@graffy/pg 0.15.7 → 0.15.8-alpha.4

package/index.cjs

@@ -0,0 +1,20 @@
+"use strict";var e=Object.defineProperty,t=Object.defineProperties,r=Object.getOwnPropertyDescriptors,n=Object.getOwnPropertySymbols,a=Object.prototype.hasOwnProperty,o=Object.prototype.propertyIsEnumerable,i=(t,r,n)=>r in t?e(t,r,{enumerable:!0,configurable:!0,writable:!0,value:n}):t[r]=n,$=(e,t)=>{for(var r in t||(t={}))a.call(t,r)&&i(e,r,t[r]);if(n)for(var r of n(t))o.call(t,r)&&i(e,r,t[r]);return e},s=(e,n)=>t(e,r(n)),l=(e,t)=>{var r={};for(var i in e)a.call(e,i)&&t.indexOf(i)<0&&(r[i]=e[i]);if(null!=e&&n)for(var i of n(e))t.indexOf(i)<0&&o.call(e,i)&&(r[i]=e[i]);return r};Object.defineProperty(exports,"__esModule",{value:!0}),exports[Symbol.toStringTag]="Module";var u=require("pg"),c=require("@graffy/common"),f=require("@graffy/testing"),d=require("debug"),p=require("sql-template-tag");function w(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var h=w(d),g=w(p);const b=h.default("graffy:pg:link");function y(e,t){return e.map((function e(r){if("string"==typeof r&&"$"===r[0]&&"$"===r[1])return c.unwrapObject(t,c.encodePath(r.slice(2)));if(Array.isArray(r))return r.map(e);if("object"==typeof r&&r){const t={};for(const n in r)t[n]=e(r[n]);return t}return r}))}function j(e,t,{links:r}){const n=[];for(let a in r){const o=c.encodePath(a),i=c.unwrap(t,o);if(i)for(const t of e){const e=y(r[a],t),[l,u]=c.splitRef(e);if(l){const r=[];c.mergeObject(t,c.wrapObject(r,o));const a=i.map((t=>{const[n,a]=c.splitArgs(c.decodeArgs(t)),o=$($({},u),a);return r.push({$key:c.isEmpty(a)?"":s($({},a),{$all:!0}),$ref:e.slice(0,-1).concat([s($({},o),{$all:!0})])}),n?s($({},c.encodeArgs(o)),{children:[t],version:t.version,prefix:!0}):$($({},t),c.encodeArgs(o))}));c.add(n,c.wrap(a,c.encodePath(e.slice(0,-1))))}else c.mergeObject(t,c.wrapObject({$ref:e},o)),c.add(n,c.wrap(i,c.encodePath(e)))}}return b("Linked Result",JSON.stringify(e,null,2),f.format(n)),n}const m={$eq:!0,$lt:!0,$gt:!0,$lte:!0,$gte:!0,$re:!0,$ire:!0,$text:!0,$and:!0,$or:!0,$any:!0,$all:!0,$has:!0},O={$eq:"$neq",$neq:"$eq",$in:"$nin",$nin:"$in",$lt:"$gte",$gte:"$lt",$gt:"$lte",$lte:"$gt"};function E(e){return q=0,N(_(e))}let q;function _(e,t,r){if(!e||"object"!=typeof e){if(r&&t)return[r,t,e];if(t)return["$eq",t,e];throw Error("pgast.expected_prop_before:"+JSON.stringify(e))}return Array.isArray(e)?["$or",e.map((e=>_(e,t,r)))]:["$and",Object.entries(e).map((([e,n])=>{if("$or"===e||"$and"===e)return[e,_(n,t,r)[1]];if("$not"===e)return[e,_(n,t,r)];if("$any"===e||"$all"===e){const r="el$"+q++;return[e,t,r,_(n,r)]}if("$has"===e){const r="el$"+q++;return[e,t,r,_(n,r)[1]]}if("$"===e[0]){if(!m[e])throw Error("pgast.invalid_op:"+e);if(r)throw Error("pgast.unexpected_op:"+r+" before:"+e);if(!t)throw Error("pgast.expected_prop_before:"+e);return _(n,t,e)}if(t){if("."===e[0])return _(n,t+e);throw Error("pgast.unexpected_prop",e)}return _(n,e)}))]}function N(e){const t=e[0];if("$and"===t||"$or"===t?e[1]=e[1].map((e=>N(e))):"$not"===t?e[1]=N(e[1]):"$all"===t||"$any"===t?e[3]=N(e[3]):"$has"===t&&(e[3]=e[3].map((e=>N(e)))),"$or"===t){const{eqmap:t,noneq:r,change:n}=e[1].reduce(((e,t)=>{if("$eq"!==t[0])e.noneq.push(t);else{if(e.eqmap[t[1]])return e.change=!0,e.eqmap[t[1]].push(t[2]),e;e.eqmap[t[1]]=[t[2]]}return e}),{eqmap:{},noneq:[],change:!1});n&&(e[1]=[...r,...Object.entries(t).map((([e,t])=>t.length>1?["$in",e,t]:["$eq",e,t[0]]))])}if("$and"===t||"$or"===t){if(!e[1].length)throw Error("pgast.expected_children:"+t);return 1===e[1].length?e[1][0]:e}if("$not"===t){const[t,...r]=e[1],n=O[t];return n?[n,...r]:e}if("$any"===t||"$all"===t){const[r,n,a,o]=e,[i,$,s]=o;return"$eq"!==i&&"$in"!==i||a!==$?e:["$any"===t?"$ovl":"$ctd",n,"$eq"===i?[s]:s]}if("$has"===t){const[t,r,n,a]=e;return a.every((([e,t])=>"$eq"===e&&t===n))?["$cts",r,a.map((([e,t,r])=>r))]:e}return e}const S=g.default`cast(extract(epoch from now()) as integer)`,v=e=>{const t=p.join(Object.entries(e).map((([e,t])=>g.default`'${p.raw(e)}', ${t}`)));return g.default`jsonb_build_object(${t})`},C=e=>g.default`to_jsonb("${p.raw(e)}")`,A=({idCol:e})=>v({$key:g.default`"${p.raw(e)}"`,$ver:S});function R(e,t){var r=e,{$first:n,$last:a,$after:o,$before:i,$since:$,$until:s,$all:u,$cursor:f}=r,d=l(r,["$first","$last","$after","$before","$since","$until","$all","$cursor"]);const w=d,{$order:h}=w,b=l(w,["$order"]),{prefix:y,idCol:j}=t,m=e=>{const[t,...r]=c.encodePath(e);return r.length?g.default`"${p.raw(t)}" #>> '{"${r.join('","')}"}'`:g.default`"${p.raw(t)}"`},O=e=>((e,t,r)=>v({$key:e,$ref:g.default`jsonb_build_array(${p.join(t.map((e=>g.default`${e}::text`)))}, "${p.raw(r)}")`,$ver:S}))(e,y,j),q=i||o||$||s||n||a||u||h;let _;const N=[];if(c.isEmpty(b)||(N.push(function(e,t){function r(e){return"el$"===e.substr(0,3)?g.default`"${p.raw(e)}"`:t(e)}return function e(t){switch(t[0]){case"$eq":return null===t[2]?g.default`${r(t[1])} IS NULL`:g.default`${r(t[1])} = ${t[2]}`;case"$neq":return null===t[2]?g.default`${r(t[1])} IS NOT NULL`:g.default`${r(t[1])} <> ${t[2]}`;case"$lt":return g.default`${r(t[1])} < ${t[2]}`;case"$lte":return g.default`${r(t[1])} <= ${t[2]}`;case"$gt":return g.default`${r(t[1])} > ${t[2]}`;case"$gte":return g.default`${r(t[1])} >= ${t[2]}`;case"$re":return g.default`${r(t[1])} ~ ${t[2]}`;case"$ire":return g.default`${r(t[1])} ~* ${t[2]}`;case"$in":return g.default`${r(t[1])} IN (${p.join(t[2])})`;case"$nin":return g.default`${r(t[1])} NOT IN (${p.join(t[2])})`;case"$cts":return g.default`${r(t[1])} @> ${t[2]}`;case"$ctd":return g.default`${r(t[1])} <@ ${t[2]}`;case"$ovp":return g.default`${r(t[1])} && ${t[2]}`;case"$and":return g.default`(${p.join(t[1].map((t=>e(t))),") AND (")})`;case"$or":return g.default`(${p.join(t[1].map((t=>e(t))),") OR (")})`;case"$not":return g.default`NOT (${e(t[1])})`;case"$any":return g.default`(SELECT bool_or(${e(t[3])}) FROM UNNEST(${r(t[1])}) ${r(t[2])})`;case"$all":return g.default`(SELECT bool_and(${e(t[3])}) FROM UNNEST(${r(t[1])}) ${r(t[2])})`;case"$has":return g.default`(SELECT bool_or(${p.join(t[3].map((t=>e(t))),") AND bool_or(")}) FROM UNNEST(${r(t[1])}) ${r(t[2])})`;default:throw Error("pg.getSql_unknown_operator: "+t[0])}}(E(e))}(b,m)),_=g.default`${JSON.stringify(b)}::jsonb`),!q)return{meta:O(_),where:N,limit:1};if(c.isEmpty(d))throw Error("pg_arg.pagination_only_unsupported in "+y);const C=(h||[j]).map(m);Object.entries({$after:o,$before:i,$since:$,$until:s}).forEach((([e,t])=>{t&&N.push(T(C,t,e))}));const A=h&&v({$order:g.default`${JSON.stringify(h)}::jsonb`}),R=v({$cursor:g.default`jsonb_build_array(${p.join(C)})`});return _=g.default`(${p.join([_,A,R].filter(Boolean)," || ")})`,{meta:O(_),where:N,order:p.join(C.map((e=>g.default`${e} ${a?g.default`DESC`:g.default`ASC`}`)),", "),limit:n||a}}function T(e,t,r){if(!Array.isArray(t))throw Error("pg_arg.bad_query bound : "+JSON.stringify(t));const n=e[0],a=t[0];if(e.length>1&&t.length>1){const o=T(e.slice(1),t.slice(1),r);switch(r){case"$after":case"$since":return g.default`${n} > ${a} OR ${n} = ${a} AND (${o})`;case"$before":case"$until":return g.default`${n} < ${a} OR ${n} = ${a} AND (${o})`}}else switch(r){case"$after":return g.default`${n} > ${a}`;case"$since":return g.default`${n} >= ${a}`;case"$before":return g.default`${n} < ${a}`;case"$until":return g.default`${n} <= ${a}`}}function x(e,t,r){const{table:n,idCol:a}=r,{where:o,meta:i}=c.isPlainObject(t)?R(t,r):{where:[g.default`"${p.raw(a)}" = ${t}`],meta:A(r)};if(!o||!o.length)throw Error("pg_write.no_condition");const $=e;return g.default`
+    UPDATE "${p.raw(n)}" SET ${((e,t)=>p.join(Object.entries(e).filter((([e])=>e!==t.idCol&&"$"!==e[0])).map((([e,t])=>g.default`"${p.raw(e)}" = ${"object"==typeof t&&t?g.default`"${p.raw(e)}" || ${t}`:t}`)).concat(g.default`"${p.raw(t.verCol)}" = ${S}`),", "))($,r)}
+    WHERE ${p.join(o," AND ")}
+    LIMIT 1
+    RETURNING (${C(n)} || ${i})`}function P(e,t,r){const{idCol:n,table:a}=r,o=e;let i,$;c.isPlainObject(t)?(({meta:i}=R(t,r)),$=p.join(Object.keys(t).map((e=>g.default`"${p.raw(e)}"`)))):(i=A(r),$=g.default`"${p.raw(n)}"`);const{cols:s,vals:l}=((e,t)=>{const r=[],n=[];return Object.entries(e).filter((([e])=>e!==t.verCol&&"$"!==e[0])).concat([[t.verCol,S]]).forEach((([e,t])=>{r.push(g.default`"${p.raw(e)}"`),n.push(t)})),{cols:p.join(r,", "),vals:p.join(n,", ")}})(o,r);return g.default`
+    INSERT INTO "${p.raw(a)}" (${s}) VALUES (${l})
+    ON CONFLICT (${$}) DO UPDATE SET (${s}) = (${l})
+    RETURNING (${C(a)} || ${i})`}const D=h.default("graffy:pg:db");class I{constructor(e){"object"==typeof e&&e&&(e instanceof u.Pool||e instanceof u.Client)?this.client=e:this.client=new u.Pool(e)}async query(e){e.rowMode="array",D("Making SQL query: "+e.text,e.values);try{return await this.client.query(e)}catch(t){throw Error("pg.sql_error "+t.message+" in "+e.text+" with "+e.values)}}async readSql(e){let t=await this.query(e);return t=t.rows.flat(),D("Read result",t),t}async writeSql(e){let t=await this.query(e);if(D("Rows written",t.rowCount),!t.rowCount)throw Error("pg.nothing_written "+e.text+" with "+e.values);return t.rows[0][0]}async read(e,t){const r={},n=[],a=[],o=[],{idCol:i,prefix:s}=t,l=async(e,r)=>{const n=await this.readSql(function(e,t){const{table:r}=t,{where:n,order:a,limit:o,meta:i}=R(e,t),$=Math.min(4096,o||4096);return g.default`
+    SELECT
+    ${C(r)} || ${i}
+    FROM "${p.raw(r)}"
+    ${n.length?g.default`WHERE ${p.join(n," AND ")}`:p.empty}
+    ${a?g.default`ORDER BY ${a}`:p.empty}
+    LIMIT ${$}
+  `}(e,t));c.add(o,j(n,r,t));const i=c.encodeGraph(c.wrapObject(n,s));D("getByArgs",i),c.merge(a,i)},u=c.unwrap(e,s);for(const f of u){const e=c.decodeArgs(f);if(c.isPlainObject(e))if(f.prefix)for(const t of f.children){const r=c.decodeArgs(t);n.push(l($($({},e),r),t.children))}else n.push(l(e,f.children));else r[f.key]=f.children}return c.isEmpty(r)||n.push((async()=>{(await this.readSql(function(e,t){const{table:r,idCol:n}=t;return g.default`
+    SELECT
+    ${C(r)} || ${A(t)}
+    FROM "${p.raw(r)}"
+    WHERE "${p.raw(n)}" IN (${p.join(e)})
+  `}(Object.keys(r),t))).forEach((e=>{const n=e[i],$=r[n];c.add(o,j([e],$,t));const l=c.encodeGraph(c.wrapObject(e,s));D("getByIds",l),c.merge(a,l)}))})()),await Promise.all(n),D("dbRead",e,a),c.slice(c.finalize(a,e),e).known||[]}async write(e,t){const r=[],n=e=>r.push(e),{prefix:a}=t,o=c.unwrap(e,a);for(const $ of o){if(c.isRange($))throw Error($.key===$.end?"pg_write.delete_unsupported":"pg_write.write_range_unsupported");const e=c.decodeArgs($),r=c.decodeGraph($.children);if(c.isPlainObject(e)?c.mergeObject(r,e):r.id=e,r.$put&&!0!==r.$put)throw Error("pg_write.partial_put_unsupported");r.$put?n(P(r,e,t)):n(x(r,e,t))}const i=[];return await Promise.all(r.map((e=>this.writeSql(e).then((e=>{c.merge(i,c.encodeGraph(c.wrapObject(e,a)))}))))),D("dbWrite",e,i),i}}exports.pg=({table:e,idCol:t,verCol:r,links:n,connection:a})=>o=>{o.on("read",(function(e,t){const r=t,{transactionDb:n=s}=r,a=l(r,["transactionDb"]);return n.read(e,$,a)})),o.on("write",(function(e,t){const r=t,{transactionDb:n=s}=r,a=l(r,["transactionDb"]);return n.write(e,$,a)}));const i=o.path,$={prefix:i,table:e||i[i.length-1]||"default",idCol:t||"id",verCol:r||"updatedAt",links:n||{}},s=new I(a)};

package/index.mjs

@@ -0,0 +1,20 @@
+var r=Object.defineProperty,e=Object.defineProperties,t=Object.getOwnPropertyDescriptors,n=Object.getOwnPropertySymbols,o=Object.prototype.hasOwnProperty,$=Object.prototype.propertyIsEnumerable,i=(e,t,n)=>t in e?r(e,t,{enumerable:!0,configurable:!0,writable:!0,value:n}):e[t]=n,a=(r,e)=>{for(var t in e||(e={}))o.call(e,t)&&i(r,t,e[t]);if(n)for(var t of n(e))$.call(e,t)&&i(r,t,e[t]);return r},s=(r,n)=>e(r,t(n)),c=(r,e)=>{var t={};for(var i in r)o.call(r,i)&&e.indexOf(i)<0&&(t[i]=r[i]);if(null!=r&&n)for(var i of n(r))e.indexOf(i)<0&&$.call(r,i)&&(t[i]=r[i]);return t};import{Pool as l,Client as u}from"pg";import{encodePath as f,unwrap as p,splitRef as h,mergeObject as d,wrapObject as g,splitArgs as b,decodeArgs as y,isEmpty as w,encodeArgs as m,add as E,wrap as O,unwrapObject as _,isPlainObject as q,slice as N,finalize as S,isRange as j,decodeGraph as v,merge as C,encodeGraph as R}from"@graffy/common";import{format as T}from"@graffy/testing";import x from"debug";import A,{join as D,raw as I,empty as k}from"sql-template-tag";const L=x("graffy:pg:link");function M(r,e){return r.map((function r(t){if("string"==typeof t&&"$"===t[0]&&"$"===t[1])return _(e,f(t.slice(2)));if(Array.isArray(t))return t.map(r);if("object"==typeof t&&t){const e={};for(const n in t)e[n]=r(t[n]);return e}return t}))}function U(r,e,{links:t}){const n=[];for(let o in t){const $=f(o),i=p(e,$);if(i)for(const e of r){const r=M(t[o],e),[c,l]=h(r);if(c){const t=[];d(e,g(t,$));const o=i.map((e=>{const[n,o]=b(y(e)),$=a(a({},l),o);return t.push({$key:w(o)?"":s(a({},o),{$all:!0}),$ref:r.slice(0,-1).concat([s(a({},$),{$all:!0})])}),n?s(a({},m($)),{children:[e],version:e.version,prefix:!0}):a(a({},e),m($))}));E(n,O(o,f(r.slice(0,-1))))}else d(e,g({$ref:r},$)),E(n,O(i,f(r)))}}return L("Linked Result",JSON.stringify(r,null,2),T(n)),n}const P={$eq:!0,$lt:!0,$gt:!0,$lte:!0,$gte:!0,$re:!0,$ire:!0,$text:!0,$and:!0,$or:!0,$any:!0,$all:!0,$has:!0},F={$eq:"$neq",$neq:"$eq",$in:"$nin",$nin:"$in",$lt:"$gte",$gte:"$lt",$gt:"$lte",$lte:"$gt"};function J(r){return B=0,H(W(r))}let B;function W(r,e,t){if(!r||"object"!=typeof r){if(t&&e)return[t,e,r];if(e)return["$eq",e,r];throw Error("pgast.expected_prop_before:"+JSON.stringify(r))}return Array.isArray(r)?["$or",r.map((r=>W(r,e,t)))]:["$and",Object.entries(r).map((([r,n])=>{if("$or"===r||"$and"===r)return[r,W(n,e,t)[1]];if("$not"===r)return[r,W(n,e,t)];if("$any"===r||"$all"===r){const t="el$"+B++;return[r,e,t,W(n,t)]}if("$has"===r){const t="el$"+B++;return[r,e,t,W(n,t)[1]]}if("$"===r[0]){if(!P[r])throw Error("pgast.invalid_op:"+r);if(t)throw Error("pgast.unexpected_op:"+t+" before:"+r);if(!e)throw Error("pgast.expected_prop_before:"+r);return W(n,e,r)}if(e){if("."===r[0])return W(n,e+r);throw Error("pgast.unexpected_prop",r)}return W(n,r)}))]}function H(r){const e=r[0];if("$and"===e||"$or"===e?r[1]=r[1].map((r=>H(r))):"$not"===e?r[1]=H(r[1]):"$all"===e||"$any"===e?r[3]=H(r[3]):"$has"===e&&(r[3]=r[3].map((r=>H(r)))),"$or"===e){const{eqmap:e,noneq:t,change:n}=r[1].reduce(((r,e)=>{if("$eq"!==e[0])r.noneq.push(e);else{if(r.eqmap[e[1]])return r.change=!0,r.eqmap[e[1]].push(e[2]),r;r.eqmap[e[1]]=[e[2]]}return r}),{eqmap:{},noneq:[],change:!1});n&&(r[1]=[...t,...Object.entries(e).map((([r,e])=>e.length>1?["$in",r,e]:["$eq",r,e[0]]))])}if("$and"===e||"$or"===e){if(!r[1].length)throw Error("pgast.expected_children:"+e);return 1===r[1].length?r[1][0]:r}if("$not"===e){const[e,...t]=r[1],n=F[e];return n?[n,...t]:r}if("$any"===e||"$all"===e){const[t,n,o,$]=r,[i,a,s]=$;return"$eq"!==i&&"$in"!==i||o!==a?r:["$any"===e?"$ovl":"$ctd",n,"$eq"===i?[s]:s]}if("$has"===e){const[e,t,n,o]=r;return o.every((([r,e])=>"$eq"===r&&e===n))?["$cts",t,o.map((([r,e,t])=>t))]:r}return r}const G=A`cast(extract(epoch from now()) as integer)`,Q=r=>{const e=D(Object.entries(r).map((([r,e])=>A`'${I(r)}', ${e}`)));return A`jsonb_build_object(${e})`},V=r=>A`to_jsonb("${I(r)}")`,Y=({idCol:r})=>Q({$key:A`"${I(r)}"`,$ver:G});function z(r,e){var t=r,{$first:n,$last:o,$after:$,$before:i,$since:a,$until:s,$all:l,$cursor:u}=t,p=c(t,["$first","$last","$after","$before","$since","$until","$all","$cursor"]);const h=p,{$order:d}=h,g=c(h,["$order"]),{prefix:b,idCol:y}=e,m=r=>{const[e,...t]=f(r);return t.length?A`"${I(e)}" #>> '{"${t.join('","')}"}'`:A`"${I(e)}"`},E=r=>((r,e,t)=>Q({$key:r,$ref:A`jsonb_build_array(${D(e.map((r=>A`${r}::text`)))}, "${I(t)}")`,$ver:G}))(r,b,y),O=i||$||a||s||n||o||l||d;let _;const q=[];if(w(g)||(q.push(function(r,e){function t(r){return"el$"===r.substr(0,3)?A`"${I(r)}"`:e(r)}return function r(e){switch(e[0]){case"$eq":return null===e[2]?A`${t(e[1])} IS NULL`:A`${t(e[1])} = ${e[2]}`;case"$neq":return null===e[2]?A`${t(e[1])} IS NOT NULL`:A`${t(e[1])} <> ${e[2]}`;case"$lt":return A`${t(e[1])} < ${e[2]}`;case"$lte":return A`${t(e[1])} <= ${e[2]}`;case"$gt":return A`${t(e[1])} > ${e[2]}`;case"$gte":return A`${t(e[1])} >= ${e[2]}`;case"$re":return A`${t(e[1])} ~ ${e[2]}`;case"$ire":return A`${t(e[1])} ~* ${e[2]}`;case"$in":return A`${t(e[1])} IN (${D(e[2])})`;case"$nin":return A`${t(e[1])} NOT IN (${D(e[2])})`;case"$cts":return A`${t(e[1])} @> ${e[2]}`;case"$ctd":return A`${t(e[1])} <@ ${e[2]}`;case"$ovp":return A`${t(e[1])} && ${e[2]}`;case"$and":return A`(${D(e[1].map((e=>r(e))),") AND (")})`;case"$or":return A`(${D(e[1].map((e=>r(e))),") OR (")})`;case"$not":return A`NOT (${r(e[1])})`;case"$any":return A`(SELECT bool_or(${r(e[3])}) FROM UNNEST(${t(e[1])}) ${t(e[2])})`;case"$all":return A`(SELECT bool_and(${r(e[3])}) FROM UNNEST(${t(e[1])}) ${t(e[2])})`;case"$has":return A`(SELECT bool_or(${D(e[3].map((e=>r(e))),") AND bool_or(")}) FROM UNNEST(${t(e[1])}) ${t(e[2])})`;default:throw Error("pg.getSql_unknown_operator: "+e[0])}}(J(r))}(g,m)),_=A`${JSON.stringify(g)}::jsonb`),!O)return{meta:E(_),where:q,limit:1};if(w(p))throw Error("pg_arg.pagination_only_unsupported in "+b);const N=(d||[y]).map(m);Object.entries({$after:$,$before:i,$since:a,$until:s}).forEach((([r,e])=>{e&&q.push(K(N,e,r))}));const S=d&&Q({$order:A`${JSON.stringify(d)}::jsonb`}),j=Q({$cursor:A`jsonb_build_array(${D(N)})`});return _=A`(${D([_,S,j].filter(Boolean)," || ")})`,{meta:E(_),where:q,order:D(N.map((r=>A`${r} ${o?A`DESC`:A`ASC`}`)),", "),limit:n||o}}function K(r,e,t){if(!Array.isArray(e))throw Error("pg_arg.bad_query bound : "+JSON.stringify(e));const n=r[0],o=e[0];if(r.length>1&&e.length>1){const $=K(r.slice(1),e.slice(1),t);switch(t){case"$after":case"$since":return A`${n} > ${o} OR ${n} = ${o} AND (${$})`;case"$before":case"$until":return A`${n} < ${o} OR ${n} = ${o} AND (${$})`}}else switch(t){case"$after":return A`${n} > ${o}`;case"$since":return A`${n} >= ${o}`;case"$before":return A`${n} < ${o}`;case"$until":return A`${n} <= ${o}`}}function X(r,e,t){const{table:n,idCol:o}=t,{where:$,meta:i}=q(e)?z(e,t):{where:[A`"${I(o)}" = ${e}`],meta:Y(t)};if(!$||!$.length)throw Error("pg_write.no_condition");const a=r;return A`
+    UPDATE "${I(n)}" SET ${((r,e)=>D(Object.entries(r).filter((([r])=>r!==e.idCol&&"$"!==r[0])).map((([r,e])=>A`"${I(r)}" = ${"object"==typeof e&&e?A`"${I(r)}" || ${e}`:e}`)).concat(A`"${I(e.verCol)}" = ${G}`),", "))(a,t)}
+    WHERE ${D($," AND ")}
+    LIMIT 1
+    RETURNING (${V(n)} || ${i})`}function Z(r,e,t){const{idCol:n,table:o}=t,$=r;let i,a;q(e)?(({meta:i}=z(e,t)),a=D(Object.keys(e).map((r=>A`"${I(r)}"`)))):(i=Y(t),a=A`"${I(n)}"`);const{cols:s,vals:c}=((r,e)=>{const t=[],n=[];return Object.entries(r).filter((([r])=>r!==e.verCol&&"$"!==r[0])).concat([[e.verCol,G]]).forEach((([r,e])=>{t.push(A`"${I(r)}"`),n.push(e)})),{cols:D(t,", "),vals:D(n,", ")}})($,t);return A`
+    INSERT INTO "${I(o)}" (${s}) VALUES (${c})
+    ON CONFLICT (${a}) DO UPDATE SET (${s}) = (${c})
+    RETURNING (${V(o)} || ${i})`}const rr=x("graffy:pg:db");class er{constructor(r){this.client="object"==typeof r&&r&&(r instanceof l||r instanceof u)?r:new l(r)}async query(r){r.rowMode="array",rr("Making SQL query: "+r.text,r.values);try{return await this.client.query(r)}catch(e){throw Error("pg.sql_error "+e.message+" in "+r.text+" with "+r.values)}}async readSql(r){let e=await this.query(r);return e=e.rows.flat(),rr("Read result",e),e}async writeSql(r){let e=await this.query(r);if(rr("Rows written",e.rowCount),!e.rowCount)throw Error("pg.nothing_written "+r.text+" with "+r.values);return e.rows[0][0]}async read(r,e){const t={},n=[],o=[],$=[],{idCol:i,prefix:s}=e,c=async(r,t)=>{const n=await this.readSql(function(r,e){const{table:t}=e,{where:n,order:o,limit:$,meta:i}=z(r,e),a=Math.min(4096,$||4096);return A`
+    SELECT
+    ${V(t)} || ${i}
+    FROM "${I(t)}"
+    ${n.length?A`WHERE ${D(n," AND ")}`:k}
+    ${o?A`ORDER BY ${o}`:k}
+    LIMIT ${a}
+  `}(r,e));E($,U(n,t,e));const i=R(g(n,s));rr("getByArgs",i),C(o,i)},l=p(r,s);for(const u of l){const r=y(u);if(q(r))if(u.prefix)for(const e of u.children){const t=y(e);n.push(c(a(a({},r),t),e.children))}else n.push(c(r,u.children));else t[u.key]=u.children}return w(t)||n.push((async()=>{(await this.readSql(function(r,e){const{table:t,idCol:n}=e;return A`
+    SELECT
+    ${V(t)} || ${Y(e)}
+    FROM "${I(t)}"
+    WHERE "${I(n)}" IN (${D(r)})
+  `}(Object.keys(t),e))).forEach((r=>{const n=r[i],a=t[n];E($,U([r],a,e));const c=R(g(r,s));rr("getByIds",c),C(o,c)}))})()),await Promise.all(n),rr("dbRead",r,o),N(S(o,r),r).known||[]}async write(r,e){const t=[],n=r=>t.push(r),{prefix:o}=e,$=p(r,o);for(const a of $){if(j(a))throw Error(a.key===a.end?"pg_write.delete_unsupported":"pg_write.write_range_unsupported");const r=y(a),t=v(a.children);if(q(r)?d(t,r):t.id=r,t.$put&&!0!==t.$put)throw Error("pg_write.partial_put_unsupported");t.$put?n(Z(t,r,e)):n(X(t,r,e))}const i=[];return await Promise.all(t.map((r=>this.writeSql(r).then((r=>{C(i,R(g(r,o)))}))))),rr("dbWrite",r,i),i}}const tr=({table:r,idCol:e,verCol:t,links:n,connection:o})=>$=>{$.on("read",(function(r,e){const t=e,{transactionDb:n=s}=t,o=c(t,["transactionDb"]);return n.read(r,a,o)})),$.on("write",(function(r,e){const t=e,{transactionDb:n=s}=t,o=c(t,["transactionDb"]);return n.write(r,a,o)}));const i=$.path,a={prefix:i,table:r||i[i.length-1]||"default",idCol:e||"id",verCol:t||"updatedAt",links:n||{}},s=new er(o)};export{tr as pg};

package/package.json

@@ -2,8 +2,13 @@
   "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.7",
-  "main": "./cjs/index.js",
+  "version": "0.15.8-alpha.4",
+  "main": "./index.cjs",
+  "exports": {
+    "import": "./index.mjs",
+    "require": "./index.cjs"
+  },
+  "module": "./index.mjs",
   "types": "./types/index.d.ts",
   "repository": {
     "type": "git",
@@ -11,11 +16,10 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.15.3",
     "pg": "^8.7.1",
-    "@graffy/common": "0.15.7",
+    "@graffy/common": "0.15.8-alpha.4",
+    "@graffy/testing": "0.15.8-alpha.4",
     "debug": "^4.3.2",
-    "sql-template-tag": "^4.0.0",
-    "@graffy/testing": "0.15.7"
+    "sql-template-tag": "^4.0.0"
   }
 }

package/types/Db.d.ts

@@ -1,9 +1,9 @@
 export default class Db {
     constructor(connection: any);
     client: any;
-    query(sqlQuery: any): Promise<any>;
+    query(sql: any): Promise<any>;
     readSql(sql: any): Promise<any>;
     writeSql(sql: any): Promise<any>;
     read(rootQuery: any, tableOptions: any): Promise<any>;
-    write(rootChange: any, tableOptions: any): Promise<any>;
+    write(rootChange: any, tableOptions: any): Promise<any[]>;
 }

package/types/sql/getArgSql.d.ts

@@ -7,7 +7,7 @@
   @typedef { import('sql-template-tag').Sql } Sql
   @return {{ meta: Sql, where: Sql[], order?: Sql, limit: number }}
 */
-export default function getArgSql({ $first, $last, $after, $before, $since, $until, $cursor: _, ...rest }: object, options: object): {
+export default function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $cursor: _, ...rest }: object, options: object): {
     meta: Sql;
     where: Sql[];
     order?: Sql;

package/cjs/Db.js

@@ -1,373 +0,0 @@
-"use strict";
-
-var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
-
-var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
-
-var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
-
-var _getIteratorMethod = require("@babel/runtime-corejs3/core-js/get-iterator-method");
-
-var _bindInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/bind");
-
-var _Array$isArray = require("@babel/runtime-corejs3/core-js-stable/array/is-array");
-
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports.default = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs3/regenerator"));
-
-var _now = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/date/now"));
-
-var _flat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/flat"));
-
-var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
-var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
-
-var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
-
-var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
-
-var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
-
-var _pg = require("pg");
-
-var _common = require("@graffy/common");
-
-var _index = require("./link/index.js");
-
-var _select = require("./sql/select");
-
-var _index2 = require("./sql/index.js");
-
-var _debug = _interopRequireDefault(require("debug"));
-
-function _createForOfIteratorHelperLoose(o, allowArrayLike) { var _context12; var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (it) return _bindInstanceProperty(_context12 = (it = it.call(o)).next).call(_context12, it); if (_Array$isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { var _context11; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context11 = Object.prototype.toString.call(o)).call(_context11, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-var log = (0, _debug.default)('graffy:pg:dbwrap');
-
-var Db = /*#__PURE__*/function () {
-  function Db(connection) {
-    if (typeof connection === 'object' && connection && (connection instanceof _pg.Pool || connection instanceof _pg.Client)) {
-      this.client = connection;
-    } else {
-      this.client = new _pg.Pool(connection);
-    }
-  }
-
-  var _proto = Db.prototype;
-
-  _proto.query = /*#__PURE__*/function () {
-    var _query = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(sqlQuery) {
-      var start, res, duration;
-      return _regenerator.default.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              start = (0, _now.default)();
-              sqlQuery.rowMode = 'array';
-              _context.next = 4;
-              return this.client.query(sqlQuery);
-
-            case 4:
-              res = _context.sent;
-              duration = (0, _now.default)() - start;
-              log('query', {
-                query: sqlQuery.text,
-                duration: duration,
-                res: res
-              });
-              return _context.abrupt("return", res);
-
-            case 8:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee, this);
-    }));
-
-    function query(_x) {
-      return _query.apply(this, arguments);
-    }
-
-    return query;
-  }();
-
-  _proto.readSql = /*#__PURE__*/function () {
-    var _readSql = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(sql) {
-      var _context2;
-
-      var result;
-      return _regenerator.default.wrap(function _callee2$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.next = 2;
-              return this.query(sql);
-
-            case 2:
-              result = _context3.sent;
-              // Each row is an array, as there is only one column returned.
-              result = (0, _flat.default)(_context2 = result.rows).call(_context2);
-              log('Read result', result);
-              return _context3.abrupt("return", result);
-
-            case 6:
-            case "end":
-              return _context3.stop();
-          }
-        }
-      }, _callee2, this);
-    }));
-
-    function readSql(_x2) {
-      return _readSql.apply(this, arguments);
-    }
-
-    return readSql;
-  }();
-
-  _proto.writeSql = /*#__PURE__*/function () {
-    var _writeSql = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(sql) {
-      var res;
-      return _regenerator.default.wrap(function _callee3$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              _context4.next = 2;
-              return this.query(sql);
-
-            case 2:
-              res = _context4.sent;
-              log('Rows written', res.rowCount);
-              return _context4.abrupt("return", res.rowCount);
-
-            case 5:
-            case "end":
-              return _context4.stop();
-          }
-        }
-      }, _callee3, this);
-    }));
-
-    function writeSql(_x3) {
-      return _writeSql.apply(this, arguments);
-    }
-
-    return writeSql;
-  }();
-
-  _proto.read = /*#__PURE__*/function () {
-    var _read = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(rootQuery, tableOptions) {
-      var _this = this;
-
-      var idQueries, promises, results, refQuery, idCol, prefix, getByArgs, getByIds, query, _iterator, _step, node, args;
-
-      return _regenerator.default.wrap(function _callee6$(_context9) {
-        while (1) {
-          switch (_context9.prev = _context9.next) {
-            case 0:
-              idQueries = {};
-              promises = [];
-              results = [];
-              refQuery = [];
-              idCol = tableOptions.idCol, prefix = tableOptions.prefix;
-
-              getByArgs = /*#__PURE__*/function () {
-                var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(args, subQuery) {
-                  var _context5;
-
-                  var result, wrappedQuery, wrappedGraph;
-                  return _regenerator.default.wrap(function _callee4$(_context6) {
-                    while (1) {
-                      switch (_context6.prev = _context6.next) {
-                        case 0:
-                          _context6.next = 2;
-                          return _this.readSql((0, _select.selectByArgs)(args, tableOptions));
-
-                        case 2:
-                          result = _context6.sent;
-                          (0, _common.add)(refQuery, (0, _index.linkResult)(result, subQuery, tableOptions));
-                          wrappedQuery = (0, _common.wrap)(subQuery, (0, _concat.default)(_context5 = []).call(_context5, prefix, [args]));
-                          wrappedGraph = (0, _common.encodeGraph)((0, _common.wrapObject)(result, prefix));
-                          log('getByArgs', wrappedGraph, wrappedQuery, (0, _common.finalize)(wrappedGraph, wrappedQuery));
-                          (0, _common.merge)(results, (0, _common.finalize)(wrappedGraph, wrappedQuery));
-
-                        case 8:
-                        case "end":
-                          return _context6.stop();
-                      }
-                    }
-                  }, _callee4);
-                }));
-
-                return function getByArgs(_x6, _x7) {
-                  return _ref.apply(this, arguments);
-                };
-              }();
-
-              getByIds = /*#__PURE__*/function () {
-                var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
-                  var result;
-                  return _regenerator.default.wrap(function _callee5$(_context8) {
-                    while (1) {
-                      switch (_context8.prev = _context8.next) {
-                        case 0:
-                          _context8.next = 2;
-                          return _this.readSql((0, _select.selectByIds)((0, _keys.default)(idQueries), tableOptions));
-
-                        case 2:
-                          result = _context8.sent;
-                          (0, _forEach.default)(result).call(result, function (object) {
-                            var _context7;
-
-                            var id = object[idCol];
-                            var subQuery = idQueries[id];
-                            (0, _common.add)(refQuery, (0, _index.linkResult)([object], subQuery, tableOptions));
-                            var wrappedQuery = (0, _common.wrap)(subQuery, (0, _concat.default)(_context7 = []).call(_context7, prefix, [id]));
-                            var wrappedGraph = (0, _common.encodeGraph)((0, _common.wrapObject)(object, prefix));
-                            log('getByIds', wrappedGraph, wrappedQuery, (0, _common.finalize)(wrappedGraph, wrappedQuery));
-                            (0, _common.merge)(results, (0, _common.finalize)(wrappedGraph, wrappedQuery));
-                          });
-
-                        case 4:
-                        case "end":
-                          return _context8.stop();
-                      }
-                    }
-                  }, _callee5);
-                }));
-
-                return function getByIds() {
-                  return _ref2.apply(this, arguments);
-                };
-              }();
-
-              query = (0, _common.unwrap)(rootQuery, prefix);
-
-              for (_iterator = _createForOfIteratorHelperLoose(query); !(_step = _iterator()).done;) {
-                node = _step.value;
-                args = (0, _common.decodeArgs)(node);
-
-                if ((0, _common.isPlainObject)(args)) {
-                  promises.push(getByArgs(args, node.children));
-                } else {
-                  idQueries[node.key] = node.children;
-                }
-              }
-
-              if (!(0, _common.isEmpty)(idQueries)) promises.push(getByIds());
-              _context9.next = 12;
-              return _promise.default.all(promises);
-
-            case 12:
-              log('dbRead', rootQuery, results);
-              return _context9.abrupt("return", (0, _sliceInstanceProperty(_common))(results, rootQuery).known || []);
-
-            case 14:
-            case "end":
-              return _context9.stop();
-          }
-        }
-      }, _callee6);
-    }));
-
-    function read(_x4, _x5) {
-      return _read.apply(this, arguments);
-    }
-
-    return read;
-  }();
-
-  _proto.write = /*#__PURE__*/function () {
-    var _write = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(rootChange, tableOptions) {
-      var _this2 = this;
-
-      var sqls, addToQuery, prefix, change, _iterator2, _step2, node, object, arg;
-
-      return _regenerator.default.wrap(function _callee7$(_context10) {
-        while (1) {
-          switch (_context10.prev = _context10.next) {
-            case 0:
-              sqls = [];
-
-              addToQuery = function addToQuery(sql) {
-                return sqls.push(sql);
-              };
-
-              prefix = tableOptions.prefix;
-              change = (0, _common.unwrap)(rootChange, prefix);
-              _iterator2 = _createForOfIteratorHelperLoose(change);
-
-            case 5:
-              if ((_step2 = _iterator2()).done) {
-                _context10.next = 16;
-                break;
-              }
-
-              node = _step2.value;
-
-              if (!(0, _common.isRange)(node)) {
-                _context10.next = 9;
-                break;
-              }
-
-              throw Error(node.key === node.end ? 'pg_write.delete_unsupported' : 'pg_write.write_range_unsupported');
-
-            case 9:
-              object = (0, _common.decodeGraph)(node.children);
-              arg = (0, _common.decodeArgs)(node);
-
-              if (!(object.$put && object.$put !== true)) {
-                _context10.next = 13;
-                break;
-              }
-
-              throw Error('pg_write.partial_put_unsupported');
-
-            case 13:
-              object.$put ? addToQuery((0, _index2.put)(object, arg, tableOptions)) : addToQuery((0, _index2.patch)(object, arg, tableOptions));
-
-            case 14:
-              _context10.next = 5;
-              break;
-
-            case 16:
-              _context10.next = 18;
-              return _promise.default.all((0, _map.default)(sqls).call(sqls, function (sql) {
-                return _this2.writeSql(sql);
-              }));
-
-            case 18:
-              return _context10.abrupt("return", rootChange);
-
-            case 19:
-            case "end":
-              return _context10.stop();
-          }
-        }
-      }, _callee7);
-    }));
-
-    function write(_x8, _x9) {
-      return _write.apply(this, arguments);
-    }
-
-    return write;
-  }();
-
-  return Db;
-}();
-
-exports.default = Db;
-module.exports = exports.default;

package/cjs/filter/filterObject.js

@@ -1,66 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports.default = filterObject;
-
-var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array"));
-
-var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
-
-var _common = require("@graffy/common");
-
-var _getAst = _interopRequireDefault(require("./getAst.js"));
-
-function filterObject(filter, object) {
-  function lookup(path) {
-    return (0, _common.unwrapObject)(object, (0, _common.encodePath)(path));
-  }
-
-  function checkNode(ast) {
-    var _context, _context2;
-
-    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 (0, _isArray.default)(ast[2]) && (0, _includes.default)(_context = ast[2]).call(_context, lookup(ast[1]));
-
-      case '$nin':
-        return !(0, _isArray.default)(ast[2]) || !(0, _includes.default)(_context2 = ast[2]).call(_context2, 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');
-    }
-  }
-
-  var rootAst = (0, _getAst.default)(filter);
-  return checkNode(rootAst);
-}
-
-module.exports = exports.default;