@markw65/monkeyc-optimizer 1.1.57 → 1.1.59

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.59
+
+- Getv and Putv can directly access local 0 (Fixes #34)
+
+### 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

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

package/build/{chunk-PUEG4GNZ.cjs → chunk-53Q62QUI.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_PUEG4GNZ_exports = {};
-__export(chunk_PUEG4GNZ_exports, {
+var chunk_53Q62QUI_exports = {};
+__export(chunk_53Q62QUI_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_PUEG4GNZ_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_PUEG4GNZ_exports);
+module.exports = __toCommonJS(chunk_53Q62QUI_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");
@@ -12789,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;
   });
@@ -12994,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,
@@ -13055,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;
       },
       {
@@ -17057,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 = {};
@@ -17080,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) {
@@ -17129,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;
@@ -17149,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);
       })) {
@@ -17303,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;
@@ -17975,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"() {
@@ -20353,19 +20420,19 @@ function opReadsLocal(bytecode) {
     case 67:
     case 68:
     case 42:
+    case 13:
+    case 14:
       return 0;
     case 70:
       return bytecode.arg.local;
     case 18:
       return bytecode.arg;
     case 19:
-    case 14:
     case 17:
     case 73:
     case 21:
     case 15:
     case 72:
-    case 13:
     case 69:
     case 71:
     case 16:
@@ -22012,11 +22079,11 @@ function localDCE(func, context) {
             dceInfo.stack.push({ dead: false });
           }
           dceInfo.locals.delete(bytecode.arg);
-          break;
+          continue;
         }
         case 2:
           dceInfo.stack.push({ dead: true, deps: [i] });
-          break;
+          continue;
         case 46: {
           const item = dceInfo.stack.pop();
           if (item?.dead) {
@@ -22028,7 +22095,7 @@ function localDCE(func, context) {
               dceInfo.stack[dceInfo.stack.length - 1 - bytecode.arg].dead = false;
             }
           }
-          break;
+          continue;
         }
         case 70:
         case 68:
@@ -22061,11 +22128,7 @@ function localDCE(func, context) {
             item.deps.push(i);
             reportNop(item);
             item.deps.forEach((index) => makeNop(block.bytecodes[index]));
-          } else {
-            const local = opReadsLocal(bytecode);
-            if (local != null) {
-              dceInfo.locals.add(local);
-            }
+            continue;
           }
           break;
         }
@@ -22095,10 +22158,10 @@ function localDCE(func, context) {
             makePopv(bytecode);
             dceInfo.stack.push({ dead: true, deps: item.deps.slice() });
             dceInfo.stack.push({ dead: true, deps: [i] });
-          } else {
-            dceInfo.stack.push({ dead: false });
-            dceInfo.stack.push({ dead: false });
+            continue;
           }
+          dceInfo.stack.push({ dead: false });
+          dceInfo.stack.push({ dead: false });
           break;
         }
         case 21:
@@ -22115,16 +22178,16 @@ function localDCE(func, context) {
             makePopv(bytecode);
             item.deps.forEach((index) => makeNop(block.bytecodes[index]));
             dceInfo.stack.push({ dead: true, deps: [i] });
-          } else {
-            dceInfo.stack.push({ dead: false });
+            continue;
           }
+          dceInfo.stack.push({ dead: false });
           break;
         }
         case 51:
         case 15:
         case 72:
           if (block.exsucc) {
-            liveInLocals.get(block.exsucc)?.forEach((local) => dceInfo.locals.add(local));
+            liveInLocals.get(block.exsucc)?.forEach((local2) => dceInfo.locals.add(local2));
           }
         case 17:
         case 73:
@@ -22154,6 +22217,10 @@ function localDCE(func, context) {
         default:
           unhandledType(bytecode);
       }
+      const local = opReadsLocal(bytecode);
+      if (local != null) {
+        dceInfo.locals.add(local);
+      }
     }
     if (changes) {
       anyChanges = true;
@@ -22413,6 +22480,8 @@ function minimizeLocals2(func, equivSets, context) {
           }
           break;
         }
+        case 14:
+        case 13:
         case 42:
         case 68:
         case 67: {
@@ -22459,6 +22528,8 @@ function computeSplitRanges(func, equivSets) {
         case 70:
         case 42:
         case 18:
+        case 13:
+        case 14:
           recordLocalRead(locals, bc);
           break;
         case 19: {
@@ -28729,7 +28800,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)
@@ -28875,8 +28953,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) {
@@ -28885,7 +28963,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];
@@ -29068,7 +29146,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 && 1713624391103 < opt_time) {
+      if (source_time < opt_time && 1713974596186 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29107,7 +29185,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.57",
+            optimizerVersion: "1.1.59",
             ...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_PUEG4GNZ.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_PUEG4GNZ.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_53Q62QUI.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_53Q62QUI.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_PUEG4GNZ.defaultConfig,
-  display: () => import_chunk_PUEG4GNZ.display,
-  generateOneConfig: () => import_chunk_PUEG4GNZ.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_PUEG4GNZ.generateOptimizedProject,
-  getConfig: () => import_chunk_PUEG4GNZ.getConfig,
-  getProjectAnalysis: () => import_chunk_PUEG4GNZ.getProjectAnalysis,
-  get_jungle: () => import_chunk_PUEG4GNZ.get_jungle,
-  isErrorWithLocation: () => import_chunk_PUEG4GNZ.isErrorWithLocation,
-  launchSimulator: () => import_chunk_PUEG4GNZ.launchSimulator,
-  manifestProducts: () => import_chunk_PUEG4GNZ.manifestProducts,
-  mctree: () => import_chunk_PUEG4GNZ.mctree,
-  simulateProgram: () => import_chunk_PUEG4GNZ.simulateProgram
+  defaultConfig: () => import_chunk_53Q62QUI.defaultConfig,
+  display: () => import_chunk_53Q62QUI.display,
+  generateOneConfig: () => import_chunk_53Q62QUI.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_53Q62QUI.generateOptimizedProject,
+  getConfig: () => import_chunk_53Q62QUI.getConfig,
+  getProjectAnalysis: () => import_chunk_53Q62QUI.getProjectAnalysis,
+  get_jungle: () => import_chunk_53Q62QUI.get_jungle,
+  isErrorWithLocation: () => import_chunk_53Q62QUI.isErrorWithLocation,
+  launchSimulator: () => import_chunk_53Q62QUI.launchSimulator,
+  manifestProducts: () => import_chunk_53Q62QUI.manifestProducts,
+  mctree: () => import_chunk_53Q62QUI.mctree,
+  simulateProgram: () => import_chunk_53Q62QUI.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_PUEG4GNZ = require("./chunk-PUEG4GNZ.cjs");
+var import_chunk_53Q62QUI = require("./chunk-53Q62QUI.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_PUEG4GNZ.init_optimizer)();
+(0, import_chunk_53Q62QUI.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_PUEG4GNZ.SectionKinds,
-  appSupport: () => import_chunk_PUEG4GNZ.appSupport,
-  connectiq: () => import_chunk_PUEG4GNZ.connectiq,
-  getDeviceInfo: () => import_chunk_PUEG4GNZ.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_PUEG4GNZ.getFunctionDocumentation,
-  getLanguages: () => import_chunk_PUEG4GNZ.getLanguages,
-  getSdkPath: () => import_chunk_PUEG4GNZ.getSdkPath,
-  isWin: () => import_chunk_PUEG4GNZ.isWin,
-  optimizeProgram: () => import_chunk_PUEG4GNZ.optimizeProgram,
-  readPrg: () => import_chunk_PUEG4GNZ.readPrg,
-  readPrgWithOffsets: () => import_chunk_PUEG4GNZ.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_PUEG4GNZ.xml_util_exports
+  SectionKinds: () => import_chunk_53Q62QUI.SectionKinds,
+  appSupport: () => import_chunk_53Q62QUI.appSupport,
+  connectiq: () => import_chunk_53Q62QUI.connectiq,
+  getDeviceInfo: () => import_chunk_53Q62QUI.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_53Q62QUI.getFunctionDocumentation,
+  getLanguages: () => import_chunk_53Q62QUI.getLanguages,
+  getSdkPath: () => import_chunk_53Q62QUI.getSdkPath,
+  isWin: () => import_chunk_53Q62QUI.isWin,
+  optimizeProgram: () => import_chunk_53Q62QUI.optimizeProgram,
+  readPrg: () => import_chunk_53Q62QUI.readPrg,
+  readPrgWithOffsets: () => import_chunk_53Q62QUI.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_53Q62QUI.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_PUEG4GNZ = require("./chunk-PUEG4GNZ.cjs");
+var import_chunk_53Q62QUI = require("./chunk-53Q62QUI.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_PUEG4GNZ.init_sdk_util)();
+(0, import_chunk_53Q62QUI.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_PUEG4GNZ = require("./chunk-PUEG4GNZ.cjs");
+var import_chunk_53Q62QUI = require("./chunk-53Q62QUI.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_PUEG4GNZ.init_worker_task)();
+    (0, import_chunk_53Q62QUI.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_PUEG4GNZ.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_53Q62QUI.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.57",
+  "version": "1.1.59",
   "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",