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

package/dist/core/OpenApiClient.js

@@ -9,6 +9,7 @@ const pathHelpers_1 = require("../common/utils/pathHelpers");
 const Parser_1 = require("./api/v2/Parser");
 const Parser_2 = require("./api/v3/Parser");
 const Context_1 = require("./Context");
+const EmptySchemaStrategy_enum_1 = require("./types/enums/EmptySchemaStrategy.enum");
 const ValidationLibrary_enum_1 = require("./types/enums/ValidationLibrary.enum");
 const getOpenApiSpec_1 = require("./utils/getOpenApiSpec");
 const getOpenApiVersion_1 = require("./utils/getOpenApiVersion");
@@ -44,6 +45,7 @@ class OpenApiClient {
                 sortByRequired: rawOptions.sortByRequired,
                 useSeparatedIndexes: rawOptions.useSeparatedIndexes,
                 validationLibrary: rawOptions.validationLibrary,
+                emptySchemaStrategy: rawOptions.emptySchemaStrategy,
             }));
         }
         else {
@@ -71,6 +73,7 @@ class OpenApiClient {
                     sortByRequired: rawOptions.sortByRequired,
                     useSeparatedIndexes: rawOptions.useSeparatedIndexes,
                     validationLibrary: rawOptions.validationLibrary,
+                    emptySchemaStrategy: rawOptions.emptySchemaStrategy,
                 },
             ];
         }
@@ -98,6 +101,7 @@ class OpenApiClient {
             sortByRequired: item.sortByRequired ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.sortByRequired,
             useSeparatedIndexes: item.useSeparatedIndexes ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes,
             validationLibrary: item.validationLibrary ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.validationLibrary,
+            emptySchemaStrategy: item.emptySchemaStrategy ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.emptySchemaStrategy,
         };
     }
     async cleanOutputDirectories(option) {
@@ -142,7 +146,7 @@ class OpenApiClient {
         this.writeClient.logger.shutdownLogger();
     }
     async generateSingle(item) {
-        const { input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles, request, interfacePrefix, enumPrefix, typePrefix, useCancelableRequest, sortByRequired, useSeparatedIndexes, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, } = item;
+        const { input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles, request, interfacePrefix, enumPrefix, typePrefix, useCancelableRequest, sortByRequired, useSeparatedIndexes, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, emptySchemaStrategy = EmptySchemaStrategy_enum_1.EmptySchemaStrategy.KEEP, } = item;
         const outputPaths = (0, getOutputPaths_1.getOutputPaths)({
             output,
             outputCore,
@@ -178,6 +182,7 @@ class OpenApiClient {
                     useCancelableRequest,
                     useSeparatedIndexes,
                     validationLibrary,
+                    emptySchemaStrategy,
                 });
                 break;
             }
@@ -197,6 +202,7 @@ class OpenApiClient {
                     useCancelableRequest,
                     useSeparatedIndexes,
                     validationLibrary,
+                    emptySchemaStrategy,
                 });
                 break;
             }

package/dist/core/WriteClient.d.ts

@@ -1,9 +1,11 @@
 import { Logger } from '../common/Logger';
 import { OutputPaths } from './types/base/OutputPaths.model';
 import { Templates } from './types/base/Templates.model';
+import { EmptySchemaStrategy } from './types/enums/EmptySchemaStrategy.enum';
 import { HttpClient } from './types/enums/HttpClient.enum';
 import { ValidationLibrary } from './types/enums/ValidationLibrary.enum';
 import type { Client } from './types/shared/Client.model';
+import type { Model } from './types/shared/Model.model';
 import { writeClientCore } from './utils/writeClientCore';
 import { writeClientCoreIndex } from './utils/writeClientCoreIndex';
 import { writeClientExecutor } from './utils/writeClientExecutor';
@@ -40,8 +42,11 @@ type TWriteClientProps = {
     useCancelableRequest?: boolean;
     useSeparatedIndexes?: boolean;
     validationLibrary?: ValidationLibrary;
+    emptySchemaStrategy: EmptySchemaStrategy;
+};
+type TAPIClientGeneratorConfig = Omit<TWriteClientProps, 'httpClient' | 'useOptions' | 'request' | 'useCancelableRequest' | 'useSeparatedIndexes'> & {
+    schemaModels: Model[];
 };
-type TAPIClientGeneratorConfig = Omit<TWriteClientProps, 'httpClient' | 'useOptions' | 'request' | 'useCancelableRequest' | 'useSeparatedIndexes'>;
 /**
  * The client which is writing all items and keep the parameters to write index file
  */
@@ -53,6 +58,7 @@ export declare class WriteClient {
      * Write our OpenAPI client, using the given templates at the given output
      */
     writeClient(options: TWriteClientProps): Promise<void>;
+    private writeModelsAndFinalize;
     /**
      * Method keeps all options that is need to create index file
      * @param config

package/dist/core/WriteClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WriteClient.d.ts","sourceRoot":"","sources":["../../src/core/WriteClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAM1C,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAI1D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE;;;;;;;;;;;;GAYG;AACH,KAAK,iBAAiB,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC,CAAC;AAEF,KAAK,yBAAyB,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,sBAAsB,GAAG,qBAAqB,CAAC,CAAC;AAEnJ;;GAEG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,MAAM,CAAuD;IACrE,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,CAAC,EAAE,MAAM;IAU3B;;OAEG;IACG,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0G5D;;;OAGG;IACH,6BAA6B,CAAC,MAAM,EAAE,yBAAyB;IAUzD,eAAe;IAKf,sBAAsB;IAK5B,IAAW,MAAM,WAEhB;IAED,OAAO,CAAC,yBAAyB;IAyCjC,OAAO,CAAC,mBAAmB;YA4Db,gBAAgB;YAUhB,uBAAuB;IAMrC,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,aAAa;IAId,eAAe,yBAAmB;IAClC,oBAAoB,8BAAwB;IAC5C,oBAAoB,8BAAwB;IAC5C,iBAAiB,2BAAqB;IACtC,sBAAsB,gCAA0B;IAChD,kBAAkB,4BAAsB;IACxC,uBAAuB,iCAA2B;IAClD,mBAAmB,6BAAuB;IAC1C,wBAAwB,kCAA4B;IACpD,sBAAsB,gCAA0B;IAChD,mBAAmB,6BAAuB;CACpD"}
+{"version":3,"file":"WriteClient.d.ts","sourceRoot":"","sources":["../../src/core/WriteClient.ts"],"names":[],"mappings":"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"}

package/dist/core/WriteClient.js

@@ -39,7 +39,7 @@ class WriteClient {
      * Write our OpenAPI client, using the given templates at the given output
      */
     async writeClient(options) {
-        const { client, templates, outputPaths, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles = false, request, useCancelableRequest = false, useSeparatedIndexes = false, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, } = options;
+        const { client, templates, outputPaths, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles = false, request, useCancelableRequest = false, useSeparatedIndexes = false, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, emptySchemaStrategy, } = options;
         if (!excludeCoreServiceFiles) {
             const executorPath = (0, pathHelpers_1.resolveHelper)(outputPaths.outputCore, 'executor');
             const interceptorsPath = (0, pathHelpers_1.resolveHelper)(outputPaths.outputCore, 'interceptors');
@@ -87,21 +87,56 @@ class WriteClient {
          */
         if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE) {
             await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputSchemas);
-            await this.writeClientSchemas({
+            const schemaModels = await this.writeClientSchemas({
                 models: client.models,
                 templates,
                 outputSchemasPath: outputPaths.outputSchemas,
                 httpClient,
                 useUnionTypes,
                 validationLibrary,
+                emptySchemaStrategy,
             });
             await this.writeClientSchemasIndex({
-                models: client.models,
+                models: schemaModels,
                 templates,
                 outputSchemasPath: outputPaths.outputSchemas,
                 useSeparatedIndexes,
             });
+            await this.writeModelsAndFinalize({
+                client,
+                templates,
+                outputPaths,
+                httpClient,
+                useOptions,
+                useUnionTypes,
+                excludeCoreServiceFiles,
+                request,
+                useCancelableRequest,
+                useSeparatedIndexes,
+                validationLibrary,
+                emptySchemaStrategy,
+                schemaModels,
+            });
+            return;
         }
+        await this.writeModelsAndFinalize({
+            client,
+            templates,
+            outputPaths,
+            httpClient,
+            useOptions,
+            useUnionTypes,
+            excludeCoreServiceFiles,
+            request,
+            useCancelableRequest,
+            useSeparatedIndexes,
+            validationLibrary,
+            emptySchemaStrategy,
+            schemaModels: [],
+        });
+    }
+    async writeModelsAndFinalize(config) {
+        const { client, templates, outputPaths, httpClient, useUnionTypes, useSeparatedIndexes, excludeCoreServiceFiles, validationLibrary, emptySchemaStrategy, schemaModels } = config;
         await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputModels);
         await this.writeClientModels({
             models: client.models,
@@ -124,6 +159,8 @@ class WriteClient {
             useUnionTypes,
             excludeCoreServiceFiles,
             validationLibrary,
+            emptySchemaStrategy,
+            schemaModels,
         });
     }
     /**
@@ -155,7 +192,7 @@ class WriteClient {
         const result = new Map();
         for (const [key, value] of this.config.entries()) {
             for (const item of value) {
-                const { outputPaths, templates, excludeCoreServiceFiles, validationLibrary } = item;
+                const { outputPaths, templates, excludeCoreServiceFiles, validationLibrary, schemaModels } = item;
                 const outputCore = this.getOutputPath(outputPaths?.outputCore, key, 'core');
                 const outputModels = this.getOutputPath(outputPaths?.outputModels, key, 'models');
                 const outputSchemas = this.getOutputPath(outputPaths?.outputSchemas, key, 'schemas');
@@ -175,7 +212,7 @@ class WriteClient {
                 if (!clientIndex.models.includes(relativePathModel)) {
                     clientIndex.models.push(relativePathModel);
                 }
-                if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE) {
+                if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE && schemaModels.length > 0) {
                     const relativePathSchema = (0, pathHelpers_1.relativeHelper)(key, outputSchemas);
                     if (!clientIndex.schemas.includes(relativePathSchema)) {
                         clientIndex.schemas.push(relativePathSchema);
@@ -189,7 +226,7 @@ class WriteClient {
         const result = new Map();
         for (const [key, value] of this.config.entries()) {
             for (const item of value) {
-                const { outputPaths, client, templates, useUnionTypes, excludeCoreServiceFiles, validationLibrary } = item;
+                const { outputPaths, client, templates, useUnionTypes, excludeCoreServiceFiles, validationLibrary, schemaModels } = item;
                 const outputCore = this.getOutputPath(outputPaths?.outputCore, key, 'core');
                 const outputModels = this.getOutputPath(outputPaths?.outputModels, key, 'models');
                 const outputSchemas = this.getOutputPath(outputPaths?.outputSchemas, key, 'schemas');
@@ -225,7 +262,7 @@ class WriteClient {
                     if (!clientIndex.models.some(m => this.isSameModel(m, modelFinal))) {
                         clientIndex.models.push(modelFinal);
                     }
-                    if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE) {
+                    if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE && schemaModels.some(schemaModel => schemaModel.name === model.name && schemaModel.path === model.path)) {
                         const schema = { ...modelFinal, package: relativePathSchema };
                         if (!clientIndex.schemas.some(s => this.isSameShema(s, schema))) {
                             clientIndex.schemas.push(schema);

package/dist/core/__tests__/WriteClient.test.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const strict_1 = __importDefault(require("node:assert/strict"));
 const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
+const EmptySchemaStrategy_enum_1 = require("../types/enums/EmptySchemaStrategy.enum");
 const HttpClient_enum_1 = require("../types/enums/HttpClient.enum");
 const ValidationLibrary_enum_1 = require("../types/enums/ValidationLibrary.enum");
 const getOutputPaths_1 = require("../utils/getOutputPaths");
@@ -70,6 +71,7 @@ const WriteClient_1 = require("../WriteClient");
             useUnionTypes: false,
             excludeCoreServiceFiles: false,
             validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.NONE,
+            emptySchemaStrategy: EmptySchemaStrategy_enum_1.EmptySchemaStrategy.KEEP,
         });
         strict_1.default.ok(mkdirCalls.length > 0, 'mkdir should be called at least once');
         strict_1.default.ok(writeFileCalls.length > 0, 'writeFile should be called at least once');

package/dist/core/types/enums/EmptySchemaStrategy.enum.d.ts

@@ -0,0 +1,6 @@
+export declare enum EmptySchemaStrategy {
+    SEMANTIC = "semantic",
+    SKIP = "skip",
+    KEEP = "keep"
+}
+//# sourceMappingURL=EmptySchemaStrategy.enum.d.ts.map

package/dist/core/types/enums/EmptySchemaStrategy.enum.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EmptySchemaStrategy.enum.d.ts","sourceRoot":"","sources":["../../../../src/core/types/enums/EmptySchemaStrategy.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,mBAAmB;IAC3B,QAAQ,aAAa;IACrB,IAAI,SAAS;IACb,IAAI,SAAS;CAChB"}

package/dist/core/types/enums/EmptySchemaStrategy.enum.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmptySchemaStrategy = void 0;
+var EmptySchemaStrategy;
+(function (EmptySchemaStrategy) {
+    EmptySchemaStrategy["SEMANTIC"] = "semantic";
+    EmptySchemaStrategy["SKIP"] = "skip";
+    EmptySchemaStrategy["KEEP"] = "keep";
+})(EmptySchemaStrategy || (exports.EmptySchemaStrategy = EmptySchemaStrategy = {}));

package/dist/core/utils/__tests__/writeClientSchemas.test.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
+const EmptySchemaStrategy_enum_1 = require("../../types/enums/EmptySchemaStrategy.enum");
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
 const ValidationLibrary_enum_1 = require("../../types/enums/ValidationLibrary.enum");
 const WriteClient_1 = require("../../WriteClient");
@@ -47,6 +48,7 @@ const templates_1 = require("../__mocks__/templates");
             httpClient: HttpClient_enum_1.HttpClient.FETCH,
             useUnionTypes: false,
             validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.NONE,
+            emptySchemaStrategy: EmptySchemaStrategy_enum_1.EmptySchemaStrategy.KEEP,
         });
         node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('MyModelSchema.ts') && content.toString().includes('schema')), 'Expected writeFile to be called with schema content for MyModelSchema.ts');
         // Restoring the original function

package/dist/core/utils/precompileTemplates.js

@@ -66,6 +66,7 @@ const precompileTemplates = () => {
                             isBasicType: true,
                             yupBaseSchema: true,
                             joiBaseSchema: true,
+                            zodBaseSchema: true,
                             getRequiredFields: true,
                             getEnumType: true,
                             camelCase: true,

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

@@ -1 +1 @@
-{"version":3,"file":"registerHandlebarHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarHelpers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAK5D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAqK5H"}
+{"version":3,"file":"registerHandlebarHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarHelpers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAK5D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAgM5H"}

package/dist/core/utils/registerHandlebarHelpers.js

@@ -168,6 +168,31 @@ function registerHandlebarHelpers(root) {
                 return 'Joi.any()';
         }
     });
+    Handlebars.registerHelper('zodBaseSchema', function (base) {
+        if (!base)
+            return 'z.any()';
+        const baseLower = base.toLowerCase();
+        switch (baseLower) {
+            case 'string':
+                return 'z.string()';
+            case 'number':
+                return 'z.number()';
+            case 'integer':
+            case 'int':
+                return 'z.number().int()';
+            case 'boolean':
+                return 'z.boolean()';
+            case 'null':
+                return 'z.null()';
+            case 'uuid':
+                return 'z.uuid()';
+            case 'file':
+            case 'any':
+                return 'z.any()';
+            default:
+                return `${base}Schema`;
+        }
+    });
     Handlebars.registerHelper('getRequiredFields', function (properties) {
         const required = properties
             .filter(prop => prop.isRequired)

package/dist/core/utils/writeClientSchemas.d.ts

@@ -1,4 +1,5 @@
 import { Templates } from '../types/base/Templates.model';
+import { EmptySchemaStrategy } from '../types/enums/EmptySchemaStrategy.enum';
 import { HttpClient } from '../types/enums/HttpClient.enum';
 import { ValidationLibrary } from '../types/enums/ValidationLibrary.enum';
 import type { Model } from '../types/shared/Model.model';
@@ -17,7 +18,9 @@ interface IWriteClientSchemas {
     httpClient: HttpClient;
     useUnionTypes: boolean;
     validationLibrary?: ValidationLibrary;
+    emptySchemaStrategy: EmptySchemaStrategy;
 }
+export declare function isEmptySchemaModel(model: Model): boolean;
 /**
  * Generate Schemas using the Handlebar template and write to disk.
  * @param models Array of Models to write
@@ -26,6 +29,6 @@ interface IWriteClientSchemas {
  * @param httpClient The selected httpClient (fetch, xhr or node)
  * @param useUnionTypes Use union types instead of enums
  */
-export declare function writeClientSchemas(this: WriteClient, options: IWriteClientSchemas): Promise<void>;
+export declare function writeClientSchemas(this: WriteClient, options: IWriteClientSchemas): Promise<Model[]>;
 export {};
 //# sourceMappingURL=writeClientSchemas.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientSchemas.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientSchemas.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;GAMG;AACH,UAAU,mBAAmB;IACzB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiCvG"}
+{"version":3,"file":"writeClientSchemas.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientSchemas.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;GAMG;AACH,UAAU,mBAAmB;IACzB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,mBAAmB,EAAE,mBAAmB,CAAC;CAC5C;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAExD;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAwC1G"}

package/dist/core/utils/writeClientSchemas.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEmptySchemaModel = isEmptySchemaModel;
 exports.writeClientSchemas = writeClientSchemas;
 const fs_1 = require("fs");
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
+const EmptySchemaStrategy_enum_1 = require("../types/enums/EmptySchemaStrategy.enum");
+function isEmptySchemaModel(model) {
+    return model.export === 'interface' && model.properties.length === 0;
+}
 /**
  * Generate Schemas using the Handlebar template and write to disk.
  * @param models Array of Models to write
@@ -14,10 +19,11 @@ const pathHelpers_1 = require("../../common/utils/pathHelpers");
  * @param useUnionTypes Use union types instead of enums
  */
 async function writeClientSchemas(options) {
-    const { models, templates, outputSchemasPath, httpClient, useUnionTypes, validationLibrary } = options;
+    const { models, templates, outputSchemasPath, httpClient, useUnionTypes, validationLibrary, emptySchemaStrategy } = options;
     if (templates.exports.schema) {
         this.logger.info('The recording of model validation schema files begins.');
-        for (const model of models) {
+        const modelsToWrite = emptySchemaStrategy === EmptySchemaStrategy_enum_1.EmptySchemaStrategy.SKIP ? models.filter(model => !isEmptySchemaModel(model)) : models;
+        for (const model of modelsToWrite) {
             const modelFolderPath = model?.path;
             const dir = (0, pathHelpers_1.dirNameHelper)(modelFolderPath);
             if (dir) {
@@ -32,11 +38,14 @@ async function writeClientSchemas(options) {
                 httpClient,
                 useUnionTypes,
                 validationLibrary,
+                emptySchemaStrategy,
             });
             const formattedValue = await (0, format_1.format)(templateResult);
             await fileSystemHelpers_1.fileSystemHelpers.writeFile(file, formattedValue);
             this.logger.info(`File recording completed: ${file}`);
         }
         this.logger.info('The recording of model validation schema files has been completed successfully');
+        return modelsToWrite;
     }
+    return [];
 }

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

@@ -27,7 +27,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "alias"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 5, "column": 25 }, "end": { "line": 5, "column": 66 } } })) != null ? stack1 : "")
             + " } from '"
             + ((stack1 = lookupProperty(helpers, "normalizePath").call(alias1, lookupProperty(depth0, "path"), { "name": "normalizePath", "hash": {}, "data": data, "loc": { "start": { "line": 5, "column": 75 }, "end": { "line": 5, "column": 99 } } })) != null ? stack1 : "")
-            + "';\n";
+            + "Schema';\n";
     }, "3": function (container, depth0, helpers, partials, data) {
         var stack1;
         return " as "
@@ -67,5 +67,5 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 24, "column": 32 }, "end": { "line": 24, "column": 36 } }), depth0)) != null ? stack1 : "")
             + "Schema.validate(data);\n    if (error) {\n        throw error;\n    }\n    return value as "
             + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 28, "column": 23 }, "end": { "line": 28, "column": 27 } }), depth0)) != null ? stack1 : "")
-            + ";\n}";
+            + ";\n}\n";
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/joi/partials/joiSchemaInterface.d.ts

@@ -1,12 +1,14 @@
 declare const _default: {
-    "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "2": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "5": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "7": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "9": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "9": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "10": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "12": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     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/joi/partials/joiSchemaInterface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"joiSchemaInterface.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/joi/partials/joiSchemaInterface.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,wBA4CmC"}
+{"version":3,"file":"joiSchemaInterface.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/joi/partials/joiSchemaInterface.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAMA,wBA0EmC"}

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

@@ -7,13 +7,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint: disable */
 // @ts-nocheck
 exports.default = { "1": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
+        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, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "properties"), { "name": "each", "hash": {}, "fn": container.program(2, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 3, "column": 0 }, "end": { "line": 5, "column": 9 } } })) != null ? stack1 : "");
+        return "Joi.object({\n"
+            + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "properties"), { "name": "each", "hash": {}, "fn": container.program(2, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 3, "column": 0 }, "end": { "line": 5, "column": 9 } } })) != null ? stack1 : "")
+            + "})"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "isNullable"), { "name": "if", "hash": {}, "fn": container.program(7, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 6, "column": 2 }, "end": { "line": 6, "column": 39 } } })) != null ? stack1 : "")
+            + "\n";
     }, "2": 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)) {
@@ -33,18 +37,41 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
     }, "5": function (container, depth0, helpers, partials, data) {
         return ",";
     }, "7": function (container, depth0, helpers, partials, data) {
-        return "})\n";
-    }, "9": function (container, depth0, helpers, partials, data) {
         return ".allow(null)";
+    }, "9": 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 = lookupProperty(helpers, "equals").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "emptySchemaStrategy"), "semantic", { "name": "equals", "hash": {}, "fn": container.program(10, data, 0), "inverse": container.program(12, data, 0), "data": data, "loc": { "start": { "line": 8, "column": 0 }, "end": { "line": 12, "column": 11 } } })) != null ? stack1 : "");
+    }, "10": 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 "Joi.object().unknown(true)"
+            + ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "isNullable"), { "name": "if", "hash": {}, "fn": container.program(7, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 9, "column": 26 }, "end": { "line": 9, "column": 63 } } })) != null ? stack1 : "")
+            + "\n";
+    }, "12": 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 "Joi.object({})"
+            + ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "isNullable"), { "name": "if", "hash": {}, "fn": container.program(7, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 11, "column": 14 }, "end": { "line": 11, "column": 51 } } })) != null ? stack1 : "")
+            + "\n";
     }, "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) {
+        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
                 return parent[propertyName];
             }
             return undefined;
         };
-        return "Joi.object({\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "properties"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.program(7, data, 0), "data": data, "loc": { "start": { "line": 2, "column": 0 }, "end": { "line": 8, "column": 7 } } })) != null ? stack1 : "")
-            + "})"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "isNullable"), { "name": "if", "hash": {}, "fn": container.program(9, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 9, "column": 2 }, "end": { "line": 9, "column": 39 } } })) != null ? stack1 : "");
+        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "properties"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.program(9, data, 0), "data": data, "loc": { "start": { "line": 1, "column": 0 }, "end": { "line": 13, "column": 7 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

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

@@ -27,7 +27,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "alias"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 5, "column": 25 }, "end": { "line": 5, "column": 66 } } })) != null ? stack1 : "")
             + " } from '"
             + ((stack1 = lookupProperty(helpers, "normalizePath").call(alias1, lookupProperty(depth0, "path"), { "name": "normalizePath", "hash": {}, "data": data, "loc": { "start": { "line": 5, "column": 75 }, "end": { "line": 5, "column": 99 } } })) != null ? stack1 : "")
-            + "';\n";
+            + "Schema';\n";
     }, "3": function (container, depth0, helpers, partials, data) {
         var stack1;
         return " as "
@@ -65,5 +65,5 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 29, "column": 36 }, "end": { "line": 29, "column": 40 } }), depth0)) != null ? stack1 : "")
             + "Schema);\n    const valid = validate(data);\n    if (!valid) {\n        throw new Error(ajv.errorsText(validate.errors));\n    }\n    return data as "
             + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 34, "column": 22 }, "end": { "line": 34, "column": 26 } }), depth0)) != null ? stack1 : "")
-            + ";\n}";
+            + ";\n}\n";
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/jsonschema/partials/jsonschemaSchemaInterface.d.ts

@@ -5,7 +5,9 @@ declare const _default: {
     "5": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "7": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "9": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "11": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "11": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "12": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "14": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     compiler: (string | number)[];
     main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     usePartial: boolean;

package/dist/templatesCompiled/client/jsonschema/partials/jsonschemaSchemaInterface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsonschemaSchemaInterface.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/jsonschema/partials/jsonschemaSchemaInterface.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAMA,wBA2DmC"}
+{"version":3,"file":"jsonschemaSchemaInterface.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/jsonschema/partials/jsonschemaSchemaInterface.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAMA,wBA4FmC"}