@graffy/pg 0.16.14 → 0.16.15-alpha.1

package/index.cjs

@@ -149,7 +149,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);
@@ -207,21 +207,36 @@ const getUpdates = (row, options) => {
   );
 };
 function getJsonUpdate(object, col, path) {
-  if (!object || typeof object !== "object" || Array.isArray(object) || object.$put) {
-    return getJsonBuildValue(object);
+  if (!object || typeof object !== "object" || Array.isArray(object) || object.$put || object.$val) {
+    let patch2 = stripAttributes(object);
+    if (object == null ? void 0 : object.$val)
+      patch2 = { $val: patch2 };
+    return [sql`${JSON.stringify(patch2)}::jsonb`, patch2 === null];
   }
   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)

package/index.mjs

@@ -147,7 +147,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);
@@ -205,21 +205,36 @@ const getUpdates = (row, options) => {
   );
 };
 function getJsonUpdate(object, col, path) {
-  if (!object || typeof object !== "object" || Array.isArray(object) || object.$put) {
-    return getJsonBuildValue(object);
+  if (!object || typeof object !== "object" || Array.isArray(object) || object.$put || object.$val) {
+    let patch2 = stripAttributes(object);
+    if (object == null ? void 0 : object.$val)
+      patch2 = { $val: patch2 };
+    return [sql`${JSON.stringify(patch2)}::jsonb`, patch2 === null];
   }
   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)

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.1",
   "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.1",
     "debug": "^4.3.3"
   },
   "peerDependencies": {