@esri/solution-common 5.6.4 → 5.6.6

package/dist/cjs/index.d.ts

@@ -43,6 +43,7 @@ export * from "./sharing";
 export * from "./templatization";
 export * from "./trackingHelpers";
 export * from "./velocityHelpers";
+export * from "./webtoolHelpers";
 export * from "./workflowHelpers";
 export * from "./workforceHelpers";
 export * from "./zip-utils";

package/dist/cjs/index.js

@@ -46,6 +46,7 @@ tslib_1.__exportStar(require("./sharing"), exports);
 tslib_1.__exportStar(require("./templatization"), exports);
 tslib_1.__exportStar(require("./trackingHelpers"), exports);
 tslib_1.__exportStar(require("./velocityHelpers"), exports);
+tslib_1.__exportStar(require("./webtoolHelpers"), exports);
 tslib_1.__exportStar(require("./workflowHelpers"), exports);
 tslib_1.__exportStar(require("./workforceHelpers"), exports);
 tslib_1.__exportStar(require("./zip-utils"), exports);

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH;;;;GAIG;AAEH,yDAA+B;AAC/B,yDAA+B;AAC/B,uEAA6C;AAC7C,0DAAgC;AAChC,2DAAiC;AACjC,yDAA+B;AAC/B,kEAAwC;AACxC,wDAA8B;AAC9B,2DAAiC;AACjC,qEAA2C;AAC3C,8DAAoC;AACpC,+DAAqC;AACrC,kEAAwC;AACxC,uDAA6B;AAC7B,uDAA6B;AAC7B,0DAAgC;AAChC,qDAA2B;AAC3B,4DAAkC;AAClC,sDAA4B;AAC5B,wDAA8B;AAC9B,2DAAiC;AACjC,oDAA0B;AAC1B,2DAAiC;AACjC,4DAAkC;AAClC,4DAAkC;AAClC,4DAAkC;AAClC,6DAAmC;AACnC,sDAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH;;;;GAIG;AAEH,yDAA+B;AAC/B,yDAA+B;AAC/B,uEAA6C;AAC7C,0DAAgC;AAChC,2DAAiC;AACjC,yDAA+B;AAC/B,kEAAwC;AACxC,wDAA8B;AAC9B,2DAAiC;AACjC,qEAA2C;AAC3C,8DAAoC;AACpC,+DAAqC;AACrC,kEAAwC;AACxC,uDAA6B;AAC7B,uDAA6B;AAC7B,0DAAgC;AAChC,qDAA2B;AAC3B,4DAAkC;AAClC,sDAA4B;AAC5B,wDAA8B;AAC9B,2DAAiC;AACjC,oDAA0B;AAC1B,2DAAiC;AACjC,4DAAkC;AAClC,4DAAkC;AAClC,2DAAiC;AACjC,4DAAkC;AAClC,6DAAmC;AACnC,sDAA4B"}

package/dist/cjs/resources/getItemResourcesPaths.js

@@ -65,10 +65,6 @@ function getItemResourcesPaths(itemTemplate, solutionItemId, authentication, sto
                     result = false;
                 }
             }
-            // GP Services
-            if (itemTemplate.type === "Geoprocessing Service") {
-                return res.indexOf("webtoolDefinition") > -1 || res.indexOf(".json") < 0;
-            }
             return result;
         });
         // create the filePaths

package/dist/cjs/resources/getItemResourcesPaths.js.map

@@ -1 +1 @@
-{"version":3,"file":"getItemResourcesPaths.js","sourceRoot":"","sources":["../../../src/resources/getItemResourcesPaths.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,sDAAqD;AACrD,wDAA6D;AAG7D,wHAAwH;AAExH;;;;;;;;GAQG;AACH,SAAgB,qBAAqB,CACnC,YAA2B,EAC3B,cAAsB,EACtB,cAA2B,EAC3B,cAAc,GAAG,CAAC;IAElB,iCAAiC;IACjC,OAAO,IAAA,iCAAgB,EAAC,YAAY,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,gBAAgB,EAAE,EAAE;QACrF,sDAAsD;QACtD,sCAAsC;QACtC,MAAM,aAAa,GAAG,gBAAgB,CAAC,SAAS;aAC7C,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;aAC3B,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE;YACnB,IAAI,MAAM,GAAG,IAAI,CAAC;YAClB,mFAAmF;YACnF,2EAA2E;YAC3E,0EAA0E;YAC1E,iCAAiC;YAEjC,YAAY;YACZ,IAAI,YAAY,CAAC,IAAI,KAAK,sBAAsB,EAAE;gBAChD,IAAI,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;oBACnC,MAAM,GAAG,KAAK,CAAC;iBAChB;aACF;YAED,YAAY;YACZ,IAAI,YAAY,CAAC,IAAI,KAAK,UAAU,EAAE;gBACpC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;oBACrD,MAAM,GAAG,KAAK,CAAC;iBAChB;gBACD,IAAI,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE;oBACrC,MAAM,GAAG,KAAK,CAAC;iBAChB;gBACD,IAAI,GAAG,KAAK,qBAAqB,EAAE;oBACjC,MAAM,GAAG,KAAK,CAAC;iBAChB;aACF;YAED,kBAAkB;YAClB,IAAI,YAAY,CAAC,IAAI,KAAK,gBAAgB,EAAE;gBAC1C,IAAI,GAAG,KAAK,oBAAoB,EAAE;oBAChC,MAAM,GAAG,KAAK,CAAC;iBAChB;aACF;YAED,cAAc;YACd,IAAI,YAAY,CAAC,IAAI,KAAK,uBAAuB,EAAE;gBACjD,OAAO,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;aAC1E;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;QACL,uBAAuB;QACvB,MAAM,qBAAqB,GAA0B,IAAA,yCAAuB,EAC1E,cAAc,CAAC,MAAM,EACrB,YAAY,CAAC,MAAM,EACnB,YAAY,CAAC,IAAI,CAAC,SAAS,EAC3B,aAAa,EACb,YAAY,CAAC,IAAI,KAAK,OAAO,EAC7B,cAAc,CACf,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC;AA/DD,sDA+DC"}
+{"version":3,"file":"getItemResourcesPaths.js","sourceRoot":"","sources":["../../../src/resources/getItemResourcesPaths.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,sDAAqD;AACrD,wDAA6D;AAG7D,wHAAwH;AAExH;;;;;;;;GAQG;AACH,SAAgB,qBAAqB,CACnC,YAA2B,EAC3B,cAAsB,EACtB,cAA2B,EAC3B,cAAc,GAAG,CAAC;IAElB,iCAAiC;IACjC,OAAO,IAAA,iCAAgB,EAAC,YAAY,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,gBAAgB,EAAE,EAAE;QACrF,sDAAsD;QACtD,sCAAsC;QACtC,MAAM,aAAa,GAAG,gBAAgB,CAAC,SAAS;aAC7C,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;aAC3B,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE;YACnB,IAAI,MAAM,GAAG,IAAI,CAAC;YAClB,mFAAmF;YACnF,2EAA2E;YAC3E,0EAA0E;YAC1E,iCAAiC;YAEjC,YAAY;YACZ,IAAI,YAAY,CAAC,IAAI,KAAK,sBAAsB,EAAE;gBAChD,IAAI,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;oBACnC,MAAM,GAAG,KAAK,CAAC;iBAChB;aACF;YAED,YAAY;YACZ,IAAI,YAAY,CAAC,IAAI,KAAK,UAAU,EAAE;gBACpC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;oBACrD,MAAM,GAAG,KAAK,CAAC;iBAChB;gBACD,IAAI,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE;oBACrC,MAAM,GAAG,KAAK,CAAC;iBAChB;gBACD,IAAI,GAAG,KAAK,qBAAqB,EAAE;oBACjC,MAAM,GAAG,KAAK,CAAC;iBAChB;aACF;YAED,kBAAkB;YAClB,IAAI,YAAY,CAAC,IAAI,KAAK,gBAAgB,EAAE;gBAC1C,IAAI,GAAG,KAAK,oBAAoB,EAAE;oBAChC,MAAM,GAAG,KAAK,CAAC;iBAChB;aACF;YAED,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;QACL,uBAAuB;QACvB,MAAM,qBAAqB,GAA0B,IAAA,yCAAuB,EAC1E,cAAc,CAAC,MAAM,EACrB,YAAY,CAAC,MAAM,EACnB,YAAY,CAAC,IAAI,CAAC,SAAS,EAC3B,aAAa,EACb,YAAY,CAAC,IAAI,KAAK,OAAO,EAC7B,cAAc,CACf,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC;AA3DD,sDA2DC"}

package/dist/cjs/webtoolHelpers.d.ts

@@ -0,0 +1,57 @@
+/** @license
+ * Copyright 2024 Esri
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { IItemTemplate } from "./interfaces";
+/**
+ * Store any web tool urls in the templateDictionary so we can use them to search other items
+ * after they have been converted to templates
+ *
+ * @param template the current template
+ * @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ *
+ */
+export declare function preProcessWebTool(template: IItemTemplate, templateDictionary: any): void;
+/**
+ * Use any stored GPServer urls to search all other templates for potential references
+ * This will allow us to replace the base server name as will as the itemId
+ *
+ * @param templates the list of all the templates in the solution
+ * @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ *
+ * @returns potentially updated list of all the templates in the solution
+ */
+export declare function postProcessWebToolReferences(templates: IItemTemplate[], templateDictionary: any): IItemTemplate[];
+/**
+ * Use any stored GPServer urls to search all other templates for potential references
+ * This will allow us to replace the base server name as will as the itemId
+ *
+ * @param templates the list of all the templates in the solution
+ * @param orgUrl the item url of the GPServer
+ * @param templatizedUrl the templatized GPServer Url
+ * @param orgItemId the item id of the GPServer
+ *
+ * @returns potentially updated list of all the templates in the solution
+ */
+export declare function _globalTemplatize(templates: IItemTemplate[], orgUrl: string, templatizedUrl: string, orgItemId: string): IItemTemplate[];
+/**
+ * Update the templates dependencies if we can detect differences after we try and replace a GPServer url
+ *
+ * @param template the current template
+ * @param itemString stringified version of the the templates item before we replaced anything
+ * @param dataString stringified version of the the templates data before we replaced anything
+ * @param id the current item Id of the GPServer
+ *
+ */
+export declare function _updateDependencies(template: IItemTemplate, itemString: string, dataString: string, id: string): void;

package/dist/cjs/webtoolHelpers.js

@@ -0,0 +1,102 @@
+"use strict";
+/** @license
+ * Copyright 2024 Esri
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._updateDependencies = exports._globalTemplatize = exports.postProcessWebToolReferences = exports.preProcessWebTool = void 0;
+const generalHelpers_1 = require("./generalHelpers");
+/**
+ * Store any web tool urls in the templateDictionary so we can use them to search other items
+ * after they have been converted to templates
+ *
+ * @param template the current template
+ * @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ *
+ */
+function preProcessWebTool(template, templateDictionary) {
+    if (template.type === "Geoprocessing Service") {
+        const url = template.item.origUrl;
+        const urlVar = `{{${template.itemId}.url}}`;
+        templateDictionary[url] = urlVar;
+    }
+}
+exports.preProcessWebTool = preProcessWebTool;
+/**
+ * Use any stored GPServer urls to search all other templates for potential references
+ * This will allow us to replace the base server name as will as the itemId
+ *
+ * @param templates the list of all the templates in the solution
+ * @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ *
+ * @returns potentially updated list of all the templates in the solution
+ */
+function postProcessWebToolReferences(templates, templateDictionary) {
+    const gpServerUrls = Object.keys(templateDictionary).filter((k) => k.indexOf("GPServer") > -1);
+    if (gpServerUrls.length > 0) {
+        gpServerUrls.forEach((url) => {
+            const itemId = templateDictionary[url].replace("{{", "").replace(".url}}", "");
+            _globalTemplatize(templates, url, templateDictionary[url], itemId);
+            // handle items that already have a templatized itemId in the url
+            const idTest = /[0-9A-F]{32}/gim;
+            const templatizedUrl = url.replace(idTest, `{{${itemId}.itemId}}`);
+            _globalTemplatize(templates, templatizedUrl, templateDictionary[url], itemId);
+        });
+    }
+    return templates;
+}
+exports.postProcessWebToolReferences = postProcessWebToolReferences;
+/**
+ * Use any stored GPServer urls to search all other templates for potential references
+ * This will allow us to replace the base server name as will as the itemId
+ *
+ * @param templates the list of all the templates in the solution
+ * @param orgUrl the item url of the GPServer
+ * @param templatizedUrl the templatized GPServer Url
+ * @param orgItemId the item id of the GPServer
+ *
+ * @returns potentially updated list of all the templates in the solution
+ */
+function _globalTemplatize(templates, orgUrl, templatizedUrl, orgItemId) {
+    // Cycle through each of the items in the template and scan the `item` and `data` sections of each for replacements
+    templates.forEach((template) => {
+        const itemString = JSON.stringify(template.item);
+        const dataString = JSON.stringify(template.data);
+        (0, generalHelpers_1.globalStringReplace)(template.item, new RegExp(orgUrl, "gi"), templatizedUrl);
+        (0, generalHelpers_1.globalStringReplace)(template.data, new RegExp(orgUrl, "gi"), templatizedUrl);
+        _updateDependencies(template, itemString, dataString, orgItemId);
+    });
+    return templates;
+}
+exports._globalTemplatize = _globalTemplatize;
+/**
+ * Update the templates dependencies if we can detect differences after we try and replace a GPServer url
+ *
+ * @param template the current template
+ * @param itemString stringified version of the the templates item before we replaced anything
+ * @param dataString stringified version of the the templates data before we replaced anything
+ * @param id the current item Id of the GPServer
+ *
+ */
+function _updateDependencies(template, itemString, dataString, id) {
+    const hasItemDepdendency = template.dependencies.indexOf(id) > -1;
+    if (itemString && itemString !== JSON.stringify(template.item) && !hasItemDepdendency) {
+        template.dependencies.push(id);
+    }
+    if (dataString && dataString !== JSON.stringify(template.data) && !hasItemDepdendency) {
+        template.dependencies.push(id);
+    }
+}
+exports._updateDependencies = _updateDependencies;
+//# sourceMappingURL=webtoolHelpers.js.map

package/dist/cjs/webtoolHelpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webtoolHelpers.js","sourceRoot":"","sources":["../../src/webtoolHelpers.ts"],"names":[],"mappings":"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"}

package/dist/esm/index.d.ts

@@ -43,6 +43,7 @@ export * from "./sharing";
 export * from "./templatization";
 export * from "./trackingHelpers";
 export * from "./velocityHelpers";
+export * from "./webtoolHelpers";
 export * from "./workflowHelpers";
 export * from "./workforceHelpers";
 export * from "./zip-utils";

package/dist/esm/index.js

@@ -43,6 +43,7 @@ export * from "./sharing";
 export * from "./templatization";
 export * from "./trackingHelpers";
 export * from "./velocityHelpers";
+export * from "./webtoolHelpers";
 export * from "./workflowHelpers";
 export * from "./workforceHelpers";
 export * from "./zip-utils";

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;GAIG;AAEH,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;GAIG;AAEH,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC"}

package/dist/esm/resources/getItemResourcesPaths.js

@@ -62,10 +62,6 @@ export function getItemResourcesPaths(itemTemplate, solutionItemId, authenticati
                     result = false;
                 }
             }
-            // GP Services
-            if (itemTemplate.type === "Geoprocessing Service") {
-                return res.indexOf("webtoolDefinition") > -1 || res.indexOf(".json") < 0;
-            }
             return result;
         });
         // create the filePaths

package/dist/esm/resources/getItemResourcesPaths.js.map

@@ -1 +1 @@
-{"version":3,"file":"getItemResourcesPaths.js","sourceRoot":"","sources":["../../../src/resources/getItemResourcesPaths.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,wHAAwH;AAExH;;;;;;;;GAQG;AACH,MAAM,UAAU,qBAAqB,CACnC,YAA2B,EAC3B,cAAsB,EACtB,cAA2B,EAC3B,cAAc,GAAG,CAAC;IAElB,iCAAiC;IACjC,OAAO,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,gBAAgB,EAAE,EAAE;QACrF,sDAAsD;QACtD,sCAAsC;QACtC,MAAM,aAAa,GAAG,gBAAgB,CAAC,SAAS;aAC7C,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;aAC3B,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE;YACnB,IAAI,MAAM,GAAG,IAAI,CAAC;YAClB,mFAAmF;YACnF,2EAA2E;YAC3E,0EAA0E;YAC1E,iCAAiC;YAEjC,YAAY;YACZ,IAAI,YAAY,CAAC,IAAI,KAAK,sBAAsB,EAAE;gBAChD,IAAI,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;oBACnC,MAAM,GAAG,KAAK,CAAC;iBAChB;aACF;YAED,YAAY;YACZ,IAAI,YAAY,CAAC,IAAI,KAAK,UAAU,EAAE;gBACpC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;oBACrD,MAAM,GAAG,KAAK,CAAC;iBAChB;gBACD,IAAI,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE;oBACrC,MAAM,GAAG,KAAK,CAAC;iBAChB;gBACD,IAAI,GAAG,KAAK,qBAAqB,EAAE;oBACjC,MAAM,GAAG,KAAK,CAAC;iBAChB;aACF;YAED,kBAAkB;YAClB,IAAI,YAAY,CAAC,IAAI,KAAK,gBAAgB,EAAE;gBAC1C,IAAI,GAAG,KAAK,oBAAoB,EAAE;oBAChC,MAAM,GAAG,KAAK,CAAC;iBAChB;aACF;YAED,cAAc;YACd,IAAI,YAAY,CAAC,IAAI,KAAK,uBAAuB,EAAE;gBACjD,OAAO,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;aAC1E;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;QACL,uBAAuB;QACvB,MAAM,qBAAqB,GAA0B,uBAAuB,CAC1E,cAAc,CAAC,MAAM,EACrB,YAAY,CAAC,MAAM,EACnB,YAAY,CAAC,IAAI,CAAC,SAAS,EAC3B,aAAa,EACb,YAAY,CAAC,IAAI,KAAK,OAAO,EAC7B,cAAc,CACf,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"getItemResourcesPaths.js","sourceRoot":"","sources":["../../../src/resources/getItemResourcesPaths.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,wHAAwH;AAExH;;;;;;;;GAQG;AACH,MAAM,UAAU,qBAAqB,CACnC,YAA2B,EAC3B,cAAsB,EACtB,cAA2B,EAC3B,cAAc,GAAG,CAAC;IAElB,iCAAiC;IACjC,OAAO,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,gBAAgB,EAAE,EAAE;QACrF,sDAAsD;QACtD,sCAAsC;QACtC,MAAM,aAAa,GAAG,gBAAgB,CAAC,SAAS;aAC7C,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;aAC3B,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE;YACnB,IAAI,MAAM,GAAG,IAAI,CAAC;YAClB,mFAAmF;YACnF,2EAA2E;YAC3E,0EAA0E;YAC1E,iCAAiC;YAEjC,YAAY;YACZ,IAAI,YAAY,CAAC,IAAI,KAAK,sBAAsB,EAAE;gBAChD,IAAI,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;oBACnC,MAAM,GAAG,KAAK,CAAC;iBAChB;aACF;YAED,YAAY;YACZ,IAAI,YAAY,CAAC,IAAI,KAAK,UAAU,EAAE;gBACpC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;oBACrD,MAAM,GAAG,KAAK,CAAC;iBAChB;gBACD,IAAI,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE;oBACrC,MAAM,GAAG,KAAK,CAAC;iBAChB;gBACD,IAAI,GAAG,KAAK,qBAAqB,EAAE;oBACjC,MAAM,GAAG,KAAK,CAAC;iBAChB;aACF;YAED,kBAAkB;YAClB,IAAI,YAAY,CAAC,IAAI,KAAK,gBAAgB,EAAE;gBAC1C,IAAI,GAAG,KAAK,oBAAoB,EAAE;oBAChC,MAAM,GAAG,KAAK,CAAC;iBAChB;aACF;YAED,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;QACL,uBAAuB;QACvB,MAAM,qBAAqB,GAA0B,uBAAuB,CAC1E,cAAc,CAAC,MAAM,EACrB,YAAY,CAAC,MAAM,EACnB,YAAY,CAAC,IAAI,CAAC,SAAS,EAC3B,aAAa,EACb,YAAY,CAAC,IAAI,KAAK,OAAO,EAC7B,cAAc,CACf,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/esm/webtoolHelpers.d.ts

@@ -0,0 +1,57 @@
+/** @license
+ * Copyright 2024 Esri
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { IItemTemplate } from "./interfaces";
+/**
+ * Store any web tool urls in the templateDictionary so we can use them to search other items
+ * after they have been converted to templates
+ *
+ * @param template the current template
+ * @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ *
+ */
+export declare function preProcessWebTool(template: IItemTemplate, templateDictionary: any): void;
+/**
+ * Use any stored GPServer urls to search all other templates for potential references
+ * This will allow us to replace the base server name as will as the itemId
+ *
+ * @param templates the list of all the templates in the solution
+ * @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ *
+ * @returns potentially updated list of all the templates in the solution
+ */
+export declare function postProcessWebToolReferences(templates: IItemTemplate[], templateDictionary: any): IItemTemplate[];
+/**
+ * Use any stored GPServer urls to search all other templates for potential references
+ * This will allow us to replace the base server name as will as the itemId
+ *
+ * @param templates the list of all the templates in the solution
+ * @param orgUrl the item url of the GPServer
+ * @param templatizedUrl the templatized GPServer Url
+ * @param orgItemId the item id of the GPServer
+ *
+ * @returns potentially updated list of all the templates in the solution
+ */
+export declare function _globalTemplatize(templates: IItemTemplate[], orgUrl: string, templatizedUrl: string, orgItemId: string): IItemTemplate[];
+/**
+ * Update the templates dependencies if we can detect differences after we try and replace a GPServer url
+ *
+ * @param template the current template
+ * @param itemString stringified version of the the templates item before we replaced anything
+ * @param dataString stringified version of the the templates data before we replaced anything
+ * @param id the current item Id of the GPServer
+ *
+ */
+export declare function _updateDependencies(template: IItemTemplate, itemString: string, dataString: string, id: string): void;

package/dist/esm/webtoolHelpers.js

@@ -0,0 +1,95 @@
+/** @license
+ * Copyright 2024 Esri
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { globalStringReplace } from "./generalHelpers";
+/**
+ * Store any web tool urls in the templateDictionary so we can use them to search other items
+ * after they have been converted to templates
+ *
+ * @param template the current template
+ * @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ *
+ */
+export function preProcessWebTool(template, templateDictionary) {
+    if (template.type === "Geoprocessing Service") {
+        const url = template.item.origUrl;
+        const urlVar = `{{${template.itemId}.url}}`;
+        templateDictionary[url] = urlVar;
+    }
+}
+/**
+ * Use any stored GPServer urls to search all other templates for potential references
+ * This will allow us to replace the base server name as will as the itemId
+ *
+ * @param templates the list of all the templates in the solution
+ * @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ *
+ * @returns potentially updated list of all the templates in the solution
+ */
+export function postProcessWebToolReferences(templates, templateDictionary) {
+    const gpServerUrls = Object.keys(templateDictionary).filter((k) => k.indexOf("GPServer") > -1);
+    if (gpServerUrls.length > 0) {
+        gpServerUrls.forEach((url) => {
+            const itemId = templateDictionary[url].replace("{{", "").replace(".url}}", "");
+            _globalTemplatize(templates, url, templateDictionary[url], itemId);
+            // handle items that already have a templatized itemId in the url
+            const idTest = /[0-9A-F]{32}/gim;
+            const templatizedUrl = url.replace(idTest, `{{${itemId}.itemId}}`);
+            _globalTemplatize(templates, templatizedUrl, templateDictionary[url], itemId);
+        });
+    }
+    return templates;
+}
+/**
+ * Use any stored GPServer urls to search all other templates for potential references
+ * This will allow us to replace the base server name as will as the itemId
+ *
+ * @param templates the list of all the templates in the solution
+ * @param orgUrl the item url of the GPServer
+ * @param templatizedUrl the templatized GPServer Url
+ * @param orgItemId the item id of the GPServer
+ *
+ * @returns potentially updated list of all the templates in the solution
+ */
+export function _globalTemplatize(templates, orgUrl, templatizedUrl, orgItemId) {
+    // Cycle through each of the items in the template and scan the `item` and `data` sections of each for replacements
+    templates.forEach((template) => {
+        const itemString = JSON.stringify(template.item);
+        const dataString = JSON.stringify(template.data);
+        globalStringReplace(template.item, new RegExp(orgUrl, "gi"), templatizedUrl);
+        globalStringReplace(template.data, new RegExp(orgUrl, "gi"), templatizedUrl);
+        _updateDependencies(template, itemString, dataString, orgItemId);
+    });
+    return templates;
+}
+/**
+ * Update the templates dependencies if we can detect differences after we try and replace a GPServer url
+ *
+ * @param template the current template
+ * @param itemString stringified version of the the templates item before we replaced anything
+ * @param dataString stringified version of the the templates data before we replaced anything
+ * @param id the current item Id of the GPServer
+ *
+ */
+export function _updateDependencies(template, itemString, dataString, id) {
+    const hasItemDepdendency = template.dependencies.indexOf(id) > -1;
+    if (itemString && itemString !== JSON.stringify(template.item) && !hasItemDepdendency) {
+        template.dependencies.push(id);
+    }
+    if (dataString && dataString !== JSON.stringify(template.data) && !hasItemDepdendency) {
+        template.dependencies.push(id);
+    }
+}
+//# sourceMappingURL=webtoolHelpers.js.map

package/dist/esm/webtoolHelpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webtoolHelpers.js","sourceRoot":"","sources":["../../src/webtoolHelpers.ts"],"names":[],"mappings":"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"}

package/dist/solution.js_commit.txt

@@ -1,7 +1,10 @@
-Built Wed 09/11/2024 11:23:40.16 
-webtool-id-check
-commit 7f30bc2cec89aae75790dfe1c59ac5f1fe4c9ad7
+Built Mon 09/16/2024 14:16:43.27 
+develop
+commit b17f90938be05e737dfc8248e96bf1a42dd3eaaa
+Merge: 663dfa36b 7e478f9fe
 Author: John Hauck <jhauck@esri.com>
-Date:   Wed Sep 11 10:42:58 2024 -0600
+Date:   Mon Sep 16 12:26:13 2024 -0700
 
-    update test
+    Merge pull request #1502 from Esri/auth-error
+    
+    remove trailing slash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esri/solution-common",
-  "version": "5.6.4",
+  "version": "5.6.6",
   "description": "Provides general helper functions for @esri/solution.js.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -94,5 +94,5 @@
     "esri",
     "ES6"
   ],
-  "gitHead": "fa632ab421f189ca4c4d68ae8a1054440066cdab"
+  "gitHead": "c14cc533aa4049e8fbbdb3c0a19ffd379400796e"
 }