@markw65/monkeyc-optimizer 1.1.25 → 1.1.27

package/build/optimizer.cjs

@@ -18,27 +18,29 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_SNWJ2FZL.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_SNWJ2FZL.buildOptimizedProject,
-  copyRecursiveAsNeeded: () => import_chunk_QFQPBQSO.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_SNWJ2FZL.defaultConfig,
-  display: () => import_chunk_SNWJ2FZL.display,
-  generateApiMirTests: () => import_chunk_SNWJ2FZL.generateApiMirTests,
-  generateOneConfig: () => import_chunk_SNWJ2FZL.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_SNWJ2FZL.generateOptimizedProject,
-  getConfig: () => import_chunk_SNWJ2FZL.getConfig,
-  getProjectAnalysis: () => import_chunk_SNWJ2FZL.getProjectAnalysis,
-  get_jungle: () => import_chunk_SNWJ2FZL.get_jungle,
-  isErrorWithLocation: () => import_chunk_SNWJ2FZL.isErrorWithLocation,
-  launchSimulator: () => import_chunk_SNWJ2FZL.launchSimulator,
-  manifestProducts: () => import_chunk_SNWJ2FZL.manifestProducts,
-  mctree: () => import_chunk_SNWJ2FZL.mctree,
-  simulateProgram: () => import_chunk_SNWJ2FZL.simulateProgram
+  StateNodeAttributes: () => import_chunk_DD4VX53Y.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_DD4VX53Y.buildOptimizedProject,
+  copyRecursiveAsNeeded: () => import_chunk_PVBIKZYZ.copyRecursiveAsNeeded,
+  defaultConfig: () => import_chunk_DD4VX53Y.defaultConfig,
+  display: () => import_chunk_DD4VX53Y.display,
+  generateApiMirTests: () => import_chunk_DD4VX53Y.generateApiMirTests,
+  generateOneConfig: () => import_chunk_DD4VX53Y.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_DD4VX53Y.generateOptimizedProject,
+  getConfig: () => import_chunk_DD4VX53Y.getConfig,
+  getProjectAnalysis: () => import_chunk_DD4VX53Y.getProjectAnalysis,
+  get_jungle: () => import_chunk_DD4VX53Y.get_jungle,
+  isErrorWithLocation: () => import_chunk_DD4VX53Y.isErrorWithLocation,
+  launchSimulator: () => import_chunk_DD4VX53Y.launchSimulator,
+  manifestProducts: () => import_chunk_DD4VX53Y.manifestProducts,
+  mctree: () => import_chunk_DD4VX53Y.mctree,
+  simulateProgram: () => import_chunk_DD4VX53Y.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_SNWJ2FZL = require("./chunk-SNWJ2FZL.cjs");
-var import_chunk_QFQPBQSO = require("./chunk-QFQPBQSO.cjs");
-(0, import_chunk_SNWJ2FZL.init_optimizer)();
+var import_chunk_DD4VX53Y = require("./chunk-DD4VX53Y.cjs");
+var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
+var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
+var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
+(0, import_chunk_DD4VX53Y.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,

package/build/sdk-util.cjs

@@ -18,23 +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_SNWJ2FZL.SectionKinds,
-  appSupport: () => import_chunk_SNWJ2FZL.appSupport,
-  connectiq: () => import_chunk_SNWJ2FZL.connectiq,
-  getDeviceInfo: () => import_chunk_SNWJ2FZL.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_SNWJ2FZL.getFunctionDocumentation,
-  getLanguages: () => import_chunk_SNWJ2FZL.getLanguages,
-  getSdkPath: () => import_chunk_SNWJ2FZL.getSdkPath,
-  isWin: () => import_chunk_SNWJ2FZL.isWin,
-  optimizeProgram: () => import_chunk_SNWJ2FZL.optimizeProgram,
-  readPrg: () => import_chunk_SNWJ2FZL.readPrg,
-  readPrgWithOffsets: () => import_chunk_SNWJ2FZL.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_SNWJ2FZL.xml_util_exports
+  SectionKinds: () => import_chunk_DD4VX53Y.SectionKinds,
+  appSupport: () => import_chunk_DD4VX53Y.appSupport,
+  connectiq: () => import_chunk_DD4VX53Y.connectiq,
+  getDeviceInfo: () => import_chunk_DD4VX53Y.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_DD4VX53Y.getFunctionDocumentation,
+  getLanguages: () => import_chunk_DD4VX53Y.getLanguages,
+  getSdkPath: () => import_chunk_DD4VX53Y.getSdkPath,
+  isWin: () => import_chunk_DD4VX53Y.isWin,
+  optimizeProgram: () => import_chunk_DD4VX53Y.optimizeProgram,
+  readPrg: () => import_chunk_DD4VX53Y.readPrg,
+  readPrgWithOffsets: () => import_chunk_DD4VX53Y.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_DD4VX53Y.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_SNWJ2FZL = require("./chunk-SNWJ2FZL.cjs");
-var import_chunk_QFQPBQSO = require("./chunk-QFQPBQSO.cjs");
-(0, import_chunk_SNWJ2FZL.init_sdk_util)();
+var import_chunk_DD4VX53Y = require("./chunk-DD4VX53Y.cjs");
+var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
+var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
+var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
+(0, import_chunk_DD4VX53Y.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/api.d.ts

@@ -14,7 +14,7 @@ export declare function isStateNode(node: {
     type: string;
 }): node is StateNode;
 export declare function variableDeclarationName(node: mctree.TypedIdentifier | mctree.InstanceofIdentifier): string;
-declare type DeclKind = "decls" | "type_decls";
+type DeclKind = "decls" | "type_decls";
 export declare function sameLookupResult(a: LookupDefinition[], b: LookupDefinition[]): boolean;
 export declare function lookupResultContains(a: LookupDefinition[], b: LookupDefinition[]): boolean;
 export declare function isLookupCandidate(node: mctree.MemberExpression): false | mctree.Identifier;

package/build/src/ast.d.ts

@@ -27,7 +27,7 @@ interface BooleanLiteral extends mctree.Literal {
 interface NullLiteral extends mctree.Literal {
     value: null;
 }
-declare type LiteralValues = [NumberLiteral, "Number" | "Float" | "Double"] | [LongLiteral, "Long"] | [StringLiteral, "String"] | [CharLiteral, "Char"] | [BooleanLiteral, "Boolean"] | [NullLiteral, "Null"];
+type LiteralValues = [NumberLiteral, "Number" | "Float" | "Double"] | [LongLiteral, "Long"] | [StringLiteral, "String"] | [CharLiteral, "Char"] | [BooleanLiteral, "Boolean"] | [NullLiteral, "Null"];
 export declare function getNodeValue(node: mctree.Literal): LiteralValues;
 export declare function getNodeValue(node: mctree.Node): LiteralValues | [null, null];
 export declare function wrap<T extends mctree.Node>(node: T, loc?: mctree.SourceLocation | null): T;

package/build/src/cftinfo.d.ts

@@ -0,0 +1,32 @@
+/// <reference types="node" />
+export declare function getCFTFontInfoFromBuffer(name: string, data: Buffer): {
+    name: string;
+    height: number;
+    ascent: number;
+    internalLeading: number;
+    charInfo: {
+        code: number;
+        char: string;
+        width: number;
+    }[];
+};
+export declare function getCFTFontInfo(filename: string): Promise<{
+    name: string;
+    height: number;
+    ascent: number;
+    internalLeading: number;
+    charInfo: {
+        code: number;
+        char: string;
+        width: number;
+    }[];
+}>;
+export declare function getDeviceFontInfo(dirname: string): Promise<{
+    device: string;
+    fontSets: {
+        [k: string]: {
+            [k: string]: string;
+        };
+    };
+    langMap: Record<string, string>;
+}>;

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

@@ -1,11 +1,11 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { ProgramStateAnalysis, FunctionStateNode } from "./optimizer-types";
-export declare type BaseEvent = {
+export type BaseEvent = {
     type: string;
     mayThrow: boolean;
 };
-declare type EventConstraint<_T> = BaseEvent;
-export declare type Block<T extends EventConstraint<T>> = {
+type EventConstraint<_T> = BaseEvent;
+export type Block<T extends EventConstraint<T>> = {
     node?: mctree.Node;
     preds?: Block<T>[];
     succs?: Block<T>[];

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

@@ -2,14 +2,14 @@ import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { BaseEvent, Block } from "./control-flow";
 import { FunctionStateNode, ProgramStateAnalysis, StateNodeDecl } from "./optimizer-types";
 import { GenericQueue } from "./util";
-export declare type RefNode = mctree.Identifier | mctree.MemberExpression | mctree.Literal;
-export declare type MemberDecl = {
+export type RefNode = mctree.Identifier | mctree.MemberExpression | mctree.Literal;
+export type MemberDecl = {
     type: "MemberDecl";
     node: mctree.MemberExpression;
     base: StateNodeDecl | StateNodeDecl[];
     path: mctree.MemberExpression[];
 };
-export declare type EventDecl = StateNodeDecl | StateNodeDecl[] | mctree.Literal | MemberDecl | {
+export type EventDecl = StateNodeDecl | StateNodeDecl[] | mctree.Literal | MemberDecl | {
     type: "Unknown";
     node: mctree.MemberExpression | mctree.Identifier | mctree.ThisExpression;
 };
@@ -86,12 +86,12 @@ export interface FlowEventInstanceof extends BaseEvent {
     right_decl: EventDecl;
     right_node?: undefined;
 }
-export declare type FlowEvent = FlowEventDecl | FlowEventNode | FlowEventTruthy | FlowEventInstanceof;
+export type FlowEvent = FlowEventDecl | FlowEventNode | FlowEventTruthy | FlowEventInstanceof;
 export interface ExnEvent extends BaseEvent {
     type: "exn";
     node: mctree.Node;
 }
-export declare type Event = RefEvent | KillEvent | DefEvent | ModEvent | FlowEvent | ExnEvent;
+export type Event = RefEvent | KillEvent | DefEvent | ModEvent | FlowEvent | ExnEvent;
 export interface DataFlowBlock extends Block<Event> {
     order?: number;
 }

package/build/src/inliner.d.ts

@@ -3,11 +3,11 @@ import { FunctionStateNode, ProgramStateAnalysis } from "./optimizer-types";
 export declare function inlinableSubExpression(expr: mctree.Expression): mctree.SimpleCallExpression | null;
 export declare function inlineRequested(state: ProgramStateAnalysis, func: FunctionStateNode): boolean;
 export declare function shouldInline(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression, context: InlineContext | null): boolean;
-declare type InlineBody = mctree.BlockStatement | mctree.ExpressionStatement["expression"];
+type InlineBody = mctree.BlockStatement | mctree.ExpressionStatement["expression"];
 export declare function unused(state: ProgramStateAnalysis, expression: mctree.ExpressionStatement["expression"]): mctree.Statement[];
 export declare function unused(state: ProgramStateAnalysis, expression: mctree.ExpressionStatement["expression"], top: true): mctree.Statement[] | null;
 export declare function inlineDiagnostic(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression, message: string | null): void;
-export declare type InlineContext = mctree.ReturnStatement | mctree.IfStatement | mctree.AssignmentExpression | mctree.ExpressionStatement | mctree.VariableDeclarator;
+export type InlineContext = mctree.ReturnStatement | mctree.IfStatement | mctree.AssignmentExpression | mctree.ExpressionStatement | mctree.VariableDeclarator;
 export declare function inlineFunction(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression, context: InlineContext | null): InlineBody | null;
 export declare function applyTypeIfNeeded(node: mctree.Node): mctree.Node;
 export {};

package/build/src/jungles.d.ts

@@ -1,11 +1,11 @@
 import { ManifestXML } from "./manifest";
 import { BuildConfig } from "./optimizer-types.js";
 import { DeviceInfo, xmlUtil } from "./sdk-util";
-export declare type JungleBuildDependencies = Record<string, xmlUtil.Document | true>;
-export declare type JungleError = Error & {
+export type JungleBuildDependencies = Record<string, xmlUtil.Document | true>;
+export type JungleError = Error & {
     buildDependencies?: JungleBuildDependencies;
 };
-export declare type Target = {
+export type Target = {
     product: string;
     qualifier: JungleQualifier;
     shape?: string;
@@ -15,34 +15,36 @@ export declare type Target = {
         key: string;
     };
 };
-declare type LangResourcePaths = {
+type LangResourcePaths = {
     [key: string]: string[];
 };
-declare type BarrelAnnotations = {
+type BarrelAnnotations = {
     [key: string]: string[];
 };
-declare type BarrelMap = {
+type BarrelMap = {
     [key: string]: ResolvedBarrel;
 };
-declare type OptBarrelMap = Record<string, {
+type OptBarrelMap = Record<string, {
     rawBarrelDir: string;
     manifest: string;
     jungleFiles: string[];
     optBarrelDir: string;
 }>;
-export declare type JungleQualifier = {
+export type JungleQualifier = {
     sourcePath?: string[];
     sourceExcludes?: string[];
     excludeAnnotations?: string[];
     resourcePath?: string[];
+    personality?: string[];
     lang?: LangResourcePaths;
     barrelPath?: (string | string[])[];
     annotations?: BarrelAnnotations;
     barrelMap?: BarrelMap;
     optBarrels?: OptBarrelMap;
     resourceMap?: JungleResourceMap;
+    products?: string[];
 };
-declare type JungleInfoBase = {
+type JungleInfoBase = {
     jungles: string[];
     manifest: string;
     xml: ManifestXML;
@@ -51,11 +53,13 @@ declare type JungleInfoBase = {
     buildDependencies: JungleBuildDependencies;
     devices: DeviceInfo;
 };
-export declare type JungleResourceMap = Record<string, xmlUtil.Document>;
-export declare type ResolvedJungle = JungleInfoBase & {
+export type JungleResourceMap = Record<string, xmlUtil.Document>;
+export type ResolvedJungle = JungleInfoBase & {
     targets: Target[];
+    typeCheckLevel?: string;
+    optimizationLevel?: string;
 };
-export declare type ResolvedBarrel = JungleInfoBase & {
+export type ResolvedBarrel = JungleInfoBase & {
     qualifier: JungleQualifier;
 };
 export declare function get_jungle(jungles: string, options: BuildConfig, resources?: JungleResourceMap | undefined): Promise<ResolvedJungle>;

package/build/src/manifest.d.ts

@@ -1,5 +1,5 @@
 import { xmlUtil } from "./sdk-util";
-export declare type ManifestXML = xmlUtil.Document;
+export type ManifestXML = xmlUtil.Document;
 export declare function readManifest(manifest: string): Promise<ManifestXML>;
 export declare function writeManifest(filename: string, xml: ManifestXML): Promise<void>;
 export declare function manifestProducts(manifest: ManifestXML): string[];

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

@@ -2,14 +2,15 @@ import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { EnumStringMember } from "@markw65/prettier-plugin-monkeyc/build/estree-types";
 import { xmlUtil } from "./sdk-util";
 import { ExactOrUnion } from "./type-flow/types";
-export declare type DiagnosticType = "ERROR" | "WARNING" | "INFO";
-export declare type LookupRules = "COMPILER1" | "COMPILER2" | "DEFAULT";
-export declare type EnforceStatic = "YES" | "NO";
-export declare type BuildConfig = {
+export type DiagnosticType = "ERROR" | "WARNING" | "INFO";
+export type LookupRules = "COMPILER1" | "COMPILER2" | "DEFAULT";
+export type EnforceStatic = "YES" | "NO";
+export type BuildConfig = {
     workspace?: string;
     jungleFiles?: string;
     developerKeyPath?: string;
     typeCheckLevel?: string;
+    optimizationLevel?: string;
     compilerOptions?: string;
     compilerWarnings?: boolean;
     simulatorBuild?: boolean;
@@ -47,15 +48,16 @@ export declare type BuildConfig = {
     removeArgc?: boolean;
     postBuildPRE?: boolean;
 };
-export declare type StateNodeDecl = StateNode | mctree.EnumStringMember | mctree.TypedIdentifier;
-export declare type StateNodeDecls = {
+export type StateNodeDecl = StateNode | mctree.EnumStringMember | mctree.TypedIdentifier;
+export type StateNodeDecls = {
     [key: string]: StateNodeDecl[];
 };
-export declare type ImportUsing = {
+export type ImportUsing = {
     node: mctree.Using | mctree.ImportModule;
     module?: ModuleStateNode | null | undefined;
 };
-export declare enum StateNodeAttributes {
+export declare const enum StateNodeAttributes {
+    NONE = 0,
     PUBLIC = 1,
     PROTECTED = 2,
     PRIVATE = 4,
@@ -93,7 +95,7 @@ export interface ClassStateNode extends BaseStateNode {
     hasInvoke?: boolean;
     superClasses?: Set<StateNode>;
 }
-export declare type FunctionInfo = {
+export type FunctionInfo = {
     modifiedDecls: Set<VariableStateNode>;
     calledFuncs: Set<FunctionStateNode>;
     resolvedDecls?: Set<VariableStateNode>;
@@ -159,20 +161,20 @@ export interface Diagnostic extends DiagnosticBase {
         message: string;
     };
 }
-declare type ProgramStateStackElem = {
+type ProgramStateStackElem = {
     sn: StateNode;
     usings?: Record<string, ImportUsing>;
     imports?: ImportUsing[];
 };
-export declare type StateNode = ProgramStateNode | FunctionStateNode | BlockStateNode | ClassStateNode | ModuleStateNode | TypedefStateNode | VariableStateNode | EnumStateNode;
-export declare type ProgramStateStack = ProgramStateStackElem[];
-export declare type LookupDefinition = {
+export type StateNode = ProgramStateNode | FunctionStateNode | BlockStateNode | ClassStateNode | ModuleStateNode | TypedefStateNode | VariableStateNode | EnumStateNode;
+export type ProgramStateStack = ProgramStateStackElem[];
+export type LookupDefinition = {
     parent: StateNode | null;
     results: StateNodeDecl[];
 };
-export declare type LookupResult = [string, LookupDefinition[]] | [null, null] | [false, false];
-export declare type ByNameStateNodeDecls = ModuleStateNode | ClassStateNode | FunctionStateNode | ProgramStateNode;
-export declare type ProgramState = {
+export type LookupResult = [string, LookupDefinition[]] | [null, null] | [false, false];
+export type ByNameStateNodeDecls = ModuleStateNode | ClassStateNode | FunctionStateNode | ProgramStateNode;
+export type ProgramState = {
     allFunctions?: Record<string, FunctionStateNode[]>;
     allClasses?: ClassStateNode[];
     invokeInfo?: FunctionInfo;
@@ -224,18 +226,19 @@ export declare type ProgramState = {
     inlineDiagnostics?: Record<string, Diagnostic[]>;
     enumMap?: Map<EnumStringMember, EnumStateNode>;
 };
-export declare type Finalized<T, Keys extends keyof T> = T & {
+export type Finalized<T, Keys extends keyof T> = T & {
     [key in Keys]-?: NonNullable<T[key]>;
 };
-export declare type ProgramStateLive = Finalized<ProgramState, "stack" | "top" | "lookup" | "lookupValue" | "lookupType" | "lookupNonlocal" | "stackClone" | "traverse" | "index" | "constants" | "removeNodeComments" | "inType" | "nextExposed" | "lookupRules">;
-export declare type ProgramStateAnalysis = Finalized<ProgramStateLive, "allClasses" | "allFunctions" | "fnMap" | "allDeclarations" | "invokeInfo">;
-export declare type ProgramStateOptimizer = Finalized<ProgramStateAnalysis, "localsStack" | "exposed" | "calledFunctions" | "usedByName">;
-export declare type ExcludeAnnotationsMap = {
+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 ProgramStateOptimizer = Finalized<ProgramStateAnalysis, "localsStack" | "exposed" | "calledFunctions" | "usedByName">;
+export type ExcludeAnnotationsMap = {
     [key: string]: boolean;
 };
-export declare type FilesToOptimizeMap = {
+export type FilesToOptimizeMap = {
     [key: string]: {
         output: string;
+        barrel: string;
         excludeAnnotations: ExcludeAnnotationsMap;
         monkeyCSource?: string;
         ast?: mctree.Program;

package/build/src/optimizer.d.ts

@@ -65,7 +65,7 @@ export declare function generateOptimizedProject(options: BuildConfig): Promise<
     hasTests: boolean;
     diagnostics: Record<string, import("./optimizer-types").Diagnostic[]>;
 }>;
-export declare type PreAnalysis = {
+export type PreAnalysis = {
     fnMap: FilesToOptimizeMap;
     paths: string[];
 };
@@ -74,7 +74,7 @@ declare type RequiredNonNull<T> = {
         [K2 in keyof T[K1]]-?: NonNullable<T[K1][K2]>;
     };
 };
-export declare type Analysis = {
+export type Analysis = {
     fnMap: RequiredNonNull<FilesToOptimizeMap>;
     paths: string[];
     state: ProgramStateAnalysis;

package/build/src/projects.d.ts

@@ -1,5 +1,5 @@
 import { BuildConfig } from "./optimizer-types";
-export declare type RemoteProject = string | {
+export type RemoteProject = string | {
     root: string;
     options?: BuildConfig;
     rename?: {

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

@@ -17,13 +17,13 @@ export declare const enum SectionKinds {
     SIGNATURE = -507453934,
     STORE_SIG = 20833
 }
-export declare type SectionInfo = {
+export type SectionInfo = {
     offset: number;
     length: number;
     view: DataView;
 };
-export declare type Logger = (module: string, level: number, message: string) => void;
-export declare type Context = {
+export type Logger = (module: string, level: number, message: string) => void;
+export type Context = {
     config: BuildConfig;
     filepath: string;
     sections: Record<number, SectionInfo>;
@@ -37,7 +37,7 @@ export declare type Context = {
     nextOffset: number;
     nextLocalId: number;
 };
-export declare type Block = {
+export type Block = {
     offset: number;
     bytecodes: Bytecode[];
     try?: ExceptionEntry[];
@@ -46,7 +46,7 @@ export declare type Block = {
     exsucc?: number;
     preds?: Set<number>;
 };
-export declare type FuncEntry = {
+export type FuncEntry = {
     name?: string;
     offset: number;
     argc?: number;

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

@@ -2,11 +2,12 @@ import { Block, FuncEntry } from "./bytecode";
 import { Bytecode } from "./opcodes";
 export declare function postOrderTraverse(func: FuncEntry, visitor: (block: Block) => void): void;
 export declare function intersect<T>(a: Set<T>, b: Set<T>): Set<T>;
-export declare type DomLike = Map<number, Set<number>>;
+export type DomLike = Map<number, Set<number>>;
 export declare function computePostDominators(func: FuncEntry): DomLike;
 export declare function computeDominators(func: FuncEntry): DomLike;
 export declare function postOrderPropagate<T>(func: FuncEntry, preBlock: (block: Block) => T, processBc: (block: Block, bc: Bytecode, state: T) => void, postBlock: (block: Block, state: T) => void, merge: (state: T, predBlock: Block, isExPred: boolean) => boolean): void;
-export declare enum RpoFlags {
+export declare const enum RpoFlags {
+    Nothing = 0,
     EnqueueTaken = 1,
     EnqueueNext = 2,
     SkipTaken = 4,

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

@@ -1,7 +1,7 @@
 import { Context, FuncEntry } from "./bytecode";
 import { ExceptionsMap } from "./exceptions";
 import { LineNumber } from "./linenum";
-declare type LocalXmlInfo = {
+type LocalXmlInfo = {
     name: string;
     startPc: number;
     endPc: number;
@@ -9,11 +9,11 @@ declare type LocalXmlInfo = {
     slot: number;
     id: number;
 };
-export declare type LocalsMap = Map<number, {
+export type LocalsMap = Map<number, {
     startPc: number;
     endPc: number;
 }>;
-export declare type UpdateInfo = {
+export type UpdateInfo = {
     offsetMap: Map<number, number>;
     localRanges: LocalXmlInfo[];
     lineMap: LineNumber[];

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

@@ -1,10 +1,10 @@
 import { Context } from "./bytecode";
 import { UpdateInfo } from "./emit";
-export declare type ExceptionEntry = {
+export type ExceptionEntry = {
     tryStart: number;
     tryEnd: number;
     handler: number;
 };
-export declare type ExceptionsMap = Map<number, ExceptionEntry[]>;
+export type ExceptionsMap = Map<number, ExceptionEntry[]>;
 export declare function parseExceptions(view: DataView): ExceptionsMap;
 export declare function fixupExceptions(context: Context, updateInfo: UpdateInfo): void;

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

@@ -1,10 +1,10 @@
 import { Context } from "./bytecode";
 import { UpdateInfo } from "./emit";
-export declare type SectionOffset = {
+export type SectionOffset = {
     data: number;
     code: number;
 };
-export declare type Header = {
+export type Header = {
     ciqVersion: number;
     backgroundOffsets: SectionOffset;
     appLock: boolean;

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

@@ -5,7 +5,7 @@ interface InterpItemInfo {
     type: ExactOrUnion;
     equivs?: Set<number>;
 }
-export declare type InterpState = {
+export type InterpState = {
     stack: InterpItemInfo[];
     locals: InterpItemInfo[];
     loopBlock?: true;

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

@@ -23,7 +23,7 @@ interface LineNumberStr extends BaseLineNumber {
     parent?: string | undefined;
     id: number;
 }
-export declare type LineNumber = LineNumberStr | LineNumberSym;
+export type LineNumber = LineNumberStr | LineNumberSym;
 export declare function parseLineNum(view: DataView, debugXml: xmlUtil.Document): Map<number, LineNumber>;
 export declare function fixupLineNum(context: Context, updateInfo: UpdateInfo): void;
 export {};

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

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

package/build/src/resources.d.ts

@@ -2,8 +2,8 @@ import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { JungleResourceMap } from "./jungles";
 import { ProgramState } from "./optimizer-types";
 import { xmlUtil } from "./sdk-util";
-declare type Visit = (e: xmlUtil.Element, module: string | null, parent: xmlUtil.Element | null) => void;
-declare type Visitor = {
+type Visit = (e: xmlUtil.Element, module: string | null, parent: xmlUtil.Element | null) => void;
+type Visitor = {
     visit?: Visit;
     error?: (node: xmlUtil.Element, parent: string | null) => void;
 } & xmlUtil.Visitor;

package/build/src/sdk-util.d.ts

@@ -5,7 +5,7 @@ export declare const isWin: boolean;
 export declare const appSupport: string;
 export declare const connectiq: string;
 export declare function getSdkPath(): Promise<string>;
-export declare type DeviceInfo = {
+export type DeviceInfo = {
     [key: string]: {
         appTypes: {
             memoryLimit: number;

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

@@ -2,7 +2,7 @@ import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { NodeEquivMap } from "../type-flow";
 import { FunctionStateNode, ProgramStateAnalysis } from "../optimizer-types";
 import { TypeFlowBlock, TypeStateKey } from "./type-flow-util";
-export declare type CopyPropStores = Map<mctree.Node, {
+export type CopyPropStores = Map<mctree.Node, {
     ref: mctree.Node;
     ant: boolean;
 }>;

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

@@ -4,13 +4,13 @@ import { InterpStackElem, InterpState } from "./interp";
 import { ExactOrUnion } from "./types";
 export declare function evaluateCall(istate: InterpState, node: mctree.CallExpression, callee: ExactOrUnion, args: ExactOrUnion[]): InterpStackElem;
 export declare function checkCallArgs(istate: InterpState, node: mctree.CallExpression, callees: FunctionStateNode | FunctionStateNode[], args: ExactOrUnion[]): InterpStackElem;
-declare type SysCallHelperResult = {
+type SysCallHelperResult = {
     calleeObj?: ExactOrUnion;
     returnType?: ExactOrUnion;
     argTypes?: ExactOrUnion[];
     effectFree?: true;
     argEffects?: true;
 };
-declare type SysCallHelper = (state: ProgramStateAnalysis, func: FunctionStateNode, calleeObj: ExactOrUnion, getArgs: () => Array<ExactOrUnion>) => SysCallHelperResult;
+type SysCallHelper = (state: ProgramStateAnalysis, func: FunctionStateNode, calleeObj: ExactOrUnion, getArgs: () => Array<ExactOrUnion>) => SysCallHelperResult;
 export declare function sysCallInfo(state: ProgramStateAnalysis, func: FunctionStateNode): SysCallHelper | null;
 export {};

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

@@ -1,16 +1,17 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { DiagnosticType, FunctionStateNode, ProgramStateAnalysis } from "../optimizer-types";
 import { ExactOrUnion } from "./types";
-export declare type TypeMap = Map<mctree.Node, ExactOrUnion>;
-export declare type InterpStackElem = {
+export type TypeMap = Map<mctree.Node, ExactOrUnion>;
+export type InterpStackElem = {
     value: ExactOrUnion;
     embeddedEffects: boolean;
     node: mctree.Expression | mctree.TypeSpecList | mctree.InstanceOfCase;
 };
-export declare type InterpState = {
+export type InterpState = {
     state: ProgramStateAnalysis;
     stack: InterpStackElem[];
     typeMap?: TypeMap;
+    localLvals?: Set<mctree.Node>;
     func?: FunctionStateNode;
     pre?: (node: mctree.Node) => mctree.Node | false | null | void;
     post?: (node: mctree.Node) => mctree.Node | false | null | void;