@esri/solution-common 6.6.1-next.9 → 6.6.2

package/dist/cjs/arcgisRestJS.d.ts

@@ -19,9 +19,12 @@
 import { IFolderIdOptions, IGetGroupContentOptions, IGetUserOptions, IGroup, IGroupContentResult, IGetRelatedItemsResponse, IGroupSharingOptions, IItem, IItemRelationshipOptions, IItemResourceOptions, IItemResourceResponse, IPortal, IRemoveItemResourceOptions, ISearchOptions, ISearchResult, ISharingResponse, IUpdateGroupOptions, IUpdateItemOptions, IUpdateItemResponse, IUser, IUserGroupOptions, IUserItemOptions, SearchQueryBuilder } from "@esri/arcgis-rest-portal";
 import { IRequestOptions } from "@esri/arcgis-rest-request";
 import { IAddToServiceDefinitionOptions, IAddToServiceDefinitionResult, IQueryRelatedOptions, IQueryRelatedResponse } from "@esri/arcgis-rest-feature-service";
-export { IAddToServiceDefinitionOptions, IAddToServiceDefinitionResult, ICreateServiceParams, ICreateServiceResult, IExtent, ISpatialReference, IFeature, IQueryRelatedOptions, IQueryRelatedResponse, IRelatedRecordGroup, createFeatureService as svcAdminCreateFeatureService, queryFeatures, addFeatures, applyEdits, } from "@esri/arcgis-rest-feature-service";
-export { IAddFolderResponse, IAddItemDataOptions, ICreateItemOptions, ICreateItemResponse, IFolder, IFolderIdOptions, IGetGroupContentOptions, IGetRelatedItemsResponse, IGroup, IGroupAdd, IGroupCategorySchema as restIGroupCategorySchema, IItem, IItemRelationshipOptions, IItemResourceOptions, IItemResourceResponse, IManageItemRelationshipOptions, IMoveItemOptions, IMoveItemResponse, IPagedResponse, IPagingParams, IPortal, IRemoveItemResourceOptions, ISearchGroupContentOptions, ISearchOptions, ISearchResult, ISetAccessOptions, ISharingResponse, ItemRelationshipType, IUpdateGroupOptions, IUpdateItemOptions, IUpdateItemResponse, IUser, IUserContentResponse, IUserGroupOptions, IGroupSharingOptions, IUserItemOptions, addItemData as restAddItemData, addItemRelationship, createFolder, createGroup, createItem, createItemInFolder, moveItem, protectItem, SearchQueryBuilder, getGroupCategorySchema as restGetGroupCategorySchema, getItem, getItemData, getItemResources as restGetItemResources, getUserContent, getPortal as restGetPortal, getPortalUrl, searchGroupContent, setItemAccess, searchGroups as restSearchGroups, removeGroupUsers, removeItem as restRemoveItem, } from "@esri/arcgis-rest-portal";
-export { IArcGISIdentityManagerOptions, ICredential, IRequestOptions, IParams, ArcGISAuthError, encodeFormData, ArcGISIdentityManager as UserSession, } from "@esri/arcgis-rest-request";
+export { createFeatureService as svcAdminCreateFeatureService, queryFeatures, addFeatures, applyEdits, } from "@esri/arcgis-rest-feature-service";
+export type { IAddToServiceDefinitionOptions, IAddToServiceDefinitionResult, ICreateServiceParams, ICreateServiceResult, IExtent, ISpatialReference, IFeature, IQueryRelatedOptions, IQueryRelatedResponse, IRelatedRecordGroup, } from "@esri/arcgis-rest-feature-service";
+export { addItemData as restAddItemData, addItemRelationship, createFolder, createGroup, createItem, createItemInFolder, moveItem, protectItem, SearchQueryBuilder, getGroupCategorySchema as restGetGroupCategorySchema, getItem, getItemData, getItemResources as restGetItemResources, getUserContent, getPortal as restGetPortal, getPortalUrl, searchGroupContent, setItemAccess, searchGroups as restSearchGroups, removeGroupUsers, removeItem as restRemoveItem, } from "@esri/arcgis-rest-portal";
+export type { IAddFolderResponse, IAddItemDataOptions, ICreateItemOptions, ICreateItemResponse, IFolder, IFolderIdOptions, IGetGroupContentOptions, IGetRelatedItemsResponse, IGroup, IGroupAdd, IGroupCategorySchema as restIGroupCategorySchema, IItem, IItemRelationshipOptions, IItemResourceOptions, IItemResourceResponse, IManageItemRelationshipOptions, IMoveItemOptions, IMoveItemResponse, IPagedResponse, IPagingParams, IPortal, IRemoveItemResourceOptions, ISearchGroupContentOptions, ISearchOptions, ISearchResult, ISetAccessOptions, ISharingResponse, ItemRelationshipType, IUpdateGroupOptions, IUpdateItemOptions, IUpdateItemResponse, IUser, IUserContentResponse, IUserGroupOptions, IGroupSharingOptions, IUserItemOptions, } from "@esri/arcgis-rest-portal";
+export { ArcGISAuthError, encodeFormData, ArcGISIdentityManager as UserSession } from "@esri/arcgis-rest-request";
+export type { IArcGISIdentityManagerOptions, ICredential, IRequestOptions, IParams } from "@esri/arcgis-rest-request";
 export interface IFolderSuccessResult {
     success: boolean;
     folder: {

package/dist/cjs/featureServiceHelpers.d.ts

@@ -164,9 +164,12 @@ export declare function getLayerSettings(layerInfos: any, url: string, itemId: s
  * The feature service name will have a generated GUID appended.
  *
  * @param templates A collection of AGO item templates.
+ * @param templateDictionary Optional hash of values used to resolve `{{...}}` tokens in the name
+ *   before applying the 50-char base-name limit. When omitted, names containing unresolved tokens
+ *   are passed through untruncated (legacy behavior).
  * @returns An updated collection of AGO templates with unique feature service names.
  */
-export declare function setNamesAndTitles(templates: IItemTemplate[]): IItemTemplate[];
+export declare function setNamesAndTitles(templates: IItemTemplate[], templateDictionary?: any): IItemTemplate[];
 /**
  * This is used when deploying views.
  * We need to update fields referenced in adminLayerInfo for relationships prior to deploying the view.
@@ -243,6 +246,28 @@ export declare function getExistingLayersAndTables(url: string, ids: number[], a
  * @private
  */
 export declare function addFeatureServiceLayersAndTables(itemTemplate: IItemTemplate, templateDictionary: any, popupInfos: IPopupInfos, authentication: UserSession): Promise<void>;
+/**
+ * Shorten any layer or table name longer than `maxNameLength` to a unique value of at most
+ * `maxNameLength` characters, in preparation for an addToDefinition call, and report the original
+ * names so they can be restored afterward.
+ *
+ * Mutates the `name` of each over-long layer/table in `layerChunks` in place.
+ *
+ * @param layerChunks The addToDefinition chunks whose `layers` and `tables` will be added
+ * @param maxNameLength Names longer than this are truncated to a unique value of this length
+ * @returns The original names to restore, as `{ layers: [{ id, name }], tables: [{ id, name }] }`
+ * @private
+ */
+export declare function _truncateNamesForAddToDefinition(layerChunks: any[], maxNameLength: number): {
+    layers: Array<{
+        id: any;
+        name: string;
+    }>;
+    tables: Array<{
+        id: any;
+        name: string;
+    }>;
+};
 /**
  * Updates a feature service with a list of layers and/or tables.
  *

package/dist/cjs/featureServiceHelpers.js

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._validateEditFieldsInfo = exports._validateTypesTemplates = exports._validateTemplatesFields = exports._validateIndexes = exports._validateDisplayField = exports._validateFields = exports._templatizeLayer = exports._templatizeProperty = exports._templatize = exports.updatePopupInfo = exports._validateViewDomainFields = exports.postProcessFields = exports.updateLayerFieldReferences = exports._getSourceSpatialReferenceAndExtent = exports.validateSpatialReferenceAndExtent = exports.setDefaultSpatialReference = exports._updateTemplateDictionaryFields = exports._updateGeomFieldName = exports._updateSourceLayerFields = exports._updateItemFields = exports._getDynamicFieldNames = exports._getFieldNames = exports._updateForPortal = exports.removeLayerOptimization = exports._isSelfReferential = exports._updateAddOptions = exports._updateOrder = exports.addFeatureServiceDefinition = exports.addFeatureServiceLayersAndTables = exports.getExistingLayersAndTables = exports.getLayersAndTables = exports.deTemplatizeFieldInfos = exports.processContingentValues = exports.updateTemplateForInvalidDesignations = exports.updateSettingsFieldInfos = exports.setNamesAndTitles = exports.getLayerSettings = exports._setTrackingViewLayerSettings = exports._updateTypeKeywords = exports.updateTemplate = exports.cacheLayerInfo = exports._cachePopupInfo = exports.cachePopupInfos = exports._cacheFieldInfo = exports.cacheIndexes = exports.cacheContingentValues = exports.cacheFieldInfos = exports.deleteViewProps = exports.templatize = exports.getFeatureServiceRelatedRecords = void 0;
-exports._getLayerChunkSize = exports._getNameMapping = exports._templatizeDefinitionQuery = exports._templatizeTimeInfo = exports._templatizeKeys = exports._templatizeTypeTemplates = exports._templatizeTemplates = exports._templatizeLabelingInfo = exports._templatizeArcadeExpressions = exports._templatizeAuthoringInfo = exports._templatizeTemporalRenderer = exports._templatizeGenRenderer = exports._templatizeRenderer = exports._templatizeDrawingInfo = exports._templatizeSimpleName = exports._templatizeDefinitionExpression = exports._templatizeDefinitionEditor = exports._templatizeMediaInfos = exports._templatizePopupElements = exports._templatizeExpressionInfos = exports._templatizeFieldName = exports._templatizePopupInfoFieldInfos = exports._templatizeName = exports._templatizePopupInfo = exports._templatizeRelationshipFields = exports._templatizeTopFilter = exports._templatizeAdminSourceLayerFields = exports._getDependantItemId = exports._templatizeAdminLayerInfoFields = exports._templatizeSourceServiceName = exports._processAdminObject = exports._templatizeAdminLayerInfo = exports._templatizeLayerFieldReferences = void 0;
+exports._validateTypesTemplates = exports._validateTemplatesFields = exports._validateIndexes = exports._validateDisplayField = exports._validateFields = exports._templatizeLayer = exports._templatizeProperty = exports._templatize = exports.updatePopupInfo = exports._validateViewDomainFields = exports.postProcessFields = exports.updateLayerFieldReferences = exports._getSourceSpatialReferenceAndExtent = exports.validateSpatialReferenceAndExtent = exports.setDefaultSpatialReference = exports._updateTemplateDictionaryFields = exports._updateGeomFieldName = exports._updateSourceLayerFields = exports._updateItemFields = exports._getDynamicFieldNames = exports._getFieldNames = exports._updateForPortal = exports.removeLayerOptimization = exports._isSelfReferential = exports._updateAddOptions = exports._updateOrder = exports.addFeatureServiceDefinition = exports._truncateNamesForAddToDefinition = exports.addFeatureServiceLayersAndTables = exports.getExistingLayersAndTables = exports.getLayersAndTables = exports.deTemplatizeFieldInfos = exports.processContingentValues = exports.updateTemplateForInvalidDesignations = exports.updateSettingsFieldInfos = exports.setNamesAndTitles = exports.getLayerSettings = exports._setTrackingViewLayerSettings = exports._updateTypeKeywords = exports.updateTemplate = exports.cacheLayerInfo = exports._cachePopupInfo = exports.cachePopupInfos = exports._cacheFieldInfo = exports.cacheIndexes = exports.cacheContingentValues = exports.cacheFieldInfos = exports.deleteViewProps = exports.templatize = exports.getFeatureServiceRelatedRecords = void 0;
+exports._getLayerChunkSize = exports._getNameMapping = exports._templatizeDefinitionQuery = exports._templatizeTimeInfo = exports._templatizeKeys = exports._templatizeTypeTemplates = exports._templatizeTemplates = exports._templatizeLabelingInfo = exports._templatizeArcadeExpressions = exports._templatizeAuthoringInfo = exports._templatizeTemporalRenderer = exports._templatizeGenRenderer = exports._templatizeRenderer = exports._templatizeDrawingInfo = exports._templatizeSimpleName = exports._templatizeDefinitionExpression = exports._templatizeDefinitionEditor = exports._templatizeMediaInfos = exports._templatizePopupElements = exports._templatizeExpressionInfos = exports._templatizeFieldName = exports._templatizePopupInfoFieldInfos = exports._templatizeName = exports._templatizePopupInfo = exports._templatizeRelationshipFields = exports._templatizeTopFilter = exports._templatizeAdminSourceLayerFields = exports._getDependantItemId = exports._templatizeAdminLayerInfoFields = exports._templatizeSourceServiceName = exports._processAdminObject = exports._templatizeAdminLayerInfo = exports._templatizeLayerFieldReferences = exports._validateEditFieldsInfo = void 0;
 /**
  * Provides general helper functions.
  *
@@ -158,9 +158,11 @@ exports.deleteViewProps = deleteViewProps;
  */
 function cacheFieldInfos(layer, fieldInfos, isView, isPortal) {
     // cache the source fields as they are in the original source
-    if (layer && layer.fields) {
+    // Note: layer.id is commonly 0 for the first layer, so use a presence check
+    // (not a truthy check) to avoid skipping the layer with id === 0.
+    if (layer && layer.id !== undefined && layer.id !== null) {
         fieldInfos[layer.id] = {
-            sourceFields: JSON.parse(JSON.stringify(layer.fields)),
+            sourceFields: layer.fields ? JSON.parse(JSON.stringify(layer.fields)) : [],
             type: layer.type,
             id: layer.id,
         };
@@ -443,9 +445,12 @@ exports.getLayerSettings = getLayerSettings;
  * The feature service name will have a generated GUID appended.
  *
  * @param templates A collection of AGO item templates.
+ * @param templateDictionary Optional hash of values used to resolve `{{...}}` tokens in the name
+ *   before applying the 50-char base-name limit. When omitted, names containing unresolved tokens
+ *   are passed through untruncated (legacy behavior).
  * @returns An updated collection of AGO templates with unique feature service names.
  */
-function setNamesAndTitles(templates) {
+function setNamesAndTitles(templates, templateDictionary) {
     const guid = (0, generalHelpers_1.generateGUID)();
     const names = [];
     return templates.map((t) => {
@@ -459,9 +464,20 @@ function setNamesAndTitles(templates) {
                 let baseName = t.item.name || t.item.title;
                 // If the name already contains a GUID remove it
                 baseName = baseName.replace(/_[0-9A-F]{32}/gi, "");
-                // The name length limit is 98
-                // Limit the baseName to 50 characters before the _<guid>
-                const name = baseName.substring(0, 50) + "_" + guid;
+                // Resolve any {{...}} tokens (e.g. {{params.buildSolution.items.<id>.title}}) so the
+                // base-name length limit reflects the value AGOL will actually see at create time.
+                const resolvedBaseName = templateDictionary
+                    ? (0, templatization_1.replaceInTemplate)(baseName, templateDictionary)
+                    : baseName;
+                // Limit the base name to 50 chars so the full service name (base + "_" + 32-char guid)
+                // stays within AGOL's service-name length limit. This 50-char cap is long-standing
+                // behavior. If unresolved {{...}} tokens remain we can't know the resolved length, so
+                // leave the name untruncated.
+                const maxBaseNameLength = 50;
+                const stillTemplatized = resolvedBaseName.includes("{{");
+                const name = stillTemplatized
+                    ? resolvedBaseName + "_" + guid
+                    : resolvedBaseName.substring(0, maxBaseNameLength) + "_" + guid;
                 // If the name + GUID already exists then append "_occurrenceCount"
                 t.item.name = names.indexOf(name) === -1 ? name : `${name}_${names.filter((n) => n === name).length}`;
                 names.push(name);
@@ -742,6 +758,53 @@ function addFeatureServiceLayersAndTables(itemTemplate, templateDictionary, popu
     });
 }
 exports.addFeatureServiceLayersAndTables = addFeatureServiceLayersAndTables;
+/**
+ * Shorten any layer or table name longer than `maxNameLength` to a unique value of at most
+ * `maxNameLength` characters, in preparation for an addToDefinition call, and report the original
+ * names so they can be restored afterward.
+ *
+ * Mutates the `name` of each over-long layer/table in `layerChunks` in place.
+ *
+ * @param layerChunks The addToDefinition chunks whose `layers` and `tables` will be added
+ * @param maxNameLength Names longer than this are truncated to a unique value of this length
+ * @returns The original names to restore, as `{ layers: [{ id, name }], tables: [{ id, name }] }`
+ * @private
+ */
+function _truncateNamesForAddToDefinition(layerChunks, maxNameLength) {
+    const restore = {
+        layers: [],
+        tables: [],
+    };
+    const allItems = [];
+    layerChunks.forEach((chunk) => {
+        chunk.layers.forEach((layer) => allItems.push({ item: layer, isLayer: true }));
+        chunk.tables.forEach((table) => allItems.push({ item: table, isLayer: false }));
+    });
+    // Reserve names that are already short enough so the truncated names won't collide with them.
+    const usedNames = new Set();
+    allItems.forEach(({ item }) => {
+        if (item.name.length <= maxNameLength) {
+            usedNames.add(item.name.toLowerCase());
+        }
+    });
+    allItems.forEach(({ item, isLayer }) => {
+        if (item.name.length > maxNameLength) {
+            const originalName = item.name;
+            let candidate = originalName.substring(0, maxNameLength);
+            let counter = 1;
+            // Keep the truncated name unique by trimming room for a numeric suffix when needed.
+            while (usedNames.has(candidate.toLowerCase())) {
+                const suffix = `_${counter++}`;
+                candidate = originalName.substring(0, maxNameLength - suffix.length) + suffix;
+            }
+            usedNames.add(candidate.toLowerCase());
+            item.name = candidate;
+            (isLayer ? restore.layers : restore.tables).push({ id: item.id, name: originalName });
+        }
+    });
+    return restore;
+}
+exports._truncateNamesForAddToDefinition = _truncateNamesForAddToDefinition;
 /**
  * Updates a feature service with a list of layers and/or tables.
  *
@@ -826,7 +889,12 @@ function addFeatureServiceDefinition(serviceUrl, listToAdd, templateDictionary,
                 removeLayerOptimization(item);
                 // this can still chunk layers
                 options = _updateAddOptions(itemTemplate, options, layerChunks, isSelfReferential, authentication);
-                if (item.type === "Feature Layer") {
+                // Route based on the discriminator set by getLayersAndTables (which derives from
+                // properties.layers vs properties.tables) rather than the layer object's own `type`
+                // field. The latter may be missing when users supply custom layer JSON via
+                // params (e.g. {{params.buildSolution.items.<id>.service.layers}}), which would
+                // otherwise cause every layer to be pushed into the `tables` array.
+                if (toAdd.type === "layer" || item.type === "Feature Layer") {
                     options.layers.push(item);
                 }
                 else {
@@ -849,9 +917,30 @@ function addFeatureServiceDefinition(serviceUrl, listToAdd, templateDictionary,
             // will use async by default rather than chunk the layer requests when we have more layers
             // than the defined chunk size
             const useAsync = listToAdd.length > chunkSize;
+            // Shorten any over-long layer/table names to short, unique values before adding them.
+            // Names will be restored afterward with one updateDefinition call per layer/table.
+            const maxBackingTableNameLength = 30;
+            const restoreNames = _truncateNamesForAddToDefinition(layerChunks, maxBackingTableNameLength);
+            // Base admin URL used for the per-layer updateDefinition restore calls below.
+            const adminServiceUrl = (0, generalHelpers_1.checkUrlPathTermination)(serviceUrl.replace("/rest/services", "/rest/admin/services"));
             layerChunks
                 .reduce((prev, curr) => prev.then(() => (0, restHelpers_1.addToServiceDefinition)(serviceUrl, curr, false, useAsync)), Promise.resolve(null))
-                .then(() => resolve(null), (e) => reject((0, generalHelpers_1.fail)(e)));
+                .then(() => {
+                // Restore the original (pre-truncation) display names.
+                // I was seeing the updateDefinition call succeed but the names not being restored when I was doing this
+                // with a single call at the service endpoint. So now we are doing this sequentially.
+                const restoreItems = [...restoreNames.layers, ...restoreNames.tables];
+                restoreItems
+                    .reduce((prev, entry) => prev.then(() => {
+                    const restoreUpdate = {
+                        url: adminServiceUrl + entry.id + "/updateDefinition",
+                        params: { updateDefinition: { name: entry.name } },
+                        args: { authentication },
+                    };
+                    return (0, restHelpers_1.getRequest)(restoreUpdate, false, false, templateDictionary.isPortal);
+                }), Promise.resolve(null))
+                    .then(() => resolve(null), (e) => reject((0, generalHelpers_1.fail)(e)));
+            }, (e) => reject((0, generalHelpers_1.fail)(e)));
         }
     });
 }

package/dist/cjs/restHelpers.d.ts

@@ -90,6 +90,28 @@ export declare function convertToISearchOptions(search: string | ISearchOptions
  * @private
  */
 export declare function _validateExtent(extent: IExtent): IExtent;
+/**
+ * The geometry service can resolve a projection request successfully but still
+ * return "NaN" coordinate values or no geometry at all. This check is used to
+ * decide whether a projected extent can be used for a service's initial and full
+ * extents.
+ *
+ * @param extent the extent to test
+ * @returns true if the extent has numeric xmin, ymin, xmax, and ymax values
+ * @private
+ */
+export declare function _extentIsValid(extent: any): boolean;
+/**
+ * Removes the templatized extent from a template's layers and tables.
+ *
+ * Used when the organization's default extent cannot be projected into the
+ * service's spatial reference so that the layers and tables are created without an
+ * extent rather than with an unresolved template variable.
+ *
+ * @param itemTemplate the template whose layer and table extents should be removed
+ * @private
+ */
+export declare function _removeLayerExtents(itemTemplate: IItemTemplate): void;
 /**
  * If the request to convert the extent fails it has commonly been due to an invalid extent.
  * This function will first attempt to use the provided extent. If it fails it will default to
@@ -107,7 +129,6 @@ export declare function _validateExtent(extent: IExtent): IExtent;
 export declare function convertExtentWithFallback(extent: IExtent, fallbackExtent: any, outSR: ISpatialReference, geometryServiceUrl: string, authentication: UserSession): Promise<any>;
 /**
  * Converts an extent to a specified spatial reference.
- *
  * @param extent Extent object to check and (possibly) to project
  * @param outSR Desired spatial reference
  * @param geometryServiceUrl Path to geometry service providing `findTransformations` and `project` services
@@ -528,6 +549,15 @@ export declare function _addItemMetadataFile(itemId: string, metadataFile: File,
  * @private
  */
 export declare function _countRelationships(layers: any[]): number;
+/**
+ * Remove spaces and replace other characters that are not allowed in a feature service name with "_".
+ * Spaces are removed entirely. Disallowed (replaced with "_"): '#', '%', '&', '"', '\', '/', '+', '?', ':', '*',
+ * '<', '>', '\t', '!', '@', "'", ';', ','
+ *
+ * @param name The candidate service name
+ * @returns The sanitized name, or the input unchanged if it is not a string
+ */
+export declare function sanitizeFeatureServiceName(name: string): string;
 /**
  * Gets the full definitions of the layers affiliated with a hosted service.
  *
@@ -538,19 +568,6 @@ export declare function _countRelationships(layers: any[]): number;
  * @private
  */
 export declare function _getCreateServiceOptions(newItemTemplate: IItemTemplate, authentication: UserSession, templateDictionary: any): Promise<any>;
-/**
- * When the services spatial reference does not match that of it's default extent
- * use the out SRs default extent if it exists in the templateDictionary
- * this should be set when adding a custom out wkid to the params before calling deploy
- * this will help avoid situations where the orgs default extent and default world extent
- * will not project successfully to the out SR
- *
- * @param serviceInfo the object that contains the spatial reference to evaluate
- * @param templateDictionary the template dictionary
- * @returns the extent to use as the fallback
- * @private
- */
-export declare function _getFallbackExtent(serviceInfo: any, templateDictionary: any): any;
 /**
  * Add relationships to all layers in one call to retain fully functioning composite relationships
  *

package/dist/cjs/restHelpers.js

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._countRelationships = exports._addItemMetadataFile = exports._addItemDataFile = exports.updateItemURL = exports.updateItemTemplateFromDictionary = exports.updateItemExtended = exports.updateGroup = exports.updateItem = exports.shareItem = exports.removeUsers = exports.reassignGroup = exports.searchGroupContents = exports.searchGroupAllContents = exports.searchAllGroups = exports.searchGroups = exports.searchAllItems = exports.searchItems = exports.removeItemOrGroup = exports.removeItem = exports.removeGroup = exports.removeFolder = exports.hasInvalidGroupDesignations = exports._parseAdminServiceData = exports.setWorkflowConfigurationZip = exports.getWorkflowConfigurationZip = exports.getFeatureServiceProperties = exports.getServiceLayersAndTables = exports.getRequest = exports._sortRelationships = exports.moveItemsToFolder = exports.moveItemToFolder = exports.getLayerUpdates = exports.getLayers = exports.extractDependencies = exports.createUniqueGroup = exports.createUniqueFolder = exports.createItemWithData = exports.createFullItem = exports.createFeatureService = exports.convertExtent = exports.convertExtentWithFallback = exports._validateExtent = exports.convertToISearchOptions = exports.checkRequestStatus = exports.addToServiceDefinition = exports.addTokenToUrl = exports.addForwardItemRelationships = exports.addForwardItemRelationship = exports.getUserSession = exports.addItemData = void 0;
-exports._updateItemURL = exports._updateIndexesForRelationshipKeyFields = exports._setItemProperties = exports._reportVariablesInItem = exports._lowercaseDomain = exports._getUpdate = exports._getSubtypeUpdates = exports._getContingentValuesUpdates = exports._getRelationshipUpdates = exports._getFallbackExtent = exports._getCreateServiceOptions = void 0;
+exports._addItemDataFile = exports.updateItemURL = exports.updateItemTemplateFromDictionary = exports.updateItemExtended = exports.updateGroup = exports.updateItem = exports.shareItem = exports.removeUsers = exports.reassignGroup = exports.searchGroupContents = exports.searchGroupAllContents = exports.searchAllGroups = exports.searchGroups = exports.searchAllItems = exports.searchItems = exports.removeItemOrGroup = exports.removeItem = exports.removeGroup = exports.removeFolder = exports.hasInvalidGroupDesignations = exports._parseAdminServiceData = exports.setWorkflowConfigurationZip = exports.getWorkflowConfigurationZip = exports.getFeatureServiceProperties = exports.getServiceLayersAndTables = exports.getRequest = exports._sortRelationships = exports.moveItemsToFolder = exports.moveItemToFolder = exports.getLayerUpdates = exports.getLayers = exports.extractDependencies = exports.createUniqueGroup = exports.createUniqueFolder = exports.createItemWithData = exports.createFullItem = exports.createFeatureService = exports.convertExtent = exports.convertExtentWithFallback = exports._removeLayerExtents = exports._extentIsValid = exports._validateExtent = exports.convertToISearchOptions = exports.checkRequestStatus = exports.addToServiceDefinition = exports.addTokenToUrl = exports.addForwardItemRelationships = exports.addForwardItemRelationship = exports.getUserSession = exports.addItemData = void 0;
+exports._updateItemURL = exports._updateIndexesForRelationshipKeyFields = exports._setItemProperties = exports._reportVariablesInItem = exports._lowercaseDomain = exports._getUpdate = exports._getSubtypeUpdates = exports._getContingentValuesUpdates = exports._getRelationshipUpdates = exports._getCreateServiceOptions = exports.sanitizeFeatureServiceName = exports._countRelationships = exports._addItemMetadataFile = void 0;
 /**
  * Provides common functions involving the arcgis-rest-js library.
  *
@@ -261,6 +261,38 @@ function _validateExtent(extent) {
     return extent;
 }
 exports._validateExtent = _validateExtent;
+/**
+ * The geometry service can resolve a projection request successfully but still
+ * return "NaN" coordinate values or no geometry at all. This check is used to
+ * decide whether a projected extent can be used for a service's initial and full
+ * extents.
+ *
+ * @param extent the extent to test
+ * @returns true if the extent has numeric xmin, ymin, xmax, and ymax values
+ * @private
+ */
+function _extentIsValid(extent) {
+    return (!!extent &&
+        [extent.xmin, extent.ymin, extent.xmax, extent.ymax].every((coordinate) => typeof coordinate === "number" && !isNaN(coordinate)));
+}
+exports._extentIsValid = _extentIsValid;
+/**
+ * Removes the templatized extent from a template's layers and tables.
+ *
+ * Used when the organization's default extent cannot be projected into the
+ * service's spatial reference so that the layers and tables are created without an
+ * extent rather than with an unresolved template variable.
+ *
+ * @param itemTemplate the template whose layer and table extents should be removed
+ * @private
+ */
+function _removeLayerExtents(itemTemplate) {
+    ["properties.layers", "properties.tables"].forEach((path) => {
+        const items = (0, generalHelpers_1.getProp)(itemTemplate, path) || [];
+        items.forEach((item) => (0, generalHelpers_1.deleteProp)(item, "extent"));
+    });
+}
+exports._removeLayerExtents = _removeLayerExtents;
 /**
  * If the request to convert the extent fails it has commonly been due to an invalid extent.
  * This function will first attempt to use the provided extent. If it fails it will default to
@@ -305,7 +337,6 @@ function convertExtentWithFallback(extent, fallbackExtent, outSR, geometryServic
 exports.convertExtentWithFallback = convertExtentWithFallback;
 /**
  * Converts an extent to a specified spatial reference.
- *
  * @param extent Extent object to check and (possibly) to project
  * @param outSR Desired spatial reference
  * @param geometryServiceUrl Path to geometry service providing `findTransformations` and `project` services
@@ -1660,6 +1691,18 @@ function _countRelationships(layers) {
     return layers.reduce(reducer, 0);
 }
 exports._countRelationships = _countRelationships;
+/**
+ * Remove spaces and replace other characters that are not allowed in a feature service name with "_".
+ * Spaces are removed entirely. Disallowed (replaced with "_"): '#', '%', '&', '"', '\', '/', '+', '?', ':', '*',
+ * '<', '>', '\t', '!', '@', "'", ';', ','
+ *
+ * @param name The candidate service name
+ * @returns The sanitized name, or the input unchanged if it is not a string
+ */
+function sanitizeFeatureServiceName(name) {
+    return typeof name === "string" ? name.replace(/ /g, "").replace(/[#%&"\\/+?:*<>\t!@';,]/g, "_") : name;
+}
+exports.sanitizeFeatureServiceName = sanitizeFeatureServiceName;
 /**
  * Gets the full definitions of the layers affiliated with a hosted service.
  *
@@ -1676,7 +1719,6 @@ function _getCreateServiceOptions(newItemTemplate, authentication, templateDicti
         const isPortal = templateDictionary.isPortal;
         const itemId = newItemTemplate.itemId;
         (0, featureServiceHelpers_1.validateSpatialReferenceAndExtent)(serviceInfo, newItemTemplate, templateDictionary);
-        const fallbackExtent = _getFallbackExtent(serviceInfo, templateDictionary);
         const params = {};
         const itemInfo = {
             title: newItemTemplate.item.title,
@@ -1695,12 +1737,23 @@ function _getCreateServiceOptions(newItemTemplate, authentication, templateDicti
         createOptions.item = !(0, trackingHelpers_1.isTrackingViewTemplate)(newItemTemplate)
             ? _setItemProperties(createOptions.item, newItemTemplate, serviceInfo, params, isPortal)
             : (0, trackingHelpers_1.setTrackingOptions)(newItemTemplate, createOptions, templateDictionary);
-        // project the portals extent to match that of the service
-        convertExtentWithFallback(templateDictionary.organization.defaultExtent, fallbackExtent, serviceInfo.service.spatialReference, templateDictionary.organization.helperServices.geometry.url, authentication).then((extent) => {
-            templateDictionary[itemId].solutionExtent = extent;
-            (0, featureServiceHelpers_1.setDefaultSpatialReference)(templateDictionary, itemId, extent.spatialReference);
+        convertExtent(_validateExtent(templateDictionary.organization.defaultExtent), serviceInfo.service.spatialReference, templateDictionary.organization.helperServices.geometry.url, authentication).then((extent) => {
+            if (_extentIsValid(extent)) {
+                templateDictionary[itemId].solutionExtent = extent;
+                (0, featureServiceHelpers_1.setDefaultSpatialReference)(templateDictionary, itemId, extent.spatialReference);
+            }
+            else {
+                // The org's default extent could not be projected into the service's spatial
+                // reference, so remove the templatized extent properties from the service and
+                // its layers and tables
+                (0, generalHelpers_1.deleteProp)(createOptions.item, "initialExtent");
+                (0, generalHelpers_1.deleteProp)(createOptions.item, "fullExtent");
+                _removeLayerExtents(newItemTemplate);
+                (0, featureServiceHelpers_1.setDefaultSpatialReference)(templateDictionary, itemId, serviceInfo.service.spatialReference);
+            }
             createOptions.item = (0, templatization_1.replaceInTemplate)(createOptions.item, templateDictionary);
             createOptions.params = (0, templatization_1.replaceInTemplate)(createOptions.params, templateDictionary);
+            createOptions.item.name = sanitizeFeatureServiceName(createOptions.item.name);
             if (newItemTemplate.item.thumbnail) {
                 // Pass thumbnail file in via params because item property is serialized, which discards a blob
                 createOptions.params.thumbnail = newItemTemplate.item.thumbnail;
@@ -1710,29 +1763,6 @@ function _getCreateServiceOptions(newItemTemplate, authentication, templateDicti
     });
 }
 exports._getCreateServiceOptions = _getCreateServiceOptions;
-/**
- * When the services spatial reference does not match that of it's default extent
- * use the out SRs default extent if it exists in the templateDictionary
- * this should be set when adding a custom out wkid to the params before calling deploy
- * this will help avoid situations where the orgs default extent and default world extent
- * will not project successfully to the out SR
- *
- * @param serviceInfo the object that contains the spatial reference to evaluate
- * @param templateDictionary the template dictionary
- * @returns the extent to use as the fallback
- * @private
- */
-function _getFallbackExtent(serviceInfo, templateDictionary) {
-    const serviceSR = serviceInfo.service.spatialReference;
-    const serviceInfoWkid = (0, generalHelpers_1.getProp)(serviceInfo, "defaultExtent.spatialReference.wkid");
-    const customDefaultExtent = (0, generalHelpers_1.getProp)(templateDictionary, "params.defaultExtent");
-    return serviceInfoWkid && serviceInfoWkid === serviceSR.wkid
-        ? serviceInfo.defaultExtent
-        : customDefaultExtent
-            ? customDefaultExtent
-            : serviceInfo.defaultExtent;
-}
-exports._getFallbackExtent = _getFallbackExtent;
 /**
  * Add relationships to all layers in one call to retain fully functioning composite relationships
  *

package/dist/esm/arcgisRestJS.d.ts

@@ -19,9 +19,12 @@
 import { IFolderIdOptions, IGetGroupContentOptions, IGetUserOptions, IGroup, IGroupContentResult, IGetRelatedItemsResponse, IGroupSharingOptions, IItem, IItemRelationshipOptions, IItemResourceOptions, IItemResourceResponse, IPortal, IRemoveItemResourceOptions, ISearchOptions, ISearchResult, ISharingResponse, IUpdateGroupOptions, IUpdateItemOptions, IUpdateItemResponse, IUser, IUserGroupOptions, IUserItemOptions, SearchQueryBuilder } from "@esri/arcgis-rest-portal";
 import { IRequestOptions } from "@esri/arcgis-rest-request";
 import { IAddToServiceDefinitionOptions, IAddToServiceDefinitionResult, IQueryRelatedOptions, IQueryRelatedResponse } from "@esri/arcgis-rest-feature-service";
-export { IAddToServiceDefinitionOptions, IAddToServiceDefinitionResult, ICreateServiceParams, ICreateServiceResult, IExtent, ISpatialReference, IFeature, IQueryRelatedOptions, IQueryRelatedResponse, IRelatedRecordGroup, createFeatureService as svcAdminCreateFeatureService, queryFeatures, addFeatures, applyEdits, } from "@esri/arcgis-rest-feature-service";
-export { IAddFolderResponse, IAddItemDataOptions, ICreateItemOptions, ICreateItemResponse, IFolder, IFolderIdOptions, IGetGroupContentOptions, IGetRelatedItemsResponse, IGroup, IGroupAdd, IGroupCategorySchema as restIGroupCategorySchema, IItem, IItemRelationshipOptions, IItemResourceOptions, IItemResourceResponse, IManageItemRelationshipOptions, IMoveItemOptions, IMoveItemResponse, IPagedResponse, IPagingParams, IPortal, IRemoveItemResourceOptions, ISearchGroupContentOptions, ISearchOptions, ISearchResult, ISetAccessOptions, ISharingResponse, ItemRelationshipType, IUpdateGroupOptions, IUpdateItemOptions, IUpdateItemResponse, IUser, IUserContentResponse, IUserGroupOptions, IGroupSharingOptions, IUserItemOptions, addItemData as restAddItemData, addItemRelationship, createFolder, createGroup, createItem, createItemInFolder, moveItem, protectItem, SearchQueryBuilder, getGroupCategorySchema as restGetGroupCategorySchema, getItem, getItemData, getItemResources as restGetItemResources, getUserContent, getPortal as restGetPortal, getPortalUrl, searchGroupContent, setItemAccess, searchGroups as restSearchGroups, removeGroupUsers, removeItem as restRemoveItem, } from "@esri/arcgis-rest-portal";
-export { IArcGISIdentityManagerOptions, ICredential, IRequestOptions, IParams, ArcGISAuthError, encodeFormData, ArcGISIdentityManager as UserSession, } from "@esri/arcgis-rest-request";
+export { createFeatureService as svcAdminCreateFeatureService, queryFeatures, addFeatures, applyEdits, } from "@esri/arcgis-rest-feature-service";
+export type { IAddToServiceDefinitionOptions, IAddToServiceDefinitionResult, ICreateServiceParams, ICreateServiceResult, IExtent, ISpatialReference, IFeature, IQueryRelatedOptions, IQueryRelatedResponse, IRelatedRecordGroup, } from "@esri/arcgis-rest-feature-service";
+export { addItemData as restAddItemData, addItemRelationship, createFolder, createGroup, createItem, createItemInFolder, moveItem, protectItem, SearchQueryBuilder, getGroupCategorySchema as restGetGroupCategorySchema, getItem, getItemData, getItemResources as restGetItemResources, getUserContent, getPortal as restGetPortal, getPortalUrl, searchGroupContent, setItemAccess, searchGroups as restSearchGroups, removeGroupUsers, removeItem as restRemoveItem, } from "@esri/arcgis-rest-portal";
+export type { IAddFolderResponse, IAddItemDataOptions, ICreateItemOptions, ICreateItemResponse, IFolder, IFolderIdOptions, IGetGroupContentOptions, IGetRelatedItemsResponse, IGroup, IGroupAdd, IGroupCategorySchema as restIGroupCategorySchema, IItem, IItemRelationshipOptions, IItemResourceOptions, IItemResourceResponse, IManageItemRelationshipOptions, IMoveItemOptions, IMoveItemResponse, IPagedResponse, IPagingParams, IPortal, IRemoveItemResourceOptions, ISearchGroupContentOptions, ISearchOptions, ISearchResult, ISetAccessOptions, ISharingResponse, ItemRelationshipType, IUpdateGroupOptions, IUpdateItemOptions, IUpdateItemResponse, IUser, IUserContentResponse, IUserGroupOptions, IGroupSharingOptions, IUserItemOptions, } from "@esri/arcgis-rest-portal";
+export { ArcGISAuthError, encodeFormData, ArcGISIdentityManager as UserSession } from "@esri/arcgis-rest-request";
+export type { IArcGISIdentityManagerOptions, ICredential, IRequestOptions, IParams } from "@esri/arcgis-rest-request";
 export interface IFolderSuccessResult {
     success: boolean;
     folder: {

package/dist/esm/arcgisRestJS.js

@@ -21,7 +21,7 @@ import { request as restRequest } from "@esri/arcgis-rest-request";
 import { addToServiceDefinition, queryRelated as restQueryRelated, } from "@esri/arcgis-rest-feature-service";
 export { createFeatureService as svcAdminCreateFeatureService, queryFeatures, addFeatures, applyEdits, } from "@esri/arcgis-rest-feature-service";
 export { addItemData as restAddItemData, addItemRelationship, createFolder, createGroup, createItem, createItemInFolder, moveItem, protectItem, SearchQueryBuilder, getGroupCategorySchema as restGetGroupCategorySchema, getItem, getItemData, getItemResources as restGetItemResources, getUserContent, getPortal as restGetPortal, getPortalUrl, searchGroupContent, setItemAccess, searchGroups as restSearchGroups, removeGroupUsers, removeItem as restRemoveItem, } from "@esri/arcgis-rest-portal";
-export { ArcGISAuthError, encodeFormData, ArcGISIdentityManager as UserSession, } from "@esri/arcgis-rest-request";
+export { ArcGISAuthError, encodeFormData, ArcGISIdentityManager as UserSession } from "@esri/arcgis-rest-request";
 //custom export functions that mimic the same export function from arcgis-rest-js
 //to bypass unit test error:
 //Error: <spyOn> : <functon or property> is not declared writable or has no setter

package/dist/esm/featureServiceHelpers.d.ts

@@ -164,9 +164,12 @@ export declare function getLayerSettings(layerInfos: any, url: string, itemId: s
  * The feature service name will have a generated GUID appended.
  *
  * @param templates A collection of AGO item templates.
+ * @param templateDictionary Optional hash of values used to resolve `{{...}}` tokens in the name
+ *   before applying the 50-char base-name limit. When omitted, names containing unresolved tokens
+ *   are passed through untruncated (legacy behavior).
  * @returns An updated collection of AGO templates with unique feature service names.
  */
-export declare function setNamesAndTitles(templates: IItemTemplate[]): IItemTemplate[];
+export declare function setNamesAndTitles(templates: IItemTemplate[], templateDictionary?: any): IItemTemplate[];
 /**
  * This is used when deploying views.
  * We need to update fields referenced in adminLayerInfo for relationships prior to deploying the view.
@@ -243,6 +246,28 @@ export declare function getExistingLayersAndTables(url: string, ids: number[], a
  * @private
  */
 export declare function addFeatureServiceLayersAndTables(itemTemplate: IItemTemplate, templateDictionary: any, popupInfos: IPopupInfos, authentication: UserSession): Promise<void>;
+/**
+ * Shorten any layer or table name longer than `maxNameLength` to a unique value of at most
+ * `maxNameLength` characters, in preparation for an addToDefinition call, and report the original
+ * names so they can be restored afterward.
+ *
+ * Mutates the `name` of each over-long layer/table in `layerChunks` in place.
+ *
+ * @param layerChunks The addToDefinition chunks whose `layers` and `tables` will be added
+ * @param maxNameLength Names longer than this are truncated to a unique value of this length
+ * @returns The original names to restore, as `{ layers: [{ id, name }], tables: [{ id, name }] }`
+ * @private
+ */
+export declare function _truncateNamesForAddToDefinition(layerChunks: any[], maxNameLength: number): {
+    layers: Array<{
+        id: any;
+        name: string;
+    }>;
+    tables: Array<{
+        id: any;
+        name: string;
+    }>;
+};
 /**
  * Updates a feature service with a list of layers and/or tables.
  *

package/dist/esm/featureServiceHelpers.js

@@ -151,9 +151,11 @@ export function deleteViewProps(layer, isPortal) {
  */
 export function cacheFieldInfos(layer, fieldInfos, isView, isPortal) {
     // cache the source fields as they are in the original source
-    if (layer && layer.fields) {
+    // Note: layer.id is commonly 0 for the first layer, so use a presence check
+    // (not a truthy check) to avoid skipping the layer with id === 0.
+    if (layer && layer.id !== undefined && layer.id !== null) {
         fieldInfos[layer.id] = {
-            sourceFields: JSON.parse(JSON.stringify(layer.fields)),
+            sourceFields: layer.fields ? JSON.parse(JSON.stringify(layer.fields)) : [],
             type: layer.type,
             id: layer.id,
         };
@@ -425,9 +427,12 @@ export function getLayerSettings(layerInfos, url, itemId, enterpriseIDMapping) {
  * The feature service name will have a generated GUID appended.
  *
  * @param templates A collection of AGO item templates.
+ * @param templateDictionary Optional hash of values used to resolve `{{...}}` tokens in the name
+ *   before applying the 50-char base-name limit. When omitted, names containing unresolved tokens
+ *   are passed through untruncated (legacy behavior).
  * @returns An updated collection of AGO templates with unique feature service names.
  */
-export function setNamesAndTitles(templates) {
+export function setNamesAndTitles(templates, templateDictionary) {
     const guid = generateGUID();
     const names = [];
     return templates.map((t) => {
@@ -441,9 +446,20 @@ export function setNamesAndTitles(templates) {
                 let baseName = t.item.name || t.item.title;
                 // If the name already contains a GUID remove it
                 baseName = baseName.replace(/_[0-9A-F]{32}/gi, "");
-                // The name length limit is 98
-                // Limit the baseName to 50 characters before the _<guid>
-                const name = baseName.substring(0, 50) + "_" + guid;
+                // Resolve any {{...}} tokens (e.g. {{params.buildSolution.items.<id>.title}}) so the
+                // base-name length limit reflects the value AGOL will actually see at create time.
+                const resolvedBaseName = templateDictionary
+                    ? replaceInTemplate(baseName, templateDictionary)
+                    : baseName;
+                // Limit the base name to 50 chars so the full service name (base + "_" + 32-char guid)
+                // stays within AGOL's service-name length limit. This 50-char cap is long-standing
+                // behavior. If unresolved {{...}} tokens remain we can't know the resolved length, so
+                // leave the name untruncated.
+                const maxBaseNameLength = 50;
+                const stillTemplatized = resolvedBaseName.includes("{{");
+                const name = stillTemplatized
+                    ? resolvedBaseName + "_" + guid
+                    : resolvedBaseName.substring(0, maxBaseNameLength) + "_" + guid;
                 // If the name + GUID already exists then append "_occurrenceCount"
                 t.item.name = names.indexOf(name) === -1 ? name : `${name}_${names.filter((n) => n === name).length}`;
                 names.push(name);
@@ -716,6 +732,52 @@ export function addFeatureServiceLayersAndTables(itemTemplate, templateDictionar
         }
     });
 }
+/**
+ * Shorten any layer or table name longer than `maxNameLength` to a unique value of at most
+ * `maxNameLength` characters, in preparation for an addToDefinition call, and report the original
+ * names so they can be restored afterward.
+ *
+ * Mutates the `name` of each over-long layer/table in `layerChunks` in place.
+ *
+ * @param layerChunks The addToDefinition chunks whose `layers` and `tables` will be added
+ * @param maxNameLength Names longer than this are truncated to a unique value of this length
+ * @returns The original names to restore, as `{ layers: [{ id, name }], tables: [{ id, name }] }`
+ * @private
+ */
+export function _truncateNamesForAddToDefinition(layerChunks, maxNameLength) {
+    const restore = {
+        layers: [],
+        tables: [],
+    };
+    const allItems = [];
+    layerChunks.forEach((chunk) => {
+        chunk.layers.forEach((layer) => allItems.push({ item: layer, isLayer: true }));
+        chunk.tables.forEach((table) => allItems.push({ item: table, isLayer: false }));
+    });
+    // Reserve names that are already short enough so the truncated names won't collide with them.
+    const usedNames = new Set();
+    allItems.forEach(({ item }) => {
+        if (item.name.length <= maxNameLength) {
+            usedNames.add(item.name.toLowerCase());
+        }
+    });
+    allItems.forEach(({ item, isLayer }) => {
+        if (item.name.length > maxNameLength) {
+            const originalName = item.name;
+            let candidate = originalName.substring(0, maxNameLength);
+            let counter = 1;
+            // Keep the truncated name unique by trimming room for a numeric suffix when needed.
+            while (usedNames.has(candidate.toLowerCase())) {
+                const suffix = `_${counter++}`;
+                candidate = originalName.substring(0, maxNameLength - suffix.length) + suffix;
+            }
+            usedNames.add(candidate.toLowerCase());
+            item.name = candidate;
+            (isLayer ? restore.layers : restore.tables).push({ id: item.id, name: originalName });
+        }
+    });
+    return restore;
+}
 /**
  * Updates a feature service with a list of layers and/or tables.
  *
@@ -800,7 +862,12 @@ export function addFeatureServiceDefinition(serviceUrl, listToAdd, templateDicti
                 removeLayerOptimization(item);
                 // this can still chunk layers
                 options = _updateAddOptions(itemTemplate, options, layerChunks, isSelfReferential, authentication);
-                if (item.type === "Feature Layer") {
+                // Route based on the discriminator set by getLayersAndTables (which derives from
+                // properties.layers vs properties.tables) rather than the layer object's own `type`
+                // field. The latter may be missing when users supply custom layer JSON via
+                // params (e.g. {{params.buildSolution.items.<id>.service.layers}}), which would
+                // otherwise cause every layer to be pushed into the `tables` array.
+                if (toAdd.type === "layer" || item.type === "Feature Layer") {
                     options.layers.push(item);
                 }
                 else {
@@ -823,9 +890,30 @@ export function addFeatureServiceDefinition(serviceUrl, listToAdd, templateDicti
             // will use async by default rather than chunk the layer requests when we have more layers
             // than the defined chunk size
             const useAsync = listToAdd.length > chunkSize;
+            // Shorten any over-long layer/table names to short, unique values before adding them.
+            // Names will be restored afterward with one updateDefinition call per layer/table.
+            const maxBackingTableNameLength = 30;
+            const restoreNames = _truncateNamesForAddToDefinition(layerChunks, maxBackingTableNameLength);
+            // Base admin URL used for the per-layer updateDefinition restore calls below.
+            const adminServiceUrl = checkUrlPathTermination(serviceUrl.replace("/rest/services", "/rest/admin/services"));
             layerChunks
                 .reduce((prev, curr) => prev.then(() => addToServiceDefinition(serviceUrl, curr, false, useAsync)), Promise.resolve(null))
-                .then(() => resolve(null), (e) => reject(fail(e)));
+                .then(() => {
+                // Restore the original (pre-truncation) display names.
+                // I was seeing the updateDefinition call succeed but the names not being restored when I was doing this
+                // with a single call at the service endpoint. So now we are doing this sequentially.
+                const restoreItems = [...restoreNames.layers, ...restoreNames.tables];
+                restoreItems
+                    .reduce((prev, entry) => prev.then(() => {
+                    const restoreUpdate = {
+                        url: adminServiceUrl + entry.id + "/updateDefinition",
+                        params: { updateDefinition: { name: entry.name } },
+                        args: { authentication },
+                    };
+                    return getRequest(restoreUpdate, false, false, templateDictionary.isPortal);
+                }), Promise.resolve(null))
+                    .then(() => resolve(null), (e) => reject(fail(e)));
+            }, (e) => reject(fail(e)));
         }
     });
 }

package/dist/esm/restHelpers.d.ts

@@ -90,6 +90,28 @@ export declare function convertToISearchOptions(search: string | ISearchOptions
  * @private
  */
 export declare function _validateExtent(extent: IExtent): IExtent;
+/**
+ * The geometry service can resolve a projection request successfully but still
+ * return "NaN" coordinate values or no geometry at all. This check is used to
+ * decide whether a projected extent can be used for a service's initial and full
+ * extents.
+ *
+ * @param extent the extent to test
+ * @returns true if the extent has numeric xmin, ymin, xmax, and ymax values
+ * @private
+ */
+export declare function _extentIsValid(extent: any): boolean;
+/**
+ * Removes the templatized extent from a template's layers and tables.
+ *
+ * Used when the organization's default extent cannot be projected into the
+ * service's spatial reference so that the layers and tables are created without an
+ * extent rather than with an unresolved template variable.
+ *
+ * @param itemTemplate the template whose layer and table extents should be removed
+ * @private
+ */
+export declare function _removeLayerExtents(itemTemplate: IItemTemplate): void;
 /**
  * If the request to convert the extent fails it has commonly been due to an invalid extent.
  * This function will first attempt to use the provided extent. If it fails it will default to
@@ -107,7 +129,6 @@ export declare function _validateExtent(extent: IExtent): IExtent;
 export declare function convertExtentWithFallback(extent: IExtent, fallbackExtent: any, outSR: ISpatialReference, geometryServiceUrl: string, authentication: UserSession): Promise<any>;
 /**
  * Converts an extent to a specified spatial reference.
- *
  * @param extent Extent object to check and (possibly) to project
  * @param outSR Desired spatial reference
  * @param geometryServiceUrl Path to geometry service providing `findTransformations` and `project` services
@@ -528,6 +549,15 @@ export declare function _addItemMetadataFile(itemId: string, metadataFile: File,
  * @private
  */
 export declare function _countRelationships(layers: any[]): number;
+/**
+ * Remove spaces and replace other characters that are not allowed in a feature service name with "_".
+ * Spaces are removed entirely. Disallowed (replaced with "_"): '#', '%', '&', '"', '\', '/', '+', '?', ':', '*',
+ * '<', '>', '\t', '!', '@', "'", ';', ','
+ *
+ * @param name The candidate service name
+ * @returns The sanitized name, or the input unchanged if it is not a string
+ */
+export declare function sanitizeFeatureServiceName(name: string): string;
 /**
  * Gets the full definitions of the layers affiliated with a hosted service.
  *
@@ -538,19 +568,6 @@ export declare function _countRelationships(layers: any[]): number;
  * @private
  */
 export declare function _getCreateServiceOptions(newItemTemplate: IItemTemplate, authentication: UserSession, templateDictionary: any): Promise<any>;
-/**
- * When the services spatial reference does not match that of it's default extent
- * use the out SRs default extent if it exists in the templateDictionary
- * this should be set when adding a custom out wkid to the params before calling deploy
- * this will help avoid situations where the orgs default extent and default world extent
- * will not project successfully to the out SR
- *
- * @param serviceInfo the object that contains the spatial reference to evaluate
- * @param templateDictionary the template dictionary
- * @returns the extent to use as the fallback
- * @private
- */
-export declare function _getFallbackExtent(serviceInfo: any, templateDictionary: any): any;
 /**
  * Add relationships to all layers in one call to retain fully functioning composite relationships
  *

package/dist/esm/restHelpers.js

@@ -248,6 +248,36 @@ export function _validateExtent(extent) {
     }
     return extent;
 }
+/**
+ * The geometry service can resolve a projection request successfully but still
+ * return "NaN" coordinate values or no geometry at all. This check is used to
+ * decide whether a projected extent can be used for a service's initial and full
+ * extents.
+ *
+ * @param extent the extent to test
+ * @returns true if the extent has numeric xmin, ymin, xmax, and ymax values
+ * @private
+ */
+export function _extentIsValid(extent) {
+    return (!!extent &&
+        [extent.xmin, extent.ymin, extent.xmax, extent.ymax].every((coordinate) => typeof coordinate === "number" && !isNaN(coordinate)));
+}
+/**
+ * Removes the templatized extent from a template's layers and tables.
+ *
+ * Used when the organization's default extent cannot be projected into the
+ * service's spatial reference so that the layers and tables are created without an
+ * extent rather than with an unresolved template variable.
+ *
+ * @param itemTemplate the template whose layer and table extents should be removed
+ * @private
+ */
+export function _removeLayerExtents(itemTemplate) {
+    ["properties.layers", "properties.tables"].forEach((path) => {
+        const items = getProp(itemTemplate, path) || [];
+        items.forEach((item) => deleteProp(item, "extent"));
+    });
+}
 /**
  * If the request to convert the extent fails it has commonly been due to an invalid extent.
  * This function will first attempt to use the provided extent. If it fails it will default to
@@ -291,7 +321,6 @@ export function convertExtentWithFallback(extent, fallbackExtent, outSR, geometr
 }
 /**
  * Converts an extent to a specified spatial reference.
- *
  * @param extent Extent object to check and (possibly) to project
  * @param outSR Desired spatial reference
  * @param geometryServiceUrl Path to geometry service providing `findTransformations` and `project` services
@@ -1606,6 +1635,17 @@ export function _countRelationships(layers) {
     const reducer = (accumulator, currentLayer) => accumulator + (currentLayer.relationships ? currentLayer.relationships.length : 0);
     return layers.reduce(reducer, 0);
 }
+/**
+ * Remove spaces and replace other characters that are not allowed in a feature service name with "_".
+ * Spaces are removed entirely. Disallowed (replaced with "_"): '#', '%', '&', '"', '\', '/', '+', '?', ':', '*',
+ * '<', '>', '\t', '!', '@', "'", ';', ','
+ *
+ * @param name The candidate service name
+ * @returns The sanitized name, or the input unchanged if it is not a string
+ */
+export function sanitizeFeatureServiceName(name) {
+    return typeof name === "string" ? name.replace(/ /g, "").replace(/[#%&"\\/+?:*<>\t!@';,]/g, "_") : name;
+}
 /**
  * Gets the full definitions of the layers affiliated with a hosted service.
  *
@@ -1622,7 +1662,6 @@ export function _getCreateServiceOptions(newItemTemplate, authentication, templa
         const isPortal = templateDictionary.isPortal;
         const itemId = newItemTemplate.itemId;
         validateSpatialReferenceAndExtent(serviceInfo, newItemTemplate, templateDictionary);
-        const fallbackExtent = _getFallbackExtent(serviceInfo, templateDictionary);
         const params = {};
         const itemInfo = {
             title: newItemTemplate.item.title,
@@ -1641,12 +1680,23 @@ export function _getCreateServiceOptions(newItemTemplate, authentication, templa
         createOptions.item = !isTrackingViewTemplate(newItemTemplate)
             ? _setItemProperties(createOptions.item, newItemTemplate, serviceInfo, params, isPortal)
             : setTrackingOptions(newItemTemplate, createOptions, templateDictionary);
-        // project the portals extent to match that of the service
-        convertExtentWithFallback(templateDictionary.organization.defaultExtent, fallbackExtent, serviceInfo.service.spatialReference, templateDictionary.organization.helperServices.geometry.url, authentication).then((extent) => {
-            templateDictionary[itemId].solutionExtent = extent;
-            setDefaultSpatialReference(templateDictionary, itemId, extent.spatialReference);
+        convertExtent(_validateExtent(templateDictionary.organization.defaultExtent), serviceInfo.service.spatialReference, templateDictionary.organization.helperServices.geometry.url, authentication).then((extent) => {
+            if (_extentIsValid(extent)) {
+                templateDictionary[itemId].solutionExtent = extent;
+                setDefaultSpatialReference(templateDictionary, itemId, extent.spatialReference);
+            }
+            else {
+                // The org's default extent could not be projected into the service's spatial
+                // reference, so remove the templatized extent properties from the service and
+                // its layers and tables
+                deleteProp(createOptions.item, "initialExtent");
+                deleteProp(createOptions.item, "fullExtent");
+                _removeLayerExtents(newItemTemplate);
+                setDefaultSpatialReference(templateDictionary, itemId, serviceInfo.service.spatialReference);
+            }
             createOptions.item = replaceInTemplate(createOptions.item, templateDictionary);
             createOptions.params = replaceInTemplate(createOptions.params, templateDictionary);
+            createOptions.item.name = sanitizeFeatureServiceName(createOptions.item.name);
             if (newItemTemplate.item.thumbnail) {
                 // Pass thumbnail file in via params because item property is serialized, which discards a blob
                 createOptions.params.thumbnail = newItemTemplate.item.thumbnail;
@@ -1655,28 +1705,6 @@ export function _getCreateServiceOptions(newItemTemplate, authentication, templa
         }, (e) => reject(fail(e)));
     });
 }
-/**
- * When the services spatial reference does not match that of it's default extent
- * use the out SRs default extent if it exists in the templateDictionary
- * this should be set when adding a custom out wkid to the params before calling deploy
- * this will help avoid situations where the orgs default extent and default world extent
- * will not project successfully to the out SR
- *
- * @param serviceInfo the object that contains the spatial reference to evaluate
- * @param templateDictionary the template dictionary
- * @returns the extent to use as the fallback
- * @private
- */
-export function _getFallbackExtent(serviceInfo, templateDictionary) {
-    const serviceSR = serviceInfo.service.spatialReference;
-    const serviceInfoWkid = getProp(serviceInfo, "defaultExtent.spatialReference.wkid");
-    const customDefaultExtent = getProp(templateDictionary, "params.defaultExtent");
-    return serviceInfoWkid && serviceInfoWkid === serviceSR.wkid
-        ? serviceInfo.defaultExtent
-        : customDefaultExtent
-            ? customDefaultExtent
-            : serviceInfo.defaultExtent;
-}
 /**
  * Add relationships to all layers in one call to retain fully functioning composite relationships
  *

package/dist/solution.js_commit.txt

@@ -1,7 +1,7 @@
-Built 04/16/2026 20:42:37.89 
-develop
-commit ad1aae1d0c999d7078115e58cdc963cace80d4e3
-Author: Ryan Cosby <ryan9313@esri.com>
-Date:   Wed Apr 15 20:49:25 2026 -0700
+Built 06/26/2026  7:43:32.91 
+release/6.6.1
+commit f94cbc8e4708970fe65c1f8f17557e7f6586dc70
+Author: John Hauck <jhauck@esri.com>
+Date:   Fri Jun 26 08:32:57 2026 -0600
 
-    v6.6.1-next.8
+    update to 6.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esri/solution-common",
-  "version": "6.6.1-next.9",
+  "version": "6.6.2",
   "description": "Provides general helper functions for @esri/solution.js.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -96,5 +96,5 @@
     "esri",
     "ES6"
   ],
-  "gitHead": "ad1aae1d0c999d7078115e58cdc963cace80d4e3"
+  "gitHead": "e33947389af65e61226182808a06eccdb3adfd83"
 }