@markw65/monkeyc-optimizer 1.1.39 → 1.1.41

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.41
+
+- Add proper support for tuple types (Sdk-7.x)
+- Fix a bug with the signature of the initialize method of resource-generated menus
+
+### 1.1.40
+
+- Update the bytecode optimizer to be compatible with Sdk-7.x
+
 ### 1.1.39
 
 - Update to [@markw65/prettier-plugin-monkeyc@1.0.54](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1054)

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

package/build/{chunk-3H4GE7RU.cjs → chunk-BJHWDTEM.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_3H4GE7RU_exports = {};
-__export(chunk_3H4GE7RU_exports, {
+var chunk_BJHWDTEM_exports = {};
+__export(chunk_BJHWDTEM_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -86,6 +86,7 @@ __export(chunk_3H4GE7RU_exports, {
   init_union_type: () => init_union_type,
   init_worker_pool: () => init_worker_pool,
   init_worker_task: () => init_worker_task,
+  init_xml_util: () => init_xml_util,
   intersection: () => intersection,
   isClassVariable: () => isClassVariable,
   isCondBranch: () => isCondBranch,
@@ -108,8 +109,10 @@ __export(chunk_3H4GE7RU_exports, {
   mustBeTrue: () => mustBeTrue,
   opcodeSize: () => opcodeSize,
   optimizeFunc: () => optimizeFunc,
+  optimizeMonkeyC: () => optimizeMonkeyC,
   optimizeProgram: () => optimizeProgram,
   parseSdkVersion: () => parseSdkVersion,
+  parseXml: () => parseXml,
   performTask: () => performTask,
   readPrg: () => readPrg,
   readPrgWithOffsets: () => readPrgWithOffsets,
@@ -130,7 +133,7 @@ __export(chunk_3H4GE7RU_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_3H4GE7RU_exports);
+module.exports = __toCommonJS(chunk_BJHWDTEM_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");
@@ -7291,7 +7294,7 @@ function mergeSingle(pair) {
     case 1:
     case 2:
     case 4:
-      throw new Error("Unexpected typetag in mergeSingle");
+      throw new Error("Unexpected TypeTag in mergeSingle");
     case 8:
     case 16:
     case 32:
@@ -7304,8 +7307,24 @@ function mergeSingle(pair) {
       }
       return [null, true];
     case 512: {
-      const merged = tryUnion(pair.avalue, pair.bvalue);
-      return [merged || pair.avalue, merged != null];
+      if (Array.isArray(pair.avalue)) {
+        const bv = pair.bvalue;
+        if (Array.isArray(bv)) {
+          if (pair.avalue.length === bv.length) {
+            let changed = false;
+            const u = pair.avalue.map((a, i) => {
+              const merged2 = tryUnion(a, bv[i]);
+              if (merged2)
+                changed = true;
+              return merged2 || a;
+            });
+            return [u, changed];
+          }
+        }
+      }
+      const av = reducedType(pair.avalue);
+      const merged = tryUnion(av, reducedType(pair.bvalue));
+      return [merged || av, merged != null];
     }
     case 1024: {
       const avalue = pair.avalue;
@@ -7556,11 +7575,29 @@ function widenTypeHelper(t, depth) {
               result = cloneType(t);
             clearValuesUnder(result, ac.type);
           } else {
-            const v = widenTypeHelper(ac.value, depth + 1);
-            if (v) {
-              if (!result)
-                result = cloneType(t);
-              setUnionComponent(result, ac.type, v);
+            if (Array.isArray(ac.value)) {
+              let newAData = ac.value;
+              ac.value.forEach((avalue, index) => {
+                const data = widenTypeHelper(avalue, depth + 1);
+                if (data) {
+                  if (newAData === ac.value) {
+                    newAData = newAData.slice();
+                  }
+                  newAData[index] = data;
+                }
+              });
+              if (newAData !== ac.value) {
+                if (!result)
+                  result = cloneType(t);
+                setUnionComponent(result, ac.type, newAData);
+              }
+            } else {
+              const v = widenTypeHelper(ac.value, depth + 1);
+              if (v) {
+                if (!result)
+                  result = cloneType(t);
+                setUnionComponent(result, ac.type, v);
+              }
             }
           }
           return;
@@ -7754,6 +7791,31 @@ function intersectionValue(pair) {
     case 131072:
       return pair.avalue === pair.bvalue ? pair.avalue : null;
     case 512: {
+      if (Array.isArray(pair.avalue)) {
+        const bv = pair.bvalue;
+        if (Array.isArray(bv)) {
+          if (pair.avalue.length !== bv.length) {
+            return null;
+          }
+          const isect2 = pair.avalue.map((t, i) => intersection(t, bv[i]));
+          return isect2.some(
+            (t) => t.type === 0
+            /* Never */
+          ) ? null : isect2;
+        }
+        const isect = pair.avalue.map((t) => intersection(t, bv));
+        return isect.some(
+          (t) => t.type === 0
+          /* Never */
+        ) ? null : isect;
+      } else if (Array.isArray(pair.bvalue)) {
+        const av = pair.avalue;
+        const isect = pair.bvalue.map((t) => intersection(av, t));
+        return isect.some(
+          (t) => t.type === 0
+          /* Never */
+        ) ? null : isect;
+      }
       const atype = intersection(pair.avalue, pair.bvalue);
       return atype.type === 0 ? null : atype;
     }
@@ -8197,8 +8259,21 @@ function subtypeOfValue(pair) {
     case 128:
     case 131072:
       return pair.avalue === pair.bvalue;
-    case 512:
+    case 512: {
+      if (Array.isArray(pair.avalue)) {
+        const bv = pair.bvalue;
+        if (Array.isArray(bv)) {
+          if (pair.avalue.length !== bv.length) {
+            return false;
+          }
+          return pair.avalue.every((t, i) => subtypeOf(t, bv[i]));
+        }
+        return pair.avalue.every((t) => subtypeOf(t, bv));
+      } else if (Array.isArray(pair.bvalue)) {
+        return false;
+      }
       return subtypeOf(pair.avalue, pair.bvalue);
+    }
     case 1024: {
       const adict = pair.avalue;
       const bdict = pair.bvalue;
@@ -9012,10 +9087,12 @@ function checkCallArgs(istate, node, callees, args) {
                     512
                     /* Array */
                   );
-                  if (!ptype || !subtypeOf(ptype, atype)) {
+                  if (!ptype || Array.isArray(ptype) || Array.isArray(atype) || !subtypeOf(ptype, atype)) {
                     curDiags.push([
                       node.arguments[i],
-                      `Argument ${i + 1} to ${cur.fullName}: passing Array<${display(atype)}> to parameter Array${ptype ? `<${display(ptype)}>` : ""} is not type safe`
+                      `Argument ${i + 1} to ${cur.fullName}: passing ${display(
+                        arg
+                      )} to parameter ${display(paramType)} is not type safe`
                     ]);
                   }
                 }
@@ -9139,7 +9216,13 @@ function getSystemCallTable(state) {
         if (args.length === 1) {
           const arg = args[0];
           if (callee.name === "add") {
-            if (!subtypeOf(arg, adata)) {
+            if (Array.isArray(adata)) {
+              const relaxed = relaxType(arg);
+              const newAData = [...adata, relaxed];
+              ret.returnType.value = newAData;
+              ret.argTypes = [relaxed];
+              ret.calleeObj = ret.returnType;
+            } else if (!subtypeOf(arg, adata)) {
               const newAData = cloneType(adata);
               unionInto(newAData, arg);
               const newObj = cloneType(calleeObj);
@@ -9148,6 +9231,23 @@ function getSystemCallTable(state) {
               ret.argTypes = [adata];
             }
           } else {
+            if (Array.isArray(adata)) {
+              if (arg.type & 512) {
+                const argSubtypes = getUnionComponent(
+                  arg,
+                  512
+                  /* Array */
+                );
+                if (argSubtypes && Array.isArray(argSubtypes)) {
+                  const newAData = [...adata, ...argSubtypes];
+                  ret.returnType.value = newAData;
+                  ret.argTypes = [arg];
+                  ret.calleeObj = ret.returnType;
+                  return ret;
+                }
+              }
+              ret.returnType.value = reducedType(adata);
+            }
             if (!subtypeOf(arg, ret.returnType)) {
               ret.argTypes = [ret.returnType];
               const newObj = cloneType(calleeObj);
@@ -9823,6 +9923,24 @@ function deEnumerate(t) {
   }
   return t;
 }
+function arrayTypeAtIndex(arr, elemType) {
+  if (Array.isArray(arr)) {
+    if (elemType && isExact(elemType) && elemType.type === 8 && elemType.value != null && arr[elemType.value] != null) {
+      return arr[elemType.value];
+    }
+    return arr.reduce(
+      (p, v) => {
+        unionInto(p, v);
+        return p;
+      },
+      {
+        type: 0
+        /* Never */
+      }
+    );
+  }
+  return arr;
+}
 function getLhsConstraint(istate, node) {
   if (istate.localLvals?.has(node)) {
     return null;
@@ -9851,7 +9969,7 @@ function getLhsConstraint(istate, node) {
               /* Array */
             );
             if (arr) {
-              result = arr;
+              result = arrayTypeAtIndex(arr, istate.typeMap.get(node.property));
             }
           }
           const updateResult = (value2) => {
@@ -10154,23 +10272,9 @@ function evaluateNode(istate, node) {
           node
         });
       } else {
-        const value2 = relaxType(
-          args.reduce(
-            (cur, next) => {
-              unionInto(cur, next.value);
-              return cur;
-            },
-            {
-              type: 0
-              /* Never */
-            }
-          )
-        );
+        const value2 = args.map((arg) => relaxType(arg.value));
         push({
-          value: value2.type === 0 ? {
-            type: 512
-            /* Array */
-          } : { type: 512, value: value2 },
+          value: { type: 512, value: value2 },
           embeddedEffects,
           node
         });
@@ -10329,10 +10433,11 @@ function evaluateNode(istate, node) {
               type: 524287
               /* Any */
             };
+            const atype = arrayTypeAtIndex(avalue, property.value);
             if (result) {
-              unionInto(result = cloneType(result), avalue);
+              unionInto(result = cloneType(result), atype);
             } else {
-              result = avalue;
+              result = atype;
             }
           }
           if (objectType.type & 1024) {
@@ -11005,6 +11110,20 @@ function typeFromTypeStateNodes(state, sns, classVsObj) {
     }
   );
 }
+function arrayLiteralKeyFromType(k) {
+  if (k && k.value != null) {
+    if (k.type === 8 || k.type === 16) {
+      return Number(k.value);
+    }
+  }
+  return null;
+}
+function arrayLiteralKeyFromExpr(key) {
+  if (key.type === "Literal") {
+    return arrayLiteralKeyFromType(typeFromLiteral(key));
+  }
+  return null;
+}
 function objectLiteralKeyFromExpr(key) {
   switch (key.type) {
     case "Literal": {
@@ -11080,18 +11199,8 @@ function typeFromSingleTypeSpec(state, type, stack) {
     case "ArrayExpression": {
       return {
         type: 512,
-        value: type.elements.reduce(
-          (prev, cur) => {
-            unionInto(
-              prev,
-              typeFromTypespec(state, cur)
-            );
-            return prev;
-          },
-          {
-            type: 0
-            /* Never */
-          }
+        value: type.elements.map(
+          (cur) => typeFromTypespec(state, cur)
         )
       };
     }
@@ -11394,6 +11503,21 @@ function castType(type, target) {
   }
   return result;
 }
+function reducedType(elems) {
+  if (!Array.isArray(elems)) {
+    return elems;
+  }
+  return elems.reduce(
+    (p, t) => {
+      unionInto(p, t);
+      return p;
+    },
+    {
+      type: 0
+      /* Never */
+    }
+  );
+}
 function mustBeTrue(arg) {
   return (arg.type === 8 || arg.type === 16) && arg.value != null && Number(arg.value) !== 0 || (arg.type & TruthyTypes) !== 0 && (arg.type & ~TruthyTypes) === 0;
 }
@@ -11419,7 +11543,7 @@ function display(type) {
       case 256:
         return JSON.stringify(tv.value);
       case 512:
-        return display(tv.value);
+        return Array.isArray(tv.value) ? `[${tv.value.map((t) => display(t)).join(", ")}]` : `Array<${display(tv.value)}>`;
       case 1024:
         return tv.value.value ? `Dictionary<${display(tv.value.key)}, ${display(tv.value.value)}>` : `{ ${Array.from(tv.value).map(
           ([key, value2]) => `${display(typeFromObjectLiteralKey(key))} as ${display(
@@ -11470,7 +11594,7 @@ function display(type) {
     const valueStr = value2 != null && displayOne({ type: bit, value: value2 });
     if (!valueStr) {
       parts.push(name);
-    } else if (bit & (32768 | 65536 | 262144 | 131072 | 2048 | 256 | 1024)) {
+    } else if (bit & (32768 | 65536 | 262144 | 131072 | 2048 | 256 | 512 | 1024)) {
       parts.push(valueStr);
     } else {
       parts.push(`${name}<${valueStr}${valueStr.endsWith(">") ? " " : ""}>`);
@@ -11704,9 +11828,30 @@ function couldBeValue(pair, shallow) {
     case 131072:
       return pair.avalue === pair.bvalue;
     case 512:
-      return shallow || couldBe(pair.avalue, pair.bvalue);
+      if (shallow)
+        return true;
+      if (Array.isArray(pair.avalue)) {
+        const bv = pair.bvalue;
+        if (Array.isArray(bv)) {
+          if (pair.avalue.length !== bv.length) {
+            return false;
+          }
+          return pair.avalue.every((a, i) => couldBe(a, bv[i]));
+        }
+        return pair.avalue.every((a) => couldBe(a, bv));
+      }
+      if (Array.isArray(pair.bvalue)) {
+        const av = pair.avalue;
+        return pair.bvalue.every((b) => couldBe(av, b));
+      }
+      return couldBe(pair.avalue, pair.bvalue);
     case 1024: {
-      return shallow || !pair.avalue.value || !pair.bvalue.value || couldBe(pair.avalue.key, pair.bvalue.key) && couldBe(pair.avalue.value, pair.bvalue.value);
+      if (shallow)
+        return true;
+      if (!pair.avalue.value || !pair.bvalue.value) {
+        return true;
+      }
+      return couldBe(pair.avalue.key, pair.bvalue.key) && couldBe(pair.avalue.value, pair.bvalue.value);
     }
     case 2048: {
       return pair.avalue.args.length === pair.bvalue.args.length && couldBe(pair.avalue.result, pair.bvalue.result) && pair.avalue.args.every((arg, i) => couldBe(arg, pair.bvalue.args[i]));
@@ -12507,7 +12652,11 @@ function updateAffected(blockState, objectType, baseDecl, assignedPath, affected
               /* Array */
             );
             if (atype) {
-              unionInto(newType, atype);
+              if (Array.isArray(atype)) {
+                atype.forEach((value2) => unionInto(newType, value2));
+              } else {
+                unionInto(newType, atype);
+              }
             }
           }
           if (type.type & 1024) {
@@ -12632,7 +12781,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
             next = t;
           }
           if (cur.type & 512) {
-            const avalue = getUnionComponent(
+            let avalue = getUnionComponent(
               cur,
               512
               /* Array */
@@ -12640,10 +12789,28 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
               type: 524287
               /* Any */
             };
-            if (next) {
-              unionInto(next = cloneType(next), avalue);
+            if (Array.isArray(avalue)) {
+              const index = arrayLiteralKeyFromExpr(me.property);
+              if (index != null && avalue[index] != null) {
+                if (!next) {
+                  assocValue[i].keyStr = index;
+                }
+                avalue = avalue[index];
+              }
+              if (next || i !== l || !newValue) {
+                const n = next ? cloneType(next) : {
+                  type: 0
+                  /* Never */
+                };
+                (0, import_chunk_SG7ODKRM.forEach)(avalue, (v) => unionInto(n, v));
+                next = n;
+              }
             } else {
-              next = avalue;
+              if (next) {
+                unionInto(next = cloneType(next), avalue);
+              } else {
+                next = avalue;
+              }
             }
           }
           let isExact2 = false;
@@ -12669,6 +12836,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
                     };
                   }
                 } else {
+                  delete assocValue[i].keyStr;
                   if (n) {
                     unionInto(next = cloneType(next), n);
                     next.type |= 1;
@@ -13899,16 +14067,29 @@ function updateByAssocPath(path7, property, update) {
       }
     } else if (update) {
       if (object.type & 512) {
-        object = cloneType(object);
-        setUnionComponent(
+        let avalue = getUnionComponent(
           object,
-          512,
-          valueToStore(getUnionComponent(
-            object,
-            512
-            /* Array */
-          ))
+          512
+          /* Array */
         );
+        if (Array.isArray(avalue)) {
+          const key = pathElem.keyStr;
+          const relaxed = relaxType(property);
+          if (typeof key === "number" && key >= 0 && key < avalue.length) {
+            avalue = avalue.slice();
+            avalue[key] = relaxed;
+          } else {
+            avalue = avalue.map((v) => {
+              v = cloneType(v);
+              unionInto(v, relaxed);
+              return v;
+            });
+          }
+        } else {
+          avalue = valueToStore(avalue);
+        }
+        object = cloneType(object);
+        setUnionComponent(object, 512, avalue);
       }
       if (object.type & 1024) {
         const dvalue = getUnionComponent(
@@ -13927,7 +14108,7 @@ function updateByAssocPath(path7, property, update) {
               value: valueToStore(dvalue.value)
             });
           } else {
-            if (pathElem.keyStr) {
+            if (typeof pathElem.keyStr === "string") {
               object = cloneType(object);
               const relaxed = cloneType(relaxType(property));
               relaxed.type &= ~1;
@@ -17454,6 +17635,16 @@ function add_one_resource(state, doc, module2, e) {
         loc: e.loc
       }
     ] : [];
+    items.push({
+      type: "ClassElement",
+      item: {
+        type: "FunctionDeclaration",
+        id: (0, import_chunk_MBTLUWXR.makeIdentifier)("initialize", loc),
+        body: null,
+        params: [],
+        loc: e.loc
+      }
+    });
     return {
       type: "ClassDeclaration",
       body: { type: "ClassBody", body: items, loc: e.loc },
@@ -19524,6 +19715,8 @@ function parseCode(view, lineTable) {
       case 20:
       case 54:
       case 47:
+      case 10:
+      case 11:
         return { op, offset, size: 1 };
       case 1:
       case 15:
@@ -19532,8 +19725,6 @@ function parseCode(view, lineTable) {
       case 43:
       case 46:
       case 53:
-      case 10:
-      case 11:
         return { op, arg: view.getUint8(current++), offset, size: 2 };
       case 25:
       case 35:
@@ -19656,10 +19847,18 @@ function opcodeSize(op) {
       unhandledType(op);
   }
 }
-function emitBytecode(bytecode, view, offset, linktable) {
+function emitBytecode(bytecode, view, offset, linktable, shift_hack) {
   view.setUint8(offset++, bytecode.op);
-  if (bytecode.arg == null)
+  if (bytecode.arg == null) {
+    if (shift_hack && (bytecode.op === 10 || bytecode.op === 11)) {
+      view.setUint8(
+        offset++,
+        0
+        /* nop */
+      );
+    }
     return offset;
+  }
   switch (bytecode.op) {
     case 1:
     case 15:
@@ -19668,8 +19867,6 @@ function emitBytecode(bytecode, view, offset, linktable) {
     case 43:
     case 46:
     case 53:
-    case 10:
-    case 11:
       view.setUint8(offset++, bytecode.arg);
       break;
     case 25:
@@ -22678,6 +22875,7 @@ var init_optimize2 = (0, import_chunk_ABYVSU2C.__esm)({
 function emitFunc(func, view, start, updateInfo, context) {
   cleanCfg2(func, context);
   groupBlocks(func);
+  const shift_hack = context.header.ciqVersion < 327680;
   const { liveInLocals } = getLocalsInfo(func);
   const liveLocalRanges = /* @__PURE__ */ new Map();
   const { localRanges, offsetMap } = updateInfo;
@@ -22772,7 +22970,7 @@ function emitFunc(func, view, start, updateInfo, context) {
         bytecode.arg = taken;
         bytecode.op = bytecode.op === 40 ? 41 : 40;
       }
-      offset = emitBytecode(bytecode, view, offset, linktable);
+      offset = emitBytecode(bytecode, view, offset, linktable, shift_hack);
     });
     if (block.next != null && block.next !== blocks[i + 1]?.offset) {
       const bc = {
@@ -22781,7 +22979,7 @@ function emitFunc(func, view, start, updateInfo, context) {
         offset: block.offset,
         size: 3
       };
-      offset = emitBytecode(bc, view, offset, linktable);
+      offset = emitBytecode(bc, view, offset, linktable, shift_hack);
     }
   });
   (0, import_node_assert13.default)(exceptionStack.length === 0);
@@ -28111,7 +28309,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 && 1706308945548 < opt_time) {
+      if (source_time < opt_time && 1707701537178 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -28150,7 +28348,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.39",
+            optimizerVersion: "1.1.41",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -29037,6 +29235,7 @@ var init_sdk_util = (0, import_chunk_ABYVSU2C.__esm)({
   init_union_type,
   init_worker_pool,
   init_worker_task,
+  init_xml_util,
   intersection,
   isClassVariable,
   isCondBranch,
@@ -29059,8 +29258,10 @@ var init_sdk_util = (0, import_chunk_ABYVSU2C.__esm)({
   mustBeTrue,
   opcodeSize,
   optimizeFunc,
+  optimizeMonkeyC,
   optimizeProgram,
   parseSdkVersion,
+  parseXml,
   performTask,
   readPrg,
   readPrgWithOffsets,

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_3H4GE7RU.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_3H4GE7RU.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_BJHWDTEM.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_BJHWDTEM.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_3H4GE7RU.defaultConfig,
-  display: () => import_chunk_3H4GE7RU.display,
-  generateOneConfig: () => import_chunk_3H4GE7RU.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_3H4GE7RU.generateOptimizedProject,
-  getConfig: () => import_chunk_3H4GE7RU.getConfig,
-  getProjectAnalysis: () => import_chunk_3H4GE7RU.getProjectAnalysis,
-  get_jungle: () => import_chunk_3H4GE7RU.get_jungle,
-  isErrorWithLocation: () => import_chunk_3H4GE7RU.isErrorWithLocation,
-  launchSimulator: () => import_chunk_3H4GE7RU.launchSimulator,
-  manifestProducts: () => import_chunk_3H4GE7RU.manifestProducts,
-  mctree: () => import_chunk_3H4GE7RU.mctree,
-  simulateProgram: () => import_chunk_3H4GE7RU.simulateProgram
+  defaultConfig: () => import_chunk_BJHWDTEM.defaultConfig,
+  display: () => import_chunk_BJHWDTEM.display,
+  generateOneConfig: () => import_chunk_BJHWDTEM.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_BJHWDTEM.generateOptimizedProject,
+  getConfig: () => import_chunk_BJHWDTEM.getConfig,
+  getProjectAnalysis: () => import_chunk_BJHWDTEM.getProjectAnalysis,
+  get_jungle: () => import_chunk_BJHWDTEM.get_jungle,
+  isErrorWithLocation: () => import_chunk_BJHWDTEM.isErrorWithLocation,
+  launchSimulator: () => import_chunk_BJHWDTEM.launchSimulator,
+  manifestProducts: () => import_chunk_BJHWDTEM.manifestProducts,
+  mctree: () => import_chunk_BJHWDTEM.mctree,
+  simulateProgram: () => import_chunk_BJHWDTEM.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_3H4GE7RU = require("./chunk-3H4GE7RU.cjs");
+var import_chunk_BJHWDTEM = require("./chunk-BJHWDTEM.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_3H4GE7RU.init_optimizer)();
+(0, import_chunk_BJHWDTEM.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_3H4GE7RU.SectionKinds,
-  appSupport: () => import_chunk_3H4GE7RU.appSupport,
-  connectiq: () => import_chunk_3H4GE7RU.connectiq,
-  getDeviceInfo: () => import_chunk_3H4GE7RU.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_3H4GE7RU.getFunctionDocumentation,
-  getLanguages: () => import_chunk_3H4GE7RU.getLanguages,
-  getSdkPath: () => import_chunk_3H4GE7RU.getSdkPath,
-  isWin: () => import_chunk_3H4GE7RU.isWin,
-  optimizeProgram: () => import_chunk_3H4GE7RU.optimizeProgram,
-  readPrg: () => import_chunk_3H4GE7RU.readPrg,
-  readPrgWithOffsets: () => import_chunk_3H4GE7RU.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_3H4GE7RU.xml_util_exports
+  SectionKinds: () => import_chunk_BJHWDTEM.SectionKinds,
+  appSupport: () => import_chunk_BJHWDTEM.appSupport,
+  connectiq: () => import_chunk_BJHWDTEM.connectiq,
+  getDeviceInfo: () => import_chunk_BJHWDTEM.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_BJHWDTEM.getFunctionDocumentation,
+  getLanguages: () => import_chunk_BJHWDTEM.getLanguages,
+  getSdkPath: () => import_chunk_BJHWDTEM.getSdkPath,
+  isWin: () => import_chunk_BJHWDTEM.isWin,
+  optimizeProgram: () => import_chunk_BJHWDTEM.optimizeProgram,
+  readPrg: () => import_chunk_BJHWDTEM.readPrg,
+  readPrgWithOffsets: () => import_chunk_BJHWDTEM.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_BJHWDTEM.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_3H4GE7RU = require("./chunk-3H4GE7RU.cjs");
+var import_chunk_BJHWDTEM = require("./chunk-BJHWDTEM.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_3H4GE7RU.init_sdk_util)();
+(0, import_chunk_BJHWDTEM.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/readprg/opcodes.d.ts

@@ -115,10 +115,10 @@ export interface Orv extends Argless {
 export interface Modv extends Argless {
     op: Opcodes.modv;
 }
-export interface Shlv extends ByteArg {
+export interface Shlv extends Argless {
     op: Opcodes.shlv;
 }
-export interface Shrv extends ByteArg {
+export interface Shrv extends Argless {
     op: Opcodes.shrv;
 }
 export interface Xorv extends Argless {
@@ -261,7 +261,7 @@ export interface Argc extends ByteArg {
 export type Bytecode = Nop | Incsp | Popv | Addv | Subv | Mulv | Divv | Andv | Orv | Modv | Shlv | Shrv | Xorv | Getv | Putv | Invokem | Agetv | Aputv | Lgetv | Lputv | Newa | Newc | Return | Ret | News | Goto | Eq | Lt | Lte | Gt | Gte | Ne | Isnull | Isa | Canhazplz | Jsr | Ts | Ipush | Fpush | Spush | Bt | Bf | Frpush | Bpush | Npush | Invv | Dup | Newd | Getm | Lpush | Dpush | Throw | Cpush | Argc | Newba;
 export declare function parseCode(view: DataView, lineTable: Map<number, LineNumber>): Bytecode[];
 export declare function opcodeSize(op: Opcodes): 1 | 2 | 3 | 5 | 9;
-export declare function emitBytecode(bytecode: Bytecode, view: DataView, offset: number, linktable: Map<number, number>): number;
+export declare function emitBytecode(bytecode: Bytecode, view: DataView, offset: number, linktable: Map<number, number>, shift_hack: boolean): number;
 export declare function getOpInfo(bytecode: Bytecode): {
     pop: number;
     push: number;

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

@@ -102,7 +102,7 @@ export interface StringType extends AbstractValue {
 }
 export interface ArrayType extends AbstractValue {
     type: TypeTag.Array;
-    value?: ExactOrUnion | undefined;
+    value?: ExactOrUnion | ExactOrUnion[] | undefined;
 }
 export interface DictionaryType extends AbstractValue {
     type: TypeTag.Dictionary;
@@ -190,6 +190,8 @@ export declare function cloneType<T extends ExactOrUnion>(t: T): T;
 export declare function relaxType(type: ExactOrUnion): ExactOrUnion;
 export declare function typeFromTypeStateNode(state: ProgramStateAnalysis, sn: StateNodeDecl, classVsObj?: boolean): ExactOrUnion;
 export declare function typeFromTypeStateNodes(state: ProgramStateAnalysis, sns: StateNodeDecl[], classVsObj?: boolean): ExactOrUnion;
+export declare function arrayLiteralKeyFromType(k: ExactOrUnion | null | undefined): number | null;
+export declare function arrayLiteralKeyFromExpr(key: mctree.Expression): number | null;
 export declare function objectLiteralKeyFromExpr(key: mctree.Expression): string | null;
 export declare function objectLiteralKeyFromType(key: ExactOrUnion): string | null;
 export declare function typeFromObjectLiteralKey(key: string): ValueTypes;
@@ -198,6 +200,7 @@ export declare function typeFromTypespec(state: ProgramStateAnalysis, ts: mctree
 export declare function typeFromLiteral(literal: mctree.Literal): ExactTypes;
 export declare function mcExprFromType(type: ValueTypes): mctree.Expression | null;
 export declare function castType(type: ExactOrUnion, target: UnionTypeTags): ExactOrUnion;
+export declare function reducedType(elems: ExactOrUnion[] | ExactOrUnion): ExactOrUnion;
 export declare const TruthyTypes: number;
 export declare function mustBeTrue(arg: ExactOrUnion): boolean;
 export declare function mustBeFalse(arg: ExactOrUnion): boolean;

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_3H4GE7RU = require("./chunk-3H4GE7RU.cjs");
+var import_chunk_BJHWDTEM = require("./chunk-BJHWDTEM.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_3H4GE7RU.init_worker_task)();
+    (0, import_chunk_BJHWDTEM.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_3H4GE7RU.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_BJHWDTEM.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.39",
+  "version": "1.1.41",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -22,7 +22,7 @@
     "build-debug": "node esbuild.mjs",
     "build-release": "node esbuild.mjs --release",
     "prepack": "node esbuild.mjs --release && mkdir -p bin && cp test/cft-font-info.js bin",
-    "test": "npm run test-mocha && npm run test-optimized && npm run test-unopt && npm run test-post-only && npm run test-remote && npm run test-remote-tests && npm run test-personality",
+    "test": "npm run test-mocha && npm run test-analysis && npm run test-optimized && npm run test-unopt && npm run test-post-only && npm run test-remote && npm run test-remote-tests && npm run test-personality",
     "test-mocha": "npx mocha --timeout 999999 build/mocha.cjs",
     "test-remote": "node ./test/test.js --showInfo --postOptimize --product=pick-one --github",
     "test-remote-tests": "node ./test/test.js --showInfo --postOptimize --product=pick-one --run-tests --github",
@@ -31,6 +31,7 @@
     "test-post-only": "node test/test.js --showInfo --typeCheckLevel Strict --skipOptimization --postOptimize --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
     "test-garmin-opt": "node test/test.js --typeCheckLevel Strict --skipOptimization --garminOptLevel=2 --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
     "test-personality": "node test/test-personality.js",
+    "test-analysis": "node test/test.js --showInfo --typeCheckLevel Strict --product=fr955 --sourceFile 'test/analysis/*.mc'",
     "eslint": "npx eslint ."
   },
   "bin": {