Fix tool issue merging tsconfig paths not detecting same state

Author: znorman-harris

package.json

@@ -33,8 +33,8 @@
     "generate-tests": "npm-run-all build-test-maker make-tests lint-tests format-tests",
     "test-libs": "nx run-many --target=test --runInBand --projects=\"tests*\" --parallel=5 && nx run-many --target=test --runInBand --projects=parsing-tokenizer --parallel=5",
     "ng": "nx",
-    "package": "npm i && npm-run-all build-extension pre-package && vsce package",
-    "package-and-test": "npm i && npm-run-all build-extension pre-package test-parsing build-test integration-test && vsce package",
+    "package": "npm i && npm-run-all build-extension pre-package && vsce package --allow-star-activation",
+    "package-and-test": "npm i && npm-run-all build-extension pre-package test-parsing build-test integration-test && vsce package --allow-star-activation",
     "parse-docs": "nx build idl-docs-parser --prod-false && node dist/apps/idl-docs-parser/main.js",
     "pre-package": "rimraf ./node_modules/__ngcc_entry_points__.json",
     "pre-dev": "npm-run-all build-package-json build-webview",

tools/merge-client-web-paths.js

@@ -20,28 +20,41 @@ const base = baseConfig.compilerOptions.paths;
 /** Get existing paths in our second config file */
 const toExtend = extendedConfig.compilerOptions.paths;
 
+/**
+ * Extract any keys that aren't from our lib (i.e. will have polyfills)
+ */
+const saveThese = {};
+
+/** Get all paths in the file to merge */
+const existingPaths = Object.keys(toExtend);
+
+// delete any changed libraries
+for (let i = 0; i < existingPaths.length; i++) {
+  // check for polyfill and not local library
+  if (!existingPaths[i].startsWith('@idl')) {
+    saveThese[existingPaths[i]] = toExtend[existingPaths[i]];
+    delete toExtend[existingPaths[i]];
+    continue;
+  }
+
+  // remove if lib is not in existing source
+  if (!(existingPaths[i] in base) && existingPaths[i] in toExtend) {
+    delete toExtend[existingPaths[i]];
+    changes = true;
+  }
+}
+
 /** Get all paths that should be shared */
 const sharedPaths = Object.keys(base);
 
 /** Track if there are changes */
 let changes = false;
 
-// check for changes - so we dont always break formatting
+// add any missing libraries
 for (let i = 0; i < sharedPaths.length; i++) {
   if (!(sharedPaths[i] in toExtend)) {
+    toExtend[sharedPaths[i]] = base[sharedPaths[i]];
     changes = true;
-    break;
-  }
-}
-
-/** Get all paths in the file to merge */
-const existingPaths = Object.keys(toExtend);
-
-// check for changes - so we dont always break formatting
-for (let i = 0; i < existingPaths.length; i++) {
-  if (!(existingPaths[i] in base)) {
-    changes = true;
-    break;
   }
 }
 
@@ -50,21 +63,8 @@ if (!changes) {
   process.exit();
 }
 
-// check for changes - so we dont always break formatting
-for (let i = 0; i < existingPaths.length; i++) {
-  if (existingPaths[i].startsWith('@idl')) {
-    delete toExtend[existingPaths[i]];
-  }
-}
-
-// Merge paths
-const mergedPaths = {
-  ...baseConfig.compilerOptions.paths,
-  ...extendedConfig.compilerOptions.paths,
-};
-
 // Update extended config
-extendedConfig.compilerOptions.paths = mergedPaths;
+extendedConfig.compilerOptions.paths = { ...toExtend, ...saveThese };
 
 // Write updated config
 fs.writeFileSync(extendedConfigPath, JSON.stringify(extendedConfig, null, 2));