query-weaver 0.0.2 → 0.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +39 -26
- package/dist/index.cjs.js +5 -0
- package/dist/index.cjs.js.map +7 -0
- package/dist/{cjs/index.d.ts → index.d.ts} +0 -0
- package/dist/index.esm.mjs +5 -0
- package/dist/index.esm.mjs.map +7 -0
- package/dist/{esm/query-helper.d.ts → query-helper.d.ts} +10 -10
- package/dist/{cjs/query-weaver.d.ts → query-weaver.d.ts} +5 -1
- package/package.json +37 -11
- package/dist/cjs/index.js +0 -1359
- package/dist/cjs/index.js.map +0 -1
- package/dist/cjs/query-helper.d.ts +0 -44
- package/dist/esm/index.d.ts +0 -2
- package/dist/esm/index.mjs +0 -1334
- package/dist/esm/index.mjs.map +0 -1
- package/dist/esm/query-weaver.d.ts +0 -111
package/README.md
CHANGED
|
@@ -8,24 +8,25 @@ Compose SQL statements safely by leveraging template string literals
|
|
|
8
8
|
$ npm install query-weaver
|
|
9
9
|
```
|
|
10
10
|
|
|
11
|
-
|
|
12
11
|
## Usage
|
|
13
12
|
|
|
14
13
|
### As a SQL Builder
|
|
14
|
+
|
|
15
15
|
```js
|
|
16
16
|
import { sql } from 'query-weaver';
|
|
17
17
|
import pg from 'pg';
|
|
18
18
|
|
|
19
|
-
const foo = 1,
|
|
20
|
-
|
|
19
|
+
const foo = 1,
|
|
20
|
+
bar = 'Bar';
|
|
21
|
+
const query = sql`SELECT * FROM foobar WHERE foo = ${foo} AND bar = ${bar}`;
|
|
21
22
|
|
|
22
|
-
console.log(query.toString())
|
|
23
|
+
console.log(query.toString());
|
|
23
24
|
// SELECT * FROM foobar WHERE foo = '1' AND bar = 'Bar'
|
|
24
25
|
|
|
25
26
|
const db = new pg.Pool();
|
|
26
27
|
const { rows } = await db.query(query);
|
|
27
28
|
|
|
28
|
-
console.log(rows)
|
|
29
|
+
console.log(rows);
|
|
29
30
|
// [ { foo: 1, bar: 'Bar' } ]
|
|
30
31
|
|
|
31
32
|
console.log(JSON.stringify(query, null, 2));
|
|
@@ -44,16 +45,18 @@ db.end();
|
|
|
44
45
|
As you can see, the query is executed using **placeholder** on the database. This makes string-value concatenation safe.
|
|
45
46
|
You can also get a string embed version of the query, so that you can debug the query easily.
|
|
46
47
|
|
|
47
|
-
|
|
48
48
|
### As a Query Helper (with `node-postgres` for example)
|
|
49
|
+
|
|
49
50
|
```js
|
|
50
51
|
import { useQueryHelper } from 'query-weaver';
|
|
51
52
|
import pg from 'pg';
|
|
52
53
|
|
|
53
54
|
const db = useQueryHelper(new pg.Pool());
|
|
54
55
|
|
|
55
|
-
const foo = 1,
|
|
56
|
-
|
|
56
|
+
const foo = 1,
|
|
57
|
+
bar = 'Bar';
|
|
58
|
+
const { rows } =
|
|
59
|
+
await db.query`SELECT * FROM foobar WHERE foo = ${foo} AND bar = ${bar}`;
|
|
57
60
|
|
|
58
61
|
console.log(rows);
|
|
59
62
|
// [ { foo: 1, bar: 'Bar' } ]
|
|
@@ -63,13 +66,20 @@ db.end(); // this call will be proxied to the original pg.Pool() instance
|
|
|
63
66
|
|
|
64
67
|
Almost the same as above, but you can directly pass the template string to the `query` function.
|
|
65
68
|
|
|
66
|
-
|
|
67
69
|
### WHERE builder
|
|
70
|
+
|
|
68
71
|
```js
|
|
69
72
|
import { sql, WHERE, OR } from 'query-weaver';
|
|
70
73
|
|
|
71
|
-
const a = 1,
|
|
72
|
-
|
|
74
|
+
const a = 1,
|
|
75
|
+
b = 'string',
|
|
76
|
+
c = null,
|
|
77
|
+
d = 5,
|
|
78
|
+
e = false,
|
|
79
|
+
f = [1, 2, 3, 4, 5];
|
|
80
|
+
console.log(
|
|
81
|
+
String(sql`SELECT * FROM foobar ${WHERE({ a, b, c }, OR({ d, e }))}`)
|
|
82
|
+
);
|
|
73
83
|
// SELECT * FROM foobar WHERE ((a = '1') AND (b = 'string') AND (c IS NULL) AND (((d = '5') OR (e = false))))
|
|
74
84
|
|
|
75
85
|
const q = sql`SELECT * FROM foobar ${WHERE(
|
|
@@ -77,11 +87,11 @@ const q = sql`SELECT * FROM foobar ${WHERE(
|
|
|
77
87
|
a: 10,
|
|
78
88
|
b: 'string',
|
|
79
89
|
c: sql`IS UNKNOWN`,
|
|
80
|
-
d: sql`BETWEEN ${a} AND ${d}
|
|
90
|
+
d: sql`BETWEEN ${a} AND ${d}`,
|
|
81
91
|
},
|
|
82
|
-
|
|
83
|
-
sql`f IN (${f})
|
|
84
|
-
)}
|
|
92
|
+
'e IS NULL',
|
|
93
|
+
sql`f IN (${f})`
|
|
94
|
+
)}`;
|
|
85
95
|
console.log(q.text);
|
|
86
96
|
// 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)))
|
|
87
97
|
|
|
@@ -89,8 +99,8 @@ console.log(q.embed);
|
|
|
89
99
|
// 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'])))
|
|
90
100
|
```
|
|
91
101
|
|
|
92
|
-
|
|
93
102
|
### JSON builder
|
|
103
|
+
|
|
94
104
|
```js
|
|
95
105
|
import pg from 'pg';
|
|
96
106
|
import { useQueryHelper, json } from 'query-weaver';
|
|
@@ -98,9 +108,10 @@ import { useQueryHelper, json } from 'query-weaver';
|
|
|
98
108
|
const db = useQueryHelper(new pg.Pool());
|
|
99
109
|
|
|
100
110
|
const id = 10;
|
|
101
|
-
const obj = { b: 'string', c: [1, 2, 'X'], d: { e: null, f: undefined } }
|
|
111
|
+
const obj = { b: 'string', c: [1, 2, 'X'], d: { e: null, f: undefined } };
|
|
102
112
|
|
|
103
|
-
const row =
|
|
113
|
+
const row =
|
|
114
|
+
await db.getRow`SELECT * FROM jsonb_to_record(${json`{ 'a': ${obj}, 'b': ${id} }`}) AS (a jsonb, b int);`;
|
|
104
115
|
|
|
105
116
|
console.log(row);
|
|
106
117
|
// {
|
|
@@ -111,16 +122,16 @@ console.log(row);
|
|
|
111
122
|
db.end();
|
|
112
123
|
```
|
|
113
124
|
|
|
114
|
-
|
|
115
125
|
### VALUES builder
|
|
126
|
+
|
|
116
127
|
`buildValues` (or `sql.values`)
|
|
117
128
|
|
|
118
129
|
```js
|
|
119
130
|
sql.values([[ ... values ], ...]); // => VALUES (...), (...), ...
|
|
120
131
|
```
|
|
121
132
|
|
|
122
|
-
|
|
123
133
|
### Simple INSERT builder and executor
|
|
134
|
+
|
|
124
135
|
`buildInsert` (or `sql.insert`) and `insert` executor
|
|
125
136
|
|
|
126
137
|
```js
|
|
@@ -132,18 +143,20 @@ sql.insert(tableName, [{ ... fieldValuePairs }, ... ]); // => sql`INSERT INTO .
|
|
|
132
143
|
db.insert(tableName, [{ ... fieldValuePairs }, ... ]); // => db.query`INSERT INTO ... VALUES (...), (...), ...`
|
|
133
144
|
```
|
|
134
145
|
|
|
135
|
-
|
|
136
146
|
### Simple UPDATE builder and executor
|
|
147
|
+
|
|
137
148
|
`buildUpdate` (or `sql.update`) and `update` executor
|
|
149
|
+
|
|
138
150
|
```js
|
|
139
|
-
sql.update(tableName, { ...
|
|
140
|
-
db.update(tableName, { ...
|
|
151
|
+
sql.update(tableName, { ...fieldValuePairs }, { ...whereCondition }); // => sql`UPDATE ...`
|
|
152
|
+
db.update(tableName, { ...fieldValuePairs }, { ...whereCondition }); // => db.query`UPDATE ...`
|
|
141
153
|
```
|
|
142
154
|
|
|
143
|
-
|
|
144
155
|
### Simple DELETE builder and executor
|
|
156
|
+
|
|
145
157
|
`buildDelete` (or `sql.delete`) and `delete` executor
|
|
158
|
+
|
|
146
159
|
```js
|
|
147
|
-
sql.delete(tableName, { ...
|
|
148
|
-
db.delete(tableName, { ...
|
|
160
|
+
sql.delete(tableName, { ...whereCondition }); // => sql`DELETE FROM ...`
|
|
161
|
+
db.delete(tableName, { ...whereCondition }); // => db.query`DELETE FROM ...`
|
|
149
162
|
```
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
"use strict";var se=Object.create;var j=Object.defineProperty;var ue=Object.getOwnPropertyDescriptor;var ie=Object.getOwnPropertyNames;var oe=Object.getPrototypeOf,pe=Object.prototype.hasOwnProperty;var ae=(e,t)=>{for(var n in t)j(e,n,{get:t[n],enumerable:!0})},J=(e,t,n,r)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of ie(t))!pe.call(e,s)&&s!==n&&j(e,s,{get:()=>t[s],enumerable:!(r=ue(t,s))||r.enumerable});return e};var le=(e,t,n)=>(n=e!=null?se(oe(e)):{},J(t||!e||!e.__esModule?j(n,"default",{value:e,enumerable:!0}):n,e)),ge=e=>J(j({},"__esModule",{value:!0}),e);var N=(e,t,n)=>{if(!t.has(e))throw TypeError("Cannot "+n)};var i=(e,t,n)=>(N(e,t,"read from private field"),n?n.call(e):t.get(e)),g=(e,t,n)=>{if(t.has(e))throw TypeError("Cannot add the same private member more than once");t instanceof WeakSet?t.add(e):t.set(e,n)},a=(e,t,n,r)=>(N(e,t,"write to private field"),r?r.call(e,n):t.set(e,n),n);var y=(e,t,n)=>(N(e,t,"access private method"),n);var fe={};ae(fe,{AND:()=>_,OR:()=>I,QueryHelper:()=>q,WHERE:()=>d,WHERE_AND:()=>B,WHERE_OR:()=>L,and:()=>X,buildClauses:()=>S,buildDelete:()=>H,buildInsert:()=>$,buildUpdate:()=>v,buildValues:()=>U,ident:()=>c,isQueryFragment:()=>F,json:()=>G,or:()=>K,pgIdent:()=>M,pgString:()=>V,raw:()=>O,sql:()=>u,useQueryHelper:()=>he,where:()=>Z,where_and:()=>ee,where_or:()=>te});module.exports=ge(fe);var W=le(require("pg-escape"));function M(e){return e.split(".").map(t=>W.default.ident(t)).join(".")}function V(e){return e===null?"NULL":typeof e=="boolean"?e?"true":"false":Array.isArray(e)?"ARRAY["+e.map(V).join(",")+"]":typeof e=="object"?W.default.literal(JSON.stringify(e)):W.default.literal(String(e))}var w=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 t=[],n=this.toString({valueFn:s=>(t.push(s),"$"+t.length)}),r=this.toString();return{text:n,values:t,embed:r}}},A,P=class extends w{constructor(n){super();g(this,A,void 0);a(this,A,n)}toString(n){return(n?.valueFn??V)(i(this,A))}};A=new WeakMap;var k,D=class extends w{constructor(n){super();g(this,k,void 0);a(this,k,n)}toString(n){return(n?.identFn??M)(i(this,k))}};k=new WeakMap;var R,T=class extends w{constructor(n){super();g(this,R,void 0);a(this,R,n)}toString(){return i(this,R)}};R=new WeakMap;function F(e){return e instanceof w}function ye(e,t,n=r=>r){if(e.length-1!==t.length)throw new Error("Invalid call of the function");return e.flatMap((r,s)=>s?[n(t[s-1]),new T(r)]:[new T(r)])}var Y=e=>F(e)?e:new P(e),z=e=>typeof e=="object"&&e!==null&&"raw"in e,m,o,h=class extends w{constructor(...n){super();g(this,m,[]);g(this,o,void 0);if(a(this,o,{prefix:"",glue:"",suffix:"",empty:"",makeFragmentFn:Y,wrapperFn:r=>r}),z(n[0])){let[r,s,p]=n;a(this,o,{...i(this,o),...p}),a(this,m,ye(r,s,i(this,o).makeFragmentFn))}else if(Array.isArray(n[0])){let[r,s]=n;a(this,o,{...i(this,o),...s}),a(this,m,r.map(p=>i(this,o).makeFragmentFn(p)))}else{let[r]=n;a(this,o,{...i(this,o),...r})}}setSewingPattern(n="",r="",s="",p=""){return a(this,o,{...i(this,o),prefix:n,glue:r,suffix:s,empty:p}),this}push(...n){return i(this,m).push(...n.flatMap(r=>typeof r>"u"?[]:[typeof r=="string"?O(r):r])),this}append(...n){return this.push(...n)}join(n=""){return i(this,o).glue=n,this}toString(n){return i(this,m).length===0?i(this,o).empty:i(this,o).prefix+i(this,o).wrapperFn(i(this,m).map(r=>r.toString(n)).join(i(this,o).glue),n)+i(this,o).suffix}};m=new WeakMap,o=new WeakMap;function u(e,...t){return typeof e=="string"?new h([new T(e),...t]):new h(e,t)}var O=u,c=e=>new D(e);function G(...e){if(z(e[0])){let[n,...r]=e;return new h(n,r,{wrapperFn:(s,p)=>p?.valueFn?.(s)??s,makeFragmentFn:s=>O(JSON.stringify(s))})}let[t]=e;return F(t)?t:u`${JSON.stringify(t)}`}function S(...e){let t=new h,n=function(r){if(r!==void 0&&r!==null){if(typeof r=="string"){t.push(O(r));return}if(F(r)){t.push(r);return}if(Array.isArray(r)){r.forEach(n);return}if(typeof r=="object"){for(let s in r)if(r[s]!==void 0){if(F(r[s])){t.push(u`${c(s)} ${r[s]}`);continue}if(r[s]===null){t.push(u`${c(s)} IS NULL`);continue}if(Array.isArray(r[s])){t.push(u`${c(s)} = ANY (${r[s]})`);continue}t.push(u`${c(s)} = ${r[s]}`)}}}};return n(e),t}function I(...e){return S(e).setSewingPattern("((",") OR (","))","false")}function _(...e){return S(e).setSewingPattern("((",") AND (","))","true")}function d(...e){return S(e).setSewingPattern("WHERE ((",") AND (","))","")}function L(...e){return S(e).setSewingPattern("WHERE ((",") OR (","))","")}function U(e){if(e.length===0)throw new Error("Invalid call of the function");let t=e[0].length;if(e.some(r=>r.length!==t))throw new Error("buildValues array must all be the same length");let n=new h(e.map(r=>new h(r.map(Y)).join(", "))).setSewingPattern("(","), (",")");return u`VALUES ${n}`}function $(e,t){if(Array.isArray(t)||(t=[t]),t.length==0)throw new Error("Invalid call of the function");let n=Object.keys(t[0]),r=n.join();if(t.some(x=>Object.keys(x).join()!==r))throw new Error("buildInsert: All objects must have the same key");let s=new h(n.map(c)).join(", "),p=U(t.map(Object.values));return u`INSERT INTO ${c(e)} (${s}) ${p}`}function v(e,t,n){let r=new h;for(let s in t){let p=t[s];p!==void 0&&r.push(u`${c(s)} = ${p}`)}return u`UPDATE ${c(e)} SET ${r.join(", ")} ${d(n)}`}function H(e,t){return u`DELETE FROM ${c(e)} ${d(t)}`}var K=I,X=_,Z=d,B=d,ee=d,te=L;u.raw=O;u.ident=c;u.json=G;u.WHERE=d;u.WHERE_AND=B;u.WHERE_OR=L;u.AND=_;u.OR=I;u.where=Z;u.where_and=ee;u.where_or=te;u.and=X;u.or=K;u.insert=$;u.update=v;u.delete=H;u.values=U;var ce=e=>{if(!Array.isArray(e)||typeof e?.[0]!="object"||e[0]===null||!("raw"in e[0])||!Array.isArray(e[0]))return!1;let[t,...n]=e;return t.length-1===n.length},b,Q,C,ne,l,f,q=class{constructor(t,n={}){g(this,C);g(this,l);g(this,b,void 0);g(this,Q,void 0);a(this,b,t),a(this,Q,n)}async insert(t,n,r){let s=$(t,n);return r&&s.push(`
|
|
2
|
+
`).push(r),await y(this,l,f).call(this,[s])}async update(t,n,r,s){let p=v(t,n,r);return s&&p.push(`
|
|
3
|
+
`).push(s),await y(this,l,f).call(this,[p])}async delete(t,n,r){let s=H(t,n);return r&&s.push(`
|
|
4
|
+
`).push(r),await y(this,l,f).call(this,[s])}async query(...t){return y(this,l,f).call(this,t)}async getRows(...t){return y(this,l,f).call(this,t).then(n=>n.rows)}async getRow(...t){return y(this,l,f).call(this,t).then(n=>n.rows?.[0])}async getOne(...t){return y(this,l,f).call(this,t).then(n=>Object.values(n.rows?.[0])?.[0])}async getCount(...t){return y(this,l,f).call(this,t).then(n=>n.rowCount)}async exec(...t){return y(this,l,f).call(this,t).then(n=>n.rowCount)}};b=new WeakMap,Q=new WeakMap,C=new WeakSet,ne=function(t){if(ce(t)){let[s,...p]=t;return u(s,...p)}let[n,r]=t;return typeof n=="object"&&n&&"text"in n?n:{text:n,values:r??[]}},l=new WeakSet,f=async function(t){let n=y(this,C,ne).call(this,t);i(this,Q)?.beforeQuery?.(n);let r=await i(this,b).query(n).catch(s=>{throw i(this,Q)?.onError?.(n,s),s});return i(this,Q)?.afterQuery?.({...n,result:r}),r};function he(e,t){let n=new q(e,t);return new Proxy(e,{get(r,s,p){let x=s in n?n:s in r?r:void 0,E=x&&Reflect.get(x,s);return E&&E instanceof Function?function(...re){return E.apply(this===p?x:this,re)}:E}})}0&&(module.exports={AND,OR,QueryHelper,WHERE,WHERE_AND,WHERE_OR,and,buildClauses,buildDelete,buildInsert,buildUpdate,buildValues,ident,isQueryFragment,json,or,pgIdent,pgString,raw,sql,useQueryHelper,where,where_and,where_or});
|
|
5
|
+
//# sourceMappingURL=index.cjs.js.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../src/index.ts", "../src/query-weaver.ts", "../src/query-helper.ts"],
|
|
4
|
+
"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: string) {\n super();\n this.#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 sewTextsAndValues<T = unknown, R = unknown>(\n texts: TemplateStringsArray,\n values: R[],\n hook: (value: unknown) => T = (x: unknown) => x as T\n) {\n if (texts.length - 1 !== values.length)\n throw new Error('Invalid call of the function');\n return texts.flatMap((text, idx) =>\n idx\n ? [hook(values[idx - 1]), new QueryFragmentRawString(text)]\n : [new QueryFragmentRawString(text)]\n );\n}\n\nconst value = (x: unknown) => {\n if (isQueryFragment(x)) return x; // assume it's already wrapped\n return new QueryFragmentValue(x);\n};\n\ntype QueryFragmentsOptions = {\n prefix?: string;\n glue?: string;\n suffix?: string;\n empty?: string;\n\n makeFragmentFn?: (x: unknown) => QueryFragment;\n wrapperFn?: (s: string, opts?: QueryFragmentToStringOptions) => string;\n};\n\nconst isTemplateStringsArray = (x: unknown): x is TemplateStringsArray =>\n typeof x === 'object' && x !== null && 'raw' in x;\n\nclass QueryFragments extends QueryFragmentBase {\n #list: QueryFragment[] = [];\n #opts: Required<QueryFragmentsOptions>;\n\n constructor(\n ...args:\n | []\n | [\n texts: TemplateStringsArray,\n values: unknown[],\n opts?: QueryFragmentsOptions\n ]\n | [values: unknown[], opts?: QueryFragmentsOptions]\n | [opts?: QueryFragmentsOptions]\n ) {\n super();\n this.#opts = {\n prefix: '',\n glue: '',\n suffix: '',\n empty: '',\n makeFragmentFn: value,\n wrapperFn: (x) => x,\n };\n\n if (isTemplateStringsArray(args[0])) {\n const [texts, values, opts] = args as [\n texts: TemplateStringsArray,\n values: unknown[],\n opts?: QueryFragmentsOptions\n ];\n this.#opts = { ...this.#opts, ...opts };\n this.#list = sewTextsAndValues(texts, values, this.#opts.makeFragmentFn);\n } else if (Array.isArray(args[0])) {\n const [values, opts] = args as [\n values: unknown[],\n opts?: QueryFragmentsOptions\n ];\n this.#opts = { ...this.#opts, ...opts };\n this.#list = values.map((v) => this.#opts.makeFragmentFn(v));\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.flatMap((v) =>\n typeof v === 'undefined' ? [] : [typeof v === 'string' ? raw(v) : v]\n )\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 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 texts: TemplateStringsArray | string,\n ...args: unknown[]\n): QueryFragments {\n if (typeof texts === 'string')\n return new QueryFragments([new QueryFragmentRawString(texts), ...args]);\n return new QueryFragments(texts, args);\n}\n\nexport const raw = sql; // just an alias\nexport const ident = (name: string) => new QueryFragmentIdent(name);\n\nexport function json(\n ...args: [json: unknown] | [texts: TemplateStringsArray, ...args: unknown[]]\n) {\n if (isTemplateStringsArray(args[0])) {\n const [texts, ...values] = args;\n\n return new QueryFragments(texts, values, {\n wrapperFn: (x: string, opts?: QueryFragmentToStringOptions) =>\n opts?.valueFn?.(x) ?? x, // stringify at last\n makeFragmentFn: (x: unknown) => raw(JSON.stringify(x)), // no escape\n });\n }\n\n const [obj] = args;\n if (isQueryFragment(obj)) return obj; // assume it's already wrapped\n return sql`${JSON.stringify(obj)}`;\n}\n\nexport function buildClauses(...args: WhereArg[]) {\n const clauses = new QueryFragments();\n\n const parse = function (val: WhereArg) {\n if (val === undefined) return;\n if (val === null) return;\n if (typeof val === 'string') {\n clauses.push(raw(val));\n return;\n }\n if (isQueryFragment(val)) {\n clauses.push(val);\n return;\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`${ident(key)} ${val[key]}`);\n continue;\n }\n\n if (val[key] === null) {\n clauses.push(sql`${ident(key)} IS NULL`);\n continue;\n }\n\n if (Array.isArray(val[key])) {\n clauses.push(sql`${ident(key)} = ANY (${val[key]})`);\n continue;\n }\n\n // \u305D\u308C\u4EE5\u5916\n clauses.push(sql`${ident(key)} = ${val[key]}`);\n }\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(args: unknown[][]) {\n if (args.length === 0) throw new Error('Invalid call of the function');\n\n const sig = args[0].length;\n if (args.some((arg) => arg.length !== sig)) {\n throw new Error('buildValues array must all be the same length');\n }\n\n const values = new QueryFragments(\n args.map((v) => new QueryFragments(v.map(value)).join(', '))\n ).setSewingPattern('(', '), (', ')');\n return sql`VALUES ${values}`;\n}\n\nexport function buildInsert(table: string, fvs: FieldValues[] | FieldValues) {\n if (!Array.isArray(fvs)) fvs = [fvs];\n if (fvs.length == 0) 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('buildInsert: All objects must have the same key');\n }\n\n const keys = new QueryFragments(ks.map(ident)).join(', ');\n const values = buildValues(fvs.map(Object.values));\n\n return sql`INSERT INTO ${ident(table)} (${keys}) ${values}`;\n}\n\nexport function buildUpdate(table: string, fv: FieldValues, where?: WhereArg) {\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`${ident(k)} = ${val}`);\n }\n\n return sql`UPDATE ${ident(table)} SET ${pairs.join(', ')} ${WHERE(where)}`;\n}\n\nexport function buildDelete(table: string, where?: WhereArg) {\n return sql`DELETE FROM ${ident(table)} ${WHERE(where)}`;\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.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 { QueryFragment, FieldValues, WhereArg } from './query-weaver';\nimport { sql, buildInsert, buildUpdate, buildDelete } 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 QueryTemplateArgs = [text: TemplateStringsArray, ...values: unknown[]];\ntype QueryTemplateOrSimpleQuery =\n | QueryTemplateArgs\n | [query: string, values?: unknown[]]\n | [query: pg.QueryConfig<unknown[]>];\n\nconst isQueryTemplateArgs = (args: unknown): args is QueryTemplateArgs => {\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\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 #parseQueryTemplateArgs(\n args: QueryTemplateOrSimpleQuery\n ): pg.QueryConfig<unknown[]> {\n if (isQueryTemplateArgs(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.#parseQueryTemplateArgs(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 followingSql?: string | QueryFragment\n ) {\n const query = buildInsert(table, fv);\n if (followingSql) query.push('\\n').push(followingSql);\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 followingSql?: string | QueryFragment\n ) {\n const query = buildUpdate(table, fv, where);\n if (followingSql) query.push('\\n').push(followingSql);\n return await this.#query<T>([query]);\n }\n\n async delete<T extends pg.QueryResultRow>(\n table: string,\n where: WhereArg,\n followingSql?: string | QueryFragment\n ) {\n const query = buildDelete(table, where);\n if (followingSql) query.push('\\n').push(followingSql);\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"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["src_exports", "__export", "AND", "OR", "QueryHelper", "WHERE", "WHERE_AND", "WHERE_OR", "and", "buildClauses", "buildDelete", "buildInsert", "buildUpdate", "buildValues", "ident", "isQueryFragment", "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", "sewTextsAndValues", "texts", "hook", "idx", "isTemplateStringsArray", "_list", "_opts", "QueryFragments", "args", "v", "prefix", "glue", "suffix", "empty", "raw", "sql", "name", "json", "obj", "buildClauses", "clauses", "parse", "val", "key", "OR", "fv", "AND", "WHERE", "WHERE_OR", "buildValues", "sig", "arg", "buildInsert", "table", "fvs", "ks", "keys", "buildUpdate", "where", "pairs", "k", "buildDelete", "or", "and", "WHERE_AND", "where_and", "where_or", "isQueryTemplateArgs", "args", "texts", "values", "_db", "_opts", "_parseQueryTemplateArgs", "parseQueryTemplateArgs_fn", "_query", "query_fn", "QueryHelper", "db", "opts", "__privateAdd", "__privateSet", "table", "fv", "followingSql", "query", "buildInsert", "__privateMethod", "where", "buildUpdate", "buildDelete", "x", "sql", "__privateGet", "result", "e", "useQueryHelper", "qh", "key", "receiver", "target", "value"]
|
|
7
|
+
}
|
|
File without changes
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
var W=(n,t,e)=>{if(!t.has(n))throw TypeError("Cannot "+e)};var i=(n,t,e)=>(W(n,t,"read from private field"),e?e.call(n):t.get(n)),g=(n,t,e)=>{if(t.has(n))throw TypeError("Cannot add the same private member more than once");t instanceof WeakSet?t.add(n):t.set(n,e)},a=(n,t,e,r)=>(W(n,t,"write to private field"),r?r.call(n,e):t.set(n,e),e);var y=(n,t,e)=>(W(n,t,"access private method"),e);import $ from"pg-escape";function z(n){return n.split(".").map(t=>$.ident(t)).join(".")}function D(n){return n===null?"NULL":typeof n=="boolean"?n?"true":"false":Array.isArray(n)?"ARRAY["+n.map(D).join(",")+"]":typeof n=="object"?$.literal(JSON.stringify(n)):$.literal(String(n))}var w=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 t=[],e=this.toString({valueFn:s=>(t.push(s),"$"+t.length)}),r=this.toString();return{text:e,values:t,embed:r}}},F,v=class extends w{constructor(e){super();g(this,F,void 0);a(this,F,e)}toString(e){return(e?.valueFn??D)(i(this,F))}};F=new WeakMap;var A,H=class extends w{constructor(e){super();g(this,A,void 0);a(this,A,e)}toString(e){return(e?.identFn??z)(i(this,A))}};A=new WeakMap;var k,T=class extends w{constructor(e){super();g(this,k,void 0);a(this,k,e)}toString(){return i(this,k)}};k=new WeakMap;function S(n){return n instanceof w}function G(n,t,e=r=>r){if(n.length-1!==t.length)throw new Error("Invalid call of the function");return n.flatMap((r,s)=>s?[e(t[s-1]),new T(r)]:[new T(r)])}var V=n=>S(n)?n:new v(n),I=n=>typeof n=="object"&&n!==null&&"raw"in n,m,o,h=class extends w{constructor(...e){super();g(this,m,[]);g(this,o,void 0);if(a(this,o,{prefix:"",glue:"",suffix:"",empty:"",makeFragmentFn:V,wrapperFn:r=>r}),I(e[0])){let[r,s,p]=e;a(this,o,{...i(this,o),...p}),a(this,m,G(r,s,i(this,o).makeFragmentFn))}else if(Array.isArray(e[0])){let[r,s]=e;a(this,o,{...i(this,o),...s}),a(this,m,r.map(p=>i(this,o).makeFragmentFn(p)))}else{let[r]=e;a(this,o,{...i(this,o),...r})}}setSewingPattern(e="",r="",s="",p=""){return a(this,o,{...i(this,o),prefix:e,glue:r,suffix:s,empty:p}),this}push(...e){return i(this,m).push(...e.flatMap(r=>typeof r>"u"?[]:[typeof r=="string"?b(r):r])),this}append(...e){return this.push(...e)}join(e=""){return i(this,o).glue=e,this}toString(e){return i(this,m).length===0?i(this,o).empty:i(this,o).prefix+i(this,o).wrapperFn(i(this,m).map(r=>r.toString(e)).join(i(this,o).glue),e)+i(this,o).suffix}};m=new WeakMap,o=new WeakMap;function u(n,...t){return typeof n=="string"?new h([new T(n),...t]):new h(n,t)}var b=u,c=n=>new H(n);function K(...n){if(I(n[0])){let[e,...r]=n;return new h(e,r,{wrapperFn:(s,p)=>p?.valueFn?.(s)??s,makeFragmentFn:s=>b(JSON.stringify(s))})}let[t]=n;return S(t)?t:u`${JSON.stringify(t)}`}function E(...n){let t=new h,e=function(r){if(r!==void 0&&r!==null){if(typeof r=="string"){t.push(b(r));return}if(S(r)){t.push(r);return}if(Array.isArray(r)){r.forEach(e);return}if(typeof r=="object"){for(let s in r)if(r[s]!==void 0){if(S(r[s])){t.push(u`${c(s)} ${r[s]}`);continue}if(r[s]===null){t.push(u`${c(s)} IS NULL`);continue}if(Array.isArray(r[s])){t.push(u`${c(s)} = ANY (${r[s]})`);continue}t.push(u`${c(s)} = ${r[s]}`)}}}};return e(n),t}function _(...n){return E(n).setSewingPattern("((",") OR (","))","false")}function L(...n){return E(n).setSewingPattern("((",") AND (","))","true")}function Q(...n){return E(n).setSewingPattern("WHERE ((",") AND (","))","")}function U(...n){return E(n).setSewingPattern("WHERE ((",") OR (","))","")}function J(n){if(n.length===0)throw new Error("Invalid call of the function");let t=n[0].length;if(n.some(r=>r.length!==t))throw new Error("buildValues array must all be the same length");let e=new h(n.map(r=>new h(r.map(V)).join(", "))).setSewingPattern("(","), (",")");return u`VALUES ${e}`}function q(n,t){if(Array.isArray(t)||(t=[t]),t.length==0)throw new Error("Invalid call of the function");let e=Object.keys(t[0]),r=e.join();if(t.some(x=>Object.keys(x).join()!==r))throw new Error("buildInsert: All objects must have the same key");let s=new h(e.map(c)).join(", "),p=J(t.map(Object.values));return u`INSERT INTO ${c(n)} (${s}) ${p}`}function C(n,t,e){let r=new h;for(let s in t){let p=t[s];p!==void 0&&r.push(u`${c(s)} = ${p}`)}return u`UPDATE ${c(n)} SET ${r.join(", ")} ${Q(e)}`}function N(n,t){return u`DELETE FROM ${c(n)} ${Q(t)}`}var X=_,Z=L,B=Q,ee=Q,te=Q,ne=U;u.raw=b;u.ident=c;u.json=K;u.WHERE=Q;u.WHERE_AND=ee;u.WHERE_OR=U;u.AND=L;u.OR=_;u.where=B;u.where_and=te;u.where_or=ne;u.and=Z;u.or=X;u.insert=q;u.update=C;u.delete=N;u.values=J;var re=n=>{if(!Array.isArray(n)||typeof n?.[0]!="object"||n[0]===null||!("raw"in n[0])||!Array.isArray(n[0]))return!1;let[t,...e]=n;return t.length-1===e.length},R,d,j,M,l,f,P=class{constructor(t,e={}){g(this,j);g(this,l);g(this,R,void 0);g(this,d,void 0);a(this,R,t),a(this,d,e)}async insert(t,e,r){let s=q(t,e);return r&&s.push(`
|
|
2
|
+
`).push(r),await y(this,l,f).call(this,[s])}async update(t,e,r,s){let p=C(t,e,r);return s&&p.push(`
|
|
3
|
+
`).push(s),await y(this,l,f).call(this,[p])}async delete(t,e,r){let s=N(t,e);return r&&s.push(`
|
|
4
|
+
`).push(r),await y(this,l,f).call(this,[s])}async query(...t){return y(this,l,f).call(this,t)}async getRows(...t){return y(this,l,f).call(this,t).then(e=>e.rows)}async getRow(...t){return y(this,l,f).call(this,t).then(e=>e.rows?.[0])}async getOne(...t){return y(this,l,f).call(this,t).then(e=>Object.values(e.rows?.[0])?.[0])}async getCount(...t){return y(this,l,f).call(this,t).then(e=>e.rowCount)}async exec(...t){return y(this,l,f).call(this,t).then(e=>e.rowCount)}};R=new WeakMap,d=new WeakMap,j=new WeakSet,M=function(t){if(re(t)){let[s,...p]=t;return u(s,...p)}let[e,r]=t;return typeof e=="object"&&e&&"text"in e?e:{text:e,values:r??[]}},l=new WeakSet,f=async function(t){let e=y(this,j,M).call(this,t);i(this,d)?.beforeQuery?.(e);let r=await i(this,R).query(e).catch(s=>{throw i(this,d)?.onError?.(e,s),s});return i(this,d)?.afterQuery?.({...e,result:r}),r};function ae(n,t){let e=new P(n,t);return new Proxy(n,{get(r,s,p){let x=s in e?e:s in r?r:void 0,O=x&&Reflect.get(x,s);return O&&O instanceof Function?function(...Y){return O.apply(this===p?x:this,Y)}:O}})}export{L as AND,_ as OR,P as QueryHelper,Q as WHERE,ee as WHERE_AND,U as WHERE_OR,Z as and,E as buildClauses,N as buildDelete,q as buildInsert,C as buildUpdate,J as buildValues,c as ident,S as isQueryFragment,K as json,X as or,z as pgIdent,D as pgString,b as raw,u as sql,ae as useQueryHelper,B as where,te as where_and,ne as where_or};
|
|
5
|
+
//# sourceMappingURL=index.esm.mjs.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../src/query-weaver.ts", "../src/query-helper.ts"],
|
|
4
|
+
"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: string) {\n super();\n this.#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 sewTextsAndValues<T = unknown, R = unknown>(\n texts: TemplateStringsArray,\n values: R[],\n hook: (value: unknown) => T = (x: unknown) => x as T\n) {\n if (texts.length - 1 !== values.length)\n throw new Error('Invalid call of the function');\n return texts.flatMap((text, idx) =>\n idx\n ? [hook(values[idx - 1]), new QueryFragmentRawString(text)]\n : [new QueryFragmentRawString(text)]\n );\n}\n\nconst value = (x: unknown) => {\n if (isQueryFragment(x)) return x; // assume it's already wrapped\n return new QueryFragmentValue(x);\n};\n\ntype QueryFragmentsOptions = {\n prefix?: string;\n glue?: string;\n suffix?: string;\n empty?: string;\n\n makeFragmentFn?: (x: unknown) => QueryFragment;\n wrapperFn?: (s: string, opts?: QueryFragmentToStringOptions) => string;\n};\n\nconst isTemplateStringsArray = (x: unknown): x is TemplateStringsArray =>\n typeof x === 'object' && x !== null && 'raw' in x;\n\nclass QueryFragments extends QueryFragmentBase {\n #list: QueryFragment[] = [];\n #opts: Required<QueryFragmentsOptions>;\n\n constructor(\n ...args:\n | []\n | [\n texts: TemplateStringsArray,\n values: unknown[],\n opts?: QueryFragmentsOptions\n ]\n | [values: unknown[], opts?: QueryFragmentsOptions]\n | [opts?: QueryFragmentsOptions]\n ) {\n super();\n this.#opts = {\n prefix: '',\n glue: '',\n suffix: '',\n empty: '',\n makeFragmentFn: value,\n wrapperFn: (x) => x,\n };\n\n if (isTemplateStringsArray(args[0])) {\n const [texts, values, opts] = args as [\n texts: TemplateStringsArray,\n values: unknown[],\n opts?: QueryFragmentsOptions\n ];\n this.#opts = { ...this.#opts, ...opts };\n this.#list = sewTextsAndValues(texts, values, this.#opts.makeFragmentFn);\n } else if (Array.isArray(args[0])) {\n const [values, opts] = args as [\n values: unknown[],\n opts?: QueryFragmentsOptions\n ];\n this.#opts = { ...this.#opts, ...opts };\n this.#list = values.map((v) => this.#opts.makeFragmentFn(v));\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.flatMap((v) =>\n typeof v === 'undefined' ? [] : [typeof v === 'string' ? raw(v) : v]\n )\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 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 texts: TemplateStringsArray | string,\n ...args: unknown[]\n): QueryFragments {\n if (typeof texts === 'string')\n return new QueryFragments([new QueryFragmentRawString(texts), ...args]);\n return new QueryFragments(texts, args);\n}\n\nexport const raw = sql; // just an alias\nexport const ident = (name: string) => new QueryFragmentIdent(name);\n\nexport function json(\n ...args: [json: unknown] | [texts: TemplateStringsArray, ...args: unknown[]]\n) {\n if (isTemplateStringsArray(args[0])) {\n const [texts, ...values] = args;\n\n return new QueryFragments(texts, values, {\n wrapperFn: (x: string, opts?: QueryFragmentToStringOptions) =>\n opts?.valueFn?.(x) ?? x, // stringify at last\n makeFragmentFn: (x: unknown) => raw(JSON.stringify(x)), // no escape\n });\n }\n\n const [obj] = args;\n if (isQueryFragment(obj)) return obj; // assume it's already wrapped\n return sql`${JSON.stringify(obj)}`;\n}\n\nexport function buildClauses(...args: WhereArg[]) {\n const clauses = new QueryFragments();\n\n const parse = function (val: WhereArg) {\n if (val === undefined) return;\n if (val === null) return;\n if (typeof val === 'string') {\n clauses.push(raw(val));\n return;\n }\n if (isQueryFragment(val)) {\n clauses.push(val);\n return;\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`${ident(key)} ${val[key]}`);\n continue;\n }\n\n if (val[key] === null) {\n clauses.push(sql`${ident(key)} IS NULL`);\n continue;\n }\n\n if (Array.isArray(val[key])) {\n clauses.push(sql`${ident(key)} = ANY (${val[key]})`);\n continue;\n }\n\n // \u305D\u308C\u4EE5\u5916\n clauses.push(sql`${ident(key)} = ${val[key]}`);\n }\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(args: unknown[][]) {\n if (args.length === 0) throw new Error('Invalid call of the function');\n\n const sig = args[0].length;\n if (args.some((arg) => arg.length !== sig)) {\n throw new Error('buildValues array must all be the same length');\n }\n\n const values = new QueryFragments(\n args.map((v) => new QueryFragments(v.map(value)).join(', '))\n ).setSewingPattern('(', '), (', ')');\n return sql`VALUES ${values}`;\n}\n\nexport function buildInsert(table: string, fvs: FieldValues[] | FieldValues) {\n if (!Array.isArray(fvs)) fvs = [fvs];\n if (fvs.length == 0) 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('buildInsert: All objects must have the same key');\n }\n\n const keys = new QueryFragments(ks.map(ident)).join(', ');\n const values = buildValues(fvs.map(Object.values));\n\n return sql`INSERT INTO ${ident(table)} (${keys}) ${values}`;\n}\n\nexport function buildUpdate(table: string, fv: FieldValues, where?: WhereArg) {\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`${ident(k)} = ${val}`);\n }\n\n return sql`UPDATE ${ident(table)} SET ${pairs.join(', ')} ${WHERE(where)}`;\n}\n\nexport function buildDelete(table: string, where?: WhereArg) {\n return sql`DELETE FROM ${ident(table)} ${WHERE(where)}`;\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.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 { QueryFragment, FieldValues, WhereArg } from './query-weaver';\nimport { sql, buildInsert, buildUpdate, buildDelete } 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 QueryTemplateArgs = [text: TemplateStringsArray, ...values: unknown[]];\ntype QueryTemplateOrSimpleQuery =\n | QueryTemplateArgs\n | [query: string, values?: unknown[]]\n | [query: pg.QueryConfig<unknown[]>];\n\nconst isQueryTemplateArgs = (args: unknown): args is QueryTemplateArgs => {\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\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 #parseQueryTemplateArgs(\n args: QueryTemplateOrSimpleQuery\n ): pg.QueryConfig<unknown[]> {\n if (isQueryTemplateArgs(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.#parseQueryTemplateArgs(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 followingSql?: string | QueryFragment\n ) {\n const query = buildInsert(table, fv);\n if (followingSql) query.push('\\n').push(followingSql);\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 followingSql?: string | QueryFragment\n ) {\n const query = buildUpdate(table, fv, where);\n if (followingSql) query.push('\\n').push(followingSql);\n return await this.#query<T>([query]);\n }\n\n async delete<T extends pg.QueryResultRow>(\n table: string,\n where: WhereArg,\n followingSql?: string | QueryFragment\n ) {\n const query = buildDelete(table, where);\n if (followingSql) query.push('\\n').push(followingSql);\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"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["pgescape", "pgIdent", "s", "x", "pgescape", "pgString", "QueryFragmentBase", "values", "text", "embed", "_value", "QueryFragmentValue", "value", "__privateAdd", "__privateSet", "opts", "__privateGet", "_ident", "QueryFragmentIdent", "ident", "_string", "QueryFragmentRawString", "isQueryFragment", "sewTextsAndValues", "texts", "hook", "idx", "isTemplateStringsArray", "_list", "_opts", "QueryFragments", "args", "v", "prefix", "glue", "suffix", "empty", "raw", "sql", "name", "json", "obj", "buildClauses", "clauses", "parse", "val", "key", "OR", "fv", "AND", "WHERE", "WHERE_OR", "buildValues", "sig", "arg", "buildInsert", "table", "fvs", "ks", "keys", "buildUpdate", "where", "pairs", "k", "buildDelete", "or", "and", "WHERE_AND", "where_and", "where_or", "isQueryTemplateArgs", "args", "texts", "values", "_db", "_opts", "_parseQueryTemplateArgs", "parseQueryTemplateArgs_fn", "_query", "query_fn", "QueryHelper", "db", "opts", "__privateAdd", "__privateSet", "table", "fv", "followingSql", "query", "buildInsert", "__privateMethod", "where", "buildUpdate", "buildDelete", "x", "sql", "__privateGet", "result", "e", "useQueryHelper", "qh", "key", "receiver", "target", "value"]
|
|
7
|
+
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type pg from 'pg';
|
|
2
|
-
import type { QueryFragment, FieldValues, WhereArg } from './query-weaver
|
|
2
|
+
import type { QueryFragment, FieldValues, WhereArg } from './query-weaver';
|
|
3
3
|
type pgQueryResultCustom<R> = {
|
|
4
4
|
rowCount: number;
|
|
5
5
|
rows: R[];
|
|
@@ -14,9 +14,9 @@ export interface Queryable {
|
|
|
14
14
|
}
|
|
15
15
|
type QueryHelperOptions = {
|
|
16
16
|
placeHolderFn?: (v: unknown, values: unknown[]) => string;
|
|
17
|
-
beforeQuery?: <T extends pg.QueryConfig<unknown[]>>(ctx: T) =>
|
|
18
|
-
afterQuery?: <T extends pg.QueryConfig<unknown[]>>(ctx: T) =>
|
|
19
|
-
onError?: <T extends pg.QueryConfig<unknown[]>>(ctx: T, e: Error) =>
|
|
17
|
+
beforeQuery?: <T extends pg.QueryConfig<unknown[]>>(ctx: T) => void;
|
|
18
|
+
afterQuery?: <T extends pg.QueryConfig<unknown[]>>(ctx: T) => void;
|
|
19
|
+
onError?: <T extends pg.QueryConfig<unknown[]>>(ctx: T, e: Error) => void;
|
|
20
20
|
};
|
|
21
21
|
type QueryTemplateArgs = [text: TemplateStringsArray, ...values: unknown[]];
|
|
22
22
|
type QueryTemplateOrSimpleQuery = QueryTemplateArgs | [query: string, values?: unknown[]] | [query: pg.QueryConfig<unknown[]>];
|
|
@@ -26,12 +26,12 @@ type QueryTemplateOrSimpleQuery = QueryTemplateArgs | [query: string, values?: u
|
|
|
26
26
|
export declare class QueryHelper {
|
|
27
27
|
#private;
|
|
28
28
|
constructor(db: Queryable, opts?: QueryHelperOptions);
|
|
29
|
-
insert<T extends pg.QueryResultRow
|
|
30
|
-
update<T extends pg.QueryResultRow
|
|
31
|
-
delete<T extends pg.QueryResultRow
|
|
32
|
-
query<T extends pg.QueryResultRow
|
|
33
|
-
getRows<T extends pg.QueryResultRow
|
|
34
|
-
getRow<T extends pg.QueryResultRow
|
|
29
|
+
insert<T extends pg.QueryResultRow>(table: string, fv: FieldValues, followingSql?: string | QueryFragment): Promise<pgQueryResult<T>>;
|
|
30
|
+
update<T extends pg.QueryResultRow>(table: string, fv: FieldValues, where: WhereArg, followingSql?: string | QueryFragment): Promise<pgQueryResult<T>>;
|
|
31
|
+
delete<T extends pg.QueryResultRow>(table: string, where: WhereArg, followingSql?: string | QueryFragment): Promise<pgQueryResult<T>>;
|
|
32
|
+
query<T extends pg.QueryResultRow>(...args: QueryTemplateOrSimpleQuery): Promise<pgQueryResult<T>>;
|
|
33
|
+
getRows<T extends pg.QueryResultRow>(...args: QueryTemplateOrSimpleQuery): Promise<T[]>;
|
|
34
|
+
getRow<T extends pg.QueryResultRow>(...args: QueryTemplateOrSimpleQuery): Promise<T>;
|
|
35
35
|
getOne<T = unknown>(...args: QueryTemplateOrSimpleQuery): Promise<T>;
|
|
36
36
|
getCount(...args: QueryTemplateOrSimpleQuery): Promise<number>;
|
|
37
37
|
exec(...args: QueryTemplateOrSimpleQuery): Promise<number>;
|
|
@@ -42,7 +42,11 @@ type QueryFragmentsOptions = {
|
|
|
42
42
|
};
|
|
43
43
|
declare class QueryFragments extends QueryFragmentBase {
|
|
44
44
|
#private;
|
|
45
|
-
constructor(...args: [] | [
|
|
45
|
+
constructor(...args: [] | [
|
|
46
|
+
texts: TemplateStringsArray,
|
|
47
|
+
values: unknown[],
|
|
48
|
+
opts?: QueryFragmentsOptions
|
|
49
|
+
] | [values: unknown[], opts?: QueryFragmentsOptions] | [opts?: QueryFragmentsOptions]);
|
|
46
50
|
setSewingPattern(prefix?: string, glue?: string, suffix?: string, empty?: string): this;
|
|
47
51
|
push(...args: (QueryFragment | string | undefined)[]): this;
|
|
48
52
|
append(...args: (QueryFragment | string | undefined)[]): this;
|
package/package.json
CHANGED
|
@@ -1,28 +1,54 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "query-weaver",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.3",
|
|
4
4
|
"description": "SQL query builder using template string literal",
|
|
5
|
-
"main": "dist/
|
|
6
|
-
"module": "dist/
|
|
7
|
-
"types": "dist/
|
|
5
|
+
"main": "./dist/index.cjs.js",
|
|
6
|
+
"module": "./dist/index.esm.mjs",
|
|
7
|
+
"types": "./dist/index.d.ts",
|
|
8
8
|
"files": [
|
|
9
9
|
"dist/"
|
|
10
10
|
],
|
|
11
|
+
"exports": {
|
|
12
|
+
".": {
|
|
13
|
+
"types": "./dist/index.d.ts",
|
|
14
|
+
"import": "./dist/index.esm.mjs",
|
|
15
|
+
"require": "./dist/index.cjs.js"
|
|
16
|
+
}
|
|
17
|
+
},
|
|
11
18
|
"scripts": {
|
|
12
|
-
"clean": "
|
|
13
|
-
"test": "
|
|
14
|
-
"build": "npm run clean &&
|
|
19
|
+
"clean": "rimraf dist",
|
|
20
|
+
"test": "jest",
|
|
21
|
+
"build": "npm run clean && npm run build:esbuild && npm run build:types",
|
|
22
|
+
"build:esbuild": "node -r esbuild-register build.ts",
|
|
23
|
+
"build:types": "tsc --declaration --emitDeclarationOnly --declarationDir './dist'",
|
|
24
|
+
"format": "prettier --check . --ignore-path .gitignore",
|
|
25
|
+
"format:fix": "npm run format -- --write",
|
|
26
|
+
"lint": "eslint src --ext .ts --ignore-path .gitignore",
|
|
27
|
+
"lint:fix": "npm run lint -- --fix",
|
|
28
|
+
"type-check": "tsc --noEmit -p tsconfig.json",
|
|
29
|
+
"prepare": "husky install"
|
|
15
30
|
},
|
|
16
31
|
"author": "kikuchan98@gmail.com",
|
|
17
32
|
"homepage": "https://github.com/kikuchan/query-weaver#readme",
|
|
18
33
|
"license": "MIT",
|
|
19
34
|
"devDependencies": {
|
|
20
|
-
"@
|
|
21
|
-
"@rollup/plugin-babel": "^6.0.3",
|
|
22
|
-
"@rollup/plugin-typescript": "^11.0.0",
|
|
35
|
+
"@types/jest": "^29.4.0",
|
|
23
36
|
"@types/pg": "^8.6.6",
|
|
24
37
|
"@types/pg-escape": "^0.2.1",
|
|
25
|
-
"
|
|
38
|
+
"@typescript-eslint/eslint-plugin": "^5.52.0",
|
|
39
|
+
"@typescript-eslint/parser": "^5.52.0",
|
|
40
|
+
"esbuild": "^0.16.17",
|
|
41
|
+
"esbuild-node-externals": "^1.6.0",
|
|
42
|
+
"esbuild-register": "^3.4.2",
|
|
43
|
+
"eslint": "^8.34.0",
|
|
44
|
+
"eslint-config-prettier": "^8.6.0",
|
|
45
|
+
"husky": "^8.0.3",
|
|
46
|
+
"jest": "^29.4.3",
|
|
47
|
+
"lint-staged": "^13.1.2",
|
|
48
|
+
"pg": "^8.9.0",
|
|
49
|
+
"prettier": "^2.8.4",
|
|
50
|
+
"rimraf": "^4.1.2",
|
|
51
|
+
"ts-jest": "^29.0.5",
|
|
26
52
|
"typescript": "^4.9.5"
|
|
27
53
|
},
|
|
28
54
|
"dependencies": {
|