@graffy/pg 0.15.25 → 0.16.0-alpha.10

package/index.cjs

@@ -210,11 +210,11 @@ const getJsonBuildValue = (value) => {
   return sql`${JSON.stringify(stripAttributes(value))}::jsonb`;
 };
 const lookup = (prop) => {
-  const [prefix, ...suffix] = common.encodePath(prop);
+  const [prefix, ...suffix] = prop.split(".");
   return suffix.length ? sql`"${raw(prefix)}" #> ${suffix}` : sql`"${raw(prefix)}"`;
 };
 const lookupNumeric = (prop) => {
-  const [prefix, ...suffix] = common.encodePath(prop);
+  const [prefix, ...suffix] = prop.split(".");
   return suffix.length ? sql`CASE WHEN "${raw(prefix)}" #> ${suffix} = 'null'::jsonb THEN 0 ELSE ("${raw(
     prefix
   )}" #> ${suffix})::numeric END` : sql`"${raw(prefix)}"`;
@@ -388,7 +388,7 @@ function getSql(filter, options) {
     } else if (op === "$not") {
       return sql`${opSql[op]} (${getNodeSql(ast[1])})`;
     }
-    const [prefix, ...suffix] = common.encodePath(ast[1]);
+    const [prefix, ...suffix] = ast[1].split(".");
     const { types: types2 } = options.schema;
     if (!types2[prefix])
       throw Error("pg.no_column " + prefix);
@@ -653,13 +653,14 @@ class Db {
     const idQueries = {};
     const promises = [];
     const results = [];
-    const { prefix } = tableOptions;
+    const { prefix: rawPrefix } = tableOptions;
+    const prefix = common.encodePath(rawPrefix);
     await this.ensureSchema(tableOptions);
     const getByArgs = async (args, projection) => {
       const result = await this.readSql(
         selectByArgs(args, projection, tableOptions)
       );
-      const wrappedGraph = common.encodeGraph(common.wrapObject(result, prefix));
+      const wrappedGraph = common.encodeGraph(common.wrapObject(result, rawPrefix));
       log("getByArgs", wrappedGraph);
       common.merge(results, wrappedGraph);
     };
@@ -668,7 +669,7 @@ class Db {
         selectByIds(Object.keys(idQueries), null, tableOptions)
       );
       result.forEach((object) => {
-        const wrappedGraph = common.encodeGraph(common.wrapObject(object, prefix));
+        const wrappedGraph = common.encodeGraph(common.wrapObject(object, rawPrefix));
         log("getByIds", wrappedGraph);
         common.merge(results, wrappedGraph);
       });
@@ -688,7 +689,7 @@ class Db {
           promises.push(getByArgs(args, projection));
         }
       } else {
-        idQueries[node.key] = node.children;
+        idQueries[args] = node.children;
       }
     }
     if (!common.isEmpty(idQueries))
@@ -698,13 +699,14 @@ class Db {
     return common.finalize(results, common.wrap(query, prefix));
   }
   async write(rootChange, tableOptions) {
-    const { prefix } = tableOptions;
+    const { prefix: rawPrefix } = tableOptions;
+    const prefix = common.encodePath(rawPrefix);
     await this.ensureSchema(tableOptions);
     const change = common.unwrap(rootChange, prefix);
     const sqls = change.map((node) => {
       const arg = common.decodeArgs(node);
       if (common.isRange(node)) {
-        if (node.key === node.end)
+        if (common.cmp(node.key, node.end) === 0)
           return del(arg, tableOptions);
         throw Error("pg_write.write_range_unsupported");
       }
@@ -723,7 +725,7 @@ class Db {
     await Promise.all(
       sqls.map(
         (sql2) => this.writeSql(sql2).then((object) => {
-          common.merge(result, common.encodeGraph(common.wrapObject(object, prefix)));
+          common.merge(result, common.encodeGraph(common.wrapObject(object, rawPrefix)));
         })
       )
     );
@@ -748,7 +750,7 @@ const pg = ({ table, idCol, verCol, connection, schema, verDefault }) => (store)
     const { pgClient } = options;
     const db = pgClient ? new Db(pgClient) : defaultDb;
     const readPromise = db.read(query, tableOpts);
-    const remainingQuery = common.remove(query, prefix);
+    const remainingQuery = common.remove(query, common.encodePath(prefix));
     const nextPromise = next(remainingQuery);
     return Promise.all([readPromise, nextPromise]).then(
       ([readRes, nextRes]) => {
@@ -760,7 +762,7 @@ const pg = ({ table, idCol, verCol, connection, schema, verDefault }) => (store)
     const { pgClient } = options;
     const db = pgClient ? new Db(pgClient) : defaultDb;
     const writePromise = db.write(change, tableOpts);
-    const remainingChange = common.remove(change, prefix);
+    const remainingChange = common.remove(change, common.encodePath(prefix));
     const nextPromise = next(remainingChange);
     return Promise.all([writePromise, nextPromise]).then(
       ([writeRes, nextRes]) => {

package/index.mjs

@@ -1,4 +1,4 @@
-import { encodePath, isEmpty, isPlainObject, unwrap, decodeArgs, decodeQuery, finalize, wrap, isRange, decodeGraph, mergeObject, merge, encodeGraph, wrapObject, remove } from "@graffy/common";
+import { isEmpty, isPlainObject, encodePath, unwrap, decodeArgs, decodeQuery, finalize, wrap, isRange, cmp, decodeGraph, mergeObject, merge, encodeGraph, wrapObject, remove } from "@graffy/common";
 import pg$1 from "pg";
 import debug from "debug";
 class Sql {
@@ -205,11 +205,11 @@ const getJsonBuildValue = (value) => {
   return sql`${JSON.stringify(stripAttributes(value))}::jsonb`;
 };
 const lookup = (prop) => {
-  const [prefix, ...suffix] = encodePath(prop);
+  const [prefix, ...suffix] = prop.split(".");
   return suffix.length ? sql`"${raw(prefix)}" #> ${suffix}` : sql`"${raw(prefix)}"`;
 };
 const lookupNumeric = (prop) => {
-  const [prefix, ...suffix] = encodePath(prop);
+  const [prefix, ...suffix] = prop.split(".");
   return suffix.length ? sql`CASE WHEN "${raw(prefix)}" #> ${suffix} = 'null'::jsonb THEN 0 ELSE ("${raw(
     prefix
   )}" #> ${suffix})::numeric END` : sql`"${raw(prefix)}"`;
@@ -383,7 +383,7 @@ function getSql(filter, options) {
     } else if (op === "$not") {
       return sql`${opSql[op]} (${getNodeSql(ast[1])})`;
     }
-    const [prefix, ...suffix] = encodePath(ast[1]);
+    const [prefix, ...suffix] = ast[1].split(".");
     const { types: types2 } = options.schema;
     if (!types2[prefix])
       throw Error("pg.no_column " + prefix);
@@ -648,13 +648,14 @@ class Db {
     const idQueries = {};
     const promises = [];
     const results = [];
-    const { prefix } = tableOptions;
+    const { prefix: rawPrefix } = tableOptions;
+    const prefix = encodePath(rawPrefix);
     await this.ensureSchema(tableOptions);
     const getByArgs = async (args, projection) => {
       const result = await this.readSql(
         selectByArgs(args, projection, tableOptions)
       );
-      const wrappedGraph = encodeGraph(wrapObject(result, prefix));
+      const wrappedGraph = encodeGraph(wrapObject(result, rawPrefix));
       log("getByArgs", wrappedGraph);
       merge(results, wrappedGraph);
     };
@@ -663,7 +664,7 @@ class Db {
         selectByIds(Object.keys(idQueries), null, tableOptions)
       );
       result.forEach((object) => {
-        const wrappedGraph = encodeGraph(wrapObject(object, prefix));
+        const wrappedGraph = encodeGraph(wrapObject(object, rawPrefix));
         log("getByIds", wrappedGraph);
         merge(results, wrappedGraph);
       });
@@ -683,7 +684,7 @@ class Db {
           promises.push(getByArgs(args, projection));
         }
       } else {
-        idQueries[node.key] = node.children;
+        idQueries[args] = node.children;
       }
     }
     if (!isEmpty(idQueries))
@@ -693,13 +694,14 @@ class Db {
     return finalize(results, wrap(query, prefix));
   }
   async write(rootChange, tableOptions) {
-    const { prefix } = tableOptions;
+    const { prefix: rawPrefix } = tableOptions;
+    const prefix = encodePath(rawPrefix);
     await this.ensureSchema(tableOptions);
     const change = unwrap(rootChange, prefix);
     const sqls = change.map((node) => {
       const arg = decodeArgs(node);
       if (isRange(node)) {
-        if (node.key === node.end)
+        if (cmp(node.key, node.end) === 0)
           return del(arg, tableOptions);
         throw Error("pg_write.write_range_unsupported");
       }
@@ -718,7 +720,7 @@ class Db {
     await Promise.all(
       sqls.map(
         (sql2) => this.writeSql(sql2).then((object) => {
-          merge(result, encodeGraph(wrapObject(object, prefix)));
+          merge(result, encodeGraph(wrapObject(object, rawPrefix)));
         })
       )
     );
@@ -743,7 +745,7 @@ const pg = ({ table, idCol, verCol, connection, schema, verDefault }) => (store)
     const { pgClient } = options;
     const db = pgClient ? new Db(pgClient) : defaultDb;
     const readPromise = db.read(query, tableOpts);
-    const remainingQuery = remove(query, prefix);
+    const remainingQuery = remove(query, encodePath(prefix));
     const nextPromise = next(remainingQuery);
     return Promise.all([readPromise, nextPromise]).then(
       ([readRes, nextRes]) => {
@@ -755,7 +757,7 @@ const pg = ({ table, idCol, verCol, connection, schema, verDefault }) => (store)
     const { pgClient } = options;
     const db = pgClient ? new Db(pgClient) : defaultDb;
     const writePromise = db.write(change, tableOpts);
-    const remainingChange = remove(change, prefix);
+    const remainingChange = remove(change, encodePath(prefix));
     const nextPromise = next(remainingChange);
     return Promise.all([writePromise, nextPromise]).then(
       ([writeRes, nextRes]) => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graffy/pg",
   "description": "The standard Postgres module for Graffy. Each instance this module mounts a Postgres table as a Graffy subtree.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.15.25",
+  "version": "0.16.0-alpha.10",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.25",
+    "@graffy/common": "0.16.0-alpha.10",
     "debug": "^4.3.3"
   },
   "peerDependencies": {