@githolon/dsl 0.54.0 → 0.54.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@githolon/dsl",
-  "version": "0.54.0",
+  "version": "0.54.1",
   "type": "module",
   "description": "Nomos 2 domain-authoring DSL: aggregates + directives in TS, executed and encoded to the Rust kernel's wire shapes.",
   "license": "SEE LICENSE IN LICENSE.md",

package/src/fields.ts

@@ -19,6 +19,22 @@ import { Conflict, Counter, LastPosition, Lww, type Driver } from "./drivers.js"
 import type { AggregateHandle } from "./aggregate.js";
 import type { FieldFacet } from "./principal_evidence.js";
 
+/**
+ * A structured JSON value — the AUTHORING type a `json`-kind field (`t.json()`,
+ * `t.jsonObject()`, a value-object field) now accepts on the write path. The kernel
+ * stores json leaves as `Value::Json` (RFC 8785/JCS), so a plan may `set(...)` a real
+ * object/array/scalar (not just a pre-stringified `string`). TYPE-LEVEL ONLY: the wire +
+ * read-model type of a json field is unchanged; this only widens what `set`/`setEntry`
+ * ACCEPT. (`string` stays a member, so already-stringified callers keep typechecking.)
+ */
+export type JsonValue =
+  | string
+  | number
+  | boolean
+  | null
+  | JsonValue[]
+  | { readonly [k: string]: JsonValue };
+
 export type FieldKind =
   | "string"
   | "int"
@@ -475,8 +491,11 @@ export const t = {
    * JSON leaf — the kernel `Value` is Str|Int only), so the v1-free projection surfaces
    * it as a permissive `Object?`. Use `t.jsonObject()` when the leaf is ALWAYS an OBJECT
    * value-object (e.g. a `location`) to get a strict `Map<String,Object?>` read type. */
-  json(): Field<string, "json"> {
-    return makeField<string, "json">("json", z.string(), Lww);
+  json(): Field<JsonValue, "json"> {
+    // AUTHORING type is the structured JsonValue (the kernel stores Value::Json), so a plan may
+    // set()/setEntry() a real object/array/scalar. The runtime wire + zod are UNCHANGED (a `Str`
+    // leaf at op time — no hash change); only the accepted TS value widens (a `string` stays valid).
+    return makeField<string, "json">("json", z.string(), Lww) as unknown as Field<JsonValue, "json">;
   },
   /** A JSON-OBJECT value-object leaf: an arbitrary JSON-string leaf (identical wire +
    * driver to `t.json()` — a `Str` at op time, so NO hash change) whose decoded value is
@@ -485,8 +504,10 @@ export const t = {
    * `Map<String,Object?>` with a STRICT reader (a present-but-non-object value throws —
    * the strict-decode contract), as opposed to a plain `t.json()` (decoded shape unknown
    * → permissive `Object?`). Marks `jsonShape:"object"`; the kind stays `"json"`. */
-  jsonObject(): Field<string, "json"> {
-    return makeField<string, "json">("json", z.string(), Lww, { jsonShape: "object" });
+  jsonObject(): Field<JsonValue, "json"> {
+    // Same JsonValue authoring widening as `t.json()` (structured value in, `Str` wire out — no hash
+    // change); the `jsonShape:"object"` marker only steers the read-model to a strict object reader.
+    return makeField<string, "json">("json", z.string(), Lww, { jsonShape: "object" }) as unknown as Field<JsonValue, "json">;
   },
   /**
    * Reference to another aggregate (stored as its id string).

package/src/index.ts

@@ -30,6 +30,7 @@ export {
   type Field,
   type FieldValue,
   type FieldKind,
+  type JsonValue,
   type EvidenceRefValue,
   evidenceRefSchema,
   // FIELD FACETS (the endorse model — security_model.md): authority/standing/attribution gate