@webiny/api-core 0.0.0-unstable.ac6ebf63c6 → 0.0.0-unstable.b6d7105cee

package/legacy/wcp/context.js.map

@@ -1 +1 @@
-{"version":3,"names":["ContextPlugin","getWcpProjectLicense","getWcpProjectEnvironment","NullLicense","License","getWcpProjectLicenseCacheKey","WcpFeature","LegacyWcpContext","createWcpGraphQL","wcpProjectEnvironment","cachedLicense","cacheKey","project","license","loadLicense","testProjectLicense","fromLicenseDto","currentCacheKey","decryptedLicenseDto","orgId","org","id","projectId","projectEnvironmentApiKey","apiKey","package","createWcpContext","params","plugin","context","register","container","wcp","plugins","name"],"sources":["context.ts"],"sourcesContent":["import { ContextPlugin } from \"@webiny/api\";\nimport { getWcpProjectLicense, getWcpProjectEnvironment, NullLicense } from \"@webiny/wcp\";\nimport type { DecryptedWcpProjectLicense, ILicense } from \"@webiny/wcp/types.js\";\nimport { License } from \"@webiny/wcp\";\nimport type { CachedWcpProjectLicense, WcpContext } from \"~/features/wcp/WcpContext/types.js\";\nimport { getWcpProjectLicenseCacheKey } from \"~/features/wcp/WcpContext/utils.js\";\nimport { WcpFeature } from \"~/features/wcp/WcpFeature.js\";\nimport { LegacyWcpContext } from \"./LegacyWcpContext.js\";\nimport { createWcpGraphQL } from \"~/graphql/wcp/graphql.js\";\n\nconst wcpProjectEnvironment = getWcpProjectEnvironment();\n\nconst cachedLicense: CachedWcpProjectLicense = {\n    cacheKey: null,\n    project: null,\n    license: new NullLicense()\n};\n\nasync function loadLicense(testProjectLicense?: DecryptedWcpProjectLicense): Promise<ILicense> {\n    if (testProjectLicense) {\n        cachedLicense.license = License.fromLicenseDto(testProjectLicense);\n    } else if (wcpProjectEnvironment) {\n        const currentCacheKey = getWcpProjectLicenseCacheKey();\n        if (cachedLicense.cacheKey !== currentCacheKey) {\n            cachedLicense.cacheKey = currentCacheKey;\n            // Pull the project license from the WCP API.\n            const decryptedLicenseDto = await getWcpProjectLicense({\n                orgId: wcpProjectEnvironment.org.id,\n                projectId: wcpProjectEnvironment.project.id,\n                projectEnvironmentApiKey: wcpProjectEnvironment.apiKey\n            });\n\n            if (decryptedLicenseDto) {\n                cachedLicense.project = {\n                    orgId: decryptedLicenseDto.orgId,\n                    projectId: decryptedLicenseDto.projectId,\n                    package: decryptedLicenseDto.package\n                };\n            }\n\n            cachedLicense.license = License.fromLicenseDto(decryptedLicenseDto);\n        }\n    }\n\n    return cachedLicense.license;\n}\n\nexport interface CreateWcpContextParams {\n    testProjectLicense?: DecryptedWcpProjectLicense;\n}\n\nexport const createWcpContext = (params: CreateWcpContextParams = {}) => {\n    const plugin = new ContextPlugin<WcpContext>(async context => {\n        const license = await loadLicense(params.testProjectLicense);\n\n        WcpFeature.register(context.container, license);\n\n        context.wcp = new LegacyWcpContext(context.container);\n\n        context.plugins.register(createWcpGraphQL());\n    });\n\n    plugin.name = \"wcp.context.create\";\n\n    return plugin;\n};\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,aAAa;AAC3C,SAASC,oBAAoB,EAAEC,wBAAwB,EAAEC,WAAW,QAAQ,aAAa;AAEzF,SAASC,OAAO,QAAQ,aAAa;AAErC,SAASC,4BAA4B;AACrC,SAASC,UAAU;AACnB,SAASC,gBAAgB;AACzB,SAASC,gBAAgB;AAEzB,MAAMC,qBAAqB,GAAGP,wBAAwB,CAAC,CAAC;AAExD,MAAMQ,aAAsC,GAAG;EAC3CC,QAAQ,EAAE,IAAI;EACdC,OAAO,EAAE,IAAI;EACbC,OAAO,EAAE,IAAIV,WAAW,CAAC;AAC7B,CAAC;AAED,eAAeW,WAAWA,CAACC,kBAA+C,EAAqB;EAC3F,IAAIA,kBAAkB,EAAE;IACpBL,aAAa,CAACG,OAAO,GAAGT,OAAO,CAACY,cAAc,CAACD,kBAAkB,CAAC;EACtE,CAAC,MAAM,IAAIN,qBAAqB,EAAE;IAC9B,MAAMQ,eAAe,GAAGZ,4BAA4B,CAAC,CAAC;IACtD,IAAIK,aAAa,CAACC,QAAQ,KAAKM,eAAe,EAAE;MAC5CP,aAAa,CAACC,QAAQ,GAAGM,eAAe;MACxC;MACA,MAAMC,mBAAmB,GAAG,MAAMjB,oBAAoB,CAAC;QACnDkB,KAAK,EAAEV,qBAAqB,CAACW,GAAG,CAACC,EAAE;QACnCC,SAAS,EAAEb,qBAAqB,CAACG,OAAO,CAACS,EAAE;QAC3CE,wBAAwB,EAAEd,qBAAqB,CAACe;MACpD,CAAC,CAAC;MAEF,IAAIN,mBAAmB,EAAE;QACrBR,aAAa,CAACE,OAAO,GAAG;UACpBO,KAAK,EAAED,mBAAmB,CAACC,KAAK;UAChCG,SAAS,EAAEJ,mBAAmB,CAACI,SAAS;UACxCG,OAAO,EAAEP,mBAAmB,CAACO;QACjC,CAAC;MACL;MAEAf,aAAa,CAACG,OAAO,GAAGT,OAAO,CAACY,cAAc,CAACE,mBAAmB,CAAC;IACvE;EACJ;EAEA,OAAOR,aAAa,CAACG,OAAO;AAChC;AAMA,OAAO,MAAMa,gBAAgB,GAAGA,CAACC,MAA8B,GAAG,CAAC,CAAC,KAAK;EACrE,MAAMC,MAAM,GAAG,IAAI5B,aAAa,CAAa,MAAM6B,OAAO,IAAI;IAC1D,MAAMhB,OAAO,GAAG,MAAMC,WAAW,CAACa,MAAM,CAACZ,kBAAkB,CAAC;IAE5DT,UAAU,CAACwB,QAAQ,CAACD,OAAO,CAACE,SAAS,EAAElB,OAAO,CAAC;IAE/CgB,OAAO,CAACG,GAAG,GAAG,IAAIzB,gBAAgB,CAACsB,OAAO,CAACE,SAAS,CAAC;IAErDF,OAAO,CAACI,OAAO,CAACH,QAAQ,CAACtB,gBAAgB,CAAC,CAAC,CAAC;EAChD,CAAC,CAAC;EAEFoB,MAAM,CAACM,IAAI,GAAG,oBAAoB;EAElC,OAAON,MAAM;AACjB,CAAC","ignoreList":[]}
+{"version":3,"file":"legacy/wcp/context.js","sources":["../../../src/legacy/wcp/context.ts"],"sourcesContent":["import { getWcpProjectLicense, getWcpProjectEnvironment, NullLicense } from \"@webiny/wcp\";\nimport type { DecryptedWcpProjectLicense, ILicense } from \"@webiny/wcp/types.js\";\nimport { License } from \"@webiny/wcp\";\nimport { createRegisterExtensionPlugin } from \"@webiny/handler/plugins/RegisterExtensionPlugin.js\";\nimport type { CachedWcpProjectLicense } from \"~/features/wcp/WcpContext/types.js\";\nimport { getWcpProjectLicenseCacheKey } from \"~/features/wcp/WcpContext/utils.js\";\nimport { WcpFeature } from \"~/features/wcp/WcpFeature.js\";\nimport { LegacyWcpContext } from \"./LegacyWcpContext.js\";\nimport { createWcpGraphQL } from \"~/graphql/wcp/graphql.js\";\n\nconst wcpProjectEnvironment = getWcpProjectEnvironment();\n\nconst cachedLicense: CachedWcpProjectLicense = {\n    cacheKey: null,\n    project: null,\n    license: new NullLicense()\n};\n\nasync function loadLicense(testProjectLicense?: DecryptedWcpProjectLicense): Promise<ILicense> {\n    if (testProjectLicense) {\n        cachedLicense.license = License.fromLicenseDto(testProjectLicense);\n    } else if (wcpProjectEnvironment) {\n        const currentCacheKey = getWcpProjectLicenseCacheKey();\n        if (cachedLicense.cacheKey !== currentCacheKey) {\n            cachedLicense.cacheKey = currentCacheKey;\n            // Pull the project license from the WCP API.\n            const decryptedLicenseDto = await getWcpProjectLicense({\n                orgId: wcpProjectEnvironment.org.id,\n                projectId: wcpProjectEnvironment.project.id,\n                projectEnvironmentApiKey: wcpProjectEnvironment.apiKey\n            });\n\n            if (decryptedLicenseDto) {\n                cachedLicense.project = {\n                    orgId: decryptedLicenseDto.orgId,\n                    projectId: decryptedLicenseDto.projectId,\n                    package: decryptedLicenseDto.package\n                };\n            }\n\n            cachedLicense.license = License.fromLicenseDto(decryptedLicenseDto);\n        }\n    }\n\n    return cachedLicense.license;\n}\n\nexport interface CreateWcpContextParams {\n    testProjectLicense?: DecryptedWcpProjectLicense;\n}\n\nexport const createWcpContext = (params: CreateWcpContextParams = {}) => {\n    const plugin = createRegisterExtensionPlugin(async context => {\n        const license = await loadLicense(params.testProjectLicense);\n\n        WcpFeature.register(context.container, license);\n\n        // @ts-expect-error This is a legacy property\n        context.wcp = new LegacyWcpContext(context.container);\n\n        context.plugins.register(createWcpGraphQL());\n    });\n\n    plugin.name = \"wcp.context.create\";\n\n    return plugin;\n};\n"],"names":["wcpProjectEnvironment","getWcpProjectEnvironment","cachedLicense","NullLicense","loadLicense","testProjectLicense","License","currentCacheKey","getWcpProjectLicenseCacheKey","decryptedLicenseDto","getWcpProjectLicense","createWcpContext","params","plugin","createRegisterExtensionPlugin","context","license","WcpFeature","LegacyWcpContext","createWcpGraphQL"],"mappings":";;;;;;AAUA,MAAMA,wBAAwBC;AAE9B,MAAMC,gBAAyC;IAC3C,UAAU;IACV,SAAS;IACT,SAAS,IAAIC;AACjB;AAEA,eAAeC,YAAYC,kBAA+C;IACtE,IAAIA,oBACAH,cAAc,OAAO,GAAGI,QAAQ,cAAc,CAACD;SAC5C,IAAIL,uBAAuB;QAC9B,MAAMO,kBAAkBC;QACxB,IAAIN,cAAc,QAAQ,KAAKK,iBAAiB;YAC5CL,cAAc,QAAQ,GAAGK;YAEzB,MAAME,sBAAsB,MAAMC,qBAAqB;gBACnD,OAAOV,sBAAsB,GAAG,CAAC,EAAE;gBACnC,WAAWA,sBAAsB,OAAO,CAAC,EAAE;gBAC3C,0BAA0BA,sBAAsB,MAAM;YAC1D;YAEA,IAAIS,qBACAP,cAAc,OAAO,GAAG;gBACpB,OAAOO,oBAAoB,KAAK;gBAChC,WAAWA,oBAAoB,SAAS;gBACxC,SAASA,oBAAoB,OAAO;YACxC;YAGJP,cAAc,OAAO,GAAGI,QAAQ,cAAc,CAACG;QACnD;IACJ;IAEA,OAAOP,cAAc,OAAO;AAChC;AAMO,MAAMS,mBAAmB,CAACC,SAAiC,CAAC,CAAC;IAChE,MAAMC,SAASC,8BAA8B,OAAMC;QAC/C,MAAMC,UAAU,MAAMZ,YAAYQ,OAAO,kBAAkB;QAE3DK,WAAW,QAAQ,CAACF,QAAQ,SAAS,EAAEC;QAGvCD,QAAQ,GAAG,GAAG,IAAIG,iBAAiBH,QAAQ,SAAS;QAEpDA,QAAQ,OAAO,CAAC,QAAQ,CAACI;IAC7B;IAEAN,OAAO,IAAI,GAAG;IAEd,OAAOA;AACX"}

package/models/base/BaseModel.js

@@ -1,64 +1,59 @@
 import { Result } from "@webiny/feature/api";
 import { WebinyError } from "@webiny/error";
-export class BaseModel {
-  get __schema() {
-    throw new Error("Schema getter is not implemented!");
-  }
-  constructor(data) {
-    this.validateData(data);
-    this.populate(data);
-  }
-  populate(data) {
-    Object.assign(this, data);
-  }
-  validate() {
-    try {
-      this.validateData(this.toData());
-      return Result.ok(true);
-    } catch (error) {
-      return Result.fail(error);
+class BaseModel {
+    get __schema() {
+        throw new Error("Schema getter is not implemented!");
     }
-  }
-  validateOrThrow() {
-    this.validateData(this.toData());
-  }
-  clone() {
-    const Constructor = this.constructor;
-    return new Constructor(this.toData());
-  }
-  toData() {
-    if (this.__schema && this.__schema._def?.typeName === "ZodObject") {
-      const result = {};
-      const shape = this.__schema.shape;
-      for (const key in shape) {
-        // always use structuredClone for safety.
-        // @ts-expect-error allow index.
-        result[key] = structuredClone(this[key]);
-      }
-      return result;
+    constructor(data){
+        this.validateData(data);
+        this.populate(data);
     }
-    return {
-      ...this
-    };
-  }
-  updateWith(partial) {
-    const updated = {
-      ...this.toData(),
-      ...partial
-    };
-    this.validateData(updated);
-    this.populate(updated);
-  }
-  validateData(data) {
-    const result = this.__schema.safeParse(data);
-    if (!result.success) {
-      throw new WebinyError({
-        message: "Validation error",
-        code: "DOMAIN_MODEL_VALIDATION_ERROR",
-        data: result.error.errors
-      });
+    populate(data) {
+        Object.assign(this, data);
+    }
+    validate() {
+        try {
+            this.validateData(this.toData());
+            return Result.ok(true);
+        } catch (error) {
+            return Result.fail(error);
+        }
+    }
+    validateOrThrow() {
+        this.validateData(this.toData());
+    }
+    clone() {
+        const Constructor = this.constructor;
+        return new Constructor(this.toData());
+    }
+    toData() {
+        if (this.__schema && this.__schema.def?.type === "object") {
+            const result = {};
+            const shape = this.__schema.shape;
+            for(const key in shape)result[key] = structuredClone(this[key]);
+            return result;
+        }
+        return {
+            ...this
+        };
+    }
+    updateWith(partial) {
+        const updated = {
+            ...this.toData(),
+            ...partial
+        };
+        this.validateData(updated);
+        this.populate(updated);
+    }
+    validateData(data) {
+        const result = this.__schema.safeParse(data);
+        if (!result.success) throw new WebinyError({
+            message: "Validation error",
+            code: "DOMAIN_MODEL_VALIDATION_ERROR",
+            data: result.error.issues
+        });
     }
-  }
 }
+export { BaseModel };
 
 //# sourceMappingURL=BaseModel.js.map

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,"file":"models/base/BaseModel.js","sources":["../../../src/models/base/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    // oxlint-disable-next-line typescript/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"],"names":["BaseModel","Error","data","Object","Result","error","Constructor","result","shape","key","structuredClone","partial","updated","WebinyError"],"mappings":";;AAaO,MAAeA;IAClB,IAAI,WAAmB;QACnB,MAAM,IAAIC,MAAM;IACpB;IAEA,YAAYC,IAAwB,CAAE;QAClC,IAAI,CAAC,YAAY,CAACA;QAClB,IAAI,CAAC,QAAQ,CAACA;IAClB;IAEA,SAASA,IAAwB,EAAQ;QACrCC,OAAO,MAAM,CAAC,IAAI,EAAED;IACxB;IAEA,WAAsC;QAClC,IAAI;YACA,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM;YAC7B,OAAOE,OAAO,EAAE,CAAC;QACrB,EAAE,OAAOC,OAAO;YACZ,OAAOD,OAAO,IAAI,CAACC;QACvB;IACJ;IAEA,kBAAwB;QACpB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM;IACjC;IAEA,QAAc;QACV,MAAMC,cAAc,IAAI,CAAC,WAAW;QACpC,OAAO,IAAIA,YAAY,IAAI,CAAC,MAAM;IACtC;IAEA,SAA6B;QACzB,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,UAAU;YACvD,MAAMC,SAAS,CAAC;YAChB,MAAMC,QAAQ,IAAI,CAAC,QAAQ,CAAC,KAAK;YACjC,IAAK,MAAMC,OAAOD,MAGdD,MAAM,CAACE,IAAI,GAAGC,gBAAgB,IAAI,CAACD,IAAI;YAE3C,OAAOF;QACX;QAEA,OAAO;YAAE,GAAI,IAAI;QAAS;IAC9B;IAEA,WAAWI,OAAkC,EAAQ;QACjD,MAAMC,UAAU;YAAE,GAAG,IAAI,CAAC,MAAM,EAAE;YAAE,GAAGD,OAAO;QAAC;QAC/C,IAAI,CAAC,YAAY,CAACC;QAClB,IAAI,CAAC,QAAQ,CAACA;IAClB;IAEU,aAAaV,IAAwB,EAAQ;QACnD,MAAMK,SAAS,IAAI,CAAC,QAAQ,CAAC,SAAS,CAACL;QACvC,IAAI,CAACK,OAAO,OAAO,EACf,MAAM,IAAIM,YAAY;YAClB,SAAS;YACT,MAAM;YACN,MAAMN,OAAO,KAAK,CAAC,MAAM;QAC7B;IAER;AACJ"}

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,68 +1,74 @@
 import { z } from "zod";
 import { BaseModel } from "./BaseModel.js";
-export const createModelSchema = factory => {
-  return z.object({
-    ...factory(z)
-  });
+const createModelSchema = (factory)=>z.object({
+        ...factory(z)
+    });
+const shouldAssign = (inner)=>{
+    if (inner) {
+        if ("def" in inner) {
+            if ("optional" === inner.def.type) return true;
+            else if ("nullable" === inner.def.type) return true;
+            else if ("default" === inner.def.type) return true;
+        }
+    }
+    return false;
 };
-export class ModelBuilder {
-  methods = {};
-  constructor(name, schema) {
-    this.name = name;
-    this.schema = schema;
-    this.methods = {};
-  }
-  extendSchema(extensionFn) {
-    const shape = extensionFn(z);
-    const baseExtensions = this.schema.shape.extensions;
-    let baseExtensionsObject;
-    if (baseExtensions instanceof z.ZodObject) {
-      baseExtensionsObject = baseExtensions;
-    } else if (baseExtensions) {
-      let inner = baseExtensions;
-      while (inner && "_def" in inner && ["ZodOptional", "ZodNullable", "ZodDefault"].includes(inner._def.typeName)) {
-        inner = inner._def.innerType;
-      }
-      baseExtensionsObject = inner instanceof z.ZodObject ? inner : z.object({});
-    } else {
-      baseExtensionsObject = z.object({});
+class ModelBuilder {
+    constructor(name, schema){
+        this.name = name;
+        this.schema = schema;
+        this.methods = {};
+        this.methods = {};
     }
-    const newExtensions = baseExtensionsObject.extend(shape);
-    this.schema = this.schema.extend({
-      extensions: newExtensions
-    });
-    return this;
-  }
-  withMethods(methods) {
-    Object.assign(this.methods, methods);
-    return this;
-  }
-  getSchema() {
-    return this.schema;
-  }
-  build() {
-    const schema = this.schema;
-    const methods = this.methods;
-    const name = this.name;
-    class Model extends BaseModel {
-      get __schema() {
-        return schema;
-      }
-      static __schema = schema;
-      static create(data) {
-        return new this(data);
-      }
-      clone() {
-        const Constructor = this.constructor;
-        return new Constructor(this.toData());
-      }
+    extendSchema(extensionFn) {
+        const shape = extensionFn(z);
+        const baseExtensions = this.schema.shape.extensions;
+        let baseExtensionsObject;
+        if (baseExtensions instanceof z.ZodObject) baseExtensionsObject = baseExtensions;
+        else if (baseExtensions) {
+            let inner = baseExtensions;
+            while(shouldAssign(inner))inner = inner.def.innerType;
+            baseExtensionsObject = inner instanceof z.ZodObject ? inner : z.object({});
+        } else baseExtensionsObject = z.object({});
+        const newExtensions = baseExtensionsObject.extend(shape);
+        this.schema = this.schema.extend({
+            extensions: newExtensions
+        });
+        return this;
+    }
+    withMethods(methods) {
+        Object.assign(this.methods, methods);
+        return this;
+    }
+    getSchema() {
+        return this.schema;
+    }
+    build() {
+        const schema = this.schema;
+        const methods = this.methods;
+        const name = this.name;
+        class Model extends BaseModel {
+            get __schema() {
+                return schema;
+            }
+            static{
+                this.__schema = schema;
+            }
+            static create(data) {
+                return new this(data);
+            }
+            clone() {
+                const Constructor = this.constructor;
+                return new Constructor(this.toData());
+            }
+        }
+        Object.assign(Model.prototype, methods);
+        Object.defineProperty(Model.prototype, Symbol.toStringTag, {
+            value: name
+        });
+        return Model;
     }
-    Object.assign(Model.prototype, methods);
-    Object.defineProperty(Model.prototype, Symbol.toStringTag, {
-      value: name
-    });
-    return Model;
-  }
 }
+export { ModelBuilder, createModelSchema };
 
 //# sourceMappingURL=ModelBuilder.js.map

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,"file":"models/base/ModelBuilder.js","sources":["../../../src/models/base/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"],"names":["createModelSchema","factory","z","shouldAssign","inner","ModelBuilder","name","schema","extensionFn","shape","baseExtensions","baseExtensionsObject","newExtensions","methods","Object","Model","BaseModel","data","Constructor","Symbol"],"mappings":";;AAmBO,MAAMA,oBAAoB,CAC7BC,UAEOC,EAAE,MAAM,CAAC;QAAE,GAAGD,QAAQC,EAAE;IAAC;AAGpC,MAAMC,eAAe,CAACC;IAClB,IAAKA,OAEE;QAAA,IAAM,SAASA,OAEf;YAAA,IAAIA,AAAmB,eAAnBA,MAAM,GAAG,CAAC,IAAI,EACrB,OAAO;iBACJ,IAAIA,AAAmB,eAAnBA,MAAM,GAAG,CAAC,IAAI,EACrB,OAAO;iBACJ,IAAIA,AAAmB,cAAnBA,MAAM,GAAG,CAAC,IAAI,EACrB,OAAO;QACX;IAAA;IACA,OAAO;AACX;AAEO,MAAMC;IAGT,YACYC,IAAY,EACZC,MAA0B,CACpC;aAFUD,IAAI,GAAJA;aACAC,MAAM,GAANA;aAJK,OAAO,GAAuC,CAAC;QAM5D,IAAI,CAAC,OAAO,GAAG,CAAC;IACpB;IAEA,aAAyCC,WAAoC,EAAQ;QACjF,MAAMC,QAAQD,YAAYN;QAC1B,MAAMQ,iBAAiB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU;QAEnD,IAAIC;QACJ,IAAID,0BAA0BR,EAAE,SAAS,EACrCS,uBAAuBD;aACpB,IAAIA,gBAAgB;YACvB,IAAIN,QAAQM;YAEZ,MAAOP,aAAaC,OAChBA,QAAQA,MAAM,GAAG,CAAC,SAAS;YAE/BO,uBAAuBP,iBAAiBF,EAAE,SAAS,GAAGE,QAAQF,EAAE,MAAM,CAAC,CAAC;QAC5E,OACIS,uBAAuBT,EAAE,MAAM,CAAC,CAAC;QAGrC,MAAMU,gBAAgBD,qBAAqB,MAAM,CAACF;QAClD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;YAC7B,YAAYG;QAChB;QAEA,OAAO,IAAI;IACf;IAEA,YACIC,OAAqD,EACnB;QAClCC,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,EAAED;QAC5B,OAAO,IAAI;IACf;IAEA,YAAY;QACR,OAAO,IAAI,CAAC,MAAM;IACtB;IAEA,QAA4B;QACxB,MAAMN,SAAS,IAAI,CAAC,MAAM;QAC1B,MAAMM,UAAU,IAAI,CAAC,OAAO;QAC5B,MAAMP,OAAO,IAAI,CAAC,IAAI;QAItB,MAAMS,cAAcC;YAChB,IAAoB,WAAW;gBAC3B,OAAOT;YACX;;qBAEO,QAAQ,GAAGA;;YAElB,OAAO,OAAOU,IAAe,EAAE;gBAC3B,OAAO,IAAI,IAAI,CAACA;YACpB;YAES,QAAc;gBACnB,MAAMC,cAAc,IAAI,CAAC,WAAW;gBACpC,OAAO,IAAIA,YAAY,IAAI,CAAC,MAAM;YACtC;QACJ;QAEAJ,OAAO,MAAM,CAACC,MAAM,SAAS,EAAEF;QAE/BC,OAAO,cAAc,CAACC,MAAM,SAAS,EAAEI,OAAO,WAAW,EAAE;YACvD,OAAOb;QACX;QAEA,OAAOS;IACX;AACJ"}

package/models/base/ModelFactory.js

@@ -1,3 +0,0 @@
-
-
-//# sourceMappingURL=ModelFactory.js.map