@webiny/api-headless-cms 0.0.0-unstable.6f45466a1d → 0.0.0-unstable.7be00a75a9

package/features/modelBuilder/fields/{validators.d.ts → fieldTypeValidator.d.ts}

@@ -65,7 +65,7 @@ export interface UniqueValidator {
     unique(message?: string): this;
 }
 /**
- * List validators (for multipleValues fields).
+ * List validators (for list fields).
  * These validate the array itself, not individual items.
  */
 export interface ListMinLengthValidator {
@@ -74,3 +74,25 @@ export interface ListMinLengthValidator {
 export interface ListMaxLengthValidator {
     listMaxLength(value: number, message?: string): this;
 }
+/**
+ * Validators to use when building a custom field type
+ */
+export declare namespace FieldTypeValidator {
+    type Required = RequiredValidator;
+    type MinLength = MinLengthValidator;
+    type MaxLength = MaxLengthValidator;
+    type Pattern = PatternValidator;
+    type Email = EmailValidator;
+    type Url = UrlValidator;
+    type LowerCase = LowerCaseValidator;
+    type UpperCase = UpperCaseValidator;
+    type LowerCaseSpace = LowerCaseSpaceValidator;
+    type UpperCaseSpace = UpperCaseSpaceValidator;
+    type Gte = GteValidator;
+    type Lte = LteValidator;
+    type DateGte = DateGteValidator;
+    type DateLte = DateLteValidator;
+    type Unique = UniqueValidator;
+    type ListMinLength = ListMinLengthValidator;
+    type ListMaxLength = ListMaxLengthValidator;
+}

package/features/modelBuilder/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./abstractions.js";
+export { ModelFactory } from "./abstractions.js";
 export * from "./models/BaseModelBuilder.js";
 export * from "./models/ModelBuilder.js";
 export * from "./models/PrivateModelBuilder.js";
@@ -7,6 +7,7 @@ export * from "./feature.js";
 export * from "./fields/FieldBuilder.js";
 export * from "./fields/abstractions.js";
 export * from "./models/abstractions.js";
+export { TextFieldSubTypes, TextFieldTypes } from "./fields/TextFieldType.js";
 import "./fields/TextFieldType.js";
 import "./fields/LongTextFieldType.js";
 import "./fields/RichTextFieldType.js";
@@ -17,6 +18,8 @@ import "./fields/DateTimeFieldType.js";
 import "./fields/ObjectFieldType.js";
 import "./fields/RefFieldType.js";
 import "./fields/DynamicZoneFieldType.js";
-import "./fields/LocationFieldType.js";
 import "./fields/JsonFieldType.js";
 import "./fields/SearchableJsonFieldType.js";
+import "./fields/UiSeparatorFieldType.js";
+import "./fields/UiTabsFieldType.js";
+import "./fields/UiAlertFieldType.js";

package/features/modelBuilder/index.js

@@ -1,16 +1,5 @@
-export * from "./abstractions.js";
-export * from "./models/BaseModelBuilder.js";
-export * from "./models/ModelBuilder.js";
-export * from "./models/PrivateModelBuilder.js";
-export * from "./models/PublicModelBuilder.js";
-export * from "./feature.js";
-export * from "./fields/FieldBuilder.js";
-export * from "./fields/abstractions.js";
-export * from "./models/abstractions.js";
-
-// Import all field types to ensure their module augmentations are applied
-// These imports have side effects that add methods to IFieldBuilderRegistry
-import "./fields/TextFieldType.js";
+import "./fields/UiAlertFieldType.js";
+import "./fields/UiTabsFieldType.js";
 import "./fields/LongTextFieldType.js";
 import "./fields/RichTextFieldType.js";
 import "./fields/NumberFieldType.js";
@@ -20,8 +9,16 @@ import "./fields/DateTimeFieldType.js";
 import "./fields/ObjectFieldType.js";
 import "./fields/RefFieldType.js";
 import "./fields/DynamicZoneFieldType.js";
-import "./fields/LocationFieldType.js";
 import "./fields/JsonFieldType.js";
 import "./fields/SearchableJsonFieldType.js";
-
-//# sourceMappingURL=index.js.map
+import "./fields/UiSeparatorFieldType.js";
+export * from "./models/BaseModelBuilder.js";
+export * from "./models/ModelBuilder.js";
+export * from "./models/PrivateModelBuilder.js";
+export * from "./models/PublicModelBuilder.js";
+export * from "./feature.js";
+export * from "./fields/FieldBuilder.js";
+export * from "./fields/abstractions.js";
+export * from "./models/abstractions.js";
+export { ModelFactory } from "./abstractions.js";
+export { TextFieldSubTypes, TextFieldTypes } from "./fields/TextFieldType.js";

package/features/modelBuilder/models/BaseModelBuilder.d.ts

@@ -1,5 +1,7 @@
-import { FieldBuilder, FieldBuilderRegistry } from "../../../features/modelBuilder/index.js";
-import { CmsModelPlugin } from "../../../plugins/index.js";
+import { BaseFieldBuilder } from "../../../features/modelBuilder/index.js";
+import { CmsModelPlugin } from "../../../plugins/CmsModelPlugin.js";
+import { FieldBuilderRegistry } from "../abstractions.js";
+import type { CmsModelField, CmsModelLayoutCell } from "../../../types/index.js";
 /**
  * Base class for all model builders, containing shared logic.
  * Concrete builders (PrivateModelBuilder, PublicModelBuilder) extend this.
@@ -12,13 +14,13 @@ export declare abstract class BaseModelBuilder<TBuild = CmsModelPlugin> {
         tags?: string[];
     };
     protected isSingleEntry: boolean;
-    protected fieldBuildersMap: Map<string, FieldBuilder<any>>;
+    protected fieldBuildersMap: Map<string, BaseFieldBuilder<any>>;
     constructor(registry: FieldBuilderRegistry.Interface);
     modelId(id: string): this;
     name(name: string): this;
     singleEntry(): this;
     tags(tags: string[]): this;
-    fields(builder: (registry: FieldBuilderRegistry.Interface) => Record<string, FieldBuilder<any>>): this;
+    fields(builder: (registry: FieldBuilderRegistry.Interface) => Record<string, BaseFieldBuilder<any>>): this;
     /**
      * Merge field operations from extension builder into existing builder.
      * This handles the case where multiple fields of the same type exist,
@@ -27,6 +29,10 @@ export declare abstract class BaseModelBuilder<TBuild = CmsModelPlugin> {
      * @internal
      */
     private mergeFieldOperations;
+    protected buildFields(): {
+        fields: CmsModelField[];
+        layoutReplacements: Map<string, CmsModelLayoutCell>;
+    };
     /**
      * Get tags with common defaults applied.
      * Always includes "type:model" and optionally "singleEntry".

package/features/modelBuilder/models/BaseModelBuilder.js

@@ -1,121 +1,80 @@
-/**
- * Base class for all model builders, containing shared logic.
- * Concrete builders (PrivateModelBuilder, PublicModelBuilder) extend this.
- */
-export class BaseModelBuilder {
-  config = {};
-  isSingleEntry = false;
-  fieldBuildersMap = new Map();
-  constructor(registry) {
-    this.registry = registry;
-  }
-  modelId(id) {
-    this.config.modelId = id;
-    return this;
-  }
-  name(name) {
-    this.config.name = name;
-    return this;
-  }
-  singleEntry() {
-    this.isSingleEntry = true;
-    return this;
-  }
-  tags(tags) {
-    this.config.tags = tags;
-    return this;
-  }
-  fields(builder) {
-    // Pass existing fields to registry so it can return them when extending
-    this.registry.existingFields = this.fieldBuildersMap;
-    const fieldBuilders = builder(this.registry);
-    for (const [key, fieldBuilder] of Object.entries(fieldBuilders)) {
-      // Set the fieldId from the object key
-      fieldBuilder.fieldId(key);
-      const existingBuilder = this.fieldBuildersMap.get(key);
-      const isExtendMode = fieldBuilder._extendMode;
-      if (isExtendMode && existingBuilder) {
-        // Extension mode - validate type and merge operations
-        if (existingBuilder.type !== fieldBuilder.type) {
-          throw new Error(`Cannot extend field "${key}": type mismatch. Expected "${existingBuilder.type}", got "${fieldBuilder.type}".`);
-        }
-        // Merge operations from temporary new builder into existing builder
-        this.mergeFieldOperations(key, existingBuilder, fieldBuilder);
-      } else if (existingBuilder && !isExtendMode) {
-        // Replacement mode - validate type
-        if (existingBuilder.type !== fieldBuilder.type) {
-          throw new Error(`Cannot redefine field "${key}": type mismatch. Expected "${existingBuilder.type}", got "${fieldBuilder.type}".`);
-        }
-        // Replace with new builder
-        this.fieldBuildersMap.set(key, fieldBuilder);
-      } else if (!existingBuilder && !isExtendMode) {
-        // New field - store builder
-        this.fieldBuildersMap.set(key, fieldBuilder);
-      } else {
-        // isExtendMode but no existingBuilder - this is an error
-        throw new Error(`Cannot extend field "${key}": field does not exist. Use .extend() only for existing fields.`);
-      }
+class BaseModelBuilder {
+    constructor(registry){
+        this.registry = registry;
+        this.config = {};
+        this.isSingleEntry = false;
+        this.fieldBuildersMap = new Map();
     }
-    return this;
-  }
-
-  /**
-   * Merge field operations from extension builder into existing builder.
-   * This handles the case where multiple fields of the same type exist,
-   * and we need to transfer operations from the temporary new builder
-   * to the existing builder.
-   * @internal
-   */
-  mergeFieldOperations(fieldId, existing, extension) {
-    // For object fields, merge nested fields and layout operations
-    if (existing.type === "object" && extension.type === "object") {
-      const existingFieldMap = existing.fieldBuildersMap;
-      const extensionFieldMap = extension.fieldBuildersMap;
-
-      // Merge nested field builders
-      if (extensionFieldMap) {
-        for (const [nestedKey, nestedBuilder] of extensionFieldMap.entries()) {
-          existingFieldMap.set(nestedKey, nestedBuilder);
+    modelId(id) {
+        this.config.modelId = id;
+        return this;
+    }
+    name(name) {
+        this.config.name = name;
+        return this;
+    }
+    singleEntry() {
+        this.isSingleEntry = true;
+        return this;
+    }
+    tags(tags) {
+        this.config.tags = tags;
+        return this;
+    }
+    fields(builder) {
+        this.registry.existingFields = this.fieldBuildersMap;
+        const fieldBuilders = builder(this.registry);
+        for (const [key, fieldBuilder] of Object.entries(fieldBuilders)){
+            fieldBuilder.fieldId(key);
+            const existingBuilder = this.fieldBuildersMap.get(key);
+            const isExtendMode = fieldBuilder._extendMode;
+            if (isExtendMode && existingBuilder) {
+                if (existingBuilder.type !== fieldBuilder.type) throw new Error(`Cannot extend field "${key}": type mismatch. Expected "${existingBuilder.type}", got "${fieldBuilder.type}".`);
+                this.mergeFieldOperations(key, existingBuilder, fieldBuilder);
+            } else if (existingBuilder && !isExtendMode) {
+                if (existingBuilder.type !== fieldBuilder.type) throw new Error(`Cannot redefine field "${key}": type mismatch. Expected "${existingBuilder.type}", got "${fieldBuilder.type}".`);
+                this.fieldBuildersMap.set(key, fieldBuilder);
+            } else if (existingBuilder || isExtendMode) throw new Error(`Cannot extend field "${key}": field does not exist. Use .extend() only for existing fields.`);
+            else this.fieldBuildersMap.set(key, fieldBuilder);
         }
-      }
-
-      // Merge layout operations
-      const existingLayoutBuilder = existing.layoutBuilder;
-      const extensionLayoutBuilder = extension.layoutBuilder;
-      if (extensionLayoutBuilder) {
-        const snapshot = extensionLayoutBuilder.getSnapshot();
-
-        // If extension called setLayout() with an array, apply it to existing
-        // We detect this by checking if there's a layout but no modifiers
-        if (snapshot.layout.length > 0 && snapshot.modifiers.length === 0) {
-          existingLayoutBuilder.setLayout(snapshot.layout);
+        return this;
+    }
+    mergeFieldOperations(fieldId, existing, extension) {
+        if ("object" === existing.type && "object" === extension.type) {
+            const existingFieldMap = existing.fieldBuildersMap;
+            const extensionFieldMap = extension.fieldBuildersMap;
+            if (extensionFieldMap) for (const [nestedKey, nestedBuilder] of extensionFieldMap.entries())existingFieldMap.set(nestedKey, nestedBuilder);
+            const existingLayoutBuilder = existing.layoutBuilder;
+            const extensionLayoutBuilder = extension.layoutBuilder;
+            if (extensionLayoutBuilder) {
+                const snapshot = extensionLayoutBuilder.getSnapshot();
+                if (snapshot.layout.length > 0 && 0 === snapshot.modifiers.length) existingLayoutBuilder.setLayout(snapshot.layout);
+                for (const modifier of snapshot.modifiers)existingLayoutBuilder.addModifier(modifier);
+            }
         }
-
-        // Apply all modifiers from extension to existing
-        for (const modifier of snapshot.modifiers) {
-          existingLayoutBuilder.addModifier(modifier);
+    }
+    buildFields() {
+        const fields = [];
+        const layoutReplacements = new Map();
+        for (const [fieldId, builder] of this.fieldBuildersMap){
+            const result = builder.build();
+            if ("layout" === result.type) {
+                layoutReplacements.set(fieldId, result.layoutCell);
+                if (result.fields) fields.push(...result.fields);
+            } else fields.push(result.field);
         }
-      }
+        return {
+            fields,
+            layoutReplacements
+        };
     }
-  }
-
-  /**
-   * Get tags with common defaults applied.
-   * Always includes "type:model" and optionally "singleEntry".
-   */
-  getTags() {
-    const tagsSet = new Set(this.config.tags || []);
-    tagsSet.add("type:model");
-    if (this.isSingleEntry) {
-      tagsSet.add("singleEntry");
+    getTags() {
+        const tagsSet = new Set(this.config.tags || []);
+        tagsSet.add("type:model");
+        if (this.isSingleEntry) tagsSet.add("singleEntry");
+        return Array.from(tagsSet);
     }
-    return Array.from(tagsSet);
-  }
-
-  /**
-   * Build the final model configuration.
-   * Must be implemented by concrete builders.
-   */
 }
+export { BaseModelBuilder };
 
 //# sourceMappingURL=BaseModelBuilder.js.map

package/features/modelBuilder/models/BaseModelBuilder.js.map

@@ -1 +1 @@
-{"version":3,"names":["BaseModelBuilder","config","isSingleEntry","fieldBuildersMap","Map","constructor","registry","modelId","id","name","singleEntry","tags","fields","builder","existingFields","fieldBuilders","key","fieldBuilder","Object","entries","fieldId","existingBuilder","get","isExtendMode","_extendMode","type","Error","mergeFieldOperations","set","existing","extension","existingFieldMap","extensionFieldMap","nestedKey","nestedBuilder","existingLayoutBuilder","layoutBuilder","extensionLayoutBuilder","snapshot","getSnapshot","layout","length","modifiers","setLayout","modifier","addModifier","getTags","tagsSet","Set","add","Array","from"],"sources":["BaseModelBuilder.ts"],"sourcesContent":["import { FieldBuilder, FieldBuilderRegistry } from \"~/features/modelBuilder/index.js\";\nimport { CmsModelPlugin } from \"~/plugins/index.js\";\n\n/**\n * Base class for all model builders, containing shared logic.\n * Concrete builders (PrivateModelBuilder, PublicModelBuilder) extend this.\n */\nexport abstract class BaseModelBuilder<TBuild = CmsModelPlugin> {\n    protected config: {\n        modelId?: string;\n        name?: string;\n        tags?: string[];\n    } = {};\n\n    protected isSingleEntry = false;\n    protected fieldBuildersMap = new Map<string, FieldBuilder<any>>();\n\n    public constructor(protected registry: FieldBuilderRegistry.Interface) {}\n\n    modelId(id: string): this {\n        this.config.modelId = id;\n        return this;\n    }\n\n    name(name: string): this {\n        this.config.name = name;\n        return this;\n    }\n\n    singleEntry(): this {\n        this.isSingleEntry = true;\n        return this;\n    }\n\n    tags(tags: string[]): this {\n        this.config.tags = tags;\n        return this;\n    }\n\n    fields(\n        builder: (registry: FieldBuilderRegistry.Interface) => Record<string, FieldBuilder<any>>\n    ): this {\n        // Pass existing fields to registry so it can return them when extending\n        (this.registry as any).existingFields = this.fieldBuildersMap;\n\n        const fieldBuilders = builder(this.registry);\n\n        for (const [key, fieldBuilder] of Object.entries(fieldBuilders)) {\n            // Set the fieldId from the object key\n            fieldBuilder.fieldId(key);\n\n            const existingBuilder = this.fieldBuildersMap.get(key);\n            const isExtendMode = (fieldBuilder as any)._extendMode;\n\n            if (isExtendMode && existingBuilder) {\n                // Extension mode - validate type and merge operations\n                if (existingBuilder.type !== fieldBuilder.type) {\n                    throw new Error(\n                        `Cannot extend field \"${key}\": type mismatch. Expected \"${existingBuilder.type}\", got \"${fieldBuilder.type}\".`\n                    );\n                }\n                // Merge operations from temporary new builder into existing builder\n                this.mergeFieldOperations(key, existingBuilder, fieldBuilder);\n            } else if (existingBuilder && !isExtendMode) {\n                // Replacement mode - validate type\n                if (existingBuilder.type !== fieldBuilder.type) {\n                    throw new Error(\n                        `Cannot redefine field \"${key}\": type mismatch. Expected \"${existingBuilder.type}\", got \"${fieldBuilder.type}\".`\n                    );\n                }\n                // Replace with new builder\n                this.fieldBuildersMap.set(key, fieldBuilder);\n            } else if (!existingBuilder && !isExtendMode) {\n                // New field - store builder\n                this.fieldBuildersMap.set(key, fieldBuilder);\n            } else {\n                // isExtendMode but no existingBuilder - this is an error\n                throw new Error(\n                    `Cannot extend field \"${key}\": field does not exist. Use .extend() only for existing fields.`\n                );\n            }\n        }\n\n        return this;\n    }\n\n    /**\n     * Merge field operations from extension builder into existing builder.\n     * This handles the case where multiple fields of the same type exist,\n     * and we need to transfer operations from the temporary new builder\n     * to the existing builder.\n     * @internal\n     */\n    private mergeFieldOperations(\n        fieldId: string,\n        existing: FieldBuilder<any>,\n        extension: FieldBuilder<any>\n    ): void {\n        // For object fields, merge nested fields and layout operations\n        if (existing.type === \"object\" && extension.type === \"object\") {\n            const existingFieldMap = (existing as any).fieldBuildersMap;\n            const extensionFieldMap = (extension as any).fieldBuildersMap;\n\n            // Merge nested field builders\n            if (extensionFieldMap) {\n                for (const [nestedKey, nestedBuilder] of extensionFieldMap.entries()) {\n                    existingFieldMap.set(nestedKey, nestedBuilder);\n                }\n            }\n\n            // Merge layout operations\n            const existingLayoutBuilder = (existing as any).layoutBuilder;\n            const extensionLayoutBuilder = (extension as any).layoutBuilder;\n\n            if (extensionLayoutBuilder) {\n                const snapshot = extensionLayoutBuilder.getSnapshot();\n\n                // If extension called setLayout() with an array, apply it to existing\n                // We detect this by checking if there's a layout but no modifiers\n                if (snapshot.layout.length > 0 && snapshot.modifiers.length === 0) {\n                    existingLayoutBuilder.setLayout(snapshot.layout);\n                }\n\n                // Apply all modifiers from extension to existing\n                for (const modifier of snapshot.modifiers) {\n                    existingLayoutBuilder.addModifier(modifier);\n                }\n            }\n        }\n    }\n\n    /**\n     * Get tags with common defaults applied.\n     * Always includes \"type:model\" and optionally \"singleEntry\".\n     */\n    protected getTags(): string[] {\n        const tagsSet = new Set(this.config.tags || []);\n        tagsSet.add(\"type:model\");\n        if (this.isSingleEntry) {\n            tagsSet.add(\"singleEntry\");\n        }\n        return Array.from(tagsSet);\n    }\n\n    /**\n     * Build the final model configuration.\n     * Must be implemented by concrete builders.\n     */\n    abstract build(): TBuild;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"features/modelBuilder/models/BaseModelBuilder.js","sources":["../../../../src/features/modelBuilder/models/BaseModelBuilder.ts"],"sourcesContent":["import { BaseFieldBuilder } from \"~/features/modelBuilder/index.js\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin.js\";\nimport { FieldBuilderRegistry } from \"../abstractions.js\";\nimport type { CmsModelField, CmsModelLayoutCell } from \"~/types/index.js\";\n\n/**\n * Base class for all model builders, containing shared logic.\n * Concrete builders (PrivateModelBuilder, PublicModelBuilder) extend this.\n */\nexport abstract class BaseModelBuilder<TBuild = CmsModelPlugin> {\n    protected config: {\n        modelId?: string;\n        name?: string;\n        tags?: string[];\n    } = {};\n\n    protected isSingleEntry = false;\n    protected fieldBuildersMap = new Map<string, BaseFieldBuilder<any>>();\n\n    public constructor(protected registry: FieldBuilderRegistry.Interface) {}\n\n    modelId(id: string): this {\n        this.config.modelId = id;\n        return this;\n    }\n\n    name(name: string): this {\n        this.config.name = name;\n        return this;\n    }\n\n    singleEntry(): this {\n        this.isSingleEntry = true;\n        return this;\n    }\n\n    tags(tags: string[]): this {\n        this.config.tags = tags;\n        return this;\n    }\n\n    fields(\n        builder: (registry: FieldBuilderRegistry.Interface) => Record<string, BaseFieldBuilder<any>>\n    ): this {\n        // Pass existing fields to registry so it can return them when extending\n        (this.registry as any).existingFields = this.fieldBuildersMap;\n\n        const fieldBuilders = builder(this.registry);\n\n        for (const [key, fieldBuilder] of Object.entries(fieldBuilders)) {\n            // Set the fieldId from the object key\n            fieldBuilder.fieldId(key);\n\n            const existingBuilder = this.fieldBuildersMap.get(key);\n            const isExtendMode = (fieldBuilder as any)._extendMode;\n\n            if (isExtendMode && existingBuilder) {\n                // Extension mode - validate type and merge operations\n                if (existingBuilder.type !== fieldBuilder.type) {\n                    throw new Error(\n                        `Cannot extend field \"${key}\": type mismatch. Expected \"${existingBuilder.type}\", got \"${fieldBuilder.type}\".`\n                    );\n                }\n                // Merge operations from temporary new builder into existing builder\n                this.mergeFieldOperations(key, existingBuilder, fieldBuilder);\n            } else if (existingBuilder && !isExtendMode) {\n                // Replacement mode - validate type\n                if (existingBuilder.type !== fieldBuilder.type) {\n                    throw new Error(\n                        `Cannot redefine field \"${key}\": type mismatch. Expected \"${existingBuilder.type}\", got \"${fieldBuilder.type}\".`\n                    );\n                }\n                // Replace with new builder\n                this.fieldBuildersMap.set(key, fieldBuilder);\n            } else if (!existingBuilder && !isExtendMode) {\n                // New field - store builder\n                this.fieldBuildersMap.set(key, fieldBuilder);\n            } else {\n                // isExtendMode but no existingBuilder - this is an error\n                throw new Error(\n                    `Cannot extend field \"${key}\": field does not exist. Use .extend() only for existing fields.`\n                );\n            }\n        }\n\n        return this;\n    }\n\n    /**\n     * Merge field operations from extension builder into existing builder.\n     * This handles the case where multiple fields of the same type exist,\n     * and we need to transfer operations from the temporary new builder\n     * to the existing builder.\n     * @internal\n     */\n    private mergeFieldOperations(\n        fieldId: string,\n        existing: BaseFieldBuilder<any>,\n        extension: BaseFieldBuilder<any>\n    ): void {\n        // For object fields, merge nested fields and layout operations\n        if (existing.type === \"object\" && extension.type === \"object\") {\n            const existingFieldMap = (existing as any).fieldBuildersMap;\n            const extensionFieldMap = (extension as any).fieldBuildersMap;\n\n            // Merge nested field builders\n            if (extensionFieldMap) {\n                for (const [nestedKey, nestedBuilder] of extensionFieldMap.entries()) {\n                    existingFieldMap.set(nestedKey, nestedBuilder);\n                }\n            }\n\n            // Merge layout operations\n            const existingLayoutBuilder = (existing as any).layoutBuilder;\n            const extensionLayoutBuilder = (extension as any).layoutBuilder;\n\n            if (extensionLayoutBuilder) {\n                const snapshot = extensionLayoutBuilder.getSnapshot();\n\n                // If extension called setLayout() with an array, apply it to existing\n                // We detect this by checking if there's a layout but no modifiers\n                if (snapshot.layout.length > 0 && snapshot.modifiers.length === 0) {\n                    existingLayoutBuilder.setLayout(snapshot.layout);\n                }\n\n                // Apply all modifiers from extension to existing\n                for (const modifier of snapshot.modifiers) {\n                    existingLayoutBuilder.addModifier(modifier);\n                }\n            }\n        }\n    }\n\n    protected buildFields(): {\n        fields: CmsModelField[];\n        layoutReplacements: Map<string, CmsModelLayoutCell>;\n    } {\n        const fields: CmsModelField[] = [];\n        const layoutReplacements = new Map<string, CmsModelLayoutCell>();\n\n        for (const [fieldId, builder] of this.fieldBuildersMap) {\n            const result = builder.build();\n            if (result.type === \"layout\") {\n                layoutReplacements.set(fieldId, result.layoutCell);\n                if (result.fields) {\n                    fields.push(...result.fields);\n                }\n            } else {\n                fields.push(result.field);\n            }\n        }\n\n        return { fields, layoutReplacements };\n    }\n\n    /**\n     * Get tags with common defaults applied.\n     * Always includes \"type:model\" and optionally \"singleEntry\".\n     */\n    protected getTags(): string[] {\n        const tagsSet = new Set(this.config.tags || []);\n        tagsSet.add(\"type:model\");\n        if (this.isSingleEntry) {\n            tagsSet.add(\"singleEntry\");\n        }\n        return Array.from(tagsSet);\n    }\n\n    /**\n     * Build the final model configuration.\n     * Must be implemented by concrete builders.\n     */\n    abstract build(): TBuild;\n}\n"],"names":["BaseModelBuilder","registry","Map","id","name","tags","builder","fieldBuilders","key","fieldBuilder","Object","existingBuilder","isExtendMode","Error","fieldId","existing","extension","existingFieldMap","extensionFieldMap","nestedKey","nestedBuilder","existingLayoutBuilder","extensionLayoutBuilder","snapshot","modifier","fields","layoutReplacements","result","tagsSet","Set","Array"],"mappings":"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"}

package/features/modelBuilder/models/ModelBuilder.d.ts

@@ -1,6 +1,17 @@
-import { FieldBuilderRegistry } from "../../../features/modelBuilder/index.js";
+import { FieldBuilderRegistry } from "../abstractions.js";
 import { PrivateModelBuilder } from "./PrivateModelBuilder.js";
 import { PublicModelBuilder } from "./PublicModelBuilder.js";
+export interface IModelBuilderPrivateInput {
+    modelId: string;
+    name: string;
+}
+export interface IModelBuilderPublicInput {
+    name: string;
+    modelId: string;
+    group: string;
+    singularApiName?: string;
+    pluralApiName?: string;
+}
 /**
  * Entry point builder that allows selecting model type.
  * Call .private() or .public() to get the appropriate typed builder.
@@ -11,9 +22,9 @@ export declare class ModelBuilder {
     /**
      * Create a private model (internal models, no GraphQL API).
      */
-    private(): PrivateModelBuilder;
+    private(input: IModelBuilderPrivateInput): PrivateModelBuilder;
     /**
      * Create a public model (with GraphQL API).
      */
-    public(): PublicModelBuilder;
+    public(input: IModelBuilderPublicInput): PublicModelBuilder;
 }

package/features/modelBuilder/models/ModelBuilder.js

@@ -1,28 +1,25 @@
 import { PrivateModelBuilder } from "./PrivateModelBuilder.js";
 import { PublicModelBuilder } from "./PublicModelBuilder.js";
-
-/**
- * Entry point builder that allows selecting model type.
- * Call .private() or .public() to get the appropriate typed builder.
- */
-export class ModelBuilder {
-  constructor(registry) {
-    this.registry = registry;
-  }
-
-  /**
-   * Create a private model (internal models, no GraphQL API).
-   */
-  private() {
-    return new PrivateModelBuilder(this.registry);
-  }
-
-  /**
-   * Create a public model (with GraphQL API).
-   */
-  public() {
-    return new PublicModelBuilder(this.registry);
-  }
+class ModelBuilder {
+    constructor(registry){
+        this.registry = registry;
+    }
+    private(input) {
+        const model = new PrivateModelBuilder(this.registry);
+        model.modelId(input.modelId);
+        model.name(input.name);
+        return model;
+    }
+    public(input) {
+        const model = new PublicModelBuilder(this.registry);
+        model.name(input.name);
+        model.modelId(input.modelId);
+        model.group(input.group);
+        if (input.singularApiName) model.singularApiName(input.singularApiName);
+        if (input.pluralApiName) model.pluralApiName(input.pluralApiName);
+        return model;
+    }
 }
+export { ModelBuilder };
 
 //# sourceMappingURL=ModelBuilder.js.map

package/features/modelBuilder/models/ModelBuilder.js.map

@@ -1 +1 @@
-{"version":3,"names":["PrivateModelBuilder","PublicModelBuilder","ModelBuilder","constructor","registry","private","public"],"sources":["ModelBuilder.ts"],"sourcesContent":["import { FieldBuilderRegistry } from \"~/features/modelBuilder/index.js\";\nimport { PrivateModelBuilder } from \"./PrivateModelBuilder.js\";\nimport { PublicModelBuilder } from \"./PublicModelBuilder.js\";\n\n/**\n * Entry point builder that allows selecting model type.\n * Call .private() or .public() to get the appropriate typed builder.\n */\nexport class ModelBuilder {\n    public constructor(private registry: FieldBuilderRegistry.Interface) {}\n\n    /**\n     * Create a private model (internal models, no GraphQL API).\n     */\n    private(): PrivateModelBuilder {\n        return new PrivateModelBuilder(this.registry);\n    }\n\n    /**\n     * Create a public model (with GraphQL API).\n     */\n    public(): PublicModelBuilder {\n        return new PublicModelBuilder(this.registry);\n    }\n}\n"],"mappings":"AACA,SAASA,mBAAmB;AAC5B,SAASC,kBAAkB;;AAE3B;AACA;AACA;AACA;AACA,OAAO,MAAMC,YAAY,CAAC;EACfC,WAAWA,CAASC,QAAwC,EAAE;IAAA,KAA1CA,QAAwC,GAAxCA,QAAwC;EAAG;;EAEtE;AACJ;AACA;EACIC,OAAOA,CAAA,EAAwB;IAC3B,OAAO,IAAIL,mBAAmB,CAAC,IAAI,CAACI,QAAQ,CAAC;EACjD;;EAEA;AACJ;AACA;EACIE,MAAMA,CAAA,EAAuB;IACzB,OAAO,IAAIL,kBAAkB,CAAC,IAAI,CAACG,QAAQ,CAAC;EAChD;AACJ","ignoreList":[]}
+{"version":3,"file":"features/modelBuilder/models/ModelBuilder.js","sources":["../../../../src/features/modelBuilder/models/ModelBuilder.ts"],"sourcesContent":["import { FieldBuilderRegistry } from \"../abstractions.js\";\nimport { PrivateModelBuilder } from \"./PrivateModelBuilder.js\";\nimport { PublicModelBuilder } from \"./PublicModelBuilder.js\";\n\nexport interface IModelBuilderPrivateInput {\n    modelId: string;\n    name: string;\n}\n\nexport interface IModelBuilderPublicInput {\n    name: string;\n    modelId: string;\n    group: string;\n    singularApiName?: string;\n    pluralApiName?: string;\n}\n\n/**\n * Entry point builder that allows selecting model type.\n * Call .private() or .public() to get the appropriate typed builder.\n */\nexport class ModelBuilder {\n    public constructor(private registry: FieldBuilderRegistry.Interface) {}\n\n    /**\n     * Create a private model (internal models, no GraphQL API).\n     */\n    public private(input: IModelBuilderPrivateInput): PrivateModelBuilder {\n        const model = new PrivateModelBuilder(this.registry);\n        model.modelId(input.modelId);\n        model.name(input.name);\n        return model;\n    }\n\n    /**\n     * Create a public model (with GraphQL API).\n     */\n    public public(input: IModelBuilderPublicInput): PublicModelBuilder {\n        const model = new PublicModelBuilder(this.registry);\n        model.name(input.name);\n        model.modelId(input.modelId);\n        model.group(input.group);\n        if (input.singularApiName) {\n            model.singularApiName(input.singularApiName);\n        }\n        if (input.pluralApiName) {\n            model.pluralApiName(input.pluralApiName);\n        }\n        return model;\n    }\n}\n"],"names":["ModelBuilder","registry","input","model","PrivateModelBuilder","PublicModelBuilder"],"mappings":";;AAqBO,MAAMA;IACT,YAA2BC,QAAwC,CAAE;aAA1CA,QAAQ,GAARA;IAA2C;IAK/D,QAAQC,KAAgC,EAAuB;QAClE,MAAMC,QAAQ,IAAIC,oBAAoB,IAAI,CAAC,QAAQ;QACnDD,MAAM,OAAO,CAACD,MAAM,OAAO;QAC3BC,MAAM,IAAI,CAACD,MAAM,IAAI;QACrB,OAAOC;IACX;IAKO,OAAOD,KAA+B,EAAsB;QAC/D,MAAMC,QAAQ,IAAIE,mBAAmB,IAAI,CAAC,QAAQ;QAClDF,MAAM,IAAI,CAACD,MAAM,IAAI;QACrBC,MAAM,OAAO,CAACD,MAAM,OAAO;QAC3BC,MAAM,KAAK,CAACD,MAAM,KAAK;QACvB,IAAIA,MAAM,eAAe,EACrBC,MAAM,eAAe,CAACD,MAAM,eAAe;QAE/C,IAAIA,MAAM,aAAa,EACnBC,MAAM,aAAa,CAACD,MAAM,aAAa;QAE3C,OAAOC;IACX;AACJ"}

package/features/modelBuilder/models/ModelsProvider.d.ts

@@ -1,6 +1,7 @@
 import { ModelsProvider as ProviderAbstraction } from "./abstractions.js";
 import { AccessControl } from "../../../features/shared/abstractions.js";
-import { ModelFactory, FieldBuilderRegistry } from "../../../features/modelBuilder/index.js";
+import { ModelFactory } from "../abstractions.js";
+import { FieldBuilderRegistry } from "../abstractions.js";
 import type { CmsModel } from "../../../types/index.js";
 export declare class ModelsProvider implements ProviderAbstraction.Interface {
     private getModels;

package/features/modelBuilder/models/ModelsProvider.js

@@ -1,40 +1,31 @@
 import { filterAsync } from "../../../utils/filterAsync.js";
 import { ModelBuilder } from "./ModelBuilder.js";
-export class ModelsProvider {
-  constructor(getModels, fieldsRegistry, accessControl) {
-    this.getModels = getModels;
-    this.fieldsRegistry = fieldsRegistry;
-    this.accessControl = accessControl;
-  }
-  async list(tenant) {
-    const modelImpls = this.getModels();
-    const allModels = [];
-    for (const modelImpl of modelImpls) {
-      // Entry builder that determines model type
-      const entryBuilder = new ModelBuilder(this.fieldsRegistry);
-
-      // Get typed builders (array of private or public builders)
-      const typedBuilders = await modelImpl.execute(entryBuilder);
-
-      // Process each builder in the array
-      for (const typedBuilder of typedBuilders) {
-        const modelPlugin = typedBuilder.build();
-        allModels.push({
-          ...modelPlugin.contentModel,
-          tenant
-        });
-      }
+class ModelsProvider {
+    constructor(getModels, fieldsRegistry, accessControl){
+        this.getModels = getModels;
+        this.fieldsRegistry = fieldsRegistry;
+        this.accessControl = accessControl;
     }
-    if (!this.accessControl) {
-      return allModels;
+    async list(tenant) {
+        const modelImpls = this.getModels();
+        const allModels = [];
+        for (const modelImpl of modelImpls){
+            const entryBuilder = new ModelBuilder(this.fieldsRegistry);
+            const typedBuilders = await modelImpl.execute(entryBuilder);
+            for (const typedBuilder of typedBuilders){
+                const modelPlugin = typedBuilder.build();
+                allModels.push({
+                    ...modelPlugin.contentModel,
+                    tenant
+                });
+            }
+        }
+        if (!this.accessControl) return allModels;
+        return filterAsync(allModels, (model)=>this.accessControl.canAccessModel({
+                model
+            }));
     }
-    // Apply access control filtering
-    return filterAsync(allModels, model => {
-      return this.accessControl.canAccessModel({
-        model
-      });
-    });
-  }
 }
+export { ModelsProvider };
 
 //# sourceMappingURL=ModelsProvider.js.map

package/features/modelBuilder/models/ModelsProvider.js.map

@@ -1 +1 @@
-{"version":3,"names":["filterAsync","ModelBuilder","ModelsProvider","constructor","getModels","fieldsRegistry","accessControl","list","tenant","modelImpls","allModels","modelImpl","entryBuilder","typedBuilders","execute","typedBuilder","modelPlugin","build","push","contentModel","model","canAccessModel"],"sources":["ModelsProvider.ts"],"sourcesContent":["import { ModelsProvider as ProviderAbstraction } from \"./abstractions.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { ModelFactory, FieldBuilderRegistry } from \"~/features/modelBuilder/index.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport { filterAsync } from \"~/utils/filterAsync.js\";\nimport { ModelBuilder } from \"./ModelBuilder.js\";\n\nexport class ModelsProvider implements ProviderAbstraction.Interface {\n    public constructor(\n        private getModels: () => ModelFactory.Interface[],\n        private fieldsRegistry: FieldBuilderRegistry.Interface,\n        private accessControl: AccessControl.Interface | undefined\n    ) {}\n\n    async list(tenant: string): Promise<CmsModel[]> {\n        const modelImpls = this.getModels();\n        const allModels: CmsModel[] = [];\n\n        for (const modelImpl of modelImpls) {\n            // Entry builder that determines model type\n            const entryBuilder = new ModelBuilder(this.fieldsRegistry);\n\n            // Get typed builders (array of private or public builders)\n            const typedBuilders = await modelImpl.execute(entryBuilder);\n\n            // Process each builder in the array\n            for (const typedBuilder of typedBuilders) {\n                const modelPlugin = typedBuilder.build();\n\n                allModels.push({\n                    ...modelPlugin.contentModel,\n                    tenant\n                });\n            }\n        }\n\n        if (!this.accessControl) {\n            return allModels;\n        }\n        // Apply access control filtering\n        return filterAsync(allModels, model => {\n            return this.accessControl!.canAccessModel({ model });\n        });\n    }\n}\n"],"mappings":"AAIA,SAASA,WAAW;AACpB,SAASC,YAAY;AAErB,OAAO,MAAMC,cAAc,CAA0C;EAC1DC,WAAWA,CACNC,SAAyC,EACzCC,cAA8C,EAC9CC,aAAkD,EAC5D;IAAA,KAHUF,SAAyC,GAAzCA,SAAyC;IAAA,KACzCC,cAA8C,GAA9CA,cAA8C;IAAA,KAC9CC,aAAkD,GAAlDA,aAAkD;EAC3D;EAEH,MAAMC,IAAIA,CAACC,MAAc,EAAuB;IAC5C,MAAMC,UAAU,GAAG,IAAI,CAACL,SAAS,CAAC,CAAC;IACnC,MAAMM,SAAqB,GAAG,EAAE;IAEhC,KAAK,MAAMC,SAAS,IAAIF,UAAU,EAAE;MAChC;MACA,MAAMG,YAAY,GAAG,IAAIX,YAAY,CAAC,IAAI,CAACI,cAAc,CAAC;;MAE1D;MACA,MAAMQ,aAAa,GAAG,MAAMF,SAAS,CAACG,OAAO,CAACF,YAAY,CAAC;;MAE3D;MACA,KAAK,MAAMG,YAAY,IAAIF,aAAa,EAAE;QACtC,MAAMG,WAAW,GAAGD,YAAY,CAACE,KAAK,CAAC,CAAC;QAExCP,SAAS,CAACQ,IAAI,CAAC;UACX,GAAGF,WAAW,CAACG,YAAY;UAC3BX;QACJ,CAAC,CAAC;MACN;IACJ;IAEA,IAAI,CAAC,IAAI,CAACF,aAAa,EAAE;MACrB,OAAOI,SAAS;IACpB;IACA;IACA,OAAOV,WAAW,CAACU,SAAS,EAAEU,KAAK,IAAI;MACnC,OAAO,IAAI,CAACd,aAAa,CAAEe,cAAc,CAAC;QAAED;MAAM,CAAC,CAAC;IACxD,CAAC,CAAC;EACN;AACJ","ignoreList":[]}
+{"version":3,"file":"features/modelBuilder/models/ModelsProvider.js","sources":["../../../../src/features/modelBuilder/models/ModelsProvider.ts"],"sourcesContent":["import { ModelsProvider as ProviderAbstraction } from \"./abstractions.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { ModelFactory } from \"../abstractions.js\";\nimport { FieldBuilderRegistry } from \"../abstractions.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport { filterAsync } from \"~/utils/filterAsync.js\";\nimport { ModelBuilder } from \"./ModelBuilder.js\";\n\nexport class ModelsProvider implements ProviderAbstraction.Interface {\n    public constructor(\n        private getModels: () => ModelFactory.Interface[],\n        private fieldsRegistry: FieldBuilderRegistry.Interface,\n        private accessControl: AccessControl.Interface | undefined\n    ) {}\n\n    async list(tenant: string): Promise<CmsModel[]> {\n        const modelImpls = this.getModels();\n        const allModels: CmsModel[] = [];\n\n        for (const modelImpl of modelImpls) {\n            // Entry builder that determines model type\n            const entryBuilder = new ModelBuilder(this.fieldsRegistry);\n\n            // Get typed builders (array of private or public builders)\n            const typedBuilders = await modelImpl.execute(entryBuilder);\n\n            // Process each builder in the array\n            for (const typedBuilder of typedBuilders) {\n                const modelPlugin = typedBuilder.build();\n\n                allModels.push({\n                    ...modelPlugin.contentModel,\n                    tenant\n                });\n            }\n        }\n\n        if (!this.accessControl) {\n            return allModels;\n        }\n        // Apply access control filtering\n        return filterAsync(allModels, model => {\n            return this.accessControl!.canAccessModel({ model });\n        });\n    }\n}\n"],"names":["ModelsProvider","getModels","fieldsRegistry","accessControl","tenant","modelImpls","allModels","modelImpl","entryBuilder","ModelBuilder","typedBuilders","typedBuilder","modelPlugin","filterAsync","model"],"mappings":";;AAQO,MAAMA;IACT,YACYC,SAAyC,EACzCC,cAA8C,EAC9CC,aAAkD,CAC5D;aAHUF,SAAS,GAATA;aACAC,cAAc,GAAdA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,KAAKC,MAAc,EAAuB;QAC5C,MAAMC,aAAa,IAAI,CAAC,SAAS;QACjC,MAAMC,YAAwB,EAAE;QAEhC,KAAK,MAAMC,aAAaF,WAAY;YAEhC,MAAMG,eAAe,IAAIC,aAAa,IAAI,CAAC,cAAc;YAGzD,MAAMC,gBAAgB,MAAMH,UAAU,OAAO,CAACC;YAG9C,KAAK,MAAMG,gBAAgBD,cAAe;gBACtC,MAAME,cAAcD,aAAa,KAAK;gBAEtCL,UAAU,IAAI,CAAC;oBACX,GAAGM,YAAY,YAAY;oBAC3BR;gBACJ;YACJ;QACJ;QAEA,IAAI,CAAC,IAAI,CAAC,aAAa,EACnB,OAAOE;QAGX,OAAOO,YAAYP,WAAWQ,CAAAA,QACnB,IAAI,CAAC,aAAa,CAAE,cAAc,CAAC;gBAAEA;YAAM;IAE1D;AACJ"}

package/features/modelBuilder/models/PrivateModelBuilder.js

@@ -1,28 +1,21 @@
 import { createPrivateModelPlugin } from "../../../plugins/CmsModelPlugin.js";
 import { BaseModelBuilder } from "./BaseModelBuilder.js";
-export class PrivateModelBuilder extends BaseModelBuilder {
-  build() {
-    if (!this.config.modelId) {
-      throw new Error("modelId is required");
+class PrivateModelBuilder extends BaseModelBuilder {
+    build() {
+        if (!this.config.modelId) throw new Error("modelId is required");
+        if (!this.config.name) throw new Error("name is required");
+        if (0 === this.fieldBuildersMap.size) throw new Error("fields are required");
+        const { fields } = this.buildFields();
+        return createPrivateModelPlugin({
+            modelId: this.config.modelId,
+            name: this.config.name,
+            fields,
+            authorization: false,
+            noValidate: true,
+            tags: this.getTags()
+        });
     }
-    if (!this.config.name) {
-      throw new Error("name is required");
-    }
-    if (this.fieldBuildersMap.size === 0) {
-      throw new Error("fields are required");
-    }
-
-    // Build all fields from field builders
-    const fields = Array.from(this.fieldBuildersMap.values()).map(builder => builder.build());
-    return createPrivateModelPlugin({
-      modelId: this.config.modelId,
-      name: this.config.name,
-      fields,
-      authorization: false,
-      noValidate: true,
-      tags: this.getTags()
-    });
-  }
 }
+export { PrivateModelBuilder };
 
 //# sourceMappingURL=PrivateModelBuilder.js.map