@markw65/monkeyc-optimizer 1.0.40 → 1.0.41

package/README.md

@@ -485,3 +485,8 @@ Bug Fixes
 - Bug fixes
   - Fix optimization of `and` and `or` (alternate names for `&&` and `||`)
   - Fix a bug that could sometimes prevent the `has` optimization from kicking in.
+
+### 1.0.41
+
+- Bug fixes
+  - The fix to avoid visiting definitions from visitReferences was incomplete

package/build/api.cjs

@@ -4771,7 +4771,7 @@ function visitorNode(node) {
     }
     return node;
 }
-function visitor_visitReferences(state, ast, name, defn, callback) {
+function visitor_visitReferences(state, ast, name, defn, callback, includeDefs = false) {
     const checkResults = ([name, results], node) => {
         if (name && results) {
             if (!defn || (0,external_api_cjs_namespaceObject.sameLookupResult)(results, defn)) {
@@ -4857,11 +4857,36 @@ function visitor_visitReferences(state, ast, name, defn, callback) {
                 return ["returnType"];
             }
             case "ModuleDeclaration":
+                if (includeDefs)
+                    break;
                 return ["body"];
             case "ClassDeclaration":
+                if (includeDefs)
+                    break;
                 return ["body", "superClass"];
             case "FunctionDeclaration":
+                if (includeDefs)
+                    break;
                 return ["params", "returnType", "body"];
+            case "TypedefDeclaration":
+                if (includeDefs)
+                    break;
+                return ["ts"];
+            case "VariableDeclarator":
+                if (includeDefs)
+                    break;
+                return ["init"];
+            case "EnumDeclaration":
+                if (includeDefs)
+                    break;
+                return [];
+            case "CatchClause":
+                if (includeDefs)
+                    break;
+                if (node.param && node.param.type !== "Identifier") {
+                    state.traverse(node.param.right);
+                }
+                return ["body"];
         }
         return null;
     };

package/build/optimizer.cjs

@@ -9143,7 +9143,7 @@ async function generateOneConfig(buildConfig, dependencyFiles, config) {
         // 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 && 1669424079462 < opt_time) {
+        if (source_time < opt_time && 1669495636842 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }
@@ -9168,7 +9168,7 @@ async function generateOneConfig(buildConfig, dependencyFiles, config) {
             return promises_namespaceObject.writeFile(external_path_.join(output, "build-info.json"), JSON.stringify({
                 hasTests,
                 diagnostics,
-                optimizerVersion: "1.0.40",
+                optimizerVersion: "1.0.41",
                 ...Object.fromEntries(configOptionsToCheck.map((option) => [option, config[option]])),
             }))
                 .then(() => ({ hasTests, diagnostics }));

package/build/src/visitor.d.ts

@@ -1,4 +1,4 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { LookupDefinition, ProgramStateAnalysis } from "./optimizer-types";
 export declare function visitorNode(node: mctree.Node): mctree.Node;
-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;
+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, includeDefs?: boolean): void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.40",
+  "version": "1.0.41",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",