@markw65/monkeyc-optimizer 1.1.69 → 1.1.70

package/build/{chunk-YERUPFGW.cjs → chunk-2PJMJVYN.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_YERUPFGW_exports = {};
-__export(chunk_YERUPFGW_exports, {
+var chunk_2PJMJVYN_exports = {};
+__export(chunk_2PJMJVYN_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -71,6 +71,7 @@ __export(chunk_YERUPFGW_exports, {
   getSdkPath: () => getSdkPath,
   getSuperClasses: () => getSuperClasses,
   get_jungle: () => get_jungle,
+  handleImportUsing: () => handleImportUsing,
   init_api: () => init_api,
   init_bytecode: () => init_bytecode,
   init_could_be: () => init_could_be,
@@ -116,6 +117,8 @@ __export(chunk_YERUPFGW_exports, {
   parseSdkVersion: () => parseSdkVersion,
   parseXml: () => parseXml,
   performTask: () => performTask,
+  popRootNode: () => popRootNode,
+  pushRootNode: () => pushRootNode,
   readPrg: () => readPrg,
   readPrgWithOffsets: () => readPrgWithOffsets,
   resolveDiagnostics: () => resolveDiagnostics,
@@ -135,8 +138,8 @@ __export(chunk_YERUPFGW_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_YERUPFGW_exports);
-var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
+module.exports = __toCommonJS(chunk_2PJMJVYN_exports);
+var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.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"));
@@ -6065,7 +6068,7 @@ function getArgSafety(state, func, args, requireAll) {
   const { pre, post, stack } = state;
   try {
     delete state.pre;
-    state.post = (node) => {
+    state.post = function(node) {
       switch (node.type) {
         case "AssignmentExpression":
         case "UpdateExpression": {
@@ -6076,7 +6079,7 @@ function getArgSafety(state, func, args, requireAll) {
           }
           if (modifiedUnknown)
             break;
-          const [, results] = state.lookup(v);
+          const [, results] = this.lookup(v);
           if (results) {
             results.forEach(
               (r) => r.results.forEach(
@@ -6091,16 +6094,16 @@ function getArgSafety(state, func, args, requireAll) {
         case "CallExpression":
         case "NewExpression":
           if (!modifiedUnknown) {
-            const [, results] = state.lookup(
+            const [, results] = this.lookup(
               node.callee,
               null,
               // calls are looked up as non-locals, but new is not
-              node.type === "CallExpression" ? func.stack : state.stack
+              node.type === "CallExpression" ? func.stack : this.stack
             );
             if (!results) {
               const callee_name = node.callee.type === "Identifier" ? node.callee : node.callee.type === "MemberExpression" ? isLookupCandidate(node.callee) : null;
               if (callee_name) {
-                const callees = state.allFunctions[callee_name.name];
+                const callees = this.allFunctions[callee_name.name];
                 if (callees) {
                   callees.forEach((callee) => callsSeen.add(callee));
                 }
@@ -6117,7 +6120,7 @@ function getArgSafety(state, func, args, requireAll) {
           break;
         case "Identifier":
           if ((0, import_chunk_JDC43A3I.hasProperty)(params, node.name) && !safeArgs[params[node.name]] && (modifiedUnknown || !argDecls[params[node.name]] || modifiedDecls.has(argDecls[params[node.name]]) || Array.from(callsSeen).some(
-            (callee) => functionMayModify(state, callee, argDecls[params[node.name]])
+            (callee) => functionMayModify(this, callee, argDecls[params[node.name]])
           ))) {
             safeArgs[params[node.name]] = null;
           }
@@ -6274,20 +6277,20 @@ function processInlineBody(state, func, call, root, params) {
   const replacements = /* @__PURE__ */ new Set();
   const lookupStack = func.stack.concat({ sn: func });
   try {
-    state.pre = (node) => {
+    state.pre = function(node) {
       if (failed)
         return [];
       if (replacements.has(node))
         return false;
-      const result = pre(node, state);
+      const result = pre.call(this, node);
       if (!insertedVariableDecls && node.type === "BlockStatement") {
-        fixupLocalsMap(state);
-        const locals = state.localsStack[state.localsStack.length - 1];
+        fixupLocalsMap(this);
+        const locals = this.localsStack[this.localsStack.length - 1];
         const declarations = func.node.params.map((param, i) => {
           const paramName = variableDeclarationName(param);
           if (params[paramName] >= 0)
             return null;
-          const name = renameVariable(state, locals, paramName) || paramName;
+          const name = renameVariable(this, locals, paramName) || paramName;
           locals.map[name] = true;
           return {
             type: "VariableDeclarator",
@@ -6331,9 +6334,9 @@ function processInlineBody(state, func, call, root, params) {
       }
       return replacement;
     };
-    state.post = (node) => {
+    state.post = function(node) {
       if (failed)
-        return post(node, state);
+        return post.call(this, node);
       let replacement = null;
       switch (node.type) {
         case "AssignmentExpression":
@@ -6356,7 +6359,7 @@ function processInlineBody(state, func, call, root, params) {
           replacement = fixId(node);
           break;
       }
-      const ret2 = post(replacement || node, state);
+      const ret2 = post.call(this, replacement || node);
       return ret2 === false || ret2 ? ret2 : replacement;
     };
     let ret = state.traverse(root);
@@ -6914,14 +6917,15 @@ function pragmaChecker(state, ast, diagnostics) {
     if (node.start && node.start >= (comment.end || Infinity)) {
       const { kind, quote, needle } = matchers.shift();
       if (kind === "match") {
+        const thisComment = comment;
         promise = promise.then(
-          () => formatAst(node).then((haystack) => {
+          () => formatAstLongLines(node).then((haystack) => {
             haystack = haystack.replace(/([\r\n]|\s)+/g, " ").replace(/\b\w+\s\/\*>([\w.]+)<\*\//g, "$1");
             if (!matcher(quote, needle, haystack)) {
               matcher(quote, needle, haystack);
               diagnostic(
                 state,
-                comment,
+                thisComment,
                 `Didn't find '${needle}' in '${haystack}'`,
                 "ERROR"
               );
@@ -6990,20 +6994,29 @@ var init_pragma_checker = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_JDC43A3I.init_ast)();
   }
 });
-function buildReducedGraph(state, func, refsForUpdate, notice) {
+function buildReducedGraph(state, root, refsForUpdate, notice) {
   const { stack, pre, post } = state;
-  try {
-    const localState = new LocalState(func.node);
-    const ret = localState.curBlock;
-    state.stack = [...func.stack];
-    const stmtStack = [func.node];
-    const testStack = [{ node: func.node }];
+  const localState = new LocalState();
+  const ret = localState.curBlock;
+  const processOne = (rootNode, rootStack) => {
+    localState.push(rootNode);
+    state.stack = [...rootStack];
+    const stmtStack = [rootNode];
+    const testStack = [{ node: rootNode }];
     const allEvents = [];
     const eventsStack = [];
     let tryActive = 0;
-    state.pre = (node) => {
+    const addEvent = (block, event) => {
+      allEvents.push(event);
+      if (!block.events) {
+        block.events = [event];
+      } else {
+        block.events.push(event);
+      }
+    };
+    state.pre = function(node) {
       eventsStack.push(allEvents.length);
-      if (state.inType || localState.unreachable) {
+      if (localState.unreachable || this.inType && node.type !== "EnumDeclaration") {
         return [];
       }
       if (!localState.curBlock.node && ((0, import_chunk_JDC43A3I.isStatement)(node) || (0, import_chunk_JDC43A3I.isExpression)(node))) {
@@ -7017,19 +7030,41 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
         stmtStack.push(node);
       }
       switch (node.type) {
+        case "ImportModule":
+        case "Using":
+          (0, import_chunk_NHZRKHZO.forEach)(
+            notice(node, node, false, () => []),
+            (e) => allEvents.push(e)
+          );
+          return [];
+        case "Program":
+        case "ModuleDeclaration":
+          if (rootNode !== node)
+            return [];
+          (0, import_chunk_NHZRKHZO.forEach)(
+            notice(node, node, false, () => []),
+            (e) => {
+              addEvent(localState.curBlock, e);
+              allEvents.pop();
+            }
+          );
+          return ["body"];
+        case "ClassDeclaration":
         case "FunctionDeclaration":
+          if (rootNode !== node)
+            return [];
           return ["body"];
         case "AttributeList":
           return [];
         case "SwitchStatement": {
           const top = localState.push(node);
           top.break = {};
-          state.traverse(node.discriminant);
+          this.traverse(node.discriminant);
           const testBlocks = [];
           let defaultSeen = false;
           node.cases.forEach((sc, i) => {
             if (sc.test) {
-              state.traverse(sc.test);
+              this.traverse(sc.test);
               testBlocks[i] = localState.curBlock;
               localState.newBlock();
             } else {
@@ -7048,7 +7083,7 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
               localState.curBlock
             );
             sc.consequent.every((s) => {
-              state.traverse(s);
+              this.traverse(s);
               return !localState.unreachable;
             });
           });
@@ -7074,13 +7109,13 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
               true: body,
               false: top.break
             });
-            state.traverse(node.test);
+            this.traverse(node.test);
             localState.unreachable = true;
             localState.newBlock(body);
           } else {
             head = localState.newBlock();
           }
-          state.traverse(node.body);
+          this.traverse(node.body);
           if (node.type === "DoWhileStatement") {
             localState.newBlock(top.continue);
             testStack.push({
@@ -7088,7 +7123,7 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
               true: head,
               false: top.break
             });
-            state.traverse(node.test);
+            this.traverse(node.test);
             localState.unreachable = true;
           } else if (!localState.unreachable) {
             localState.addEdge(localState.curBlock, head);
@@ -7105,7 +7140,7 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
           localState.addEdge(localState.curBlock, top.throw);
           localState.newBlock();
           tryActive++;
-          state.traverse(node.block);
+          this.traverse(node.block);
           tryActive--;
           delete top.throw;
           top.posttry = {};
@@ -7116,7 +7151,7 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
           localState.unreachable = true;
           localState.newBlock(catches);
           if (node.handler) {
-            state.traverse(node.handler);
+            this.traverse(node.handler);
             if (localState.curBlock.preds) {
               localState.terminal("ThrowStatement");
             }
@@ -7125,7 +7160,7 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
             localState.unreachable = true;
             localState.newBlock(top.finally);
             delete top.finally;
-            state.traverse(node.finalizer);
+            this.traverse(node.finalizer);
             if (!localState.unreachable) {
               if (tryFallsThrough) {
                 localState.addEdge(localState.curBlock, top.posttry);
@@ -7150,11 +7185,11 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
           }
           const next = {};
           if (node.param && node.param.type === "BinaryExpression") {
-            state.traverse(node.param);
+            this.traverse(node.param);
             localState.addEdge(localState.curBlock, next);
             localState.newBlock();
           }
-          state.traverse(node.body);
+          this.traverse(node.body);
           if (!localState.unreachable) {
             localState.addEdge(
               localState.curBlock,
@@ -7168,7 +7203,7 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
         case "ForStatement": {
           const top = localState.push(node);
           if (node.init)
-            state.traverse(node.init);
+            this.traverse(node.init);
           const head = localState.newBlock();
           top.break = {};
           top.continue = {};
@@ -7179,14 +7214,14 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
               true: body,
               false: top.break
             });
-            state.traverse(node.test);
+            this.traverse(node.test);
             localState.unreachable = true;
             localState.newBlock(body);
           }
-          state.traverse(node.body);
+          this.traverse(node.body);
           localState.newBlock(top.continue);
           if (node.update) {
-            state.traverse(node.update);
+            this.traverse(node.update);
           }
           if (!localState.unreachable) {
             localState.addEdge(localState.curBlock, head);
@@ -7208,7 +7243,7 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
             true: consequent,
             false: alternate
           });
-          state.traverse(node.test);
+          this.traverse(node.test);
           localState.unreachable = true;
           if (topTest.true) {
             testStack.push({ ...topTest, node: node.consequent });
@@ -7216,7 +7251,7 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
             testStack.push({ node: node.consequent, true: next, false: next });
           }
           localState.newBlock(consequent);
-          state.traverse(node.consequent);
+          this.traverse(node.consequent);
           localState.unreachable = true;
           if (node.alternate) {
             if (topTest.true) {
@@ -7225,7 +7260,7 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
               testStack.push({ node: node.alternate, true: next, false: next });
             }
             localState.newBlock(alternate);
-            state.traverse(node.alternate);
+            this.traverse(node.alternate);
             localState.unreachable = true;
           }
           if (next.preds) {
@@ -7252,7 +7287,7 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
               false: right
             });
           }
-          state.traverse(node.left);
+          this.traverse(node.left);
           localState.unreachable = true;
           localState.newBlock(right);
           testStack.push({
@@ -7260,7 +7295,7 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
             true: topTest.true || next,
             false: topTest.false || next
           });
-          state.traverse(node.right);
+          this.traverse(node.right);
           localState.unreachable = true;
           if (next.preds) {
             localState.newBlock(next);
@@ -7279,9 +7314,9 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
           break;
         case "UpdateExpression":
           if (node.argument.type === "MemberExpression") {
-            state.traverse(node.argument.object);
+            this.traverse(node.argument.object);
             if (node.argument.computed) {
-              state.traverse(node.argument.property);
+              this.traverse(node.argument.property);
             }
           }
           return [];
@@ -7290,16 +7325,16 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
             return null;
           }
           if (node.left.type === "MemberExpression") {
-            state.traverse(node.left.object);
+            this.traverse(node.left.object);
             if (node.left.computed) {
-              state.traverse(node.left.property);
+              this.traverse(node.left.property);
             }
           }
           return ["right"];
         case "ThrowStatement":
         case "ReturnStatement":
           if (node.argument) {
-            state.traverse(node.argument);
+            this.traverse(node.argument);
           }
         case "BreakStatement":
         case "ContinueStatement":
@@ -7307,29 +7342,21 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
           return [];
         case "CallExpression":
           if (node.callee.type === "Identifier") {
-            const extra = state.stack.splice(func.stack.length);
-            state.traverse(node.callee);
-            state.stack.push(...extra);
+            const extra = this.stack.splice(rootStack.length);
+            this.traverse(node.callee);
+            this.stack.push(...extra);
             return ["arguments"];
           }
           break;
       }
       return null;
     };
-    const addEvent = (block, event) => {
-      allEvents.push(event);
-      if (!block.events) {
-        block.events = [event];
-      } else {
-        block.events.push(event);
-      }
-    };
-    state.post = (node) => {
+    state.post = function(node) {
       const eventIndex = eventsStack.pop();
       const getContainedEvents = () => allEvents.slice(eventIndex);
       const curStmt = stmtStack[stmtStack.length - 1];
       const topTest = testStack[testStack.length - 1];
-      if (!state.inType) {
+      if (!this.inType && node !== rootNode) {
         const throws = tryActive > 0 && (0, import_chunk_JDC43A3I.mayThrow)(node);
         const events = notice(node, curStmt, throws, getContainedEvents);
         if (throws) {
@@ -7339,9 +7366,9 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
             );
           }
         } else {
-          (0, import_chunk_OASVKTK5.forEach)(events, (e) => e.mayThrow = false);
+          (0, import_chunk_NHZRKHZO.forEach)(events, (e) => e.mayThrow = false);
         }
-        (0, import_chunk_OASVKTK5.forEach)(events, (event) => {
+        (0, import_chunk_NHZRKHZO.forEach)(events, (event) => {
           if (event.mayThrow) {
             for (let i = localState.stack.length; i--; ) {
               const target = localState.stack[i].throw;
@@ -7396,8 +7423,18 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
       }
       return null;
     };
-    state.traverse(func.node);
+    state.traverse(rootNode);
     return cleanCfg(ret);
+  };
+  try {
+    if (root.nodes) {
+      root.nodes.forEach(
+        (rootStack, rootNode) => processOne(rootNode, rootStack)
+      );
+    } else {
+      processOne(root.node, root.stack);
+    }
+    return ret;
   } finally {
     state.pre = pre;
     state.post = post;
@@ -7486,7 +7523,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_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     Terminals = {
       BreakStatement: "break",
       ContinueStatement: "continue",
@@ -7498,9 +7535,6 @@ var init_control_flow = (0, import_chunk_ABYVSU2C.__esm)({
       info = /* @__PURE__ */ new Map();
       curBlock = {};
       unreachable = false;
-      constructor(func) {
-        this.push(func);
-      }
       push(node) {
         const top = { node };
         this.stack.push(top);
@@ -7516,12 +7550,12 @@ var init_control_flow = (0, import_chunk_ABYVSU2C.__esm)({
         if (!from.succs) {
           from.succs = [to];
         } else {
-          (0, import_chunk_OASVKTK5.pushUnique)(from.succs, to);
+          (0, import_chunk_NHZRKHZO.pushUnique)(from.succs, to);
         }
         if (!to.preds) {
           to.preds = [from];
         } else {
-          (0, import_chunk_OASVKTK5.pushUnique)(to.preds, from);
+          (0, import_chunk_NHZRKHZO.pushUnique)(to.preds, from);
         }
       }
       newBlock(block) {
@@ -7875,8 +7909,8 @@ function mergeObjectValues(to, from) {
 function mergeStateDecls(to, from) {
   let changed = false;
   let result = to;
-  (0, import_chunk_OASVKTK5.forEach)(from, (v) => {
-    if ((0, import_chunk_OASVKTK5.some)(to, (t) => t === v)) {
+  (0, import_chunk_NHZRKHZO.forEach)(from, (v) => {
+    if ((0, import_chunk_NHZRKHZO.some)(to, (t) => t === v)) {
       return;
     }
     if (Array.isArray(result)) {
@@ -8043,7 +8077,7 @@ var init_union_type = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     (0, import_chunk_JDC43A3I.init_ast)();
     init_data_flow();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_could_be();
     init_intersection_type();
     init_sub_type();
@@ -8058,7 +8092,7 @@ function expandTypedef(t) {
   );
   const tExpanded = cloneType(t);
   clearValuesUnder(tExpanded, 262144, true);
-  (0, import_chunk_OASVKTK5.forEach)(decls, (decl) => unionInto(tExpanded, decl.resolvedType));
+  (0, import_chunk_NHZRKHZO.forEach)(decls, (decl) => unionInto(tExpanded, decl.resolvedType));
   return tExpanded;
 }
 function intersectEnum(t, e) {
@@ -8252,9 +8286,9 @@ function intersectionValue(pair) {
     case 4096:
     case 8192: {
       const common = [];
-      (0, import_chunk_OASVKTK5.forEach)(
+      (0, import_chunk_NHZRKHZO.forEach)(
         pair.avalue,
-        (sna) => (0, import_chunk_OASVKTK5.some)(pair.bvalue, (snb) => sna === snb) && common.push(sna)
+        (sna) => (0, import_chunk_NHZRKHZO.some)(pair.bvalue, (snb) => sna === snb) && common.push(sna)
       );
       if (!common.length)
         return null;
@@ -8262,9 +8296,9 @@ function intersectionValue(pair) {
     }
     case 16384: {
       const common = [];
-      (0, import_chunk_OASVKTK5.forEach)(pair.avalue, (sna) => {
+      (0, import_chunk_NHZRKHZO.forEach)(pair.avalue, (sna) => {
         const superA = getSuperClasses(sna);
-        (0, import_chunk_OASVKTK5.forEach)(pair.bvalue, (snb) => {
+        (0, import_chunk_NHZRKHZO.forEach)(pair.bvalue, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             common.push(sna);
           }
@@ -8510,7 +8544,7 @@ function restrictExactTypesByEquality(a, b) {
     }
     case 262144:
       return restrictByEquality(
-        (0, import_chunk_OASVKTK5.reduce)(
+        (0, import_chunk_NHZRKHZO.reduce)(
           a.value,
           (cur, decl) => {
             unionInto(cur, decl.resolvedType);
@@ -8577,7 +8611,7 @@ var init_intersection_type = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_could_be();
     init_interp();
     init_types();
@@ -8691,14 +8725,14 @@ function subtypeOfValue(pair) {
     case 8192: {
       const asd = pair.avalue;
       const bsd = pair.bvalue;
-      return (0, import_chunk_OASVKTK5.some)(asd, (sna) => (0, import_chunk_OASVKTK5.some)(bsd, (snb) => sna === snb));
+      return (0, import_chunk_NHZRKHZO.some)(asd, (sna) => (0, import_chunk_NHZRKHZO.some)(bsd, (snb) => sna === snb));
     }
     case 16384: {
       const asd = pair.avalue;
       const bsd = pair.bvalue;
-      return (0, import_chunk_OASVKTK5.every)(asd, (sna) => {
+      return (0, import_chunk_NHZRKHZO.every)(asd, (sna) => {
         const superA = getSuperClasses(sna);
-        return (0, import_chunk_OASVKTK5.some)(bsd, (snb) => {
+        return (0, import_chunk_NHZRKHZO.some)(bsd, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             return true;
           }
@@ -8734,7 +8768,7 @@ var init_sub_type = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_could_be();
     init_intersection_type();
     init_types();
@@ -9155,13 +9189,13 @@ function isTypeStateKey(decl) {
   return Array.isArray(decl) || decl.type !== "MemberDecl" && decl.type !== "Unknown";
 }
 function declIsLocal(decl) {
-  return (0, import_chunk_OASVKTK5.some)(
+  return (0, import_chunk_NHZRKHZO.some)(
     decl,
     (d) => d.type === "BinaryExpression" || d.type === "Identifier" || d.type === "VariableDeclarator" && isLocal(d)
   );
 }
 function declIsNonLocal(decl) {
-  return (0, import_chunk_OASVKTK5.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d));
+  return (0, import_chunk_NHZRKHZO.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d));
 }
 function localDeclName(decl) {
   if (Array.isArray(decl))
@@ -9174,12 +9208,12 @@ function localDeclName(decl) {
     case "VariableDeclarator":
       return variableDeclarationName(decl.node.id);
   }
-  throw new import_chunk_OASVKTK5.AwaitedError(
+  throw new import_chunk_NHZRKHZO.AwaitedError(
     declFullName(decl).then((declStr) => `Invalid local decl: ${declStr}`)
   );
 }
 function tsKey(key) {
-  return `${(0, import_chunk_OASVKTK5.map)(key, (k) => {
+  return `${(0, import_chunk_NHZRKHZO.map)(key, (k) => {
     if (k.type === "Literal") {
       return k.raw;
     } else if (isStateNode(k)) {
@@ -9198,24 +9232,36 @@ function sourceLocation(loc) {
   return loc ? `${loc.source || "??"}:${loc.start.line}:${loc.start.column}` : "??";
 }
 function printBlockHeader(block) {
-  (0, import_chunk_OASVKTK5.log)(
+  (0, import_chunk_NHZRKHZO.log)(
     block.order,
     `(${block.node?.loc?.source || "??"}:${block.node?.loc?.start.line || "??"})`,
     `Preds: ${(block.preds || []).map((block2) => block2.order).join(", ")}`
   );
 }
+function printImp(event) {
+  switch (event.node.type) {
+    case "ImportModule":
+    case "Using":
+      return formatAstLongLines(event.node.id).then(
+        (id) => `${event.node.type} ${id}`
+      );
+    case "ModuleDeclaration":
+    case "Program":
+      return event.node.type;
+  }
+}
 function describeEvent(event) {
   if (event.type === "exn")
     return Promise.resolve("exn:");
   return Promise.resolve(
-    event.type === "flw" || event.type === "mod" || !Array.isArray(event.decl) && (event.decl.type === "MemberDecl" || event.decl.type === "Unknown") ? formatAst(event.node) : event.decl ? declFullName(event.decl) : "??"
+    event.type === "imp" ? printImp(event) : event.type === "flw" || event.type === "mod" || !Array.isArray(event.decl) && (event.decl.type === "MemberDecl" || event.decl.type === "Unknown") ? formatAstLongLines(event.node) : event.decl ? declFullName(event.decl) : "??"
   ).then((desc) => `${event.type}: ${desc}`);
 }
 function printBlockEvents(block, extra) {
-  (0, import_chunk_OASVKTK5.log)("Events:");
-  (0, import_chunk_OASVKTK5.forEach)(
+  (0, import_chunk_NHZRKHZO.log)("Events:");
+  (0, import_chunk_NHZRKHZO.forEach)(
     block.events,
-    (event) => (0, import_chunk_OASVKTK5.log)(
+    (event) => (0, import_chunk_NHZRKHZO.log)(
       describeEvent(event).then(
         (eventStr) => `    ${eventStr} ${extra ? extra(event) : ""}`
       )
@@ -9223,7 +9269,7 @@ function printBlockEvents(block, extra) {
   );
 }
 function printBlockTrailer(block) {
-  (0, import_chunk_OASVKTK5.log)(
+  (0, import_chunk_NHZRKHZO.log)(
     `Succs: ${(block.succs || []).map((block2) => block2.order).join(", ")} ExSucc: ${block.exsucc ? block.exsucc.order : ""}`
   );
 }
@@ -9355,7 +9401,7 @@ var init_type_flow_util = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_intersection_type();
     init_sub_type();
     init_types();
@@ -9377,7 +9423,7 @@ function evaluateCall(istate, node, callee, args) {
     istate.typeChecker && diagnostic(
       istate.state,
       node,
-      formatAst(node.callee).then(
+      formatAstLongLines(node.callee).then(
         (calleeStr) => `'${calleeStr}' is not callable`
       ),
       istate.checkTypes
@@ -9391,25 +9437,25 @@ function evaluateCall(istate, node, callee, args) {
 }
 function calleeObjectType(istate, callee) {
   if (callee.type === "MemberExpression") {
-    return istate.typeMap?.get(callee.object) || {
+    return istate.typeMap?.get(callee.object) ?? istate.frpushType ?? {
       type: 524287
       /* Any */
     };
   }
-  if (callee.type === "Identifier" && istate.func) {
-    const func = istate.func;
-    const [{ sn: self }] = func.stack.slice(-1);
+  if (callee.type === "Identifier" && istate.root) {
+    const root = istate.root;
+    const [{ sn: self }] = root.stack.slice(-1);
     return typeFromTypeStateNode(
       istate.state,
       self,
-      (func.attributes & 8) !== 0 || self.type !== "ClassDeclaration"
+      (root.attributes & 8) !== 0 || self.type !== "ClassDeclaration"
     );
   }
   return null;
 }
 function checkCallArgs(istate, node, callees, args) {
   const allDiags = [];
-  const resultType = (0, import_chunk_OASVKTK5.reduce)(
+  const resultType = (0, import_chunk_NHZRKHZO.reduce)(
     callees,
     (result, cur) => {
       const curDiags = [];
@@ -9568,7 +9614,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_OASVKTK5.some)(funcs, (func) => {
+    if (supers && (0, import_chunk_NHZRKHZO.some)(funcs, (func) => {
       if (func === cur)
         return false;
       const fcls = func.stack?.[func.stack.length - 1].sn;
@@ -9590,6 +9636,75 @@ function getSystemCallTable(state) {
   if (systemCallInfo && systemCallVersion === state.sdk) {
     return systemCallInfo;
   }
+  const toNumber = (state2, callee, calleeObj, getArgs) => {
+    const ret = { effectFree: true };
+    if (isExact(calleeObj)) {
+      if (calleeObj.type === 8) {
+        const args = getArgs();
+        if (args.length === 0) {
+          ret.returnType = calleeObj;
+        }
+      } else if (hasValue(calleeObj)) {
+        switch (calleeObj.type) {
+          case 1:
+            return {};
+          case 2:
+            ret.returnType = { type: 8, value: 0 };
+            break;
+          case 4:
+            ret.returnType = { type: 8, value: 1 };
+            break;
+          case 16:
+            ret.returnType = {
+              type: 8,
+              value: Number(calleeObj.value) & -1
+            };
+            break;
+          case 32:
+          case 64:
+            ret.returnType = {
+              type: 8,
+              value: Math.max(
+                -134217728,
+                Math.min(
+                  2147483647,
+                  calleeObj.value >= 0 ? Math.floor(calleeObj.value) : Math.ceil(calleeObj.value)
+                )
+              )
+            };
+            break;
+          case 128:
+            ret.returnType = {
+              type: 8,
+              value: calleeObj.value.charCodeAt(0)
+            };
+            break;
+          case 256: {
+            const value2 = parseInt(calleeObj.value, 10);
+            ret.returnType = isNaN(value2) ? {
+              type: 1
+              /* Null */
+            } : {
+              type: 8,
+              value: value2
+            };
+            break;
+          }
+          case 512:
+          case 1024:
+          case 2048:
+          case 4096:
+          case 8192:
+          case 16384:
+          case 32768:
+          case 65536:
+          case 131072:
+          case 262144:
+        }
+      }
+    }
+    return ret;
+  };
   const arrayAdd = (state2, callee, calleeObj, getArgs) => {
     const ret = {};
     if (calleeObj.type & 512) {
@@ -9979,6 +10094,7 @@ function getSystemCallTable(state) {
     "$.Toybox.Lang.Dictionary.values": dictionaryValues,
     "$.Toybox.Lang.Method.invoke": methodInvoke,
     "$.Toybox.Lang.Object.method": method,
+    "$.Toybox.Lang.*.toNumber": toNumber,
     "$.Toybox.Math.acos": mathHelper,
     "$.Toybox.Math.asin": mathHelper,
     "$.Toybox.Math.atan": mathHelper,
@@ -10064,14 +10180,14 @@ var systemCallInfo, systemCallVersion;
 var init_interp_call = (0, import_chunk_ABYVSU2C.__esm)({
   "src/type-flow/interp-call.ts"() {
     "use strict";
-    init_optimizer_types();
     init_api();
-    (0, import_chunk_OASVKTK5.init_util)();
+    init_optimizer_types();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_interp();
     init_sub_type();
+    init_type_flow_util();
     init_types();
     init_union_type();
-    init_type_flow_util();
     systemCallInfo = null;
   }
 });
@@ -10224,42 +10340,54 @@ function preEvaluate(istate, node) {
       return ["init"];
     case "CatchClause":
       return ["body"];
+    case "TypedefDeclaration":
+      return [];
   }
   return null;
 }
-function evaluate(istate, node) {
+function evaluate(istate, root) {
   let skipNode = null;
-  const post = (node2) => {
-    if (istate.pre && node2 !== skipNode) {
-      const rep = istate.pre(node2);
+  const post = (node) => {
+    if (istate.pre && node !== skipNode) {
+      const rep = istate.pre(node);
       if (rep)
         return rep;
     }
-    evaluateNode(istate, node2);
-    if (skipNode === node2) {
+    evaluateNode(istate, node);
+    if (skipNode === node) {
       skipNode = null;
       return null;
     }
-    return istate.post ? istate.post(node2) : null;
+    return istate.post ? istate.post(node) : null;
   };
-  const pre = (node2) => {
-    const ret2 = preEvaluate(istate, node2);
+  const pre = (node) => {
+    const ret2 = preEvaluate(istate, node);
     if (ret2)
       return ret2;
-    switch (node2.type) {
+    switch (node.type) {
+      case "ImportModule":
+      case "Using":
+        handleImportUsing(istate.state, node);
+        return false;
+      case "FunctionDeclaration":
+      case "ModuleDeclaration":
+      case "ClassDeclaration":
+        if (node !== root)
+          return false;
+        break;
       case "AssignmentExpression":
-        skipNode = node2.left;
+        skipNode = node.left;
         break;
       case "UpdateExpression":
-        skipNode = node2.argument;
+        skipNode = node.argument;
         break;
     }
     return null;
   };
-  (0, import_chunk_JDC43A3I.traverseAst)(node, pre, post);
+  (0, import_chunk_JDC43A3I.traverseAst)(root, pre, post);
   const ret = istate.stack.pop();
-  if ((0, import_chunk_JDC43A3I.isExpression)(node)) {
-    if (!ret || node !== ret.node) {
+  if ((0, import_chunk_JDC43A3I.isExpression)(root)) {
+    if (!ret || root !== ret.node) {
       throw new Error("evaluate failed to produce a value for an expression");
     }
   }
@@ -10455,6 +10583,7 @@ function getLhsConstraint(istate, node) {
 }
 function pushScopedNameType(istate, node, object) {
   let embeddedEffects = object ? object.embeddedEffects : false;
+  istate.frpushType = object?.value;
   let result;
   if (istate.typeMap) {
     result = istate.typeMap.get(node);
@@ -10577,7 +10706,7 @@ function evaluateNode(istate, node) {
           diagnostic(
             istate.state,
             node,
-            formatAst(
+            formatAstLongLines(
               left.value.type === 1 ? node.right : node.left
             ).then(
               (nodeStr) => `This comparison seems redundant because ${nodeStr} should never be null`
@@ -10736,7 +10865,7 @@ function evaluateNode(istate, node) {
           const si = state.stack[i].sn;
           if (si.type === "ClassDeclaration") {
             const klass = { type: 16384, value: si };
-            if ((istate.func?.attributes || 0) & 8) {
+            if ((istate.root?.attributes || 0) & 8) {
               return klass;
             } else {
               return { type: 32768, value: { klass } };
@@ -10952,7 +11081,7 @@ function evaluateNode(istate, node) {
           diagnostic(
             istate.state,
             node,
-            formatAst(node.left).then(
+            formatAstLongLines(node.left).then(
               (nodeStr) => `Invalid assignment to ${nodeStr}. Expected ${display(
                 constraint
               )} but got ${display(actual)}`
@@ -11039,8 +11168,8 @@ function evaluateNode(istate, node) {
                 istate.state,
                 node,
                 Promise.all([
-                  formatAst(node.id.left),
-                  formatAst(node.id.right)
+                  formatAstLongLines(node.id.left),
+                  formatAstLongLines(node.id.right)
                 ]).then(
                   ([leftStr, rightStr]) => `Invalid initializer for ${leftStr}. Expected ${rightStr} but got ${display(
                     init.value
@@ -11063,21 +11192,21 @@ function evaluateNode(istate, node) {
     case "ReturnStatement": {
       const value2 = node.argument && popIstate(istate, node.argument);
       if (istate.typeChecker) {
-        if (!istate.func) {
+        if (istate.root?.type !== "FunctionDeclaration") {
           throw new Error("ReturnStatement found outside of function");
         }
-        if (istate.func.node.returnType) {
+        if (istate.root.node.returnType) {
           const returnType = typeFromTypespec(
             istate.state,
-            istate.func.node.returnType.argument,
-            istate.func.stack
+            istate.root.node.returnType.argument,
+            istate.root.stack
           );
           if (value2) {
             if (!istate.typeChecker(value2.value, returnType)) {
               diagnostic(
                 istate.state,
                 node,
-                `Expected ${istate.func.fullName} to return ${display(
+                `Expected ${istate.root.fullName} to return ${display(
                   returnType
                 )} but got ${display(value2.value)}`,
                 istate.checkTypes
@@ -11191,7 +11320,7 @@ function mustBeIdentical(a, b) {
   return false;
 }
 function isByteArrayData(objectData) {
-  return objectData.klass.value && (0, import_chunk_OASVKTK5.every)(
+  return objectData.klass.value && (0, import_chunk_NHZRKHZO.every)(
     objectData.klass.value,
     (klass) => klass.fullName === "$.Toybox.Lang.ByteArray"
   );
@@ -11203,7 +11332,7 @@ var init_interp = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_JDC43A3I.init_ast)();
     init_data_flow();
     init_optimizer_types();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_could_be();
     init_interp_binary();
     init_interp_call();
@@ -11310,7 +11439,7 @@ function resolveEnum(e) {
       unionInto(
         result,
         next.type === "EnumStringMember" && next.init?.type === "Literal" ? typeFromLiteral(next.init) : {
-          type: 8
+          type: next.type === "EnumStringMember" && next.init ? EnumTagsConst : 8
           /* Number */
         }
       );
@@ -11408,10 +11537,7 @@ function typeFromTypeStateNode(state, sn, classVsObj) {
       };
     case "EnumStringMember": {
       const e = state.enumMap?.get(sn);
-      const value2 = sn.init?.type === "Literal" ? typeFromLiteral(sn.init) : e ? resolveEnum(e) : {
-        type: 8 | 16
-        /* Long */
-      };
+      const value2 = sn.init?.type === "Literal" ? typeFromLiteral(sn.init) : sn.resolvedType ?? (e ? resolveEnum(e) : { type: EnumTagsConst });
       return { type: 65536, value: { enum: e, value: value2 } };
     }
     case "TypedefDeclaration": {
@@ -11434,7 +11560,7 @@ function typeFromTypeStateNode(state, sn, classVsObj) {
           );
           if (value2) {
             const a = [];
-            (0, import_chunk_OASVKTK5.forEach)(value2, (v) => {
+            (0, import_chunk_NHZRKHZO.forEach)(value2, (v) => {
               if (v !== sn)
                 a.push(v);
             });
@@ -11658,7 +11784,9 @@ function typeFromSingleTypeSpec(state, type, stack) {
           diagnostic(
             state,
             id,
-            formatAst(id).then((idStr) => `Unable to resolve type ${idStr}`),
+            formatAstLongLines(id).then(
+              (idStr) => `Unable to resolve type ${idStr}`
+            ),
             level || "WARNING"
           );
         }
@@ -11926,7 +12054,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_OASVKTK5.map)(v, fn).sort().filter((s, i, arr) => !i || s !== arr[i - 1]).join(" or ");
+  const names = (v, fn) => (0, import_chunk_NHZRKHZO.map)(v, fn).sort().filter((s, i, arr) => !i || s !== arr[i - 1]).join(" or ");
   const parts = [];
   const displayOne = (tv) => {
     switch (tv.type) {
@@ -12124,13 +12252,13 @@ var LastTypeTag, SingletonTypeTagsConst, UnionDataTypeTagsConst, ValueTypeTagsCo
 var init_types = (0, import_chunk_ABYVSU2C.__esm)({
   "src/type-flow/types.ts"() {
     "use strict";
-    init_data_flow();
     init_api();
     (0, import_chunk_JDC43A3I.init_ast)();
-    (0, import_chunk_OASVKTK5.init_util)();
+    init_data_flow();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_interp();
-    init_union_type();
     init_intersection_type();
+    init_union_type();
     LastTypeTag = 262144;
     SingletonTypeTagsConst = 1 | 2 | 4;
     UnionDataTypeTagsConst = 512 | 1024 | 2048 | 4096 | 8192 | 16384 | 32768 | 65536 | 262144;
@@ -12187,7 +12315,7 @@ function couldBeHelper(a, b, shallow) {
       262144
       /* Typedef */
     );
-    return typedef && (0, import_chunk_OASVKTK5.some)(typedef, (td) => {
+    return typedef && (0, import_chunk_NHZRKHZO.some)(typedef, (td) => {
       if (!td.resolvedType) {
         throw new Error(`No resolved type for ${td.fullName} in 'couldBe'`);
       }
@@ -12259,15 +12387,15 @@ function couldBeValue(pair, shallow) {
     }
     case 4096:
     case 8192: {
-      return (0, import_chunk_OASVKTK5.some)(
+      return (0, import_chunk_NHZRKHZO.some)(
         pair.avalue,
-        (sna) => (0, import_chunk_OASVKTK5.some)(pair.bvalue, (snb) => sna === snb)
+        (sna) => (0, import_chunk_NHZRKHZO.some)(pair.bvalue, (snb) => sna === snb)
       );
     }
     case 16384: {
-      return (0, import_chunk_OASVKTK5.some)(pair.avalue, (sna) => {
+      return (0, import_chunk_NHZRKHZO.some)(pair.avalue, (sna) => {
         const superA = getSuperClasses(sna);
-        return (0, import_chunk_OASVKTK5.some)(pair.bvalue, (snb) => {
+        return (0, import_chunk_NHZRKHZO.some)(pair.bvalue, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             return true;
           }
@@ -12300,7 +12428,7 @@ var init_could_be = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_types();
   }
 });
@@ -12407,7 +12535,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
       }
       addAnt(curState.partiallyAnticipated, key, node);
       if (logThisRun) {
-        (0, import_chunk_OASVKTK5.log)(
+        (0, import_chunk_NHZRKHZO.log)(
           `  antrefs: ${curState.partiallyAnticipated.get(key) !== false} ${curState.anticipated.get(key) !== false}`
         );
       }
@@ -12430,7 +12558,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_OASVKTK5.log)(` - anticipated: ${tsKey(decl)}`));
+      curState.dead.forEach((decl) => (0, import_chunk_NHZRKHZO.log)(` - anticipated: ${tsKey(decl)}`));
     }
     if (top.events) {
       for (let i = top.events.length; i--; ) {
@@ -12442,12 +12570,12 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
           case "ref":
             if (isTypeStateKey(event.decl)) {
               if (logThisRun) {
-                (0, import_chunk_OASVKTK5.log)(
+                (0, import_chunk_NHZRKHZO.log)(
                   describeEvent(event).then(
                     (eventStr) => `${eventStr} (${sourceLocation(event.node.loc)})`
                   )
                 );
-                (0, import_chunk_OASVKTK5.log)(`  kill => ${tsKey(event.decl)}`);
+                (0, import_chunk_NHZRKHZO.log)(`  kill => ${tsKey(event.decl)}`);
               }
               copyPropRef(curState, event.decl, event.node);
               curState.dead.delete(event.decl);
@@ -12456,7 +12584,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_OASVKTK5.log)(
+                (0, import_chunk_NHZRKHZO.log)(
                   describeEvent(event).then(
                     (eventStr) => `${eventStr} (${sourceLocation(event.node.loc)})`
                   )
@@ -12472,7 +12600,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
                   const pant = curState.partiallyAnticipated.get(event.decl);
                   if (pant) {
                     if (logThisRun) {
-                      (0, import_chunk_OASVKTK5.log)(
+                      (0, import_chunk_NHZRKHZO.log)(
                         `  is copy-prop-candidate ${curState.anticipated?.get(event.decl) === pant}`
                       );
                     }
@@ -12504,7 +12632,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
               if (assignNode) {
                 curState.dead.add(event.decl);
                 if (logThisRun) {
-                  (0, import_chunk_OASVKTK5.log)(`  anticipated => ${tsKey(event.decl)}`);
+                  (0, import_chunk_NHZRKHZO.log)(`  anticipated => ${tsKey(event.decl)}`);
                 }
               } else if (event.node.type === "UpdateExpression") {
                 copyPropRef(curState, event.decl, event.node.argument);
@@ -12515,7 +12643,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
             if (isTypeStateKey(event.decl)) {
               curState.dead.add(event.decl);
               if (logThisRun) {
-                (0, import_chunk_OASVKTK5.log)(`  anticipated => ${tsKey(event.decl)}`);
+                (0, import_chunk_NHZRKHZO.log)(`  anticipated => ${tsKey(event.decl)}`);
               }
             }
             break;
@@ -12578,10 +12706,10 @@ function eliminateDeadStores(state, func, graph, logThisRun) {
   if (!deadStores.size)
     return { changes: false, copyPropStores };
   if (logThisRun) {
-    (0, import_chunk_OASVKTK5.log)("====== Dead Stores =====");
+    (0, import_chunk_NHZRKHZO.log)("====== Dead Stores =====");
     deadStores.forEach(
-      (dead) => (dead.type === "AssignmentExpression" || dead.type === "UpdateExpression" || dead.type === "VariableDeclarator") && (0, import_chunk_OASVKTK5.log)(
-        formatAst(dead).then(
+      (dead) => (dead.type === "AssignmentExpression" || dead.type === "UpdateExpression" || dead.type === "VariableDeclarator") && (0, import_chunk_NHZRKHZO.log)(
+        formatAstLongLines(dead).then(
           (deadStr) => `${deadStr} (${sourceLocation(dead.loc)})`
         )
       )
@@ -12635,47 +12763,50 @@ var init_dead_store = (0, import_chunk_ABYVSU2C.__esm)({
     init_control_flow();
     init_data_flow();
     init_inliner();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_minimize_locals();
     init_type_flow_util();
   }
 });
-function loggingEnabledFor(env, func) {
+function loggingEnabledFor(env, root) {
   const pattern = process.env[env];
   if (!pattern)
     return false;
   const match = pattern.match(/^\/(.*)\/(i?)$/);
   if (match) {
-    return new RegExp(match[1], match[2]).test(func.fullName);
+    return new RegExp(match[1], match[2]).test(root.fullName);
   }
-  return pattern === func.fullName;
+  return pattern === root.fullName;
 }
-function buildTypeInfo(state, func, optimizeEquivalencies) {
-  if (!func.node.body || !func.stack)
+function buildTypeInfo(state, root, optimizeEquivalencies) {
+  if (!root.node?.body || !root.stack)
     return;
-  const logThisRun = logging && loggingEnabledFor("TYPEFLOW_FUNC", func);
+  const logThisRun = logging && loggingEnabledFor("TYPEFLOW_FUNC", root);
   while (true) {
-    const { graph } = buildDataFlowGraph(state, func, () => false, false, true);
+    const { graph } = buildDataFlowGraph(state, root, () => false, false, true);
     let copyPropStores;
-    if (optimizeEquivalencies) {
-      const result2 = eliminateDeadStores(state, func, graph, logThisRun);
-      if (result2.changes) {
+    if (optimizeEquivalencies && root.type === "FunctionDeclaration") {
+      const result = eliminateDeadStores(state, root, graph, logThisRun);
+      if (result.changes) {
         continue;
       }
-      if (result2.copyPropStores.size) {
-        copyPropStores = result2.copyPropStores;
+      if (result.copyPropStores.size) {
+        copyPropStores = result.copyPropStores;
       }
     }
-    const result = propagateTypes(
-      { ...state, stack: func.stack },
-      func,
+    const stack = root.stack.slice();
+    pushRootNode(stack, root);
+    const { istate, redo } = propagateTypes(
+      { ...state, stack },
+      root,
       graph,
       optimizeEquivalencies,
       copyPropStores,
       logThisRun
     );
-    if (!result.redo) {
-      return result.istate;
+    popRootNode(stack, root);
+    if (!redo) {
+      return istate;
     }
   }
 }
@@ -13000,13 +13131,13 @@ function typeStateEntry(value2, key) {
   return `${tsKey(key)} = ${display(value2.curType)}`;
 }
 function printBlockState(block, state, indent = "") {
-  (0, import_chunk_OASVKTK5.log)(indent + "State:");
+  (0, import_chunk_NHZRKHZO.log)(indent + "State:");
   if (!state) {
-    (0, import_chunk_OASVKTK5.log)(indent + "Not visited!");
+    (0, import_chunk_NHZRKHZO.log)(indent + "Not visited!");
     return;
   }
   state.map.forEach((value2, key) => {
-    (0, import_chunk_OASVKTK5.log)(
+    (0, import_chunk_NHZRKHZO.log)(
       `${indent} - ${typeStateEntry(value2, key)}${value2.equivSet ? ` [(${Array.from(value2.equivSet).map(tsKey).join(", ")})]` : ""}`
     );
   });
@@ -13104,18 +13235,18 @@ function updateAffected(blockState, objectType, baseDecl, assignedPath, affected
     }
   });
 }
-function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStores, logThisRun) {
+function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStores, logThisRun) {
   const order = getPostOrder(graph).reverse();
   const queue = new DataflowQueue();
-  const isStatic = !!(func.attributes & 8);
-  const klass = func.stack?.[func.stack?.length - 1].sn;
+  const isStatic = !!(root.attributes & 8);
+  const klass = root.stack?.[root.stack?.length - 1].sn;
   const selfClassDecl = klass && klass.type === "ClassDeclaration" ? klass : null;
-  const uninitClassDecls = selfClassDecl && func.name === "initialize" && selfClassDecl.decls ? new Set(
-    Object.values(selfClassDecl.decls).filter(
-      (decls) => decls.some(
+  const uninitClassDecls = selfClassDecl && root.name === "initialize" && selfClassDecl.decls ? new Set(
+    Object.values(selfClassDecl.decls).flatMap(
+      (decls) => decls.filter(
         (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !decl.node.init
       )
-    ).flat()
+    )
   ) : null;
   order.forEach((block, i) => {
     block.order = i;
@@ -13213,7 +13344,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
                   type: 0
                   /* Never */
                 };
-                (0, import_chunk_OASVKTK5.forEach)(avalue, (v) => unionInto(n, v));
+                (0, import_chunk_NHZRKHZO.forEach)(avalue, (v) => unionInto(n, v));
                 next = n;
               }
             } else {
@@ -13318,7 +13449,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       }
       if (!isStatic && selfClassDecl) {
         const baseObj = getObjectValue(baseElem.type);
-        if (baseObj && baseObj.klass.type === 16384 && (0, import_chunk_OASVKTK5.some)(
+        if (baseObj && baseObj.klass.type === 16384 && (0, import_chunk_NHZRKHZO.some)(
           baseObj.klass.value,
           (cls) => cls === selfClassDecl || getSuperClasses(cls)?.has(selfClassDecl) || getSuperClasses(selfClassDecl)?.has(cls) || false
         )) {
@@ -13363,7 +13494,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     return [cur, updateAny];
   }
   function typeConstraint(decls, blockState) {
-    return (0, import_chunk_OASVKTK5.reduce)(
+    return (0, import_chunk_NHZRKHZO.reduce)(
       decls,
       (cur, decl) => {
         if (decl.type === "Identifier" || decl.type === "BinaryExpression") {
@@ -13453,15 +13584,17 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
   }
   const blockStates = [];
   const typeMap = /* @__PURE__ */ new Map();
+  const dependencies = /* @__PURE__ */ new Map();
   const istate = {
     state,
     typeMap,
     stack: [],
-    func
+    root,
+    dependencies
   };
-  const modifiableDecl = (decls, callees) => (0, import_chunk_OASVKTK5.some)(
+  const modifiableDecl = (decls, callees) => (0, import_chunk_NHZRKHZO.some)(
     decls,
-    (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (!callees || (0, import_chunk_OASVKTK5.some)(callees, (callee) => functionMayModify(state, callee, decl)))
+    (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (!callees || (0, import_chunk_NHZRKHZO.some)(callees, (callee) => functionMayModify(state, callee, decl)))
   );
   const mergeSuccState = (top, curState) => {
     top.succs?.forEach((succ) => {
@@ -13470,7 +13603,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       }
       if (mergeTypeState(blockStates, succ.order, curState, nodeCopyProp)) {
         if (logThisRun) {
-          (0, import_chunk_OASVKTK5.log)(`re-merge: ${top.order} -> ${succ.order}`);
+          (0, import_chunk_NHZRKHZO.log)(`re-merge: ${top.order} -> ${succ.order}`);
         }
         queue.enqueue(succ);
       }
@@ -13480,7 +13613,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     const calleeObj = getStateType(curState, calleeObjDecl);
     let calleeResult = null;
     let effectFree = true;
-    (0, import_chunk_OASVKTK5.forEach)(callees, (callee) => {
+    (0, import_chunk_NHZRKHZO.forEach)(callees, (callee) => {
       const info = sysCallInfo(istate.state, callee);
       if (!info) {
         effectFree = false;
@@ -13757,7 +13890,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       });
     } else {
       if (logThisRun) {
-        (0, import_chunk_OASVKTK5.log)(`  Flow (true): merge to ${trueSucc.order || -1}`);
+        (0, import_chunk_NHZRKHZO.log)(`  Flow (true): merge to ${trueSucc.order || -1}`);
         printBlockState(top, sTrue || curState, "    >true ");
       }
       if (mergeTypeState(
@@ -13767,7 +13900,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         nodeCopyProp
       )) {
         if (logThisRun) {
-          (0, import_chunk_OASVKTK5.log)(`re-merge: ${top.order} -> ${trueSucc.order}`);
+          (0, import_chunk_NHZRKHZO.log)(`re-merge: ${top.order} -> ${trueSucc.order}`);
         }
         queue.enqueue(trueSucc);
       }
@@ -13779,7 +13912,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       });
     } else {
       if (logThisRun) {
-        (0, import_chunk_OASVKTK5.log)(`  Flow (false): merge to: ${falseSucc.order || -1}`);
+        (0, import_chunk_NHZRKHZO.log)(`  Flow (false): merge to: ${falseSucc.order || -1}`);
         printBlockState(top, sFalse || curState, "    >false ");
       }
       if (mergeTypeState(
@@ -13789,7 +13922,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         nodeCopyProp
       )) {
         if (logThisRun) {
-          (0, import_chunk_OASVKTK5.log)(`re-merge: ${top.order} -> ${falseSucc.order}`);
+          (0, import_chunk_NHZRKHZO.log)(`re-merge: ${top.order} -> ${falseSucc.order}`);
         }
         queue.enqueue(falseSucc);
       }
@@ -13814,6 +13947,21 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     }
     validateTypeState(curState);
     switch (event.type) {
+      case "imp":
+        switch (event.node.type) {
+          case "ImportModule":
+          case "Using":
+            handleImportUsing(istate.state, event.node);
+            break;
+          case "ModuleDeclaration":
+          case "Program":
+            if (event.stack) {
+              istate.state.stack = event.stack;
+              istate.state.stack = istate.state.stackClone();
+            }
+            break;
+        }
+        break;
       case "kil": {
         const curEntry = getStateEntry(curState, event.decl);
         if (curEntry.equivSet) {
@@ -13864,7 +14012,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           }
         }
         if (logThisRun) {
-          (0, import_chunk_OASVKTK5.log)(
+          (0, import_chunk_NHZRKHZO.log)(
             describeEvent(event).then(
               (eventStr) => `  ${eventStr} == ${display(curEntry.curType)}`
             )
@@ -13874,7 +14022,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       }
       case "mod": {
         if (logThisRun) {
-          (0, import_chunk_OASVKTK5.log)(describeEvent(event).then((eventStr) => `  ${eventStr}`));
+          (0, import_chunk_NHZRKHZO.log)(describeEvent(event).then((eventStr) => `  ${eventStr}`));
         }
         modInterference(curState, event, true, (callees, calleeObj) => {
           clearRelatedCopyPropEvents(curState, null, nodeCopyProp);
@@ -13890,7 +14038,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
               );
             }
           }
-          if (nodeCopyProp.size && event.node.type === "CallExpression" && (0, import_chunk_OASVKTK5.some)(callees, (callee) => inlineRequested(state, callee))) {
+          if (nodeCopyProp.size && event.node.type === "CallExpression" && (0, import_chunk_NHZRKHZO.some)(callees, (callee) => inlineRequested(state, callee))) {
             event.node.arguments.forEach((arg) => {
               const def = nodeCopyProp.get(arg);
               if (def && nodeCopyProp.get(def) !== false) {
@@ -13902,7 +14050,7 @@ function propagateTypes(state, func, 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_OASVKTK5.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d))) {
+            if ((type.value == null || !(type.type & (32768 | 512 | 1024))) && !(0, import_chunk_NHZRKHZO.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d))) {
               return;
             }
             if (modifiableDecl(decl, callees)) {
@@ -13917,7 +14065,7 @@ function propagateTypes(state, func, 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_OASVKTK5.every)(callees, (callee) => callee.info === false) : calleeEffects)) {
+            } else if (type.type & (32768 | 512 | 1024) && (calleeEffects == null ? calleeEffects = !callees || !(0, import_chunk_NHZRKHZO.every)(callees, (callee) => callee.info === false) : calleeEffects)) {
               if (type.value != null && type.type & 32768) {
                 const odata = getObjectValue(tsv.curType);
                 if (odata?.obj) {
@@ -13973,7 +14121,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
             delete before.copyPropItem;
           }
         }
-        const expr = event.node.type === "VariableDeclarator" ? event.node.init || null : event.node;
+        const expr = event.node.type === "VariableDeclarator" || event.node.type === "EnumStringMember" ? event.node.init || null : event.node;
         const type = expr ? evaluate(istate, expr).value : {
           type: 524287
           /* Any */
@@ -13985,7 +14133,15 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           2
           /* Reassign */
         );
-        (0, import_chunk_OASVKTK5.some)(event.decl, (decl) => {
+        if (type.type !== 524287) {
+          if (event.node.type === "EnumStringMember" || event.node.type === "VariableDeclarator" && event.node.kind === "const") {
+            (0, import_chunk_NHZRKHZO.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) => {
           if (decl.type !== "VariableDeclarator" || decl.node.kind !== "var" || !isClassVariable(decl)) {
             return false;
           }
@@ -13993,7 +14149,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           if (affected) {
             const objType = typeFromTypeStateNodes(
               istate.state,
-              (0, import_chunk_OASVKTK5.map)(
+              (0, import_chunk_NHZRKHZO.map)(
                 event.decl,
                 (decl2) => decl2.type === "VariableDeclarator" && decl2.stack[decl2.stack.length - 1].sn
               ).filter(
@@ -14014,7 +14170,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         });
         if (wasComputedDecl) {
           curState.map.forEach((value2, decls) => {
-            if ((0, import_chunk_OASVKTK5.some)(
+            if ((0, import_chunk_NHZRKHZO.some)(
               decls,
               (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl)
             )) {
@@ -14060,14 +14216,14 @@ function propagateTypes(state, func, 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_OASVKTK5.some)(
+                  (0, import_chunk_NHZRKHZO.some)(
                     event2.calleeDecl,
                     (callee) => callee.type === "FunctionDeclaration" && inlineRequested(state, callee)
                   )) {
                     return false;
                   }
                 }
-                if (!event2.decl || isTypeStateKey(event2.decl) && (0, import_chunk_OASVKTK5.some)(
+                if (!event2.decl || isTypeStateKey(event2.decl) && (0, import_chunk_NHZRKHZO.some)(
                   event2.decl,
                   (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" || decl.type === "BinaryExpression" || decl.type === "Identifier"
                 )) {
@@ -14106,13 +14262,13 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           }
         }
         if (uninitClassDecls?.size) {
-          (0, import_chunk_OASVKTK5.forEach)(
+          (0, import_chunk_NHZRKHZO.forEach)(
             event.decl,
             (decl) => uninitClassDecls.has(decl) && curState.inited?.add(decl)
           );
         }
         if (logThisRun) {
-          (0, import_chunk_OASVKTK5.log)(
+          (0, import_chunk_NHZRKHZO.log)(
             describeEvent(event).then(
               (eventStr) => `  ${eventStr} := ${display(type)}`
             )
@@ -14130,7 +14286,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           );
         }
         if (logThisRun) {
-          (0, import_chunk_OASVKTK5.log)(
+          (0, import_chunk_NHZRKHZO.log)(
             describeEvent(event).then(
               (eventStr) => `  ${eventStr} : ${!Array.isArray(event.left) && event.left.type === "MemberDecl" ? `${display(
                 curState.map.get(event.left.base)?.curType || {
@@ -14152,18 +14308,20 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
   const head = blockStates[0];
   if (uninitClassDecls?.size)
     head.inited = /* @__PURE__ */ new Set();
-  func.node.params.forEach((param) => {
-    setStateEvent(
-      head,
-      param,
-      param.type === "BinaryExpression" ? typeFromTypespec(state, param.right) : {
-        type: 524287
-        /* Any */
-      },
-      0
-      /* None */
-    );
-  });
+  if (root.type === "FunctionDeclaration") {
+    root.node.params.forEach((param) => {
+      setStateEvent(
+        head,
+        param,
+        param.type === "BinaryExpression" ? typeFromTypespec(state, param.right) : {
+          type: 524287
+          /* Any */
+        },
+        0
+        /* None */
+      );
+    });
+  }
   queue.enqueue(order[0]);
   while (!queue.empty()) {
     const top = queue.dequeue();
@@ -14188,8 +14346,8 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     }
     if (!successorsHandled) {
       if (logThisRun) {
-        (0, import_chunk_OASVKTK5.log)(
-          `  merge to: ${(0, import_chunk_OASVKTK5.map)(
+        (0, import_chunk_NHZRKHZO.log)(
+          `  merge to: ${(0, import_chunk_NHZRKHZO.map)(
             top.succs,
             (succ) => succ.order || -1
           ).join(", ")}`
@@ -14210,6 +14368,40 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       (0, import_node_assert3.default)(nodeCopyProp.get(value2) === key);
     }
   });
+  order.forEach(
+    (block) => block.events?.forEach((event) => {
+      if (event.type !== "ref")
+        return;
+      (0, import_chunk_NHZRKHZO.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") {
+            return;
+          }
+          const dep = dependencies.get(root2);
+          dependencies.set(
+            root2,
+            (dep ?? 0) | 1
+            /* Type */
+          );
+        } else if (decl.type === "EnumStringMember" && decl.init && decl.init.type !== "Literal") {
+          const e = state.enumMap?.get(decl);
+          if (!e)
+            return;
+          const root2 = e.stack.at(-1)?.sn;
+          if (!root2 || root2.type !== "ModuleDeclaration" && root2.type !== "ClassDeclaration" && root2.type !== "Program") {
+            return;
+          }
+          const dep = dependencies.get(root2);
+          dependencies.set(
+            root2,
+            (dep ?? 0) | 1
+            /* Type */
+          );
+        }
+      });
+    })
+  );
   if (logThisRun) {
     order.forEach((block) => {
       printBlockHeader(block);
@@ -14220,25 +14412,25 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       );
       printBlockTrailer(block);
     });
-    (0, import_chunk_OASVKTK5.log)("====== TypeMap =====");
+    (0, import_chunk_NHZRKHZO.log)("====== TypeMap =====");
     typeMap.forEach((value2, key) => {
-      (0, import_chunk_OASVKTK5.log)(
-        formatAst(key).then(
+      (0, import_chunk_NHZRKHZO.log)(
+        formatAstLongLines(key).then(
           (keyStr) => `${keyStr} = ${display(value2)} ${key.loc && key.loc.source ? ` (${sourceLocation(key.loc)})` : ""}`
         )
       );
     });
-    (0, import_chunk_OASVKTK5.log)("====== EquivMap =====");
+    (0, import_chunk_NHZRKHZO.log)("====== EquivMap =====");
     nodeEquivs.forEach((value2, key) => {
-      (0, import_chunk_OASVKTK5.log)(
-        formatAst(key).then(
+      (0, import_chunk_NHZRKHZO.log)(
+        formatAstLongLines(key).then(
           (keyStr) => `${keyStr} = [${value2.equiv.map(
             (equiv) => tsKey(equiv)
           )}] ${key.loc && key.loc.source ? ` (${sourceLocation(key.loc)})` : ""}`
         )
       );
     });
-    (0, import_chunk_OASVKTK5.log)("====== Copy Prop =====");
+    (0, import_chunk_NHZRKHZO.log)("====== Copy Prop =====");
     nodeCopyProp.forEach((value2, key) => {
       (0, import_node_assert3.default)(value2 !== false);
       if (key.type === "VariableDeclarator" || key.type === "AssignmentExpression") {
@@ -14248,20 +14440,22 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         value2.type === "VariableDeclarator" && value2.init || value2.type === "AssignmentExpression"
       );
       const node = value2.type === "VariableDeclarator" ? value2.init : value2.right;
-      (0, import_chunk_OASVKTK5.log)(
-        formatAst(key).then(
+      (0, import_chunk_NHZRKHZO.log)(
+        formatAstLongLines(key).then(
           (keyStr) => formatAstLongLines(node).then(
             (nodeStr) => `${keyStr} = [${nodeStr}] ${key.loc && key.loc.source ? ` (${sourceLocation(key.loc)})` : ""}`
           )
         )
       );
     });
-  }
-  if (logThisRun) {
-    (0, import_chunk_OASVKTK5.log)(formatAstLongLines(func.node));
+    if (root.nodes) {
+      root.nodes.forEach((stack, node) => (0, import_chunk_NHZRKHZO.log)(formatAstLongLines(node)));
+    } else {
+      (0, import_chunk_NHZRKHZO.log)(formatAstLongLines(root.node));
+    }
     if (copyPropStores) {
       copyPropStores.forEach(({ ref, ant }, node) => {
-        (0, import_chunk_OASVKTK5.log)(
+        (0, import_chunk_NHZRKHZO.log)(
           formatAstLongLines(node).then(
             (nodeStr) => `copy-prop-store: ${nodeStr}${ant ? "!" : ""} => ${nodeCopyProp.get(node) !== ref ? "Failed" : "Success"}`
           )
@@ -14269,16 +14463,16 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       });
     }
   }
-  if (optimizeEquivalencies) {
+  if (root.type === "FunctionDeclaration" && optimizeEquivalencies) {
     if (!nodeEquivs.size && !selfAssignments.size && !nodeCopyProp.size) {
-      return { istate, nodeEquivs };
+      return { istate, nodeEquivs, redo: false };
     }
     if (logThisRun) {
       if (selfAssignments.size) {
-        (0, import_chunk_OASVKTK5.log)("====== Self Assignments =====");
+        (0, import_chunk_NHZRKHZO.log)("====== Self Assignments =====");
         selfAssignments.forEach(
-          (self) => (0, import_chunk_OASVKTK5.log)(
-            formatAst(self).then(
+          (self) => (0, import_chunk_NHZRKHZO.log)(
+            formatAstLongLines(self).then(
               (selfStr) => `${selfStr} (${sourceLocation(self.loc)})`
             )
           )
@@ -14318,7 +14512,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       })
     );
     (0, import_chunk_JDC43A3I.traverseAst)(
-      func.node.body,
+      root.node.body,
       (node) => {
         if (node.type === "AssignmentExpression" && node.operator !== "=" && nodeCopyProp.has(node.left)) {
           const left = (0, import_chunk_JDC43A3I.cloneDeep)(node.left);
@@ -14342,7 +14536,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         if (copyNode) {
           if (node.type === "AssignmentExpression") {
             if (logThisRun) {
-              (0, import_chunk_OASVKTK5.log)(
+              (0, import_chunk_NHZRKHZO.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => `Killing copy-prop assignment ${nodeStr}`
                 )
@@ -14357,7 +14551,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           if (node.type === "VariableDeclarator") {
             (0, import_node_assert3.default)(node.init);
             if (logThisRun) {
-              (0, import_chunk_OASVKTK5.log)(
+              (0, import_chunk_NHZRKHZO.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => `Killing copy-prop variable initialization ${nodeStr}`
                 )
@@ -14378,7 +14572,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
               right: copyNode.right
             };
             if (logThisRun) {
-              (0, import_chunk_OASVKTK5.log)(
+              (0, import_chunk_NHZRKHZO.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => formatAstLongLines(replacement2).then(
                     (repStr) => `copy-prop ${nodeStr} => ${repStr}`
@@ -14391,7 +14585,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
             const init = copyNode.init;
             (0, import_node_assert3.default)(init);
             if (logThisRun) {
-              (0, import_chunk_OASVKTK5.log)(
+              (0, import_chunk_NHZRKHZO.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => formatAstLongLines(init).then(
                     (initStr) => `copy-prop ${nodeStr} => ${initStr}`
@@ -14405,8 +14599,8 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         }
         if (selfAssignments.has(node)) {
           if (logThisRun) {
-            (0, import_chunk_OASVKTK5.log)(
-              formatAst(node).then(
+            (0, import_chunk_NHZRKHZO.log)(
+              formatAstLongLines(node).then(
                 (nodeStr) => `Deleting self assignment: ${nodeStr} (${sourceLocation(
                   node.loc
                 )})`
@@ -14449,7 +14643,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         }, curInfo);
         if (rep === curInfo)
           return null;
-        const name = (0, import_chunk_OASVKTK5.reduce)(
+        const name = (0, import_chunk_NHZRKHZO.reduce)(
           rep.decl,
           (cur, decl) => decl.type === "VariableDeclarator" ? decl.name : cur,
           null
@@ -14457,8 +14651,8 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         if (!name)
           return null;
         if (logThisRun) {
-          (0, import_chunk_OASVKTK5.log)(
-            formatAst(node).then(
+          (0, import_chunk_NHZRKHZO.log)(
+            formatAstLongLines(node).then(
               (nodeStr) => `Replacing ${nodeStr} with ${name} at ${sourceLocation(
                 node.loc
               )}`
@@ -14476,7 +14670,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
   return {
     istate,
     nodeEquivs,
-    redo: optimizeEquivalencies && nodeCopyProp.size
+    redo: optimizeEquivalencies && nodeCopyProp.size !== 0
   };
 }
 function updateByAssocPath(path7, property, update) {
@@ -14588,7 +14782,7 @@ var init_type_flow = (0, import_chunk_ABYVSU2C.__esm)({
     init_type_flow_util();
     init_types();
     init_union_type();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     logging = true;
     missingNullWorkaround = true;
   }
@@ -14640,9 +14834,9 @@ function minimizeLocals(state, func) {
   if (!didMerge)
     return;
   if (logThisRun) {
-    (0, import_chunk_OASVKTK5.log)(`>>> Merging locals in ${func.fullName}`);
+    (0, import_chunk_NHZRKHZO.log)(`>>> Merging locals in ${func.fullName}`);
     merge.forEach(
-      (merged) => merged.length > 1 && (0, import_chunk_OASVKTK5.log)(` - merging ${merged.map((k) => tsKey(k)).join(" | ")}`)
+      (merged) => merged.length > 1 && (0, import_chunk_NHZRKHZO.log)(` - merging ${merged.map((k) => tsKey(k)).join(" | ")}`)
     );
   }
   const remap = /* @__PURE__ */ new Map();
@@ -14912,7 +15106,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_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_variable_renamer();
     init_type_flow_util();
   }
@@ -14923,12 +15117,12 @@ function logAntState(s, decl) {
       defs2++;
     return defs2;
   }, 0);
-  (0, import_chunk_OASVKTK5.log)(
+  (0, import_chunk_NHZRKHZO.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_OASVKTK5.log)(
+  (0, import_chunk_NHZRKHZO.log)(
     `    - members: ${Array.from(s.members).map(([block, live]) => block.order + (live ? "t" : "f")).join(", ")}`
   );
 }
@@ -14945,7 +15139,7 @@ async function sizeBasedPRE(state, func) {
   const candidates = computeAttributes(state, head);
   if (candidates) {
     if (logging2) {
-      (0, import_chunk_OASVKTK5.log)(`Found ${candidates.size} candidates in ${func.fullName}`);
+      (0, import_chunk_NHZRKHZO.log)(`Found ${candidates.size} candidates in ${func.fullName}`);
       logAntDecls(candidates);
     }
     const nodeMap = /* @__PURE__ */ new Map();
@@ -15038,7 +15232,7 @@ function buildPREGraph(state, func) {
       const event = block.events[i];
       switch (event.type) {
         case "ref":
-          if ((0, import_chunk_OASVKTK5.some)(
+          if ((0, import_chunk_NHZRKHZO.some)(
             event.decl,
             (decl) => decl.type === "Literal" || decl.type === "VariableDeclarator" && decl.node.kind === "const"
           )) {
@@ -15056,7 +15250,7 @@ function buildPREGraph(state, func) {
           defs.add(event.decl);
           break;
         case "mod":
-          if (event.callees && (0, import_chunk_OASVKTK5.every)(event.callees, (callee) => callee.info === false)) {
+          if (event.callees && (0, import_chunk_NHZRKHZO.every)(event.callees, (callee) => callee.info === false)) {
             block.events.splice(i, 1);
             break;
           }
@@ -15215,21 +15409,21 @@ function computeAttributes(state, head) {
   });
   if (logging2) {
     order.forEach((block) => {
-      (0, import_chunk_OASVKTK5.log)(
+      (0, import_chunk_NHZRKHZO.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_OASVKTK5.log)(
+          (event) => event.type !== "exn" && (0, import_chunk_NHZRKHZO.log)(
             Promise.resolve(
-              event.decl ? declFullName(event.decl) : event.node ? formatAst(event.node) : "??"
+              event.decl ? declFullName(event.decl) : event.node ? formatAstLongLines(event.node) : "??"
             ).then((eventDetails) => `    ${event.type}: ${eventDetails}`)
           )
         );
       }
-      (0, import_chunk_OASVKTK5.log)(
+      (0, import_chunk_NHZRKHZO.log)(
         `Succs: ${(block.succs || []).map((block2) => block2.order).join(", ")} ExSucc: ${block.exsucc ? block.exsucc.order : ""}`
       );
     });
@@ -15297,7 +15491,7 @@ function computeAttributes(state, head) {
           }
           case "mod": {
             curState.forEach((candidates, decls) => {
-              if ((0, import_chunk_OASVKTK5.some)(
+              if ((0, import_chunk_NHZRKHZO.some)(
                 decls,
                 (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && candidates.live && (!event.callees || event.callees.some(
                   (callee) => functionMayModify(state, callee, decl)
@@ -15339,7 +15533,7 @@ function computeAttributes(state, head) {
     }
     blockStates[top.order] = curState;
     if (logging2) {
-      (0, import_chunk_OASVKTK5.log)(`Updated block ${top.order}`);
+      (0, import_chunk_NHZRKHZO.log)(`Updated block ${top.order}`);
       logAntDecls(curState);
     }
     if (top.preds) {
@@ -15441,8 +15635,8 @@ function applyReplacements(func, nodeMap, declMap) {
             }
             const name = declMap.get(event.decl);
             if (!name) {
-              throw new import_chunk_OASVKTK5.AwaitedError(
-                formatAst(node).then(
+              throw new import_chunk_NHZRKHZO.AwaitedError(
+                formatAstLongLines(node).then(
                   (targetStr) => `No replacement found for "${targetStr}"`
                 )
               );
@@ -15463,8 +15657,8 @@ 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_OASVKTK5.AwaitedError(
-                formatAst(target).then(
+              throw new import_chunk_NHZRKHZO.AwaitedError(
+                formatAstLongLines(target).then(
                   (targetStr) => `No replacement found for "${targetStr}"`
                 )
               );
@@ -15526,14 +15720,14 @@ function applyReplacements(func, nodeMap, declMap) {
           const decl = event.decl;
           const name = declMap.get(decl);
           if (!name) {
-            throw new import_chunk_OASVKTK5.AwaitedError(
+            throw new import_chunk_NHZRKHZO.AwaitedError(
               declFullName(decl).then(
                 (declStr) => `No replacement found for "${declStr}"`
               )
             );
           }
           if (!event.id) {
-            throw new import_chunk_OASVKTK5.AwaitedError(
+            throw new import_chunk_NHZRKHZO.AwaitedError(
               declFullName(decl).then(
                 (declStr) => `Missing id for mod event for "${declStr}"`
               )
@@ -15598,7 +15792,7 @@ var init_pre = (0, import_chunk_ABYVSU2C.__esm)({
     init_data_flow();
     init_function_info();
     init_minimize_locals();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     logging2 = false;
     LocalRefCost = 2;
   }
@@ -15608,8 +15802,8 @@ function minimizeModules(ast, state) {
   try {
     const replacementMap = /* @__PURE__ */ new Map();
     const conflictingNames = /* @__PURE__ */ new Set();
-    state.pre = (node) => {
-      if (state.inType)
+    state.pre = function(node) {
+      if (this.inType)
         return null;
       switch (node.type) {
         case "ModuleDeclaration":
@@ -15640,18 +15834,18 @@ function minimizeModules(ast, state) {
           let toReplace = null;
           let module2 = null;
           let addImport = false;
-          let [, results] = state.lookupValue(current, null);
+          let [, results] = this.lookupValue(current, null);
           let i = 0;
           for (; results && results.length === 1 && results[0].results.length === 1 && (results[0].results[0].type === "Program" || results[0].results[0].type === "ClassDeclaration" || results[0].results[0].type === "ModuleDeclaration"); i++) {
-            if (current.type === "Identifier" && results[0].results[0].type === "ModuleDeclaration" && isImportCandidate(results[0].results[0], state.stack)) {
-              const directResults = i ? state.lookupValue(current, null) : results;
+            if (current.type === "Identifier" && results[0].results[0].type === "ModuleDeclaration" && isImportCandidate(results[0].results[0], this.stack)) {
+              const directResults = i ? this.lookupValue(current, null) : results;
               if (directResults && directResults.length === 1 && directResults[0].results.length === 1 && directResults[0].results[0] === results[0].results[0]) {
                 toReplace = i ? parts[i - 1] : current;
                 module2 = results[0].results[0];
                 if (findUsingForNode(
-                  state,
-                  state.stack,
-                  state.stack.length - 1,
+                  this,
+                  this.stack,
+                  this.stack.length - 1,
                   current
                 ) === directResults[0].results[0]) {
                   addImport = false;
@@ -15667,7 +15861,7 @@ function minimizeModules(ast, state) {
             if (i === parts.length)
               break;
             current = parts[i].property;
-            results = lookupNext(state, results, "decls", current);
+            results = lookupNext(this, results, "decls", current);
           }
           if (toReplace) {
             (0, import_node_assert5.default)(module2);
@@ -15683,6 +15877,7 @@ function minimizeModules(ast, state) {
       }
       return null;
     };
+    delete state.post;
     collectNamespaces(ast, state);
     const mappedNames = /* @__PURE__ */ new Map();
     replacementMap.forEach((value2, key) => {
@@ -15969,7 +16164,7 @@ function beforeEvaluate(istate, node) {
           break;
         }
         const id = node.right.argument;
-        if ((0, import_chunk_OASVKTK5.every)(left.value.value, (m) => {
+        if ((0, import_chunk_NHZRKHZO.every)(left.value.value, (m) => {
           if ((0, import_chunk_JDC43A3I.hasProperty)(m.decls, id.name))
             return false;
           return istate.state.lookup({
@@ -16415,7 +16610,7 @@ var init_optimize = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_JDC43A3I.init_ast)();
     init_inliner();
     init_type_flow();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_interp();
     init_interp_binary();
     init_types();
@@ -16762,6 +16957,7 @@ async function analyze(fnMap, resourcesMap, manifestXML, config, allowParseError
     config,
     allFunctions: {},
     allClasses: [],
+    allModules: /* @__PURE__ */ new Set(),
     shouldExclude(node) {
       if ("attrs" in node && node.attrs && "attributes" in node.attrs && node.attrs.attributes && node.loc?.source) {
         const excludeAnnotations = fnMap[node.loc.source].excludeAnnotations;
@@ -16786,26 +16982,28 @@ async function analyze(fnMap, resourcesMap, manifestXML, config, allowParseError
       }
       return false;
     },
-    pre(node, state2) {
+    pre(node) {
       switch (node.type) {
         case "FunctionDeclaration":
         case "ModuleDeclaration":
         case "ClassDeclaration": {
-          const scope = state2.top().sn;
-          scope.stack = state2.stackClone().slice(0, -1);
+          const scope = this.top().sn;
+          scope.stack = this.stackClone().slice(0, -1);
           if (scope.type === "FunctionDeclaration") {
             if (markApi && node.loc?.source === "api.mir") {
               node.body = null;
-              scope.info = getApiFunctionInfo(state2, scope);
+              scope.info = getApiFunctionInfo(this, scope);
             }
-            const allFuncs = state2.allFunctions;
+            const allFuncs = this.allFunctions;
             if (!(0, import_chunk_JDC43A3I.hasProperty)(allFuncs, scope.name)) {
               allFuncs[scope.name] = [scope];
             } else {
               allFuncs[scope.name].push(scope);
             }
           } else if (scope.type === "ClassDeclaration") {
-            state2.allClasses.push(scope);
+            this.allClasses.push(scope);
+          } else if (scope.type === "ModuleDeclaration") {
+            this.allModules.add(scope);
           }
           break;
         }
@@ -16864,7 +17062,7 @@ function reportMissingSymbols(state, config) {
             diagnostic(
               state,
               node,
-              formatAst(node).then(
+              formatAstLongLines(node).then(
                 (nodeStr) => `The expression ${nodeStr} will fail at runtime using sdk-4.1.6`
               ),
               compiler2DiagnosticType
@@ -16880,7 +17078,9 @@ function reportMissingSymbols(state, config) {
         diagnostic(
           state,
           node,
-          formatAst(node).then((nodeStr) => `Undefined symbol ${nodeStr}`),
+          formatAstLongLines(node).then(
+            (nodeStr) => `Undefined symbol ${nodeStr}`
+          ),
           diagnosticType
         );
         return false;
@@ -16990,11 +17190,11 @@ function markFunctionCalled(state, func) {
     state.calledFunctions[func.id.name] = [func];
     return;
   }
-  (0, import_chunk_OASVKTK5.pushUnique)(state.calledFunctions[func.id.name], func);
+  (0, import_chunk_NHZRKHZO.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_OASVKTK5.AwaitedError ? ex.resolve() : ex)
+    (ex) => Promise.reject(ex instanceof import_chunk_NHZRKHZO.AwaitedError ? ex.resolve() : ex)
   );
 }
 async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
@@ -17025,21 +17225,21 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
     }
     return result;
   };
-  const topLocals = () => state.localsStack[state.localsStack.length - 1];
-  const checkInherited = (elm, name) => elm.superClass === true || elm.superClass != null && elm.superClass.some(
+  const topLocals = (state2) => state2.localsStack[state2.localsStack.length - 1];
+  const checkInherited = (state2, elm, name) => elm.superClass === true || elm.superClass != null && elm.superClass.some(
     (sc) => (0, import_chunk_JDC43A3I.hasProperty)(sc.decls, name) && sc.decls[name].some(
-      (f) => isStateNode(f) && f.type === "FunctionDeclaration" && maybeCalled(state, f.node)
-    ) || sc.superClass && checkInherited(sc, name)
+      (f) => isStateNode(f) && f.type === "FunctionDeclaration" && maybeCalled(state2, f.node)
+    ) || sc.superClass && checkInherited(state2, sc, name)
   );
-  const renamer = (idNode) => {
+  const renamer = (state2, idNode) => {
     const ident = idNode.type === "Identifier" ? idNode : idNode.left;
-    const locals = topLocals();
+    const locals = topLocals(state2);
     const { map: map2 } = locals;
     if (map2) {
       const declName2 = ident.name;
-      const name = renameVariable(state, locals, declName2);
+      const name = renameVariable(state2, locals, declName2);
       if (name) {
-        const [, results] = state.lookupValue(ident);
+        const [, results] = state2.lookupValue(ident);
         if (!results) {
           throw new Error(
             `Didn't find local ${declName2} which needed renaming`
@@ -17094,7 +17294,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
     gistate.checkTypes = state.config?.checkTypes || "WARNING";
   }
   let istate = gistate;
-  state.pre = (node) => {
+  state.pre = function(node) {
     const ret = preEvaluate(istate, node);
     switch (node.type) {
       case "EnumDeclaration":
@@ -17104,20 +17304,23 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
       case "EnumStringMember":
         return ["init"];
       case "ForStatement": {
-        const map2 = topLocals().map;
+        const map2 = topLocals(this).map;
         if (map2) {
-          state.localsStack.push({ node, map: { ...map2 } });
+          this.localsStack.push({ node, map: { ...map2 } });
         }
         break;
       }
       case "VariableDeclarator": {
-        renamer(node.id);
+        renamer(this, node.id);
         break;
       }
       case "CatchClause":
         if (node.param) {
-          state.localsStack.push({ node, map: { ...topLocals().map || {} } });
-          renamer(node.param);
+          this.localsStack.push({
+            node,
+            map: { ...topLocals(this).map || {} }
+          });
+          renamer(this, node.param);
         }
         break;
       case "BinaryExpression":
@@ -17126,13 +17329,13 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
         }
         break;
       case "Identifier": {
-        const map2 = topLocals().map;
+        const map2 = topLocals(this).map;
         if ((0, import_chunk_JDC43A3I.hasProperty)(map2, node.name)) {
           const name = map2[node.name];
           if (typeof name === "string") {
             renameIdentifier(node, name);
           }
-          const [, results] = state.lookupValue(node);
+          const [, results] = this.lookupValue(node);
           if (results) {
             if (results.length !== 1 || results[0].results.length !== 1) {
               throw new Error(`Local ${node.name} had multiple lookup results`);
@@ -17159,7 +17362,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
       case "UpdateExpression": {
         const lhs = node.type === "AssignmentExpression" ? node.left : node.argument;
         if (lhs.type === "Identifier") {
-          const map2 = topLocals().map;
+          const map2 = topLocals(this).map;
           if (map2) {
             if ((0, import_chunk_JDC43A3I.hasProperty)(map2, lhs.name)) {
               const name = map2[lhs.name];
@@ -17169,12 +17372,12 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
             }
           }
         } else if (lhs.type === "MemberExpression") {
-          const object = state.traverse(lhs.object);
+          const object = this.traverse(lhs.object);
           if (object) {
             lhs.object = object;
           }
           if (!isLookupCandidate(lhs)) {
-            const property = state.traverse(lhs.property);
+            const property = this.traverse(lhs.property);
             if (property) {
               lhs.property = property;
             }
@@ -17183,9 +17386,9 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
         return node.type === "AssignmentExpression" ? ["right"] : [];
       }
       case "BlockStatement": {
-        const map2 = topLocals().map;
+        const map2 = topLocals(this).map;
         if (map2) {
-          state.localsStack.push({
+          this.localsStack.push({
             node,
             map: { ...map2 }
           });
@@ -17195,34 +17398,34 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
       case "FunctionDeclaration": {
         const map2 = {};
         node.params && node.params.forEach((p) => map2[variableDeclarationName(p)] = true);
-        state.localsStack.push({ node, map: map2 });
-        const [{ sn: parent }, { sn: self }] = state.stack.slice(-2);
-        if (state.currentFunction) {
+        this.localsStack.push({ node, map: map2 });
+        const [{ sn: parent }, { sn: self }] = this.stack.slice(-2);
+        if (this.currentFunction) {
           throw new Error(
-            `Nested functions: ${self.fullName} was activated during processing of ${state.currentFunction.fullName}`
+            `Nested functions: ${self.fullName} was activated during processing of ${this.currentFunction.fullName}`
           );
         }
-        state.currentFunction = self;
-        const is = !state.config?.propagateTypes || node.attrs?.attributes?.elements.find(
+        this.currentFunction = self;
+        const is = !this.config?.propagateTypes || node.attrs?.attributes?.elements.find(
           (attr) => attr.type === "UnaryExpression" && attr.argument.name === "noConstProp"
-        ) ? null : buildTypeInfo(state, state.currentFunction, true);
+        ) ? null : buildTypeInfo(this, this.currentFunction, true);
         if (is) {
-          is.state = state;
-          if (state.config?.checkTypes !== "OFF" && state.config?.trustDeclaredTypes) {
+          is.state = this;
+          if (this.config?.checkTypes !== "OFF" && this.config?.trustDeclaredTypes) {
             is.typeChecker = gistate.typeChecker;
-            is.checkTypes = state.config?.checkTypes || "WARNING";
+            is.checkTypes = this.config?.checkTypes || "WARNING";
           }
           istate = is;
         }
-        if (parent.type === "ClassDeclaration" && !maybeCalled(state, node)) {
+        if (parent.type === "ClassDeclaration" && !maybeCalled(this, node)) {
           let used = false;
           if (node.id.name === "initialize") {
             used = true;
           } else if (parent.superClass) {
-            used = checkInherited(parent, node.id.name);
+            used = checkInherited(this, parent, node.id.name);
           }
           if (used) {
-            markFunctionCalled(state, node);
+            markFunctionCalled(this, node);
           }
         }
         return ["body"];
@@ -17233,10 +17436,10 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
     }
     return ret;
   };
-  state.post = (node) => {
-    const locals = topLocals();
+  state.post = function(node) {
+    const locals = topLocals(this);
     if (locals.node === node) {
-      state.localsStack.pop();
+      this.localsStack.pop();
     }
     const opt = optimizeNode(istate, node);
     if (opt != null) {
@@ -17247,28 +17450,28 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
         if (node.body && evaluateFunction(istate, node, null) !== false) {
           node.optimizable = true;
         }
-        if (!state.currentFunction) {
+        if (!this.currentFunction) {
           throw new Error(
-            `Finished function ${state.top().sn.fullName}, but it was not marked current`
+            `Finished function ${this.top().sn.fullName}, but it was not marked current`
           );
         }
-        state.currentFunction.info = state.currentFunction.next_info || false;
-        delete state.currentFunction.next_info;
-        delete state.currentFunction;
+        this.currentFunction.info = this.currentFunction.next_info || false;
+        delete this.currentFunction.next_info;
+        delete this.currentFunction;
         if (istate.stack.length) {
           throw new Error("Stack was not empty");
         }
         istate = gistate;
         if (again) {
           again = false;
-          const top = state.stack.pop();
-          state.traverse(node);
-          state.stack.push(top);
+          const top = this.stack.pop();
+          this.traverse(node);
+          this.stack.push(top);
         }
         break;
       case "BlockStatement":
       case "ForStatement":
-        if (locals.map && cleanupUnusedVars(state, node) && !state.inlining) {
+        if (locals.map && cleanupUnusedVars(this, node) && !this.inlining) {
           again = true;
         }
         break;
@@ -17285,29 +17488,26 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
         }
         break;
       case "Identifier":
-        if ((0, import_chunk_JDC43A3I.hasProperty)(state.index, node.name)) {
-          state.usedByName[node.name] = true;
+        if ((0, import_chunk_JDC43A3I.hasProperty)(this.index, node.name)) {
+          this.usedByName[node.name] = true;
         }
         break;
       case "MemberExpression": {
         const property = isLookupCandidate(node);
         if (property) {
-          if ((0, import_chunk_JDC43A3I.hasProperty)(state.index, property.name)) {
-            state.usedByName[property.name] = true;
+          if ((0, import_chunk_JDC43A3I.hasProperty)(this.index, property.name)) {
+            this.usedByName[property.name] = true;
           }
         }
         break;
       }
       case "NewExpression":
-        if (state.currentFunction) {
-          const [, results] = state.lookup(node.callee);
+        if (this.currentFunction) {
+          const [, results] = this.lookup(node.callee);
           if (results) {
-            recordCalledFuncs(
-              state.currentFunction,
-              findCalleesForNew(results)
-            );
+            recordCalledFuncs(this.currentFunction, findCalleesForNew(results));
           } else {
-            recordModifiedUnknown(state.currentFunction);
+            recordModifiedUnknown(this.currentFunction);
           }
         }
         break;
@@ -17315,11 +17515,11 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
         return optimizeCallHelper(istate, node, null);
       }
       case "VariableDeclaration": {
-        const locals2 = topLocals();
+        const locals2 = topLocals(this);
         if (!locals2.map) {
           if (again) {
             again = false;
-            state.traverse(node);
+            this.traverse(node);
           }
           break;
         }
@@ -17378,12 +17578,12 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
           if (call) {
             let ok = false;
             if (node.expression.left.type === "Identifier") {
-              if ((0, import_chunk_JDC43A3I.hasProperty)(topLocals().map, node.expression.left.type)) {
+              if ((0, import_chunk_JDC43A3I.hasProperty)(topLocals(this).map, node.expression.left.type)) {
                 ok = true;
               }
             }
             if (!ok && node.expression.operator === "=") {
-              const [, result] = state.lookup(node.expression.left);
+              const [, result] = this.lookup(node.expression.left);
               ok = !!result;
             }
             if (ok) {
@@ -17391,7 +17591,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
             }
           }
         } else {
-          return unused(state, node.expression, true);
+          return unused(this, node.expression, true);
         }
         break;
       case "UpdateExpression": {
@@ -17406,17 +17606,17 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
         delete n.prefix;
       }
       case "AssignmentExpression":
-        if (state.currentFunction) {
+        if (this.currentFunction) {
           const lhs = node.type === "AssignmentExpression" ? node.left : node.argument;
-          const [, results] = state.lookup(lhs);
+          const [, results] = this.lookup(lhs);
           if (results) {
-            recordModifiedDecls(state.currentFunction, results);
+            recordModifiedDecls(this.currentFunction, results);
           } else {
             const id = lhs.type === "Identifier" ? lhs : isLookupCandidate(lhs);
             if (id) {
-              recordModifiedName(state.currentFunction, id.name);
+              recordModifiedName(this.currentFunction, id.name);
             } else {
-              recordModifiedUnknown(state.currentFunction);
+              recordModifiedUnknown(this.currentFunction);
             }
           }
         }
@@ -17433,22 +17633,22 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
     Changes2[Changes2["Some"] = 1] = "Some";
     Changes2[Changes2["Force"] = 2] = "Force";
   })(Changes || (Changes = {}));
-  const cleanupAll = () => {
-    const usedDecls = findRezRefs(state);
-    const pre = state.pre;
-    const post = state.post;
+  const cleanupAll = (state2) => {
+    const usedDecls = findRezRefs(state2);
+    const pre = state2.pre;
+    const post = state2.post;
     try {
-      delete state.pre;
+      delete state2.pre;
       return Object.values(fnMap).reduce(
         (changes, f) => {
-          state.post = (node) => {
+          state2.post = function(node) {
             if (usedDecls.has(node)) {
               return null;
             }
-            const ret = cleanup(state, node, f.ast, usedDecls);
+            const ret = cleanup(this, node, f.ast, usedDecls);
             if (ret === false) {
               changes |= 1;
-              state.removeNodeComments(node, f.ast);
+              this.removeNodeComments(node, f.ast);
             } else if (ret) {
               if (node.type === "EnumDeclaration" && ret.type === "TypedefDeclaration" && ret.ts.argument.ts.length > 1) {
                 changes |= 2;
@@ -17458,15 +17658,15 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
             }
             return ret;
           };
-          collectNamespaces(f.ast, state);
+          collectNamespaces(f.ast, state2);
           return changes;
         },
         0
         /* None */
       );
     } finally {
-      state.pre = pre;
-      state.post = post;
+      state2.pre = pre;
+      state2.post = post;
     }
   };
   while (true) {
@@ -17479,7 +17679,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
     });
     state.exposed = state.nextExposed;
     state.nextExposed = {};
-    const changes = cleanupAll();
+    const changes = cleanupAll(state);
     if (changes & 2 || changes & 1 && state.config?.iterateOptimizer) {
       continue;
     }
@@ -17499,7 +17699,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
     ),
     Promise.resolve()
   );
-  cleanupAll();
+  cleanupAll(state);
   config.checkCompilerLookupRules = checkLookupRules;
   reportMissingSymbols(state, config);
   Object.values(fnMap).forEach(
@@ -17760,7 +17960,7 @@ var init_mc_rewrite = (0, import_chunk_ABYVSU2C.__esm)({
     init_sub_type();
     init_types();
     init_unused_exprs();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_variable_renamer();
   }
 });
@@ -18211,10 +18411,10 @@ function add_one_resource(state, doc, module2, e, barrelNames) {
             {
               type: "VariableDeclarator",
               kind: "var",
-              id: {
+              id: id2 && !init ? {
                 type: "BinaryExpression",
                 operator: "as",
-                left: (0, import_chunk_JDC43A3I.makeIdentifier)(id2 ? id2.value.value : "*invalid*", loc),
+                left: (0, import_chunk_JDC43A3I.makeIdentifier)(id2.value.value, loc),
                 right: {
                   type: "TypeSpecList",
                   ts: [
@@ -18226,7 +18426,7 @@ function add_one_resource(state, doc, module2, e, barrelNames) {
                     }
                   ]
                 }
-              },
+              } : (0, import_chunk_JDC43A3I.makeIdentifier)(id2 ? id2.value.value : "*invalid*", loc),
               init
             },
             outer
@@ -18466,7 +18666,7 @@ function visitReferences(state, ast, name, defn, callback, includeDefs = false,
   };
   const { pre, post } = state;
   try {
-    state.pre = (node) => {
+    state.pre = function(node) {
       if (filter && !filter(node))
         return [];
       switch (node.type) {
@@ -18491,7 +18691,7 @@ function visitReferences(state, ast, name, defn, callback, includeDefs = false,
                 );
               }
             }
-          } else if (state.inType && node.operator === "as") {
+          } else if (this.inType && node.operator === "as") {
             return ["right"];
           }
           break;
@@ -18519,13 +18719,13 @@ function visitReferences(state, ast, name, defn, callback, includeDefs = false,
           break;
         }
         case "MethodDefinition": {
-          if (!state.inType) {
+          if (!this.inType) {
             throw new Error("Method definition outside of type!");
           }
           if (node.params) {
             node.params.forEach((param) => {
               if (param.type === "BinaryExpression") {
-                state.traverse(param.right);
+                this.traverse(param.right);
               }
             });
           }
@@ -18556,7 +18756,7 @@ function visitReferences(state, ast, name, defn, callback, includeDefs = false,
             visitDef(node.id, node);
           }
           if (node.id.type === "BinaryExpression") {
-            state.traverse(node.id.right);
+            this.traverse(node.id.right);
           }
           return ["init"];
         case "EnumDeclaration":
@@ -18570,7 +18770,7 @@ function visitReferences(state, ast, name, defn, callback, includeDefs = false,
         case "EnumStringMember": {
           if (!filter || filter(node.id)) {
             checkResults(
-              [node.id.name, [{ parent: state.top().sn, results: [node] }]],
+              [node.id.name, [{ parent: this.top().sn, results: [node] }]],
               node
             );
           }
@@ -18580,7 +18780,7 @@ function visitReferences(state, ast, name, defn, callback, includeDefs = false,
           if (includeDefs)
             break;
           if (node.param && node.param.type !== "Identifier") {
-            state.traverse(node.param.right);
+            this.traverse(node.param.right);
           }
           return ["body"];
       }
@@ -18627,6 +18827,28 @@ function checkCompilerVersion(version, sdkVer) {
   }
   return sdkVer <= v2;
 }
+function pushRootNode(stack, root) {
+  if (root.type === "Program")
+    return;
+  const sn = root.stack?.at(-1)?.sn?.decls?.[root.name]?.find(
+    (sn2) => sn2.type === root.type && (root.nodes != null || sn2.node === root.node)
+  );
+  if (!sn) {
+    throw new Error(`Invalid stack for node ${root.fullName}`);
+  }
+  if (root.nodes) {
+    sn.node = root.node;
+  }
+  stack.push({ sn });
+}
+function popRootNode(stack, root) {
+  if (root.type === "Program")
+    return;
+  if (stack.at(-1)?.sn.node !== root.node) {
+    throw new Error(`Invalid stack for node ${root.fullName}`);
+  }
+  stack.pop();
+}
 async function getApiMapping(state, resourcesMap, manifestXML) {
   const parser = import_prettier_plugin_monkeyc4.default.parsers.monkeyc;
   const sdk = await getSdkPath();
@@ -18670,7 +18892,7 @@ async function getApiMapping(state, resourcesMap, manifestXML) {
       throw `Negative constant ${fixup} was not a Literal`;
     }
     if (typeof init.value !== "number") {
-      (0, import_chunk_OASVKTK5.log)(`Negative fixup ${fixup} was not a number!`);
+      (0, import_chunk_NHZRKHZO.log)(`Negative fixup ${fixup} was not a number!`);
     } else if (init.value > 0) {
       init.value = -init.value;
       init.raw = "-" + init.raw;
@@ -18760,11 +18982,11 @@ function sameStateNodeDecl(a, b) {
 function sameLookupDefinition(a, b) {
   return (
     // sameStateNodeDecl(a.parent, b.parent) &&
-    (0, import_chunk_OASVKTK5.sameArrays)(a.results, b.results, (ar, br) => sameStateNodeDecl(ar, br))
+    (0, import_chunk_NHZRKHZO.sameArrays)(a.results, b.results, (ar, br) => sameStateNodeDecl(ar, br))
   );
 }
 function sameLookupResult(a, b) {
-  return (0, import_chunk_OASVKTK5.sameArrays)(a, b, sameLookupDefinition);
+  return (0, import_chunk_NHZRKHZO.sameArrays)(a, b, sameLookupDefinition);
 }
 function declKey(decl) {
   return isStateNode(decl) ? decl.type === "ModuleDeclaration" ? decl.fullName : decl.node : decl;
@@ -18967,7 +19189,7 @@ function lookup(state, decls, node, name, maybeStack, nonlocal, ignoreImports) {
             diagnostic(
               state,
               node,
-              formatAst(node).then(
+              formatAstLongLines(node).then(
                 (nodeStr) => `${nodeStr} is ambiguous and exists in multiple imported modules [${imp.map(({ name: name2 }) => name2).join(", ")}]`
               ),
               state.config?.checkInvalidSymbols || "WARNING"
@@ -18983,7 +19205,7 @@ function lookup(state, decls, node, name, maybeStack, nonlocal, ignoreImports) {
               diagnostic(
                 state,
                 node,
-                formatAst(node).then(
+                formatAstLongLines(node).then(
                   (nodeStr) => `${nodeStr} will only be found when compiled with compiler2 at -O1 or above`
                 ),
                 state.config?.checkCompilerLookupRules || "WARNING",
@@ -19059,6 +19281,27 @@ function lookupWithType(state, node, typeMap, nonLocal = false, stack = null) {
   }
   return results;
 }
+function handleImportUsing(state, node) {
+  const parent = { ...state.stack.pop() };
+  state.stack.push(parent);
+  parent.usings = parent.usings ? { ...parent.usings } : {};
+  const name = node.type === "Using" && node.as && node.as.name || (node.id.type === "Identifier" ? node.id.name : node.id.property.name);
+  const using = { node };
+  parent.usings[name] = using;
+  if (node.type === "ImportModule") {
+    if (!parent.imports) {
+      parent.imports = [using];
+    } else {
+      parent.imports = parent.imports.slice();
+      const index = parent.imports.findIndex(
+        (using2) => (using2.node.id.type === "Identifier" ? using2.node.id.name : using2.node.id.property.name) === name
+      );
+      if (index >= 0)
+        parent.imports.splice(index, 1);
+      parent.imports.push(using);
+    }
+  }
+}
 function stateFuncs() {
   let currentEnum = null;
   return {
@@ -19116,7 +19359,7 @@ function stateFuncs() {
             switch (node.type) {
               case "MemberExpression": {
                 if (isLookupCandidate(node)) {
-                  return (this.pre && this.pre(node, this)) ?? ["object"];
+                  return (this.pre && this.pre(node)) ?? ["object"];
                 }
                 break;
               }
@@ -19132,6 +19375,9 @@ function stateFuncs() {
                   throw new Error("Unexpected stack length for Program node");
                 }
                 this.stack[0].sn.node = node;
+                if (this.rezAst !== node && !this.stack[0].sn.nodes?.has(node) && node.loc?.source !== "api.mir") {
+                  this.stack[0].sn.nodes?.set(node, this.stackClone());
+                }
                 break;
               case "TypeSpecList":
               case "TypeSpecPart":
@@ -19139,25 +19385,7 @@ function stateFuncs() {
                 break;
               case "ImportModule":
               case "Using": {
-                const parent = { ...this.stack.pop() };
-                this.stack.push(parent);
-                parent.usings = parent.usings ? { ...parent.usings } : {};
-                const name = node.type === "Using" && node.as && node.as.name || (node.id.type === "Identifier" ? node.id.name : node.id.property.name);
-                const using = { node };
-                parent.usings[name] = using;
-                if (node.type === "ImportModule") {
-                  if (!parent.imports) {
-                    parent.imports = [using];
-                  } else {
-                    parent.imports = parent.imports.slice();
-                    const index = parent.imports.findIndex(
-                      (using2) => (using2.node.id.type === "Identifier" ? using2.node.id.name : using2.node.id.property.name) === name
-                    );
-                    if (index >= 0)
-                      parent.imports.splice(index, 1);
-                    parent.imports.push(using);
-                  }
-                }
+                handleImportUsing(this, node);
                 break;
               }
               case "CatchClause":
@@ -19217,9 +19445,21 @@ function stateFuncs() {
                   if (!parent.decls)
                     parent.decls = {};
                   if ((0, import_chunk_JDC43A3I.hasProperty)(parent.decls, name)) {
-                    const what = node.type === "ModuleDeclaration" ? "type" : "node";
+                    if (node.type === "ModuleDeclaration") {
+                      const e2 = parent.decls[name].find(
+                        (d) => isStateNode(d) && d.type === "ModuleDeclaration"
+                      );
+                      if (e2 != null) {
+                        e2.node = node;
+                        if (!e2.nodes.has(node) && node.loc?.source && /\.mc$/.test(node.loc?.source)) {
+                          e2.nodes.set(node, this.stackClone().slice(0, -1));
+                        }
+                        this.top().sn = e2;
+                        break;
+                      }
+                    }
                     const e = parent.decls[name].find(
-                      (d) => isStateNode(d) && d[what] === elm[what]
+                      (d) => isStateNode(d) && d.node === elm.node
                     );
                     if (e != null) {
                       e.node = node;
@@ -19243,6 +19483,15 @@ function stateFuncs() {
                       parent.type_decls[name] = [];
                     }
                     parent.type_decls[name].push(elm);
+                    if (elm.type === "ModuleDeclaration") {
+                      elm.nodes = /* @__PURE__ */ new Map();
+                      if (node.loc?.source !== "api.mir") {
+                        elm.nodes.set(
+                          node,
+                          this.stackClone().slice(0, -1)
+                        );
+                      }
+                    }
                   }
                   break;
                 }
@@ -19317,7 +19566,7 @@ function stateFuncs() {
                     if (!(0, import_chunk_JDC43A3I.hasProperty)(this.index, name)) {
                       this.index[name] = [];
                     }
-                    (0, import_chunk_OASVKTK5.pushUnique)(this.index[name], parent);
+                    (0, import_chunk_NHZRKHZO.pushUnique)(this.index[name], parent);
                   }
                 });
                 break;
@@ -19372,7 +19621,7 @@ function stateFuncs() {
                   if (!(0, import_chunk_JDC43A3I.hasProperty)(values, name)) {
                     values[name] = [];
                   }
-                  if ((0, import_chunk_OASVKTK5.pushUnique)(values[name], m) && currentEnum) {
+                  if ((0, import_chunk_NHZRKHZO.pushUnique)(values[name], m) && currentEnum) {
                     if (!this.enumMap)
                       this.enumMap = /* @__PURE__ */ new Map();
                     this.enumMap.set(m, currentEnum);
@@ -19380,13 +19629,13 @@ function stateFuncs() {
                   if (!(0, import_chunk_JDC43A3I.hasProperty)(this.index, name)) {
                     this.index[name] = [];
                   }
-                  (0, import_chunk_OASVKTK5.pushUnique)(this.index[name], parent);
+                  (0, import_chunk_NHZRKHZO.pushUnique)(this.index[name], parent);
                 });
                 break;
               }
             }
             if (this.pre)
-              return this.pre(node, this);
+              return this.pre(node);
           } catch (e) {
             handleException(this, node, e);
           }
@@ -19400,7 +19649,7 @@ function stateFuncs() {
             } else {
               const type = node.type;
               if (this.post)
-                ret = this.post(node, this);
+                ret = this.post(node);
               switch (type) {
                 case "EnumDeclaration":
                   currentEnum = null;
@@ -19455,11 +19704,13 @@ function collectNamespaces(ast, stateIn) {
           name: "$",
           fullName: "$",
           node: void 0,
+          nodes: /* @__PURE__ */ new Map(),
           attributes: 0
           /* NONE */
         }
       }
     ];
+    state.stack[0].sn.stack = [state.stack[0]];
   }
   if (!state.lookupRules) {
     const rules = state?.config?.compilerLookupRules || "DEFAULT";
@@ -19472,7 +19723,11 @@ function collectNamespaces(ast, stateIn) {
       }
     }
   }
-  Object.assign(state, stateFuncs());
+  if (!state.traverse) {
+    state.diagnostics = {};
+    state.inlineDiagnostics = {};
+    Object.assign(state, stateFuncs());
+  }
   state.inType = 0;
   state.traverse(ast);
   if (state.inType) {
@@ -19509,6 +19764,7 @@ function formatAst(node, monkeyCSource = null, options = null) {
       ...options || {},
       parser: "monkeyc-json",
       plugins: [import_prettier_plugin_monkeyc4.default],
+      pluginSearchDirs: false,
       endOfLine: "lf"
     })
   );
@@ -19570,6 +19826,23 @@ function formatScopedName(node) {
   return `${formatScopedName(node.object)}.${node.property.name}`;
 }
 function formatAstLongLines(node) {
+  const filter = (s) => s.type !== "ClassDeclaration" && s.type !== "ModuleDeclaration" && s.type !== "FunctionDeclaration";
+  switch (node.type) {
+    case "ClassDeclaration":
+      node = { ...node };
+      node.body = { ...node.body };
+      node.body.body = node.body.body.filter((c) => filter(c.item));
+      break;
+    case "ModuleDeclaration":
+      node = { ...node };
+      node.body = { ...node.body };
+      node.body.body = node.body.body.filter(filter);
+      break;
+    case "Program":
+      node = { ...node };
+      node.body = node.body.filter(filter);
+      break;
+  }
   return formatAst(node, null, { printWidth: 1e4 });
 }
 async function createDocumentationMap(functionDocumentation) {
@@ -19712,7 +19985,7 @@ function findUsing(state, stack, using) {
     diagnostic(
       state,
       using.node.id,
-      formatAst(using.node.id).then(
+      formatAstLongLines(using.node.id).then(
         (nodeStr) => `Unable to resolve import of ${nodeStr}`
       ),
       state.config?.checkInvalidSymbols || "WARNING"
@@ -19881,7 +20154,7 @@ var init_api = (0, import_chunk_ABYVSU2C.__esm)({
     init_sdk_util();
     init_type_flow_util();
     init_types();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_visitor();
   }
 });
@@ -19900,11 +20173,11 @@ async function declFullName(decl) {
     case "BinaryExpression":
       return decl.left.name;
     case "EnumStringMember":
-      return decl.init ? `${decl.id.name}:${await formatAst(decl.init)}` : decl.id.name;
+      return decl.init ? `${decl.id.name}:${await formatAstLongLines(decl.init)}` : decl.id.name;
     case "MemberDecl":
       return `${await declFullName(decl.base)}->${decl.path.join(".")}`;
     case "Unknown":
-      return `Unknown:${await formatAst(decl.node)}`;
+      return `Unknown:${await formatAstLongLines(decl.node)}`;
     default:
       unhandledType(decl);
   }
@@ -19935,7 +20208,7 @@ function unhandledType(node) {
     `Unhandled expression type: ${node.type}`
   );
 }
-function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wantsAllRefs) {
+function buildDataFlowGraph(state, root, wantsLiteral, trackInsertionPoints, wantsAllRefs) {
   const uniqueDeclMap = /* @__PURE__ */ new Map();
   const lookupDefToDecl = (results) => {
     const decls = results.reduce(
@@ -19965,7 +20238,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
       return decls;
     }
     if (canon.length !== decls.length || !canon.every((v, i) => v === decls[i])) {
-      throw new import_chunk_OASVKTK5.AwaitedError(
+      throw new import_chunk_NHZRKHZO.AwaitedError(
         declFullName(canon).then(
           (canonStr) => `Canonical representation of ${canonStr} did not match`
         )
@@ -19999,7 +20272,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
     }
     const decl = lookupDefToDecl(results);
     if (decl && path7.length) {
-      if (wantsAllRefs && (0, import_chunk_OASVKTK5.every)(
+      if (wantsAllRefs && (0, import_chunk_NHZRKHZO.every)(
         decl,
         (d) => d.type === "VariableDeclarator" || d.type === "BinaryExpression" || d.type === "Identifier"
       )) {
@@ -20035,7 +20308,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
     identifiers,
     graph: buildReducedGraph(
       state,
-      func,
+      root,
       wantsAllRefs,
       (node, stmt, mayThrow2, getContainedEvents) => {
         if (mayThrow2 === 1) {
@@ -20051,7 +20324,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
             }
             const v = liveDefs.get(def);
             if (!v || !v.has(node)) {
-              throw new import_chunk_OASVKTK5.AwaitedError(
+              throw new import_chunk_NHZRKHZO.AwaitedError(
                 Promise.resolve(def ? declFullName(def) : "null").then(
                   (defStr) => `No stmt in liveDef for ${defStr}`
                 )
@@ -20065,7 +20338,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
         }
         if (wantsAllRefs) {
           const scope = state.top().sn;
-          if (scope.node === node && scope.type === "BlockStatement" && scope.decls && state.stack.length - 2 !== func.stack?.length) {
+          if (scope.node === node && scope.type === "BlockStatement" && scope.decls && state.stack.length - 2 !== root.stack?.length) {
             return Object.values(scope.decls).map((value2) => {
               const decl = lookupDefToDecl([
                 { parent: null, results: value2 }
@@ -20075,6 +20348,20 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
           }
         }
         switch (node.type) {
+          case "ImportModule":
+          case "Using":
+            return { type: "imp", node, mayThrow: false };
+          case "ModuleDeclaration":
+          case "Program":
+            if (root.node === node || root.nodes?.has(node)) {
+              return {
+                type: "imp",
+                node,
+                stack: state.stackClone(),
+                mayThrow: false
+              };
+            }
+            break;
           case "BinaryExpression":
           case "UnaryExpression":
           case "SizedArrayExpression":
@@ -20109,7 +20396,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
             const decls = findDecl(node);
             if (!decls)
               break;
-            if (trackInsertionPoints && (0, import_chunk_OASVKTK5.some)(decls, (decl) => {
+            if (trackInsertionPoints && (0, import_chunk_NHZRKHZO.some)(decls, (decl) => {
               if (decl.type === "VariableDeclarator") {
                 const defStmts = decl.node.kind === "var" && liveDefs.get(null) || liveDefs.get(decl);
                 if (defStmts) {
@@ -20127,6 +20414,22 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
               mayThrow: mayThrow2
             };
           }
+          case "EnumStringMember": {
+            if (node.init && node.init.type !== "Literal") {
+              const decl = findDecl(node.id);
+              if (decl) {
+                liveDef(decl, stmt);
+                const def = {
+                  type: "def",
+                  node,
+                  decl,
+                  mayThrow: mayThrow2
+                };
+                return def;
+              }
+            }
+            break;
+          }
           case "VariableDeclarator": {
             const decl = findDecl(
               node.id.type === "BinaryExpression" ? node.id.left : node.id
@@ -20360,8 +20663,8 @@ var init_data_flow = (0, import_chunk_ABYVSU2C.__esm)({
     init_control_flow();
     init_function_info();
     init_type_flow_util();
-    (0, import_chunk_OASVKTK5.init_util)();
-    DataflowQueue = class extends import_chunk_OASVKTK5.GenericQueue {
+    (0, import_chunk_NHZRKHZO.init_util)();
+    DataflowQueue = class extends import_chunk_NHZRKHZO.GenericQueue {
       constructor() {
         super((b, a) => (a.order || 0) - (b.order || 0));
       }
@@ -21156,7 +21459,7 @@ function computeJsrMap(func) {
 }
 function postOrderPropagate(func, preBlock, processBc, postBlock, merge) {
   const order = /* @__PURE__ */ new Map();
-  const queue = new import_chunk_OASVKTK5.GenericQueue(
+  const queue = new import_chunk_NHZRKHZO.GenericQueue(
     (b, a) => order.get(a) - order.get(b)
   );
   postOrderTraverse2(func, (block) => {
@@ -21215,7 +21518,7 @@ function rpoPropagate(func, preBlock, processBc, postBlock, merge) {
     });
     blocks.reverse().forEach((block, i) => order.set(block, i));
   }
-  const queue = new import_chunk_OASVKTK5.GenericQueue(
+  const queue = new import_chunk_NHZRKHZO.GenericQueue(
     (b, a) => order.get(a) - order.get(b)
   );
   queue.enqueue(func.blocks.get(func.offset));
@@ -21269,7 +21572,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_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_opcodes();
   }
 });
@@ -21732,12 +22035,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_OASVKTK5.wouldLog)("interp", 1);
+  const interpLogging = (0, import_chunk_NHZRKHZO.wouldLog)("interp", 1);
   if (interpLogging) {
-    if ((0, import_chunk_OASVKTK5.wouldLog)("interp", 7)) {
-      (0, import_chunk_OASVKTK5.setBanner)(functionBanner(func, context, "interp"));
-    } else if ((0, import_chunk_OASVKTK5.wouldLog)("interp", 3)) {
-      (0, import_chunk_OASVKTK5.setBanner)(
+    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)(
         () => `+++++++++++++ interp-prepare ${func.name} ++++++++++++++`
       );
     }
@@ -21771,20 +22074,20 @@ function interpFunc(func, context) {
     func,
     (block) => {
       if (interpLogging) {
-        (0, import_chunk_OASVKTK5.logger)(
+        (0, import_chunk_NHZRKHZO.logger)(
           "interp",
           3,
           `${offsetToString(block.offset)}: ${block.bytecodes[0]?.lineNum ? lineInfoToString(block.bytecodes[0]?.lineNum, context) : ""}
  ${interpStateToString(liveInState.get(block.offset))}`
         );
-        (0, import_chunk_OASVKTK5.logger)("interp", 9, () => blockToString(block, context));
+        (0, import_chunk_NHZRKHZO.logger)("interp", 9, () => blockToString(block, context));
       }
       return cloneState2(liveInState.get(block.offset));
     },
     (block, bc, localState) => {
       if (interpLogging) {
-        if ((0, import_chunk_OASVKTK5.wouldLog)("interp", 8)) {
-          (0, import_chunk_OASVKTK5.log)(
+        if ((0, import_chunk_NHZRKHZO.wouldLog)("interp", 8)) {
+          (0, import_chunk_NHZRKHZO.log)(
             `${interpStateToString(localState)}
     ${bytecodeToString(
               bc,
@@ -21949,14 +22252,14 @@ function interpFunc(func, context) {
       if (!mergeInto(localState, succState))
         return false;
       if (interpLogging) {
-        (0, import_chunk_OASVKTK5.logger)("interp", 3, `Re-Merge to ${offsetToString(succBlock.offset)}`);
+        (0, import_chunk_NHZRKHZO.logger)("interp", 3, `Re-Merge to ${offsetToString(succBlock.offset)}`);
       }
       return true;
     }
   );
   if (interpLogging) {
-    if ((0, import_chunk_OASVKTK5.wouldLog)("interp", 5)) {
-      (0, import_chunk_OASVKTK5.setBanner)(
+    if ((0, import_chunk_NHZRKHZO.wouldLog)("interp", 5)) {
+      (0, import_chunk_NHZRKHZO.setBanner)(
         functionBanner(func, context, "interp", (block, footer) => {
           if (footer)
             return "";
@@ -21964,44 +22267,44 @@ function interpFunc(func, context) {
         })
       );
     } else {
-      (0, import_chunk_OASVKTK5.setBanner)(() => `=============== interp ${func.name} ==============`);
+      (0, import_chunk_NHZRKHZO.setBanner)(() => `=============== interp ${func.name} ==============`);
     }
     if (equivSets.size) {
-      (0, import_chunk_OASVKTK5.log)(`====== equivSets =====`);
+      (0, import_chunk_NHZRKHZO.log)(`====== equivSets =====`);
       equivSets.forEach(
-        (value2, key) => (0, import_chunk_OASVKTK5.log)(
+        (value2, key) => (0, import_chunk_NHZRKHZO.log)(
           `L${key.arg} === ${Array.from(value2).sort().join(" ")} ${key.lineNum ? lineInfoToString(key.lineNum, context) : ""}`
         )
       );
     }
     if (selfStores.size) {
-      (0, import_chunk_OASVKTK5.log)(`====== selfStores =====`);
+      (0, import_chunk_NHZRKHZO.log)(`====== selfStores =====`);
       selfStores.forEach(
-        (value2) => (0, import_chunk_OASVKTK5.log)(`${bytecodeToString(value2, symbolTable)}`)
+        (value2) => (0, import_chunk_NHZRKHZO.log)(`${bytecodeToString(value2, symbolTable)}`)
       );
     }
     if (replacements.size) {
-      (0, import_chunk_OASVKTK5.log)(`====== replacements =====`);
+      (0, import_chunk_NHZRKHZO.log)(`====== replacements =====`);
       replacements.forEach(
         (blockRep) => blockRep.forEach(
-          (rep, bc) => (0, import_chunk_OASVKTK5.log)(
+          (rep, bc) => (0, import_chunk_NHZRKHZO.log)(
             `${bytecodeToString(bc, symbolTable)} => ${rep.invert ? "~" : ""}${bytecodeToString(rep, symbolTable)} ${bc.lineNum ? lineInfoToString(bc.lineNum, context) : ""}`
           )
         )
       );
     }
     if (resolvedBranches.size) {
-      (0, import_chunk_OASVKTK5.log)(`====== resolved branches =====`);
+      (0, import_chunk_NHZRKHZO.log)(`====== resolved branches =====`);
       resolvedBranches.forEach(
-        (isTaken, block) => (0, import_chunk_OASVKTK5.log)(
+        (isTaken, block) => (0, import_chunk_NHZRKHZO.log)(
           `block ${offsetToString(block.offset)} is ${isTaken ? "always" : "never"} taken`
         )
       );
     }
     if (branchRedirects.size) {
-      (0, import_chunk_OASVKTK5.log)(`====== redirected branches =====`);
+      (0, import_chunk_NHZRKHZO.log)(`====== redirected branches =====`);
       branchRedirects.forEach(
-        ({ to, from }, block) => (0, import_chunk_OASVKTK5.log)(
+        ({ to, from }, block) => (0, import_chunk_NHZRKHZO.log)(
           `block ${offsetToString(
             block.offset
           )} redirects from ${offsetToString(from)} to ${offsetToString(to)}${safeBranchBlocks.get(from) ? ` popping ${safeBranchBlocks.get(from)}` : ""}`
@@ -22064,7 +22367,7 @@ function interpFunc(func, context) {
     }
   });
   if (interpLogging)
-    (0, import_chunk_OASVKTK5.setBanner)(null);
+    (0, import_chunk_NHZRKHZO.setBanner)(null);
   return {
     liveInState,
     equivSets,
@@ -22114,7 +22417,7 @@ var init_interp2 = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/interp.ts"() {
     "use strict";
     init_interp_binary();
-    (0, import_chunk_OASVKTK5.init_logger)();
+    (0, import_chunk_NHZRKHZO.init_logger)();
     init_interp();
     init_types();
     init_union_type();
@@ -22226,7 +22529,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_OASVKTK5.logger)(
+    (0, import_chunk_NHZRKHZO.logger)(
       "array-init",
       1,
       () => `${func.name}: Removing initialization of default initialized ${putvStarts.length} element array init at block ${offsetToString(
@@ -22263,7 +22566,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         convertAputv(offset - 1);
       }
     }
-    (0, import_chunk_OASVKTK5.logger)(
+    (0, import_chunk_NHZRKHZO.logger)(
       "array-init",
       1,
       () => `${func.name}: Optimizing unused ${putvStarts.length} element array init at block ${offsetToString(
@@ -22272,8 +22575,8 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         block.bytecodes[index].offset
       )}`
     );
-    if ((0, import_chunk_OASVKTK5.wouldLog)("array-init", 5)) {
-      (0, import_chunk_OASVKTK5.log)(blockToString(block, context));
+    if ((0, import_chunk_NHZRKHZO.wouldLog)("array-init", 5)) {
+      (0, import_chunk_NHZRKHZO.log)(blockToString(block, context));
     }
     return true;
   }
@@ -22313,7 +22616,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
     if (putvStarts.length < 3)
       return false;
     tryLocal(3);
-    (0, import_chunk_OASVKTK5.logger)(
+    (0, import_chunk_NHZRKHZO.logger)(
       "array-init",
       1,
       () => `${func.name}: Optimizing ${putvStarts.length} element array init with constant initializer ${bytecodeToString(
@@ -22339,7 +22642,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         block.bytecodes[index + 1].arg = putvStarts.length;
       }
     }
-    (0, import_chunk_OASVKTK5.logger)(
+    (0, import_chunk_NHZRKHZO.logger)(
       "array-init",
       5,
       () => `index: ${index}, i: ${i}
@@ -22392,7 +22695,7 @@ ${blockToString(block, context)}`
   for (let i2 = putvStarts.length; i2-- > 1; ) {
     block.bytecodes.splice(putvStarts[i2], 2);
   }
-  (0, import_chunk_OASVKTK5.logger)(
+  (0, import_chunk_NHZRKHZO.logger)(
     "array-init",
     1,
     () => `${func.name}: Optimizing ${putvStarts.length} element array init at block ${offsetToString(
@@ -22451,15 +22754,15 @@ var init_array_init = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/array-init.ts"() {
     "use strict";
     init_types();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_bytecode();
     init_interp2();
     init_opcodes();
   }
 });
 function localDCE(func, context) {
-  if ((0, import_chunk_OASVKTK5.wouldLog)("dce", 5)) {
-    (0, import_chunk_OASVKTK5.setBanner)(
+  if ((0, import_chunk_NHZRKHZO.wouldLog)("dce", 5)) {
+    (0, import_chunk_NHZRKHZO.setBanner)(
       functionBanner(
         func,
         context,
@@ -22492,7 +22795,7 @@ function localDCE(func, context) {
   };
   func.blocks.forEach((block) => {
     const reportPopv = (i, item, kill) => {
-      (0, import_chunk_OASVKTK5.logger)(
+      (0, import_chunk_NHZRKHZO.logger)(
         "dce",
         2,
         () => `${func.name}: Convert ${i}:${bytecodeToString(
@@ -22507,7 +22810,7 @@ function localDCE(func, context) {
       );
     };
     const reportNop = (item) => {
-      (0, import_chunk_OASVKTK5.logger)(
+      (0, import_chunk_NHZRKHZO.logger)(
         "dce",
         2,
         () => `${func.name}: Kill ${item.deps.map(
@@ -22526,7 +22829,7 @@ function localDCE(func, context) {
         case 19: {
           const liveLocal = dceInfo.locals.has(bytecode.arg);
           if (!liveLocal && (bytecode.arg || context.config.allowForbiddenOpts)) {
-            (0, import_chunk_OASVKTK5.logger)(
+            (0, import_chunk_NHZRKHZO.logger)(
               "dce",
               2,
               () => `${func.name}: Killing store to unused local ${bytecode.arg} at ${offsetToString(block.offset)}:${i}`
@@ -22686,10 +22989,10 @@ function localDCE(func, context) {
         (bc) => bc.op !== 0
         /* nop */
       );
-      (0, import_chunk_OASVKTK5.logger)("dce", 3, functionBanner(func, context, "local-dce-end"));
+      (0, import_chunk_NHZRKHZO.logger)("dce", 3, functionBanner(func, context, "local-dce-end"));
     }
   });
-  (0, import_chunk_OASVKTK5.setBanner)(null);
+  (0, import_chunk_NHZRKHZO.setBanner)(null);
   return anyChanges;
 }
 function computeLiveLocals(func) {
@@ -22740,7 +23043,7 @@ var init_dce = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/dce.ts"() {
     "use strict";
     init_data_flow();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_bytecode();
     init_cflow();
     init_opcodes();
@@ -22780,7 +23083,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_OASVKTK5.logger)("locals", 10, functionBanner(func, context, "Minimize Locals"));
+  (0, import_chunk_NHZRKHZO.logger)("locals", 10, functionBanner(func, context, "Minimize Locals"));
   let argc = func.argc ?? null;
   const colors = /* @__PURE__ */ new Map();
   const merge = [];
@@ -22847,15 +23150,15 @@ function minimizeLocals2(func, equivSets, context) {
       }
     }
   }
-  if ((0, import_chunk_OASVKTK5.wouldLog)("locals", 1)) {
-    if (!(0, import_chunk_OASVKTK5.wouldLog)("locals", 10)) {
-      (0, import_chunk_OASVKTK5.logger)("locals", 5, functionBanner(func, context, "Minimize Locals"));
+  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"));
     }
-    (0, import_chunk_OASVKTK5.log)(
+    (0, import_chunk_NHZRKHZO.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_OASVKTK5.log)(
+      (merged) => (0, import_chunk_NHZRKHZO.log)(
         ` ${colors.get(merged[0])} - ${merged.map((k) => bytecodeToString(k, context.symbolTable)).join(" | ")}`
       )
     );
@@ -23154,7 +23457,7 @@ function mergeSplitRanges(splitRanges) {
 var init_locals = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/locals.ts"() {
     "use strict";
-    (0, import_chunk_OASVKTK5.init_logger)();
+    (0, import_chunk_NHZRKHZO.init_logger)();
     init_bytecode();
     init_cflow();
     init_opcodes();
@@ -23267,16 +23570,16 @@ function sizeBasedPRE2(func, context) {
       delete bc.arg;
     return bc;
   };
-  if ((0, import_chunk_OASVKTK5.wouldLog)("pre", 1)) {
-    if ((0, import_chunk_OASVKTK5.wouldLog)("pre", 5)) {
-      (0, import_chunk_OASVKTK5.log)(functionBanner(func, context, "PRE")());
+  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")());
     } else {
-      (0, import_chunk_OASVKTK5.log)(`================ PRE : ${func.name} ================
+      (0, import_chunk_NHZRKHZO.log)(`================ PRE : ${func.name} ================
 `);
     }
     insertionBlocks.forEach((o, key) => {
       const bcs = canonicalMap.get(key);
-      (0, import_chunk_OASVKTK5.log)(
+      (0, import_chunk_NHZRKHZO.log)(
         `Replacing ${bcs.size} instances of ${bytecodeToString(
           bcs.values().next().value,
           context.symbolTable
@@ -23359,13 +23662,13 @@ function sizeBasedPRE2(func, context) {
       bytecode(1, insertionBlocks.size)
     );
   }
-  (0, import_chunk_OASVKTK5.logger)("pre", 5, functionBanner(func, context, "post-PRE"));
+  (0, import_chunk_NHZRKHZO.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_OASVKTK5.init_logger)();
+    (0, import_chunk_NHZRKHZO.init_logger)();
     init_bytecode();
     init_cflow();
     init_opcodes();
@@ -23398,9 +23701,9 @@ function blockSharing(func, context) {
   if (!any)
     return false;
   any = false;
-  const logging3 = (0, import_chunk_OASVKTK5.wouldLog)("sharing", 1);
-  if (logging3 && (0, import_chunk_OASVKTK5.wouldLog)("sharing", 10)) {
-    (0, import_chunk_OASVKTK5.setBanner)(functionBanner(func, context, "sharing"));
+  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"));
   }
   candidates.forEach((blocks) => {
     while (blocks.size > 1) {
@@ -23536,9 +23839,9 @@ function blockSharing(func, context) {
                 block2.offset
               )})` : `block(${offsetToString(block2.offset)})`;
             };
-            (0, import_chunk_OASVKTK5.log)(`Sharing ${showBlock(block)} with ${showBlock(target)}`);
-            if ((0, import_chunk_OASVKTK5.wouldLog)("sharing", 5)) {
-              (0, import_chunk_OASVKTK5.log)(blockToString(target, context));
+            (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));
             }
           }
           if (target.bytecodes.length > length2) {
@@ -23565,13 +23868,13 @@ function blockSharing(func, context) {
       });
     }
   });
-  (0, import_chunk_OASVKTK5.setBanner)(null);
+  (0, import_chunk_NHZRKHZO.setBanner)(null);
   return any;
 }
 var init_sharing = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/sharing.ts"() {
     "use strict";
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_bytecode();
     init_opcodes();
   }
@@ -23635,7 +23938,7 @@ function doArrayInits(func, liveInState, context) {
 }
 function simpleOpts(func, context) {
   const equalsSym = 8388787;
-  const logging3 = (0, import_chunk_OASVKTK5.wouldLog)("optimize", 5);
+  const logging3 = (0, import_chunk_NHZRKHZO.wouldLog)("optimize", 5);
   return Array.from(func.blocks.values()).reduce((changes, block) => {
     for (let i = block.bytecodes.length; i--; ) {
       const cur = block.bytecodes[i];
@@ -23643,7 +23946,7 @@ function simpleOpts(func, context) {
         block.bytecodes.splice(i, 1);
         changes = true;
         if (logging3) {
-          (0, import_chunk_OASVKTK5.log)(`${func.name}: deleting ${bytecodeToString(cur, null)}`);
+          (0, import_chunk_NHZRKHZO.log)(`${func.name}: deleting ${bytecodeToString(cur, null)}`);
         }
       } else if (cur.op === 74 && context.config.removeArgc && context.config.allowForbiddenOpts) {
         const arg = cur.arg.incsp;
@@ -23652,7 +23955,7 @@ function simpleOpts(func, context) {
         incsp.arg = arg;
         changes = true;
         if (logging3) {
-          (0, import_chunk_OASVKTK5.log)(`${func.name}: argcincsp => incsp`);
+          (0, import_chunk_NHZRKHZO.log)(`${func.name}: argcincsp => incsp`);
         }
       } else if (i && cur.op === 39 && cur.arg === equalsSym) {
         changes = equalSymbolToEq(block, i) || changes;
@@ -23663,7 +23966,7 @@ function simpleOpts(func, context) {
           if (!shift && prev.op === 37) {
             block.bytecodes.splice(i - 1, 2);
             changes = true;
-            logging3 && (0, import_chunk_OASVKTK5.log)(`${func.name}: deleting no-op shift (${shift})`);
+            logging3 && (0, import_chunk_NHZRKHZO.log)(`${func.name}: deleting no-op shift (${shift})`);
             continue;
           }
           if (shift === 1n && prev.op === 37) {
@@ -23673,7 +23976,7 @@ function simpleOpts(func, context) {
             const add = cur;
             add.op = 3;
             delete add.arg;
-            logging3 && (0, import_chunk_OASVKTK5.log)(`${func.name}: converting "ipush 1; shlv" to "dup 0; addv"`);
+            logging3 && (0, import_chunk_NHZRKHZO.log)(`${func.name}: converting "ipush 1; shlv" to "dup 0; addv"`);
             continue;
           }
           if (shift < (prev.op === 49 ? 64n : 31n)) {
@@ -23683,7 +23986,7 @@ function simpleOpts(func, context) {
             } else {
               prev.arg = BigInt.asIntN(64, mul);
             }
-            logging3 && (0, import_chunk_OASVKTK5.log)(
+            logging3 && (0, import_chunk_NHZRKHZO.log)(
               `${func.name}: converting shlv(${shift}) to mulv(${prev.arg})`
             );
             changes = true;
@@ -23697,14 +24000,14 @@ function simpleOpts(func, context) {
         func.blocks.get(block.taken).preds.delete(block.offset);
         delete block.taken;
         changes = true;
-        logging3 && (0, import_chunk_OASVKTK5.log)(`${func.name}: deleting empty finally handler`);
+        logging3 && (0, import_chunk_NHZRKHZO.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_OASVKTK5.log)(
+            (0, import_chunk_NHZRKHZO.log)(
               `${func.name}: converting ${Opcodes[cur.op]} to ${Opcodes[newOp]}`
             );
           }
@@ -23717,7 +24020,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_OASVKTK5.log)(
+              (0, import_chunk_NHZRKHZO.log)(
                 `${func.name}: simplifying ${next.bytecodes[next.bytecodes.length - 1].op === 7 ? "'&&'" : "'||'"} at ${offsetToString(block.offset)}:${offsetToString(
                   next.offset
                 )}:${offsetToString(taken.offset)}:`
@@ -23734,7 +24037,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_OASVKTK5.log)(
+              (0, import_chunk_NHZRKHZO.log)(
                 `${func.name}: simplifying ${taken.bytecodes[taken.bytecodes.length - 1].op === 7 ? "'&&'" : "'||'"} at ${offsetToString(block.offset)}:${offsetToString(
                   taken.offset
                 )}:${offsetToString(next.offset)}:`
@@ -23782,7 +24085,7 @@ function equalSymbolToEq(block, equalsIndex) {
     op: 26,
     offset: invokem.offset
   });
-  (0, import_chunk_OASVKTK5.logger)(
+  (0, import_chunk_NHZRKHZO.logger)(
     "optimize",
     1,
     `Replacing <thing>.equals(:symbol) with <thing> eq :symbol at ${offsetToString(
@@ -23842,7 +24145,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_OASVKTK5.logger)(
+          (0, import_chunk_NHZRKHZO.logger)(
             "cfg",
             1,
             () => `${func.name}: ${offsetToString(
@@ -23865,7 +24168,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_OASVKTK5.logger)(
+          (0, import_chunk_NHZRKHZO.logger)(
             "cfg",
             1,
             () => `${func.name}: ${offsetToString(
@@ -23890,7 +24193,7 @@ function removeUnreachableCatches(func, context) {
       switch (last.op) {
         case 41:
         case 40:
-          (0, import_chunk_OASVKTK5.logger)(
+          (0, import_chunk_NHZRKHZO.logger)(
             "cfg",
             1,
             () => `${func.name}: killing no-op ${bytecodeToString(
@@ -23913,7 +24216,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_OASVKTK5.logger)(
+          (0, import_chunk_NHZRKHZO.logger)(
             "cfg",
             1,
             `${func.name}: killing unused try-catch at ${offsetToString(
@@ -23930,8 +24233,8 @@ function removeUnreachableCatches(func, context) {
   });
 }
 function cleanCfg2(func, context) {
-  if ((0, import_chunk_OASVKTK5.wouldLog)("cfg", 10)) {
-    (0, import_chunk_OASVKTK5.setBanner)(functionBanner(func, context, "sharing"));
+  if ((0, import_chunk_NHZRKHZO.wouldLog)("cfg", 10)) {
+    (0, import_chunk_NHZRKHZO.setBanner)(functionBanner(func, context, "sharing"));
   }
   removeNoOpBlocks(func);
   removeUnreachableCatches(func, context);
@@ -23946,12 +24249,12 @@ function cleanCfg2(func, context) {
     (0, import_node_assert12.default)(!block.preds?.size);
     func.blocks.delete(block.offset);
   });
-  (0, import_chunk_OASVKTK5.setBanner)(null);
+  (0, import_chunk_NHZRKHZO.setBanner)(null);
 }
 var init_optimize2 = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/optimize.ts"() {
     "use strict";
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_array_init();
     init_bytecode();
     init_cflow();
@@ -24566,21 +24869,21 @@ function optimizeBytecode(context) {
       functions.forEach(callback);
       return;
     }
-    (0, import_chunk_OASVKTK5.bumpLogging)(null, 10);
+    (0, import_chunk_NHZRKHZO.bumpLogging)(null, 10);
     functions.forEach((func) => {
       if (loggerFunc.test(func.name ?? "<null>")) {
-        (0, import_chunk_OASVKTK5.bumpLogging)(null, -10);
+        (0, import_chunk_NHZRKHZO.bumpLogging)(null, -10);
         callback(func);
-        (0, import_chunk_OASVKTK5.bumpLogging)(null, 10);
+        (0, import_chunk_NHZRKHZO.bumpLogging)(null, 10);
         return;
       }
       callback(func);
     });
-    (0, import_chunk_OASVKTK5.bumpLogging)(null, -10);
+    (0, import_chunk_NHZRKHZO.bumpLogging)(null, -10);
   };
-  if ((0, import_chunk_OASVKTK5.wouldLog)("list-input", 1)) {
+  if ((0, import_chunk_NHZRKHZO.wouldLog)("list-input", 1)) {
     forEachFunction(
-      (func) => (0, import_chunk_OASVKTK5.wouldLog)("list-input", 1) && printFunction(func, context)
+      (func) => (0, import_chunk_NHZRKHZO.wouldLog)("list-input", 1) && printFunction(func, context)
     );
   }
   forEachFunction((func) => optimizeFunc(func, context));
@@ -24598,7 +24901,7 @@ function optimizeBytecode(context) {
   forEachFunction((func) => {
     if (!func.name)
       return;
-    (0, import_chunk_OASVKTK5.logger)(
+    (0, import_chunk_NHZRKHZO.logger)(
       "bytecode",
       5,
       `${func.name}: ${offset.toString(16)} ${offset - func.offset}`
@@ -24607,7 +24910,7 @@ function optimizeBytecode(context) {
   });
   const { offsetMap } = updateInfo;
   offsetMap.set(code.byteLength, offset);
-  (0, import_chunk_OASVKTK5.logger)(
+  (0, import_chunk_NHZRKHZO.logger)(
     "bytecode",
     1,
     `${context.filepath}: code size: ${context.sections[
@@ -24619,9 +24922,9 @@ function optimizeBytecode(context) {
     ].length - offset}`
   );
   fixSectionSize(-1059145026, context.sections, offset);
-  if ((0, import_chunk_OASVKTK5.wouldLog)("list-output", 1)) {
+  if ((0, import_chunk_NHZRKHZO.wouldLog)("list-output", 1)) {
     forEachFunction(
-      (func) => (0, import_chunk_OASVKTK5.wouldLog)("list-output", 1) && printFunction(func, context)
+      (func) => (0, import_chunk_NHZRKHZO.wouldLog)("list-output", 1) && printFunction(func, context)
     );
   }
   fixupHeader(context, updateInfo);
@@ -24711,7 +25014,7 @@ ${functionToString(
 ---------------- ${func.name} ----------------`;
 }
 function printFunction(func, context) {
-  (0, import_chunk_OASVKTK5.log)(functionToString(func, context));
+  (0, import_chunk_NHZRKHZO.log)(functionToString(func, context));
 }
 function functionToString(func, context, extra) {
   const parts = [];
@@ -25142,7 +25445,7 @@ var init_bytecode = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     (0, import_chunk_JDC43A3I.init_ast)();
     init_sdk_util();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_data();
     init_emit();
     init_exceptions();
@@ -25428,10 +25731,10 @@ async function build_project(product, options, lineCallback) {
   ].flat();
   if (!returnCommand) {
     const handlers = [
-      lineCallback || ((line) => (0, import_chunk_OASVKTK5.log)(line)),
+      lineCallback || ((line) => (0, import_chunk_NHZRKHZO.log)(line)),
       (line) => console.error(line)
     ];
-    await (0, import_chunk_OASVKTK5.spawnByLine)(exe, args, handlers, {
+    await (0, import_chunk_NHZRKHZO.spawnByLine)(exe, args, handlers, {
       cwd: workspace
     });
   }
@@ -25441,7 +25744,7 @@ var init_build = (0, import_chunk_ABYVSU2C.__esm)({
   "src/build.ts"() {
     "use strict";
     init_sdk_util();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
   }
 });
 var require_ms = (0, import_chunk_ABYVSU2C.__commonJS)({
@@ -28408,7 +28711,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_OASVKTK5.globSome)(resolved, () => true);
+          cache.resolvedPaths[resolved] = (0, import_chunk_NHZRKHZO.globSome)(resolved, () => true);
         } else {
           cache.resolvedPaths[resolved] = fs5.stat(resolved).then(
             () => true,
@@ -28487,12 +28790,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_OASVKTK5.globa)(pattern, { mark: true })
+            (pattern) => (0, import_chunk_NHZRKHZO.globa)(pattern, { mark: true })
           )
         ).then(
           (patterns) => Promise.all(
             patterns.flat().map(
-              (path7) => path7.endsWith("/") ? (0, import_chunk_OASVKTK5.globa)(`${path7}**/*.xml`, { mark: true }) : path7
+              (path7) => path7.endsWith("/") ? (0, import_chunk_NHZRKHZO.globa)(`${path7}**/*.xml`, { mark: true }) : path7
             )
           )
         ).then(
@@ -28552,7 +28855,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_OASVKTK5.globa)(p)))).flat();
+    const files = (await Promise.all(filePatterns.map((p) => (0, import_chunk_NHZRKHZO.globa)(p)))).flat();
     sourceExcludes.push(...files);
   }
   const excludeAnnotations = excludes.map((e) => e.annotation?.value.value).filter((f) => f != null);
@@ -28729,15 +29032,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_OASVKTK5.globa)(path7, { mark: true }))).then(
+    Promise.all(barrelPath.map((path7) => (0, import_chunk_NHZRKHZO.globa)(path7, { mark: true }))).then(
       (paths) => [
         paths.flat().filter((path7) => path7.endsWith(".jungle")).join(";")
       ]
     )
-  ) : (0, import_chunk_OASVKTK5.globa)(barrelPath, { mark: true }).then(
+  ) : (0, import_chunk_NHZRKHZO.globa)(barrelPath, { mark: true }).then(
     (paths) => Promise.all(
       paths.map(
-        (path7) => path7.endsWith("/") ? (0, import_chunk_OASVKTK5.globa)(`${path7}**/*.barrel`) : path7
+        (path7) => path7.endsWith("/") ? (0, import_chunk_NHZRKHZO.globa)(`${path7}**/*.barrel`) : path7
       )
     )
   ).then(
@@ -28745,7 +29048,7 @@ function find_barrels(barrelPath, buildDependencies) {
       (path7) => path7.endsWith(".jungle") || path7.endsWith(".barrel")
     )
   )).then((paths) => {
-    (0, import_chunk_OASVKTK5.forEach)(
+    (0, import_chunk_NHZRKHZO.forEach)(
       barrelPath,
       (path7) => /[*?[\]{}]/.test(path7) || (buildDependencies[path7] = true)
     );
@@ -29022,7 +29325,7 @@ var init_jungles = (0, import_chunk_ABYVSU2C.__esm)({
     init_api();
     init_manifest();
     init_sdk_util();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     depth = 0;
   }
 });
@@ -29050,7 +29353,7 @@ async function launchSimulator(force = true) {
       await new Promise((r) => setTimeout(r, 200));
     }
   } catch (e) {
-    (0, import_chunk_OASVKTK5.log)(e);
+    (0, import_chunk_NHZRKHZO.log)(e);
   }
 }
 function checkIfSimulatorRunning() {
@@ -29081,10 +29384,10 @@ function simulateProgram(prg, device, test = false, logger2) {
     }
   }
   return getSdkPath().then(
-    (sdk) => (0, import_chunk_OASVKTK5.spawnByLine)(
+    (sdk) => (0, import_chunk_NHZRKHZO.spawnByLine)(
       path3.resolve(sdk, "bin", isWin ? "monkeydo.bat" : "monkeydo"),
       args,
-      logger2 || ((line) => (0, import_chunk_OASVKTK5.log)(line))
+      logger2 || ((line) => (0, import_chunk_NHZRKHZO.log)(line))
     ).then(() => {
       return;
     })
@@ -29094,7 +29397,107 @@ var init_launch = (0, import_chunk_ABYVSU2C.__esm)({
   "src/launch.ts"() {
     "use strict";
     init_sdk_util();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
+  }
+});
+async function analyze_module_types(state) {
+  if (!state.config?.propagateTypes || !state.config.trustDeclaredTypes || state.config.checkTypes === "OFF") {
+    return null;
+  }
+  const typeChecker = state.config.strictTypeCheck?.toLowerCase() === "on" ? subtypeOf : couldBeWeak;
+  const checkTypes = state.config?.checkTypes || "WARNING";
+  const rootList = [
+    state.stack[0].sn,
+    ...state.allModules,
+    ...state.allClasses
+  ];
+  const modulesSet = new Set(rootList);
+  const typeMap = /* @__PURE__ */ new Map();
+  const moduleMap = /* @__PURE__ */ new Map();
+  const dependencies = /* @__PURE__ */ new Map();
+  for (const module2 of modulesSet) {
+    modulesSet.delete(module2);
+    const istate = buildTypeInfo(state, module2, false);
+    await (0, import_chunk_NHZRKHZO.log)();
+    if (istate?.typeMap) {
+      moduleMap.set(module2, istate);
+      istate.dependencies?.forEach((flags, other) => {
+        if (other === module2)
+          return;
+        const depMap = dependencies.get(other);
+        if (depMap) {
+          depMap.set(module2, (depMap.get(module2) ?? 0) | flags);
+        } else {
+          dependencies.set(other, /* @__PURE__ */ new Map([[module2, flags]]));
+        }
+      });
+      let changes = false;
+      let promise = null;
+      istate.typeMap?.forEach((value2, key) => {
+        const old = typeMap.get(key);
+        if (!old) {
+          changes = true;
+        } else if (!subtypeOf(value2, old)) {
+          if (promise)
+            return;
+          promise = formatAstLongLines(key).then((nodeStr) => {
+            throw new Error(
+              `New type for ${nodeStr} was not a subtype. Old: ${display(
+                old
+              )} vs New: ${display(value2)}`
+            );
+          });
+        } else if (!changes && !subtypeOf(old, value2)) {
+          changes = true;
+        }
+        typeMap.set(key, value2);
+      });
+      promise && await promise;
+      if (changes) {
+        const depMap = dependencies.get(module2);
+        depMap?.forEach((flags, other) => {
+          if (flags & 1) {
+            modulesSet.add(other);
+          }
+        });
+      }
+    }
+  }
+  rootList.push(...Object.values(state.allFunctions).flat());
+  for (const root of rootList) {
+    const istate = moduleMap.get(root) ?? buildTypeInfo(state, root, false);
+    if (istate) {
+      istate.typeChecker = typeChecker;
+      istate.checkTypes = checkTypes;
+      if (root.nodes) {
+        const saved = istate.state.stack;
+        root.nodes.forEach((stack, node) => {
+          istate.state.stack = stack.slice();
+          pushRootNode(istate.state.stack, root);
+          evaluate(istate, node);
+          popRootNode(istate.state.stack, root);
+        });
+        istate.state.stack = saved;
+      } else {
+        pushRootNode(istate.state.stack, root);
+        evaluate(istate, root.node);
+        popRootNode(istate.state.stack, root);
+      }
+      istate.typeMap?.forEach((value2, key) => typeMap.set(key, value2));
+    }
+  }
+  return typeMap;
+}
+var init_module_types = (0, import_chunk_ABYVSU2C.__esm)({
+  "src/type-flow/module-types.ts"() {
+    "use strict";
+    init_api();
+    init_type_flow();
+    init_could_be();
+    init_interp();
+    init_sub_type();
+    init_types();
+    (0, import_chunk_NHZRKHZO.init_logger)();
   }
 });
 function relative_path_no_dotdot(relative2) {
@@ -29115,7 +29518,7 @@ async function getCodeWorkspaceSettings(folder) {
   let curDir = folder;
   try {
     while (curDir) {
-      const code_workspaces = await (0, import_chunk_OASVKTK5.globa)(
+      const code_workspaces = await (0, import_chunk_NHZRKHZO.globa)(
         path4.resolve(curDir, "*.code-workspace"),
         { onlyFiles: true }
       );
@@ -29243,7 +29646,7 @@ async function createLocalBarrels(targets, options) {
             optBarrelDir
           };
           return promise2.then(
-            () => (0, import_chunk_OASVKTK5.copyRecursiveAsNeeded)(
+            () => (0, import_chunk_NHZRKHZO.copyRecursiveAsNeeded)(
               rawBarrelDir,
               optBarrelDir,
               (src) => !src.endsWith(".mc")
@@ -29544,7 +29947,7 @@ async function filesFromPaths(workspace, buildDir, inPaths, extension) {
   const filter = buildDir.startsWith(workspace);
   const paths = (await Promise.all(
     inPaths?.map(
-      (pattern) => (0, import_chunk_OASVKTK5.globa)(pattern, { cwd: workspace, mark: true }).then(
+      (pattern) => (0, import_chunk_NHZRKHZO.globa)(pattern, { cwd: workspace, mark: true }).then(
         (paths2) => paths2.map((p) => ({
           path: p,
           filter: filter && /^\*\*[\\/]\*.mc$/i.test(path4.relative(workspace, pattern))
@@ -29554,7 +29957,7 @@ async function filesFromPaths(workspace, buildDir, inPaths, extension) {
   )).flat();
   const files = await Promise.all(
     paths.map(
-      (result) => result.path.endsWith("/") ? (0, import_chunk_OASVKTK5.globa)(`${result.path}**/*${extension}`, {
+      (result) => result.path.endsWith("/") ? (0, import_chunk_NHZRKHZO.globa)(`${result.path}**/*${extension}`, {
         cwd: workspace,
         mark: true
       }).then(
@@ -29677,7 +30080,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       })
     );
   }
-  const actualOptimizedFiles = (await (0, import_chunk_OASVKTK5.globa)(path4.join(output, "**", "*.mc"), { mark: true })).filter((file) => !file.endsWith("/")).sort();
+  const actualOptimizedFiles = (await (0, import_chunk_NHZRKHZO.globa)(path4.join(output, "**", "*.mc"), { mark: true })).filter((file) => !file.endsWith("/")).sort();
   const {
     hasTests,
     diagnostics: prevDiagnostics,
@@ -29693,13 +30096,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_OASVKTK5.last_modified)(
+      const source_time = await (0, import_chunk_NHZRKHZO.last_modified)(
         Object.keys(fnMap).concat(dependencyFiles)
       );
-      const opt_time = await (0, import_chunk_OASVKTK5.first_modified)(
+      const opt_time = await (0, import_chunk_NHZRKHZO.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1721003959168 < opt_time) {
+      if (source_time < opt_time && 1721693366621 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29737,7 +30140,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.69",
+            optimizerVersion: "1.1.70",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -29751,7 +30154,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_OASVKTK5.AwaitedError ? ex.resolve() : ex)
+    (ex) => Promise.reject(ex instanceof import_chunk_NHZRKHZO.AwaitedError ? ex.resolve() : ex)
   );
 }
 async function getProjectAnalysisHelper(targets, analysis, manifestXML, options) {
@@ -29849,49 +30252,12 @@ async function getFnMapAnalysis(fnMap, resourcesMap, manifestXML, options) {
   if (Object.values(fnMap).every(({ ast }) => ast != null)) {
     reportMissingSymbols(state, options);
   }
-  let typeMap = null;
-  if (state.config?.propagateTypes && state.config.trustDeclaredTypes && state.config.checkTypes !== "OFF") {
-    const gistate = {
-      state,
-      stack: [],
-      typeChecker: state.config.strictTypeCheck?.toLowerCase() === "on" ? subtypeOf : couldBeWeak,
-      checkTypes: state.config?.checkTypes || "WARNING"
-    };
-    state.pre = (node) => {
-      switch (node.type) {
-        case "FunctionDeclaration": {
-          const self = state.top().sn;
-          const istate = buildTypeInfo(state, self, false);
-          if (istate) {
-            istate.state = state;
-            istate.typeChecker = gistate.typeChecker;
-            istate.checkTypes = gistate.checkTypes;
-            evaluate(istate, node.body);
-            if (istate.typeMap) {
-              if (typeMap == null) {
-                typeMap = istate.typeMap;
-              } else {
-                istate.typeMap.forEach(
-                  (value2, key) => typeMap.set(key, value2)
-                );
-              }
-            }
-          }
-          return [];
-        }
-      }
-      return null;
-    };
-    Object.values(state.fnMap).forEach((f) => {
-      f.ast && collectNamespaces(f.ast, state);
-    });
-    delete state.pre;
-  }
+  const typeMap = await analyze_module_types(state);
   const diagnostics = state.diagnostics && await resolveDiagnosticsMap(state.diagnostics);
   if (state.config?.checkBuildPragmas) {
-    Object.entries(fnMap).forEach(([name, f]) => {
-      pragmaChecker(state, f.ast, diagnostics?.[name]);
-    });
+    Object.entries(fnMap).forEach(
+      ([name, f]) => f.ast && pragmaChecker(state, f.ast, diagnostics?.[name])
+    );
   }
   return { fnMap, state, typeMap };
 }
@@ -29907,11 +30273,9 @@ var init_optimizer = (0, import_chunk_ABYVSU2C.__esm)({
     init_mc_rewrite();
     init_pragma_checker();
     init_sdk_util();
-    init_type_flow();
-    init_could_be();
     init_interp();
-    init_sub_type();
-    (0, import_chunk_OASVKTK5.init_util)();
+    init_module_types();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_worker_pool();
     init_optimizer_types();
     init_types();
@@ -29971,7 +30335,7 @@ async function performTask(task) {
     throw new Error(`Invalid task type ${type}`);
   }
   return Promise.resolve(handler(task.data)).then(
-    (result) => import_chunk_OASVKTK5.logPromise.then(() => result)
+    (result) => import_chunk_NHZRKHZO.logPromise.then(() => result)
   );
 }
 var workerTaskHandlers;
@@ -29981,7 +30345,7 @@ var init_worker_task = (0, import_chunk_ABYVSU2C.__esm)({
     init_optimizer();
     init_readprg();
     init_sdk_util();
-    (0, import_chunk_OASVKTK5.init_logger)();
+    (0, import_chunk_NHZRKHZO.init_logger)();
     workerTaskHandlers = {
       buildOptimizedProject(data) {
         return buildOptimizedProject(data.product, data.options);
@@ -30199,7 +30563,7 @@ async function optimizeProgram(filepath, devKey, output, config) {
 }
 function optimizeProgramBuffer(filepath, view, debugXml, apiDebugXml, key, config) {
   const { sections } = readPrgWithOffsets(view);
-  (0, import_chunk_OASVKTK5.logger)("readprg", 5, sections);
+  (0, import_chunk_NHZRKHZO.logger)("readprg", 5, sections);
   const symbolTable = new SymbolTable();
   if ((0, import_chunk_JDC43A3I.hasProperty)(sections, 1461170197 .toString())) {
     symbolTable.parse(sections[
@@ -30499,7 +30863,7 @@ var init_readprg = (0, import_chunk_ABYVSU2C.__esm)({
     init_signer();
     init_symbols();
     init_sdk_util();
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_worker_pool();
   }
 });
@@ -30511,7 +30875,7 @@ function getSdkPath() {
   });
 }
 async function getDeviceInfo() {
-  const files = await (0, import_chunk_OASVKTK5.globa)(`${connectiq}/Devices/*/compiler.json`);
+  const files = await (0, import_chunk_NHZRKHZO.globa)(`${connectiq}/Devices/*/compiler.json`);
   if (!files.length) {
     throw new Error(
       `No devices found at '${connectiq}/Devices'. Check your sdk is correctly installed`
@@ -30579,7 +30943,7 @@ async function getFunctionDocumentation() {
 var isWin, appSupport, connectiq;
 var init_sdk_util = (0, import_chunk_ABYVSU2C.__esm)({
   "src/sdk-util.ts"() {
-    (0, import_chunk_OASVKTK5.init_util)();
+    (0, import_chunk_NHZRKHZO.init_util)();
     init_xml_util();
     init_readprg();
     init_bytecode();
@@ -30634,6 +30998,7 @@ var init_sdk_util = (0, import_chunk_ABYVSU2C.__esm)({
   getSdkPath,
   getSuperClasses,
   get_jungle,
+  handleImportUsing,
   init_api,
   init_bytecode,
   init_could_be,
@@ -30679,6 +31044,8 @@ var init_sdk_util = (0, import_chunk_ABYVSU2C.__esm)({
   parseSdkVersion,
   parseXml,
   performTask,
+  popRootNode,
+  pushRootNode,
   readPrg,
   readPrgWithOffsets,
   resolveDiagnostics,