@markw65/monkeyc-optimizer 1.1.52 → 1.1.53

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.53
+
+- Update to [@markw65/prettier-plugin-monkeyc@1.0.56](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1056)
+  - Allows excludeAnnotations on typedefs
+- Allows arbitrary initializers for enums
+- Fix a few nits with the post build optimizer
+
 ### 1.1.52
 
 - Add support for System 5 .prg files, including new bytecodes.

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_J5XJWBYV.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_J5XJWBYV.collectNamespaces,
-  createDocumentationMap: () => import_chunk_J5XJWBYV.createDocumentationMap,
-  diagnostic: () => import_chunk_J5XJWBYV.diagnostic,
-  diagnosticHelper: () => import_chunk_J5XJWBYV.diagnosticHelper,
-  findNamesInScope: () => import_chunk_J5XJWBYV.findNamesInScope,
-  findUsingForNode: () => import_chunk_J5XJWBYV.findUsingForNode,
-  formatAst: () => import_chunk_J5XJWBYV.formatAst,
-  formatAstLongLines: () => import_chunk_J5XJWBYV.formatAstLongLines,
-  formatScopedName: () => import_chunk_J5XJWBYV.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_J5XJWBYV.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_J5XJWBYV.getApiMapping,
-  getSuperClasses: () => import_chunk_J5XJWBYV.getSuperClasses,
+  checkCompilerVersion: () => import_chunk_32NRMXAJ.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_32NRMXAJ.collectNamespaces,
+  createDocumentationMap: () => import_chunk_32NRMXAJ.createDocumentationMap,
+  diagnostic: () => import_chunk_32NRMXAJ.diagnostic,
+  diagnosticHelper: () => import_chunk_32NRMXAJ.diagnosticHelper,
+  findNamesInScope: () => import_chunk_32NRMXAJ.findNamesInScope,
+  findUsingForNode: () => import_chunk_32NRMXAJ.findUsingForNode,
+  formatAst: () => import_chunk_32NRMXAJ.formatAst,
+  formatAstLongLines: () => import_chunk_32NRMXAJ.formatAstLongLines,
+  formatScopedName: () => import_chunk_32NRMXAJ.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_32NRMXAJ.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_32NRMXAJ.getApiMapping,
+  getSuperClasses: () => import_chunk_32NRMXAJ.getSuperClasses,
   hasProperty: () => import_chunk_MBTLUWXR.hasProperty,
-  isClassVariable: () => import_chunk_J5XJWBYV.isClassVariable,
-  isLocal: () => import_chunk_J5XJWBYV.isLocal,
-  isLookupCandidate: () => import_chunk_J5XJWBYV.isLookupCandidate,
-  isStateNode: () => import_chunk_J5XJWBYV.isStateNode,
-  lookupByFullName: () => import_chunk_J5XJWBYV.lookupByFullName,
-  lookupNext: () => import_chunk_J5XJWBYV.lookupNext,
-  lookupResultContains: () => import_chunk_J5XJWBYV.lookupResultContains,
-  lookupWithType: () => import_chunk_J5XJWBYV.lookupWithType,
-  makeToyboxLink: () => import_chunk_J5XJWBYV.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_J5XJWBYV.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_J5XJWBYV.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_J5XJWBYV.parseSdkVersion,
-  resolveDiagnostics: () => import_chunk_J5XJWBYV.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_J5XJWBYV.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_J5XJWBYV.sameLookupResult,
+  isClassVariable: () => import_chunk_32NRMXAJ.isClassVariable,
+  isLocal: () => import_chunk_32NRMXAJ.isLocal,
+  isLookupCandidate: () => import_chunk_32NRMXAJ.isLookupCandidate,
+  isStateNode: () => import_chunk_32NRMXAJ.isStateNode,
+  lookupByFullName: () => import_chunk_32NRMXAJ.lookupByFullName,
+  lookupNext: () => import_chunk_32NRMXAJ.lookupNext,
+  lookupResultContains: () => import_chunk_32NRMXAJ.lookupResultContains,
+  lookupWithType: () => import_chunk_32NRMXAJ.lookupWithType,
+  makeToyboxLink: () => import_chunk_32NRMXAJ.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_32NRMXAJ.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_32NRMXAJ.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_32NRMXAJ.parseSdkVersion,
+  resolveDiagnostics: () => import_chunk_32NRMXAJ.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_32NRMXAJ.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_32NRMXAJ.sameLookupResult,
   traverseAst: () => import_chunk_MBTLUWXR.traverseAst,
-  variableDeclarationName: () => import_chunk_J5XJWBYV.variableDeclarationName,
-  visitReferences: () => import_chunk_J5XJWBYV.visitReferences,
-  visit_resources: () => import_chunk_J5XJWBYV.visit_resources,
-  visitorNode: () => import_chunk_J5XJWBYV.visitorNode
+  variableDeclarationName: () => import_chunk_32NRMXAJ.variableDeclarationName,
+  visitReferences: () => import_chunk_32NRMXAJ.visitReferences,
+  visit_resources: () => import_chunk_32NRMXAJ.visit_resources,
+  visitorNode: () => import_chunk_32NRMXAJ.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_J5XJWBYV = require("./chunk-J5XJWBYV.cjs");
+var import_chunk_32NRMXAJ = require("./chunk-32NRMXAJ.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_J5XJWBYV.init_api)();
+(0, import_chunk_32NRMXAJ.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-J5XJWBYV.cjs → chunk-32NRMXAJ.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_J5XJWBYV_exports = {};
-__export(chunk_J5XJWBYV_exports, {
+var chunk_32NRMXAJ_exports = {};
+__export(chunk_32NRMXAJ_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_J5XJWBYV_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_J5XJWBYV_exports);
+module.exports = __toCommonJS(chunk_32NRMXAJ_exports);
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -16674,7 +16674,11 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
     const ret = preEvaluate(istate, node);
     switch (node.type) {
       case "EnumDeclaration":
-        return [];
+        return ["body"];
+      case "EnumStringBody":
+        return ["members"];
+      case "EnumStringMember":
+        return ["init"];
       case "ForStatement": {
         const map2 = topLocals().map;
         if (map2) {
@@ -17101,20 +17105,18 @@ function cleanup(state, node, ast) {
         const name = "name" in m ? m.name : m.id.name;
         return (0, import_chunk_MBTLUWXR.hasProperty)(state.index, name) && !(0, import_chunk_MBTLUWXR.hasProperty)(state.exposed, name) && !(0, import_chunk_MBTLUWXR.hasProperty)(state.usedByName, name);
       })) {
-        node.enumType = [
-          ...new Set(
-            node.members.map((m) => {
-              if (!("init" in m))
-                return "Number";
-              const [node2, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(m.init);
-              if (!node2) {
-                throw new Error("Failed to get type for eliminated enum");
-              }
-              return type;
-            })
-          )
-        ].join(" or ");
-        node.members.splice(0);
+        const enumType = new Set(
+          node.members.map((m) => {
+            if (!("init" in m))
+              return "Number";
+            const [node2, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(m.init);
+            return node2 ? type : null;
+          })
+        );
+        if (!enumType.has(null)) {
+          node.enumType = [...enumType].join(" or ");
+          node.members.splice(0);
+        }
       }
       break;
     case "EnumDeclaration":
@@ -18723,17 +18725,16 @@ function stateFuncs() {
                   }
                   const name = m.id.name;
                   const init = (0, import_chunk_MBTLUWXR.getLiteralNode)(m.init);
-                  if (!init) {
-                    throw new Error("Unexpected enum initializer");
-                  }
-                  if (init !== m.init) {
-                    if (m.init.enumType) {
-                      init.enumType = m.init.enumType;
+                  if (init) {
+                    if (init !== m.init) {
+                      if (m.init.enumType) {
+                        init.enumType = m.init.enumType;
+                      }
+                      m.init = init;
+                    }
+                    if (init.type === "Literal" && init.raw && import_prettier_plugin_monkeyc4.LiteralIntegerRe.test(init.raw)) {
+                      prev = init.value;
                     }
-                    m.init = init;
-                  }
-                  if (init.type === "Literal" && init.raw && import_prettier_plugin_monkeyc4.LiteralIntegerRe.test(init.raw)) {
-                    prev = init.value;
                   }
                   if (!(0, import_chunk_MBTLUWXR.hasProperty)(values, name)) {
                     values[name] = [];
@@ -21460,31 +21461,31 @@ function instForType(type, offset) {
         op: 43,
         arg: type.type === 2 ? 0 : 1,
         offset,
-        size: 1
+        size: 2
       };
     case 8:
-      return { op: 37, arg: type.value, offset, size: 1 };
+      return { op: 37, arg: type.value, offset, size: 5 };
     case 16:
-      return { op: 49, arg: type.value, offset, size: 1 };
+      return { op: 49, arg: type.value, offset, size: 9 };
     case 32:
-      return { op: 38, arg: type.value, offset, size: 1 };
+      return { op: 38, arg: type.value, offset, size: 5 };
     case 64:
-      return { op: 50, arg: type.value, offset, size: 1 };
+      return { op: 50, arg: type.value, offset, size: 9 };
     case 128:
       return {
         op: 52,
         arg: type.value.charCodeAt(0),
         offset,
-        size: 1
+        size: 5
       };
     case 131072: {
       const match = type.value.match(/<(\d+)>$/);
       (0, import_node_assert7.default)(match);
       return {
-        op: 37,
+        op: 39,
         arg: parseInt(match[1], 10),
         offset,
-        size: 1
+        size: 5
       };
     }
   }
@@ -28591,19 +28592,6 @@ async function generateOptimizedProject(options) {
   const pick_one = config.products ? config.products.indexOf("pick-one") : -1;
   if (pick_one >= 0) {
     let preferredProduct = 0;
-    targets.every((t, i) => {
-      const dev = devices[t.product];
-      if (!dev)
-        return true;
-      if (dev.ciqVersions.every((ciq) => ciq.startsWith("5"))) {
-        preferredProduct = i;
-        return false;
-      }
-      if (dev.ciqVersions.some((ciq) => ciq.startsWith("5"))) {
-        preferredProduct = i;
-      }
-      return true;
-    });
     options.products = [...options.products];
     options.products[pick_one] = targets[preferredProduct].product;
   }
@@ -28981,7 +28969,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_SG7ODKRM.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1712442631755 < opt_time) {
+      if (source_time < opt_time && 1712549362694 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29020,7 +29008,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.52",
+            optimizerVersion: "1.1.53",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )

package/build/optimizer.cjs

@@ -18,28 +18,28 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_J5XJWBYV.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_J5XJWBYV.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_32NRMXAJ.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_32NRMXAJ.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_J5XJWBYV.defaultConfig,
-  display: () => import_chunk_J5XJWBYV.display,
-  generateOneConfig: () => import_chunk_J5XJWBYV.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_J5XJWBYV.generateOptimizedProject,
-  getConfig: () => import_chunk_J5XJWBYV.getConfig,
-  getProjectAnalysis: () => import_chunk_J5XJWBYV.getProjectAnalysis,
-  get_jungle: () => import_chunk_J5XJWBYV.get_jungle,
-  isErrorWithLocation: () => import_chunk_J5XJWBYV.isErrorWithLocation,
-  launchSimulator: () => import_chunk_J5XJWBYV.launchSimulator,
-  manifestProducts: () => import_chunk_J5XJWBYV.manifestProducts,
-  mctree: () => import_chunk_J5XJWBYV.mctree,
-  simulateProgram: () => import_chunk_J5XJWBYV.simulateProgram
+  defaultConfig: () => import_chunk_32NRMXAJ.defaultConfig,
+  display: () => import_chunk_32NRMXAJ.display,
+  generateOneConfig: () => import_chunk_32NRMXAJ.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_32NRMXAJ.generateOptimizedProject,
+  getConfig: () => import_chunk_32NRMXAJ.getConfig,
+  getProjectAnalysis: () => import_chunk_32NRMXAJ.getProjectAnalysis,
+  get_jungle: () => import_chunk_32NRMXAJ.get_jungle,
+  isErrorWithLocation: () => import_chunk_32NRMXAJ.isErrorWithLocation,
+  launchSimulator: () => import_chunk_32NRMXAJ.launchSimulator,
+  manifestProducts: () => import_chunk_32NRMXAJ.manifestProducts,
+  mctree: () => import_chunk_32NRMXAJ.mctree,
+  simulateProgram: () => import_chunk_32NRMXAJ.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_J5XJWBYV = require("./chunk-J5XJWBYV.cjs");
+var import_chunk_32NRMXAJ = require("./chunk-32NRMXAJ.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_J5XJWBYV.init_optimizer)();
+(0, import_chunk_32NRMXAJ.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_J5XJWBYV.SectionKinds,
-  appSupport: () => import_chunk_J5XJWBYV.appSupport,
-  connectiq: () => import_chunk_J5XJWBYV.connectiq,
-  getDeviceInfo: () => import_chunk_J5XJWBYV.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_J5XJWBYV.getFunctionDocumentation,
-  getLanguages: () => import_chunk_J5XJWBYV.getLanguages,
-  getSdkPath: () => import_chunk_J5XJWBYV.getSdkPath,
-  isWin: () => import_chunk_J5XJWBYV.isWin,
-  optimizeProgram: () => import_chunk_J5XJWBYV.optimizeProgram,
-  readPrg: () => import_chunk_J5XJWBYV.readPrg,
-  readPrgWithOffsets: () => import_chunk_J5XJWBYV.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_J5XJWBYV.xml_util_exports
+  SectionKinds: () => import_chunk_32NRMXAJ.SectionKinds,
+  appSupport: () => import_chunk_32NRMXAJ.appSupport,
+  connectiq: () => import_chunk_32NRMXAJ.connectiq,
+  getDeviceInfo: () => import_chunk_32NRMXAJ.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_32NRMXAJ.getFunctionDocumentation,
+  getLanguages: () => import_chunk_32NRMXAJ.getLanguages,
+  getSdkPath: () => import_chunk_32NRMXAJ.getSdkPath,
+  isWin: () => import_chunk_32NRMXAJ.isWin,
+  optimizeProgram: () => import_chunk_32NRMXAJ.optimizeProgram,
+  readPrg: () => import_chunk_32NRMXAJ.readPrg,
+  readPrgWithOffsets: () => import_chunk_32NRMXAJ.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_32NRMXAJ.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_J5XJWBYV = require("./chunk-J5XJWBYV.cjs");
+var import_chunk_32NRMXAJ = require("./chunk-32NRMXAJ.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_J5XJWBYV.init_sdk_util)();
+(0, import_chunk_32NRMXAJ.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

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

@@ -1,5 +1,4 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-import { EnumStringMember } from "@markw65/prettier-plugin-monkeyc/build/estree-types";
 import { xmlUtil } from "./sdk-util";
 import { ExactOrUnion } from "./type-flow/types";
 export type DiagnosticType = "ERROR" | "WARNING" | "INFO";
@@ -228,7 +227,7 @@ export type ProgramState = {
     };
     diagnostics?: Record<string, PreDiagnostic[]>;
     inlineDiagnostics?: Record<string, Diagnostic[]>;
-    enumMap?: Map<EnumStringMember, EnumStateNode>;
+    enumMap?: Map<mctree.EnumStringMember, EnumStateNode>;
 };
 export type Finalized<T, Keys extends keyof T> = T & {
     [key in Keys]-?: NonNullable<T[key]>;

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_J5XJWBYV = require("./chunk-J5XJWBYV.cjs");
+var import_chunk_32NRMXAJ = require("./chunk-32NRMXAJ.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.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_J5XJWBYV.init_worker_task)();
+    (0, import_chunk_32NRMXAJ.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_J5XJWBYV.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_32NRMXAJ.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.52",
+  "version": "1.1.53",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -52,7 +52,7 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.55"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.56"
   },
   "devDependencies": {
     "@markw65/peggy-optimizer": "^1.0.1",