@markw65/monkeyc-optimizer 1.1.82 → 1.1.83

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.83
+
+- Rewrite enums to handle arbitrary unions (Fixes #48)
+- Clear typedef cache when an enum is converted to a typedef
+- Support barrel qualifiers in personality references (Fixes #54)
+
 ### 1.1.82
 
 - Fix type for resource ids that contain refs (Fixes #53)

package/build/api.cjs

@@ -18,51 +18,51 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_TLXMWGYI.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_TLXMWGYI.collectNamespaces,
-  createDocumentationMap: () => import_chunk_TLXMWGYI.createDocumentationMap,
-  declKey: () => import_chunk_TLXMWGYI.declKey,
-  diagnostic: () => import_chunk_TLXMWGYI.diagnostic,
-  diagnosticHelper: () => import_chunk_TLXMWGYI.diagnosticHelper,
-  findNamesInScope: () => import_chunk_TLXMWGYI.findNamesInScope,
-  findUsingForNode: () => import_chunk_TLXMWGYI.findUsingForNode,
-  formatAst: () => import_chunk_TLXMWGYI.formatAst,
-  formatAstLongLines: () => import_chunk_TLXMWGYI.formatAstLongLines,
-  formatScopedName: () => import_chunk_TLXMWGYI.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_TLXMWGYI.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_TLXMWGYI.getApiMapping,
-  getSuperClasses: () => import_chunk_TLXMWGYI.getSuperClasses,
-  handleImportUsing: () => import_chunk_TLXMWGYI.handleImportUsing,
+  checkCompilerVersion: () => import_chunk_UNU55JJ3.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_UNU55JJ3.collectNamespaces,
+  createDocumentationMap: () => import_chunk_UNU55JJ3.createDocumentationMap,
+  declKey: () => import_chunk_UNU55JJ3.declKey,
+  diagnostic: () => import_chunk_UNU55JJ3.diagnostic,
+  diagnosticHelper: () => import_chunk_UNU55JJ3.diagnosticHelper,
+  findNamesInScope: () => import_chunk_UNU55JJ3.findNamesInScope,
+  findUsingForNode: () => import_chunk_UNU55JJ3.findUsingForNode,
+  formatAst: () => import_chunk_UNU55JJ3.formatAst,
+  formatAstLongLines: () => import_chunk_UNU55JJ3.formatAstLongLines,
+  formatScopedName: () => import_chunk_UNU55JJ3.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_UNU55JJ3.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_UNU55JJ3.getApiMapping,
+  getSuperClasses: () => import_chunk_UNU55JJ3.getSuperClasses,
+  handleImportUsing: () => import_chunk_UNU55JJ3.handleImportUsing,
   hasProperty: () => import_chunk_JDC43A3I.hasProperty,
-  isClassVariable: () => import_chunk_TLXMWGYI.isClassVariable,
-  isLocal: () => import_chunk_TLXMWGYI.isLocal,
-  isLookupCandidate: () => import_chunk_TLXMWGYI.isLookupCandidate,
-  isStateNode: () => import_chunk_TLXMWGYI.isStateNode,
-  lookupByFullName: () => import_chunk_TLXMWGYI.lookupByFullName,
-  lookupNext: () => import_chunk_TLXMWGYI.lookupNext,
-  lookupResultContains: () => import_chunk_TLXMWGYI.lookupResultContains,
-  lookupWithType: () => import_chunk_TLXMWGYI.lookupWithType,
-  makeToyboxLink: () => import_chunk_TLXMWGYI.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_TLXMWGYI.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_TLXMWGYI.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_TLXMWGYI.parseSdkVersion,
-  popRootNode: () => import_chunk_TLXMWGYI.popRootNode,
-  pushRootNode: () => import_chunk_TLXMWGYI.pushRootNode,
-  resolveDiagnostics: () => import_chunk_TLXMWGYI.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_TLXMWGYI.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_TLXMWGYI.sameLookupResult,
+  isClassVariable: () => import_chunk_UNU55JJ3.isClassVariable,
+  isLocal: () => import_chunk_UNU55JJ3.isLocal,
+  isLookupCandidate: () => import_chunk_UNU55JJ3.isLookupCandidate,
+  isStateNode: () => import_chunk_UNU55JJ3.isStateNode,
+  lookupByFullName: () => import_chunk_UNU55JJ3.lookupByFullName,
+  lookupNext: () => import_chunk_UNU55JJ3.lookupNext,
+  lookupResultContains: () => import_chunk_UNU55JJ3.lookupResultContains,
+  lookupWithType: () => import_chunk_UNU55JJ3.lookupWithType,
+  makeToyboxLink: () => import_chunk_UNU55JJ3.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_UNU55JJ3.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_UNU55JJ3.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_UNU55JJ3.parseSdkVersion,
+  popRootNode: () => import_chunk_UNU55JJ3.popRootNode,
+  pushRootNode: () => import_chunk_UNU55JJ3.pushRootNode,
+  resolveDiagnostics: () => import_chunk_UNU55JJ3.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_UNU55JJ3.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_UNU55JJ3.sameLookupResult,
   traverseAst: () => import_chunk_JDC43A3I.traverseAst,
-  variableDeclarationName: () => import_chunk_TLXMWGYI.variableDeclarationName,
-  visitReferences: () => import_chunk_TLXMWGYI.visitReferences,
-  visit_resources: () => import_chunk_TLXMWGYI.visit_resources,
-  visitorNode: () => import_chunk_TLXMWGYI.visitorNode
+  variableDeclarationName: () => import_chunk_UNU55JJ3.variableDeclarationName,
+  visitReferences: () => import_chunk_UNU55JJ3.visitReferences,
+  visit_resources: () => import_chunk_UNU55JJ3.visit_resources,
+  visitorNode: () => import_chunk_UNU55JJ3.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_TLXMWGYI = require("./chunk-TLXMWGYI.cjs");
+var import_chunk_UNU55JJ3 = require("./chunk-UNU55JJ3.cjs");
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_TLXMWGYI.init_api)();
+(0, import_chunk_UNU55JJ3.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-TLXMWGYI.cjs → chunk-UNU55JJ3.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_TLXMWGYI_exports = {};
-__export(chunk_TLXMWGYI_exports, {
+var chunk_UNU55JJ3_exports = {};
+__export(chunk_UNU55JJ3_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -139,7 +139,7 @@ __export(chunk_TLXMWGYI_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_TLXMWGYI_exports);
+module.exports = __toCommonJS(chunk_UNU55JJ3_exports);
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -7897,28 +7897,33 @@ function mergeSingle(pair, widenDepth) {
     case 65536: {
       const toE = pair.avalue;
       const fromE = pair.bvalue;
-      if (toE.enum !== fromE.enum) {
-        if (toE.value && fromE.value) {
-          const result = cloneType(toE.value);
-          unionHelper(result, fromE.value, widenDepth + 1);
-          const e = { value: result };
-          return [e, true];
+      let changed = false;
+      let resultEnum = toE.enum;
+      const s = new Set(
+        Array.isArray(toE.enum) ? toE.enum : [toE.enum]
+      );
+      const size = s.size;
+      (0, import_chunk_X7QCZR3F.forEach)(fromE.enum, (e) => s.add(e));
+      if (size !== s.size) {
+        resultEnum = Array.from(s);
+        changed = true;
+      }
+      let resultValue = toE.value;
+      if (resultValue) {
+        if (fromE.value) {
+          resultValue = cloneType(resultValue);
+          if (unionHelper(resultValue, fromE.value, widenDepth + 1)) {
+            changed = true;
+          }
+        } else {
+          resultValue = void 0;
+          changed = true;
         }
-        return [null, true];
       }
-      if (!toE.value) {
+      if (!changed) {
         return [toE, false];
       }
-      if (!fromE.value) {
-        delete toE.value;
-        return [toE, true];
-      }
-      const toValue = tryUnion(toE.value, fromE.value);
-      if (toValue) {
-        const e = { enum: toE.enum, value: toValue };
-        return [e, true];
-      }
-      return [toE, false];
+      return resultValue ? [{ enum: resultEnum, value: resultValue }, changed] : [{ enum: resultEnum }, changed];
     }
     default:
       unhandledType(pair);
@@ -8063,10 +8068,7 @@ function intersectEnum(t, e) {
     /* Enum */
   );
   const e2 = cloneType(e);
-  const i = intersection(
-    t,
-    !enumData ? { type: EnumTagsConst } : enumData.value ? enumData.value : enumData.enum?.resolvedType || { type: EnumTagsConst }
-  );
+  const i = intersection(t, typeFromEnumValue(enumData));
   if (e2.value != null) {
     clearValuesUnder(e2, 65536, true);
   } else {
@@ -8295,19 +8297,21 @@ function intersectionValue(pair) {
       return klass.type !== 16384 || klass.value == null ? null : obj ? { klass, obj } : { klass };
     }
     case 65536: {
-      if (pair.avalue.enum !== pair.bvalue.enum && pair.avalue.enum && pair.bvalue.enum) {
-        return null;
-      }
-      const enumDecl = pair.avalue.enum || pair.bvalue.enum;
-      if (pair.avalue.value != null) {
-        if (pair.bvalue.value != null) {
-          const value2 = intersection(pair.avalue.value, pair.bvalue.value);
-          const e = { enum: enumDecl, value: value2 };
-          return e;
+      let enumDecl;
+      if (Array.isArray(pair.avalue.enum)) {
+        const s = new Set(pair.avalue.enum);
+        const enums = [];
+        (0, import_chunk_X7QCZR3F.forEach)(pair.bvalue.enum, (b) => s.has(b) && enums.push(b));
+        if (enums.length) {
+          enumDecl = enums.length === 1 ? enums[0] : enums;
         }
-        return pair.avalue.value;
+      } else {
+        (0, import_chunk_X7QCZR3F.some)(pair.bvalue.enum, (b) => b === pair.avalue.enum) && (enumDecl = pair.bvalue.enum);
       }
-      return pair.bvalue;
+      if (!enumDecl)
+        return null;
+      const enumValue = pair.avalue.value != null ? pair.bvalue.value != null ? intersection(pair.avalue.value, pair.bvalue.value) : pair.avalue.value : pair.bvalue.value;
+      return { enum: enumDecl, value: enumValue };
     }
     default:
       unhandledType(pair);
@@ -8339,12 +8343,7 @@ function fixupEnum(a, b_restricted, b) {
       65536
       /* Enum */
     );
-    const br = restrictByEquality(
-      a,
-      bvalue && (bvalue.value || bvalue.enum?.resolvedType) || {
-        type: EnumTagsConst
-      }
-    );
+    const br = restrictByEquality(a, typeFromEnumValue(bvalue));
     if (br.type) {
       b_restricted = cloneType(b_restricted);
       unionInto(
@@ -8512,12 +8511,7 @@ function restrictExactTypesByEquality(a, b) {
     case 131072:
       return intersection(a, b);
     case 65536: {
-      return restrictByEquality(
-        a.value && (a.value.value || a.value.enum?.resolvedType) || {
-          type: EnumTagsConst
-        },
-        b
-      );
+      return restrictByEquality(typeFromEnumValue(a.value), b);
     }
     case 262144:
       return restrictByEquality(
@@ -8608,12 +8602,7 @@ function subtypeOf(a, b) {
       65536
       /* Enum */
     );
-    if (!subtypeOf(
-      value2 != null && (value2.value || value2.enum?.resolvedType) || {
-        type: EnumTagsConst
-      },
-      b
-    )) {
+    if (!subtypeOf(typeFromEnumValue(value2), b)) {
       return false;
     }
     if (a.type === 65536)
@@ -8740,7 +8729,12 @@ function subtypeOfValue(pair) {
     case 65536: {
       const aenum = pair.avalue;
       const benum = pair.bvalue;
-      return aenum.enum === benum.enum && (!aenum.value || !benum.value || subtypeOf(aenum.value, benum.value));
+      if (benum.value) {
+        if (!aenum.value || !subtypeOf(aenum.value, benum.value)) {
+          return false;
+        }
+      }
+      return (0, import_chunk_X7QCZR3F.every)(aenum.enum, (ea) => (0, import_chunk_X7QCZR3F.some)(benum.enum, (eb) => ea === eb));
     }
     default:
       unhandledType(pair);
@@ -10476,12 +10470,7 @@ function deEnumerate(t) {
     );
     t = cloneType(t);
     clearValuesUnder(t, 65536, true);
-    unionInto(
-      t,
-      data && (data.value || data.enum?.resolvedType) || {
-        type: EnumTagsConst
-      }
-    );
+    unionInto(t, typeFromEnumValue(data));
   }
   return t;
 }
@@ -12024,11 +12013,8 @@ function mcExprFromType(type) {
       if (type.value.value && hasValue(type.value.value)) {
         const left = mcExprFromType(type.value.value);
         if (left) {
-          if (!type.value.enum) {
-            return left;
-          }
-          const enumStr = type.value.enum.fullName.slice(2);
-          if (enumStr === "Toybox.Graphics.ColorValue" && left.type === "Literal" && typeof left.value === "number" && left.value >= 0 && left.value <= 16777215 && /^\d+$/.test(left.raw)) {
+          const enumStrs = (0, import_chunk_X7QCZR3F.map)(type.value.enum, (e) => e.fullName.slice(2));
+          if (enumStrs.length === 1 && enumStrs[0] === "Toybox.Graphics.ColorValue" && left.type === "Literal" && typeof left.value === "number" && left.value >= 0 && left.value <= 16777215 && /^\d+$/.test(left.raw)) {
             left.raw = "0x" + `00000${left.value.toString(16)}`.slice(-6);
           }
           return {
@@ -12037,7 +12023,7 @@ function mcExprFromType(type) {
             left,
             right: {
               type: "TypeSpecList",
-              ts: [type.value.enum.fullName.slice(2)]
+              ts: enumStrs
             }
           };
         }
@@ -12191,7 +12177,8 @@ function display(type) {
       }
       case 65536: {
         const v = tv.value;
-        return v.enum != null ? v.value != null ? `${display(v.value)} as ${v.enum.fullName.slice(2)}` : v.enum.fullName.slice(2) : v.value != null ? `enum<${display(v.value)}>` : `enum`;
+        const name = v.enum ? (0, import_chunk_X7QCZR3F.map)(v.enum, (e) => e.fullName.slice(2)).join(" or ") : "";
+        return v.value != null ? `${display(v.value)} as ${name}` : name;
       }
       case 131072:
         return `:${tv.value}`;
@@ -12414,6 +12401,18 @@ function checkArrayCovariance(arg, param) {
 function safeReferenceArg(arg) {
   return arg.type === "ArrayExpression" || arg.type === "ObjectExpression" || arg.type === "NewExpression";
 }
+function typeFromEnumValue(arg) {
+  return arg?.value ?? (arg && reducedType(
+    (0, import_chunk_X7QCZR3F.map)(
+      arg.enum,
+      (e) => e.resolvedType ?? {
+        type: EnumTagsConst
+      }
+    )
+  )) ?? {
+    type: EnumTagsConst
+  };
+}
 var LastTypeTag, SingletonTypeTagsConst, UnionDataTypeTagsConst, ValueTypeTagsConst, ObjectLikeTagsConst, EnumTagsConst, TruthyTypes;
 var init_types = (0, import_chunk_ABYVSU2C.__esm)({
   "src/type-flow/types.ts"() {
@@ -12591,7 +12590,10 @@ function couldBeValue(pair, shallow) {
       return couldBe(pair.avalue.klass, pair.bvalue.klass) && (shallow || couldBeObj(pair.avalue.obj, pair.bvalue.obj));
     }
     case 65536: {
-      return pair.avalue.enum === pair.bvalue.enum && (!pair.avalue.value || !pair.bvalue.value || couldBe(pair.avalue.value, pair.bvalue.value));
+      return (!pair.avalue.value || !pair.bvalue.value || couldBe(pair.avalue.value, pair.bvalue.value)) && (0, import_chunk_X7QCZR3F.some)(
+        pair.avalue.enum,
+        (sna) => (0, import_chunk_X7QCZR3F.some)(pair.bvalue.enum, (snb) => sna === snb)
+      );
     }
     default:
       unhandledType(pair);
@@ -17182,6 +17184,7 @@ async function analyze(fnMap, resourcesMap, manifestXML, config, allowParseError
     allClasses: [],
     nestedClasses: {},
     allModules: /* @__PURE__ */ new Set(),
+    allTypedefs: /* @__PURE__ */ new Set(),
     shouldExclude(node) {
       if ("attrs" in node && node.attrs && "attributes" in node.attrs && node.attrs.attributes && node.loc?.source) {
         const excludeAnnotations = fnMap[node.loc.source].excludeAnnotations;
@@ -17874,7 +17877,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
               changes |= 1;
               this.removeNodeComments(node, f.ast);
             } else if (ret) {
-              if (node.type === "EnumDeclaration" && ret.type === "TypedefDeclaration" && ret.ts.argument.ts.length > 1) {
+              if (node.type === "EnumDeclaration" && ret.type === "TypedefDeclaration") {
                 changes |= 2;
               } else {
                 changes |= 1;
@@ -17883,6 +17886,9 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
             return ret;
           };
           collectNamespaces(f.ast, state2);
+          if (changes & 2) {
+            state2.allTypedefs?.forEach((t) => delete t.resolvedType);
+          }
           return changes;
         },
         0
@@ -18074,14 +18080,10 @@ function cleanup(state, node, ast, usedNodes) {
           (d) => d.type === "EnumDeclaration" && d.node === node
         );
         if (i >= 0) {
-          const old = decls[i];
-          const rep = {
-            ...old,
-            type: "TypedefDeclaration",
-            node: typedefDecl
-          };
+          const rep = decls[i];
+          rep.type = "TypedefDeclaration";
+          rep.node = typedefDecl;
           delete rep.resolvedType;
-          decls.splice(i, 1, rep);
         }
       }
       return typedefDecl;
@@ -18541,8 +18543,11 @@ function visit_resource_refs(state, doc, e, barrelNames) {
             loc.start.offset -= name.length;
           }
         } else {
-          const base = (0, import_chunk_JDC43A3I.makeScopedName)(`Rez.Styles`);
-          const idLoc = (0, import_chunk_JDC43A3I.adjustLoc)(loc, 0, 0);
+          const colonPos = name.indexOf(":");
+          const barrel = colonPos < 0 ? "" : name.slice(0, colonPos) + ".";
+          name = name.slice(colonPos + 1);
+          const base = (0, import_chunk_JDC43A3I.makeScopedName)(`${barrel}Rez.Styles`);
+          const idLoc = (0, import_chunk_JDC43A3I.adjustLoc)(loc, colonPos + 1, 0);
           idLoc.end = { ...idLoc.start };
           idLoc.end.column += name.length;
           idLoc.end.offset += name.length;
@@ -19823,6 +19828,8 @@ function stateFuncs() {
                 parent.type_decls[name].push(decl);
                 if (decl.type === "EnumDeclaration") {
                   currentEnum = decl;
+                } else {
+                  this.allTypedefs?.add(decl);
                 }
                 break;
               }
@@ -30406,7 +30413,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_X7QCZR3F.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1732486572981 < opt_time) {
+      if (source_time < opt_time && 1732680967178 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -30444,7 +30451,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.82",
+            optimizerVersion: "1.1.83",
             ...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_TLXMWGYI.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_TLXMWGYI.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_TLXMWGYI.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_UNU55JJ3.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_UNU55JJ3.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_UNU55JJ3.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_X7QCZR3F.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_TLXMWGYI.defaultConfig,
-  display: () => import_chunk_TLXMWGYI.display,
-  generateOneConfig: () => import_chunk_TLXMWGYI.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_TLXMWGYI.generateOptimizedProject,
-  getConfig: () => import_chunk_TLXMWGYI.getConfig,
-  getFnMapAnalysis: () => import_chunk_TLXMWGYI.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_TLXMWGYI.getProjectAnalysis,
-  get_jungle: () => import_chunk_TLXMWGYI.get_jungle,
-  isErrorWithLocation: () => import_chunk_TLXMWGYI.isErrorWithLocation,
-  launchSimulator: () => import_chunk_TLXMWGYI.launchSimulator,
-  manifestProducts: () => import_chunk_TLXMWGYI.manifestProducts,
-  mctree: () => import_chunk_TLXMWGYI.mctree,
-  simulateProgram: () => import_chunk_TLXMWGYI.simulateProgram
+  defaultConfig: () => import_chunk_UNU55JJ3.defaultConfig,
+  display: () => import_chunk_UNU55JJ3.display,
+  generateOneConfig: () => import_chunk_UNU55JJ3.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_UNU55JJ3.generateOptimizedProject,
+  getConfig: () => import_chunk_UNU55JJ3.getConfig,
+  getFnMapAnalysis: () => import_chunk_UNU55JJ3.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_UNU55JJ3.getProjectAnalysis,
+  get_jungle: () => import_chunk_UNU55JJ3.get_jungle,
+  isErrorWithLocation: () => import_chunk_UNU55JJ3.isErrorWithLocation,
+  launchSimulator: () => import_chunk_UNU55JJ3.launchSimulator,
+  manifestProducts: () => import_chunk_UNU55JJ3.manifestProducts,
+  mctree: () => import_chunk_UNU55JJ3.mctree,
+  simulateProgram: () => import_chunk_UNU55JJ3.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_TLXMWGYI = require("./chunk-TLXMWGYI.cjs");
+var import_chunk_UNU55JJ3 = require("./chunk-UNU55JJ3.cjs");
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_TLXMWGYI.init_optimizer)();
+(0, import_chunk_UNU55JJ3.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_TLXMWGYI.SectionKinds,
-  appSupport: () => import_chunk_TLXMWGYI.appSupport,
-  connectiq: () => import_chunk_TLXMWGYI.connectiq,
-  getDeviceInfo: () => import_chunk_TLXMWGYI.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_TLXMWGYI.getFunctionDocumentation,
-  getLanguages: () => import_chunk_TLXMWGYI.getLanguages,
-  getSdkPath: () => import_chunk_TLXMWGYI.getSdkPath,
-  isWin: () => import_chunk_TLXMWGYI.isWin,
-  optimizeProgram: () => import_chunk_TLXMWGYI.optimizeProgram,
-  readPrg: () => import_chunk_TLXMWGYI.readPrg,
-  readPrgWithOffsets: () => import_chunk_TLXMWGYI.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_TLXMWGYI.xml_util_exports
+  SectionKinds: () => import_chunk_UNU55JJ3.SectionKinds,
+  appSupport: () => import_chunk_UNU55JJ3.appSupport,
+  connectiq: () => import_chunk_UNU55JJ3.connectiq,
+  getDeviceInfo: () => import_chunk_UNU55JJ3.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_UNU55JJ3.getFunctionDocumentation,
+  getLanguages: () => import_chunk_UNU55JJ3.getLanguages,
+  getSdkPath: () => import_chunk_UNU55JJ3.getSdkPath,
+  isWin: () => import_chunk_UNU55JJ3.isWin,
+  optimizeProgram: () => import_chunk_UNU55JJ3.optimizeProgram,
+  readPrg: () => import_chunk_UNU55JJ3.readPrg,
+  readPrgWithOffsets: () => import_chunk_UNU55JJ3.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_UNU55JJ3.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_TLXMWGYI = require("./chunk-TLXMWGYI.cjs");
+var import_chunk_UNU55JJ3 = require("./chunk-UNU55JJ3.cjs");
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_TLXMWGYI.init_sdk_util)();
+(0, import_chunk_UNU55JJ3.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/api.d.ts

@@ -31,7 +31,7 @@ export declare function findNamesInScope(declStack: StateNode[][], pattern: stri
     readonly parent: StateNode;
     readonly depth: number;
 }])[];
-export declare function mapVarDeclsByType(state: ProgramStateAnalysis, decls: StateNodeDecl[], node: mctree.Node, typeMap: TypeMap | null | undefined): (mctree.Identifier | mctree.EnumStringMember | mctree.AsIdentifier | ProgramStateNode | FunctionStateNode | ModuleStateNode | ClassStateNode | VariableStateNode | import("./optimizer-types").BlockStateNode | TypedefStateNode | EnumStateNode)[];
+export declare function mapVarDeclsByType(state: ProgramStateAnalysis, decls: StateNodeDecl[], node: mctree.Node, typeMap: TypeMap | null | undefined): (mctree.Identifier | mctree.EnumStringMember | mctree.AsIdentifier | ProgramStateNode | FunctionStateNode | ModuleStateNode | ClassStateNode | TypedefStateNode | VariableStateNode | import("./optimizer-types").BlockStateNode | EnumStateNode)[];
 export declare function formatScopedName(node: mctree.ScopedName | mctree.ThisExpression): string;
 export declare function formatAstLongLines(node: mctree.Node): Promise<string>;
 export declare function createDocumentationMap(functionDocumentation: {

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

@@ -138,6 +138,7 @@ export type ProgramState = {
     allClasses?: ClassStateNode[];
     nestedClasses?: Record<string, ClassStateNode[]>;
     allModules?: Set<ModuleStateNode>;
+    allTypedefs?: Set<TypedefStateNode>;
     invokeInfo?: FunctionInfo;
     allDeclarations?: Record<string, ByNameStateNodeDecls[]>;
     fnMap?: FilesToOptimizeMap;
@@ -191,7 +192,7 @@ export type Finalized<T, Keys extends keyof T> = T & {
     [key in Keys]-?: NonNullable<T[key]>;
 };
 export type ProgramStateLive = Finalized<ProgramState, "stack" | "top" | "lookup" | "lookupValue" | "lookupType" | "lookupNonlocal" | "stackClone" | "traverse" | "index" | "constants" | "removeNodeComments" | "inType" | "nextExposed" | "lookupRules">;
-export type ProgramStateAnalysis = Finalized<ProgramStateLive, "allClasses" | "nestedClasses" | "allModules" | "allFunctions" | "fnMap" | "allDeclarations" | "invokeInfo">;
+export type ProgramStateAnalysis = Finalized<ProgramStateLive, "allClasses" | "nestedClasses" | "allModules" | "allTypedefs" | "allFunctions" | "fnMap" | "allDeclarations" | "invokeInfo">;
 export type ProgramStateOptimizer = Finalized<ProgramStateAnalysis, "localsStack" | "exposed" | "calledFunctions" | "usedByName">;
 export type ExcludeAnnotationsMap = {
     [key: string]: boolean;

package/build/src/type-flow/types.d.ts

@@ -144,11 +144,8 @@ export interface ObjectType extends AbstractValue {
 export interface EnumType extends AbstractValue {
     type: TypeTag.Enum;
     value?: {
-        enum: EnumStateNode;
+        enum: EnumStateNode | EnumStateNode[];
         value?: ExactOrUnion | undefined;
-    } | {
-        enum?: undefined;
-        value: ExactOrUnion;
     } | undefined;
 }
 export interface SymbolType extends AbstractValue {
@@ -222,4 +219,5 @@ export declare function tupleReduce(v: Array<ExactOrUnion | ExactOrUnion[]>): Un
 export declare function reducedArrayType(t: Set<ExactOrUnion[] | ExactOrUnion> | ExactOrUnion[] | ExactOrUnion): ExactOrUnion;
 export declare function checkArrayCovariance(arg: NonNullable<ArrayType["value"]>, param: NonNullable<ArrayType["value"]>): boolean;
 export declare function safeReferenceArg(arg: mctree.Expression): boolean;
+export declare function typeFromEnumValue(arg: EnumType["value"] | null): UnionType | NumberType | LongType | FloatType | DoubleType | CharType | StringType | ArrayType | DictionaryType | MethodType | ModuleType | FunctionType | ClassType | ObjectType | EnumType | SymbolType | TypedefType;
 export {};

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_TLXMWGYI = require("./chunk-TLXMWGYI.cjs");
+var import_chunk_UNU55JJ3 = require("./chunk-UNU55JJ3.cjs");
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.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_TLXMWGYI.init_worker_task)();
+    (0, import_chunk_UNU55JJ3.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_TLXMWGYI.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_UNU55JJ3.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.82",
+  "version": "1.1.83",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",