@esri/solution-simple-types 5.6.3 → 5.6.5

package/dist/cjs/helpers/convert-item-to-template.js

@@ -80,6 +80,7 @@ function convertItemToTemplate(itemInfo, destAuthentication, srcAuthentication,
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         Promise.all([dataPromise, relatedPromise, resourcesPromise]).then((responses) => {
             const [itemDataResponse, relatedItemsResponse, resourcesResponse] = responses;
+            common.preProcessWebTool(itemTemplate, templateDictionary);
             // need to pre-process for velocity urls before they could be templatized by other processors
             itemTemplate.data = common.updateVelocityReferences(itemDataResponse, itemInfo.type, templateDictionary);
             const relationships = relatedItemsResponse;
@@ -108,7 +109,7 @@ function convertItemToTemplate(itemInfo, destAuthentication, srcAuthentication,
                     dashboard.convertItemToTemplate(itemTemplate, templateDictionary);
                     break;
                 case "Notebook":
-                    templateModifyingPromise = notebook.convertNotebookToTemplate(itemTemplate, srcAuthentication);
+                    templateModifyingPromise = notebook.convertNotebookToTemplate(itemTemplate);
                     break;
                 case "Oriented Imagery Catalog":
                     templateModifyingPromise = oic.convertItemToTemplate(itemTemplate, destAuthentication, srcAuthentication);

package/dist/cjs/helpers/convert-item-to-template.js.map

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

package/dist/cjs/notebook.d.ts

@@ -29,10 +29,17 @@ export declare function createItemFromTemplate(template: common.IItemTemplate, t
  * Converts a Python Notebook item to a template.
  *
  * @param itemTemplate template for the Python Notebook
- * @param srcAuthentication Credentials for requests to source items
  * @returns templatized itemTemplate
  */
-export declare function convertNotebookToTemplate(itemTemplate: common.IItemTemplate, srcAuthentication: common.UserSession): Promise<common.IItemTemplate>;
+export declare function convertNotebookToTemplate(itemTemplate: common.IItemTemplate): Promise<common.IItemTemplate>;
+/**
+ * Swap any ids found in the items data section with itemId variables
+ *
+ * @param templates IItemTemplate[] all templates for the current solution
+ * @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ * @returns templatized IItemTemplate[]
+ */
+export declare function postProcessNotebookTemplates(templates: common.IItemTemplate[], templateDictionary: any): common.IItemTemplate[];
 /**
  * Remove interpreter and papermill props
  *

package/dist/cjs/notebook.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.postProcess = exports.fineTuneCreatedItem = exports.deleteProps = exports.convertNotebookToTemplate = exports.createItemFromTemplate = exports.convertItemToTemplate = void 0;
+exports.postProcess = exports.fineTuneCreatedItem = exports.deleteProps = exports.postProcessNotebookTemplates = exports.convertNotebookToTemplate = exports.createItemFromTemplate = exports.convertItemToTemplate = void 0;
 const tslib_1 = require("tslib");
 const common = tslib_1.__importStar(require("@esri/solution-common"));
 // Need to import collectively to enable spying
@@ -46,53 +46,67 @@ exports.createItemFromTemplate = createItemFromTemplate;
  * Converts a Python Notebook item to a template.
  *
  * @param itemTemplate template for the Python Notebook
- * @param srcAuthentication Credentials for requests to source items
  * @returns templatized itemTemplate
  */
-function convertNotebookToTemplate(itemTemplate, srcAuthentication) {
-    return new Promise((resolve, reject) => {
-        // The templates data to process
-        const data = itemTemplate.data;
-        deleteProps(data);
-        let dataString = JSON.stringify(data);
-        const idTest = /[0-9A-F]{32}/gim;
-        if (data && idTest.test(dataString)) {
-            const ids = dataString.match(idTest);
-            const promises = [];
-            const verifiedIds = [];
-            const idLookup = [];
-            ids.forEach((id) => {
-                if (verifiedIds.indexOf(id) === -1) {
-                    promises.push(common.isItem(id, srcAuthentication));
-                    idLookup.push(id);
-                    promises.push(common.isGroup(id, srcAuthentication));
-                    idLookup.push(id);
-                }
-            });
-            Promise.all(promises).then((results) => {
-                results.forEach((isValid, i) => {
-                    const id = idLookup[i];
-                    if (isValid && verifiedIds.indexOf(id) < 0) {
-                        verifiedIds.push(id);
-                        // templatize the itemId--but only once per unique id
-                        const regEx = new RegExp(id, "gm");
-                        dataString = dataString.replace(regEx, "{{" + id + ".itemId}}");
-                        // update the dependencies
-                        if (itemTemplate.dependencies.indexOf(id) === -1) {
-                            itemTemplate.dependencies.push(id);
+function convertNotebookToTemplate(itemTemplate) {
+    return new Promise((resolve) => {
+        deleteProps(itemTemplate.data);
+        resolve(itemTemplate);
+    });
+}
+exports.convertNotebookToTemplate = convertNotebookToTemplate;
+/**
+ * Swap any ids found in the items data section with itemId variables
+ *
+ * @param templates IItemTemplate[] all templates for the current solution
+ * @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ * @returns templatized IItemTemplate[]
+ */
+function postProcessNotebookTemplates(templates, templateDictionary) {
+    const hasNotebook = templates.some((t) => {
+        return t.type === "Notebook";
+    });
+    if (hasNotebook) {
+        const fsUrlKeys = Object.keys(templateDictionary)
+            .filter((k) => k.indexOf("FeatureServer") > -1)
+            .sort()
+            .reverse();
+        const ids = templates.reduce((prev, cur) => {
+            prev = [...new Set([...prev, ...cur.dependencies, cur.itemId])];
+            return prev;
+        }, []);
+        templates = templates.map((t) => {
+            if (t.type === "Notebook") {
+                let dataString = t.data && JSON.stringify(t.data);
+                ids.forEach((id) => {
+                    const idTest = new RegExp(id, "gim");
+                    if (idTest.test(dataString)) {
+                        dataString = dataString.replace(id, "{{" + id + ".itemId}}");
+                        if (t.dependencies.indexOf(id) < 0) {
+                            t.dependencies.push(id);
                         }
                     }
                 });
-                itemTemplate.data = JSON.parse(dataString);
-                resolve(itemTemplate);
-            }, (error) => reject(JSON.stringify(error)));
-        }
-        else {
-            resolve(itemTemplate);
-        }
-    });
+                fsUrlKeys.forEach((url) => {
+                    const urlTest = new RegExp(url, "gim");
+                    if (urlTest.test(dataString)) {
+                        const urlVar = templateDictionary[url];
+                        dataString = dataString.replace(urlTest, urlVar);
+                        const idTest = /[0-9A-F]{32}/gim;
+                        const id = urlVar.match(idTest)[0];
+                        if (t.dependencies.indexOf(id) < 0) {
+                            t.dependencies.push(id);
+                        }
+                    }
+                });
+                t.data = JSON.parse(dataString);
+                return t;
+            }
+        });
+    }
+    return templates;
 }
-exports.convertNotebookToTemplate = convertNotebookToTemplate;
+exports.postProcessNotebookTemplates = postProcessNotebookTemplates;
 /**
  * Remove interpreter and papermill props
  *

package/dist/cjs/notebook.js.map

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

package/dist/cjs/oic.js

@@ -104,7 +104,7 @@ function _getLayerIds(layerURLs, dependencies, authentication) {
                     // avoid redundant checks when we have a layer with subLayers
                     /* istanbul ignore else */
                     if (Object.keys(layerChecks).indexOf(baseUrl) < 0) {
-                        layerChecks[baseUrl] = common.rest_request(layerURL, options);
+                        layerChecks[baseUrl] = common.request(layerURL, options);
                     }
                     layerPromises.push(layerChecks[baseUrl]);
                     return true;

package/dist/cjs/oic.js.map

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

package/dist/cjs/webmap.js

@@ -144,7 +144,7 @@ function _getLayerIds(layerList, dependencies, authentication) {
                 if (baseUrl) {
                     // avoid redundant checks when we have a layer with subLayers
                     if (Object.keys(layerChecks).indexOf(baseUrl) < 0) {
-                        layerChecks[baseUrl] = common.rest_request(layer.url, options);
+                        layerChecks[baseUrl] = common.request(layer.url, options);
                     }
                     layerPromises.push(layerChecks[baseUrl]);
                     return true;

package/dist/cjs/webmap.js.map

@@ -1 +1 @@
-{"version":3,"file":"webmap.js","sourceRoot":"","sources":["../../src/webmap.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;AAEH,sEAAgD;AAEhD;;;;GAIG;AACH,MAAM,mBAAmB,GAAW,iCAAiC,CAAC;AAEtE,wHAAwH;AAExH;;;;;;;;GAQG;AACH,SAAgB,qBAAqB,CACnC,YAAkC,EAClC,kBAAsC,EACtC,iBAAqC,EACrC,kBAAuB;IAEvB,OAAO,IAAI,OAAO,CAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3D,2DAA2D;QAC3D,IAAI,YAAY,CAAC,IAAI,KAAK,qBAAqB,EAAE;YAC/C,YAAY,CAAC,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG;gBAC3C,CAAC,CAAC,MAAM,CAAC,uBAAuB,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;oBACtE,mBAAmB;oBACnB,YAAY,CAAC,IAAI,CAAC,EAAE;gBACtB,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,iBAAiB;SAC7C;QAED,uBAAuB;QACvB,oBAAoB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,IAAI,CACxD,CAAC,OAAmC,EAAE,EAAE;YACtC,YAAY,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;YAEjD,0EAA0E;YAC1E,IAAI,YAAY,CAAC,IAAI,EAAE;gBACrB,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC;gBAC/D,IAAI,aAAa,EAAE;oBACjB,gCAAgC,CAC9B,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EACvC,OAAO,CAAC,OAAO,EACf,kBAAkB,CACnB,CAAC;iBACH;gBAED,MAAM,iBAAiB,GAAG,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBAC9D,IAAI,iBAAiB,EAAE;oBACrB,gCAAgC,CAAC,YAAY,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;iBAC5G;gBAED,gCAAgC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;gBAEhG,sBAAsB;gBACtB,oBAAoB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;aACzC;YAED,OAAO,CAAC,YAAY,CAAC,CAAC;QACxB,CAAC,EACD,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAC9B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAhDD,sDAgDC;AAED;;;;;;;GAOG;AACH,SAAgB,oBAAoB,CAClC,YAAkC,EAClC,cAAkC;IAElC,OAAO,IAAI,OAAO,CAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,IAAI,YAAY,CAAC,IAAI,EAAE;YACrB,MAAM,aAAa,GAAU,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,IAAI,EAAE,CAAC;YAC5E,MAAM,QAAQ,GAAU,YAAY,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC;YAClE,MAAM,MAAM,GAAU,YAAY,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC;YACrD,MAAM,eAAe,GAAU,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7E,YAAY,CAAC,eAAe,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC,IAAI,CAC9D,CAAC,OAAO,EAAE,EAAE;gBACV,OAAO,CAAC,OAAO,CAAC,CAAC;YACnB,CAAC,EACD,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAC9B,CAAC;SACH;aAAM;YACL,OAAO,CAAC;gBACN,YAAY,EAAE,YAAY;gBAC1B,OAAO,EAAE,EAAE;aACZ,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAxBD,oDAwBC;AAED;;;;;;;;;GASG;AACH,SAAgB,oBAAoB,CAAC,IAAS;IAC5C,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;AAC1C,CAAC;AAFD,oDAEC;AAED;;;;;;;;;GASG;AACH,SAAgB,YAAY,CAC1B,SAAgB,EAChB,YAAsB,EACtB,cAAkC;IAElC,OAAO,IAAI,OAAO,CAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,MAAM,OAAO,GAAyB,EAAE,CAAC;QAEzC,MAAM,OAAO,GAAQ;YACnB,CAAC,EAAE,MAAM;YACT,cAAc,EAAE,cAAc;SAC/B,CAAC;QACF,MAAM,aAAa,GAAwB,EAAE,CAAC;QAC9C,MAAM,WAAW,GAAQ,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAU,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/C,8BAA8B;YAC9B,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,SAAS,KAAK,iBAAiB,EAAE;gBACzD,0GAA0G;gBAC1G,uGAAuG;gBACvG,WAAW;gBACX,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;gBACrE,OAAO,IAAI,CAAC;gBAEZ,gCAAgC;aACjC;iBAAM,IAAI,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE;gBAChE,MAAM,OAAO,GAAQ,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACxD,MAAM,OAAO,GAAW,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC9F,IAAI,OAAO,EAAE;oBACX,6DAA6D;oBAC7D,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;wBACjD,WAAW,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;qBAChE;oBACD,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;oBACzC,OAAO,IAAI,CAAC;iBACb;qBAAM;oBACL,OAAO,KAAK,CAAC;iBACd;gBAED,iCAAiC;aAClC;iBAAM;gBACL,OAAO,KAAK,CAAC;aACd;QACH,CAAC,CAAC,CAAC;QAEH,yFAAyF;QACzF,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAC7B,CAAC,SAAS,EAAE,EAAE;gBACZ,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;oBAChC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,iBAAiB,EAAE;wBAC7C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;wBAC9D,IAAI,YAAY,IAAI,YAAY,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE;4BACrE,gEAAgE;4BAChE,IAAI,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;gCACzC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;6BAChC;4BAED,iFAAiF;4BACjF,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC;4BAE9B,2CAA2C;4BAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC;4BAC7E,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,cAAc,CACxC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,EACjF,QAAQ,CAAC,EAAE,EACX,UAAU,CACX,CAAC;yBACH;qBACF;yBAAM,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC,EAAE;wBACpD,kBAAkB;wBAClB,MAAM,EAAE,GAAW,QAAQ,CAAC,aAAa,CAAC;wBAC1C,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;4BAChC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;yBACvB;wBACD,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;qBAC7B;gBACH,CAAC,CAAC,CAAC;gBAEH,OAAO,CAAC;oBACN,YAAY;oBACZ,OAAO;iBACsB,CAAC,CAAC;YACnC,CAAC,EACD,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAC9B,CAAC;SACH;aAAM;YACL,OAAO,CAAC;gBACN,YAAY;gBACZ,OAAO;aACsB,CAAC,CAAC;SAClC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA5FD,oCA4FC;AAED;;;;;;;;GAQG;AACH,SAAgB,gCAAgC,CAC9C,YAAY,EAAW,EACvB,OAA6B,EAC7B,kBAAuB;IAEvB,SAAS,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;QAC/B,8BAA8B;QAC9B,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,SAAS,KAAK,iBAAiB,EAAE;YACzD,wDAAwD;YACxD,IAAI,KAAK,CAAC,YAAY,EAAE;gBACtB,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;gBAC5E,OAAO,KAAK,CAAC,YAAY,CAAC;aAC3B;YAED,gCAAgC;SACjC;aAAM,IAAI,KAAK,CAAC,GAAG,EAAE;YACpB,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAE,KAAK,CAAC,GAAc,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7E,MAAM,EAAE,GAAW,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACjG,IAAI,EAAE,EAAE;gBACN,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;gBAClE,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;gBACvE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;aAC9E;SACF;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAzBD,4EAyBC;AAED;;;;;;GAMG;AACH,SAAgB,0BAA0B,CACxC,gBAAsC,EACtC,eAAyC;IAEzC,MAAM,KAAK,GAAa,CAAC,wBAAwB,EAAE,aAAa,EAAE,kDAAkD,CAAC,CAAC;IACtH,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC;IAChF,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAPD,gEAOC;AAED;;;;;;;GAOG;AACH,SAAgB,mBAAmB,CACjC,gBAAsC,EACtC,eAAyC,EACzC,IAAY;IAEZ,MAAM,IAAI,GAAU,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IAC3D,IAAI,IAAI,EAAE;QACR,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;KAC5E;AACH,CAAC;AATD,kDASC;AAED;;;;;;;GAOG;AACH,SAAgB,WAAW,CAAC,IAAW,EAAE,eAAyC;IAChF,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACnB,MAAM,EAAE,GAA2B,kBAAkB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QAC5E,IAAI,EAAE,EAAE;YACN,MAAM,UAAU,GAAa,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAE1D,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;YAEzE,MAAM,CAAC,2BAA2B,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAEjE,IAAI,GAAG,CAAC,eAAe,EAAE;gBACvB,MAAM,CAAC,sBAAsB,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;gBAE5E,MAAM,CAAC,+BAA+B,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;aACtF;YAED,+CAA+C;YAC/C,MAAM,SAAS,GAAQ,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;YACzD,IAAI,SAAS,EAAE;gBACb,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,CAAC,oBAAoB,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;aACxG;SACF;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAzBD,kCAyBC;AAED;;;;;;;GAOG;AACH,SAAgB,kBAAkB,CAAC,GAAQ,EAAE,eAAyC;IACpF,IAAI,cAAmB,CAAC;IACxB,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;QAC1B,IAAI,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE;YAC/B,cAAc,GAAG,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC,CAAC;IACH,OAAO,cAAc,CAAC;AACxB,CAAC;AAXD,gDAWC"}
+{"version":3,"file":"webmap.js","sourceRoot":"","sources":["../../src/webmap.ts"],"names":[],"mappings":"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"}

package/dist/cjs/webmappingapplication.js

@@ -226,7 +226,7 @@ function findUrls(testString, portalUrl, requestUrls, serviceRequests, authentic
             else if (url.indexOf("FeatureServer") > -1) {
                 if (requestUrls.indexOf(url) === -1) {
                     requestUrls.push(url);
-                    serviceRequests.push(common.rest_request(url, options));
+                    serviceRequests.push(common.request(url, options));
                 }
             }
         });

package/dist/cjs/webmappingapplication.js.map

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

package/dist/esm/helpers/convert-item-to-template.js

@@ -76,6 +76,7 @@ export function convertItemToTemplate(itemInfo, destAuthentication, srcAuthentic
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         Promise.all([dataPromise, relatedPromise, resourcesPromise]).then((responses) => {
             const [itemDataResponse, relatedItemsResponse, resourcesResponse] = responses;
+            common.preProcessWebTool(itemTemplate, templateDictionary);
             // need to pre-process for velocity urls before they could be templatized by other processors
             itemTemplate.data = common.updateVelocityReferences(itemDataResponse, itemInfo.type, templateDictionary);
             const relationships = relatedItemsResponse;
@@ -104,7 +105,7 @@ export function convertItemToTemplate(itemInfo, destAuthentication, srcAuthentic
                     dashboard.convertItemToTemplate(itemTemplate, templateDictionary);
                     break;
                 case "Notebook":
-                    templateModifyingPromise = notebook.convertNotebookToTemplate(itemTemplate, srcAuthentication);
+                    templateModifyingPromise = notebook.convertNotebookToTemplate(itemTemplate);
                     break;
                 case "Oriented Imagery Catalog":
                     templateModifyingPromise = oic.convertItemToTemplate(itemTemplate, destAuthentication, srcAuthentication);

package/dist/esm/helpers/convert-item-to-template.js.map

@@ -1 +1 @@
-{"version":3,"file":"convert-item-to-template.js","sourceRoot":"","sources":["../../../src/helpers/convert-item-to-template.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"convert-item-to-template.js","sourceRoot":"","sources":["../../../src/helpers/convert-item-to-template.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,KAAK,SAAS,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,QAAQ,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,GAAG,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,qBAAqB,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,SAAS,MAAM,cAAc,CAAC;AAE1C,wHAAwH;AAExH;;;;;;;;;GASG;AACH,MAAM,UAAU,qBAAqB,CACnC,QAAa,EACb,kBAAsC,EACtC,iBAAqC,EACrC,kBAAuB;IAEvB,OAAO,IAAI,OAAO,CAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3D,gBAAgB;QAChB,MAAM,YAAY,GAAyB,MAAM,CAAC,6BAA6B,CAAC,QAAQ,CAAC,CAAC;QAE1F,uCAAuC;QACvC,YAAY,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAEpG,wBAAwB;QACxB,MAAM,cAAc,GAAG,MAAM,CAAC,kCAAkC,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAEpH,iCAAiC;QACjC,IAAI,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACtC,IAAI,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC3C,QAAQ,QAAQ,CAAC,IAAI,EAAE;YACrB,KAAK,WAAW,CAAC;YACjB,KAAK,eAAe,CAAC;YACrB,KAAK,oBAAoB,CAAC;YAC1B,KAAK,iBAAiB,CAAC;YACvB,KAAK,gBAAgB,CAAC;YACtB,KAAK,UAAU,CAAC;YAChB,KAAK,sBAAsB,CAAC;YAC5B,KAAK,gBAAgB,CAAC;YACtB,KAAK,0BAA0B,CAAC;YAChC,KAAK,iBAAiB,CAAC;YACvB,KAAK,mBAAmB,CAAC;YACzB,KAAK,SAAS,CAAC;YACf,KAAK,yBAAyB,CAAC;YAC/B,KAAK,WAAW,CAAC;YACjB,KAAK,UAAU;gBACb,WAAW,GAAG,IAAI,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;oBACxC,mEAAmE;oBACnE,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;gBACrG,CAAC,CAAC,CAAC;gBACH,MAAM;YACR,KAAK,MAAM;gBACT,WAAW,GAAG,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;gBACvG,MAAM;YACR,KAAK,sBAAsB;gBACzB,+CAA+C;gBAC/C,gBAAgB,GAAG,MAAM,CAAC,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;gBACxF,MAAM;SACT;QAED,4GAA4G;QAC5G,mEAAmE;QACnE,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;YAC9E,MAAM,CAAC,gBAAgB,EAAE,oBAAoB,EAAE,iBAAiB,CAAC,GAAG,SAAS,CAAC;YAE9E,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;YAE3D,6FAA6F;YAC7F,YAAY,CAAC,IAAI,GAAG,MAAM,CAAC,wBAAwB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;YACzG,MAAM,aAAa,GAAG,oBAAoB,CAAC;YAE3C,yGAAyG;YACzG,YAAY,CAAC,YAAY,GAAG,EAAc,CAAC;YAC3C,YAAY,CAAC,YAAY,GAAG,EAA4B,CAAC;YAEzD,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;gBACrC,0BAA0B;gBAC1B,IAAI,YAAY,CAAC,gBAAgB,KAAK,UAAU,EAAE;oBAChD,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBAC7C,YAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;wBACpD,IAAI,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE;4BACxD,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;yBAC/C;oBACH,CAAC,CAAC,CAAC;iBACJ;YACH,CAAC,CAAC,CAAC;YAEH,mEAAmE;YACnE,IAAI,QAAQ,CAAC,IAAI,KAAK,eAAe,EAAE;gBACrC,YAAY,CAAC,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,+BAA+B,CAAC,gBAAgB,CAAC,CAAC,CAAC;aACjH;YAED,sBAAsB;YACtB,IAAI,wBAAwB,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAC7D,QAAQ,QAAQ,CAAC,IAAI,EAAE;gBACrB,KAAK,WAAW;oBACd,SAAS,CAAC,qBAAqB,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;oBAClE,MAAM;gBACR,KAAK,UAAU;oBACb,wBAAwB,GAAG,QAAQ,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAC;oBAC5E,MAAM;gBACR,KAAK,0BAA0B;oBAC7B,wBAAwB,GAAG,GAAG,CAAC,qBAAqB,CAAC,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;oBAC1G,MAAM;gBACR,KAAK,sBAAsB;oBACzB,6EAA6E;oBAC7E,YAAY,CAAC,SAAS,GAAG,iBAAiB,CAAC;oBAE3C,oBAAoB;oBACpB,wBAAwB,GAAG,IAAI,OAAO;oBACpC,6FAA6F;oBAC7F,KAAK,EAAE,SAAS,EAAE,EAAE;wBAClB,6DAA6D;wBAC7D,IAAI,aAAa,GAAS,IAAI,CAAC;wBAC/B,IAAI,cAAc,GAAW,CAAC,CAAC,CAAC;wBAChC,IAAI,iBAAiB,EAAE;4BACrB,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAU,EAAE,CAAS,EAAE,EAAE;gCAC/C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,KAAK,iBAAiB,CAAC;gCACvD,IAAI,cAAc,EAAE;oCAClB,aAAa,GAAG,IAAI,CAAC;oCACrB,cAAc,GAAG,CAAC,CAAC;iCACpB;gCACD,OAAO,cAAc,CAAC;4BACxB,CAAC,CAAC,CAAC;4BAEH,mCAAmC;4BACnC,IAAI,cAAc,IAAI,CAAC,EAAE;gCACvB,iBAAiB,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;6BAC7C;yBACF;wBAED,sDAAsD;wBACtD,IAAI,aAAa,EAAE;4BACjB,YAAY,CAAC,IAAI,GAAG;gCAClB,WAAW,EAAE;oCACX,GAAG,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;iCAC5C;gCACD,IAAI,EAAE,iBAAiB;6BACxB,CAAC;yBACH;wBAED,8BAA8B;wBAC9B,IAAI,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,KAAK,SAAS,EAAE;4BAC9D,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;yBAC9E;wBAED,sBAAsB;wBACtB,MAAM,eAAe,GAAG,YAAY,CAAC,6BAA6B,CAAC,YAAY,CAAC,CAAC;wBACjF,SAAS,CAAC,eAAe,CAAC,CAAC;oBAC7B,CAAC,CACF,CAAC;oBACF,MAAM;gBACR,KAAK,qBAAqB,CAAC;gBAC3B,KAAK,SAAS,CAAC;gBACf,KAAK,WAAW;oBACd,wBAAwB,GAAG,MAAM,CAAC,qBAAqB,CACrD,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,CACnB,CAAC;oBACF,MAAM;gBACR,KAAK,yBAAyB;oBAC5B,IAAI,gBAAgB,EAAE;wBACpB,wBAAwB,GAAG,qBAAqB,CAAC,qBAAqB,CACpE,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,CACnB,CAAC;qBACH;oBACD,MAAM;gBACR,KAAK,mBAAmB;oBACtB,wBAAwB,GAAG,SAAS,CAAC,qBAAqB,CACxD,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,CACnB,CAAC;oBACF,MAAM;aACT;YAED,wBAAwB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,+BAA+B,CAAC,QAAa;IAC3D,MAAM,YAAY,GAAG,EAAc,CAAC;IACpC,MAAM,eAAe,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;IAEjF,eAAe,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;QACvC,IAAI,YAAY,CAAC,IAAI,KAAK,sBAAsB,IAAI,YAAY,CAAC,IAAI,KAAK,oBAAoB,EAAE;YAC9F,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,+BAA+B,CAAC,CAAC;YACvF,IAAI,gBAAgB,EAAE;gBACpB,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aACrC;SACF;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC"}

package/dist/esm/notebook.d.ts

@@ -29,10 +29,17 @@ export declare function createItemFromTemplate(template: common.IItemTemplate, t
  * Converts a Python Notebook item to a template.
  *
  * @param itemTemplate template for the Python Notebook
- * @param srcAuthentication Credentials for requests to source items
  * @returns templatized itemTemplate
  */
-export declare function convertNotebookToTemplate(itemTemplate: common.IItemTemplate, srcAuthentication: common.UserSession): Promise<common.IItemTemplate>;
+export declare function convertNotebookToTemplate(itemTemplate: common.IItemTemplate): Promise<common.IItemTemplate>;
+/**
+ * Swap any ids found in the items data section with itemId variables
+ *
+ * @param templates IItemTemplate[] all templates for the current solution
+ * @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ * @returns templatized IItemTemplate[]
+ */
+export declare function postProcessNotebookTemplates(templates: common.IItemTemplate[], templateDictionary: any): common.IItemTemplate[];
 /**
  * Remove interpreter and papermill props
  *

package/dist/esm/notebook.js

@@ -40,51 +40,64 @@ export function createItemFromTemplate(template, templateDictionary, destination
  * Converts a Python Notebook item to a template.
  *
  * @param itemTemplate template for the Python Notebook
- * @param srcAuthentication Credentials for requests to source items
  * @returns templatized itemTemplate
  */
-export function convertNotebookToTemplate(itemTemplate, srcAuthentication) {
-    return new Promise((resolve, reject) => {
-        // The templates data to process
-        const data = itemTemplate.data;
-        deleteProps(data);
-        let dataString = JSON.stringify(data);
-        const idTest = /[0-9A-F]{32}/gim;
-        if (data && idTest.test(dataString)) {
-            const ids = dataString.match(idTest);
-            const promises = [];
-            const verifiedIds = [];
-            const idLookup = [];
-            ids.forEach((id) => {
-                if (verifiedIds.indexOf(id) === -1) {
-                    promises.push(common.isItem(id, srcAuthentication));
-                    idLookup.push(id);
-                    promises.push(common.isGroup(id, srcAuthentication));
-                    idLookup.push(id);
-                }
-            });
-            Promise.all(promises).then((results) => {
-                results.forEach((isValid, i) => {
-                    const id = idLookup[i];
-                    if (isValid && verifiedIds.indexOf(id) < 0) {
-                        verifiedIds.push(id);
-                        // templatize the itemId--but only once per unique id
-                        const regEx = new RegExp(id, "gm");
-                        dataString = dataString.replace(regEx, "{{" + id + ".itemId}}");
-                        // update the dependencies
-                        if (itemTemplate.dependencies.indexOf(id) === -1) {
-                            itemTemplate.dependencies.push(id);
+export function convertNotebookToTemplate(itemTemplate) {
+    return new Promise((resolve) => {
+        deleteProps(itemTemplate.data);
+        resolve(itemTemplate);
+    });
+}
+/**
+ * Swap any ids found in the items data section with itemId variables
+ *
+ * @param templates IItemTemplate[] all templates for the current solution
+ * @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
+ * @returns templatized IItemTemplate[]
+ */
+export function postProcessNotebookTemplates(templates, templateDictionary) {
+    const hasNotebook = templates.some((t) => {
+        return t.type === "Notebook";
+    });
+    if (hasNotebook) {
+        const fsUrlKeys = Object.keys(templateDictionary)
+            .filter((k) => k.indexOf("FeatureServer") > -1)
+            .sort()
+            .reverse();
+        const ids = templates.reduce((prev, cur) => {
+            prev = [...new Set([...prev, ...cur.dependencies, cur.itemId])];
+            return prev;
+        }, []);
+        templates = templates.map((t) => {
+            if (t.type === "Notebook") {
+                let dataString = t.data && JSON.stringify(t.data);
+                ids.forEach((id) => {
+                    const idTest = new RegExp(id, "gim");
+                    if (idTest.test(dataString)) {
+                        dataString = dataString.replace(id, "{{" + id + ".itemId}}");
+                        if (t.dependencies.indexOf(id) < 0) {
+                            t.dependencies.push(id);
                         }
                     }
                 });
-                itemTemplate.data = JSON.parse(dataString);
-                resolve(itemTemplate);
-            }, (error) => reject(JSON.stringify(error)));
-        }
-        else {
-            resolve(itemTemplate);
-        }
-    });
+                fsUrlKeys.forEach((url) => {
+                    const urlTest = new RegExp(url, "gim");
+                    if (urlTest.test(dataString)) {
+                        const urlVar = templateDictionary[url];
+                        dataString = dataString.replace(urlTest, urlVar);
+                        const idTest = /[0-9A-F]{32}/gim;
+                        const id = urlVar.match(idTest)[0];
+                        if (t.dependencies.indexOf(id) < 0) {
+                            t.dependencies.push(id);
+                        }
+                    }
+                });
+                t.data = JSON.parse(dataString);
+                return t;
+            }
+        });
+    }
+    return templates;
 }
 /**
  * Remove interpreter and papermill props

package/dist/esm/notebook.js.map

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

package/dist/esm/oic.js

@@ -98,7 +98,7 @@ export function _getLayerIds(layerURLs, dependencies, authentication) {
                     // avoid redundant checks when we have a layer with subLayers
                     /* istanbul ignore else */
                     if (Object.keys(layerChecks).indexOf(baseUrl) < 0) {
-                        layerChecks[baseUrl] = common.rest_request(layerURL, options);
+                        layerChecks[baseUrl] = common.request(layerURL, options);
                     }
                     layerPromises.push(layerChecks[baseUrl]);
                     return true;

package/dist/esm/oic.js.map

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

package/dist/esm/webmap.js

@@ -137,7 +137,7 @@ export function _getLayerIds(layerList, dependencies, authentication) {
                 if (baseUrl) {
                     // avoid redundant checks when we have a layer with subLayers
                     if (Object.keys(layerChecks).indexOf(baseUrl) < 0) {
-                        layerChecks[baseUrl] = common.rest_request(layer.url, options);
+                        layerChecks[baseUrl] = common.request(layer.url, options);
                     }
                     layerPromises.push(layerChecks[baseUrl]);
                     return true;

package/dist/esm/webmap.js.map

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

package/dist/esm/webmappingapplication.js

@@ -217,7 +217,7 @@ export function findUrls(testString, portalUrl, requestUrls, serviceRequests, au
             else if (url.indexOf("FeatureServer") > -1) {
                 if (requestUrls.indexOf(url) === -1) {
                     requestUrls.push(url);
-                    serviceRequests.push(common.rest_request(url, options));
+                    serviceRequests.push(common.request(url, options));
                 }
             }
         });

package/dist/esm/webmappingapplication.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esri/solution-simple-types",
-  "version": "5.6.3",
+  "version": "5.6.5",
   "description": "Manages the creation and deployment of simple item types for @esri/solution.js.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -22,7 +22,7 @@
     "npm-check-updates": "^17.1.0"
   },
   "dependencies": {
-    "@esri/solution-common": "^5.6.3",
+    "@esri/solution-common": "^5.6.5",
     "tslib": "1.14.1"
   },
   "scripts": {
@@ -76,5 +76,5 @@
     "esri",
     "ES6"
   ],
-  "gitHead": "d1d6426318e5663257a5b5c8d8308d3c3ed2a15f"
+  "gitHead": "34aa39cf4de1ae2642862f6407df802939807431"
 }