xcraft-core-pickaxe 0.1.5 → 0.1.6

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)})`;
   },

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',

package/lib/picks.js

@@ -12,6 +12,7 @@ const {
   number,
   StringType,
   string,
+  NumberType,
 } = require('xcraft-core-stones');
 
 const $o = require('./operators.js');
@@ -49,7 +50,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 +156,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
  */
@@ -340,7 +364,7 @@ class ArrayPick {
   }
 
   get length() {
-    return new ValuePick(number, {
+    return new NumberPick(number, {
       field: $o.length(this.value),
       path: [],
     });
@@ -437,6 +461,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

@@ -31,9 +31,12 @@ const {queryToSql} = require('./query-to-sql.js');
 /**
  * @typedef {Operators["count"] | Operators["avg"] | Operators["max"] | Operators["min"] | Operators["sum"] | Operators["groupArray"]} Aggregator
  */
+/**
+ * @typedef {Operators["abs"] | Operators["plus"] | Operators["minus"]} MathOperator
+ */
 
 /**
- * @typedef {AnyPick | Aggregator} SelectValue
+ * @typedef {AnyPick | Aggregator | MathOperator} SelectValue
  */
 /**
  * @template T

package/package.json

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