fix id checking

Esri · Sep 6, 2024 · 325bd53 · 325bd53
1 parent 37f1ff9
commit 325bd53
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 22 deletions.
diff --git a/demos/compareJSON/package-lock.json b/demos/compareJSON/package-lock.json
diff --git a/demos/compareSolutions/package-lock.json b/demos/compareSolutions/package-lock.json
diff --git a/demos/copyItemInfo/package-lock.json b/demos/copyItemInfo/package-lock.json
diff --git a/demos/copySolutions/package-lock.json b/demos/copySolutions/package-lock.json
diff --git a/demos/createSolution/package-lock.json b/demos/createSolution/package-lock.json
diff --git a/demos/deleteSolution/package-lock.json b/demos/deleteSolution/package-lock.json
diff --git a/demos/deploySolution/package-lock.json b/demos/deploySolution/package-lock.json
diff --git a/demos/getItemInfo/package-lock.json b/demos/getItemInfo/package-lock.json
diff --git a/demos/implementedTypes/package-lock.json b/demos/implementedTypes/package-lock.json
diff --git a/demos/reuseDeployedItems/package-lock.json b/demos/reuseDeployedItems/package-lock.json
diff --git a/demos/verifySolution/package-lock.json b/demos/verifySolution/package-lock.json
diff --git a/packages/creator/src/createItemTemplate.ts b/packages/creator/src/createItemTemplate.ts
@@ -550,30 +550,33 @@ export function _templatizeResources(
             let dataString = JSON.stringify(fileJson);
             if (fileJson && idTest.test(dataString)) {
               const ids: string[] = dataString.match(idTest) as string[];
-              const verifiedIds: string[] = [];
               const promises = [];
               const idLookup = [];
               ids.forEach((id) => {
-                idLookup.push(id);
-                if (verifiedIds.indexOf(id) === -1) {
-                  verifiedIds.push(id);
+                if (idLookup.indexOf(id) === -1) {
+                  idLookup.push(id);
                   promises.push(isItem(id, srcAuthentication));
+                  idLookup.push(id);
                   promises.push(isGroup(id, srcAuthentication));
                 }
               });
 
               // eslint-disable-next-line @typescript-eslint/no-floating-promises
               Promise.all(promises).then((results) => {
+                const verifiedIds = [];
                 results.forEach((isValid, i) => {
                   if (isValid) {
                     const id: string = idLookup[i];
-                    // 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);
+                    if (verifiedIds.indexOf(id) < 0 && 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);
+                      }
+                      verifiedIds.push(id);
                     }
                   }
                 });