toilscript 0.1.10 → 0.1.12

package/dist/web.js

@@ -1,8 +1,8 @@
-var ASSEMBLYSCRIPT_VERSION = "0.1.10";
+var ASSEMBLYSCRIPT_VERSION = "0.1.12";
   var ASSEMBLYSCRIPT_IMPORTMAP = {
   "imports": {
-    "toilscript": "https://cdn.jsdelivr.net/npm/toilscript@0.1.10/dist/toilscript.js",
-    "toilscript/cli": "https://cdn.jsdelivr.net/npm/toilscript@0.1.10/dist/cli.js",
+    "toilscript": "https://cdn.jsdelivr.net/npm/toilscript@0.1.12/dist/toilscript.js",
+    "toilscript/cli": "https://cdn.jsdelivr.net/npm/toilscript@0.1.12/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.10",
+  "version": "0.1.12",
   "author": "Daniel Wirtz <dcode+assemblyscript@dcode.io>",
   "license": "Apache-2.0",
   "homepage": "https://github.com/dacely-cloud/toilscript",

package/std/assembly/json.ts

@@ -320,9 +320,18 @@ export class JSON {
 }
 
 /** Recursive-descent parser producing a `JSON` value tree. Internal. */
+/**
+ * Maximum array/object nesting depth. Recursive descent costs stack per level, so an
+ * unbounded depth lets a small hostile input (e.g. `[[[[...`) overflow the stack and trap
+ * the instance. 512 is far beyond any real-world JSON yet far below the overflow point, so
+ * over-nested input fails as a normal parse error instead of crashing.
+ */
+const JSON_MAX_DEPTH: i32 = 512;
+
 class Parser {
     private src: string;
     private pos: i32 = 0;
+    private depth: i32 = 0;
     err: string = "";
 
     constructor(src: string) {
@@ -468,11 +477,13 @@ class Parser {
     }
 
     private parseArray(): JSON {
+        if (++this.depth > JSON_MAX_DEPTH) return this.fail("maximum nesting depth exceeded");
         this.pos++; // [
         const j = JSON.arr();
         this.skipWs();
         if (!this.atEnd() && this.peek() == 0x5d) {
             this.pos++;
+            this.depth--;
             return j;
         }
         while (true) {
@@ -484,15 +495,18 @@ class Parser {
             if (c == 0x5d) break; // ]
             if (c != 0x2c) return this.fail("expected ',' or ']'"); // ,
         }
+        this.depth--;
         return j;
     }
 
     private parseObject(): JSON {
+        if (++this.depth > JSON_MAX_DEPTH) return this.fail("maximum nesting depth exceeded");
         this.pos++; // {
         const j = JSON.obj();
         this.skipWs();
         if (!this.atEnd() && this.peek() == 0x7d) {
             this.pos++;
+            this.depth--;
             return j;
         }
         while (true) {
@@ -510,6 +524,7 @@ class Parser {
             if (c == 0x7d) break; // }
             if (c != 0x2c) return this.fail("expected ',' or '}'"); // ,
         }
+        this.depth--;
         return j;
     }
 }

package/std/assembly/rest.ts

@@ -0,0 +1,25 @@
+// Globals for the `@rest` / `@route` HTTP layer (no import). Top-level std exports are
+// globalized like the other natives.
+
+/**
+ * HTTP method for `@route({ method: Methods.GET, ... })`. Values mirror the server runtime
+ * `Method` enum so `req.method == Methods.GET` compiles to a plain integer comparison.
+ */
+export enum Methods {
+  GET = 0,
+  POST = 1,
+  PUT = 2,
+  DELETE = 3,
+  PATCH = 4,
+  HEAD = 5,
+  OPTIONS = 6
+}
+
+/**
+ * Body/response codec for `@route({ stream: DataStream.JSON, ... })`: `JSON` uses the `@data`
+ * class's `toJSON`/`fromJSON`, `Binary` uses its `encode`/`decode`.
+ */
+export enum DataStream {
+  JSON = 0,
+  Binary = 1
+}

package/std/assembly/toilscript.d.ts

@@ -38,6 +38,35 @@ declare function remote<T>(target: Object, propertyKey: string | symbol, descrip
  */
 declare function service(target: Function): void;
 
+// --- HTTP layer (@rest / @route), handled natively by the compiler; typed here for editors ---
+
+/** HTTP method for `@route({ method: Methods.GET, ... })`. */
+declare enum Methods { GET, POST, PUT, DELETE, PATCH, HEAD, OPTIONS }
+
+/** Body/response codec for `@route({ stream: DataStream.JSON, ... })`. */
+declare enum DataStream { JSON, Binary }
+
+interface RestOptions { stream?: DataStream }
+interface RouteOptions { method: Methods; path: string; stream?: DataStream }
+/** A legacy method decorator (the return of a `@route`/`@get`/... factory). */
+type ToilRouteDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => void;
+
+/** Marks a class as an HTTP controller mounted at `prefix` (default `/`). */
+declare function rest(target: Function): void;
+declare function rest(prefix?: string): (target: Function) => void;
+declare function rest(options: RestOptions): (target: Function) => void;
+
+/** Declares an HTTP route on a `@rest` method (`@route({ method, path, stream })`). */
+declare function route(options: RouteOptions): ToilRouteDecorator;
+/** HTTP verb shortcuts for `@route` (`@del` for DELETE, since `delete` is a reserved word). */
+declare function get(path: string): ToilRouteDecorator;
+declare function post(path: string): ToilRouteDecorator;
+declare function put(path: string): ToilRouteDecorator;
+declare function del(path: string): ToilRouteDecorator;
+declare function patch(path: string): ToilRouteDecorator;
+declare function head(path: string): ToilRouteDecorator;
+declare function options(path: string): ToilRouteDecorator;
+
 // Big integers, native globals implemented in std/assembly/bignum. The
 // arithmetic/bitwise/comparison operators
 // (+ - * / % & | ^ << >> == != < > <= >=) are operator overloads resolved by

package/std/ts-plugin.cjs

@@ -4,19 +4,76 @@
  * Stock TypeScript has no grammar for toil-native decorators applied to
  * top-level functions and globals (`@main`, `@inline`, `@unmanaged`, ...), so
  * the editor's language service flags them as errors even though the toilscript
- * compiler (asc) handles them correctly. This plugin runs only inside the
- * editor's language service (VS Code, WebStorm, etc. — never `tsc`/asc builds)
- * and removes exactly those decorator-grammar false positives:
+ * compiler handles them correctly. It also can't see the members the compiler
+ * injects into a `@data` class (`encode`/`decode`/`toJSON`/...). This plugin runs
+ * only inside the editor's language service (VS Code, WebStorm, etc. - never
+ * `tsc`/compiler builds) and removes exactly those false positives:
  *
  *   TS1206  "Decorators are not valid here."
  *   TS1249  "A decorator can only decorate a method implementation, not an overload."
+ *   TS2339  "Property '<m>' does not exist on type '<T>'." - but ONLY when `<m>` is a
+ *           `@data`-injected member and `<T>` is a `@data` class (so a typo on any
+ *           other type still surfaces).
  *
- * Every other diagnostic — unknown types, bad calls, missing names — passes
+ * Every other diagnostic - unknown types, bad calls, missing names - passes
  * through untouched, so real type errors are still surfaced.
  */
 const DECORATOR_GRAMMAR_CODES = new Set([1206, 1249]);
+const PROPERTY_NOT_EXIST = 2339;
+
+/** Members the compiler injects into every `@data` class (instance + static). */
+const DATA_MEMBERS = new Set([
+  'encode',
+  'encodeInto',
+  'decode',
+  'decodeFrom',
+  'toJSON',
+  'fromJSON',
+  'dataId',
+]);
+
+function init(modules) {
+  const ts = modules.typescript;
+
+  /** Deepest node spanning `pos`. */
+  function nodeAt(node, pos) {
+    if (pos < node.getStart() || pos >= node.getEnd()) return undefined;
+    let found = node;
+    node.forEachChild((child) => {
+      const inner = nodeAt(child, pos);
+      if (inner) found = inner;
+    });
+    return found;
+  }
+
+  /** Whether a class declaration carries the `@data` decorator (bare or called). */
+  function hasDataDecorator(decl) {
+    const decorators = (ts.getDecorators ? ts.getDecorators(decl) : decl.decorators) || [];
+    for (const d of decorators) {
+      const e = d.expression;
+      const name = e && (e.text || (e.expression && e.expression.text));
+      if (name === 'data') return true;
+    }
+    return false;
+  }
+
+  function declsAreDataClass(declarations) {
+    return (
+      !!declarations &&
+      declarations.some((d) => ts.isClassDeclaration(d) && hasDataDecorator(d))
+    );
+  }
+
+  /** Whether `expr` is (an instance of, or the static side of) a `@data` class. */
+  function resolvesToDataClass(expr, checker) {
+    const type = checker.getTypeAtLocation(expr);
+    const typeSym = type && type.getSymbol && type.getSymbol();
+    if (typeSym && declsAreDataClass(typeSym.declarations)) return true;
+    // Static access like `Player.decode(...)`: resolve the identifier's own symbol.
+    const sym = checker.getSymbolAtLocation(expr);
+    return !!sym && declsAreDataClass(sym.declarations);
+  }
 
-function init() {
   return {
     create(info) {
       const ls = info.languageService;
@@ -28,13 +85,31 @@ function init() {
         proxy[key] = typeof value === 'function' ? value.bind(ls) : value;
       }
 
-      const strip = (diagnostics) =>
-        diagnostics.filter((d) => !DECORATOR_GRAMMAR_CODES.has(d.code));
+      const isInjectedDataMember = (fileName, diag) => {
+        if (diag.code !== PROPERTY_NOT_EXIST || diag.start == null) return false;
+        const program = ls.getProgram();
+        const sf = program && program.getSourceFile(fileName);
+        if (!sf) return false;
+        const node = nodeAt(sf, diag.start);
+        const access =
+          node && ts.isPropertyAccessExpression(node)
+            ? node
+            : node && ts.isPropertyAccessExpression(node.parent)
+              ? node.parent
+              : undefined;
+        if (!access || !DATA_MEMBERS.has(access.name.text)) return false;
+        return resolvesToDataClass(access.expression, program.getTypeChecker());
+      };
+
+      const strip = (fileName, diagnostics) =>
+        diagnostics.filter(
+          (d) => !DECORATOR_GRAMMAR_CODES.has(d.code) && !isInjectedDataMember(fileName, d),
+        );
 
       proxy.getSemanticDiagnostics = (fileName) =>
-        strip(ls.getSemanticDiagnostics(fileName));
+        strip(fileName, ls.getSemanticDiagnostics(fileName));
       proxy.getSyntacticDiagnostics = (fileName) =>
-        strip(ls.getSyntacticDiagnostics(fileName));
+        strip(fileName, ls.getSyntacticDiagnostics(fileName));
 
       return proxy;
     },