@esri/solution-creator 6.4.0-next.20250925 → 6.4.0-next.20250926

package/dist/cjs/helpers/add-content-to-solution.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ICreateSolutionOptions, IItemTemplate, TPossibleSourceFile, UserSession } from "@esri/solution-common";
+import { ICreateSolutionOptions, IItemTemplate, TPossibleSourceFile, ISourceFile, UserSession } from "@esri/solution-common";
 /**
  * Adds a list of AGO item ids to a solution item.
  *
@@ -65,6 +65,18 @@ export declare function _getSolutionItemUrls(templates: IItemTemplate[]): string
  * @private
  */
 export declare function _getTemplateVariables(text: string): string[];
+/**
+ * Update the tasks-configuration resource file if it exists
+ *
+ * @param templates List of Solution's templates
+ * @param resourceItemFiles Resources for the item; these resources are modified as needed
+ * @param templateDictionary templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ * @param srcAuthentication Credentials for requests to source items
+ *
+ * @returns A promise that resolves with the resource files
+ * @internal
+ */
+export declare function _postProcessTaskResource(templates: IItemTemplate[], resourceItemFiles: ISourceFile[], templateDictionary: any, srcAuthentication: UserSession): Promise<ISourceFile[]>;
 /**
  * Update the items dependencies and groups arrays
  *

package/dist/cjs/helpers/add-content-to-solution.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._templatizeWorkflowConfig = exports._templatizeSolutionIds = exports._templatizeOrgUrl = exports._simplifyUrlsInItemDescriptions = exports._restoreDataFilesToTemplates = exports._replaceRemainingIdsInString = exports._replaceRemainingIdsInObject = exports._replaceDictionaryItemsInObject = exports._getDataFilesFromTemplates = exports._postProcessIgnoredItems = exports._postProcessGroupDependencies = exports._getTemplateVariables = exports._getSolutionItemUrls = exports._getOrgUrl = exports._getIdsOutOfTemplateVariables = exports._getDependencies = exports.addContentToSolution = void 0;
+exports._templatizeWorkflowConfig = exports._templatizeSolutionIds = exports._templatizeOrgUrl = exports._simplifyUrlsInItemDescriptions = exports._restoreDataFilesToTemplates = exports._replaceRemainingIdsInString = exports._replaceRemainingIdsInObject = exports._replaceDictionaryItemsInObject = exports._getDataFilesFromTemplates = exports._postProcessIgnoredItems = exports._postProcessGroupDependencies = exports._postProcessTaskResource = exports._getTemplateVariables = exports._getSolutionItemUrls = exports._getOrgUrl = exports._getIdsOutOfTemplateVariables = exports._getDependencies = exports.addContentToSolution = void 0;
 const tslib_1 = require("tslib");
 const solution_common_1 = require("@esri/solution-common");
 const hub_common_1 = require("@esri/hub-common");
@@ -133,6 +133,7 @@ function addContentToSolution(solutionItemId, options, srcAuthentication, destAu
                     resourceItemFiles = resourceItemFiles.concat((0, template_1.getDataFilesFromTemplates)(solutionTemplates));
                     // Coalesce the resource file paths from the created templates
                     resourceItemFiles = resourceItemFiles.filter((file) => templateIds.includes(file.itemId));
+                    resourceItemFiles = await _postProcessTaskResource(solutionTemplates, resourceItemFiles, templateDictionary, srcAuthentication);
                     // Send the accumulated resources to the solution item
                     // eslint-disable-next-line @typescript-eslint/no-floating-promises
                     (0, solution_common_1.copyFilesToStorageItem)(resourceItemFiles, solutionItemId, destAuthentication).then(() => {
@@ -269,6 +270,116 @@ function _getTemplateVariables(text) {
         .map((variable) => variable.substring(2, variable.length - 2)); // remove "{{" & "}}"
 }
 exports._getTemplateVariables = _getTemplateVariables;
+/**
+ * Update the tasks-configuration resource file if it exists
+ *
+ * @param templates List of Solution's templates
+ * @param resourceItemFiles Resources for the item; these resources are modified as needed
+ * @param templateDictionary templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ * @param srcAuthentication Credentials for requests to source items
+ *
+ * @returns A promise that resolves with the resource files
+ * @internal
+ */
+async function _postProcessTaskResource(templates, resourceItemFiles, templateDictionary, srcAuthentication) {
+    const taskConfigName = solution_common_1.TASK_CONFIG;
+    const taskResources = resourceItemFiles.reduce((prev, cur) => {
+        if (cur.filename === taskConfigName) {
+            prev[cur.itemId] = cur;
+        }
+        return prev;
+    }, {});
+    const taskKeys = Object.keys(taskResources);
+    if (taskKeys.length < 1) {
+        return Promise.resolve(resourceItemFiles);
+    }
+    const itemIds = templates.reduce((prev, cur) => {
+        // key is the source id and the value is the variable
+        // example { "31980e6ad7xxxc60b756e712b69d1344": "{{31980e6ad7xxxc60b756e712b69d1344.itemId}}" }
+        prev[cur.itemId] = cur.item.id;
+        return prev;
+    }, {});
+    const featureServiceWithLayerUrls = [];
+    const featureServerUrls = [];
+    const otherUrls = [];
+    // we want to first process feature service urls that conain a layer number, then general feature service urls then all other urls, finally the portal base url
+    let arrayToUse;
+    const urlVarHash = Object.keys(templateDictionary).reduce((prev, cur) => {
+        if (cur.indexOf("http://") > -1 || cur.indexOf("https://") > -1) {
+            // key is the source url and the value is the variable
+            // example { "http://example": "{{31980e6ad7xxxc60b756e712b69d1344.url}}" }
+            const encoded = encodeURIComponent(cur);
+            prev[cur] = templateDictionary[cur];
+            prev[encoded] = templateDictionary[cur].replace("}}", ":encode}}");
+            arrayToUse = /FeatureServer\/\d+/g.test(cur)
+                ? featureServiceWithLayerUrls
+                : cur.endsWith("FeatureServer")
+                    ? featureServerUrls
+                    : otherUrls;
+            // sorted
+            arrayToUse.push(cur);
+            arrayToUse.push(encoded);
+        }
+        return prev;
+    }, {});
+    // Add the portal base urls at the end so we will search for them last
+    // and not accidentially replace part of a service url
+    const portalBaseUrl = templateDictionary.portalBaseUrl;
+    const encodedPortalBaseUrl = encodeURIComponent(portalBaseUrl);
+    urlVarHash[portalBaseUrl] = "{{portalBaseUrl}}";
+    urlVarHash[encodedPortalBaseUrl] = "{{portalBaseUrl:encode}}";
+    const orderedUrls = [...featureServiceWithLayerUrls, ...featureServerUrls, ...otherUrls];
+    orderedUrls.push(portalBaseUrl);
+    orderedUrls.push(encodedPortalBaseUrl);
+    const requestOptions = {
+        httpMethod: "GET",
+        authentication: srcAuthentication,
+        params: {
+            f: "json",
+        },
+        headers: {
+            "Accept": "application/json",
+            "Authorization": `Bearer ${srcAuthentication.token}`,
+            "Content-Type": "application/json",
+            "X-Esri-Authorization": `Bearer ${srcAuthentication.token}`,
+        },
+    };
+    const resourcePromises = taskKeys.map((k) => {
+        return (0, solution_common_1.request)((0, solution_common_1.generateSourceResourceUrl)(`${templateDictionary.portalBaseUrl}/sharing/rest`, taskResources[k].itemId, taskResources[k].filename), requestOptions);
+    });
+    await Promise.all(resourcePromises).then(async (r) => {
+        let resourceString = JSON.stringify(r);
+        // replace urls first
+        orderedUrls.forEach((url) => {
+            // TypeScript for es2015 doesn't have a definition for `replaceAll`
+            resourceString = resourceString.replaceAll(url, urlVarHash[url]);
+        });
+        // replace any item ids that aren't already variables
+        Object.keys(itemIds).forEach((k) => {
+            let pattern = new RegExp(`(?<!\\{\\{)${k}`, "g");
+            // TypeScript for es2015 doesn't have a definition for `replaceAll`
+            resourceString = resourceString.replaceAll(pattern, itemIds[k]);
+        });
+        // all urls and item ids should now be replaced with variables that contain the item ids
+        // we need to add any ids that are not currently marked as dependencies to the webmap dependencies and update the resource
+        const ids = (0, solution_common_1.uniqueStringList)(resourceString.match((0, solution_common_1.getAgoIdRegEx)()));
+        resourceItemFiles = resourceItemFiles.map((file) => {
+            if (file.filename === taskConfigName) {
+                file.file = (0, solution_common_1.jsonToFile)(JSON.parse(resourceString), file.filename);
+                // add any ids that we found to the source webmap
+                templates.some((t) => {
+                    if (t.itemId === file.itemId) {
+                        t.dependencies = [...new Set([...t.dependencies, ...ids])];
+                        return true;
+                    }
+                });
+            }
+            return file;
+        });
+    });
+    return Promise.resolve(resourceItemFiles);
+}
+exports._postProcessTaskResource = _postProcessTaskResource;
 /**
  * Update the items dependencies and groups arrays
  *

package/dist/esm/helpers/add-content-to-solution.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ICreateSolutionOptions, IItemTemplate, TPossibleSourceFile, UserSession } from "@esri/solution-common";
+import { ICreateSolutionOptions, IItemTemplate, TPossibleSourceFile, ISourceFile, UserSession } from "@esri/solution-common";
 /**
  * Adds a list of AGO item ids to a solution item.
  *
@@ -65,6 +65,18 @@ export declare function _getSolutionItemUrls(templates: IItemTemplate[]): string
  * @private
  */
 export declare function _getTemplateVariables(text: string): string[];
+/**
+ * Update the tasks-configuration resource file if it exists
+ *
+ * @param templates List of Solution's templates
+ * @param resourceItemFiles Resources for the item; these resources are modified as needed
+ * @param templateDictionary templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ * @param srcAuthentication Credentials for requests to source items
+ *
+ * @returns A promise that resolves with the resource files
+ * @internal
+ */
+export declare function _postProcessTaskResource(templates: IItemTemplate[], resourceItemFiles: ISourceFile[], templateDictionary: any, srcAuthentication: UserSession): Promise<ISourceFile[]>;
 /**
  * Update the items dependencies and groups arrays
  *

package/dist/esm/helpers/add-content-to-solution.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SolutionTemplateFormatVersion, EItemProgressStatus, dedupe, failWithIds, getAgoIdRegEx, getIDs, getPortal, getTemplateById, globalStringReplace, isWorkforceProject, removeTemplate, replaceInTemplate, SItemProgressStatus, copyFilesToStorageItem, postProcessWebToolReferences, postProcessWorkforceTemplates, UNREACHABLE, updateItem, } from "@esri/solution-common";
+import { SolutionTemplateFormatVersion, EItemProgressStatus, dedupe, failWithIds, getAgoIdRegEx, getIDs, getPortal, getTemplateById, globalStringReplace, isWorkforceProject, generateSourceResourceUrl, jsonToFile, removeTemplate, replaceInTemplate, request, SItemProgressStatus, copyFilesToStorageItem, postProcessWebToolReferences, postProcessWorkforceTemplates, TASK_CONFIG, uniqueStringList, UNREACHABLE, updateItem, } from "@esri/solution-common";
 import { getProp, getWithDefault } from "@esri/hub-common";
 import { createItemTemplate, postProcessFieldReferences } from "../createItemTemplate";
 import * as form from "@esri/solution-form";
@@ -129,6 +129,7 @@ export function addContentToSolution(solutionItemId, options, srcAuthentication,
                     resourceItemFiles = resourceItemFiles.concat(getDataFilesFromTemplates(solutionTemplates));
                     // Coalesce the resource file paths from the created templates
                     resourceItemFiles = resourceItemFiles.filter((file) => templateIds.includes(file.itemId));
+                    resourceItemFiles = await _postProcessTaskResource(solutionTemplates, resourceItemFiles, templateDictionary, srcAuthentication);
                     // Send the accumulated resources to the solution item
                     // eslint-disable-next-line @typescript-eslint/no-floating-promises
                     copyFilesToStorageItem(resourceItemFiles, solutionItemId, destAuthentication).then(() => {
@@ -259,6 +260,115 @@ export function _getTemplateVariables(text) {
     return (text.match(/{{[a-z0-9.]*}}/gi) || []) // find variable
         .map((variable) => variable.substring(2, variable.length - 2)); // remove "{{" & "}}"
 }
+/**
+ * Update the tasks-configuration resource file if it exists
+ *
+ * @param templates List of Solution's templates
+ * @param resourceItemFiles Resources for the item; these resources are modified as needed
+ * @param templateDictionary templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ * @param srcAuthentication Credentials for requests to source items
+ *
+ * @returns A promise that resolves with the resource files
+ * @internal
+ */
+export async function _postProcessTaskResource(templates, resourceItemFiles, templateDictionary, srcAuthentication) {
+    const taskConfigName = TASK_CONFIG;
+    const taskResources = resourceItemFiles.reduce((prev, cur) => {
+        if (cur.filename === taskConfigName) {
+            prev[cur.itemId] = cur;
+        }
+        return prev;
+    }, {});
+    const taskKeys = Object.keys(taskResources);
+    if (taskKeys.length < 1) {
+        return Promise.resolve(resourceItemFiles);
+    }
+    const itemIds = templates.reduce((prev, cur) => {
+        // key is the source id and the value is the variable
+        // example { "31980e6ad7xxxc60b756e712b69d1344": "{{31980e6ad7xxxc60b756e712b69d1344.itemId}}" }
+        prev[cur.itemId] = cur.item.id;
+        return prev;
+    }, {});
+    const featureServiceWithLayerUrls = [];
+    const featureServerUrls = [];
+    const otherUrls = [];
+    // we want to first process feature service urls that conain a layer number, then general feature service urls then all other urls, finally the portal base url
+    let arrayToUse;
+    const urlVarHash = Object.keys(templateDictionary).reduce((prev, cur) => {
+        if (cur.indexOf("http://") > -1 || cur.indexOf("https://") > -1) {
+            // key is the source url and the value is the variable
+            // example { "http://example": "{{31980e6ad7xxxc60b756e712b69d1344.url}}" }
+            const encoded = encodeURIComponent(cur);
+            prev[cur] = templateDictionary[cur];
+            prev[encoded] = templateDictionary[cur].replace("}}", ":encode}}");
+            arrayToUse = /FeatureServer\/\d+/g.test(cur)
+                ? featureServiceWithLayerUrls
+                : cur.endsWith("FeatureServer")
+                    ? featureServerUrls
+                    : otherUrls;
+            // sorted
+            arrayToUse.push(cur);
+            arrayToUse.push(encoded);
+        }
+        return prev;
+    }, {});
+    // Add the portal base urls at the end so we will search for them last
+    // and not accidentially replace part of a service url
+    const portalBaseUrl = templateDictionary.portalBaseUrl;
+    const encodedPortalBaseUrl = encodeURIComponent(portalBaseUrl);
+    urlVarHash[portalBaseUrl] = "{{portalBaseUrl}}";
+    urlVarHash[encodedPortalBaseUrl] = "{{portalBaseUrl:encode}}";
+    const orderedUrls = [...featureServiceWithLayerUrls, ...featureServerUrls, ...otherUrls];
+    orderedUrls.push(portalBaseUrl);
+    orderedUrls.push(encodedPortalBaseUrl);
+    const requestOptions = {
+        httpMethod: "GET",
+        authentication: srcAuthentication,
+        params: {
+            f: "json",
+        },
+        headers: {
+            "Accept": "application/json",
+            "Authorization": `Bearer ${srcAuthentication.token}`,
+            "Content-Type": "application/json",
+            "X-Esri-Authorization": `Bearer ${srcAuthentication.token}`,
+        },
+    };
+    const resourcePromises = taskKeys.map((k) => {
+        return request(generateSourceResourceUrl(`${templateDictionary.portalBaseUrl}/sharing/rest`, taskResources[k].itemId, taskResources[k].filename), requestOptions);
+    });
+    await Promise.all(resourcePromises).then(async (r) => {
+        let resourceString = JSON.stringify(r);
+        // replace urls first
+        orderedUrls.forEach((url) => {
+            // TypeScript for es2015 doesn't have a definition for `replaceAll`
+            resourceString = resourceString.replaceAll(url, urlVarHash[url]);
+        });
+        // replace any item ids that aren't already variables
+        Object.keys(itemIds).forEach((k) => {
+            let pattern = new RegExp(`(?<!\\{\\{)${k}`, "g");
+            // TypeScript for es2015 doesn't have a definition for `replaceAll`
+            resourceString = resourceString.replaceAll(pattern, itemIds[k]);
+        });
+        // all urls and item ids should now be replaced with variables that contain the item ids
+        // we need to add any ids that are not currently marked as dependencies to the webmap dependencies and update the resource
+        const ids = uniqueStringList(resourceString.match(getAgoIdRegEx()));
+        resourceItemFiles = resourceItemFiles.map((file) => {
+            if (file.filename === taskConfigName) {
+                file.file = jsonToFile(JSON.parse(resourceString), file.filename);
+                // add any ids that we found to the source webmap
+                templates.some((t) => {
+                    if (t.itemId === file.itemId) {
+                        t.dependencies = [...new Set([...t.dependencies, ...ids])];
+                        return true;
+                    }
+                });
+            }
+            return file;
+        });
+    });
+    return Promise.resolve(resourceItemFiles);
+}
 /**
  * Update the items dependencies and groups arrays
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esri/solution-creator",
-  "version": "6.4.0-next.20250925",
+  "version": "6.4.0-next.20250926",
   "description": "Manages the creation of a Solution item for @esri/solution.js.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -25,18 +25,18 @@
   },
   "dependencies": {
     "@esri/hub-common": "^17.0.2",
-    "@esri/solution-common": "^6.4.0-next.20250925",
-    "@esri/solution-feature-layer": "^6.4.0-next.20250925",
-    "@esri/solution-file": "^6.4.0-next.20250925",
-    "@esri/solution-form": "^6.4.0-next.20250925",
-    "@esri/solution-group": "^6.4.0-next.20250925",
-    "@esri/solution-hub-types": "^6.4.0-next.20250925",
-    "@esri/solution-simple-types": "^6.4.0-next.20250925",
-    "@esri/solution-storymap": "^6.4.0-next.20250925",
-    "@esri/solution-velocity": "^6.4.0-next.20250925",
-    "@esri/solution-web-experience": "^6.4.0-next.20250925",
-    "@esri/solution-web-tool": "^6.4.0-next.20250925",
-    "@esri/solution-workflow": "^6.4.0-next.20250925",
+    "@esri/solution-common": "^6.4.0-next.20250926",
+    "@esri/solution-feature-layer": "^6.4.0-next.20250926",
+    "@esri/solution-file": "^6.4.0-next.20250926",
+    "@esri/solution-form": "^6.4.0-next.20250926",
+    "@esri/solution-group": "^6.4.0-next.20250926",
+    "@esri/solution-hub-types": "^6.4.0-next.20250926",
+    "@esri/solution-simple-types": "^6.4.0-next.20250926",
+    "@esri/solution-storymap": "^6.4.0-next.20250926",
+    "@esri/solution-velocity": "^6.4.0-next.20250926",
+    "@esri/solution-web-experience": "^6.4.0-next.20250926",
+    "@esri/solution-web-tool": "^6.4.0-next.20250926",
+    "@esri/solution-workflow": "^6.4.0-next.20250926",
     "tslib": "1.14.1"
   },
   "scripts": {
@@ -91,5 +91,5 @@
     "esri",
     "ES6"
   ],
-  "gitHead": "0092f8c76afb3b4d94d2a89353313a3b42cf2d77"
+  "gitHead": "f8b6ad1803cd5c2f67b317b6ea7390dad77ada61"
 }