@markw65/monkeyc-optimizer 1.0.0 → 1.0.1

package/build/optimizer.cjs

@@ -10741,12 +10741,69 @@ async function copyRecursiveAsNeeded(source, target, filter) {
   }
 }
 
+;// CONCATENATED MODULE: ./src/negative-fixups.js
+/*
+ * This is strange. It pretty much has to be a bug in the sdk,
+ * but its the same in every sdk.
+ *
+ * ${sdk}/bin/api.mir describes the Toybox api down to every module,
+ * class, function, enum and constant, together with the enum
+ * and constant values.
+ *
+ * The problem is that every enum or constant with a negative
+ * value, appears with the corresponding positive value in api.mir.
+ * So eg Graphics.COLOR_TRANSPARENT should be -1, but instead, it has
+ * the value 1.
+ *
+ * This is a (currently somewhat ad-hoc) list of the negative constants
+ * so we can fix them after reading api.mir.
+ */
+const negativeFixups = [
+  "Toybox.Communications.BLE_CONNECTION_UNAVAILABLE",
+  "Toybox.Communications.INVALID_HTTP_BODY_IN_REQUEST",
+  "Toybox.Communications.REQUEST_CANCELLED",
+  "Toybox.Communications.UNSUPPORTED_CONTENT_TYPE_IN_RESPONSE",
+  "Toybox.Communications.UNABLE_TO_PROCESS_IMAGE",
+  "Toybox.Communications.NETWORK_RESPONSE_OUT_OF_MEMORY",
+  "Toybox.Communications.BLE_REQUEST_CANCELLED",
+  "Toybox.Communications.INVALID_HTTP_METHOD_IN_REQUEST",
+  "Toybox.Communications.BLE_NO_DATA",
+  "Toybox.Communications.INVALID_HTTP_HEADER_FIELDS_IN_REQUEST",
+  "Toybox.Communications.BLE_ERROR",
+  "Toybox.Communications.NETWORK_RESPONSE_TOO_LARGE",
+  "Toybox.Communications.INVALID_HTTP_BODY_IN_NETWORK_RESPONSE",
+  "Toybox.Communications.BLE_REQUEST_TOO_LARGE",
+  "Toybox.Communications.UNABLE_TO_PROCESS_MEDIA",
+  "Toybox.Communications.REQUEST_CONNECTION_DROPPED",
+  "Toybox.Communications.BLE_UNKNOWN_SEND_ERROR",
+  "Toybox.Communications.BLE_QUEUE_FULL",
+  "Toybox.Communications.STORAGE_FULL",
+  "Toybox.Communications.BLE_SERVER_TIMEOUT",
+  "Toybox.Communications.INVALID_HTTP_HEADER_FIELDS_IN_NETWORK_RESPONSE",
+  "Toybox.Communications.SECURE_CONNECTION_REQUIRED",
+  "Toybox.Communications.NETWORK_REQUEST_TIMED_OUT",
+  "Toybox.Communications.BLE_HOST_TIMEOUT",
+  "Toybox.Communications.UNABLE_TO_PROCESS_HLS",
+  "Toybox.Graphics.COLOR_TRANSPARENT",
+  "Toybox.AntPlus.INVALID_SPEED",
+  "Toybox.AntPlus.INVALID_CADENCE",
+  "Toybox.WatchUi.LAYOUT_VALIGN_START",
+  "Toybox.WatchUi.LAYOUT_VALIGN_TOP",
+  "Toybox.WatchUi.LAYOUT_VALIGN_BOTTOM",
+  "Toybox.WatchUi.LAYOUT_VALIGN_CENTER",
+  "Toybox.WatchUi.LAYOUT_HALIGN_RIGHT",
+  "Toybox.WatchUi.LAYOUT_HALIGN_CENTER",
+  "Toybox.WatchUi.LAYOUT_HALIGN_START",
+  "Toybox.WatchUi.LAYOUT_HALIGN_LEFT",
+];
+
 ;// CONCATENATED MODULE: ./src/api.js
 
 
 
 
 
+
 const LiteralIntegerRe = /^(0x[0-9a-f]+|\d+)(l)?$/;
 /*
  * This is an unfortunate hack. I want to be able to extract things
@@ -10769,11 +10826,30 @@ async function getApiMapping(state) {
     .toString()
     .replace(/\r\n/g, "\n")
     .replace(/^\s*\[.*?\]\s*$/gm, "")
-    .replace(/(COLOR_TRANSPARENT|LAYOUT_[HV]ALIGN_\w+) = (\d+)/gm, "$1 = -$2")
+    //.replace(/(COLOR_TRANSPARENT|LAYOUT_[HV]ALIGN_\w+) = (\d+)/gm, "$1 = -$2")
     .replace(/^(\s*type)\s/gm, "$1def ");
 
   try {
-    return collectNamespaces(parser.parse(api, {}), state);
+    const result = collectNamespaces(parser.parse(api, {}), state);
+    negativeFixups.forEach((fixup) => {
+      const value = fixup.split(".").reduce((state, part) => {
+        const decls = state.decls[part];
+        if (!Array.isArray(decls) || decls.length != 1 || !decls[0]) {
+          throw `Failed to find and fix negative constant ${fixup}`;
+        }
+        return decls[0];
+      }, result);
+      if (value.type != "Literal") {
+        throw `Negative constant ${fixup} was not a Literal`;
+      }
+      if (value.value > 0) {
+        value.value = -value.value;
+        value.raw = "-" + value.raw;
+      } else {
+        console.log(`Negative fixup ${fixup} was already negative!`);
+      }
+    });
+    return result;
   } catch (e) {
     console.error(e.toString());
   }
@@ -12162,6 +12238,9 @@ async function buildOptimizedProject(product, options) {
   } else {
     bin = external_path_.join(bin, "exported");
     name = `${program}.iq`;
+    if (!hasProperty(config, "releaseBuild")) {
+      config.releaseBuild = true;
+    }
   }
   config.program = external_path_.join(bin, name);
   return build_project(product, config);
@@ -12293,32 +12372,19 @@ async function generateOneConfig(config) {
 async function generateApiMirTests(options) {
   const config = { ...defaultConfig, ...(options || {}) };
   const tests = [];
-  const state = {
-    post(node) {
-      if (node.type == "EnumDeclaration") {
-        const [parent] = state.stack.slice(-1);
-        node.body.members.forEach((e) => {
-          const name = e.name || e.id.name;
-          const values = parent.decls[name];
-          if (values == null || values.length != 1) {
-            throw "Can't find value for enum";
-          }
-          const value = values[0];
-          tests.push([`${parent.fullName}.${name}`, formatAst(value)]);
-        });
-      } else if (node.type == "VariableDeclaration" && node.kind == "const") {
-        const [parent] = state.stack.slice(-1);
-        node.declarations.forEach((decl) =>
-          tests.push([
-            `${parent.fullName}.${decl.id.name}`,
-            formatAst(decl.init),
-          ])
-        );
+  const api = await getApiMapping();
+  const findConstants = (node) => {
+    Object.entries(node.decls).forEach(([key, decl]) => {
+      if (decl.length > 1) throw `Bad decl length:${node.fullName}.${key}`;
+      if (decl.length != 1) return;
+      if (decl[0].type == "Literal") {
+        tests.push([`${node.fullName}.${key}`, formatAst(decl[0])]);
+      } else if (decl[0].decls) {
+        findConstants(decl[0]);
       }
-    },
+    });
   };
-  await getApiMapping(state);
-
+  findConstants(api);
   function hasTests(name) {
     const names = name.split(".");
     return names
@@ -12327,8 +12393,9 @@ async function generateApiMirTests(options) {
       .join(" && ");
   }
   const source = [
+    "import Toybox.Lang;",
     "import Toybox.Test;",
-    "(:test)",
+    "(:test,:typecheck(false))",
     "function apiTest(logger as Logger) as Boolean {",
     ...tests.map(
       (t) =>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "scripts": {