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

package/Db.d.ts

@@ -1,9 +1,10 @@
 export default class Db {
+    client: any;
     constructor(connection: any);
-    query(sql: any, tableOptions: any): Promise<any>;
+    query(sql: any, tableOptions?: any): Promise<any>;
     readSql(sql: any, tableOptions: any): Promise<any>;
     writeSql(sql: any, tableOptions: any): Promise<any>;
-    ensureSchema(tableOptions: any, typeOids: any): Promise<void>;
+    ensureSchema(tableOptions: any, typeOids?: any): Promise<void>;
     read(rootQuery: any, tableOptions: any): Promise<{
         key: Uint8Array<ArrayBuffer>;
         end: Uint8Array<ArrayBuffer>;

package/filter/getAst.js

@@ -134,7 +134,9 @@ function simplify(node) {
         if (change) {
             node[1] = [
                 ...noneq,
-                ...Object.entries(eqmap).map(([prop, val]) => val.length > 1 ? ['$in', prop, val] : ['$eq', prop, val[0]]),
+                ...Object.entries(eqmap).map(([prop, val]) => val.length > 1
+                    ? ['$in', prop, val]
+                    : ['$eq', prop, val[0]]),
             ];
         }
     }

package/filter/index.d.ts

@@ -1,2 +1 @@
-export { default as filterObject } from './filterObject.js';
 export { default as getFilterSql } from './getSql.js';

package/filter/index.js

@@ -1,2 +1 @@
-export { default as filterObject } from "./filterObject.js";
 export { default as getFilterSql } from "./getSql.js";

package/index.d.ts

@@ -3,6 +3,6 @@
  * @returns {Function}
  */
 export declare const pg: ({ connection, ...rawOptions }: {
-    [x: string]: any;
     connection: any;
+    [key: string]: any;
 }) => (store: any) => void;

package/index.js

@@ -16,19 +16,22 @@ import Db from "./Db.js";
  * @param {string} parentName
  * @returns {TableOpts}
  */
-function getTableOpts(name, { table, idCol, verCol, joins, schema, verDefault } = {}, parentName = null) {
+function getTableOpts(name, { table, idCol, verCol, joins, schema, verDefault, } = {}, parentName = null) {
     const tableName = table || name;
     return {
         table: table || name,
         idCol: idCol || 'id',
         verCol: verCol || 'updatedAt',
-        joins: Object.fromEntries(Object.entries(joins || {}).map(([joinName, { refCol = parentName, ...joinOptions }]) => [
-            joinName,
-            {
-                refCol,
-                ...getTableOpts(joinName, joinOptions, tableName),
-            },
-        ])),
+        joins: Object.fromEntries(Object.entries(joins || {}).map(([joinName, joinVal]) => {
+            const { refCol = parentName, ...joinOptions } = joinVal;
+            return [
+                joinName,
+                {
+                    refCol,
+                    ...getTableOpts(joinName, joinOptions, tableName),
+                },
+            ];
+        })),
         schema,
         verDefault,
     };

package/package.json

@@ -2,18 +2,9 @@
   "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.19.1-alpha.1",
-  "main": "./cjs/index.js",
-  "exports": {
-    ".": {
-      "import": "./index.js",
-      "types": "./index.d.ts"
-    },
-    "./*": {
-      "import": "./*.js",
-      "types": "./*.d.ts"
-    }
-  },
+  "version": "0.19.1-alpha.3",
+  "type": "module",
+  "main": "./index.js",
   "types": "./index.d.ts",
   "repository": {
     "type": "git",
@@ -21,8 +12,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "sql-formatter": "^15.7.2",
-    "@graffy/common": "0.19.1-alpha.1",
+    "sql-formatter": "^15.7.4",
+    "@graffy/common": "0.19.1-alpha.3",
     "sql-template-tag": "^5.2.1",
     "debug": "^4.4.3"
   },

package/sql/clauses.d.ts

@@ -1,7 +1,6 @@
 import { Sql } from 'sql-template-tag';
 export declare const getJsonBuildTrusted: (variadic: any) => Sql;
 export declare const lookup: (prop: any, options: any) => Sql;
-export declare const lookupNumeric: (prop: any) => Sql;
 export declare const getSelectCols: (options: any, projection?: any) => Sql;
 export declare function cubeLiteralSql(value: any): Sql;
 export declare const getInsert: (rows: any, options: any) => {

package/sql/clauses.js

@@ -35,7 +35,7 @@ export const lookup = (prop, options) => {
     }
     throw Error(`pg.cannot_lookup ${prop}`);
 };
-export const lookupNumeric = (prop) => {
+const lookupNumeric = (prop) => {
     const [prefix, ...suffix] = prop.split('.');
     return suffix.length
         ? sql `CASE WHEN "${raw(prefix)}" #> ${suffix} = 'null'::jsonb
@@ -213,7 +213,7 @@ function stripAttributes(object) {
     if (Array.isArray(object)) {
         return object.map((item) => stripAttributes(item));
     }
-    return Object.entries(object).reduce((/** @type {null|Record<string,any>} */ out, [key, val]) => {
+    return Object.entries(object).reduce((out, [key, val]) => {
         if (key === '$put' || val === null)
             return out;
         if (out === null)

package/filter/filterObject.d.ts

@@ -1 +0,0 @@
-export default function filterObject(filter: any, object: any): boolean;

package/filter/filterObject.js

@@ -1,39 +0,0 @@
-import { encodePath, unwrapObject } from '@graffy/common';
-import getAst from "./getAst.js";
-export default function filterObject(filter, object) {
-    function lookup(path) {
-        return unwrapObject(object, encodePath(path));
-    }
-    function checkNode(ast) {
-        switch (ast[0]) {
-            case '$eq':
-                return lookup(ast[1]) === ast[2];
-            case '$ne':
-                return lookup(ast[1]) !== ast[2];
-            case '$lt':
-                return lookup(ast[1]) < ast[2];
-            case '$lte':
-                return lookup(ast[1]) <= ast[2];
-            case '$gt':
-                return lookup(ast[1]) > ast[2];
-            case '$gte':
-                return lookup(ast[1]) >= ast[2];
-            case '$in':
-                return Array.isArray(ast[2]) && ast[2].includes(lookup(ast[1]));
-            case '$nin':
-                return !(Array.isArray(ast[2]) && ast[2].includes(lookup(ast[1])));
-            case '$cts':
-            case '$ctd':
-            case '$ovp':
-            case '$and':
-            case '$or':
-            case '$not':
-            case '$any':
-            case '$all':
-            case '$has':
-                throw Error('pgfilter.unimplemented');
-        }
-    }
-    const rootAst = getAst(filter);
-    return checkNode(rootAst);
-}