@esri/solution-simple-types 1.1.2 → 1.2.0

package/dist/esm/webmappingapplication.js

@@ -19,20 +19,21 @@ import * as common from "@esri/solution-common";
  * Converts a web mapping application item into a template.
  *
  * @param itemInfo Info about the item
- * @param authentication Credentials for working with AGO
+ * @param destAuthentication Credentials for requests to the destination organization
+ * @param srcAuthentication Credentials for requests to source items
  * @return A promise that will resolve when the template has been created
  */
-export function convertItemToTemplate(itemTemplate, authentication) {
-    return new Promise(function (resolve, reject) {
+export function convertItemToTemplate(itemTemplate, destAuthentication, srcAuthentication) {
+    return new Promise((resolve, reject) => {
         // Remove org base URL and app id, e.g.,
         //   http://anOrg.maps.arcgis.com/apps/CrowdsourcePolling/index.html?appid=6fc5992522d34a6b5ce80d17835eea21
         // to
         //   <placeholder(SERVER_NAME)>/apps/CrowdsourcePolling/index.html?appid={{<itemId>.id}}
         // Need to add placeholder server name because otherwise AGOL makes URL null
-        var portalUrl = "";
+        let portalUrl = "";
         if (itemTemplate.item.url) {
-            var templatizedUrl = itemTemplate.item.url;
-            var iSep = templatizedUrl.indexOf("//");
+            const templatizedUrl = itemTemplate.item.url;
+            const iSep = templatizedUrl.indexOf("//");
             itemTemplate.item.url =
                 common.placeholder(common.SERVER_NAME) + // add placeholder server name
                     templatizedUrl.substring(templatizedUrl.indexOf("/", iSep + 2), templatizedUrl.lastIndexOf("=") + 1) +
@@ -60,37 +61,37 @@ export function convertItemToTemplate(itemTemplate, authentication) {
             "data.httpProxy.url"
         ], common.placeholder(common.SERVER_NAME));
         common.setProp(itemTemplate, "data.geometryService", common.placeholder(common.GEOMETRY_SERVER_NAME));
-        templatizeDatasources(itemTemplate, authentication, portalUrl).then(function () {
-            templatizeWidgets(itemTemplate, authentication, portalUrl, "data.widgetPool.widgets").then(function (_itemTemplate) {
-                templatizeWidgets(_itemTemplate, authentication, portalUrl, "data.widgetOnScreen.widgets", true).then(function (updatedItemTemplate) {
-                    templatizeValues(updatedItemTemplate, authentication, portalUrl, "data.values").then(function (_updatedItemTemplate) {
+        templatizeDatasources(itemTemplate, srcAuthentication, portalUrl).then(() => {
+            templatizeWidgets(itemTemplate, srcAuthentication, portalUrl, "data.widgetPool.widgets").then(_itemTemplate => {
+                templatizeWidgets(_itemTemplate, srcAuthentication, portalUrl, "data.widgetOnScreen.widgets", true).then(updatedItemTemplate => {
+                    templatizeValues(updatedItemTemplate, srcAuthentication, portalUrl, "data.values").then(_updatedItemTemplate => {
                         resolve(_updatedItemTemplate);
-                    }, function (e) { return reject(common.fail(e)); });
-                }, function (e) { return reject(common.fail(e)); });
-            }, function (e) { return reject(common.fail(e)); });
-        }, function (e) { return reject(common.fail(e)); });
+                    }, e => reject(common.fail(e)));
+                }, e => reject(common.fail(e)));
+            }, e => reject(common.fail(e)));
+        }, e => reject(common.fail(e)));
     });
 }
 export function templatizeDatasources(itemTemplate, authentication, portalUrl) {
-    return new Promise(function (resolve, reject) {
-        var dataSources = common.getProp(itemTemplate, "data.dataSource.dataSources");
+    return new Promise((resolve, reject) => {
+        const dataSources = common.getProp(itemTemplate, "data.dataSource.dataSources");
         if (dataSources && Object.keys(dataSources).length > 0) {
-            var pendingRequests_1 = new Array();
-            Object.keys(dataSources).forEach(function (k) {
-                var ds = dataSources[k];
+            const pendingRequests = new Array();
+            Object.keys(dataSources).forEach(k => {
+                const ds = dataSources[k];
                 common.setProp(ds, "portalUrl", common.placeholder(common.SERVER_NAME));
-                var itemId = common.getProp(ds, "itemId");
+                const itemId = common.getProp(ds, "itemId");
                 if (common.getProp(ds, "url")) {
                     if (itemId) {
-                        var layerId = ds.url.substr(ds.url.lastIndexOf("/") + 1);
+                        const layerId = ds.url.substr(ds.url.lastIndexOf("/") + 1);
                         ds.itemId = common.templatizeTerm(itemId, itemId, ".layer" + layerId + ".itemId");
                     }
-                    var urlResults_1 = findUrls(ds.url, portalUrl, [], [], authentication);
-                    pendingRequests_1.push(new Promise(function (resolveReq, rejectReq) {
-                        handleServiceRequests(urlResults_1.serviceRequests, urlResults_1.requestUrls, urlResults_1.testString).then(function (response) {
+                    const urlResults = findUrls(ds.url, portalUrl, [], [], authentication);
+                    pendingRequests.push(new Promise((resolveReq, rejectReq) => {
+                        handleServiceRequests(urlResults.serviceRequests, urlResults.requestUrls, urlResults.testString).then(response => {
                             ds.url = response;
                             resolveReq();
-                        }, function (e) { return rejectReq(common.fail(e)); });
+                        }, e => rejectReq(common.fail(e)));
                     }));
                 }
                 else {
@@ -99,40 +100,39 @@ export function templatizeDatasources(itemTemplate, authentication, portalUrl) {
                     }
                 }
             });
-            Promise.all(pendingRequests_1).then(function () { return resolve(itemTemplate); }, function (e) { return reject(common.fail(e)); });
+            Promise.all(pendingRequests).then(() => resolve(itemTemplate), e => reject(common.fail(e)));
         }
         else {
             resolve(itemTemplate);
         }
     });
 }
-export function templatizeWidgets(itemTemplate, authentication, portalUrl, widgetPath, isOnScreen) {
-    if (isOnScreen === void 0) { isOnScreen = false; }
-    return new Promise(function (resolve, reject) {
+export function templatizeWidgets(itemTemplate, authentication, portalUrl, widgetPath, isOnScreen = false) {
+    return new Promise((resolve, reject) => {
         // update widgets
-        var widgets = common.getProp(itemTemplate, widgetPath) || [];
-        var serviceRequests = [];
-        var requestUrls = [];
-        widgets.forEach(function (widget) {
+        const widgets = common.getProp(itemTemplate, widgetPath) || [];
+        let serviceRequests = [];
+        let requestUrls = [];
+        widgets.forEach(widget => {
             /* istanbul ignore else */
             if (!isOnScreen && common.getProp(widget, "icon")) {
                 setValues(widget, ["icon"], common.placeholder(common.SERVER_NAME));
             }
-            var config = widget.config;
+            const config = widget.config;
             if (config) {
-                var sConfig = JSON.stringify(config);
-                var urlResults = findUrls(sConfig, portalUrl, requestUrls, serviceRequests, authentication);
+                const sConfig = JSON.stringify(config);
+                const urlResults = findUrls(sConfig, portalUrl, requestUrls, serviceRequests, authentication);
                 widget.config = JSON.parse(urlResults.testString);
                 serviceRequests = urlResults.serviceRequests;
                 requestUrls = urlResults.requestUrls;
             }
         });
         if (serviceRequests.length > 0) {
-            var sWidgets = JSON.stringify(widgets);
-            handleServiceRequests(serviceRequests, requestUrls, sWidgets).then(function (response) {
+            const sWidgets = JSON.stringify(widgets);
+            handleServiceRequests(serviceRequests, requestUrls, sWidgets).then(response => {
                 common.setProp(itemTemplate, widgetPath, JSON.parse(response));
                 resolve(itemTemplate);
-            }, function (e) { return reject(common.fail(e)); });
+            }, e => reject(common.fail(e)));
         }
         else {
             resolve(itemTemplate);
@@ -140,27 +140,27 @@ export function templatizeWidgets(itemTemplate, authentication, portalUrl, widge
     });
 }
 export function templatizeValues(itemTemplate, authentication, portalUrl, widgetPath) {
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
         // update properties of values collection for web app templates
-        var values = common.getProp(itemTemplate, widgetPath);
-        var serviceRequests = [];
-        var requestUrls = [];
+        let values = common.getProp(itemTemplate, widgetPath);
+        let serviceRequests = [];
+        let requestUrls = [];
         if (values) {
             if (common.getProp(values, "icon")) {
                 setValues(values, ["icon"], common.placeholder(common.SERVER_NAME));
             }
-            var sConfig = JSON.stringify(values);
-            var urlResults = findUrls(sConfig, portalUrl, requestUrls, serviceRequests, authentication);
+            const sConfig = JSON.stringify(values);
+            const urlResults = findUrls(sConfig, portalUrl, requestUrls, serviceRequests, authentication);
             values = JSON.parse(urlResults.testString);
             serviceRequests = urlResults.serviceRequests;
             requestUrls = urlResults.requestUrls;
         }
         if (serviceRequests.length > 0) {
-            var sWidgets = JSON.stringify(values);
-            handleServiceRequests(serviceRequests, requestUrls, sWidgets).then(function (response) {
+            const sWidgets = JSON.stringify(values);
+            handleServiceRequests(serviceRequests, requestUrls, sWidgets).then(response => {
                 common.setProp(itemTemplate, widgetPath, JSON.parse(response));
                 resolve(itemTemplate);
-            }, function (e) { return reject(common.fail(e)); });
+            }, e => reject(common.fail(e)));
         }
         else {
             resolve(itemTemplate);
@@ -168,24 +168,24 @@ export function templatizeValues(itemTemplate, authentication, portalUrl, widget
     });
 }
 export function handleServiceRequests(serviceRequests, requestUrls, objString) {
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
         if (serviceRequests && serviceRequests.length > 0) {
-            var i_1 = 0;
-            Promise.all(serviceRequests).then(function (serviceResponses) {
-                serviceResponses.forEach(function (serviceResponse) {
+            let i = 0;
+            Promise.all(serviceRequests).then(serviceResponses => {
+                serviceResponses.forEach(serviceResponse => {
                     if (common.getProp(serviceResponse, "serviceItemId")) {
-                        var serviceTemplate = "{{" +
+                        const serviceTemplate = "{{" +
                             serviceResponse.serviceItemId +
                             (serviceResponse.hasOwnProperty("id")
                                 ? ".layer" + serviceResponse.id
                                 : "") +
                             ".url}}";
-                        objString = replaceUrl(objString, requestUrls[i_1], serviceTemplate, true);
+                        objString = replaceUrl(objString, requestUrls[i], serviceTemplate, true);
                     }
-                    i_1++;
+                    i++;
                 });
                 resolve(objString);
-            }, function (e) { return reject(common.fail(e)); });
+            }, e => reject(common.fail(e)));
         }
         else {
             resolve(objString);
@@ -193,14 +193,14 @@ export function handleServiceRequests(serviceRequests, requestUrls, objString) {
     });
 }
 export function findUrls(testString, portalUrl, requestUrls, serviceRequests, authentication) {
-    var options = {
+    const options = {
         f: "json",
         authentication: authentication
     };
     // test for URLs
-    var results = testString.match(/(\bhttps?:\/\/[-A-Z0-9/._]*)/gim);
+    const results = testString.match(/(\bhttps?:\/\/[-A-Z0-9/._]*)/gim);
     if (results && results.length) {
-        results.forEach(function (url) {
+        results.forEach((url) => {
             if (url.indexOf("NAServer") > -1) {
                 testString = replaceUrl(testString, url, common.placeholder(common.NA_SERVER_NAME));
             }
@@ -219,9 +219,9 @@ export function findUrls(testString, portalUrl, requestUrls, serviceRequests, au
         });
     }
     return {
-        testString: testString,
-        requestUrls: requestUrls,
-        serviceRequests: serviceRequests
+        testString,
+        requestUrls,
+        serviceRequests
     };
 }
 /**
@@ -235,23 +235,22 @@ export function findUrls(testString, portalUrl, requestUrls, serviceRequests, au
  *
  * @returns the obj with any instances of the url replaced
  */
-export function replaceUrl(obj, url, newUrl, validateFullUrl) {
-    if (validateFullUrl === void 0) { validateFullUrl = false; }
-    var enforceFullUrl = validateFullUrl && obj.indexOf('"') > -1;
-    var re = new RegExp(enforceFullUrl ? '"' + url + '"' : url, "gmi");
+export function replaceUrl(obj, url, newUrl, validateFullUrl = false) {
+    const enforceFullUrl = validateFullUrl && obj.indexOf('"') > -1;
+    const re = new RegExp(enforceFullUrl ? '"' + url + '"' : url, "gmi");
     return obj.replace(re, enforceFullUrl ? '"' + newUrl + '"' : newUrl);
 }
 export function setValues(itemTemplate, paths, base) {
-    paths.forEach(function (path) {
-        var url = common.getProp(itemTemplate, path);
+    paths.forEach(path => {
+        const url = common.getProp(itemTemplate, path);
         if (url) {
-            var subString = url.substring(url.indexOf("/", url.indexOf("//") + 2));
+            const subString = url.substring(url.indexOf("/", url.indexOf("//") + 2));
             common.setProp(itemTemplate, path, subString !== url ? base + subString : base);
         }
     });
 }
 export function fineTuneCreatedItem(originalTemplate, newlyCreatedItem, templateDictionary, destinationAuthentication) {
-    return new Promise(function (resolve) {
+    return new Promise(resolve => {
         // If this is a Web AppBuilder application, we will create a Code Attachment for downloading
         if (common.hasAnyKeyword(originalTemplate, [
             "WAB2D",
@@ -259,13 +258,13 @@ export function fineTuneCreatedItem(originalTemplate, newlyCreatedItem, template
             "Web AppBuilder"
         ])) {
             // Update item so properties like appItemId can now be set now that we know the new apps ID
-            var updateOptions = {
+            const updateOptions = {
                 id: newlyCreatedItem.itemId,
                 url: newlyCreatedItem.item.url,
                 data: newlyCreatedItem.data
             };
-            var updateDef = common.updateItem(updateOptions, destinationAuthentication);
-            var itemInfo = {
+            const updateDef = common.updateItem(updateOptions, destinationAuthentication);
+            const itemInfo = {
                 tags: originalTemplate.item.tags,
                 title: originalTemplate.item.title,
                 type: "Code Attachment",
@@ -277,8 +276,8 @@ export function fineTuneCreatedItem(originalTemplate, newlyCreatedItem, template
                     newlyCreatedItem.itemId +
                     "/package"
             };
-            var createItemWithDataDef = common.createItemWithData(itemInfo, {}, destinationAuthentication, templateDictionary.folderId);
-            Promise.all([updateDef, createItemWithDataDef]).then(function () { return resolve(null); }, function () { return resolve(null); });
+            const createItemWithDataDef = common.createItemWithData(itemInfo, {}, destinationAuthentication, templateDictionary.folderId);
+            Promise.all([updateDef, createItemWithDataDef]).then(() => resolve(null), () => resolve(null));
         }
         else {
             // Otherwise, nothing extra needed
@@ -295,7 +294,7 @@ export function fineTuneCreatedItem(originalTemplate, newlyCreatedItem, template
  * @protected
  */
 export function _extractDependencies(model) {
-    var processor = _getGenericWebAppDependencies;
+    let processor = _getGenericWebAppDependencies;
     /*
     if (common.hasTypeKeyword(model, "Story Map")) {
       processor = getStoryMapDependencies;
@@ -310,19 +309,19 @@ export function _extractDependencies(model) {
  * Generic Web App Dependencies
  */
 export function _getGenericWebAppDependencies(model) {
-    var props = ["data.values.webmap", "data.values.group"];
+    const props = ["data.values.webmap", "data.values.group"];
     return common.getProps(model, props);
 }
 export function _getWABDependencies(model) {
-    var deps = [];
-    var v = common.getProp(model, "data.map.itemId");
+    const deps = [];
+    const v = common.getProp(model, "data.map.itemId");
     if (v) {
         deps.push(v);
     }
-    var dataSources = common.getProp(model, "data.dataSource.dataSources");
+    const dataSources = common.getProp(model, "data.dataSource.dataSources");
     if (dataSources) {
-        Object.keys(dataSources).forEach(function (k) {
-            var ds = dataSources[k];
+        Object.keys(dataSources).forEach(k => {
+            const ds = dataSources[k];
             if (ds.itemId) {
                 deps.push(ds.itemId);
             }
@@ -338,8 +337,8 @@ export function _getWABDependencies(model) {
  * @protected
  */
 export function _templatizeIdPaths(itemTemplate, paths) {
-    paths.forEach(function (path) {
-        var id = common.getProp(itemTemplate, path);
+    paths.forEach(path => {
+        const id = common.getProp(itemTemplate, path);
         _templatizeIdPath(itemTemplate, path, id);
     });
 }
@@ -363,27 +362,27 @@ export function _templatizeIdPath(itemTemplate, path, id) {
  */
 export function postProcessFieldReferences(solutionTemplate, datasourceInfos) {
     // handle datasources common for WAB apps
-    var dataSources = common.getProp(solutionTemplate, "data.dataSource.dataSources");
+    const dataSources = common.getProp(solutionTemplate, "data.dataSource.dataSources");
     if (dataSources && Object.keys(dataSources).length > 0) {
-        Object.keys(dataSources).forEach(function (k) {
-            var ds = dataSources[k];
+        Object.keys(dataSources).forEach(k => {
+            const ds = dataSources[k];
             dataSources[k] = _templatizeObject(ds, datasourceInfos);
         });
         common.setProp(solutionTemplate, "data.dataSource.dataSources", dataSources);
     }
     // handle widgets common for WAB apps
-    var paths = [
+    const paths = [
         "data.widgetPool.widgets",
         "data.widgetOnScreen.widgets"
     ];
-    paths.forEach(function (path) {
-        var widgets = common.getProp(solutionTemplate, path);
+    paths.forEach(path => {
+        const widgets = common.getProp(solutionTemplate, path);
         if (widgets) {
             common.setProp(solutionTemplate, path, _templatizeObjectArray(widgets, datasourceInfos));
         }
     });
     // handle values common for web app templates
-    var values = common.getProp(solutionTemplate, "data.values");
+    const values = common.getProp(solutionTemplate, "data.values");
     if (values) {
         common.setProp(solutionTemplate, "data.values", _templatizeObject(values, datasourceInfos));
     }
@@ -396,11 +395,10 @@ export function postProcessFieldReferences(solutionTemplate, datasourceInfos) {
  * @param datasourceInfos A list of datasource info objects that contain key values to templatize field references
  * @returns The dataSource with templatized field references
  */
-export function _templatizeObject(obj, datasourceInfos, templatizeKeys) {
-    if (templatizeKeys === void 0) { templatizeKeys = false; }
+export function _templatizeObject(obj, datasourceInfos, templatizeKeys = false) {
     obj = _prioritizedTests(obj, datasourceInfos, templatizeKeys);
-    var replaceOrder = _getReplaceOrder(obj, datasourceInfos);
-    replaceOrder.forEach(function (ds) {
+    const replaceOrder = _getReplaceOrder(obj, datasourceInfos);
+    replaceOrder.forEach(ds => {
         obj = common.templatizeFieldReferences(obj, ds.fields, ds.basePath, templatizeKeys);
     });
     return obj;
@@ -413,11 +411,11 @@ export function _templatizeObject(obj, datasourceInfos, templatizeKeys) {
  * @returns The widgets with templatized field references
  */
 export function _templatizeObjectArray(objects, datasourceInfos) {
-    var updateKeyObjects = ["SmartEditor", "Screening"];
-    return objects.map(function (obj) {
+    const updateKeyObjects = ["SmartEditor", "Screening"];
+    return objects.map(obj => {
         // only templatize the config and lower
         if (obj.config) {
-            var templatizeKeys = updateKeyObjects.indexOf(obj.name) > -1;
+            const templatizeKeys = updateKeyObjects.indexOf(obj.name) > -1;
             obj.config = _templatizeObject(obj.config, datasourceInfos, templatizeKeys);
         }
         return obj;
@@ -433,10 +431,10 @@ export function _templatizeObjectArray(objects, datasourceInfos) {
  * @returns A list of datasourceInfo objects sorted based on the presence of a layers url or id
  */
 export function _getReplaceOrder(obj, datasourceInfos) {
-    var objString = JSON.stringify(obj);
+    const objString = JSON.stringify(obj);
     // If we don't find any layer url, web map layer id, service url, agol itemId then remove the datasource.
-    var _datasourceInfos = datasourceInfos.filter(function (ds) { return _getSortOrder(ds, objString) < 4; });
-    return _datasourceInfos.sort(function (a, b) {
+    const _datasourceInfos = datasourceInfos.filter(ds => _getSortOrder(ds, objString) < 4);
+    return _datasourceInfos.sort((a, b) => {
         return _getSortOrder(a, objString) - _getSortOrder(b, objString);
     });
 }
@@ -449,12 +447,12 @@ export function _getReplaceOrder(obj, datasourceInfos) {
  * @returns The prioritized order for testing
  */
 export function _getSortOrder(datasourceInfo, testString) {
-    var url = datasourceInfo.url;
-    var itemId = datasourceInfo.itemId;
-    var layerId = datasourceInfo.layerId;
+    const url = datasourceInfo.url;
+    const itemId = datasourceInfo.itemId;
+    const layerId = datasourceInfo.layerId;
     // if we have the url and the layerID and its found prioritize it first
     // else if we find the maps layer id prioritze it first
-    var layerUrlTest;
+    let layerUrlTest;
     if (url && !isNaN(layerId)) {
         layerUrlTest = new RegExp(url.replace(/[.]/, ".layer" + layerId + "."), "gm");
     }
@@ -462,8 +460,8 @@ export function _getSortOrder(datasourceInfo, testString) {
         return 1;
     }
     else if (datasourceInfo.ids.length > 0) {
-        if (datasourceInfo.ids.some(function (id) {
-            var layerMapIdTest = new RegExp(id, "gm");
+        if (datasourceInfo.ids.some(id => {
+            const layerMapIdTest = new RegExp(id, "gm");
             return layerMapIdTest.test(testString);
         })) {
             return 1;
@@ -472,14 +470,14 @@ export function _getSortOrder(datasourceInfo, testString) {
     // if neither full layer url or map layer id are found...check to see if we can
     // find the base service url
     if (url) {
-        var serviceUrlTest = new RegExp(url, "gm");
+        const serviceUrlTest = new RegExp(url, "gm");
         if (serviceUrlTest.test(testString)) {
             return 2;
         }
     }
     // if none of the above see if we can find an AGOL item id reference
     if (itemId) {
-        var itemIdTest = new RegExp(itemId, "gm");
+        const itemIdTest = new RegExp(itemId, "gm");
         if (itemIdTest.test(testString)) {
             return 3;
         }
@@ -497,16 +495,16 @@ export function _getSortOrder(datasourceInfo, testString) {
  * @returns An updated instance of the dataSource or widget with as many field references templatized as possible.
  */
 export function _prioritizedTests(obj, datasourceInfos, templatizeKeys) {
-    var objString = JSON.stringify(obj);
-    var hasDatasources = datasourceInfos.filter(function (ds) {
-        var urlTest;
+    const objString = JSON.stringify(obj);
+    const hasDatasources = datasourceInfos.filter(ds => {
+        let urlTest;
         if (ds.url && !isNaN(ds.layerId)) {
             urlTest = new RegExp(ds.url.replace(/[.]/, ".layer" + ds.layerId + "."), "gm");
         }
-        var hasMapLayerId = false;
+        let hasMapLayerId = false;
         if (ds.ids.length > 0) {
-            hasMapLayerId = ds.ids.some(function (id) {
-                var idTest = new RegExp(id, "gm");
+            hasMapLayerId = ds.ids.some(id => {
+                const idTest = new RegExp(id, "gm");
                 return idTest.test(objString);
             });
         }
@@ -515,12 +513,12 @@ export function _prioritizedTests(obj, datasourceInfos, templatizeKeys) {
         }
     });
     if (hasDatasources.length > 0) {
-        hasDatasources.forEach(function (ds) {
+        hasDatasources.forEach(ds => {
             // specific url reference is the most common
             obj = _templatizeParentByURL(obj, ds, templatizeKeys);
             if (ds.ids.length > 0) {
                 // the second most common is to use the layerId from the webmap
-                ds.ids.forEach(function (id) {
+                ds.ids.forEach(id => {
                     obj = _templatizeParentByWebMapLayerId(obj, ds, id, templatizeKeys);
                 });
             }
@@ -538,20 +536,20 @@ export function _prioritizedTests(obj, datasourceInfos, templatizeKeys) {
  * @returns The updated instance of the object with as many field references templatized as possible
  */
 export function _templatizeParentByURL(obj, ds, templatizeKeys) {
-    var clone = {};
-    var url = ds.url;
-    var layerId = ds.layerId;
-    var urlTest;
+    let clone = {};
+    const url = ds.url;
+    const layerId = ds.layerId;
+    let urlTest;
     if (url && !isNaN(layerId)) {
         urlTest = new RegExp(url.replace(/[.]/, ".layer" + layerId + "."), "gm");
     }
     if (Array.isArray(obj)) {
-        clone = obj.map(function (c) {
+        clone = obj.map(c => {
             return _templatizeParentByURL(c, ds, templatizeKeys);
         });
     }
     else if (typeof obj === "object") {
-        for (var i in obj) {
+        for (const i in obj) {
             if (obj[i] != null && typeof obj[i] === "object") {
                 clone[i] = _templatizeParentByURL(obj[i], ds, templatizeKeys);
             }
@@ -579,21 +577,21 @@ export function _templatizeParentByURL(obj, ds, templatizeKeys) {
  * @returns The updated instance of the object with as many field references templatized as possible
  */
 export function _templatizeParentByWebMapLayerId(obj, ds, id, templatizeKeys) {
-    var clone = {};
-    var idTest = new RegExp(id, "gm");
+    let clone = {};
+    const idTest = new RegExp(id, "gm");
     if (Array.isArray(obj)) {
-        clone = obj.map(function (c) {
+        clone = obj.map(c => {
             return _templatizeParentByWebMapLayerId(c, ds, id, templatizeKeys);
         });
     }
     else if (typeof obj === "object") {
-        for (var i in obj) {
+        for (const i in obj) {
             if (obj[i] !== null) {
                 // In some web application templates they store a stringified version of an object that can
                 // contain multiple layer references at a very high level on the main values collection.
                 // This was causing many other more typical layer references to be set incorrectly as the first
                 // layerId found in this high level string would be used against the main object.
-                var parsedProp = void 0;
+                let parsedProp;
                 try {
                     parsedProp = JSON.parse(obj[i]);
                 }