@graffy/link 0.15.15-alpha.2 → 0.15.15-alpha.3

package/index.cjs

@@ -19,6 +19,11 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var common = require("@graffy/common");
+var debug = require("debug");
+function _interopDefaultLegacy(e) {
+  return e && typeof e === "object" && "default" in e ? e : { "default": e };
+}
+var debug__default = /* @__PURE__ */ _interopDefaultLegacy(debug);
 function linkGraph(rootGraph, defs) {
   let version = rootGraph[0].version;
   for (const { path, def } of defs) {
@@ -277,6 +282,7 @@ function prepareDef(def, vars) {
   const ref = def.flatMap(replacePlaceholders);
   return ref;
 }
+const log = debug__default["default"]("graffy:link");
 var index = (defs) => (store) => {
   const prefix = store.path;
   const defEntries = Object.entries(defs).map(([prop, def]) => ({
@@ -286,10 +292,16 @@ var index = (defs) => (store) => {
   store.on("read", async (query, options, next) => {
     const unwrappedQuery = clone(common.unwrap(query, prefix));
     const usedDefs = prepQueryLinks(unwrappedQuery, defEntries);
+    if (!usedDefs.length)
+      return next(query, options);
     const result = await next(common.wrap(unwrappedQuery, prefix), options);
     const unwrappedResult = common.unwrap(result, prefix);
-    linkGraph(unwrappedResult, usedDefs);
-    return result;
+    common.add(unwrappedQuery, common.unwrap(query, prefix));
+    log("finalizing", prefix, unwrappedQuery);
+    const finalizedResult = common.finalize(unwrappedResult, unwrappedQuery);
+    log("beforeAddingLinks", prefix, unwrappedResult);
+    linkGraph(finalizedResult, usedDefs);
+    return common.wrap(finalizedResult, prefix);
   });
 };
 function clone(tree) {

package/index.mjs

@@ -17,7 +17,8 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { encodePath, splitRef, findFirst, unwrap, merge, wrap, decodeArgs, isBranch, add, wrapValue } from "@graffy/common";
+import { encodePath, splitRef, findFirst, unwrap, merge, wrap, decodeArgs, isBranch, add, wrapValue, finalize } from "@graffy/common";
+import debug from "debug";
 function linkGraph(rootGraph, defs) {
   let version = rootGraph[0].version;
   for (const { path, def } of defs) {
@@ -276,6 +277,7 @@ function prepareDef(def, vars) {
   const ref = def.flatMap(replacePlaceholders);
   return ref;
 }
+const log = debug("graffy:link");
 var index = (defs) => (store) => {
   const prefix = store.path;
   const defEntries = Object.entries(defs).map(([prop, def]) => ({
@@ -285,10 +287,16 @@ var index = (defs) => (store) => {
   store.on("read", async (query, options, next) => {
     const unwrappedQuery = clone(unwrap(query, prefix));
     const usedDefs = prepQueryLinks(unwrappedQuery, defEntries);
+    if (!usedDefs.length)
+      return next(query, options);
     const result = await next(wrap(unwrappedQuery, prefix), options);
     const unwrappedResult = unwrap(result, prefix);
-    linkGraph(unwrappedResult, usedDefs);
-    return result;
+    add(unwrappedQuery, unwrap(query, prefix));
+    log("finalizing", prefix, unwrappedQuery);
+    const finalizedResult = finalize(unwrappedResult, unwrappedQuery);
+    log("beforeAddingLinks", prefix, unwrappedResult);
+    linkGraph(finalizedResult, usedDefs);
+    return wrap(finalizedResult, prefix);
   });
 };
 function clone(tree) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graffy/link",
   "description": "Graffy module for constructing links using an intuitive, declarative notation.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.15.15-alpha.2",
+  "version": "0.15.15-alpha.3",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,6 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.15-alpha.2"
+    "@graffy/common": "0.15.15-alpha.3",
+    "debug": "^4.3.2"
   }
 }