@markw65/monkeyc-optimizer 1.0.18 → 1.0.21

package/build/src/inliner.d.ts

@@ -4,10 +4,11 @@ export declare enum InlineStatus {
     AsExpression = 1,
     AsStatement = 2
 }
-export declare function shouldInline(state: ProgramStateAnalysis, func: FunctionStateNode, args: mctree.Node[]): InlineStatus;
+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 inlineFunction(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression, inlineStatus: InlineStatus): InlineBody | null;
+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;
 export {};

package/build/src/launch.d.ts

@@ -1,2 +1,3 @@
+import { LineHandler } from "./util";
 export declare function launchSimulator(): Promise<void>;
-export declare function simulateProgram(prg: string, device: string, test?: boolean): Promise<void>;
+export declare function simulateProgram(prg: string, device: string, test?: boolean, logger?: LineHandler | LineHandler[]): Promise<void>;

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

@@ -4,4 +4,11 @@ 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 getLiteralNode(node: mctree.Node | null | undefined): null | mctree.Literal | mctree.AsExpression;
-export declare function optimizeMonkeyC(fnMap: FilesToOptimizeMap): Promise<void>;
+export declare function optimizeMonkeyC(fnMap: FilesToOptimizeMap): Promise<Record<string, {
+    type: "ERROR" | "WARNING" | "INFO";
+    loc: {
+        start: mctree.Position;
+        end: mctree.Position;
+    };
+    message: string;
+}[]> | undefined>;

package/build/src/optimizer.d.ts

@@ -117,16 +117,17 @@ declare global {
         lookupType?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack) => [string, StateNodeDecl[], ProgramStateStack] | [null, null, null];
         traverse?: (node: mctree.Node) => void | null | false | mctree.Node | mctree.Node[];
         inType?: boolean;
+        inlining?: true;
         exposed?: {
             [key: string]: true;
         };
         calledFunctions?: {
-            [key: string]: unknown[];
+            [key: string]: mctree.FunctionDeclaration[];
         };
         localsStack?: {
             node?: mctree.Node;
             map?: {
-                [key: string]: true | string;
+                [key: string]: boolean | string;
             };
             inners?: {
                 [key: string]: true;
@@ -138,6 +139,14 @@ declare global {
         constants?: {
             [key: string]: mctree.Literal;
         };
+        diagnostics?: Record<string, {
+            type: "ERROR" | "WARNING" | "INFO";
+            loc: {
+                start: mctree.Position;
+                end: mctree.Position;
+            };
+            message: string;
+        }[]>;
     };
     type Finalized<T, Keys extends keyof T> = T & {
         [key in Keys]-?: NonNullable<T[key]>;
@@ -172,17 +181,34 @@ export declare function buildOptimizedProject(product: string | null, options: B
     program: string;
     product: string | null;
     hasTests: boolean | undefined;
+    diagnostics: Record<string, {
+        type: "ERROR" | "WARNING" | "INFO";
+        loc: {
+            start: mctree.Position;
+            end: mctree.Position;
+        };
+        message: string;
+    }[]> | undefined;
 }>;
 export declare function generateOptimizedProject(options: BuildConfig): Promise<{
     jungleFiles: string | undefined;
     program: string;
     xml?: undefined;
     hasTests?: undefined;
+    diagnostics?: undefined;
 } | {
     jungleFiles: string;
     xml: import("./manifest").ManifestXML;
     program: string;
     hasTests: boolean;
+    diagnostics: Record<string, {
+        type: "ERROR" | "WARNING" | "INFO";
+        loc: {
+            start: mctree.Position;
+            end: mctree.Position;
+        };
+        message: string;
+    }[]>;
 }>;
 export declare type PreAnalysis = {
     fnMap: FilesToOptimizeMap;

package/build/src/util.d.ts

@@ -2,12 +2,11 @@ import * as glob from "glob";
 export declare function globa(pattern: string, options?: glob.IOptions): Promise<Array<string>>;
 export declare function last_modified(inputs: string[]): Promise<number>;
 export declare function first_modified(inputs: string[]): Promise<number>;
-export declare function pushUnique<T>(arr: T[], value: T): void;
-declare type LineHandler = (line: string) => void;
+export declare function pushUnique<T, U extends T>(arr: T[], value: U): void;
+export declare type LineHandler = (line: string) => void;
 export declare function spawnByLine(command: string, args: string[], lineHandlers: LineHandler | LineHandler[], options?: {
     [key: string]: unknown;
 }): Promise<void>;
 export declare function readByLine(file: string, lineHandler: LineHandler): Promise<unknown>;
 export declare function promiseAll<T>(promiseFn: (i: number) => Promise<T>, parallelism: number): Promise<T[]>;
 export declare function copyRecursiveAsNeeded(source: string, target: string, filter?: (src: string, tgt: string) => boolean): Promise<void>;
-export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.18",
+  "version": "1.0.21",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -34,7 +34,7 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.21"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.24"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0",