xcraft-core-pickaxe 0.1.5 → 0.1.7

package/lib/operator-to-sql.js

@@ -124,6 +124,24 @@ const operators = {
     return `(${sqlConditions.join(' OR ')})`;
   },
 
+  abs({value}, values) {
+    return `ABS(${sql(value, values)})`;
+  },
+
+  plus({values: list}, values) {
+    return `(${list
+      .map((value) => sql(value, values))
+      .filter(Boolean)
+      .join(' + ')})`;
+  },
+
+  minus({values: list}, values) {
+    return `(${list
+      .map((value) => sql(value, values))
+      .filter(Boolean)
+      .join(' - ')})`;
+  },
+
   length({list}, values) {
     return `json_array_length(${sql(list, values)})`;
   },
@@ -148,6 +166,15 @@ const operators = {
     )`;
   },
 
+  query({query}, values) {
+    const {queryToSql} = require('./query-to-sql.js');
+    return `(${queryToSql(query, values).sql})`;
+  },
+
+  each({value}, values) {
+    return `json_each(${sql(value, values)})`;
+  },
+
   eachValue(_, values) {
     return 'json_each.value';
   },

package/lib/operators.js

@@ -168,6 +168,33 @@ const operators = {
     });
   },
 
+  abs(value) {
+    value = op(value);
+    return /** @type {const} */ ({
+      operator: 'abs',
+      type: number,
+      value,
+    });
+  },
+
+  plus(...values) {
+    values = values.map(op);
+    return /** @type {const} */ ({
+      operator: 'plus',
+      type: number,
+      values,
+    });
+  },
+
+  minus(...values) {
+    values = values.map(op);
+    return /** @type {const} */ ({
+      operator: 'minus',
+      type: number,
+      values,
+    });
+  },
+
   length(list) {
     return /** @type {const} */ ({
       operator: 'length',
@@ -192,6 +219,20 @@ const operators = {
     });
   },
 
+  query(query) {
+    return /** @type {const} */ ({
+      operator: 'query',
+      query,
+    });
+  },
+
+  each(value) {
+    return /** @type {const} */ ({
+      operator: 'each',
+      value,
+    });
+  },
+
   eachValue() {
     return /** @type {const} */ ({
       operator: 'eachValue',
@@ -315,4 +356,11 @@ const operators = {
  * @typedef {Values<{[k in keyof typeof operators] : ReturnType<typeof operators[k]>}>} Operator
  */
 
+/**
+ * @typedef {Operators["count"] | Operators["avg"] | Operators["max"] | Operators["min"] | Operators["sum"] | Operators["groupArray"]} Aggregator
+ */
+/**
+ * @typedef {Operators["abs"] | Operators["plus"] | Operators["minus"]} MathOperator
+ */
+
 module.exports = operators;

package/lib/picks.js

@@ -12,15 +12,15 @@ const {
   number,
   StringType,
   string,
+  NumberType,
 } = require('xcraft-core-stones');
 
 const $o = require('./operators.js');
 
 /**
  * @typedef {import('./operators.js').Operators} Operators
- */
-/**
  * @typedef {import('./operators.js').Operator} Operator
+ * @typedef {import('./operators.js').Aggregator} Aggregator
  */
 
 /**
@@ -49,7 +49,7 @@ const $o = require('./operators.js');
 
 /**
  * @template {Type} T
- * @typedef { [T] extends [ArrayType<infer V>] ? ArrayPick<V> : [T] extends [ObjectType<infer S>] ? ObjectPick<S> : [T] extends [ObjectMapType<infer V>] ? RecordPick<StringType,V> : [T] extends [RecordType<infer K,infer V>] ? RecordPick<K,V> : ValuePick<T>} PickOfType
+ * @typedef { [T] extends [ArrayType<infer V>] ? ArrayPick<V> : [T] extends [ObjectType<infer S>] ? ObjectPick<S> : [T] extends [ObjectMapType<infer V>] ? RecordPick<StringType,V> : [T] extends [RecordType<infer K,infer V>] ? RecordPick<K,V> : [T] extends [NumberType] ? NumberPick : ValuePick<T>} PickOfType
  */
 /**
  * @template {AnyTypeOrShape} T
@@ -155,6 +155,29 @@ class ValuePick {
   }
 }
 
+/**
+ * @extends {ValuePick<NumberType>}
+ */
+class NumberPick extends ValuePick {
+  abs() {
+    return $o.abs(this.value);
+  }
+
+  /**
+   * @param {number | ValuePick<NumberType>} value
+   */
+  plus(value) {
+    return $o.plus(this.value, value);
+  }
+
+  /**
+   * @param {number | ValuePick<NumberType>} value
+   */
+  minus(value) {
+    return $o.minus(this.value, value);
+  }
+}
+
 /**
  * @template {ObjectShape} T
  */
@@ -277,6 +300,27 @@ class RecordPick {
     return $o.not(this.some((...args) => $o.not(func(...args))));
   }
 
+  /**
+   * @param {(value: PickOf<V>, key: PickOf<K>) => Aggregator} fct
+   */
+  select(fct) {
+    return $o.query({
+      from: $o.each(this.value),
+      select: [
+        fct(
+          makePick(this.#type.valuesType, {
+            field: $o.eachValue(),
+            path: [],
+          }),
+          makePick(this.#type.keysType, {
+            field: $o.eachKey(),
+            path: [],
+          })
+        ),
+      ],
+    });
+  }
+
   /**
    * @returns {ArrayPick<K>}
    */
@@ -340,7 +384,7 @@ class ArrayPick {
   }
 
   get length() {
-    return new ValuePick(number, {
+    return new NumberPick(number, {
       field: $o.length(this.value),
       path: [],
     });
@@ -374,6 +418,23 @@ class ArrayPick {
   every(func) {
     return $o.not(this.some((...args) => $o.not(func(...args))));
   }
+
+  /**
+   * @param {(value: PickOf<T>) => Aggregator} fct
+   */
+  select(fct) {
+    return $o.query({
+      from: $o.each(this.value),
+      select: [
+        fct(
+          makePick(this.#type.valuesType, {
+            field: $o.eachValue(),
+            path: [],
+          })
+        ),
+      ],
+    });
+  }
 }
 
 /**
@@ -437,6 +498,9 @@ function makeTypePick(type, context) {
   if (type instanceof RecordType) {
     return /** @type {any} */ (new RecordPick(type, context));
   }
+  if (type instanceof NumberType) {
+    return /** @type {any} */ (new NumberPick(type, context));
+  }
   return /** @type {any} */ (new ValuePick(type, context));
 }
 

package/lib/query-builder.js

@@ -10,30 +10,19 @@ const {
 const operators = require('./operators.js');
 const {rowPick, ValuePick, RowPick, ObjectPick} = require('./picks.js');
 const {queryToSql} = require('./query-to-sql.js');
-/**
- * @typedef {import("./operators.js").Operator} Operator
- */
 /**
  * @typedef {import("./operators.js").Operators} Operators
+ * @typedef {import("./operators.js").Operator} Operator
+ * @typedef {import("./operators.js").Aggregator} Aggregator
+ * @typedef {import("./operators.js").MathOperator} MathOperator
  */
 
-/**
- * @template {AnyTypeOrShape} T
- * @typedef {import("./picks.js").PickOf<T>} PickOf
- */
 /**
  * @typedef {import("./picks.js").AnyPick} AnyPick
  */
-/**
- * @typedef {import("./picks.js").Path} Path
- */
-
-/**
- * @typedef {Operators["count"] | Operators["avg"] | Operators["max"] | Operators["min"] | Operators["sum"] | Operators["groupArray"]} Aggregator
- */
 
 /**
- * @typedef {AnyPick | Aggregator} SelectValue
+ * @typedef {AnyPick | Aggregator | MathOperator} SelectValue
  */
 /**
  * @template T
@@ -185,7 +174,7 @@ class FinalQuery {
   }
 
   sql() {
-    return queryToSql(this.#queryParts, false).sql;
+    return queryToSql(this.#queryParts, null).sql;
   }
 
   /**

package/lib/query-to-sql.js

@@ -45,14 +45,16 @@ function groupByFields(groupBy, values) {
 
 /**
  * @param {QueryObj} query
- * @param {boolean} [useBindedValues=true]
+ * @param {any[] | null} [values]
  * @returns {{sql: string, values: any[] | null}}
  */
-function queryToSql(query, useBindedValues = true) {
-  const values = useBindedValues ? [] : null;
+function queryToSql(query, values = []) {
   const distinct = query.distinct ? 'DISTINCT ' : '';
+  // Note: query.from is not validated
+  const from =
+    typeof query.from === 'string' ? query.from : sql(query.from, values);
   let result = `SELECT ${distinct}${selectFields(query.select, values)}`;
-  result += '\n' + `FROM ${query.from}`;
+  result += '\n' + `FROM ${from}`;
   if (query.where) {
     result += '\n' + `WHERE ${sql(query.where, values)}`;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcraft-core-pickaxe",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Query builder",
   "main": "index.js",
   "scripts": {