openapi-ts-generator 10.41.1 → 10.49.3

package/enums/enum-helpers.d.ts

@@ -1,4 +1,4 @@
-import { IEnumValue } from './enum-value';
+import { IEnumValue } from './enum-value.ts';
 /**
  * Retrieves the key of an enum value from a list of enum values.
  *

package/enums/enum-helpers.js

@@ -1,8 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnumKey = getEnumKey;
-exports.getEnumDisplayText = getEnumDisplayText;
-exports.getEnum = getEnum;
 /**
  * Retrieves the key of an enum value from a list of enum values.
  *
@@ -10,7 +5,7 @@ exports.getEnum = getEnum;
  * @param lookupValue - The value to look up in the enum, which can be a number or a string.
  * @returns The key of the enum value if found, otherwise `undefined`.
  */
-function getEnumKey(data, lookupValue) {
+export function getEnumKey(data, lookupValue) {
     return getEnum(data, lookupValue)?.key;
 }
 /**
@@ -20,7 +15,7 @@ function getEnumKey(data, lookupValue) {
  * @param lookupValue - The value to look up in the enum, which can be a number or a string.
  * @returns The display text associated with the given enum value, or `undefined` if not found.
  */
-function getEnumDisplayText(data, lookupValue) {
+export function getEnumDisplayText(data, lookupValue) {
     return getEnum(data, lookupValue)?.displayText;
 }
 /**
@@ -30,6 +25,6 @@ function getEnumDisplayText(data, lookupValue) {
  * @param lookupValue - The value to look up, which can be either a number or a string.
  * @returns The matching enum value, or `undefined` if no match is found.
  */
-function getEnum(data, lookupValue) {
+export function getEnum(data, lookupValue) {
     return data.find((f) => f.name === lookupValue || f.key === lookupValue);
 }

package/enums/enum-properties.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnumProperties = void 0;
-var EnumProperties;
+export var EnumProperties;
 (function (EnumProperties) {
     EnumProperties["KEY"] = "key";
     EnumProperties["NAME"] = "name";
     EnumProperties["DISPLAY_TEXT"] = "displayText";
-})(EnumProperties || (exports.EnumProperties = EnumProperties = {}));
+})(EnumProperties || (EnumProperties = {}));

package/enums/enum-value.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/enums/index.d.ts

@@ -1,3 +1,3 @@
-export * from './enum-value';
-export * from './enum-properties';
-export * from './enum-helpers';
+export * from './enum-value.ts';
+export * from './enum-properties.ts';
+export * from './enum-helpers.ts';

package/enums/index.js

@@ -1,19 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./enum-value"), exports);
-__exportStar(require("./enum-properties"), exports);
-__exportStar(require("./enum-helpers"), exports);
+export * from "./enum-value.js";
+export * from "./enum-properties.js";
+export * from "./enum-helpers.js";

package/generators/barrel.generator.d.ts

@@ -1,10 +1,10 @@
-import { IGeneratorOptions } from '../models/generator-options';
-import { BaseGenerator } from './base.generator';
+import { IGeneratorOptions } from '../models/generator-options.ts';
+import { BaseGenerator } from './base.generator.ts';
 export declare class BarrelGenerator extends BaseGenerator<{
     fileNames: string[];
 }> {
     readonly GeneratorName = "BarrelGenerator";
     private readonly tsRegex;
-    constructor(options: IGeneratorOptions);
+    constructor(generatorOptions: IGeneratorOptions);
     generate(): string | null;
 }

package/generators/barrel.generator.js

@@ -1,18 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BarrelGenerator = void 0;
-const fs_1 = require("fs");
-const base_generator_1 = require("./base.generator");
-class BarrelGenerator extends base_generator_1.BaseGenerator {
-    constructor(options) {
-        super(options, options.templates?.barrel);
+import { readdirSync } from 'node:fs';
+import { BaseGenerator } from "./base.generator.js";
+export class BarrelGenerator extends BaseGenerator {
+    constructor(generatorOptions) {
+        super(generatorOptions, generatorOptions.templates?.barrel);
         this.GeneratorName = 'BarrelGenerator';
         this.tsRegex = /.ts$/;
     }
     generate() {
-        let fileNames = (0, fs_1.readdirSync)(this.generatorOptions.outputPath).map((value) => value.replace(this.tsRegex, ''));
+        let fileNames = readdirSync(this.generatorOptions.outputPath).map((value) => value.replace(this.tsRegex, ''));
         fileNames = fileNames.filter((x) => x !== 'endpoints');
         return super.generateFile(`${this.generatorOptions.outputPath}/index.ts`, fileNames.length ? { fileNames } : null);
     }
 }
-exports.BarrelGenerator = BarrelGenerator;

package/generators/base.generator.d.ts

@@ -1,9 +1,10 @@
-import { IGeneratorOptions } from '../models/generator-options';
+import handlebars from 'handlebars';
+import { IGeneratorOptions } from '../models/generator-options.ts';
 export declare abstract class BaseGenerator<TContextSchema> {
     readonly generatorOptions: IGeneratorOptions;
     readonly templateFilePath: string | undefined;
     abstract readonly GeneratorName: string;
-    readonly template?: HandlebarsTemplateDelegate<TContextSchema>;
+    readonly template?: handlebars.TemplateDelegate<TContextSchema>;
     readonly emptyArrayRegex: RegExp;
     constructor(generatorOptions: IGeneratorOptions, templateFilePath: string | undefined);
     protected generateFile(outputFilePath: string, context: TContextSchema | null): string | null;

package/generators/base.generator.js

@@ -1,16 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseGenerator = void 0;
-const fs_1 = require("fs");
-const handlebars_1 = require("handlebars");
-class BaseGenerator {
+import { readFileSync, writeFileSync } from 'node:fs';
+import handlebars from 'handlebars';
+export class BaseGenerator {
     constructor(generatorOptions, templateFilePath) {
         this.generatorOptions = generatorOptions;
         this.templateFilePath = templateFilePath;
         this.emptyArrayRegex = /, ]/g;
         if (templateFilePath) {
-            const templateSource = (0, fs_1.readFileSync)(templateFilePath, { encoding: 'utf8' });
-            this.template = (0, handlebars_1.compile)(templateSource);
+            const templateSource = readFileSync(templateFilePath, { encoding: 'utf8' });
+            this.template = handlebars.compile(templateSource);
         }
     }
     generateFile(outputFilePath, context) {
@@ -23,7 +20,7 @@ class BaseGenerator {
         else {
             try {
                 const content = this.template(context).replace(this.emptyArrayRegex, ']');
-                (0, fs_1.writeFileSync)(outputFilePath, content, { encoding: 'utf8' });
+                writeFileSync(outputFilePath, content, { encoding: 'utf8' });
                 return content;
             }
             catch (err) {
@@ -38,4 +35,3 @@ class BaseGenerator {
         return null;
     }
 }
-exports.BaseGenerator = BaseGenerator;

package/generators/endpoints.generator.d.ts

@@ -1,6 +1,6 @@
-import { IGeneratorOptions } from '../models/generator-options';
-import { IPath, ITemplateData } from '../models/template-data';
-import { BaseGenerator } from './base.generator';
+import { IGeneratorOptions } from '../models/generator-options.ts';
+import { IPath, ITemplateData } from '../models/template-data.ts';
+import { BaseGenerator } from './base.generator.ts';
 export declare class EndPointsGenerator extends BaseGenerator<{
     paths: IPath[];
 }> {

package/generators/endpoints.generator.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EndPointsGenerator = void 0;
-const base_generator_1 = require("./base.generator");
-const lodash_1 = require("lodash");
-class EndPointsGenerator extends base_generator_1.BaseGenerator {
+import lodash from 'lodash';
+import { BaseGenerator } from "./base.generator.js";
+export class EndPointsGenerator extends BaseGenerator {
     constructor(options) {
         super(options, options.templates?.endpoints);
         this.GeneratorName = 'EndPointsGenerator';
-        this.endpointIdentifierRegex = /[A-z0-9_-]*$/;
+        this.endpointIdentifierRegex = /[A-Za-z0-9_-]*$/;
     }
     generate(templateData) {
         const paths = this.eliminateDupes(templateData);
@@ -17,13 +14,13 @@ class EndPointsGenerator extends base_generator_1.BaseGenerator {
         const sortedTemplateData = [...templateData.paths].sort((x, y) => (x.endpoint.toUpperCase() < y.endpoint.toUpperCase() ? -1 : 1));
         const result = [];
         sortedTemplateData.forEach((val) => {
-            val = { ...val, tag: (0, lodash_1.camelCase)(val.tag) };
+            val = { ...val, tag: lodash.camelCase(val.tag) };
             const dupeIndex = result.findIndex((f) => f.tag === val.tag);
             if (dupeIndex > -1) {
                 const dupeCount = result.filter((f) => f.tag === val.tag).length + 1;
                 const endpointIdentifier = (this.endpointIdentifierRegex.exec(val.endpoint) || [])[0];
                 // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                result.push({ ...val, tag: (0, lodash_1.camelCase)(`${val.tag}_${endpointIdentifier || dupeCount}`) });
+                result.push({ ...val, tag: lodash.camelCase(`${val.tag}_${endpointIdentifier || dupeCount}`) });
             }
             else {
                 result.push(val);
@@ -32,4 +29,3 @@ class EndPointsGenerator extends base_generator_1.BaseGenerator {
         return result;
     }
 }
-exports.EndPointsGenerator = EndPointsGenerator;

package/generators/enum.generator.d.ts

@@ -1,7 +1,7 @@
-import { IGeneratorOptions } from '../models/generator-options';
-import { ITemplateData } from '../models/template-data';
-import { IEntity } from '../models/entity';
-import { BaseGenerator } from './base.generator';
+import { IGeneratorOptions } from '../models/generator-options.ts';
+import { ITemplateData } from '../models/template-data.ts';
+import { IEntity } from '../models/entity.ts';
+import { BaseGenerator } from './base.generator.ts';
 export declare class EnumGenerator extends BaseGenerator<IEntity> {
     readonly GeneratorName = "EnumGenerator";
     constructor(options: IGeneratorOptions);

package/generators/enum.generator.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnumGenerator = void 0;
-const lodash_1 = require("lodash");
-const base_generator_1 = require("./base.generator");
-class EnumGenerator extends base_generator_1.BaseGenerator {
+import lodash from 'lodash';
+import { BaseGenerator } from "./base.generator.js";
+export class EnumGenerator extends BaseGenerator {
     constructor(options) {
         super(options, options.templates?.enum);
         this.GeneratorName = 'EnumGenerator';
@@ -12,8 +9,7 @@ class EnumGenerator extends base_generator_1.BaseGenerator {
         templateData.entities
             ?.filter((entity) => entity.isEnum)
             .forEach((entity) => {
-            super.generateFile(`${this.generatorOptions.outputPath}/${(0, lodash_1.kebabCase)(entity.name)}.enum.ts`, entity);
+            super.generateFile(`${this.generatorOptions.outputPath}/${lodash.kebabCase(entity.name)}.enum.ts`, entity);
         });
     }
 }
-exports.EnumGenerator = EnumGenerator;

package/generators/form-group-factory.generator.d.ts

@@ -1,8 +1,8 @@
-import { IGeneratorOptions } from '../models/generator-options';
-import { ITemplateData } from '../models/template-data';
-import { IEntity } from '../models/entity';
-import { BaseGenerator } from './base.generator';
-import { IHelperContext, PropertyType } from '../models/helper-context';
+import { IGeneratorOptions } from '../models/generator-options.ts';
+import { ITemplateData } from '../models/template-data.ts';
+import { IEntity } from '../models/entity.ts';
+import { BaseGenerator } from './base.generator.ts';
+import { IHelperContext, PropertyType } from '../models/helper-context.ts';
 export declare class FormGroupFactoryGenerator extends BaseGenerator<IEntity> {
     readonly GeneratorName = "FormGroupFactoryGenerator";
     constructor(options: IGeneratorOptions);

package/generators/form-group-factory.generator.js

@@ -1,44 +1,8 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormGroupFactoryGenerator = void 0;
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
-const lodash_1 = require("lodash");
-const base_generator_1 = require("./base.generator");
-const HandleBars = __importStar(require("handlebars"));
-class FormGroupFactoryGenerator extends base_generator_1.BaseGenerator {
+import handlebars from 'handlebars';
+import lodash from 'lodash';
+import { BaseGenerator } from "./base.generator.js";
+export class FormGroupFactoryGenerator extends BaseGenerator {
     constructor(options) {
         super(options, options.templates?.formGroupFactory);
         this.GeneratorName = 'FormGroupFactoryGenerator';
@@ -48,7 +12,7 @@ class FormGroupFactoryGenerator extends base_generator_1.BaseGenerator {
         templateData.entities
             ?.filter((val) => val.valueProperties?.length + val.referenceProperties?.length > 0)
             .forEach((entity) => {
-            super.generateFile(`${this.generatorOptions.outputPath}/${(0, lodash_1.kebabCase)(entity.name)}.form-group-fac.ts`, entity);
+            super.generateFile(`${this.generatorOptions.outputPath}/${lodash.kebabCase(entity.name)}.form-group-fac.ts`, entity);
         });
     }
     registerHelpers() {
@@ -61,7 +25,7 @@ class FormGroupFactoryGenerator extends base_generator_1.BaseGenerator {
         this.registerValidatorHelper('pattern');
     }
     registerValidatorHelper(validatorName, angularValidatorName = validatorName) {
-        HandleBars.registerHelper(`${validatorName}Validator`, (x, y) => this.validatorFactory(x, y, validatorName, angularValidatorName));
+        handlebars.registerHelper(`${validatorName}Validator`, (x, y) => this.validatorFactory(x, y, validatorName, angularValidatorName));
     }
     validatorFactory(propertyCollection, propertyContext, validationName, angularValidatorFunctionName) {
         const props = propertyContext.data.root[propertyCollection];
@@ -76,4 +40,3 @@ class FormGroupFactoryGenerator extends base_generator_1.BaseGenerator {
         return '';
     }
 }
-exports.FormGroupFactoryGenerator = FormGroupFactoryGenerator;

package/generators/form.generator.d.ts

@@ -1,7 +1,7 @@
-import { IGeneratorOptions } from '../models/generator-options';
-import { ITemplateData } from '../models/template-data';
-import { IEntity } from '../models/entity';
-import { BaseGenerator } from './base.generator';
+import { IGeneratorOptions } from '../models/generator-options.ts';
+import { ITemplateData } from '../models/template-data.ts';
+import { IEntity } from '../models/entity.ts';
+import { BaseGenerator } from './base.generator.ts';
 export declare class FormGenerator extends BaseGenerator<IEntity> {
     readonly GeneratorName = "FormGenerator";
     constructor(options: IGeneratorOptions);

package/generators/form.generator.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormGenerator = void 0;
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
-const lodash_1 = require("lodash");
-const base_generator_1 = require("./base.generator");
-class FormGenerator extends base_generator_1.BaseGenerator {
+import lodash from 'lodash';
+import { BaseGenerator } from "./base.generator.js";
+export class FormGenerator extends BaseGenerator {
     constructor(options) {
         super(options, options.templates?.form);
         this.GeneratorName = 'FormGenerator';
@@ -13,8 +10,7 @@ class FormGenerator extends base_generator_1.BaseGenerator {
         templateData.entities
             ?.filter((val) => val.valueProperties?.length + val.referenceProperties?.length > 0)
             .forEach((entity) => {
-            super.generateFile(`${this.generatorOptions.outputPath}/${(0, lodash_1.kebabCase)(entity.name)}.form.ts`, entity);
+            super.generateFile(`${this.generatorOptions.outputPath}/${lodash.kebabCase(entity.name)}.form.ts`, entity);
         });
     }
 }
-exports.FormGenerator = FormGenerator;

package/generators/index.d.ts

@@ -1,8 +1,8 @@
-export * from './model.generator';
-export * from './form-group-factory.generator';
-export * from './model-properties.generator';
-export * from './barrel.generator';
-export * from './enum.generator';
-export * from './form.generator';
-export * from './test-object-factory.generator';
-export * from './endpoints.generator';
+export * from './model.generator.ts';
+export * from './form-group-factory.generator.ts';
+export * from './model-properties.generator.ts';
+export * from './barrel.generator.ts';
+export * from './enum.generator.ts';
+export * from './form.generator.ts';
+export * from './test-object-factory.generator.ts';
+export * from './endpoints.generator.ts';

package/generators/index.js

@@ -1,24 +1,8 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./model.generator"), exports);
-__exportStar(require("./form-group-factory.generator"), exports);
-__exportStar(require("./model-properties.generator"), exports);
-__exportStar(require("./barrel.generator"), exports);
-__exportStar(require("./enum.generator"), exports);
-__exportStar(require("./form.generator"), exports);
-__exportStar(require("./test-object-factory.generator"), exports);
-__exportStar(require("./endpoints.generator"), exports);
+export * from "./model.generator.js";
+export * from "./form-group-factory.generator.js";
+export * from "./model-properties.generator.js";
+export * from "./barrel.generator.js";
+export * from "./enum.generator.js";
+export * from "./form.generator.js";
+export * from "./test-object-factory.generator.js";
+export * from "./endpoints.generator.js";

package/generators/model-properties.generator.d.ts

@@ -1,7 +1,7 @@
-import { IGeneratorOptions } from '../models/generator-options';
-import { ITemplateData } from '../models/template-data';
-import { IEntity } from '../models/entity';
-import { BaseGenerator } from './base.generator';
+import { IGeneratorOptions } from '../models/generator-options.ts';
+import { ITemplateData } from '../models/template-data.ts';
+import { IEntity } from '../models/entity.ts';
+import { BaseGenerator } from './base.generator.ts';
 export declare class ModelPropertiesGenerator extends BaseGenerator<IEntity> {
     readonly GeneratorName = "ModelPropertiesGenerator";
     constructor(options: IGeneratorOptions);

package/generators/model-properties.generator.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelPropertiesGenerator = void 0;
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
-const lodash_1 = require("lodash");
-const base_generator_1 = require("./base.generator");
-class ModelPropertiesGenerator extends base_generator_1.BaseGenerator {
+import lodash from 'lodash';
+import { BaseGenerator } from "./base.generator.js";
+export class ModelPropertiesGenerator extends BaseGenerator {
     constructor(options) {
         super(options, options.templates?.modelProperties);
         this.GeneratorName = 'ModelPropertiesGenerator';
@@ -14,8 +11,7 @@ class ModelPropertiesGenerator extends base_generator_1.BaseGenerator {
             ?.filter((entity) => !entity.isEnum)
             .filter((val) => val.valueProperties?.length > 0 || val.referenceProperties?.length > 0)
             .forEach((entity) => {
-            super.generateFile(`${this.generatorOptions.outputPath}/${(0, lodash_1.kebabCase)(entity.name)}.properties.ts`, entity);
+            super.generateFile(`${this.generatorOptions.outputPath}/${lodash.kebabCase(entity.name)}.properties.ts`, entity);
         });
     }
 }
-exports.ModelPropertiesGenerator = ModelPropertiesGenerator;

package/generators/model.generator.d.ts

@@ -1,8 +1,9 @@
-import { IGeneratorOptions } from '../models/generator-options';
-import { ITemplateData } from '../models/template-data';
-import { IEntity } from '../models/entity';
-import { BaseGenerator } from './base.generator';
+import { IGeneratorOptions } from '../models/generator-options.ts';
+import { ITemplateData } from '../models/template-data.ts';
+import { IEntity } from '../models/entity.ts';
+import { BaseGenerator } from './base.generator.ts';
 export declare class ModelGenerator extends BaseGenerator<IEntity> {
+    private readonly options;
     readonly GeneratorName = "ModelGenerator";
     constructor(options: IGeneratorOptions);
     generate(templateData: ITemplateData): void;

package/generators/model.generator.js

@@ -1,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelGenerator = void 0;
-const lodash_1 = require("lodash");
-const base_generator_1 = require("./base.generator");
-class ModelGenerator extends base_generator_1.BaseGenerator {
+import lodash from 'lodash';
+import { BaseGenerator } from "./base.generator.js";
+export class ModelGenerator extends BaseGenerator {
     constructor(options) {
         super(options, options.genClasses ? options.templates?.entity : options.templates?.model);
+        this.options = options;
         this.GeneratorName = 'ModelGenerator';
     }
     generate(templateData) {
-        const fileSuffix = this.generatorOptions.genClasses ? '.entity.ts' : '.model.ts';
+        const fileSuffix = this.options.genClasses ? '.entity.ts' : '.model.ts';
         templateData.entities
             ?.filter((entity) => !entity.isEnum)
             .forEach((entity) => {
-            super.generateFile(`${this.generatorOptions.outputPath}/${(0, lodash_1.kebabCase)(entity.name)}${fileSuffix}`, entity);
+            super.generateFile(`${this.options.outputPath}/${lodash.kebabCase(entity.name)}${fileSuffix}`, entity);
         });
     }
 }
-exports.ModelGenerator = ModelGenerator;

package/generators/test-object-factory.generator.d.ts

@@ -1,8 +1,9 @@
-import { IGeneratorOptions } from '../models/generator-options';
-import { ITemplateData } from '../models/template-data';
-import { IEntity } from '../models/entity';
-import { BaseGenerator } from './base.generator';
+import { IGeneratorOptions } from '../models/generator-options.ts';
+import { ITemplateData } from '../models/template-data.ts';
+import { IEntity } from '../models/entity.ts';
+import { BaseGenerator } from './base.generator.ts';
 export declare class TestObjectFactoryGenerator extends BaseGenerator<IEntity> {
+    private readonly options;
     readonly GeneratorName = "TestObjectFactoryGenerator";
     constructor(options: IGeneratorOptions);
     generate(templateData: ITemplateData): void;

package/generators/test-object-factory.generator.js

@@ -1,20 +1,17 @@
-"use strict";
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TestObjectFactoryGenerator = void 0;
-const lodash_1 = require("lodash");
-const base_generator_1 = require("./base.generator");
-class TestObjectFactoryGenerator extends base_generator_1.BaseGenerator {
+import lodash from 'lodash';
+import { BaseGenerator } from "./base.generator.js";
+export class TestObjectFactoryGenerator extends BaseGenerator {
     constructor(options) {
         super(options, options.templates?.testObjectFactory);
+        this.options = options;
         this.GeneratorName = 'TestObjectFactoryGenerator';
     }
     generate(templateData) {
         templateData.entities
             ?.filter((val) => val.valueProperties?.length + val.referenceProperties?.length > 0)
             .forEach((entity) => {
-            super.generateFile(`${this.generatorOptions.outputPath}/${(0, lodash_1.kebabCase)(entity.name)}.test-obj-fac.ts`, entity);
+            super.generateFile(`${this.options.outputPath}/${lodash.kebabCase(entity.name)}.test-obj-fac.ts`, entity);
         });
     }
 }
-exports.TestObjectFactoryGenerator = TestObjectFactoryGenerator;

package/index.d.ts

@@ -1,3 +1,3 @@
-import { IGeneratorOptions } from './models/generator-options';
-export { nrsrxTypeFilterCallBack, nrsrxValuePropertyTypeFilterCallBack } from './models/nrsrx-filters';
+import { IGeneratorOptions } from './models/generator-options.ts';
+export { nrsrxTypeFilterCallBack, nrsrxValuePropertyTypeFilterCallBack } from './models/nrsrx-filters.ts';
 export declare function generateTsModels(options: IGeneratorOptions): Promise<void>;

package/index.js

@@ -1,62 +1,20 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nrsrxValuePropertyTypeFilterCallBack = exports.nrsrxTypeFilterCallBack = void 0;
-exports.generateTsModels = generateTsModels;
-const fs = __importStar(require("node:fs"));
-const generators_1 = require("./generators");
-const generator_options_1 = require("./models/generator-options");
-const openapidoc_converter_1 = require("./openapidoc-converter");
-const axios_1 = __importDefault(require("axios"));
-var nrsrx_filters_1 = require("./models/nrsrx-filters");
-Object.defineProperty(exports, "nrsrxTypeFilterCallBack", { enumerable: true, get: function () { return nrsrx_filters_1.nrsrxTypeFilterCallBack; } });
-Object.defineProperty(exports, "nrsrxValuePropertyTypeFilterCallBack", { enumerable: true, get: function () { return nrsrx_filters_1.nrsrxValuePropertyTypeFilterCallBack; } });
-async function generateTsModels(options) {
-    options = (0, generator_options_1.setGeneratorOptionDefaults)(options);
+import * as fs from 'node:fs';
+import { FormGenerator, EndPointsGenerator, BarrelGenerator, FormGroupFactoryGenerator, ModelGenerator, ModelPropertiesGenerator, EnumGenerator, TestObjectFactoryGenerator, } from "./generators/index.js";
+import { setGeneratorOptionDefaults } from "./models/generator-options.js";
+import { OpenApiDocConverter } from "./openapidoc-converter.js";
+import Axios from 'axios';
+export { nrsrxTypeFilterCallBack, nrsrxValuePropertyTypeFilterCallBack } from "./models/nrsrx-filters.js";
+export async function generateTsModels(options) {
+    options = setGeneratorOptionDefaults(options);
     const apiDocument = await getOpenApiDocumentAsync(options);
-    const converter = new openapidoc_converter_1.OpenApiDocConverter(options, apiDocument);
+    const converter = new OpenApiDocConverter(options, apiDocument);
     const templateData = converter.convertDocument();
     generateOutput(options, templateData);
 }
 async function getOpenApiDocumentAsync(options) {
     let apiDoc;
     if (options.openApiJsonUrl) {
-        const response = await axios_1.default.get(options.openApiJsonUrl, options.axiosConfig);
+        const response = await Axios.get(options.openApiJsonUrl, options.axiosConfig);
         apiDoc = response.data;
     }
     else if (options.openApiJsonFileName) {
@@ -73,25 +31,25 @@ function generateOutput(options, templateData) {
         fs.readdirSync(options.outputPath).forEach((file) => {
             fs.unlinkSync(`${options.outputPath}/${file}`);
         });
-        fs.rmdirSync(options.outputPath);
+        fs.rmSync(options.outputPath, { recursive: true });
     }
     fs.mkdirSync(options.outputPath, { recursive: true });
-    const modelGenerator = new generators_1.ModelGenerator(options);
+    const modelGenerator = new ModelGenerator(options);
     modelGenerator.generate(templateData);
     if (options.genAngularFormGroups) {
-        const formGroupGenerator = new generators_1.FormGroupFactoryGenerator(options);
+        const formGroupGenerator = new FormGroupFactoryGenerator(options);
         formGroupGenerator.generate(templateData);
-        const formGenerator = new generators_1.FormGenerator(options);
+        const formGenerator = new FormGenerator(options);
         formGenerator.generate(templateData);
     }
-    const modelPropertiesGenerator = new generators_1.ModelPropertiesGenerator(options);
+    const modelPropertiesGenerator = new ModelPropertiesGenerator(options);
     modelPropertiesGenerator.generate(templateData);
-    const endpointGenerator = new generators_1.EndPointsGenerator(options);
+    const endpointGenerator = new EndPointsGenerator(options);
     endpointGenerator.generate(templateData);
-    const barrelGenerator = new generators_1.BarrelGenerator(options);
-    const enumGenerator = new generators_1.EnumGenerator(options);
+    const barrelGenerator = new BarrelGenerator(options);
+    const enumGenerator = new EnumGenerator(options);
     enumGenerator.generate(templateData);
-    const testObjFacGenerator = new generators_1.TestObjectFactoryGenerator(options);
+    const testObjFacGenerator = new TestObjectFactoryGenerator(options);
     testObjFacGenerator.generate(templateData);
     barrelGenerator.generate();
 }

package/jest.setup.d.ts

@@ -0,0 +1 @@
+export {};

package/jest.setup.js

@@ -0,0 +1,4 @@
+import { jest } from '@jest/globals';
+jest.mock('./models/utils.ts', () => ({
+    getDirName: jest.fn(() => './src/models/'),
+}));

package/models/entity.d.ts

@@ -1,7 +1,7 @@
-import { IReferenceProperty } from './reference-property';
-import { IValueProperty } from './value-property';
-import { IImportType } from './template-data';
-import { IEnumValue } from './enum-value';
+import { IReferenceProperty } from './reference-property.ts';
+import { IValueProperty } from './value-property.ts';
+import { IImportType } from './template-data.ts';
+import { IEnumValue } from './enum-value.ts';
 export interface IEntity {
     isEnum?: boolean;
     isCharEnum: boolean;

package/models/entity.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/models/enum-value.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/models/generator-options.d.ts

@@ -1,7 +1,7 @@
-import { ILogger } from './logger';
-import { IEntity } from './entity';
-import { IReferenceProperty } from './reference-property';
-import { IValueProperty } from './value-property';
+import { ILogger } from './logger.ts';
+import { IEntity } from './entity.ts';
+import { IReferenceProperty } from './reference-property.ts';
+import { IValueProperty } from './value-property.ts';
 import { AxiosRequestConfig } from 'axios';
 export interface IGeneratorOptions {
     logger?: ILogger;

package/models/generator-options.js

@@ -1,14 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultFilter = defaultFilter;
-exports.setGeneratorOptionDefaults = setGeneratorOptionDefaults;
 /* eslint-disable @typescript-eslint/no-unused-vars */
-const path_1 = require("path");
-function defaultFilter(_value, _index, _array) {
+import { resolve, } from 'node:path';
+import { getDirName } from "./utils.js";
+export function defaultFilter(_value, _index, _array) {
     return true;
 }
-function setGeneratorOptionDefaults(options) {
-    const templateFolder = (0, path_1.resolve)(`${__dirname}/..`, 'templates');
+export function setGeneratorOptionDefaults(options) {
+    const __dirname = getDirName();
+    const templateFolder = resolve(`${__dirname}/..`, 'templates');
     options.typeFilterCallBack = options.typeFilterCallBack ?? defaultFilter;
     options.valuePropertyTypeFilterCallBack = options.valuePropertyTypeFilterCallBack ?? defaultFilter;
     options.referencePropertyTypeFilterCallBack = options.referencePropertyTypeFilterCallBack ?? defaultFilter;

package/models/helper-context.d.ts

@@ -1,4 +1,4 @@
-import { IEntity } from './entity';
+import { IEntity } from './entity.ts';
 export interface IHelperContext {
     data: {
         root: IEntity;

package/models/helper-context.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/models/logger.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockConsoleLogger = void 0;
 /* eslint-disable @typescript-eslint/no-unused-vars */
-class MockConsoleLogger {
+export class MockConsoleLogger {
     constructor() {
         this.log = (data) => { };
         this.error = (data) => { };
         this.warn = (data) => { };
     }
 }
-exports.MockConsoleLogger = MockConsoleLogger;

package/models/nrsrx-filters.d.ts

@@ -1,4 +1,4 @@
-import { IEntity } from './entity';
-import { IValueProperty } from './value-property';
+import { IEntity } from './entity.ts';
+import { IValueProperty } from './value-property.ts';
 export declare function nrsrxTypeFilterCallBack(val: IEntity, _i: number, _arr: IEntity[]): boolean;
 export declare function nrsrxValuePropertyTypeFilterCallBack(val: IValueProperty, _i: number, _arr: IValueProperty[]): boolean;

package/models/nrsrx-filters.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nrsrxTypeFilterCallBack = nrsrxTypeFilterCallBack;
-exports.nrsrxValuePropertyTypeFilterCallBack = nrsrxValuePropertyTypeFilterCallBack;
 const edmRegex = /^Edm[A-z]*Kind$/;
-function nrsrxTypeFilterCallBack(val, _i, _arr) {
+export function nrsrxTypeFilterCallBack(val, _i, _arr) {
     return !val.name.endsWith('ODataEnvelope') && !edmRegex.test(val.name);
 }
-function nrsrxValuePropertyTypeFilterCallBack(val, _i, _arr) {
+export function nrsrxValuePropertyTypeFilterCallBack(val, _i, _arr) {
     return !val.name.startsWith('created') && !val.name.startsWith('updated');
 }

package/models/reference-property.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/models/schema-info.d.ts

@@ -1,8 +1,8 @@
 import { ReferenceObject, SchemaObject } from 'openapi3-ts/oas31';
-import { IEnumValue } from './enum-value';
-import { IGeneratorOptions } from './generator-options';
-import { IReferenceProperty } from './reference-property';
-import { IValueProperty } from './value-property';
+import { IEnumValue } from './enum-value.ts';
+import { IGeneratorOptions } from './generator-options.ts';
+import { IReferenceProperty } from './reference-property.ts';
+import { IValueProperty } from './value-property.ts';
 export declare class SchemaWrapperInfo {
     propertySchemaObject: SchemaObject;
     propertyReferenceObject: ReferenceObject;

package/models/schema-info.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SchemaWrapperInfo = void 0;
-const generator_options_1 = require("./generator-options");
-class SchemaWrapperInfo {
+import { defaultFilter } from "./generator-options.js";
+export class SchemaWrapperInfo {
     constructor(schemaItem) {
         this.propertySchemaObject = {};
         this.propertyReferenceObject = { $ref: '' };
@@ -14,7 +11,6 @@ class SchemaWrapperInfo {
         this.enumValues = [];
     }
     updateReferenceProperties(options) {
-        this.referenceProperties = this.referenceProperties.filter(options.referencePropertyTypeFilterCallBack ?? generator_options_1.defaultFilter);
+        this.referenceProperties = this.referenceProperties.filter(options.referencePropertyTypeFilterCallBack ?? defaultFilter);
     }
 }
-exports.SchemaWrapperInfo = SchemaWrapperInfo;

package/models/template-data.d.ts

@@ -1,4 +1,4 @@
-import { IEntity } from './entity';
+import { IEntity } from './entity.ts';
 export interface ITemplateData {
     entities?: IEntity[];
     paths: IPath[];

package/models/template-data.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/models/utils.d.ts

@@ -0,0 +1 @@
+export declare const getDirName: () => string;

package/models/utils.js

@@ -0,0 +1,6 @@
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+export const getDirName = () => {
+    const __filename = fileURLToPath(import.meta.url);
+    return dirname(__filename);
+};

package/models/value-property.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/openapidoc-converter.d.ts

@@ -1,10 +1,10 @@
-import { IGeneratorOptions } from './models/generator-options';
-import { SchemaWrapperInfo } from './models/schema-info';
-import { IImportType, IPath, ITemplateData } from './models/template-data';
-import { IEntity } from './models/entity';
-import { IReferenceProperty } from './models/reference-property';
-import { IValueProperty } from './models/value-property';
 import { OpenAPIObject } from 'openapi3-ts/oas31';
+import { IGeneratorOptions } from './models/generator-options.ts';
+import { SchemaWrapperInfo } from './models/schema-info.ts';
+import { IImportType, IPath, ITemplateData } from './models/template-data.ts';
+import { IEntity } from './models/entity.ts';
+import { IReferenceProperty } from './models/reference-property.ts';
+import { IValueProperty } from './models/value-property.ts';
 export declare class OpenApiDocConverter {
     private readonly options;
     private readonly apiDocument;

package/openapidoc-converter.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenApiDocConverter = void 0;
 /* eslint-disable @typescript-eslint/no-unnecessary-type-conversion */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
-const generator_options_1 = require("./models/generator-options");
-const schema_info_1 = require("./models/schema-info");
-const pluralize_1 = require("pluralize");
-const lodash_1 = require("lodash");
-class OpenApiDocConverter {
+import pluralize from 'pluralize';
+import lodash from 'lodash';
+import { defaultFilter } from "./models/generator-options.js";
+import { SchemaWrapperInfo } from "./models/schema-info.js";
+export class OpenApiDocConverter {
     constructor(options, apiDocument) {
         this.options = options;
         this.apiDocument = apiDocument;
@@ -28,7 +25,7 @@ class OpenApiDocConverter {
             tagLookup = tagLookup || path.delete || path.patch;
             const tag = (tagLookup?.tags || ['unknown_endpoint'])[0];
             paths.push({
-                tag: (0, lodash_1.snakeCase)(tag),
+                tag: lodash.snakeCase(tag),
                 endpoint: this.options.pathUrlFormattingCallBack ? this.options.pathUrlFormattingCallBack(key) : key,
             });
         }
@@ -38,7 +35,7 @@ class OpenApiDocConverter {
         const entities = [];
         for (const schemaName in this.apiDocument.components?.schemas) {
             if (this.apiDocument.components.schemas[schemaName]) {
-                const schemaWrapperInfo = new schema_info_1.SchemaWrapperInfo(this.apiDocument.components?.schemas[schemaName]);
+                const schemaWrapperInfo = new SchemaWrapperInfo(this.apiDocument.components?.schemas[schemaName]);
                 if (schemaWrapperInfo.componentSchemaObject.enum) {
                     this.buildSchemaWrapperInfoForEnum(schemaWrapperInfo);
                 }
@@ -56,40 +53,43 @@ class OpenApiDocConverter {
                             key: schemaWrapperInfo.isCharEnum ? t.key : +t.key,
                         }),
                     name: schemaName,
-                    kebabCasedName: (0, lodash_1.kebabCase)(schemaName),
-                    singularName: (0, pluralize_1.singular)(schemaName),
-                    camelSingularName: (0, lodash_1.camelCase)((0, pluralize_1.singular)(schemaName)),
+                    kebabCasedName: lodash.kebabCase(schemaName),
+                    singularName: pluralize.singular(schemaName),
+                    camelSingularName: lodash.camelCase(pluralize.singular(schemaName)),
                     description: schemaWrapperInfo.description,
                     referenceProperties: schemaWrapperInfo.referenceProperties,
-                    valueProperties: schemaWrapperInfo.valueProperties.filter(this.options.valuePropertyTypeFilterCallBack || generator_options_1.defaultFilter),
+                    valueProperties: schemaWrapperInfo.valueProperties.filter(this.options.valuePropertyTypeFilterCallBack || defaultFilter),
                     importTypes: this.getImportTypes(schemaName, schemaWrapperInfo),
                 };
                 entities.push(entity);
             }
         }
-        return entities.filter(this.options.typeFilterCallBack || generator_options_1.defaultFilter);
+        return entities.filter(this.options.typeFilterCallBack || defaultFilter);
     }
     buildSchemaWrapperInfoForEnum(schemaWrapperInfo) {
         schemaWrapperInfo.isEnum = true;
-        let enumValues = [...(schemaWrapperInfo.componentSchemaObject.enum || []).map((x) => {
+        let enumValues = [
+            ...(schemaWrapperInfo.componentSchemaObject.enum || []).map((x) => {
                 const key = this.startNumberregex.exec(x)?.at(0);
                 const name = this.endAlphaNumRegex.exec(x)?.at(0) ?? '';
                 return {
                     key: key ? +key : 0,
                     name,
-                    titleName: (0, lodash_1.startCase)(name),
-                    snakeCaseName: (0, lodash_1.snakeCase)(name).toUpperCase(),
+                    titleName: lodash.startCase(name),
+                    snakeCaseName: lodash.snakeCase(name).toUpperCase(),
                 };
-            })];
-        schemaWrapperInfo.isCharEnum = enumValues.length > 0 &&
-            enumValues
-                .filter((enumVal) => typeof enumVal !== 'string' && typeof enumVal.key === 'number')
-                .map((enumVal) => enumVal.key)
-                .every((val) => val >= 65 && val <= 90); // A-Z ASCII range
+            }),
+        ];
+        schemaWrapperInfo.isCharEnum =
+            enumValues.length > 0 &&
+                enumValues
+                    .filter((enumVal) => typeof enumVal !== 'string' && typeof enumVal.key === 'number')
+                    .map((enumVal) => enumVal.key)
+                    .every((val) => val >= 65 && val <= 90); // A-Z ASCII range
         if (schemaWrapperInfo.isCharEnum) {
-            enumValues = enumValues.map(enumvalue => ({
+            enumValues = enumValues.map((enumvalue) => ({
                 ...enumvalue,
-                key: String.fromCharCode(enumvalue.key)
+                key: String.fromCharCode(enumvalue.key),
             }));
         }
         schemaWrapperInfo.enumValues.push(...enumValues);
@@ -134,7 +134,7 @@ class OpenApiDocConverter {
             initialValue,
             initialTestValue,
             isArray: false,
-            snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
+            snakeCaseName: lodash.snakeCase(propertyName).toUpperCase(),
             typeScriptType: this.getPropertyTypeScriptType(schemaWrapperInfo),
             maxLength: schemaWrapperInfo.propertySchemaObject.maxLength,
             minLength: schemaWrapperInfo.propertySchemaObject.minLength,
@@ -170,7 +170,7 @@ class OpenApiDocConverter {
             email: false,
             uri: false,
             isArray: true,
-            snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
+            snakeCaseName: lodash.snakeCase(propertyName).toUpperCase(),
             hasMultipleValidators: false,
             hasValidators: validatorCount > 0,
         };
@@ -226,7 +226,7 @@ class OpenApiDocConverter {
             return `'${defaultValue.split(' ').pop()}'`;
         }
         else if (email) {
-            return `'${(0, lodash_1.kebabCase)(parentTypeName)}@email.org'`;
+            return `'${lodash.kebabCase(parentTypeName)}@email.org'`;
         }
         else if (typescriptType === 'Date') {
             return 'new Date()';
@@ -244,7 +244,7 @@ class OpenApiDocConverter {
             return minValue ? `${minValue}` : '0';
         }
         else {
-            let retValue = (0, lodash_1.snakeCase)(propertyName).toUpperCase();
+            let retValue = lodash.snakeCase(propertyName).toUpperCase();
             while (minLength && retValue.length < minLength) {
                 retValue = `${retValue}_${retValue}`;
             }
@@ -275,7 +275,7 @@ class OpenApiDocConverter {
             isSameAsParentTypescriptType: parentTypeName.toLowerCase() === typeName.toLowerCase(),
             initialValue,
             initialTestValue,
-            snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
+            snakeCaseName: lodash.snakeCase(propertyName).toUpperCase(),
             referenceTypeName: typeName,
             typeScriptType: typeName,
             isArray: false,
@@ -351,7 +351,7 @@ class OpenApiDocConverter {
             const props = properties.filter((t) => t.items.$ref === value || t.$ref === value);
             return {
                 name: value,
-                kebabCasedTypeName: (0, lodash_1.kebabCase)(value),
+                kebabCasedTypeName: lodash.kebabCase(value),
                 isEnum: (refSchema?.enum ?? []).length > 0,
                 areAllArrays: props.every((val) => val.type === 'array'),
                 hasArrays: props.some((val) => val.type === 'array'),
@@ -367,4 +367,3 @@ class OpenApiDocConverter {
             propertyName !== 'id');
     }
 }
-exports.OpenApiDocConverter = OpenApiDocConverter;

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "openapi-ts-generator",
-  "version": "10.41.1",
+  "version": "10.49.3",
   "description": "Based on swagger-ts-generator, this is a type script model generator specifically for services with OpenApi spec documentation.",
   "main": "index.js",
+  "type": "module",
   "types": "index.d.ts",
   "exports": {
     ".": {
@@ -19,7 +20,8 @@
   "scripts": {
     "build": "tsc && cp -rfv ./src/templates ./lib",
     "format": "prettier --write \"src/**/*.ts\"",
-    "lint": "eslint . --ext .ts --output-file ./eslint-report.json --format json && eslint . --ext .ts --output-file ./eslint-report.html --format html ",
+    "lint-json": "eslint --output-file ./eslint-report.json --format json",
+    "lint-html": "eslint --output-file ./eslint-report.html --format html",
     "link": "npm run build && cd lib && npm link && cd ..",
     "test": "npm run build && jest --collect-coverage",
     "prep:lib": "rm -rv ./lib/*.spec.* && rm -rv ./lib/**/*.spec.* && cp -v ./package.json ./lib/ && cp -v ./LICENSE ./lib/ && cp -v ./README.md ./lib/",
@@ -50,6 +52,7 @@
   "homepage": "https://github.com/ikemtz/OpenApi-TS-Generator#readme",
   "devDependencies": {
     "@eslint/js": "^9.39.2",
+    "@jest/globals": "^30.2.0",
     "@types/jest": "^30.0.0",
     "@types/lodash": "^4.17.23",
     "@types/node": "^22.19.7",

package/templates/form-group-factory.ts.hbs

@@ -23,9 +23,9 @@ export function {{name}}FormGroupFac(): FormGroup<I{{name}}Form> {
     {{name}}: new FormArray<FormControl<{{typeScriptType}}>>([]{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{minLengthValidator "valueProperties"}}{{maxLengthValidator "valueProperties"}}{{minimumValidator "valueProperties"}}{{maximumValidator "valueProperties"}}{{minItemsValidator "valueProperties"}}{{maxItemsValidator "valueProperties"}}{{{patternValidator "valueProperties"}}} }{{/if}}),
 {{/if}}
 {{else}}
-{{#if hasMultipleValidators}}{{#if required}}    // @ts-expect-error this is intentional, we want the initial value to be undefined so that the required validator will work correctly.{{/if}}
+{{#if hasMultipleValidators}}
     {{name}}: new FormControl<{{typeScriptType}}{{#unless required}} | null | undefined{{/unless}}>({{{initialValue}}}, { validators: Validators.compose([{{#if required}}Validators.required, {{/if}}{{#if email}}Validators.email, {{/if}}{{#if uri}}Validators.pattern('(https?://)?([\\da-z.-]+)\\.([a-z.]{2,6})[/\\w .-]*/?'), {{/if}}{{minLengthValidator "valueProperties"}}{{maxLengthValidator "valueProperties"}}{{minimumValidator "valueProperties"}}{{maximumValidator "valueProperties"}}{{minItemsValidator "valueProperties"}}{{maxItemsValidator "valueProperties"}}{{{patternValidator "valueProperties"}}}]){{#if required}}, nonNullable: true{{/if}} }),
-{{else}}{{#if required}}    // @ts-expect-error this is intentional, we want the initial value to be undefined so that the required validator will work correctly.{{/if}}
+{{else}}
     {{name}}: new FormControl<{{typeScriptType}}{{#unless required}} | null | undefined{{/unless}}>({{{initialValue}}}{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{#if email}}Validators.email {{/if}}{{#if uri}}Validators.pattern('(https?://)?([\\da-z.-]+)\\.([a-z.]{2,6})[/\\w .-]*/?') {{/if}}{{minLengthValidator "valueProperties"}}{{maxLengthValidator "valueProperties"}}{{minimumValidator "valueProperties"}}{{maximumValidator "valueProperties"}}{{minItemsValidator "valueProperties"}}{{maxItemsValidator "valueProperties"}}{{{patternValidator "valueProperties"}}}{{#if required}}, nonNullable: true{{/if}} } {{/if}}),
 {{/if}}
 {{/if}}
@@ -44,9 +44,9 @@ export function {{name}}FormGroupFac(): FormGroup<I{{name}}Form> {
     {{name}}: new FormArray<FormGroup<I{{typeScriptType}}Form>>([]{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{minLengthValidator "referenceProperties"}}{{maxLengthValidator "referenceProperties"}}{{minimumValidator "referenceProperties"}}{{maximumValidator "referenceProperties"}}{{minItemsValidator "referenceProperties"}}{{maxItemsValidator "referenceProperties"}}{{{patternValidator "referenceProperties"}}} } {{/if}}),
 {{/if}}
 {{else if isEnum}}
-{{#if hasMultipleValidators}}{{#if required}}    // @ts-expect-error this is intentional, we want the initial value to be undefined so that the required validator will work correctly.{{/if}}
+{{#if hasMultipleValidators}}
     {{name}}: new FormControl<{{typeScriptType}} | string{{#unless required}} | null | undefined{{/unless}}>({{{initialValue}}}, { validators: Validators.compose([{{#if required}}Validators.required, {{/if}}{{minLengthValidator "referenceProperties"}}{{maxLengthValidator "referenceProperties"}}{{minimumValidator "referenceProperties"}}{{maximumValidator "referenceProperties"}}{{minItemsValidator "referenceProperties"}}{{maxItemsValidator "referenceProperties"}}{{{patternValidator "referenceProperties"}}}]){{#if required}}, nonNullable: true{{/if}} }),
-{{else}}{{#if required}}    // @ts-expect-error this is intentional, we want the initial value to be undefined so that the required validator will work correctly.{{/if}}
+{{else}}
     {{name}}: new FormControl<{{typeScriptType}} | string{{#unless required}} | null | undefined{{/unless}}>({{{initialValue}}}{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{minLengthValidator "referenceProperties"}}{{maxLengthValidator "referenceProperties"}}{{minimumValidator "referenceProperties"}}{{maximumValidator "referenceProperties"}}{{minItemsValidator "referenceProperties"}}{{maxItemsValidator "referenceProperties"}}{{{patternValidator "referenceProperties"}}}{{#if required}}, nonNullable: true{{/if}} } {{/if}}),
 {{/if}}
 {{else}}