@jmm-devkit/ngx-form-generator 1.2.3 → 1.3.1

package/dist/generator-cli.js

@@ -28,6 +28,11 @@ async function main() {
         alias: ['f', 'outFile'],
         description: 'Generated file name',
         type: 'string'
+    })
+        .option('max-depth', {
+        alias: ['d', 'maxDepth'],
+        description: 'Maximum depth of the generated forms',
+        type: 'number'
     })
         .help()
         .wrap(null)
@@ -37,7 +42,12 @@ async function main() {
         .example('npx ngx-form-generator -i swagger.json -o project/form/src/lib')
         .alias('help', 'h').argv;
     const spec = await (0, generator_lib_1.loadSpec)(argv['input-spec']);
-    const file = (0, generator_lib_1.makeForm)(spec);
+    const maxDepth = argv['max-depth'];
+    if (maxDepth !== undefined && (isNaN(maxDepth) || maxDepth < 1)) {
+        console.error('Error: max-depth must be a number greater than 0');
+        process.exit(1);
+    }
+    const file = (0, generator_lib_1.makeForm)(spec, maxDepth);
     let fileName = argv['file-name'] || (0, generator_lib_1.makeFileName)(spec) || 'forms.ts';
     if (argv.output) {
         fileName = (0, path_1.join)(argv.output, fileName);

package/dist/generator-lib.d.ts

@@ -10,9 +10,10 @@ import { OpenAPI } from 'openapi-types';
 /**
  * Generates Angular ReactiveForms from an OpenAPI v2 or v3 spec.
  * @param spec - The OpenAPI document.
+ * @param maxDepth - The maximum depth of the generated forms.
  * @returns A string representing the generated forms.
  */
-export declare function makeForm(spec: OpenAPI.Document): string;
+export declare function makeForm(spec: OpenAPI.Document, maxDepth?: number): string;
 /**
  * Adds a validation rule for a form field.
  * @param rule - The validation rule to add.

package/dist/generator-lib.js

@@ -19,14 +19,17 @@ const swagger_parser_1 = __importDefault(require("@apidevtools/swagger-parser"))
 const DEFAULT_RULES = [rules_1.requiredRule, rules_1.patternRule, rules_1.minLengthRule, rules_1.maxLengthRule, rules_1.emailRule, rules_1.minimumRule, rules_1.maximumRule];
 const NEEDED_IMPORTS = `import { FormGroup, FormControl, Validators, FormArray } from '@angular/forms'; \n`;
 let rules = [...DEFAULT_RULES];
+let MAX_DEPTH = 2;
 /**
  * Generates Angular ReactiveForms from an OpenAPI v2 or v3 spec.
  * @param spec - The OpenAPI document.
+ * @param maxDepth - The maximum depth of the generated forms.
  * @returns A string representing the generated forms.
  */
-function makeForm(spec) {
+function makeForm(spec, maxDepth) {
     var _a;
     let definitions;
+    MAX_DEPTH = maxDepth !== null && maxDepth !== void 0 ? maxDepth : MAX_DEPTH;
     if ('definitions' in spec) {
         definitions = spec.definitions;
     }
@@ -40,11 +43,11 @@ function makeForm(spec) {
         throw new Error('Cannot find schemas/definitions');
     }
     let body = NEEDED_IMPORTS + '\n\n';
-    Object.keys(definitions).forEach(key => {
-        if (definitions === null || definitions === void 0 ? void 0 : definitions[key]) {
-            body += makeDefinition(key, definitions[key]);
+    for (const [key, value] of Object.entries(definitions)) {
+        if (value) {
+            body += makeDefinition(key, value);
         }
-    });
+    }
     return prettier_1.default.format(body, { parser: 'typescript', singleQuote: true });
 }
 exports.makeForm = makeForm;
@@ -66,38 +69,56 @@ function makeDefinition(definitionName, definition) {
  * @returns An array of strings representing the form fields.
  */
 function makeFieldsBody(definition, depth) {
-    const fields = [];
-    if (depth > 2)
-        return fields;
+    if (depth >= MAX_DEPTH)
+        return [];
     depth++;
-    const hasProperties = 'properties' in definition && definition.properties;
-    if (hasProperties && definition.properties) {
-        // Process each property in the definition
-        Object.keys(definition.properties).forEach(fieldName => {
-            var _a, _b;
-            const field = makeField(fieldName, (_a = definition.properties) === null || _a === void 0 ? void 0 : _a[fieldName], !!((_b = definition.required) === null || _b === void 0 ? void 0 : _b.includes(fieldName)), depth);
-            if (field !== '') {
-                fields.push(field);
-            }
-        });
+    return [...extractPropertiesFields(definition, depth), ...extractAllOfFields(definition, depth)];
+}
+/**
+ * Extracts fields from the properties of a given OpenAPI definition.
+ * @param definition - The OpenAPI definition object.
+ * @param depth - The current depth of recursion.
+ * @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, !!((_a = definition.required) === null || _a === void 0 ? void 0 : _a.includes(fieldName)), depth);
+        if (field !== '') {
+            fields.push(field);
+        }
     }
-    // Handle allOf by merging properties from referenced schemas
-    const hasAllOf = 'allOf' in definition && Array.isArray(definition.allOf);
-    if (hasAllOf && definition.allOf) {
-        definition.allOf.forEach((subSchema) => {
-            var _a, _b, _c;
-            // If the subSchema is a reference, resolve it from definitions
-            if ('$ref' in subSchema) {
-                const refName = subSchema.$ref.split('/').pop();
-                const refSchema = ((_a = definition.definitions) === null || _a === void 0 ? void 0 : _a[refName]) || ((_c = (_b = definition.components) === null || _b === void 0 ? void 0 : _b.schemas) === null || _c === void 0 ? void 0 : _c[refName]);
-                if (refSchema) {
-                    fields.push(...makeFieldsBody(refSchema, depth));
-                }
-            }
-            else {
-                fields.push(...makeFieldsBody(subSchema, depth));
+    return fields;
+}
+/**
+ * Extracts fields from the allOf properties of a given OpenAPI definition.
+ * @param definition - The OpenAPI definition object.
+ * @param depth - The current depth of recursion.
+ * @returns An array of strings representing the form fields.
+ */
+function extractAllOfFields(definition, depth) {
+    var _a, _b, _c;
+    if (!('allOf' in definition) || !Array.isArray(definition.allOf))
+        return [];
+    const fields = [];
+    for (const subSchema of definition.allOf) {
+        if ('$ref' in subSchema) {
+            const refName = subSchema.$ref.split('/').pop();
+            const refSchema = ((_a = definition.definitions) === null || _a === void 0 ? void 0 : _a[refName]) || ((_c = (_b = definition.components) === null || _b === void 0 ? void 0 : _b.schemas) === null || _c === void 0 ? void 0 : _c[refName]);
+            if (refSchema) {
+                fields.push(...makeFieldsBody(refSchema, depth));
             }
-        });
+        }
+        else if ('type' in subSchema && subSchema.type === 'object') {
+            subSchema.required = definition.required;
+            fields.push(...makeFieldsBody(subSchema, depth));
+        }
+        else {
+            fields.push(...makeFieldsBody(subSchema, depth));
+        }
     }
     return fields;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jmm-devkit/ngx-form-generator",
-  "version": "1.2.3",
+  "version": "1.3.1",
   "description": "Generates an Angular ReactiveForm from a Swagger or OpenAPI definition",
   "main": "dist/generator-lib.js",
   "repository": "github:jmm-devkit/ngx-form-generator",