@markw65/monkeyc-optimizer 1.1.72 → 1.1.74

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 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.
+
 ### 1.1.72
 
 - Update to [@markw65/prettier-plugin-monkeyc@1.0.59](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1059)

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_O23K24OV.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_O23K24OV.collectNamespaces,
-  createDocumentationMap: () => import_chunk_O23K24OV.createDocumentationMap,
-  diagnostic: () => import_chunk_O23K24OV.diagnostic,
-  diagnosticHelper: () => import_chunk_O23K24OV.diagnosticHelper,
-  findNamesInScope: () => import_chunk_O23K24OV.findNamesInScope,
-  findUsingForNode: () => import_chunk_O23K24OV.findUsingForNode,
-  formatAst: () => import_chunk_O23K24OV.formatAst,
-  formatAstLongLines: () => import_chunk_O23K24OV.formatAstLongLines,
-  formatScopedName: () => import_chunk_O23K24OV.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_O23K24OV.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_O23K24OV.getApiMapping,
-  getSuperClasses: () => import_chunk_O23K24OV.getSuperClasses,
-  handleImportUsing: () => import_chunk_O23K24OV.handleImportUsing,
+  checkCompilerVersion: () => import_chunk_7OAMZRC7.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_7OAMZRC7.collectNamespaces,
+  createDocumentationMap: () => import_chunk_7OAMZRC7.createDocumentationMap,
+  diagnostic: () => import_chunk_7OAMZRC7.diagnostic,
+  diagnosticHelper: () => import_chunk_7OAMZRC7.diagnosticHelper,
+  findNamesInScope: () => import_chunk_7OAMZRC7.findNamesInScope,
+  findUsingForNode: () => import_chunk_7OAMZRC7.findUsingForNode,
+  formatAst: () => import_chunk_7OAMZRC7.formatAst,
+  formatAstLongLines: () => import_chunk_7OAMZRC7.formatAstLongLines,
+  formatScopedName: () => import_chunk_7OAMZRC7.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_7OAMZRC7.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_7OAMZRC7.getApiMapping,
+  getSuperClasses: () => import_chunk_7OAMZRC7.getSuperClasses,
+  handleImportUsing: () => import_chunk_7OAMZRC7.handleImportUsing,
   hasProperty: () => import_chunk_JDC43A3I.hasProperty,
-  isClassVariable: () => import_chunk_O23K24OV.isClassVariable,
-  isLocal: () => import_chunk_O23K24OV.isLocal,
-  isLookupCandidate: () => import_chunk_O23K24OV.isLookupCandidate,
-  isStateNode: () => import_chunk_O23K24OV.isStateNode,
-  lookupByFullName: () => import_chunk_O23K24OV.lookupByFullName,
-  lookupNext: () => import_chunk_O23K24OV.lookupNext,
-  lookupResultContains: () => import_chunk_O23K24OV.lookupResultContains,
-  lookupWithType: () => import_chunk_O23K24OV.lookupWithType,
-  makeToyboxLink: () => import_chunk_O23K24OV.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_O23K24OV.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_O23K24OV.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_O23K24OV.parseSdkVersion,
-  popRootNode: () => import_chunk_O23K24OV.popRootNode,
-  pushRootNode: () => import_chunk_O23K24OV.pushRootNode,
-  resolveDiagnostics: () => import_chunk_O23K24OV.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_O23K24OV.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_O23K24OV.sameLookupResult,
+  isClassVariable: () => import_chunk_7OAMZRC7.isClassVariable,
+  isLocal: () => import_chunk_7OAMZRC7.isLocal,
+  isLookupCandidate: () => import_chunk_7OAMZRC7.isLookupCandidate,
+  isStateNode: () => import_chunk_7OAMZRC7.isStateNode,
+  lookupByFullName: () => import_chunk_7OAMZRC7.lookupByFullName,
+  lookupNext: () => import_chunk_7OAMZRC7.lookupNext,
+  lookupResultContains: () => import_chunk_7OAMZRC7.lookupResultContains,
+  lookupWithType: () => import_chunk_7OAMZRC7.lookupWithType,
+  makeToyboxLink: () => import_chunk_7OAMZRC7.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_7OAMZRC7.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_7OAMZRC7.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_7OAMZRC7.parseSdkVersion,
+  popRootNode: () => import_chunk_7OAMZRC7.popRootNode,
+  pushRootNode: () => import_chunk_7OAMZRC7.pushRootNode,
+  resolveDiagnostics: () => import_chunk_7OAMZRC7.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_7OAMZRC7.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_7OAMZRC7.sameLookupResult,
   traverseAst: () => import_chunk_JDC43A3I.traverseAst,
-  variableDeclarationName: () => import_chunk_O23K24OV.variableDeclarationName,
-  visitReferences: () => import_chunk_O23K24OV.visitReferences,
-  visit_resources: () => import_chunk_O23K24OV.visit_resources,
-  visitorNode: () => import_chunk_O23K24OV.visitorNode
+  variableDeclarationName: () => import_chunk_7OAMZRC7.variableDeclarationName,
+  visitReferences: () => import_chunk_7OAMZRC7.visitReferences,
+  visit_resources: () => import_chunk_7OAMZRC7.visit_resources,
+  visitorNode: () => import_chunk_7OAMZRC7.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_O23K24OV = require("./chunk-O23K24OV.cjs");
+var import_chunk_7OAMZRC7 = require("./chunk-7OAMZRC7.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_O23K24OV.init_api)();
+(0, import_chunk_7OAMZRC7.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-O23K24OV.cjs → chunk-7OAMZRC7.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_O23K24OV_exports = {};
-__export(chunk_O23K24OV_exports, {
+var chunk_7OAMZRC7_exports = {};
+__export(chunk_7OAMZRC7_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -138,7 +138,7 @@ __export(chunk_O23K24OV_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_O23K24OV_exports);
+module.exports = __toCommonJS(chunk_7OAMZRC7_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");
@@ -18263,7 +18263,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 +18357,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 +18622,8 @@ var init_resources = (0, import_chunk_ABYVSU2C.__esm)({
       foreground: {},
       background: {},
       font: {},
-      justification: {}
+      justification: {},
+      identifier: true
     };
   }
 });
@@ -19842,18 +19850,24 @@ function formatAstLongLines(node) {
   const filter = (s) => s.type !== "ClassDeclaration" && s.type !== "ModuleDeclaration" && s.type !== "FunctionDeclaration";
   switch (node.type) {
     case "ClassDeclaration":
-      node = { ...node };
-      node.body = { ...node.body };
-      node.body.body = node.body.body.filter((c) => filter(c.item));
+      if (node.body?.body) {
+        node = { ...node };
+        node.body = { ...node.body };
+        node.body.body = node.body.body.filter((c) => filter(c.item));
+      }
       break;
     case "ModuleDeclaration":
-      node = { ...node };
-      node.body = { ...node.body };
-      node.body.body = node.body.body.filter(filter);
+      if (node.body?.body) {
+        node = { ...node };
+        node.body = { ...node.body };
+        node.body.body = node.body.body.filter(filter);
+      }
       break;
     case "Program":
-      node = { ...node };
-      node.body = node.body.filter(filter);
+      if (node.body) {
+        node = { ...node };
+        node.body = node.body.filter(filter);
+      }
       break;
   }
   return formatAst(node, null, { printWidth: 1e4 });
@@ -29963,7 +29977,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))
         }))
       )
     ) || []
@@ -29981,11 +29995,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) {
@@ -30115,7 +30130,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 && 1721773641397 < opt_time) {
+      if (source_time < opt_time && 1723999677373 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -30153,7 +30168,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.72",
+            optimizerVersion: "1.1.74",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )

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

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_O23K24OV = require("./chunk-O23K24OV.cjs");
+var import_chunk_7OAMZRC7 = require("./chunk-7OAMZRC7.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_O23K24OV.init_worker_task)();
+    (0, import_chunk_7OAMZRC7.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_O23K24OV.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_7OAMZRC7.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.72",
+  "version": "1.1.74",
   "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 ."
   },