@markw65/monkeyc-optimizer 1.1.67 → 1.1.68

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.68
+
+- Fix a race between removing and creating outputPath that could potentially cause a build to fail
+- Only ignore jungle paths that resolve to `prettierMonkeyC.outputPath` if the pattern is the default, `**.mc`
+- Ignore jungle paths that resolve to `prettierMonkeyC.outputPath`, rather than `bin`.
+- Prevent infinite recursion with cyclic Class graphs. Now gives sensible error messages, and doesn't crash
+- Record barrel paths in build dependencies, so that rebuilding a barrel will cause a re-run of the live analysis
+- Add the jungle as the source file for "unresolved barrel" errors. Lets you know which project caused the error.
+
 ### 1.1.67
 
 - Use the type of a variable, when known, if its the base of a lookup (fixes #35)

package/build/api.cjs

@@ -18,47 +18,47 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_2OEXWI65.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_2OEXWI65.collectNamespaces,
-  createDocumentationMap: () => import_chunk_2OEXWI65.createDocumentationMap,
-  diagnostic: () => import_chunk_2OEXWI65.diagnostic,
-  diagnosticHelper: () => import_chunk_2OEXWI65.diagnosticHelper,
-  findNamesInScope: () => import_chunk_2OEXWI65.findNamesInScope,
-  findUsingForNode: () => import_chunk_2OEXWI65.findUsingForNode,
-  formatAst: () => import_chunk_2OEXWI65.formatAst,
-  formatAstLongLines: () => import_chunk_2OEXWI65.formatAstLongLines,
-  formatScopedName: () => import_chunk_2OEXWI65.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_2OEXWI65.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_2OEXWI65.getApiMapping,
-  getSuperClasses: () => import_chunk_2OEXWI65.getSuperClasses,
+  checkCompilerVersion: () => import_chunk_NGCEDNHJ.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_NGCEDNHJ.collectNamespaces,
+  createDocumentationMap: () => import_chunk_NGCEDNHJ.createDocumentationMap,
+  diagnostic: () => import_chunk_NGCEDNHJ.diagnostic,
+  diagnosticHelper: () => import_chunk_NGCEDNHJ.diagnosticHelper,
+  findNamesInScope: () => import_chunk_NGCEDNHJ.findNamesInScope,
+  findUsingForNode: () => import_chunk_NGCEDNHJ.findUsingForNode,
+  formatAst: () => import_chunk_NGCEDNHJ.formatAst,
+  formatAstLongLines: () => import_chunk_NGCEDNHJ.formatAstLongLines,
+  formatScopedName: () => import_chunk_NGCEDNHJ.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_NGCEDNHJ.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_NGCEDNHJ.getApiMapping,
+  getSuperClasses: () => import_chunk_NGCEDNHJ.getSuperClasses,
   hasProperty: () => import_chunk_MBTLUWXR.hasProperty,
-  isClassVariable: () => import_chunk_2OEXWI65.isClassVariable,
-  isLocal: () => import_chunk_2OEXWI65.isLocal,
-  isLookupCandidate: () => import_chunk_2OEXWI65.isLookupCandidate,
-  isStateNode: () => import_chunk_2OEXWI65.isStateNode,
-  lookupByFullName: () => import_chunk_2OEXWI65.lookupByFullName,
-  lookupNext: () => import_chunk_2OEXWI65.lookupNext,
-  lookupResultContains: () => import_chunk_2OEXWI65.lookupResultContains,
-  lookupWithType: () => import_chunk_2OEXWI65.lookupWithType,
-  makeToyboxLink: () => import_chunk_2OEXWI65.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_2OEXWI65.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_2OEXWI65.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_2OEXWI65.parseSdkVersion,
-  resolveDiagnostics: () => import_chunk_2OEXWI65.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_2OEXWI65.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_2OEXWI65.sameLookupResult,
+  isClassVariable: () => import_chunk_NGCEDNHJ.isClassVariable,
+  isLocal: () => import_chunk_NGCEDNHJ.isLocal,
+  isLookupCandidate: () => import_chunk_NGCEDNHJ.isLookupCandidate,
+  isStateNode: () => import_chunk_NGCEDNHJ.isStateNode,
+  lookupByFullName: () => import_chunk_NGCEDNHJ.lookupByFullName,
+  lookupNext: () => import_chunk_NGCEDNHJ.lookupNext,
+  lookupResultContains: () => import_chunk_NGCEDNHJ.lookupResultContains,
+  lookupWithType: () => import_chunk_NGCEDNHJ.lookupWithType,
+  makeToyboxLink: () => import_chunk_NGCEDNHJ.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_NGCEDNHJ.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_NGCEDNHJ.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_NGCEDNHJ.parseSdkVersion,
+  resolveDiagnostics: () => import_chunk_NGCEDNHJ.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_NGCEDNHJ.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_NGCEDNHJ.sameLookupResult,
   traverseAst: () => import_chunk_MBTLUWXR.traverseAst,
-  variableDeclarationName: () => import_chunk_2OEXWI65.variableDeclarationName,
-  visitReferences: () => import_chunk_2OEXWI65.visitReferences,
-  visit_resources: () => import_chunk_2OEXWI65.visit_resources,
-  visitorNode: () => import_chunk_2OEXWI65.visitorNode
+  variableDeclarationName: () => import_chunk_NGCEDNHJ.variableDeclarationName,
+  visitReferences: () => import_chunk_NGCEDNHJ.visitReferences,
+  visit_resources: () => import_chunk_NGCEDNHJ.visit_resources,
+  visitorNode: () => import_chunk_NGCEDNHJ.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_2OEXWI65 = require("./chunk-2OEXWI65.cjs");
+var import_chunk_NGCEDNHJ = require("./chunk-NGCEDNHJ.cjs");
 var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_2OEXWI65.init_api)();
+(0, import_chunk_NGCEDNHJ.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-2OEXWI65.cjs → chunk-NGCEDNHJ.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_2OEXWI65_exports = {};
-__export(chunk_2OEXWI65_exports, {
+var chunk_NGCEDNHJ_exports = {};
+__export(chunk_NGCEDNHJ_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -135,7 +135,7 @@ __export(chunk_2OEXWI65_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_2OEXWI65_exports);
+module.exports = __toCommonJS(chunk_NGCEDNHJ_exports);
 var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -16626,6 +16626,7 @@ function collectClassInfo(state) {
   const toybox = state.stack[0].sn.decls["Toybox"][0];
   const lang = toybox.decls["Lang"][0];
   const object = lang.decls["Object"];
+  const invalidSymbols = state.config?.checkInvalidSymbols ?? "WARNING";
   state.allClasses.forEach((elm) => {
     if (elm.stack[elm.stack.length - 1].sn.type === "ClassDeclaration") {
       elm.stack = elm.stack.slice(0, 1);
@@ -16640,7 +16641,18 @@ function collectClassInfo(state) {
         (c) => isStateNode(c) && c.type === "ClassDeclaration"
       );
       elm.superClass = superClass && superClass.length ? superClass : true;
-      if (name && elm.superClass !== true) {
+      if (elm.superClass === true) {
+        if (invalidSymbols !== "OFF") {
+          diagnostic(
+            state,
+            elm.node,
+            formatAstLongLines(elm.node.superClass).then(
+              (superClass2) => `Unable to find super class ${superClass2} for ${elm.fullName}`
+            ),
+            invalidSymbols
+          );
+        }
+      } else if (name) {
         if (!elm.decls)
           elm.decls = {};
         elm.decls[name] = elm.superClass;
@@ -16649,24 +16661,44 @@ function collectClassInfo(state) {
       elm.superClass = object;
     }
   });
-  const markOverrides = (cls, scls) => {
+  const markOverrides = (cls, scls, seen) => {
     if (scls === true)
       return;
-    scls.forEach((c) => {
-      c.decls && Object.values(c.decls).forEach((funcs) => {
+    for (let i = scls.length; i--; ) {
+      const c = scls[i];
+      if (!c.decls)
+        continue;
+      if (seen.has(c)) {
+        if (invalidSymbols !== "OFF") {
+          diagnostic(
+            state,
+            cls.node,
+            `Class ${cls.fullName}'s inheritance graph contains a cycle including ${c.fullName}`,
+            invalidSymbols
+          );
+        }
+        scls.splice(i, 1);
+        continue;
+      }
+      Object.values(c.decls).forEach((funcs) => {
         funcs.forEach((f) => {
           if (f.type === "FunctionDeclaration" && (0, import_chunk_MBTLUWXR.hasProperty)(cls.decls, f.name)) {
             f.node.hasOverride = true;
           }
         });
       });
-      if (c.superClass)
-        markOverrides(cls, c.superClass);
-    });
+      if (c.superClass) {
+        seen.add(c);
+        markOverrides(cls, c.superClass, seen);
+        seen.delete(c);
+      }
+    }
   };
   state.allClasses.forEach((elm) => {
-    if (elm.superClass)
-      markOverrides(elm, elm.superClass);
+    if (elm.superClass) {
+      const seen = /* @__PURE__ */ new Set();
+      markOverrides(elm, elm.superClass, seen);
+    }
     if (elm.hasInvoke && elm.decls) {
       Object.values(elm.decls).forEach((funcs) => {
         funcs.forEach((f) => {
@@ -16677,6 +16709,11 @@ function collectClassInfo(state) {
       });
     }
   });
+  state.allClasses.forEach((elm) => {
+    if (elm.superClass && elm.superClass !== true && elm.superClass.length === 0) {
+      elm.superClass = true;
+    }
+  });
 }
 function getFileSources(fnMap) {
   return Promise.all(
@@ -28335,7 +28372,7 @@ function resolve_filename(literal, default_source = null) {
   return path2.resolve(root, literal.value);
 }
 async function resolve_literals(qualifier, default_source, deviceInfo, cache) {
-  const resolve_file_list = (literals) => Promise.all(
+  const resolve_file_list = (literals, checkExists = true) => Promise.all(
     literals.map((v) => {
       if (!isJNode(v)) {
         return v;
@@ -28359,7 +28396,7 @@ async function resolve_literals(qualifier, default_source, deviceInfo, cache) {
         } else {
           cache.resolvedPaths[resolved] = fs5.stat(resolved).then(
             () => true,
-            () => false
+            () => !checkExists
           );
         }
       }
@@ -28370,12 +28407,13 @@ async function resolve_literals(qualifier, default_source, deviceInfo, cache) {
   ).then(
     (results) => results.filter((name) => name != null)
   );
-  const resolve_one_file_list = async (base, name) => {
+  const resolve_one_file_list = async (base, name, checkExists = true) => {
     const bname = base[name];
     if (!bname)
       return;
     const result = await resolve_file_list(
-      bname
+      bname,
+      checkExists
     );
     if (!result || !result.length) {
       delete base[name];
@@ -28387,7 +28425,7 @@ async function resolve_literals(qualifier, default_source, deviceInfo, cache) {
     resolve_one_file_list(qualifier, "sourcePath"),
     resolve_one_file_list(qualifier, "resourcePath"),
     resolve_one_file_list(qualifier, "personality"),
-    resolve_one_file_list(qualifier, "barrelPath")
+    resolve_one_file_list(qualifier, "barrelPath", false)
   ];
   const lang = qualifier["lang"];
   if (lang) {
@@ -28672,23 +28710,32 @@ function identify_optimizer_groups(targets, options) {
     target.group.optimizerConfig.products.push(target.product);
   });
 }
-function find_barrels(barrelPath) {
-  if (Array.isArray(barrelPath)) {
-    return Promise.all(
-      barrelPath.map((path7) => (0, import_chunk_OASVKTK5.globa)(path7, { mark: true }))
-    ).then((paths) => [
-      paths.flat().filter((path7) => path7.endsWith(".jungle")).join(";")
-    ]);
-  }
-  return (0, import_chunk_OASVKTK5.globa)(barrelPath, { mark: true }).then(
+function find_barrels(barrelPath, buildDependencies) {
+  return (Array.isArray(barrelPath) ? (
+    // This is a sublist. The barrel has more than one jungle file.
+    Promise.all(barrelPath.map((path7) => (0, import_chunk_OASVKTK5.globa)(path7, { mark: true }))).then(
+      (paths) => [
+        paths.flat().filter((path7) => path7.endsWith(".jungle")).join(";")
+      ]
+    )
+  ) : (0, import_chunk_OASVKTK5.globa)(barrelPath, { mark: true }).then(
     (paths) => Promise.all(
       paths.map(
         (path7) => path7.endsWith("/") ? (0, import_chunk_OASVKTK5.globa)(`${path7}**/*.barrel`) : path7
       )
     )
   ).then(
-    (barrelPaths) => barrelPaths.flat().filter((path7) => path7.endsWith(".jungle") || path7.endsWith(".barrel"))
-  );
+    (barrelPaths) => barrelPaths.flat().filter(
+      (path7) => path7.endsWith(".jungle") || path7.endsWith(".barrel")
+    )
+  )).then((paths) => {
+    (0, import_chunk_OASVKTK5.forEach)(
+      barrelPath,
+      (path7) => /[*?[\]{}]/.test(path7) || (buildDependencies[path7] = true)
+    );
+    paths.forEach((path7) => buildDependencies[path7] = true);
+    return paths;
+  });
 }
 function resolve_barrel(barrel, barrelDir, products, options, cache, buildDependencies) {
   if ((0, import_chunk_MBTLUWXR.hasProperty)(cache.barrels, barrel)) {
@@ -28734,7 +28781,7 @@ function resolve_barrel(barrel, barrelDir, products, options, cache, buildDepend
     throw e;
   });
 }
-function resolve_barrels(product, qualifier, barrels, products, options, cache, buildDependencies) {
+function resolve_barrels(jungle, product, qualifier, barrels, products, options, cache, buildDependencies) {
   if (qualifier.annotations) {
     Object.keys(qualifier.annotations).forEach((key) => {
       if (!barrels.includes(key)) {
@@ -28772,7 +28819,7 @@ function resolve_barrels(product, qualifier, barrels, products, options, cache,
     barrels.map((b) => [b, null])
   );
   return (qualifier.barrelPath || []).reduce(
-    (promise, barrelPath) => promise.then(() => find_barrels(barrelPath)).then((barrelPaths) => {
+    (promise, barrelPath) => promise.then(() => find_barrels(barrelPath, buildDependencies)).then((barrelPaths) => {
       return Promise.all(
         barrelPaths.map(
           (barrel) => resolve_barrel(
@@ -28809,9 +28856,11 @@ function resolve_barrels(product, qualifier, barrels, products, options, cache,
   ).then(() => {
     const unresolved = Object.entries(barrelMap).filter((v) => v[1] === null);
     if (unresolved.length) {
-      throw new Error(
+      const e = new Error(
         `Failed to resolve some barrels: ${unresolved.map(([name]) => name).join(",")}`
       );
+      e.source = jungle;
+      throw e;
     }
     const finalMap = barrelMap;
     if (!cache.barrelMap)
@@ -28876,6 +28925,7 @@ async function get_jungle_and_barrels(jungleFiles, defaultProducts, options, cac
       ).then((qualifier) => {
         targets.push({ product, qualifier, shape });
         return resolve_barrels(
+          jungles[0],
           product,
           qualifier,
           barrels,
@@ -29295,17 +29345,14 @@ async function generateOptimizedProject(options) {
     let hasPersonality = false;
     const promises = Object.keys(buildConfigs).sort().map((key) => {
       const buildConfig = buildConfigs[key];
-      const outputPath = path4.join(config.outputPath, key);
       return buildConfig ? runTaskInPool({
         type: "generateOneConfig",
         data: {
           buildConfig,
           manifestXML: xml,
           dependencyFiles,
-          config: {
-            ...config,
-            outputPath
-          }
+          config,
+          key
         }
       }).catch((e) => {
         if (!e.stack) {
@@ -29324,7 +29371,7 @@ async function generateOptimizedProject(options) {
         if (t.sdkVersion != null && t.sdkVersion >= 4002001) {
           hasPersonality = true;
         }
-      }) : fs6.rm(path4.resolve(workspace, outputPath), {
+      }) : fs6.rm(path4.resolve(workspace, config.outputPath, key), {
         recursive: true,
         force: true
       });
@@ -29477,30 +29524,48 @@ async function generateOptimizedProject(options) {
     diagnostics
   };
 }
-async function filesFromPaths(workspace, paths, extension) {
-  paths = (await Promise.all(
-    paths?.map((pattern) => (0, import_chunk_OASVKTK5.globa)(pattern, { cwd: workspace, mark: true })) || []
+async function filesFromPaths(workspace, buildDir, inPaths, extension) {
+  const filter = buildDir.startsWith(workspace);
+  const paths = (await Promise.all(
+    inPaths?.map(
+      (pattern) => (0, import_chunk_OASVKTK5.globa)(pattern, { cwd: workspace, mark: true }).then(
+        (paths2) => paths2.map((p) => ({
+          path: p,
+          filter: filter && /^\*\*[\\/]\*.mc$/i.test(path4.relative(workspace, pattern))
+        }))
+      )
+    ) || []
   )).flat();
   const files = await Promise.all(
     paths.map(
-      (path7) => path7.endsWith("/") ? (0, import_chunk_OASVKTK5.globa)(`${path7}**/*${extension}`, { cwd: workspace, mark: true }) : path7
+      (result) => result.path.endsWith("/") ? (0, import_chunk_OASVKTK5.globa)(`${result.path}**/*${extension}`, {
+        cwd: workspace,
+        mark: true
+      }).then(
+        (paths2) => paths2.map((path7) => ({
+          path: path7,
+          filter: result.filter
+        }))
+      ) : result
     )
   );
   return {
     files: files.flat().filter(
-      (file) => file.endsWith(extension) && !path4.relative(workspace, file).startsWith("bin")
-    ),
-    paths
+      (file) => file.path.endsWith(extension) && (!file.filter || !file.path.startsWith(buildDir))
+    ).map(({ path: path7 }) => path7),
+    paths: paths.map(({ path: path7 }) => path7)
   };
 }
-async function fileInfoFromConfig(workspace, output, buildConfig, extraExcludes, barrel) {
+async function fileInfoFromConfig(workspace, buildDir, output, buildConfig, extraExcludes, barrel) {
   const { files, paths } = await filesFromPaths(
     workspace,
+    buildDir,
     buildConfig.sourcePath,
     ".mc"
   );
   const { files: personalityFiles } = await filesFromPaths(
     workspace,
+    buildDir,
     buildConfig.personality,
     ".mss"
   );
@@ -29538,9 +29603,10 @@ function excludesFromAnnotations(barrel, annotations, resolvedBarrel) {
   }
   return excludes;
 }
-async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, config) {
+async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, config, key) {
   const { workspace } = config;
-  const output = path4.join(workspace, config.outputPath);
+  const outputRoot = path4.resolve(workspace, config.outputPath);
+  const output = path4.join(outputRoot, key);
   const buildModeExcludes = {
     // note: exclude debug in release builds, and release in debug builds
     [config.releaseBuild ? "debug" : "release"]: true
@@ -29554,6 +29620,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
   }
   const { fnMap } = await fileInfoFromConfig(
     workspace,
+    outputRoot,
     path4.join(output, "source"),
     buildConfig,
     buildModeExcludes,
@@ -29571,6 +29638,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
         );
         return fileInfoFromConfig(
           path4.dirname(resolvedBarrel.jungles[0]),
+          outputRoot,
           path4.join(output, "barrels", barrel),
           resolvedBarrel.qualifier,
           {
@@ -29586,9 +29654,9 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       }).flat()
     );
     barrelFnMaps.forEach(
-      (barrelFnMap) => Object.entries(barrelFnMap).forEach(([key, value2]) => {
-        if (!(0, import_chunk_MBTLUWXR.hasProperty)(fnMap, key)) {
-          fnMap[key] = value2;
+      (barrelFnMap) => Object.entries(barrelFnMap).forEach(([key2, value2]) => {
+        if (!(0, import_chunk_MBTLUWXR.hasProperty)(fnMap, key2)) {
+          fnMap[key2] = value2;
         }
       })
     );
@@ -29615,7 +29683,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_OASVKTK5.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1720052616198 < opt_time) {
+      if (source_time < opt_time && 1720645332171 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29624,13 +29692,12 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       }
     }
   }
-  const [, , prettierConfig] = await Promise.all([
-    fs6.rm(output, { recursive: true, force: true }),
-    fs6.mkdir(output, { recursive: true }),
+  const [prettierConfig] = await Promise.all([
     Prettier2.resolveConfig(config.workspace, {
       useCache: false,
       editorconfig: true
-    })
+    }),
+    fs6.rm(output, { recursive: true, force: true }).then(() => fs6.mkdir(output, { recursive: true }))
   ]);
   return optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config).then(
     ({ diagnostics, sdkVersion }) => {
@@ -29654,7 +29721,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.67",
+            optimizerVersion: "1.1.68",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -29699,11 +29766,13 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
     }
     return product;
   });
+  const { workspace, outputPath } = options;
   const { fnMap, paths } = await Promise.all(
     Array.from(qualifiers).map(
       ([name, qualifier]) => fileInfoFromConfig(
         qualifier.root,
-        options.workspace,
+        path4.resolve(workspace, outputPath ?? "bin/optimized"),
+        workspace,
         {
           sourcePath: Array.from(qualifier.sourcePath),
           personality: Array.from(qualifier.personality),
@@ -29820,6 +29889,7 @@ var init_optimizer = (0, import_chunk_ABYVSU2C.__esm)({
     init_launch();
     init_manifest();
     init_mc_rewrite();
+    init_pragma_checker();
     init_sdk_util();
     init_type_flow();
     init_could_be();
@@ -29827,7 +29897,6 @@ var init_optimizer = (0, import_chunk_ABYVSU2C.__esm)({
     init_sub_type();
     (0, import_chunk_OASVKTK5.init_util)();
     init_worker_pool();
-    init_pragma_checker();
     init_optimizer_types();
     init_types();
     defaultConfig = {
@@ -29913,7 +29982,8 @@ var init_worker_task = (0, import_chunk_ABYVSU2C.__esm)({
           data.buildConfig,
           data.manifestXML,
           data.dependencyFiles,
-          data.config
+          data.config,
+          data.key
         );
       },
       optimizePrgAndDebug(data) {

package/build/optimizer.cjs

@@ -18,30 +18,30 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_2OEXWI65.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_2OEXWI65.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_2OEXWI65.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_NGCEDNHJ.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_NGCEDNHJ.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_NGCEDNHJ.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_OASVKTK5.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_2OEXWI65.defaultConfig,
-  display: () => import_chunk_2OEXWI65.display,
-  generateOneConfig: () => import_chunk_2OEXWI65.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_2OEXWI65.generateOptimizedProject,
-  getConfig: () => import_chunk_2OEXWI65.getConfig,
-  getFnMapAnalysis: () => import_chunk_2OEXWI65.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_2OEXWI65.getProjectAnalysis,
-  get_jungle: () => import_chunk_2OEXWI65.get_jungle,
-  isErrorWithLocation: () => import_chunk_2OEXWI65.isErrorWithLocation,
-  launchSimulator: () => import_chunk_2OEXWI65.launchSimulator,
-  manifestProducts: () => import_chunk_2OEXWI65.manifestProducts,
-  mctree: () => import_chunk_2OEXWI65.mctree,
-  simulateProgram: () => import_chunk_2OEXWI65.simulateProgram
+  defaultConfig: () => import_chunk_NGCEDNHJ.defaultConfig,
+  display: () => import_chunk_NGCEDNHJ.display,
+  generateOneConfig: () => import_chunk_NGCEDNHJ.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_NGCEDNHJ.generateOptimizedProject,
+  getConfig: () => import_chunk_NGCEDNHJ.getConfig,
+  getFnMapAnalysis: () => import_chunk_NGCEDNHJ.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_NGCEDNHJ.getProjectAnalysis,
+  get_jungle: () => import_chunk_NGCEDNHJ.get_jungle,
+  isErrorWithLocation: () => import_chunk_NGCEDNHJ.isErrorWithLocation,
+  launchSimulator: () => import_chunk_NGCEDNHJ.launchSimulator,
+  manifestProducts: () => import_chunk_NGCEDNHJ.manifestProducts,
+  mctree: () => import_chunk_NGCEDNHJ.mctree,
+  simulateProgram: () => import_chunk_NGCEDNHJ.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_2OEXWI65 = require("./chunk-2OEXWI65.cjs");
+var import_chunk_NGCEDNHJ = require("./chunk-NGCEDNHJ.cjs");
 var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_2OEXWI65.init_optimizer)();
+(0, import_chunk_NGCEDNHJ.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,

package/build/sdk-util.cjs

@@ -18,25 +18,25 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var sdk_util_exports = {};
 __export(sdk_util_exports, {
-  SectionKinds: () => import_chunk_2OEXWI65.SectionKinds,
-  appSupport: () => import_chunk_2OEXWI65.appSupport,
-  connectiq: () => import_chunk_2OEXWI65.connectiq,
-  getDeviceInfo: () => import_chunk_2OEXWI65.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_2OEXWI65.getFunctionDocumentation,
-  getLanguages: () => import_chunk_2OEXWI65.getLanguages,
-  getSdkPath: () => import_chunk_2OEXWI65.getSdkPath,
-  isWin: () => import_chunk_2OEXWI65.isWin,
-  optimizeProgram: () => import_chunk_2OEXWI65.optimizeProgram,
-  readPrg: () => import_chunk_2OEXWI65.readPrg,
-  readPrgWithOffsets: () => import_chunk_2OEXWI65.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_2OEXWI65.xml_util_exports
+  SectionKinds: () => import_chunk_NGCEDNHJ.SectionKinds,
+  appSupport: () => import_chunk_NGCEDNHJ.appSupport,
+  connectiq: () => import_chunk_NGCEDNHJ.connectiq,
+  getDeviceInfo: () => import_chunk_NGCEDNHJ.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_NGCEDNHJ.getFunctionDocumentation,
+  getLanguages: () => import_chunk_NGCEDNHJ.getLanguages,
+  getSdkPath: () => import_chunk_NGCEDNHJ.getSdkPath,
+  isWin: () => import_chunk_NGCEDNHJ.isWin,
+  optimizeProgram: () => import_chunk_NGCEDNHJ.optimizeProgram,
+  readPrg: () => import_chunk_NGCEDNHJ.readPrg,
+  readPrgWithOffsets: () => import_chunk_NGCEDNHJ.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_NGCEDNHJ.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_2OEXWI65 = require("./chunk-2OEXWI65.cjs");
+var import_chunk_NGCEDNHJ = require("./chunk-NGCEDNHJ.cjs");
 var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_2OEXWI65.init_sdk_util)();
+(0, import_chunk_NGCEDNHJ.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/optimizer.d.ts

@@ -82,7 +82,7 @@ export type Analysis = {
  * @param {string[]} dependencyFiles
  * @returns
  */
-export declare function generateOneConfig(buildConfig: JungleQualifier, manifestXML: xmlUtil.Document, dependencyFiles: string[], config: BuildConfig): Promise<{
+export declare function generateOneConfig(buildConfig: JungleQualifier, manifestXML: xmlUtil.Document, dependencyFiles: string[], config: BuildConfig, key: string): Promise<{
     hasTests: boolean;
     diagnostics: ProgramState["diagnostics"];
     sdkVersion: number | undefined;

package/build/src/worker-task.d.ts

@@ -21,6 +21,7 @@ interface GenerateOneConfig extends BaseNode {
         manifestXML: xmlUtil.Document;
         dependencyFiles: string[];
         config: BuildConfig;
+        key: string;
     };
 }
 interface GenerateOptimizedProject extends BaseNode {

package/build/worker-thread.cjs

@@ -21,17 +21,17 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_2OEXWI65 = require("./chunk-2OEXWI65.cjs");
+var import_chunk_NGCEDNHJ = require("./chunk-NGCEDNHJ.cjs");
 var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var import_node_worker_threads = require("node:worker_threads");
 var require_worker_thread = (0, import_chunk_ABYVSU2C.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_2OEXWI65.init_worker_task)();
+    (0, import_chunk_NGCEDNHJ.init_worker_task)();
     if (import_node_worker_threads.parentPort) {
       import_node_worker_threads.parentPort.on("message", async (task) => {
-        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_2OEXWI65.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_NGCEDNHJ.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.67",
+  "version": "1.1.68",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",