@markw65/monkeyc-optimizer 1.0.16 → 1.0.19

package/build/sdk-util.cjs

@@ -1,4 +1,4 @@
-0 && (module.exports = {isWin,appSupport,connectiq,getSdkPath,getDeviceInfo,getLanguages});
+0 && (module.exports = {appSupport,connectiq,getDeviceInfo,getLanguages,getSdkPath,isWin});
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 

package/build/src/api.d.ts

@@ -5,5 +5,5 @@ 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 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): false | void | null | mctree.Node;
+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;

package/build/src/inliner.d.ts

@@ -1,4 +1,14 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-export declare function shouldInline(state: ProgramStateAnalysis, func: FunctionStateNode, args: mctree.Node[]): boolean | undefined;
-export declare function inlineFunction(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression): any;
+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 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/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

@@ -111,11 +111,11 @@ declare global {
         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;
+        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];
-        traverse?: (node: mctree.Node) => void | null | false | mctree.Node;
+        traverse?: (node: mctree.Node) => void | null | false | mctree.Node | mctree.Node[];
         inType?: boolean;
         exposed?: {
             [key: string]: true;
@@ -126,7 +126,7 @@ declare global {
         localsStack?: {
             node?: mctree.Node;
             map?: {
-                [key: string]: true | string;
+                [key: string]: boolean | string;
             };
             inners?: {
                 [key: string]: true;
@@ -138,6 +138,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 +180,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/pragma-checker.d.ts

@@ -0,0 +1,2 @@
+import { mctree } from "@markw65/prettier-plugin-monkeyc";
+export declare function pragmaChecker(ast: mctree.Program): void;

package/build/src/variable-renamer.d.ts

@@ -0,0 +1 @@
+export declare function renameVariable(state: ProgramStateAnalysis, locals: NonNullable<ProgramStateAnalysis["localsStack"]>[number], declName: string): string | null;

package/build/util.cjs

@@ -1,4 +1,4 @@
-0 && (module.exports = {globa,last_modified,first_modified,pushUnique,spawnByLine,readByLine,promiseAll,copyRecursiveAsNeeded});
+0 && (module.exports = {copyRecursiveAsNeeded,first_modified,globa,last_modified,promiseAll,pushUnique,readByLine,spawnByLine});
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.16",
+  "version": "1.0.19",
   "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.22"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0",