npm - json-machete - Versions diffs - 0.1.0 → 0.2.0-alpha-72c3f2bb5.0 - Mend

json-machete 0.1.0 → 0.2.0-alpha-72c3f2bb5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dereferenceObject.d.ts CHANGED Viewed

@@ -1,9 +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, }?: {
+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 CHANGED Viewed

@@ -10,6 +10,7 @@ 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";
@@ -299,7 +300,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;
@@ -374,7 +382,7 @@ async function healJSONSchema(schema) {
                 if (reservedTypeNames.includes(pathBasedName)) {
                     pathBasedName += '_';
                 }
-                subSchema.title = subSchema.title || pathBasedName || 'Root';
+                subSchema.title = subSchema.title || pathBasedName;
             }
             // Try to find the type
             if (!subSchema.type) {
@@ -412,6 +420,7 @@ async function healJSONSchema(schema) {
     });
 }
+const { readFile } = fs.promises;
 const resolvePath = (path, root) => {
     return jsonPtr.JsonPointer.get(root, path);
 };
@@ -453,8 +462,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, } = {}) {
+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,12 +477,14 @@ 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).then(res => res.json())
-                            : await importFn(externalFilePath);
+                            ? await fetch(externalFilePath, {
+                                headers,
+                            }).then(res => res.json())
+                            : await JSON.parse(await readFile(externalFilePath, 'utf-8'));
                         externalFile = await healJSONSchema(externalFile);
                         externalFileCache.set(externalFilePath, externalFile);
                     }
@@ -505,10 +519,14 @@ async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache =
                             },
                         }),
                         fetch,
+                        headers,
                     });
                 }
                 else {
                     const result = resolvePath(refPath, root);
+                    if (!result.title && obj.title) {
+                        result.title = obj.title;
+                    }
                     refMap.set($ref, result);
                     return dereferenceObject(result, {
                         cwd,
@@ -516,6 +534,7 @@ async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache =
                         refMap,
                         root,
                         fetch,
+                        headers,
                     });
                 }
             }
@@ -523,7 +542,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 });
+                    obj[key] = await dereferenceObject(val, {
+                        cwd,
+                        externalFileCache,
+                        refMap,
+                        root,
+                        fetch,
+                        headers,
+                    });
                 }
             }));
         }
@@ -571,6 +597,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 CHANGED Viewed

@@ -1,9 +1,10 @@
 import { JsonPointer } from 'json-ptr';
-import { AggregateError, defaultImportFn } from '@graphql-mesh/utils';
-import { dirname, isAbsolute, join } from 'path';
+import { AggregateError } 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) {
@@ -294,7 +295,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;
@@ -369,7 +377,7 @@ async function healJSONSchema(schema) {
                 if (reservedTypeNames.includes(pathBasedName)) {
                     pathBasedName += '_';
                 }
-                subSchema.title = subSchema.title || pathBasedName || 'Root';
+                subSchema.title = subSchema.title || pathBasedName;
             }
             // Try to find the type
             if (!subSchema.type) {
@@ -407,6 +415,7 @@ async function healJSONSchema(schema) {
     });
 }
+const { readFile } = promises;
 const resolvePath = (path, root) => {
     return JsonPointer.get(root, path);
 };
@@ -448,8 +457,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, } = {}) {
+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,12 +472,14 @@ 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).then(res => res.json())
-                            : await importFn(externalFilePath);
+                            ? await fetch$1(externalFilePath, {
+                                headers,
+                            }).then(res => res.json())
+                            : await JSON.parse(await readFile(externalFilePath, 'utf-8'));
                         externalFile = await healJSONSchema(externalFile);
                         externalFileCache.set(externalFilePath, externalFile);
                     }
@@ -500,10 +514,14 @@ async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache =
                             },
                         }),
                         fetch: fetch$1,
+                        headers,
                     });
                 }
                 else {
                     const result = resolvePath(refPath, root);
+                    if (!result.title && obj.title) {
+                        result.title = obj.title;
+                    }
                     refMap.set($ref, result);
                     return dereferenceObject(result, {
                         cwd,
@@ -511,6 +529,7 @@ async function dereferenceObject(obj, { cwd = process.cwd(), externalFileCache =
                         refMap,
                         root,
                         fetch: fetch$1,
+                        headers,
                     });
                 }
             }
@@ -518,7 +537,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 });
+                    obj[key] = await dereferenceObject(val, {
+                        cwd,
+                        externalFileCache,
+                        refMap,
+                        root,
+                        fetch: fetch$1,
+                        headers,
+                    });
                 }
             }));
         }
@@ -563,4 +589,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 CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "json-machete",
-  "version": "0.1.0",
+  "version": "0.2.0-alpha-72c3f2bb5.0",
   "sideEffects": false,
   "dependencies": {
     "@graphql-mesh/utils": "0.22.0",