@graffy/pg 0.16.14 → 0.16.15-alpha.2

package/index.cjs

@@ -34,17 +34,29 @@ class Sql {
     }
   }
   get text() {
-    let i = 1, value = this.strings[0];
-    while (i < this.strings.length)
+    const len = this.strings.length;
+    let i = 1;
+    let value = this.strings[0];
+    while (i < len)
       value += `$${i}${this.strings[i++]}`;
     return value;
   }
   get sql() {
-    let i = 1, value = this.strings[0];
-    while (i < this.strings.length)
+    const len = this.strings.length;
+    let i = 1;
+    let value = this.strings[0];
+    while (i < len)
       value += `?${this.strings[i++]}`;
     return value;
   }
+  get statement() {
+    const len = this.strings.length;
+    let i = 1;
+    let value = this.strings[0];
+    while (i < len)
+      value += `:${i}${this.strings[i++]}`;
+    return value;
+  }
   inspect() {
     return {
       text: this.text,
@@ -90,7 +102,7 @@ const lookup = (prop, options) => {
     return sql`"${raw(prefix)}" #> ${suffix}`;
   }
   if (types2[prefix] === "cube" && suffix.length === 1) {
-    return sql`"${raw(prefix)}" ~> ${parseInt(suffix[0])}`;
+    return sql`"${raw(prefix)}" ~> ${Number.parseInt(suffix[0])}`;
   }
   throw Error(`pg.cannot_lookup ${prop}`);
 };
@@ -149,7 +161,7 @@ function castValue(value, type, name, isPut) {
   if (value === null)
     return sql`NULL`;
   if (type === "jsonb") {
-    return isPut ? JSON.stringify(stripAttributes(value)) : getJsonUpdate(value, name, []);
+    return isPut ? JSON.stringify(stripAttributes(value)) : getJsonUpdate(value, name, [])[0];
   }
   if (type === "cube")
     return cubeLiteralSql(value);
@@ -208,20 +220,37 @@ const getUpdates = (row, options) => {
 };
 function getJsonUpdate(object, col, path) {
   if (!object || typeof object !== "object" || Array.isArray(object) || object.$put) {
-    return getJsonBuildValue(object);
+    const patch2 = stripAttributes(object);
+    return [sql`${JSON.stringify(patch2)}::jsonb`, patch2 === null];
+  }
+  if ("$val" in object) {
+    const value = object.$val === true ? stripAttributes(object) : object.$val;
+    return [sql`${JSON.stringify({ $val: value })}::jsonb`, false];
   }
   const curr = sql`"${raw(col)}"${path.length ? sql`#>${path}` : empty}`;
   if (common.isEmpty(object))
-    return curr;
-  return sql`nullif(jsonb_strip_nulls((case jsonb_typeof(${curr})
+    return [curr, false];
+  const baseSql = sql`case jsonb_typeof(${curr})
     when 'object' then ${curr}
     else '{}'::jsonb
-  end) || jsonb_build_object(${join(
-    Object.entries(object).map(
-      ([key, value]) => sql`${key}::text, ${getJsonUpdate(value, col, path.concat(key))}`
-    ),
-    ", "
-  )})), '{}'::jsonb)`;
+  end`;
+  let maybeNull = true;
+  let hasNulls = false;
+  const patchSqls = Object.entries(object).map(([key, value]) => {
+    const [valSql, nullable] = getJsonUpdate(value, col, path.concat(key));
+    maybeNull && (maybeNull = nullable);
+    hasNulls || (hasNulls = nullable);
+    return sql`${key}::text, ${valSql}`;
+  });
+  let clause = sql`${baseSql} || jsonb_build_object(${join(patchSqls, ", ")})`;
+  if (hasNulls) {
+    clause = sql`(select jsonb_object_agg(key, value)
+      from jsonb_each(${clause}) where value <> 'null'::jsonb)`;
+  }
+  if (maybeNull) {
+    clause = sql`nullif(${clause}, '{}'::jsonb)`;
+  }
+  return [clause, maybeNull];
 }
 function stripAttributes(object) {
   if (typeof object !== "object" || !object)
@@ -386,6 +415,7 @@ function simplify(node) {
 }
 const opSql = {
   $and: "AND",
+  // Not SQL as these are used as delimiters
   $or: "OR",
   $not: sql`NOT`,
   $eq: sql`=`,
@@ -675,17 +705,17 @@ class Db {
   async query(sql2, tableOptions) {
     var _a, _b;
     log(`Making SQL query: ${sql2.text}`, sql2.values);
-    const cubeOid = parseInt(((_b = (_a = tableOptions == null ? void 0 : tableOptions.schema) == null ? void 0 : _a.typeOids) == null ? void 0 : _b.cube) || "0") || null;
+    const cubeOid = Number.parseInt(((_b = (_a = tableOptions == null ? void 0 : tableOptions.schema) == null ? void 0 : _a.typeOids) == null ? void 0 : _b.cube) || "0") || null;
     try {
       sql2.types = {
         getTypeParser: (oid, format) => {
           if (oid === types.builtins.INT8) {
-            return (value) => parseInt(value, 10);
+            return (value) => Number.parseInt(value, 10);
           }
           if (oid === cubeOid) {
             return (value) => {
               const array = value.slice(1, -1).split(/\)\s*,\s*\(/).map(
-                (corner) => corner.split(",").map((coord) => parseFloat(coord.trim()))
+                (corner) => corner.split(",").map((coord) => Number.parseFloat(coord.trim()))
               );
               return array.length > 1 ? array : array[0];
             };
@@ -719,6 +749,11 @@ class Db {
     }
     return res.rows;
   }
+  /*
+    Adds .schema to tableOptions if it doesn't exist yet.
+    It mutates the argument, to "persist" the results and
+    avoid this query in every operation. 
+  */
   async ensureSchema(tableOptions, typeOids) {
     if (tableOptions.schema)
       return;

package/index.mjs

@@ -32,17 +32,29 @@ class Sql {
     }
   }
   get text() {
-    let i = 1, value = this.strings[0];
-    while (i < this.strings.length)
+    const len = this.strings.length;
+    let i = 1;
+    let value = this.strings[0];
+    while (i < len)
       value += `$${i}${this.strings[i++]}`;
     return value;
   }
   get sql() {
-    let i = 1, value = this.strings[0];
-    while (i < this.strings.length)
+    const len = this.strings.length;
+    let i = 1;
+    let value = this.strings[0];
+    while (i < len)
       value += `?${this.strings[i++]}`;
     return value;
   }
+  get statement() {
+    const len = this.strings.length;
+    let i = 1;
+    let value = this.strings[0];
+    while (i < len)
+      value += `:${i}${this.strings[i++]}`;
+    return value;
+  }
   inspect() {
     return {
       text: this.text,
@@ -88,7 +100,7 @@ const lookup = (prop, options) => {
     return sql`"${raw(prefix)}" #> ${suffix}`;
   }
   if (types2[prefix] === "cube" && suffix.length === 1) {
-    return sql`"${raw(prefix)}" ~> ${parseInt(suffix[0])}`;
+    return sql`"${raw(prefix)}" ~> ${Number.parseInt(suffix[0])}`;
   }
   throw Error(`pg.cannot_lookup ${prop}`);
 };
@@ -147,7 +159,7 @@ function castValue(value, type, name, isPut) {
   if (value === null)
     return sql`NULL`;
   if (type === "jsonb") {
-    return isPut ? JSON.stringify(stripAttributes(value)) : getJsonUpdate(value, name, []);
+    return isPut ? JSON.stringify(stripAttributes(value)) : getJsonUpdate(value, name, [])[0];
   }
   if (type === "cube")
     return cubeLiteralSql(value);
@@ -206,20 +218,37 @@ const getUpdates = (row, options) => {
 };
 function getJsonUpdate(object, col, path) {
   if (!object || typeof object !== "object" || Array.isArray(object) || object.$put) {
-    return getJsonBuildValue(object);
+    const patch2 = stripAttributes(object);
+    return [sql`${JSON.stringify(patch2)}::jsonb`, patch2 === null];
+  }
+  if ("$val" in object) {
+    const value = object.$val === true ? stripAttributes(object) : object.$val;
+    return [sql`${JSON.stringify({ $val: value })}::jsonb`, false];
   }
   const curr = sql`"${raw(col)}"${path.length ? sql`#>${path}` : empty}`;
   if (isEmpty(object))
-    return curr;
-  return sql`nullif(jsonb_strip_nulls((case jsonb_typeof(${curr})
+    return [curr, false];
+  const baseSql = sql`case jsonb_typeof(${curr})
     when 'object' then ${curr}
     else '{}'::jsonb
-  end) || jsonb_build_object(${join(
-    Object.entries(object).map(
-      ([key, value]) => sql`${key}::text, ${getJsonUpdate(value, col, path.concat(key))}`
-    ),
-    ", "
-  )})), '{}'::jsonb)`;
+  end`;
+  let maybeNull = true;
+  let hasNulls = false;
+  const patchSqls = Object.entries(object).map(([key, value]) => {
+    const [valSql, nullable] = getJsonUpdate(value, col, path.concat(key));
+    maybeNull && (maybeNull = nullable);
+    hasNulls || (hasNulls = nullable);
+    return sql`${key}::text, ${valSql}`;
+  });
+  let clause = sql`${baseSql} || jsonb_build_object(${join(patchSqls, ", ")})`;
+  if (hasNulls) {
+    clause = sql`(select jsonb_object_agg(key, value)
+      from jsonb_each(${clause}) where value <> 'null'::jsonb)`;
+  }
+  if (maybeNull) {
+    clause = sql`nullif(${clause}, '{}'::jsonb)`;
+  }
+  return [clause, maybeNull];
 }
 function stripAttributes(object) {
   if (typeof object !== "object" || !object)
@@ -384,6 +413,7 @@ function simplify(node) {
 }
 const opSql = {
   $and: "AND",
+  // Not SQL as these are used as delimiters
   $or: "OR",
   $not: sql`NOT`,
   $eq: sql`=`,
@@ -673,17 +703,17 @@ class Db {
   async query(sql2, tableOptions) {
     var _a, _b;
     log(`Making SQL query: ${sql2.text}`, sql2.values);
-    const cubeOid = parseInt(((_b = (_a = tableOptions == null ? void 0 : tableOptions.schema) == null ? void 0 : _a.typeOids) == null ? void 0 : _b.cube) || "0") || null;
+    const cubeOid = Number.parseInt(((_b = (_a = tableOptions == null ? void 0 : tableOptions.schema) == null ? void 0 : _a.typeOids) == null ? void 0 : _b.cube) || "0") || null;
     try {
       sql2.types = {
         getTypeParser: (oid, format) => {
           if (oid === types.builtins.INT8) {
-            return (value) => parseInt(value, 10);
+            return (value) => Number.parseInt(value, 10);
           }
           if (oid === cubeOid) {
             return (value) => {
               const array = value.slice(1, -1).split(/\)\s*,\s*\(/).map(
-                (corner) => corner.split(",").map((coord) => parseFloat(coord.trim()))
+                (corner) => corner.split(",").map((coord) => Number.parseFloat(coord.trim()))
               );
               return array.length > 1 ? array : array[0];
             };
@@ -717,6 +747,11 @@ class Db {
     }
     return res.rows;
   }
+  /*
+    Adds .schema to tableOptions if it doesn't exist yet.
+    It mutates the argument, to "persist" the results and
+    avoid this query in every operation. 
+  */
   async ensureSchema(tableOptions, typeOids) {
     if (tableOptions.schema)
       return;

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.16.14",
+  "version": "0.16.15-alpha.2",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.16.14",
+    "@graffy/common": "0.16.15-alpha.2",
     "debug": "^4.3.3"
   },
   "peerDependencies": {

package/types/Db.d.ts

@@ -5,6 +5,10 @@ export default class Db {
     readSql(sql: any, tableOptions: any): Promise<any>;
     writeSql(sql: any, tableOptions: any): Promise<any>;
     ensureSchema(tableOptions: any, typeOids: any): Promise<void>;
-    read(rootQuery: any, tableOptions: any): Promise<any>;
+    read(rootQuery: any, tableOptions: any): Promise<{
+        key: Uint8Array;
+        end: Uint8Array;
+        version: number;
+    }[]>;
     write(rootChange: any, tableOptions: any): Promise<any[]>;
 }

package/types/sql/clauses.d.ts

@@ -9,4 +9,4 @@ export function getInsert(rows: any, options: any): {
     updates: Sql;
 };
 export function getUpdates(row: any, options: any): Sql;
-import { Sql } from "sql-template-tag";
+import { Sql } from 'sql-template-tag';