@graffy/core 0.15.25 → 0.16.0-alpha.10

package/index.cjs

@@ -4,26 +4,24 @@ const stream = require("@graffy/stream");
 const debug = require("debug");
 const _interopDefaultLegacy = (e) => e && typeof e === "object" && "default" in e ? e : { default: e };
 const debug__default = /* @__PURE__ */ _interopDefaultLegacy(debug);
-function isPlainObject(obj) {
-  return obj && typeof obj === "object" && !Array.isArray(obj);
-}
+const splitPath = (path) => Array.isArray(path) ? path : path === "" ? [] : String(path).split(".");
 function validateCall(...args) {
   if (args.length === 1) {
     return [[], args[0], {}];
   } else if (args.length === 2) {
-    if (isPlainObject(args[0])) {
-      if (!isPlainObject(args[1])) {
+    if (common.isPlainObject(args[0])) {
+      if (!common.isPlainObject(args[1])) {
         throw Error(`validateCall.invalid_options: ${JSON.stringify(args[1])}`);
       }
       return [[], args[0], args[1]];
     } else {
-      return [common.encodePath(args[0]), args[1], {}];
+      return [splitPath(args[0]), args[1], {}];
     }
   } else if (args.length === 3) {
-    if (!isPlainObject(args[2])) {
+    if (!common.isPlainObject(args[2])) {
       throw Error(`validateCall.invalid_options: ${JSON.stringify(args[1])}`);
     }
-    return [common.encodePath(args[0]), args[1], args[2]];
+    return [splitPath(args[0]), args[1], args[2]];
   }
   throw Error(`validateCall.invalid_args: ${JSON.stringify(args)}`);
 }
@@ -37,7 +35,7 @@ function validateOn(...args) {
     if (typeof args[1] !== "function") {
       throw Error(`validateOn.invalid_handler: ${JSON.stringify(args[1])}`);
     }
-    return [common.encodePath(args[0]), args[1]];
+    return [splitPath(args[0]), args[1]];
   }
   throw Error(`validateOn.invalid_args: ${JSON.stringify(args)}`);
 }
@@ -47,6 +45,7 @@ async function mapStream(stream2, fn) {
   }
 }
 function shiftFn(fn, path) {
+  path = common.encodePath(path);
   return async function shiftedFn(payload, options, next) {
     let nextCalled = false;
     let remainingNextResult;
@@ -73,6 +72,7 @@ function shiftFn(fn, path) {
   };
 }
 function shiftGen(fn, path) {
+  path = common.encodePath(path);
   return async function* shiftedGen(payload, options, next) {
     let nextCalled = false;
     let remainingNextStream;
@@ -120,8 +120,9 @@ function resolve(handlers, firstPayload, firstOptions) {
       throw Error("resolve.no_providers_for " + JSON.stringify(payload));
     }
     const { path, handle } = handlers[i];
-    if (!common.unwrap(payload, path))
+    if (!common.unwrap(payload, path)) {
       return run(i + 1, payload, options);
+    }
     let nextCalled = false;
     return handle(payload, options, (nextPayload, nextOptions) => {
       if (nextCalled) {
@@ -141,7 +142,7 @@ class Core {
   }
   on(type, path, handle) {
     this.handlers[type] = this.handlers[type] || [];
-    this.handlers[type].push({ path, handle });
+    this.handlers[type].push({ path: common.encodePath(path), handle });
   }
   call(type, payload, options = {}) {
     log("call", type, payload);
@@ -164,9 +165,14 @@ class Graffy {
     this.core.on(
       "read",
       path,
-      shiftFn(async function porcelainRead(query, options) {
-        const decoded = common.decodeQuery(query);
-        const encoded = common.encodeGraph(await handle(decoded, options));
+      shiftFn(async function porcelainRead(query, options, next) {
+        const porcelainQuery = common.decodeQuery(query);
+        const encoded = common.encodeGraph(
+          await handle(porcelainQuery, options, async (nextQuery, nextOpts) => {
+            const nextResult = await next(common.encodeQuery(nextQuery), nextOpts);
+            return common.decodeGraph(nextResult);
+          })
+        );
         const finalized = common.finalize(encoded, query);
         return finalized;
       }, path)
@@ -180,7 +186,9 @@ class Graffy {
       path,
       shiftGen(function porcelainWatch(query, options) {
         return stream.makeStream((push, end) => {
-          const subscription = handle(common.decodeQuery(query), options);
+          const subscription = handle(common.decodeQuery(query), options, () => {
+            throw Error("porcelain.watch_next_unsupported: " + path);
+          });
           (async function() {
             try {
               let firstValue = (await subscription.next()).value;
@@ -203,8 +211,17 @@ class Graffy {
     this.core.on(
       "write",
       path,
-      shiftFn(async function porcelainWrite(change, options) {
-        return common.encodeGraph(await handle(common.decodeGraph(change), options));
+      shiftFn(async function porcelainWrite(change, options, next) {
+        return common.encodeGraph(
+          await handle(
+            common.decodeGraph(change),
+            options,
+            async (nextChange, nextOpts) => {
+              const nextResult = await next(common.encodeGraph(nextChange), nextOpts);
+              return common.decodeGraph(nextResult);
+            }
+          )
+        );
       }, path)
     );
   }
@@ -221,7 +238,7 @@ class Graffy {
     const rootQuery = common.wrapObject(porcelainQuery, path);
     const query = common.encodeQuery(rootQuery);
     const result = await this.core.call("read", query, options || {});
-    return common.unwrapObject(common.decorate(result, rootQuery), common.decodePath(path));
+    return common.unwrapObject(common.decorate(result, rootQuery), path);
   }
   watch(...args) {
     const [path, porcelainQuery, options] = validateCall(...args);
@@ -230,14 +247,14 @@ class Graffy {
     const stream$1 = this.core.call("watch", query, options || {});
     return stream.mapStream(
       stream$1,
-      (value) => common.unwrapObject(common.decorate(value, rootQuery), common.decodePath(path))
+      (value) => common.unwrapObject(common.decorate(value, rootQuery), path)
     );
   }
   async write(...args) {
     const [path, porcelainChange, options] = validateCall(...args);
     const change = common.encodeGraph(common.wrapObject(porcelainChange, path));
     const writtenChange = await this.core.call("write", change, options || {});
-    return common.unwrapObject(common.decodeGraph(writtenChange), common.decodePath(path));
+    return common.unwrapObject(common.decodeGraph(writtenChange), path);
   }
 }
 module.exports = Graffy;

package/index.mjs

@@ -1,9 +1,7 @@
-import { encodePath, unwrap, remove, wrap, merge, mergeStreams, wrapObject, encodeQuery, unwrapObject, decorate, decodePath, encodeGraph, decodeGraph, decodeQuery, finalize } from "@graffy/common";
+import { isPlainObject, encodePath, unwrap, remove, wrap, merge, mergeStreams, wrapObject, encodeQuery, unwrapObject, decorate, encodeGraph, decodeGraph, decodeQuery, finalize } from "@graffy/common";
 import { makeStream, mapStream as mapStream$1 } from "@graffy/stream";
 import debug from "debug";
-function isPlainObject(obj) {
-  return obj && typeof obj === "object" && !Array.isArray(obj);
-}
+const splitPath = (path) => Array.isArray(path) ? path : path === "" ? [] : String(path).split(".");
 function validateCall(...args) {
   if (args.length === 1) {
     return [[], args[0], {}];
@@ -14,13 +12,13 @@ function validateCall(...args) {
       }
       return [[], args[0], args[1]];
     } else {
-      return [encodePath(args[0]), args[1], {}];
+      return [splitPath(args[0]), args[1], {}];
     }
   } else if (args.length === 3) {
     if (!isPlainObject(args[2])) {
       throw Error(`validateCall.invalid_options: ${JSON.stringify(args[1])}`);
     }
-    return [encodePath(args[0]), args[1], args[2]];
+    return [splitPath(args[0]), args[1], args[2]];
   }
   throw Error(`validateCall.invalid_args: ${JSON.stringify(args)}`);
 }
@@ -34,7 +32,7 @@ function validateOn(...args) {
     if (typeof args[1] !== "function") {
       throw Error(`validateOn.invalid_handler: ${JSON.stringify(args[1])}`);
     }
-    return [encodePath(args[0]), args[1]];
+    return [splitPath(args[0]), args[1]];
   }
   throw Error(`validateOn.invalid_args: ${JSON.stringify(args)}`);
 }
@@ -44,6 +42,7 @@ async function mapStream(stream, fn) {
   }
 }
 function shiftFn(fn, path) {
+  path = encodePath(path);
   return async function shiftedFn(payload, options, next) {
     let nextCalled = false;
     let remainingNextResult;
@@ -70,6 +69,7 @@ function shiftFn(fn, path) {
   };
 }
 function shiftGen(fn, path) {
+  path = encodePath(path);
   return async function* shiftedGen(payload, options, next) {
     let nextCalled = false;
     let remainingNextStream;
@@ -117,8 +117,9 @@ function resolve(handlers, firstPayload, firstOptions) {
       throw Error("resolve.no_providers_for " + JSON.stringify(payload));
     }
     const { path, handle } = handlers[i];
-    if (!unwrap(payload, path))
+    if (!unwrap(payload, path)) {
       return run(i + 1, payload, options);
+    }
     let nextCalled = false;
     return handle(payload, options, (nextPayload, nextOptions) => {
       if (nextCalled) {
@@ -138,7 +139,7 @@ class Core {
   }
   on(type, path, handle) {
     this.handlers[type] = this.handlers[type] || [];
-    this.handlers[type].push({ path, handle });
+    this.handlers[type].push({ path: encodePath(path), handle });
   }
   call(type, payload, options = {}) {
     log("call", type, payload);
@@ -161,9 +162,14 @@ class Graffy {
     this.core.on(
       "read",
       path,
-      shiftFn(async function porcelainRead(query, options) {
-        const decoded = decodeQuery(query);
-        const encoded = encodeGraph(await handle(decoded, options));
+      shiftFn(async function porcelainRead(query, options, next) {
+        const porcelainQuery = decodeQuery(query);
+        const encoded = encodeGraph(
+          await handle(porcelainQuery, options, async (nextQuery, nextOpts) => {
+            const nextResult = await next(encodeQuery(nextQuery), nextOpts);
+            return decodeGraph(nextResult);
+          })
+        );
         const finalized = finalize(encoded, query);
         return finalized;
       }, path)
@@ -177,7 +183,9 @@ class Graffy {
       path,
       shiftGen(function porcelainWatch(query, options) {
         return makeStream((push, end) => {
-          const subscription = handle(decodeQuery(query), options);
+          const subscription = handle(decodeQuery(query), options, () => {
+            throw Error("porcelain.watch_next_unsupported: " + path);
+          });
           (async function() {
             try {
               let firstValue = (await subscription.next()).value;
@@ -200,8 +208,17 @@ class Graffy {
     this.core.on(
       "write",
       path,
-      shiftFn(async function porcelainWrite(change, options) {
-        return encodeGraph(await handle(decodeGraph(change), options));
+      shiftFn(async function porcelainWrite(change, options, next) {
+        return encodeGraph(
+          await handle(
+            decodeGraph(change),
+            options,
+            async (nextChange, nextOpts) => {
+              const nextResult = await next(encodeGraph(nextChange), nextOpts);
+              return decodeGraph(nextResult);
+            }
+          )
+        );
       }, path)
     );
   }
@@ -218,7 +235,7 @@ class Graffy {
     const rootQuery = wrapObject(porcelainQuery, path);
     const query = encodeQuery(rootQuery);
     const result = await this.core.call("read", query, options || {});
-    return unwrapObject(decorate(result, rootQuery), decodePath(path));
+    return unwrapObject(decorate(result, rootQuery), path);
   }
   watch(...args) {
     const [path, porcelainQuery, options] = validateCall(...args);
@@ -227,14 +244,14 @@ class Graffy {
     const stream = this.core.call("watch", query, options || {});
     return mapStream$1(
       stream,
-      (value) => unwrapObject(decorate(value, rootQuery), decodePath(path))
+      (value) => unwrapObject(decorate(value, rootQuery), path)
     );
   }
   async write(...args) {
     const [path, porcelainChange, options] = validateCall(...args);
     const change = encodeGraph(wrapObject(porcelainChange, path));
     const writtenChange = await this.core.call("write", change, options || {});
-    return unwrapObject(decodeGraph(writtenChange), decodePath(path));
+    return unwrapObject(decodeGraph(writtenChange), path);
   }
 }
 export {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graffy/core",
   "description": "The main module for Graffy, a library for intuitive real-time data APIs.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.15.25",
+  "version": "0.16.0-alpha.10",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,8 +16,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.25",
-    "@graffy/stream": "0.15.25",
+    "@graffy/common": "0.16.0-alpha.10",
+    "@graffy/stream": "0.16.0-alpha.10",
     "debug": "^4.3.3"
   }
 }