@markw65/monkeyc-optimizer 1.1.71 → 1.1.73

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 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)
+
+  - Ignore `resolveType` field in serializeMonkeyC to avoid errors due to cycles.
+
+- Make `evaluate` skip everything except the `body` when processing class, module or function declarations.
+- Always fully evaluate expressions in enum initializers.
+
 ### 1.1.71
 
 - Fix various import paths so that .d.ts files work

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

package/build/{chunk-DI3VCMXL.cjs → chunk-XNAPUWVE.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_DI3VCMXL_exports = {};
-__export(chunk_DI3VCMXL_exports, {
+var chunk_XNAPUWVE_exports = {};
+__export(chunk_XNAPUWVE_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -138,7 +138,7 @@ __export(chunk_DI3VCMXL_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_DI3VCMXL_exports);
+module.exports = __toCommonJS(chunk_XNAPUWVE_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");
@@ -10374,7 +10374,7 @@ function evaluate(istate, root) {
       case "ClassDeclaration":
         if (node !== root)
           return false;
-        break;
+        return ["body"];
       case "AssignmentExpression":
         skipNode = node.left;
         break;
@@ -11431,26 +11431,6 @@ function relaxType(type) {
   unionInto(relaxed, type);
   return relaxed;
 }
-function resolveEnum(e) {
-  if (e.resolvedType)
-    return e.resolvedType;
-  return e.resolvedType = e.node.body.members.reduce(
-    (result, next) => {
-      unionInto(
-        result,
-        next.type === "EnumStringMember" && next.init?.type === "Literal" ? typeFromLiteral(next.init) : {
-          type: next.type === "EnumStringMember" && next.init ? EnumTagsConst : 8
-          /* Number */
-        }
-      );
-      return result;
-    },
-    {
-      type: 0
-      /* Never */
-    }
-  );
-}
 function typeFromTypeStateNode(state, sn, classVsObj) {
   switch (sn.type) {
     case "ClassDeclaration": {
@@ -11530,15 +11510,46 @@ function typeFromTypeStateNode(state, sn, classVsObj) {
         type: 4096
         /* Module */
       };
-    case "EnumDeclaration":
-      return {
+    case "EnumDeclaration": {
+      if (sn.resolvedType)
+        return sn.resolvedType;
+      if ((0, import_chunk_JDC43A3I.hasProperty)(sn, "resolvedType")) {
+        return {
+          type: 65536,
+          value: { enum: sn, value: { type: EnumTagsConst } }
+        };
+      }
+      sn.resolvedType = void 0;
+      const value2 = sn.node.body.members.reduce(
+        (type, member) => {
+          unionInto(type, deEnumerate(typeFromTypeStateNode(state, member)));
+          return type;
+        },
+        {
+          type: 0
+          /* Never */
+        }
+      );
+      return sn.resolvedType = {
         type: 65536,
-        value: { enum: sn, value: resolveEnum(sn) }
+        value: { enum: sn, value: value2 }
       };
+    }
     case "EnumStringMember": {
-      const e = state.enumMap?.get(sn);
-      const value2 = sn.init?.type === "Literal" ? typeFromLiteral(sn.init) : sn.resolvedType ?? (e ? resolveEnum(e) : { type: EnumTagsConst });
-      return { type: 65536, value: { enum: e, value: value2 } };
+      const n = sn;
+      if (!n.resolvedType) {
+        if ((0, import_chunk_JDC43A3I.hasProperty)(n, "resolvedType")) {
+          return { type: EnumTagsConst };
+        }
+        n.resolvedType = void 0;
+        const value2 = n.init?.type === "Literal" ? typeFromLiteral(n.init) : n.init ? deEnumerate(evaluateExpr(state, n.init).value) : {
+          type: 8
+          /* Number */
+        };
+        n.resolvedType = value2;
+      }
+      const e = state.enumMap?.get(n);
+      return e ? { type: 65536, value: { enum: e, value: n.resolvedType } } : n.resolvedType;
     }
     case "TypedefDeclaration": {
       if (sn.resolvedType) {
@@ -17851,11 +17862,13 @@ function cleanup(state, node, ast, usedNodes) {
         );
         if (i >= 0) {
           const old = decls[i];
-          decls.splice(i, 1, {
+          const rep = {
             ...old,
             type: "TypedefDeclaration",
             node: typedefDecl
-          });
+          };
+          delete rep.resolvedType;
+          decls.splice(i, 1, rep);
         }
       }
       return typedefDecl;
@@ -19829,18 +19842,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 });
@@ -30102,7 +30121,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 && 1721695353078 < opt_time) {
+      if (source_time < opt_time && 1722003035546 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -30140,7 +30159,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.71",
+            optimizerVersion: "1.1.73",
             ...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_DI3VCMXL.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_DI3VCMXL.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_DI3VCMXL.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_XNAPUWVE.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_XNAPUWVE.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_XNAPUWVE.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_NHZRKHZO.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_DI3VCMXL.defaultConfig,
-  display: () => import_chunk_DI3VCMXL.display,
-  generateOneConfig: () => import_chunk_DI3VCMXL.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_DI3VCMXL.generateOptimizedProject,
-  getConfig: () => import_chunk_DI3VCMXL.getConfig,
-  getFnMapAnalysis: () => import_chunk_DI3VCMXL.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_DI3VCMXL.getProjectAnalysis,
-  get_jungle: () => import_chunk_DI3VCMXL.get_jungle,
-  isErrorWithLocation: () => import_chunk_DI3VCMXL.isErrorWithLocation,
-  launchSimulator: () => import_chunk_DI3VCMXL.launchSimulator,
-  manifestProducts: () => import_chunk_DI3VCMXL.manifestProducts,
-  mctree: () => import_chunk_DI3VCMXL.mctree,
-  simulateProgram: () => import_chunk_DI3VCMXL.simulateProgram
+  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
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_DI3VCMXL = require("./chunk-DI3VCMXL.cjs");
+var import_chunk_XNAPUWVE = require("./chunk-XNAPUWVE.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_DI3VCMXL.init_optimizer)();
+(0, import_chunk_XNAPUWVE.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_DI3VCMXL.SectionKinds,
-  appSupport: () => import_chunk_DI3VCMXL.appSupport,
-  connectiq: () => import_chunk_DI3VCMXL.connectiq,
-  getDeviceInfo: () => import_chunk_DI3VCMXL.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_DI3VCMXL.getFunctionDocumentation,
-  getLanguages: () => import_chunk_DI3VCMXL.getLanguages,
-  getSdkPath: () => import_chunk_DI3VCMXL.getSdkPath,
-  isWin: () => import_chunk_DI3VCMXL.isWin,
-  optimizeProgram: () => import_chunk_DI3VCMXL.optimizeProgram,
-  readPrg: () => import_chunk_DI3VCMXL.readPrg,
-  readPrgWithOffsets: () => import_chunk_DI3VCMXL.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_DI3VCMXL.xml_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
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_DI3VCMXL = require("./chunk-DI3VCMXL.cjs");
+var import_chunk_XNAPUWVE = require("./chunk-XNAPUWVE.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_DI3VCMXL.init_sdk_util)();
+(0, import_chunk_XNAPUWVE.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_DI3VCMXL = require("./chunk-DI3VCMXL.cjs");
+var import_chunk_XNAPUWVE = require("./chunk-XNAPUWVE.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_DI3VCMXL.init_worker_task)();
+    (0, import_chunk_XNAPUWVE.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_DI3VCMXL.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_XNAPUWVE.performTask)(task));
       });
     }
   }

package/package.json

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