@atscript/db-memory 0.1.134 → 0.1.136

package/dist/index.cjs

@@ -348,7 +348,8 @@ function projectRow(row, projection, opts) {
 * - null and missing form ONE group; a calendar-bucket key is the
 *   `@uniqu/core` kernel label (the SQLite UDF runs the same kernel);
 * - `sum` / `avg` over no numeric value are `null`; `min` / `max` order with
-*   the `$sort` comparator; any other `$fn` is `INVALID_QUERY`;
+*   the `$sort` comparator; `countDistinct` counts distinct non-null values
+*   by group identity (below); any other `$fn` is `INVALID_QUERY`;
 * - group identity is type-tagged: `1` and `"1"` never share a group (a
 *   number and a bigint of one value do), `Date`s group by instant, JSON
 *   values by a key-order-independent serialization;
@@ -470,6 +471,7 @@ function numericValue(value) {
 * there are no rows.
 */
 function accumulatorFactory(expr) {
+	(0, _atscript_db_agg.assertAggregateFn)(expr.$fn);
 	const field = expr.$field;
 	const read = pathReader(field);
 	switch (expr.$fn) {
@@ -503,6 +505,19 @@ function accumulatorFactory(expr) {
 				};
 			};
 		}
+		case "countDistinct": return () => {
+			const plain = /* @__PURE__ */ new Set();
+			const tokens = /* @__PURE__ */ new Set();
+			return {
+				add: (row) => {
+					const v = read(row);
+					if (v == null) return;
+					if (typeof v === "string" || typeof v === "boolean") plain.add(v);
+					else tokens.add(identityToken(v));
+				},
+				result: () => plain.size + tokens.size
+			};
+		};
 		case "min":
 		case "max": {
 			const sign = expr.$fn === "min" ? -1 : 1;
@@ -518,10 +533,7 @@ function accumulatorFactory(expr) {
 				};
 			};
 		}
-		default: throw new _atscript_db.DbError("INVALID_QUERY", [{
-			path: "$select",
-			message: `Unsupported aggregate function "${String(expr.$fn)}" — use count, sum, avg, min or max`
-		}]);
+		default: return expr.$fn;
 	}
 }
 //#endregion
@@ -1095,6 +1107,10 @@ var MemoryAdapter = class extends _atscript_db.BaseDbAdapter {
 	calendarBucketUnits() {
 		return _atscript_db.ALL_BUCKET_UNITS;
 	}
+	/** Every aggregate function, `countDistinct` included. */
+	aggregateFns() {
+		return _atscript_db.ALL_AGGREGATE_FNS;
+	}
 	async updateMany(filter, data, ops) {
 		this._assertWritable();
 		const matched = this._selectForWrite(filter, void 0, true);

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbUpdateResult, TFieldOps } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbUpdateResult, TFieldOps } from "@atscript/db";
 import { TAtscriptAnnotatedType } from "@atscript/typescript/utils";
 
 //#region src/lib/memory-adapter.d.ts
@@ -367,6 +367,8 @@ declare class MemoryAdapter extends BaseDbAdapter {
    * there is no zone this adapter cannot resolve).
    */
   calendarBucketUnits(): ReadonlySet<BucketUnit>;
+  /** Every aggregate function, `countDistinct` included. */
+  aggregateFns(): ReadonlySet<AggregateFn>;
   updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps): Promise<TDbUpdateResult>;
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteMany(filter: FilterExpr): Promise<TDbDeleteResult>;

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbUpdateResult, TFieldOps } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbUpdateResult, TFieldOps } from "@atscript/db";
 import { TAtscriptAnnotatedType } from "@atscript/typescript/utils";
 
 //#region src/lib/memory-adapter.d.ts
@@ -367,6 +367,8 @@ declare class MemoryAdapter extends BaseDbAdapter {
    * there is no zone this adapter cannot resolve).
    */
   calendarBucketUnits(): ReadonlySet<BucketUnit>;
+  /** Every aggregate function, `countDistinct` included. */
+  aggregateFns(): ReadonlySet<AggregateFn>;
   updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps): Promise<TDbUpdateResult>;
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteMany(filter: FilterExpr): Promise<TDbDeleteResult>;

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace, walkFilter } from "@atscript/db";
-import { resolveAlias } from "@atscript/db/agg";
+import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace, walkFilter } from "@atscript/db";
+import { assertAggregateFn, resolveAlias } from "@atscript/db/agg";
 import { bucketer } from "@uniqu/core";
 //#region src/lib/memory-filter.ts
 /**
@@ -347,7 +347,8 @@ function projectRow(row, projection, opts) {
 * - null and missing form ONE group; a calendar-bucket key is the
 *   `@uniqu/core` kernel label (the SQLite UDF runs the same kernel);
 * - `sum` / `avg` over no numeric value are `null`; `min` / `max` order with
-*   the `$sort` comparator; any other `$fn` is `INVALID_QUERY`;
+*   the `$sort` comparator; `countDistinct` counts distinct non-null values
+*   by group identity (below); any other `$fn` is `INVALID_QUERY`;
 * - group identity is type-tagged: `1` and `"1"` never share a group (a
 *   number and a bigint of one value do), `Date`s group by instant, JSON
 *   values by a key-order-independent serialization;
@@ -469,6 +470,7 @@ function numericValue(value) {
 * there are no rows.
 */
 function accumulatorFactory(expr) {
+	assertAggregateFn(expr.$fn);
 	const field = expr.$field;
 	const read = pathReader(field);
 	switch (expr.$fn) {
@@ -502,6 +504,19 @@ function accumulatorFactory(expr) {
 				};
 			};
 		}
+		case "countDistinct": return () => {
+			const plain = /* @__PURE__ */ new Set();
+			const tokens = /* @__PURE__ */ new Set();
+			return {
+				add: (row) => {
+					const v = read(row);
+					if (v == null) return;
+					if (typeof v === "string" || typeof v === "boolean") plain.add(v);
+					else tokens.add(identityToken(v));
+				},
+				result: () => plain.size + tokens.size
+			};
+		};
 		case "min":
 		case "max": {
 			const sign = expr.$fn === "min" ? -1 : 1;
@@ -517,10 +532,7 @@ function accumulatorFactory(expr) {
 				};
 			};
 		}
-		default: throw new DbError("INVALID_QUERY", [{
-			path: "$select",
-			message: `Unsupported aggregate function "${String(expr.$fn)}" — use count, sum, avg, min or max`
-		}]);
+		default: return expr.$fn;
 	}
 }
 //#endregion
@@ -1094,6 +1106,10 @@ var MemoryAdapter = class extends BaseDbAdapter {
 	calendarBucketUnits() {
 		return ALL_BUCKET_UNITS;
 	}
+	/** Every aggregate function, `countDistinct` included. */
+	aggregateFns() {
+		return ALL_AGGREGATE_FNS;
+	}
 	async updateMany(filter, data, ops) {
 		this._assertWritable();
 		const matched = this._selectForWrite(filter, void 0, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-memory",
-  "version": "0.1.134",
+  "version": "0.1.136",
   "description": "In-memory adapter for atscript-db.",
   "keywords": [
     "atscript",
@@ -38,14 +38,14 @@
   "devDependencies": {
     "@atscript/core": "^0.1.92",
     "@atscript/typescript": "^0.1.92",
-    "@uniqu/core": "^0.1.10",
+    "@uniqu/core": "^0.1.11",
     "unplugin-atscript": "^0.1.92"
   },
   "peerDependencies": {
     "@atscript/core": "^0.1.92",
     "@atscript/typescript": "^0.1.92",
-    "@uniqu/core": "^0.1.10",
-    "@atscript/db": "^0.1.134"
+    "@uniqu/core": "^0.1.11",
+    "@atscript/db": "^0.1.136"
   },
   "scripts": {
     "postinstall": "asc -f dts",