feat: sort parameters and object schema props, hoise required ones to…

… the top

jest.config.js

@@ -3,6 +3,6 @@ module.exports = {
     preset: 'ts-jest',
     testEnvironment: 'node',
     testRegex: '.test.ts$',
-    rootDir: 'src/__tests__',
-    snapshotResolver: '../../jest.snapshots.js',
+    rootDir: '.',
+    snapshotResolver: './jest.snapshots.js',
 };

jest.snapshots.js

@@ -2,12 +2,12 @@ module.exports = {
     testPathForConsistencyCheck: 'src/__tests__/basic.test.ts',
 
     resolveSnapshotPath: (testPath, snapshotExtension) => {
-        return testPath.replace('src/__tests__', 'src/__snapshots__/') + snapshotExtension;
+        return testPath.replace('src/__tests__', 'src/__snapshots__') + snapshotExtension;
     },
 
     resolveTestPath: (snapshotFilePath, snapshotExtension) => {
         return snapshotFilePath
-            .replace('src/__snapshots__/', 'src/__tests__')
+            .replace('src/__snapshots__', 'src/__tests__')
             .slice(0, -snapshotExtension.length);
     },
 };

package.json

@@ -66,6 +66,7 @@
     "@types/js-yaml": "^4.0.5",
     "@types/json-schema": "^7.0.11",
     "@types/json-stringify-safe": "^5.0.0",
+    "@types/lodash": "^4.17.5",
     "@types/markdown-it": "^13.0.7",
     "@types/react": "^18.0.35",
     "@types/react-dom": "^18.0.11",
@@ -74,6 +75,7 @@
     "glob": "^8.0.3",
     "jest": "^29.5.0",
     "jest-when": "^3.5.2",
+    "lodash": "^4.17.21",
     "markdown-it": "^13.0.2",
     "npm-run-all": "^4.1.5",
     "openapi-types": "^12.1.3",

src/__snapshots__/basic.test.ts.snap

@@ -61,7 +61,7 @@ Base 200 response
 ||
 
 ||
- type 
+ foo 
 |
  **Type:** string
 
@@ -70,7 +70,7 @@ Base 200 response
 ||
 
 ||
- foo 
+ type 
 |
  **Type:** string
 
@@ -113,7 +113,7 @@ Base 200 response
 ||
 
 ||
- type 
+ bar 
 |
  **Type:** string
 
@@ -122,7 +122,7 @@ Base 200 response
 ||
 
 ||
- bar 
+ type 
 |
  **Type:** string
 

src/__snapshots__/combiners/allOf.test.ts.snap

@@ -54,7 +54,7 @@ Generated server url
 ||
 
 ||
- type 
+ foo 
 |
  **Type:** string
 
@@ -63,7 +63,7 @@ Generated server url
 ||
 
 ||
- foo 
+ name 
 |
  **Type:** string
 
@@ -72,7 +72,7 @@ Generated server url
 ||
 
 ||
- name 
+ type 
 |
  **Type:** string
 
@@ -115,24 +115,24 @@ Base 200 response
 ||
 
 ||
- name 
+ baz 
 |
  **Type:** string
 
-<span class="openapi-description-annotation">Default:</span> \`a\` 
+
+ 
 ||
 
 ||
- type 
+ name 
 |
  **Type:** string
 
-
- 
+<span class="openapi-description-annotation">Default:</span> \`a\` 
 ||
 
 ||
- baz 
+ type 
 |
  **Type:** string
 
@@ -226,7 +226,7 @@ Cat class
 ||
 
 ||
- type 
+ foo 
 |
  **Type:** string
 
@@ -235,7 +235,7 @@ Cat class
 ||
 
 ||
- foo 
+ type 
 |
  **Type:** string
 

src/__snapshots__/combiners/complex.test.ts.snap

@@ -57,20 +57,20 @@ Generated server url
 ||
 
 ||
- name 
+ age 
 |
- **Type:** string
+ **Type:** any
 
-<span class="openapi-description-annotation">Default:</span> \`b\` 
+
+ 
 ||
 
 ||
- age 
+ name 
 |
- **Type:** any
-
+ **Type:** string
 
- 
+<span class="openapi-description-annotation">Default:</span> \`b\` 
 ||
 
 ||
@@ -104,7 +104,7 @@ Dog class
 ||
 
 ||
- type 
+ bar 
 |
  **Type:** string
 
@@ -113,7 +113,7 @@ Dog class
 ||
 
 ||
- bar 
+ type 
 |
  **Type:** string
 
@@ -136,7 +136,7 @@ Cat class
 ||
 
 ||
- type 
+ foo 
 |
  **Type:** string
 
@@ -145,7 +145,7 @@ Cat class
 ||
 
 ||
- foo 
+ type 
 |
  **Type:** string
 
@@ -192,20 +192,20 @@ Base 200 response
 ||
 
 ||
- name 
+ age 
 |
- **Type:** string
+ **Type:** any
 
-<span class="openapi-description-annotation">Default:</span> \`b\` 
+
+ 
 ||
 
 ||
- age 
+ name 
 |
- **Type:** any
-
+ **Type:** string
 
- 
+<span class="openapi-description-annotation">Default:</span> \`b\` 
 ||
 
 ||