npm - @markw65/monkeyc-optimizer - Versions diffs - 1.1.80 → 1.1.82 - Mend

@markw65/monkeyc-optimizer 1.1.80 → 1.1.82

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/CHANGELOG.md +10 -0
package/build/api.cjs +39 -39
package/build/{chunk-3KM4FHVN.cjs → chunk-TLXMWGYI.cjs} +813 -613
package/build/{chunk-NHZRKHZO.cjs → chunk-X7QCZR3F.cjs} +10 -5
package/build/optimizer.cjs +20 -20
package/build/sdk-util.cjs +15 -15
package/build/src/build-config.d.ts +1 -1
package/build/src/type-flow/interp-call.d.ts +2 -1
package/build/src/type-flow/types.d.ts +8 -1
package/build/src/type-flow/union-type.d.ts +1 -1
package/build/util.cjs +26 -26
package/build/worker-thread.cjs +4 -4
package/package.json +1 -1

package/build/{chunk-3KM4FHVN.cjs → chunk-TLXMWGYI.cjs} RENAMED Viewed

@@ -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_3KM4FHVN_exports = {};
-__export(chunk_3KM4FHVN_exports, {
+var chunk_TLXMWGYI_exports = {};
+__export(chunk_TLXMWGYI_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -139,8 +139,8 @@ __export(chunk_3KM4FHVN_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_3KM4FHVN_exports);
-var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
+module.exports = __toCommonJS(chunk_TLXMWGYI_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");
 var import_node_assert = __toESM(require("node:assert"));
@@ -5726,6 +5726,12 @@ var init_build_config = (0, import_chunk_ABYVSU2C.__esm)({
             default: "YES",
             scope: "resource"
           },
+          extraReferenceTypeChecks: {
+            type: "boolean",
+            description: "Whether to warn about [unsafe operations on Arrays and Dictionaries](https://github.com/markw65/monkeyc-optimizer/wiki/Extra-Reference-Type-Checks-(prettierMonkeyC.extraReferenceTypeChecks)) that Garmin's compiler allows",
+            default: true,
+            scope: "resource"
+          },
           compilerLookupRules: {
             type: "string",
             description: "Whether to perform lookups as compiler1, compiler2, or based on the currently selected sdk",
@@ -7033,7 +7039,7 @@ function buildReducedGraph(state, root, refsForUpdate, notice) {
       switch (node.type) {
         case "ImportModule":
         case "Using":
-          (0, import_chunk_NHZRKHZO.forEach)(
+          (0, import_chunk_X7QCZR3F.forEach)(
             notice(node, node, false, () => []),
             (e) => allEvents.push(e)
           );
@@ -7042,7 +7048,7 @@ function buildReducedGraph(state, root, refsForUpdate, notice) {
         case "ModuleDeclaration":
           if (rootNode !== node)
             return [];
-          (0, import_chunk_NHZRKHZO.forEach)(
+          (0, import_chunk_X7QCZR3F.forEach)(
             notice(node, node, false, () => []),
             (e) => {
               addEvent(localState.curBlock, e);
@@ -7367,9 +7373,9 @@ function buildReducedGraph(state, root, refsForUpdate, notice) {
             );
           }
         } else {
-          (0, import_chunk_NHZRKHZO.forEach)(events, (e) => e.mayThrow = false);
+          (0, import_chunk_X7QCZR3F.forEach)(events, (e) => e.mayThrow = false);
         }
-        (0, import_chunk_NHZRKHZO.forEach)(events, (event) => {
+        (0, import_chunk_X7QCZR3F.forEach)(events, (event) => {
           if (event.mayThrow) {
             for (let i = localState.stack.length; i--; ) {
               const target = localState.stack[i].throw;
@@ -7524,7 +7530,7 @@ var init_control_flow = (0, import_chunk_ABYVSU2C.__esm)({
   "src/control-flow.ts"() {
     "use strict";
     (0, import_chunk_JDC43A3I.init_ast)();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     Terminals = {
       BreakStatement: "break",
       ContinueStatement: "continue",
@@ -7551,12 +7557,12 @@ var init_control_flow = (0, import_chunk_ABYVSU2C.__esm)({
         if (!from.succs) {
           from.succs = [to];
         } else {
-          (0, import_chunk_NHZRKHZO.pushUnique)(from.succs, to);
+          (0, import_chunk_X7QCZR3F.pushUnique)(from.succs, to);
         }
         if (!to.preds) {
           to.preds = [from];
         } else {
-          (0, import_chunk_NHZRKHZO.pushUnique)(to.preds, from);
+          (0, import_chunk_X7QCZR3F.pushUnique)(to.preds, from);
         }
       }
       newBlock(block) {
@@ -7613,6 +7619,9 @@ var init_control_flow = (0, import_chunk_ABYVSU2C.__esm)({
   }
 });
 function unionInto(to, from) {
+  return unionHelper(to, from, -Infinity);
+}
+function unionHelper(to, from, widenDepth) {
   if (to == null || from == null) {
     throw new Error("Null");
   }
@@ -7638,14 +7647,14 @@ function unionInto(to, from) {
       clearValuesUnder(to, from.type);
       return true;
     }
-    return mergeMultiple(to, from);
+    return mergeMultiple(to, from, widenDepth);
   }
   if (to.value != null) {
     if (from.value == null) {
       clearValuesUnder(to, from.type);
       return true;
     }
-    mergeMultiple(to, from);
+    mergeMultiple(to, from, widenDepth);
     return true;
   }
   if (from.value == null) {
@@ -7658,7 +7667,7 @@ function unionInto(to, from) {
   to.value = tmp.value;
   return true;
 }
-function mergeMultiple(to, from) {
+function mergeMultiple(to, from, widenDepth) {
   const newTags = to.type | from.type;
   let anyChanged = newTags !== to.type;
   let mask = 0;
@@ -7667,11 +7676,14 @@ function mergeMultiple(to, from) {
     const fromv = getUnionComponent(from, ac.type);
     if (ac.value != null) {
       if (fromv != null) {
-        const [value2, changed] = mergeSingle({
-          type: ac.type,
-          avalue: ac.value,
-          bvalue: fromv
-        });
+        const [value2, changed] = ac.value === fromv ? [fromv, false] : mergeSingle(
+          {
+            type: ac.type,
+            avalue: ac.value,
+            bvalue: fromv
+          },
+          widenDepth
+        );
         if (changed)
           anyChanged = true;
         if (value2) {
@@ -7708,13 +7720,13 @@ function mergeMultiple(to, from) {
   to.value = result[mask];
   return true;
 }
-function tryUnion(to, from) {
-  to = cloneType(to);
-  if (unionInto(to, from))
-    return to;
-  return null;
-}
-function mergeSingle(pair) {
+function mergeSingle(pair, widenDepth) {
+  function tryUnion(to, from) {
+    to = cloneType(to);
+    if (unionHelper(to, from, widenDepth + 1))
+      return to;
+    return null;
+  }
   switch (pair.type) {
     case 1:
     case 2:
@@ -7727,31 +7739,58 @@ function mergeSingle(pair) {
     case 128:
     case 256:
     case 131072:
-      if (pair.avalue === pair.bvalue) {
-        return [pair.avalue, false];
-      }
       return [null, true];
     case 512: {
-      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];
+      if (widenDepth > MaxWidenDepth) {
+        return [null, true];
+      }
+      const tupleTypes = /* @__PURE__ */ new Map();
+      const arrayTypes = [];
+      tupleForEach(
+        pair.avalue,
+        (v) => {
+          const t = tupleTypes.get(v.length);
+          if (t) {
+            t.push(v);
+          } else {
+            tupleTypes.set(v.length, [v]);
+          }
+        },
+        (v) => arrayTypes.push(v)
+      );
+      const extraTypes = [];
+      tupleForEach(
+        pair.bvalue,
+        (v) => {
+          const tuples = tupleTypes.get(v.length);
+          if (!tuples?.some(
+            (t) => t.every((at, i) => {
+              const bt = v[i];
+              return subtypeOf(at, bt) && subtypeOf(bt, at);
+            })
+          )) {
+            extraTypes.push(v);
+          }
+        },
+        (v) => {
+          if (!arrayTypes.some((at) => subtypeOf(at, v) && subtypeOf(v, at))) {
+            extraTypes.push(v);
           }
         }
+      );
+      if (extraTypes.length) {
+        if (widenDepth >= 0) {
+          return [null, true];
+        }
+        const allTypes = (pair.avalue instanceof Set ? Array.from(pair.avalue) : [pair.avalue]).concat(extraTypes);
+        return [tupleReduce(allTypes), true];
       }
-      const av = reducedType(pair.avalue);
-      const merged = tryUnion(av, reducedType(pair.bvalue));
-      return [merged || av, merged != null];
+      return [pair.avalue, false];
     }
     case 1024: {
+      if (widenDepth > MaxWidenDepth) {
+        return [null, true];
+      }
       const avalue = pair.avalue;
       const bvalue = pair.bvalue;
       if (!avalue.value) {
@@ -7766,7 +7805,7 @@ function mergeSingle(pair) {
               return;
             }
             av = cloneType(av);
-            if (unionInto(av, bv))
+            if (unionHelper(av, bv, widenDepth + 1))
               merged = true;
             result.set(key2, av);
           });
@@ -7842,7 +7881,8 @@ function mergeSingle(pair) {
       let klass = pair.avalue.klass;
       const [obj, objChanged] = mergeObjectValues(
         pair.avalue.obj,
-        pair.bvalue.obj
+        pair.bvalue.obj,
+        widenDepth
       );
       const klassChanged = tryUnion(klass, pair.bvalue.klass);
       if (klassChanged || objChanged) {
@@ -7860,7 +7900,7 @@ function mergeSingle(pair) {
       if (toE.enum !== fromE.enum) {
         if (toE.value && fromE.value) {
           const result = cloneType(toE.value);
-          unionInto(result, fromE.value);
+          unionHelper(result, fromE.value, widenDepth + 1);
           const e = { value: result };
           return [e, true];
         }
@@ -7884,7 +7924,7 @@ function mergeSingle(pair) {
       unhandledType(pair);
   }
 }
-function mergeObjectValues(to, from) {
+function mergeObjectValues(to, from, widenDepth) {
   if (!to) {
     return [to, false];
   }
@@ -7901,7 +7941,7 @@ function mergeObjectValues(to, from) {
       return;
     }
     const rep = cloneType(value2);
-    if (unionInto(rep, from[key])) {
+    if (unionHelper(rep, from[key], widenDepth + 1)) {
       if (result === to)
         result = { ...result };
       result[key] = rep;
@@ -7916,8 +7956,8 @@ function mergeObjectValues(to, from) {
 function mergeStateDecls(to, from) {
   let changed = false;
   let result = to;
-  (0, import_chunk_NHZRKHZO.forEach)(from, (v) => {
-    if ((0, import_chunk_NHZRKHZO.some)(to, (t) => t === v)) {
+  (0, import_chunk_X7QCZR3F.forEach)(from, (v) => {
+    if ((0, import_chunk_X7QCZR3F.some)(to, (t) => t === v)) {
       return;
     }
     if (Array.isArray(result)) {
@@ -7991,104 +8031,18 @@ function clearValuesUnder(v, tag, clearTag = false) {
     v.value = newData;
   }
 }
-function widenTypeHelper(t, depth2) {
-  let result = null;
-  forEachUnionComponent(
-    t,
-    t.type & (512 | 1024),
-    (ac) => {
-      if (ac.value == null)
-        return;
-      switch (ac.type) {
-        case 512:
-          if (depth2 > 4) {
-            if (!result)
-              result = cloneType(t);
-            clearValuesUnder(result, ac.type);
-          } else {
-            if (Array.isArray(ac.value)) {
-              let newAData = ac.value;
-              ac.value.forEach((avalue, index) => {
-                const data = widenTypeHelper(avalue, depth2 + 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, depth2 + 1);
-              if (v) {
-                if (!result)
-                  result = cloneType(t);
-                setUnionComponent(result, ac.type, v);
-              }
-            }
-          }
-          return;
-        case 1024:
-          if (depth2 > 4) {
-            if (!result)
-              result = cloneType(t);
-            clearValuesUnder(result, ac.type);
-          } else {
-            const ddata = ac.value;
-            if (ddata.value) {
-              const key = widenTypeHelper(ddata.key, depth2 + 1);
-              const data = widenTypeHelper(ddata.value, depth2 + 1);
-              if (key || data) {
-                if (!result)
-                  result = cloneType(t);
-                const newDData = { ...ddata };
-                if (key)
-                  newDData.key = key;
-                if (data)
-                  newDData.value = data;
-                setUnionComponent(result, ac.type, newDData);
-              }
-            } else {
-              let newDData = ddata;
-              ddata.forEach((dvalue, dkey) => {
-                const data = widenTypeHelper(dvalue, depth2 + 1);
-                if (data) {
-                  if (newDData === ddata) {
-                    newDData = new Map(newDData);
-                  }
-                  newDData.set(dkey, data);
-                }
-              });
-              if (newDData !== ddata) {
-                if (!result)
-                  result = cloneType(t);
-                setUnionComponent(result, ac.type, newDData);
-              }
-            }
-          }
-          return;
-      }
-    }
-  );
-  return result;
-}
-function widenType(t) {
-  return widenTypeHelper(t, 0);
-}
+var MaxWidenDepth;
 var init_union_type = (0, import_chunk_ABYVSU2C.__esm)({
   "src/type-flow/union-type.ts"() {
     "use strict";
     (0, import_chunk_JDC43A3I.init_ast)();
     init_data_flow();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_could_be();
     init_intersection_type();
     init_sub_type();
     init_types();
+    MaxWidenDepth = 4;
   }
 });
 function expandTypedef(t) {
@@ -8099,7 +8053,7 @@ function expandTypedef(t) {
   );
   const tExpanded = cloneType(t);
   clearValuesUnder(tExpanded, 262144, true);
-  (0, import_chunk_NHZRKHZO.forEach)(decls, (decl) => unionInto(tExpanded, decl.resolvedType));
+  (0, import_chunk_X7QCZR3F.forEach)(decls, (decl) => unionInto(tExpanded, decl.resolvedType));
   return tExpanded;
 }
 function intersectEnum(t, e) {
@@ -8221,35 +8175,49 @@ function intersectionValue(pair) {
     case 128:
     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;
+    case 512:
+      return tupleMap(
+        pair.avalue,
+        (av) => tupleMap(
+          pair.bvalue,
+          (bv) => {
+            if (av.length !== bv.length)
+              return null;
+            const isect = av.map((t, i) => intersection(t, bv[i]));
+            return isect.some(
+              (t) => t.type === 0
+              /* Never */
+            ) ? null : isect;
+          },
+          (bv) => {
+            const isect = av.map((t) => intersection(bv, t));
+            return isect.some(
+              (t) => t.type === 0
+              /* Never */
+            ) ? null : isect;
+          },
+          (bv) => bv.length === 0 ? null : bv
+        ),
+        (av) => tupleMap(
+          pair.bvalue,
+          (bv) => {
+            const isect = bv.map((t) => intersection(av, t));
+            return isect.some(
+              (t) => t.type === 0
+              /* Never */
+            ) ? null : isect;
+          },
+          (bv) => {
+            const atype = intersection(av, bv);
+            return atype.type === 0 ? null : atype;
+          },
+          (bv) => bv.length === 0 ? null : bv
+        ),
+        (av) => {
+          const result = av.flat(1);
+          return result.length === 0 ? null : tupleReduce(result);
         }
-        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;
-    }
+      );
     case 1024: {
       if (!pair.avalue.value) {
         if (!pair.bvalue.value) {
@@ -8293,9 +8261,9 @@ function intersectionValue(pair) {
     case 4096:
     case 8192: {
       const common = /* @__PURE__ */ new Set();
-      (0, import_chunk_NHZRKHZO.forEach)(
+      (0, import_chunk_X7QCZR3F.forEach)(
         pair.avalue,
-        (sna) => (0, import_chunk_NHZRKHZO.some)(pair.bvalue, (snb) => sna === snb) && common.add(sna)
+        (sna) => (0, import_chunk_X7QCZR3F.some)(pair.bvalue, (snb) => sna === snb) && common.add(sna)
       );
       if (!common.size)
         return null;
@@ -8304,9 +8272,9 @@ function intersectionValue(pair) {
     }
     case 16384: {
       const common = /* @__PURE__ */ new Set();
-      (0, import_chunk_NHZRKHZO.forEach)(pair.avalue, (sna) => {
+      (0, import_chunk_X7QCZR3F.forEach)(pair.avalue, (sna) => {
         const superA = getSuperClasses(sna);
-        (0, import_chunk_NHZRKHZO.forEach)(pair.bvalue, (snb) => {
+        (0, import_chunk_X7QCZR3F.forEach)(pair.bvalue, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             common.add(sna);
           }
@@ -8553,7 +8521,7 @@ function restrictExactTypesByEquality(a, b) {
     }
     case 262144:
       return restrictByEquality(
-        (0, import_chunk_NHZRKHZO.reduce)(
+        (0, import_chunk_X7QCZR3F.reduce)(
           a.value,
           (cur, decl) => {
             unionInto(cur, decl.resolvedType);
@@ -8620,7 +8588,7 @@ var init_intersection_type = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_could_be();
     init_interp();
     init_types();
@@ -8693,19 +8661,34 @@ function subtypeOfValue(pair) {
     case 131072:
       return pair.avalue === pair.bvalue;
     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]));
+      let result = true;
+      tupleForEach(
+        pair.avalue,
+        (av) => {
+          let some2 = false;
+          tupleForEach(
+            pair.bvalue,
+            (bv) => {
+              some2 = av.length === bv.length && bv.every((b, i) => subtypeOf(av[i], b));
+              return some2 === false;
+            },
+            (bv) => (some2 = av.every((a) => subtypeOf(a, bv))) === false
+          );
+          return result = some2;
+        },
+        (av) => {
+          let some2 = false;
+          tupleForEach(
+            pair.bvalue,
+            () => {
+              return true;
+            },
+            (bv) => (some2 = subtypeOf(av, bv)) === false
+          );
+          return result = some2;
         }
-        return pair.avalue.every((t) => subtypeOf(t, bv));
-      } else if (Array.isArray(pair.bvalue)) {
-        return false;
-      }
-      return subtypeOf(pair.avalue, pair.bvalue);
+      );
+      return result;
     }
     case 1024: {
       const adict = pair.avalue;
@@ -8734,14 +8717,14 @@ function subtypeOfValue(pair) {
     case 8192: {
       const asd = pair.avalue;
       const bsd = pair.bvalue;
-      return (0, import_chunk_NHZRKHZO.every)(asd, (sna) => (0, import_chunk_NHZRKHZO.some)(bsd, (snb) => sna === snb));
+      return (0, import_chunk_X7QCZR3F.every)(asd, (sna) => (0, import_chunk_X7QCZR3F.some)(bsd, (snb) => sna === snb));
     }
     case 16384: {
       const asd = pair.avalue;
       const bsd = pair.bvalue;
-      return (0, import_chunk_NHZRKHZO.every)(asd, (sna) => {
+      return (0, import_chunk_X7QCZR3F.every)(asd, (sna) => {
         const superA = getSuperClasses(sna);
-        return (0, import_chunk_NHZRKHZO.some)(bsd, (snb) => {
+        return (0, import_chunk_X7QCZR3F.some)(bsd, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             return true;
           }
@@ -8777,7 +8760,7 @@ var init_sub_type = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_could_be();
     init_intersection_type();
     init_types();
@@ -9198,13 +9181,13 @@ function isTypeStateKey(decl) {
   return Array.isArray(decl) || decl.type !== "MemberDecl" && decl.type !== "Unknown";
 }
 function declIsLocal(decl) {
-  return (0, import_chunk_NHZRKHZO.some)(
+  return (0, import_chunk_X7QCZR3F.some)(
     decl,
     (d) => d.type === "BinaryExpression" || d.type === "Identifier" || d.type === "VariableDeclarator" && isLocal(d)
   );
 }
 function declIsNonLocal(decl) {
-  return (0, import_chunk_NHZRKHZO.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d));
+  return (0, import_chunk_X7QCZR3F.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d));
 }
 function localDeclName(decl) {
   if (Array.isArray(decl))
@@ -9217,12 +9200,12 @@ function localDeclName(decl) {
     case "VariableDeclarator":
       return variableDeclarationName(decl.node.id);
   }
-  throw new import_chunk_NHZRKHZO.AwaitedError(
+  throw new import_chunk_X7QCZR3F.AwaitedError(
     declFullName(decl).then((declStr) => `Invalid local decl: ${declStr}`)
   );
 }
 function tsKey(key) {
-  return `${(0, import_chunk_NHZRKHZO.map)(key, (k) => {
+  return `${(0, import_chunk_X7QCZR3F.map)(key, (k) => {
     if (k.type === "Literal") {
       return k.raw;
     } else if (isStateNode(k)) {
@@ -9241,7 +9224,7 @@ function sourceLocation(loc) {
   return loc ? `${loc.source || "??"}:${loc.start.line}:${loc.start.column}` : "??";
 }
 function printBlockHeader(block) {
-  (0, import_chunk_NHZRKHZO.log)(
+  (0, import_chunk_X7QCZR3F.log)(
     block.order,
     `(${block.node?.loc?.source || "??"}:${block.node?.loc?.start.line || "??"})`,
     `Preds: ${(block.preds || []).map((block2) => block2.order).join(", ")}`
@@ -9267,10 +9250,10 @@ function describeEvent(event) {
   ).then((desc) => `${event.type}: ${desc}`);
 }
 function printBlockEvents(block, extra) {
-  (0, import_chunk_NHZRKHZO.log)("Events:");
-  (0, import_chunk_NHZRKHZO.forEach)(
+  (0, import_chunk_X7QCZR3F.log)("Events:");
+  (0, import_chunk_X7QCZR3F.forEach)(
     block.events,
-    (event) => (0, import_chunk_NHZRKHZO.log)(
+    (event) => (0, import_chunk_X7QCZR3F.log)(
       describeEvent(event).then(
         (eventStr) => `    ${eventStr} ${extra ? extra(event) : ""}`
       )
@@ -9278,7 +9261,7 @@ function printBlockEvents(block, extra) {
   );
 }
 function printBlockTrailer(block) {
-  (0, import_chunk_NHZRKHZO.log)(
+  (0, import_chunk_X7QCZR3F.log)(
     `Succs: ${(block.succs || []).map((block2) => block2.order).join(", ")} ExSucc: ${block.exsucc ? block.exsucc.order : ""}`
   );
 }
@@ -9405,7 +9388,7 @@ var init_type_flow_util = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_intersection_type();
     init_sub_type();
     init_types();
@@ -9459,7 +9442,7 @@ function calleeObjectType(istate, callee) {
 }
 function checkCallArgs(istate, node, callees, args) {
   const allDiags = [];
-  const resultType = (0, import_chunk_NHZRKHZO.reduce)(
+  const resultType = (0, import_chunk_X7QCZR3F.reduce)(
     callees,
     (result, cur) => {
       const curDiags = [];
@@ -9472,7 +9455,7 @@ function checkCallArgs(istate, node, callees, args) {
       if (object) {
         const info = sysCallInfo(istate.state, cur);
         if (info) {
-          const result2 = info(istate.state, cur, object, () => args);
+          const result2 = info(istate, cur, object, () => args);
           if (result2.argTypes)
             argTypes = result2.argTypes;
           if (result2.returnType)
@@ -9481,6 +9464,8 @@ function checkCallArgs(istate, node, callees, args) {
             effects = false;
           if (!result2.argEffects)
             argEffects = false;
+          if (result2.diagnostic)
+            curDiags.push([node, result2.diagnostic]);
         }
       }
       if (cur.info === false) {
@@ -9514,7 +9499,7 @@ function checkCallArgs(istate, node, callees, args) {
             paramType = typeFromTypespec(istate.state, param.right, cur.stack);
           }
           if (checker(arg, paramType)) {
-            if (istate.state.config?.covarianceWarnings && effects && argEffects) {
+            if (istate.state.config?.extraReferenceTypeChecks && effects && argEffects && !safeReferenceArg(node.arguments[i])) {
               if (arg.type & 512) {
                 const atype = getUnionComponent(
                   arg,
@@ -9527,7 +9512,7 @@ function checkCallArgs(istate, node, callees, args) {
                     512
                     /* Array */
                   );
-                  if (!ptype || Array.isArray(ptype) || Array.isArray(atype) || !subtypeOf(ptype, atype)) {
+                  if (!ptype || !checkArrayCovariance(atype, ptype)) {
                     curDiags.push([
                       node.arguments[i],
                       `Argument ${i + 1} to ${cur.fullName}: passing ${display(
@@ -9618,7 +9603,7 @@ function isOverride(cur, funcs) {
   const cls = cur.stack?.[cur.stack.length - 1]?.sn;
   if (cls?.type === "ClassDeclaration" && cls.superClasses) {
     const supers = getSuperClasses(cls);
-    if (supers && (0, import_chunk_NHZRKHZO.some)(funcs, (func) => {
+    if (supers && (0, import_chunk_X7QCZR3F.some)(funcs, (func) => {
       if (func === cur)
         return false;
       const fcls = func.stack?.[func.stack.length - 1].sn;
@@ -9709,7 +9694,7 @@ function getSystemCallTable(state) {
     }
     return ret;
   };
-  const arrayAdd = (state2, callee, calleeObj, getArgs) => {
+  const arrayAdd = (istate, callee, calleeObj, getArgs) => {
     const ret = {};
     if (calleeObj.type & 512) {
       const adata = getUnionComponent(
@@ -9722,54 +9707,97 @@ function getSystemCallTable(state) {
         const args = getArgs();
         if (args.length === 1) {
           const arg = args[0];
+          let hasTuple = false;
           if (callee.name === "add") {
-            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);
-              setUnionComponent(newObj, 512, newAData);
-              ret.calleeObj = newObj;
-              ret.argTypes = [adata];
-            }
+            const relaxed = relaxType(arg);
+            tupleMap(
+              adata,
+              (v) => {
+                hasTuple = true;
+                return [...v, relaxed];
+              },
+              (v) => {
+                if (subtypeOf(arg, v))
+                  return v;
+                const newAData = cloneType(v);
+                unionInto(newAData, arg);
+                if (!ret.argTypes) {
+                  ret.argTypes = [v];
+                } else {
+                  ret.argTypes = [intersection(ret.argTypes[0], v)];
+                }
+                return newAData;
+              },
+              (v) => {
+                const newAData = tupleReduce(v);
+                ret.returnType.value = newAData;
+                const newObj = cloneType(calleeObj);
+                setUnionComponent(newObj, 512, newAData);
+                ret.calleeObj = newObj;
+                if (!ret.argTypes) {
+                  ret.argTypes = [relaxed];
+                }
+              }
+            );
           } else {
-            if (Array.isArray(adata)) {
-              if (arg.type & 512) {
-                const argSubtypes = getUnionComponent(
-                  arg,
-                  512
-                  /* Array */
-                );
-                if (argSubtypes) {
-                  if (Array.isArray(argSubtypes)) {
-                    const newAData2 = [...adata, ...argSubtypes];
-                    ret.returnType.value = newAData2;
-                    ret.argTypes = [arg];
-                    ret.calleeObj = ret.returnType;
-                    return ret;
+            const argSubtypes = arg.type & 512 ? getUnionComponent(
+              arg,
+              512
+              /* Array */
+            ) : null;
+            if (argSubtypes) {
+              tupleMap(
+                adata,
+                (v) => {
+                  hasTuple = true;
+                  return tupleMap(
+                    argSubtypes,
+                    (a) => [...v, ...a],
+                    (a) => {
+                      const at = cloneType(reducedType(v));
+                      unionInto(at, a);
+                      return at;
+                    },
+                    (a) => a
+                  );
+                },
+                (v) => {
+                  const addedType = reducedArrayType(argSubtypes);
+                  if (subtypeOf(addedType, v))
+                    return [v];
+                  if (!ret.argTypes) {
+                    ret.argTypes = [v];
+                  } else {
+                    ret.argTypes = [intersection(ret.argTypes[0], v)];
                   }
-                  const newAData = reducedType(adata);
-                  unionInto(newAData, argSubtypes);
+                  v = cloneType(v);
+                  unionInto(v, addedType);
+                  return [v];
+                },
+                (va) => {
+                  const newAData = tupleReduce(va.flat());
                   ret.returnType.value = newAData;
-                  ret.argTypes = [arg];
-                  ret.calleeObj = ret.returnType;
-                  return ret;
+                  const newObj = cloneType(calleeObj);
+                  setUnionComponent(newObj, 512, newAData);
+                  ret.calleeObj = newObj;
+                  if (!ret.argTypes) {
+                    ret.argTypes = [
+                      { type: 512, value: argSubtypes }
+                    ];
+                  }
                 }
-              }
-              ret.returnType.value = reducedType(adata);
-            }
-            if (!subtypeOf(arg, ret.returnType)) {
-              ret.argTypes = [ret.returnType];
-              const newObj = cloneType(calleeObj);
-              unionInto(newObj, arg);
-              ret.calleeObj = newObj;
+              );
+            } else {
+              tupleForEach(
+                adata,
+                () => hasTuple = true,
+                () => false
+              );
             }
           }
+          if (hasTuple && istate.typeChecker && istate.state.config?.extraReferenceTypeChecks !== false) {
+            ret.diagnostic = "Adding to a tuple would change its type";
+          }
         }
       }
     }
@@ -9959,7 +9987,7 @@ function getSystemCallTable(state) {
     ret.argTypes = getArgs();
     return ret;
   };
-  const method = (state2, callee, calleeObj, getArgs) => {
+  const method = (istate, callee, calleeObj, getArgs) => {
     const ret = {};
     const args = getArgs();
     if (args.length === 1 && hasValue(args[0]) && args[0].type === 131072) {
@@ -9974,7 +10002,7 @@ function getSystemCallTable(state) {
         computed: false
       };
       const [, trueDecls] = findObjectDeclsByProperty(
-        state2,
+        istate.state,
         calleeObj,
         next.property
       );
@@ -9988,7 +10016,7 @@ function getSystemCallTable(state) {
       ret.returnType = callees.reduce(
         (type, callee2) => {
           const result = callee2.node.returnType ? typeFromTypespec(
-            state2,
+            istate.state,
             callee2.node.returnType.argument,
             callee2.stack
           ) : {
@@ -9996,7 +10024,7 @@ function getSystemCallTable(state) {
             /* Any */
           };
           const args2 = callee2.node.params.map(
-            (param) => param.type === "BinaryExpression" ? typeFromTypespec(state2, param.right, callee2.stack) : {
+            (param) => param.type === "BinaryExpression" ? typeFromTypespec(istate.state, param.right, callee2.stack) : {
               type: 524287
               /* Any */
             }
@@ -10017,7 +10045,7 @@ function getSystemCallTable(state) {
   };
   const nop = () => ({ effectFree: true });
   const mod = () => ({});
-  const rounder = (state2, callee, calleeObj, getArgs) => {
+  const rounder = (istate, callee, calleeObj, getArgs) => {
     const results = {};
     const fn = Math[callee.name];
     results.effectFree = true;
@@ -10039,7 +10067,7 @@ function getSystemCallTable(state) {
     };
     return results;
   };
-  const mathHelper = (state2, callee, calleeObj, getArgs, helper) => {
+  const mathHelper = (istate, callee, calleeObj, getArgs, helper) => {
     const results = {};
     const fn = helper && typeof helper === "function" ? helper : (0, import_chunk_JDC43A3I.hasProperty)(Math, helper || callee.name) && Math[helper || callee.name];
     if (fn && typeof fn === "function") {
@@ -10186,8 +10214,9 @@ var init_interp_call = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_optimizer_types();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_interp();
+    init_intersection_type();
     init_sub_type();
     init_type_flow_util();
     init_types();
@@ -10456,23 +10485,27 @@ 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];
+function arrayTypeAtIndex(arr, elemType, forStrictAssign, enforceTuples) {
+  const reduce2 = (v) => forStrictAssign ? v.reduce(
+    (t, c) => t ? intersection(t, c) : c,
+    null
+  ) ?? {
+    type: 0
+    /* Never */
+  } : reducedType(v);
+  const key = elemType && isExact(elemType) && elemType.type === 8 ? elemType.value : null;
+  return tupleMap(
+    arr,
+    (v) => key != null ? v[key] ?? null : reduce2(v),
+    (v) => v,
+    (v) => v.length ? reduce2(v) : enforceTuples ? {
+      type: 0
+      /* Never */
+    } : {
+      type: 524287
+      /* Any */
     }
-    return arr.reduce(
-      (p, v) => {
-        unionInto(p, v);
-        return p;
-      },
-      {
-        type: 0
-        /* Never */
-      }
-    );
-  }
-  return arr;
+  );
 }
 function getLhsConstraint(istate, node) {
   if (istate.localLvals?.has(node)) {
@@ -10502,7 +10535,15 @@ function getLhsConstraint(istate, node) {
               /* Array */
             );
             if (arr) {
-              result = arrayTypeAtIndex(arr, istate.typeMap.get(node.property));
+              result = arrayTypeAtIndex(
+                arr,
+                istate.typeMap.get(node.property) ?? {
+                  type: 8,
+                  value: arrayLiteralKeyFromExpr(node.property) ?? void 0
+                },
+                strict,
+                istate.state.config?.extraReferenceTypeChecks !== false
+              );
             }
           }
           const updateResult = (value2) => {
@@ -10957,7 +10998,7 @@ function evaluateNode(istate, node) {
             byteArray = true;
           }
         }
-        if (objectType.value && !(objectType.type & (4096 | 16384 | (byteArray ? 0 : 32768)))) {
+        if (objectType.value && !(objectType.type & (16384 | (byteArray ? 0 : 32768)))) {
           let result = null;
           if (objectType.type & 512) {
             const avalue = getUnionComponent(
@@ -10968,7 +11009,7 @@ function evaluateNode(istate, node) {
               type: 524287
               /* Any */
             };
-            const atype = arrayTypeAtIndex(avalue, property.value);
+            const atype = arrayTypeAtIndex(avalue, property.value, false, true);
             if (result) {
               unionInto(result = cloneType(result), atype);
             } else {
@@ -10994,6 +11035,42 @@ function evaluateNode(istate, node) {
               result.type |= 1;
             }
           }
+          if (objectType.type & 4096 && couldBe(property.value, {
+            type: 131072
+            /* Symbol */
+          })) {
+            const mvalue = getUnionComponent(
+              objectType,
+              4096
+              /* Module */
+            );
+            if (!mvalue) {
+              result = {
+                type: 524287
+                /* Any */
+              };
+              push({
+                value: result,
+                embeddedEffects: object.embeddedEffects || property.embeddedEffects,
+                node
+              });
+              break;
+            }
+            if (result)
+              result = cloneType(result);
+            (0, import_chunk_X7QCZR3F.forEach)(mvalue, (m) => {
+              if (m.decls) {
+                Object.values(m.decls).forEach((sn) => {
+                  const t = typeFromTypeStateNodes(istate.state, sn, true);
+                  if (result) {
+                    unionInto(result, t);
+                  } else {
+                    result = cloneType(t);
+                  }
+                });
+              }
+            });
+          }
           if (byteArray) {
             const t = {
               type: 8
@@ -11120,7 +11197,7 @@ function evaluateNode(istate, node) {
       if (isExact(klass.value) && klass.value.type === 16384) {
         obj.value = { klass: klass.value };
         if (istate.checkTypes && klass.value.value) {
-          const callees = (0, import_chunk_NHZRKHZO.map)(
+          const callees = (0, import_chunk_X7QCZR3F.map)(
             klass.value.value,
             (klass2) => klass2.decls?.initialize
           ).flat().filter(
@@ -11322,7 +11399,7 @@ function mustBeIdentical(a, b) {
   return false;
 }
 function isByteArrayData(objectData) {
-  return objectData.klass.value && (0, import_chunk_NHZRKHZO.every)(
+  return objectData.klass.value && (0, import_chunk_X7QCZR3F.every)(
     objectData.klass.value,
     (klass) => klass.fullName === "$.Toybox.Lang.ByteArray"
   );
@@ -11334,7 +11411,7 @@ var init_interp = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_JDC43A3I.init_ast)();
     init_data_flow();
     init_optimizer_types();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_could_be();
     init_interp_binary();
     init_interp_call();
@@ -11573,7 +11650,7 @@ function typeFromTypeStateNode(state, sn, classVsObj) {
           );
           if (value2) {
             const a = [];
-            (0, import_chunk_NHZRKHZO.forEach)(value2, (v) => {
+            (0, import_chunk_X7QCZR3F.forEach)(value2, (v) => {
               if (v !== sn)
                 a.push(v);
             });
@@ -12049,7 +12126,7 @@ function reducedType(elems) {
   if (!Array.isArray(elems)) {
     return elems;
   }
-  return elems.reduce(
+  return elems.flat().reduce(
     (p, t) => {
       unionInto(p, t);
       return p;
@@ -12067,7 +12144,7 @@ function mustBeFalse(arg) {
   return arg.type === 1 || arg.type === 2 || (arg.type === 8 || arg.type === 16) && arg.value != null && Number(arg.value) === 0;
 }
 function display(type) {
-  const names = (v, fn) => (0, import_chunk_NHZRKHZO.map)(v, fn).sort().filter((s, i, arr) => !i || s !== arr[i - 1]).join(" or ");
+  const names = (v, fn) => (0, import_chunk_X7QCZR3F.map)(v, fn).sort().filter((s, i, arr) => !i || s !== arr[i - 1]).join(" or ");
   const parts = [];
   const displayOne = (tv) => {
     switch (tv.type) {
@@ -12085,7 +12162,12 @@ function display(type) {
       case 256:
         return JSON.stringify(tv.value);
       case 512:
-        return Array.isArray(tv.value) ? `[${tv.value.map((t) => display(t)).join(", ")}]` : `Array<${display(tv.value)}>`;
+        return tupleMap(
+          tv.value,
+          (v) => `[${v.map((t) => display(t)).join(", ")}]`,
+          (v) => `Array<${display(v)}>`,
+          (v) => v.join(" or ")
+        );
       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(
@@ -12225,7 +12307,7 @@ function getStateNodeDeclsWithExactFromType(state, object) {
         switch (type.type) {
           case 32768:
             if (type.value.klass.type === 16384 && type.value.klass.value) {
-              (0, import_chunk_NHZRKHZO.forEach)(
+              (0, import_chunk_X7QCZR3F.forEach)(
                 type.value.klass.value,
                 (sn) => decls.push({ sn, exact: false })
               );
@@ -12233,7 +12315,7 @@ function getStateNodeDeclsWithExactFromType(state, object) {
             break;
           case 4096:
           case 16384:
-            (0, import_chunk_NHZRKHZO.forEach)(type.value, (sn) => decls.push({ sn, exact: true }));
+            (0, import_chunk_X7QCZR3F.forEach)(type.value, (sn) => decls.push({ sn, exact: true }));
             break;
         }
       }
@@ -12259,6 +12341,79 @@ function getStateNodeDeclsWithExactFromType(state, object) {
   }
   return decls;
 }
+function tupleForEach(t, tupleFn, arrayFn) {
+  if (t instanceof Set) {
+    for (const v of t) {
+      if ((Array.isArray(v) ? tupleFn(v) : arrayFn(v)) === false) {
+        break;
+      }
+    }
+  } else {
+    if (Array.isArray(t)) {
+      tupleFn(t);
+    } else {
+      arrayFn(t);
+    }
+  }
+}
+function tupleMap(t, tupleFn, arrayFn, reduceFn) {
+  const result = t instanceof Set ? Array.from(t).map((v) => Array.isArray(v) ? tupleFn(v) : arrayFn(v)) : [Array.isArray(t) ? tupleFn(t) : arrayFn(t)];
+  return reduceFn(result.filter((v) => v != null));
+}
+function tupleReduce(v) {
+  return v.length === 1 ? v[0] : new Set(v);
+}
+function reducedArrayType(t) {
+  if (t instanceof Set) {
+    return reducedType(Array.from(t).map((v) => reducedType(v)));
+  }
+  return reducedType(t);
+}
+function checkArrayCovariance(arg, param) {
+  let ok = true;
+  tupleForEach(
+    arg,
+    (av) => {
+      tupleForEach(
+        param,
+        (pv) => {
+          if (av.length !== pv.length)
+            return true;
+          if (!av.every((a, i) => subtypeOf(a, pv[i])))
+            return true;
+          if (!av.every((a, i) => subtypeOf(pv[i], a))) {
+            ok = false;
+          }
+          return ok !== false;
+        },
+        () => {
+          ok = false;
+          return false;
+        }
+      );
+      return ok !== false;
+    },
+    (av) => {
+      tupleForEach(
+        param,
+        () => {
+          return ok !== false;
+        },
+        (pv) => {
+          if (subtypeOf(av, pv) && !subtypeOf(pv, av)) {
+            ok = false;
+          }
+          return ok !== false;
+        }
+      );
+      return ok !== false;
+    }
+  );
+  return ok;
+}
+function safeReferenceArg(arg) {
+  return arg.type === "ArrayExpression" || arg.type === "ObjectExpression" || arg.type === "NewExpression";
+}
 var LastTypeTag, SingletonTypeTagsConst, UnionDataTypeTagsConst, ValueTypeTagsConst, ObjectLikeTagsConst, EnumTagsConst, TruthyTypes;
 var init_types = (0, import_chunk_ABYVSU2C.__esm)({
   "src/type-flow/types.ts"() {
@@ -12266,10 +12421,11 @@ var init_types = (0, import_chunk_ABYVSU2C.__esm)({
     init_api();
     (0, import_chunk_JDC43A3I.init_ast)();
     init_data_flow();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_interp();
     init_intersection_type();
     init_union_type();
+    init_sub_type();
     LastTypeTag = 262144;
     SingletonTypeTagsConst = 1 | 2 | 4;
     UnionDataTypeTagsConst = 512 | 1024 | 2048 | 4096 | 8192 | 16384 | 32768 | 65536 | 262144;
@@ -12326,7 +12482,7 @@ function couldBeHelper(a, b, shallow) {
       262144
       /* Typedef */
     );
-    return typedef && (0, import_chunk_NHZRKHZO.some)(typedef, (td) => {
+    return typedef && (0, import_chunk_X7QCZR3F.some)(typedef, (td) => {
       if (!td.resolvedType) {
         throw new Error(`No resolved type for ${td.fullName} in 'couldBe'`);
       }
@@ -12367,24 +12523,40 @@ function couldBeValue(pair, shallow) {
     case 128:
     case 131072:
       return pair.avalue === pair.bvalue;
-    case 512:
+    case 512: {
       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]));
+      let result = false;
+      tupleForEach(
+        pair.avalue,
+        (av) => {
+          tupleForEach(
+            pair.bvalue,
+            (bv) => {
+              result = av.length === bv.length && bv.every((b, i) => couldBe(av[i], b));
+              return result === false;
+            },
+            (bv) => {
+              result = av.every((a) => couldBe(a, bv));
+              return result === false;
+            }
+          );
+          return result === false;
+        },
+        (av) => {
+          tupleForEach(
+            pair.bvalue,
+            (bv) => {
+              result = bv.every((b) => couldBe(av, b));
+              return result === false;
+            },
+            (bv) => (result = couldBe(av, bv)) === false
+          );
+          return result === false;
         }
-        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);
+      );
+      return result;
+    }
     case 1024: {
       if (shallow)
         return true;
@@ -12398,15 +12570,15 @@ function couldBeValue(pair, shallow) {
     }
     case 4096:
     case 8192: {
-      return (0, import_chunk_NHZRKHZO.some)(
+      return (0, import_chunk_X7QCZR3F.some)(
         pair.avalue,
-        (sna) => (0, import_chunk_NHZRKHZO.some)(pair.bvalue, (snb) => sna === snb)
+        (sna) => (0, import_chunk_X7QCZR3F.some)(pair.bvalue, (snb) => sna === snb)
       );
     }
     case 16384: {
-      return (0, import_chunk_NHZRKHZO.some)(pair.avalue, (sna) => {
+      return (0, import_chunk_X7QCZR3F.some)(pair.avalue, (sna) => {
         const superA = getSuperClasses(sna);
-        return (0, import_chunk_NHZRKHZO.some)(pair.bvalue, (snb) => {
+        return (0, import_chunk_X7QCZR3F.some)(pair.bvalue, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             return true;
           }
@@ -12439,7 +12611,7 @@ var init_could_be = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_types();
   }
 });
@@ -12546,7 +12718,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
       }
       addAnt(curState.partiallyAnticipated, key, node);
       if (logThisRun) {
-        (0, import_chunk_NHZRKHZO.log)(
+        (0, import_chunk_X7QCZR3F.log)(
           `  antrefs: ${curState.partiallyAnticipated.get(key) !== false} ${curState.anticipated.get(key) !== false}`
         );
       }
@@ -12569,7 +12741,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
     const curState = cloneState(blockStates[top.order]);
     if (logThisRun) {
       printBlockHeader(top);
-      curState.dead.forEach((decl) => (0, import_chunk_NHZRKHZO.log)(` - anticipated: ${tsKey(decl)}`));
+      curState.dead.forEach((decl) => (0, import_chunk_X7QCZR3F.log)(` - anticipated: ${tsKey(decl)}`));
     }
     if (top.events) {
       for (let i = top.events.length; i--; ) {
@@ -12581,12 +12753,12 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
           case "ref":
             if (isTypeStateKey(event.decl)) {
               if (logThisRun) {
-                (0, import_chunk_NHZRKHZO.log)(
+                (0, import_chunk_X7QCZR3F.log)(
                   describeEvent(event).then(
                     (eventStr) => `${eventStr} (${sourceLocation(event.node.loc)})`
                   )
                 );
-                (0, import_chunk_NHZRKHZO.log)(`  kill => ${tsKey(event.decl)}`);
+                (0, import_chunk_X7QCZR3F.log)(`  kill => ${tsKey(event.decl)}`);
               }
               copyPropRef(curState, event.decl, event.node);
               curState.dead.delete(event.decl);
@@ -12595,7 +12767,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
           case "def":
             if (isTypeStateKey(event.decl) && (event.node.type !== "VariableDeclarator" || event.node.init)) {
               if (logThisRun) {
-                (0, import_chunk_NHZRKHZO.log)(
+                (0, import_chunk_X7QCZR3F.log)(
                   describeEvent(event).then(
                     (eventStr) => `${eventStr} (${sourceLocation(event.node.loc)})`
                   )
@@ -12611,7 +12783,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
                   const pant = curState.partiallyAnticipated.get(event.decl);
                   if (pant) {
                     if (logThisRun) {
-                      (0, import_chunk_NHZRKHZO.log)(
+                      (0, import_chunk_X7QCZR3F.log)(
                         `  is copy-prop-candidate ${curState.anticipated?.get(event.decl) === pant}`
                       );
                     }
@@ -12643,7 +12815,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
               if (assignNode) {
                 curState.dead.add(event.decl);
                 if (logThisRun) {
-                  (0, import_chunk_NHZRKHZO.log)(`  anticipated => ${tsKey(event.decl)}`);
+                  (0, import_chunk_X7QCZR3F.log)(`  anticipated => ${tsKey(event.decl)}`);
                 }
               } else if (event.node.type === "UpdateExpression") {
                 copyPropRef(curState, event.decl, event.node.argument);
@@ -12654,7 +12826,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
             if (isTypeStateKey(event.decl)) {
               curState.dead.add(event.decl);
               if (logThisRun) {
-                (0, import_chunk_NHZRKHZO.log)(`  anticipated => ${tsKey(event.decl)}`);
+                (0, import_chunk_X7QCZR3F.log)(`  anticipated => ${tsKey(event.decl)}`);
               }
             }
             break;
@@ -12717,9 +12889,9 @@ function eliminateDeadStores(state, func, graph, logThisRun) {
   if (!deadStores.size)
     return { changes: false, copyPropStores };
   if (logThisRun) {
-    (0, import_chunk_NHZRKHZO.log)("====== Dead Stores =====");
+    (0, import_chunk_X7QCZR3F.log)("====== Dead Stores =====");
     deadStores.forEach(
-      (dead) => (dead.type === "AssignmentExpression" || dead.type === "UpdateExpression" || dead.type === "VariableDeclarator") && (0, import_chunk_NHZRKHZO.log)(
+      (dead) => (dead.type === "AssignmentExpression" || dead.type === "UpdateExpression" || dead.type === "VariableDeclarator") && (0, import_chunk_X7QCZR3F.log)(
         formatAstLongLines(dead).then(
           (deadStr) => `${deadStr} (${sourceLocation(dead.loc)})`
         )
@@ -12774,7 +12946,7 @@ var init_dead_store = (0, import_chunk_ABYVSU2C.__esm)({
     init_control_flow();
     init_data_flow();
     init_inliner();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_minimize_locals();
     init_type_flow_util();
   }
@@ -13124,14 +13296,9 @@ function mergeTypeState(blockStates, index, from, nodeCopyProp) {
         return;
       }
     }
-    let result = cloneType(tov.curType);
-    if (!unionInto(result, fromv.curType))
+    const result = cloneType(tov.curType);
+    if (!unionHelper(result, fromv.curType, widen ? 0 : -Infinity))
       return;
-    if (widen) {
-      const wide = widenType(result);
-      if (wide)
-        result = wide;
-    }
     tov.curType = result;
     changes = true;
   });
@@ -13142,13 +13309,13 @@ function typeStateEntry(value2, key) {
   return `${tsKey(key)} = ${display(value2.curType)}`;
 }
 function printBlockState(block, state, indent = "") {
-  (0, import_chunk_NHZRKHZO.log)(indent + "State:");
+  (0, import_chunk_X7QCZR3F.log)(indent + "State:");
   if (!state) {
-    (0, import_chunk_NHZRKHZO.log)(indent + "Not visited!");
+    (0, import_chunk_X7QCZR3F.log)(indent + "Not visited!");
     return;
   }
   state.map.forEach((value2, key) => {
-    (0, import_chunk_NHZRKHZO.log)(
+    (0, import_chunk_X7QCZR3F.log)(
       `${indent} - ${typeStateEntry(value2, key)}${value2.equivSet ? ` [(${Array.from(value2.equivSet).map(tsKey).join(", ")})]` : ""}`
     );
   });
@@ -13202,11 +13369,11 @@ function updateAffected(blockState, objectType, baseDecl, assignedPath, affected
               /* Array */
             );
             if (atype) {
-              if (Array.isArray(atype)) {
-                atype.forEach((value2) => unionInto(newType, value2));
-              } else {
-                unionInto(newType, atype);
-              }
+              tupleForEach(
+                atype,
+                (v) => v.forEach((value2) => unionInto(newType, value2)),
+                (v) => unionInto(newType, v)
+              );
             }
           }
           if (type.type & 1024) {
@@ -13334,7 +13501,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
             next = t;
           }
           if (cur.type & 512) {
-            let avalue = getUnionComponent(
+            const avalue = getUnionComponent(
               cur,
               512
               /* Array */
@@ -13342,29 +13509,41 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
               type: 524287
               /* Any */
             };
-            if (Array.isArray(avalue)) {
-              const index = arrayLiteralKeyFromExpr(me.property);
-              if (index != null && avalue[index] != null) {
-                if (!next) {
-                  assocValue[i].keyStr = index;
+            const index = arrayLiteralKeyFromExpr(me.property);
+            tupleForEach(
+              avalue,
+              (av) => {
+                let possibleValues = av;
+                if (index != null) {
+                  if (av[index] != null) {
+                    if (!next) {
+                      assocValue[i].keyStr = index;
+                    }
+                    possibleValues = av[index];
+                  } else {
+                    possibleValues = {
+                      type: 0
+                      /* Never */
+                    };
+                  }
+                }
+                if (next || i !== l || !newValue) {
+                  const n = next ? cloneType(next) : {
+                    type: 0
+                    /* Never */
+                  };
+                  (0, import_chunk_X7QCZR3F.forEach)(possibleValues, (v) => unionInto(n, v));
+                  next = n;
+                }
+              },
+              (av) => {
+                if (next) {
+                  unionInto(next = cloneType(next), av);
+                } else {
+                  next = av;
                 }
-                avalue = avalue[index];
-              }
-              if (next || i !== l || !newValue) {
-                const n = next ? cloneType(next) : {
-                  type: 0
-                  /* Never */
-                };
-                (0, import_chunk_NHZRKHZO.forEach)(avalue, (v) => unionInto(n, v));
-                next = n;
-              }
-            } else {
-              if (next) {
-                unionInto(next = cloneType(next), avalue);
-              } else {
-                next = avalue;
               }
-            }
+            );
           }
           let isExact2 = false;
           if (cur.type & 1024) {
@@ -13460,7 +13639,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
       }
       if (!isStatic && selfClassDecl) {
         const baseObj = getObjectValue(baseElem.type);
-        if (baseObj && baseObj.klass.type === 16384 && (0, import_chunk_NHZRKHZO.some)(
+        if (baseObj && baseObj.klass.type === 16384 && (0, import_chunk_X7QCZR3F.some)(
           baseObj.klass.value,
           (cls) => cls === selfClassDecl || getSuperClasses(cls)?.has(selfClassDecl) || getSuperClasses(selfClassDecl)?.has(cls) || false
         )) {
@@ -13505,7 +13684,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
     return [cur, updateAny];
   }
   function typeConstraint(decls, blockState) {
-    return (0, import_chunk_NHZRKHZO.reduce)(
+    return (0, import_chunk_X7QCZR3F.reduce)(
       decls,
       (cur, decl) => {
         if (decl.type === "Identifier" || decl.type === "BinaryExpression") {
@@ -13615,9 +13794,9 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
     root,
     dependencies
   };
-  const modifiableDecl = (decls, callees) => (0, import_chunk_NHZRKHZO.some)(
+  const modifiableDecl = (decls, callees) => (0, import_chunk_X7QCZR3F.some)(
     decls,
-    (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (!callees || (0, import_chunk_NHZRKHZO.some)(callees, (callee) => functionMayModify(state, callee, decl)))
+    (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (!callees || (0, import_chunk_X7QCZR3F.some)(callees, (callee) => functionMayModify(state, callee, decl)))
   );
   const mergeSuccState = (top, curState) => {
     top.succs?.forEach((succ) => {
@@ -13626,7 +13805,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
       }
       if (mergeTypeState(blockStates, succ.order, curState, nodeCopyProp)) {
         if (logThisRun) {
-          (0, import_chunk_NHZRKHZO.log)(`re-merge: ${top.order} -> ${succ.order}`);
+          (0, import_chunk_X7QCZR3F.log)(`re-merge: ${top.order} -> ${succ.order}`);
         }
         queue.enqueue(succ);
       }
@@ -13636,14 +13815,14 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
     const calleeObj = getStateType(curState, calleeObjDecl);
     let calleeResult = null;
     let effectFree = true;
-    (0, import_chunk_NHZRKHZO.forEach)(callees, (callee) => {
+    (0, import_chunk_X7QCZR3F.forEach)(callees, (callee) => {
       const info = sysCallInfo(istate.state, callee);
       if (!info) {
         effectFree = false;
         return;
       }
       const result = info(
-        istate.state,
+        istate,
         callee,
         calleeObj,
         () => node.arguments.map((arg) => evaluateExpr(state, arg, typeMap).value)
@@ -13913,7 +14092,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
       });
     } else {
       if (logThisRun) {
-        (0, import_chunk_NHZRKHZO.log)(`  Flow (true): merge to ${trueSucc.order || -1}`);
+        (0, import_chunk_X7QCZR3F.log)(`  Flow (true): merge to ${trueSucc.order || -1}`);
         printBlockState(top, sTrue || curState, "    >true ");
       }
       if (mergeTypeState(
@@ -13923,7 +14102,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         nodeCopyProp
       )) {
         if (logThisRun) {
-          (0, import_chunk_NHZRKHZO.log)(`re-merge: ${top.order} -> ${trueSucc.order}`);
+          (0, import_chunk_X7QCZR3F.log)(`re-merge: ${top.order} -> ${trueSucc.order}`);
         }
         queue.enqueue(trueSucc);
       }
@@ -13935,7 +14114,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
       });
     } else {
       if (logThisRun) {
-        (0, import_chunk_NHZRKHZO.log)(`  Flow (false): merge to: ${falseSucc.order || -1}`);
+        (0, import_chunk_X7QCZR3F.log)(`  Flow (false): merge to: ${falseSucc.order || -1}`);
         printBlockState(top, sFalse || curState, "    >false ");
       }
       if (mergeTypeState(
@@ -13945,7 +14124,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         nodeCopyProp
       )) {
         if (logThisRun) {
-          (0, import_chunk_NHZRKHZO.log)(`re-merge: ${top.order} -> ${falseSucc.order}`);
+          (0, import_chunk_X7QCZR3F.log)(`re-merge: ${top.order} -> ${falseSucc.order}`);
         }
         queue.enqueue(falseSucc);
       }
@@ -14035,7 +14214,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
           }
         }
         if (logThisRun) {
-          (0, import_chunk_NHZRKHZO.log)(
+          (0, import_chunk_X7QCZR3F.log)(
             describeEvent(event).then(
               (eventStr) => `  ${eventStr} == ${display(curEntry.curType)}`
             )
@@ -14045,7 +14224,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
       }
       case "mod": {
         if (logThisRun) {
-          (0, import_chunk_NHZRKHZO.log)(describeEvent(event).then((eventStr) => `  ${eventStr}`));
+          (0, import_chunk_X7QCZR3F.log)(describeEvent(event).then((eventStr) => `  ${eventStr}`));
         }
         modInterference(curState, event, true, (callees, calleeObj) => {
           clearRelatedCopyPropEvents(curState, null, nodeCopyProp);
@@ -14061,7 +14240,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
               );
             }
           }
-          if (nodeCopyProp.size && event.node.type === "CallExpression" && (0, import_chunk_NHZRKHZO.some)(callees, (callee) => inlineRequested(state, callee))) {
+          if (nodeCopyProp.size && event.node.type === "CallExpression" && (0, import_chunk_X7QCZR3F.some)(callees, (callee) => inlineRequested(state, callee))) {
             event.node.arguments.forEach((arg) => {
               const def = nodeCopyProp.get(arg);
               if (def && nodeCopyProp.get(def) !== false) {
@@ -14073,7 +14252,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
           let calleeEffects;
           curState.map.forEach((tsv, decl) => {
             let type = tsv.curType;
-            if ((type.value == null || !(type.type & (32768 | 512 | 1024))) && !(0, import_chunk_NHZRKHZO.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d))) {
+            if ((type.value == null || !(type.type & (32768 | 512 | 1024))) && !(0, import_chunk_X7QCZR3F.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d))) {
               return;
             }
             if (modifiableDecl(decl, callees)) {
@@ -14088,7 +14267,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
               curState.map.set(decl, {
                 curType: typeConstraint(decl, curState)
               });
-            } else if (type.type & (32768 | 512 | 1024) && (calleeEffects == null ? calleeEffects = !callees || !(0, import_chunk_NHZRKHZO.every)(callees, (callee) => callee.info === false) : calleeEffects)) {
+            } else if (type.type & (32768 | 512 | 1024) && (calleeEffects == null ? calleeEffects = !callees || !(0, import_chunk_X7QCZR3F.every)(callees, (callee) => callee.info === false) : calleeEffects)) {
               if (type.value != null && type.type & 32768) {
                 const odata = getObjectValue(tsv.curType);
                 if (odata?.obj) {
@@ -14158,13 +14337,13 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         );
         if (type.type !== 524287) {
           if (event.node.type === "EnumStringMember" || event.node.type === "VariableDeclarator" && event.node.kind === "const") {
-            (0, import_chunk_NHZRKHZO.forEach)(
+            (0, import_chunk_X7QCZR3F.forEach)(
               event.decl,
               (decl) => (decl.type === "VariableDeclarator" ? decl.node === event.node : decl === event.node) && (decl.resolvedType = type)
             );
           }
         }
-        (0, import_chunk_NHZRKHZO.some)(event.decl, (decl) => {
+        (0, import_chunk_X7QCZR3F.some)(event.decl, (decl) => {
           if (decl.type !== "VariableDeclarator" || decl.node.kind !== "var" || !isClassVariable(decl)) {
             return false;
           }
@@ -14172,7 +14351,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
           if (affected) {
             const objType = typeFromTypeStateNodes(
               istate.state,
-              (0, import_chunk_NHZRKHZO.map)(
+              (0, import_chunk_X7QCZR3F.map)(
                 event.decl,
                 (decl2) => decl2.type === "VariableDeclarator" && decl2.stack[decl2.stack.length - 1].sn
               ).filter(
@@ -14193,7 +14372,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         });
         if (wasComputedDecl) {
           curState.map.forEach((value2, decls) => {
-            if ((0, import_chunk_NHZRKHZO.some)(
+            if ((0, import_chunk_X7QCZR3F.some)(
               decls,
               (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl)
             )) {
@@ -14239,14 +14418,14 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
                   }
                   if (!copyPropCandidate.ant || // If the ref isn't anticipated, we can't propagate it
                   // in case it has side effects.
-                  (0, import_chunk_NHZRKHZO.some)(
+                  (0, import_chunk_X7QCZR3F.some)(
                     event2.calleeDecl,
                     (callee) => callee.type === "FunctionDeclaration" && inlineRequested(state, callee)
                   )) {
                     return false;
                   }
                 }
-                if (!event2.decl || isTypeStateKey(event2.decl) && (0, import_chunk_NHZRKHZO.some)(
+                if (!event2.decl || isTypeStateKey(event2.decl) && (0, import_chunk_X7QCZR3F.some)(
                   event2.decl,
                   (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" || decl.type === "BinaryExpression" || decl.type === "Identifier"
                 )) {
@@ -14285,13 +14464,13 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
           }
         }
         if (uninitClassDecls?.size) {
-          (0, import_chunk_NHZRKHZO.forEach)(
+          (0, import_chunk_X7QCZR3F.forEach)(
             event.decl,
             (decl) => uninitClassDecls.has(decl) && curState.inited?.add(decl)
           );
         }
         if (logThisRun) {
-          (0, import_chunk_NHZRKHZO.log)(
+          (0, import_chunk_X7QCZR3F.log)(
             describeEvent(event).then(
               (eventStr) => `  ${eventStr} := ${display(type)}`
             )
@@ -14309,7 +14488,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
           );
         }
         if (logThisRun) {
-          (0, import_chunk_NHZRKHZO.log)(
+          (0, import_chunk_X7QCZR3F.log)(
             describeEvent(event).then(
               (eventStr) => `  ${eventStr} : ${!Array.isArray(event.left) && event.left.type === "MemberDecl" ? `${display(
                 curState.map.get(event.left.base)?.curType || {
@@ -14369,8 +14548,8 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
     }
     if (!successorsHandled) {
       if (logThisRun) {
-        (0, import_chunk_NHZRKHZO.log)(
-          `  merge to: ${(0, import_chunk_NHZRKHZO.map)(
+        (0, import_chunk_X7QCZR3F.log)(
+          `  merge to: ${(0, import_chunk_X7QCZR3F.map)(
             top.succs,
             (succ) => succ.order || -1
           ).join(", ")}`
@@ -14395,7 +14574,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
     (block) => block.events?.forEach((event) => {
       if (event.type !== "ref")
         return;
-      (0, import_chunk_NHZRKHZO.forEach)(event.decl, (decl) => {
+      (0, import_chunk_X7QCZR3F.forEach)(event.decl, (decl) => {
         if (decl.type === "VariableDeclarator" && decl.node.kind === "const" && (!decl.resolvedType || !hasValue(decl.resolvedType))) {
           const root2 = decl.stack.at(-1)?.sn;
           if (!root2 || root2.type !== "ModuleDeclaration" && root2.type !== "ClassDeclaration" && root2.type !== "Program") {
@@ -14435,17 +14614,17 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
       );
       printBlockTrailer(block);
     });
-    (0, import_chunk_NHZRKHZO.log)("====== TypeMap =====");
+    (0, import_chunk_X7QCZR3F.log)("====== TypeMap =====");
     typeMap.forEach((value2, key) => {
-      (0, import_chunk_NHZRKHZO.log)(
+      (0, import_chunk_X7QCZR3F.log)(
         formatAstLongLines(key).then(
           (keyStr) => `${keyStr} = ${display(value2)} ${key.loc && key.loc.source ? ` (${sourceLocation(key.loc)})` : ""}`
         )
       );
     });
-    (0, import_chunk_NHZRKHZO.log)("====== EquivMap =====");
+    (0, import_chunk_X7QCZR3F.log)("====== EquivMap =====");
     nodeEquivs.forEach((value2, key) => {
-      (0, import_chunk_NHZRKHZO.log)(
+      (0, import_chunk_X7QCZR3F.log)(
         formatAstLongLines(key).then(
           (keyStr) => `${keyStr} = [${value2.equiv.map(
             (equiv) => tsKey(equiv)
@@ -14453,7 +14632,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         )
       );
     });
-    (0, import_chunk_NHZRKHZO.log)("====== Copy Prop =====");
+    (0, import_chunk_X7QCZR3F.log)("====== Copy Prop =====");
     nodeCopyProp.forEach((value2, key) => {
       (0, import_node_assert3.default)(value2 !== false);
       if (key.type === "VariableDeclarator" || key.type === "AssignmentExpression") {
@@ -14463,7 +14642,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         value2.type === "VariableDeclarator" && value2.init || value2.type === "AssignmentExpression"
       );
       const node = value2.type === "VariableDeclarator" ? value2.init : value2.right;
-      (0, import_chunk_NHZRKHZO.log)(
+      (0, import_chunk_X7QCZR3F.log)(
         formatAstLongLines(key).then(
           (keyStr) => formatAstLongLines(node).then(
             (nodeStr) => `${keyStr} = [${nodeStr}] ${key.loc && key.loc.source ? ` (${sourceLocation(key.loc)})` : ""}`
@@ -14472,13 +14651,13 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
       );
     });
     if (root.nodes) {
-      root.nodes.forEach((stack, node) => (0, import_chunk_NHZRKHZO.log)(formatAstLongLines(node)));
+      root.nodes.forEach((stack, node) => (0, import_chunk_X7QCZR3F.log)(formatAstLongLines(node)));
     } else {
-      (0, import_chunk_NHZRKHZO.log)(formatAstLongLines(root.node));
+      (0, import_chunk_X7QCZR3F.log)(formatAstLongLines(root.node));
     }
     if (copyPropStores) {
       copyPropStores.forEach(({ ref, ant }, node) => {
-        (0, import_chunk_NHZRKHZO.log)(
+        (0, import_chunk_X7QCZR3F.log)(
           formatAstLongLines(node).then(
             (nodeStr) => `copy-prop-store: ${nodeStr}${ant ? "!" : ""} => ${nodeCopyProp.get(node) !== ref ? "Failed" : "Success"}`
           )
@@ -14492,9 +14671,9 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
     }
     if (logThisRun) {
       if (selfAssignments.size) {
-        (0, import_chunk_NHZRKHZO.log)("====== Self Assignments =====");
+        (0, import_chunk_X7QCZR3F.log)("====== Self Assignments =====");
         selfAssignments.forEach(
-          (self) => (0, import_chunk_NHZRKHZO.log)(
+          (self) => (0, import_chunk_X7QCZR3F.log)(
             formatAstLongLines(self).then(
               (selfStr) => `${selfStr} (${sourceLocation(self.loc)})`
             )
@@ -14559,7 +14738,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         if (copyNode) {
           if (node.type === "AssignmentExpression") {
             if (logThisRun) {
-              (0, import_chunk_NHZRKHZO.log)(
+              (0, import_chunk_X7QCZR3F.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => `Killing copy-prop assignment ${nodeStr}`
                 )
@@ -14574,7 +14753,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
           if (node.type === "VariableDeclarator") {
             (0, import_node_assert3.default)(node.init);
             if (logThisRun) {
-              (0, import_chunk_NHZRKHZO.log)(
+              (0, import_chunk_X7QCZR3F.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => `Killing copy-prop variable initialization ${nodeStr}`
                 )
@@ -14595,7 +14774,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
               right: copyNode.right
             };
             if (logThisRun) {
-              (0, import_chunk_NHZRKHZO.log)(
+              (0, import_chunk_X7QCZR3F.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => formatAstLongLines(replacement2).then(
                     (repStr) => `copy-prop ${nodeStr} => ${repStr}`
@@ -14608,7 +14787,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
             const init = copyNode.init;
             (0, import_node_assert3.default)(init);
             if (logThisRun) {
-              (0, import_chunk_NHZRKHZO.log)(
+              (0, import_chunk_X7QCZR3F.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => formatAstLongLines(init).then(
                     (initStr) => `copy-prop ${nodeStr} => ${initStr}`
@@ -14622,7 +14801,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         }
         if (selfAssignments.has(node)) {
           if (logThisRun) {
-            (0, import_chunk_NHZRKHZO.log)(
+            (0, import_chunk_X7QCZR3F.log)(
               formatAstLongLines(node).then(
                 (nodeStr) => `Deleting self assignment: ${nodeStr} (${sourceLocation(
                   node.loc
@@ -14666,7 +14845,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         }, curInfo);
         if (rep === curInfo)
           return null;
-        const name = (0, import_chunk_NHZRKHZO.reduce)(
+        const name = (0, import_chunk_X7QCZR3F.reduce)(
           rep.decl,
           (cur, decl) => decl.type === "VariableDeclarator" ? decl.name : cur,
           null
@@ -14674,7 +14853,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         if (!name)
           return null;
         if (logThisRun) {
-          (0, import_chunk_NHZRKHZO.log)(
+          (0, import_chunk_X7QCZR3F.log)(
             formatAstLongLines(node).then(
               (nodeStr) => `Replacing ${nodeStr} with ${name} at ${sourceLocation(
                 node.loc
@@ -14729,24 +14908,39 @@ function updateByAssocPath(path7, property, update) {
           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);
+        const key = pathElem.keyStr;
+        const relaxed = relaxType(property);
+        if (avalue) {
+          avalue = tupleMap(
+            avalue,
+            (v) => {
+              if (typeof key === "number") {
+                if (key < 0 || key >= v.length) {
+                  return null;
+                }
+                v = v.slice();
+                v[key] = relaxed;
+                return v;
+              }
+              return v.map((v2) => {
+                v2 = cloneType(v2);
+                unionInto(v2, relaxed);
+                return v2;
+              });
+            },
+            (v) => valueToStore(v),
+            tupleReduce
+          );
         }
         object = cloneType(object);
-        setUnionComponent(object, 512, avalue);
+        setUnionComponent(
+          object,
+          512,
+          avalue ?? {
+            type: 524287
+            /* Any */
+          }
+        );
       }
       if (object.type & 1024) {
         const dvalue = getUnionComponent(
@@ -14805,7 +14999,7 @@ var init_type_flow = (0, import_chunk_ABYVSU2C.__esm)({
     init_type_flow_util();
     init_types();
     init_union_type();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     logging = true;
     missingNullWorkaround = true;
   }
@@ -14857,9 +15051,9 @@ function minimizeLocals(state, func) {
   if (!didMerge)
     return;
   if (logThisRun) {
-    (0, import_chunk_NHZRKHZO.log)(`>>> Merging locals in ${func.fullName}`);
+    (0, import_chunk_X7QCZR3F.log)(`>>> Merging locals in ${func.fullName}`);
     merge.forEach(
-      (merged) => merged.length > 1 && (0, import_chunk_NHZRKHZO.log)(` - merging ${merged.map((k) => tsKey(k)).join(" | ")}`)
+      (merged) => merged.length > 1 && (0, import_chunk_X7QCZR3F.log)(` - merging ${merged.map((k) => tsKey(k)).join(" | ")}`)
     );
   }
   const remap = /* @__PURE__ */ new Map();
@@ -15129,7 +15323,7 @@ var init_minimize_locals = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_JDC43A3I.init_ast)();
     init_control_flow();
     init_type_flow();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_variable_renamer();
     init_type_flow_util();
   }
@@ -15140,12 +15334,12 @@ function logAntState(s, decl) {
       defs2++;
     return defs2;
   }, 0);
-  (0, import_chunk_NHZRKHZO.log)(
+  (0, import_chunk_X7QCZR3F.log)(
     declFullName(decl).then(
       (declStr) => `  - ${declStr}: ${candidateCost(s)} bytes, ${s.ant.size - defs} refs, ${defs} defs, ${s.live ? "" : "!"}live, ${s.isIsolated ? "" : "!"}isolated`
     )
   );
-  (0, import_chunk_NHZRKHZO.log)(
+  (0, import_chunk_X7QCZR3F.log)(
     `    - members: ${Array.from(s.members).map(([block, live]) => block.order + (live ? "t" : "f")).join(", ")}`
   );
 }
@@ -15162,7 +15356,7 @@ async function sizeBasedPRE(state, func) {
   const candidates = computeAttributes(state, head);
   if (candidates) {
     if (logging2) {
-      (0, import_chunk_NHZRKHZO.log)(`Found ${candidates.size} candidates in ${func.fullName}`);
+      (0, import_chunk_X7QCZR3F.log)(`Found ${candidates.size} candidates in ${func.fullName}`);
       logAntDecls(candidates);
     }
     const nodeMap = /* @__PURE__ */ new Map();
@@ -15255,7 +15449,7 @@ function buildPREGraph(state, func) {
       const event = block.events[i];
       switch (event.type) {
         case "ref":
-          if ((0, import_chunk_NHZRKHZO.some)(
+          if ((0, import_chunk_X7QCZR3F.some)(
             event.decl,
             (decl) => decl.type === "Literal" || decl.type === "VariableDeclarator" && decl.node.kind === "const"
           )) {
@@ -15273,7 +15467,7 @@ function buildPREGraph(state, func) {
           defs.add(event.decl);
           break;
         case "mod":
-          if (event.callees && (0, import_chunk_NHZRKHZO.every)(event.callees, (callee) => callee.info === false)) {
+          if (event.callees && (0, import_chunk_X7QCZR3F.every)(event.callees, (callee) => callee.info === false)) {
             block.events.splice(i, 1);
             break;
           }
@@ -15432,21 +15626,21 @@ function computeAttributes(state, head) {
   });
   if (logging2) {
     order.forEach((block) => {
-      (0, import_chunk_NHZRKHZO.log)(
+      (0, import_chunk_X7QCZR3F.log)(
         block.order,
         `(${block.node ? block.node.loc?.start.line : "??"})`,
         `Preds: ${(block.preds || []).map((block2) => block2.order).join(", ")}`
       );
       if (block.events) {
         block.events.forEach(
-          (event) => event.type !== "exn" && (0, import_chunk_NHZRKHZO.log)(
+          (event) => event.type !== "exn" && (0, import_chunk_X7QCZR3F.log)(
             Promise.resolve(
               event.decl ? declFullName(event.decl) : event.node ? formatAstLongLines(event.node) : "??"
             ).then((eventDetails) => `    ${event.type}: ${eventDetails}`)
           )
         );
       }
-      (0, import_chunk_NHZRKHZO.log)(
+      (0, import_chunk_X7QCZR3F.log)(
         `Succs: ${(block.succs || []).map((block2) => block2.order).join(", ")} ExSucc: ${block.exsucc ? block.exsucc.order : ""}`
       );
     });
@@ -15514,7 +15708,7 @@ function computeAttributes(state, head) {
           }
           case "mod": {
             curState.forEach((candidates, decls) => {
-              if ((0, import_chunk_NHZRKHZO.some)(
+              if ((0, import_chunk_X7QCZR3F.some)(
                 decls,
                 (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && candidates.live && (!event.callees || event.callees.some(
                   (callee) => functionMayModify(state, callee, decl)
@@ -15556,7 +15750,7 @@ function computeAttributes(state, head) {
     }
     blockStates[top.order] = curState;
     if (logging2) {
-      (0, import_chunk_NHZRKHZO.log)(`Updated block ${top.order}`);
+      (0, import_chunk_X7QCZR3F.log)(`Updated block ${top.order}`);
       logAntDecls(curState);
     }
     if (top.preds) {
@@ -15658,7 +15852,7 @@ function applyReplacements(func, nodeMap, declMap) {
             }
             const name = declMap.get(event.decl);
             if (!name) {
-              throw new import_chunk_NHZRKHZO.AwaitedError(
+              throw new import_chunk_X7QCZR3F.AwaitedError(
                 formatAstLongLines(node).then(
                   (targetStr) => `No replacement found for "${targetStr}"`
                 )
@@ -15680,7 +15874,7 @@ function applyReplacements(func, nodeMap, declMap) {
             const target = node.type === "AssignmentExpression" ? node.left : node.argument;
             const name = declMap.get(event.decl);
             if (!name) {
-              throw new import_chunk_NHZRKHZO.AwaitedError(
+              throw new import_chunk_X7QCZR3F.AwaitedError(
                 formatAstLongLines(target).then(
                   (targetStr) => `No replacement found for "${targetStr}"`
                 )
@@ -15743,14 +15937,14 @@ function applyReplacements(func, nodeMap, declMap) {
           const decl = event.decl;
           const name = declMap.get(decl);
           if (!name) {
-            throw new import_chunk_NHZRKHZO.AwaitedError(
+            throw new import_chunk_X7QCZR3F.AwaitedError(
               declFullName(decl).then(
                 (declStr) => `No replacement found for "${declStr}"`
               )
             );
           }
           if (!event.id) {
-            throw new import_chunk_NHZRKHZO.AwaitedError(
+            throw new import_chunk_X7QCZR3F.AwaitedError(
               declFullName(decl).then(
                 (declStr) => `Missing id for mod event for "${declStr}"`
               )
@@ -15815,7 +16009,7 @@ var init_pre = (0, import_chunk_ABYVSU2C.__esm)({
     init_data_flow();
     init_function_info();
     init_minimize_locals();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     logging2 = false;
     LocalRefCost = 2;
   }
@@ -16187,7 +16381,7 @@ function beforeEvaluate(istate, node) {
           break;
         }
         const id = node.right.argument;
-        if ((0, import_chunk_NHZRKHZO.every)(left.value.value, (m) => {
+        if ((0, import_chunk_X7QCZR3F.every)(left.value.value, (m) => {
           if ((0, import_chunk_JDC43A3I.hasProperty)(m.decls, id.name))
             return false;
           return istate.state.lookup({
@@ -16633,7 +16827,7 @@ var init_optimize = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_JDC43A3I.init_ast)();
     init_inliner();
     init_type_flow();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_interp();
     init_interp_binary();
     init_types();
@@ -17220,11 +17414,11 @@ function markFunctionCalled(state, func) {
     state.calledFunctions[func.id.name] = [func];
     return;
   }
-  (0, import_chunk_NHZRKHZO.pushUnique)(state.calledFunctions[func.id.name], func);
+  (0, import_chunk_X7QCZR3F.pushUnique)(state.calledFunctions[func.id.name], func);
 }
 function optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config) {
   return optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config).catch(
-    (ex) => Promise.reject(ex instanceof import_chunk_NHZRKHZO.AwaitedError ? ex.resolve() : ex)
+    (ex) => Promise.reject(ex instanceof import_chunk_X7QCZR3F.AwaitedError ? ex.resolve() : ex)
   );
 }
 async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
@@ -17992,7 +18186,7 @@ var init_mc_rewrite = (0, import_chunk_ABYVSU2C.__esm)({
     init_sub_type();
     init_types();
     init_unused_exprs();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_variable_renamer();
   }
 });
@@ -18442,35 +18636,41 @@ function add_one_resource(state, doc, module2, e, barrelNames) {
   let func;
   const makeVarDecl = (id2, outer) => {
     const loc = id2 && (0, import_chunk_JDC43A3I.adjustLoc)(id2.value.loc);
+    const declarations = [];
+    if (id2) {
+      declarations.push({
+        type: "VariableDeclarator",
+        kind: "var",
+        id: {
+          type: "BinaryExpression",
+          operator: "as",
+          left: (0, import_chunk_JDC43A3I.makeIdentifier)(id2.value.value, loc),
+          right: {
+            type: "TypeSpecList",
+            ts: [
+              {
+                type: "TypeSpecPart",
+                name: (0, import_chunk_JDC43A3I.makeScopedName)(
+                  (state?.sdkVersion ?? 0) >= 7e6 ? "Toybox.Lang.ResourceId" : "Toybox.Lang.Symbol"
+                )
+              }
+            ]
+          }
+        }
+      });
+    }
+    if (init) {
+      declarations.push({
+        type: "VariableDeclarator",
+        kind: "var",
+        id: (0, import_chunk_JDC43A3I.makeIdentifier)("*invalid*"),
+        init
+      });
+    }
     return (0, import_chunk_JDC43A3I.wrap)(
       {
         type: "VariableDeclaration",
-        declarations: [
-          (0, import_chunk_JDC43A3I.wrap)(
-            {
-              type: "VariableDeclarator",
-              kind: "var",
-              id: id2 && !init ? {
-                type: "BinaryExpression",
-                operator: "as",
-                left: (0, import_chunk_JDC43A3I.makeIdentifier)(id2.value.value, loc),
-                right: {
-                  type: "TypeSpecList",
-                  ts: [
-                    {
-                      type: "TypeSpecPart",
-                      name: (0, import_chunk_JDC43A3I.makeScopedName)(
-                        (state?.sdkVersion ?? 0) >= 7e6 ? "Toybox.Lang.ResourceId" : "Toybox.Lang.Symbol"
-                      )
-                    }
-                  ]
-                }
-              } : (0, import_chunk_JDC43A3I.makeIdentifier)(id2 ? id2.value.value : "*invalid*", loc),
-              init
-            },
-            outer
-          )
-        ],
+        declarations: declarations.map((d) => (0, import_chunk_JDC43A3I.wrap)(d, outer)),
         kind: "var"
       },
       outer
@@ -18971,7 +19171,7 @@ async function getApiMapping(state, resourcesMap, manifestXML) {
       throw `Negative constant ${fixup} was not a Literal`;
     }
     if (typeof init.value !== "number") {
-      (0, import_chunk_NHZRKHZO.log)(`Negative fixup ${fixup} was not a number!`);
+      (0, import_chunk_X7QCZR3F.log)(`Negative fixup ${fixup} was not a number!`);
     } else if (init.value > 0) {
       init.value = -init.value;
       init.raw = "-" + init.raw;
@@ -19061,11 +19261,11 @@ function sameStateNodeDecl(a, b) {
 function sameLookupDefinition(a, b) {
   return (
     // sameStateNodeDecl(a.parent, b.parent) &&
-    (0, import_chunk_NHZRKHZO.sameArrays)(a.results, b.results, (ar, br) => sameStateNodeDecl(ar, br))
+    (0, import_chunk_X7QCZR3F.sameArrays)(a.results, b.results, (ar, br) => sameStateNodeDecl(ar, br))
   );
 }
 function sameLookupResult(a, b) {
-  return (0, import_chunk_NHZRKHZO.sameArrays)(a, b, sameLookupDefinition);
+  return (0, import_chunk_X7QCZR3F.sameArrays)(a, b, sameLookupDefinition);
 }
 function declKey(decl) {
   return isStateNode(decl) ? decl.type === "ModuleDeclaration" ? decl.fullName : decl.node : decl;
@@ -19654,7 +19854,7 @@ function stateFuncs() {
                     if (!(0, import_chunk_JDC43A3I.hasProperty)(this.index, name)) {
                       this.index[name] = [];
                     }
-                    (0, import_chunk_NHZRKHZO.pushUnique)(this.index[name], parent);
+                    (0, import_chunk_X7QCZR3F.pushUnique)(this.index[name], parent);
                   }
                 });
                 break;
@@ -19709,7 +19909,7 @@ function stateFuncs() {
                   if (!(0, import_chunk_JDC43A3I.hasProperty)(values, name)) {
                     values[name] = [];
                   }
-                  if ((0, import_chunk_NHZRKHZO.pushUnique)(values[name], m) && currentEnum) {
+                  if ((0, import_chunk_X7QCZR3F.pushUnique)(values[name], m) && currentEnum) {
                     if (!this.enumMap)
                       this.enumMap = /* @__PURE__ */ new Map();
                     this.enumMap.set(m, currentEnum);
@@ -19717,7 +19917,7 @@ function stateFuncs() {
                   if (!(0, import_chunk_JDC43A3I.hasProperty)(this.index, name)) {
                     this.index[name] = [];
                   }
-                  (0, import_chunk_NHZRKHZO.pushUnique)(this.index[name], parent);
+                  (0, import_chunk_X7QCZR3F.pushUnique)(this.index[name], parent);
                 });
                 break;
               }
@@ -20248,7 +20448,7 @@ var init_api = (0, import_chunk_ABYVSU2C.__esm)({
     init_sdk_util();
     init_type_flow_util();
     init_types();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_visitor();
   }
 });
@@ -20332,7 +20532,7 @@ function buildDataFlowGraph(state, root, wantsLiteral, trackInsertionPoints, wan
       return decls;
     }
     if (canon.length !== decls.length || !canon.every((v, i) => v === decls[i])) {
-      throw new import_chunk_NHZRKHZO.AwaitedError(
+      throw new import_chunk_X7QCZR3F.AwaitedError(
         declFullName(canon).then(
           (canonStr) => `Canonical representation of ${canonStr} did not match`
         )
@@ -20366,7 +20566,7 @@ function buildDataFlowGraph(state, root, wantsLiteral, trackInsertionPoints, wan
     }
     const decl = lookupDefToDecl(results);
     if (decl && path7.length) {
-      if (wantsAllRefs && (0, import_chunk_NHZRKHZO.every)(
+      if (wantsAllRefs && (0, import_chunk_X7QCZR3F.every)(
         decl,
         (d) => d.type === "VariableDeclarator" || d.type === "BinaryExpression" || d.type === "Identifier"
       )) {
@@ -20418,7 +20618,7 @@ function buildDataFlowGraph(state, root, wantsLiteral, trackInsertionPoints, wan
             }
             const v = liveDefs.get(def);
             if (!v || !v.has(node)) {
-              throw new import_chunk_NHZRKHZO.AwaitedError(
+              throw new import_chunk_X7QCZR3F.AwaitedError(
                 Promise.resolve(def ? declFullName(def) : "null").then(
                   (defStr) => `No stmt in liveDef for ${defStr}`
                 )
@@ -20490,7 +20690,7 @@ function buildDataFlowGraph(state, root, wantsLiteral, trackInsertionPoints, wan
             const decls = findDecl(node);
             if (!decls)
               break;
-            if (trackInsertionPoints && (0, import_chunk_NHZRKHZO.some)(decls, (decl) => {
+            if (trackInsertionPoints && (0, import_chunk_X7QCZR3F.some)(decls, (decl) => {
               if (decl.type === "VariableDeclarator") {
                 const defStmts = decl.node.kind === "var" && liveDefs.get(null) || liveDefs.get(decl);
                 if (defStmts) {
@@ -20757,8 +20957,8 @@ var init_data_flow = (0, import_chunk_ABYVSU2C.__esm)({
     init_control_flow();
     init_function_info();
     init_type_flow_util();
-    (0, import_chunk_NHZRKHZO.init_util)();
-    DataflowQueue = class extends import_chunk_NHZRKHZO.GenericQueue {
+    (0, import_chunk_X7QCZR3F.init_util)();
+    DataflowQueue = class extends import_chunk_X7QCZR3F.GenericQueue {
       constructor() {
         super((b, a) => (a.order || 0) - (b.order || 0));
       }
@@ -21553,7 +21753,7 @@ function computeJsrMap(func) {
 }
 function postOrderPropagate(func, preBlock, processBc, postBlock, merge) {
   const order = /* @__PURE__ */ new Map();
-  const queue = new import_chunk_NHZRKHZO.GenericQueue(
+  const queue = new import_chunk_X7QCZR3F.GenericQueue(
     (b, a) => order.get(a) - order.get(b)
   );
   postOrderTraverse2(func, (block) => {
@@ -21612,7 +21812,7 @@ function rpoPropagate(func, preBlock, processBc, postBlock, merge) {
     });
     blocks.reverse().forEach((block, i) => order.set(block, i));
   }
-  const queue = new import_chunk_NHZRKHZO.GenericQueue(
+  const queue = new import_chunk_X7QCZR3F.GenericQueue(
     (b, a) => order.get(a) - order.get(b)
   );
   queue.enqueue(func.blocks.get(func.offset));
@@ -21666,7 +21866,7 @@ function rpoPropagate(func, preBlock, processBc, postBlock, merge) {
 var init_cflow = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/cflow.ts"() {
     "use strict";
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_opcodes();
   }
 });
@@ -22129,12 +22329,12 @@ function interpFunc(func, context) {
   const selfStores = /* @__PURE__ */ new Set();
   const liveInState = /* @__PURE__ */ new Map();
   const replacements = /* @__PURE__ */ new Map();
-  const interpLogging = (0, import_chunk_NHZRKHZO.wouldLog)("interp", 1);
+  const interpLogging = (0, import_chunk_X7QCZR3F.wouldLog)("interp", 1);
   if (interpLogging) {
-    if ((0, import_chunk_NHZRKHZO.wouldLog)("interp", 7)) {
-      (0, import_chunk_NHZRKHZO.setBanner)(functionBanner(func, context, "interp"));
-    } else if ((0, import_chunk_NHZRKHZO.wouldLog)("interp", 3)) {
-      (0, import_chunk_NHZRKHZO.setBanner)(
+    if ((0, import_chunk_X7QCZR3F.wouldLog)("interp", 7)) {
+      (0, import_chunk_X7QCZR3F.setBanner)(functionBanner(func, context, "interp"));
+    } else if ((0, import_chunk_X7QCZR3F.wouldLog)("interp", 3)) {
+      (0, import_chunk_X7QCZR3F.setBanner)(
         () => `+++++++++++++ interp-prepare ${func.name} ++++++++++++++`
       );
     }
@@ -22168,20 +22368,20 @@ function interpFunc(func, context) {
     func,
     (block) => {
       if (interpLogging) {
-        (0, import_chunk_NHZRKHZO.logger)(
+        (0, import_chunk_X7QCZR3F.logger)(
           "interp",
           3,
           `${offsetToString(block.offset)}: ${block.bytecodes[0]?.lineNum ? lineInfoToString(block.bytecodes[0]?.lineNum, context) : ""}
  ${interpStateToString(liveInState.get(block.offset))}`
         );
-        (0, import_chunk_NHZRKHZO.logger)("interp", 9, () => blockToString(block, context));
+        (0, import_chunk_X7QCZR3F.logger)("interp", 9, () => blockToString(block, context));
       }
       return cloneState2(liveInState.get(block.offset));
     },
     (block, bc, localState) => {
       if (interpLogging) {
-        if ((0, import_chunk_NHZRKHZO.wouldLog)("interp", 8)) {
-          (0, import_chunk_NHZRKHZO.log)(
+        if ((0, import_chunk_X7QCZR3F.wouldLog)("interp", 8)) {
+          (0, import_chunk_X7QCZR3F.log)(
             `${interpStateToString(localState)}
     ${bytecodeToString(
               bc,
@@ -22346,14 +22546,14 @@ function interpFunc(func, context) {
       if (!mergeInto(localState, succState))
         return false;
       if (interpLogging) {
-        (0, import_chunk_NHZRKHZO.logger)("interp", 3, `Re-Merge to ${offsetToString(succBlock.offset)}`);
+        (0, import_chunk_X7QCZR3F.logger)("interp", 3, `Re-Merge to ${offsetToString(succBlock.offset)}`);
       }
       return true;
     }
   );
   if (interpLogging) {
-    if ((0, import_chunk_NHZRKHZO.wouldLog)("interp", 5)) {
-      (0, import_chunk_NHZRKHZO.setBanner)(
+    if ((0, import_chunk_X7QCZR3F.wouldLog)("interp", 5)) {
+      (0, import_chunk_X7QCZR3F.setBanner)(
         functionBanner(func, context, "interp", (block, footer) => {
           if (footer)
             return "";
@@ -22361,44 +22561,44 @@ function interpFunc(func, context) {
         })
       );
     } else {
-      (0, import_chunk_NHZRKHZO.setBanner)(() => `=============== interp ${func.name} ==============`);
+      (0, import_chunk_X7QCZR3F.setBanner)(() => `=============== interp ${func.name} ==============`);
     }
     if (equivSets.size) {
-      (0, import_chunk_NHZRKHZO.log)(`====== equivSets =====`);
+      (0, import_chunk_X7QCZR3F.log)(`====== equivSets =====`);
       equivSets.forEach(
-        (value2, key) => (0, import_chunk_NHZRKHZO.log)(
+        (value2, key) => (0, import_chunk_X7QCZR3F.log)(
           `L${key.arg} === ${Array.from(value2).sort().join(" ")} ${key.lineNum ? lineInfoToString(key.lineNum, context) : ""}`
         )
       );
     }
     if (selfStores.size) {
-      (0, import_chunk_NHZRKHZO.log)(`====== selfStores =====`);
+      (0, import_chunk_X7QCZR3F.log)(`====== selfStores =====`);
       selfStores.forEach(
-        (value2) => (0, import_chunk_NHZRKHZO.log)(`${bytecodeToString(value2, symbolTable)}`)
+        (value2) => (0, import_chunk_X7QCZR3F.log)(`${bytecodeToString(value2, symbolTable)}`)
       );
     }
     if (replacements.size) {
-      (0, import_chunk_NHZRKHZO.log)(`====== replacements =====`);
+      (0, import_chunk_X7QCZR3F.log)(`====== replacements =====`);
       replacements.forEach(
         (blockRep) => blockRep.forEach(
-          (rep, bc) => (0, import_chunk_NHZRKHZO.log)(
+          (rep, bc) => (0, import_chunk_X7QCZR3F.log)(
             `${bytecodeToString(bc, symbolTable)} => ${rep.invert ? "~" : ""}${bytecodeToString(rep, symbolTable)} ${bc.lineNum ? lineInfoToString(bc.lineNum, context) : ""}`
           )
         )
       );
     }
     if (resolvedBranches.size) {
-      (0, import_chunk_NHZRKHZO.log)(`====== resolved branches =====`);
+      (0, import_chunk_X7QCZR3F.log)(`====== resolved branches =====`);
       resolvedBranches.forEach(
-        (isTaken, block) => (0, import_chunk_NHZRKHZO.log)(
+        (isTaken, block) => (0, import_chunk_X7QCZR3F.log)(
           `block ${offsetToString(block.offset)} is ${isTaken ? "always" : "never"} taken`
         )
       );
     }
     if (branchRedirects.size) {
-      (0, import_chunk_NHZRKHZO.log)(`====== redirected branches =====`);
+      (0, import_chunk_X7QCZR3F.log)(`====== redirected branches =====`);
       branchRedirects.forEach(
-        ({ to, from }, block) => (0, import_chunk_NHZRKHZO.log)(
+        ({ to, from }, block) => (0, import_chunk_X7QCZR3F.log)(
           `block ${offsetToString(
             block.offset
           )} redirects from ${offsetToString(from)} to ${offsetToString(to)}${safeBranchBlocks.get(from) ? ` popping ${safeBranchBlocks.get(from)}` : ""}`
@@ -22461,7 +22661,7 @@ function interpFunc(func, context) {
     }
   });
   if (interpLogging)
-    (0, import_chunk_NHZRKHZO.setBanner)(null);
+    (0, import_chunk_X7QCZR3F.setBanner)(null);
   return {
     liveInState,
     equivSets,
@@ -22511,7 +22711,7 @@ var init_interp2 = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/interp.ts"() {
     "use strict";
     init_interp_binary();
-    (0, import_chunk_NHZRKHZO.init_logger)();
+    (0, import_chunk_X7QCZR3F.init_logger)();
     init_interp();
     init_types();
     init_union_type();
@@ -22623,7 +22823,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
     i = found;
   }
   if (initType && (block.bytecodes[index].op === 20 ? initType.type === 1 : initType.type === 8 && initType.value === 0)) {
-    (0, import_chunk_NHZRKHZO.logger)(
+    (0, import_chunk_X7QCZR3F.logger)(
       "array-init",
       1,
       () => `${func.name}: Removing initialization of default initialized ${putvStarts.length} element array init at block ${offsetToString(
@@ -22660,7 +22860,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         convertAputv(offset - 1);
       }
     }
-    (0, import_chunk_NHZRKHZO.logger)(
+    (0, import_chunk_X7QCZR3F.logger)(
       "array-init",
       1,
       () => `${func.name}: Optimizing unused ${putvStarts.length} element array init at block ${offsetToString(
@@ -22669,8 +22869,8 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         block.bytecodes[index].offset
       )}`
     );
-    if ((0, import_chunk_NHZRKHZO.wouldLog)("array-init", 5)) {
-      (0, import_chunk_NHZRKHZO.log)(blockToString(block, context));
+    if ((0, import_chunk_X7QCZR3F.wouldLog)("array-init", 5)) {
+      (0, import_chunk_X7QCZR3F.log)(blockToString(block, context));
     }
     return true;
   }
@@ -22710,7 +22910,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
     if (putvStarts.length < 3)
       return false;
     tryLocal(3);
-    (0, import_chunk_NHZRKHZO.logger)(
+    (0, import_chunk_X7QCZR3F.logger)(
       "array-init",
       1,
       () => `${func.name}: Optimizing ${putvStarts.length} element array init with constant initializer ${bytecodeToString(
@@ -22736,7 +22936,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         block.bytecodes[index + 1].arg = putvStarts.length;
       }
     }
-    (0, import_chunk_NHZRKHZO.logger)(
+    (0, import_chunk_X7QCZR3F.logger)(
       "array-init",
       5,
       () => `index: ${index}, i: ${i}
@@ -22789,7 +22989,7 @@ ${blockToString(block, context)}`
   for (let i2 = putvStarts.length; i2-- > 1; ) {
     block.bytecodes.splice(putvStarts[i2], 2);
   }
-  (0, import_chunk_NHZRKHZO.logger)(
+  (0, import_chunk_X7QCZR3F.logger)(
     "array-init",
     1,
     () => `${func.name}: Optimizing ${putvStarts.length} element array init at block ${offsetToString(
@@ -22848,15 +23048,15 @@ var init_array_init = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/array-init.ts"() {
     "use strict";
     init_types();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_bytecode();
     init_interp2();
     init_opcodes();
   }
 });
 function localDCE(func, context) {
-  if ((0, import_chunk_NHZRKHZO.wouldLog)("dce", 5)) {
-    (0, import_chunk_NHZRKHZO.setBanner)(
+  if ((0, import_chunk_X7QCZR3F.wouldLog)("dce", 5)) {
+    (0, import_chunk_X7QCZR3F.setBanner)(
       functionBanner(
         func,
         context,
@@ -22889,7 +23089,7 @@ function localDCE(func, context) {
   };
   func.blocks.forEach((block) => {
     const reportPopv = (i, item, kill) => {
-      (0, import_chunk_NHZRKHZO.logger)(
+      (0, import_chunk_X7QCZR3F.logger)(
         "dce",
         2,
         () => `${func.name}: Convert ${i}:${bytecodeToString(
@@ -22904,7 +23104,7 @@ function localDCE(func, context) {
       );
     };
     const reportNop = (item) => {
-      (0, import_chunk_NHZRKHZO.logger)(
+      (0, import_chunk_X7QCZR3F.logger)(
         "dce",
         2,
         () => `${func.name}: Kill ${item.deps.map(
@@ -22923,7 +23123,7 @@ function localDCE(func, context) {
         case 19: {
           const liveLocal = dceInfo.locals.has(bytecode.arg);
           if (!liveLocal && (bytecode.arg || context.config.allowForbiddenOpts)) {
-            (0, import_chunk_NHZRKHZO.logger)(
+            (0, import_chunk_X7QCZR3F.logger)(
               "dce",
               2,
               () => `${func.name}: Killing store to unused local ${bytecode.arg} at ${offsetToString(block.offset)}:${i}`
@@ -23083,10 +23283,10 @@ function localDCE(func, context) {
         (bc) => bc.op !== 0
         /* nop */
       );
-      (0, import_chunk_NHZRKHZO.logger)("dce", 3, functionBanner(func, context, "local-dce-end"));
+      (0, import_chunk_X7QCZR3F.logger)("dce", 3, functionBanner(func, context, "local-dce-end"));
     }
   });
-  (0, import_chunk_NHZRKHZO.setBanner)(null);
+  (0, import_chunk_X7QCZR3F.setBanner)(null);
   return anyChanges;
 }
 function computeLiveLocals(func) {
@@ -23137,7 +23337,7 @@ var init_dce = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/dce.ts"() {
     "use strict";
     init_data_flow();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_bytecode();
     init_cflow();
     init_opcodes();
@@ -23177,7 +23377,7 @@ function minimizeLocals2(func, equivSets, context) {
   const splitRanges = computeSplitRanges(func, equivSets);
   const locals = mergeSplitRanges(splitRanges);
   const numLocals = Math.max(...Array.from(splitRanges.keys())) + 1;
-  (0, import_chunk_NHZRKHZO.logger)("locals", 10, functionBanner(func, context, "Minimize Locals"));
+  (0, import_chunk_X7QCZR3F.logger)("locals", 10, functionBanner(func, context, "Minimize Locals"));
   let argc = func.argc ?? null;
   const colors = /* @__PURE__ */ new Map();
   const merge = [];
@@ -23244,15 +23444,15 @@ function minimizeLocals2(func, equivSets, context) {
       }
     }
   }
-  if ((0, import_chunk_NHZRKHZO.wouldLog)("locals", 1)) {
-    if (!(0, import_chunk_NHZRKHZO.wouldLog)("locals", 10)) {
-      (0, import_chunk_NHZRKHZO.logger)("locals", 5, functionBanner(func, context, "Minimize Locals"));
+  if ((0, import_chunk_X7QCZR3F.wouldLog)("locals", 1)) {
+    if (!(0, import_chunk_X7QCZR3F.wouldLog)("locals", 10)) {
+      (0, import_chunk_X7QCZR3F.logger)("locals", 5, functionBanner(func, context, "Minimize Locals"));
     }
-    (0, import_chunk_NHZRKHZO.log)(
+    (0, import_chunk_X7QCZR3F.log)(
       `>>> Merging locals in ${func.name} (in: ${numLocals} => out: ${merge.length})`
     );
     merge.slice().sort((a, b) => (colors.get(a[0]) ?? 0) - (colors.get(b[0]) ?? 0)).forEach(
-      (merged) => (0, import_chunk_NHZRKHZO.log)(
+      (merged) => (0, import_chunk_X7QCZR3F.log)(
         ` ${colors.get(merged[0])} - ${merged.map((k) => bytecodeToString(k, context.symbolTable)).join(" | ")}`
       )
     );
@@ -23551,7 +23751,7 @@ function mergeSplitRanges(splitRanges) {
 var init_locals = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/locals.ts"() {
     "use strict";
-    (0, import_chunk_NHZRKHZO.init_logger)();
+    (0, import_chunk_X7QCZR3F.init_logger)();
     init_bytecode();
     init_cflow();
     init_opcodes();
@@ -23664,16 +23864,16 @@ function sizeBasedPRE2(func, context) {
       delete bc.arg;
     return bc;
   };
-  if ((0, import_chunk_NHZRKHZO.wouldLog)("pre", 1)) {
-    if ((0, import_chunk_NHZRKHZO.wouldLog)("pre", 5)) {
-      (0, import_chunk_NHZRKHZO.log)(functionBanner(func, context, "PRE")());
+  if ((0, import_chunk_X7QCZR3F.wouldLog)("pre", 1)) {
+    if ((0, import_chunk_X7QCZR3F.wouldLog)("pre", 5)) {
+      (0, import_chunk_X7QCZR3F.log)(functionBanner(func, context, "PRE")());
     } else {
-      (0, import_chunk_NHZRKHZO.log)(`================ PRE : ${func.name} ================
+      (0, import_chunk_X7QCZR3F.log)(`================ PRE : ${func.name} ================
 `);
     }
     insertionBlocks.forEach((o, key) => {
       const bcs = canonicalMap.get(key);
-      (0, import_chunk_NHZRKHZO.log)(
+      (0, import_chunk_X7QCZR3F.log)(
         `Replacing ${bcs.size} instances of ${bytecodeToString(
           bcs.values().next().value,
           context.symbolTable
@@ -23756,13 +23956,13 @@ function sizeBasedPRE2(func, context) {
       bytecode(1, insertionBlocks.size)
     );
   }
-  (0, import_chunk_NHZRKHZO.logger)("pre", 5, functionBanner(func, context, "post-PRE"));
+  (0, import_chunk_X7QCZR3F.logger)("pre", 5, functionBanner(func, context, "post-PRE"));
   return true;
 }
 var init_pre2 = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/pre.ts"() {
     "use strict";
-    (0, import_chunk_NHZRKHZO.init_logger)();
+    (0, import_chunk_X7QCZR3F.init_logger)();
     init_bytecode();
     init_cflow();
     init_opcodes();
@@ -23795,9 +23995,9 @@ function blockSharing(func, context) {
   if (!any)
     return false;
   any = false;
-  const logging3 = (0, import_chunk_NHZRKHZO.wouldLog)("sharing", 1);
-  if (logging3 && (0, import_chunk_NHZRKHZO.wouldLog)("sharing", 10)) {
-    (0, import_chunk_NHZRKHZO.setBanner)(functionBanner(func, context, "sharing"));
+  const logging3 = (0, import_chunk_X7QCZR3F.wouldLog)("sharing", 1);
+  if (logging3 && (0, import_chunk_X7QCZR3F.wouldLog)("sharing", 10)) {
+    (0, import_chunk_X7QCZR3F.setBanner)(functionBanner(func, context, "sharing"));
   }
   candidates.forEach((blocks) => {
     while (blocks.size > 1) {
@@ -23933,9 +24133,9 @@ function blockSharing(func, context) {
                 block2.offset
               )})` : `block(${offsetToString(block2.offset)})`;
             };
-            (0, import_chunk_NHZRKHZO.log)(`Sharing ${showBlock(block)} with ${showBlock(target)}`);
-            if ((0, import_chunk_NHZRKHZO.wouldLog)("sharing", 5)) {
-              (0, import_chunk_NHZRKHZO.log)(blockToString(target, context));
+            (0, import_chunk_X7QCZR3F.log)(`Sharing ${showBlock(block)} with ${showBlock(target)}`);
+            if ((0, import_chunk_X7QCZR3F.wouldLog)("sharing", 5)) {
+              (0, import_chunk_X7QCZR3F.log)(blockToString(target, context));
             }
           }
           if (target.bytecodes.length > length2) {
@@ -23962,13 +24162,13 @@ function blockSharing(func, context) {
       });
     }
   });
-  (0, import_chunk_NHZRKHZO.setBanner)(null);
+  (0, import_chunk_X7QCZR3F.setBanner)(null);
   return any;
 }
 var init_sharing = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/sharing.ts"() {
     "use strict";
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_bytecode();
     init_opcodes();
   }
@@ -24032,7 +24232,7 @@ function doArrayInits(func, liveInState, context) {
 }
 function simpleOpts(func, context) {
   const equalsSym = 8388787;
-  const logging3 = (0, import_chunk_NHZRKHZO.wouldLog)("optimize", 5);
+  const logging3 = (0, import_chunk_X7QCZR3F.wouldLog)("optimize", 5);
   return Array.from(func.blocks.values()).reduce((changes, block) => {
     for (let i = block.bytecodes.length; i--; ) {
       const cur = block.bytecodes[i];
@@ -24040,7 +24240,7 @@ function simpleOpts(func, context) {
         block.bytecodes.splice(i, 1);
         changes = true;
         if (logging3) {
-          (0, import_chunk_NHZRKHZO.log)(`${func.name}: deleting ${bytecodeToString(cur, null)}`);
+          (0, import_chunk_X7QCZR3F.log)(`${func.name}: deleting ${bytecodeToString(cur, null)}`);
         }
       } else if (cur.op === 74 && context.config.removeArgc && context.config.allowForbiddenOpts) {
         const arg = cur.arg.incsp;
@@ -24049,7 +24249,7 @@ function simpleOpts(func, context) {
         incsp.arg = arg;
         changes = true;
         if (logging3) {
-          (0, import_chunk_NHZRKHZO.log)(`${func.name}: argcincsp => incsp`);
+          (0, import_chunk_X7QCZR3F.log)(`${func.name}: argcincsp => incsp`);
         }
       } else if (i && cur.op === 39 && cur.arg === equalsSym) {
         changes = equalSymbolToEq(block, i) || changes;
@@ -24060,7 +24260,7 @@ function simpleOpts(func, context) {
           if (!shift && prev.op === 37) {
             block.bytecodes.splice(i - 1, 2);
             changes = true;
-            logging3 && (0, import_chunk_NHZRKHZO.log)(`${func.name}: deleting no-op shift (${shift})`);
+            logging3 && (0, import_chunk_X7QCZR3F.log)(`${func.name}: deleting no-op shift (${shift})`);
             continue;
           }
           if (shift === 1n && prev.op === 37) {
@@ -24070,7 +24270,7 @@ function simpleOpts(func, context) {
             const add = cur;
             add.op = 3;
             delete add.arg;
-            logging3 && (0, import_chunk_NHZRKHZO.log)(`${func.name}: converting "ipush 1; shlv" to "dup 0; addv"`);
+            logging3 && (0, import_chunk_X7QCZR3F.log)(`${func.name}: converting "ipush 1; shlv" to "dup 0; addv"`);
             continue;
           }
           if (shift < (prev.op === 49 ? 64n : 31n)) {
@@ -24080,7 +24280,7 @@ function simpleOpts(func, context) {
             } else {
               prev.arg = BigInt.asIntN(64, mul);
             }
-            logging3 && (0, import_chunk_NHZRKHZO.log)(
+            logging3 && (0, import_chunk_X7QCZR3F.log)(
               `${func.name}: converting shlv(${shift}) to mulv(${prev.arg})`
             );
             changes = true;
@@ -24094,14 +24294,14 @@ function simpleOpts(func, context) {
         func.blocks.get(block.taken).preds.delete(block.offset);
         delete block.taken;
         changes = true;
-        logging3 && (0, import_chunk_NHZRKHZO.log)(`${func.name}: deleting empty finally handler`);
+        logging3 && (0, import_chunk_X7QCZR3F.log)(`${func.name}: deleting empty finally handler`);
       } else if (isCondBranch(cur.op)) {
         const next = func.blocks.get(block.next);
         const taken = func.blocks.get(block.taken);
         if (next.preds.size > 1 && taken.preds.size === 1) {
           const newOp = cur.op === 40 ? 41 : 40;
           if (logging3) {
-            (0, import_chunk_NHZRKHZO.log)(
+            (0, import_chunk_X7QCZR3F.log)(
               `${func.name}: converting ${Opcodes[cur.op]} to ${Opcodes[newOp]}`
             );
           }
@@ -24114,7 +24314,7 @@ function simpleOpts(func, context) {
           const isBool = i >= 2 && isBoolOp(block.bytecodes[i - 2].op);
           if (next.next === block.taken && next.taken == null && taken.bytecodes.length === 1 && isCondBranch(taken.bytecodes[0].op) && next.bytecodes.length > 1 && next.bytecodes[next.bytecodes.length - 1].op === (cur.op === 41 ? 7 : 8) && (isBool || next.bytecodes.length > 2 && isBoolOp(next.bytecodes[next.bytecodes.length - 2].op)) && next.preds?.size === 1 && taken.preds?.size === 2) {
             if (logging3) {
-              (0, import_chunk_NHZRKHZO.log)(
+              (0, import_chunk_X7QCZR3F.log)(
                 `${func.name}: simplifying ${next.bytecodes[next.bytecodes.length - 1].op === 7 ? "'&&'" : "'||'"} at ${offsetToString(block.offset)}:${offsetToString(
                   next.offset
                 )}:${offsetToString(taken.offset)}:`
@@ -24131,7 +24331,7 @@ function simpleOpts(func, context) {
             changes = true;
           } else if (taken.next === block.next && taken.taken == null && next.bytecodes.length === 1 && isCondBranch(next.bytecodes[0].op) && taken.bytecodes.length > 1 && taken.bytecodes[taken.bytecodes.length - 1].op === (cur.op === 40 ? 7 : 8) && (isBool || taken.bytecodes.length > 2 && isBoolOp(taken.bytecodes[taken.bytecodes.length - 2].op)) && next.preds?.size === 2 && taken.preds?.size === 1) {
             if (logging3) {
-              (0, import_chunk_NHZRKHZO.log)(
+              (0, import_chunk_X7QCZR3F.log)(
                 `${func.name}: simplifying ${taken.bytecodes[taken.bytecodes.length - 1].op === 7 ? "'&&'" : "'||'"} at ${offsetToString(block.offset)}:${offsetToString(
                   taken.offset
                 )}:${offsetToString(next.offset)}:`
@@ -24179,7 +24379,7 @@ function equalSymbolToEq(block, equalsIndex) {
     op: 26,
     offset: invokem.offset
   });
-  (0, import_chunk_NHZRKHZO.logger)(
+  (0, import_chunk_X7QCZR3F.logger)(
     "optimize",
     1,
     `Replacing <thing>.equals(:symbol) with <thing> eq :symbol at ${offsetToString(
@@ -24239,7 +24439,7 @@ function removeUnreachableCatches(func, context) {
       const next = func.blocks.get(block.next);
       if (block.try === next.try) {
         if (next.preds.size === 1) {
-          (0, import_chunk_NHZRKHZO.logger)(
+          (0, import_chunk_X7QCZR3F.logger)(
             "cfg",
             1,
             () => `${func.name}: ${offsetToString(
@@ -24262,7 +24462,7 @@ function removeUnreachableCatches(func, context) {
           delete next.preds;
           removeBlock(func, next.offset);
         } else if (next.next == null && next.bytecodes.length < 3 && next.bytecodes.reduce((size, bc) => size + opcodeSize(bc.op), 0) < 3 && countFallthroughPreds(func, next) > 1) {
-          (0, import_chunk_NHZRKHZO.logger)(
+          (0, import_chunk_X7QCZR3F.logger)(
             "cfg",
             1,
             () => `${func.name}: ${offsetToString(
@@ -24287,7 +24487,7 @@ function removeUnreachableCatches(func, context) {
       switch (last.op) {
         case 41:
         case 40:
-          (0, import_chunk_NHZRKHZO.logger)(
+          (0, import_chunk_X7QCZR3F.logger)(
             "cfg",
             1,
             () => `${func.name}: killing no-op ${bytecodeToString(
@@ -24310,7 +24510,7 @@ function removeUnreachableCatches(func, context) {
       for (let i = block.try.length; i--; ) {
         const handler = block.try[i].handler;
         if (!func.blocks.get(handler)?.preds?.size) {
-          (0, import_chunk_NHZRKHZO.logger)(
+          (0, import_chunk_X7QCZR3F.logger)(
             "cfg",
             1,
             `${func.name}: killing unused try-catch at ${offsetToString(
@@ -24327,8 +24527,8 @@ function removeUnreachableCatches(func, context) {
   });
 }
 function cleanCfg2(func, context) {
-  if ((0, import_chunk_NHZRKHZO.wouldLog)("cfg", 10)) {
-    (0, import_chunk_NHZRKHZO.setBanner)(functionBanner(func, context, "sharing"));
+  if ((0, import_chunk_X7QCZR3F.wouldLog)("cfg", 10)) {
+    (0, import_chunk_X7QCZR3F.setBanner)(functionBanner(func, context, "sharing"));
   }
   removeNoOpBlocks(func);
   removeUnreachableCatches(func, context);
@@ -24343,12 +24543,12 @@ function cleanCfg2(func, context) {
     (0, import_node_assert12.default)(!block.preds?.size);
     func.blocks.delete(block.offset);
   });
-  (0, import_chunk_NHZRKHZO.setBanner)(null);
+  (0, import_chunk_X7QCZR3F.setBanner)(null);
 }
 var init_optimize2 = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/optimize.ts"() {
     "use strict";
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_array_init();
     init_bytecode();
     init_cflow();
@@ -24963,21 +25163,21 @@ function optimizeBytecode(context) {
       functions.forEach(callback);
       return;
     }
-    (0, import_chunk_NHZRKHZO.bumpLogging)(null, 10);
+    (0, import_chunk_X7QCZR3F.bumpLogging)(null, 10);
     functions.forEach((func) => {
       if (loggerFunc.test(func.name ?? "<null>")) {
-        (0, import_chunk_NHZRKHZO.bumpLogging)(null, -10);
+        (0, import_chunk_X7QCZR3F.bumpLogging)(null, -10);
         callback(func);
-        (0, import_chunk_NHZRKHZO.bumpLogging)(null, 10);
+        (0, import_chunk_X7QCZR3F.bumpLogging)(null, 10);
         return;
       }
       callback(func);
     });
-    (0, import_chunk_NHZRKHZO.bumpLogging)(null, -10);
+    (0, import_chunk_X7QCZR3F.bumpLogging)(null, -10);
   };
-  if ((0, import_chunk_NHZRKHZO.wouldLog)("list-input", 1)) {
+  if ((0, import_chunk_X7QCZR3F.wouldLog)("list-input", 1)) {
     forEachFunction(
-      (func) => (0, import_chunk_NHZRKHZO.wouldLog)("list-input", 1) && printFunction(func, context)
+      (func) => (0, import_chunk_X7QCZR3F.wouldLog)("list-input", 1) && printFunction(func, context)
     );
   }
   forEachFunction((func) => optimizeFunc(func, context));
@@ -24995,7 +25195,7 @@ function optimizeBytecode(context) {
   forEachFunction((func) => {
     if (!func.name)
       return;
-    (0, import_chunk_NHZRKHZO.logger)(
+    (0, import_chunk_X7QCZR3F.logger)(
       "bytecode",
       5,
       `${func.name}: ${offset.toString(16)} ${offset - func.offset}`
@@ -25004,7 +25204,7 @@ function optimizeBytecode(context) {
   });
   const { offsetMap } = updateInfo;
   offsetMap.set(code.byteLength, offset);
-  (0, import_chunk_NHZRKHZO.logger)(
+  (0, import_chunk_X7QCZR3F.logger)(
     "bytecode",
     1,
     `${context.filepath}: code size: ${context.sections[
@@ -25016,9 +25216,9 @@ function optimizeBytecode(context) {
     ].length - offset}`
   );
   fixSectionSize(-1059145026, context.sections, offset);
-  if ((0, import_chunk_NHZRKHZO.wouldLog)("list-output", 1)) {
+  if ((0, import_chunk_X7QCZR3F.wouldLog)("list-output", 1)) {
     forEachFunction(
-      (func) => (0, import_chunk_NHZRKHZO.wouldLog)("list-output", 1) && printFunction(func, context)
+      (func) => (0, import_chunk_X7QCZR3F.wouldLog)("list-output", 1) && printFunction(func, context)
     );
   }
   fixupHeader(context, updateInfo);
@@ -25108,7 +25308,7 @@ ${functionToString(
 ---------------- ${func.name} ----------------`;
 }
 function printFunction(func, context) {
-  (0, import_chunk_NHZRKHZO.log)(functionToString(func, context));
+  (0, import_chunk_X7QCZR3F.log)(functionToString(func, context));
 }
 function functionToString(func, context, extra) {
   const parts = [];
@@ -25539,7 +25739,7 @@ var init_bytecode = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     (0, import_chunk_JDC43A3I.init_ast)();
     init_sdk_util();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_data();
     init_emit();
     init_exceptions();
@@ -25825,10 +26025,10 @@ async function build_project(product, options, lineCallback) {
   ].flat();
   if (!returnCommand) {
     const handlers = [
-      lineCallback || ((line) => (0, import_chunk_NHZRKHZO.log)(line)),
+      lineCallback || ((line) => (0, import_chunk_X7QCZR3F.log)(line)),
       (line) => console.error(line)
     ];
-    await (0, import_chunk_NHZRKHZO.spawnByLine)(exe, args, handlers, {
+    await (0, import_chunk_X7QCZR3F.spawnByLine)(exe, args, handlers, {
       cwd: workspace
     });
   }
@@ -25838,7 +26038,7 @@ var init_build = (0, import_chunk_ABYVSU2C.__esm)({
   "src/build.ts"() {
     "use strict";
     init_sdk_util();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
   }
 });
 var require_ms = (0, import_chunk_ABYVSU2C.__commonJS)({
@@ -27103,7 +27303,7 @@ function peg$parse2(input, options) {
   var peg$r1 = /^[A-Z_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376-\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u05D0-\u05EA\u05EF-\u05F2\u0620-\u064A\u066E-\u066F\u0671-\u06D3\u06D5\u06E5-\u06E6\u06EE-\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4-\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F-\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC-\u09DD\u09DF-\u09E1\u09F0-\u09F1\u09FC\u0A05-\u0A0A\u0A0F-\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32-\u0A33\u0A35-\u0A36\u0A38-\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2-\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0-\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F-\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32-\u0B33\u0B35-\u0B39\u0B3D\u0B5C-\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99-\u0B9A\u0B9C\u0B9E-\u0B9F\u0BA3-\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60-\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0-\u0CE1\u0CF1-\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32-\u0E33\u0E40-\u0E46\u0E81-\u0E82\u0E84\u0E87-\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA-\u0EAB\u0EAD-\u0EB0\u0EB2-\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065-\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1878\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE-\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5-\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEF\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A-\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7B9\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD-\uA8FE\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5-\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40-\uFB41\uFB43-\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/;
   var peg$r2 = /^[0-9A-Z_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376-\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\u05D0-\u05EA\u05EF-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u07FD\u0800-\u082D\u0840-\u085B\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u08D3-\u08E1\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F-\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7-\u09C8\u09CB-\u09CE\u09D7\u09DC-\u09DD\u09DF-\u09E3\u09E6-\u09F1\u09FC\u09FE\u0A01-\u0A03\u0A05-\u0A0A\u0A0F-\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32-\u0A33\u0A35-\u0A36\u0A38-\u0A39\u0A3C\u0A3E-\u0A42\u0A47-\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2-\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9-\u0AFF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F-\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32-\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47-\u0B48\u0B4B-\u0B4D\u0B56-\u0B57\u0B5C-\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82-\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99-\u0B9A\u0B9C\u0B9E-\u0B9F\u0BA3-\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55-\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C80-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5-\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1-\u0CF2\u0D00-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D54-\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82-\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2-\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81-\u0E82\u0E84\u0E87-\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA-\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18-\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772-\u1773\u1780-\u17D3\u17D7\u17DC-\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1878\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CD0-\u1CD2\u1CD4-\u1CF9\u1D00-\u1DF9\u1DFB-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u203F-\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEF\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7B9\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C5\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC-\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40-\uFB41\uFB43-\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33-\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/;
   var peg$r3 = /^[\-\u200C-\u200D]/;
-  var peg$r4 = /^[*.-\/]/;
+  var peg$r4 = /^[*.-\/:]/;
   var peg$r5 = /^[A-Za-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376-\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u05D0-\u05EA\u05EF-\u05F2\u0620-\u064A\u066E-\u066F\u0671-\u06D3\u06D5\u06E5-\u06E6\u06EE-\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4-\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F-\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC-\u09DD\u09DF-\u09E1\u09F0-\u09F1\u09FC\u0A05-\u0A0A\u0A0F-\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32-\u0A33\u0A35-\u0A36\u0A38-\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2-\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0-\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F-\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32-\u0B33\u0B35-\u0B39\u0B3D\u0B5C-\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99-\u0B9A\u0B9C\u0B9E-\u0B9F\u0BA3-\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60-\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0-\u0CE1\u0CF1-\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32-\u0E33\u0E40-\u0E46\u0E81-\u0E82\u0E84\u0E87-\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA-\u0EAB\u0EAD-\u0EB0\u0EB2-\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065-\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1878\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE-\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5-\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEF\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A-\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7B9\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD-\uA8FE\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5-\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40-\uFB41\uFB43-\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/;
   var peg$r6 = /^[\u0300-\u036F\u0483-\u0487\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7-\u06E8\u06EA-\u06ED\u0711\u0730-\u074A\u07A6-\u07B0\u07EB-\u07F3\u07FD\u0816-\u0819\u081B-\u0823\u0825-\u0827\u0829-\u082D\u0859-\u085B\u08D3-\u08E1\u08E3-\u0903\u093A-\u093C\u093E-\u094F\u0951-\u0957\u0962-\u0963\u0981-\u0983\u09BC\u09BE-\u09C4\u09C7-\u09C8\u09CB-\u09CD\u09D7\u09E2-\u09E3\u09FE\u0A01-\u0A03\u0A3C\u0A3E-\u0A42\u0A47-\u0A48\u0A4B-\u0A4D\u0A51\u0A70-\u0A71\u0A75\u0A81-\u0A83\u0ABC\u0ABE-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AE2-\u0AE3\u0AFA-\u0AFF\u0B01-\u0B03\u0B3C\u0B3E-\u0B44\u0B47-\u0B48\u0B4B-\u0B4D\u0B56-\u0B57\u0B62-\u0B63\u0B82\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD7\u0C00-\u0C04\u0C3E-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55-\u0C56\u0C62-\u0C63\u0C81-\u0C83\u0CBC\u0CBE-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5-\u0CD6\u0CE2-\u0CE3\u0D00-\u0D03\u0D3B-\u0D3C\u0D3E-\u0D44\u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0D62-\u0D63\u0D82-\u0D83\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DF2-\u0DF3\u0E31\u0E34-\u0E3A\u0E47-\u0E4E\u0EB1\u0EB4-\u0EB9\u0EBB-\u0EBC\u0EC8-\u0ECD\u0F18-\u0F19\u0F35\u0F37\u0F39\u0F3E-\u0F3F\u0F71-\u0F84\u0F86-\u0F87\u0F8D-\u0F97\u0F99-\u0FBC\u0FC6\u102B-\u103E\u1056-\u1059\u105E-\u1060\u1062-\u1064\u1067-\u106D\u1071-\u1074\u1082-\u108D\u108F\u109A-\u109D\u135D-\u135F\u1712-\u1714\u1732-\u1734\u1752-\u1753\u1772-\u1773\u17B4-\u17D3\u17DD\u180B-\u180D\u1885-\u1886\u18A9\u1920-\u192B\u1930-\u193B\u1A17-\u1A1B\u1A55-\u1A5E\u1A60-\u1A7C\u1A7F\u1AB0-\u1ABD\u1B00-\u1B04\u1B34-\u1B44\u1B6B-\u1B73\u1B80-\u1B82\u1BA1-\u1BAD\u1BE6-\u1BF3\u1C24-\u1C37\u1CD0-\u1CD2\u1CD4-\u1CE8\u1CED\u1CF2-\u1CF4\u1CF7-\u1CF9\u1DC0-\u1DF9\u1DFB-\u1DFF\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2CEF-\u2CF1\u2D7F\u2DE0-\u2DFF\u302A-\u302F\u3099-\u309A\uA66F\uA674-\uA67D\uA69E-\uA69F\uA6F0-\uA6F1\uA802\uA806\uA80B\uA823-\uA827\uA880-\uA881\uA8B4-\uA8C5\uA8E0-\uA8F1\uA8FF\uA926-\uA92D\uA947-\uA953\uA980-\uA983\uA9B3-\uA9C0\uA9E5\uAA29-\uAA36\uAA43\uAA4C-\uAA4D\uAA7B-\uAA7D\uAAB0\uAAB2-\uAAB4\uAAB7-\uAAB8\uAABE-\uAABF\uAAC1\uAAEB-\uAAEF\uAAF5-\uAAF6\uABE3-\uABEA\uABEC-\uABED\uFB1E\uFE00-\uFE0F\uFE20-\uFE2F]/;
   var peg$r7 = /^[\t\v-\f \xA0\u1680\u2000-\u200A\u202F\u205F\u3000\uFEFF]/;
@@ -27139,7 +27339,7 @@ function peg$parse2(input, options) {
   var peg$e16 = peg$literalExpectation("$", false);
   var peg$e17 = peg$literalExpectation("(", false);
   var peg$e18 = peg$classExpectation(["-", ["\u200C", "\u200D"]], false, false);
-  var peg$e19 = peg$classExpectation(["*", [".", "/"]], false, false);
+  var peg$e19 = peg$classExpectation(["*", [".", "/"], ":"], false, false);
   var peg$e20 = peg$classExpectation([["A", "Z"], ["a", "z"], "\xAA", "\xB5", "\xBA", ["\xC0", "\xD6"], ["\xD8", "\xF6"], ["\xF8", "\u02C1"], ["\u02C6", "\u02D1"], ["\u02E0", "\u02E4"], "\u02EC", "\u02EE", ["\u0370", "\u0374"], ["\u0376", "\u0377"], ["\u037A", "\u037D"], "\u037F", "\u0386", ["\u0388", "\u038A"], "\u038C", ["\u038E", "\u03A1"], ["\u03A3", "\u03F5"], ["\u03F7", "\u0481"], ["\u048A", "\u052F"], ["\u0531", "\u0556"], "\u0559", ["\u0560", "\u0588"], ["\u05D0", "\u05EA"], ["\u05EF", "\u05F2"], ["\u0620", "\u064A"], ["\u066E", "\u066F"], ["\u0671", "\u06D3"], "\u06D5", ["\u06E5", "\u06E6"], ["\u06EE", "\u06EF"], ["\u06FA", "\u06FC"], "\u06FF", "\u0710", ["\u0712", "\u072F"], ["\u074D", "\u07A5"], "\u07B1", ["\u07CA", "\u07EA"], ["\u07F4", "\u07F5"], "\u07FA", ["\u0800", "\u0815"], "\u081A", "\u0824", "\u0828", ["\u0840", "\u0858"], ["\u0860", "\u086A"], ["\u08A0", "\u08B4"], ["\u08B6", "\u08BD"], ["\u0904", "\u0939"], "\u093D", "\u0950", ["\u0958", "\u0961"], ["\u0971", "\u0980"], ["\u0985", "\u098C"], ["\u098F", "\u0990"], ["\u0993", "\u09A8"], ["\u09AA", "\u09B0"], "\u09B2", ["\u09B6", "\u09B9"], "\u09BD", "\u09CE", ["\u09DC", "\u09DD"], ["\u09DF", "\u09E1"], ["\u09F0", "\u09F1"], "\u09FC", ["\u0A05", "\u0A0A"], ["\u0A0F", "\u0A10"], ["\u0A13", "\u0A28"], ["\u0A2A", "\u0A30"], ["\u0A32", "\u0A33"], ["\u0A35", "\u0A36"], ["\u0A38", "\u0A39"], ["\u0A59", "\u0A5C"], "\u0A5E", ["\u0A72", "\u0A74"], ["\u0A85", "\u0A8D"], ["\u0A8F", "\u0A91"], ["\u0A93", "\u0AA8"], ["\u0AAA", "\u0AB0"], ["\u0AB2", "\u0AB3"], ["\u0AB5", "\u0AB9"], "\u0ABD", "\u0AD0", ["\u0AE0", "\u0AE1"], "\u0AF9", ["\u0B05", "\u0B0C"], ["\u0B0F", "\u0B10"], ["\u0B13", "\u0B28"], ["\u0B2A", "\u0B30"], ["\u0B32", "\u0B33"], ["\u0B35", "\u0B39"], "\u0B3D", ["\u0B5C", "\u0B5D"], ["\u0B5F", "\u0B61"], "\u0B71", "\u0B83", ["\u0B85", "\u0B8A"], ["\u0B8E", "\u0B90"], ["\u0B92", "\u0B95"], ["\u0B99", "\u0B9A"], "\u0B9C", ["\u0B9E", "\u0B9F"], ["\u0BA3", "\u0BA4"], ["\u0BA8", "\u0BAA"], ["\u0BAE", "\u0BB9"], "\u0BD0", ["\u0C05", "\u0C0C"], ["\u0C0E", "\u0C10"], ["\u0C12", "\u0C28"], ["\u0C2A", "\u0C39"], "\u0C3D", ["\u0C58", "\u0C5A"], ["\u0C60", "\u0C61"], "\u0C80", ["\u0C85", "\u0C8C"], ["\u0C8E", "\u0C90"], ["\u0C92", "\u0CA8"], ["\u0CAA", "\u0CB3"], ["\u0CB5", "\u0CB9"], "\u0CBD", "\u0CDE", ["\u0CE0", "\u0CE1"], ["\u0CF1", "\u0CF2"], ["\u0D05", "\u0D0C"], ["\u0D0E", "\u0D10"], ["\u0D12", "\u0D3A"], "\u0D3D", "\u0D4E", ["\u0D54", "\u0D56"], ["\u0D5F", "\u0D61"], ["\u0D7A", "\u0D7F"], ["\u0D85", "\u0D96"], ["\u0D9A", "\u0DB1"], ["\u0DB3", "\u0DBB"], "\u0DBD", ["\u0DC0", "\u0DC6"], ["\u0E01", "\u0E30"], ["\u0E32", "\u0E33"], ["\u0E40", "\u0E46"], ["\u0E81", "\u0E82"], "\u0E84", ["\u0E87", "\u0E88"], "\u0E8A", "\u0E8D", ["\u0E94", "\u0E97"], ["\u0E99", "\u0E9F"], ["\u0EA1", "\u0EA3"], "\u0EA5", "\u0EA7", ["\u0EAA", "\u0EAB"], ["\u0EAD", "\u0EB0"], ["\u0EB2", "\u0EB3"], "\u0EBD", ["\u0EC0", "\u0EC4"], "\u0EC6", ["\u0EDC", "\u0EDF"], "\u0F00", ["\u0F40", "\u0F47"], ["\u0F49", "\u0F6C"], ["\u0F88", "\u0F8C"], ["\u1000", "\u102A"], "\u103F", ["\u1050", "\u1055"], ["\u105A", "\u105D"], "\u1061", ["\u1065", "\u1066"], ["\u106E", "\u1070"], ["\u1075", "\u1081"], "\u108E", ["\u10A0", "\u10C5"], "\u10C7", "\u10CD", ["\u10D0", "\u10FA"], ["\u10FC", "\u1248"], ["\u124A", "\u124D"], ["\u1250", "\u1256"], "\u1258", ["\u125A", "\u125D"], ["\u1260", "\u1288"], ["\u128A", "\u128D"], ["\u1290", "\u12B0"], ["\u12B2", "\u12B5"], ["\u12B8", "\u12BE"], "\u12C0", ["\u12C2", "\u12C5"], ["\u12C8", "\u12D6"], ["\u12D8", "\u1310"], ["\u1312", "\u1315"], ["\u1318", "\u135A"], ["\u1380", "\u138F"], ["\u13A0", "\u13F5"], ["\u13F8", "\u13FD"], ["\u1401", "\u166C"], ["\u166F", "\u167F"], ["\u1681", "\u169A"], ["\u16A0", "\u16EA"], ["\u16EE", "\u16F8"], ["\u1700", "\u170C"], ["\u170E", "\u1711"], ["\u1720", "\u1731"], ["\u1740", "\u1751"], ["\u1760", "\u176C"], ["\u176E", "\u1770"], ["\u1780", "\u17B3"], "\u17D7", "\u17DC", ["\u1820", "\u1878"], ["\u1880", "\u1884"], ["\u1887", "\u18A8"], "\u18AA", ["\u18B0", "\u18F5"], ["\u1900", "\u191E"], ["\u1950", "\u196D"], ["\u1970", "\u1974"], ["\u1980", "\u19AB"], ["\u19B0", "\u19C9"], ["\u1A00", "\u1A16"], ["\u1A20", "\u1A54"], "\u1AA7", ["\u1B05", "\u1B33"], ["\u1B45", "\u1B4B"], ["\u1B83", "\u1BA0"], ["\u1BAE", "\u1BAF"], ["\u1BBA", "\u1BE5"], ["\u1C00", "\u1C23"], ["\u1C4D", "\u1C4F"], ["\u1C5A", "\u1C7D"], ["\u1C80", "\u1C88"], ["\u1C90", "\u1CBA"], ["\u1CBD", "\u1CBF"], ["\u1CE9", "\u1CEC"], ["\u1CEE", "\u1CF1"], ["\u1CF5", "\u1CF6"], ["\u1D00", "\u1DBF"], ["\u1E00", "\u1F15"], ["\u1F18", "\u1F1D"], ["\u1F20", "\u1F45"], ["\u1F48", "\u1F4D"], ["\u1F50", "\u1F57"], "\u1F59", "\u1F5B", "\u1F5D", ["\u1F5F", "\u1F7D"], ["\u1F80", "\u1FB4"], ["\u1FB6", "\u1FBC"], "\u1FBE", ["\u1FC2", "\u1FC4"], ["\u1FC6", "\u1FCC"], ["\u1FD0", "\u1FD3"], ["\u1FD6", "\u1FDB"], ["\u1FE0", "\u1FEC"], ["\u1FF2", "\u1FF4"], ["\u1FF6", "\u1FFC"], "\u2071", "\u207F", ["\u2090", "\u209C"], "\u2102", "\u2107", ["\u210A", "\u2113"], "\u2115", ["\u2119", "\u211D"], "\u2124", "\u2126", "\u2128", ["\u212A", "\u212D"], ["\u212F", "\u2139"], ["\u213C", "\u213F"], ["\u2145", "\u2149"], "\u214E", ["\u2160", "\u2188"], ["\u2C00", "\u2C2E"], ["\u2C30", "\u2C5E"], ["\u2C60", "\u2CE4"], ["\u2CEB", "\u2CEE"], ["\u2CF2", "\u2CF3"], ["\u2D00", "\u2D25"], "\u2D27", "\u2D2D", ["\u2D30", "\u2D67"], "\u2D6F", ["\u2D80", "\u2D96"], ["\u2DA0", "\u2DA6"], ["\u2DA8", "\u2DAE"], ["\u2DB0", "\u2DB6"], ["\u2DB8", "\u2DBE"], ["\u2DC0", "\u2DC6"], ["\u2DC8", "\u2DCE"], ["\u2DD0", "\u2DD6"], ["\u2DD8", "\u2DDE"], "\u2E2F", ["\u3005", "\u3007"], ["\u3021", "\u3029"], ["\u3031", "\u3035"], ["\u3038", "\u303C"], ["\u3041", "\u3096"], ["\u309D", "\u309F"], ["\u30A1", "\u30FA"], ["\u30FC", "\u30FF"], ["\u3105", "\u312F"], ["\u3131", "\u318E"], ["\u31A0", "\u31BA"], ["\u31F0", "\u31FF"], ["\u3400", "\u4DB5"], ["\u4E00", "\u9FEF"], ["\uA000", "\uA48C"], ["\uA4D0", "\uA4FD"], ["\uA500", "\uA60C"], ["\uA610", "\uA61F"], ["\uA62A", "\uA62B"], ["\uA640", "\uA66E"], ["\uA67F", "\uA69D"], ["\uA6A0", "\uA6EF"], ["\uA717", "\uA71F"], ["\uA722", "\uA788"], ["\uA78B", "\uA7B9"], ["\uA7F7", "\uA801"], ["\uA803", "\uA805"], ["\uA807", "\uA80A"], ["\uA80C", "\uA822"], ["\uA840", "\uA873"], ["\uA882", "\uA8B3"], ["\uA8F2", "\uA8F7"], "\uA8FB", ["\uA8FD", "\uA8FE"], ["\uA90A", "\uA925"], ["\uA930", "\uA946"], ["\uA960", "\uA97C"], ["\uA984", "\uA9B2"], "\uA9CF", ["\uA9E0", "\uA9E4"], ["\uA9E6", "\uA9EF"], ["\uA9FA", "\uA9FE"], ["\uAA00", "\uAA28"], ["\uAA40", "\uAA42"], ["\uAA44", "\uAA4B"], ["\uAA60", "\uAA76"], "\uAA7A", ["\uAA7E", "\uAAAF"], "\uAAB1", ["\uAAB5", "\uAAB6"], ["\uAAB9", "\uAABD"], "\uAAC0", "\uAAC2", ["\uAADB", "\uAADD"], ["\uAAE0", "\uAAEA"], ["\uAAF2", "\uAAF4"], ["\uAB01", "\uAB06"], ["\uAB09", "\uAB0E"], ["\uAB11", "\uAB16"], ["\uAB20", "\uAB26"], ["\uAB28", "\uAB2E"], ["\uAB30", "\uAB5A"], ["\uAB5C", "\uAB65"], ["\uAB70", "\uABE2"], ["\uAC00", "\uD7A3"], ["\uD7B0", "\uD7C6"], ["\uD7CB", "\uD7FB"], ["\uF900", "\uFA6D"], ["\uFA70", "\uFAD9"], ["\uFB00", "\uFB06"], ["\uFB13", "\uFB17"], "\uFB1D", ["\uFB1F", "\uFB28"], ["\uFB2A", "\uFB36"], ["\uFB38", "\uFB3C"], "\uFB3E", ["\uFB40", "\uFB41"], ["\uFB43", "\uFB44"], ["\uFB46", "\uFBB1"], ["\uFBD3", "\uFD3D"], ["\uFD50", "\uFD8F"], ["\uFD92", "\uFDC7"], ["\uFDF0", "\uFDFB"], ["\uFE70", "\uFE74"], ["\uFE76", "\uFEFC"], ["\uFF21", "\uFF3A"], ["\uFF41", "\uFF5A"], ["\uFF66", "\uFFBE"], ["\uFFC2", "\uFFC7"], ["\uFFCA", "\uFFCF"], ["\uFFD2", "\uFFD7"], ["\uFFDA", "\uFFDC"]], false, false);
   var peg$e21 = peg$classExpectation([["\u0300", "\u036F"], ["\u0483", "\u0487"], ["\u0591", "\u05BD"], "\u05BF", ["\u05C1", "\u05C2"], ["\u05C4", "\u05C5"], "\u05C7", ["\u0610", "\u061A"], ["\u064B", "\u065F"], "\u0670", ["\u06D6", "\u06DC"], ["\u06DF", "\u06E4"], ["\u06E7", "\u06E8"], ["\u06EA", "\u06ED"], "\u0711", ["\u0730", "\u074A"], ["\u07A6", "\u07B0"], ["\u07EB", "\u07F3"], "\u07FD", ["\u0816", "\u0819"], ["\u081B", "\u0823"], ["\u0825", "\u0827"], ["\u0829", "\u082D"], ["\u0859", "\u085B"], ["\u08D3", "\u08E1"], ["\u08E3", "\u0903"], ["\u093A", "\u093C"], ["\u093E", "\u094F"], ["\u0951", "\u0957"], ["\u0962", "\u0963"], ["\u0981", "\u0983"], "\u09BC", ["\u09BE", "\u09C4"], ["\u09C7", "\u09C8"], ["\u09CB", "\u09CD"], "\u09D7", ["\u09E2", "\u09E3"], "\u09FE", ["\u0A01", "\u0A03"], "\u0A3C", ["\u0A3E", "\u0A42"], ["\u0A47", "\u0A48"], ["\u0A4B", "\u0A4D"], "\u0A51", ["\u0A70", "\u0A71"], "\u0A75", ["\u0A81", "\u0A83"], "\u0ABC", ["\u0ABE", "\u0AC5"], ["\u0AC7", "\u0AC9"], ["\u0ACB", "\u0ACD"], ["\u0AE2", "\u0AE3"], ["\u0AFA", "\u0AFF"], ["\u0B01", "\u0B03"], "\u0B3C", ["\u0B3E", "\u0B44"], ["\u0B47", "\u0B48"], ["\u0B4B", "\u0B4D"], ["\u0B56", "\u0B57"], ["\u0B62", "\u0B63"], "\u0B82", ["\u0BBE", "\u0BC2"], ["\u0BC6", "\u0BC8"], ["\u0BCA", "\u0BCD"], "\u0BD7", ["\u0C00", "\u0C04"], ["\u0C3E", "\u0C44"], ["\u0C46", "\u0C48"], ["\u0C4A", "\u0C4D"], ["\u0C55", "\u0C56"], ["\u0C62", "\u0C63"], ["\u0C81", "\u0C83"], "\u0CBC", ["\u0CBE", "\u0CC4"], ["\u0CC6", "\u0CC8"], ["\u0CCA", "\u0CCD"], ["\u0CD5", "\u0CD6"], ["\u0CE2", "\u0CE3"], ["\u0D00", "\u0D03"], ["\u0D3B", "\u0D3C"], ["\u0D3E", "\u0D44"], ["\u0D46", "\u0D48"], ["\u0D4A", "\u0D4D"], "\u0D57", ["\u0D62", "\u0D63"], ["\u0D82", "\u0D83"], "\u0DCA", ["\u0DCF", "\u0DD4"], "\u0DD6", ["\u0DD8", "\u0DDF"], ["\u0DF2", "\u0DF3"], "\u0E31", ["\u0E34", "\u0E3A"], ["\u0E47", "\u0E4E"], "\u0EB1", ["\u0EB4", "\u0EB9"], ["\u0EBB", "\u0EBC"], ["\u0EC8", "\u0ECD"], ["\u0F18", "\u0F19"], "\u0F35", "\u0F37", "\u0F39", ["\u0F3E", "\u0F3F"], ["\u0F71", "\u0F84"], ["\u0F86", "\u0F87"], ["\u0F8D", "\u0F97"], ["\u0F99", "\u0FBC"], "\u0FC6", ["\u102B", "\u103E"], ["\u1056", "\u1059"], ["\u105E", "\u1060"], ["\u1062", "\u1064"], ["\u1067", "\u106D"], ["\u1071", "\u1074"], ["\u1082", "\u108D"], "\u108F", ["\u109A", "\u109D"], ["\u135D", "\u135F"], ["\u1712", "\u1714"], ["\u1732", "\u1734"], ["\u1752", "\u1753"], ["\u1772", "\u1773"], ["\u17B4", "\u17D3"], "\u17DD", ["\u180B", "\u180D"], ["\u1885", "\u1886"], "\u18A9", ["\u1920", "\u192B"], ["\u1930", "\u193B"], ["\u1A17", "\u1A1B"], ["\u1A55", "\u1A5E"], ["\u1A60", "\u1A7C"], "\u1A7F", ["\u1AB0", "\u1ABD"], ["\u1B00", "\u1B04"], ["\u1B34", "\u1B44"], ["\u1B6B", "\u1B73"], ["\u1B80", "\u1B82"], ["\u1BA1", "\u1BAD"], ["\u1BE6", "\u1BF3"], ["\u1C24", "\u1C37"], ["\u1CD0", "\u1CD2"], ["\u1CD4", "\u1CE8"], "\u1CED", ["\u1CF2", "\u1CF4"], ["\u1CF7", "\u1CF9"], ["\u1DC0", "\u1DF9"], ["\u1DFB", "\u1DFF"], ["\u20D0", "\u20DC"], "\u20E1", ["\u20E5", "\u20F0"], ["\u2CEF", "\u2CF1"], "\u2D7F", ["\u2DE0", "\u2DFF"], ["\u302A", "\u302F"], ["\u3099", "\u309A"], "\uA66F", ["\uA674", "\uA67D"], ["\uA69E", "\uA69F"], ["\uA6F0", "\uA6F1"], "\uA802", "\uA806", "\uA80B", ["\uA823", "\uA827"], ["\uA880", "\uA881"], ["\uA8B4", "\uA8C5"], ["\uA8E0", "\uA8F1"], "\uA8FF", ["\uA926", "\uA92D"], ["\uA947", "\uA953"], ["\uA980", "\uA983"], ["\uA9B3", "\uA9C0"], "\uA9E5", ["\uAA29", "\uAA36"], "\uAA43", ["\uAA4C", "\uAA4D"], ["\uAA7B", "\uAA7D"], "\uAAB0", ["\uAAB2", "\uAAB4"], ["\uAAB7", "\uAAB8"], ["\uAABE", "\uAABF"], "\uAAC1", ["\uAAEB", "\uAAEF"], ["\uAAF5", "\uAAF6"], ["\uABE3", "\uABEA"], ["\uABEC", "\uABED"], "\uFB1E", ["\uFE00", "\uFE0F"], ["\uFE20", "\uFE2F"]], false, false);
   var peg$e22 = peg$otherExpectation("whitespace");
@@ -28811,7 +29011,7 @@ async function resolve_literals(qualifier, default_source, deviceInfo, cache) {
       );
       if (!(0, import_chunk_JDC43A3I.hasProperty)(cache.resolvedPaths, resolved)) {
         if (/[*?[\]{}]/.test(resolved)) {
-          cache.resolvedPaths[resolved] = (0, import_chunk_NHZRKHZO.globSome)(resolved, () => true);
+          cache.resolvedPaths[resolved] = (0, import_chunk_X7QCZR3F.globSome)(resolved, () => true);
         } else {
           cache.resolvedPaths[resolved] = fs5.stat(resolved).then(
             () => true,
@@ -28890,12 +29090,12 @@ async function read_resource_files(targets, cache) {
       if (!(0, import_chunk_JDC43A3I.hasProperty)(resourceGroupPromises, key)) {
         resourceGroupPromises[key] = Promise.all(
           p.qualifier.resourcePath.map(
-            (pattern) => (0, import_chunk_NHZRKHZO.globa)(pattern, { mark: true })
+            (pattern) => (0, import_chunk_X7QCZR3F.globa)(pattern, { mark: true })
           )
         ).then(
           (patterns) => Promise.all(
             patterns.flat().map(
-              (path7) => path7.endsWith("/") ? (0, import_chunk_NHZRKHZO.globa)(`${path7}**/*.xml`, { mark: true }) : path7
+              (path7) => path7.endsWith("/") ? (0, import_chunk_X7QCZR3F.globa)(`${path7}**/*.xml`, { mark: true }) : path7
             )
           )
         ).then(
@@ -28955,7 +29155,7 @@ async function find_build_instructions_in_resource(file, rez, buildDependencies)
   const sourceExcludes = excludes.map((e) => e.file?.value.value).filter((f) => f != null).map((f) => path2.resolve(dir, f).replace(/\\/g, "/"));
   const filePatterns = excludes.map((e) => e.dir?.value.value).filter((f) => f != null).map((f) => path2.join(dir, f, "**", "*.mc").replace(/\\/g, "/"));
   if (filePatterns.length) {
-    const files = (await Promise.all(filePatterns.map((p) => (0, import_chunk_NHZRKHZO.globa)(p)))).flat();
+    const files = (await Promise.all(filePatterns.map((p) => (0, import_chunk_X7QCZR3F.globa)(p)))).flat();
     sourceExcludes.push(...files);
   }
   const excludeAnnotations = excludes.map((e) => e.annotation?.value.value).filter((f) => f != null);
@@ -29132,15 +29332,15 @@ function identify_optimizer_groups(targets, options) {
 function find_barrels(barrelPath, buildDependencies) {
   return (Array.isArray(barrelPath) ? (
     // This is a sublist. The barrel has more than one jungle file.
-    Promise.all(barrelPath.map((path7) => (0, import_chunk_NHZRKHZO.globa)(path7, { mark: true }))).then(
+    Promise.all(barrelPath.map((path7) => (0, import_chunk_X7QCZR3F.globa)(path7, { mark: true }))).then(
       (paths) => [
         paths.flat().filter((path7) => path7.endsWith(".jungle")).join(";")
       ]
     )
-  ) : (0, import_chunk_NHZRKHZO.globa)(barrelPath, { mark: true }).then(
+  ) : (0, import_chunk_X7QCZR3F.globa)(barrelPath, { mark: true }).then(
     (paths) => Promise.all(
       paths.map(
-        (path7) => path7.endsWith("/") ? (0, import_chunk_NHZRKHZO.globa)(`${path7}**/*.barrel`) : path7
+        (path7) => path7.endsWith("/") ? (0, import_chunk_X7QCZR3F.globa)(`${path7}**/*.barrel`) : path7
       )
     )
   ).then(
@@ -29148,7 +29348,7 @@ function find_barrels(barrelPath, buildDependencies) {
       (path7) => path7.endsWith(".jungle") || path7.endsWith(".barrel")
     )
   )).then((paths) => {
-    (0, import_chunk_NHZRKHZO.forEach)(
+    (0, import_chunk_X7QCZR3F.forEach)(
       barrelPath,
       (path7) => /[*?[\]{}]/.test(path7) || (buildDependencies[path7] = true)
     );
@@ -29425,7 +29625,7 @@ var init_jungles = (0, import_chunk_ABYVSU2C.__esm)({
     init_api();
     init_manifest();
     init_sdk_util();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     depth = 0;
   }
 });
@@ -29453,7 +29653,7 @@ async function launchSimulator(force = true) {
       await new Promise((r) => setTimeout(r, 200));
     }
   } catch (e) {
-    (0, import_chunk_NHZRKHZO.log)(e);
+    (0, import_chunk_X7QCZR3F.log)(e);
   }
 }
 function checkIfSimulatorRunning() {
@@ -29484,10 +29684,10 @@ function simulateProgram(prg, device, test = false, logger2) {
     }
   }
   return getSdkPath().then(
-    (sdk) => (0, import_chunk_NHZRKHZO.spawnByLine)(
+    (sdk) => (0, import_chunk_X7QCZR3F.spawnByLine)(
       path3.resolve(sdk, "bin", isWin ? "monkeydo.bat" : "monkeydo"),
       args,
-      logger2 || ((line) => (0, import_chunk_NHZRKHZO.log)(line))
+      logger2 || ((line) => (0, import_chunk_X7QCZR3F.log)(line))
     ).then(() => {
       return;
     })
@@ -29497,7 +29697,7 @@ var init_launch = (0, import_chunk_ABYVSU2C.__esm)({
   "src/launch.ts"() {
     "use strict";
     init_sdk_util();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
   }
 });
 async function analyze_module_types(state) {
@@ -29518,7 +29718,7 @@ async function analyze_module_types(state) {
   for (const module2 of modulesSet) {
     modulesSet.delete(module2);
     const istate = buildTypeInfo(state, module2, false);
-    await (0, import_chunk_NHZRKHZO.log)();
+    await (0, import_chunk_X7QCZR3F.log)();
     if (istate?.typeMap) {
       moduleMap.set(module2, istate);
       istate.dependencies?.forEach((flags, other) => {
@@ -29597,7 +29797,7 @@ var init_module_types = (0, import_chunk_ABYVSU2C.__esm)({
     init_interp();
     init_sub_type();
     init_types();
-    (0, import_chunk_NHZRKHZO.init_logger)();
+    (0, import_chunk_X7QCZR3F.init_logger)();
   }
 });
 function relative_path_no_dotdot(relative2) {
@@ -29618,7 +29818,7 @@ async function getCodeWorkspaceSettings(folder) {
   let curDir = folder;
   try {
     while (curDir) {
-      const code_workspaces = await (0, import_chunk_NHZRKHZO.globa)(
+      const code_workspaces = await (0, import_chunk_X7QCZR3F.globa)(
         path4.resolve(curDir, "*.code-workspace"),
         { onlyFiles: true }
       );
@@ -29746,7 +29946,7 @@ async function createLocalBarrels(targets, options) {
             optBarrelDir
           };
           return promise2.then(
-            () => (0, import_chunk_NHZRKHZO.copyRecursiveAsNeeded)(
+            () => (0, import_chunk_X7QCZR3F.copyRecursiveAsNeeded)(
               rawBarrelDir,
               optBarrelDir,
               (src) => !src.endsWith(".mc")
@@ -30047,7 +30247,7 @@ async function filesFromPaths(workspace, buildDir, inPaths, extension) {
   const filter = buildDir.startsWith(workspace);
   const paths = (await Promise.all(
     inPaths?.map(
-      (pattern) => (0, import_chunk_NHZRKHZO.globa)(pattern, { cwd: workspace, mark: true }).then(
+      (pattern) => (0, import_chunk_X7QCZR3F.globa)(pattern, { cwd: workspace, mark: true }).then(
         (paths2) => paths2.map((p) => ({
           path: p,
           filter: filter && /^\*\*[\\/]\*\.mc$/i.test(path4.relative(workspace, pattern))
@@ -30057,7 +30257,7 @@ async function filesFromPaths(workspace, buildDir, inPaths, extension) {
   )).flat();
   const files = await Promise.all(
     paths.map(
-      (result) => result.path.endsWith("/") ? (0, import_chunk_NHZRKHZO.globa)(`${result.path}**/*${extension}`, {
+      (result) => result.path.endsWith("/") ? (0, import_chunk_X7QCZR3F.globa)(`${result.path}**/*${extension}`, {
         cwd: workspace,
         mark: true
       }).then(
@@ -30184,7 +30384,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       })
     );
   }
-  const actualOptimizedFiles = (await (0, import_chunk_NHZRKHZO.globa)(path4.join(output, "**", "*.mc"), { mark: true })).filter((file) => !file.endsWith("/")).sort();
+  const actualOptimizedFiles = (await (0, import_chunk_X7QCZR3F.globa)(path4.join(output, "**", "*.mc"), { mark: true })).filter((file) => !file.endsWith("/")).sort();
   const {
     hasTests,
     diagnostics: prevDiagnostics,
@@ -30200,13 +30400,13 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
     const sdk = await getSdkPath();
     const match = sdk.match(/-(\d+\.\d+\.\d+)/);
     if ((match && parseSdkVersion(match[1])) === prevSdkVersion) {
-      const source_time = await (0, import_chunk_NHZRKHZO.last_modified)(
+      const source_time = await (0, import_chunk_X7QCZR3F.last_modified)(
         Object.keys(fnMap).concat(dependencyFiles)
       );
-      const opt_time = await (0, import_chunk_NHZRKHZO.first_modified)(
+      const opt_time = await (0, import_chunk_X7QCZR3F.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1731196989092 < opt_time) {
+      if (source_time < opt_time && 1732486572981 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -30244,7 +30444,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.80",
+            optimizerVersion: "1.1.82",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -30258,7 +30458,7 @@ function getProjectAnalysis(targets, analysis, manifestXML, options) {
   return getConfig(options).then(
     (options2) => getProjectAnalysisHelper(targets, analysis, manifestXML, options2)
   ).catch(
-    (ex) => Promise.reject(ex instanceof import_chunk_NHZRKHZO.AwaitedError ? ex.resolve() : ex)
+    (ex) => Promise.reject(ex instanceof import_chunk_X7QCZR3F.AwaitedError ? ex.resolve() : ex)
   );
 }
 async function getProjectAnalysisHelper(targets, analysis, manifestXML, options) {
@@ -30383,7 +30583,7 @@ var init_optimizer = (0, import_chunk_ABYVSU2C.__esm)({
     init_sdk_util();
     init_interp();
     init_module_types();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_worker_pool();
     init_optimizer_types();
     init_types();
@@ -30410,7 +30610,7 @@ var init_optimizer = (0, import_chunk_ABYVSU2C.__esm)({
       "minimizeModules",
       "extensionVersion",
       "typeCheckLevel",
-      "covarianceWarnings",
+      "extraReferenceTypeChecks",
       "iterateOptimizer",
       "extraExcludes"
     ];
@@ -30443,7 +30643,7 @@ async function performTask(task) {
     throw new Error(`Invalid task type ${type}`);
   }
   return Promise.resolve(handler(task.data)).then(
-    (result) => import_chunk_NHZRKHZO.logPromise.then(() => result)
+    (result) => import_chunk_X7QCZR3F.logPromise.then(() => result)
   );
 }
 var workerTaskHandlers;
@@ -30453,7 +30653,7 @@ var init_worker_task = (0, import_chunk_ABYVSU2C.__esm)({
     init_optimizer();
     init_readprg();
     init_sdk_util();
-    (0, import_chunk_NHZRKHZO.init_logger)();
+    (0, import_chunk_X7QCZR3F.init_logger)();
     workerTaskHandlers = {
       buildOptimizedProject(data) {
         return buildOptimizedProject(data.product, data.options);
@@ -30671,7 +30871,7 @@ async function optimizeProgram(filepath, devKey, output, config) {
 }
 function optimizeProgramBuffer(filepath, view, debugXml, apiDebugXml, key, config) {
   const { sections } = readPrgWithOffsets(view);
-  (0, import_chunk_NHZRKHZO.logger)("readprg", 5, sections);
+  (0, import_chunk_X7QCZR3F.logger)("readprg", 5, sections);
   const symbolTable = new SymbolTable();
   if ((0, import_chunk_JDC43A3I.hasProperty)(sections, 1461170197 .toString())) {
     symbolTable.parse(sections[
@@ -30971,7 +31171,7 @@ var init_readprg = (0, import_chunk_ABYVSU2C.__esm)({
     init_signer();
     init_symbols();
     init_sdk_util();
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_worker_pool();
   }
 });
@@ -30983,7 +31183,7 @@ function getSdkPath() {
   });
 }
 async function getDeviceInfo() {
-  const files = await (0, import_chunk_NHZRKHZO.globa)(`${connectiq}/Devices/*/compiler.json`);
+  const files = await (0, import_chunk_X7QCZR3F.globa)(`${connectiq}/Devices/*/compiler.json`);
   if (!files.length) {
     throw new Error(
       `No devices found at '${connectiq}/Devices'. Check your sdk is correctly installed`
@@ -31051,7 +31251,7 @@ async function getFunctionDocumentation() {
 var isWin, appSupport, connectiq;
 var init_sdk_util = (0, import_chunk_ABYVSU2C.__esm)({
   "src/sdk-util.ts"() {
-    (0, import_chunk_NHZRKHZO.init_util)();
+    (0, import_chunk_X7QCZR3F.init_util)();
     init_xml_util();
     init_readprg();
     init_bytecode();