update lint and test

asyncapi · Aug 1, 2024 · fd80d54 · fd80d54
1 parent c9407a1
commit fd80d54
Show file tree

Hide file tree

Showing 14 changed files with 123 additions and 57 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -2,5 +2,6 @@
     "semi": true,
     "trailingComma": "none",
     "singleQuote": true,
-    "printWidth": 80
+    "printWidth": 80,
+    "endOfLine": "auto"
 }
diff --git a/src/generators/csharp/CSharpConstrainer.ts b/src/generators/csharp/CSharpConstrainer.ts
@@ -15,7 +15,7 @@ function getFullTypeDefinition(
   typeName: string,
   partOfProperty: ConstrainedObjectPropertyModel | undefined
 ) {
-  return partOfProperty?.required ?? true ? typeName : `${typeName}?`;
+  return (partOfProperty?.required ?? true) ? typeName : `${typeName}?`;
 }
 
 const fromEnumValueToType = (

diff --git a/src/models/AsyncapiV2Schema.ts b/src/models/AsyncapiV2Schema.ts
@@ -97,6 +97,8 @@ export class AsyncapiV2Schema {
       'Could not convert input to expected copy of AsyncapiV2Schema'
     );
   }
+
+  // eslint-disable-next-line sonarjs/cognitive-complexity
   private static internalToSchema(
     object: any,
     seenSchemas: Map<any, AsyncapiV2Schema> = new Map()
@@ -124,7 +126,9 @@ export class AsyncapiV2Schema {
     const schema = new AsyncapiV2Schema();
     seenSchemas.set(object, schema);
     for (const [propName, prop] of Object.entries(object)) {
-      if(prop === undefined) continue;
+      if (prop === undefined) {
+        continue;
+      }
       let copyProp: any = prop;
 
       // Ignore value properties (those with `any` type) as they should be saved as is regardless of value
@@ -148,7 +152,10 @@ export class AsyncapiV2Schema {
           // Special cases are properties that should be a basic object
           copyProp = {};
           for (const [propName2, prop2] of Object.entries(prop as any)) {
-            copyProp[String(propName2)] = AsyncapiV2Schema.internalToSchema(prop2, seenSchemas);
+            copyProp[String(propName2)] = AsyncapiV2Schema.internalToSchema(
+              prop2,
+              seenSchemas
+            );
           }
         } else {
           copyProp = AsyncapiV2Schema.internalToSchema(prop, seenSchemas);

diff --git a/src/models/CommonModel.ts b/src/models/CommonModel.ts
@@ -46,6 +46,8 @@ export class CommonModel {
     }
     throw new Error('Could not convert input to expected copy of CommonModel');
   }
+
+  // eslint-disable-next-line sonarjs/cognitive-complexity
   private static internalToSchema(
     object: any,
     seenSchemas: Map<any, CommonModel> = new Map()
@@ -73,17 +75,19 @@ export class CommonModel {
     const schema = new CommonModel();
     seenSchemas.set(object, schema);
     for (const [propName, prop] of Object.entries(object)) {
-      if(prop === undefined) continue;
+      if (prop === undefined) {
+        continue;
+      }
       let copyProp: any = prop;
       // Ignore value properties (those with `any` type) as they should be saved as is regardless of value
       if (propName !== 'originalInput' && propName !== 'enum') {
-        if (
-          propName === 'properties' ||
-          propName === 'patternProperties'
-        ) {
+        if (propName === 'properties' || propName === 'patternProperties') {
           copyProp = {};
           for (const [propName2, prop2] of Object.entries(prop as any)) {
-            copyProp[String(propName2)] = CommonModel.internalToSchema(prop2, seenSchemas);
+            copyProp[String(propName2)] = CommonModel.internalToSchema(
+              prop2,
+              seenSchemas
+            );
           }
         } else {
           copyProp = CommonModel.internalToSchema(prop, seenSchemas);

diff --git a/src/models/Draft4Schema.ts b/src/models/Draft4Schema.ts
@@ -51,6 +51,7 @@ export class Draft4Schema {
     }
     throw new Error('Could not convert input to expected copy of Draft4Schema');
   }
+  // eslint-disable-next-line sonarjs/cognitive-complexity
   private static internalToSchema(
     object: any,
     seenSchemas: Map<any, Draft4Schema> = new Map()
@@ -78,7 +79,9 @@ export class Draft4Schema {
     const schema = new Draft4Schema();
     seenSchemas.set(object, schema);
     for (const [propName, prop] of Object.entries(object)) {
-      if(prop === undefined) continue;
+      if (prop === undefined) {
+        continue;
+      }
       let copyProp: any = prop;
 
       // Ignore value properties (those with `any` type) as they should be saved as is regardless of value
@@ -92,7 +95,10 @@ export class Draft4Schema {
         ) {
           copyProp = {};
           for (const [propName2, prop2] of Object.entries(prop as any)) {
-            copyProp[String(propName2)] = Draft4Schema.internalToSchema(prop2, seenSchemas);
+            copyProp[String(propName2)] = Draft4Schema.internalToSchema(
+              prop2,
+              seenSchemas
+            );
           }
         } else {
           copyProp = Draft4Schema.internalToSchema(prop, seenSchemas);

diff --git a/src/models/Draft6Schema.ts b/src/models/Draft6Schema.ts
@@ -57,6 +57,7 @@ export class Draft6Schema {
     }
     throw new Error('Could not convert input to expected copy of Draft6Schema');
   }
+  // eslint-disable-next-line sonarjs/cognitive-complexity
   private static internalToSchema(
     object: any,
     seenSchemas: Map<any, Draft6Schema> = new Map()
@@ -84,7 +85,9 @@ export class Draft6Schema {
     const schema = new Draft6Schema();
     seenSchemas.set(object, schema);
     for (const [propName, prop] of Object.entries(object)) {
-      if(prop === undefined) continue;
+      if (prop === undefined) {
+        continue;
+      }
       let copyProp: any = prop;
 
       // Ignore value properties (those with `any` type) as they should be saved as is regardless of value
@@ -103,7 +106,10 @@ export class Draft6Schema {
         ) {
           copyProp = {};
           for (const [propName2, prop2] of Object.entries(prop as any)) {
-            copyProp[String(propName2)] = Draft6Schema.internalToSchema(prop2, seenSchemas);
+            copyProp[String(propName2)] = Draft6Schema.internalToSchema(
+              prop2,
+              seenSchemas
+            );
           }
         } else {
           copyProp = Draft6Schema.internalToSchema(prop, seenSchemas);

diff --git a/src/models/Draft7Schema.ts b/src/models/Draft7Schema.ts
@@ -67,6 +67,8 @@ export class Draft7Schema {
     }
     throw new Error('Could not convert input to expected copy of Draft7Schema');
   }
+
+  // eslint-disable-next-line sonarjs/cognitive-complexity
   private static internalToSchema(
     object: any,
     seenSchemas: Map<any, Draft7Schema> = new Map()
@@ -94,31 +96,36 @@ export class Draft7Schema {
     const schema = new Draft7Schema();
     seenSchemas.set(object, schema);
     for (const [propName, prop] of Object.entries(object)) {
-      if(prop === undefined) continue;
-        let copyProp: any = prop;
-        // Ignore value properties (those with `any` type) as they should be saved as is regardless of value
+      if (prop === undefined) {
+        continue;
+      }
+      let copyProp: any = prop;
+      // Ignore value properties (those with `any` type) as they should be saved as is regardless of value
+      if (
+        propName !== 'default' &&
+        propName !== 'examples' &&
+        propName !== 'const' &&
+        propName !== 'enum'
+      ) {
+        // Special cases are properties that should be a basic object
         if (
-          propName !== 'default' &&
-          propName !== 'examples' &&
-          propName !== 'const' &&
-          propName !== 'enum'
+          propName === 'properties' ||
+          propName === 'patternProperties' ||
+          propName === 'definitions' ||
+          propName === 'dependencies'
         ) {
-          // Special cases are properties that should be a basic object
-          if (
-            propName === 'properties' ||
-            propName === 'patternProperties' ||
-            propName === 'definitions' ||
-            propName === 'dependencies'
-          ) {
-            copyProp = {};
-            for (const [propName2, prop2] of Object.entries(prop as any)) {
-              copyProp[String(propName2)] = Draft7Schema.internalToSchema(prop2, seenSchemas);
-            }
-          } else {
-            copyProp = Draft7Schema.internalToSchema(prop, seenSchemas);
+          copyProp = {};
+          for (const [propName2, prop2] of Object.entries(prop as any)) {
+            copyProp[String(propName2)] = Draft7Schema.internalToSchema(
+              prop2,
+              seenSchemas
+            );
           }
-        } 
-        (schema as any)[String(propName)] = copyProp;
+        } else {
+          copyProp = Draft7Schema.internalToSchema(prop, seenSchemas);
+        }
+      }
+      (schema as any)[String(propName)] = copyProp;
     }
     return schema;
   }

diff --git a/src/models/OpenapiV3Schema.ts b/src/models/OpenapiV3Schema.ts
@@ -124,6 +124,8 @@ export class OpenapiV3Schema {
       'Could not convert input to expected copy of OpenapiV3Schema'
     );
   }
+
+  // eslint-disable-next-line sonarjs/cognitive-complexity
   private static internalToSchema(
     object: any,
     seenSchemas: Map<any, OpenapiV3Schema> = new Map()
@@ -151,7 +153,9 @@ export class OpenapiV3Schema {
     const schema = new OpenapiV3Schema();
     seenSchemas.set(object, schema);
     for (const [propName, prop] of Object.entries(object)) {
-      if(prop === undefined) continue;
+      if (prop === undefined) {
+        continue;
+      }
       let copyProp: any = prop;
 
       // Ignore value properties (those with `any` type) as they should be saved as is regardless of value
@@ -176,7 +180,10 @@ export class OpenapiV3Schema {
           // Special cases are properties that should be a basic object
           copyProp = {};
           for (const [propName2, prop2] of Object.entries(prop as any)) {
-            copyProp[String(propName2)] = OpenapiV3Schema.internalToSchema(prop2, seenSchemas);
+            copyProp[String(propName2)] = OpenapiV3Schema.internalToSchema(
+              prop2,
+              seenSchemas
+            );
           }
         } else {
           copyProp = OpenapiV3Schema.internalToSchema(prop, seenSchemas);

diff --git a/src/models/SwaggerV2Schema.ts b/src/models/SwaggerV2Schema.ts
@@ -91,6 +91,8 @@ export class SwaggerV2Schema {
       'Could not convert input to expected copy of SwaggerV2Schema'
     );
   }
+
+  // eslint-disable-next-line sonarjs/cognitive-complexity
   private static internalToSchema(
     object: any,
     seenSchemas: Map<any, SwaggerV2Schema> = new Map()
@@ -118,7 +120,9 @@ export class SwaggerV2Schema {
     const schema = new SwaggerV2Schema();
     seenSchemas.set(object, schema);
     for (const [propName, prop] of Object.entries(object)) {
-      if(prop === undefined) continue;
+      if (prop === undefined) {
+        continue;
+      }
       let copyProp: any = prop;
 
       // Ignore value properties (those with `any` type) as they should be saved as is regardless of value
@@ -140,7 +144,10 @@ export class SwaggerV2Schema {
           // Special cases are properties that should be a basic object
           copyProp = {};
           for (const [propName2, prop2] of Object.entries(prop as any)) {
-            copyProp[String(propName2)] = SwaggerV2Schema.internalToSchema(prop2, seenSchemas);
+            copyProp[String(propName2)] = SwaggerV2Schema.internalToSchema(
+              prop2,
+              seenSchemas
+            );
           }
         } else {
           copyProp = SwaggerV2Schema.internalToSchema(prop, seenSchemas);

diff --git a/src/utils/Partials.ts b/src/utils/Partials.ts
@@ -6,8 +6,8 @@
 export type DeepPartial<T> = T extends Function
   ? T
   : T extends object
-  ? { [P in keyof T]?: DeepPartial<T[P]> }
-  : T;
+    ? { [P in keyof T]?: DeepPartial<T[P]> }
+    : T;
 
 /**
  * Return true or false based on whether the input object is a regular object or a class

diff --git a/test/TestUtils/GeneralUtils.ts b/test/TestUtils/GeneralUtils.ts
@@ -1,4 +1,4 @@
-/* eslint-disable no-undef */
+/* eslint-disable no-undef, security/detect-object-injection */
 import { promisify } from 'util';
 import { exec } from 'child_process';
 const promiseExec = promisify(exec);
@@ -30,8 +30,10 @@ export async function execCommand(
  * Ensure object does not contain undefined properties when matching outputs
  */
 export function removeEmptyPropertiesFromObjects(obj: any): any {
-  if(typeof obj !== 'object') return obj;
-  Object.keys(obj).forEach(key => {
+  if (typeof obj !== 'object') {
+    return obj;
+  }
+  for (const key of Object.keys(obj)) {
     if (obj[key] && typeof obj[key] === 'object') {
       removeEmptyPropertiesFromObjects(obj[key]);
       if (Object.keys(obj[key]).length === 0) {
@@ -40,6 +42,6 @@ export function removeEmptyPropertiesFromObjects(obj: any): any {
     } else if (obj[key] === undefined) {
       delete obj[key];
     }
-  });
+  }
   return obj;
 }
diff --git a/test/interpreter/Intepreter.spec.ts b/test/interpreter/Intepreter.spec.ts
@@ -1,4 +1,3 @@
-import { CommonModel } from '../../src';
 import { Interpreter } from '../../src/interpreter/Interpreter';
 import { removeEmptyPropertiesFromObjects } from '../TestUtils/GeneralUtils';
 
@@ -15,6 +14,8 @@ describe('Interpreter', () => {
     };
     const interpreter = new Interpreter();
     const interpretedModel = interpreter.interpret(schema);
-    expect(removeEmptyPropertiesFromObjects(interpretedModel)).toMatchSnapshot();
+    expect(
+      removeEmptyPropertiesFromObjects(interpretedModel)
+    ).toMatchSnapshot();
   });
 });