@stonecrop/stonecrop 0.13.8 → 0.13.9

package/dist/src/doctype.d.ts

@@ -1,8 +1,6 @@
-import type { SchemaTypes } from '@stonecrop/aform';
-import type { LinkDeclaration } from '@stonecrop/schema';
+import type { DoctypeField, LinkDeclaration } from '@stonecrop/schema';
 import { Component } from 'vue';
-import type { ImmutableDoctype } from './types';
-import type { DoctypeConfig } from './types/doctype';
+import type { DoctypeConfig, ImmutableDoctype } from './types/doctype';
 /**
  * Doctype runtime class with Immutable.js collections for HST change tracking.
  * @public
@@ -100,21 +98,21 @@ export default class Doctype {
      */
     static fromObject(config: DoctypeConfig): Doctype;
     /**
-     * Returns the schema as a plain array for use with components that expect
-     * plain JavaScript arrays (e.g., AForm, ATable).
+     * Returns the raw authoring schema as a plain array.
+     * For the resolved schema suitable for AForm, use `registry.resolveSchema(doctype)`.
      *
-     * @returns Array of schema fields
+     * @returns Array of raw DoctypeField authoring definitions
      *
      * @example
      * ```ts
-     * const schemaArray = doctype.getSchemaArray()
-     * // Use with AForm
-     * <AForm :schema="schemaArray" v-model:data="formData" />
+     * const fields = doctype.getSchemaArray()
+     * // Pass to resolveSchema for AForm-ready output:
+     * const resolved = registry.resolveSchema(doctype)
      * ```
      *
      * @public
      */
-    getSchemaArray(): SchemaTypes[];
+    getSchemaArray(): DoctypeField[];
     /**
      * Returns the actions as a plain object for use with components that expect
      * plain JavaScript objects.

package/dist/src/doctype.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctype.d.ts","sourceRoot":"","sources":["../../src/doctype.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,eAAe,EAAgB,MAAM,mBAAmB,CAAA;AAEtE,OAAO,EAAE,SAAS,EAAE,MAAM,KAAK,CAAA;AAE/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAEpD;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO;IAC3B;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IAExB;;;;OAIG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IAE3C;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAA;IAE/C;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAA;IAE7C;;;;OAIG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAA;IAE9B;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAEhD;;;;;;;;OAQG;gBAEF,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAClC,QAAQ,EAAE,gBAAgB,CAAC,UAAU,CAAC,EACtC,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,EACpC,SAAS,CAAC,EAAE,SAAS,EACrB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAUxC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqCG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO;IAOjD;;;;;;;;;;;;;;OAcG;IACH,cAAc,IAAI,WAAW,EAAE;IAK/B;;;;;;;OAOG;IACH,gBAAgB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAK5C;;;;;;;;;;;;;;OAcG;IACH,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IAuC3F;;;;;;;;;;;;;;OAcG;IACH,aAAa,CAAC,UAAU,EAAE,MAAM,GAC7B;QACA,KAAK,EAAE,MAAM,CAAA;QACb,OAAO,EAAE,MAAM,CAAA;QACf,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;QACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;QACxB,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAC7B,GACD,SAAS;IASZ;;;;;;;;;;;;;;;OAeG;IACH,IAAI,IAAI,WAKP;CACD"}
+{"version":3,"file":"doctype.d.ts","sourceRoot":"","sources":["../../src/doctype.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAgB,MAAM,mBAAmB,CAAA;AAEpF,OAAO,EAAE,SAAS,EAAE,MAAM,KAAK,CAAA;AAE/B,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAEtE;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO;IAC3B;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IAExB;;;;OAIG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IAE3C;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAA;IAE/C;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAA;IAE7C;;;;OAIG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAA;IAE9B;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAEhD;;;;;;;;OAQG;gBAEF,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAClC,QAAQ,EAAE,gBAAgB,CAAC,UAAU,CAAC,EACtC,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,EACpC,SAAS,CAAC,EAAE,SAAS,EACrB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAUxC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqCG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO;IAOjD;;;;;;;;;;;;;;OAcG;IACH,cAAc,IAAI,YAAY,EAAE;IAKhC;;;;;;;OAOG;IACH,gBAAgB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAK5C;;;;;;;;;;;;;;OAcG;IACH,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IAuC3F;;;;;;;;;;;;;;OAcG;IACH,aAAa,CAAC,UAAU,EAAE,MAAM,GAC7B;QACA,KAAK,EAAE,MAAM,CAAA;QACb,OAAO,EAAE,MAAM,CAAA;QACf,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;QACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;QACxB,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAC7B,GACD,SAAS;IASZ;;;;;;;;;;;;;;;OAeG;IACH,IAAI,IAAI,WAKP;CACD"}

package/dist/src/doctype.js

@@ -109,16 +109,16 @@ export default class Doctype {
         return new Doctype(config.name, schema, config.workflow, actions, undefined, config.links);
     }
     /**
-     * Returns the schema as a plain array for use with components that expect
-     * plain JavaScript arrays (e.g., AForm, ATable).
+     * Returns the raw authoring schema as a plain array.
+     * For the resolved schema suitable for AForm, use `registry.resolveSchema(doctype)`.
      *
-     * @returns Array of schema fields
+     * @returns Array of raw DoctypeField authoring definitions
      *
      * @example
      * ```ts
-     * const schemaArray = doctype.getSchemaArray()
-     * // Use with AForm
-     * <AForm :schema="schemaArray" v-model:data="formData" />
+     * const fields = doctype.getSchemaArray()
+     * // Pass to resolveSchema for AForm-ready output:
+     * const resolved = registry.resolveSchema(doctype)
      * ```
      *
      * @public

package/dist/src/registry.d.ts

@@ -1,4 +1,4 @@
-import type { SchemaTypes } from '@stonecrop/aform';
+import type { ResolvedField } from '@stonecrop/aform';
 import type { LinkDeclaration } from '@stonecrop/schema';
 import { Router } from 'vue-router';
 import Doctype from './doctype';
@@ -65,70 +65,50 @@ export default class Registry {
      */
     addDoctype(doctype: Doctype): void;
     /**
-     * Resolve nested Doctype fields in a schema by embedding child schemas inline.
+     * Resolve a Doctype's authoring schema into a rendered schema array suitable for AForm.
      *
-     * Accepts a Doctype and extracts `fields` and `links` internally.
-     * Fields array contains both scalar fields and link fields (with fieldtype: 'Link').
-     * Render order is determined by the order of fields in the fields array.
+     * Transforms `DoctypeField[]` (authoring space) → `ResolvedField[]` (rendering space):
+     * - `kind: 'field'` (not Link) → `ResolvedScalar`
+     * - `kind: 'field'` (Link, no declaration) → `ResolvedScalar` with `component: 'AFormLink'`
+     * - `kind: 'field'` (Link, `noneOrMany`/`atLeastOne`) → `ResolvedTable`
+     * - `kind: 'field'` (Link, `one`/`atMostOne`) → `ResolvedLink`
+     * - `kind: 'fieldset'` → `ResolvedFieldset` (children resolved recursively)
+     * - `kind: 'table'` → `ResolvedTable` (columns as `ColumnSchema[]`)
      *
-     * For each link field:
-     * - Looks up the corresponding link declaration in `links` by fieldname
-     * - `cardinality: 'noneOrMany'` or `'atLeastOne'`: auto-derives `columns` from the target's schema,
-     *   sets `component` to `link.component ?? 'ATable'`, `config: { view: 'list' }`.
-     * - `cardinality: 'one'` or `'atMostOne'`: embeds the target schema as the entry's
-     *   `schema` property, sets `component` to `link.component ?? 'AForm'`.
-     *
-     * Recurses for deeply nested doctypes. Circular references are protected against.
-     * Returns a new array — does not mutate the original.
+     * Circular references are protected against via the `visited` set.
      *
      * @param doctype - The doctype to resolve
      * @param visited - Internal — set of already-visited doctype slugs for cycle detection
-     * @returns A new schema array with nested links resolved
+     * @returns A resolved schema array ready for AForm
      *
      * @public
      */
-    resolveSchema(doctype: Doctype, visited?: Set<string>): SchemaTypes[];
+    resolveSchema(doctype: Doctype, visited?: Set<string>): ResolvedField[];
     /**
-     * Recursively resolve a flat fields array using the provided link context.
-     * Used by resolveSchema to handle fieldset children.
+     * Recursively resolve a `DoctypeField[]` using the provided link context.
+     * Called by `resolveSchema` and recursively for fieldset children.
      * @internal
      */
     private resolveFields;
     /**
-     * Build an ATable configuration from a field and child schema.
-     * Data-model properties from the source field are preserved via the spread `field` argument.
+     * Build a `ResolvedTable` from a resolved Link field with many cardinality.
+     * Extracts scalar column definitions from the child schema.
      * @internal
      */
     private buildTableConfig;
     /**
-     * Initialize a new record with default values based on a schema.
-     *
-     * @remarks
-     * Creates a plain object with keys from the schema's fieldnames and default values
-     * derived from each field's `fieldtype`:
-     * - Data, Text → `''`
-     * - Check → `false`
-     * - Int, Float, Decimal, Currency, Quantity → `0`
-     * - JSON → `{}`
-     * - Doctype with `cardinality: 'noneOrMany'` or `'atLeastOne'` → `[]`
-     * - Doctype without `cardinality` or `cardinality: 'one'` → recursively initializes nested record
-     * - All others → `null`
+     * Initialize a new record with default values based on a resolved schema.
+     * Narrows by `kind` discriminator for precise branch selection.
      *
-     * For Doctype fields with a resolved `schema` array (cardinality: 'one'), recursively
-     * initializes the nested record.
+     * - `kind: 'table'` or `kind: 'link'` → `[]` or `{}`
+     * - `kind: 'fieldset'` → recursively initializes children as `{}`
+     * - `kind: 'field'` → derives default from `fieldtype`; falls back to `null`
      *
-     * @param schema - The schema array to derive defaults from
+     * @param schema - The resolved schema array to derive defaults from
      * @returns A plain object with default values for each field
-     *
-     * @example
-     * ```ts
-     * const defaults = registry.initializeRecord(addressSchema)
-     * // { street: '', city: '', state: '', zip_code: '' }
-     * ```
-     *
      * @public
      */
-    initializeRecord(schema: SchemaTypes[]): Record<string, any>;
+    initializeRecord(schema: ResolvedField[]): Record<string, any>;
     /**
      * Get a registered doctype by slug
      * @param slug - The doctype slug to look up

package/dist/src/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,kBAAkB,CAAA;AAChE,OAAO,KAAK,EAAa,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAEnC,OAAO,OAAO,MAAM,WAAW,CAAA;AAE/B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAE/C;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,QAAQ;IAC5B;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAA;IAEtB;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAa;IAElC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAK;IAE/C;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc,CAAqE;IAE3F;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB,CAAgB;IAE3C;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IAExB;;;;OAIG;gBACS,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAUjG;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAEpE;;;;;OAKG;IACH,UAAU,CAAC,OAAO,EAAE,OAAO;IAuB3B;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,WAAW,EAAE;IAkHrE;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAkDrB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAiBxB;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACH,gBAAgB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAoD5D;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAI7C;;;;;;;;;;;;;OAaG;IACH,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,KAAK,CAAC,eAAe,GAAG;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAWvF;;;;;;;;;;;;;OAaG;IACH,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,KAAK,CAAC,eAAe,GAAG;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAwBtG;;;OAGG;IACH,OAAO,CAAC,oBAAoB;CAgC5B"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAiE,MAAM,kBAAkB,CAAA;AACpH,OAAO,KAAK,EAA8B,eAAe,EAA+B,MAAM,mBAAmB,CAAA;AACjH,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAEnC,OAAO,OAAO,MAAM,WAAW,CAAA;AAE/B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAE/C;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,QAAQ;IAC5B;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAA;IAEtB;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAa;IAElC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAK;IAE/C;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc,CAAqE;IAE3F;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB,CAAgB;IAE3C;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IAExB;;;;OAIG;gBACS,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAUjG;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAEpE;;;;;OAKG;IACH,UAAU,CAAC,OAAO,EAAE,OAAO;IAuB3B;;;;;;;;;;;;;;;;;;OAkBG;IACH,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,aAAa,EAAE;IA4BvE;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAiFrB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAmBxB;;;;;;;;;;;OAWG;IACH,gBAAgB,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IA6C9D;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAI7C;;;;;;;;;;;;;OAaG;IACH,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,KAAK,CAAC,eAAe,GAAG;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAWvF;;;;;;;;;;;;;OAaG;IACH,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,KAAK,CAAC,eAAe,GAAG;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAwBtG;;;OAGG;IACH,OAAO,CAAC,oBAAoB;CAgC5B"}

package/dist/src/registry.js

@@ -88,245 +88,202 @@ export default class Registry {
         }
     }
     /**
-     * Resolve nested Doctype fields in a schema by embedding child schemas inline.
+     * Resolve a Doctype's authoring schema into a rendered schema array suitable for AForm.
      *
-     * Accepts a Doctype and extracts `fields` and `links` internally.
-     * Fields array contains both scalar fields and link fields (with fieldtype: 'Link').
-     * Render order is determined by the order of fields in the fields array.
+     * Transforms `DoctypeField[]` (authoring space) → `ResolvedField[]` (rendering space):
+     * - `kind: 'field'` (not Link) → `ResolvedScalar`
+     * - `kind: 'field'` (Link, no declaration) → `ResolvedScalar` with `component: 'AFormLink'`
+     * - `kind: 'field'` (Link, `noneOrMany`/`atLeastOne`) → `ResolvedTable`
+     * - `kind: 'field'` (Link, `one`/`atMostOne`) → `ResolvedLink`
+     * - `kind: 'fieldset'` → `ResolvedFieldset` (children resolved recursively)
+     * - `kind: 'table'` → `ResolvedTable` (columns as `ColumnSchema[]`)
      *
-     * For each link field:
-     * - Looks up the corresponding link declaration in `links` by fieldname
-     * - `cardinality: 'noneOrMany'` or `'atLeastOne'`: auto-derives `columns` from the target's schema,
-     *   sets `component` to `link.component ?? 'ATable'`, `config: { view: 'list' }`.
-     * - `cardinality: 'one'` or `'atMostOne'`: embeds the target schema as the entry's
-     *   `schema` property, sets `component` to `link.component ?? 'AForm'`.
-     *
-     * Recurses for deeply nested doctypes. Circular references are protected against.
-     * Returns a new array — does not mutate the original.
+     * Circular references are protected against via the `visited` set.
      *
      * @param doctype - The doctype to resolve
      * @param visited - Internal — set of already-visited doctype slugs for cycle detection
-     * @returns A new schema array with nested links resolved
+     * @returns A resolved schema array ready for AForm
      *
      * @public
      */
     resolveSchema(doctype, visited) {
         const seen = visited ?? new Set();
         const slug = doctype.slug;
-        // Prevent circular resolution
+        // Prevent circular resolution — return all ValueField entries as scalars (link not expanded)
         if (seen.has(slug)) {
-            return doctype.schema ? (Array.isArray(doctype.schema) ? doctype.schema : Array.from(doctype.schema)) : [];
+            const fallback = doctype.schema ? doctype.schema.toArray() : [];
+            return fallback
+                .filter((f) => f.kind === 'field')
+                .map(({ cardinality: _c, ...rest }) => rest);
         }
         seen.add(slug);
-        // Convert schema to array
-        const schemaArray = doctype.schema
-            ? Array.isArray(doctype.schema)
-                ? doctype.schema
-                : Array.from(doctype.schema)
-            : [];
-        // Build a map of link declarations by fieldname for quick lookup
-        // Use the link's fieldname property if set, otherwise use the key
+        const schemaArray = doctype.schema ? doctype.schema.toArray() : [];
+        // Map link declarations by fieldname (link.fieldname ?? key)
         const linksByFieldname = new Map();
         if (doctype.links) {
             for (const [key, link] of Object.entries(doctype.links)) {
-                const linkFieldname = link.fieldname ?? key;
-                linksByFieldname.set(linkFieldname, link);
-            }
-        }
-        // Process fields in order: scalar fields copied as-is, link fields resolved
-        const resolvedFields = [];
-        for (const field of schemaArray) {
-            // Check if this field is a link field (fieldtype: 'Link')
-            if ('fieldtype' in field && field.fieldtype === 'Link') {
-                const link = linksByFieldname.get(field.fieldname);
-                if (!link) {
-                    // oxlint-disable typescript/no-unsafe-type-assertion -- SchemaTypes union narrowed to FieldMeta by fieldtype === 'Link' check; options may not exist on all members
-                    const linkDoctype = typeof field.options === 'string' ? field.options : undefined;
-                    // oxlint-enable typescript/no-unsafe-type-assertion
-                    if (linkDoctype === undefined) {
-                        console.warn(`[Stonecrop] Link field "${field.fieldname}" has no \`options\` or corresponding \`links\` declaration. ` +
-                            `AFormLink will be created without a \`doctype\` prop, so navigation will not work. ` +
-                            `Add \`"options": "<doctype-slug>"\` to the field definition.`);
-                    }
-                    // Strip any raw `doctype` from the JSON; only `options` is the authoritative source.
-                    const { doctype: _rawDoctype, ...fieldRest } = field;
-                    resolvedFields.push({
-                        ...fieldRest,
-                        component: fieldRest.component || 'AFormLink',
-                        ...(linkDoctype !== undefined ? { doctype: linkDoctype } : {}),
-                    });
-                    continue;
-                }
-                const targetDoctype = this.registry[link.target];
-                if (!targetDoctype) {
-                    // Target not found - copy as-is
-                    resolvedFields.push({ ...field });
-                    continue;
-                }
-                const childSchema = this.resolveSchema(targetDoctype, seen);
-                // Extract properties consumed by resolution; preserve everything else
-                // TODO: options and cardinality are untyped runtime properties on link fields; add them to
-                // FormSchema (or a dedicated link field type) to remove this cast
-                const { fieldtype: _ft, options: _opt, cardinality: _card, ...fieldRest } = field;
-                if (link.cardinality === 'noneOrMany' || link.cardinality === 'atLeastOne') {
-                    // Many relationship — build table config
-                    resolvedFields.push(this.buildTableConfig({ ...fieldRest, label: fieldRest.label || field.fieldname }, childSchema, link.component));
-                }
-                else {
-                    // One relationship — embed form schema
-                    resolvedFields.push({
-                        ...fieldRest,
-                        label: fieldRest.label || field.fieldname,
-                        component: link.component || fieldRest.component || 'AForm',
-                        schema: childSchema,
-                    });
-                }
-            }
-            else if ('schema' in field && Array.isArray(field.schema)) {
-                // Fieldset — recursively resolve nested fields
-                const resolvedChildren = this.resolveFields(field.schema, linksByFieldname, seen);
-                resolvedFields.push({ ...field, schema: resolvedChildren });
-            }
-            else {
-                // Scalar field — copy as-is
-                resolvedFields.push({ ...field });
+                linksByFieldname.set(link.fieldname ?? key, link);
             }
         }
+        const result = this.resolveFields(schemaArray, linksByFieldname, seen);
         seen.delete(slug);
-        return resolvedFields;
+        return result;
     }
     /**
-     * Recursively resolve a flat fields array using the provided link context.
-     * Used by resolveSchema to handle fieldset children.
+     * Recursively resolve a `DoctypeField[]` using the provided link context.
+     * Called by `resolveSchema` and recursively for fieldset children.
      * @internal
      */
     resolveFields(fields, links, visited) {
         const resolved = [];
         for (const field of fields) {
-            if ('fieldtype' in field && field.fieldtype === 'Link') {
+            if (field.kind === 'field' && field.fieldtype === 'Link') {
                 const link = links.get(field.fieldname);
                 if (!link) {
-                    resolved.push({ ...field });
+                    // Unresolved link — warn and produce a scalar with component: 'AFormLink'
+                    const linkDoctype = typeof field.options === 'string' ? field.options : undefined;
+                    if (linkDoctype === undefined) {
+                        console.warn(`[Stonecrop] Link field "${field.fieldname}" has no \`options\` or corresponding \`links\` declaration. ` +
+                            `AFormLink will be created without a \`doctype\` prop, so navigation will not work. ` +
+                            `Add \`"options": "<doctype-slug>"\` to the field definition.`);
+                    }
+                    const { cardinality: _c, ...rest } = field;
+                    resolved.push({
+                        ...rest,
+                        component: rest.component || 'AFormLink',
+                        ...(linkDoctype !== undefined ? { doctype: linkDoctype } : {}),
+                    });
                     continue;
                 }
                 const targetDoctype = this.registry[link.target];
                 if (!targetDoctype) {
-                    resolved.push({ ...field });
+                    // Target not registered — copy as scalar
+                    const { cardinality: _c, ...rest } = field;
+                    resolved.push({ ...rest });
                     continue;
                 }
                 const childSchema = this.resolveSchema(targetDoctype, new Set(visited));
-                const { fieldtype: _ft, options: _opt, cardinality: _card, ...fieldRest } = field;
+                const { fieldtype: _ft, options: _opt, cardinality: _card, kind: _kind, ...fieldRest } = field;
                 if (link.cardinality === 'noneOrMany' || link.cardinality === 'atLeastOne') {
-                    resolved.push(this.buildTableConfig({ ...fieldRest, label: fieldRest.label || field.fieldname }, childSchema, link.component));
+                    resolved.push(this.buildTableConfig(field, childSchema, link.component));
                 }
                 else {
-                    resolved.push({
+                    const linkEntry = {
                         ...fieldRest,
+                        kind: 'link',
                         label: fieldRest.label || field.fieldname,
                         component: link.component || fieldRest.component || 'AForm',
                         schema: childSchema,
-                    });
+                    };
+                    resolved.push(linkEntry);
                 }
             }
-            else if ('schema' in field && Array.isArray(field.schema)) {
-                resolved.push({ ...field, schema: this.resolveFields(field.schema, links, visited) });
+            else if (field.kind === 'fieldset') {
+                const resolvedChildren = this.resolveFields(field.schema, links, visited);
+                const { schema: _s, ...fieldRest } = field;
+                const fieldsetEntry = {
+                    ...fieldRest,
+                    schema: resolvedChildren,
+                };
+                resolved.push(fieldsetEntry);
+            }
+            else if (field.kind === 'table') {
+                // Inline table — columns become ColumnSchema[], add default config
+                const { columns, config, ...fieldRest } = field;
+                const tableEntry = {
+                    ...fieldRest,
+                    kind: 'table',
+                    component: fieldRest.component || 'ATable',
+                    schema: columns,
+                    config: config ?? { view: 'list' },
+                };
+                resolved.push(tableEntry);
             }
             else {
-                resolved.push({ ...field });
+                // Scalar field (kind: 'field', not a Link) — strip cardinality
+                const { cardinality: _c, ...rest } = field;
+                resolved.push({ ...rest });
             }
         }
         return resolved;
     }
     /**
-     * Build an ATable configuration from a field and child schema.
-     * Data-model properties from the source field are preserved via the spread `field` argument.
+     * Build a `ResolvedTable` from a resolved Link field with many cardinality.
+     * Extracts scalar column definitions from the child schema.
      * @internal
      */
     buildTableConfig(field, childSchema, component) {
-        const resolved = {
-            ...field,
-            fieldname: field.fieldname,
-            component: component || field.component || 'ATable',
+        // Only scalar fields become columns; strip kind and cardinality (runtime column spec)
+        const columns = childSchema
+            .filter((f) => f.kind === 'field')
+            .map(({ kind: _k, ...col }) => col);
+        const config = field.config ?? { view: 'list' };
+        const { fieldtype: _ft, options: _opt, cardinality: _card, ...fieldRest } = field;
+        return {
+            ...fieldRest,
             kind: 'table',
-            schema: childSchema,
-            config: field.config,
+            label: fieldRest.label || field.fieldname,
+            component: component || fieldRest.component || 'ATable',
+            schema: columns,
+            config,
         };
-        if (!resolved.config) {
-            resolved.config = { view: 'list' };
-        }
-        return resolved;
     }
     /**
-     * Initialize a new record with default values based on a schema.
+     * Initialize a new record with default values based on a resolved schema.
+     * Narrows by `kind` discriminator for precise branch selection.
      *
-     * @remarks
-     * Creates a plain object with keys from the schema's fieldnames and default values
-     * derived from each field's `fieldtype`:
-     * - Data, Text → `''`
-     * - Check → `false`
-     * - Int, Float, Decimal, Currency, Quantity → `0`
-     * - JSON → `{}`
-     * - Doctype with `cardinality: 'noneOrMany'` or `'atLeastOne'` → `[]`
-     * - Doctype without `cardinality` or `cardinality: 'one'` → recursively initializes nested record
-     * - All others → `null`
+     * - `kind: 'table'` or `kind: 'link'` → `[]` or `{}`
+     * - `kind: 'fieldset'` → recursively initializes children as `{}`
+     * - `kind: 'field'` → derives default from `fieldtype`; falls back to `null`
      *
-     * For Doctype fields with a resolved `schema` array (cardinality: 'one'), recursively
-     * initializes the nested record.
-     *
-     * @param schema - The schema array to derive defaults from
+     * @param schema - The resolved schema array to derive defaults from
      * @returns A plain object with default values for each field
-     *
-     * @example
-     * ```ts
-     * const defaults = registry.initializeRecord(addressSchema)
-     * // { street: '', city: '', state: '', zip_code: '' }
-     * ```
-     *
      * @public
      */
     initializeRecord(schema) {
         const record = {};
-        schema.forEach(field => {
-            const fieldtype = 'fieldtype' in field ? field.fieldtype : 'Data';
-            const cardinality = 'cardinality' in field ? field.cardinality : undefined;
-            // 1:many — cardinality signals an array
-            if (cardinality === 'noneOrMany' || cardinality === 'atLeastOne') {
+        for (const field of schema) {
+            if (field.kind === 'table') {
                 record[field.fieldname] = [];
-                return;
             }
-            // Resolved 1:many table entry — kind discriminant set by buildTableConfig
-            if ('kind' in field && field.kind === 'table') {
-                record[field.fieldname] = [];
-                return;
+            else if (field.kind === 'link') {
+                record[field.fieldname] = this.initializeRecord(field.schema);
             }
-            // Resolved 1:1 link entry — has schema property (e.g., FieldsetSchema with nested schema)
-            if ('schema' in field && Array.isArray(field.schema)) {
+            else if (field.kind === 'fieldset') {
                 record[field.fieldname] = this.initializeRecord(field.schema);
-                return;
             }
-            switch (fieldtype) {
-                case 'Data':
-                case 'Text':
-                case 'Code':
-                    record[field.fieldname] = '';
-                    break;
-                case 'Check':
-                    record[field.fieldname] = false;
-                    break;
-                case 'Int':
-                case 'Float':
-                case 'Decimal':
-                case 'Currency':
-                case 'Quantity':
-                    record[field.fieldname] = 0;
-                    break;
-                case 'JSON':
-                    record[field.fieldname] = {};
-                    break;
-                default:
-                    record[field.fieldname] = null;
+            else {
+                // kind: 'field' — derive from fieldtype
+                const fieldDefault = field.default;
+                if (fieldDefault !== undefined) {
+                    record[field.fieldname] = fieldDefault;
+                }
+                else {
+                    switch (field.fieldtype) {
+                        case 'Data':
+                        case 'Text':
+                        case 'Code':
+                            record[field.fieldname] = '';
+                            break;
+                        case 'Check':
+                            record[field.fieldname] = false;
+                            break;
+                        case 'Int':
+                        case 'Float':
+                        case 'Decimal':
+                        case 'Currency':
+                        case 'Quantity':
+                            record[field.fieldname] = 0;
+                            break;
+                        case 'JSON':
+                            record[field.fieldname] = {};
+                            break;
+                        default:
+                            record[field.fieldname] = null;
+                    }
+                }
             }
-        });
+        }
         return record;
     }
     /**

package/dist/src/schema-validator.d.ts

@@ -3,7 +3,7 @@
  * Validates Stonecrop schemas for integrity and consistency
  * @packageDocumentation
  */
-import type { SchemaTypes } from '@stonecrop/aform';
+import type { DoctypeField } from '@stonecrop/schema';
 import type { LinkDeclaration } from '@stonecrop/schema';
 import type { List, Map as ImmutableMap } from 'immutable';
 import type { AnyStateNodeConfig } from 'xstate';
@@ -29,7 +29,7 @@ export declare class SchemaValidator {
      * @param links - Optional links object
      * @returns Validation result
      */
-    validate(doctype: string, schema: List<SchemaTypes> | SchemaTypes[] | undefined, workflow?: AnyStateNodeConfig, actions?: ImmutableMap<string, string[]> | Map<string, string[]>, links?: Record<string, LinkDeclaration>): ValidationResult;
+    validate(doctype: string, schema: List<DoctypeField> | DoctypeField[] | undefined, workflow?: AnyStateNodeConfig, actions?: ImmutableMap<string, string[]> | Map<string, string[]>, links?: Record<string, LinkDeclaration>): ValidationResult;
     /**
      * Validates that required schema properties are present
      * @internal
@@ -74,5 +74,5 @@ export declare function createValidator(registry: Registry, options?: Partial<Va
  * @returns Validation result
  * @public
  */
-export declare function validateSchema(doctype: string, schema: List<SchemaTypes> | SchemaTypes[] | undefined, registry: Registry, workflow?: AnyStateNodeConfig, actions?: ImmutableMap<string, string[]> | Map<string, string[]>): ValidationResult;
+export declare function validateSchema(doctype: string, schema: List<DoctypeField> | DoctypeField[] | undefined, registry: Registry, workflow?: AnyStateNodeConfig, actions?: ImmutableMap<string, string[]> | Map<string, string[]>): ValidationResult;
 //# sourceMappingURL=schema-validator.d.ts.map

package/dist/src/schema-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-validator.d.ts","sourceRoot":"","sources":["../../src/schema-validator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,YAAY,EAAE,MAAM,WAAW,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAA;AAGhD,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAA;AAEtC,OAAO,KAAK,EAAmB,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAEnG;;;GAGG;AACH,qBAAa,eAAe;IAC3B,OAAO,CAAC,OAAO,CAA4B;IAE3C;;;OAGG;gBACS,OAAO,GAAE,gBAAqB;IAW1C;;;;;;;;OAQG;IACH,QAAQ,CACP,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,WAAW,EAAE,GAAG,SAAS,EACrD,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAChE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GACrC,gBAAgB;IA+CnB;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IA2ClC;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAgE1B;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IA0GhC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAoFxB;;;OAGG;IACH,OAAO,CAAC,0BAA0B;CAwClC;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,eAAe,CAKxG;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC7B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,WAAW,EAAE,GAAG,SAAS,EACrD,QAAQ,EAAE,QAAQ,EAClB,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAC9D,gBAAgB,CAGlB"}
+{"version":3,"file":"schema-validator.d.ts","sourceRoot":"","sources":["../../src/schema-validator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,YAAY,EAAE,MAAM,WAAW,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAA;AAGhD,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAA;AAEtC,OAAO,KAAK,EAAmB,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAEnG;;;GAGG;AACH,qBAAa,eAAe;IAC3B,OAAO,CAAC,OAAO,CAA4B;IAE3C;;;OAGG;gBACS,OAAO,GAAE,gBAAqB;IAW1C;;;;;;;;OAQG;IACH,QAAQ,CACP,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,YAAY,EAAE,GAAG,SAAS,EACvD,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAChE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GACrC,gBAAgB;IA+CnB;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAoClC;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAmD1B;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAyGhC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAoFxB;;;OAGG;IACH,OAAO,CAAC,0BAA0B;CAwClC;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,eAAe,CAKxG;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC7B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,YAAY,EAAE,GAAG,SAAS,EACvD,QAAQ,EAAE,QAAQ,EAClB,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAC9D,gBAAgB,CAGlB"}