@markw65/monkeyc-optimizer 1.1.56 → 1.1.58

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.58
+
+- Update to [@markw65/prettier-plugin-monkeyc@1.0.57](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1057)
+  - Just updates exported types. No change in functionality
+- Properly quote paths in the generated jungle
+- Take account of all references from resource files
+- Include Null in the types of uninitialized variables in their initialize method
+
+### 1.1.57
+
+- Include ConditionalExpression and LogicalExpression in evaluateFunction
+- Fix personality search path (Fixes # 27)
+- Use fully qualified names for enum typedefs (Fixes # 28)
+- Fix auto-inlining of protected functions (Fixes #29)
+
 ### 1.1.56
 
 - Fix regression caused by the fix to #24 (Fixes #26)

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

package/build/{chunk-M3LMSSY7.cjs → chunk-XC5IVRTO.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_M3LMSSY7_exports = {};
-__export(chunk_M3LMSSY7_exports, {
+var chunk_XC5IVRTO_exports = {};
+__export(chunk_XC5IVRTO_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_M3LMSSY7_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_M3LMSSY7_exports);
+module.exports = __toCommonJS(chunk_XC5IVRTO_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");
@@ -5560,6 +5560,20 @@ var init_function_info = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_MBTLUWXR.init_ast)();
   }
 });
+var StateNodeAttributes;
+var init_optimizer_types = (0, import_chunk_ABYVSU2C.__esm)({
+  "src/optimizer-types.ts"() {
+    "use strict";
+    StateNodeAttributes = /* @__PURE__ */ ((StateNodeAttributes2) => {
+      StateNodeAttributes2[StateNodeAttributes2["NONE"] = 0] = "NONE";
+      StateNodeAttributes2[StateNodeAttributes2["PUBLIC"] = 1] = "PUBLIC";
+      StateNodeAttributes2[StateNodeAttributes2["PROTECTED"] = 2] = "PROTECTED";
+      StateNodeAttributes2[StateNodeAttributes2["PRIVATE"] = 4] = "PRIVATE";
+      StateNodeAttributes2[StateNodeAttributes2["STATIC"] = 8] = "STATIC";
+      return StateNodeAttributes2;
+    })(StateNodeAttributes || {});
+  }
+});
 function renameIdentifier(ident, newName) {
   if (!ident.original) {
     ident.original = ident.name;
@@ -5826,7 +5840,7 @@ function canInline(state, func, args) {
   }
   return safeArgs.every((arg) => arg !== null);
 }
-function inliningLooksUseful(func, node) {
+function inliningLooksUseful(state, func, node) {
   while (true) {
     if (node.type === "BinaryExpression" && node.operator === "as") {
       node = node.left;
@@ -5839,10 +5853,42 @@ function inliningLooksUseful(func, node) {
   if (node.type === "Literal")
     return true;
   if (node.type === "Identifier") {
-    if (func.params.length === 1 && variableDeclarationName(func.params[0]) === node.name) {
+    if (func.node.params.length === 1 && variableDeclarationName(func.node.params[0]) === node.name) {
       return 1;
     }
-    return true;
+    const stack = func.stack;
+    if (!stack)
+      return false;
+    const calleeClass = stack[stack.length - 1].sn;
+    if (calleeClass.type !== "ClassDeclaration") {
+      return true;
+    }
+    const [, results] = state.lookupNonlocal(node, null, stack);
+    if (!results)
+      return false;
+    const attrs = results.reduce(
+      (attrs2, result) => attrs2 | result.results.reduce(
+        (attrs3, sn) => attrs3 | (isStateNode(sn) ? sn.attributes & (4 | 2) : 0),
+        0
+      ),
+      0
+    );
+    if (!attrs)
+      return true;
+    if (state.stack[stack.length - 1] === stack[stack.length - 1]) {
+      return true;
+    }
+    if (attrs & 4)
+      return false;
+    for (let i = state.stack.length; i--; ) {
+      const callerClass = state.stack[i].sn;
+      if (callerClass.type === "ClassDeclaration") {
+        if (getSuperClasses(callerClass)?.has(calleeClass)) {
+          return true;
+        }
+        break;
+      }
+    }
   }
   return false;
 }
@@ -5868,7 +5914,8 @@ function shouldInline(state, func, call, context) {
   if (func.node.body && func.node.body.body.length === 1 && func.node.body.body[0].type === "ReturnStatement" && func.node.body.body[0].argument && func.node.params.length === args.length) {
     inlineAsExpression = true;
     autoInline = inliningLooksUseful(
-      func.node,
+      state,
+      func,
       func.node.body.body[0].argument
     );
   }
@@ -6492,23 +6539,10 @@ var init_inliner = (0, import_chunk_ABYVSU2C.__esm)({
     init_api();
     (0, import_chunk_MBTLUWXR.init_ast)();
     init_function_info();
+    init_optimizer_types();
     init_variable_renamer();
   }
 });
-var StateNodeAttributes;
-var init_optimizer_types = (0, import_chunk_ABYVSU2C.__esm)({
-  "src/optimizer-types.ts"() {
-    "use strict";
-    StateNodeAttributes = /* @__PURE__ */ ((StateNodeAttributes2) => {
-      StateNodeAttributes2[StateNodeAttributes2["NONE"] = 0] = "NONE";
-      StateNodeAttributes2[StateNodeAttributes2["PUBLIC"] = 1] = "PUBLIC";
-      StateNodeAttributes2[StateNodeAttributes2["PROTECTED"] = 2] = "PROTECTED";
-      StateNodeAttributes2[StateNodeAttributes2["PRIVATE"] = 4] = "PRIVATE";
-      StateNodeAttributes2[StateNodeAttributes2["STATIC"] = 8] = "STATIC";
-      return StateNodeAttributes2;
-    })(StateNodeAttributes || {});
-  }
-});
 function pragmaChecker(state, ast, diagnostics) {
   const comments = ast.comments;
   if (!comments)
@@ -12755,12 +12789,12 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
   const order = getPostOrder(graph).reverse();
   const queue = new DataflowQueue();
   let selfClassDecl = null;
-  if (!(func.attributes & 8)) {
-    const klass = func.stack?.[func.stack?.length - 1].sn;
-    if (klass && klass.type === "ClassDeclaration") {
-      selfClassDecl = klass;
-    }
+  const isStatic = !!(func.attributes & 8);
+  const klass = func.stack?.[func.stack?.length - 1].sn;
+  if (klass && klass.type === "ClassDeclaration") {
+    selfClassDecl = klass;
   }
+  const isInitialize = selfClassDecl && func.name === "initialize";
   order.forEach((block, i) => {
     block.order = i;
   });
@@ -12960,7 +12994,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           );
         }
       }
-      if (selfClassDecl) {
+      if (!isStatic && selfClassDecl) {
         const baseObj = getObjectValue(baseElem.type);
         if (baseObj && baseObj.klass.type === 16384 && (0, import_chunk_SG7ODKRM.some)(
           baseObj.klass.value,
@@ -13021,6 +13055,9 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           cur,
           decl.type === "Literal" ? typeFromLiteral(decl) : typeFromTypeStateNode(state, decl, true)
         );
+        if (isInitialize && decl.type === "VariableDeclarator" && !decl.node.init && decl.node.kind === "var" && decl.stack[decl.stack.length - 1].sn === selfClassDecl) {
+          cur.type |= 1;
+        }
         return cur;
       },
       {
@@ -16535,6 +16572,8 @@ function evaluateFunction(istate, func, args) {
           case "ReturnStatement":
           case "UnaryExpression":
           case "BinaryExpression":
+          case "ConditionalExpression":
+          case "LogicalExpression":
           case "Literal":
           case "Identifier":
             return;
@@ -17021,19 +17060,25 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
   Object.values(fnMap).forEach((f) => {
     collectNamespaces(f.ast, state);
   });
-  const cleanupAll = () => Object.values(fnMap).reduce((changes, f) => {
-    (0, import_chunk_MBTLUWXR.traverseAst)(f.ast, void 0, (node) => {
-      const ret = cleanup(state, node, f.ast);
-      if (ret === false) {
-        changes = true;
-        state.removeNodeComments(node, f.ast);
-      } else if (ret) {
-        changes = true;
-      }
-      return ret;
-    });
-    return changes;
-  }, false);
+  const cleanupAll = () => {
+    const usedDecls = findRezRefs(state);
+    return Object.values(fnMap).reduce((changes, f) => {
+      (0, import_chunk_MBTLUWXR.traverseAst)(f.ast, void 0, (node) => {
+        if (usedDecls.has(node)) {
+          return null;
+        }
+        const ret = cleanup(state, node, f.ast, usedDecls);
+        if (ret === false) {
+          changes = true;
+          state.removeNodeComments(node, f.ast);
+        } else if (ret) {
+          changes = true;
+        }
+        return ret;
+      });
+      return changes;
+    }, false);
+  };
   do {
     state.usedByName = {};
     state.calledFunctions = {};
@@ -17044,7 +17089,9 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
     });
     state.exposed = state.nextExposed;
     state.nextExposed = {};
-  } while (cleanupAll() && state.config?.iterateOptimizer);
+    if (!cleanupAll())
+      break;
+  } while (state.config?.iterateOptimizer);
   delete state.pre;
   delete state.post;
   if (state.config?.minimizeModules ?? true) {
@@ -17093,6 +17140,53 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
     sdkVersion: state.sdkVersion
   };
 }
+function findRezRefs(state) {
+  const usedDecls = /* @__PURE__ */ new Set();
+  state.rezAst && visitReferences(
+    state,
+    state.rezAst,
+    null,
+    false,
+    (node, results, error) => {
+      if (error)
+        return;
+      results.forEach(
+        (result) => result.results.forEach((sn) => {
+          switch (sn.type) {
+            case "ModuleDeclaration":
+            case "Program":
+            case "BlockStatement":
+              return;
+            case "Identifier":
+            case "BinaryExpression":
+              return;
+            case "EnumStringMember":
+              if (sn.system)
+                return;
+              usedDecls.add(sn);
+              break;
+            case "ClassDeclaration":
+            case "FunctionDeclaration":
+            case "EnumDeclaration":
+            case "TypedefDeclaration":
+              if (sn.node.attrs?.system)
+                return;
+            case "VariableDeclarator":
+              if (sn.fullName.startsWith("$.Toybox") || sn.fullName.startsWith("$.Rez")) {
+                return;
+              }
+              usedDecls.add(sn.node);
+              break;
+            default:
+              unhandledType(sn);
+          }
+        })
+      );
+      return void 0;
+    }
+  );
+  return usedDecls;
+}
 function maybeCalled(state, func) {
   if (!func.body) {
     return true;
@@ -17113,13 +17207,15 @@ function maybeCalled(state, func) {
   }
   return false;
 }
-function cleanup(state, node, ast) {
+function cleanup(state, node, ast, usedNodes) {
   switch (node.type) {
     case "ThisExpression":
       node.text = "self";
       break;
     case "EnumStringBody":
       if (node.members.every((m) => {
+        if (usedNodes.has(m))
+          return false;
         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);
       })) {
@@ -17132,7 +17228,7 @@ function cleanup(state, node, ast) {
           })
         );
         if (!enumType.has(null)) {
-          node.enumType = [...enumType].join(" or ");
+          node.enumType = [...enumType].map((t) => t === "Null" ? t : `Toybox.Lang.${t}`).join(" or ");
           node.members.splice(0);
         }
       }
@@ -17267,6 +17363,7 @@ var init_mc_rewrite = (0, import_chunk_ABYVSU2C.__esm)({
     init_unused_exprs();
     (0, import_chunk_SG7ODKRM.init_util)();
     init_variable_renamer();
+    init_data_flow();
   }
 });
 var negativeFixups;
@@ -17939,126 +18036,132 @@ function visitReferences(state, ast, name, defn, callback, includeDefs = false,
     }
     checkResults([id.name, [{ parent: parent.sn, results }]], id);
   };
-  state.pre = (node) => {
-    if (filter && !filter(node))
-      return [];
-    switch (node.type) {
-      case "AttributeList":
+  const { pre, post } = state;
+  try {
+    state.pre = (node) => {
+      if (filter && !filter(node))
         return [];
-      case "UnaryExpression":
-        if (node.operator === ":")
+      switch (node.type) {
+        case "AttributeList":
           return [];
-        break;
-      case "BinaryExpression":
-        if (node.operator === "has") {
-          if (node.right.type === "UnaryExpression" && node.right.operator === ":") {
-            if (!name || node.right.argument.name === name) {
-              return checkResults(
-                lookup2({
-                  type: "MemberExpression",
-                  object: node.left,
-                  property: node.right.argument,
-                  computed: false
-                }),
-                node
-              );
+        case "UnaryExpression":
+          if (node.operator === ":")
+            return [];
+          break;
+        case "BinaryExpression":
+          if (node.operator === "has") {
+            if (node.right.type === "UnaryExpression" && node.right.operator === ":") {
+              if (!name || node.right.argument.name === name) {
+                return checkResults(
+                  lookup2({
+                    type: "MemberExpression",
+                    object: node.left,
+                    property: node.right.argument,
+                    computed: false
+                  }),
+                  node
+                );
+              }
             }
           }
-        }
-        break;
-      case "CallExpression":
-        if (node.callee.type === "Identifier") {
-          if ((!name || node.callee.name === name) && (!filter || filter(node.callee))) {
-            checkResults(lookup2(node.callee, true), node.callee);
+          break;
+        case "CallExpression":
+          if (node.callee.type === "Identifier") {
+            if ((!name || node.callee.name === name) && (!filter || filter(node.callee))) {
+              checkResults(lookup2(node.callee, true), node.callee);
+            }
+            return ["arguments"];
           }
-          return ["arguments"];
-        }
-        break;
-      case "Identifier":
-        if (!name || node.name === name) {
-          return checkResults(lookup2(node), node);
-        }
-        break;
-      case "MemberExpression": {
-        const property = isLookupCandidate(node);
-        if (property) {
-          if (!name || property.name === name) {
-            return checkResults(lookup2(node), node) || ["object"];
+          break;
+        case "Identifier":
+          if (!name || node.name === name) {
+            return checkResults(lookup2(node), node);
           }
-          return ["object"];
-        }
-        break;
-      }
-      case "MethodDefinition": {
-        if (!state.inType) {
-          throw new Error("Method definition outside of type!");
-        }
-        if (node.params) {
-          node.params.forEach((param) => {
-            if (param.type === "BinaryExpression") {
-              state.traverse(param.right);
+          break;
+        case "MemberExpression": {
+          const property = isLookupCandidate(node);
+          if (property) {
+            if (!name || property.name === name) {
+              return checkResults(lookup2(node), node) || ["object"];
             }
-          });
-        }
-        return ["returnType"];
-      }
-      case "ModuleDeclaration":
-        if (includeDefs) {
-          visitDef(node.id);
-        }
-        return ["body"];
-      case "ClassDeclaration":
-        if (includeDefs) {
-          visitDef(node.id, node);
-        }
-        return ["body", "superClass"];
-      case "FunctionDeclaration":
-        if (includeDefs) {
-          visitDef(node.id, node);
-        }
-        return ["params", "returnType", "body"];
-      case "TypedefDeclaration":
-        if (includeDefs) {
-          visitDef(node.id, node, "type_decls");
-        }
-        return ["ts"];
-      case "VariableDeclarator":
-        if (includeDefs) {
-          visitDef(node.id, node);
+            return ["object"];
+          }
+          break;
         }
-        if (node.id.type === "BinaryExpression") {
-          state.traverse(node.id.right);
+        case "MethodDefinition": {
+          if (!state.inType) {
+            throw new Error("Method definition outside of type!");
+          }
+          if (node.params) {
+            node.params.forEach((param) => {
+              if (param.type === "BinaryExpression") {
+                state.traverse(param.right);
+              }
+            });
+          }
+          return ["returnType"];
         }
-        return ["init"];
-      case "EnumDeclaration":
-        if (includeDefs) {
-          if (node.id) {
+        case "ModuleDeclaration":
+          if (includeDefs) {
+            visitDef(node.id);
+          }
+          return ["body"];
+        case "ClassDeclaration":
+          if (includeDefs) {
+            visitDef(node.id, node);
+          }
+          return ["body", "superClass"];
+        case "FunctionDeclaration":
+          if (includeDefs) {
+            visitDef(node.id, node);
+          }
+          return ["params", "returnType", "body"];
+        case "TypedefDeclaration":
+          if (includeDefs) {
             visitDef(node.id, node, "type_decls");
           }
+          return ["ts"];
+        case "VariableDeclarator":
+          if (includeDefs) {
+            visitDef(node.id, node);
+          }
+          if (node.id.type === "BinaryExpression") {
+            state.traverse(node.id.right);
+          }
+          return ["init"];
+        case "EnumDeclaration":
+          if (includeDefs) {
+            if (node.id) {
+              visitDef(node.id, node, "type_decls");
+            }
+            break;
+          }
+          return [];
+        case "EnumStringMember": {
+          if (!filter || filter(node.id)) {
+            checkResults(
+              [node.id.name, [{ parent: state.top().sn, results: [node] }]],
+              node
+            );
+          }
           break;
         }
-        return [];
-      case "EnumStringMember": {
-        if (!filter || filter(node.id)) {
-          checkResults(
-            [node.id.name, [{ parent: state.top().sn, results: [node] }]],
-            node
-          );
-        }
-        break;
+        case "CatchClause":
+          if (includeDefs)
+            break;
+          if (node.param && node.param.type !== "Identifier") {
+            state.traverse(node.param.right);
+          }
+          return ["body"];
       }
-      case "CatchClause":
-        if (includeDefs)
-          break;
-        if (node.param && node.param.type !== "Identifier") {
-          state.traverse(node.param.right);
-        }
-        return ["body"];
-    }
-    return null;
-  };
-  collectNamespaces(ast, state);
-  delete state.pre;
+      return null;
+    };
+    delete state.post;
+    collectNamespaces(ast, state);
+  } finally {
+    state.pre = pre;
+    state.post = post;
+  }
 }
 var init_visitor = (0, import_chunk_ABYVSU2C.__esm)({
   "src/visitor.ts"() {
@@ -27530,7 +27633,11 @@ async function default_jungle() {
       assign(id, [qname(base)]);
     }
     rassign(`${id}.resourcePath`, [literal(rez)], base);
-    rassign(`${id}.personality`, [literal(rez)], base);
+    rassign(
+      `${id}.personality`,
+      [literal(`${connectiq}/Devices/${id}`), literal(rez)],
+      base
+    );
     languages.forEach(
       (l) => rassign(`${id}.lang.${l.id}`, [literal(`${rez}-${l.id}`)], base)
     );
@@ -28689,7 +28796,14 @@ async function generateOptimizedProject(options) {
   const jungle_dir = path4.resolve(workspace, config.outputPath);
   await fs6.mkdir(jungle_dir, { recursive: true });
   const relative_path = (s) => path4.relative(jungle_dir, s);
-  let relative_manifest = relative_path(manifest);
+  const quoted_relative_path = (s) => {
+    const rel = relative_path(s);
+    if (/[^-*._$/\\\w]/.test(rel)) {
+      return `"${rel}"`;
+    }
+    return rel;
+  };
+  let relative_manifest = quoted_relative_path(manifest);
   const manifestOk = (!config.checkManifest || await checkManifest(
     xml,
     targets.map((t) => t.product)
@@ -28835,8 +28949,8 @@ async function generateOptimizedProject(options) {
           ).join(";")}`
         );
       }
-      process_field(prefix, qualifier, "resourcePath", relative_path);
-      process_field(prefix, qualifier, "personality", relative_path);
+      process_field(prefix, qualifier, "resourcePath", quoted_relative_path);
+      process_field(prefix, qualifier, "personality", quoted_relative_path);
       process_field(prefix, qualifier, "excludeAnnotations");
       const qLang = qualifier.lang;
       if (qLang) {
@@ -28845,7 +28959,7 @@ async function generateOptimizedProject(options) {
           if ((0, import_chunk_MBTLUWXR.hasProperty)(devLang, key) || !(0, import_chunk_MBTLUWXR.hasProperty)(languagesToInclude, key)) {
             return null;
           }
-          const mapped = map_field(qLang, key, relative_path);
+          const mapped = map_field(qLang, key, quoted_relative_path);
           if (!mapped)
             return null;
           return [key, mapped];
@@ -28912,17 +29026,9 @@ async function fileInfoFromConfig(workspace, output, buildConfig, extraExcludes,
     buildConfig.sourcePath,
     ".mc"
   );
-  let personality = buildConfig.personality;
-  if (buildConfig.products) {
-    personality = (personality ?? []).concat(
-      buildConfig.products.map(
-        (product) => `${connectiq}/Devices/${product}/personality.mss`
-      )
-    );
-  }
   const { files: personalityFiles } = await filesFromPaths(
     workspace,
-    personality,
+    buildConfig.personality,
     ".mss"
   );
   const excludeAnnotations = Object.assign(
@@ -29006,7 +29112,13 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
         ).then(({ fnMap: fnMap2 }) => fnMap2);
       }).flat()
     );
-    barrelFnMaps.forEach((barrelFnMap) => Object.assign(fnMap, barrelFnMap));
+    barrelFnMaps.forEach(
+      (barrelFnMap) => Object.entries(barrelFnMap).forEach(([key, value2]) => {
+        if (!(0, import_chunk_MBTLUWXR.hasProperty)(fnMap, key)) {
+          fnMap[key] = value2;
+        }
+      })
+    );
   }
   const actualOptimizedFiles = (await (0, import_chunk_SG7ODKRM.globa)(path4.join(output, "**", "*.mc"), { mark: true })).filter((file) => !file.endsWith("/")).sort();
   const {
@@ -29030,7 +29142,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 && 1713286417604 < opt_time) {
+      if (source_time < opt_time && 1713815963058 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29069,7 +29181,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.56",
+            optimizerVersion: "1.1.58",
             ...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_M3LMSSY7.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_M3LMSSY7.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_XC5IVRTO.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_XC5IVRTO.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_M3LMSSY7.defaultConfig,
-  display: () => import_chunk_M3LMSSY7.display,
-  generateOneConfig: () => import_chunk_M3LMSSY7.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_M3LMSSY7.generateOptimizedProject,
-  getConfig: () => import_chunk_M3LMSSY7.getConfig,
-  getProjectAnalysis: () => import_chunk_M3LMSSY7.getProjectAnalysis,
-  get_jungle: () => import_chunk_M3LMSSY7.get_jungle,
-  isErrorWithLocation: () => import_chunk_M3LMSSY7.isErrorWithLocation,
-  launchSimulator: () => import_chunk_M3LMSSY7.launchSimulator,
-  manifestProducts: () => import_chunk_M3LMSSY7.manifestProducts,
-  mctree: () => import_chunk_M3LMSSY7.mctree,
-  simulateProgram: () => import_chunk_M3LMSSY7.simulateProgram
+  defaultConfig: () => import_chunk_XC5IVRTO.defaultConfig,
+  display: () => import_chunk_XC5IVRTO.display,
+  generateOneConfig: () => import_chunk_XC5IVRTO.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_XC5IVRTO.generateOptimizedProject,
+  getConfig: () => import_chunk_XC5IVRTO.getConfig,
+  getProjectAnalysis: () => import_chunk_XC5IVRTO.getProjectAnalysis,
+  get_jungle: () => import_chunk_XC5IVRTO.get_jungle,
+  isErrorWithLocation: () => import_chunk_XC5IVRTO.isErrorWithLocation,
+  launchSimulator: () => import_chunk_XC5IVRTO.launchSimulator,
+  manifestProducts: () => import_chunk_XC5IVRTO.manifestProducts,
+  mctree: () => import_chunk_XC5IVRTO.mctree,
+  simulateProgram: () => import_chunk_XC5IVRTO.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_M3LMSSY7 = require("./chunk-M3LMSSY7.cjs");
+var import_chunk_XC5IVRTO = require("./chunk-XC5IVRTO.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_M3LMSSY7.init_optimizer)();
+(0, import_chunk_XC5IVRTO.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_M3LMSSY7.SectionKinds,
-  appSupport: () => import_chunk_M3LMSSY7.appSupport,
-  connectiq: () => import_chunk_M3LMSSY7.connectiq,
-  getDeviceInfo: () => import_chunk_M3LMSSY7.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_M3LMSSY7.getFunctionDocumentation,
-  getLanguages: () => import_chunk_M3LMSSY7.getLanguages,
-  getSdkPath: () => import_chunk_M3LMSSY7.getSdkPath,
-  isWin: () => import_chunk_M3LMSSY7.isWin,
-  optimizeProgram: () => import_chunk_M3LMSSY7.optimizeProgram,
-  readPrg: () => import_chunk_M3LMSSY7.readPrg,
-  readPrgWithOffsets: () => import_chunk_M3LMSSY7.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_M3LMSSY7.xml_util_exports
+  SectionKinds: () => import_chunk_XC5IVRTO.SectionKinds,
+  appSupport: () => import_chunk_XC5IVRTO.appSupport,
+  connectiq: () => import_chunk_XC5IVRTO.connectiq,
+  getDeviceInfo: () => import_chunk_XC5IVRTO.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_XC5IVRTO.getFunctionDocumentation,
+  getLanguages: () => import_chunk_XC5IVRTO.getLanguages,
+  getSdkPath: () => import_chunk_XC5IVRTO.getSdkPath,
+  isWin: () => import_chunk_XC5IVRTO.isWin,
+  optimizeProgram: () => import_chunk_XC5IVRTO.optimizeProgram,
+  readPrg: () => import_chunk_XC5IVRTO.readPrg,
+  readPrgWithOffsets: () => import_chunk_XC5IVRTO.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_XC5IVRTO.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_M3LMSSY7 = require("./chunk-M3LMSSY7.cjs");
+var import_chunk_XC5IVRTO = require("./chunk-XC5IVRTO.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_M3LMSSY7.init_sdk_util)();
+(0, import_chunk_XC5IVRTO.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_M3LMSSY7 = require("./chunk-M3LMSSY7.cjs");
+var import_chunk_XC5IVRTO = require("./chunk-XC5IVRTO.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_M3LMSSY7.init_worker_task)();
+    (0, import_chunk_XC5IVRTO.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_M3LMSSY7.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_XC5IVRTO.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.56",
+  "version": "1.1.58",
   "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.56"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.57"
   },
   "devDependencies": {
     "@markw65/peggy-optimizer": "^1.0.1",