@markw65/monkeyc-optimizer 1.1.73 → 1.1.75

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.75
+
+- Fix issues using personality files from barrels
+- Fix issues with enums values as the base of member expressions
+- Handle `new` expressions as references to the `initialize` method
+- Classes without an explicit `initialize` method get an implicit, empty `initialize`, rather than inheriting the parent's
+- Fix `subtypeOf` for function types.
+- Update tests to work with sdk-7.2.1 and later
+
+### 1.1.74
+
+- Add refs from drawable-ids to the corresponding drawable (Fixes prettier-extension-monkeyc#20)
+- Fix handling of 'identifier' params in resource files (Fixes prettier-extension-monkeyc#21)
+- Fix a bug filtering out generated files on Windows (Fixes #45)
+
 ### 1.1.73
 
 - Fix an issue formatting body-less class/module/program nodes.

package/build/api.cjs

@@ -18,50 +18,50 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_XNAPUWVE.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_XNAPUWVE.collectNamespaces,
-  createDocumentationMap: () => import_chunk_XNAPUWVE.createDocumentationMap,
-  diagnostic: () => import_chunk_XNAPUWVE.diagnostic,
-  diagnosticHelper: () => import_chunk_XNAPUWVE.diagnosticHelper,
-  findNamesInScope: () => import_chunk_XNAPUWVE.findNamesInScope,
-  findUsingForNode: () => import_chunk_XNAPUWVE.findUsingForNode,
-  formatAst: () => import_chunk_XNAPUWVE.formatAst,
-  formatAstLongLines: () => import_chunk_XNAPUWVE.formatAstLongLines,
-  formatScopedName: () => import_chunk_XNAPUWVE.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_XNAPUWVE.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_XNAPUWVE.getApiMapping,
-  getSuperClasses: () => import_chunk_XNAPUWVE.getSuperClasses,
-  handleImportUsing: () => import_chunk_XNAPUWVE.handleImportUsing,
+  checkCompilerVersion: () => import_chunk_7GXXJDR3.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_7GXXJDR3.collectNamespaces,
+  createDocumentationMap: () => import_chunk_7GXXJDR3.createDocumentationMap,
+  diagnostic: () => import_chunk_7GXXJDR3.diagnostic,
+  diagnosticHelper: () => import_chunk_7GXXJDR3.diagnosticHelper,
+  findNamesInScope: () => import_chunk_7GXXJDR3.findNamesInScope,
+  findUsingForNode: () => import_chunk_7GXXJDR3.findUsingForNode,
+  formatAst: () => import_chunk_7GXXJDR3.formatAst,
+  formatAstLongLines: () => import_chunk_7GXXJDR3.formatAstLongLines,
+  formatScopedName: () => import_chunk_7GXXJDR3.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_7GXXJDR3.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_7GXXJDR3.getApiMapping,
+  getSuperClasses: () => import_chunk_7GXXJDR3.getSuperClasses,
+  handleImportUsing: () => import_chunk_7GXXJDR3.handleImportUsing,
   hasProperty: () => import_chunk_JDC43A3I.hasProperty,
-  isClassVariable: () => import_chunk_XNAPUWVE.isClassVariable,
-  isLocal: () => import_chunk_XNAPUWVE.isLocal,
-  isLookupCandidate: () => import_chunk_XNAPUWVE.isLookupCandidate,
-  isStateNode: () => import_chunk_XNAPUWVE.isStateNode,
-  lookupByFullName: () => import_chunk_XNAPUWVE.lookupByFullName,
-  lookupNext: () => import_chunk_XNAPUWVE.lookupNext,
-  lookupResultContains: () => import_chunk_XNAPUWVE.lookupResultContains,
-  lookupWithType: () => import_chunk_XNAPUWVE.lookupWithType,
-  makeToyboxLink: () => import_chunk_XNAPUWVE.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_XNAPUWVE.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_XNAPUWVE.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_XNAPUWVE.parseSdkVersion,
-  popRootNode: () => import_chunk_XNAPUWVE.popRootNode,
-  pushRootNode: () => import_chunk_XNAPUWVE.pushRootNode,
-  resolveDiagnostics: () => import_chunk_XNAPUWVE.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_XNAPUWVE.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_XNAPUWVE.sameLookupResult,
+  isClassVariable: () => import_chunk_7GXXJDR3.isClassVariable,
+  isLocal: () => import_chunk_7GXXJDR3.isLocal,
+  isLookupCandidate: () => import_chunk_7GXXJDR3.isLookupCandidate,
+  isStateNode: () => import_chunk_7GXXJDR3.isStateNode,
+  lookupByFullName: () => import_chunk_7GXXJDR3.lookupByFullName,
+  lookupNext: () => import_chunk_7GXXJDR3.lookupNext,
+  lookupResultContains: () => import_chunk_7GXXJDR3.lookupResultContains,
+  lookupWithType: () => import_chunk_7GXXJDR3.lookupWithType,
+  makeToyboxLink: () => import_chunk_7GXXJDR3.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_7GXXJDR3.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_7GXXJDR3.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_7GXXJDR3.parseSdkVersion,
+  popRootNode: () => import_chunk_7GXXJDR3.popRootNode,
+  pushRootNode: () => import_chunk_7GXXJDR3.pushRootNode,
+  resolveDiagnostics: () => import_chunk_7GXXJDR3.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_7GXXJDR3.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_7GXXJDR3.sameLookupResult,
   traverseAst: () => import_chunk_JDC43A3I.traverseAst,
-  variableDeclarationName: () => import_chunk_XNAPUWVE.variableDeclarationName,
-  visitReferences: () => import_chunk_XNAPUWVE.visitReferences,
-  visit_resources: () => import_chunk_XNAPUWVE.visit_resources,
-  visitorNode: () => import_chunk_XNAPUWVE.visitorNode
+  variableDeclarationName: () => import_chunk_7GXXJDR3.variableDeclarationName,
+  visitReferences: () => import_chunk_7GXXJDR3.visitReferences,
+  visit_resources: () => import_chunk_7GXXJDR3.visit_resources,
+  visitorNode: () => import_chunk_7GXXJDR3.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_XNAPUWVE = require("./chunk-XNAPUWVE.cjs");
+var import_chunk_7GXXJDR3 = require("./chunk-7GXXJDR3.cjs");
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_XNAPUWVE.init_api)();
+(0, import_chunk_7GXXJDR3.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-XNAPUWVE.cjs → chunk-7GXXJDR3.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_XNAPUWVE_exports = {};
-__export(chunk_XNAPUWVE_exports, {
+var chunk_7GXXJDR3_exports = {};
+__export(chunk_7GXXJDR3_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -138,7 +138,7 @@ __export(chunk_XNAPUWVE_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_XNAPUWVE_exports);
+module.exports = __toCommonJS(chunk_7GXXJDR3_exports);
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -8725,7 +8725,7 @@ function subtypeOfValue(pair) {
     case 8192: {
       const asd = pair.avalue;
       const bsd = pair.bvalue;
-      return (0, import_chunk_NHZRKHZO.some)(asd, (sna) => (0, import_chunk_NHZRKHZO.some)(bsd, (snb) => sna === snb));
+      return (0, import_chunk_NHZRKHZO.every)(asd, (sna) => (0, import_chunk_NHZRKHZO.some)(bsd, (snb) => sna === snb));
     }
     case 16384: {
       const asd = pair.avalue;
@@ -10588,8 +10588,9 @@ function pushScopedNameType(istate, node, object) {
   if (istate.typeMap) {
     result = istate.typeMap.get(node);
     if (!result && object && node.type === "MemberExpression" && !node.computed) {
-      istate.typeMap.set(node.object, object.value);
-      const resolved = resolveDottedMember(istate, object.value, node);
+      const objectType = deEnumerate(object.value);
+      istate.typeMap.set(node.object, objectType);
+      const resolved = resolveDottedMember(istate, objectType, node);
       if (resolved) {
         result = resolved.property;
         if (resolved.mayThrow) {
@@ -10944,7 +10945,7 @@ function evaluateNode(istate, node) {
       if (!isLookupCandidate(node)) {
         const property = popIstate(istate, node.property);
         const object = popIstate(istate, node.object);
-        const objectType = object.value;
+        const objectType = deEnumerate(object.value);
         let byteArray = false;
         if (objectType.type & 32768 && objectType.value) {
           const odata = getObjectValue(objectType);
@@ -11115,29 +11116,26 @@ function evaluateNode(istate, node) {
       if (isExact(klass.value) && klass.value.type === 16384) {
         obj.value = { klass: klass.value };
         if (istate.checkTypes && klass.value.value) {
-          const results = lookupNext(
-            istate.state,
-            [
-              {
-                parent: null,
-                results: Array.isArray(klass.value.value) ? klass.value.value : [klass.value.value]
-              }
-            ],
-            "decls",
-            { type: "Identifier", name: "initialize" }
+          const callees = (0, import_chunk_NHZRKHZO.map)(
+            klass.value.value,
+            (klass2) => klass2.decls?.initialize
+          ).flat().filter(
+            (result) => result?.type === "FunctionDeclaration"
           );
-          if (results) {
-            const callees = results.flatMap(
-              (lookupDef) => lookupDef.results.filter(
-                (result) => result.type === "FunctionDeclaration"
-              )
-            );
+          if (callees.length) {
             checkCallArgs(
               istate,
               node,
               callees,
               args.map(({ value: value2 }) => value2)
             );
+          } else if (args.length) {
+            diagnostic(
+              istate.state,
+              node,
+              `initialize method expected no args, but got ${args.length}`,
+              istate.checkTypes
+            );
           }
         }
       }
@@ -13572,11 +13570,23 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
   function getStateType(blockState, decl) {
     return getStateEntry(blockState, decl).curType;
   }
-  function getStateEntry(blockState, decl) {
+  function getStateEntry(blockState, decl, node) {
     if (Array.isArray(decl) || decl.type !== "MemberDecl" && decl.type !== "Unknown") {
       let tsVal = blockState.map.get(decl);
       if (!tsVal) {
-        tsVal = { curType: typeConstraint(decl, blockState) };
+        const t = typeConstraint(decl, blockState);
+        if (node?.type === "MemberExpression" && !node.computed) {
+          const baseType = typeMap.get(node.object);
+          if (baseType) {
+            const r = evaluate(istate, node).value;
+            if (subtypeOf(r, t)) {
+              tsVal = { curType: r };
+            }
+          }
+        }
+        if (!tsVal) {
+          tsVal = { curType: t };
+        }
         blockState.map.set(decl, tsVal);
       }
       return tsVal;
@@ -13989,7 +13999,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         break;
       }
       case "ref": {
-        const curEntry = getStateEntry(curState, event.decl);
+        const curEntry = getStateEntry(curState, event.decl, event.node);
         typeMap.set(event.node, curEntry.curType);
         nodeEquivs.delete(event.node);
         if (curEntry.equivSet) {
@@ -16923,8 +16933,10 @@ function collectClassInfo(state) {
 }
 function getFileSources(fnMap) {
   return Promise.all(
-    Object.entries(fnMap).map(([name, value2]) => {
-      return value2.monkeyCSource || fs.readFile(name).then(
+    Object.values(fnMap).map((value2) => {
+      if (value2.monkeyCSource)
+        return value2.monkeyCSource;
+      return fs.readFile(value2.name).then(
         (data) => value2.monkeyCSource = data.toString().replace(/\r\n/g, "\n")
       );
     })
@@ -16934,12 +16946,12 @@ function getFileSources(fnMap) {
 }
 function getFileASTs(fnMap) {
   return getFileSources(fnMap).then(
-    () => Object.entries(fnMap).reduce((ok, [name, value2]) => {
+    () => Object.values(fnMap).reduce((ok, value2) => {
       if (!value2.ast && !value2.parserError) {
         const options = {
-          filepath: name
+          filepath: value2.name
         };
-        if (/\.mss$/i.test(name)) {
+        if (/\.mss$/i.test(value2.name)) {
           options.mss = value2.barrel;
         }
         try {
@@ -17026,12 +17038,12 @@ async function analyze(fnMap, resourcesMap, manifestXML, config, allowParseError
   markApi = false;
   const state = preState;
   await getFileASTs(fnMap);
-  Object.entries(fnMap).forEach(([name, value2]) => {
+  Object.values(fnMap).forEach((value2) => {
     const { ast, parserError } = value2;
     if (!ast) {
       if (allowParseErrors)
         return;
-      throw parserError || new Error(`Failed to parse ${name}`);
+      throw parserError || new Error(`Failed to parse ${value2.name}`);
     }
     hasTests = false;
     collectNamespaces(ast, state);
@@ -17732,8 +17744,8 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
   }
   const diagnostics = state.diagnostics && await resolveDiagnosticsMap(state.diagnostics);
   if (state.config?.checkBuildPragmas) {
-    Object.entries(fnMap).forEach(([name, f]) => {
-      pragmaChecker(state, f.ast, diagnostics?.[name]);
+    Object.values(fnMap).forEach((f) => {
+      pragmaChecker(state, f.ast, diagnostics?.[f.name]);
     });
   }
   return {
@@ -18263,7 +18275,7 @@ function visit_resource_refs(state, doc, e, barrelNames) {
         }
       }
     }
-    if ((0, import_chunk_JDC43A3I.hasProperty)(skip, name) || /^\d+(\.\d+)?%?$/.test(name)) {
+    if (skip === true || (0, import_chunk_JDC43A3I.hasProperty)(skip, name) || /^\d+(\.\d+)?%?$/.test(name)) {
       return;
     }
     if (/^([-\w_$]+\s*\.\s*)*[-\w_$]+$/.test(name)) {
@@ -18357,6 +18369,13 @@ function visit_resource_refs(state, doc, e, barrelNames) {
       case "drawable":
         if (id === "class") {
           parseArg(dotted, l);
+        } else if (id === "id" && !element.attr.class) {
+          if (/^\w+$/.test(dotted)) {
+            const base = (0, import_chunk_JDC43A3I.makeScopedName)(`Rez.Drawables`);
+            const idLoc = (0, import_chunk_JDC43A3I.adjustLoc)(l, 0, 0);
+            const id2 = (0, import_chunk_JDC43A3I.makeIdentifier)(dotted, idLoc);
+            result.push((0, import_chunk_JDC43A3I.makeMemberExpression)((0, import_chunk_JDC43A3I.withLoc)(base, id2, false), id2));
+          }
         }
         return;
       case "shape":
@@ -18615,7 +18634,8 @@ var init_resources = (0, import_chunk_ABYVSU2C.__esm)({
       foreground: {},
       background: {},
       font: {},
-      justification: {}
+      justification: {},
+      identifier: true
     };
   }
 });
@@ -18629,6 +18649,9 @@ function visitorNode(node) {
   if (node.type === "BinaryExpression" && node.operator === "has" && node.right.type === "UnaryExpression" && node.right.operator === ":") {
     return node.right.argument;
   }
+  if (node.type === "NewExpression") {
+    return visitorNode(node.callee);
+  }
   return node;
 }
 function visitReferences(state, ast, name, defn, callback, includeDefs = false, filter = null, typeMap = null, findSingleDefinition = false) {
@@ -18716,6 +18739,42 @@ function visitReferences(state, ast, name, defn, callback, includeDefs = false,
             return ["arguments"];
           }
           break;
+        case "NewExpression": {
+          const [name2, results] = lookup2(node.callee, true);
+          if (!results)
+            break;
+          const initializers = /* @__PURE__ */ new Map();
+          results.forEach((result) => {
+            result.results.forEach((klass) => {
+              if (klass.type !== "ClassDeclaration")
+                return;
+              const inits = klass.decls?.["initialize"];
+              inits?.forEach((init) => {
+                if (init.type === "FunctionDeclaration") {
+                  const existing = initializers.get(klass);
+                  if (existing) {
+                    existing.push(init);
+                  } else {
+                    initializers.set(klass, [init]);
+                  }
+                }
+              });
+            });
+          });
+          if (initializers.size) {
+            checkResults(
+              [
+                name2,
+                Array.from(initializers).map(([parent, results2]) => ({
+                  parent,
+                  results: results2
+                }))
+              ],
+              node
+            );
+          }
+          break;
+        }
         case "Identifier":
           if (!name || node.name === name) {
             return checkResults(lookup2(node), node);
@@ -29969,7 +30028,7 @@ async function filesFromPaths(workspace, buildDir, inPaths, extension) {
       (pattern) => (0, import_chunk_NHZRKHZO.globa)(pattern, { cwd: workspace, mark: true }).then(
         (paths2) => paths2.map((p) => ({
           path: p,
-          filter: filter && /^\*\*[\\/]\*.mc$/i.test(path4.relative(workspace, pattern))
+          filter: filter && /^\*\*[\\/]\*\.mc$/i.test(path4.relative(workspace, pattern))
         }))
       )
     ) || []
@@ -29987,11 +30046,12 @@ async function filesFromPaths(workspace, buildDir, inPaths, extension) {
       ) : result
     )
   );
+  const buildDirNormalized = buildDir.replace(/\\/g, "/");
   return {
     files: files.flat().filter(
-      (file) => file.path.endsWith(extension) && (!file.filter || !file.path.startsWith(buildDir))
+      (file) => file.path.endsWith(extension) && (!file.filter || !file.path.startsWith(buildDirNormalized))
     ).map(({ path: path7 }) => path7),
-    paths: paths.map(({ path: path7 }) => path7)
+    paths: paths.filter(({ path: path7 }) => path7.endsWith("/")).map(({ path: path7 }) => path7)
   };
 }
 async function fileInfoFromConfig(workspace, buildDir, output, buildConfig, extraExcludes, barrel) {
@@ -30020,6 +30080,7 @@ async function fileInfoFromConfig(workspace, buildDir, output, buildConfig, extr
       ).concat(personalityFiles).map((file) => [
         file,
         {
+          name: file,
           output: path4.join(
             output,
             relative_path_no_dotdot(path4.relative(workspace, file))
@@ -30093,7 +30154,9 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
     );
     barrelFnMaps.forEach(
       (barrelFnMap) => Object.entries(barrelFnMap).forEach(([key2, value2]) => {
-        if (!(0, import_chunk_JDC43A3I.hasProperty)(fnMap, key2)) {
+        if (fnMap[key2]) {
+          fnMap[key2 + "::" + value2.barrel] = value2;
+        } else {
           fnMap[key2] = value2;
         }
       })
@@ -30121,7 +30184,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_NHZRKHZO.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1722003035546 < opt_time) {
+      if (source_time < opt_time && 1726412336564 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -30159,7 +30222,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.73",
+            optimizerVersion: "1.1.75",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -30224,9 +30287,13 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
     (results) => results.reduce((cur, result) => {
       if (!cur)
         return result;
-      Object.entries(result.fnMap).forEach(
-        ([key, value2]) => cur.fnMap[key] || (cur.fnMap[key] = value2)
-      );
+      Object.entries(result.fnMap).forEach(([key, value2]) => {
+        if (cur.fnMap[key]) {
+          cur.fnMap[key + "::" + value2.barrel] = value2;
+        } else {
+          cur.fnMap[key] = value2;
+        }
+      });
       cur.paths.push(...result.paths);
       return cur;
     }, null)
@@ -30274,8 +30341,8 @@ async function getFnMapAnalysis(fnMap, resourcesMap, manifestXML, options) {
   const typeMap = await analyze_module_types(state);
   const diagnostics = state.diagnostics && await resolveDiagnosticsMap(state.diagnostics);
   if (state.config?.checkBuildPragmas) {
-    Object.entries(fnMap).forEach(
-      ([name, f]) => f.ast && pragmaChecker(state, f.ast, diagnostics?.[name])
+    Object.values(fnMap).forEach(
+      (f) => f.ast && pragmaChecker(state, f.ast, diagnostics?.[f.name])
     );
   }
   return { fnMap, state, typeMap };

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_XNAPUWVE.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_XNAPUWVE.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_XNAPUWVE.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_7GXXJDR3.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_7GXXJDR3.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_7GXXJDR3.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_NHZRKHZO.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_XNAPUWVE.defaultConfig,
-  display: () => import_chunk_XNAPUWVE.display,
-  generateOneConfig: () => import_chunk_XNAPUWVE.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_XNAPUWVE.generateOptimizedProject,
-  getConfig: () => import_chunk_XNAPUWVE.getConfig,
-  getFnMapAnalysis: () => import_chunk_XNAPUWVE.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_XNAPUWVE.getProjectAnalysis,
-  get_jungle: () => import_chunk_XNAPUWVE.get_jungle,
-  isErrorWithLocation: () => import_chunk_XNAPUWVE.isErrorWithLocation,
-  launchSimulator: () => import_chunk_XNAPUWVE.launchSimulator,
-  manifestProducts: () => import_chunk_XNAPUWVE.manifestProducts,
-  mctree: () => import_chunk_XNAPUWVE.mctree,
-  simulateProgram: () => import_chunk_XNAPUWVE.simulateProgram
+  defaultConfig: () => import_chunk_7GXXJDR3.defaultConfig,
+  display: () => import_chunk_7GXXJDR3.display,
+  generateOneConfig: () => import_chunk_7GXXJDR3.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_7GXXJDR3.generateOptimizedProject,
+  getConfig: () => import_chunk_7GXXJDR3.getConfig,
+  getFnMapAnalysis: () => import_chunk_7GXXJDR3.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_7GXXJDR3.getProjectAnalysis,
+  get_jungle: () => import_chunk_7GXXJDR3.get_jungle,
+  isErrorWithLocation: () => import_chunk_7GXXJDR3.isErrorWithLocation,
+  launchSimulator: () => import_chunk_7GXXJDR3.launchSimulator,
+  manifestProducts: () => import_chunk_7GXXJDR3.manifestProducts,
+  mctree: () => import_chunk_7GXXJDR3.mctree,
+  simulateProgram: () => import_chunk_7GXXJDR3.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_XNAPUWVE = require("./chunk-XNAPUWVE.cjs");
+var import_chunk_7GXXJDR3 = require("./chunk-7GXXJDR3.cjs");
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_XNAPUWVE.init_optimizer)();
+(0, import_chunk_7GXXJDR3.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_XNAPUWVE.SectionKinds,
-  appSupport: () => import_chunk_XNAPUWVE.appSupport,
-  connectiq: () => import_chunk_XNAPUWVE.connectiq,
-  getDeviceInfo: () => import_chunk_XNAPUWVE.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_XNAPUWVE.getFunctionDocumentation,
-  getLanguages: () => import_chunk_XNAPUWVE.getLanguages,
-  getSdkPath: () => import_chunk_XNAPUWVE.getSdkPath,
-  isWin: () => import_chunk_XNAPUWVE.isWin,
-  optimizeProgram: () => import_chunk_XNAPUWVE.optimizeProgram,
-  readPrg: () => import_chunk_XNAPUWVE.readPrg,
-  readPrgWithOffsets: () => import_chunk_XNAPUWVE.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_XNAPUWVE.xml_util_exports
+  SectionKinds: () => import_chunk_7GXXJDR3.SectionKinds,
+  appSupport: () => import_chunk_7GXXJDR3.appSupport,
+  connectiq: () => import_chunk_7GXXJDR3.connectiq,
+  getDeviceInfo: () => import_chunk_7GXXJDR3.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_7GXXJDR3.getFunctionDocumentation,
+  getLanguages: () => import_chunk_7GXXJDR3.getLanguages,
+  getSdkPath: () => import_chunk_7GXXJDR3.getSdkPath,
+  isWin: () => import_chunk_7GXXJDR3.isWin,
+  optimizeProgram: () => import_chunk_7GXXJDR3.optimizeProgram,
+  readPrg: () => import_chunk_7GXXJDR3.readPrg,
+  readPrgWithOffsets: () => import_chunk_7GXXJDR3.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_7GXXJDR3.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_XNAPUWVE = require("./chunk-XNAPUWVE.cjs");
+var import_chunk_7GXXJDR3 = require("./chunk-7GXXJDR3.cjs");
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_XNAPUWVE.init_sdk_util)();
+(0, import_chunk_7GXXJDR3.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/optimizer-types.d.ts

@@ -197,6 +197,7 @@ export type ExcludeAnnotationsMap = {
 };
 export type FilesToOptimizeMap = {
     [key: string]: {
+        name: string;
         output: string;
         barrel: string;
         excludeAnnotations: ExcludeAnnotationsMap;

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_XNAPUWVE = require("./chunk-XNAPUWVE.cjs");
+var import_chunk_7GXXJDR3 = require("./chunk-7GXXJDR3.cjs");
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.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_XNAPUWVE.init_worker_task)();
+    (0, import_chunk_7GXXJDR3.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_XNAPUWVE.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_7GXXJDR3.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.73",
+  "version": "1.1.75",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -35,7 +35,7 @@
     "test-post-only": "node test/test.js --showInfo --typeCheckLevel Strict --skipOptimization --postOptimize --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
     "test-garmin-opt": "node test/test.js --typeCheckLevel Strict --skipOptimization --garminOptLevel=2 --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
     "test-personality": "node test/test-personality.js",
-    "test-analysis": "node test/test.js --showInfo --typeCheckLevel Strict --product=fr955 --sourceFile 'test/analysis/*.mc'",
+    "test-analysis": "node test/test.js --showInfo --typeCheckLevel Strict --product=fr955 --sourceFile \"test/analysis/*.mc\"",
     "test-tiny": "node test/test-tiny.js",
     "eslint": "npx eslint ."
   },