@graffy/pg 0.15.10-alpha.1 → 0.15.10-alpha.2

package/index.cjs

@@ -269,7 +269,7 @@ const getJsonBuildValue = (value) => {
     return value;
   if (typeof value === "string")
     return sql__default["default"]`${value}::text`;
-  return sql__default["default"]`${stripAttributes(value)}::jsonb`;
+  return sql__default["default"]`${JSON.stringify(stripAttributes(value))}::jsonb`;
 };
 const getSelectCols = (table) => {
   return sql__default["default"]`to_jsonb("${sql.raw(table)}")`;
@@ -279,13 +279,13 @@ const getInsert = (row, options) => {
   const vals = [];
   Object.entries(row).filter(([name]) => name !== options.verCol && name[0] !== "$").concat([[options.verCol, nowTimestamp]]).forEach(([col, val]) => {
     cols.push(sql__default["default"]`"${sql.raw(col)}"`);
-    vals.push(val instanceof sql.Sql ? val : stripAttributes(val));
+    vals.push(val instanceof sql.Sql || typeof val !== "object" || !val ? val : sql__default["default"]`${JSON.stringify(stripAttributes(val))}::jsonb`);
   });
   return { cols: sql.join(cols, ", "), vals: sql.join(vals, ", ") };
 };
 const getUpdates = (row, options) => {
   return sql.join(Object.entries(row).filter(([name]) => name !== options.idCol && name[0] !== "$").map(([name, value]) => {
-    return sql__default["default"]`"${sql.raw(name)}" = ${typeof value === "object" && value && !value.$put ? sql__default["default"]`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})` : stripAttributes(value)}`;
+    return sql__default["default"]`"${sql.raw(name)}" = ${value instanceof sql.Sql || typeof value !== "object" || !value ? value : !value.$put ? sql__default["default"]`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})` : sql__default["default"]`${JSON.stringify(stripAttributes(value))}::jsonb`}`;
   }).concat(sql__default["default"]`"${sql.raw(options.verCol)}" = ${nowTimestamp}`), ", ");
 };
 function getJsonUpdate(_a, col, path) {
@@ -304,14 +304,14 @@ function stripAttributes(object) {
   if (typeof object !== "object" || !object)
     return object;
   if (Array.isArray(object)) {
-    return JSON.stringify(object.map((item) => stripAttributes(item)));
+    return object.map((item) => stripAttributes(item));
   }
-  return JSON.stringify(Object.entries(object).reduce((out, [key, val]) => {
+  return Object.entries(object).reduce((out, [key, val]) => {
     if (key === "$put")
       return out;
     out[key] = stripAttributes(val);
     return out;
-  }, {}));
+  }, {});
 }
 const getIdMeta = ({ idCol }) => getJsonBuildObject({
   $key: sql__default["default"]`"${sql.raw(idCol)}"`,

package/index.mjs

@@ -28,7 +28,7 @@ var __objRest = (source, exclude) => {
 };
 import { isEmpty, encodePath, isPlainObject, unwrap, decodeArgs, slice, finalize, isRange, decodeGraph, mergeObject, merge, encodeGraph, wrapObject, remove } from "@graffy/common";
 import { Pool, Client } from "pg";
-import sql, { join, raw, empty, Sql } from "sql-template-tag";
+import sql, { join, raw, Sql, empty } from "sql-template-tag";
 import debug from "debug";
 const valid = {
   $eq: true,
@@ -261,7 +261,7 @@ const getJsonBuildValue = (value) => {
     return value;
   if (typeof value === "string")
     return sql`${value}::text`;
-  return sql`${stripAttributes(value)}::jsonb`;
+  return sql`${JSON.stringify(stripAttributes(value))}::jsonb`;
 };
 const getSelectCols = (table) => {
   return sql`to_jsonb("${raw(table)}")`;
@@ -271,13 +271,13 @@ const getInsert = (row, options) => {
   const vals = [];
   Object.entries(row).filter(([name]) => name !== options.verCol && name[0] !== "$").concat([[options.verCol, nowTimestamp]]).forEach(([col, val]) => {
     cols.push(sql`"${raw(col)}"`);
-    vals.push(val instanceof Sql ? val : stripAttributes(val));
+    vals.push(val instanceof Sql || typeof val !== "object" || !val ? val : sql`${JSON.stringify(stripAttributes(val))}::jsonb`);
   });
   return { cols: join(cols, ", "), vals: join(vals, ", ") };
 };
 const getUpdates = (row, options) => {
   return join(Object.entries(row).filter(([name]) => name !== options.idCol && name[0] !== "$").map(([name, value]) => {
-    return sql`"${raw(name)}" = ${typeof value === "object" && value && !value.$put ? sql`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})` : stripAttributes(value)}`;
+    return sql`"${raw(name)}" = ${value instanceof Sql || typeof value !== "object" || !value ? value : !value.$put ? sql`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})` : sql`${JSON.stringify(stripAttributes(value))}::jsonb`}`;
   }).concat(sql`"${raw(options.verCol)}" = ${nowTimestamp}`), ", ");
 };
 function getJsonUpdate(_a, col, path) {
@@ -296,14 +296,14 @@ function stripAttributes(object) {
   if (typeof object !== "object" || !object)
     return object;
   if (Array.isArray(object)) {
-    return JSON.stringify(object.map((item) => stripAttributes(item)));
+    return object.map((item) => stripAttributes(item));
   }
-  return JSON.stringify(Object.entries(object).reduce((out, [key, val]) => {
+  return Object.entries(object).reduce((out, [key, val]) => {
     if (key === "$put")
       return out;
     out[key] = stripAttributes(val);
     return out;
-  }, {}));
+  }, {});
 }
 const getIdMeta = ({ idCol }) => getJsonBuildObject({
   $key: sql`"${raw(idCol)}"`,

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.10-alpha.1",
+  "version": "0.15.10-alpha.2",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.10-alpha.1",
+    "@graffy/common": "0.15.10-alpha.2",
     "pg": "^8.7.1",
     "debug": "^4.3.2",
     "sql-template-tag": "^4.0.0"