@jmm-devkit/ngx-form-generator 1.3.0 → 1.3.2

package/dist/generator-lib.js

@@ -43,11 +43,11 @@ function makeForm(spec, maxDepth) {
         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;
@@ -59,7 +59,7 @@ exports.makeForm = makeForm;
  */
 function makeDefinition(definitionName, definition) {
     return `export const ${(0, camelcase_1.default)(definitionName)}Form = () => new FormGroup({
-      ${makeFieldsBody(definition, 0)}
+      ${makeFieldsBody(Object.assign({}, definition), 0)}
     });\n`;
 }
 /**
@@ -69,38 +69,58 @@ function makeDefinition(definitionName, definition) {
  * @returns An array of strings representing the form fields.
  */
 function makeFieldsBody(definition, depth) {
-    const fields = [];
     if (depth >= MAX_DEPTH)
-        return fields;
+        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, _d, _e;
+    if (!('allOf' in definition) || !Array.isArray(definition.allOf))
+        return [];
+    const fields = [];
+    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 = ((_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 = [...((_e = subSchema.required) !== null && _e !== void 0 ? _e : []), ...definitionRequired];
+            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.3.0",
+  "version": "1.3.2",
   "description": "Generates an Angular ReactiveForm from a Swagger or OpenAPI definition",
   "main": "dist/generator-lib.js",
   "repository": "github:jmm-devkit/ngx-form-generator",