json-machete 0.2.0-alpha-72c3f2bb5.0 → 0.2.1-alpha-044ef7368.0

package/index.js

@@ -10,7 +10,6 @@ const path = require('path');
 const util = require('util');
 const urlJoin = _interopDefault(require('url-join'));
 const crossUndiciFetch = require('cross-undici-fetch');
-const fs = require('fs');
 
 (function (OnCircularReference) {
     OnCircularReference["WARN"] = "WARN";
@@ -402,7 +401,7 @@ async function healJSONSchema(schema) {
                     }
                 }
                 // Properties only exist in objects
-                if (subSchema.properties) {
+                if (subSchema.properties || subSchema.patternProperties || 'additionalProperties' in subSchema) {
                     subSchema.type = 'object';
                 }
                 // Items only exist in arrays
@@ -420,7 +419,6 @@ async function healJSONSchema(schema) {
     });
 }
 
-const { readFile } = fs.promises;
 const resolvePath = (path, root) => {
     return jsonPtr.JsonPointer.get(root, path);
 };
@@ -480,11 +478,14 @@ async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache =
                     const newCwd = getCwd(externalFilePath);
                     let externalFile = externalFileCache.get(externalFilePath);
                     if (!externalFile) {
-                        externalFile = isURL(externalFilePath)
-                            ? await fetch(externalFilePath, {
-                                headers,
-                            }).then(res => res.json())
-                            : await JSON.parse(await readFile(externalFilePath, 'utf-8'));
+                        externalFile = await utils.readFileOrUrl(externalFilePath, {
+                            fetch,
+                            headers,
+                            cwd,
+                            fallbackFormat: 'json',
+                        }).catch(() => {
+                            throw new Error(`Unable to load ${externalRelativeFilePath} from ${cwd}`);
+                        });
                         externalFile = await healJSONSchema(externalFile);
                         externalFileCache.set(externalFilePath, externalFile);
                     }

package/index.mjs

@@ -1,10 +1,9 @@
 import { JsonPointer } from 'json-ptr';
-import { AggregateError } from '@graphql-mesh/utils';
+import { AggregateError, readFileOrUrl } from '@graphql-mesh/utils';
 import { isAbsolute, join, dirname } from 'path';
 import { inspect } from 'util';
 import urlJoin from 'url-join';
 import { fetch } from 'cross-undici-fetch';
-import { promises } from 'fs';
 
 var OnCircularReference;
 (function (OnCircularReference) {
@@ -397,7 +396,7 @@ async function healJSONSchema(schema) {
                     }
                 }
                 // Properties only exist in objects
-                if (subSchema.properties) {
+                if (subSchema.properties || subSchema.patternProperties || 'additionalProperties' in subSchema) {
                     subSchema.type = 'object';
                 }
                 // Items only exist in arrays
@@ -415,7 +414,6 @@ async function healJSONSchema(schema) {
     });
 }
 
-const { readFile } = promises;
 const resolvePath = (path, root) => {
     return JsonPointer.get(root, path);
 };
@@ -475,11 +473,14 @@ async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache =
                     const newCwd = getCwd(externalFilePath);
                     let externalFile = externalFileCache.get(externalFilePath);
                     if (!externalFile) {
-                        externalFile = isURL(externalFilePath)
-                            ? await fetch$1(externalFilePath, {
-                                headers,
-                            }).then(res => res.json())
-                            : await JSON.parse(await readFile(externalFilePath, 'utf-8'));
+                        externalFile = await readFileOrUrl(externalFilePath, {
+                            fetch: fetch$1,
+                            headers,
+                            cwd,
+                            fallbackFormat: 'json',
+                        }).catch(() => {
+                            throw new Error(`Unable to load ${externalRelativeFilePath} from ${cwd}`);
+                        });
                         externalFile = await healJSONSchema(externalFile);
                         externalFileCache.set(externalFilePath, externalFile);
                     }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "json-machete",
-  "version": "0.2.0-alpha-72c3f2bb5.0",
+  "version": "0.2.1-alpha-044ef7368.0",
   "sideEffects": false,
   "dependencies": {
-    "@graphql-mesh/utils": "0.22.0",
+    "@graphql-mesh/utils": "0.22.2-alpha-044ef7368.0",
     "@json-schema-tools/meta-schema": "1.6.19",
     "cross-undici-fetch": "0.0.26",
     "json-ptr": "2.2.0",