@eide/foir-cli 0.1.18 → 0.1.19

package/dist/codegen/fetch-models.d.ts

@@ -33,6 +33,20 @@ export interface CodegenModel {
     config: CodegenModelConfig;
     hooks?: Record<string, unknown>;
 }
+/**
+ * Normalize a field's item type reference into `options.itemType`.
+ *
+ * The platform stores the reference in different locations depending on
+ * how the field was created:
+ *   - `options.itemType`        (standard)
+ *   - `config.itemType`         (config variant)
+ *   - `config.itemSchema`       (inline model schema reference)
+ *   - top-level `itemType`      (inline model field definitions)
+ *
+ * We consolidate into `options.itemType` so downstream codegen has a
+ * single location to check.
+ */
+export declare function normalizeField(raw: Record<string, unknown>): FieldSchemaForGen;
 export declare function fetchModelsForCodegen(client: GraphQLClient): Promise<CodegenModel[]>;
 /**
  * Filter models based on pull config options.

package/dist/codegen/fetch-models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-models.d.ts","sourceRoot":"","sources":["../../src/codegen/fetch-models.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE;QACR,OAAO,EAAE,OAAO,CAAC;QACjB,iBAAiB,EAAE,OAAO,CAAC;KAC5B,CAAC;IACF,UAAU,CAAC,EAAE;QACX,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,KAAK,CAAC;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACvD,CAAC;CACH;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC5B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAsCD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,YAAY,EAAE,CAAC,CAezB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,YAAY,EAAE,EACtB,OAAO,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,GACpD,YAAY,EAAE,CAahB"}
+{"version":3,"file":"fetch-models.d.ts","sourceRoot":"","sources":["../../src/codegen/fetch-models.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE;QACR,OAAO,EAAE,OAAO,CAAC;QACjB,iBAAiB,EAAE,OAAO,CAAC;KAC5B,CAAC;IACF,UAAU,CAAC,EAAE;QACX,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,KAAK,CAAC;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACvD,CAAC;CACH;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC5B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAsCD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,iBAAiB,CAmC9E;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,YAAY,EAAE,CAAC,CAiBzB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,YAAY,EAAE,EACtB,OAAO,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,GACpD,YAAY,EAAE,CAahB"}

package/dist/codegen/fetch-models.js

@@ -20,6 +20,47 @@ function normalizeConfig(raw) {
         embeddings: raw.embeddings,
     };
 }
+/**
+ * Normalize a field's item type reference into `options.itemType`.
+ *
+ * The platform stores the reference in different locations depending on
+ * how the field was created:
+ *   - `options.itemType`        (standard)
+ *   - `config.itemType`         (config variant)
+ *   - `config.itemSchema`       (inline model schema reference)
+ *   - top-level `itemType`      (inline model field definitions)
+ *
+ * We consolidate into `options.itemType` so downstream codegen has a
+ * single location to check.
+ */
+export function normalizeField(raw) {
+    const field = raw;
+    const options = { ...(field.options ?? {}) };
+    // Resolve itemType from all possible locations (first wins)
+    if (!options.itemType) {
+        const resolved = field.itemType ??
+            field.config?.itemType ??
+            field.config?.itemSchema;
+        if (resolved) {
+            options.itemType = resolved;
+        }
+    }
+    // Carry over minItems/maxItems from config
+    if (field.config?.minItems !== undefined && options.minItems === undefined) {
+        options.minItems = field.config.minItems;
+    }
+    if (field.config?.maxItems !== undefined && options.maxItems === undefined) {
+        options.maxItems = field.config.maxItems;
+    }
+    return {
+        key: field.key,
+        type: field.type,
+        label: field.label,
+        required: field.required,
+        helpText: field.helpText,
+        options: Object.keys(options).length > 0 ? options : undefined,
+    };
+}
 export async function fetchModelsForCodegen(client) {
     const data = await client.request(MODELS_FOR_CODEGEN, {
         limit: 500,
@@ -30,7 +71,7 @@ export async function fetchModelsForCodegen(client) {
         pluralName: item.pluralName,
         description: item.description,
         category: item.category,
-        fields: item.fields ?? [],
+        fields: (item.fields ?? []).map((f) => normalizeField(f)),
         config: normalizeConfig(item.config ?? {}),
         hooks: item.hooks,
     }));

package/dist/codegen/field-mapping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"field-mapping.d.ts","sourceRoot":"","sources":["../../src/codegen/field-mapping.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,qBAAqB,aAsBhC,CAAC;AAEH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CA0D1D,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,wBAAgB,YAAY,CAC1B,KAAK,EAAE,iBAAiB,EACxB,IAAI,GAAE,QAAQ,GAAG,OAAkB,GAClC,MAAM,CAwCR;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAc3E;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,iBAAiB,EAAE,GAC1B,GAAG,CAAC,MAAM,CAAC,CAiBb;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAK/C;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAMpD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKrD;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAiFjE"}
+{"version":3,"file":"field-mapping.d.ts","sourceRoot":"","sources":["../../src/codegen/field-mapping.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,qBAAqB,aAqBhC,CAAC;AAEH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAyD1D,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,wBAAgB,YAAY,CAC1B,KAAK,EAAE,iBAAiB,EACxB,IAAI,GAAE,QAAQ,GAAG,OAAkB,GAClC,MAAM,CAqCR;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAY3E;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,iBAAiB,EAAE,GAC1B,GAAG,CAAC,MAAM,CAAC,CAcb;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAK/C;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAMpD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKrD;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CA8EjE"}

package/dist/codegen/field-mapping.js

@@ -19,7 +19,6 @@ export const PRIMITIVE_FIELD_TYPES = new Set([
     'multiselect',
     'json',
     'list',
-    'tree',
     'entity-reference',
     'reference',
     'link',
@@ -65,7 +64,6 @@ export const FIELD_TYPE_MAPPING = {
     multiselect: { outputType: 'string[]', inputType: 'string[]' },
     json: { outputType: 'unknown', inputType: 'unknown' },
     list: { outputType: 'unknown[]', inputType: 'unknown[]' },
-    tree: { outputType: 'unknown[]', inputType: 'unknown[]' },
     flexible: {
         outputType: 'FlexibleFieldItem[]',
         inputType: 'FlexibleFieldItem[]',
@@ -109,8 +107,7 @@ export function getFieldType(field, mode = 'output') {
             tsType = `(${options.map((o) => `'${o.value}'`).join(' | ')})[]`;
         }
     }
-    if ((field.type === 'list' || field.type === 'tree') &&
-        field.options?.itemType) {
+    if (field.type === 'list' && field.options?.itemType) {
         const itemType = field.options.itemType;
         const itemMapping = FIELD_TYPE_MAPPING[itemType];
         if (itemMapping) {
@@ -128,8 +125,7 @@ export function getRequiredImports(fields) {
         const mapping = FIELD_TYPE_MAPPING[field.type];
         if (mapping?.needsImport)
             imports.add(mapping.needsImport);
-        if ((field.type === 'list' || field.type === 'tree') &&
-            field.options?.itemType) {
+        if (field.type === 'list' && field.options?.itemType) {
             const itemMapping = FIELD_TYPE_MAPPING[field.options.itemType];
             if (itemMapping?.needsImport)
                 imports.add(itemMapping.needsImport);
@@ -143,8 +139,7 @@ export function getInlineSchemaReferences(fields) {
         if (!isPrimitiveFieldType(field.type) && !FIELD_TYPE_MAPPING[field.type]) {
             refs.add(field.type);
         }
-        if ((field.type === 'list' || field.type === 'tree') &&
-            field.options?.itemType) {
+        if (field.type === 'list' && field.options?.itemType) {
             const itemType = field.options.itemType;
             if (!isPrimitiveFieldType(itemType) && !FIELD_TYPE_MAPPING[itemType]) {
                 refs.add(itemType);
@@ -223,8 +218,7 @@ export function generateFieldDef(field) {
         if (field.options.multiple)
             parts.push('multiple: true');
     }
-    if ((field.type === 'list' || field.type === 'tree') &&
-        field.options?.itemType) {
+    if (field.type === 'list' && field.options?.itemType) {
         parts.push(`itemType: '${field.options.itemType}'`);
         if (field.options.minItems !== undefined)
             parts.push(`minItems: ${field.options.minItems}`);

package/dist/codegen/generators/model-types.js

@@ -118,9 +118,8 @@ function generateDataInterface(model, fields, interfaceName, allModels) {
         if (refModel && !isInlineOnlyModel(refModel)) {
             fieldType = toPascalCase(field.type) + 'Data';
         }
-        // Handle list/tree itemType refs
-        if ((field.type === 'list' || field.type === 'tree') &&
-            field.options?.itemType) {
+        // Handle list itemType refs
+        if (field.type === 'list' && field.options?.itemType) {
             const itemRefModel = allModels.find((m) => m.key === field.options.itemType);
             if (itemRefModel && !isInlineOnlyModel(itemRefModel)) {
                 fieldType = toPascalCase(field.options.itemType) + 'Data[]';
@@ -140,8 +139,7 @@ function getFieldTypeImportsForFields(fields) {
         if (mapping?.needsImport === 'field-types') {
             imports.add(mapping.outputType);
         }
-        if ((field.type === 'list' || field.type === 'tree') &&
-            field.options?.itemType) {
+        if (field.type === 'list' && field.options?.itemType) {
             const itemMapping = FIELD_TYPE_MAPPING[field.options.itemType];
             if (itemMapping?.needsImport === 'field-types') {
                 imports.add(itemMapping.outputType);

package/dist/codegen/swift-field-mapping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swift-field-mapping.d.ts","sourceRoot":"","sources":["../../src/codegen/swift-field-mapping.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,MAAM,WAAW,gBAAgB;IAC/B,sBAAsB;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,yEAAyE;IACzE,cAAc,EAAE,OAAO,CAAC;IACxB,gFAAgF;IAChF,YAAY,EAAE,MAAM,CAAC;IACrB,iDAAiD;IACjD,cAAc,EAAE,MAAM,CAAC;IACvB,kEAAkE;IAClE,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAoIrE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC;CACvC,CAeA"}
+{"version":3,"file":"swift-field-mapping.d.ts","sourceRoot":"","sources":["../../src/codegen/swift-field-mapping.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,MAAM,WAAW,gBAAgB;IAC/B,sBAAsB;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,yEAAyE;IACzE,cAAc,EAAE,OAAO,CAAC;IACxB,gFAAgF;IAChF,YAAY,EAAE,MAAM,CAAC;IACrB,iDAAiD;IACjD,cAAc,EAAE,MAAM,CAAC;IACvB,kEAAkE;IAClE,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CA8HrE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC;CACvC,CAeA"}

package/dist/codegen/swift-field-mapping.js

@@ -105,12 +105,6 @@ export const SWIFT_FIELD_TYPE_MAPPING = {
         defaultValue: '[]',
         castExpression: 'as? [Any]',
     },
-    tree: {
-        type: '[Any]',
-        alwaysOptional: true,
-        defaultValue: '[]',
-        castExpression: 'as? [Any]',
-    },
     flexible: {
         type: '[[String: Any]]',
         alwaysOptional: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eide/foir-cli",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "Universal platform CLI for EIDE — scriptable, composable resource management",
   "type": "module",
   "publishConfig": {