@markw65/monkeyc-optimizer 1.0.42 → 1.0.43

package/README.md

@@ -507,3 +507,14 @@ Bug Fixes
 
 - New features
   - Resource files, and manifest.xml generate definitions and references so that prettier-extension-monkeyc can provide Goto Ref/Def between monkeyc, resource, and manifest files.
+
+### 1.0.43
+
+- Update to [@markw65/prettier-plugin-monkeyc@1.0.39](https://github.com/markw65/prettier-plugin-monkeyc#1039)
+
+  - Fixes issues parsing/printing/optimizing NaN
+
+- Fix issues with windows paths introduced in 1.0.42
+- Add Symbols (`:name`) to the list of things the inliner knows are constants
+- Propagate `:typecheck(false)` to the caller when inlining
+- Fix an issue with bogus undefined symbols being reported against manifest.xml in some projects that use barrels.

package/build/api.cjs

@@ -466,7 +466,13 @@ function ast_withLoc(node, start, end) {
             node.end = start.end;
         node.loc = { ...(node.loc || start.loc), start: start.loc.start };
     }
-    if (end && end.loc) {
+    if (end === false) {
+        if (node.loc) {
+            node.loc.end = node.loc.start;
+            node.end = node.start;
+        }
+    }
+    else if (end && end.loc) {
         node.end = end.end;
         node.loc = { ...(node.loc || end.loc), end: end.loc.end };
     }
@@ -829,6 +835,12 @@ function getArgSafety(state, func, args, requireAll) {
     let allSafe = true;
     if (!args.every((arg, i) => {
         switch (arg.type) {
+            case "UnaryExpression":
+                if (arg.operator === ":") {
+                    safeArgs.push(true);
+                    return true;
+                }
+                break;
             case "Literal":
                 safeArgs.push(true);
                 return true;
@@ -1408,7 +1420,16 @@ function inlineWithArgs(state, func, call, context) {
     withLocDeep(body, context, context, true);
     return body;
 }
-function inliner_inlineFunction(state, func, call, context) {
+function isTypecheckArg(node, arg) {
+    return (node.type === "CallExpression" &&
+        node.callee.type === "Identifier" &&
+        node.callee.name === ":typecheck" &&
+        (arg === null ||
+            (node.arguments.length === 1 &&
+                node.arguments[0].type === "Literal" &&
+                node.arguments[0].value === arg)));
+}
+function inlineFunctionHelper(state, func, call, context) {
     if (context) {
         return inlineWithArgs(state, func, call, context);
     }
@@ -1419,6 +1440,33 @@ function inliner_inlineFunction(state, func, call, context) {
     state.localsStack[state.localsStack.length - 1].map = map;
     return ret && withLocDeep(ret, call, call, true);
 }
+function inliner_inlineFunction(state, func, call, context) {
+    const ret = inlineFunctionHelper(state, func, call, context);
+    if (!ret)
+        return ret;
+    const typecheckFalse = func.node.attrs?.attributes?.elements.find((attr) => isTypecheckArg(attr, false));
+    if (!typecheckFalse) {
+        return ret;
+    }
+    const callerSn = state.stack.find((sn) => sn.type === "FunctionDeclaration");
+    if (!callerSn) {
+        return ret;
+    }
+    const caller = callerSn.node;
+    if (!caller.attrs) {
+        caller.attrs = withLoc({
+            type: "AttributeList",
+        }, caller, false);
+    }
+    if (!caller.attrs.attributes) {
+        caller.attrs.attributes = withLoc({ type: "Attributes", elements: [] }, caller.attrs, false);
+    }
+    if (caller.attrs.attributes.elements.find((attr) => isTypecheckArg(attr, null))) {
+        return ret;
+    }
+    caller.attrs.attributes.elements.unshift(withLocDeep({ ...typecheckFalse }, caller.attrs, false));
+    return ret;
+}
 function applyTypeIfNeeded(node) {
     if ("enumType" in node && node.enumType) {
         node = {
@@ -4748,7 +4796,9 @@ function add_resources_to_ast(ast, resources, manifestXML) {
         body.push(rez);
         const hiddenRez = makeModule("*Rez*");
         rez.body.body.push(hiddenRez);
-        if (manifestXML && manifestXML.body instanceof external_sdk_util_cjs_namespaceObject.xmlUtil.Nodes) {
+        if (barrel === "" &&
+            manifestXML &&
+            manifestXML.body instanceof external_sdk_util_cjs_namespaceObject.xmlUtil.Nodes) {
             manifestXML.body
                 .children("iq:application")
                 .elements.forEach((e) => add_one_resource(rez, e));

package/build/optimizer.cjs

@@ -4731,7 +4731,13 @@ function withLoc(node, start, end) {
             node.end = start.end;
         node.loc = { ...(node.loc || start.loc), start: start.loc.start };
     }
-    if (end && end.loc) {
+    if (end === false) {
+        if (node.loc) {
+            node.loc.end = node.loc.start;
+            node.end = node.start;
+        }
+    }
+    else if (end && end.loc) {
         node.end = end.end;
         node.loc = { ...(node.loc || end.loc), end: end.loc.end };
     }
@@ -5092,6 +5098,12 @@ function getArgSafety(state, func, args, requireAll) {
     let allSafe = true;
     if (!args.every((arg, i) => {
         switch (arg.type) {
+            case "UnaryExpression":
+                if (arg.operator === ":") {
+                    safeArgs.push(true);
+                    return true;
+                }
+                break;
             case "Literal":
                 safeArgs.push(true);
                 return true;
@@ -5671,7 +5683,16 @@ function inlineWithArgs(state, func, call, context) {
     withLocDeep(body, context, context, true);
     return body;
 }
-function inlineFunction(state, func, call, context) {
+function isTypecheckArg(node, arg) {
+    return (node.type === "CallExpression" &&
+        node.callee.type === "Identifier" &&
+        node.callee.name === ":typecheck" &&
+        (arg === null ||
+            (node.arguments.length === 1 &&
+                node.arguments[0].type === "Literal" &&
+                node.arguments[0].value === arg)));
+}
+function inlineFunctionHelper(state, func, call, context) {
     if (context) {
         return inlineWithArgs(state, func, call, context);
     }
@@ -5682,6 +5703,33 @@ function inlineFunction(state, func, call, context) {
     state.localsStack[state.localsStack.length - 1].map = map;
     return ret && withLocDeep(ret, call, call, true);
 }
+function inlineFunction(state, func, call, context) {
+    const ret = inlineFunctionHelper(state, func, call, context);
+    if (!ret)
+        return ret;
+    const typecheckFalse = func.node.attrs?.attributes?.elements.find((attr) => isTypecheckArg(attr, false));
+    if (!typecheckFalse) {
+        return ret;
+    }
+    const callerSn = state.stack.find((sn) => sn.type === "FunctionDeclaration");
+    if (!callerSn) {
+        return ret;
+    }
+    const caller = callerSn.node;
+    if (!caller.attrs) {
+        caller.attrs = withLoc({
+            type: "AttributeList",
+        }, caller, false);
+    }
+    if (!caller.attrs.attributes) {
+        caller.attrs.attributes = withLoc({ type: "Attributes", elements: [] }, caller.attrs, false);
+    }
+    if (caller.attrs.attributes.elements.find((attr) => isTypecheckArg(attr, null))) {
+        return ret;
+    }
+    caller.attrs.attributes.elements.unshift(withLocDeep({ ...typecheckFalse }, caller.attrs, false));
+    return ret;
+}
 function applyTypeIfNeeded(node) {
     if ("enumType" in node && node.enumType) {
         node = {
@@ -9218,7 +9266,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
         // the oldest optimized file, we don't need to regenerate
         const source_time = await (0,external_util_cjs_namespaceObject.last_modified)(Object.keys(fnMap).concat(dependencyFiles));
         const opt_time = await (0,external_util_cjs_namespaceObject.first_modified)(Object.values(fnMap).map((v) => v.output));
-        if (source_time < opt_time && 1670349312602 < opt_time) {
+        if (source_time < opt_time && 1670458646779 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }
@@ -9245,7 +9293,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             return promises_namespaceObject.writeFile(external_path_.join(output, "build-info.json"), JSON.stringify({
                 hasTests,
                 diagnostics,
-                optimizerVersion: "1.0.42",
+                optimizerVersion: "1.0.43",
                 ...Object.fromEntries(configOptionsToCheck.map((option) => [option, config[option]])),
             }))
                 .then(() => ({ hasTests, diagnostics }));

package/build/sdk-util.cjs

@@ -176,7 +176,7 @@ function makeAttribute(name, value) {
 function parseXml(content, fileName = null) {
     try {
         const [prolog, body, misc] = peg$parse(content, {
-            grammarSource: fileName || "unknown",
+            grammarSource: (fileName || "unknown").replace(/\\/g, "/"),
         });
         return new Document(prolog, new Nodes(body), misc, content);
     }

package/build/src/ast.d.ts

@@ -5,8 +5,8 @@ export declare function isExpression(node: mctree.Node): node is mctree.Expressi
 export declare function mayThrow(node: mctree.Node): boolean;
 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 withLoc<T extends mctree.Node>(node: T, start: mctree.Node | null, end?: mctree.Node | undefined): T;
-export declare function withLocDeep<T extends mctree.Node>(node: T, start: mctree.Node | null, end?: mctree.Node | undefined, inplace?: boolean): T;
+export declare function withLoc<T extends mctree.Node>(node: T, start: mctree.Node | null, end?: mctree.Node | undefined | false): T;
+export declare function withLocDeep<T extends mctree.Node>(node: T, start: mctree.Node | null, end?: mctree.Node | undefined | false, inplace?: boolean): T;
 export declare function cloneDeep<T extends mctree.Node>(node: T): T;
 interface NumberLiteral extends mctree.Literal {
     value: number;

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

@@ -32,6 +32,7 @@ export declare type BuildConfig = {
     sizeBasedPRE?: boolean | string;
     prettier?: Record<string, unknown>;
     extensionVersion?: string;
+    useLocalOptimizer?: boolean;
 };
 export declare type StateNodeDecl = StateNode | mctree.EnumStringMember | mctree.TypedIdentifier | mctree.EnumDeclaration;
 export declare type StateNodeDecls = {

package/build/util.cjs

@@ -7756,7 +7756,7 @@ function globa(pattern, options) {
 }
 function globSome(pattern, predicate, options) {
     return new Promise((resolve, _reject) => {
-        const stream = out.stream(pattern, options || {});
+        const stream = out.stream(pattern.replace(/\\/g, "/"), options || {});
         let result = false;
         const resolver = () => {
             resolve(result);

package/package.json

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