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

package/README.md

@@ -3,6 +3,7 @@
 ## Fixes
 
 - Fixed the handling of the `properties` property when generating fields from the OpenAPI definition. Now, if `properties` is `undefined`, an empty array is returned, allowing the rest of the code to execute correctly.
+- Added JSON parser for handling big integers.
 
 ## Improvements
 

package/dist/file-utils.js

@@ -6,9 +6,11 @@ import * as path from 'node:path';
  * @param fileName - The name of the file to save.
  */
 export function saveFile(content, fileName) {
+    // Ensure the directory exists before writing the file
     const dir = path.dirname(fileName);
     if (!fs.existsSync(dir)) {
         fs.mkdirSync(dir, { recursive: true });
     }
+    // Write the content to the file
     fs.writeFileSync(fileName, content);
 }

package/dist/generator-lib.js

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

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/json-parser.d.ts

@@ -0,0 +1,9 @@
+import { FileInfo } from '@apidevtools/swagger-parser';
+/**
+ * Parser for JSON files that can handle big integers.
+ */
+export declare const JSON_PARSER: {
+    order: number;
+    canParse: string;
+    parse: (file: FileInfo) => any;
+};

package/dist/json-parser.js

@@ -0,0 +1,20 @@
+import * as JSONBig from 'json-bigint';
+const JSONBigNative = JSONBig.default({ protoAction: 'preserve' });
+/**
+ * Parser for JSON files that can handle big integers.
+ */
+export const JSON_PARSER = {
+    order: 1,
+    canParse: '.json',
+    parse: (file) => {
+        const fileContent = file.data.toString();
+        try {
+            return JSONBigNative.parse(fileContent);
+        }
+        catch (e) {
+            const error = e;
+            console.error(`Error parsing JSON file: ${error.message}`);
+            throw error;
+        }
+    },
+};

package/dist/rules.js

@@ -6,7 +6,7 @@
  * Copyright (c) 2020 Verizon
  */
 function hasMetadata(fieldName, property, metadataName) {
-    return property.hasOwnProperty(metadataName);
+    return Object.hasOwn(property, metadataName);
 }
 function abstractRule(fieldName, property, ruleName) {
     return hasMetadata(fieldName, property, ruleName) ? `Validators.${ruleName}(${property[ruleName]})` : '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jmm-devkit/ngx-form-generator",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Generates an Angular ReactiveForm from a Swagger or OpenAPI definition",
   "type": "module",
   "main": "dist/generator-lib.js",
@@ -27,6 +27,7 @@
   ],
   "devDependencies": {
     "@eslint/js": "^10.0.1",
+    "@types/json-bigint": "^1.0.4",
     "eslint": "^10.0.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
@@ -36,6 +37,7 @@
     "@apidevtools/swagger-parser": "^12.1.0",
     "@types/yargs": "^17.0.35",
     "camelcase": "^9.0.0",
+    "json-bigint": "^1.0.0",
     "openapi-types": "^12.1.3",
     "prettier": "^3.8.1",
     "yargs": "^18.0.0"