toilscript 0.1.32 → 0.1.34

package/dist/web.js

@@ -1,8 +1,8 @@
-var ASSEMBLYSCRIPT_VERSION = "0.1.32";
+var ASSEMBLYSCRIPT_VERSION = "0.1.34";
   var ASSEMBLYSCRIPT_IMPORTMAP = {
   "imports": {
-    "toilscript": "https://cdn.jsdelivr.net/npm/toilscript@0.1.32/dist/toilscript.js",
-    "toilscript/cli": "https://cdn.jsdelivr.net/npm/toilscript@0.1.32/dist/cli.js",
+    "toilscript": "https://cdn.jsdelivr.net/npm/toilscript@0.1.34/dist/toilscript.js",
+    "toilscript/cli": "https://cdn.jsdelivr.net/npm/toilscript@0.1.34/dist/cli.js",
     "binaryen": "https://cdn.jsdelivr.net/npm/binaryen@130.0.0-nightly.20260609/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.32",
+  "version": "0.1.34",
   "author": "Daniel Wirtz <dcode+assemblyscript@dcode.io>",
   "license": "Apache-2.0",
   "homepage": "https://github.com/dacely-cloud/toilscript",
@@ -80,7 +80,7 @@
     "prepublishOnly": "node scripts/build",
     "watch": "node scripts/build --watch",
     "coverage": "npx c8 -- npm test",
-    "test": "npm run test:parser && npm run test:compiler -- --parallel && npm run test:browser && npm run test:toilconfig && npm run test:transform && npm run test:cli && npm run test:json && npm run test:data",
+    "test": "npm run test:parser && npm run test:compiler -- --parallel && npm run test:browser && npm run test:toilconfig && npm run test:transform && npm run test:cli && npm run test:json && npm run test:data && npm run test:dbstatic",
     "test:parser": "node --enable-source-maps tests/parser",
     "test:compiler": "node --enable-source-maps --no-warnings tests/compiler",
     "test:browser": "node --enable-source-maps tests/browser",
@@ -91,6 +91,7 @@
     "test:cli": "node tests/cli/options.js",
     "test:json": "node tests/json/run.mjs",
     "test:data": "node tests/data/run.mjs",
+    "test:dbstatic": "node tests/dbstatic/run.mjs",
     "asbuild": "npm run asbuild:debug && npm run asbuild:release",
     "asbuild:debug": "node bin/toilscript --config src/toilconfig.json --target debug",
     "asbuild:release": "node bin/toilscript --config src/toilconfig.json --target release",

package/std/assembly/bindings/toildb.ts

@@ -227,4 +227,20 @@ export namespace toildbHost {
   // @ts-ignore: decorator
   @external("env", "data.take_result")
   export declare function takeResult(outPtr: usize, outLen: i32): i32;
+
+  // The schema version the LAST value-returning read's row was written under, so
+  // the generated decoder can default fields added since / reject an unknown
+  // layout. A u32 version rides in the non-negative range; -1 means the last op
+  // returned no value (or the host does not track a version). Does not drain the
+  // result stash, so it may be read before or after `takeResult`.
+  // @ts-ignore: decorator
+  @external("env", "data.result_schema_version")
+  export declare function resultSchemaVersion(): i64;
+
+  // 1 if the current call's kind may issue a record write, else 0. The generated
+  // reader uses it to skip the rewrite-on-read convergence write in a read-only
+  // `@query` (where it would be rejected) rather than attempt a doomed write.
+  // @ts-ignore: decorator
+  @external("env", "data.write_allowed")
+  export declare function writeAllowed(): i32;
 }

package/std/assembly/toildb.ts

@@ -25,6 +25,24 @@ export function __toildbResolve(name: string): u32 {
   return load<u32>(out.dataStart);
 }
 
+/// The schema version of the last value-returning read's row (or -1). The
+/// generated `decodeInto` of a `@migrate`-d value type calls this to dispatch an
+/// old-layout row through its transform. Global so generated user-code reaches it
+/// (like `__toildbResolve`).
+export function __toildbReadVersion(): i64 {
+  return toildbHost.resultSchemaVersion();
+}
+
+/// Set true by a woven `decodeInto` when it migrates an old-layout row, so the
+/// reading handle can converge the row (rewrite-on-read). The handle resets it
+/// before each decode and reads it after; the dispatch marks it AFTER the
+/// transform runs, so a transform that itself reads (resetting the flag) does not
+/// clear the outer migration.
+let __toildbMigratedFlag: bool = false;
+export function __toildbResetMigrated(): void { __toildbMigratedFlag = false; }
+export function __toildbMarkMigrated(): void { __toildbMigratedFlag = true; }
+export function __toildbWasMigrated(): bool { return __toildbMigratedFlag; }
+
 /// Pull the last stashed variable-length result of `len` bytes into a buffer.
 function __toildbTake(len: i32): Uint8Array {
   const buf = new Uint8Array(len);
@@ -61,8 +79,17 @@ export class Documents<K, V> {
     const kb = key.encode();
     const status = toildbHost.get(this.__handle, kb.dataStart, kb.byteLength);
     if (status < 0) return null;
+    __toildbResetMigrated();
     const v = instantiate<V>();
     v.decodeInto(__toildbTake(status));
+    // Rewrite-on-read convergence: if this row was lazily migrated from an older
+    // layout AND the current call may write, persist the migrated value so it
+    // stops being re-migrated. Best-effort: a read-only kind skips it, and a
+    // failed patch is ignored (the in-memory value is already correct).
+    if (__toildbWasMigrated() && toildbHost.writeAllowed() == 1) {
+      const nb = v.encode();
+      toildbHost.patch(this.__handle, kb.dataStart, kb.byteLength, nb.dataStart, nb.byteLength, 0);
+    }
     return v;
   }
 

package/std/assembly/toilscript.d.ts

@@ -93,7 +93,13 @@ declare function user(target: Function): void;
 declare function database(target: Function): void;
 
 /** Declares a `@database` field as a collection - a `Documents`/`View`/`Unique`/
- *  `Counter`/`Events`/`Membership`/`Capacity` handle. */
+ *  `Counter`/`Events`/`Membership`/`Capacity` handle. Prefer the `static` form,
+ *  `@collection static users: Documents<UserId, User>` (no `!` - a definite
+ *  assignment assertion on a static field is a TS1255 error, and the compiler
+ *  demotes the field so none is needed), so `App.users` type-checks in any editor
+ *  with no language-service plugin. The instance form (`@collection users!: ...`)
+ *  still works but needs the toilscript TS plugin to type the static `App.users`
+ *  access. */
 declare function collection(target: Object, propertyKey: string | symbol): void;
 
 /** ToilDB function kinds (spec 6) - the data ops a function may issue. `@query`