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

package/dereferenceObject.d.ts

@@ -1,10 +1,11 @@
 export declare const resolvePath: (path: string, root: any) => any;
-export declare function dereferenceObject<T extends object, TRoot = T>(obj: T, { cwd, externalFileCache, refMap, root, fetch, importFn, headers, }?: {
+export declare function getAbsolutePath(path: string, cwd: string): string;
+export declare function getCwd(path: string): string;
+export declare function dereferenceObject<T extends object, TRoot = T>(obj: T, { cwd, externalFileCache, refMap, root, fetch, headers, }?: {
     cwd?: string;
     externalFileCache?: Map<string, any>;
     refMap?: Map<string, any>;
     root?: TRoot;
     fetch?: WindowOrWorkerGlobalScope['fetch'];
-    importFn?: (moduleId: string) => Promise<any>;
     headers?: Record<string, string>;
 }): Promise<T>;

package/index.js

@@ -299,7 +299,14 @@ async function compareJSONSchemas(oldSchema, newSchema) {
 const reservedTypeNames = ['Query', 'Mutation', 'Subscription'];
 function deduplicateJSONSchema(schema, seenMap = new Map()) {
     if (typeof schema === 'object' && schema != null) {
+        const titleReserved = schema.title;
+        if (titleReserved) {
+            schema.title = undefined;
+        }
         const stringified = util.inspect(schema, undefined, 3);
+        if (titleReserved) {
+            schema.title = titleReserved;
+        }
         const seen = seenMap.get(stringified);
         if (seen) {
             return seen;
@@ -394,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
@@ -453,8 +460,11 @@ function getAbsolutePath(path$1, cwd) {
     }
     return path.join(cwd, path$1);
 }
+function getCwd(path$1) {
+    return isURL(path$1) ? getCwdForUrl(path$1) : path.dirname(path$1);
+}
 // eslint-disable-next-line @typescript-eslint/ban-types
-async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache = new Map(), refMap = new Map(), root = obj, fetch = crossUndiciFetch.fetch, importFn = utils.defaultImportFn, headers, } = {}) {
+async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache = new Map(), refMap = new Map(), root = obj, fetch = crossUndiciFetch.fetch, headers, } = {}) {
     if (typeof obj === 'object') {
         if (isRefObject(obj)) {
             const $ref = obj.$ref;
@@ -465,14 +475,17 @@ async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache =
                 const [externalRelativeFilePath, refPath] = $ref.split('#');
                 if (externalRelativeFilePath) {
                     const externalFilePath = getAbsolutePath(externalRelativeFilePath, cwd);
-                    const newCwd = isURL(externalFilePath) ? getCwdForUrl(externalFilePath) : path.dirname(externalFilePath);
+                    const newCwd = getCwd(externalFilePath);
                     let externalFile = externalFileCache.get(externalFilePath);
                     if (!externalFile) {
-                        externalFile = isURL(externalFilePath)
-                            ? await fetch(externalFilePath, {
-                                headers,
-                            }).then(res => res.json())
-                            : await importFn(externalFilePath);
+                        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);
                     }
@@ -512,6 +525,9 @@ async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache =
                 }
                 else {
                     const result = resolvePath(refPath, root);
+                    if (!result.title && obj.title) {
+                        result.title = obj.title;
+                    }
                     refMap.set($ref, result);
                     return dereferenceObject(result, {
                         cwd,
@@ -527,7 +543,14 @@ async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache =
         else {
             await Promise.all(Object.entries(obj).map(async ([key, val]) => {
                 if (typeof val === 'object') {
-                    obj[key] = await dereferenceObject(val, { cwd, externalFileCache, refMap, root, fetch, headers });
+                    obj[key] = await dereferenceObject(val, {
+                        cwd,
+                        externalFileCache,
+                        refMap,
+                        root,
+                        fetch,
+                        headers,
+                    });
                 }
             }));
         }
@@ -575,6 +598,8 @@ async function referenceJSONSchema(schema) {
 exports.FIRST_VISITED_PATH = FIRST_VISITED_PATH;
 exports.compareJSONSchemas = compareJSONSchemas;
 exports.dereferenceObject = dereferenceObject;
+exports.getAbsolutePath = getAbsolutePath;
+exports.getCwd = getCwd;
 exports.healJSONSchema = healJSONSchema;
 exports.referenceJSONSchema = referenceJSONSchema;
 exports.resolvePath = resolvePath;

package/index.mjs

@@ -1,6 +1,6 @@
 import { JsonPointer } from 'json-ptr';
-import { AggregateError, defaultImportFn } from '@graphql-mesh/utils';
-import { dirname, isAbsolute, join } from 'path';
+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';
@@ -294,7 +294,14 @@ async function compareJSONSchemas(oldSchema, newSchema) {
 const reservedTypeNames = ['Query', 'Mutation', 'Subscription'];
 function deduplicateJSONSchema(schema, seenMap = new Map()) {
     if (typeof schema === 'object' && schema != null) {
+        const titleReserved = schema.title;
+        if (titleReserved) {
+            schema.title = undefined;
+        }
         const stringified = inspect(schema, undefined, 3);
+        if (titleReserved) {
+            schema.title = titleReserved;
+        }
         const seen = seenMap.get(stringified);
         if (seen) {
             return seen;
@@ -389,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
@@ -448,8 +455,11 @@ function getAbsolutePath(path, cwd) {
     }
     return join(cwd, path);
 }
+function getCwd(path) {
+    return isURL(path) ? getCwdForUrl(path) : dirname(path);
+}
 // eslint-disable-next-line @typescript-eslint/ban-types
-async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache = new Map(), refMap = new Map(), root = obj, fetch: fetch$1 = fetch, importFn = defaultImportFn, headers, } = {}) {
+async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache = new Map(), refMap = new Map(), root = obj, fetch: fetch$1 = fetch, headers, } = {}) {
     if (typeof obj === 'object') {
         if (isRefObject(obj)) {
             const $ref = obj.$ref;
@@ -460,14 +470,17 @@ async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache =
                 const [externalRelativeFilePath, refPath] = $ref.split('#');
                 if (externalRelativeFilePath) {
                     const externalFilePath = getAbsolutePath(externalRelativeFilePath, cwd);
-                    const newCwd = isURL(externalFilePath) ? getCwdForUrl(externalFilePath) : dirname(externalFilePath);
+                    const newCwd = getCwd(externalFilePath);
                     let externalFile = externalFileCache.get(externalFilePath);
                     if (!externalFile) {
-                        externalFile = isURL(externalFilePath)
-                            ? await fetch$1(externalFilePath, {
-                                headers,
-                            }).then(res => res.json())
-                            : await importFn(externalFilePath);
+                        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);
                     }
@@ -507,6 +520,9 @@ async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache =
                 }
                 else {
                     const result = resolvePath(refPath, root);
+                    if (!result.title && obj.title) {
+                        result.title = obj.title;
+                    }
                     refMap.set($ref, result);
                     return dereferenceObject(result, {
                         cwd,
@@ -522,7 +538,14 @@ async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache =
         else {
             await Promise.all(Object.entries(obj).map(async ([key, val]) => {
                 if (typeof val === 'object') {
-                    obj[key] = await dereferenceObject(val, { cwd, externalFileCache, refMap, root, fetch: fetch$1, headers });
+                    obj[key] = await dereferenceObject(val, {
+                        cwd,
+                        externalFileCache,
+                        refMap,
+                        root,
+                        fetch: fetch$1,
+                        headers,
+                    });
                 }
             }));
         }
@@ -567,4 +590,4 @@ async function referenceJSONSchema(schema) {
     return finalSchema;
 }
 
-export { FIRST_VISITED_PATH, OnCircularReference, compareJSONSchemas, dereferenceObject, healJSONSchema, referenceJSONSchema, resolvePath, visitJSONSchema };
+export { FIRST_VISITED_PATH, OnCircularReference, compareJSONSchemas, dereferenceObject, getAbsolutePath, getCwd, healJSONSchema, referenceJSONSchema, resolvePath, visitJSONSchema };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "json-machete",
-  "version": "0.2.0",
+  "version": "0.2.1-alpha-044ef7368.0",
   "sideEffects": false,
   "dependencies": {
-    "@graphql-mesh/utils": "0.22.1",
+    "@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",