ts-openapi-codegen 2.0.0-beta.11 → 2.0.0-beta.13

package/dist/common/VersionedSchema/Utils/determineBestMatchingSchemaVersion.js

@@ -4,38 +4,83 @@ exports.determineBestMatchingSchemaVersion = determineBestMatchingSchemaVersion;
 const validateZodOptions_1 = require("../../Validation/validateZodOptions");
 const getUniqueKeysFromSchemas_1 = require("./getUniqueKeysFromSchemas");
 const getUniqueObjectKeys_1 = require("./getUniqueObjectKeys");
-// Determining the most appropriate schema version
+/**
+ * Counts unknown keys using a strict schema variant.
+ * The strict check is used only for ranking candidates, not for final validation.
+ */
+function getStrictUnrecognizedKeyCount(schema, inputData) {
+    const strictResult = (0, validateZodOptions_1.validateZodOptionsRaw)(schema.strict(), inputData);
+    if (strictResult.success) {
+        return 0;
+    }
+    return strictResult.error.issues.reduce((count, issue) => {
+        if (issue.code !== 'unrecognized_keys' || !('keys' in issue)) {
+            return count;
+        }
+        return count + issue.keys.length;
+    }, 0);
+}
+/**
+ * Compares two schema candidates and returns the better one.
+ * Priority:
+ * 1) fewer structural errors;
+ * 2) fewer strict-mode unknown keys;
+ * 3) more matching keys;
+ * 4) newer version inside the same schema family;
+ * 5) lower index when schema families differ.
+ */
+function compareCandidates(best, current) {
+    if (current.structuralErrorCount !== best.structuralErrorCount) {
+        return current.structuralErrorCount < best.structuralErrorCount ? current : best;
+    }
+    if (current.strictUnrecognizedKeyCount !== best.strictUnrecognizedKeyCount) {
+        return current.strictUnrecognizedKeyCount < best.strictUnrecognizedKeyCount ? current : best;
+    }
+    if (current.matchingKeysCount !== best.matchingKeysCount) {
+        return current.matchingKeysCount > best.matchingKeysCount ? current : best;
+    }
+    if (current.type === best.type) {
+        return current.index > best.index ? current : best;
+    }
+    return current.index < best.index ? current : best;
+}
+/**
+ * Determines the best matching schema version for input data.
+ * `invalid_value` issues are intentionally ignored to allow migration from older enum/value variants.
+ */
 function determineBestMatchingSchemaVersion(inputData, versionedSchemas) {
     if (!versionedSchemas.length) {
         throw new Error('The list of schemes cannot be empty');
     }
     const inputKeys = (0, getUniqueObjectKeys_1.getUniqueObjectKeys)(inputData);
-    const matchingSchemas = versionedSchemas
-        .map(({ schema, version }, idx) => {
+    const schemaMatches = versionedSchemas.map(({ schema, baseSchema, version, type }, idx) => {
+        const schemaKeys = (0, getUniqueKeysFromSchemas_1.getUniqueKeysFromSchemas)([schema]);
+        const matchingKeysCount = inputKeys.filter(key => schemaKeys.has(key)).length;
+        const strictUnrecognizedKeyCount = getStrictUnrecognizedKeyCount(baseSchema, inputData);
         const validationResult = (0, validateZodOptions_1.validateZodOptionsRaw)(schema, inputData);
-        const errorFields = !validationResult.success ? validationResult.error.issues.filter(err => err.code !== 'invalid_value') : [];
-        return errorFields.length === 0 ? { version, index: idx } : null;
-    })
-        .filter((match) => match !== null);
-    if (matchingSchemas.length > 0) {
-        const latestMatch = matchingSchemas.reduce((prev, curr) => (curr.index > prev.index ? curr : prev));
+        const structuralErrorCount = !validationResult.success
+            ? validationResult.error.issues.filter(issue => issue.code !== 'invalid_value').length
+            : 0;
         return {
-            lastVersionIndex: latestMatch.index,
-            latestVersion: latestMatch.version,
-            firstVersion: matchingSchemas[0].version,
+            index: idx,
+            version,
+            type,
+            structuralErrorCount,
+            strictUnrecognizedKeyCount,
+            matchingKeysCount,
         };
-    }
-    const schemaMatches = versionedSchemas.map(({ schema, version }, idx) => {
-        const schemaKeys = (0, getUniqueKeysFromSchemas_1.getUniqueKeysFromSchemas)([schema]);
-        const validationResult = (0, validateZodOptions_1.validateZodOptionsRaw)(schema, inputData);
-        const errorFields = !validationResult.success ? validationResult.error.issues.filter(err => err.code !== 'invalid_value') : [];
-        const matchingKeys = inputKeys.filter(key => schemaKeys.has(key));
-        return { index: idx, version, errorFields, matchingKeys };
     });
-    const bestMatch = schemaMatches.reduce((best, current) => {
-        const isBetterMatch = current.matchingKeys.length >= best.matchingKeys.length && current.errorFields.length <= best.errorFields.length;
-        return isBetterMatch ? current : best;
-    }, schemaMatches[0]);
+    const structurallyValidMatches = schemaMatches.filter(match => match.structuralErrorCount === 0);
+    if (structurallyValidMatches.length > 0) {
+        const bestStructurallyValidMatch = structurallyValidMatches.reduce(compareCandidates);
+        const firstVersion = structurallyValidMatches.reduce((earliest, current) => (current.index < earliest.index ? current : earliest)).version;
+        return {
+            lastVersionIndex: bestStructurallyValidMatch.index,
+            latestVersion: bestStructurallyValidMatch.version,
+            firstVersion,
+        };
+    }
+    const bestMatch = schemaMatches.reduce(compareCandidates);
     return {
         lastVersionIndex: bestMatch.index,
         latestVersion: bestMatch.version,

package/dist/common/VersionedSchema/Utils/getUniqueKeysFromSchemas.d.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 /**
  * Get all the unique parameter keys of all Joi schemes in the array
- * @param schemas array of joi schemes
+ * @param schemas array of zod schemes
  * @returns All the unique parameter keys of all Joi schemes in the array
  */
 export declare function getUniqueKeysFromSchemas(schemas: z.ZodTypeAny[]): Set<string>;

package/dist/common/VersionedSchema/Utils/getUniqueKeysFromSchemas.js

@@ -18,7 +18,7 @@ function collectKeys(schema, result) {
 }
 /**
  * Get all the unique parameter keys of all Joi schemes in the array
- * @param schemas array of joi schemes
+ * @param schemas array of zod schemes
  * @returns All the unique parameter keys of all Joi schemes in the array
  */
 function getUniqueKeysFromSchemas(schemas) {

package/dist/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.d.ts

@@ -2,18 +2,28 @@ import { z } from 'zod';
 import { EMigrationMode } from '../../Enums';
 import { EVersionedSchemaType } from '../Enums';
 import { SchemaMigrationPlan, VersionedSchema, VersionMatchResult } from '../Types';
+/**
+ * Input arguments for migrating arbitrary config data to the latest schema version.
+ */
 type MigrateToLatestProps = {
     rawInput: Record<string, any>;
     migrationPlans: SchemaMigrationPlan<Record<string, any>, Record<string, any>>[];
     versionedSchemas: VersionedSchema<z.ZodTypeAny>[];
     migrationMode: EMigrationMode;
 };
+/**
+ * Result of successful migration to the latest schema.
+ */
 type MigrateToLatestResult = {
     value: Record<string, any>;
     guessedVersion: VersionMatchResult;
     schemaVersion: string;
     schemaType: EVersionedSchemaType;
 };
+/**
+ * Migrates raw input through the migration graph to the latest schema version.
+ * Migration path is resolved by `fromVersion -> toVersion` links from `migrationPlans`.
+ */
 export declare function migrateDataToLatestSchemaVersion({ rawInput, migrationPlans, versionedSchemas, migrationMode }: MigrateToLatestProps): MigrateToLatestResult | null;
 export {};
 //# sourceMappingURL=migrateDataToLatestSchemaVersion.d.ts.map

package/dist/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrateDataToLatestSchemaVersion.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AASpF,KAAK,oBAAoB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IAChF,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;IAClD,aAAa,EAAE,cAAc,CAAC;CACjC,CAAC;AAEF,KAAK,qBAAqB,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,cAAc,EAAE,kBAAkB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,oBAAoB,CAAC;CACpC,CAAC;AAEF,wBAAgB,gCAAgC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAE,EAAE,oBAAoB,GAAG,qBAAqB,GAAG,IAAI,CAiElK"}
+{"version":3,"file":"migrateDataToLatestSchemaVersion.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AASpF;;GAEG;AACH,KAAK,oBAAoB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IAChF,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;IAClD,aAAa,EAAE,cAAc,CAAC;CACjC,CAAC;AAEF;;GAEG;AACH,KAAK,qBAAqB,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,cAAc,EAAE,kBAAkB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,oBAAoB,CAAC;CACpC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAE,EAAE,oBAAoB,GAAG,qBAAqB,GAAG,IAAI,CAoFlK"}

package/dist/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.js

@@ -10,6 +10,10 @@ const getUniqueKeysFromSchemas_1 = require("./getUniqueKeysFromSchemas");
 const getUniqueObjectKeys_1 = require("./getUniqueObjectKeys");
 const replaceInvalidKeysWithMappedNames_1 = require("./replaceInvalidKeysWithMappedNames");
 const validateAndSuggestKeyCorrections_1 = require("./validateAndSuggestKeyCorrections");
+/**
+ * Migrates raw input through the migration graph to the latest schema version.
+ * Migration path is resolved by `fromVersion -> toVersion` links from `migrationPlans`.
+ */
 function migrateDataToLatestSchemaVersion({ rawInput, migrationPlans, versionedSchemas, migrationMode }) {
     const schemas = versionedSchemas.map(el => el.schema);
     const allUniqueKeysFromSchemas = (0, getUniqueKeysFromSchemas_1.getUniqueKeysFromSchemas)(schemas);
@@ -20,33 +24,46 @@ function migrateDataToLatestSchemaVersion({ rawInput, migrationPlans, versionedS
     const schemaPossibleKeys = (0, getUniqueKeysFromSchemas_1.getUniqueKeysFromSchemas)([guessedValidationSchema]);
     const replacingKeysMap = (0, generateKeyMappingForInvalidKeys_1.generateKeyMappingForInvalidKeys)(allUniqueKeysFromRawInput, schemaPossibleKeys);
     let currentData = replacingKeysMap.size ? (0, replaceInvalidKeysWithMappedNames_1.replaceInvalidKeysWithMappedNames)(rawInput, replacingKeysMap) : rawInput;
-    const actualVersionIndex = versionedSchemas.length - 1;
-    const actualSchema = versionedSchemas[actualVersionIndex];
-    for (let idx = guessedVersion.lastVersionIndex; idx < versionedSchemas.length - 1; idx++) {
-        const currentVersionSchema = versionedSchemas[idx];
-        const firstValidationResult = (0, validateZodOptions_1.validateZodOptionsRaw)(currentVersionSchema.schema, currentData);
+    const actualSchema = versionedSchemas[versionedSchemas.length - 1];
+    const schemasByVersion = new Map(versionedSchemas.map(schemaInfo => [schemaInfo.version, schemaInfo.schema]));
+    const migrationPlanByFromVersion = new Map(migrationPlans.map(plan => [plan.fromVersion, plan]));
+    let currentVersion = guessedVersion.latestVersion;
+    const visitedVersions = new Set([currentVersion]);
+    while (currentVersion !== actualSchema.version) {
+        const currentVersionSchema = schemasByVersion.get(currentVersion);
+        if (!currentVersionSchema) {
+            throw new Error(`No schema found for version ${currentVersion}.`);
+        }
+        const firstValidationResult = (0, validateZodOptions_1.validateZodOptionsRaw)(currentVersionSchema, currentData);
         if (!firstValidationResult.success) {
             (0, getCurrentErrorMessage_1.getCurrentErrorMessage)(firstValidationResult.error, replacingKeysMap);
         }
-        const fromVersion = currentVersionSchema.version;
-        const migrationPlan = migrationPlans.find(p => p.fromVersion === fromVersion);
+        const migrationPlan = migrationPlanByFromVersion.get(currentVersion);
         if (!migrationPlan) {
-            const availableVersions = migrationPlans.map(p => p.fromVersion).join(', ');
-            throw new Error(`No migration plan from ${fromVersion}. ` +
+            const availableVersions = Array.from(migrationPlanByFromVersion.keys()).join(', ');
+            throw new Error(`No migration plan from ${currentVersion}. ` +
                 `Available migration plans: ${availableVersions}. ` +
                 `This usually means the migration chain is incomplete.`);
         }
-        const toVersion = versionedSchemas[idx + 1].version;
+        const nextVersion = migrationPlan.toVersion;
+        const nextSchema = schemasByVersion.get(nextVersion);
+        if (!nextSchema) {
+            throw new Error(`Migration plan from ${migrationPlan.fromVersion} points to unknown schema version ${nextVersion}.`);
+        }
         const migratedRaw = migrationPlan.migrate(currentData);
-        const validationResult = (0, validateZodOptions_1.validateZodOptions)(versionedSchemas[idx + 1].schema, migratedRaw);
+        const validationResult = (0, validateZodOptions_1.validateZodOptions)(nextSchema, migratedRaw);
         if (!validationResult.success) {
-            throw new Error(`Migration from ${fromVersion} to ${toVersion} failed validation. ` +
+            throw new Error(`Migration from ${currentVersion} to ${nextVersion} failed validation. ` +
                 `Error: ${validationResult.errors.join('\n')}. ` +
                 `Migration description: ${migrationPlan.description || 'No description provided'}.`);
         }
         currentData = { ...migratedRaw };
-        const isLastIteration = idx + 1 === actualVersionIndex;
-        if (isLastIteration && migrationMode === Enums_1.EMigrationMode.GENERATE_OPENAPI) {
+        currentVersion = nextVersion;
+        if (visitedVersions.has(currentVersion)) {
+            throw new Error(`Migration loop detected at version ${currentVersion}.`);
+        }
+        visitedVersions.add(currentVersion);
+        if (currentVersion === actualSchema.version && migrationMode === Enums_1.EMigrationMode.GENERATE_OPENAPI) {
             console.warn('Для выполнения генерации OpenApi потребовалось мигрировать схему Ваших данных на актуальную. Для обновленмя конфигурации в файле используйте команду `npm name_cli_tool update-config`');
         }
     }

package/dist/core/types/base/Templates.model.d.ts

@@ -11,7 +11,7 @@ export interface Templates {
     exports: {
         client: Handlebars.TemplateDelegate;
         model: Handlebars.TemplateDelegate;
-        schema: Handlebars.TemplateDelegate | undefined;
+        schema: Handlebars.TemplateDelegate;
         service: Handlebars.TemplateDelegate;
     };
     core: {

package/dist/core/types/base/Templates.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Templates.model.d.ts","sourceRoot":"","sources":["../../../../src/core/types/base/Templates.model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAEjD,MAAM,WAAW,SAAS;IACtB,OAAO,EAAE;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACzC,CAAC;IACF,OAAO,EAAE;QACL,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAChD,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACxC,CAAC;IACF,IAAI,EAAE;QACF,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC5C,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC7C,qBAAqB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnD,YAAY,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC1C,mBAAmB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACjD,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACjD,CAAC;CACL"}
+{"version":3,"file":"Templates.model.d.ts","sourceRoot":"","sources":["../../../../src/core/types/base/Templates.model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAEjD,MAAM,WAAW,SAAS;IACtB,OAAO,EAAE;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACzC,CAAC;IACF,OAAO,EAAE;QACL,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACxC,CAAC;IACF,IAAI,EAAE;QACF,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC5C,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC7C,qBAAqB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnD,YAAY,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC1C,mBAAmB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACjD,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACjD,CAAC;CACL"}

package/dist/core/utils/registerHandlebarTemplates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AA6FA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA2C1E,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAAE,GAAG,SAAS,CAyK1K"}
+{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AA8FA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA2C1E,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAAE,GAAG,SAAS,CAqK1K"}

package/dist/core/utils/registerHandlebarTemplates.js

@@ -89,6 +89,7 @@ const getResponseHeader_4 = __importDefault(require("../../templatesCompiled/cli
 const request_5 = __importDefault(require("../../templatesCompiled/client/core/xhr/request"));
 const sendRequest_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/sendRequest"));
 const exportClient_1 = __importDefault(require("../../templatesCompiled/client/exportClient"));
+const exportSchema_1 = __importDefault(require("../../templatesCompiled/client/exportSchema"));
 const exportModel_1 = __importDefault(require("../../templatesCompiled/client/exportModel"));
 const exportService_1 = __importDefault(require("../../templatesCompiled/client/exportService"));
 const indexFull_1 = __importDefault(require("../../templatesCompiled/client/indexFull"));
@@ -130,7 +131,7 @@ const typeReference_1 = __importDefault(require("../../templatesCompiled/client/
 const typeUnion_1 = __importDefault(require("../../templatesCompiled/client/partials/typeUnion"));
 const registerHandlebarHelpers_1 = require("./registerHandlebarHelpers");
 const ValidationLibrary_enum_1 = require("../types/enums/ValidationLibrary.enum");
-const exportSchema_1 = __importDefault(require("../../templatesCompiled/client/zod/exportSchema"));
+const exportSchema_2 = __importDefault(require("../../templatesCompiled/client/zod/exportSchema"));
 const zodSchema_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchema"));
 const zodSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaInterface"));
 const zodSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaEnum"));
@@ -139,7 +140,7 @@ const zodSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/c
 const zodSchemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaGeneric"));
 const zodSchemaReference_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaReference"));
 const zodSchemaComposition_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaComposition"));
-const exportSchema_2 = __importDefault(require("../../templatesCompiled/client/yup/exportSchema"));
+const exportSchema_3 = __importDefault(require("../../templatesCompiled/client/yup/exportSchema"));
 const yupSchema_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchema"));
 const yupSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaInterface"));
 const yupSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaEnum"));
@@ -148,7 +149,7 @@ const yupSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/c
 const yupSchemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaGeneric"));
 const yupSchemaReference_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaReference"));
 const yupSchemaComposition_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaComposition"));
-const exportSchema_3 = __importDefault(require("../../templatesCompiled/client/joi/exportSchema"));
+const exportSchema_4 = __importDefault(require("../../templatesCompiled/client/joi/exportSchema"));
 const joiSchema_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchema"));
 const joiSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaInterface"));
 const joiSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaEnum"));
@@ -157,7 +158,7 @@ const joiSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/c
 const joiSchemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaGeneric"));
 const joiSchemaReference_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaReference"));
 const joiSchemaComposition_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaComposition"));
-const exportSchema_4 = __importDefault(require("../../templatesCompiled/client/jsonschema/exportSchema"));
+const exportSchema_5 = __importDefault(require("../../templatesCompiled/client/jsonschema/exportSchema"));
 const jsonschemaSchema_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchema"));
 const jsonschemaSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchemaInterface"));
 const jsonschemaSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchemaEnum"));
@@ -185,7 +186,7 @@ function registerHandlebarTemplates(root) {
         exports: {
             client: Handlebars.template(exportClient_1.default),
             model: Handlebars.template(exportModel_1.default),
-            schema: undefined,
+            schema: Handlebars.template(exportSchema_1.default),
             service: Handlebars.template(exportService_1.default),
         },
         core: {
@@ -277,50 +278,50 @@ function registerHandlebarTemplates(root) {
     Handlebars.registerPartial('axios/request', Handlebars.template(request_1.default));
     // Register Zod partials if validationLibrary is ZOD
     if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.ZOD) {
-        templates.exports.schema = Handlebars.template(exportSchema_1.default);
-        Handlebars.registerPartial('zodSchema', Handlebars.template(zodSchema_1.default));
-        Handlebars.registerPartial('zodSchemaInterface', Handlebars.template(zodSchemaInterface_1.default));
-        Handlebars.registerPartial('zodSchemaEnum', Handlebars.template(zodSchemaEnum_1.default));
-        Handlebars.registerPartial('zodSchemaArray', Handlebars.template(zodSchemaArray_1.default));
-        Handlebars.registerPartial('zodSchemaDictionary', Handlebars.template(zodSchemaDictionary_1.default));
-        Handlebars.registerPartial('zodSchemaGeneric', Handlebars.template(zodSchemaGeneric_1.default));
-        Handlebars.registerPartial('zodSchemaReference', Handlebars.template(zodSchemaReference_1.default));
-        Handlebars.registerPartial('zodSchemaComposition', Handlebars.template(zodSchemaComposition_1.default));
+        Handlebars.registerPartial('zod/exportSchema', Handlebars.template(exportSchema_2.default));
+        Handlebars.registerPartial('zod/zodSchema', Handlebars.template(zodSchema_1.default));
+        Handlebars.registerPartial('zod/zodSchemaInterface', Handlebars.template(zodSchemaInterface_1.default));
+        Handlebars.registerPartial('zod/zodSchemaEnum', Handlebars.template(zodSchemaEnum_1.default));
+        Handlebars.registerPartial('zod/zodSchemaArray', Handlebars.template(zodSchemaArray_1.default));
+        Handlebars.registerPartial('zod/zodSchemaDictionary', Handlebars.template(zodSchemaDictionary_1.default));
+        Handlebars.registerPartial('zod/zodSchemaGeneric', Handlebars.template(zodSchemaGeneric_1.default));
+        Handlebars.registerPartial('zod/zodSchemaReference', Handlebars.template(zodSchemaReference_1.default));
+        Handlebars.registerPartial('zod/zodSchemaComposition', Handlebars.template(zodSchemaComposition_1.default));
     }
     // Register Yup partials if validationLibrary is YUP
     if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.YUP) {
-        templates.exports.schema = Handlebars.template(exportSchema_2.default);
-        Handlebars.registerPartial('yupSchema', Handlebars.template(yupSchema_1.default));
-        Handlebars.registerPartial('yupSchemaInterface', Handlebars.template(yupSchemaInterface_1.default));
-        Handlebars.registerPartial('yupSchemaEnum', Handlebars.template(yupSchemaEnum_1.default));
-        Handlebars.registerPartial('yupSchemaArray', Handlebars.template(yupSchemaArray_1.default));
-        Handlebars.registerPartial('yupSchemaDictionary', Handlebars.template(yupSchemaDictionary_1.default));
-        Handlebars.registerPartial('yupSchemaGeneric', Handlebars.template(yupSchemaGeneric_1.default));
-        Handlebars.registerPartial('yupSchemaReference', Handlebars.template(yupSchemaReference_1.default));
-        Handlebars.registerPartial('yupSchemaComposition', Handlebars.template(yupSchemaComposition_1.default));
+        Handlebars.registerPartial('yup/exportSchema', Handlebars.template(exportSchema_3.default));
+        Handlebars.registerPartial('yup/yupSchema', Handlebars.template(yupSchema_1.default));
+        Handlebars.registerPartial('yup/yupSchemaInterface', Handlebars.template(yupSchemaInterface_1.default));
+        Handlebars.registerPartial('yup/yupSchemaEnum', Handlebars.template(yupSchemaEnum_1.default));
+        Handlebars.registerPartial('yup/yupSchemaArray', Handlebars.template(yupSchemaArray_1.default));
+        Handlebars.registerPartial('yup/yupSchemaDictionary', Handlebars.template(yupSchemaDictionary_1.default));
+        Handlebars.registerPartial('yup/yupSchemaGeneric', Handlebars.template(yupSchemaGeneric_1.default));
+        Handlebars.registerPartial('yup/yupSchemaReference', Handlebars.template(yupSchemaReference_1.default));
+        Handlebars.registerPartial('yup/yupSchemaComposition', Handlebars.template(yupSchemaComposition_1.default));
     }
     // Register Joi partials if validationLibrary is JOI
     if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.JOI) {
-        templates.exports.schema = Handlebars.template(exportSchema_3.default);
-        Handlebars.registerPartial('joiSchema', Handlebars.template(joiSchema_1.default));
-        Handlebars.registerPartial('joiSchemaInterface', Handlebars.template(joiSchemaInterface_1.default));
-        Handlebars.registerPartial('joiSchemaEnum', Handlebars.template(joiSchemaEnum_1.default));
-        Handlebars.registerPartial('joiSchemaArray', Handlebars.template(joiSchemaArray_1.default));
-        Handlebars.registerPartial('joiSchemaDictionary', Handlebars.template(joiSchemaDictionary_1.default));
-        Handlebars.registerPartial('joiSchemaGeneric', Handlebars.template(joiSchemaGeneric_1.default));
-        Handlebars.registerPartial('joiSchemaReference', Handlebars.template(joiSchemaReference_1.default));
-        Handlebars.registerPartial('joiSchemaComposition', Handlebars.template(joiSchemaComposition_1.default));
+        Handlebars.registerPartial('joi/exportSchema', Handlebars.template(exportSchema_4.default));
+        Handlebars.registerPartial('joi/joiSchema', Handlebars.template(joiSchema_1.default));
+        Handlebars.registerPartial('joi/joiSchemaInterface', Handlebars.template(joiSchemaInterface_1.default));
+        Handlebars.registerPartial('joi/joiSchemaEnum', Handlebars.template(joiSchemaEnum_1.default));
+        Handlebars.registerPartial('joi/joiSchemaArray', Handlebars.template(joiSchemaArray_1.default));
+        Handlebars.registerPartial('joi/joiSchemaDictionary', Handlebars.template(joiSchemaDictionary_1.default));
+        Handlebars.registerPartial('joi/joiSchemaGeneric', Handlebars.template(joiSchemaGeneric_1.default));
+        Handlebars.registerPartial('joi/joiSchemaReference', Handlebars.template(joiSchemaReference_1.default));
+        Handlebars.registerPartial('joi/joiSchemaComposition', Handlebars.template(joiSchemaComposition_1.default));
     }
     if (root.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.JSONSCHEMA) {
-        templates.exports.schema = Handlebars.template(exportSchema_4.default);
-        Handlebars.registerPartial('jsonschemaSchema', Handlebars.template(jsonschemaSchema_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaInterface', Handlebars.template(jsonschemaSchemaInterface_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaEnum', Handlebars.template(jsonschemaSchemaEnum_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaArray', Handlebars.template(jsonschemaSchemaArray_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaDictionary', Handlebars.template(jsonschemaSchemaDictionary_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaGeneric', Handlebars.template(jsonschemaSchemaGeneric_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaReference', Handlebars.template(jsonschemaSchemaReference_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaComposition', Handlebars.template(jsonschemaSchemaComposition_1.default));
+        Handlebars.registerPartial('jsonschema/exportSchema', Handlebars.template(exportSchema_5.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchema', Handlebars.template(jsonschemaSchema_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaInterface', Handlebars.template(jsonschemaSchemaInterface_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaEnum', Handlebars.template(jsonschemaSchemaEnum_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaArray', Handlebars.template(jsonschemaSchemaArray_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaDictionary', Handlebars.template(jsonschemaSchemaDictionary_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaGeneric', Handlebars.template(jsonschemaSchemaGeneric_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaReference', Handlebars.template(jsonschemaSchemaReference_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaComposition', Handlebars.template(jsonschemaSchemaComposition_1.default));
     }
     return templates;
 }

package/dist/templatesCompiled/client/exportClient.js

@@ -47,7 +47,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + ((stack1 = lookupProperty(helpers, "joinPath").call(alias1, lookupProperty(lookupProperty(data, "root"), "outputCore"), "./interceptors/apiErrorInterceptor", { "name": "joinPath", "hash": {}, "data": data, "loc": { "start": { "line": 8, "column": 37 }, "end": { "line": 8, "column": 105 } } })) != null ? stack1 : "")
             + "';\n\n"
             + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "services"), { "name": "each", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 10, "column": 0 }, "end": { "line": 12, "column": 9 } } })) != null ? stack1 : "")
-            + "\nexport interface ClientOptions<TExecutorOptions extends Record<string, any>> {\n  openApi?: Partial<TOpenAPIConfig>;\n  interceptors?: {\n    onRequest?: RequestInterceptor[];\n    onResponse?: ResponseInterceptor[];\n    onError?: ErrorInterceptor[];\n  }\n}\n\nexport function createClient<TExecutorOptions extends Record<string, any>>(\n  options: ClientOptions<TExecutorOptions> = {},\n) {\n  const openApiConfig: TOpenAPIConfig = {\n    ...OpenAPI,\n    ...options.openApi,\n  };\n\n  let executor = createExecutorAdapter<TExecutorOptions>(openApiConfig);\n  if (options?.interceptors) {\n    executor = withInterceptors(executor, {\n      onError: [apiErrorInterceptor, ...(options.interceptors?.onError ?? [])],\n      onRequest: options.interceptors?.onRequest,\n      onResponse: options.interceptors?.onResponse,\n    });\n  }\n\n  return {\n"
+            + "\nexport interface ClientOptions {\n  openApi?: Partial<TOpenAPIConfig>;\n  interceptors?: {\n    onRequest?: RequestInterceptor[];\n    onResponse?: ResponseInterceptor[];\n    onError?: ErrorInterceptor[];\n  }\n}\n\nexport function createClient<TExecutorOptions extends Record<string, any>>(\n  options: ClientOptions = {},\n) {\n  const openApiConfig: TOpenAPIConfig = {\n    ...OpenAPI,\n    ...options.openApi,\n  };\n\n  let executor = createExecutorAdapter<TExecutorOptions>(openApiConfig);\n  if (options?.interceptors) {\n    executor = withInterceptors(executor, {\n      onError: [apiErrorInterceptor, ...(options.interceptors?.onError ?? [])],\n      onRequest: options.interceptors?.onRequest,\n      onResponse: options.interceptors?.onResponse,\n    });\n  }\n\n  return {\n"
             + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "services"), { "name": "each", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 41, "column": 4 }, "end": { "line": 43, "column": 13 } } })) != null ? stack1 : "")
             + "  };\n}\n";
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/exportSchema.d.ts

@@ -1,6 +1,10 @@
 declare const _default: {
+    "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "5": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "7": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
     compiler: (string | number)[];
-    main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    main: (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
     usePartial: boolean;
     useData: boolean;
 };

package/dist/templatesCompiled/client/exportSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exportSchema.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/client/exportSchema.ts"],"names":[],"mappings":";;;;;;AAMA,wBAcmC"}
+{"version":3,"file":"exportSchema.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/client/exportSchema.ts"],"names":[],"mappings":";;;;;;;;;;AAMA,wBAgDmC"}

package/dist/templatesCompiled/client/exportSchema.js

@@ -6,17 +6,47 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* tslint: disable */
 /* eslint: disable */
 // @ts-nocheck
-exports.default = { "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
+exports.default = { "1": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
                 return parent[propertyName];
             }
             return undefined;
         };
-        return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "\nexport const "
-            + ((stack1 = container.lambda(container.strict(depth0, "name", { "start": { "line": 3, "column": 16 }, "end": { "line": 3, "column": 20 } }), depth0)) != null ? stack1 : "")
-            + "Schema = "
-            + ((stack1 = container.invokePartial(lookupProperty(partials, "schema"), depth0, { "name": "schema", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + ";\n";
+        return ((stack1 = container.invokePartial(lookupProperty(partials, "zod/exportSchema"), depth0, { "name": "zod/exportSchema", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
+    }, "3": function (container, depth0, helpers, partials, data) {
+        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
+            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+                return parent[propertyName];
+            }
+            return undefined;
+        };
+        return ((stack1 = container.invokePartial(lookupProperty(partials, "joi/exportSchema"), depth0, { "name": "joi/exportSchema", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
+    }, "5": function (container, depth0, helpers, partials, data) {
+        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
+            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+                return parent[propertyName];
+            }
+            return undefined;
+        };
+        return ((stack1 = container.invokePartial(lookupProperty(partials, "yup/exportSchema"), depth0, { "name": "yup/exportSchema", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
+    }, "7": function (container, depth0, helpers, partials, data) {
+        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
+            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+                return parent[propertyName];
+            }
+            return undefined;
+        };
+        return ((stack1 = container.invokePartial(lookupProperty(partials, "jsonschema/exportSchema"), depth0, { "name": "jsonschema/exportSchema", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
+    }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
+        var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
+            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+                return parent[propertyName];
+            }
+            return undefined;
+        };
+        return ((stack1 = lookupProperty(helpers, "equals").call(alias1, lookupProperty(lookupProperty(data, "root"), "validationLibrary"), "zod", { "name": "equals", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 1, "column": 0 }, "end": { "line": 1, "column": 75 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "equals").call(alias1, lookupProperty(lookupProperty(data, "root"), "validationLibrary"), "joi", { "name": "equals", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 2, "column": 0 }, "end": { "line": 2, "column": 75 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "equals").call(alias1, lookupProperty(lookupProperty(data, "root"), "validationLibrary"), "yup", { "name": "equals", "hash": {}, "fn": container.program(5, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 3, "column": 0 }, "end": { "line": 3, "column": 75 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "equals").call(alias1, lookupProperty(lookupProperty(data, "root"), "validationLibrary"), "jsonschema", { "name": "equals", "hash": {}, "fn": container.program(7, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 4, "column": 0 }, "end": { "line": 4, "column": 89 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/joi/exportSchema.js

@@ -46,11 +46,11 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + "\nimport Joi from 'joi';\n\nexport const "
             + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 11, "column": 16 }, "end": { "line": 11, "column": 20 } }), depth0)) != null ? stack1 : "")
             + "Schema = "
-            + ((stack1 = container.invokePartial(lookupProperty(partials, "joiSchema"), depth0, { "name": "joiSchema", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
+            + ((stack1 = container.invokePartial(lookupProperty(partials, "joi/joiSchema"), depth0, { "name": "joi/joiSchema", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
             + ";\n\nexport type "
             + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 13, "column": 15 }, "end": { "line": 13, "column": 19 } }), depth0)) != null ? stack1 : "")
-            + " = Joi.SchemaValue<typeof "
-            + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 13, "column": 51 }, "end": { "line": 13, "column": 55 } }), depth0)) != null ? stack1 : "")
+            + " = Joi.Schema<typeof "
+            + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 13, "column": 46 }, "end": { "line": 13, "column": 50 } }), depth0)) != null ? stack1 : "")
             + "Schema>;\n\nexport function validate"
             + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 15, "column": 27 }, "end": { "line": 15, "column": 31 } }), depth0)) != null ? stack1 : "")
             + "(data: unknown): { value: "

package/dist/templatesCompiled/client/joi/partials/joiSchema.js

@@ -13,7 +13,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return ((stack1 = container.invokePartial(lookupProperty(partials, "joiSchemaInterface"), depth0, { "name": "joiSchemaInterface", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
+        return ((stack1 = container.invokePartial(lookupProperty(partials, "joi/joiSchemaInterface"), depth0, { "name": "joi/joiSchemaInterface", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
     }, "3": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -29,7 +29,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return ((stack1 = container.invokePartial(lookupProperty(partials, "joiSchemaEnum"), depth0, { "name": "joiSchemaEnum", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
+        return ((stack1 = container.invokePartial(lookupProperty(partials, "joi/joiSchemaEnum"), depth0, { "name": "joi/joiSchemaEnum", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
     }, "6": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -45,7 +45,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return ((stack1 = container.invokePartial(lookupProperty(partials, "joiSchemaArray"), depth0, { "name": "joiSchemaArray", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
+        return ((stack1 = container.invokePartial(lookupProperty(partials, "joi/joiSchemaArray"), depth0, { "name": "joi/joiSchemaArray", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
     }, "9": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -61,7 +61,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return ((stack1 = container.invokePartial(lookupProperty(partials, "joiSchemaDictionary"), depth0, { "name": "joiSchemaDictionary", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
+        return ((stack1 = container.invokePartial(lookupProperty(partials, "joi/joiSchemaDictionary"), depth0, { "name": "joi/joiSchemaDictionary", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
     }, "12": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -77,7 +77,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return ((stack1 = container.invokePartial(lookupProperty(partials, "joiSchemaComposition"), depth0, { "name": "joiSchemaComposition", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
+        return ((stack1 = container.invokePartial(lookupProperty(partials, "joi/joiSchemaComposition"), depth0, { "name": "joi/joiSchemaComposition", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
     }, "15": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -109,7 +109,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return ((stack1 = container.invokePartial(lookupProperty(partials, "joiSchemaReference"), depth0, { "name": "joiSchemaReference", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
+        return ((stack1 = container.invokePartial(lookupProperty(partials, "joi/joiSchemaReference"), depth0, { "name": "joi/joiSchemaReference", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
     }, "20": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -117,7 +117,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return ((stack1 = container.invokePartial(lookupProperty(partials, "joiSchemaGeneric"), depth0, { "name": "joiSchemaGeneric", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
+        return ((stack1 = container.invokePartial(lookupProperty(partials, "joi/joiSchemaGeneric"), depth0, { "name": "joi/joiSchemaGeneric", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "");
     }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {