Migrate to json-op library

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/json-ref",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "license": "MIT",
   "author": {
     "name": "redneckz",
@@ -45,6 +45,9 @@
     "test": "jest",
     "size": "echo size-limit"
   },
+  "dependencies": {
+    "@redneckz/json-op": "^0.0.5"
+  },
   "devDependencies": {
     "@size-limit/preset-small-lib": "^8.2.4",
     "@types/jest": "^29.5.0",
@@ -64,4 +67,4 @@
       "path": "lib/*.js"
     }
   ]
-}
+}

src/JSONRef.ts

@@ -0,0 +1,8 @@
+import { JSONPath, fp, isJSONRecord, type JSONNode, type JSONRecord } from '@redneckz/json-op';
+
+export type JSONRef = { $ref: string } & JSONRecord;
+
+export const isJSONRef = (_: JSONNode | undefined): _ is JSONRef =>
+  Boolean(isJSONRecord(_) && typeof _.$ref === 'string');
+
+export const isJSONRefPath = JSONPath.endsWith(['$ref']);

src/URIResolver.ts

@@ -1,3 +1,3 @@
-import type { JSONNode } from './JSONNode';
+import { type JSONNode } from '@redneckz/json-op';
 
 export type URIResolver<R extends Promise<JSONNode> | JSONNode = Promise<JSONNode>> = (uri: string) => R;

src/collectRef.ts

@@ -1,8 +1,4 @@
-import { type JSONNode } from './JSONNode';
-import { visitRef } from './visitRef';
+import { type JSONNode } from '@redneckz/json-op';
+import { refEntries } from './refEntries';
 
-export const collectRef = (json: JSONNode): string[] => {
-  const refs: string[] = [];
-  visitRef(json, _ => refs.push(_));
-  return refs;
-};
+export const collectRef = (json: JSONNode): string[] => refEntries(json).map(([, _]) => _);

src/index.ts

@@ -1,10 +1,9 @@
 export { resolveRef } from './resolveRef';
 export { resolveRef as resolveRefSync } from './resolveRef.sync';
-export { visitRef, type RefVisitor } from './visitRef';
 export { collectRef } from './collectRef';
 
 export { resolveJPointer } from './resolveJPointer';
 
 export type { URIResolver } from './URIResolver';
 
-export * from './JSONNode';
+export * from './JSONRef';

src/refEntries.ts

@@ -0,0 +1,7 @@
+import { type JSONPath, fp, leafs, type JSONNode } from '@redneckz/json-op';
+import { isJSONRefPath } from './JSONRef';
+
+export type JSONRefEntry = [path: JSONPath.JSONPath, ref: string];
+
+export const refEntries = (json: JSONNode): JSONRefEntry[] =>
+  leafs(json).filter(fp.t0(isJSONRefPath)) as JSONRefEntry[];

src/resolveJPointer.ts

@@ -1,4 +1,4 @@
-import { JSONNode, isJSONArray, isJSONRecord } from './JSONNode';
+import { isJSONArray, isJSONRecord, type JSONNode } from '@redneckz/json-op';
 import { parseJPointer } from './parseJPointer';
 
 export const resolveJPointer = (json: JSONNode, uri: string): JSONNode =>

src/resolveRef.sync.ts

@@ -1,15 +1,14 @@
-import { type JSONNode, type JSONRecord } from './JSONNode';
+import { JSONPath, fp, map, type JSONNode } from '@redneckz/json-op';
+import { isJSONRefPath } from './JSONRef';
 import type { URIResolver } from './URIResolver';
-import { mapJSONNode } from './mapJSONNode';
-import { mergeRecords } from './mergeRecords';
 import { resolveJPointer } from './resolveJPointer';
 
 export const resolveRef = (json: JSONNode, resolver: URIResolver<JSONNode>): JSONNode =>
-  mapJSONNode(json, {
-    ref: ({ $ref, ...rest }) => resolveRef($ref ? resolveJPointer(resolver($ref), $ref) : rest, resolver),
-    record: record =>
-      mergeRecords(
-        Object.entries(record).map(([key, value]) => ({ [key]: resolveRef(value, resolver) } as JSONRecord))
-      ),
-    array: list => list.map(_ => resolveRef(_, resolver))
-  });
+  map(([path, node]) =>
+    isJSONRefPath(path)
+      ? [
+          fp.init(path) as JSONPath.JSONPath,
+          resolveRef(resolveJPointer(resolver(node as string), node as string), resolver)
+        ]
+      : [path, node]
+  )(json);

src/resolveRef.ts

@@ -1,19 +1,14 @@
-import { type JSONNode, type JSONRecord } from './JSONNode';
+import { JSONPath, async, fp, type JSONNode } from '@redneckz/json-op';
+import { isJSONRefPath } from './JSONRef';
 import type { URIResolver } from './URIResolver';
-import { mapJSONNode } from './mapJSONNode';
-import { mergeRecords } from './mergeRecords';
 import { resolveJPointer } from './resolveJPointer';
 
 export const resolveRef = async (json: JSONNode, resolver: URIResolver): Promise<JSONNode> =>
-  mapJSONNode(json, {
-    ref: async ({ $ref, ...rest }) => resolveRef($ref ? resolveJPointer(await resolver($ref), $ref) : rest, resolver),
-    record: async record =>
-      mergeRecords(
-        await Promise.all(
-          Object.entries(record).map(
-            async ([key, value]) => ({ [key]: await resolveRef(value, resolver) } as JSONRecord)
-          )
-        )
-      ),
-    array: async list => Promise.all(list.map(_ => resolveRef(_, resolver)))
-  });
+  async.map(async ([path, node]) =>
+    isJSONRefPath(path)
+      ? [
+          fp.init(path) as JSONPath.JSONPath,
+          await resolveRef(resolveJPointer(await resolver(node as string), node as string), resolver)
+        ]
+      : [path, node]
+  )(json);