toilscript 0.1.25 → 0.1.26

package/dist/importmap.json

@@ -1,7 +1,7 @@
 {
   "imports": {
-    "toilscript": "https://cdn.jsdelivr.net/npm/toilscript@0.1.25/dist/toilscript.js",
-    "toilscript/cli": "https://cdn.jsdelivr.net/npm/toilscript@0.1.25/dist/cli.js",
+    "toilscript": "https://cdn.jsdelivr.net/npm/toilscript@0.1.26/dist/toilscript.js",
+    "toilscript/cli": "https://cdn.jsdelivr.net/npm/toilscript@0.1.26/dist/cli.js",
     "binaryen": "https://cdn.jsdelivr.net/npm/binaryen@129.0.0-nightly.20260428/index.js",
     "long": "https://cdn.jsdelivr.net/npm/long@5.3.2/index.js"
   }

package/dist/web.js

@@ -1,8 +1,8 @@
-var ASSEMBLYSCRIPT_VERSION = "0.1.25";
+var ASSEMBLYSCRIPT_VERSION = "0.1.26";
   var ASSEMBLYSCRIPT_IMPORTMAP = {
   "imports": {
-    "toilscript": "https://cdn.jsdelivr.net/npm/toilscript@0.1.25/dist/toilscript.js",
-    "toilscript/cli": "https://cdn.jsdelivr.net/npm/toilscript@0.1.25/dist/cli.js",
+    "toilscript": "https://cdn.jsdelivr.net/npm/toilscript@0.1.26/dist/toilscript.js",
+    "toilscript/cli": "https://cdn.jsdelivr.net/npm/toilscript@0.1.26/dist/cli.js",
     "binaryen": "https://cdn.jsdelivr.net/npm/binaryen@129.0.0-nightly.20260428/index.js",
     "long": "https://cdn.jsdelivr.net/npm/long@5.3.2/index.js"
   }

package/package.json

@@ -8,7 +8,7 @@
     "toilscript",
     "wasm"
   ],
-  "version": "0.1.25",
+  "version": "0.1.26",
   "author": "Daniel Wirtz <dcode+assemblyscript@dcode.io>",
   "license": "Apache-2.0",
   "homepage": "https://github.com/dacely-cloud/toilscript",

package/std/ts-plugin.cjs

@@ -125,6 +125,18 @@ function init(modules) {
     );
   }
 
+  /** True when a declaration carries an `export` modifier. The appended codec
+   *  augmentation must match the class's export-ness, else merging the class with
+   *  the synthesized `interface`/`namespace` trips TS2395 ("must be all exported
+   *  or all local"). */
+  function hasExportModifier(node) {
+    const mods =
+      (ts.getModifiers && ts.canHaveModifiers && ts.canHaveModifiers(node)
+        ? ts.getModifiers(node)
+        : node.modifiers) || [];
+    return mods.some((m) => m.kind === ts.SyntaxKind.ExportKeyword);
+  }
+
   /** True when the parsed file is an ES module (has a top-level import/export), so
    *  a global augmentation must be wrapped in `declare global { ... }`. */
   function isModuleFile(sf) {
@@ -164,11 +176,14 @@ function init(modules) {
       const isUser = declHasDecorator(node, 'user');
       if (!declHasDecorator(node, 'data') && !isUser) return;
       const n = node.name.text;
+      // Match the class's export-ness so the class/interface/namespace merge is all
+      // exported or all local (an exported class + local augmentation -> TS2395).
+      const exp = hasExportModifier(node) ? 'export ' : '';
       // Both `@data` and `@user` classes get the compiler-injected binary codec.
       out +=
         `\n// toilscript: editor types for the compiler-injected ${isUser ? '@user' : '@data'} ${n} codec\n` +
-        `interface ${n} { encode(): Uint8Array; toJSON(): JSON; }\n` +
-        `declare namespace ${n} { function decode(buf: Uint8Array): ${n}; function fromJSON(v: JSON): ${n}; function dataId(): u32; }\n`;
+        `${exp}interface ${n} { encode(): Uint8Array; toJSON(): JSON; }\n` +
+        `${exp}declare namespace ${n} { function decode(buf: Uint8Array): ${n}; function fromJSON(v: JSON): ${n}; function dataId(): u32; }\n`;
       // The single `@user` class is also the type of `AuthService.getUser()`
       // everywhere: merge it into the global `__ToilAuthUser` interface that the
       // generated env d.ts returns from `getUser()`. `declare global` when the