@markw65/monkeyc-optimizer 1.1.68 → 1.1.70

package/build/{chunk-MBTLUWXR.cjs → chunk-JDC43A3I.cjs}

@@ -16,8 +16,8 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_MBTLUWXR_exports = {};
-__export(chunk_MBTLUWXR_exports, {
+var chunk_JDC43A3I_exports = {};
+__export(chunk_JDC43A3I_exports, {
   adjustLoc: () => adjustLoc,
   cloneDeep: () => cloneDeep,
   getLiteralNode: () => getLiteralNode,
@@ -36,7 +36,7 @@ __export(chunk_MBTLUWXR_exports, {
   withLocDeep: () => withLocDeep,
   wrap: () => wrap
 });
-module.exports = __toCommonJS(chunk_MBTLUWXR_exports);
+module.exports = __toCommonJS(chunk_JDC43A3I_exports);
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var import_prettier_plugin_monkeyc = require("@markw65/prettier-plugin-monkeyc");
 function isMCTreeNode(node) {
@@ -239,7 +239,7 @@ function makeMemberExpression(object, property) {
     object.loc && locRange(object.loc, property.loc)
   );
 }
-function makeScopedName(dotted, l) {
+function makeScopedName(dotted, l, base) {
   const loc = l && adjustLoc(l, 0, l.start.offset - l.end.offset);
   const result = dotted.split(/\s*\.\s*/).reduce(
     ({ cur, offset }, next) => {
@@ -255,7 +255,7 @@ function makeScopedName(dotted, l) {
       offset += next.length + 1;
       return { cur, offset };
     },
-    { cur: null, offset: 0 }
+    { cur: base, offset: 0 }
   ).cur;
   if (!result)
     throw new Error("Failed to make a ScopedName");

package/build/{chunk-OASVKTK5.cjs → chunk-NHZRKHZO.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_OASVKTK5_exports = {};
-__export(chunk_OASVKTK5_exports, {
+var chunk_NHZRKHZO_exports = {};
+__export(chunk_NHZRKHZO_exports, {
   AwaitedError: () => AwaitedError,
   GenericQueue: () => GenericQueue,
   bumpLogging: () => bumpLogging,
@@ -55,7 +55,7 @@ __export(chunk_OASVKTK5_exports, {
   spawnByLine: () => spawnByLine,
   wouldLog: () => wouldLog
 });
-module.exports = __toCommonJS(chunk_OASVKTK5_exports);
+module.exports = __toCommonJS(chunk_NHZRKHZO_exports);
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var child_process = __toESM(require("child_process"));
 var fsc = __toESM(require("fs"));
@@ -5474,6 +5474,7 @@ function log(...messages) {
       }
     }
   });
+  return logPromise;
 }
 function getLoggerSettings() {
   const ls = /* @__PURE__ */ new Map();

package/build/optimizer.cjs

@@ -18,30 +18,30 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_NGCEDNHJ.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_NGCEDNHJ.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_NGCEDNHJ.buildOptimizedProject,
-  copyRecursiveAsNeeded: () => import_chunk_OASVKTK5.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_NGCEDNHJ.defaultConfig,
-  display: () => import_chunk_NGCEDNHJ.display,
-  generateOneConfig: () => import_chunk_NGCEDNHJ.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_NGCEDNHJ.generateOptimizedProject,
-  getConfig: () => import_chunk_NGCEDNHJ.getConfig,
-  getFnMapAnalysis: () => import_chunk_NGCEDNHJ.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_NGCEDNHJ.getProjectAnalysis,
-  get_jungle: () => import_chunk_NGCEDNHJ.get_jungle,
-  isErrorWithLocation: () => import_chunk_NGCEDNHJ.isErrorWithLocation,
-  launchSimulator: () => import_chunk_NGCEDNHJ.launchSimulator,
-  manifestProducts: () => import_chunk_NGCEDNHJ.manifestProducts,
-  mctree: () => import_chunk_NGCEDNHJ.mctree,
-  simulateProgram: () => import_chunk_NGCEDNHJ.simulateProgram
+  StateNodeAttributes: () => import_chunk_2PJMJVYN.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_2PJMJVYN.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_2PJMJVYN.buildOptimizedProject,
+  copyRecursiveAsNeeded: () => import_chunk_NHZRKHZO.copyRecursiveAsNeeded,
+  defaultConfig: () => import_chunk_2PJMJVYN.defaultConfig,
+  display: () => import_chunk_2PJMJVYN.display,
+  generateOneConfig: () => import_chunk_2PJMJVYN.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_2PJMJVYN.generateOptimizedProject,
+  getConfig: () => import_chunk_2PJMJVYN.getConfig,
+  getFnMapAnalysis: () => import_chunk_2PJMJVYN.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_2PJMJVYN.getProjectAnalysis,
+  get_jungle: () => import_chunk_2PJMJVYN.get_jungle,
+  isErrorWithLocation: () => import_chunk_2PJMJVYN.isErrorWithLocation,
+  launchSimulator: () => import_chunk_2PJMJVYN.launchSimulator,
+  manifestProducts: () => import_chunk_2PJMJVYN.manifestProducts,
+  mctree: () => import_chunk_2PJMJVYN.mctree,
+  simulateProgram: () => import_chunk_2PJMJVYN.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_NGCEDNHJ = require("./chunk-NGCEDNHJ.cjs");
-var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
-var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
+var import_chunk_2PJMJVYN = require("./chunk-2PJMJVYN.cjs");
+var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
+var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_NGCEDNHJ.init_optimizer)();
+(0, import_chunk_2PJMJVYN.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,

package/build/sdk-util.cjs

@@ -18,25 +18,25 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var sdk_util_exports = {};
 __export(sdk_util_exports, {
-  SectionKinds: () => import_chunk_NGCEDNHJ.SectionKinds,
-  appSupport: () => import_chunk_NGCEDNHJ.appSupport,
-  connectiq: () => import_chunk_NGCEDNHJ.connectiq,
-  getDeviceInfo: () => import_chunk_NGCEDNHJ.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_NGCEDNHJ.getFunctionDocumentation,
-  getLanguages: () => import_chunk_NGCEDNHJ.getLanguages,
-  getSdkPath: () => import_chunk_NGCEDNHJ.getSdkPath,
-  isWin: () => import_chunk_NGCEDNHJ.isWin,
-  optimizeProgram: () => import_chunk_NGCEDNHJ.optimizeProgram,
-  readPrg: () => import_chunk_NGCEDNHJ.readPrg,
-  readPrgWithOffsets: () => import_chunk_NGCEDNHJ.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_NGCEDNHJ.xml_util_exports
+  SectionKinds: () => import_chunk_2PJMJVYN.SectionKinds,
+  appSupport: () => import_chunk_2PJMJVYN.appSupport,
+  connectiq: () => import_chunk_2PJMJVYN.connectiq,
+  getDeviceInfo: () => import_chunk_2PJMJVYN.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_2PJMJVYN.getFunctionDocumentation,
+  getLanguages: () => import_chunk_2PJMJVYN.getLanguages,
+  getSdkPath: () => import_chunk_2PJMJVYN.getSdkPath,
+  isWin: () => import_chunk_2PJMJVYN.isWin,
+  optimizeProgram: () => import_chunk_2PJMJVYN.optimizeProgram,
+  readPrg: () => import_chunk_2PJMJVYN.readPrg,
+  readPrgWithOffsets: () => import_chunk_2PJMJVYN.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_2PJMJVYN.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_NGCEDNHJ = require("./chunk-NGCEDNHJ.cjs");
-var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
-var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
+var import_chunk_2PJMJVYN = require("./chunk-2PJMJVYN.cjs");
+var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
+var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_NGCEDNHJ.init_sdk_util)();
+(0, import_chunk_2PJMJVYN.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/api.d.ts

@@ -5,10 +5,13 @@ import { ClassStateNode, Diagnostic, DiagnosticType, EnumStateNode, FunctionInfo
 import { visit_resources } from "./resources";
 import { xmlUtil } from "./sdk-util";
 import { TypeMap } from "./type-flow/interp";
+import { RootStateNode } from "./control-flow";
 export { visitReferences, visitorNode } from "./visitor";
 export { hasProperty, traverseAst, visit_resources };
 export declare function parseSdkVersion(version: string | undefined): number;
 export declare function checkCompilerVersion(version: string, sdkVer: number): boolean | undefined;
+export declare function pushRootNode(stack: ProgramStateStack, root: RootStateNode): void;
+export declare function popRootNode(stack: ProgramStateStack, root: RootStateNode): void;
 export declare function getApiMapping(state?: ProgramState, resourcesMap?: Record<string, JungleResourceMap>, manifestXML?: xmlUtil.Document): Promise<ProgramStateNode>;
 export declare function isStateNode(node: {
     type: string;
@@ -20,13 +23,14 @@ export declare function lookupResultContains(a: LookupDefinition[], b: LookupDef
 export declare function isLookupCandidate(node: mctree.MemberExpression): false | mctree.Identifier;
 export declare function lookupNext(state: ProgramStateLive, results: LookupDefinition[], decls: DeclKind, property: mctree.Identifier): LookupDefinition[] | null;
 export declare function lookupWithType(state: ProgramStateAnalysis, node: mctree.Node, typeMap: TypeMap | undefined | null, nonLocal?: boolean, stack?: ProgramStateStack | null): LookupResult;
+export declare function handleImportUsing(state: ProgramStateLive, node: mctree.Using | mctree.ImportModule): void;
 export declare function collectNamespaces(ast: mctree.Program, stateIn?: ProgramState): ProgramStateNode;
 export declare function formatAst(node: mctree.Node, monkeyCSource?: string | null, options?: Record<string, unknown> | null): Promise<string>;
 export declare function findNamesInScope(declStack: StateNode[][], pattern: string | RegExp): (readonly [StateNodeDecl, {
     readonly parent: StateNode;
     readonly depth: number;
 }])[];
-export declare function mapVarDeclsByType(state: ProgramStateAnalysis, decls: StateNodeDecl[], node: mctree.Node, typeMap: TypeMap | null | undefined): (mctree.Identifier | mctree.EnumStringMember | mctree.AsIdentifier | FunctionStateNode | ClassStateNode | ModuleStateNode | ProgramStateNode | VariableStateNode | import("./optimizer-types").BlockStateNode | TypedefStateNode | EnumStateNode)[];
+export declare function mapVarDeclsByType(state: ProgramStateAnalysis, decls: StateNodeDecl[], node: mctree.Node, typeMap: TypeMap | null | undefined): (mctree.Identifier | mctree.EnumStringMember | mctree.AsIdentifier | ProgramStateNode | FunctionStateNode | ModuleStateNode | ClassStateNode | VariableStateNode | import("./optimizer-types").BlockStateNode | TypedefStateNode | EnumStateNode)[];
 export declare function formatScopedName(node: mctree.ScopedName | mctree.ThisExpression): string;
 export declare function formatAstLongLines(node: mctree.Node): Promise<string>;
 export declare function createDocumentationMap(functionDocumentation: {

package/build/src/ast.d.ts

@@ -42,6 +42,6 @@ export declare function makeIdentifier(name: string, loc?: mctree.SourceLocation
     name: string;
 };
 export declare function makeMemberExpression(object: mctree.ScopedName, property: mctree.Identifier): mctree.DottedName;
-export declare function makeScopedName(dotted: string, l?: mctree.SourceLocation): mctree.ScopedName;
+export declare function makeScopedName(dotted: string, l?: mctree.SourceLocation, base?: mctree.ScopedName): mctree.ScopedName;
 export declare function getLiteralNode(node: mctree.Node | null | undefined): null | mctree.Literal | mctree.AsExpression;
 export {};

package/build/src/control-flow.d.ts

@@ -1,5 +1,6 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-import { ProgramStateAnalysis, FunctionStateNode } from "./optimizer-types";
+import { ProgramStateAnalysis, FunctionStateNode, ModuleStateNode, ClassStateNode, ProgramStateNode } from "./optimizer-types";
+export type RootStateNode = ProgramStateNode | FunctionStateNode | ModuleStateNode | ClassStateNode;
 export type BaseEvent = {
     type: string;
     mayThrow: boolean;
@@ -14,7 +15,7 @@ export type Block<T extends EventConstraint<T>> = {
     bogopred?: Block<T>;
     events?: T[];
 };
-export declare function buildReducedGraph<T extends EventConstraint<T>>(state: ProgramStateAnalysis, func: FunctionStateNode, refsForUpdate: boolean, notice: (node: mctree.Node, stmt: mctree.Node, mayThrow: boolean | 1, containedEvents: () => T[]) => T | T[] | null): Block<T>;
+export declare function buildReducedGraph<T extends EventConstraint<T>>(state: ProgramStateAnalysis, root: RootStateNode, refsForUpdate: boolean, notice: (node: mctree.Node, stmt: mctree.Node, mayThrow: boolean | 1, containedEvents: () => T[]) => T | T[] | null): Block<T>;
 export declare function postOrderTraverse<T extends EventConstraint<T>>(head: Block<T>, visitor: (block: Block<T>) => void): void;
 export declare function preOrderTraverse<T extends EventConstraint<T>>(head: Block<T>, visitor: (block: Block<T>) => void): void;
 export declare function getPostOrder<T extends EventConstraint<T>>(head: Block<T>): Block<T>[];

package/build/src/data-flow.d.ts

@@ -1,6 +1,6 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-import { BaseEvent, Block } from "./control-flow";
-import { FunctionStateNode, ProgramStateAnalysis, StateNodeDecl } from "./optimizer-types";
+import { BaseEvent, Block, RootStateNode } from "./control-flow";
+import { FunctionStateNode, ProgramStateAnalysis, ProgramStateStack, StateNodeDecl } from "./optimizer-types";
 import { GenericQueue } from "./util";
 export type RefNode = mctree.Identifier | mctree.MemberExpression | mctree.Literal;
 export type MemberDecl = {
@@ -25,7 +25,7 @@ export interface KillEvent extends BaseEvent {
 }
 export interface DefEvent extends BaseEvent {
     type: "def";
-    node: mctree.AssignmentExpression | mctree.UpdateExpression | mctree.VariableDeclarator;
+    node: mctree.AssignmentExpression | mctree.UpdateExpression | mctree.VariableDeclarator | mctree.EnumStringMember;
     decl: EventDecl;
     rhs?: EventDecl;
     containedEvents?: Array<RefEvent | ModEvent>;
@@ -40,6 +40,16 @@ export interface ModEvent extends BaseEvent {
     calleeDecl?: EventDecl | undefined;
     calleeObj?: EventDecl | undefined;
 }
+/**
+ * When analyzing Program and ModuleDeclaration scopes,
+ * we need to keep the imports up to date.
+ */
+export interface ImpEvent extends BaseEvent {
+    type: "imp";
+    node: mctree.Using | mctree.ImportModule | mctree.Program | mctree.ModuleDeclaration;
+    stack?: ProgramStateStack;
+    decl?: undefined;
+}
 export declare enum FlowKind {
     LEFT_EQ_RIGHT_DECL = 0,
     LEFT_NE_RIGHT_DECL = 1,
@@ -91,14 +101,14 @@ export interface ExnEvent extends BaseEvent {
     type: "exn";
     node: mctree.Node;
 }
-export type Event = RefEvent | KillEvent | DefEvent | ModEvent | FlowEvent | ExnEvent;
+export type Event = RefEvent | KillEvent | DefEvent | ModEvent | FlowEvent | ImpEvent | ExnEvent;
 export interface DataFlowBlock extends Block<Event> {
     order?: number;
 }
 export declare function declFullName(decl: EventDecl): Promise<string>;
 export declare function declName(decl: EventDecl): string | undefined;
 export declare function unhandledType(node: never): never;
-export declare function buildDataFlowGraph(state: ProgramStateAnalysis, func: FunctionStateNode, wantsLiteral: (literal: mctree.Literal) => boolean, trackInsertionPoints: boolean, wantsAllRefs: boolean): {
+export declare function buildDataFlowGraph(state: ProgramStateAnalysis, root: RootStateNode, wantsLiteral: (literal: mctree.Literal) => boolean, trackInsertionPoints: boolean, wantsAllRefs: boolean): {
     identifiers: Set<string>;
     graph: Block<Event>;
 };

package/build/src/logger.d.ts

@@ -3,5 +3,5 @@ export declare function wouldLog(module: string, level: number): boolean;
 export declare function bumpLogging(module: string | null, amount: number): void;
 export declare function setBanner(b: (() => string) | null): void;
 export declare let logPromise: Promise<unknown>;
-export declare function log(...messages: unknown[]): void;
+export declare function log(...messages: unknown[]): Promise<unknown>;
 export declare function setLogger(log: (message: string) => void): void;

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

@@ -21,6 +21,7 @@ export declare const enum StateNodeAttributes {
 interface BaseStateNode {
     type: string;
     node: mctree.Node | null | undefined;
+    nodes?: Map<mctree.ModuleDeclaration | mctree.Program, ProgramStateStack>;
     name: string | null | undefined;
     fullName: string | null | undefined;
     decls?: StateNodeDecls | undefined;
@@ -31,13 +32,14 @@ interface BaseStateNode {
 export interface ProgramStateNode extends BaseStateNode {
     type: "Program";
     node: mctree.Program | undefined;
+    nodes: Map<mctree.Program | mctree.ModuleDeclaration, ProgramStateStack>;
     name: "$";
     fullName: "$";
-    stack?: undefined;
 }
 export interface ModuleStateNode extends BaseStateNode {
     type: "ModuleDeclaration";
     node: mctree.ModuleDeclaration;
+    nodes: Map<mctree.Program | mctree.ModuleDeclaration, ProgramStateStack>;
     name: string;
     fullName: string;
 }
@@ -63,7 +65,6 @@ export interface FunctionStateNode extends BaseStateNode {
     node: mctree.FunctionDeclaration;
     name: string;
     fullName: string;
-    stack?: ProgramStateStack;
     decls?: undefined;
     info?: FunctionInfo | false;
     next_info?: FunctionInfo;
@@ -135,6 +136,7 @@ export type ByNameStateNodeDecls = ModuleStateNode | ClassStateNode | FunctionSt
 export type ProgramState = {
     allFunctions?: Record<string, FunctionStateNode[]>;
     allClasses?: ClassStateNode[];
+    allModules?: Set<ModuleStateNode>;
     invokeInfo?: FunctionInfo;
     allDeclarations?: Record<string, ByNameStateNodeDecls[]>;
     fnMap?: FilesToOptimizeMap;
@@ -145,8 +147,8 @@ export type ProgramState = {
     currentFunction?: FunctionStateNode;
     removeNodeComments?: (node: mctree.Node, ast: mctree.Program) => void;
     shouldExclude?: (node: mctree.Node) => boolean;
-    pre?: (node: mctree.Node, state: ProgramStateLive) => null | false | (keyof mctree.NodeAll)[];
-    post?: (node: mctree.Node, state: ProgramStateLive) => null | false | mctree.Node | mctree.Node[];
+    pre?: (node: mctree.Node) => null | false | (keyof mctree.NodeAll)[];
+    post?: (node: mctree.Node) => null | false | mctree.Node | mctree.Node[];
     lookup?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack | null) => LookupResult;
     lookupValue?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack | null) => LookupResult;
     lookupType?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack | null) => LookupResult;
@@ -188,7 +190,7 @@ export type Finalized<T, Keys extends keyof T> = T & {
     [key in Keys]-?: NonNullable<T[key]>;
 };
 export type ProgramStateLive = Finalized<ProgramState, "stack" | "top" | "lookup" | "lookupValue" | "lookupType" | "lookupNonlocal" | "stackClone" | "traverse" | "index" | "constants" | "removeNodeComments" | "inType" | "nextExposed" | "lookupRules">;
-export type ProgramStateAnalysis = Finalized<ProgramStateLive, "allClasses" | "allFunctions" | "fnMap" | "allDeclarations" | "invokeInfo">;
+export type ProgramStateAnalysis = Finalized<ProgramStateLive, "allClasses" | "allModules" | "allFunctions" | "fnMap" | "allDeclarations" | "invokeInfo">;
 export type ProgramStateOptimizer = Finalized<ProgramStateAnalysis, "localsStack" | "exposed" | "calledFunctions" | "usedByName">;
 export type ExcludeAnnotationsMap = {
     [key: string]: boolean;

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

@@ -1,8 +1,15 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-import { DiagnosticType, FunctionStateNode, ProgramStateAnalysis } from "../optimizer-types";
+import { RootStateNode } from "src/control-flow";
+import { DiagnosticType, ProgramStateAnalysis } from "../optimizer-types";
 import { OpMatch } from "./interp-binary";
 import { ExactOrUnion, ObjectType } from "./types";
 export type TypeMap = Map<mctree.Node, ExactOrUnion>;
+export declare const enum DependencyFlags {
+    None = 0,
+    Type = 1,
+    Info = 2
+}
+export type DependencyMap = Map<RootStateNode, DependencyFlags>;
 export type InterpStackElem = {
     value: ExactOrUnion;
     embeddedEffects: boolean;
@@ -13,11 +20,13 @@ export type InterpState = {
     stack: InterpStackElem[];
     typeMap?: TypeMap;
     localLvals?: Set<mctree.Node>;
-    func?: FunctionStateNode;
+    root?: RootStateNode;
     pre?: (node: mctree.Node) => mctree.Node | false | null | void;
     post?: (node: mctree.Node) => mctree.Node | false | null | void;
     typeChecker?: (a: ExactOrUnion, b: ExactOrUnion) => boolean;
     checkTypes?: DiagnosticType;
+    dependencies?: DependencyMap;
+    frpushType?: ExactOrUnion;
 };
 export declare function popIstate(istate: InterpState, node: mctree.Node): InterpStackElem;
 export declare function tryPop(istate: InterpState, node: InterpStackElem["node"]): InterpStackElem;

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

@@ -0,0 +1,3 @@
+import { ProgramStateAnalysis } from "../optimizer-types";
+import { TypeMap } from "./interp";
+export declare function analyze_module_types(state: ProgramStateAnalysis): Promise<TypeMap | null>;

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

@@ -1,4 +1,5 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
+import { RootStateNode } from "./control-flow";
 import { Event, EventDecl } from "./data-flow";
 import { FunctionStateNode, ProgramStateAnalysis } from "./optimizer-types";
 import { InterpState } from "./type-flow/interp";
@@ -8,7 +9,7 @@ export type NodeEquivMap = Map<mctree.Node, {
     decl: EventDecl;
     equiv: Array<EventDecl>;
 }>;
-export declare function buildTypeInfo(state: ProgramStateAnalysis, func: FunctionStateNode, optimizeEquivalencies: boolean): InterpState | undefined;
+export declare function buildTypeInfo(state: ProgramStateAnalysis, root: RootStateNode, optimizeEquivalencies: boolean): InterpState | undefined;
 export declare function buildConflictGraph(state: ProgramStateAnalysis, func: FunctionStateNode): {
     graph: import("./control-flow").Block<Event>;
     localConflicts: Map<TypeStateKey, Set<TypeStateKey>> | null;

package/build/util.cjs

@@ -18,35 +18,35 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var util_exports = {};
 __export(util_exports, {
-  AwaitedError: () => import_chunk_OASVKTK5.AwaitedError,
-  GenericQueue: () => import_chunk_OASVKTK5.GenericQueue,
-  bumpLogging: () => import_chunk_OASVKTK5.bumpLogging,
-  copyRecursiveAsNeeded: () => import_chunk_OASVKTK5.copyRecursiveAsNeeded,
-  every: () => import_chunk_OASVKTK5.every,
-  first_modified: () => import_chunk_OASVKTK5.first_modified,
-  forEach: () => import_chunk_OASVKTK5.forEach,
-  globSome: () => import_chunk_OASVKTK5.globSome,
-  globa: () => import_chunk_OASVKTK5.globa,
-  last_modified: () => import_chunk_OASVKTK5.last_modified,
-  log: () => import_chunk_OASVKTK5.log,
-  logPromise: () => import_chunk_OASVKTK5.logPromise,
-  logger: () => import_chunk_OASVKTK5.logger,
-  map: () => import_chunk_OASVKTK5.map,
-  popcount: () => import_chunk_OASVKTK5.popcount,
-  promiseAll: () => import_chunk_OASVKTK5.promiseAll,
-  pushUnique: () => import_chunk_OASVKTK5.pushUnique,
-  readByLine: () => import_chunk_OASVKTK5.readByLine,
-  reduce: () => import_chunk_OASVKTK5.reduce,
-  sameArrays: () => import_chunk_OASVKTK5.sameArrays,
-  setBanner: () => import_chunk_OASVKTK5.setBanner,
-  some: () => import_chunk_OASVKTK5.some,
-  spawnByLine: () => import_chunk_OASVKTK5.spawnByLine,
-  wouldLog: () => import_chunk_OASVKTK5.wouldLog
+  AwaitedError: () => import_chunk_NHZRKHZO.AwaitedError,
+  GenericQueue: () => import_chunk_NHZRKHZO.GenericQueue,
+  bumpLogging: () => import_chunk_NHZRKHZO.bumpLogging,
+  copyRecursiveAsNeeded: () => import_chunk_NHZRKHZO.copyRecursiveAsNeeded,
+  every: () => import_chunk_NHZRKHZO.every,
+  first_modified: () => import_chunk_NHZRKHZO.first_modified,
+  forEach: () => import_chunk_NHZRKHZO.forEach,
+  globSome: () => import_chunk_NHZRKHZO.globSome,
+  globa: () => import_chunk_NHZRKHZO.globa,
+  last_modified: () => import_chunk_NHZRKHZO.last_modified,
+  log: () => import_chunk_NHZRKHZO.log,
+  logPromise: () => import_chunk_NHZRKHZO.logPromise,
+  logger: () => import_chunk_NHZRKHZO.logger,
+  map: () => import_chunk_NHZRKHZO.map,
+  popcount: () => import_chunk_NHZRKHZO.popcount,
+  promiseAll: () => import_chunk_NHZRKHZO.promiseAll,
+  pushUnique: () => import_chunk_NHZRKHZO.pushUnique,
+  readByLine: () => import_chunk_NHZRKHZO.readByLine,
+  reduce: () => import_chunk_NHZRKHZO.reduce,
+  sameArrays: () => import_chunk_NHZRKHZO.sameArrays,
+  setBanner: () => import_chunk_NHZRKHZO.setBanner,
+  some: () => import_chunk_NHZRKHZO.some,
+  spawnByLine: () => import_chunk_NHZRKHZO.spawnByLine,
+  wouldLog: () => import_chunk_NHZRKHZO.wouldLog
 });
 module.exports = __toCommonJS(util_exports);
-var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
+var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_OASVKTK5.init_util)();
+(0, import_chunk_NHZRKHZO.init_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AwaitedError,

package/build/worker-thread.cjs

@@ -21,17 +21,17 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_NGCEDNHJ = require("./chunk-NGCEDNHJ.cjs");
-var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
-var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
+var import_chunk_2PJMJVYN = require("./chunk-2PJMJVYN.cjs");
+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_worker_threads = require("node:worker_threads");
 var require_worker_thread = (0, import_chunk_ABYVSU2C.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_NGCEDNHJ.init_worker_task)();
+    (0, import_chunk_2PJMJVYN.init_worker_task)();
     if (import_node_worker_threads.parentPort) {
       import_node_worker_threads.parentPort.on("message", async (task) => {
-        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_NGCEDNHJ.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_2PJMJVYN.performTask)(task));
       });
     }
   }

package/package.json

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