@graffy/pg 0.16.3-alpha.1 → 0.16.3-alpha.3

package/index.cjs

@@ -206,24 +206,32 @@ const getJsonBuildValue = (value) => {
     return sql`${value}::text`;
   return sql`${JSON.stringify(stripAttributes(value))}::jsonb`;
 };
-const lookup = (prop) => {
+const lookup = (prop, options) => {
   const [prefix, ...suffix] = prop.split(".");
-  return suffix.length ? sql`"${raw(prefix)}" #> ${suffix}` : sql`"${raw(prefix)}"`;
+  if (!suffix.length)
+    return sql`"${raw(prefix)}"`;
+  const { types: types2 } = options.schema;
+  if (types2[prefix] === "jsonb") {
+    return sql`"${raw(prefix)}" #> ${suffix}`;
+  } else if (types2[prefix] === "cube" && suffix.length === 1) {
+    return sql`"${raw(prefix)}" ~> ${parseInt(suffix[0])}`;
+  } else {
+    throw Error(`pg.cannot_lookup ${prop}`);
+  }
 };
 const lookupNumeric = (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)}"`;
+  return suffix.length ? sql`CASE WHEN "${raw(prefix)}" #> ${suffix} = 'null'::jsonb
+      THEN 0 ELSE ("${raw(prefix)}" #> ${suffix})::numeric END` : sql`"${raw(prefix)}"`;
 };
 const aggSql = {
   $sum: (prop) => sql`sum((${lookupNumeric(prop)})::numeric)`,
-  $card: (prop) => sql`count(distinct(${lookup(prop)}))`,
+  $card: (prop, options) => sql`count(distinct(${lookup(prop, options)}))`,
   $avg: (prop) => sql`avg((${lookupNumeric(prop)})::numeric)`,
   $max: (prop) => sql`max((${lookupNumeric(prop)})::numeric)`,
   $min: (prop) => sql`min((${lookupNumeric(prop)})::numeric)`
 };
-const getSelectCols = (table, projection = null) => {
+const getSelectCols = (options, projection = null) => {
   if (!projection)
     return sql`*`;
   const sqls = [];
@@ -233,7 +241,7 @@ const getSelectCols = (table, projection = null) => {
     } else if (aggSql[key]) {
       const subSqls = [];
       for (const prop in projection[key]) {
-        subSqls.push(sql`${prop}::text, ${aggSql[key](prop)}`);
+        subSqls.push(sql`${prop}::text, ${aggSql[key](prop, options)}`);
       }
       sqls.push(
         sql`jsonb_build_object(${join(subSqls, ", ")}) AS "${raw(key)}"`
@@ -317,14 +325,17 @@ function stripAttributes(object) {
   if (Array.isArray(object)) {
     return object.map((item) => stripAttributes(item));
   }
-  return Object.entries(object).reduce((out, [key, val]) => {
-    if (key === "$put" || val === null)
+  return Object.entries(object).reduce(
+    (out, [key, val]) => {
+      if (key === "$put" || val === null)
+        return out;
+      if (out === null)
+        out = {};
+      out[key] = stripAttributes(val);
       return out;
-    if (out === null)
-      out = {};
-    out[key] = stripAttributes(val);
-    return out;
-  }, null);
+    },
+    null
+  );
 }
 const opSql = {
   $and: "AND",
@@ -431,11 +442,16 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
   if (!common.isEmpty(filter))
     where.push(getSql(filter, options));
   if (!hasRangeArg)
-    return { meta: meta(baseKey), where, limit: 1 };
-  const groupCols = Array.isArray($group) && $group.length && $group.map(lookup);
+    return {
+      meta: meta(baseKey),
+      where,
+      limit: 1,
+      ensureSingleRow: $group === true
+    };
+  const groupCols = Array.isArray($group) && $group.length && $group.map((prop) => lookup(prop, options));
   const group = groupCols ? join(groupCols, ", ") : void 0;
   const orderCols = ($order || [idCol]).map(
-    (orderItem) => orderItem[0] === "!" ? sql`-(${lookup(orderItem.slice(1))})::float8` : lookup(orderItem)
+    (orderItem) => orderItem[0] === "!" ? sql`-(${lookup(orderItem.slice(1), options)})::float8` : lookup(orderItem, options)
   );
   Object.entries({ $after, $before, $since, $until }).forEach(
     ([name, value]) => {
@@ -445,7 +461,7 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
   );
   const order = !$group && join(
     ($order || [idCol]).map(
-      (orderItem) => orderItem[0] === "!" ? sql`${lookup(orderItem.slice(1))} ${$last ? sql`ASC` : sql`DESC`}` : sql`${lookup(orderItem)} ${$last ? sql`DESC` : sql`ASC`}`
+      (orderItem) => orderItem[0] === "!" ? sql`${lookup(orderItem.slice(1), options)} ${$last ? sql`ASC` : sql`DESC`}` : sql`${lookup(orderItem, options)} ${$last ? sql`DESC` : sql`ASC`}`
     ),
     ", "
   );
@@ -458,7 +474,8 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
     where,
     order,
     group,
-    limit: $first || $last
+    limit: $first || $last,
+    ensureSingleRow: true
   };
 }
 function getBoundCond(orderCols, bound, kind) {
@@ -492,12 +509,26 @@ function getBoundCond(orderCols, bound, kind) {
 }
 const MAX_LIMIT = 4096;
 function selectByArgs(args, projection, options) {
-  const { table } = options;
-  const { where, order, group, limit, meta } = getArgSql(args, options);
+  const { table, idCol } = options;
+  const { where, order, group, limit, meta, ensureSingleRow } = getArgSql(
+    args,
+    options
+  );
   const clampedLimit = Math.min(MAX_LIMIT, limit || MAX_LIMIT);
+  if (!ensureSingleRow) {
+    return sql`
+      SELECT
+      ${getSelectCols(options, projection)}, ${meta}
+      FROM "${raw(table)}" WHERE "${raw(idCol)}" = (
+        SELECT "${raw(idCol)}" FROM "${raw(table)}"
+        ${where.length ? sql`WHERE ${join(where, " AND ")}` : empty}
+        LIMIT 2
+      )
+    `;
+  }
   return sql`
     SELECT
-    ${getSelectCols(table, projection)}, ${meta}
+    ${getSelectCols(options, projection)}, ${meta}
     FROM "${raw(table)}"
     ${where.length ? sql`WHERE ${join(where, " AND ")}` : empty}
     ${group ? sql`GROUP BY ${group}` : empty}
@@ -509,7 +540,7 @@ function selectByIds(ids, projection, options) {
   const { table, idCol } = options;
   return sql`
     SELECT
-    ${getSelectCols(table, projection)}, ${getIdMeta(options)}
+    ${getSelectCols(options, projection)}, ${getIdMeta(options)}
     FROM "${raw(table)}"
     WHERE "${raw(idCol)}" IN (${join(ids)})
   `;
@@ -530,7 +561,7 @@ function getSingleSql(arg, options) {
         SELECT "${raw(idCol)}"
         FROM "${raw(table)}"
         WHERE ${join(where, " AND ")}
-        LIMIT 1
+        LIMIT 2
       )`,
     meta
   };
@@ -542,7 +573,7 @@ function patch(object, arg, options) {
   return sql`
     UPDATE "${raw(table)}" SET ${getUpdates(row, options)}
     WHERE ${where}
-    RETURNING ${getSelectCols()}, ${meta}`;
+    RETURNING ${getSelectCols(options)}, ${meta}`;
 }
 function put(object, arg, options) {
   const { idCol, table } = options;
@@ -560,7 +591,7 @@ function put(object, arg, options) {
   return sql`
     INSERT INTO "${raw(table)}" (${cols}) VALUES (${vals})
     ON CONFLICT (${conflictTarget}) DO UPDATE SET (${cols}) = (${vals})
-    RETURNING ${getSelectCols()}, ${meta}`;
+    RETURNING ${getSelectCols(options)}, ${meta}`;
 }
 function del(arg, options) {
   const { table } = options;

package/index.mjs

@@ -204,24 +204,32 @@ const getJsonBuildValue = (value) => {
     return sql`${value}::text`;
   return sql`${JSON.stringify(stripAttributes(value))}::jsonb`;
 };
-const lookup = (prop) => {
+const lookup = (prop, options) => {
   const [prefix, ...suffix] = prop.split(".");
-  return suffix.length ? sql`"${raw(prefix)}" #> ${suffix}` : sql`"${raw(prefix)}"`;
+  if (!suffix.length)
+    return sql`"${raw(prefix)}"`;
+  const { types: types2 } = options.schema;
+  if (types2[prefix] === "jsonb") {
+    return sql`"${raw(prefix)}" #> ${suffix}`;
+  } else if (types2[prefix] === "cube" && suffix.length === 1) {
+    return sql`"${raw(prefix)}" ~> ${parseInt(suffix[0])}`;
+  } else {
+    throw Error(`pg.cannot_lookup ${prop}`);
+  }
 };
 const lookupNumeric = (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)}"`;
+  return suffix.length ? sql`CASE WHEN "${raw(prefix)}" #> ${suffix} = 'null'::jsonb
+      THEN 0 ELSE ("${raw(prefix)}" #> ${suffix})::numeric END` : sql`"${raw(prefix)}"`;
 };
 const aggSql = {
   $sum: (prop) => sql`sum((${lookupNumeric(prop)})::numeric)`,
-  $card: (prop) => sql`count(distinct(${lookup(prop)}))`,
+  $card: (prop, options) => sql`count(distinct(${lookup(prop, options)}))`,
   $avg: (prop) => sql`avg((${lookupNumeric(prop)})::numeric)`,
   $max: (prop) => sql`max((${lookupNumeric(prop)})::numeric)`,
   $min: (prop) => sql`min((${lookupNumeric(prop)})::numeric)`
 };
-const getSelectCols = (table, projection = null) => {
+const getSelectCols = (options, projection = null) => {
   if (!projection)
     return sql`*`;
   const sqls = [];
@@ -231,7 +239,7 @@ const getSelectCols = (table, projection = null) => {
     } else if (aggSql[key]) {
       const subSqls = [];
       for (const prop in projection[key]) {
-        subSqls.push(sql`${prop}::text, ${aggSql[key](prop)}`);
+        subSqls.push(sql`${prop}::text, ${aggSql[key](prop, options)}`);
       }
       sqls.push(
         sql`jsonb_build_object(${join(subSqls, ", ")}) AS "${raw(key)}"`
@@ -315,14 +323,17 @@ function stripAttributes(object) {
   if (Array.isArray(object)) {
     return object.map((item) => stripAttributes(item));
   }
-  return Object.entries(object).reduce((out, [key, val]) => {
-    if (key === "$put" || val === null)
+  return Object.entries(object).reduce(
+    (out, [key, val]) => {
+      if (key === "$put" || val === null)
+        return out;
+      if (out === null)
+        out = {};
+      out[key] = stripAttributes(val);
       return out;
-    if (out === null)
-      out = {};
-    out[key] = stripAttributes(val);
-    return out;
-  }, null);
+    },
+    null
+  );
 }
 const opSql = {
   $and: "AND",
@@ -429,11 +440,16 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
   if (!isEmpty(filter))
     where.push(getSql(filter, options));
   if (!hasRangeArg)
-    return { meta: meta(baseKey), where, limit: 1 };
-  const groupCols = Array.isArray($group) && $group.length && $group.map(lookup);
+    return {
+      meta: meta(baseKey),
+      where,
+      limit: 1,
+      ensureSingleRow: $group === true
+    };
+  const groupCols = Array.isArray($group) && $group.length && $group.map((prop) => lookup(prop, options));
   const group = groupCols ? join(groupCols, ", ") : void 0;
   const orderCols = ($order || [idCol]).map(
-    (orderItem) => orderItem[0] === "!" ? sql`-(${lookup(orderItem.slice(1))})::float8` : lookup(orderItem)
+    (orderItem) => orderItem[0] === "!" ? sql`-(${lookup(orderItem.slice(1), options)})::float8` : lookup(orderItem, options)
   );
   Object.entries({ $after, $before, $since, $until }).forEach(
     ([name, value]) => {
@@ -443,7 +459,7 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
   );
   const order = !$group && join(
     ($order || [idCol]).map(
-      (orderItem) => orderItem[0] === "!" ? sql`${lookup(orderItem.slice(1))} ${$last ? sql`ASC` : sql`DESC`}` : sql`${lookup(orderItem)} ${$last ? sql`DESC` : sql`ASC`}`
+      (orderItem) => orderItem[0] === "!" ? sql`${lookup(orderItem.slice(1), options)} ${$last ? sql`ASC` : sql`DESC`}` : sql`${lookup(orderItem, options)} ${$last ? sql`DESC` : sql`ASC`}`
     ),
     ", "
   );
@@ -456,7 +472,8 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
     where,
     order,
     group,
-    limit: $first || $last
+    limit: $first || $last,
+    ensureSingleRow: true
   };
 }
 function getBoundCond(orderCols, bound, kind) {
@@ -490,12 +507,26 @@ function getBoundCond(orderCols, bound, kind) {
 }
 const MAX_LIMIT = 4096;
 function selectByArgs(args, projection, options) {
-  const { table } = options;
-  const { where, order, group, limit, meta } = getArgSql(args, options);
+  const { table, idCol } = options;
+  const { where, order, group, limit, meta, ensureSingleRow } = getArgSql(
+    args,
+    options
+  );
   const clampedLimit = Math.min(MAX_LIMIT, limit || MAX_LIMIT);
+  if (!ensureSingleRow) {
+    return sql`
+      SELECT
+      ${getSelectCols(options, projection)}, ${meta}
+      FROM "${raw(table)}" WHERE "${raw(idCol)}" = (
+        SELECT "${raw(idCol)}" FROM "${raw(table)}"
+        ${where.length ? sql`WHERE ${join(where, " AND ")}` : empty}
+        LIMIT 2
+      )
+    `;
+  }
   return sql`
     SELECT
-    ${getSelectCols(table, projection)}, ${meta}
+    ${getSelectCols(options, projection)}, ${meta}
     FROM "${raw(table)}"
     ${where.length ? sql`WHERE ${join(where, " AND ")}` : empty}
     ${group ? sql`GROUP BY ${group}` : empty}
@@ -507,7 +538,7 @@ function selectByIds(ids, projection, options) {
   const { table, idCol } = options;
   return sql`
     SELECT
-    ${getSelectCols(table, projection)}, ${getIdMeta(options)}
+    ${getSelectCols(options, projection)}, ${getIdMeta(options)}
     FROM "${raw(table)}"
     WHERE "${raw(idCol)}" IN (${join(ids)})
   `;
@@ -528,7 +559,7 @@ function getSingleSql(arg, options) {
         SELECT "${raw(idCol)}"
         FROM "${raw(table)}"
         WHERE ${join(where, " AND ")}
-        LIMIT 1
+        LIMIT 2
       )`,
     meta
   };
@@ -540,7 +571,7 @@ function patch(object, arg, options) {
   return sql`
     UPDATE "${raw(table)}" SET ${getUpdates(row, options)}
     WHERE ${where}
-    RETURNING ${getSelectCols()}, ${meta}`;
+    RETURNING ${getSelectCols(options)}, ${meta}`;
 }
 function put(object, arg, options) {
   const { idCol, table } = options;
@@ -558,7 +589,7 @@ function put(object, arg, options) {
   return sql`
     INSERT INTO "${raw(table)}" (${cols}) VALUES (${vals})
     ON CONFLICT (${conflictTarget}) DO UPDATE SET (${cols}) = (${vals})
-    RETURNING ${getSelectCols()}, ${meta}`;
+    RETURNING ${getSelectCols(options)}, ${meta}`;
 }
 function del(arg, options) {
   const { table } = options;

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

package/types/sql/clauses.d.ts

@@ -1,8 +1,8 @@
 export function cubeLiteralSql(value: any): Sql;
 export function getJsonBuildTrusted(variadic: any): Sql;
-export function lookup(prop: any): Sql;
+export function lookup(prop: any, options: any): Sql;
 export function lookupNumeric(prop: any): Sql;
-export function getSelectCols(table: any, projection?: any): Sql;
+export function getSelectCols(options: any, projection?: any): Sql;
 export function getInsert(row: any, options: any): {
     cols: Sql;
     vals: Sql;

package/types/sql/getArgSql.d.ts

@@ -5,7 +5,7 @@
   @param {{prefix: string, idCol: string, verDefault: string}} options
 
   @typedef { import('sql-template-tag').Sql } Sql
-  @return {{ meta: Sql, where: Sql[], order?: Sql, group?: Sql, limit: number }}
+  @return {{ meta: Sql, where: Sql[], order?: Sql, group?: Sql, limit: number, ensureSingleRow: boolean }}
 */
 export default function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $cursor: _, ...rest }: object, options: {
     prefix: string;
@@ -17,6 +17,7 @@ export default function getArgSql({ $first, $last, $after, $before, $since, $unt
     order?: Sql;
     group?: Sql;
     limit: number;
+    ensureSingleRow: boolean;
 };
 /**
  * Uses the args object (typically passed in the $key attribute)