@stonecrop/stonecrop 0.13.7 → 0.13.9

package/dist/src/schema-validator.js

@@ -90,8 +90,8 @@ export class SchemaValidator {
                 });
                 continue;
             }
-            // Check for component or fieldtype
-            if (!field.component && !('fieldtype' in field)) {
+            // ValueField requires fieldtype; fieldset/table have their own structural requirements
+            if (field.kind === 'field' && !field.component && !field.fieldtype) {
                 issues.push({
                     severity: ValidationSeverity.ERROR,
                     rule: 'required-component-or-fieldtype',
@@ -100,14 +100,9 @@ export class SchemaValidator {
                     fieldname: field.fieldname,
                 });
             }
-            // Validate nested schemas (recursively)
-            if ('schema' in field) {
-                // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- 'schema' in field guard confirms property exists; SchemaTypes union narrowed at runtime
-                const nestedSchema = field.schema;
-                // oxlint-disable typescript/no-unsafe-type-assertion -- Immutable List or plain array; toArray() returns SchemaTypes elements
-                const nestedArray = (Array.isArray(nestedSchema) ? nestedSchema : nestedSchema.toArray?.() || []);
-                // oxlint-enable typescript/no-unsafe-type-assertion
-                issues.push(...this.validateRequiredProperties(doctype, nestedArray));
+            // Validate nested schemas recursively (fieldset only; table columns are ColumnSchema not DoctypeField)
+            if (field.kind === 'fieldset') {
+                issues.push(...this.validateRequiredProperties(doctype, field.schema));
             }
         }
         return issues;
@@ -119,11 +114,8 @@ export class SchemaValidator {
     validateLinkFields(doctype, schema, registry) {
         const issues = [];
         for (const field of schema) {
-            // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- 'fieldtype' in field guard confirms property exists; accessing unknown-typed fieldtype safely
-            const fieldtype = 'fieldtype' in field ? field.fieldtype : undefined;
-            // Check Link fields
-            if (fieldtype === 'Link') {
-                const options = 'options' in field ? field.options : undefined;
+            if (field.kind === 'field' && field.fieldtype === 'Link') {
+                const options = field.options;
                 if (!options) {
                     issues.push({
                         severity: ValidationSeverity.ERROR,
@@ -134,8 +126,6 @@ export class SchemaValidator {
                     });
                     continue;
                 }
-                // Check if target doctype exists in registry
-                // Options should be a string representing the target doctype name
                 const targetDoctype = typeof options === 'string' ? options : '';
                 if (!targetDoctype) {
                     issues.push({
@@ -159,14 +149,9 @@ export class SchemaValidator {
                     });
                 }
             }
-            // Recursively check nested schemas
-            if ('schema' in field) {
-                // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- 'schema' in field guard confirms property exists; SchemaTypes union narrowed at runtime
-                const nestedSchema = field.schema;
-                // oxlint-disable typescript/no-unsafe-type-assertion -- Immutable List or plain array; toArray() returns SchemaTypes elements
-                const nestedArray = (Array.isArray(nestedSchema) ? nestedSchema : nestedSchema.toArray?.() || []);
-                // oxlint-enable typescript/no-unsafe-type-assertion
-                issues.push(...this.validateLinkFields(doctype, nestedArray, registry));
+            // Recursively check nested fieldset schemas
+            if (field.kind === 'fieldset') {
+                issues.push(...this.validateLinkFields(doctype, field.schema, registry));
             }
         }
         return issues;
@@ -180,7 +165,7 @@ export class SchemaValidator {
         // Build a map of Link fields by fieldname for quick lookup
         const linkFieldsByFieldname = new Map();
         for (const field of schema) {
-            if ('fieldtype' in field && field.fieldtype === 'Link') {
+            if (field.kind === 'field' && field.fieldtype === 'Link') {
                 linkFieldsByFieldname.set(field.fieldname, field);
             }
         }
@@ -237,9 +222,8 @@ export class SchemaValidator {
             // Only check if link has fieldname set (otherwise it's a standalone link without a field)
             if (link.fieldname) {
                 const linkField = linkFieldsByFieldname.get(link.fieldname);
-                if (linkField) {
-                    const linkFieldOptions = 'options' in linkField ? linkField.options : undefined;
-                    const linkFieldTarget = typeof linkFieldOptions === 'string' ? linkFieldOptions : undefined;
+                if (linkField && linkField.kind === 'field') {
+                    const linkFieldTarget = typeof linkField.options === 'string' ? linkField.options : undefined;
                     if (linkFieldTarget && linkFieldTarget !== link.target) {
                         issues.push({
                             severity: ValidationSeverity.ERROR,

package/dist/src/stonecrop.d.ts

@@ -312,7 +312,7 @@ export declare class Stonecrop {
         getSnapshot: () => import("./types").OperationLogSnapshot;
         markIrreversible: (operationId: string, reason: string) => void;
         logAction: (doctype: string, actionName: string, recordIds?: string[], result?: "success" | "failure" | "pending", error?: string) => string;
-    }, "undo" | "redo" | "configure" | "addOperation" | "startBatch" | "commitBatch" | "cancelBatch" | "clear" | "getOperationsFor" | "getSnapshot" | "markIrreversible" | "logAction">>;
+    }, "clear" | "undo" | "redo" | "configure" | "addOperation" | "startBatch" | "commitBatch" | "cancelBatch" | "getOperationsFor" | "getSnapshot" | "markIrreversible" | "logAction">>;
     /**
      * Initialize the HST store structure
      */

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

@@ -1 +1 @@
-{"version":3,"file":"stonecrop.d.ts","sourceRoot":"","sources":["../../src/stonecrop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stonecrop.d.ts","sourceRoot":"","sources":["../../src/stonecrop.ts"],"names":[],"mappings":"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"}

package/dist/src/stonecrop.js

@@ -271,7 +271,6 @@ export class Stonecrop {
         // TODO: For custom fetch handlers, this returns false (not blocking), but the custom handler
         // may still be invoked by useLazyLink. Future: custom handlers should be able to declare they
         // satisfy blockWorkflows, or validation should reject custom + blockWorkflows: true.
-        // See: relationships.md Phase 6 "Open Question: blockWorkflows + custom fetch"
         return link.fetch?.method === 'sync';
     }
     /**

package/dist/src/stores/operation-log.d.ts

@@ -264,5 +264,5 @@ export declare const useOperationLogStore: import("pinia").StoreDefinition<"hst-
     getSnapshot: () => OperationLogSnapshot;
     markIrreversible: (operationId: string, reason: string) => void;
     logAction: (doctype: string, actionName: string, recordIds?: string[], result?: "success" | "failure" | "pending", error?: string) => string;
-}, "undo" | "redo" | "configure" | "addOperation" | "startBatch" | "commitBatch" | "cancelBatch" | "clear" | "getOperationsFor" | "getSnapshot" | "markIrreversible" | "logAction">>;
+}, "clear" | "undo" | "redo" | "configure" | "addOperation" | "startBatch" | "commitBatch" | "cancelBatch" | "getOperationsFor" | "getSnapshot" | "markIrreversible" | "logAction">>;
 //# sourceMappingURL=operation-log.d.ts.map

package/dist/src/types/composable.d.ts

@@ -1,4 +1,4 @@
-import type { SchemaTypes } from '@stonecrop/aform';
+import type { ResolvedField } from '@stonecrop/aform';
 import type { Ref, ComputedRef } from 'vue';
 import type Doctype from '../doctype';
 import type { HSTNode } from './hst';
@@ -167,7 +167,7 @@ export type HSTStonecropReturn = BaseStonecropReturn & {
      * Resolved schema with nested Doctype fields expanded.
      * Use this to iterate over fields for rendering, excluding nested doctypes handled separately.
      */
-    resolvedSchema: Ref<SchemaTypes[]>;
+    resolvedSchema: Ref<ResolvedField[]>;
     /**
      * Scaffold empty descendant records from defaults for all descendant links.
      * @param path - The HST path where initialized data should be stored

package/dist/src/types/composable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"composable.d.ts","sourceRoot":"","sources":["../../../src/types/composable.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"composable.d.ts","sourceRoot":"","sources":["../../../src/types/composable.ts"],"names":[],"mappings":"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"}

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

@@ -1,38 +1,19 @@
-import type { SchemaTypes } from '@stonecrop/aform';
-import type { FieldMeta, LinkDeclaration, WorkflowMeta } from '@stonecrop/schema';
+import type { DoctypeField, LinkDeclaration, WorkflowMeta } from '@stonecrop/schema';
 import { List, Map } from 'immutable';
 import type { AnyStateNodeConfig, UnknownMachineConfig } from 'xstate';
 /**
- * Immutable Doctype type for Stonecrop instances
+ * Immutable Doctype type for Stonecrop instances. App authors should use
+ * `Doctype.fromObject()` rather than constructing this shape manually.
  * @public
  */
 export type ImmutableDoctype = {
-    readonly schema?: List<SchemaTypes>;
+    readonly schema?: List<DoctypeField>;
     readonly workflow?: UnknownMachineConfig | AnyStateNodeConfig | WorkflowMeta;
     readonly actions?: Map<string, string[]>;
-    readonly links?: Record<string, LinkDeclaration>;
-};
-/**
- * Mutable Doctype type for Stonecrop instances
- * @public
- */
-export type MutableDoctype = {
-    doctype?: string;
-    schema?: SchemaTypes[];
-    workflow?: UnknownMachineConfig | AnyStateNodeConfig | WorkflowMeta;
-    actions?: Record<string, string[]>;
-};
-/**
- * Schema type for Stonecrop instances
- * @public
- */
-export type Schema = {
-    doctype: string;
-    schema: List<SchemaTypes>;
 };
 /**
  * Plain object representation of doctype configuration for serialization/API responses.
- * Compatible with the DoctypeMeta type from \@stonecrop/schema.
+ * Extends DoctypeMeta with Stonecrop-specific properties: actions, slug, inherits.
  * @public
  */
 export type DoctypeConfig = {
@@ -41,7 +22,7 @@ export type DoctypeConfig = {
     /** URL-friendly slug (kebab-case) */
     slug?: string;
     /** Field definitions (including link fields with fieldtype: 'Link') */
-    fields?: (SchemaTypes | FieldMeta)[];
+    fields?: DoctypeField[];
     /** Relationship links to other doctypes */
     links?: Record<string, LinkDeclaration>;
     /** Workflow configuration (XState format or simple WorkflowMeta) */

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

@@ -1 +1 @@
-{"version":3,"file":"doctype.d.ts","sourceRoot":"","sources":["../../../src/types/doctype.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACjF,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAA;AAEtE;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;IACnC,QAAQ,CAAC,QAAQ,CAAC,EAAE,oBAAoB,GAAG,kBAAkB,GAAG,YAAY,CAAA;IAC5E,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;IACxC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;CAChD,CAAA;AAED;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,WAAW,EAAE,CAAA;IACtB,QAAQ,CAAC,EAAE,oBAAoB,GAAG,kBAAkB,GAAG,YAAY,CAAA;IACnE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;CAClC,CAAA;AAED;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;CACzB,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG;IAC3B,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,qCAAqC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,uEAAuE;IACvE,MAAM,CAAC,EAAE,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,CAAA;IACpC,2CAA2C;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IACvC,oEAAoE;IACpE,QAAQ,CAAC,EAAE,oBAAoB,GAAG,YAAY,CAAA;IAC9C,uCAAuC;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;IAClC,uCAAuC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA"}
+{"version":3,"file":"doctype.d.ts","sourceRoot":"","sources":["../../../src/types/doctype.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACpF,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAA;AAEtE;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IACpC,QAAQ,CAAC,QAAQ,CAAC,EAAE,oBAAoB,GAAG,kBAAkB,GAAG,YAAY,CAAA;IAC5E,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;CACxC,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG;IAC3B,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,qCAAqC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,uEAAuE;IACvE,MAAM,CAAC,EAAE,YAAY,EAAE,CAAA;IACvB,2CAA2C;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IACvC,oEAAoE;IACpE,QAAQ,CAAC,EAAE,oBAAoB,GAAG,YAAY,CAAA;IAC9C,uCAAuC;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;IAClC,uCAAuC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA"}

package/dist/stonecrop.d.ts

@@ -2,14 +2,14 @@ import type { AnyStateNodeConfig } from 'xstate';
 import { Component } from 'vue';
 import { ComputedRef } from 'vue';
 import type { DataClient } from '@stonecrop/schema';
-import type { FieldMeta } from '@stonecrop/schema';
+import type { DoctypeField } from '@stonecrop/schema';
 import type { LinkDeclaration } from '@stonecrop/schema';
 import { List } from 'immutable';
 import { Map as Map_2 } from 'immutable';
 import { Plugin as Plugin_2 } from 'vue';
 import { Ref } from 'vue';
+import type { ResolvedField } from '@stonecrop/aform';
 import { Router } from 'vue-router';
-import type { SchemaTypes } from '@stonecrop/aform';
 import { Store } from 'pinia';
 import { StoreDefinition } from 'pinia';
 import type { UnknownMachineConfig } from 'xstate';
@@ -223,21 +223,21 @@ export declare 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.
@@ -310,7 +310,7 @@ export declare class Doctype {
 
 /**
  * Plain object representation of doctype configuration for serialization/API responses.
- * Compatible with the DoctypeMeta type from \@stonecrop/schema.
+ * Extends DoctypeMeta with Stonecrop-specific properties: actions, slug, inherits.
  * @public
  */
 export declare type DoctypeConfig = {
@@ -319,7 +319,7 @@ export declare type DoctypeConfig = {
     /** URL-friendly slug (kebab-case) */
     slug?: string;
     /** Field definitions (including link fields with fieldtype: 'Link') */
-    fields?: (SchemaTypes | FieldMeta)[];
+    fields?: DoctypeField[];
     /** Relationship links to other doctypes */
     links?: Record<string, LinkDeclaration>;
     /** Workflow configuration (XState format or simple WorkflowMeta) */
@@ -798,7 +798,7 @@ export declare type HSTStonecropReturn = BaseStonecropReturn & {
      * Resolved schema with nested Doctype fields expanded.
      * Use this to iterate over fields for rendering, excluding nested doctypes handled separately.
      */
-    resolvedSchema: Ref<SchemaTypes[]>;
+    resolvedSchema: Ref<ResolvedField[]>;
     /**
      * Scaffold empty descendant records from defaults for all descendant links.
      * @param path - The HST path where initialized data should be stored
@@ -866,14 +866,14 @@ export declare type HSTStonecropReturn = BaseStonecropReturn & {
 };
 
 /**
- * Immutable Doctype type for Stonecrop instances
+ * Immutable Doctype type for Stonecrop instances. App authors should use
+ * `Doctype.fromObject()` rather than constructing this shape manually.
  * @public
  */
 export declare type ImmutableDoctype = {
-    readonly schema?: List<SchemaTypes>;
+    readonly schema?: List<DoctypeField>;
     readonly workflow?: UnknownMachineConfig | AnyStateNodeConfig | WorkflowMeta;
     readonly actions?: Map_2<string, string[]>;
-    readonly links?: Record<string, LinkDeclaration>;
 };
 
 /**
@@ -933,17 +933,6 @@ export declare type LazyLink = {
  */
 export declare function markOperationIrreversible(operationId: string | undefined, reason: string): void;
 
-/**
- * Mutable Doctype type for Stonecrop instances
- * @public
- */
-export declare type MutableDoctype = {
-    doctype?: string;
-    schema?: SchemaTypes[];
-    workflow?: UnknownMachineConfig | AnyStateNodeConfig | WorkflowMeta;
-    actions?: Record<string, string[]>;
-};
-
 /**
  * Operation Log API - nested object containing all operation log functionality
  * @public
@@ -1230,70 +1219,50 @@ export declare class Registry {
      */
     addDoctype(doctype: Doctype): void;
     /**
-     * Resolve nested Doctype fields in a schema by embedding child schemas inline.
-     *
-     * 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.
+     * Resolve a Doctype's authoring schema into a rendered schema array suitable for AForm.
      *
-     * 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'`.
+     * 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[]`)
      *
-     * 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.
+     * 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: SchemaTypes[]): Record<string, any>;
+    initializeRecord(schema: ResolvedField[]): Record<string, any>;
     /**
      * Get a registered doctype by slug
      * @param slug - The doctype slug to look up
@@ -1354,15 +1323,6 @@ export declare interface RouteContext {
     segments: string[];
 }
 
-/**
- * Schema type for Stonecrop instances
- * @public
- */
-export declare type Schema = {
-    doctype: string;
-    schema: List<SchemaTypes>;
-};
-
 /**
  * Schema validator class
  * @public
@@ -1383,7 +1343,7 @@ export declare class SchemaValidator {
      * @param links - Optional links object
      * @returns Validation result
      */
-    validate(doctype: string, schema: List<SchemaTypes> | SchemaTypes[] | undefined, workflow?: AnyStateNodeConfig, actions?: Map_2<string, string[]> | Map<string, string[]>, links?: Record<string, LinkDeclaration>): ValidationResult;
+    validate(doctype: string, schema: List<DoctypeField> | DoctypeField[] | undefined, workflow?: AnyStateNodeConfig, actions?: Map_2<string, string[]> | Map<string, string[]>, links?: Record<string, LinkDeclaration>): ValidationResult;
     /**
      * Validates that required schema properties are present
      * @internal
@@ -1727,7 +1687,7 @@ export declare class Stonecrop {
     getSnapshot: () => OperationLogSnapshot;
     markIrreversible: (operationId: string, reason: string) => void;
     logAction: (doctype: string, actionName: string, recordIds?: string[], result?: "success" | "failure" | "pending", error?: string) => string;
-    }, "undo" | "redo" | "configure" | "addOperation" | "startBatch" | "commitBatch" | "cancelBatch" | "clear" | "getOperationsFor" | "getSnapshot" | "markIrreversible" | "logAction">>;
+    }, "clear" | "undo" | "redo" | "configure" | "addOperation" | "startBatch" | "commitBatch" | "cancelBatch" | "getOperationsFor" | "getSnapshot" | "markIrreversible" | "logAction">>;
     /**
      * Initialize the HST store structure
      */
@@ -2385,7 +2345,7 @@ getOperationsFor: (doctype: string, recordId?: string) => HSTOperation[];
 getSnapshot: () => OperationLogSnapshot;
 markIrreversible: (operationId: string, reason: string) => void;
 logAction: (doctype: string, actionName: string, recordIds?: string[], result?: "success" | "failure" | "pending", error?: string) => string;
-}, "undo" | "redo" | "configure" | "addOperation" | "startBatch" | "commitBatch" | "cancelBatch" | "clear" | "getOperationsFor" | "getSnapshot" | "markIrreversible" | "logAction">>;
+}, "clear" | "undo" | "redo" | "configure" | "addOperation" | "startBatch" | "commitBatch" | "cancelBatch" | "getOperationsFor" | "getSnapshot" | "markIrreversible" | "logAction">>;
 
 /**
  * Unified Stonecrop composable - handles both general operations and HST reactive integration
@@ -2448,7 +2408,7 @@ export declare function useUndoRedoShortcuts(hstStore: HSTNode, enabled?: boolea
  * @returns Validation result
  * @public
  */
-export declare function validateSchema(doctype: string, schema: List<SchemaTypes> | SchemaTypes[] | undefined, registry: Registry, workflow?: AnyStateNodeConfig, actions?: Map_2<string, string[]> | Map<string, string[]>): ValidationResult;
+export declare function validateSchema(doctype: string, schema: List<DoctypeField> | DoctypeField[] | undefined, registry: Registry, workflow?: AnyStateNodeConfig, actions?: Map_2<string, string[]> | Map<string, string[]>): ValidationResult;
 
 /**
  * Validation issue