@stonecrop/stonecrop 0.11.4 → 0.11.5

package/dist/registry.js

@@ -96,7 +96,7 @@ export default class Registry {
      * 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' }`, `rows: []`.
+     *   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'`.
      *
@@ -150,20 +150,30 @@ export default class Registry {
                     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({ fieldname: field.fieldname, label: field.label || field.fieldname }, childSchema, link.component));
+                    resolvedFields.push(this.buildTableConfig({ ...fieldRest, label: fieldRest.label || field.fieldname }, childSchema, link.component));
                 }
                 else {
                     // One relationship — embed form schema
+                    // TODO: remove assertion once resolved link output has a dedicated type separate from input schema
                     resolvedFields.push({
-                        fieldname: field.fieldname,
-                        label: field.label || field.fieldname,
-                        component: link.component || 'AForm',
+                        ...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 });
@@ -173,16 +183,60 @@ export default class Registry {
         return resolvedFields;
     }
     /**
-     * Build an ATable configuration from a field and child schema
+     * Recursively resolve a flat fields array using the provided link context.
+     * Used by resolveSchema to handle fieldset children.
+     * @internal
+     */
+    resolveFields(fields, links, visited) {
+        const resolved = [];
+        for (const field of fields) {
+            if ('fieldtype' in field && field.fieldtype === 'Link') {
+                const link = links.get(field.fieldname);
+                if (!link) {
+                    resolved.push({ ...field });
+                    continue;
+                }
+                const targetDoctype = this.registry[link.target];
+                if (!targetDoctype) {
+                    resolved.push({ ...field });
+                    continue;
+                }
+                const childSchema = this.resolveSchema(targetDoctype, new Set(visited));
+                const { fieldtype: _ft, options: _opt, cardinality: _card, ...fieldRest } = field;
+                if (link.cardinality === 'noneOrMany' || link.cardinality === 'atLeastOne') {
+                    resolved.push(this.buildTableConfig({ ...fieldRest, label: fieldRest.label || field.fieldname }, childSchema, link.component));
+                }
+                else {
+                    // TODO: remove assertion once resolved link output has a dedicated type separate from input schema
+                    resolved.push({
+                        ...fieldRest,
+                        label: fieldRest.label || field.fieldname,
+                        component: link.component || fieldRest.component || 'AForm',
+                        schema: childSchema,
+                    });
+                }
+            }
+            else if ('schema' in field && Array.isArray(field.schema)) {
+                resolved.push({ ...field, schema: this.resolveFields(field.schema, links, visited) });
+            }
+            else {
+                resolved.push({ ...field });
+            }
+        }
+        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.
      * @internal
      */
     buildTableConfig(field, childSchema, component) {
         const resolved = {
+            ...field,
             fieldname: field.fieldname,
             component: component || field.component || 'ATable',
             columns: field.columns,
             config: field.config,
-            rows: field.rows,
         };
         if (!resolved.columns) {
             resolved.columns = childSchema
@@ -199,9 +253,6 @@ export default class Registry {
         if (!resolved.config) {
             resolved.config = { view: 'list' };
         }
-        if (!resolved.rows) {
-            resolved.rows = [];
-        }
         return resolved;
     }
     /**
@@ -242,8 +293,9 @@ export default class Registry {
                 record[field.fieldname] = [];
                 return;
             }
-            // Resolved 1:many table entry — has rows property
-            if ('rows' in field) {
+            // Resolved 1:many table entry — structural detection via columns
+            // TODO: replace 'columns' presence check with a type discriminant on SchemaTypes once one exists
+            if ('columns' in field) {
                 record[field.fieldname] = [];
                 return;
             }

package/dist/src/registry.d.ts

@@ -74,7 +74,7 @@ export default class Registry {
      * 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' }`, `rows: []`.
+     *   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'`.
      *
@@ -89,7 +89,14 @@ export default class Registry {
      */
     resolveSchema(doctype: Doctype, visited?: Set<string>): SchemaTypes[];
     /**
-     * Build an ATable configuration from a field and child schema
+     * Recursively resolve a flat fields array using the provided link context.
+     * Used by resolveSchema to handle 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.
      * @internal
      */
     private buildTableConfig;

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,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACxD,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;IASjG;;;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;IA6ErE;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAiCxB;;;;;;;;;;;;;;;;;;;;;;;;;;;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;IAUvF;;;;;;;;;;;;;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,WAAW,EAAe,MAAM,kBAAkB,CAAA;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACxD,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;IASjG;;;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;IA4FrE;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAmDrB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IA6BxB;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACH,gBAAgB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAqD5D;;;;;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;IAUvF;;;;;;;;;;;;;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/stonecrop.d.ts

@@ -1240,7 +1240,7 @@ export declare class Registry {
      * 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' }`, `rows: []`.
+     *   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'`.
      *
@@ -1255,7 +1255,14 @@ export declare class Registry {
      */
     resolveSchema(doctype: Doctype, visited?: Set<string>): SchemaTypes[];
     /**
-     * Build an ATable configuration from a field and child schema
+     * Recursively resolve a flat fields array using the provided link context.
+     * Used by resolveSchema to handle 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.
      * @internal
      */
     private buildTableConfig;