@jmm-devkit/ngx-form-generator 1.4.0 → 1.5.1

package/dist/file-utils.js

@@ -1,9 +1,14 @@
 import * as fs from 'node:fs';
+import * as path from 'node:path';
 /**
  * Saves the generated file
  * @param content - The content of the file to save.
  * @param fileName - The name of the file to save.
  */
 export function saveFile(content, fileName) {
+    const dir = path.dirname(fileName);
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
     fs.writeFileSync(fileName, content);
 }

package/dist/generator-cli.js

@@ -6,17 +6,18 @@
  *
  * Copyright (c) 2020 Verizon
  */
-import { saveFile } from './file-utils';
-import { makeForm, makeFileName, loadSpec } from './generator-lib';
+import { saveFile } from './file-utils.js';
+import { makeForm, makeFileName, loadSpec } from './generator-lib.js';
 import { join } from 'node:path';
-const yargs = require('yargs');
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
 async function main() {
-    const argv = yargs
+    const argv = await yargs(hideBin(process.argv))
         .option('input-spec', {
         alias: ['i', 'swaggerUrl'],
         description: 'Location of the OpenAPI spec as a URL or file path',
         type: 'string',
-        require: true,
+        demandOption: true,
     })
         .option('output', {
         alias: ['o', 'outDir'],
@@ -36,10 +37,11 @@ async function main() {
         .help()
         .wrap(null)
         .usage('Generates Angular ReactiveForms from an OpenAPI v2 or v3 spec.\n\n Usage: $0 -i <spec> -o <path>')
-        .example('ngx-form-generator -i https://petstore.swagger.io/v2/swagger.json -o petstore-forms')
-        .example('ngx-form-generator -i https://petstore.swagger.io/v2/swagger.yaml -o petstore-forms')
-        .example('npx ngx-form-generator -i swagger.json -o project/form/src/lib')
-        .alias('help', 'h').argv;
+        .example('ngx-form-generator -i https://petstore.swagger.io/v2/swagger.json -o petstore-forms', 'Generate forms from a remote JSON spec')
+        .example('ngx-form-generator -i https://petstore.swagger.io/v2/swagger.yaml -o petstore-forms', 'Generate forms from a remote YAML spec')
+        .example('npx ngx-form-generator -i swagger.json -o project/form/src/lib', 'Generate forms from a local JSON spec')
+        .alias('help', 'h')
+        .parse();
     const spec = await loadSpec(argv['input-spec']);
     const maxDepth = argv['max-depth'];
     if (maxDepth !== undefined && (Number.isNaN(maxDepth) || maxDepth < 1)) {

package/dist/generator-lib.d.ts

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2020 Verizon
  */
-import { type Rule } from './rules';
+import { type Rule } from './rules.js';
 import { type OpenAPI } from 'openapi-types';
 /**
  * Generates Angular ReactiveForms from an OpenAPI v2 or v3 spec.

package/dist/generator-lib.js

@@ -7,9 +7,8 @@
  */
 import * as prettier from 'prettier';
 import camelcase from 'camelcase';
-import { requiredRule, patternRule, minLengthRule, maxLengthRule, emailRule, minimumRule, maximumRule, } from './rules';
-import * as SwaggerParser from '@apidevtools/swagger-parser';
-import { OpenAPIV3 } from 'openapi-types';
+import { requiredRule, patternRule, minLengthRule, maxLengthRule, emailRule, minimumRule, maximumRule, } from './rules.js';
+import SwaggerParser from '@apidevtools/swagger-parser';
 const DEFAULT_RULES = [requiredRule, patternRule, minLengthRule, maxLengthRule, emailRule, minimumRule, maximumRule];
 const NEEDED_IMPORTS = `import { FormGroup, FormControl, Validators, FormArray } from '@angular/forms'; \n`;
 let rules = [...DEFAULT_RULES];
@@ -21,13 +20,14 @@ let MAX_DEPTH = 2;
  * @returns A string representing the generated forms.
  */
 export async function makeForm(spec, maxDepth) {
+    var _a;
     let definitions;
-    MAX_DEPTH = maxDepth ?? MAX_DEPTH;
+    MAX_DEPTH = maxDepth !== null && maxDepth !== void 0 ? maxDepth : MAX_DEPTH;
     if ('definitions' in spec) {
         definitions = spec.definitions;
     }
     else if ('components' in spec) {
-        definitions = spec.components?.schemas;
+        definitions = (_a = spec.components) === null || _a === void 0 ? void 0 : _a.schemas;
     }
     else {
         throw new Error('Cannot find schemas/definitions');
@@ -50,8 +50,8 @@ export async function makeForm(spec, maxDepth) {
  * @returns A string representing the form definition.
  */
 function makeDefinition(definitionName, definition) {
-    return `export const ${camelcase(definitionName)}Form = () => new FormGroup({
-      ${makeFieldsBody({ ...definition }, 0)}
+    return `export const ${camelcase(definitionName)}Form = () => new FormGroup({
+      ${makeFieldsBody(Object.assign({}, definition), 0)}
     });\n`;
 }
 /**
@@ -73,11 +73,12 @@ function makeFieldsBody(definition, depth) {
  * @returns An array of strings representing the form fields.
  */
 function extractPropertiesFields(definition, depth) {
+    var _a;
     if (!('properties' in definition) || !definition.properties)
         return [];
     const fields = [];
     for (const [fieldName, fieldValue] of Object.entries(definition.properties)) {
-        const field = makeField(fieldName, fieldValue, !!definition.required?.includes(fieldName), depth);
+        const field = makeField(fieldName, fieldValue, !!((_a = definition.required) === null || _a === void 0 ? void 0 : _a.includes(fieldName)), depth);
         if (field !== '') {
             fields.push(field);
         }
@@ -91,21 +92,22 @@ function extractPropertiesFields(definition, depth) {
  * @returns An array of strings representing the form fields.
  */
 function extractAllOfFields(definition, depth) {
+    var _a, _b, _c, _d, _e;
     if (!('allOf' in definition) || !Array.isArray(definition.allOf))
         return [];
     const fields = [];
-    const definitionRequired = definition.required ?? [];
+    const definitionRequired = (_a = definition.required) !== null && _a !== void 0 ? _a : [];
     for (const subSchema of definition.allOf) {
         if ('$ref' in subSchema) {
             const refName = subSchema.$ref.split('/').pop();
-            const refSchema = definition.definitions?.[refName] || definition.components?.schemas?.[refName];
+            const refSchema = ((_b = definition.definitions) === null || _b === void 0 ? void 0 : _b[refName]) || ((_d = (_c = definition.components) === null || _c === void 0 ? void 0 : _c.schemas) === null || _d === void 0 ? void 0 : _d[refName]);
             if (refSchema) {
                 refSchema.required = [...refSchema.required, ...definitionRequired];
                 fields.push(...makeFieldsBody(refSchema, depth));
             }
         }
         else if ('type' in subSchema && subSchema.type === 'object') {
-            subSchema.required = [...(subSchema.required ?? []), ...definitionRequired];
+            subSchema.required = [...((_e = subSchema.required) !== null && _e !== void 0 ? _e : []), ...definitionRequired];
             fields.push(...makeFieldsBody(subSchema, depth));
         }
         else {
@@ -147,8 +149,9 @@ function makeField(fieldName, property, isRequired, depth) {
  * @returns A string representing the form array field.
  */
 function makeArrayField(fieldName, property, isRequired, depth) {
+    var _a;
     const itemDefinition = property.items;
-    const minItems = property['minItems'] ?? 1;
+    const minItems = (_a = property['minItems']) !== null && _a !== void 0 ? _a : 1;
     const items = [];
     if (itemDefinition['type'] === 'object') {
         for (let i = 0; i <= minItems; i++) {
@@ -224,7 +227,8 @@ export function resetRules() {
  * @returns A string representing the file name or undefined if no title is available.
  */
 export function makeFileName(swagger) {
-    if (swagger.info?.title) {
+    var _a;
+    if ((_a = swagger.info) === null || _a === void 0 ? void 0 : _a.title) {
         return `${camelcase(swagger.info.title)}.ts`;
     }
 }
@@ -234,6 +238,5 @@ export function makeFileName(swagger) {
  * @returns A promise that resolves to the dereferenced OpenAPI document.
  */
 export async function loadSpec(fileOrUrlPath) {
-    const parser = new SwaggerParser();
-    return parser.dereference(fileOrUrlPath);
+    return SwaggerParser.dereference(fileOrUrlPath);
 }

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export * from './generator-lib';
-export * from './rules';
-export * from './file-utils';
+export * from './file-utils.js';
+export * from './generator-lib.js';
+export * from './rules.js';

package/dist/index.js

@@ -1,3 +1,3 @@
-export * from './generator-lib';
-export * from './rules';
-export * from './file-utils';
+export * from './file-utils.js';
+export * from './generator-lib.js';
+export * from './rules.js';

package/dist/rules.js

@@ -5,7 +5,6 @@
  *
  * Copyright (c) 2020 Verizon
  */
-import { OpenAPIV2, OpenAPIV3 } from 'openapi-types';
 function hasMetadata(fieldName, property, metadataName) {
     return property.hasOwnProperty(metadataName);
 }

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@jmm-devkit/ngx-form-generator",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "description": "Generates an Angular ReactiveForm from a Swagger or OpenAPI definition",
+  "type": "module",
   "main": "dist/generator-lib.js",
   "repository": "github:jmm-devkit/ngx-form-generator",
   "bin": {
@@ -33,8 +34,10 @@
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^12.1.0",
+    "@types/yargs": "^17.0.35",
     "camelcase": "^9.0.0",
     "openapi-types": "^12.1.3",
-    "prettier": "^3.8.1"
+    "prettier": "^3.8.1",
+    "yargs": "^18.0.0"
   }
 }