@markw65/monkeyc-optimizer 1.0.4 → 1.0.6

package/README.md

@@ -29,4 +29,13 @@ Initial release
 - Make the generated .cjs files work better with es modules (vscode doesn't work with es modules, so prettier-extension-monkeyc doesn't care - but for other projects importing this package it improves the behavior)
 - Generate separate debug/release jungle files.
 
+### 1.0.5
+
+- Bump to version 1.0.11 of `@markw65/prettier-plugin-monkeyc` to fix an ObjectLiteral parsing issue.
+
+### 1.0.6
+
+- Bump to version 1.0.12 of `@markw65/prettier-plugin-monkeyc` to fix multiple parser bugs
+- Add lots of open source projects as tests. For now, just verify that optimizing the sources succeeds, not that the generated source is actually correct.
+
 ---

package/build/optimizer.cjs

@@ -7440,6 +7440,7 @@ function resolve_node(state, node) {
 }
 
 function resolve_filename(literal, default_source) {
+  if (typeof literal === "string") return literal;
   const root = external_path_namespaceObject.dirname(literal.source || default_source);
   return external_path_namespaceObject.resolve(root, literal.value);
 }
@@ -7480,10 +7481,14 @@ async function resolve_literals(qualifier, default_source) {
   await resolve_one_file_list(qualifier, "resourcePath");
   await resolve_one_file_list(qualifier, "barrelPath");
   const lang = qualifier["lang"];
-  await Promise.all(
-    Object.keys(lang).map((key) => resolve_one_file_list(lang, key))
-  );
-  if (Object.keys(lang).length === 0) delete qualifier["lang"];
+  if (lang) {
+    await Promise.all(
+      Object.keys(lang).map((key) => resolve_one_file_list(lang, key))
+    );
+    if (Object.keys(lang).length === 0) delete qualifier["lang"];
+  } else {
+    delete qualifier["lang"];
+  }
 
   const resolve_literal_list = (base, name) => {
     const literals = base[name];
@@ -7635,7 +7640,7 @@ const prettier_plugin_monkeyc_namespaceObject = require("@markw65/prettier-plugi
 
 function processImports(allImports, lookup) {
   allImports.forEach(({ node, stack }) => {
-    const [name, module] = lookup(node.id, node.as && node.as.id.name, stack);
+    const [name, module] = lookup(node.id, node.as && node.as.name, stack);
     if (name && module) {
       const [parent] = stack.slice(-1);
       if (!parent.decls) parent.decls = {};
@@ -8122,6 +8127,8 @@ async function optimizeMonkeyC(fileNames, buildConfig) {
               state.exposed[node.name] = true;
             }
           }
+          // Don't optimize the property.
+          return ["object"];
         }
         break;
       case "FunctionDeclaration": {
@@ -8369,6 +8376,9 @@ async function generateOptimizedProject(options) {
     if (!(0,external_api_cjs_namespaceObject.hasProperty)(buildConfigs, key)) {
       p.group.dir = key;
       buildConfigs[key] = null;
+      if (p.group.optimizerConfig["excludeAnnotations"] == null) {
+        p.group.optimizerConfig["excludeAnnotations"] = [];
+      }
       // Note that we exclude (:debug) in release builds, and we
       // exclude (:release) in debug builds. This isn't backwards!
       p.group.optimizerConfig["excludeAnnotations"].push(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "exports": {
@@ -23,7 +23,7 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.10"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.12"
   },
   "devDependencies": {
     "eslint": "^8.12.0",