query-weaver 0.0.2 → 0.0.4-alpha.0

package/README.md

@@ -8,24 +8,25 @@ Compose SQL statements safely by leveraging template string literals
 $ npm install query-weaver
 ```
 
-
 ## Usage
 
 ### As a SQL Builder
+
 ```js
 import { sql } from 'query-weaver';
 import pg from 'pg';
 
-const foo = 1, bar = 'Bar';
-const query = sql`SELECT * FROM foobar WHERE foo = ${ foo } AND bar = ${ bar }`;
+const foo = 1,
+  bar = 'Bar';
+const query = sql`SELECT * FROM foobar WHERE foo = ${foo} AND bar = ${bar}`;
 
-console.log(query.toString())
+console.log(query.toString());
 // SELECT * FROM foobar WHERE foo = '1' AND bar = 'Bar'
 
 const db = new pg.Pool();
 const { rows } = await db.query(query);
 
-console.log(rows)
+console.log(rows);
 // [ { foo: 1, bar: 'Bar' } ]
 
 console.log(JSON.stringify(query, null, 2));
@@ -44,16 +45,18 @@ db.end();
 As you can see, the query is executed using **placeholder** on the database. This makes string-value concatenation safe.
 You can also get a string embed version of the query, so that you can debug the query easily.
 
-
 ### As a Query Helper (with `node-postgres` for example)
+
 ```js
 import { useQueryHelper } from 'query-weaver';
 import pg from 'pg';
 
 const db = useQueryHelper(new pg.Pool());
 
-const foo = 1, bar = 'Bar';
-const { rows } = await db.query`SELECT * FROM foobar WHERE foo = ${ foo } AND bar = ${ bar }`;
+const foo = 1,
+  bar = 'Bar';
+const { rows } =
+  await db.query`SELECT * FROM foobar WHERE foo = ${foo} AND bar = ${bar}`;
 
 console.log(rows);
 // [ { foo: 1, bar: 'Bar' } ]
@@ -63,13 +66,22 @@ db.end(); // this call will be proxied to the original pg.Pool() instance
 
 Almost the same as above, but you can directly pass the template string to the `query` function.
 
-
 ### WHERE builder
+
+`WHERE_AND` / `WHERE_OR` / `AND` / `OR` / `WHERE` (`WHERE_AND` alias)
+
 ```js
 import { sql, WHERE, OR } from 'query-weaver';
 
-const a = 1, b = "string", c = null, d = 5, e = false;
-console.log(String(sql`SELECT * FROM foobar ${WHERE({ a, b, c }, OR({ d, e }))}`));
+const a = 1,
+  b = 'string',
+  c = null,
+  d = 5,
+  e = false,
+  f = [1, 2, 3, 4, 5];
+console.log(
+  String(sql`SELECT * FROM foobar ${WHERE({ a, b, c }, OR({ d, e }))}`)
+);
 // SELECT * FROM foobar WHERE ((a = '1') AND (b = 'string') AND (c IS NULL) AND (((d = '5') OR (e = false))))
 
 const q = sql`SELECT * FROM foobar ${WHERE(
@@ -77,20 +89,20 @@ const q = sql`SELECT * FROM foobar ${WHERE(
     a: 10,
     b: 'string',
     c: sql`IS UNKNOWN`,
-    d: sql`BETWEEN ${a} AND ${d}`
+    d: sql`BETWEEN ${a} AND ${d}`,
   },
-  "e IS NULL"
-  sql`f IN (${f})`,
-)}`
+  'e IS NULL',
+  sql`f = ANY (${f})`
+)}`;
 console.log(q.text);
-// SELECT * FROM foobar WHERE ((a = $1) AND (b = $2) AND (c IS UNKNOWN) AND (d BETWEEN $3 AND $4) AND (e IS NULL) AND (f IN ($5)))
+// SELECT * FROM foobar WHERE ((a = $1) AND (b = $2) AND (c IS UNKNOWN) AND (d BETWEEN $3 AND $4) AND (e IS NULL) AND (f = ANY ($5)))
 
 console.log(q.embed);
-// SELECT * FROM foobar WHERE ((a = '10') AND (b = 'string') AND (c IS UNKNOWN) AND (d BETWEEN '1' AND '5') AND (e IS NULL) AND (f IN (ARRAY['1','2','3','4','5'])))
+// SELECT * FROM foobar WHERE ((a = '10') AND (b = 'string') AND (c IS UNKNOWN) AND (d BETWEEN '1' AND '5') AND (e IS NULL) AND (f = ANY (ARRAY['1','2','3','4','5'])))
 ```
 
-
 ### JSON builder
+
 ```js
 import pg from 'pg';
 import { useQueryHelper, json } from 'query-weaver';
@@ -98,9 +110,10 @@ import { useQueryHelper, json } from 'query-weaver';
 const db = useQueryHelper(new pg.Pool());
 
 const id = 10;
-const obj = { b: 'string', c: [1, 2, 'X'], d: { e: null, f: undefined } }
+const obj = { b: 'string', c: [1, 2, 'X'], d: { e: null, f: undefined } };
 
-const row = await db.getRow`SELECT * FROM jsonb_to_record(${json`{ "a": ${ obj }, "b": ${id} }`}) AS (a jsonb, b int);`
+const row =
+  await db.getRow`SELECT * FROM jsonb_to_record(${json`{ 'a': ${obj}, 'b': ${id} }`}) AS (a jsonb, b int);`;
 
 console.log(row);
 // {
@@ -111,17 +124,35 @@ console.log(row);
 db.end();
 ```
 
-
 ### VALUES builder
-`buildValues` (or `sql.values`)
+
+`buildValues` / `sql.values`
+
+```js
+sql.values([[1, 2, 3], ...]);              // => VALUES (1, 2, 3), (...), ...
+sql.values([{ a: 1, b: 2, c: 3 }], ...]);  // => VALUES (1, 2, 3), (...), ...
+```
+
+### Key builder
+
+`buildKeys` / `sql.keys`
 
 ```js
-sql.values([[ ... values ], ...]);  // => VALUES (...), (...), ...
+sql.keys({ a: 1, b: 2, c: 3 });         // => (a, b, c)
+sql.keys([{ a: 1, b: 2, c: 3 }, ...]);  // => (a, b, c)
 ```
 
+### Raw builder
+
+`raw`
+
+```js
+console.log(sql`SELECT * FROM foobar WHERE ${raw("bar LIKE '%something%'")}`);
+```
 
 ### Simple INSERT builder and executor
-`buildInsert` (or `sql.insert`) and `insert` executor
+
+`buildInsert` / `sql.insert` builder, and `insert` executor
 
 ```js
 sql.insert(tableName, { ... fieldValuePairs });  // => sql`INSERT INTO ...`
@@ -132,18 +163,80 @@ sql.insert(tableName, [{ ... fieldValuePairs }, ... ]);  // => sql`INSERT INTO .
 db.insert(tableName, [{ ... fieldValuePairs }, ... ]);   // => db.query`INSERT INTO ... VALUES (...), (...), ...`
 ```
 
-
 ### Simple UPDATE builder and executor
-`buildUpdate` (or `sql.update`) and `update` executor
+
+`buildUpdate` / `sql.update` builder, and `update` executor
+
 ```js
-sql.update(tableName, { ... fieldValuePairs }, { ... whereCondition });  // => sql`UPDATE ...`
-db.update(tableName, { ... fieldValuePairs }, { ... whereCondition });   // => db.query`UPDATE ...`
+sql.update(tableName, { ...fieldValuePairs }, { ...whereCondition }); // => sql`UPDATE ...`
+db.update(tableName, { ...fieldValuePairs }, { ...whereCondition }); // => db.query`UPDATE ...`
 ```
 
-
 ### Simple DELETE builder and executor
-`buildDelete` (or `sql.delete`) and `delete` executor
+
+`buildDelete` / `sql.delete` builder, and `delete` executor
+
+```js
+sql.delete(tableName, { ...whereCondition }); // => sql`DELETE FROM ...`
+db.delete(tableName, { ...whereCondition }); // => db.query`DELETE FROM ...`
+```
+
+### API
+
+As you can see, an object built and constructed by `sql` keyword behave like a simple object with the following properties;
+`text`, `values`, and `embed`.
+
+Furthermore, the object also comes up with the following APIs;
+
+- `append(...)` / `push(...)`
+  - append raw string or an object created by `sql`, to the query
+- `join(glue = ', ')` / `prefix(prefix)` / `suffix(suffix)` / `empty(empty)`
+  - set glue/prefix/suffix/empty string for toString(), respectively
+- `setSewingPattern(prefix, glue, suffix, empty)`
+  - set sewing pattern for toString() at once
+- `toString(opts?)`
+  - constructs SQL string (by using sewing pattern and `opts` settings)
+
+To create the object;
+
+- `` sql`template string with ${value}` `` / `` json`{"a": "b", "c": ${value}}` ``
+  - creates a query object with values that will be automatically escaped
+- `sql(value, ...)` / `json(value)`
+  - creates a query object from only values that will be automatically escaped
+
+These APIs can be used, for example, to construct `IN` clause;
+
+```js
+console.log(
+  sql`SELECT * FROM foobar WHERE foo IN (${sql(1, 2, 3).join()})`.embed
+);
+// SELECT * FROM foobar WHERE foo IN ('1', '2', '3')
+
+const a = [1, 2, 3];
+console.log(sql`SELECT * FROM foobar WHERE foo IN (${sql(...a).join()})`.text);
+// SELECT * FROM foobar WHERE foo IN ($1, $2, $3)
+```
+
+### Caveats
+
+- Only `sql` and `json` accepts a template string literal.
+- The actual SQL statement executed on the database may differ between `[.text, .values]` and `.embed`, due to differences in serialize functions. If you really want to get the exact same statement, you can try this for example:
+
 ```js
-sql.delete(tableName, { ... whereCondition });  // => sql`DELETE FROM ...`
-db.delete(tableName, { ... whereCondition });   // => db.query`DELETE FROM ...`
+import pgUtil from 'pg/lib/utils.js';
+import pgEscape from 'pg-escape';
+
+console.log(sql`SELECT ${[1, 2, 3, 4, 5]}`.embed);
+// SELECT ARRAY['1','2','3','4','5']
+
+console.log(sql`SELECT ${pgUtil.prepareValue([1, 2, 3, 4, 5])}`.embed);
+// SELECT '{"1","2","3","4","5"}'
+
+// or, pass a custom serialize function
+console.log(
+  sql`SELECT ${[1, 2, 3, 4, 5]}`.toString({
+    valueFn: (x) => pgEscape.literal(JSON.stringify(x)),
+  })
+);
+// SELECT '[1,2,3,4,5]'
 ```

package/dist/index.cjs.js

@@ -0,0 +1,2 @@
+"use strict";var pe=Object.create;var j=Object.defineProperty;var le=Object.getOwnPropertyDescriptor;var ye=Object.getOwnPropertyNames;var ge=Object.getPrototypeOf,ce=Object.prototype.hasOwnProperty;var fe=(e,n)=>{for(var t in n)j(e,t,{get:n[t],enumerable:!0})},M=(e,n,t,r)=>{if(n&&typeof n=="object"||typeof n=="function")for(let u of ye(n))!ce.call(e,u)&&u!==t&&j(e,u,{get:()=>n[u],enumerable:!(r=le(n,u))||r.enumerable});return e};var me=(e,n,t)=>(t=e!=null?pe(ge(e)):{},M(n||!e||!e.__esModule?j(t,"default",{value:e,enumerable:!0}):t,e)),he=e=>M(j({},"__esModule",{value:!0}),e);var P=(e,n,t)=>{if(!n.has(e))throw TypeError("Cannot "+t)};var i=(e,n,t)=>(P(e,n,"read from private field"),t?t.call(e):n.get(e)),p=(e,n,t)=>{if(n.has(e))throw TypeError("Cannot add the same private member more than once");n instanceof WeakSet?n.add(e):n.set(e,t)},l=(e,n,t,r)=>(P(e,n,"write to private field"),r?r.call(e,t):n.set(e,t),t);var y=(e,n,t)=>(P(e,n,"access private method"),t);var we={};fe(we,{AND:()=>L,OR:()=>_,QueryHelper:()=>C,WHERE:()=>w,WHERE_AND:()=>ue,WHERE_OR:()=>U,and:()=>ne,buildClauses:()=>b,buildDelete:()=>H,buildInsert:()=>q,buildKeys:()=>K,buildUpdate:()=>V,buildValues:()=>J,ident:()=>Z,isQueryFragment:()=>F,isQueryTemplateStyle:()=>k,json:()=>ee,or:()=>te,pgIdent:()=>G,pgString:()=>$,raw:()=>B,sql:()=>s,useQueryHelper:()=>de,where:()=>re,where_and:()=>se,where_or:()=>ie});module.exports=he(we);var W=me(require("pg-escape"));function G(e){return e.split(".").map(n=>W.default.ident(n)).join(".")}function $(e){return e===null?"NULL":typeof e=="boolean"?e?"true":"false":Array.isArray(e)?"ARRAY["+e.map($).join(",")+"]":typeof e=="object"?W.default.literal(JSON.stringify(e)):W.default.literal(String(e))}var d=class{constructor(){this.text="";this.values=[];this.embed="";Object.defineProperties(this,{text:{enumerable:!0,get(){return this.compiled.text}},values:{enumerable:!0,get(){return this.compiled.values}},embed:{enumerable:!0,get(){return this.compiled.embed}}})}get compiled(){let n=[],t=this.toString({valueFn:u=>(n.push(u),"$"+n.length)}),r=this.toString();return{text:t,values:n,embed:r}}},A,D=class extends d{constructor(t){super();p(this,A,void 0);l(this,A,t)}toString(t){return(t?.valueFn??$)(i(this,A))}};A=new WeakMap;var R,v=class extends d{constructor(t){super();p(this,R,void 0);l(this,R,t)}toString(t){return(t?.identFn??G)(i(this,R))}};R=new WeakMap;var S,I=class extends d{constructor(t){super();p(this,S,void 0);l(this,S,String(t))}toString(){return i(this,S)}};S=new WeakMap;function F(e){return e instanceof d}function f(e){return new v(e)}function Y(e){return typeof e>"u"||F(e)?e:new D(e)}function h(e){return typeof e>"u"||F(e)?e:Array.isArray(e)?new g(e.map(h)):new I(e)}function z(e){return typeof e>"u"||F(e)?e:h(JSON.stringify(e))}var k=e=>{if(!Array.isArray(e)||typeof e?.[0]!="object"||e[0]===null||!("raw"in e[0])||!Array.isArray(e[0]))return!1;let[n,...t]=e;return n.length-1===t.length};function X(e,n){if(e.length-1!==n.length)throw new Error("Invalid call of the function");return e.flatMap((t,r)=>r?[n[r-1],t]:[t])}var T,o,g=class extends d{constructor(...t){super();p(this,T,[]);p(this,o,void 0);if(l(this,o,{prefix:"",glue:"",suffix:"",empty:"",wrapperFn:r=>r}),Array.isArray(t[0])){let[r,u]=t;l(this,o,{...i(this,o),...u}),this.push(...r)}else{let[r]=t;l(this,o,{...i(this,o),...r})}}setSewingPattern(t="",r="",u="",c=""){return l(this,o,{...i(this,o),prefix:t,glue:r,suffix:u,empty:c}),this}push(...t){return i(this,T).push(...t.map(h).filter(r=>r!==void 0)),this}append(...t){return this.push(...t)}join(t=", "){return i(this,o).glue=t,this}prefix(t=" "){return i(this,o).prefix=t,this}suffix(t=" "){return i(this,o).suffix=t,this}empty(t=""){return i(this,o).empty=t,this}toString(t){return i(this,T).length===0?i(this,o).empty:i(this,o).prefix+i(this,o).wrapperFn(i(this,T).map(r=>r.toString(t)).join(i(this,o).glue),t)+i(this,o).suffix}};T=new WeakMap,o=new WeakMap;function s(...e){let n;if(k(e)){let[t,...r]=e;n=[new g(X(t.map(h),r.map(Y)))]}else n=e.map(Y);return new g(n)}var Z=f;function B(...e){return new g(e.map(h))}function ee(...e){let n,t=(r,u)=>(u?.valueFn||$)(r);if(k(e)){let[r,...u]=e;n=[new g(X(r.map(h),u.map(z)),{wrapperFn:t})]}else n=e.map(r=>new g([z(r)],{wrapperFn:t}));return new g(n)}function b(...e){let n=new g,t=r=>{if(r!==void 0&&r!==null){if(typeof r=="string"){n.push(h(r));return}if(F(r)){n.push(r);return}if(Array.isArray(r)){r.forEach(t);return}if(typeof r=="object"){for(let u in r)if(r[u]!==void 0){if(F(r[u])){n.push(s`${f(u)} ${r[u]}`);continue}if(r[u]===null){n.push(s`${f(u)} IS NULL`);continue}if(Array.isArray(r[u])){n.push(s`${f(u)} = ANY (${r[u]})`);continue}n.push(s`${f(u)} = ${r[u]}`)}return}}};return t(e),n}function _(...e){return b(e).setSewingPattern("((",") OR (","))","false")}function L(...e){return b(e).setSewingPattern("((",") AND (","))","true")}function w(...e){return b(e).setSewingPattern("WHERE ((",") AND (","))","")}function U(...e){return b(e).setSewingPattern("WHERE ((",") OR (","))","")}function J(e){if(!Array.isArray(e)){if(typeof e!="object")throw new Error("buildValues: The argument must be an array");e=[e]}if(e.length===0)throw new Error("buildValues: Array must contain elements at least one");let n=e.map(u=>typeof u=="object"?Object.values(u):u),t=n[0].length;if(n.some(u=>u.length!==t))throw new Error("buildValues: Array must all be the same length");let r=s(...n.map(u=>s(...u).join(", "))).setSewingPattern("(","), (",")");return s`VALUES ${r}`}function K(e){if(Array.isArray(e)||(e=[e]),e.length==0||!e[0]||typeof e[0]!="object")throw new Error("Invalid call of the function");let n=Object.keys(e[0]),t=n.join();if(e.some(r=>Object.keys(r).join()!==t))throw new Error("buildKeys: All objects must have the same key");return s(...n.map(f)).setSewingPattern("(",", ",")")}function q(e,n,t){Array.isArray(n)||(n=[n]);let r=K(n),u=J(n.map(Object.values));return s`INSERT INTO ${f(e)} ${r} ${u}`.append(h(t)).join(" ")}function V(e,n,t,r){let u=new g;for(let c in n){let x=n[c];x!==void 0&&u.push(s`${f(c)} = ${x}`)}return s`UPDATE ${f(e)} SET ${u.join(", ")} ${w(t)}`.append(h(r)).join(" ")}function H(e,n,t){return s`DELETE FROM ${f(e)} ${w(n)}`.append(t).join(" ")}var te=_,ne=L,re=w,ue=w,se=w,ie=U;s.raw=B;s.ident=Z;s.json=ee;s.WHERE=w;s.WHERE_AND=ue;s.WHERE_OR=U;s.AND=L;s.OR=_;s.where=re;s.where_and=se;s.where_or=ie;s.and=ne;s.or=te;s.insert=q;s.update=V;s.delete=H;s.keys=K;s.values=J;var O,Q,N,oe,a,m,C=class{constructor(n,t={}){p(this,N);p(this,a);p(this,O,void 0);p(this,Q,void 0);l(this,O,n),l(this,Q,t)}async insert(n,t,r){let u=q(n,t,r);return await y(this,a,m).call(this,[u])}async update(n,t,r,u){let c=V(n,t,r,u);return await y(this,a,m).call(this,[c])}async delete(n,t,r){let u=H(n,t,r);return await y(this,a,m).call(this,[u])}async query(...n){return y(this,a,m).call(this,n)}async getRows(...n){return y(this,a,m).call(this,n).then(t=>t.rows)}async getRow(...n){return y(this,a,m).call(this,n).then(t=>t.rows?.[0])}async getOne(...n){return y(this,a,m).call(this,n).then(t=>Object.values(t.rows?.[0])?.[0])}async getCount(...n){return y(this,a,m).call(this,n).then(t=>t.rowCount)}async exec(...n){return y(this,a,m).call(this,n).then(t=>t.rowCount)}};O=new WeakMap,Q=new WeakMap,N=new WeakSet,oe=function(n){if(k(n)){let[u,...c]=n;return s(u,...c)}let[t,r]=n;return typeof t=="object"&&t&&"text"in t?t:{text:t,values:r??[]}},a=new WeakSet,m=async function(n){let t=y(this,N,oe).call(this,n);i(this,Q)?.beforeQuery?.(t);let r=await i(this,O).query(t).catch(u=>{throw i(this,Q)?.onError?.(t,u),u});return i(this,Q)?.afterQuery?.({...t,result:r}),r};function de(e,n){let t=new C(e,n);return new Proxy(e,{get(r,u,c){let x=u in t?t:u in r?r:void 0,E=x&&Reflect.get(x,u);return E&&E instanceof Function?function(...ae){return E.apply(this===c?x:this,ae)}:E}})}0&&(module.exports={AND,OR,QueryHelper,WHERE,WHERE_AND,WHERE_OR,and,buildClauses,buildDelete,buildInsert,buildKeys,buildUpdate,buildValues,ident,isQueryFragment,isQueryTemplateStyle,json,or,pgIdent,pgString,raw,sql,useQueryHelper,where,where_and,where_or});
+//# sourceMappingURL=index.cjs.js.map

package/dist/index.cjs.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/index.ts", "../src/query-weaver.ts", "../src/query-helper.ts"],
+  "sourcesContent": ["export * from './query-weaver';\nexport * from './query-helper';\n", "import pgescape from 'pg-escape';\n\ntype EscapeFunction = (v: unknown) => string;\nexport type FieldValues = Record<string, unknown>;\nexport type WhereArg =\n  | string\n  | FieldValues\n  | QueryFragment\n  | undefined\n  | WhereArg[];\n\nexport function pgIdent(s: string) {\n  // '.' is a special for us\n  return s\n    .split('.')\n    .map((x) => pgescape.ident(x))\n    .join('.');\n}\n\n// fallback function for when the EscapeFunction is not specified\nexport function pgString(s: unknown): string {\n  if (s === null) return 'NULL';\n  if (typeof s === 'boolean') return s ? 'true' : 'false';\n  if (Array.isArray(s)) return 'ARRAY[' + s.map(pgString).join(',') + ']';\n  if (typeof s === 'object') return pgescape.literal(JSON.stringify(s));\n  return pgescape.literal(String(s));\n}\n\ntype QueryFragmentToStringOptions = {\n  valueFn?: EscapeFunction;\n  identFn?: EscapeFunction;\n};\n\nexport interface QueryFragment {\n  text: string;\n  values?: unknown[];\n  embed?: string;\n  sql?: string;\n\n  toString(opts?: QueryFragmentToStringOptions): string;\n}\n\nabstract class QueryFragmentBase implements QueryFragment {\n  // XXX: entries for defineProperties\n  text: string = '';\n  values?: unknown[] | undefined = [];\n  embed?: string = '';\n\n  get compiled() {\n    const values = [] as unknown[];\n    const text = this.toString({\n      valueFn: (x: unknown) => {\n        values.push(x);\n        return '$' + values.length;\n      },\n    });\n    const embed = this.toString();\n\n    return {\n      text,\n      values,\n      embed,\n    };\n  }\n\n  constructor() {\n    Object.defineProperties(this, {\n      text: {\n        enumerable: true,\n        get() {\n          return this.compiled.text;\n        },\n      },\n      values: {\n        enumerable: true,\n        get() {\n          return this.compiled.values;\n        },\n      },\n      embed: {\n        enumerable: true,\n        get() {\n          return this.compiled.embed;\n        },\n      },\n    });\n  }\n\n  abstract toString(opts?: QueryFragmentToStringOptions): string;\n}\n\nclass QueryFragmentValue extends QueryFragmentBase {\n  #value: unknown;\n\n  constructor(value: unknown) {\n    super();\n    this.#value = value;\n  }\n\n  toString(opts?: QueryFragmentToStringOptions) {\n    return (opts?.valueFn ?? pgString)(this.#value);\n  }\n}\n\nclass QueryFragmentIdent extends QueryFragmentBase {\n  #ident: string;\n\n  constructor(ident: string) {\n    super();\n    this.#ident = ident;\n  }\n\n  toString(opts?: QueryFragmentToStringOptions) {\n    return (opts?.identFn ?? pgIdent)(this.#ident);\n  }\n}\n\n// we exploits String constructor\nclass QueryFragmentRawString extends QueryFragmentBase {\n  #string: string;\n\n  constructor(s: unknown) {\n    super();\n    this.#string = String(s);\n  }\n\n  /* toString(_?: QueryFragmentToStringOptions) { */\n  toString() {\n    return this.#string;\n  }\n}\n\nexport function isQueryFragment(x: unknown): x is QueryFragment {\n  return x instanceof QueryFragmentBase;\n}\n\nfunction makeIdent(name: string) {\n  return new QueryFragmentIdent(name);\n}\n\nfunction makeValue(x: unknown): QueryFragment | undefined {\n  if (typeof x === 'undefined' || isQueryFragment(x)) return x;\n  return new QueryFragmentValue(x);\n}\n\nfunction makeRaw(text: unknown | unknown[]): QueryFragment | undefined {\n  if (typeof text === 'undefined' || isQueryFragment(text)) return text;\n  if (Array.isArray(text)) return new QueryFragments(text.map(makeRaw));\n  return new QueryFragmentRawString(text);\n}\n\nfunction makeJsonValue(x: unknown) {\n  if (typeof x === 'undefined' || isQueryFragment(x)) return x;\n  return makeRaw(JSON.stringify(x));\n}\n\ntype QueryFragmentsOptions = {\n  prefix?: string;\n  glue?: string;\n  suffix?: string;\n  empty?: string;\n\n  wrapperFn?: (s: string, opts?: QueryFragmentToStringOptions) => string;\n};\n\nexport type QueryTemplateStyle = [\n  text: TemplateStringsArray,\n  ...values: unknown[]\n];\nexport const isQueryTemplateStyle = (\n  args: unknown\n): args is QueryTemplateStyle => {\n  if (!Array.isArray(args)) return false;\n  if (typeof args?.[0] !== 'object' || args[0] === null || !('raw' in args[0]))\n    return false;\n  if (!Array.isArray(args[0])) return false;\n  const [texts, ...values] = args;\n  return texts.length - 1 === values.length;\n};\n\nfunction sewTemplateTextsAndValues<T = unknown, R = unknown>(\n  texts: T[],\n  values: R[]\n) {\n  if (texts.length - 1 !== values.length)\n    throw new Error('Invalid call of the function');\n  return texts.flatMap((text, idx) => (idx ? [values[idx - 1], text] : [text]));\n}\n\nclass QueryFragments extends QueryFragmentBase {\n  #list: QueryFragment[] = [];\n  #opts: Required<QueryFragmentsOptions>;\n\n  constructor(\n    ...args:\n      | []\n      | [values: (QueryFragment | undefined)[], opts?: QueryFragmentsOptions]\n      | [opts?: QueryFragmentsOptions]\n  ) {\n    super();\n    this.#opts = {\n      prefix: '',\n      glue: '',\n      suffix: '',\n      empty: '',\n      wrapperFn: (x) => x,\n    };\n\n    if (Array.isArray(args[0])) {\n      const [values, opts] = args as [\n        values: (QueryFragment | undefined)[],\n        opts?: QueryFragmentsOptions\n      ];\n      this.#opts = { ...this.#opts, ...opts };\n      this.push(...values);\n    } else {\n      const [opts] = args as [opts?: QueryFragmentsOptions];\n      this.#opts = { ...this.#opts, ...opts };\n    }\n  }\n\n  setSewingPattern(\n    prefix: string = '',\n    glue: string = '',\n    suffix: string = '',\n    empty: string = ''\n  ) {\n    this.#opts = { ...this.#opts, prefix, glue, suffix, empty };\n    return this;\n  }\n\n  push(...args: (QueryFragment | string | undefined)[]) {\n    this.#list.push(\n      ...(args.map(makeRaw).filter((x) => x !== undefined) as QueryFragment[])\n    );\n    return this;\n  }\n\n  // alias\n  append(...args: (QueryFragment | string | undefined)[]) {\n    return this.push(...args);\n  }\n\n  join(glue: string = ', ') {\n    this.#opts.glue = glue;\n    return this;\n  }\n\n  prefix(prefix: string = ' ') {\n    this.#opts.prefix = prefix;\n    return this;\n  }\n\n  suffix(suffix: string = ' ') {\n    this.#opts.suffix = suffix;\n    return this;\n  }\n\n  empty(empty: string = '') {\n    this.#opts.empty = empty;\n    return this;\n  }\n\n  toString(opts?: QueryFragmentToStringOptions): string {\n    if (this.#list.length === 0) return this.#opts.empty;\n    return (\n      this.#opts.prefix +\n      this.#opts.wrapperFn(\n        this.#list.map((x) => x.toString(opts)).join(this.#opts.glue),\n        opts\n      ) +\n      this.#opts.suffix\n    );\n  }\n}\n\nexport function sql(\n  ...args:\n    | [texts: TemplateStringsArray, ...values: unknown[]]\n    | [...values: unknown[]]\n): QueryFragments {\n  let fragments: (QueryFragment | undefined)[];\n  if (isQueryTemplateStyle(args)) {\n    // sql`...` comes here\n    const [texts, ...values] = args as [\n      texts: TemplateStringsArray,\n      values: unknown[]\n    ];\n    // template string looks like a single QueryFragment for user\n    fragments = [\n      new QueryFragments(\n        sewTemplateTextsAndValues(texts.map(makeRaw), values.map(makeValue))\n      ),\n    ];\n  } else {\n    // normal function call\n    fragments = args.map(makeValue);\n  }\n\n  return new QueryFragments(fragments);\n}\n\nexport const ident = makeIdent;\n\nexport function raw(...args: unknown[]) {\n  return new QueryFragments(args.map(makeRaw));\n}\n\nexport function json(\n  ...args:\n    | [...json: unknown[]]\n    | [texts: TemplateStringsArray, ...args: unknown[]]\n) {\n  let fragments: (QueryFragment | undefined)[];\n  const wrapperFn = (x: string, opts?: QueryFragmentToStringOptions) =>\n    (opts?.valueFn || pgString)(x);\n  if (isQueryTemplateStyle(args)) {\n    const [texts, ...values] = args;\n    fragments = [\n      new QueryFragments(\n        sewTemplateTextsAndValues(\n          texts.map(makeRaw),\n          values.map(makeJsonValue)\n        ),\n        { wrapperFn }\n      ),\n    ];\n  } else {\n    // normal function call\n    fragments = args.map(\n      (x) => new QueryFragments([makeJsonValue(x)], { wrapperFn })\n    );\n  }\n\n  return new QueryFragments(fragments);\n}\n\nexport function buildClauses(...args: WhereArg[]) {\n  const clauses = new QueryFragments();\n\n  const parse = (val: WhereArg) => {\n    if (val === undefined) return;\n    if (val === null) return;\n\n    if (typeof val === 'string') {\n      clauses.push(makeRaw(val));\n      return;\n    }\n\n    if (isQueryFragment(val)) {\n      clauses.push(val);\n      return;\n    }\n\n    if (Array.isArray(val)) {\n      val.forEach(parse);\n      return;\n    }\n\n    if (typeof val === 'object') {\n      for (const key in val) {\n        if (val[key] === undefined) continue;\n\n        if (isQueryFragment(val[key])) {\n          clauses.push(sql`${makeIdent(key)} ${val[key]}`);\n          continue;\n        }\n\n        if (val[key] === null) {\n          clauses.push(sql`${makeIdent(key)} IS NULL`);\n          continue;\n        }\n\n        if (Array.isArray(val[key])) {\n          clauses.push(sql`${makeIdent(key)} = ANY (${val[key]})`);\n          continue;\n        }\n\n        // \u305D\u308C\u4EE5\u5916\n        clauses.push(sql`${makeIdent(key)} = ${val[key]}`);\n      }\n      return;\n    }\n  };\n\n  parse(args);\n\n  return clauses;\n}\n\nexport function OR(...fv: WhereArg[]) {\n  return buildClauses(fv).setSewingPattern('((', ') OR (', '))', 'false');\n}\n\nexport function AND(...fv: WhereArg[]) {\n  return buildClauses(fv).setSewingPattern('((', ') AND (', '))', 'true');\n}\n\nexport function WHERE(...fv: WhereArg[]) {\n  return buildClauses(fv).setSewingPattern('WHERE ((', ') AND (', '))', '');\n}\n\nexport function WHERE_OR(...fv: WhereArg[]) {\n  return buildClauses(fv).setSewingPattern('WHERE ((', ') OR (', '))', '');\n}\n\nexport function buildValues(fvs: (FieldValues | unknown[])[]) {\n  if (!Array.isArray(fvs)) {\n    if (typeof fvs !== 'object')\n      throw new Error('buildValues: The argument must be an array');\n    fvs = [fvs];\n  }\n  if (fvs.length === 0)\n    throw new Error('buildValues: Array must contain elements at least one');\n\n  const array = fvs.map((x) => (typeof x === 'object' ? Object.values(x) : x));\n\n  const sig = array[0].length;\n  if (array.some((arg) => arg.length !== sig)) {\n    throw new Error('buildValues: Array must all be the same length');\n  }\n\n  const values = sql(\n    ...array.map((v) => sql(...v).join(', '))\n  ).setSewingPattern('(', '), (', ')');\n  return sql`VALUES ${values}`;\n}\n\nexport function buildKeys(fvs: FieldValues[] | FieldValues) {\n  if (!Array.isArray(fvs)) fvs = [fvs];\n  if (fvs.length == 0 || !fvs[0] || typeof fvs[0] !== 'object')\n    throw new Error('Invalid call of the function');\n\n  const ks = Object.keys(fvs[0]);\n  const sig = ks.join();\n  if (fvs.some((fv) => Object.keys(fv).join() !== sig)) {\n    throw new Error('buildKeys: All objects must have the same key');\n  }\n\n  return sql(...ks.map(makeIdent)).setSewingPattern('(', ', ', ')');\n}\n\nexport function buildInsert(\n  table: string,\n  fvs: FieldValues[] | FieldValues,\n  appendix?: string | QueryFragment\n) {\n  if (!Array.isArray(fvs)) fvs = [fvs];\n\n  const keys = buildKeys(fvs);\n  const values = buildValues(fvs.map(Object.values));\n\n  return sql`INSERT INTO ${makeIdent(table)} ${keys} ${values}`\n    .append(makeRaw(appendix))\n    .join(' ');\n}\n\nexport function buildUpdate(\n  table: string,\n  fv: FieldValues,\n  where?: WhereArg,\n  appendix?: string | QueryFragment\n) {\n  const pairs = new QueryFragments();\n\n  for (const k in fv) {\n    const val = fv[k];\n    if (val === undefined) continue;\n\n    pairs.push(sql`${makeIdent(k)} = ${val}`);\n  }\n\n  return sql`UPDATE ${makeIdent(table)} SET ${pairs.join(', ')} ${WHERE(where)}`\n    .append(makeRaw(appendix))\n    .join(' ');\n}\n\nexport function buildDelete(\n  table: string,\n  where?: WhereArg,\n  appendix?: string | QueryFragment\n) {\n  return sql`DELETE FROM ${makeIdent(table)} ${WHERE(where)}`\n    .append(appendix)\n    .join(' ');\n}\n\n// aliases\nexport const or = OR;\nexport const and = AND;\nexport const where = WHERE;\nexport const WHERE_AND = WHERE;\nexport const where_and = WHERE;\nexport const where_or = WHERE_OR;\n\n// expose via `sql`\nsql.raw = raw;\nsql.ident = ident;\nsql.json = json;\nsql.WHERE = WHERE;\nsql.WHERE_AND = WHERE_AND;\nsql.WHERE_OR = WHERE_OR;\nsql.AND = AND;\nsql.OR = OR;\nsql.where = where;\nsql.where_and = where_and;\nsql.where_or = where_or;\nsql.and = and;\nsql.or = or;\nsql.insert = buildInsert;\nsql.update = buildUpdate;\nsql.delete = buildDelete;\nsql.keys = buildKeys;\nsql.values = buildValues;\n\nexport default {\n  sql,\n  raw,\n  ident,\n  json,\n  WHERE,\n  WHERE_AND,\n  WHERE_OR,\n  AND,\n  OR,\n  where,\n  where_and,\n  where_or,\n  and,\n  or,\n  buildInsert,\n  buildUpdate,\n  buildDelete,\n  buildValues,\n};\n", "import type pg from 'pg';\nimport type {\n  QueryFragment,\n  FieldValues,\n  WhereArg,\n  QueryTemplateStyle,\n} from './query-weaver';\nimport {\n  sql,\n  buildInsert,\n  buildUpdate,\n  buildDelete,\n  isQueryTemplateStyle,\n} from './query-weaver';\n\n// pg (almost) compatible types to relief and reduce their requirements\ntype pgQueryResultCustom<R> = {\n  rowCount: number;\n  rows: R[];\n  fields?: Partial<pg.FieldDef>[];\n};\ntype pgQueryResult<R> = Omit<\n  Partial<pg.QueryResult>,\n  keyof pgQueryResultCustom<R>\n> &\n  pgQueryResultCustom<R>;\n\nexport interface Queryable {\n  query: <T extends pg.QueryResultRow>(queryConfig: {\n    text: string;\n    values?: unknown[];\n  }) => Promise<pgQueryResult<T>>;\n}\n\ntype QueryHelperOptions = {\n  placeHolderFn?: (v: unknown, values: unknown[]) => string;\n\n  beforeQuery?: <T extends pg.QueryConfig<unknown[]>>(ctx: T) => void;\n  afterQuery?: <T extends pg.QueryConfig<unknown[]>>(ctx: T) => void;\n  onError?: <T extends pg.QueryConfig<unknown[]>>(ctx: T, e: Error) => void;\n};\n\ntype QueryTemplateOrSimpleQuery =\n  | QueryTemplateStyle\n  | [query: string, values?: unknown[]]\n  | [query: pg.QueryConfig<unknown[]>];\n\n/**\n * Query Helper\n */\nexport class QueryHelper {\n  #db: Queryable;\n  #opts: QueryHelperOptions;\n\n  constructor(db: Queryable, opts: QueryHelperOptions = {}) {\n    this.#db = db;\n    this.#opts = opts;\n  }\n\n  #parseQueryTemplateStyle(\n    args: QueryTemplateOrSimpleQuery\n  ): pg.QueryConfig<unknown[]> {\n    if (isQueryTemplateStyle(args)) {\n      const [texts, ...values] = args;\n      return sql(texts, ...values);\n    }\n\n    const [query, values] = args;\n\n    if (typeof query === 'object' && query && 'text' in query) {\n      return query;\n    }\n\n    return { text: query, values: values ?? [] };\n  }\n\n  async #query<T extends pg.QueryResultRow>(args: QueryTemplateOrSimpleQuery) {\n    const query = this.#parseQueryTemplateStyle(args);\n\n    this.#opts?.beforeQuery?.(query);\n\n    const result = await this.#db.query<T>(query).catch((e) => {\n      this.#opts?.onError?.(query, e);\n      throw e;\n    });\n\n    this.#opts?.afterQuery?.({ ...query, result });\n\n    return result;\n  }\n\n  // ==================================================================================================\n  // query executors\n\n  async insert<T extends pg.QueryResultRow>(\n    table: string,\n    fv: FieldValues,\n    appendix?: string | QueryFragment\n  ) {\n    const query = buildInsert(table, fv, appendix);\n    return await this.#query<T>([query]);\n  }\n\n  async update<T extends pg.QueryResultRow>(\n    table: string,\n    fv: FieldValues,\n    where: WhereArg,\n    appendix?: string | QueryFragment\n  ) {\n    const query = buildUpdate(table, fv, where, appendix);\n    return await this.#query<T>([query]);\n  }\n\n  async delete<T extends pg.QueryResultRow>(\n    table: string,\n    where: WhereArg,\n    appendix?: string | QueryFragment\n  ) {\n    const query = buildDelete(table, where, appendix);\n    return await this.#query<T>([query]);\n  }\n\n  async query<T extends pg.QueryResultRow>(\n    ...args: QueryTemplateOrSimpleQuery\n  ) {\n    return this.#query<T>(args);\n  }\n\n  async getRows<T extends pg.QueryResultRow>(\n    ...args: QueryTemplateOrSimpleQuery\n  ) {\n    return this.#query<T>(args).then((x) => x.rows);\n  }\n\n  async getRow<T extends pg.QueryResultRow>(\n    ...args: QueryTemplateOrSimpleQuery\n  ) {\n    return this.#query<T>(args).then((x) => x.rows?.[0]);\n  }\n\n  async getOne<T = unknown>(...args: QueryTemplateOrSimpleQuery) {\n    return this.#query(args).then((x) => Object.values(x.rows?.[0])?.[0] as T);\n  }\n\n  async getCount(...args: QueryTemplateOrSimpleQuery) {\n    return this.#query(args).then((x) => x.rowCount);\n  }\n  async exec(...args: QueryTemplateOrSimpleQuery) {\n    // same as getCount\n    return this.#query(args).then((x) => x.rowCount);\n  }\n}\n\n/**\n * Returns a proxy object that overrides the queryable instance `db` by Query Helper utilities\n * @param db - Queryable object to be wrapped\n */\nexport function useQueryHelper<T extends Queryable>(\n  db: T,\n  opts?: QueryHelperOptions\n): Omit<T, keyof QueryHelper> & QueryHelper {\n  const qh = new QueryHelper(db, opts);\n  return new Proxy(db, {\n    get(db, key, receiver) {\n      const target = key in qh ? qh : key in db ? db : undefined;\n\n      const value = target && Reflect.get(target, key);\n\n      if (value && value instanceof Function) {\n        return function (this: unknown, ...args: unknown[]) {\n          return value.apply(this === receiver ? target : this, args);\n        };\n      }\n\n      return value;\n    },\n  }) as T & QueryHelper;\n}\n"],
+  "mappings": "48BAAA,IAAAA,GAAA,GAAAC,GAAAD,GAAA,SAAAE,EAAA,OAAAC,EAAA,gBAAAC,EAAA,UAAAC,EAAA,cAAAC,GAAA,aAAAC,EAAA,QAAAC,GAAA,iBAAAC,EAAA,gBAAAC,EAAA,gBAAAC,EAAA,cAAAC,EAAA,gBAAAC,EAAA,gBAAAC,EAAA,UAAAC,EAAA,oBAAAC,EAAA,yBAAAC,EAAA,SAAAC,GAAA,OAAAC,GAAA,YAAAC,EAAA,aAAAC,EAAA,QAAAC,EAAA,QAAAC,EAAA,mBAAAC,GAAA,UAAAC,GAAA,cAAAC,GAAA,aAAAC,KAAA,eAAAC,GAAA5B,ICAA,IAAA6B,EAAqB,yBAWd,SAASC,EAAQC,EAAW,CAEjC,OAAOA,EACJ,MAAM,GAAG,EACT,IAAKC,GAAM,EAAAC,QAAS,MAAMD,CAAC,CAAC,EAC5B,KAAK,GAAG,CACb,CAGO,SAASE,EAASH,EAAoB,CAC3C,OAAIA,IAAM,KAAa,OACnB,OAAOA,GAAM,UAAkBA,EAAI,OAAS,QAC5C,MAAM,QAAQA,CAAC,EAAU,SAAWA,EAAE,IAAIG,CAAQ,EAAE,KAAK,GAAG,EAAI,IAChE,OAAOH,GAAM,SAAiB,EAAAE,QAAS,QAAQ,KAAK,UAAUF,CAAC,CAAC,EAC7D,EAAAE,QAAS,QAAQ,OAAOF,CAAC,CAAC,CACnC,CAgBA,IAAeI,EAAf,KAA0D,CAuBxD,aAAc,CArBd,UAAe,GACf,YAAiC,CAAC,EAClC,WAAiB,GAoBf,OAAO,iBAAiB,KAAM,CAC5B,KAAM,CACJ,WAAY,GACZ,KAAM,CACJ,OAAO,KAAK,SAAS,IACvB,CACF,EACA,OAAQ,CACN,WAAY,GACZ,KAAM,CACJ,OAAO,KAAK,SAAS,MACvB,CACF,EACA,MAAO,CACL,WAAY,GACZ,KAAM,CACJ,OAAO,KAAK,SAAS,KACvB,CACF,CACF,CAAC,CACH,CAtCA,IAAI,UAAW,CACb,IAAMC,EAAS,CAAC,EACVC,EAAO,KAAK,SAAS,CACzB,QAAUL,IACRI,EAAO,KAAKJ,CAAC,EACN,IAAMI,EAAO,OAExB,CAAC,EACKE,EAAQ,KAAK,SAAS,EAE5B,MAAO,CACL,KAAAD,EACA,OAAAD,EACA,MAAAE,CACF,CACF,CA0BF,EAzFAC,EA2FMC,EAAN,cAAiCL,CAAkB,CAGjD,YAAYM,EAAgB,CAC1B,MAAM,EAHRC,EAAA,KAAAH,EAAA,QAIEI,EAAA,KAAKJ,EAASE,EAChB,CAEA,SAASG,EAAqC,CAC5C,OAAQA,GAAM,SAAWV,GAAUW,EAAA,KAAKN,EAAM,CAChD,CACF,EAVEA,EAAA,YA5FF,IAAAO,EAwGMC,EAAN,cAAiCZ,CAAkB,CAGjD,YAAYa,EAAe,CACzB,MAAM,EAHRN,EAAA,KAAAI,EAAA,QAIEH,EAAA,KAAKG,EAASE,EAChB,CAEA,SAASJ,EAAqC,CAC5C,OAAQA,GAAM,SAAWd,GAASe,EAAA,KAAKC,EAAM,CAC/C,CACF,EAVEA,EAAA,YAzGF,IAAAG,EAsHMC,EAAN,cAAqCf,CAAkB,CAGrD,YAAYJ,EAAY,CACtB,MAAM,EAHRW,EAAA,KAAAO,EAAA,QAIEN,EAAA,KAAKM,EAAU,OAAOlB,CAAC,EACzB,CAGA,UAAW,CACT,OAAOc,EAAA,KAAKI,EACd,CACF,EAXEA,EAAA,YAaK,SAASE,EAAgBnB,EAAgC,CAC9D,OAAOA,aAAaG,CACtB,CAEA,SAASiB,EAAUC,EAAc,CAC/B,OAAO,IAAIN,EAAmBM,CAAI,CACpC,CAEA,SAASC,EAAUtB,EAAuC,CACxD,OAAI,OAAOA,EAAM,KAAemB,EAAgBnB,CAAC,EAAUA,EACpD,IAAIQ,EAAmBR,CAAC,CACjC,CAEA,SAASuB,EAAQlB,EAAsD,CACrE,OAAI,OAAOA,EAAS,KAAec,EAAgBd,CAAI,EAAUA,EAC7D,MAAM,QAAQA,CAAI,EAAU,IAAImB,EAAenB,EAAK,IAAIkB,CAAO,CAAC,EAC7D,IAAIL,EAAuBb,CAAI,CACxC,CAEA,SAASoB,EAAczB,EAAY,CACjC,OAAI,OAAOA,EAAM,KAAemB,EAAgBnB,CAAC,EAAUA,EACpDuB,EAAQ,KAAK,UAAUvB,CAAC,CAAC,CAClC,CAeO,IAAM0B,EACXC,GAC+B,CAI/B,GAHI,CAAC,MAAM,QAAQA,CAAI,GACnB,OAAOA,IAAO,CAAC,GAAM,UAAYA,EAAK,CAAC,IAAM,MAAQ,EAAE,QAASA,EAAK,CAAC,IAEtE,CAAC,MAAM,QAAQA,EAAK,CAAC,CAAC,EAAG,MAAO,GACpC,GAAM,CAACC,EAAO,GAAGxB,CAAM,EAAIuB,EAC3B,OAAOC,EAAM,OAAS,IAAMxB,EAAO,MACrC,EAEA,SAASyB,EACPD,EACAxB,EACA,CACA,GAAIwB,EAAM,OAAS,IAAMxB,EAAO,OAC9B,MAAM,IAAI,MAAM,8BAA8B,EAChD,OAAOwB,EAAM,QAAQ,CAACvB,EAAMyB,IAASA,EAAM,CAAC1B,EAAO0B,EAAM,CAAC,EAAGzB,CAAI,EAAI,CAACA,CAAI,CAAE,CAC9E,CA3LA,IAAA0B,EAAAC,EA6LMR,EAAN,cAA6BrB,CAAkB,CAI7C,eACKwB,EAIH,CACA,MAAM,EATRjB,EAAA,KAAAqB,EAAyB,CAAC,GAC1BrB,EAAA,KAAAsB,EAAA,QASE,GAAArB,EAAA,KAAKqB,EAAQ,CACX,OAAQ,GACR,KAAM,GACN,OAAQ,GACR,MAAO,GACP,UAAYhC,GAAMA,CACpB,GAEI,MAAM,QAAQ2B,EAAK,CAAC,CAAC,EAAG,CAC1B,GAAM,CAACvB,EAAQQ,CAAI,EAAIe,EAIvBhB,EAAA,KAAKqB,EAAQ,CAAE,GAAGnB,EAAA,KAAKmB,GAAO,GAAGpB,CAAK,GACtC,KAAK,KAAK,GAAGR,CAAM,CACrB,KAAO,CACL,GAAM,CAACQ,CAAI,EAAIe,EACfhB,EAAA,KAAKqB,EAAQ,CAAE,GAAGnB,EAAA,KAAKmB,GAAO,GAAGpB,CAAK,EACxC,CACF,CAEA,iBACEqB,EAAiB,GACjBC,EAAe,GACfC,EAAiB,GACjBC,EAAgB,GAChB,CACA,OAAAzB,EAAA,KAAKqB,EAAQ,CAAE,GAAGnB,EAAA,KAAKmB,GAAO,OAAAC,EAAQ,KAAAC,EAAM,OAAAC,EAAQ,MAAAC,CAAM,GACnD,IACT,CAEA,QAAQT,EAA8C,CACpD,OAAAd,EAAA,KAAKkB,GAAM,KACT,GAAIJ,EAAK,IAAIJ,CAAO,EAAE,OAAQvB,GAAMA,IAAM,MAAS,CACrD,EACO,IACT,CAGA,UAAU2B,EAA8C,CACtD,OAAO,KAAK,KAAK,GAAGA,CAAI,CAC1B,CAEA,KAAKO,EAAe,KAAM,CACxB,OAAArB,EAAA,KAAKmB,GAAM,KAAOE,EACX,IACT,CAEA,OAAOD,EAAiB,IAAK,CAC3B,OAAApB,EAAA,KAAKmB,GAAM,OAASC,EACb,IACT,CAEA,OAAOE,EAAiB,IAAK,CAC3B,OAAAtB,EAAA,KAAKmB,GAAM,OAASG,EACb,IACT,CAEA,MAAMC,EAAgB,GAAI,CACxB,OAAAvB,EAAA,KAAKmB,GAAM,MAAQI,EACZ,IACT,CAEA,SAASxB,EAA6C,CACpD,OAAIC,EAAA,KAAKkB,GAAM,SAAW,EAAUlB,EAAA,KAAKmB,GAAM,MAE7CnB,EAAA,KAAKmB,GAAM,OACXnB,EAAA,KAAKmB,GAAM,UACTnB,EAAA,KAAKkB,GAAM,IAAK/B,GAAMA,EAAE,SAASY,CAAI,CAAC,EAAE,KAAKC,EAAA,KAAKmB,GAAM,IAAI,EAC5DpB,CACF,EACAC,EAAA,KAAKmB,GAAM,MAEf,CACF,EApFED,EAAA,YACAC,EAAA,YAqFK,SAASK,KACXV,EAGa,CAChB,IAAIW,EACJ,GAAIZ,EAAqBC,CAAI,EAAG,CAE9B,GAAM,CAACC,EAAO,GAAGxB,CAAM,EAAIuB,EAK3BW,EAAY,CACV,IAAId,EACFK,EAA0BD,EAAM,IAAIL,CAAO,EAAGnB,EAAO,IAAIkB,CAAS,CAAC,CACrE,CACF,CACF,MAEEgB,EAAYX,EAAK,IAAIL,CAAS,EAGhC,OAAO,IAAIE,EAAec,CAAS,CACrC,CAEO,IAAMtB,EAAQI,EAEd,SAASmB,KAAOZ,EAAiB,CACtC,OAAO,IAAIH,EAAeG,EAAK,IAAIJ,CAAO,CAAC,CAC7C,CAEO,SAASiB,MACXb,EAGH,CACA,IAAIW,EACEG,EAAY,CAACzC,EAAWY,KAC3BA,GAAM,SAAWV,GAAUF,CAAC,EAC/B,GAAI0B,EAAqBC,CAAI,EAAG,CAC9B,GAAM,CAACC,EAAO,GAAGxB,CAAM,EAAIuB,EAC3BW,EAAY,CACV,IAAId,EACFK,EACED,EAAM,IAAIL,CAAO,EACjBnB,EAAO,IAAIqB,CAAa,CAC1B,EACA,CAAE,UAAAgB,CAAU,CACd,CACF,CACF,MAEEH,EAAYX,EAAK,IACd3B,GAAM,IAAIwB,EAAe,CAACC,EAAczB,CAAC,CAAC,EAAG,CAAE,UAAAyC,CAAU,CAAC,CAC7D,EAGF,OAAO,IAAIjB,EAAec,CAAS,CACrC,CAEO,SAASI,KAAgBf,EAAkB,CAChD,IAAMgB,EAAU,IAAInB,EAEdoB,EAASC,GAAkB,CAC/B,GAAIA,IAAQ,QACRA,IAAQ,KAEZ,IAAI,OAAOA,GAAQ,SAAU,CAC3BF,EAAQ,KAAKpB,EAAQsB,CAAG,CAAC,EACzB,MACF,CAEA,GAAI1B,EAAgB0B,CAAG,EAAG,CACxBF,EAAQ,KAAKE,CAAG,EAChB,MACF,CAEA,GAAI,MAAM,QAAQA,CAAG,EAAG,CACtBA,EAAI,QAAQD,CAAK,EACjB,MACF,CAEA,GAAI,OAAOC,GAAQ,SAAU,CAC3B,QAAWC,KAAOD,EAChB,GAAIA,EAAIC,CAAG,IAAM,OAEjB,IAAI3B,EAAgB0B,EAAIC,CAAG,CAAC,EAAG,CAC7BH,EAAQ,KAAKN,IAAMjB,EAAU0B,CAAG,KAAKD,EAAIC,CAAG,GAAG,EAC/C,QACF,CAEA,GAAID,EAAIC,CAAG,IAAM,KAAM,CACrBH,EAAQ,KAAKN,IAAMjB,EAAU0B,CAAG,WAAW,EAC3C,QACF,CAEA,GAAI,MAAM,QAAQD,EAAIC,CAAG,CAAC,EAAG,CAC3BH,EAAQ,KAAKN,IAAMjB,EAAU0B,CAAG,YAAYD,EAAIC,CAAG,IAAI,EACvD,QACF,CAGAH,EAAQ,KAAKN,IAAMjB,EAAU0B,CAAG,OAAOD,EAAIC,CAAG,GAAG,EAEnD,MACF,EACF,EAEA,OAAAF,EAAMjB,CAAI,EAEHgB,CACT,CAEO,SAASI,KAAMC,EAAgB,CACpC,OAAON,EAAaM,CAAE,EAAE,iBAAiB,KAAM,SAAU,KAAM,OAAO,CACxE,CAEO,SAASC,KAAOD,EAAgB,CACrC,OAAON,EAAaM,CAAE,EAAE,iBAAiB,KAAM,UAAW,KAAM,MAAM,CACxE,CAEO,SAASE,KAASF,EAAgB,CACvC,OAAON,EAAaM,CAAE,EAAE,iBAAiB,WAAY,UAAW,KAAM,EAAE,CAC1E,CAEO,SAASG,KAAYH,EAAgB,CAC1C,OAAON,EAAaM,CAAE,EAAE,iBAAiB,WAAY,SAAU,KAAM,EAAE,CACzE,CAEO,SAASI,EAAYC,EAAkC,CAC5D,GAAI,CAAC,MAAM,QAAQA,CAAG,EAAG,CACvB,GAAI,OAAOA,GAAQ,SACjB,MAAM,IAAI,MAAM,4CAA4C,EAC9DA,EAAM,CAACA,CAAG,CACZ,CACA,GAAIA,EAAI,SAAW,EACjB,MAAM,IAAI,MAAM,uDAAuD,EAEzE,IAAMC,EAAQD,EAAI,IAAKrD,GAAO,OAAOA,GAAM,SAAW,OAAO,OAAOA,CAAC,EAAIA,CAAE,EAErEuD,EAAMD,EAAM,CAAC,EAAE,OACrB,GAAIA,EAAM,KAAME,GAAQA,EAAI,SAAWD,CAAG,EACxC,MAAM,IAAI,MAAM,gDAAgD,EAGlE,IAAMnD,EAASiC,EACb,GAAGiB,EAAM,IAAKG,GAAMpB,EAAI,GAAGoB,CAAC,EAAE,KAAK,IAAI,CAAC,CAC1C,EAAE,iBAAiB,IAAK,OAAQ,GAAG,EACnC,OAAOpB,WAAajC,GACtB,CAEO,SAASsD,EAAUL,EAAkC,CAE1D,GADK,MAAM,QAAQA,CAAG,IAAGA,EAAM,CAACA,CAAG,GAC/BA,EAAI,QAAU,GAAK,CAACA,EAAI,CAAC,GAAK,OAAOA,EAAI,CAAC,GAAM,SAClD,MAAM,IAAI,MAAM,8BAA8B,EAEhD,IAAMM,EAAK,OAAO,KAAKN,EAAI,CAAC,CAAC,EACvBE,EAAMI,EAAG,KAAK,EACpB,GAAIN,EAAI,KAAML,GAAO,OAAO,KAAKA,CAAE,EAAE,KAAK,IAAMO,CAAG,EACjD,MAAM,IAAI,MAAM,+CAA+C,EAGjE,OAAOlB,EAAI,GAAGsB,EAAG,IAAIvC,CAAS,CAAC,EAAE,iBAAiB,IAAK,KAAM,GAAG,CAClE,CAEO,SAASwC,EACdC,EACAR,EACAS,EACA,CACK,MAAM,QAAQT,CAAG,IAAGA,EAAM,CAACA,CAAG,GAEnC,IAAMU,EAAOL,EAAUL,CAAG,EACpBjD,EAASgD,EAAYC,EAAI,IAAI,OAAO,MAAM,CAAC,EAEjD,OAAOhB,gBAAkBjB,EAAUyC,CAAK,KAAKE,KAAQ3D,IAClD,OAAOmB,EAAQuC,CAAQ,CAAC,EACxB,KAAK,GAAG,CACb,CAEO,SAASE,EACdH,EACAb,EACAiB,EACAH,EACA,CACA,IAAMI,EAAQ,IAAI1C,EAElB,QAAW2C,KAAKnB,EAAI,CAClB,IAAMH,EAAMG,EAAGmB,CAAC,EACZtB,IAAQ,QAEZqB,EAAM,KAAK7B,IAAMjB,EAAU+C,CAAC,OAAOtB,GAAK,CAC1C,CAEA,OAAOR,WAAajB,EAAUyC,CAAK,SAASK,EAAM,KAAK,IAAI,KAAKhB,EAAMe,CAAK,IACxE,OAAO1C,EAAQuC,CAAQ,CAAC,EACxB,KAAK,GAAG,CACb,CAEO,SAASM,EACdP,EACAI,EACAH,EACA,CACA,OAAOzB,gBAAkBjB,EAAUyC,CAAK,KAAKX,EAAMe,CAAK,IACrD,OAAOH,CAAQ,EACf,KAAK,GAAG,CACb,CAGO,IAAMO,GAAKtB,EACLuB,GAAMrB,EACNgB,GAAQf,EACRqB,GAAYrB,EACZsB,GAAYtB,EACZuB,GAAWtB,EAGxBd,EAAI,IAAME,EACVF,EAAI,MAAQrB,EACZqB,EAAI,KAAOG,GACXH,EAAI,MAAQa,EACZb,EAAI,UAAYkC,GAChBlC,EAAI,SAAWc,EACfd,EAAI,IAAMY,EACVZ,EAAI,GAAKU,EACTV,EAAI,MAAQ4B,GACZ5B,EAAI,UAAYmC,GAChBnC,EAAI,SAAWoC,GACfpC,EAAI,IAAMiC,GACVjC,EAAI,GAAKgC,GACThC,EAAI,OAASuB,EACbvB,EAAI,OAAS2B,EACb3B,EAAI,OAAS+B,EACb/B,EAAI,KAAOqB,EACXrB,EAAI,OAASe,ECjgBb,IAAAsB,EAAAC,EAAAC,EAAAC,GAAAC,EAAAC,EAkDaC,EAAN,KAAkB,CAIvB,YAAYC,EAAeC,EAA2B,CAAC,EAAG,CAK1DC,EAAA,KAAAP,GAiBAO,EAAA,KAAML,GAzBNK,EAAA,KAAAT,EAAA,QACAS,EAAA,KAAAR,EAAA,QAGES,EAAA,KAAKV,EAAMO,GACXG,EAAA,KAAKT,EAAQO,EACf,CAqCA,MAAM,OACJG,EACAC,EACAC,EACA,CACA,IAAMC,EAAQC,EAAYJ,EAAOC,EAAIC,CAAQ,EAC7C,OAAO,MAAMG,EAAA,KAAKZ,EAAAC,GAAL,UAAe,CAACS,CAAK,EACpC,CAEA,MAAM,OACJH,EACAC,EACAK,EACAJ,EACA,CACA,IAAMC,EAAQI,EAAYP,EAAOC,EAAIK,EAAOJ,CAAQ,EACpD,OAAO,MAAMG,EAAA,KAAKZ,EAAAC,GAAL,UAAe,CAACS,CAAK,EACpC,CAEA,MAAM,OACJH,EACAM,EACAJ,EACA,CACA,IAAMC,EAAQK,EAAYR,EAAOM,EAAOJ,CAAQ,EAChD,OAAO,MAAMG,EAAA,KAAKZ,EAAAC,GAAL,UAAe,CAACS,CAAK,EACpC,CAEA,MAAM,SACDM,EACH,CACA,OAAOJ,EAAA,KAAKZ,EAAAC,GAAL,UAAee,EACxB,CAEA,MAAM,WACDA,EACH,CACA,OAAOJ,EAAA,KAAKZ,EAAAC,GAAL,UAAee,GAAM,KAAMC,GAAMA,EAAE,IAAI,CAChD,CAEA,MAAM,UACDD,EACH,CACA,OAAOJ,EAAA,KAAKZ,EAAAC,GAAL,UAAee,GAAM,KAAMC,GAAMA,EAAE,OAAO,CAAC,CAAC,CACrD,CAEA,MAAM,UAAuBD,EAAkC,CAC7D,OAAOJ,EAAA,KAAKZ,EAAAC,GAAL,UAAYe,GAAM,KAAMC,GAAM,OAAO,OAAOA,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAM,CAC3E,CAEA,MAAM,YAAYD,EAAkC,CAClD,OAAOJ,EAAA,KAAKZ,EAAAC,GAAL,UAAYe,GAAM,KAAMC,GAAMA,EAAE,QAAQ,CACjD,CACA,MAAM,QAAQD,EAAkC,CAE9C,OAAOJ,EAAA,KAAKZ,EAAAC,GAAL,UAAYe,GAAM,KAAMC,GAAMA,EAAE,QAAQ,CACjD,CACF,EApGErB,EAAA,YACAC,EAAA,YAOAC,EAAA,YAAAC,GAAwB,SACtBiB,EAC2B,CAC3B,GAAIE,EAAqBF,CAAI,EAAG,CAC9B,GAAM,CAACG,EAAO,GAAGC,CAAM,EAAIJ,EAC3B,OAAOK,EAAIF,EAAO,GAAGC,CAAM,CAC7B,CAEA,GAAM,CAACV,EAAOU,CAAM,EAAIJ,EAExB,OAAI,OAAON,GAAU,UAAYA,GAAS,SAAUA,EAC3CA,EAGF,CAAE,KAAMA,EAAO,OAAQU,GAAU,CAAC,CAAE,CAC7C,EAEMpB,EAAA,YAAAC,EAAmC,eAACe,EAAkC,CAC1E,IAAMN,EAAQE,EAAA,KAAKd,EAAAC,IAAL,UAA8BiB,GAE5CM,EAAA,KAAKzB,IAAO,cAAca,CAAK,EAE/B,IAAMa,EAAS,MAAMD,EAAA,KAAK1B,GAAI,MAASc,CAAK,EAAE,MAAOc,GAAM,CACzD,MAAAF,EAAA,KAAKzB,IAAO,UAAUa,EAAOc,CAAC,EACxBA,CACR,CAAC,EAED,OAAAF,EAAA,KAAKzB,IAAO,aAAa,CAAE,GAAGa,EAAO,OAAAa,CAAO,CAAC,EAEtCA,CACT,EAoEK,SAASE,GACdtB,EACAC,EAC0C,CAC1C,IAAMsB,EAAK,IAAIxB,EAAYC,EAAIC,CAAI,EACnC,OAAO,IAAI,MAAMD,EAAI,CACnB,IAAIA,EAAIwB,EAAKC,EAAU,CACrB,IAAMC,EAASF,KAAOD,EAAKA,EAAKC,KAAOxB,EAAKA,EAAK,OAE3C2B,EAAQD,GAAU,QAAQ,IAAIA,EAAQF,CAAG,EAE/C,OAAIG,GAASA,aAAiB,SACrB,YAA4Bd,GAAiB,CAClD,OAAOc,EAAM,MAAM,OAASF,EAAWC,EAAS,KAAMb,EAAI,CAC5D,EAGKc,CACT,CACF,CAAC,CACH",
+  "names": ["src_exports", "__export", "AND", "OR", "QueryHelper", "WHERE", "WHERE_AND", "WHERE_OR", "and", "buildClauses", "buildDelete", "buildInsert", "buildKeys", "buildUpdate", "buildValues", "ident", "isQueryFragment", "isQueryTemplateStyle", "json", "or", "pgIdent", "pgString", "raw", "sql", "useQueryHelper", "where", "where_and", "where_or", "__toCommonJS", "import_pg_escape", "pgIdent", "s", "x", "pgescape", "pgString", "QueryFragmentBase", "values", "text", "embed", "_value", "QueryFragmentValue", "value", "__privateAdd", "__privateSet", "opts", "__privateGet", "_ident", "QueryFragmentIdent", "ident", "_string", "QueryFragmentRawString", "isQueryFragment", "makeIdent", "name", "makeValue", "makeRaw", "QueryFragments", "makeJsonValue", "isQueryTemplateStyle", "args", "texts", "sewTemplateTextsAndValues", "idx", "_list", "_opts", "prefix", "glue", "suffix", "empty", "sql", "fragments", "raw", "json", "wrapperFn", "buildClauses", "clauses", "parse", "val", "key", "OR", "fv", "AND", "WHERE", "WHERE_OR", "buildValues", "fvs", "array", "sig", "arg", "v", "buildKeys", "ks", "buildInsert", "table", "appendix", "keys", "buildUpdate", "where", "pairs", "k", "buildDelete", "or", "and", "WHERE_AND", "where_and", "where_or", "_db", "_opts", "_parseQueryTemplateStyle", "parseQueryTemplateStyle_fn", "_query", "query_fn", "QueryHelper", "db", "opts", "__privateAdd", "__privateSet", "table", "fv", "appendix", "query", "buildInsert", "__privateMethod", "where", "buildUpdate", "buildDelete", "args", "x", "isQueryTemplateStyle", "texts", "values", "sql", "__privateGet", "result", "e", "useQueryHelper", "qh", "key", "receiver", "target", "value"]
+}

package/dist/index.esm.mjs

@@ -0,0 +1,2 @@
+var W=(e,n,t)=>{if(!n.has(e))throw TypeError("Cannot "+t)};var i=(e,n,t)=>(W(e,n,"read from private field"),t?t.call(e):n.get(e)),p=(e,n,t)=>{if(n.has(e))throw TypeError("Cannot add the same private member more than once");n instanceof WeakSet?n.add(e):n.set(e,t)},l=(e,n,t,r)=>(W(e,n,"write to private field"),r?r.call(e,t):n.set(e,t),t);var y=(e,n,t)=>(W(e,n,"access private method"),t);import $ from"pg-escape";function X(e){return e.split(".").map(n=>$.ident(n)).join(".")}function C(e){return e===null?"NULL":typeof e=="boolean"?e?"true":"false":Array.isArray(e)?"ARRAY["+e.map(C).join(",")+"]":typeof e=="object"?$.literal(JSON.stringify(e)):$.literal(String(e))}var d=class{constructor(){this.text="";this.values=[];this.embed="";Object.defineProperties(this,{text:{enumerable:!0,get(){return this.compiled.text}},values:{enumerable:!0,get(){return this.compiled.values}},embed:{enumerable:!0,get(){return this.compiled.embed}}})}get compiled(){let n=[],t=this.toString({valueFn:u=>(n.push(u),"$"+n.length)}),r=this.toString();return{text:t,values:n,embed:r}}},A,q=class extends d{constructor(t){super();p(this,A,void 0);l(this,A,t)}toString(t){return(t?.valueFn??C)(i(this,A))}};A=new WeakMap;var R,V=class extends d{constructor(t){super();p(this,R,void 0);l(this,R,t)}toString(t){return(t?.identFn??X)(i(this,R))}};R=new WeakMap;var S,H=class extends d{constructor(t){super();p(this,S,void 0);l(this,S,String(t))}toString(){return i(this,S)}};S=new WeakMap;function F(e){return e instanceof d}function f(e){return new V(e)}function I(e){return typeof e>"u"||F(e)?e:new q(e)}function h(e){return typeof e>"u"||F(e)?e:Array.isArray(e)?new g(e.map(h)):new H(e)}function _(e){return typeof e>"u"||F(e)?e:h(JSON.stringify(e))}var O=e=>{if(!Array.isArray(e)||typeof e?.[0]!="object"||e[0]===null||!("raw"in e[0])||!Array.isArray(e[0]))return!1;let[n,...t]=e;return n.length-1===t.length};function L(e,n){if(e.length-1!==n.length)throw new Error("Invalid call of the function");return e.flatMap((t,r)=>r?[n[r-1],t]:[t])}var x,o,g=class extends d{constructor(...t){super();p(this,x,[]);p(this,o,void 0);if(l(this,o,{prefix:"",glue:"",suffix:"",empty:"",wrapperFn:r=>r}),Array.isArray(t[0])){let[r,u]=t;l(this,o,{...i(this,o),...u}),this.push(...r)}else{let[r]=t;l(this,o,{...i(this,o),...r})}}setSewingPattern(t="",r="",u="",c=""){return l(this,o,{...i(this,o),prefix:t,glue:r,suffix:u,empty:c}),this}push(...t){return i(this,x).push(...t.map(h).filter(r=>r!==void 0)),this}append(...t){return this.push(...t)}join(t=", "){return i(this,o).glue=t,this}prefix(t=" "){return i(this,o).prefix=t,this}suffix(t=" "){return i(this,o).suffix=t,this}empty(t=""){return i(this,o).empty=t,this}toString(t){return i(this,x).length===0?i(this,o).empty:i(this,o).prefix+i(this,o).wrapperFn(i(this,x).map(r=>r.toString(t)).join(i(this,o).glue),t)+i(this,o).suffix}};x=new WeakMap,o=new WeakMap;function s(...e){let n;if(O(e)){let[t,...r]=e;n=[new g(L(t.map(h),r.map(I)))]}else n=e.map(I);return new g(n)}var Z=f;function B(...e){return new g(e.map(h))}function ee(...e){let n,t=(r,u)=>(u?.valueFn||C)(r);if(O(e)){let[r,...u]=e;n=[new g(L(r.map(h),u.map(_)),{wrapperFn:t})]}else n=e.map(r=>new g([_(r)],{wrapperFn:t}));return new g(n)}function E(...e){let n=new g,t=r=>{if(r!==void 0&&r!==null){if(typeof r=="string"){n.push(h(r));return}if(F(r)){n.push(r);return}if(Array.isArray(r)){r.forEach(t);return}if(typeof r=="object"){for(let u in r)if(r[u]!==void 0){if(F(r[u])){n.push(s`${f(u)} ${r[u]}`);continue}if(r[u]===null){n.push(s`${f(u)} IS NULL`);continue}if(Array.isArray(r[u])){n.push(s`${f(u)} = ANY (${r[u]})`);continue}n.push(s`${f(u)} = ${r[u]}`)}return}}};return t(e),n}function U(...e){return E(e).setSewingPattern("((",") OR (","))","false")}function J(...e){return E(e).setSewingPattern("((",") AND (","))","true")}function T(...e){return E(e).setSewingPattern("WHERE ((",") AND (","))","")}function K(...e){return E(e).setSewingPattern("WHERE ((",") OR (","))","")}function M(e){if(!Array.isArray(e)){if(typeof e!="object")throw new Error("buildValues: The argument must be an array");e=[e]}if(e.length===0)throw new Error("buildValues: Array must contain elements at least one");let n=e.map(u=>typeof u=="object"?Object.values(u):u),t=n[0].length;if(n.some(u=>u.length!==t))throw new Error("buildValues: Array must all be the same length");let r=s(...n.map(u=>s(...u).join(", "))).setSewingPattern("(","), (",")");return s`VALUES ${r}`}function Y(e){if(Array.isArray(e)||(e=[e]),e.length==0||!e[0]||typeof e[0]!="object")throw new Error("Invalid call of the function");let n=Object.keys(e[0]),t=n.join();if(e.some(r=>Object.keys(r).join()!==t))throw new Error("buildKeys: All objects must have the same key");return s(...n.map(f)).setSewingPattern("(",", ",")")}function N(e,n,t){Array.isArray(n)||(n=[n]);let r=Y(n),u=M(n.map(Object.values));return s`INSERT INTO ${f(e)} ${r} ${u}`.append(h(t)).join(" ")}function P(e,n,t,r){let u=new g;for(let c in n){let Q=n[c];Q!==void 0&&u.push(s`${f(c)} = ${Q}`)}return s`UPDATE ${f(e)} SET ${u.join(", ")} ${T(t)}`.append(h(r)).join(" ")}function D(e,n,t){return s`DELETE FROM ${f(e)} ${T(n)}`.append(t).join(" ")}var te=U,ne=J,re=T,ue=T,se=T,ie=K;s.raw=B;s.ident=Z;s.json=ee;s.WHERE=T;s.WHERE_AND=ue;s.WHERE_OR=K;s.AND=J;s.OR=U;s.where=re;s.where_and=se;s.where_or=ie;s.and=ne;s.or=te;s.insert=N;s.update=P;s.delete=D;s.keys=Y;s.values=M;var k,w,j,z,a,m,v=class{constructor(n,t={}){p(this,j);p(this,a);p(this,k,void 0);p(this,w,void 0);l(this,k,n),l(this,w,t)}async insert(n,t,r){let u=N(n,t,r);return await y(this,a,m).call(this,[u])}async update(n,t,r,u){let c=P(n,t,r,u);return await y(this,a,m).call(this,[c])}async delete(n,t,r){let u=D(n,t,r);return await y(this,a,m).call(this,[u])}async query(...n){return y(this,a,m).call(this,n)}async getRows(...n){return y(this,a,m).call(this,n).then(t=>t.rows)}async getRow(...n){return y(this,a,m).call(this,n).then(t=>t.rows?.[0])}async getOne(...n){return y(this,a,m).call(this,n).then(t=>Object.values(t.rows?.[0])?.[0])}async getCount(...n){return y(this,a,m).call(this,n).then(t=>t.rowCount)}async exec(...n){return y(this,a,m).call(this,n).then(t=>t.rowCount)}};k=new WeakMap,w=new WeakMap,j=new WeakSet,z=function(n){if(O(n)){let[u,...c]=n;return s(u,...c)}let[t,r]=n;return typeof t=="object"&&t&&"text"in t?t:{text:t,values:r??[]}},a=new WeakSet,m=async function(n){let t=y(this,j,z).call(this,n);i(this,w)?.beforeQuery?.(t);let r=await i(this,k).query(t).catch(u=>{throw i(this,w)?.onError?.(t,u),u});return i(this,w)?.afterQuery?.({...t,result:r}),r};function ge(e,n){let t=new v(e,n);return new Proxy(e,{get(r,u,c){let Q=u in t?t:u in r?r:void 0,b=Q&&Reflect.get(Q,u);return b&&b instanceof Function?function(...G){return b.apply(this===c?Q:this,G)}:b}})}export{J as AND,U as OR,v as QueryHelper,T as WHERE,ue as WHERE_AND,K as WHERE_OR,ne as and,E as buildClauses,D as buildDelete,N as buildInsert,Y as buildKeys,P as buildUpdate,M as buildValues,Z as ident,F as isQueryFragment,O as isQueryTemplateStyle,ee as json,te as or,X as pgIdent,C as pgString,B as raw,s as sql,ge as useQueryHelper,re as where,se as where_and,ie as where_or};
+//# sourceMappingURL=index.esm.mjs.map

package/dist/index.esm.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/query-weaver.ts", "../src/query-helper.ts"],
+  "sourcesContent": ["import pgescape from 'pg-escape';\n\ntype EscapeFunction = (v: unknown) => string;\nexport type FieldValues = Record<string, unknown>;\nexport type WhereArg =\n  | string\n  | FieldValues\n  | QueryFragment\n  | undefined\n  | WhereArg[];\n\nexport function pgIdent(s: string) {\n  // '.' is a special for us\n  return s\n    .split('.')\n    .map((x) => pgescape.ident(x))\n    .join('.');\n}\n\n// fallback function for when the EscapeFunction is not specified\nexport function pgString(s: unknown): string {\n  if (s === null) return 'NULL';\n  if (typeof s === 'boolean') return s ? 'true' : 'false';\n  if (Array.isArray(s)) return 'ARRAY[' + s.map(pgString).join(',') + ']';\n  if (typeof s === 'object') return pgescape.literal(JSON.stringify(s));\n  return pgescape.literal(String(s));\n}\n\ntype QueryFragmentToStringOptions = {\n  valueFn?: EscapeFunction;\n  identFn?: EscapeFunction;\n};\n\nexport interface QueryFragment {\n  text: string;\n  values?: unknown[];\n  embed?: string;\n  sql?: string;\n\n  toString(opts?: QueryFragmentToStringOptions): string;\n}\n\nabstract class QueryFragmentBase implements QueryFragment {\n  // XXX: entries for defineProperties\n  text: string = '';\n  values?: unknown[] | undefined = [];\n  embed?: string = '';\n\n  get compiled() {\n    const values = [] as unknown[];\n    const text = this.toString({\n      valueFn: (x: unknown) => {\n        values.push(x);\n        return '$' + values.length;\n      },\n    });\n    const embed = this.toString();\n\n    return {\n      text,\n      values,\n      embed,\n    };\n  }\n\n  constructor() {\n    Object.defineProperties(this, {\n      text: {\n        enumerable: true,\n        get() {\n          return this.compiled.text;\n        },\n      },\n      values: {\n        enumerable: true,\n        get() {\n          return this.compiled.values;\n        },\n      },\n      embed: {\n        enumerable: true,\n        get() {\n          return this.compiled.embed;\n        },\n      },\n    });\n  }\n\n  abstract toString(opts?: QueryFragmentToStringOptions): string;\n}\n\nclass QueryFragmentValue extends QueryFragmentBase {\n  #value: unknown;\n\n  constructor(value: unknown) {\n    super();\n    this.#value = value;\n  }\n\n  toString(opts?: QueryFragmentToStringOptions) {\n    return (opts?.valueFn ?? pgString)(this.#value);\n  }\n}\n\nclass QueryFragmentIdent extends QueryFragmentBase {\n  #ident: string;\n\n  constructor(ident: string) {\n    super();\n    this.#ident = ident;\n  }\n\n  toString(opts?: QueryFragmentToStringOptions) {\n    return (opts?.identFn ?? pgIdent)(this.#ident);\n  }\n}\n\n// we exploits String constructor\nclass QueryFragmentRawString extends QueryFragmentBase {\n  #string: string;\n\n  constructor(s: unknown) {\n    super();\n    this.#string = String(s);\n  }\n\n  /* toString(_?: QueryFragmentToStringOptions) { */\n  toString() {\n    return this.#string;\n  }\n}\n\nexport function isQueryFragment(x: unknown): x is QueryFragment {\n  return x instanceof QueryFragmentBase;\n}\n\nfunction makeIdent(name: string) {\n  return new QueryFragmentIdent(name);\n}\n\nfunction makeValue(x: unknown): QueryFragment | undefined {\n  if (typeof x === 'undefined' || isQueryFragment(x)) return x;\n  return new QueryFragmentValue(x);\n}\n\nfunction makeRaw(text: unknown | unknown[]): QueryFragment | undefined {\n  if (typeof text === 'undefined' || isQueryFragment(text)) return text;\n  if (Array.isArray(text)) return new QueryFragments(text.map(makeRaw));\n  return new QueryFragmentRawString(text);\n}\n\nfunction makeJsonValue(x: unknown) {\n  if (typeof x === 'undefined' || isQueryFragment(x)) return x;\n  return makeRaw(JSON.stringify(x));\n}\n\ntype QueryFragmentsOptions = {\n  prefix?: string;\n  glue?: string;\n  suffix?: string;\n  empty?: string;\n\n  wrapperFn?: (s: string, opts?: QueryFragmentToStringOptions) => string;\n};\n\nexport type QueryTemplateStyle = [\n  text: TemplateStringsArray,\n  ...values: unknown[]\n];\nexport const isQueryTemplateStyle = (\n  args: unknown\n): args is QueryTemplateStyle => {\n  if (!Array.isArray(args)) return false;\n  if (typeof args?.[0] !== 'object' || args[0] === null || !('raw' in args[0]))\n    return false;\n  if (!Array.isArray(args[0])) return false;\n  const [texts, ...values] = args;\n  return texts.length - 1 === values.length;\n};\n\nfunction sewTemplateTextsAndValues<T = unknown, R = unknown>(\n  texts: T[],\n  values: R[]\n) {\n  if (texts.length - 1 !== values.length)\n    throw new Error('Invalid call of the function');\n  return texts.flatMap((text, idx) => (idx ? [values[idx - 1], text] : [text]));\n}\n\nclass QueryFragments extends QueryFragmentBase {\n  #list: QueryFragment[] = [];\n  #opts: Required<QueryFragmentsOptions>;\n\n  constructor(\n    ...args:\n      | []\n      | [values: (QueryFragment | undefined)[], opts?: QueryFragmentsOptions]\n      | [opts?: QueryFragmentsOptions]\n  ) {\n    super();\n    this.#opts = {\n      prefix: '',\n      glue: '',\n      suffix: '',\n      empty: '',\n      wrapperFn: (x) => x,\n    };\n\n    if (Array.isArray(args[0])) {\n      const [values, opts] = args as [\n        values: (QueryFragment | undefined)[],\n        opts?: QueryFragmentsOptions\n      ];\n      this.#opts = { ...this.#opts, ...opts };\n      this.push(...values);\n    } else {\n      const [opts] = args as [opts?: QueryFragmentsOptions];\n      this.#opts = { ...this.#opts, ...opts };\n    }\n  }\n\n  setSewingPattern(\n    prefix: string = '',\n    glue: string = '',\n    suffix: string = '',\n    empty: string = ''\n  ) {\n    this.#opts = { ...this.#opts, prefix, glue, suffix, empty };\n    return this;\n  }\n\n  push(...args: (QueryFragment | string | undefined)[]) {\n    this.#list.push(\n      ...(args.map(makeRaw).filter((x) => x !== undefined) as QueryFragment[])\n    );\n    return this;\n  }\n\n  // alias\n  append(...args: (QueryFragment | string | undefined)[]) {\n    return this.push(...args);\n  }\n\n  join(glue: string = ', ') {\n    this.#opts.glue = glue;\n    return this;\n  }\n\n  prefix(prefix: string = ' ') {\n    this.#opts.prefix = prefix;\n    return this;\n  }\n\n  suffix(suffix: string = ' ') {\n    this.#opts.suffix = suffix;\n    return this;\n  }\n\n  empty(empty: string = '') {\n    this.#opts.empty = empty;\n    return this;\n  }\n\n  toString(opts?: QueryFragmentToStringOptions): string {\n    if (this.#list.length === 0) return this.#opts.empty;\n    return (\n      this.#opts.prefix +\n      this.#opts.wrapperFn(\n        this.#list.map((x) => x.toString(opts)).join(this.#opts.glue),\n        opts\n      ) +\n      this.#opts.suffix\n    );\n  }\n}\n\nexport function sql(\n  ...args:\n    | [texts: TemplateStringsArray, ...values: unknown[]]\n    | [...values: unknown[]]\n): QueryFragments {\n  let fragments: (QueryFragment | undefined)[];\n  if (isQueryTemplateStyle(args)) {\n    // sql`...` comes here\n    const [texts, ...values] = args as [\n      texts: TemplateStringsArray,\n      values: unknown[]\n    ];\n    // template string looks like a single QueryFragment for user\n    fragments = [\n      new QueryFragments(\n        sewTemplateTextsAndValues(texts.map(makeRaw), values.map(makeValue))\n      ),\n    ];\n  } else {\n    // normal function call\n    fragments = args.map(makeValue);\n  }\n\n  return new QueryFragments(fragments);\n}\n\nexport const ident = makeIdent;\n\nexport function raw(...args: unknown[]) {\n  return new QueryFragments(args.map(makeRaw));\n}\n\nexport function json(\n  ...args:\n    | [...json: unknown[]]\n    | [texts: TemplateStringsArray, ...args: unknown[]]\n) {\n  let fragments: (QueryFragment | undefined)[];\n  const wrapperFn = (x: string, opts?: QueryFragmentToStringOptions) =>\n    (opts?.valueFn || pgString)(x);\n  if (isQueryTemplateStyle(args)) {\n    const [texts, ...values] = args;\n    fragments = [\n      new QueryFragments(\n        sewTemplateTextsAndValues(\n          texts.map(makeRaw),\n          values.map(makeJsonValue)\n        ),\n        { wrapperFn }\n      ),\n    ];\n  } else {\n    // normal function call\n    fragments = args.map(\n      (x) => new QueryFragments([makeJsonValue(x)], { wrapperFn })\n    );\n  }\n\n  return new QueryFragments(fragments);\n}\n\nexport function buildClauses(...args: WhereArg[]) {\n  const clauses = new QueryFragments();\n\n  const parse = (val: WhereArg) => {\n    if (val === undefined) return;\n    if (val === null) return;\n\n    if (typeof val === 'string') {\n      clauses.push(makeRaw(val));\n      return;\n    }\n\n    if (isQueryFragment(val)) {\n      clauses.push(val);\n      return;\n    }\n\n    if (Array.isArray(val)) {\n      val.forEach(parse);\n      return;\n    }\n\n    if (typeof val === 'object') {\n      for (const key in val) {\n        if (val[key] === undefined) continue;\n\n        if (isQueryFragment(val[key])) {\n          clauses.push(sql`${makeIdent(key)} ${val[key]}`);\n          continue;\n        }\n\n        if (val[key] === null) {\n          clauses.push(sql`${makeIdent(key)} IS NULL`);\n          continue;\n        }\n\n        if (Array.isArray(val[key])) {\n          clauses.push(sql`${makeIdent(key)} = ANY (${val[key]})`);\n          continue;\n        }\n\n        // \u305D\u308C\u4EE5\u5916\n        clauses.push(sql`${makeIdent(key)} = ${val[key]}`);\n      }\n      return;\n    }\n  };\n\n  parse(args);\n\n  return clauses;\n}\n\nexport function OR(...fv: WhereArg[]) {\n  return buildClauses(fv).setSewingPattern('((', ') OR (', '))', 'false');\n}\n\nexport function AND(...fv: WhereArg[]) {\n  return buildClauses(fv).setSewingPattern('((', ') AND (', '))', 'true');\n}\n\nexport function WHERE(...fv: WhereArg[]) {\n  return buildClauses(fv).setSewingPattern('WHERE ((', ') AND (', '))', '');\n}\n\nexport function WHERE_OR(...fv: WhereArg[]) {\n  return buildClauses(fv).setSewingPattern('WHERE ((', ') OR (', '))', '');\n}\n\nexport function buildValues(fvs: (FieldValues | unknown[])[]) {\n  if (!Array.isArray(fvs)) {\n    if (typeof fvs !== 'object')\n      throw new Error('buildValues: The argument must be an array');\n    fvs = [fvs];\n  }\n  if (fvs.length === 0)\n    throw new Error('buildValues: Array must contain elements at least one');\n\n  const array = fvs.map((x) => (typeof x === 'object' ? Object.values(x) : x));\n\n  const sig = array[0].length;\n  if (array.some((arg) => arg.length !== sig)) {\n    throw new Error('buildValues: Array must all be the same length');\n  }\n\n  const values = sql(\n    ...array.map((v) => sql(...v).join(', '))\n  ).setSewingPattern('(', '), (', ')');\n  return sql`VALUES ${values}`;\n}\n\nexport function buildKeys(fvs: FieldValues[] | FieldValues) {\n  if (!Array.isArray(fvs)) fvs = [fvs];\n  if (fvs.length == 0 || !fvs[0] || typeof fvs[0] !== 'object')\n    throw new Error('Invalid call of the function');\n\n  const ks = Object.keys(fvs[0]);\n  const sig = ks.join();\n  if (fvs.some((fv) => Object.keys(fv).join() !== sig)) {\n    throw new Error('buildKeys: All objects must have the same key');\n  }\n\n  return sql(...ks.map(makeIdent)).setSewingPattern('(', ', ', ')');\n}\n\nexport function buildInsert(\n  table: string,\n  fvs: FieldValues[] | FieldValues,\n  appendix?: string | QueryFragment\n) {\n  if (!Array.isArray(fvs)) fvs = [fvs];\n\n  const keys = buildKeys(fvs);\n  const values = buildValues(fvs.map(Object.values));\n\n  return sql`INSERT INTO ${makeIdent(table)} ${keys} ${values}`\n    .append(makeRaw(appendix))\n    .join(' ');\n}\n\nexport function buildUpdate(\n  table: string,\n  fv: FieldValues,\n  where?: WhereArg,\n  appendix?: string | QueryFragment\n) {\n  const pairs = new QueryFragments();\n\n  for (const k in fv) {\n    const val = fv[k];\n    if (val === undefined) continue;\n\n    pairs.push(sql`${makeIdent(k)} = ${val}`);\n  }\n\n  return sql`UPDATE ${makeIdent(table)} SET ${pairs.join(', ')} ${WHERE(where)}`\n    .append(makeRaw(appendix))\n    .join(' ');\n}\n\nexport function buildDelete(\n  table: string,\n  where?: WhereArg,\n  appendix?: string | QueryFragment\n) {\n  return sql`DELETE FROM ${makeIdent(table)} ${WHERE(where)}`\n    .append(appendix)\n    .join(' ');\n}\n\n// aliases\nexport const or = OR;\nexport const and = AND;\nexport const where = WHERE;\nexport const WHERE_AND = WHERE;\nexport const where_and = WHERE;\nexport const where_or = WHERE_OR;\n\n// expose via `sql`\nsql.raw = raw;\nsql.ident = ident;\nsql.json = json;\nsql.WHERE = WHERE;\nsql.WHERE_AND = WHERE_AND;\nsql.WHERE_OR = WHERE_OR;\nsql.AND = AND;\nsql.OR = OR;\nsql.where = where;\nsql.where_and = where_and;\nsql.where_or = where_or;\nsql.and = and;\nsql.or = or;\nsql.insert = buildInsert;\nsql.update = buildUpdate;\nsql.delete = buildDelete;\nsql.keys = buildKeys;\nsql.values = buildValues;\n\nexport default {\n  sql,\n  raw,\n  ident,\n  json,\n  WHERE,\n  WHERE_AND,\n  WHERE_OR,\n  AND,\n  OR,\n  where,\n  where_and,\n  where_or,\n  and,\n  or,\n  buildInsert,\n  buildUpdate,\n  buildDelete,\n  buildValues,\n};\n", "import type pg from 'pg';\nimport type {\n  QueryFragment,\n  FieldValues,\n  WhereArg,\n  QueryTemplateStyle,\n} from './query-weaver';\nimport {\n  sql,\n  buildInsert,\n  buildUpdate,\n  buildDelete,\n  isQueryTemplateStyle,\n} from './query-weaver';\n\n// pg (almost) compatible types to relief and reduce their requirements\ntype pgQueryResultCustom<R> = {\n  rowCount: number;\n  rows: R[];\n  fields?: Partial<pg.FieldDef>[];\n};\ntype pgQueryResult<R> = Omit<\n  Partial<pg.QueryResult>,\n  keyof pgQueryResultCustom<R>\n> &\n  pgQueryResultCustom<R>;\n\nexport interface Queryable {\n  query: <T extends pg.QueryResultRow>(queryConfig: {\n    text: string;\n    values?: unknown[];\n  }) => Promise<pgQueryResult<T>>;\n}\n\ntype QueryHelperOptions = {\n  placeHolderFn?: (v: unknown, values: unknown[]) => string;\n\n  beforeQuery?: <T extends pg.QueryConfig<unknown[]>>(ctx: T) => void;\n  afterQuery?: <T extends pg.QueryConfig<unknown[]>>(ctx: T) => void;\n  onError?: <T extends pg.QueryConfig<unknown[]>>(ctx: T, e: Error) => void;\n};\n\ntype QueryTemplateOrSimpleQuery =\n  | QueryTemplateStyle\n  | [query: string, values?: unknown[]]\n  | [query: pg.QueryConfig<unknown[]>];\n\n/**\n * Query Helper\n */\nexport class QueryHelper {\n  #db: Queryable;\n  #opts: QueryHelperOptions;\n\n  constructor(db: Queryable, opts: QueryHelperOptions = {}) {\n    this.#db = db;\n    this.#opts = opts;\n  }\n\n  #parseQueryTemplateStyle(\n    args: QueryTemplateOrSimpleQuery\n  ): pg.QueryConfig<unknown[]> {\n    if (isQueryTemplateStyle(args)) {\n      const [texts, ...values] = args;\n      return sql(texts, ...values);\n    }\n\n    const [query, values] = args;\n\n    if (typeof query === 'object' && query && 'text' in query) {\n      return query;\n    }\n\n    return { text: query, values: values ?? [] };\n  }\n\n  async #query<T extends pg.QueryResultRow>(args: QueryTemplateOrSimpleQuery) {\n    const query = this.#parseQueryTemplateStyle(args);\n\n    this.#opts?.beforeQuery?.(query);\n\n    const result = await this.#db.query<T>(query).catch((e) => {\n      this.#opts?.onError?.(query, e);\n      throw e;\n    });\n\n    this.#opts?.afterQuery?.({ ...query, result });\n\n    return result;\n  }\n\n  // ==================================================================================================\n  // query executors\n\n  async insert<T extends pg.QueryResultRow>(\n    table: string,\n    fv: FieldValues,\n    appendix?: string | QueryFragment\n  ) {\n    const query = buildInsert(table, fv, appendix);\n    return await this.#query<T>([query]);\n  }\n\n  async update<T extends pg.QueryResultRow>(\n    table: string,\n    fv: FieldValues,\n    where: WhereArg,\n    appendix?: string | QueryFragment\n  ) {\n    const query = buildUpdate(table, fv, where, appendix);\n    return await this.#query<T>([query]);\n  }\n\n  async delete<T extends pg.QueryResultRow>(\n    table: string,\n    where: WhereArg,\n    appendix?: string | QueryFragment\n  ) {\n    const query = buildDelete(table, where, appendix);\n    return await this.#query<T>([query]);\n  }\n\n  async query<T extends pg.QueryResultRow>(\n    ...args: QueryTemplateOrSimpleQuery\n  ) {\n    return this.#query<T>(args);\n  }\n\n  async getRows<T extends pg.QueryResultRow>(\n    ...args: QueryTemplateOrSimpleQuery\n  ) {\n    return this.#query<T>(args).then((x) => x.rows);\n  }\n\n  async getRow<T extends pg.QueryResultRow>(\n    ...args: QueryTemplateOrSimpleQuery\n  ) {\n    return this.#query<T>(args).then((x) => x.rows?.[0]);\n  }\n\n  async getOne<T = unknown>(...args: QueryTemplateOrSimpleQuery) {\n    return this.#query(args).then((x) => Object.values(x.rows?.[0])?.[0] as T);\n  }\n\n  async getCount(...args: QueryTemplateOrSimpleQuery) {\n    return this.#query(args).then((x) => x.rowCount);\n  }\n  async exec(...args: QueryTemplateOrSimpleQuery) {\n    // same as getCount\n    return this.#query(args).then((x) => x.rowCount);\n  }\n}\n\n/**\n * Returns a proxy object that overrides the queryable instance `db` by Query Helper utilities\n * @param db - Queryable object to be wrapped\n */\nexport function useQueryHelper<T extends Queryable>(\n  db: T,\n  opts?: QueryHelperOptions\n): Omit<T, keyof QueryHelper> & QueryHelper {\n  const qh = new QueryHelper(db, opts);\n  return new Proxy(db, {\n    get(db, key, receiver) {\n      const target = key in qh ? qh : key in db ? db : undefined;\n\n      const value = target && Reflect.get(target, key);\n\n      if (value && value instanceof Function) {\n        return function (this: unknown, ...args: unknown[]) {\n          return value.apply(this === receiver ? target : this, args);\n        };\n      }\n\n      return value;\n    },\n  }) as T & QueryHelper;\n}\n"],
+  "mappings": "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",
+  "names": ["pgescape", "pgIdent", "s", "x", "pgescape", "pgString", "QueryFragmentBase", "values", "text", "embed", "_value", "QueryFragmentValue", "value", "__privateAdd", "__privateSet", "opts", "__privateGet", "_ident", "QueryFragmentIdent", "ident", "_string", "QueryFragmentRawString", "isQueryFragment", "makeIdent", "name", "makeValue", "makeRaw", "QueryFragments", "makeJsonValue", "isQueryTemplateStyle", "args", "texts", "sewTemplateTextsAndValues", "idx", "_list", "_opts", "prefix", "glue", "suffix", "empty", "sql", "fragments", "raw", "json", "wrapperFn", "buildClauses", "clauses", "parse", "val", "key", "OR", "fv", "AND", "WHERE", "WHERE_OR", "buildValues", "fvs", "array", "sig", "arg", "v", "buildKeys", "ks", "buildInsert", "table", "appendix", "keys", "buildUpdate", "where", "pairs", "k", "buildDelete", "or", "and", "WHERE_AND", "where_and", "where_or", "_db", "_opts", "_parseQueryTemplateStyle", "parseQueryTemplateStyle_fn", "_query", "query_fn", "QueryHelper", "db", "opts", "__privateAdd", "__privateSet", "table", "fv", "appendix", "query", "buildInsert", "__privateMethod", "where", "buildUpdate", "buildDelete", "args", "x", "isQueryTemplateStyle", "texts", "values", "sql", "__privateGet", "result", "e", "useQueryHelper", "qh", "key", "receiver", "target", "value"]
+}

package/dist/{esm/query-helper.d.ts → query-helper.d.ts}

@@ -1,5 +1,5 @@
 import type pg from 'pg';
-import type { QueryFragment, FieldValues, WhereArg } from './query-weaver.js';
+import type { QueryFragment, FieldValues, WhereArg, QueryTemplateStyle } from './query-weaver';
 type pgQueryResultCustom<R> = {
     rowCount: number;
     rows: R[];
@@ -14,24 +14,23 @@ export interface Queryable {
 }
 type QueryHelperOptions = {
     placeHolderFn?: (v: unknown, values: unknown[]) => string;
-    beforeQuery?: <T extends pg.QueryConfig<unknown[]>>(ctx: T) => any;
-    afterQuery?: <T extends pg.QueryConfig<unknown[]>>(ctx: T) => any;
-    onError?: <T extends pg.QueryConfig<unknown[]>>(ctx: T, e: Error) => any;
+    beforeQuery?: <T extends pg.QueryConfig<unknown[]>>(ctx: T) => void;
+    afterQuery?: <T extends pg.QueryConfig<unknown[]>>(ctx: T) => void;
+    onError?: <T extends pg.QueryConfig<unknown[]>>(ctx: T, e: Error) => void;
 };
-type QueryTemplateArgs = [text: TemplateStringsArray, ...values: unknown[]];
-type QueryTemplateOrSimpleQuery = QueryTemplateArgs | [query: string, values?: unknown[]] | [query: pg.QueryConfig<unknown[]>];
+type QueryTemplateOrSimpleQuery = QueryTemplateStyle | [query: string, values?: unknown[]] | [query: pg.QueryConfig<unknown[]>];
 /**
  * Query Helper
  */
 export declare class QueryHelper {
     #private;
     constructor(db: Queryable, opts?: QueryHelperOptions);
-    insert<T extends pg.QueryResultRow = any>(table: string, fv: FieldValues, followingSql?: string | QueryFragment): Promise<pgQueryResult<T>>;
-    update<T extends pg.QueryResultRow = any>(table: string, fv: FieldValues, where: WhereArg, followingSql?: string | QueryFragment): Promise<pgQueryResult<T>>;
-    delete<T extends pg.QueryResultRow = any>(table: string, where: WhereArg, followingSql?: string | QueryFragment): Promise<pgQueryResult<T>>;
-    query<T extends pg.QueryResultRow = any>(...args: QueryTemplateOrSimpleQuery): Promise<pgQueryResult<T>>;
-    getRows<T extends pg.QueryResultRow = any>(...args: QueryTemplateOrSimpleQuery): Promise<T[]>;
-    getRow<T extends pg.QueryResultRow = any>(...args: QueryTemplateOrSimpleQuery): Promise<T>;
+    insert<T extends pg.QueryResultRow>(table: string, fv: FieldValues, appendix?: string | QueryFragment): Promise<pgQueryResult<T>>;
+    update<T extends pg.QueryResultRow>(table: string, fv: FieldValues, where: WhereArg, appendix?: string | QueryFragment): Promise<pgQueryResult<T>>;
+    delete<T extends pg.QueryResultRow>(table: string, where: WhereArg, appendix?: string | QueryFragment): Promise<pgQueryResult<T>>;
+    query<T extends pg.QueryResultRow>(...args: QueryTemplateOrSimpleQuery): Promise<pgQueryResult<T>>;
+    getRows<T extends pg.QueryResultRow>(...args: QueryTemplateOrSimpleQuery): Promise<T[]>;
+    getRow<T extends pg.QueryResultRow>(...args: QueryTemplateOrSimpleQuery): Promise<T>;
     getOne<T = unknown>(...args: QueryTemplateOrSimpleQuery): Promise<T>;
     getCount(...args: QueryTemplateOrSimpleQuery): Promise<number>;
     exec(...args: QueryTemplateOrSimpleQuery): Promise<number>;

package/dist/{cjs/query-weaver.d.ts → query-weaver.d.ts}

@@ -32,27 +32,35 @@ declare class QueryFragmentIdent extends QueryFragmentBase {
     toString(opts?: QueryFragmentToStringOptions): string;
 }
 export declare function isQueryFragment(x: unknown): x is QueryFragment;
+declare function makeIdent(name: string): QueryFragmentIdent;
 type QueryFragmentsOptions = {
     prefix?: string;
     glue?: string;
     suffix?: string;
     empty?: string;
-    makeFragmentFn?: (x: unknown) => QueryFragment;
     wrapperFn?: (s: string, opts?: QueryFragmentToStringOptions) => string;
 };
+export type QueryTemplateStyle = [
+    text: TemplateStringsArray,
+    ...values: unknown[]
+];
+export declare const isQueryTemplateStyle: (args: unknown) => args is QueryTemplateStyle;
 declare class QueryFragments extends QueryFragmentBase {
     #private;
-    constructor(...args: [] | [texts: TemplateStringsArray, values: unknown[], opts?: QueryFragmentsOptions] | [values: unknown[], opts?: QueryFragmentsOptions] | [opts?: QueryFragmentsOptions]);
+    constructor(...args: [] | [values: (QueryFragment | undefined)[], opts?: QueryFragmentsOptions] | [opts?: QueryFragmentsOptions]);
     setSewingPattern(prefix?: string, glue?: string, suffix?: string, empty?: string): this;
     push(...args: (QueryFragment | string | undefined)[]): this;
     append(...args: (QueryFragment | string | undefined)[]): this;
     join(glue?: string): this;
+    prefix(prefix?: string): this;
+    suffix(suffix?: string): this;
+    empty(empty?: string): this;
     toString(opts?: QueryFragmentToStringOptions): string;
 }
-export declare function sql(texts: TemplateStringsArray | string, ...args: unknown[]): QueryFragments;
+export declare function sql(...args: [texts: TemplateStringsArray, ...values: unknown[]] | [...values: unknown[]]): QueryFragments;
 export declare namespace sql {
-    export var raw: typeof sql;
-    export var ident: (name: string) => QueryFragmentIdent;
+    export var raw: typeof import("./query-weaver").raw;
+    export var ident: typeof makeIdent;
     export var json: typeof import("./query-weaver").json;
     export var WHERE: typeof import("./query-weaver").WHERE;
     export var WHERE_AND: typeof import("./query-weaver").WHERE;
@@ -67,21 +75,23 @@ export declare namespace sql {
     export var insert: typeof buildInsert;
     export var update: typeof buildUpdate;
     var _a: typeof buildDelete;
+    export var keys: typeof buildKeys;
     export var values: typeof buildValues;
     export { _a as delete };
 }
-export declare const raw: typeof sql;
-export declare const ident: (name: string) => QueryFragmentIdent;
-export declare function json(...args: [json: unknown] | [texts: TemplateStringsArray, ...args: unknown[]]): QueryFragment | QueryFragments;
+export declare const ident: typeof makeIdent;
+export declare function raw(...args: unknown[]): QueryFragments;
+export declare function json(...args: [...json: unknown[]] | [texts: TemplateStringsArray, ...args: unknown[]]): QueryFragments;
 export declare function buildClauses(...args: WhereArg[]): QueryFragments;
 export declare function OR(...fv: WhereArg[]): QueryFragments;
 export declare function AND(...fv: WhereArg[]): QueryFragments;
 export declare function WHERE(...fv: WhereArg[]): QueryFragments;
 export declare function WHERE_OR(...fv: WhereArg[]): QueryFragments;
-export declare function buildValues(args: unknown[][]): QueryFragments;
-export declare function buildInsert(table: string, fvs: FieldValues[] | FieldValues): QueryFragments;
-export declare function buildUpdate(table: string, fv: FieldValues, where?: WhereArg): QueryFragments;
-export declare function buildDelete(table: string, where?: WhereArg): QueryFragments;
+export declare function buildValues(fvs: (FieldValues | unknown[])[]): QueryFragments;
+export declare function buildKeys(fvs: FieldValues[] | FieldValues): QueryFragments;
+export declare function buildInsert(table: string, fvs: FieldValues[] | FieldValues, appendix?: string | QueryFragment): QueryFragments;
+export declare function buildUpdate(table: string, fv: FieldValues, where?: WhereArg, appendix?: string | QueryFragment): QueryFragments;
+export declare function buildDelete(table: string, where?: WhereArg, appendix?: string | QueryFragment): QueryFragments;
 export declare const or: typeof OR;
 export declare const and: typeof AND;
 export declare const where: typeof WHERE;
@@ -90,8 +100,8 @@ export declare const where_and: typeof WHERE;
 export declare const where_or: typeof WHERE_OR;
 declare const _default: {
     sql: typeof sql;
-    raw: typeof sql;
-    ident: (name: string) => QueryFragmentIdent;
+    raw: typeof raw;
+    ident: typeof makeIdent;
     json: typeof json;
     WHERE: typeof WHERE;
     WHERE_AND: typeof WHERE;