json-machete 0.2.1 → 0.3.3-alpha-b6b65b0d4.0

package/index.js

@@ -175,6 +175,19 @@ async function visitJSONSchema(schema, visitorFn, { visitedSubschemaResultMap, p
                     onCircularReference,
                 });
             }
+            if (schema.components) {
+                visitedSchema.components = keepObjectRef ? visitedSchema.components : {};
+                visitedSchema.components.schemas = keepObjectRef ? visitedSchema.components.schemas : {};
+                const entries = Object.entries(schema.components.schemas);
+                for (const [schemaName, subSchema] of entries) {
+                    visitedSchema.components.schemas[schemaName] = await visitJSONSchema(subSchema, visitorFn, {
+                        visitedSubschemaResultMap,
+                        path: path + '/components/schemas/' + schemaName,
+                        keepObjectRef,
+                        onCircularReference,
+                    });
+                }
+            }
             const visitorResult = await visitorFn(visitedSchema, {
                 visitedSubschemaResultMap,
                 path,
@@ -349,10 +362,10 @@ async function healJSONSchema(schema) {
             }
             if (!subSchema.title && !subSchema.$ref) {
                 // Try to get definition name if missing
-                const splitByDefinitions = path.split('/definitions/');
-                const maybeDefinitionBasedPath = path.includes('/definitions/')
-                    ? splitByDefinitions[splitByDefinitions.length - 1]
-                    : path;
+                const splitByDefinitions = path.includes('/components/schemas/')
+                    ? path.split('/components/schemas/')
+                    : path.split('/definitions/');
+                const maybeDefinitionBasedPath = splitByDefinitions.length > 1 ? splitByDefinitions[splitByDefinitions.length - 1] : path;
                 let pathBasedName = maybeDefinitionBasedPath
                     .split('/properties')
                     .join('')

package/index.mjs

@@ -170,6 +170,19 @@ async function visitJSONSchema(schema, visitorFn, { visitedSubschemaResultMap, p
                     onCircularReference,
                 });
             }
+            if (schema.components) {
+                visitedSchema.components = keepObjectRef ? visitedSchema.components : {};
+                visitedSchema.components.schemas = keepObjectRef ? visitedSchema.components.schemas : {};
+                const entries = Object.entries(schema.components.schemas);
+                for (const [schemaName, subSchema] of entries) {
+                    visitedSchema.components.schemas[schemaName] = await visitJSONSchema(subSchema, visitorFn, {
+                        visitedSubschemaResultMap,
+                        path: path + '/components/schemas/' + schemaName,
+                        keepObjectRef,
+                        onCircularReference,
+                    });
+                }
+            }
             const visitorResult = await visitorFn(visitedSchema, {
                 visitedSubschemaResultMap,
                 path,
@@ -344,10 +357,10 @@ async function healJSONSchema(schema) {
             }
             if (!subSchema.title && !subSchema.$ref) {
                 // Try to get definition name if missing
-                const splitByDefinitions = path.split('/definitions/');
-                const maybeDefinitionBasedPath = path.includes('/definitions/')
-                    ? splitByDefinitions[splitByDefinitions.length - 1]
-                    : path;
+                const splitByDefinitions = path.includes('/components/schemas/')
+                    ? path.split('/components/schemas/')
+                    : path.split('/definitions/');
+                const maybeDefinitionBasedPath = splitByDefinitions.length > 1 ? splitByDefinitions[splitByDefinitions.length - 1] : path;
                 let pathBasedName = maybeDefinitionBasedPath
                     .split('/properties')
                     .join('')

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "json-machete",
-  "version": "0.2.1",
+  "version": "0.3.3-alpha-b6b65b0d4.0",
   "sideEffects": false,
   "dependencies": {
-    "@graphql-mesh/utils": "0.22.2",
+    "@graphql-mesh/utils": "0.24.2-alpha-b6b65b0d4.0",
     "@json-schema-tools/meta-schema": "1.6.19",
-    "cross-undici-fetch": "0.1.1",
+    "cross-undici-fetch": "0.1.12",
     "json-ptr": "3.0.1",
     "url-join": "4.0.1"
   },
@@ -24,6 +24,7 @@
     "./*": {
       "require": "./*.js",
       "import": "./*.mjs"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }