@webiny/api-core 6.0.0 → 6.1.0-beta.1

package/legacy/security/createSecurityContext.js

@@ -1,19 +1,8 @@
 import { ContextPlugin } from "@webiny/api";
-import { RolesProvider, TeamsProvider } from "../../features/security/shared/abstractions.js";
-import { SecurityRolePlugin } from "./plugins/SecurityRolePlugin.js";
-import { SecurityTeamPlugin } from "./plugins/SecurityTeamPlugin.js";
 import { LegacyContext } from "./LegacyContext.js";
 import { createSecurityGraphQL } from "../../graphql/security/index.js";
 export const createSecurityContext = () => {
   return new ContextPlugin(async context => {
-    // Register roles and teams providers for plugin-defined roles/teams
-    context.container.registerFactory(RolesProvider, () => {
-      return async () => context.plugins.byType(SecurityRolePlugin.type).map(plugin => plugin.securityRole);
-    });
-    context.container.registerFactory(TeamsProvider, () => {
-      return async () => context.plugins.byType(SecurityTeamPlugin.type).map(plugin => plugin.securityTeam);
-    });
-
     // Create a legacy context that delegates to new features
     context.security = new LegacyContext(context.container);
 

package/legacy/security/createSecurityContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["ContextPlugin","RolesProvider","TeamsProvider","SecurityRolePlugin","SecurityTeamPlugin","LegacyContext","createSecurityGraphQL","createSecurityContext","context","container","registerFactory","plugins","byType","type","map","plugin","securityRole","securityTeam","security","register"],"sources":["createSecurityContext.ts"],"sourcesContent":["import { ContextPlugin } from \"@webiny/api\";\nimport type { ApiCoreContext } from \"~/types/core.js\";\nimport { RolesProvider, TeamsProvider } from \"~/features/security/shared/abstractions.js\";\nimport { SecurityRolePlugin } from \"~/legacy/security/plugins/SecurityRolePlugin.js\";\nimport { SecurityTeamPlugin } from \"~/legacy/security/plugins/SecurityTeamPlugin.js\";\nimport { LegacyContext } from \"~/legacy/security/LegacyContext.js\";\nimport { createSecurityGraphQL } from \"~/graphql/security/index.js\";\n\nexport const createSecurityContext = () => {\n    return new ContextPlugin<ApiCoreContext>(async context => {\n        // Register roles and teams providers for plugin-defined roles/teams\n        context.container.registerFactory(RolesProvider, () => {\n            return async () =>\n                context.plugins\n                    .byType<SecurityRolePlugin>(SecurityRolePlugin.type)\n                    .map(plugin => plugin.securityRole);\n        });\n\n        context.container.registerFactory(TeamsProvider, () => {\n            return async () =>\n                context.plugins\n                    .byType<SecurityTeamPlugin>(SecurityTeamPlugin.type)\n                    .map(plugin => plugin.securityTeam);\n        });\n\n        // Create a legacy context that delegates to new features\n        context.security = new LegacyContext(context.container);\n\n        // Register GraphQL plugins\n        context.plugins.register(createSecurityGraphQL());\n    });\n};\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,aAAa;AAE3C,SAASC,aAAa,EAAEC,aAAa;AACrC,SAASC,kBAAkB;AAC3B,SAASC,kBAAkB;AAC3B,SAASC,aAAa;AACtB,SAASC,qBAAqB;AAE9B,OAAO,MAAMC,qBAAqB,GAAGA,CAAA,KAAM;EACvC,OAAO,IAAIP,aAAa,CAAiB,MAAMQ,OAAO,IAAI;IACtD;IACAA,OAAO,CAACC,SAAS,CAACC,eAAe,CAACT,aAAa,EAAE,MAAM;MACnD,OAAO,YACHO,OAAO,CAACG,OAAO,CACVC,MAAM,CAAqBT,kBAAkB,CAACU,IAAI,CAAC,CACnDC,GAAG,CAACC,MAAM,IAAIA,MAAM,CAACC,YAAY,CAAC;IAC/C,CAAC,CAAC;IAEFR,OAAO,CAACC,SAAS,CAACC,eAAe,CAACR,aAAa,EAAE,MAAM;MACnD,OAAO,YACHM,OAAO,CAACG,OAAO,CACVC,MAAM,CAAqBR,kBAAkB,CAACS,IAAI,CAAC,CACnDC,GAAG,CAACC,MAAM,IAAIA,MAAM,CAACE,YAAY,CAAC;IAC/C,CAAC,CAAC;;IAEF;IACAT,OAAO,CAACU,QAAQ,GAAG,IAAIb,aAAa,CAACG,OAAO,CAACC,SAAS,CAAC;;IAEvD;IACAD,OAAO,CAACG,OAAO,CAACQ,QAAQ,CAACb,qBAAqB,CAAC,CAAC,CAAC;EACrD,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
+{"version":3,"names":["ContextPlugin","LegacyContext","createSecurityGraphQL","createSecurityContext","context","security","container","plugins","register"],"sources":["createSecurityContext.ts"],"sourcesContent":["import { ContextPlugin } from \"@webiny/api\";\nimport type { ApiCoreContext } from \"~/types/core.js\";\nimport { LegacyContext } from \"~/legacy/security/LegacyContext.js\";\nimport { createSecurityGraphQL } from \"~/graphql/security/index.js\";\n\nexport const createSecurityContext = () => {\n    return new ContextPlugin<ApiCoreContext>(async context => {\n        // Create a legacy context that delegates to new features\n        context.security = new LegacyContext(context.container);\n\n        // Register GraphQL plugins\n        context.plugins.register(createSecurityGraphQL());\n    });\n};\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,aAAa;AAE3C,SAASC,aAAa;AACtB,SAASC,qBAAqB;AAE9B,OAAO,MAAMC,qBAAqB,GAAGA,CAAA,KAAM;EACvC,OAAO,IAAIH,aAAa,CAAiB,MAAMI,OAAO,IAAI;IACtD;IACAA,OAAO,CAACC,QAAQ,GAAG,IAAIJ,aAAa,CAACG,OAAO,CAACE,SAAS,CAAC;;IAEvD;IACAF,OAAO,CAACG,OAAO,CAACC,QAAQ,CAACN,qBAAqB,CAAC,CAAC,CAAC;EACrD,CAAC,CAAC;AACN,CAAC","ignoreList":[]}

package/models/base/BaseModel.js

@@ -27,7 +27,7 @@ export class BaseModel {
     return new Constructor(this.toData());
   }
   toData() {
-    if (this.__schema && this.__schema._def?.typeName === "ZodObject") {
+    if (this.__schema && this.__schema.def?.type === "object") {
       const result = {};
       const shape = this.__schema.shape;
       for (const key in shape) {
@@ -55,7 +55,7 @@ export class BaseModel {
       throw new WebinyError({
         message: "Validation error",
         code: "DOMAIN_MODEL_VALIDATION_ERROR",
-        data: result.error.errors
+        data: result.error.issues
       });
     }
   }

package/models/base/BaseModel.js.map

@@ -1 +1 @@
-{"version":3,"names":["Result","WebinyError","BaseModel","__schema","Error","constructor","data","validateData","populate","Object","assign","validate","toData","ok","error","fail","validateOrThrow","clone","Constructor","_def","typeName","result","shape","key","structuredClone","updateWith","partial","updated","safeParse","success","message","code","errors"],"sources":["BaseModel.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { WebinyError } from \"@webiny/error\";\nimport z from \"zod\";\n\ntype DataProperties<T> = Omit<T, \"__schema\">;\n\nexport type IModelData<T> = {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type\n    [K in keyof DataProperties<T> as T[K] extends Function ? never : K]: T[K];\n};\n\nexport type IModelInput<T> = IModelData<T>;\n\nexport abstract class BaseModel<TModel extends z.ZodObject<any> = any> {\n    get __schema(): TModel {\n        throw new Error(\"Schema getter is not implemented!\");\n    }\n\n    constructor(data: IModelData<TModel>) {\n        this.validateData(data);\n        this.populate(data);\n    }\n\n    populate(data: IModelData<TModel>): void {\n        Object.assign(this, data);\n    }\n\n    validate(): Result<true, WebinyError> {\n        try {\n            this.validateData(this.toData());\n            return Result.ok(true);\n        } catch (error) {\n            return Result.fail(error);\n        }\n    }\n\n    validateOrThrow(): void {\n        this.validateData(this.toData());\n    }\n\n    clone(): this {\n        const Constructor = this.constructor as new (data: IModelData<TModel>) => this;\n        return new Constructor(this.toData());\n    }\n\n    toData(): IModelData<TModel> {\n        if (this.__schema && this.__schema._def?.typeName === \"ZodObject\") {\n            const result = {} as IModelData<TModel>;\n            const shape = this.__schema.shape;\n            for (const key in shape) {\n                // always use structuredClone for safety.\n                // @ts-expect-error allow index.\n                result[key] = structuredClone(this[key]);\n            }\n            return result;\n        }\n\n        return { ...(this as any) } as IModelData<TModel>;\n    }\n\n    updateWith(partial: Partial<IModelData<this>>): void {\n        const updated = { ...this.toData(), ...partial };\n        this.validateData(updated);\n        this.populate(updated);\n    }\n\n    protected validateData(data: IModelData<TModel>): void {\n        const result = this.__schema.safeParse(data);\n        if (!result.success) {\n            throw new WebinyError({\n                message: \"Validation error\",\n                code: \"DOMAIN_MODEL_VALIDATION_ERROR\",\n                data: result.error.errors\n            });\n        }\n    }\n}\n"],"mappings":"AAAA,SAASA,MAAM,QAAQ,qBAAqB;AAC5C,SAASC,WAAW,QAAQ,eAAe;AAY3C,OAAO,MAAeC,SAAS,CAAwC;EACnE,IAAIC,QAAQA,CAAA,EAAW;IACnB,MAAM,IAAIC,KAAK,CAAC,mCAAmC,CAAC;EACxD;EAEAC,WAAWA,CAACC,IAAwB,EAAE;IAClC,IAAI,CAACC,YAAY,CAACD,IAAI,CAAC;IACvB,IAAI,CAACE,QAAQ,CAACF,IAAI,CAAC;EACvB;EAEAE,QAAQA,CAACF,IAAwB,EAAQ;IACrCG,MAAM,CAACC,MAAM,CAAC,IAAI,EAAEJ,IAAI,CAAC;EAC7B;EAEAK,QAAQA,CAAA,EAA8B;IAClC,IAAI;MACA,IAAI,CAACJ,YAAY,CAAC,IAAI,CAACK,MAAM,CAAC,CAAC,CAAC;MAChC,OAAOZ,MAAM,CAACa,EAAE,CAAC,IAAI,CAAC;IAC1B,CAAC,CAAC,OAAOC,KAAK,EAAE;MACZ,OAAOd,MAAM,CAACe,IAAI,CAACD,KAAK,CAAC;IAC7B;EACJ;EAEAE,eAAeA,CAAA,EAAS;IACpB,IAAI,CAACT,YAAY,CAAC,IAAI,CAACK,MAAM,CAAC,CAAC,CAAC;EACpC;EAEAK,KAAKA,CAAA,EAAS;IACV,MAAMC,WAAW,GAAG,IAAI,CAACb,WAAqD;IAC9E,OAAO,IAAIa,WAAW,CAAC,IAAI,CAACN,MAAM,CAAC,CAAC,CAAC;EACzC;EAEAA,MAAMA,CAAA,EAAuB;IACzB,IAAI,IAAI,CAACT,QAAQ,IAAI,IAAI,CAACA,QAAQ,CAACgB,IAAI,EAAEC,QAAQ,KAAK,WAAW,EAAE;MAC/D,MAAMC,MAAM,GAAG,CAAC,CAAuB;MACvC,MAAMC,KAAK,GAAG,IAAI,CAACnB,QAAQ,CAACmB,KAAK;MACjC,KAAK,MAAMC,GAAG,IAAID,KAAK,EAAE;QACrB;QACA;QACAD,MAAM,CAACE,GAAG,CAAC,GAAGC,eAAe,CAAC,IAAI,CAACD,GAAG,CAAC,CAAC;MAC5C;MACA,OAAOF,MAAM;IACjB;IAEA,OAAO;MAAE,GAAI;IAAa,CAAC;EAC/B;EAEAI,UAAUA,CAACC,OAAkC,EAAQ;IACjD,MAAMC,OAAO,GAAG;MAAE,GAAG,IAAI,CAACf,MAAM,CAAC,CAAC;MAAE,GAAGc;IAAQ,CAAC;IAChD,IAAI,CAACnB,YAAY,CAACoB,OAAO,CAAC;IAC1B,IAAI,CAACnB,QAAQ,CAACmB,OAAO,CAAC;EAC1B;EAEUpB,YAAYA,CAACD,IAAwB,EAAQ;IACnD,MAAMe,MAAM,GAAG,IAAI,CAAClB,QAAQ,CAACyB,SAAS,CAACtB,IAAI,CAAC;IAC5C,IAAI,CAACe,MAAM,CAACQ,OAAO,EAAE;MACjB,MAAM,IAAI5B,WAAW,CAAC;QAClB6B,OAAO,EAAE,kBAAkB;QAC3BC,IAAI,EAAE,+BAA+B;QACrCzB,IAAI,EAAEe,MAAM,CAACP,KAAK,CAACkB;MACvB,CAAC,CAAC;IACN;EACJ;AACJ","ignoreList":[]}
+{"version":3,"names":["Result","WebinyError","BaseModel","__schema","Error","constructor","data","validateData","populate","Object","assign","validate","toData","ok","error","fail","validateOrThrow","clone","Constructor","def","type","result","shape","key","structuredClone","updateWith","partial","updated","safeParse","success","message","code","issues"],"sources":["BaseModel.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { WebinyError } from \"@webiny/error\";\nimport z from \"zod\";\n\ntype DataProperties<T> = Omit<T, \"__schema\">;\n\nexport type IModelData<T> = {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type\n    [K in keyof DataProperties<T> as T[K] extends Function ? never : K]: T[K];\n};\n\nexport type IModelInput<T> = IModelData<T>;\n\nexport abstract class BaseModel<TModel extends z.ZodObject<any> = any> {\n    get __schema(): TModel {\n        throw new Error(\"Schema getter is not implemented!\");\n    }\n\n    constructor(data: IModelData<TModel>) {\n        this.validateData(data);\n        this.populate(data);\n    }\n\n    populate(data: IModelData<TModel>): void {\n        Object.assign(this, data);\n    }\n\n    validate(): Result<true, WebinyError> {\n        try {\n            this.validateData(this.toData());\n            return Result.ok(true);\n        } catch (error) {\n            return Result.fail(error);\n        }\n    }\n\n    validateOrThrow(): void {\n        this.validateData(this.toData());\n    }\n\n    clone(): this {\n        const Constructor = this.constructor as new (data: IModelData<TModel>) => this;\n        return new Constructor(this.toData());\n    }\n\n    toData(): IModelData<TModel> {\n        if (this.__schema && this.__schema.def?.type === \"object\") {\n            const result = {} as IModelData<TModel>;\n            const shape = this.__schema.shape;\n            for (const key in shape) {\n                // always use structuredClone for safety.\n                // @ts-expect-error allow index.\n                result[key] = structuredClone(this[key]);\n            }\n            return result;\n        }\n\n        return { ...(this as any) } as IModelData<TModel>;\n    }\n\n    updateWith(partial: Partial<IModelData<this>>): void {\n        const updated = { ...this.toData(), ...partial };\n        this.validateData(updated);\n        this.populate(updated);\n    }\n\n    protected validateData(data: IModelData<TModel>): void {\n        const result = this.__schema.safeParse(data);\n        if (!result.success) {\n            throw new WebinyError({\n                message: \"Validation error\",\n                code: \"DOMAIN_MODEL_VALIDATION_ERROR\",\n                data: result.error.issues\n            });\n        }\n    }\n}\n"],"mappings":"AAAA,SAASA,MAAM,QAAQ,qBAAqB;AAC5C,SAASC,WAAW,QAAQ,eAAe;AAY3C,OAAO,MAAeC,SAAS,CAAwC;EACnE,IAAIC,QAAQA,CAAA,EAAW;IACnB,MAAM,IAAIC,KAAK,CAAC,mCAAmC,CAAC;EACxD;EAEAC,WAAWA,CAACC,IAAwB,EAAE;IAClC,IAAI,CAACC,YAAY,CAACD,IAAI,CAAC;IACvB,IAAI,CAACE,QAAQ,CAACF,IAAI,CAAC;EACvB;EAEAE,QAAQA,CAACF,IAAwB,EAAQ;IACrCG,MAAM,CAACC,MAAM,CAAC,IAAI,EAAEJ,IAAI,CAAC;EAC7B;EAEAK,QAAQA,CAAA,EAA8B;IAClC,IAAI;MACA,IAAI,CAACJ,YAAY,CAAC,IAAI,CAACK,MAAM,CAAC,CAAC,CAAC;MAChC,OAAOZ,MAAM,CAACa,EAAE,CAAC,IAAI,CAAC;IAC1B,CAAC,CAAC,OAAOC,KAAK,EAAE;MACZ,OAAOd,MAAM,CAACe,IAAI,CAACD,KAAK,CAAC;IAC7B;EACJ;EAEAE,eAAeA,CAAA,EAAS;IACpB,IAAI,CAACT,YAAY,CAAC,IAAI,CAACK,MAAM,CAAC,CAAC,CAAC;EACpC;EAEAK,KAAKA,CAAA,EAAS;IACV,MAAMC,WAAW,GAAG,IAAI,CAACb,WAAqD;IAC9E,OAAO,IAAIa,WAAW,CAAC,IAAI,CAACN,MAAM,CAAC,CAAC,CAAC;EACzC;EAEAA,MAAMA,CAAA,EAAuB;IACzB,IAAI,IAAI,CAACT,QAAQ,IAAI,IAAI,CAACA,QAAQ,CAACgB,GAAG,EAAEC,IAAI,KAAK,QAAQ,EAAE;MACvD,MAAMC,MAAM,GAAG,CAAC,CAAuB;MACvC,MAAMC,KAAK,GAAG,IAAI,CAACnB,QAAQ,CAACmB,KAAK;MACjC,KAAK,MAAMC,GAAG,IAAID,KAAK,EAAE;QACrB;QACA;QACAD,MAAM,CAACE,GAAG,CAAC,GAAGC,eAAe,CAAC,IAAI,CAACD,GAAG,CAAC,CAAC;MAC5C;MACA,OAAOF,MAAM;IACjB;IAEA,OAAO;MAAE,GAAI;IAAa,CAAC;EAC/B;EAEAI,UAAUA,CAACC,OAAkC,EAAQ;IACjD,MAAMC,OAAO,GAAG;MAAE,GAAG,IAAI,CAACf,MAAM,CAAC,CAAC;MAAE,GAAGc;IAAQ,CAAC;IAChD,IAAI,CAACnB,YAAY,CAACoB,OAAO,CAAC;IAC1B,IAAI,CAACnB,QAAQ,CAACmB,OAAO,CAAC;EAC1B;EAEUpB,YAAYA,CAACD,IAAwB,EAAQ;IACnD,MAAMe,MAAM,GAAG,IAAI,CAAClB,QAAQ,CAACyB,SAAS,CAACtB,IAAI,CAAC;IAC5C,IAAI,CAACe,MAAM,CAACQ,OAAO,EAAE;MACjB,MAAM,IAAI5B,WAAW,CAAC;QAClB6B,OAAO,EAAE,kBAAkB;QAC3BC,IAAI,EAAE,+BAA+B;QACrCzB,IAAI,EAAEe,MAAM,CAACP,KAAK,CAACkB;MACvB,CAAC,CAAC;IACN;EACJ;AACJ","ignoreList":[]}

package/models/base/ModelBuilder.d.ts

@@ -5,11 +5,11 @@ export type ModelClass<TModel extends BaseModel<any>> = {
     new (data: ExtractModelData<TModel>): TModel;
     create(data: ExtractModelData<TModel>): TModel;
 };
-export declare const createModelSchema: <TReturn extends z.ZodRawShape>(factory: (zod: typeof z) => TReturn) => z.ZodObject<TReturn, "strip", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<TReturn>, any> extends infer T ? { [k in keyof T]: T[k]; } : never, z.baseObjectInputType<TReturn> extends infer T_1 ? { [k_1 in keyof T_1]: T_1[k_1]; } : never>;
+export declare const createModelSchema: <TReturn extends z.ZodRawShape>(factory: (zod: typeof z) => TReturn) => z.ZodObject<{ -readonly [P in keyof TReturn]: TReturn[P]; }, z.core.$strip>;
 export declare class ModelBuilder<TModel extends BaseModel<any>> {
     private name;
     private schema;
-    private methods;
+    private readonly methods;
     constructor(name: string, schema: TModel["__schema"]);
     extendSchema<TExt extends z.ZodRawShape>(extensionFn: (zod: typeof z) => TExt): this;
     withMethods<TExtMethods extends object>(methods: TExtMethods & ThisType<TModel & TExtMethods>): ModelBuilder<TModel & TExtMethods>;

package/models/base/ModelBuilder.js

@@ -1,10 +1,29 @@
 import { z } from "zod";
 import { BaseModel } from "./BaseModel.js";
+
+/**
+ * Custom type to compare Zod types and extract the inner type if it's wrapped in ZodOptional, ZodNullable, or ZodDefault.
+ */
+
 export const createModelSchema = factory => {
   return z.object({
     ...factory(z)
   });
 };
+const shouldAssign = inner => {
+  if (!inner) {
+    return false;
+  } else if (!("def" in inner)) {
+    return false;
+  } else if (inner.def.type === "optional") {
+    return true;
+  } else if (inner.def.type === "nullable") {
+    return true;
+  } else if (inner.def.type === "default") {
+    return true;
+  }
+  return false;
+};
 export class ModelBuilder {
   methods = {};
   constructor(name, schema) {
@@ -20,8 +39,8 @@ export class ModelBuilder {
       baseExtensionsObject = baseExtensions;
     } else if (baseExtensions) {
       let inner = baseExtensions;
-      while (inner && "_def" in inner && ["ZodOptional", "ZodNullable", "ZodDefault"].includes(inner._def.typeName)) {
-        inner = inner._def.innerType;
+      while (shouldAssign(inner)) {
+        inner = inner.def.innerType;
       }
       baseExtensionsObject = inner instanceof z.ZodObject ? inner : z.object({});
     } else {

package/models/base/ModelBuilder.js.map

@@ -1 +1 @@
-{"version":3,"names":["z","BaseModel","createModelSchema","factory","object","ModelBuilder","methods","constructor","name","schema","extendSchema","extensionFn","shape","baseExtensions","extensions","baseExtensionsObject","ZodObject","inner","includes","_def","typeName","innerType","newExtensions","extend","withMethods","Object","assign","getSchema","build","Model","__schema","create","data","clone","Constructor","toData","prototype","defineProperty","Symbol","toStringTag","value"],"sources":["ModelBuilder.ts"],"sourcesContent":["import { z } from \"zod\";\nimport { BaseModel, type IModelData as ExtractModelData } from \"./BaseModel.js\";\n\nexport type ModelClass<TModel extends BaseModel<any>> = {\n    __schema: TModel[\"__schema\"];\n    new (data: ExtractModelData<TModel>): TModel;\n    create(data: ExtractModelData<TModel>): TModel;\n};\n\nexport const createModelSchema = <TReturn extends z.ZodRawShape>(\n    factory: (zod: typeof z) => TReturn\n) => {\n    return z.object({ ...factory(z) });\n};\n\nexport class ModelBuilder<TModel extends BaseModel<any>> {\n    private methods: Partial<Record<keyof TModel, any>> = {};\n\n    constructor(\n        private name: string,\n        private schema: TModel[\"__schema\"]\n    ) {\n        this.methods = {};\n    }\n\n    extendSchema<TExt extends z.ZodRawShape>(extensionFn: (zod: typeof z) => TExt): this {\n        const shape = extensionFn(z);\n        const baseExtensions = (this.schema.shape as any).extensions;\n\n        let baseExtensionsObject: z.ZodObject<any>;\n        if (baseExtensions instanceof z.ZodObject) {\n            baseExtensionsObject = baseExtensions;\n        } else if (baseExtensions) {\n            let inner = baseExtensions as any;\n            while (\n                inner &&\n                \"_def\" in inner &&\n                [\"ZodOptional\", \"ZodNullable\", \"ZodDefault\"].includes(inner._def.typeName)\n            ) {\n                inner = inner._def.innerType;\n            }\n            baseExtensionsObject = inner instanceof z.ZodObject ? inner : z.object({});\n        } else {\n            baseExtensionsObject = z.object({});\n        }\n\n        const newExtensions = baseExtensionsObject.extend(shape);\n        this.schema = this.schema.extend({\n            extensions: newExtensions\n        }) as TModel[\"__schema\"];\n\n        return this;\n    }\n\n    withMethods<TExtMethods extends object>(\n        methods: TExtMethods & ThisType<TModel & TExtMethods>\n    ): ModelBuilder<TModel & TExtMethods> {\n        Object.assign(this.methods, methods);\n        return this as unknown as ModelBuilder<TModel & TExtMethods>;\n    }\n\n    getSchema() {\n        return this.schema;\n    }\n\n    build(): ModelClass<TModel> {\n        const schema = this.schema;\n        const methods = this.methods;\n        const name = this.name;\n\n        type ModelData = ExtractModelData<TModel>;\n\n        class Model extends BaseModel<TModel[\"__schema\"]> {\n            public override get __schema() {\n                return schema;\n            }\n\n            static __schema = schema;\n\n            static create(data: ModelData) {\n                return new this(data) as unknown as TModel;\n            }\n\n            override clone(): this {\n                const Constructor = this.constructor as new (data: ModelData) => this;\n                return new Constructor(this.toData());\n            }\n        }\n\n        Object.assign(Model.prototype, methods);\n\n        Object.defineProperty(Model.prototype, Symbol.toStringTag, {\n            value: name\n        });\n\n        return Model as unknown as ModelClass<TModel>;\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["z","BaseModel","createModelSchema","factory","object","shouldAssign","inner","def","type","ModelBuilder","methods","constructor","name","schema","extendSchema","extensionFn","shape","baseExtensions","extensions","baseExtensionsObject","ZodObject","innerType","newExtensions","extend","withMethods","Object","assign","getSchema","build","Model","__schema","create","data","clone","Constructor","toData","prototype","defineProperty","Symbol","toStringTag","value"],"sources":["ModelBuilder.ts"],"sourcesContent":["import { z } from \"zod\";\nimport { BaseModel, type IModelData as ExtractModelData } from \"./BaseModel.js\";\nimport type { $ZodTypeDef } from \"zod/v4/core\";\n\nexport type ModelClass<TModel extends BaseModel<any>> = {\n    __schema: TModel[\"__schema\"];\n    new (data: ExtractModelData<TModel>): TModel;\n    create(data: ExtractModelData<TModel>): TModel;\n};\n\n/**\n * Custom type to compare Zod types and extract the inner type if it's wrapped in ZodOptional, ZodNullable, or ZodDefault.\n */\ntype InnerType = z.ZodTypeAny & {\n    def: $ZodTypeDef & {\n        innerType?: z.ZodObject<any>;\n    };\n};\n\nexport const createModelSchema = <TReturn extends z.ZodRawShape>(\n    factory: (zod: typeof z) => TReturn\n) => {\n    return z.object({ ...factory(z) });\n};\n\nconst shouldAssign = (inner: InnerType): boolean => {\n    if (!inner) {\n        return false;\n    } else if (!(\"def\" in inner)) {\n        return false;\n    } else if (inner.def.type === \"optional\") {\n        return true;\n    } else if (inner.def.type === \"nullable\") {\n        return true;\n    } else if (inner.def.type === \"default\") {\n        return true;\n    }\n    return false;\n};\n\nexport class ModelBuilder<TModel extends BaseModel<any>> {\n    private readonly methods: Partial<Record<keyof TModel, any>> = {};\n\n    constructor(\n        private name: string,\n        private schema: TModel[\"__schema\"]\n    ) {\n        this.methods = {};\n    }\n\n    extendSchema<TExt extends z.ZodRawShape>(extensionFn: (zod: typeof z) => TExt): this {\n        const shape = extensionFn(z);\n        const baseExtensions = this.schema.shape.extensions;\n\n        let baseExtensionsObject: z.ZodObject<any>;\n        if (baseExtensions instanceof z.ZodObject) {\n            baseExtensionsObject = baseExtensions;\n        } else if (baseExtensions) {\n            let inner = baseExtensions as InnerType;\n\n            while (shouldAssign(inner)) {\n                inner = inner.def.innerType!;\n            }\n            baseExtensionsObject = inner instanceof z.ZodObject ? inner : z.object({});\n        } else {\n            baseExtensionsObject = z.object({});\n        }\n\n        const newExtensions = baseExtensionsObject.extend(shape);\n        this.schema = this.schema.extend({\n            extensions: newExtensions\n        }) as TModel[\"__schema\"];\n\n        return this;\n    }\n\n    withMethods<TExtMethods extends object>(\n        methods: TExtMethods & ThisType<TModel & TExtMethods>\n    ): ModelBuilder<TModel & TExtMethods> {\n        Object.assign(this.methods, methods);\n        return this as unknown as ModelBuilder<TModel & TExtMethods>;\n    }\n\n    getSchema() {\n        return this.schema;\n    }\n\n    build(): ModelClass<TModel> {\n        const schema = this.schema;\n        const methods = this.methods;\n        const name = this.name;\n\n        type ModelData = ExtractModelData<TModel>;\n\n        class Model extends BaseModel<TModel[\"__schema\"]> {\n            public override get __schema() {\n                return schema;\n            }\n\n            static __schema = schema;\n\n            static create(data: ModelData) {\n                return new this(data) as unknown as TModel;\n            }\n\n            override clone(): this {\n                const Constructor = this.constructor as new (data: ModelData) => this;\n                return new Constructor(this.toData());\n            }\n        }\n\n        Object.assign(Model.prototype, methods);\n\n        Object.defineProperty(Model.prototype, Symbol.toStringTag, {\n            value: name\n        });\n\n        return Model as unknown as ModelClass<TModel>;\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/models/cms/FieldBuilder.d.ts

@@ -19,12 +19,13 @@ export declare class TextFieldBuilder<TZod extends z.ZodString = z.ZodString> ex
     slug(): this;
     email(): this;
     url(): this;
+    private addStringValidator;
     unique(): this;
 }
 export declare class ObjectFieldBuilder<TShape extends z.ZodRawShape> extends FieldBuilder<z.ZodObject<TShape>> {
-    private nestedFields;
+    private readonly nestedFields;
     constructor(fields: (registry: IFieldBuilderRegistry) => {
-        [K in keyof TShape]: FieldBuilder<TShape[K]>;
+        [K in keyof TShape]: FieldBuilder<TShape[K] & z.ZodTypeAny>;
     }, registry: IFieldBuilderRegistry);
     optional(): ObjectFieldBuilder<TShape> & {
         getZodSchema(): z.ZodOptional<z.ZodObject<TShape>>;

package/models/cms/FieldBuilder.js

@@ -61,28 +61,19 @@ export class TextFieldBuilder extends FieldBuilder {
     return this;
   }
   slug() {
-    this.zodSchema = this.zodSchema.regex(/^[a-z0-9-]+$/, "Must be a valid slug (lowercase letters, numbers, and hyphens only)");
-    this.config.validation?.push({
-      name: "slug",
-      message: "Must be a valid slug",
-      settings: {}
-    });
-    return this;
+    return this.addStringValidator(this.zodSchema.regex(/^[a-z0-9-]+$/, "Must be a valid slug (lowercase letters, numbers, and hyphens only)"), "slug", "Must be a valid slug");
   }
   email() {
-    this.zodSchema = this.zodSchema.email("Must be a valid email");
-    this.config.validation?.push({
-      name: "email",
-      message: "Must be a valid email",
-      settings: {}
-    });
-    return this;
+    return this.addStringValidator(this.zodSchema.email("Must be a valid email"), "email", "Must be a valid email");
   }
   url() {
-    this.zodSchema = this.zodSchema.url("Must be a valid URL");
+    return this.addStringValidator(this.zodSchema.url("Must be a valid URL"), "url", "Must be a valid URL");
+  }
+  addStringValidator(schema, name, message) {
+    this.zodSchema = schema;
     this.config.validation?.push({
-      name: "url",
-      message: "Must be a valid URL",
+      name,
+      message,
       settings: {}
     });
     return this;
@@ -115,11 +106,15 @@ export class ObjectFieldBuilder extends FieldBuilder {
     this.config.fields = nestedConfigs;
   }
   optional() {
+    // @ts-expect-error
     this.zodSchema = this.zodSchema.optional();
+    // @ts-expect-error
     return this;
   }
   nullable() {
+    // @ts-expect-error
     this.zodSchema = this.zodSchema.nullable();
+    // @ts-expect-error
     return this;
   }
   toConfig() {

package/models/cms/FieldBuilder.js.map

@@ -1 +1 @@
-{"version":3,"names":["z","FieldBuilder","config","validation","constructor","type","initialSchema","zodSchema","label","text","help","placeholder","toConfig","fieldId","settings","getZodSchema","TextFieldBuilder","schema","string","required","message","newSchema","min","push","name","minLength","length","maxLength","max","slug","regex","email","url","unique","ObjectFieldBuilder","nestedFields","fields","registry","fieldBuilders","shape","nestedConfigs","builder","Object","entries","object","optional","nullable"],"sources":["FieldBuilder.ts"],"sourcesContent":["import { z } from \"zod\";\nimport type { FieldConfig } from \"./types.js\";\nimport type { IFieldBuilderRegistry } from \"./abstractions.js\";\n\n// Make FieldBuilder return the Zod type it produces\nexport abstract class FieldBuilder<TZod extends z.ZodTypeAny> {\n    protected config: Partial<FieldConfig> = {\n        validation: []\n    };\n    protected zodSchema: TZod;\n\n    constructor(type: string, initialSchema: TZod) {\n        this.config.type = type;\n        this.zodSchema = initialSchema;\n    }\n\n    label(text: string): this {\n        this.config.label = text;\n        return this;\n    }\n\n    help(text: string): this {\n        this.config.help = text;\n        return this;\n    }\n\n    placeholder(text: string): this {\n        this.config.placeholder = text;\n        return this;\n    }\n\n    toConfig(): FieldConfig {\n        return {\n            fieldId: \"\",\n            type: this.config.type!,\n            label: this.config.label,\n            help: this.config.help,\n            placeholder: this.config.placeholder,\n            validation: this.config.validation || [],\n            settings: this.config.settings || {},\n            zodSchema: this.zodSchema\n        };\n    }\n\n    getZodSchema(): TZod {\n        return this.zodSchema;\n    }\n}\n\n// Text Field Builder - properly track type transformations\nexport class TextFieldBuilder<TZod extends z.ZodString = z.ZodString> extends FieldBuilder<TZod> {\n    constructor(schema?: TZod) {\n        super(\"text\", (schema || z.string()) as TZod);\n    }\n\n    required(message?: string): TextFieldBuilder<z.ZodString> {\n        const newSchema = (this.zodSchema as z.ZodString).min(1, message || \"Field is required\");\n        this.zodSchema = newSchema as any;\n        this.config.validation?.push({\n            name: \"required\",\n            message: message || \"Field is required\",\n            settings: {}\n        });\n        return this as any;\n    }\n\n    minLength(length: number, message?: string): this {\n        this.zodSchema = (this.zodSchema as z.ZodString).min(length, message) as TZod;\n        return this;\n    }\n\n    maxLength(length: number, message?: string): this {\n        this.zodSchema = (this.zodSchema as z.ZodString).max(length, message) as TZod;\n        return this;\n    }\n\n    slug(): this {\n        this.zodSchema = (this.zodSchema as z.ZodString).regex(\n            /^[a-z0-9-]+$/,\n            \"Must be a valid slug (lowercase letters, numbers, and hyphens only)\"\n        ) as TZod;\n        this.config.validation?.push({\n            name: \"slug\",\n            message: \"Must be a valid slug\",\n            settings: {}\n        });\n        return this;\n    }\n\n    email(): this {\n        this.zodSchema = (this.zodSchema as z.ZodString).email(\"Must be a valid email\") as TZod;\n        this.config.validation?.push({\n            name: \"email\",\n            message: \"Must be a valid email\",\n            settings: {}\n        });\n        return this;\n    }\n\n    url(): this {\n        this.zodSchema = (this.zodSchema as z.ZodString).url(\"Must be a valid URL\") as TZod;\n        this.config.validation?.push({\n            name: \"url\",\n            message: \"Must be a valid URL\",\n            settings: {}\n        });\n        return this;\n    }\n\n    unique(): this {\n        this.config.validation?.push({\n            name: \"unique\",\n            message: \"Value must be unique\",\n            settings: {}\n        });\n        return this;\n    }\n}\n\n// Object Field Builder - track the shape type\nexport class ObjectFieldBuilder<TShape extends z.ZodRawShape> extends FieldBuilder<\n    z.ZodObject<TShape>\n> {\n    private nestedFields: FieldConfig[] = [];\n\n    constructor(\n        fields: (registry: IFieldBuilderRegistry) => {\n            [K in keyof TShape]: FieldBuilder<TShape[K]>;\n        },\n        registry: IFieldBuilderRegistry\n    ) {\n        const fieldBuilders = fields(registry);\n        const shape = {} as TShape;\n        const nestedConfigs: FieldConfig[] = [];\n\n        for (const [fieldId, builder] of Object.entries(fieldBuilders) as Array<\n            [keyof TShape, FieldBuilder<any>]\n        >) {\n            const config = builder.toConfig();\n            config.fieldId = fieldId as string;\n            nestedConfigs.push(config);\n            shape[fieldId] = builder.getZodSchema() as TShape[keyof TShape];\n        }\n\n        super(\"object\", z.object(shape));\n        this.nestedFields = nestedConfigs;\n        this.config.fields = nestedConfigs;\n    }\n\n    optional(): ObjectFieldBuilder<TShape> & {\n        getZodSchema(): z.ZodOptional<z.ZodObject<TShape>>;\n    } {\n        this.zodSchema = this.zodSchema.optional() as any;\n        return this as any;\n    }\n\n    nullable(): ObjectFieldBuilder<TShape> & {\n        getZodSchema(): z.ZodNullable<z.ZodObject<TShape>>;\n    } {\n        this.zodSchema = this.zodSchema.nullable() as any;\n        return this as any;\n    }\n\n    override toConfig(): FieldConfig {\n        const config = super.toConfig();\n        config.fields = this.nestedFields;\n        return config;\n    }\n}\n"],"mappings":"AAAA,SAASA,CAAC,QAAQ,KAAK;AAIvB;AACA,OAAO,MAAeC,YAAY,CAA4B;EAChDC,MAAM,GAAyB;IACrCC,UAAU,EAAE;EAChB,CAAC;EAGDC,WAAWA,CAACC,IAAY,EAAEC,aAAmB,EAAE;IAC3C,IAAI,CAACJ,MAAM,CAACG,IAAI,GAAGA,IAAI;IACvB,IAAI,CAACE,SAAS,GAAGD,aAAa;EAClC;EAEAE,KAAKA,CAACC,IAAY,EAAQ;IACtB,IAAI,CAACP,MAAM,CAACM,KAAK,GAAGC,IAAI;IACxB,OAAO,IAAI;EACf;EAEAC,IAAIA,CAACD,IAAY,EAAQ;IACrB,IAAI,CAACP,MAAM,CAACQ,IAAI,GAAGD,IAAI;IACvB,OAAO,IAAI;EACf;EAEAE,WAAWA,CAACF,IAAY,EAAQ;IAC5B,IAAI,CAACP,MAAM,CAACS,WAAW,GAAGF,IAAI;IAC9B,OAAO,IAAI;EACf;EAEAG,QAAQA,CAAA,EAAgB;IACpB,OAAO;MACHC,OAAO,EAAE,EAAE;MACXR,IAAI,EAAE,IAAI,CAACH,MAAM,CAACG,IAAK;MACvBG,KAAK,EAAE,IAAI,CAACN,MAAM,CAACM,KAAK;MACxBE,IAAI,EAAE,IAAI,CAACR,MAAM,CAACQ,IAAI;MACtBC,WAAW,EAAE,IAAI,CAACT,MAAM,CAACS,WAAW;MACpCR,UAAU,EAAE,IAAI,CAACD,MAAM,CAACC,UAAU,IAAI,EAAE;MACxCW,QAAQ,EAAE,IAAI,CAACZ,MAAM,CAACY,QAAQ,IAAI,CAAC,CAAC;MACpCP,SAAS,EAAE,IAAI,CAACA;IACpB,CAAC;EACL;EAEAQ,YAAYA,CAAA,EAAS;IACjB,OAAO,IAAI,CAACR,SAAS;EACzB;AACJ;;AAEA;AACA,OAAO,MAAMS,gBAAgB,SAAiDf,YAAY,CAAO;EAC7FG,WAAWA,CAACa,MAAa,EAAE;IACvB,KAAK,CAAC,MAAM,EAAGA,MAAM,IAAIjB,CAAC,CAACkB,MAAM,CAAC,CAAU,CAAC;EACjD;EAEAC,QAAQA,CAACC,OAAgB,EAAiC;IACtD,MAAMC,SAAS,GAAI,IAAI,CAACd,SAAS,CAAiBe,GAAG,CAAC,CAAC,EAAEF,OAAO,IAAI,mBAAmB,CAAC;IACxF,IAAI,CAACb,SAAS,GAAGc,SAAgB;IACjC,IAAI,CAACnB,MAAM,CAACC,UAAU,EAAEoB,IAAI,CAAC;MACzBC,IAAI,EAAE,UAAU;MAChBJ,OAAO,EAAEA,OAAO,IAAI,mBAAmB;MACvCN,QAAQ,EAAE,CAAC;IACf,CAAC,CAAC;IACF,OAAO,IAAI;EACf;EAEAW,SAASA,CAACC,MAAc,EAAEN,OAAgB,EAAQ;IAC9C,IAAI,CAACb,SAAS,GAAI,IAAI,CAACA,SAAS,CAAiBe,GAAG,CAACI,MAAM,EAAEN,OAAO,CAAS;IAC7E,OAAO,IAAI;EACf;EAEAO,SAASA,CAACD,MAAc,EAAEN,OAAgB,EAAQ;IAC9C,IAAI,CAACb,SAAS,GAAI,IAAI,CAACA,SAAS,CAAiBqB,GAAG,CAACF,MAAM,EAAEN,OAAO,CAAS;IAC7E,OAAO,IAAI;EACf;EAEAS,IAAIA,CAAA,EAAS;IACT,IAAI,CAACtB,SAAS,GAAI,IAAI,CAACA,SAAS,CAAiBuB,KAAK,CAClD,cAAc,EACd,qEACJ,CAAS;IACT,IAAI,CAAC5B,MAAM,CAACC,UAAU,EAAEoB,IAAI,CAAC;MACzBC,IAAI,EAAE,MAAM;MACZJ,OAAO,EAAE,sBAAsB;MAC/BN,QAAQ,EAAE,CAAC;IACf,CAAC,CAAC;IACF,OAAO,IAAI;EACf;EAEAiB,KAAKA,CAAA,EAAS;IACV,IAAI,CAACxB,SAAS,GAAI,IAAI,CAACA,SAAS,CAAiBwB,KAAK,CAAC,uBAAuB,CAAS;IACvF,IAAI,CAAC7B,MAAM,CAACC,UAAU,EAAEoB,IAAI,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbJ,OAAO,EAAE,uBAAuB;MAChCN,QAAQ,EAAE,CAAC;IACf,CAAC,CAAC;IACF,OAAO,IAAI;EACf;EAEAkB,GAAGA,CAAA,EAAS;IACR,IAAI,CAACzB,SAAS,GAAI,IAAI,CAACA,SAAS,CAAiByB,GAAG,CAAC,qBAAqB,CAAS;IACnF,IAAI,CAAC9B,MAAM,CAACC,UAAU,EAAEoB,IAAI,CAAC;MACzBC,IAAI,EAAE,KAAK;MACXJ,OAAO,EAAE,qBAAqB;MAC9BN,QAAQ,EAAE,CAAC;IACf,CAAC,CAAC;IACF,OAAO,IAAI;EACf;EAEAmB,MAAMA,CAAA,EAAS;IACX,IAAI,CAAC/B,MAAM,CAACC,UAAU,EAAEoB,IAAI,CAAC;MACzBC,IAAI,EAAE,QAAQ;MACdJ,OAAO,EAAE,sBAAsB;MAC/BN,QAAQ,EAAE,CAAC;IACf,CAAC,CAAC;IACF,OAAO,IAAI;EACf;AACJ;;AAEA;AACA,OAAO,MAAMoB,kBAAkB,SAAuCjC,YAAY,CAEhF;EACUkC,YAAY,GAAkB,EAAE;EAExC/B,WAAWA,CACPgC,MAEC,EACDC,QAA+B,EACjC;IACE,MAAMC,aAAa,GAAGF,MAAM,CAACC,QAAQ,CAAC;IACtC,MAAME,KAAK,GAAG,CAAC,CAAW;IAC1B,MAAMC,aAA4B,GAAG,EAAE;IAEvC,KAAK,MAAM,CAAC3B,OAAO,EAAE4B,OAAO,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACL,aAAa,CAAC,EAE3D;MACC,MAAMpC,MAAM,GAAGuC,OAAO,CAAC7B,QAAQ,CAAC,CAAC;MACjCV,MAAM,CAACW,OAAO,GAAGA,OAAiB;MAClC2B,aAAa,CAACjB,IAAI,CAACrB,MAAM,CAAC;MAC1BqC,KAAK,CAAC1B,OAAO,CAAC,GAAG4B,OAAO,CAAC1B,YAAY,CAAC,CAAyB;IACnE;IAEA,KAAK,CAAC,QAAQ,EAAEf,CAAC,CAAC4C,MAAM,CAACL,KAAK,CAAC,CAAC;IAChC,IAAI,CAACJ,YAAY,GAAGK,aAAa;IACjC,IAAI,CAACtC,MAAM,CAACkC,MAAM,GAAGI,aAAa;EACtC;EAEAK,QAAQA,CAAA,EAEN;IACE,IAAI,CAACtC,SAAS,GAAG,IAAI,CAACA,SAAS,CAACsC,QAAQ,CAAC,CAAQ;IACjD,OAAO,IAAI;EACf;EAEAC,QAAQA,CAAA,EAEN;IACE,IAAI,CAACvC,SAAS,GAAG,IAAI,CAACA,SAAS,CAACuC,QAAQ,CAAC,CAAQ;IACjD,OAAO,IAAI;EACf;EAESlC,QAAQA,CAAA,EAAgB;IAC7B,MAAMV,MAAM,GAAG,KAAK,CAACU,QAAQ,CAAC,CAAC;IAC/BV,MAAM,CAACkC,MAAM,GAAG,IAAI,CAACD,YAAY;IACjC,OAAOjC,MAAM;EACjB;AACJ","ignoreList":[]}
+{"version":3,"names":["z","FieldBuilder","config","validation","constructor","type","initialSchema","zodSchema","label","text","help","placeholder","toConfig","fieldId","settings","getZodSchema","TextFieldBuilder","schema","string","required","message","newSchema","min","push","name","minLength","length","maxLength","max","slug","addStringValidator","regex","email","url","unique","ObjectFieldBuilder","nestedFields","fields","registry","fieldBuilders","shape","nestedConfigs","builder","Object","entries","object","optional","nullable"],"sources":["FieldBuilder.ts"],"sourcesContent":["import { z } from \"zod\";\nimport type { FieldConfig } from \"./types.js\";\nimport type { IFieldBuilderRegistry } from \"./abstractions.js\";\n\n// Make FieldBuilder return the Zod type it produces\nexport abstract class FieldBuilder<TZod extends z.ZodTypeAny> {\n    protected config: Partial<FieldConfig> = {\n        validation: []\n    };\n    protected zodSchema: TZod;\n\n    constructor(type: string, initialSchema: TZod) {\n        this.config.type = type;\n        this.zodSchema = initialSchema;\n    }\n\n    label(text: string): this {\n        this.config.label = text;\n        return this;\n    }\n\n    help(text: string): this {\n        this.config.help = text;\n        return this;\n    }\n\n    placeholder(text: string): this {\n        this.config.placeholder = text;\n        return this;\n    }\n\n    toConfig(): FieldConfig {\n        return {\n            fieldId: \"\",\n            type: this.config.type!,\n            label: this.config.label,\n            help: this.config.help,\n            placeholder: this.config.placeholder,\n            validation: this.config.validation || [],\n            settings: this.config.settings || {},\n            zodSchema: this.zodSchema\n        };\n    }\n\n    getZodSchema(): TZod {\n        return this.zodSchema;\n    }\n}\n\n// Text Field Builder - properly track type transformations\nexport class TextFieldBuilder<TZod extends z.ZodString = z.ZodString> extends FieldBuilder<TZod> {\n    constructor(schema?: TZod) {\n        super(\"text\", (schema || z.string()) as TZod);\n    }\n\n    required(message?: string): TextFieldBuilder<z.ZodString> {\n        const newSchema = this.zodSchema.min(1, message || \"Field is required\");\n        this.zodSchema = newSchema;\n        this.config.validation?.push({\n            name: \"required\",\n            message: message || \"Field is required\",\n            settings: {}\n        });\n        return this;\n    }\n\n    minLength(length: number, message?: string): this {\n        this.zodSchema = this.zodSchema.min(length, message) as TZod;\n        return this;\n    }\n\n    maxLength(length: number, message?: string): this {\n        this.zodSchema = this.zodSchema.max(length, message) as TZod;\n        return this;\n    }\n\n    slug(): this {\n        return this.addStringValidator(\n            this.zodSchema.regex(\n                /^[a-z0-9-]+$/,\n                \"Must be a valid slug (lowercase letters, numbers, and hyphens only)\"\n            ),\n            \"slug\",\n            \"Must be a valid slug\"\n        );\n    }\n\n    email(): this {\n        return this.addStringValidator(\n            this.zodSchema.email(\"Must be a valid email\"),\n            \"email\",\n            \"Must be a valid email\"\n        );\n    }\n\n    url(): this {\n        return this.addStringValidator(\n            this.zodSchema.url(\"Must be a valid URL\"),\n            \"url\",\n            \"Must be a valid URL\"\n        );\n    }\n\n    private addStringValidator(schema: z.ZodString, name: string, message: string): this {\n        this.zodSchema = schema as TZod;\n        this.config.validation?.push({ name, message, settings: {} });\n        return this;\n    }\n\n    unique(): this {\n        this.config.validation?.push({\n            name: \"unique\",\n            message: \"Value must be unique\",\n            settings: {}\n        });\n        return this;\n    }\n}\n\n// Object Field Builder - track the shape type\nexport class ObjectFieldBuilder<TShape extends z.ZodRawShape> extends FieldBuilder<\n    z.ZodObject<TShape>\n> {\n    private readonly nestedFields: FieldConfig[] = [];\n\n    constructor(\n        fields: (registry: IFieldBuilderRegistry) => {\n            [K in keyof TShape]: FieldBuilder<TShape[K] & z.ZodTypeAny>;\n        },\n        registry: IFieldBuilderRegistry\n    ) {\n        const fieldBuilders = fields(registry);\n        const shape = {} as TShape;\n        const nestedConfigs: FieldConfig[] = [];\n\n        for (const [fieldId, builder] of Object.entries(fieldBuilders) as Array<\n            [keyof TShape, FieldBuilder<any>]\n        >) {\n            const config = builder.toConfig();\n            config.fieldId = fieldId as string;\n            nestedConfigs.push(config);\n            shape[fieldId] = builder.getZodSchema() as TShape[keyof TShape];\n        }\n\n        super(\"object\", z.object(shape));\n        this.nestedFields = nestedConfigs;\n        this.config.fields = nestedConfigs;\n    }\n\n    optional(): ObjectFieldBuilder<TShape> & {\n        getZodSchema(): z.ZodOptional<z.ZodObject<TShape>>;\n    } {\n        // @ts-expect-error\n        this.zodSchema = this.zodSchema.optional();\n        // @ts-expect-error\n        return this;\n    }\n\n    nullable(): ObjectFieldBuilder<TShape> & {\n        getZodSchema(): z.ZodNullable<z.ZodObject<TShape>>;\n    } {\n        // @ts-expect-error\n        this.zodSchema = this.zodSchema.nullable();\n        // @ts-expect-error\n        return this;\n    }\n\n    override toConfig(): FieldConfig {\n        const config = super.toConfig();\n        config.fields = this.nestedFields;\n        return config;\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/models/cms/FieldBuilderRegistry.d.ts

@@ -3,7 +3,7 @@ import { TextFieldBuilder, ObjectFieldBuilder, type FieldBuilder } from "./Field
 import { type IFieldBuilderRegistry } from "./abstractions.js";
 declare class FieldBuilderRegistryImpl implements IFieldBuilderRegistry {
     text(): TextFieldBuilder<z.ZodString>;
-    object<TShape extends z.ZodRawShape>(fields: (registry: IFieldBuilderRegistry) => {
+    object<TShape extends Record<string, z.ZodTypeAny>>(fields: (registry: IFieldBuilderRegistry) => {
         [K in keyof TShape]: FieldBuilder<TShape[K]>;
     }): ObjectFieldBuilder<TShape>;
 }

package/models/cms/FieldBuilderRegistry.js.map

@@ -1 +1 @@
-{"version":3,"names":["createImplementation","TextFieldBuilder","ObjectFieldBuilder","FieldBuilderRegistry","RegistryAbstraction","FieldBuilderRegistryImpl","text","object","fields","abstraction","implementation","dependencies"],"sources":["FieldBuilderRegistry.ts"],"sourcesContent":["import { z } from \"zod\";\nimport { createImplementation } from \"@webiny/di\";\nimport { TextFieldBuilder, ObjectFieldBuilder, type FieldBuilder } from \"./FieldBuilder.js\";\nimport {\n    FieldBuilderRegistry as RegistryAbstraction,\n    type IFieldBuilderRegistry\n} from \"./abstractions.js\";\n\nclass FieldBuilderRegistryImpl implements IFieldBuilderRegistry {\n    text(): TextFieldBuilder<z.ZodString> {\n        return new TextFieldBuilder();\n    }\n\n    object<TShape extends z.ZodRawShape>(\n        fields: (registry: IFieldBuilderRegistry) => {\n            [K in keyof TShape]: FieldBuilder<TShape[K]>;\n        }\n    ): ObjectFieldBuilder<TShape> {\n        return new ObjectFieldBuilder(fields, this);\n    }\n}\n\nexport const FieldBuilderRegistry = createImplementation({\n    abstraction: RegistryAbstraction,\n    implementation: FieldBuilderRegistryImpl,\n    dependencies: []\n});\n"],"mappings":"AACA,SAASA,oBAAoB,QAAQ,YAAY;AACjD,SAASC,gBAAgB,EAAEC,kBAAkB;AAC7C,SACIC,oBAAoB,IAAIC,mBAAmB;AAI/C,MAAMC,wBAAwB,CAAkC;EAC5DC,IAAIA,CAAA,EAAkC;IAClC,OAAO,IAAIL,gBAAgB,CAAC,CAAC;EACjC;EAEAM,MAAMA,CACFC,MAEC,EACyB;IAC1B,OAAO,IAAIN,kBAAkB,CAACM,MAAM,EAAE,IAAI,CAAC;EAC/C;AACJ;AAEA,OAAO,MAAML,oBAAoB,GAAGH,oBAAoB,CAAC;EACrDS,WAAW,EAAEL,mBAAmB;EAChCM,cAAc,EAAEL,wBAAwB;EACxCM,YAAY,EAAE;AAClB,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["createImplementation","TextFieldBuilder","ObjectFieldBuilder","FieldBuilderRegistry","RegistryAbstraction","FieldBuilderRegistryImpl","text","object","fields","abstraction","implementation","dependencies"],"sources":["FieldBuilderRegistry.ts"],"sourcesContent":["import { z } from \"zod\";\nimport { createImplementation } from \"@webiny/di\";\nimport { TextFieldBuilder, ObjectFieldBuilder, type FieldBuilder } from \"./FieldBuilder.js\";\nimport {\n    FieldBuilderRegistry as RegistryAbstraction,\n    type IFieldBuilderRegistry\n} from \"./abstractions.js\";\n\nclass FieldBuilderRegistryImpl implements IFieldBuilderRegistry {\n    text(): TextFieldBuilder<z.ZodString> {\n        return new TextFieldBuilder();\n    }\n\n    object<TShape extends Record<string, z.ZodTypeAny>>(\n        fields: (registry: IFieldBuilderRegistry) => {\n            [K in keyof TShape]: FieldBuilder<TShape[K]>;\n        }\n    ): ObjectFieldBuilder<TShape> {\n        return new ObjectFieldBuilder(fields, this);\n    }\n}\n\nexport const FieldBuilderRegistry = createImplementation({\n    abstraction: RegistryAbstraction,\n    implementation: FieldBuilderRegistryImpl,\n    dependencies: []\n});\n"],"mappings":"AACA,SAASA,oBAAoB,QAAQ,YAAY;AACjD,SAASC,gBAAgB,EAAEC,kBAAkB;AAC7C,SACIC,oBAAoB,IAAIC,mBAAmB;AAI/C,MAAMC,wBAAwB,CAAkC;EAC5DC,IAAIA,CAAA,EAAkC;IAClC,OAAO,IAAIL,gBAAgB,CAAC,CAAC;EACjC;EAEAM,MAAMA,CACFC,MAEC,EACyB;IAC1B,OAAO,IAAIN,kBAAkB,CAACM,MAAM,EAAE,IAAI,CAAC;EAC/C;AACJ;AAEA,OAAO,MAAML,oBAAoB,GAAGH,oBAAoB,CAAC;EACrDS,WAAW,EAAEL,mBAAmB;EAChCM,cAAc,EAAEL,wBAAwB;EACxCM,YAAY,EAAE;AAClB,CAAC,CAAC","ignoreList":[]}

package/models/cms/FieldDefinitionsBuilder.d.ts

@@ -10,6 +10,7 @@ export declare class FieldDefinitionsBuilder<TFields extends z.ZodRawShape = {}>
     __fromObject<TShape extends Record<string, FieldBuilder<any>>>(shape: TShape): FieldDefinitionsBuilder<{
         [K in keyof TShape]: ReturnType<TShape[K]["getZodSchema"]>;
     }>;
+    private registerField;
     __toZodSchema(): z.ZodObject<TFields>;
     __getFields(): FieldConfig[];
     __getFieldsMap(): Map<string, FieldBuilderConfig>;

package/models/cms/FieldDefinitionsBuilder.js

@@ -8,30 +8,28 @@ export class FieldDefinitionsBuilder {
 
   // Keep the old .field() method for internal use
   field(name, configure) {
-    const fieldBuilder = configure(this.registry);
-    const config = fieldBuilder.toConfig();
-    config.fieldId = name;
-    this.fields.set(name, {
-      fieldId: name,
-      config,
-      zodSchema: fieldBuilder.getZodSchema()
-    });
+    this.registerField(name, configure(this.registry));
+    // @ts-expect-error
     return this;
   }
 
   // Internal method to build from object
   __fromObject(shape) {
     for (const [fieldId, fieldBuilder] of Object.entries(shape)) {
-      const config = fieldBuilder.toConfig();
-      config.fieldId = fieldId;
-      this.fields.set(fieldId, {
-        fieldId,
-        config,
-        zodSchema: fieldBuilder.getZodSchema()
-      });
+      this.registerField(fieldId, fieldBuilder);
     }
+    // @ts-expect-error
     return this;
   }
+  registerField(fieldId, fieldBuilder) {
+    const config = fieldBuilder.toConfig();
+    config.fieldId = fieldId;
+    this.fields.set(fieldId, {
+      fieldId,
+      config,
+      zodSchema: fieldBuilder.getZodSchema()
+    });
+  }
   __toZodSchema() {
     const schemaShape = {};
     for (const [fieldId, {

package/models/cms/FieldDefinitionsBuilder.js.map

@@ -1 +1 @@
-{"version":3,"names":["z","FieldDefinitionsBuilder","fields","Map","constructor","registry","field","name","configure","fieldBuilder","config","toConfig","fieldId","set","zodSchema","getZodSchema","__fromObject","shape","Object","entries","__toZodSchema","schemaShape","object","__getFields","Array","from","values","map","f","__getFieldsMap","createFieldDefinitions","factory","__type"],"sources":["FieldDefinitionsBuilder.ts"],"sourcesContent":["import { z } from \"zod\";\nimport type { FieldBuilder } from \"./FieldBuilder.js\";\nimport type { IFieldBuilderRegistry } from \"./abstractions.js\";\nimport type { FieldConfig, FieldBuilderConfig } from \"./types.js\";\n\n// eslint-disable-next-line\nexport class FieldDefinitionsBuilder<TFields extends z.ZodRawShape = {}> {\n    private fields = new Map<string, FieldBuilderConfig>();\n\n    constructor(private registry: IFieldBuilderRegistry) {}\n\n    // Keep the old .field() method for internal use\n    field<K extends string, TZod extends z.ZodTypeAny>(\n        name: K,\n        configure: (field: IFieldBuilderRegistry) => FieldBuilder<TZod>\n    ): FieldDefinitionsBuilder<TFields & Record<K, TZod>> {\n        const fieldBuilder = configure(this.registry);\n        const config = fieldBuilder.toConfig();\n        config.fieldId = name;\n\n        this.fields.set(name, {\n            fieldId: name,\n            config,\n            zodSchema: fieldBuilder.getZodSchema()\n        });\n\n        return this as any;\n    }\n\n    // Internal method to build from object\n    __fromObject<TShape extends Record<string, FieldBuilder<any>>>(\n        shape: TShape\n    ): FieldDefinitionsBuilder<{ [K in keyof TShape]: ReturnType<TShape[K][\"getZodSchema\"]> }> {\n        for (const [fieldId, fieldBuilder] of Object.entries(shape)) {\n            const config = fieldBuilder.toConfig();\n            config.fieldId = fieldId;\n\n            this.fields.set(fieldId, {\n                fieldId,\n                config,\n                zodSchema: fieldBuilder.getZodSchema()\n            });\n        }\n\n        return this as any;\n    }\n\n    __toZodSchema(): z.ZodObject<TFields> {\n        const schemaShape = {} as TFields;\n\n        for (const [fieldId, { zodSchema }] of this.fields) {\n            schemaShape[fieldId as keyof TFields] = zodSchema as TFields[keyof TFields];\n        }\n\n        return z.object(schemaShape);\n    }\n\n    __getFields(): FieldConfig[] {\n        return Array.from(this.fields.values()).map(f => f.config);\n    }\n\n    __getFieldsMap(): Map<string, FieldBuilderConfig> {\n        return new Map(this.fields);\n    }\n}\n\n// Updated factory function - now takes an object!\nexport function createFieldDefinitions<TShape extends Record<string, FieldBuilder<any>>>(\n    factory: (fields: IFieldBuilderRegistry) => TShape\n): FieldDefinitionsFactory<{ [K in keyof TShape]: ReturnType<TShape[K][\"getZodSchema\"]> }> {\n    return {\n        __type: \"FieldDefinitionsFactory\" as const,\n        factory\n    };\n}\n\n// TODO: check the unused generic\n// eslint-disable-next-line\nexport interface FieldDefinitionsFactory<TFields extends z.ZodRawShape> {\n    __type: \"FieldDefinitionsFactory\";\n    factory: (fields: IFieldBuilderRegistry) => Record<string, FieldBuilder<any>>;\n}\n\nexport type InferFieldSchema<T> =\n    T extends FieldDefinitionsFactory<infer TFields> ? z.ZodObject<TFields> : never;\n"],"mappings":"AAAA,SAASA,CAAC,QAAQ,KAAK;AAKvB;AACA,OAAO,MAAMC,uBAAuB,CAAqC;EAC7DC,MAAM,GAAG,IAAIC,GAAG,CAA6B,CAAC;EAEtDC,WAAWA,CAASC,QAA+B,EAAE;IAAA,KAAjCA,QAA+B,GAA/BA,QAA+B;EAAG;;EAEtD;EACAC,KAAKA,CACDC,IAAO,EACPC,SAA+D,EACb;IAClD,MAAMC,YAAY,GAAGD,SAAS,CAAC,IAAI,CAACH,QAAQ,CAAC;IAC7C,MAAMK,MAAM,GAAGD,YAAY,CAACE,QAAQ,CAAC,CAAC;IACtCD,MAAM,CAACE,OAAO,GAAGL,IAAI;IAErB,IAAI,CAACL,MAAM,CAACW,GAAG,CAACN,IAAI,EAAE;MAClBK,OAAO,EAAEL,IAAI;MACbG,MAAM;MACNI,SAAS,EAAEL,YAAY,CAACM,YAAY,CAAC;IACzC,CAAC,CAAC;IAEF,OAAO,IAAI;EACf;;EAEA;EACAC,YAAYA,CACRC,KAAa,EAC0E;IACvF,KAAK,MAAM,CAACL,OAAO,EAAEH,YAAY,CAAC,IAAIS,MAAM,CAACC,OAAO,CAACF,KAAK,CAAC,EAAE;MACzD,MAAMP,MAAM,GAAGD,YAAY,CAACE,QAAQ,CAAC,CAAC;MACtCD,MAAM,CAACE,OAAO,GAAGA,OAAO;MAExB,IAAI,CAACV,MAAM,CAACW,GAAG,CAACD,OAAO,EAAE;QACrBA,OAAO;QACPF,MAAM;QACNI,SAAS,EAAEL,YAAY,CAACM,YAAY,CAAC;MACzC,CAAC,CAAC;IACN;IAEA,OAAO,IAAI;EACf;EAEAK,aAAaA,CAAA,EAAyB;IAClC,MAAMC,WAAW,GAAG,CAAC,CAAY;IAEjC,KAAK,MAAM,CAACT,OAAO,EAAE;MAAEE;IAAU,CAAC,CAAC,IAAI,IAAI,CAACZ,MAAM,EAAE;MAChDmB,WAAW,CAACT,OAAO,CAAkB,GAAGE,SAAmC;IAC/E;IAEA,OAAOd,CAAC,CAACsB,MAAM,CAACD,WAAW,CAAC;EAChC;EAEAE,WAAWA,CAAA,EAAkB;IACzB,OAAOC,KAAK,CAACC,IAAI,CAAC,IAAI,CAACvB,MAAM,CAACwB,MAAM,CAAC,CAAC,CAAC,CAACC,GAAG,CAACC,CAAC,IAAIA,CAAC,CAAClB,MAAM,CAAC;EAC9D;EAEAmB,cAAcA,CAAA,EAAoC;IAC9C,OAAO,IAAI1B,GAAG,CAAC,IAAI,CAACD,MAAM,CAAC;EAC/B;AACJ;;AAEA;AACA,OAAO,SAAS4B,sBAAsBA,CAClCC,OAAkD,EACqC;EACvF,OAAO;IACHC,MAAM,EAAE,yBAAkC;IAC1CD;EACJ,CAAC;AACL;;AAEA;AACA","ignoreList":[]}
+{"version":3,"names":["z","FieldDefinitionsBuilder","fields","Map","constructor","registry","field","name","configure","registerField","__fromObject","shape","fieldId","fieldBuilder","Object","entries","config","toConfig","set","zodSchema","getZodSchema","__toZodSchema","schemaShape","object","__getFields","Array","from","values","map","f","__getFieldsMap","createFieldDefinitions","factory","__type"],"sources":["FieldDefinitionsBuilder.ts"],"sourcesContent":["import { z } from \"zod\";\nimport type { FieldBuilder } from \"./FieldBuilder.js\";\nimport type { IFieldBuilderRegistry } from \"./abstractions.js\";\nimport type { FieldConfig, FieldBuilderConfig } from \"./types.js\";\n\n// eslint-disable-next-line\nexport class FieldDefinitionsBuilder<TFields extends z.ZodRawShape = {}> {\n    private fields = new Map<string, FieldBuilderConfig>();\n\n    constructor(private registry: IFieldBuilderRegistry) {}\n\n    // Keep the old .field() method for internal use\n    field<K extends string, TZod extends z.ZodTypeAny>(\n        name: K,\n        configure: (field: IFieldBuilderRegistry) => FieldBuilder<TZod>\n    ): FieldDefinitionsBuilder<TFields & Record<K, TZod>> {\n        this.registerField(name, configure(this.registry));\n        // @ts-expect-error\n        return this;\n    }\n\n    // Internal method to build from object\n    __fromObject<TShape extends Record<string, FieldBuilder<any>>>(\n        shape: TShape\n    ): FieldDefinitionsBuilder<{ [K in keyof TShape]: ReturnType<TShape[K][\"getZodSchema\"]> }> {\n        for (const [fieldId, fieldBuilder] of Object.entries(shape)) {\n            this.registerField(fieldId, fieldBuilder);\n        }\n        // @ts-expect-error\n        return this;\n    }\n\n    private registerField(fieldId: string, fieldBuilder: FieldBuilder<any>): void {\n        const config = fieldBuilder.toConfig();\n        config.fieldId = fieldId;\n        this.fields.set(fieldId, { fieldId, config, zodSchema: fieldBuilder.getZodSchema() });\n    }\n\n    __toZodSchema(): z.ZodObject<TFields> {\n        const schemaShape = {} as TFields;\n\n        for (const [fieldId, { zodSchema }] of this.fields) {\n            schemaShape[fieldId as keyof TFields] = zodSchema as unknown as TFields[keyof TFields];\n        }\n\n        return z.object(schemaShape);\n    }\n\n    __getFields(): FieldConfig[] {\n        return Array.from(this.fields.values()).map(f => f.config);\n    }\n\n    __getFieldsMap(): Map<string, FieldBuilderConfig> {\n        return new Map(this.fields);\n    }\n}\n\n// Updated factory function - now takes an object!\nexport function createFieldDefinitions<TShape extends Record<string, FieldBuilder<any>>>(\n    factory: (fields: IFieldBuilderRegistry) => TShape\n): FieldDefinitionsFactory<{ [K in keyof TShape]: ReturnType<TShape[K][\"getZodSchema\"]> }> {\n    return {\n        __type: \"FieldDefinitionsFactory\" as const,\n        factory\n    };\n}\n\n// TODO: check the unused generic\n// eslint-disable-next-line\nexport interface FieldDefinitionsFactory<TFields extends z.ZodRawShape> {\n    __type: \"FieldDefinitionsFactory\";\n    factory: (fields: IFieldBuilderRegistry) => Record<string, FieldBuilder<any>>;\n}\n\nexport type InferFieldSchema<T> =\n    T extends FieldDefinitionsFactory<infer TFields> ? z.ZodObject<TFields> : never;\n"],"mappings":"AAAA,SAASA,CAAC,QAAQ,KAAK;AAKvB;AACA,OAAO,MAAMC,uBAAuB,CAAqC;EAC7DC,MAAM,GAAG,IAAIC,GAAG,CAA6B,CAAC;EAEtDC,WAAWA,CAASC,QAA+B,EAAE;IAAA,KAAjCA,QAA+B,GAA/BA,QAA+B;EAAG;;EAEtD;EACAC,KAAKA,CACDC,IAAO,EACPC,SAA+D,EACb;IAClD,IAAI,CAACC,aAAa,CAACF,IAAI,EAAEC,SAAS,CAAC,IAAI,CAACH,QAAQ,CAAC,CAAC;IAClD;IACA,OAAO,IAAI;EACf;;EAEA;EACAK,YAAYA,CACRC,KAAa,EAC0E;IACvF,KAAK,MAAM,CAACC,OAAO,EAAEC,YAAY,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACJ,KAAK,CAAC,EAAE;MACzD,IAAI,CAACF,aAAa,CAACG,OAAO,EAAEC,YAAY,CAAC;IAC7C;IACA;IACA,OAAO,IAAI;EACf;EAEQJ,aAAaA,CAACG,OAAe,EAAEC,YAA+B,EAAQ;IAC1E,MAAMG,MAAM,GAAGH,YAAY,CAACI,QAAQ,CAAC,CAAC;IACtCD,MAAM,CAACJ,OAAO,GAAGA,OAAO;IACxB,IAAI,CAACV,MAAM,CAACgB,GAAG,CAACN,OAAO,EAAE;MAAEA,OAAO;MAAEI,MAAM;MAAEG,SAAS,EAAEN,YAAY,CAACO,YAAY,CAAC;IAAE,CAAC,CAAC;EACzF;EAEAC,aAAaA,CAAA,EAAyB;IAClC,MAAMC,WAAW,GAAG,CAAC,CAAY;IAEjC,KAAK,MAAM,CAACV,OAAO,EAAE;MAAEO;IAAU,CAAC,CAAC,IAAI,IAAI,CAACjB,MAAM,EAAE;MAChDoB,WAAW,CAACV,OAAO,CAAkB,GAAGO,SAA8C;IAC1F;IAEA,OAAOnB,CAAC,CAACuB,MAAM,CAACD,WAAW,CAAC;EAChC;EAEAE,WAAWA,CAAA,EAAkB;IACzB,OAAOC,KAAK,CAACC,IAAI,CAAC,IAAI,CAACxB,MAAM,CAACyB,MAAM,CAAC,CAAC,CAAC,CAACC,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACb,MAAM,CAAC;EAC9D;EAEAc,cAAcA,CAAA,EAAoC;IAC9C,OAAO,IAAI3B,GAAG,CAAC,IAAI,CAACD,MAAM,CAAC;EAC/B;AACJ;;AAEA;AACA,OAAO,SAAS6B,sBAAsBA,CAClCC,OAAkD,EACqC;EACvF,OAAO;IACHC,MAAM,EAAE,yBAAkC;IAC1CD;EACJ,CAAC;AACL;;AAEA;AACA","ignoreList":[]}

package/models/cms/PrivateCmsModelBuilder.js.map

@@ -1 +1 @@
-{"version":3,"names":["z","FieldDefinitionsBuilder","createImplementation","FieldBuilderRegistry","PrivateCmsModelBuilder","BuilderAbstraction","ModelBuilder","PrivateCmsModelBuilderImpl","constructor","fieldBuilderRegistry","create","modelId","fieldDefinitions","builder","fieldShape","factory","fieldDefinitionsBuilder","__fromObject","PrivateCmsModelConfiguration","metadata","modelMethods","extensionFields","Map","withMethods","methods","Object","assign","extendFields","fieldId","fieldBuilder","entries","config","toConfig","zodSchema","getZodSchema","set","build","baseSchema","__toZodSchema","finalSchema","size","extensionsShape","optional","extensionsSchema","object","extend","extensions","modelBuilder","keys","length","ModelClass","allFields","__getFields","type","label","validation","settings","fromEntries","Array","from","map","id","fields","values","f","modelType","Model","name","icon","description","schema","getSchema","data","abstraction","implementation","dependencies"],"sources":["PrivateCmsModelBuilder.ts"],"sourcesContent":["import { z } from \"zod\";\nimport {\n    FieldDefinitionsBuilder,\n    type FieldDefinitionsFactory\n} from \"./FieldDefinitionsBuilder.js\";\nimport type { BaseModel } from \"../base/BaseModel.js\";\nimport type { IModelData } from \"../base/abstractions.js\";\nimport type { PrivateCmsModel, CmsModelMetadata, FieldBuilderConfig } from \"./types.js\";\n// Import your existing ModelBuilder\nimport { FieldBuilder } from \"./FieldBuilder.js\";\nimport { createImplementation } from \"@webiny/di\";\nimport {\n    FieldBuilderRegistry,\n    type IFieldBuilderRegistry,\n    PrivateCmsModelBuilder as BuilderAbstraction\n} from \"~/models/cms/abstractions.js\";\nimport { ModelBuilder } from \"~/models/base/ModelBuilder.js\";\n\nexport interface IPrivateCmsModelBuilder {\n    create<TModel extends BaseModel<any>, TFields extends z.ZodRawShape = any>(\n        modelId: string,\n        fieldDefinitions: FieldDefinitionsFactory<TFields>\n    ): IPrivateCmsModelConfiguration<TModel>;\n}\n\nexport interface IPrivateCmsModelConfiguration<TModel extends BaseModel<any>> {\n    withMethods<TMethods extends object>(\n        methods: TMethods & ThisType<TModel & TMethods>\n    ): IPrivateCmsModelConfiguration<TModel>;\n    extendFields(\n        factory: (fields: IFieldBuilderRegistry) => Record<string, FieldBuilder<any>>\n    ): IPrivateCmsModelConfiguration<TModel>;\n    build(): PrivateCmsModel<TModel>;\n}\n\nclass PrivateCmsModelBuilderImpl implements IPrivateCmsModelBuilder {\n    constructor(private fieldBuilderRegistry: IFieldBuilderRegistry) {}\n\n    create<TModel extends BaseModel<any>, TFields extends z.ZodRawShape = any>(\n        modelId: string,\n        fieldDefinitions: FieldDefinitionsFactory<TFields>\n    ): IPrivateCmsModelConfiguration<TModel> {\n        const builder = new FieldDefinitionsBuilder(this.fieldBuilderRegistry);\n        const fieldShape = fieldDefinitions.factory(this.fieldBuilderRegistry);\n        const fieldDefinitionsBuilder = builder.__fromObject(fieldShape);\n\n        return new PrivateCmsModelConfiguration<TModel>(\n            modelId,\n            this.fieldBuilderRegistry,\n            fieldDefinitionsBuilder\n        );\n    }\n}\n\nclass PrivateCmsModelConfiguration<TModel extends BaseModel<any>>\n    implements IPrivateCmsModelConfiguration<TModel>\n{\n    private metadata: CmsModelMetadata = {};\n    // eslint-disable-next-line\n    private modelMethods: Record<string, Function> = {};\n    private extensionFields = new Map<string, FieldBuilderConfig>();\n\n    constructor(\n        private modelId: string,\n        private fieldBuilderRegistry: IFieldBuilderRegistry,\n        private fieldDefinitionsBuilder: FieldDefinitionsBuilder\n    ) {}\n\n    withMethods<TMethods extends object>(\n        methods: TMethods & ThisType<TModel & TMethods>\n    ): IPrivateCmsModelConfiguration<TModel> {\n        Object.assign(this.modelMethods, methods);\n        return this as any;\n    }\n\n    extendFields(\n        factory: (fields: IFieldBuilderRegistry) => Record<string, FieldBuilder<any>>\n    ): IPrivateCmsModelConfiguration<TModel> {\n        // Use the factory to get field shape - same as createFieldDefinitions!\n        const fieldShape = factory(this.fieldBuilderRegistry);\n\n        // Convert to field configs\n        for (const [fieldId, fieldBuilder] of Object.entries(fieldShape)) {\n            const config = fieldBuilder.toConfig();\n            config.fieldId = fieldId;\n            const zodSchema = fieldBuilder.getZodSchema();\n\n            this.extensionFields.set(fieldId, {\n                fieldId,\n                config,\n                zodSchema\n            });\n        }\n\n        return this as any;\n    }\n\n    build(): PrivateCmsModel<TModel> {\n        const baseSchema = this.fieldDefinitionsBuilder.__toZodSchema();\n        let finalSchema = baseSchema;\n\n        if (this.extensionFields.size > 0) {\n            const extensionsShape: z.ZodRawShape = {};\n\n            for (const [fieldId, { zodSchema }] of this.extensionFields) {\n                // Make each extension field optional\n                extensionsShape[fieldId] = zodSchema.optional();\n            }\n\n            const extensionsSchema = z.object(extensionsShape).optional();\n\n            finalSchema = baseSchema.extend({\n                extensions: extensionsSchema\n            }) as any;\n        }\n\n        let modelBuilder = new ModelBuilder<any>(this.modelId, finalSchema);\n\n        if (Object.keys(this.modelMethods).length > 0) {\n            modelBuilder = modelBuilder.withMethods(this.modelMethods);\n        }\n\n        const ModelClass = modelBuilder.build();\n\n        const allFields = [\n            ...this.fieldDefinitionsBuilder.__getFields(),\n            ...(this.extensionFields.size > 0\n                ? [\n                      {\n                          fieldId: \"extensions\",\n                          type: \"object\",\n                          label: \"Extensions\",\n                          validation: [],\n                          settings: {},\n                          zodSchema: z\n                              .object(\n                                  Object.fromEntries(\n                                      Array.from(this.extensionFields.entries()).map(\n                                          ([id, { zodSchema }]) => [id, zodSchema.optional()]\n                                      )\n                                  )\n                              )\n                              .optional(),\n                          fields: Array.from(this.extensionFields.values()).map(f => f.config)\n                      }\n                  ]\n                : [])\n        ];\n\n        return {\n            type: \"private\" as const,\n            modelType: \"private\" as const,\n            Model: ModelClass as any,\n            modelId: this.modelId,\n            name: this.modelId,\n            icon: this.metadata.icon,\n            description: this.metadata.description,\n            fields: allFields,\n            schema: modelBuilder.getSchema() as TModel[\"__schema\"],\n            create: (data: IModelData<TModel>) => ModelClass.create(data) as TModel\n        };\n    }\n}\n\nexport const PrivateCmsModelBuilder = createImplementation({\n    abstraction: BuilderAbstraction,\n    implementation: PrivateCmsModelBuilderImpl,\n    dependencies: [FieldBuilderRegistry]\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["z","FieldDefinitionsBuilder","createImplementation","FieldBuilderRegistry","PrivateCmsModelBuilder","BuilderAbstraction","ModelBuilder","PrivateCmsModelBuilderImpl","constructor","fieldBuilderRegistry","create","modelId","fieldDefinitions","builder","fieldShape","factory","fieldDefinitionsBuilder","__fromObject","PrivateCmsModelConfiguration","metadata","modelMethods","extensionFields","Map","withMethods","methods","Object","assign","extendFields","fieldId","fieldBuilder","entries","config","toConfig","zodSchema","getZodSchema","set","build","baseSchema","__toZodSchema","finalSchema","size","extensionsShape","optional","extensionsSchema","object","extend","extensions","modelBuilder","keys","length","ModelClass","allFields","__getFields","type","label","validation","settings","fromEntries","Array","from","map","id","fields","values","f","modelType","Model","name","icon","description","schema","getSchema","data","abstraction","implementation","dependencies"],"sources":["PrivateCmsModelBuilder.ts"],"sourcesContent":["import { z } from \"zod\";\nimport {\n    FieldDefinitionsBuilder,\n    type FieldDefinitionsFactory\n} from \"./FieldDefinitionsBuilder.js\";\nimport type { BaseModel } from \"../base/BaseModel.js\";\nimport type { IModelData } from \"../base/abstractions.js\";\nimport type { PrivateCmsModel, CmsModelMetadata, FieldBuilderConfig } from \"./types.js\";\n// Import your existing ModelBuilder\nimport { FieldBuilder } from \"./FieldBuilder.js\";\nimport { createImplementation } from \"@webiny/di\";\nimport {\n    FieldBuilderRegistry,\n    type IFieldBuilderRegistry,\n    PrivateCmsModelBuilder as BuilderAbstraction\n} from \"~/models/cms/abstractions.js\";\nimport { ModelBuilder } from \"~/models/base/ModelBuilder.js\";\n\nexport interface IPrivateCmsModelBuilder {\n    create<TModel extends BaseModel<any>, TFields extends z.ZodRawShape = any>(\n        modelId: string,\n        fieldDefinitions: FieldDefinitionsFactory<TFields>\n    ): IPrivateCmsModelConfiguration<TModel>;\n}\n\nexport interface IPrivateCmsModelConfiguration<TModel extends BaseModel<any>> {\n    withMethods<TMethods extends object>(\n        methods: TMethods & ThisType<TModel & TMethods>\n    ): IPrivateCmsModelConfiguration<TModel>;\n    extendFields(\n        factory: (fields: IFieldBuilderRegistry) => Record<string, FieldBuilder<any>>\n    ): IPrivateCmsModelConfiguration<TModel>;\n    build(): PrivateCmsModel<TModel>;\n}\n\nclass PrivateCmsModelBuilderImpl implements IPrivateCmsModelBuilder {\n    constructor(private fieldBuilderRegistry: IFieldBuilderRegistry) {}\n\n    create<TModel extends BaseModel<any>, TFields extends z.ZodRawShape = any>(\n        modelId: string,\n        fieldDefinitions: FieldDefinitionsFactory<TFields>\n    ): IPrivateCmsModelConfiguration<TModel> {\n        const builder = new FieldDefinitionsBuilder(this.fieldBuilderRegistry);\n        const fieldShape = fieldDefinitions.factory(this.fieldBuilderRegistry);\n        const fieldDefinitionsBuilder = builder.__fromObject(fieldShape);\n\n        return new PrivateCmsModelConfiguration<TModel>(\n            modelId,\n            this.fieldBuilderRegistry,\n            fieldDefinitionsBuilder\n        );\n    }\n}\n\nclass PrivateCmsModelConfiguration<TModel extends BaseModel<any>>\n    implements IPrivateCmsModelConfiguration<TModel>\n{\n    private metadata: CmsModelMetadata = {};\n    // eslint-disable-next-line\n    private modelMethods: Record<string, Function> = {};\n    private extensionFields = new Map<string, FieldBuilderConfig>();\n\n    constructor(\n        private modelId: string,\n        private fieldBuilderRegistry: IFieldBuilderRegistry,\n        private fieldDefinitionsBuilder: FieldDefinitionsBuilder\n    ) {}\n\n    withMethods<TMethods extends object>(\n        methods: TMethods & ThisType<TModel & TMethods>\n    ): IPrivateCmsModelConfiguration<TModel> {\n        Object.assign(this.modelMethods, methods);\n        return this as any;\n    }\n\n    extendFields(\n        factory: (fields: IFieldBuilderRegistry) => Record<string, FieldBuilder<any>>\n    ): IPrivateCmsModelConfiguration<TModel> {\n        // Use the factory to get field shape - same as createFieldDefinitions!\n        const fieldShape = factory(this.fieldBuilderRegistry);\n\n        // Convert to field configs\n        for (const [fieldId, fieldBuilder] of Object.entries(fieldShape)) {\n            const config = fieldBuilder.toConfig();\n            config.fieldId = fieldId;\n            const zodSchema = fieldBuilder.getZodSchema();\n\n            this.extensionFields.set(fieldId, {\n                fieldId,\n                config,\n                zodSchema\n            });\n        }\n\n        return this as any;\n    }\n\n    build(): PrivateCmsModel<TModel> {\n        const baseSchema = this.fieldDefinitionsBuilder.__toZodSchema();\n        let finalSchema = baseSchema;\n\n        if (this.extensionFields.size > 0) {\n            const extensionsShape: Record<string, z.ZodTypeAny> = {};\n\n            for (const [fieldId, { zodSchema }] of this.extensionFields) {\n                // Make each extension field optional\n                extensionsShape[fieldId] = zodSchema.optional();\n            }\n\n            const extensionsSchema = z.object(extensionsShape).optional();\n\n            finalSchema = baseSchema.extend({\n                extensions: extensionsSchema\n            }) as any;\n        }\n\n        let modelBuilder = new ModelBuilder<any>(this.modelId, finalSchema);\n\n        if (Object.keys(this.modelMethods).length > 0) {\n            modelBuilder = modelBuilder.withMethods(this.modelMethods);\n        }\n\n        const ModelClass = modelBuilder.build();\n\n        const allFields = [\n            ...this.fieldDefinitionsBuilder.__getFields(),\n            ...(this.extensionFields.size > 0\n                ? [\n                      {\n                          fieldId: \"extensions\",\n                          type: \"object\",\n                          label: \"Extensions\",\n                          validation: [],\n                          settings: {},\n                          zodSchema: z\n                              .object(\n                                  Object.fromEntries(\n                                      Array.from(this.extensionFields.entries()).map(\n                                          ([id, { zodSchema }]) => [id, zodSchema.optional()]\n                                      )\n                                  )\n                              )\n                              .optional(),\n                          fields: Array.from(this.extensionFields.values()).map(f => f.config)\n                      }\n                  ]\n                : [])\n        ];\n\n        return {\n            type: \"private\" as const,\n            modelType: \"private\" as const,\n            Model: ModelClass as any,\n            modelId: this.modelId,\n            name: this.modelId,\n            icon: this.metadata.icon,\n            description: this.metadata.description,\n            fields: allFields,\n            schema: modelBuilder.getSchema() as TModel[\"__schema\"],\n            create: (data: IModelData<TModel>) => ModelClass.create(data) as TModel\n        };\n    }\n}\n\nexport const PrivateCmsModelBuilder = createImplementation({\n    abstraction: BuilderAbstraction,\n    implementation: PrivateCmsModelBuilderImpl,\n    dependencies: [FieldBuilderRegistry]\n});\n"],"mappings":"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","ignoreList":[]}

package/models/cms/abstractions.d.ts

@@ -9,7 +9,7 @@ import type { BaseModel, IModelData } from "../../models/base/BaseModel.js";
  */
 export interface IFieldBuilderRegistry {
     text(): TextFieldBuilder<z.ZodString>;
-    object<TShape extends z.ZodRawShape>(fields: (registry: IFieldBuilderRegistry) => {
+    object<TShape extends Record<string, z.ZodTypeAny>>(fields: (registry: IFieldBuilderRegistry) => {
         [K in keyof TShape]: FieldBuilder<TShape[K]>;
     }): ObjectFieldBuilder<TShape>;
 }

package/models/cms/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"names":["Abstraction","FieldBuilderRegistry","PrivateCmsModelBuilder"],"sources":["abstractions.ts"],"sourcesContent":["import { z } from \"zod\";\nimport { Abstraction } from \"@webiny/di\";\nimport type { IPrivateCmsModelConfiguration } from \"./PrivateCmsModelBuilder.js\";\nimport type { FieldDefinitionsFactory } from \"./FieldDefinitionsBuilder.js\";\nimport { type TextFieldBuilder, type ObjectFieldBuilder, FieldBuilder } from \"./FieldBuilder.js\";\nimport type { BaseModel, IModelData } from \"~/models/base/BaseModel.js\";\n\n/**\n * Field Builder Registry - provides field builders\n */\nexport interface IFieldBuilderRegistry {\n    text(): TextFieldBuilder<z.ZodString>;\n    object<TShape extends z.ZodRawShape>(\n        fields: (registry: IFieldBuilderRegistry) => {\n            [K in keyof TShape]: FieldBuilder<TShape[K]>;\n        }\n    ): ObjectFieldBuilder<TShape>;\n}\n\nexport const FieldBuilderRegistry = new Abstraction<IFieldBuilderRegistry>(\"FieldBuilderRegistry\");\n\n/**\n * Private CMS Model Builder - builds CMS model configurations\n */\nexport interface IPrivateCmsModelBuilder {\n    create<TModel extends BaseModel<any>>(\n        modelId: string,\n        fieldDefinitions: FieldDefinitionsFactory<any>\n    ): IPrivateCmsModelConfiguration<TModel>;\n}\n\nexport const PrivateCmsModelBuilder = new Abstraction<IPrivateCmsModelBuilder>(\n    \"PrivateCmsModelBuilder\"\n);\n\nexport namespace PrivateCmsModelBuilder {\n    export type Interface = IPrivateCmsModelBuilder;\n}\n\n/**\n * CMS Model Builder - builds the model configuration for a specific model\n */\nexport interface ICmsModelBuilder<TModel extends BaseModel<any>> {\n    buildCmsModel(): Promise<IPrivateCmsModelConfiguration<TModel>>;\n}\n\n/**\n * CMS Model Factory - creates model instances\n */\nexport interface ICmsModelFactory<TModel extends BaseModel<any>> {\n    create(data: IModelData<TModel>): Promise<TModel>;\n}\n"],"mappings":"AACA,SAASA,WAAW,QAAQ,YAAY;;AAMxC;AACA;AACA;;AAUA,OAAO,MAAMC,oBAAoB,GAAG,IAAID,WAAW,CAAwB,sBAAsB,CAAC;;AAElG;AACA;AACA;;AAQA,OAAO,MAAME,sBAAsB,GAAG,IAAIF,WAAW,CACjD,wBACJ,CAAC;;AAMD;AACA;AACA;;AAKA;AACA;AACA","ignoreList":[]}
+{"version":3,"names":["Abstraction","FieldBuilderRegistry","PrivateCmsModelBuilder"],"sources":["abstractions.ts"],"sourcesContent":["import { z } from \"zod\";\nimport { Abstraction } from \"@webiny/di\";\nimport type { IPrivateCmsModelConfiguration } from \"./PrivateCmsModelBuilder.js\";\nimport type { FieldDefinitionsFactory } from \"./FieldDefinitionsBuilder.js\";\nimport { type TextFieldBuilder, type ObjectFieldBuilder, FieldBuilder } from \"./FieldBuilder.js\";\nimport type { BaseModel, IModelData } from \"~/models/base/BaseModel.js\";\n\n/**\n * Field Builder Registry - provides field builders\n */\nexport interface IFieldBuilderRegistry {\n    text(): TextFieldBuilder<z.ZodString>;\n    object<TShape extends Record<string, z.ZodTypeAny>>(\n        fields: (registry: IFieldBuilderRegistry) => {\n            [K in keyof TShape]: FieldBuilder<TShape[K]>;\n        }\n    ): ObjectFieldBuilder<TShape>;\n}\n\nexport const FieldBuilderRegistry = new Abstraction<IFieldBuilderRegistry>(\"FieldBuilderRegistry\");\n\n/**\n * Private CMS Model Builder - builds CMS model configurations\n */\nexport interface IPrivateCmsModelBuilder {\n    create<TModel extends BaseModel<any>>(\n        modelId: string,\n        fieldDefinitions: FieldDefinitionsFactory<any>\n    ): IPrivateCmsModelConfiguration<TModel>;\n}\n\nexport const PrivateCmsModelBuilder = new Abstraction<IPrivateCmsModelBuilder>(\n    \"PrivateCmsModelBuilder\"\n);\n\nexport namespace PrivateCmsModelBuilder {\n    export type Interface = IPrivateCmsModelBuilder;\n}\n\n/**\n * CMS Model Builder - builds the model configuration for a specific model\n */\nexport interface ICmsModelBuilder<TModel extends BaseModel<any>> {\n    buildCmsModel(): Promise<IPrivateCmsModelConfiguration<TModel>>;\n}\n\n/**\n * CMS Model Factory - creates model instances\n */\nexport interface ICmsModelFactory<TModel extends BaseModel<any>> {\n    create(data: IModelData<TModel>): Promise<TModel>;\n}\n"],"mappings":"AACA,SAASA,WAAW,QAAQ,YAAY;;AAMxC;AACA;AACA;;AAUA,OAAO,MAAMC,oBAAoB,GAAG,IAAID,WAAW,CAAwB,sBAAsB,CAAC;;AAElG;AACA;AACA;;AAQA,OAAO,MAAME,sBAAsB,GAAG,IAAIF,WAAW,CACjD,wBACJ,CAAC;;AAMD;AACA;AACA;;AAKA;AACA;AACA","ignoreList":[]}

package/models/cms/fieldsBuilder.md

@@ -194,7 +194,7 @@ import type { FieldBuilder } from "./FieldBuilder.js";
 export interface IFieldBuilderRegistry {
   text(): ITextFieldBuilder;
   // object is special - needs registry reference
-  object<TShape extends z.ZodRawShape>(
+  object<TShape extends  Record<string, z.ZodTypeAny>>(
     fields: (registry: IFieldBuilderRegistry) => { [K in keyof TShape]: FieldBuilder<TShape[K]> }
   ): FieldBuilder<z.ZodObject<TShape>>;
 }

package/models/simple/Page/abstractions.d.ts

@@ -5,17 +5,7 @@ export declare const PageSchema: import("zod").ZodObject<{
     title: import("zod").ZodString;
     content: import("zod").ZodString;
     publishedAt: import("zod").ZodNullable<import("zod").ZodDate>;
-}, "strip", import("zod").ZodTypeAny, {
-    id: string;
-    title: string;
-    publishedAt: Date | null;
-    content: string;
-}, {
-    id: string;
-    title: string;
-    publishedAt: Date | null;
-    content: string;
-}>;
+}, import("zod/v4/core").$strip>;
 export interface IPageExtensions {
 }
 export interface IPage extends IModel<typeof PageSchema> {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-core",
-	"version": "6.0.0",
+	"version": "6.1.0-beta.1",
 	"type": "module",
 	"main": "index.js",
 	"repository": {
@@ -57,41 +57,41 @@
 	},
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api": "6.0.0",
+		"@webiny/api": "6.1.0-beta.1",
 		"@webiny/di": "0.2.3",
-		"@webiny/error": "6.0.0",
-		"@webiny/feature": "6.0.0",
-		"@webiny/feature-flags": "6.0.0",
-		"@webiny/handler": "6.0.0",
-		"@webiny/handler-db": "6.0.0",
-		"@webiny/handler-graphql": "6.0.0",
-		"@webiny/plugins": "6.0.0",
-		"@webiny/utils": "6.0.0",
-		"@webiny/wcp": "6.0.0",
+		"@webiny/error": "6.1.0-beta.1",
+		"@webiny/feature": "6.1.0-beta.1",
+		"@webiny/feature-flags": "6.1.0-beta.1",
+		"@webiny/handler": "6.1.0-beta.1",
+		"@webiny/handler-db": "6.1.0-beta.1",
+		"@webiny/handler-graphql": "6.1.0-beta.1",
+		"@webiny/plugins": "6.1.0-beta.1",
+		"@webiny/utils": "6.1.0-beta.1",
+		"@webiny/wcp": "6.1.0-beta.1",
 		"dataloader": "2.2.3",
-		"jose": "5.10.0",
+		"jose": "6.2.2",
 		"jsonwebtoken": "9.0.3",
 		"lodash": "4.17.23",
 		"minimatch": "10.2.4",
-		"pino": "9.14.0",
+		"pino": "10.3.1",
 		"pino-lambda": "4.4.1",
-		"zod": "3.25.76"
+		"zod": "4.3.6"
 	},
 	"devDependencies": {
 		"@types/jsonwebtoken": "9.0.10",
 		"@types/md5": "2.3.6",
-		"@webiny/build-tools": "6.0.0",
-		"@webiny/db-dynamodb": "6.0.0",
-		"@webiny/handler-aws": "6.0.0",
-		"@webiny/project-utils": "6.0.0",
+		"@webiny/build-tools": "6.1.0-beta.1",
+		"@webiny/db-dynamodb": "6.1.0-beta.1",
+		"@webiny/handler-aws": "6.1.0-beta.1",
+		"@webiny/project-utils": "6.1.0-beta.1",
 		"jest-dynalite": "3.6.1",
 		"rimraf": "6.1.3",
 		"typescript": "5.9.3",
-		"vitest": "4.0.18"
+		"vitest": "4.1.2"
 	},
 	"publishConfig": {
 		"access": "public",
 		"directory": "dist"
 	},
-	"gitHead": "9c6892640a45679ff521e25cd6587dff57393a2e"
+	"gitHead": "3c1293ba17a14f239fb1cbf5d80cd66846849309"
 }