@markw65/monkeyc-optimizer 1.0.20 → 1.0.23

package/build/src/api.d.ts

@@ -1,9 +1,13 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-export declare function getApiMapping(state?: ProgramState): Promise<ProgramStateNode | null>;
+import { traverseAst } from "./ast";
+export { visitReferences } from "./visitor";
+export { traverseAst };
+export declare function getApiMapping(state?: ProgramState, barrelList?: string[]): Promise<ProgramStateNode | null>;
 export declare function hasProperty<T extends null extends T ? unknown : undefined extends T ? unknown : never>(obj: T, prop: string): obj is NonNullable<T>;
 export declare function hasProperty<T>(obj: T, prop: string): boolean;
 export declare function isStateNode(node: StateNodeDecl): node is StateNode;
-export declare function variableDeclarationName(node: mctree.TypedIdentifier): string;
+export declare function variableDeclarationName(node: mctree.TypedIdentifier | mctree.InstanceofIdentifier): string;
+export declare function sameLookupResult(a: LookupDefinition[], b: LookupDefinition[]): boolean;
 export declare function collectNamespaces(ast: mctree.Program, stateIn?: ProgramState): ProgramStateNode;
-export declare function traverseAst(node: mctree.Node, pre?: null | ((node: mctree.Node) => void | null | false | (keyof mctree.NodeAll)[]), post?: (node: mctree.Node) => void | null | false | mctree.Node | mctree.Node[]): false | void | null | mctree.Node | mctree.Node[];
 export declare function formatAst(node: mctree.Node, monkeyCSource?: string | null): string;
+export declare function findUsingForNode(state: ProgramStateLive, stack: ProgramStateStack, i: number, node: mctree.Identifier, isType: boolean): StateNodeDecl[] | null;

package/build/src/ast.d.ts

@@ -0,0 +1,2 @@
+import { mctree } from "@markw65/prettier-plugin-monkeyc";
+export declare function traverseAst(node: mctree.Node, pre?: null | ((node: mctree.Node) => void | null | false | (keyof mctree.NodeAll)[]), post?: (node: mctree.Node) => void | null | false | mctree.Node | mctree.Node[]): false | void | null | mctree.Node | mctree.Node[];

package/build/src/inliner.d.ts

@@ -1,13 +1,9 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-export declare enum InlineStatus {
-    Never = 0,
-    AsExpression = 1,
-    AsStatement = 2
-}
 export declare function shouldInline(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression, context: InlineContext | null): boolean;
 declare type InlineBody = mctree.BlockStatement | mctree.ExpressionStatement["expression"];
 export declare function unused(expression: mctree.ExpressionStatement["expression"]): mctree.ExpressionStatement[];
 export declare function unused(expression: mctree.ExpressionStatement["expression"], top: true): mctree.ExpressionStatement[] | null;
+export declare function diagnostic(state: ProgramStateLive, loc: mctree.Node["loc"], message: string | null, type?: NonNullable<ProgramStateAnalysis["diagnostics"]>[string][number]["type"]): void;
 export declare type InlineContext = mctree.ReturnStatement | mctree.AssignmentExpression | mctree.ExpressionStatement;
 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;

package/build/src/mc-rewrite.d.ts

@@ -1,11 +1,11 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 export declare function getFileSources(fnMap: FilesToOptimizeMap): Promise<void>;
 export declare function getFileASTs(fnMap: FilesToOptimizeMap): Promise<boolean>;
-export declare function analyze(fnMap: FilesToOptimizeMap): Promise<ProgramStateAnalysis>;
-export declare function getLiteralFromDecls(decls: StateNodeDecl[]): null;
+export declare function analyze(fnMap: FilesToOptimizeMap, barrelList?: string[], config?: BuildConfig): Promise<ProgramStateAnalysis>;
+export declare function getLiteralFromDecls(lookupDefns: LookupDefinition[]): null;
 export declare function getLiteralNode(node: mctree.Node | null | undefined): null | mctree.Literal | mctree.AsExpression;
-export declare function optimizeMonkeyC(fnMap: FilesToOptimizeMap): Promise<Record<string, {
-    type: "ERROR" | "WARNING" | "INFO";
+export declare function optimizeMonkeyC(fnMap: FilesToOptimizeMap, barrelList?: string[], config?: BuildConfig): Promise<Record<string, {
+    type: DiagnosticType;
     loc: {
         start: mctree.Position;
         end: mctree.Position;

package/build/src/optimizer.d.ts

@@ -13,6 +13,7 @@ export interface ErrorWithLocation extends Error {
 }
 export declare function isErrorWithLocation(e: Error): e is ErrorWithLocation;
 declare global {
+    type DiagnosticType = "ERROR" | "WARNING" | "INFO";
     type BuildConfig = {
         workspace?: string;
         jungleFiles?: string;
@@ -35,6 +36,7 @@ declare global {
         ignoredSourcePaths?: string;
         returnCommand?: boolean;
         checkBuildPragmas?: boolean;
+        checkInvalidSymbols?: DiagnosticType | "OFF";
         _cache?: {
             barrels?: Record<string, ResolvedJungle>;
             barrelMap?: Record<string, Record<string, ResolvedJungle>>;
@@ -44,6 +46,10 @@ declare global {
     type StateNodeDecls = {
         [key: string]: StateNodeDecl[];
     };
+    type ImportUsing = {
+        node: mctree.Using | mctree.ImportModule;
+        module?: ModuleStateNode | null | undefined;
+    };
     interface BaseStateNode {
         type: string;
         node: mctree.Node | null | undefined;
@@ -52,10 +58,12 @@ declare global {
         decls?: StateNodeDecls | undefined;
         type_decls?: StateNodeDecls | undefined;
         stack?: ProgramStateStack | undefined;
+        usings?: Record<string, ImportUsing>;
+        imports?: ImportUsing[];
     }
     interface ProgramStateNode extends BaseStateNode {
         type: "Program";
-        node: null | undefined;
+        node: mctree.Program | undefined;
         name: "$";
         fullName: "$";
         stack?: undefined;
@@ -80,6 +88,7 @@ declare global {
         fullName: string;
         stack?: ProgramStateStack;
         decls?: undefined;
+        isStatic?: boolean;
     }
     interface BlockStateNode extends BaseStateNode {
         type: "BlockStatement";
@@ -103,6 +112,11 @@ declare global {
     }
     type StateNode = ProgramStateNode | FunctionStateNode | BlockStateNode | ClassStateNode | ModuleStateNode | TypedefStateNode | VariableStateNode;
     type ProgramStateStack = StateNode[];
+    type LookupDefinition = {
+        parent: StateNodeDecl | null;
+        results: StateNodeDecl[];
+    };
+    type LookupResult = [string, LookupDefinition[]] | [null, null] | [false, false];
     export type ProgramState = {
         allFunctions?: FunctionStateNode[];
         allClasses?: ClassStateNode[];
@@ -112,11 +126,15 @@ declare global {
         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[];
-        lookup?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack) => [string, StateNodeDecl[], ProgramStateStack] | [null, null, null];
-        lookupValue?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack) => [string, StateNodeDecl[], ProgramStateStack] | [null, null, null];
-        lookupType?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack) => [string, StateNodeDecl[], ProgramStateStack] | [null, null, null];
+        lookup?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack) => LookupResult;
+        lookupValue?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack) => LookupResult;
+        lookupType?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack) => LookupResult;
+        lookupNonlocal?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack) => LookupResult;
+        stackClone?: () => ProgramStateStack;
         traverse?: (node: mctree.Node) => void | null | false | mctree.Node | mctree.Node[];
         inType?: boolean;
+        inlining?: true;
+        config?: BuildConfig;
         exposed?: {
             [key: string]: true;
         };
@@ -139,7 +157,7 @@ declare global {
             [key: string]: mctree.Literal;
         };
         diagnostics?: Record<string, {
-            type: "ERROR" | "WARNING" | "INFO";
+            type: DiagnosticType;
             loc: {
                 start: mctree.Position;
                 end: mctree.Position;
@@ -150,7 +168,7 @@ declare global {
     type Finalized<T, Keys extends keyof T> = T & {
         [key in Keys]-?: NonNullable<T[key]>;
     };
-    export type ProgramStateLive = Finalized<ProgramState, "stack" | "lookup" | "lookupValue" | "lookupType" | "traverse" | "index" | "constants" | "removeNodeComments" | "inType">;
+    export type ProgramStateLive = Finalized<ProgramState, "stack" | "lookup" | "lookupValue" | "lookupType" | "lookupNonlocal" | "stackClone" | "traverse" | "index" | "constants" | "removeNodeComments" | "inType">;
     export type ProgramStateAnalysis = Finalized<ProgramStateLive, "allClasses" | "allFunctions" | "fnMap">;
     export type ProgramStateOptimizer = Finalized<ProgramStateAnalysis, "localsStack" | "exposed" | "calledFunctions">;
     type ExcludeAnnotationsMap = {
@@ -179,9 +197,9 @@ export declare function buildOptimizedProject(product: string | null, options: B
     args: string[];
     program: string;
     product: string | null;
-    hasTests: boolean | undefined;
+    hasTests: boolean;
     diagnostics: Record<string, {
-        type: "ERROR" | "WARNING" | "INFO";
+        type: DiagnosticType;
         loc: {
             start: mctree.Position;
             end: mctree.Position;
@@ -191,9 +209,9 @@ export declare function buildOptimizedProject(product: string | null, options: B
 }>;
 export declare function generateOptimizedProject(options: BuildConfig): Promise<{
     jungleFiles: string | undefined;
+    xml: import("./manifest").ManifestXML;
     program: string;
-    xml?: undefined;
-    hasTests?: undefined;
+    hasTests: boolean;
     diagnostics?: undefined;
 } | {
     jungleFiles: string;
@@ -201,7 +219,7 @@ export declare function generateOptimizedProject(options: BuildConfig): Promise<
     program: string;
     hasTests: boolean;
     diagnostics: Record<string, {
-        type: "ERROR" | "WARNING" | "INFO";
+        type: DiagnosticType;
         loc: {
             start: mctree.Position;
             end: mctree.Position;

package/build/src/pragma-checker.d.ts

@@ -1,2 +1,2 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-export declare function pragmaChecker(ast: mctree.Program): void;
+export declare function pragmaChecker(ast: mctree.Program, diagnostics: NonNullable<ProgramState["diagnostics"]>[string] | null | undefined): void;

package/build/src/util.d.ts

@@ -3,6 +3,7 @@ export declare function globa(pattern: string, options?: glob.IOptions): Promise
 export declare function last_modified(inputs: string[]): Promise<number>;
 export declare function first_modified(inputs: string[]): Promise<number>;
 export declare function pushUnique<T, U extends T>(arr: T[], value: U): void;
+export declare function sameArrays<T>(a1: T[], a2: T[], check: (a: T, b: T) => boolean): boolean;
 export declare type LineHandler = (line: string) => void;
 export declare function spawnByLine(command: string, args: string[], lineHandlers: LineHandler | LineHandler[], options?: {
     [key: string]: unknown;

package/build/src/visitor.d.ts

@@ -0,0 +1,2 @@
+import { mctree } from "@markw65/prettier-plugin-monkeyc";
+export declare function visitReferences(state: ProgramStateAnalysis, ast: mctree.Program, name: string | null, defn: LookupDefinition[] | null | false, callback: (node: mctree.Node, results: LookupDefinition[], error: boolean) => undefined | false): void;

package/build/util.cjs

@@ -1,4 +1,4 @@
-0 && (module.exports = {copyRecursiveAsNeeded,first_modified,globa,last_modified,promiseAll,pushUnique,readByLine,spawnByLine});
+0 && (module.exports = {copyRecursiveAsNeeded,first_modified,globa,last_modified,promiseAll,pushUnique,readByLine,sameArrays,spawnByLine});
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
@@ -4005,6 +4005,7 @@ __webpack_require__.d(__webpack_exports__, {
   "promiseAll": () => (/* binding */ promiseAll),
   "pushUnique": () => (/* binding */ pushUnique),
   "readByLine": () => (/* binding */ readByLine),
+  "sameArrays": () => (/* binding */ sameArrays),
   "spawnByLine": () => (/* binding */ spawnByLine)
 });
 
@@ -4065,6 +4066,9 @@ function pushUnique(arr, value) {
         return;
     arr.push(value);
 }
+function sameArrays(a1, a2, check) {
+    return a1.length === a2.length && a1.every((e, i) => check(e, a2[i]));
+}
 // return a promise that will process the output of command
 // line-by-line via lineHandlers.
 function spawnByLine(command, args, lineHandlers, options) {
@@ -4141,10 +4145,12 @@ async function copyRecursiveAsNeeded(source, target, filter) {
         }
         const files = await promises_namespaceObject.readdir(source);
         return Promise.all(files.map((file) => {
-            var src = external_path_.join(source, file);
-            var tgt = external_path_.join(target, file);
+            const src = external_path_.join(source, file);
+            const tgt = external_path_.join(target, file);
             return copyRecursiveAsNeeded(src, tgt, filter);
-        })).then(() => { });
+        })).then(() => {
+            return;
+        });
     }
     else {
         if (filter && !filter(source, target)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.20",
+  "version": "1.0.23",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -20,9 +20,12 @@
     "build-debug": "webpack --mode development",
     "build-release": "webpack --mode production",
     "prepack": "webpack --mode production",
-    "test": "npm run test-inline && npm run test-remote",
+    "test": "npm run test-optimized && npm run test-remote",
     "test-remote": "node ./test/test.js --product=pick-one --github",
-    "test-inline": "node test/test.js --run-tests --product=fenix5 --product=fr235 --jungle $(pwd)/test/OptimizerTests/monkey.jungle"
+    "test-optimized": "node test/test.js --run-tests --product=fenix5 --product=fr235 --jungle $(pwd)/test/OptimizerTests/monkey.jungle",
+    "test-unopt": "node test/test.js --skipOptimization --run-tests --product=fenix5 --product=fr235 --jungle $(pwd)/test/OptimizerTests/monkey.jungle",
+    "test-garmin-opt": "node test/test.js --skipOptimization --garminOptLevel=2 --run-tests --product=fenix5 --product=fr235 --jungle $(pwd)/test/OptimizerTests/monkey.jungle",
+    "eslint": "npx eslint ."
   },
   "files": [
     "build/optimizer.cjs",
@@ -34,12 +37,14 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.22"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.27"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0",
     "@types/prettier": "^2.6.1",
     "@types/xml2js": "^0.4.11",
+    "@typescript-eslint/eslint-plugin": "^5.28.0",
+    "@typescript-eslint/parser": "^5.28.0",
     "eslint": "^8.12.0",
     "extract-zip": "^2.0.1",
     "glob": "^7.2.0",