@uwdata/mosaic-sql 0.0.1 → 0.1.0

package/LICENSE

@@ -0,0 +1,28 @@
+BSD 3-Clause License
+
+Copyright (c) 2023, UW Interactive Data Lab
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,3 +1,3 @@
-# @mosaic/sql
+# mosaic-sql
 
 An API for convenient construction and analysis of SQL queries. Query objects then coerce to SQL query strings.

package/dist/mosaic-sql.js

@@ -37,34 +37,6 @@ function column(table, column2) {
 function all(table) {
   return new Ref(table, "*");
 }
-function desc(expr2) {
-  expr2 = asColumn(expr2);
-  return {
-    expr: expr2,
-    desc: true,
-    toString: () => `${expr2} DESC NULLS LAST`,
-    get columns() {
-      return expr2.columns?.() || [];
-    }
-  };
-}
-function expr(sql, columns, label) {
-  return {
-    expr: sql,
-    label,
-    toString: () => `${sql}`,
-    get columns() {
-      return columns || [];
-    }
-  };
-}
-function transform(func2, label) {
-  return (value) => expr(
-    func2(value),
-    asColumn(value).columns,
-    label
-  );
-}
 
 // src/to-sql.js
 function toSQL(value) {
@@ -89,6 +61,87 @@ function literalToSQL(value) {
   }
 }
 
+// src/expression.js
+var isParamLike = (e) => typeof e?.addEventListener === "function";
+function isExpression(e) {
+  return e instanceof SQLExpression;
+}
+var SQLExpression = class {
+  constructor(sql2, columns, label) {
+    this.expr = sql2;
+    this.label = label;
+    this.columns = columns || [];
+  }
+  toString() {
+    return `${this.expr}`;
+  }
+};
+var ParameterizedSQLExpression = class extends SQLExpression {
+  constructor(parts, columns, label) {
+    const paramSet = /* @__PURE__ */ new Set();
+    for (const part of parts) {
+      if (isParamLike(part))
+        paramSet.add(part);
+    }
+    paramSet.forEach((param) => {
+      param.addEventListener("value", () => this.update());
+    });
+    super(parts, columns, label);
+  }
+  toString() {
+    return this.expr.map((p) => isParamLike(p) ? literalToSQL(p.value) : p).join("");
+  }
+  addEventListener(type, callback) {
+    const map = this.map || (this.map = /* @__PURE__ */ new Map());
+    const set = map.get(type) || (map.set(type, /* @__PURE__ */ new Set()), map.get(type));
+    set.add(callback);
+  }
+  update() {
+    this.map?.get("value")?.forEach((callback) => callback(this));
+  }
+};
+function exprParams(parts, columns, label) {
+  return new ParameterizedSQLExpression(parts, columns, label);
+}
+function expr(sql2, columns, label) {
+  return new SQLExpression(sql2, columns, label);
+}
+function desc(e) {
+  return Object.assign(
+    expr(`${asColumn(e)} DESC NULLS LAST`, e?.columns, e?.label),
+    { desc: true }
+  );
+}
+function transform(func2, label) {
+  return (value) => expr(func2(value), asColumn(value).columns, label);
+}
+
+// src/sql-tag.js
+function sql(strings, ...exprs) {
+  const spans = [strings[0]];
+  const colset = /* @__PURE__ */ new Set();
+  const n = exprs.length;
+  for (let i = 0, k = 0; i < n; ) {
+    const e = exprs[i];
+    if (isParamLike(e)) {
+      spans[++k] = e;
+    } else {
+      if (Array.isArray(e.columns)) {
+        e.columns.forEach((col) => colset.add(col));
+      }
+      spans[k] += String(e);
+    }
+    const s = strings[++i];
+    if (isParamLike(spans[k])) {
+      spans[++k] = s;
+    } else {
+      spans[k] += s;
+    }
+  }
+  const columns = Array.from(colset);
+  return spans.length > 1 ? exprParams(spans, columns) : expr(spans[0], columns);
+}
+
 // src/literal.js
 var Literal = class {
   constructor(value) {
@@ -431,7 +484,7 @@ var Query = class {
           list.push({ as: e, from: asRelation(e) });
         } else if (e instanceof Ref) {
           list.push({ as: e.table, from: e });
-        } else if (isQuery(e) || Object.hasOwn(e, "toString")) {
+        } else if (isQuery(e) || isExpression(e)) {
           list.push({ from: e });
         } else if (Array.isArray(e)) {
           list.push({ as: unquote(e[0]), from: asRelation(e[1]) });
@@ -588,60 +641,60 @@ var Query = class {
       offset,
       with: cte
     } = this.query;
-    const sql = [];
+    const sql2 = [];
     if (cte.length) {
       const list = cte.map(({ as, query }) => `"${as}" AS (${query})`);
-      sql.push(`WITH ${list.join(", ")}`);
+      sql2.push(`WITH ${list.join(", ")}`);
     }
     const sels = select.map(
       ({ as, expr: expr2 }) => isColumnRefFor(expr2, as) && !expr2.table ? `${expr2}` : `${expr2} AS "${as}"`
     );
-    sql.push(`SELECT${distinct ? " DISTINCT" : ""} ${sels.join(", ")}`);
+    sql2.push(`SELECT${distinct ? " DISTINCT" : ""} ${sels.join(", ")}`);
     if (from.length) {
       const rels = from.map(({ as, from: from2 }) => {
         const rel = isQuery(from2) ? `(${from2})` : `${from2}`;
         return !as || as === from2.table ? rel : `${rel} AS "${as}"`;
       });
-      sql.push(`FROM ${rels.join(", ")}`);
+      sql2.push(`FROM ${rels.join(", ")}`);
     }
     if (sample) {
       const { rows, perc, method, seed } = sample;
       const size = rows ? `${rows} ROWS` : `${perc} PERCENT`;
       const how = method ? ` (${method}${seed != null ? `, ${seed}` : ""})` : "";
-      sql.push(`USING SAMPLE ${size}${how}`);
+      sql2.push(`USING SAMPLE ${size}${how}`);
     }
     if (where.length) {
       const clauses = where.map(String).filter((x) => x).join(" AND ");
       if (clauses)
-        sql.push(`WHERE ${clauses}`);
+        sql2.push(`WHERE ${clauses}`);
     }
     if (groupby.length) {
-      sql.push(`GROUP BY ${groupby.join(", ")}`);
+      sql2.push(`GROUP BY ${groupby.join(", ")}`);
     }
     if (having.length) {
       const clauses = having.map(String).filter((x) => x).join(" AND ");
       if (clauses)
-        sql.push(`HAVING ${clauses}`);
+        sql2.push(`HAVING ${clauses}`);
     }
     if (window.length) {
       const windows = window.map(({ as, expr: expr2 }) => `"${as}" AS (${expr2})`);
-      sql.push(`WINDOW ${windows.join(", ")}`);
+      sql2.push(`WINDOW ${windows.join(", ")}`);
     }
     if (qualify.length) {
       const clauses = qualify.map(String).filter((x) => x).join(" AND ");
       if (clauses)
-        sql.push(`QUALIFY ${clauses}`);
+        sql2.push(`QUALIFY ${clauses}`);
     }
     if (orderby.length) {
-      sql.push(`ORDER BY ${orderby.join(", ")}`);
+      sql2.push(`ORDER BY ${orderby.join(", ")}`);
     }
     if (Number.isFinite(limit)) {
-      sql.push(`LIMIT ${limit}`);
+      sql2.push(`LIMIT ${limit}`);
     }
     if (Number.isFinite(offset)) {
-      sql.push(`OFFSET ${offset}`);
+      sql2.push(`OFFSET ${offset}`);
     }
-    return sql.join(" ");
+    return sql2.join(" ");
   }
 };
 var SetOperation = class {
@@ -692,17 +745,17 @@ var SetOperation = class {
   }
   toString() {
     const { op, queries, query: { orderby, limit, offset } } = this;
-    const sql = [queries.join(` ${op} `)];
+    const sql2 = [queries.join(` ${op} `)];
     if (orderby.length) {
-      sql.push(`ORDER BY ${orderby.join(", ")}`);
+      sql2.push(`ORDER BY ${orderby.join(", ")}`);
     }
     if (Number.isFinite(limit)) {
-      sql.push(`LIMIT ${limit}`);
+      sql2.push(`LIMIT ${limit}`);
     }
     if (Number.isFinite(offset)) {
-      sql.push(`OFFSET ${offset}`);
+      sql2.push(`OFFSET ${offset}`);
     }
-    return sql.join(" ");
+    return sql2.join(" ");
   }
 };
 function isQuery(value) {
@@ -735,6 +788,7 @@ export {
   epoch_ms,
   eq,
   expr,
+  exprParams,
   first,
   gt,
   gte,
@@ -780,6 +834,7 @@ export {
   regrSlope,
   relation,
   skewness,
+  sql,
   stddev,
   stddevPop,
   stringAgg,

package/dist/mosaic-sql.min.js

@@ -1 +1 @@
-var m=class{constructor(t,r){t&&(this.table=String(t)),r&&(this.column=r)}get columns(){return this.column?[this.column]:[]}toString(){let{table:t,column:r}=this;if(r){let n=r==="*"?r:`"${r}"`;return(t?`"${t}".`:"")+n}else return`"${t}"`}};function _(e,t){return e instanceof m&&e.column===t}function f(e){return typeof e=="string"?B(e):e}function E(e){return typeof e=="string"?X(e):e}function X(e){return new m(e)}function B(e,t){return arguments.length===1?new m(null,e):new m(e,t)}function k(e){return new m(e,"*")}function K(e){return e=f(e),{expr:e,desc:!0,toString:()=>`${e} DESC NULLS LAST`,get columns(){return e.columns?.()||[]}}}function V(e,t,r){return{expr:e,label:r,toString:()=>`${e}`,get columns(){return t||[]}}}function b(e,t){return r=>V(e(r),f(r).columns,t)}function h(e){return typeof e=="string"?`"${e}"`:d(e)}function d(e){switch(typeof e){case"boolean":return e?"TRUE":"FALSE";case"string":return`'${e}'`;default:return e==null?"NULL":e instanceof Date?`MAKE_DATE(${e.getUTCFullYear()}, ${e.getUTCMonth()+1}, ${e.getUTCDate()})`:e instanceof RegExp?`'${e.source}'`:String(e)}}var I=class{constructor(t){this.value=t}toString(){return d(this.value)}},z=e=>new I(e);function q(...e){return e.flat().flatMap(t=>t?.columns||[])}var D=class{constructor(t,r){this.op=t,this.a=f(r)}get columns(){return q(this.a)}visit(t){t(this.op,this)}toString(){let{op:t,a:r}=this;return`(${h(r)} ${t})`}};function C(e){return t=>new D(e,t)}var J=C("NOT"),Z=C("IS NULL"),tt=C("IS NOT NULL"),O=class{constructor(t,r,n){this.op=t,this.a=f(r),this.b=f(n)}get columns(){return q(this.a,this.b)}visit(t){t(this.op,this)}toString(){let{op:t,a:r,b:n}=this;return`(${h(r)} ${t} ${h(n)})`}};function w(e){return(t,r)=>new O(e,t,r)}var rt=w("="),et=w("<>"),nt=w("<"),st=w(">"),ot=w("<="),it=w(">="),ct=w("IS DISTINCT FROM"),ut=w("IS NOT DISTINCT FROM"),L=class{constructor(t,r,n){this.op=t,this.expr=f(r),this.value=n?.map(f)}get columns(){return q(this.expr,this.value)}visit(t){t(this.op,this)}toString(){let{op:t,expr:r,value:n}=this;if(!n)return"";let[s,i]=n;return`(${h(r)} ${t} ${h(s)} AND ${h(i)})`}};function v(e){return(t,r)=>new L(e,t,r)}var lt=v("BETWEEN"),ft=v("NOT BETWEEN"),R=class{constructor(t,r){this.op=t,this.value=r.map(f)}get columns(){return q(this.value)}visit(t){t(this.op,this),this.value?.forEach(r=>r.visit(t))}toString(){let{op:t,value:r}=this;return!r||r.length===0?"":r.length===1?h(r[0]):`(${r.map(h).filter(n=>n).join(` ${t} `)})`}};function ht(...e){return new R("AND",e.flat())}function pt(...e){return new R("OR",e.flat())}var F=class{constructor(t,r){this.func=t,this.args=(r||[]).map(f)}get column(){return this.columns[0]}get columns(){return this.args.flatMap(t=>t.columns||[])}toString(){let{func:t,args:r}=this;return`${t}(${r.map(h).join(", ")})`}};function x(e){return(...t)=>new F(e,t)}var at=x("regexp_matches"),gt=x("contains"),mt=x("prefix"),xt=x("suffix"),$t=x("lower"),St=x("upper"),yt=x("length"),wt=x("isnan"),Nt=x("isfinite"),Et=x("isinf");var G=class{constructor(t,r){this.aggregate=t,this.args=(r||[]).map(f)}get label(){return this.aggregate.toLowerCase()+(this.args.length?` ${this.columns.join(", ")}`:"")}get column(){return this.columns[0]}get columns(){return this.args.flatMap(t=>t.columns||[])}distinct(){return this.isDistinct=!0,this}where(t){return this.filter=t,this}toString(){let{aggregate:t,args:r,isDistinct:n,filter:s}=this,i=r.length===0?"*":r.map(h).join(", "),c=n?"DISTINCT ":"",p=s?` FILTER (WHERE ${h(s)})`:"",y=t==="COUNT"?"::INTEGER":"";return p&&y?`(${t}(${c}${i})${p})${y}`:`${t}(${c}${i})${p}${y}`}};function o(e){return(...t)=>new G(e,t)}var dt=o("COUNT"),Rt=o("AVG"),qt=o("AVG"),At=o("MAD"),Tt=o("MAX"),bt=o("MIN"),It=o("SUM"),Dt=o("PRODUCT"),Ot=o("MEDIAN"),Lt=o("QUANTILE"),Ct=o("MODE"),Ft=o("VARIANCE"),Gt=o("STDDEV"),Ut=o("SKEWNESS"),Mt=o("KURTOSIS"),Pt=o("ENTROPY"),jt=o("VAR_POP"),Yt=o("STDDEV_POP"),_t=o("CORR"),Xt=o("COVAR_POP"),Bt=o("REGR_INTERCEPT"),Vt=o("REGR_SLOPE"),vt=o("REGR_COUNT"),Qt=o("REGR_R2"),Wt=o("REGR_SYY"),Ht=o("REGR_SXX"),kt=o("REGR_SXY"),Kt=o("REGR_AVGX"),zt=o("REGR_AVGY"),Jt=o("FIRST"),Zt=o("LAST"),tr=o("ARG_MIN"),rr=o("ARG_MAX"),er=o("STRING_AGG"),nr=o("ARRAY_AGG");var sr=b(e=>`(1000 * (epoch(${e}) - second(${e})) + millisecond(${e}))::DOUBLE`);function or(e){return{op:"UNNEST",arg:e,toString(){return`UNNEST(${Array.isArray(e)?`[${e.join(", ")}]`:e})`}}}var $=class{static select(...t){return new $().select(...t)}static from(...t){return new $().from(...t)}static with(...t){return new $().with(...t)}static union(...t){return new S("UNION",t.flat())}static unionAll(...t){return new S("UNION ALL",t.flat())}static intersect(...t){return new S("INTERSECT",t.flat())}static except(...t){return new S("EXCEPT",t.flat())}constructor(){this.query={with:[],select:[],from:[],where:[],groupby:[],having:[],window:[],qualify:[],orderby:[]}}clone(){let t=new $;return t.query={...this.query},t}with(...t){let{query:r}=this;if(t.length===0)return r.with;{let n=[],s=(i,c)=>{let p=c.clone();p.cteFor=this,n.push({as:i,query:p})};return t.flat().forEach(i=>{if(i!=null)if(i.as&&i.query)s(i.as,i.query);else for(let c in i)s(c,i[c])}),r.with=r.with.concat(n),this}}select(...t){let{query:r}=this;if(t.length===0)return r.select;{let n=[];return t.flat().forEach(s=>{if(s!=null)if(typeof s=="string")n.push({as:s,expr:f(s)});else if(s instanceof m)n.push({as:s.column,expr:s});else if(Array.isArray(s))n.push({as:s[0],expr:s[1]});else for(let i in s)n.push({as:A(i),expr:f(s[i])})}),r.select=r.select.concat(n),this}}$select(...t){return this.query.select=[],this.select(...t)}distinct(t=!0){return this.query.distinct=!!t,this}from(...t){let{query:r}=this;if(t.length===0)return r.from;{let n=[];return t.flat().forEach(s=>{if(s!=null)if(typeof s=="string")n.push({as:s,from:E(s)});else if(s instanceof m)n.push({as:s.table,from:s});else if(T(s)||Object.hasOwn(s,"toString"))n.push({from:s});else if(Array.isArray(s))n.push({as:A(s[0]),from:E(s[1])});else for(let i in s)n.push({as:A(i),from:E(s[i])})}),r.from=r.from.concat(n),this}}$from(...t){return this.query.from=[],this.from(...t)}sample(t){let{query:r}=this;if(arguments.length===0)return r.sample;{let n=t;return typeof t=="number"&&(n=t>0&&t<1?{perc:100*t}:{rows:Math.round(t)}),r.sample=n,this}}where(...t){let{query:r}=this;return t.length===0?r.where:(r.where=r.where.concat(t.flat().filter(n=>n)),this)}$where(...t){return this.query.where=[],this.where(...t)}groupby(...t){let{query:r}=this;return t.length===0?r.groupby:(r.groupby=r.groupby.concat(t.flat().filter(n=>n).map(f)),this)}having(...t){let{query:r}=this;return t.length===0?r.having:(r.having=r.having.concat(t.flat().filter(n=>n)),this)}window(...t){let{query:r}=this;if(t.length===0)return r.window;{let n=[];return t.flat().forEach(s=>{if(s!=null)for(let i in s)n.push({as:A(i),expr:s[i]})}),r.window=r.window.concat(n),this}}qualify(...t){let{query:r}=this;return t.length===0?r.qualify:(r.qualify=r.qualify.concat(t.flat().filter(n=>n)),this)}orderby(...t){let{query:r}=this;return t.length===0?r.orderby:(r.orderby=r.orderby.concat(t.flat().filter(n=>n).map(f)),this)}limit(t){let{query:r}=this;return arguments.length===0?r.limit:(r.limit=Number.isFinite(t)?t:void 0,this)}offset(t){let{query:r}=this;return arguments.length===0?r.offset:(r.offset=Number.isFinite(t)?t:void 0,this)}get subqueries(){let{query:t,cteFor:r}=this,s=(r?.query||t).with?.reduce((c,{as:p,query:y})=>(c[p]=y,c),{}),i=[];return t.from.forEach(({from:c})=>{if(T(c))i.push(c);else if(s[c.table]){let p=s[c.table];i.push(p)}}),i}toString(){let{select:t,distinct:r,from:n,sample:s,where:i,groupby:c,having:p,window:y,qualify:U,orderby:M,limit:P,offset:j,with:Y}=this.query,a=[];if(Y.length){let u=Y.map(({as:l,query:g})=>`"${l}" AS (${g})`);a.push(`WITH ${u.join(", ")}`)}let Q=t.map(({as:u,expr:l})=>_(l,u)&&!l.table?`${l}`:`${l} AS "${u}"`);if(a.push(`SELECT${r?" DISTINCT":""} ${Q.join(", ")}`),n.length){let u=n.map(({as:l,from:g})=>{let N=T(g)?`(${g})`:`${g}`;return!l||l===g.table?N:`${N} AS "${l}"`});a.push(`FROM ${u.join(", ")}`)}if(s){let{rows:u,perc:l,method:g,seed:N}=s,W=u?`${u} ROWS`:`${l} PERCENT`,H=g?` (${g}${N!=null?`, ${N}`:""})`:"";a.push(`USING SAMPLE ${W}${H}`)}if(i.length){let u=i.map(String).filter(l=>l).join(" AND ");u&&a.push(`WHERE ${u}`)}if(c.length&&a.push(`GROUP BY ${c.join(", ")}`),p.length){let u=p.map(String).filter(l=>l).join(" AND ");u&&a.push(`HAVING ${u}`)}if(y.length){let u=y.map(({as:l,expr:g})=>`"${l}" AS (${g})`);a.push(`WINDOW ${u.join(", ")}`)}if(U.length){let u=U.map(String).filter(l=>l).join(" AND ");u&&a.push(`QUALIFY ${u}`)}return M.length&&a.push(`ORDER BY ${M.join(", ")}`),Number.isFinite(P)&&a.push(`LIMIT ${P}`),Number.isFinite(j)&&a.push(`OFFSET ${j}`),a.join(" ")}},S=class{constructor(t,r){this.op=t,this.queries=r.map(n=>n.clone()),this.query={orderby:[]}}clone(){let t=new S(this.op,this.queries);return t.query={...this.query},t}orderby(...t){let{query:r}=this;return t.length===0?r.orderby:(r.orderby=r.orderby.concat(t.flat().filter(n=>n).map(f)),this)}limit(t){let{query:r}=this;return arguments.length===0?r.limit:(r.limit=Number.isFinite(t)?t:void 0,this)}offset(t){let{query:r}=this;return arguments.length===0?r.offset:(r.offset=Number.isFinite(t)?t:void 0,this)}get subqueries(){let{queries:t,cteFor:r}=this;return r&&t.forEach(n=>n.cteFor=r),t}toString(){let{op:t,queries:r,query:{orderby:n,limit:s,offset:i}}=this,c=[r.join(` ${t} `)];return n.length&&c.push(`ORDER BY ${n.join(", ")}`),Number.isFinite(s)&&c.push(`LIMIT ${s}`),Number.isFinite(i)&&c.push(`OFFSET ${i}`),c.join(" ")}};function T(e){return e instanceof $||e instanceof S}function A(e){return ir(e)?e.slice(1,-1):e}function ir(e){return e[0]==='"'&&e[e.length-1]==='"'}export{$ as Query,m as Ref,k as all,ht as and,rr as argmax,tr as argmin,nr as arrayAgg,f as asColumn,E as asRelation,Rt as avg,B as column,gt as contains,_t as corr,dt as count,Xt as covarPop,K as desc,Pt as entropy,sr as epoch_ms,rt as eq,V as expr,Jt as first,st as gt,it as gte,lt as isBetween,ct as isDistinct,Nt as isFinite,Et as isInfinite,wt as isNaN,ft as isNotBetween,ut as isNotDistinct,tt as isNotNull,Z as isNull,T as isQuery,Mt as kurtosis,Zt as last,yt as length,z as literal,d as literalToSQL,$t as lower,nt as lt,ot as lte,At as mad,Tt as max,qt as mean,Ot as median,bt as min,Ct as mode,et as neq,J as not,pt as or,mt as prefix,Dt as product,Lt as quantile,at as regexp_matches,Kt as regrAvgX,zt as regrAvgY,vt as regrCount,Bt as regrIntercept,Qt as regrR2,Ht as regrSXX,kt as regrSXY,Wt as regrSYY,Vt as regrSlope,X as relation,Ut as skewness,Gt as stddev,Yt as stddevPop,er as stringAgg,xt as suffix,It as sum,h as toSQL,b as transform,or as unnest,St as upper,jt as varPop,Ft as variance};
+var x=class{constructor(t,r){t&&(this.table=String(t)),r&&(this.column=r)}get columns(){return this.column?[this.column]:[]}toString(){let{table:t,column:r}=this;if(r){let n=r==="*"?r:`"${r}"`;return(t?`"${t}".`:"")+n}else return`"${t}"`}};function W(e,t){return e instanceof x&&e.column===t}function u(e){return typeof e=="string"?k(e):e}function R(e){return typeof e=="string"?Q(e):e}function Q(e){return new x(e)}function k(e,t){return arguments.length===1?new x(null,e):new x(e,t)}function tt(e){return new x(e,"*")}function f(e){return typeof e=="string"?`"${e}"`:y(e)}function y(e){switch(typeof e){case"boolean":return e?"TRUE":"FALSE";case"string":return`'${e}'`;default:return e==null?"NULL":e instanceof Date?`MAKE_DATE(${e.getUTCFullYear()}, ${e.getUTCMonth()+1}, ${e.getUTCDate()})`:e instanceof RegExp?`'${e.source}'`:String(e)}}var q=e=>typeof e?.addEventListener=="function";function H(e){return e instanceof A}var A=class{constructor(t,r,n){this.expr=t,this.label=n,this.columns=r||[]}toString(){return`${this.expr}`}},C=class extends A{constructor(t,r,n){let s=new Set;for(let o of t)q(o)&&s.add(o);s.forEach(o=>{o.addEventListener("value",()=>this.update())}),super(t,r,n)}toString(){return this.expr.map(t=>q(t)?y(t.value):t).join("")}addEventListener(t,r){let n=this.map||(this.map=new Map);(n.get(t)||(n.set(t,new Set),n.get(t))).add(r)}update(){this.map?.get("value")?.forEach(t=>t(this))}};function F(e,t,r){return new C(e,t,r)}function T(e,t,r){return new A(e,t,r)}function rt(e){return Object.assign(T(`${u(e)} DESC NULLS LAST`,e?.columns,e?.label),{desc:!0})}function G(e,t){return r=>T(e(r),u(r).columns,t)}function et(e,...t){let r=[e[0]],n=new Set,s=t.length;for(let c=0,p=0;c<s;){let h=t[c];q(h)?r[++p]=h:(Array.isArray(h.columns)&&h.columns.forEach(b=>n.add(b)),r[p]+=String(h));let E=e[++c];q(r[p])?r[++p]=E:r[p]+=E}let o=Array.from(n);return r.length>1?F(r,o):T(r[0],o)}var P=class{constructor(t){this.value=t}toString(){return y(this.value)}},nt=e=>new P(e);function L(...e){return e.flat().flatMap(t=>t?.columns||[])}var U=class{constructor(t,r){this.op=t,this.a=u(r)}get columns(){return L(this.a)}visit(t){t(this.op,this)}toString(){let{op:t,a:r}=this;return`(${f(r)} ${t})`}};function Y(e){return t=>new U(e,t)}var st=Y("NOT"),ot=Y("IS NULL"),it=Y("IS NOT NULL"),M=class{constructor(t,r,n){this.op=t,this.a=u(r),this.b=u(n)}get columns(){return L(this.a,this.b)}visit(t){t(this.op,this)}toString(){let{op:t,a:r,b:n}=this;return`(${f(r)} ${t} ${f(n)})`}};function w(e){return(t,r)=>new M(e,t,r)}var ct=w("="),ut=w("<>"),lt=w("<"),at=w(">"),pt=w("<="),ft=w(">="),ht=w("IS DISTINCT FROM"),mt=w("IS NOT DISTINCT FROM"),j=class{constructor(t,r,n){this.op=t,this.expr=u(r),this.value=n?.map(u)}get columns(){return L(this.expr,this.value)}visit(t){t(this.op,this)}toString(){let{op:t,expr:r,value:n}=this;if(!n)return"";let[s,o]=n;return`(${f(r)} ${t} ${f(s)} AND ${f(o)})`}};function K(e){return(t,r)=>new j(e,t,r)}var gt=K("BETWEEN"),xt=K("NOT BETWEEN"),I=class{constructor(t,r){this.op=t,this.value=r.map(u)}get columns(){return L(this.value)}visit(t){t(this.op,this),this.value?.forEach(r=>r.visit(t))}toString(){let{op:t,value:r}=this;return!r||r.length===0?"":r.length===1?f(r[0]):`(${r.map(f).filter(n=>n).join(` ${t} `)})`}};function $t(...e){return new I("AND",e.flat())}function St(...e){return new I("OR",e.flat())}var _=class{constructor(t,r){this.func=t,this.args=(r||[]).map(u)}get column(){return this.columns[0]}get columns(){return this.args.flatMap(t=>t.columns||[])}toString(){let{func:t,args:r}=this;return`${t}(${r.map(f).join(", ")})`}};function $(e){return(...t)=>new _(e,t)}var dt=$("regexp_matches"),wt=$("contains"),yt=$("prefix"),Et=$("suffix"),Nt=$("lower"),Rt=$("upper"),qt=$("length"),At=$("isnan"),Tt=$("isfinite"),bt=$("isinf");var v=class{constructor(t,r){this.aggregate=t,this.args=(r||[]).map(u)}get label(){return this.aggregate.toLowerCase()+(this.args.length?` ${this.columns.join(", ")}`:"")}get column(){return this.columns[0]}get columns(){return this.args.flatMap(t=>t.columns||[])}distinct(){return this.isDistinct=!0,this}where(t){return this.filter=t,this}toString(){let{aggregate:t,args:r,isDistinct:n,filter:s}=this,o=r.length===0?"*":r.map(f).join(", "),c=n?"DISTINCT ":"",p=s?` FILTER (WHERE ${f(s)})`:"",h=t==="COUNT"?"::INTEGER":"";return p&&h?`(${t}(${c}${o})${p})${h}`:`${t}(${c}${o})${p}${h}`}};function i(e){return(...t)=>new v(e,t)}var It=i("COUNT"),Lt=i("AVG"),Dt=i("AVG"),Ot=i("MAD"),Ct=i("MAX"),Ft=i("MIN"),Gt=i("SUM"),Pt=i("PRODUCT"),Ut=i("MEDIAN"),Mt=i("QUANTILE"),jt=i("MODE"),Yt=i("VARIANCE"),_t=i("STDDEV"),vt=i("SKEWNESS"),Xt=i("KURTOSIS"),Bt=i("ENTROPY"),Vt=i("VAR_POP"),Wt=i("STDDEV_POP"),Qt=i("CORR"),kt=i("COVAR_POP"),Ht=i("REGR_INTERCEPT"),Kt=i("REGR_SLOPE"),zt=i("REGR_COUNT"),Jt=i("REGR_R2"),Zt=i("REGR_SYY"),tr=i("REGR_SXX"),rr=i("REGR_SXY"),er=i("REGR_AVGX"),nr=i("REGR_AVGY"),sr=i("FIRST"),or=i("LAST"),ir=i("ARG_MIN"),cr=i("ARG_MAX"),ur=i("STRING_AGG"),lr=i("ARRAY_AGG");var ar=G(e=>`(1000 * (epoch(${e}) - second(${e})) + millisecond(${e}))::DOUBLE`);function pr(e){return{op:"UNNEST",arg:e,toString(){return`UNNEST(${Array.isArray(e)?`[${e.join(", ")}]`:e})`}}}var S=class{static select(...t){return new S().select(...t)}static from(...t){return new S().from(...t)}static with(...t){return new S().with(...t)}static union(...t){return new d("UNION",t.flat())}static unionAll(...t){return new d("UNION ALL",t.flat())}static intersect(...t){return new d("INTERSECT",t.flat())}static except(...t){return new d("EXCEPT",t.flat())}constructor(){this.query={with:[],select:[],from:[],where:[],groupby:[],having:[],window:[],qualify:[],orderby:[]}}clone(){let t=new S;return t.query={...this.query},t}with(...t){let{query:r}=this;if(t.length===0)return r.with;{let n=[],s=(o,c)=>{let p=c.clone();p.cteFor=this,n.push({as:o,query:p})};return t.flat().forEach(o=>{if(o!=null)if(o.as&&o.query)s(o.as,o.query);else for(let c in o)s(c,o[c])}),r.with=r.with.concat(n),this}}select(...t){let{query:r}=this;if(t.length===0)return r.select;{let n=[];return t.flat().forEach(s=>{if(s!=null)if(typeof s=="string")n.push({as:s,expr:u(s)});else if(s instanceof x)n.push({as:s.column,expr:s});else if(Array.isArray(s))n.push({as:s[0],expr:s[1]});else for(let o in s)n.push({as:D(o),expr:u(s[o])})}),r.select=r.select.concat(n),this}}$select(...t){return this.query.select=[],this.select(...t)}distinct(t=!0){return this.query.distinct=!!t,this}from(...t){let{query:r}=this;if(t.length===0)return r.from;{let n=[];return t.flat().forEach(s=>{if(s!=null)if(typeof s=="string")n.push({as:s,from:R(s)});else if(s instanceof x)n.push({as:s.table,from:s});else if(O(s)||H(s))n.push({from:s});else if(Array.isArray(s))n.push({as:D(s[0]),from:R(s[1])});else for(let o in s)n.push({as:D(o),from:R(s[o])})}),r.from=r.from.concat(n),this}}$from(...t){return this.query.from=[],this.from(...t)}sample(t){let{query:r}=this;if(arguments.length===0)return r.sample;{let n=t;return typeof t=="number"&&(n=t>0&&t<1?{perc:100*t}:{rows:Math.round(t)}),r.sample=n,this}}where(...t){let{query:r}=this;return t.length===0?r.where:(r.where=r.where.concat(t.flat().filter(n=>n)),this)}$where(...t){return this.query.where=[],this.where(...t)}groupby(...t){let{query:r}=this;return t.length===0?r.groupby:(r.groupby=r.groupby.concat(t.flat().filter(n=>n).map(u)),this)}having(...t){let{query:r}=this;return t.length===0?r.having:(r.having=r.having.concat(t.flat().filter(n=>n)),this)}window(...t){let{query:r}=this;if(t.length===0)return r.window;{let n=[];return t.flat().forEach(s=>{if(s!=null)for(let o in s)n.push({as:D(o),expr:s[o]})}),r.window=r.window.concat(n),this}}qualify(...t){let{query:r}=this;return t.length===0?r.qualify:(r.qualify=r.qualify.concat(t.flat().filter(n=>n)),this)}orderby(...t){let{query:r}=this;return t.length===0?r.orderby:(r.orderby=r.orderby.concat(t.flat().filter(n=>n).map(u)),this)}limit(t){let{query:r}=this;return arguments.length===0?r.limit:(r.limit=Number.isFinite(t)?t:void 0,this)}offset(t){let{query:r}=this;return arguments.length===0?r.offset:(r.offset=Number.isFinite(t)?t:void 0,this)}get subqueries(){let{query:t,cteFor:r}=this,s=(r?.query||t).with?.reduce((c,{as:p,query:h})=>(c[p]=h,c),{}),o=[];return t.from.forEach(({from:c})=>{if(O(c))o.push(c);else if(s[c.table]){let p=s[c.table];o.push(p)}}),o}toString(){let{select:t,distinct:r,from:n,sample:s,where:o,groupby:c,having:p,window:h,qualify:E,orderby:b,limit:X,offset:B,with:V}=this.query,m=[];if(V.length){let l=V.map(({as:a,query:g})=>`"${a}" AS (${g})`);m.push(`WITH ${l.join(", ")}`)}let z=t.map(({as:l,expr:a})=>W(a,l)&&!a.table?`${a}`:`${a} AS "${l}"`);if(m.push(`SELECT${r?" DISTINCT":""} ${z.join(", ")}`),n.length){let l=n.map(({as:a,from:g})=>{let N=O(g)?`(${g})`:`${g}`;return!a||a===g.table?N:`${N} AS "${a}"`});m.push(`FROM ${l.join(", ")}`)}if(s){let{rows:l,perc:a,method:g,seed:N}=s,J=l?`${l} ROWS`:`${a} PERCENT`,Z=g?` (${g}${N!=null?`, ${N}`:""})`:"";m.push(`USING SAMPLE ${J}${Z}`)}if(o.length){let l=o.map(String).filter(a=>a).join(" AND ");l&&m.push(`WHERE ${l}`)}if(c.length&&m.push(`GROUP BY ${c.join(", ")}`),p.length){let l=p.map(String).filter(a=>a).join(" AND ");l&&m.push(`HAVING ${l}`)}if(h.length){let l=h.map(({as:a,expr:g})=>`"${a}" AS (${g})`);m.push(`WINDOW ${l.join(", ")}`)}if(E.length){let l=E.map(String).filter(a=>a).join(" AND ");l&&m.push(`QUALIFY ${l}`)}return b.length&&m.push(`ORDER BY ${b.join(", ")}`),Number.isFinite(X)&&m.push(`LIMIT ${X}`),Number.isFinite(B)&&m.push(`OFFSET ${B}`),m.join(" ")}},d=class{constructor(t,r){this.op=t,this.queries=r.map(n=>n.clone()),this.query={orderby:[]}}clone(){let t=new d(this.op,this.queries);return t.query={...this.query},t}orderby(...t){let{query:r}=this;return t.length===0?r.orderby:(r.orderby=r.orderby.concat(t.flat().filter(n=>n).map(u)),this)}limit(t){let{query:r}=this;return arguments.length===0?r.limit:(r.limit=Number.isFinite(t)?t:void 0,this)}offset(t){let{query:r}=this;return arguments.length===0?r.offset:(r.offset=Number.isFinite(t)?t:void 0,this)}get subqueries(){let{queries:t,cteFor:r}=this;return r&&t.forEach(n=>n.cteFor=r),t}toString(){let{op:t,queries:r,query:{orderby:n,limit:s,offset:o}}=this,c=[r.join(` ${t} `)];return n.length&&c.push(`ORDER BY ${n.join(", ")}`),Number.isFinite(s)&&c.push(`LIMIT ${s}`),Number.isFinite(o)&&c.push(`OFFSET ${o}`),c.join(" ")}};function O(e){return e instanceof S||e instanceof d}function D(e){return fr(e)?e.slice(1,-1):e}function fr(e){return e[0]==='"'&&e[e.length-1]==='"'}export{S as Query,x as Ref,tt as all,$t as and,cr as argmax,ir as argmin,lr as arrayAgg,u as asColumn,R as asRelation,Lt as avg,k as column,wt as contains,Qt as corr,It as count,kt as covarPop,rt as desc,Bt as entropy,ar as epoch_ms,ct as eq,T as expr,F as exprParams,sr as first,at as gt,ft as gte,gt as isBetween,ht as isDistinct,Tt as isFinite,bt as isInfinite,At as isNaN,xt as isNotBetween,mt as isNotDistinct,it as isNotNull,ot as isNull,O as isQuery,Xt as kurtosis,or as last,qt as length,nt as literal,y as literalToSQL,Nt as lower,lt,pt as lte,Ot as mad,Ct as max,Dt as mean,Ut as median,Ft as min,jt as mode,ut as neq,st as not,St as or,yt as prefix,Pt as product,Mt as quantile,dt as regexp_matches,er as regrAvgX,nr as regrAvgY,zt as regrCount,Ht as regrIntercept,Jt as regrR2,tr as regrSXX,rr as regrSXY,Zt as regrSYY,Kt as regrSlope,Q as relation,vt as skewness,et as sql,_t as stddev,Wt as stddevPop,ur as stringAgg,Et as suffix,Gt as sum,f as toSQL,G as transform,pr as unnest,Rt as upper,Vt as varPop,Yt as variance};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uwdata/mosaic-sql",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "description": "SQL query construction and analysis.",
   "keywords": [
     "sql",
@@ -24,5 +24,6 @@
     "lint": "eslint src test --ext .js",
     "test": "mocha 'test/**/*-test.js'",
     "prepublishOnly": "npm run test && npm run lint && npm run build"
-  }
+  },
+  "gitHead": "a7967c35349bdf7f00abb113ce1dd9abb233cd62"
 }

package/src/Query.js

@@ -1,3 +1,4 @@
+import { isExpression } from './expression.js';
 import { asColumn, asRelation, isColumnRefFor, Ref } from './ref.js';
 
 export class Query {
@@ -126,7 +127,7 @@ export class Query {
           list.push({ as: e, from: asRelation(e) });
         } else if (e instanceof Ref) {
           list.push({ as: e.table, from: e });
-        } else if (isQuery(e) || Object.hasOwn(e, 'toString')) {
+        } else if (isQuery(e) || isExpression(e)) {
           list.push({ from: e });
         } else if (Array.isArray(e)) {
           list.push({ as: unquote(e[0]), from: asRelation(e[1]) });

package/src/datetime.js

@@ -1,4 +1,4 @@
-import { transform } from './ref.js';
+import { transform } from './expression.js';
 
 export const epoch_ms = transform(
   d => `(1000 * (epoch(${d}) - second(${d})) + millisecond(${d}))::DOUBLE`

package/src/expression.js

@@ -0,0 +1,68 @@
+import { asColumn } from './ref.js';
+import { literalToSQL } from './to-sql.js';
+
+export const isParamLike = e => typeof e?.addEventListener === 'function';
+
+export function isExpression(e) {
+  return e instanceof SQLExpression;
+}
+
+export class SQLExpression {
+  constructor(sql, columns, label) {
+    this.expr = sql;
+    this.label = label;
+    this.columns = columns || [];
+  }
+
+  toString() {
+    return `${this.expr}`;
+  }
+}
+
+export class ParameterizedSQLExpression extends SQLExpression{
+  constructor(parts, columns, label) {
+    const paramSet = new Set;
+    for (const part of parts) {
+      if (isParamLike(part)) paramSet.add(part);
+    }
+    paramSet.forEach(param => {
+      param.addEventListener('value', () => this.update());
+    });
+    super(parts, columns, label);
+  }
+
+  toString() {
+    return this.expr
+      .map(p => isParamLike(p) ? literalToSQL(p.value) : p)
+      .join('');
+  }
+
+  addEventListener(type, callback) {
+    const map = this.map || (this.map = new Map());
+    const set = map.get(type) || (map.set(type, new Set), map.get(type));
+    set.add(callback);
+  }
+
+  update() {
+    this.map?.get('value')?.forEach(callback => callback(this));
+  }
+}
+
+export function exprParams(parts, columns, label) {
+  return new ParameterizedSQLExpression(parts, columns, label);
+}
+
+export function expr(sql, columns, label) {
+  return new SQLExpression(sql, columns, label);
+}
+
+export function desc(e) {
+  return Object.assign(
+    expr(`${asColumn(e)} DESC NULLS LAST`, e?.columns, e?.label),
+    { desc: true }
+  );
+}
+
+export function transform(func, label) {
+  return value => expr(func(value), asColumn(value).columns, label);
+}

package/src/index.js

@@ -4,11 +4,19 @@ export {
   asRelation,
   all,
   column,
+  relation
+} from './ref.js';
+
+export {
+  transform,
   desc,
   expr,
-  relation,
-  transform
-} from './ref.js';
+  exprParams
+} from './expression.js';
+
+export {
+  sql
+} from './sql-tag.js';
 
 export {
   toSQL,

package/src/ref.js

@@ -44,30 +44,3 @@ export function column(table, column) {
 export function all(table) {
   return new Ref(table, '*');
 }
-
-export function desc(expr) {
-  expr = asColumn(expr);
-  return {
-    expr,
-    desc: true,
-    toString: () => `${expr} DESC NULLS LAST`,
-    get columns() { return expr.columns?.() || []; }
-  };
-}
-
-export function expr(sql, columns, label) {
-  return {
-    expr: sql,
-    label,
-    toString: () => `${sql}`,
-    get columns() { return columns || []; }
-  };
-}
-
-export function transform(func, label) {
-  return value => expr(
-    func(value),
-    asColumn(value).columns,
-    label
-  )
-}

package/src/sql-tag.js

@@ -0,0 +1,34 @@
+import { expr, exprParams, isParamLike } from './expression.js';
+
+/**
+ * Tag function for SQL expression strings. Interpolated values
+ * may be strings, other SQL expression objects (such as column
+ * references), or parameterized values.
+ */
+export function sql(strings, ...exprs) {
+  const spans = [strings[0]];
+  const colset = new Set;
+  const n = exprs.length;
+  for (let i = 0, k = 0; i < n;) {
+    const e = exprs[i];
+    if (isParamLike(e)) {
+      spans[++k] = e;
+    } else {
+      if (Array.isArray(e.columns)) {
+        e.columns.forEach(col => colset.add(col));
+      }
+      spans[k] += String(e);
+    }
+    const s = strings[++i];
+    if (isParamLike(spans[k])) {
+      spans[++k] = s;
+    } else {
+      spans[k] += s;
+    }
+  }
+
+  const columns = Array.from(colset);
+  return spans.length > 1
+    ? exprParams(spans, columns)
+    : expr(spans[0], columns);
+}