@atscript/moost-db 0.1.153 → 0.1.155

package/dist/index.cjs

@@ -1529,7 +1529,7 @@ var FieldCapabilityIndex = class FieldCapabilityIndex {
 		const ignored = source.ignoredFields;
 		for (const [path, entry] of flatMap) {
 			if (!path || this._entries.has(path) || this._objectParents.has(path)) continue;
-			if (entry?.type?.kind !== "object") continue;
+			if (!entry?.type || (0, _atscript_db.resolveDesignType)(entry) !== "object") continue;
 			if (entry.metadata?.has?.("db.json")) continue;
 			if (isNavOrDescendant(path)) continue;
 			if (ignored.has(path)) continue;
@@ -1644,13 +1644,17 @@ var FieldCapabilityIndex = class FieldCapabilityIndex {
 	* `predicate` is a filter entry's class (`collectQueryPaths` records it per
 	* occurrence); it only matters for `op === "filter"` on a listed leaf.
 	*
+	* `nullTest` (since 0.1.155): the filter entry only tests presence
+	* (`TFilterRef.nullTest`) — accepted on a nested-object parent whose leaves
+	* are all visible.
+	*
 	* `prefix` (since 0.1.147) is this index's readable's dotted path from the
 	* controller when it judges a relational predicate's operand (`"ticket."`):
 	* `exists` still receives the LOCAL path, the verdict's `path` and message
 	* name the prefixed one. A filter on a navigation path names the predicate
 	* alternative (`ticket=$some(status=…)`).
 	*/
-	check(local, gateOp, exists, predicate = "compare", prefix = "") {
+	check(local, gateOp, exists, predicate = "compare", prefix = "", nullTest = false) {
 		const path = prefix + local;
 		const requires = prefix === "" ? this._decorations.get(local) : void 0;
 		if (requires) {
@@ -1707,6 +1711,7 @@ var FieldCapabilityIndex = class FieldCapabilityIndex {
 				const all = this._objectParents.get(local);
 				const leaves = all.filter(exists).map((leaf) => prefix + leaf);
 				if (leaves.length === 0 && all.length > 0) return unknownField(path);
+				if (op === "filter" && nullTest && all.length > 0 && all.every((leaf) => exists(leaf) && this._entries.get(leaf)?.filterBy.exists === void 0) && (0, _atscript_db.findAncestorInSet)(local, this._bucketTable.jsonValueParents) === void 0) return;
 				return {
 					path,
 					message: `"${path}" is a nested object — filter or sort on one of its leaves (${leafHint(leaves)})`
@@ -1847,7 +1852,7 @@ var RelationPredicateGate = class {
 		const index = this._indexOf(target);
 		const visible = (p) => this._visibleAt(target, prefix, p);
 		for (const ref of refs.filter) {
-			const error = ref.predicate === "relation" ? this.checkRef(ref, state, target, prefix, depth) : verdictError(index.check(ref.path, "filter", visible, ref.predicate, prefix));
+			const error = ref.predicate === "relation" ? this.checkRef(ref, state, target, prefix, depth) : verdictError(index.check(ref.path, "filter", visible, ref.predicate, prefix, ref.nullTest));
 			if (error) return error;
 		}
 	}
@@ -5246,7 +5251,7 @@ let AsDbReadableController = _AsDbReadableController = class AsDbReadableControl
 				if (relError) return relError;
 				continue;
 			}
-			const verdict = capabilities.check(ref.path, "filter", isVisible, ref.predicate);
+			const verdict = capabilities.check(ref.path, "filter", isVisible, ref.predicate, "", ref.nullTest);
 			if (verdict) return badRequest(verdict.path, verdict.message);
 		}
 		const liveWith = parsed.controls?.$with;
@@ -5323,7 +5328,8 @@ let AsDbReadableController = _AsDbReadableController = class AsDbReadableControl
 		}
 	}
 	/**
-	* {@link checkComputedSelect} (before the controls DTO), the controls DTO
+	* {@link checkComputedSelect} (before the controls DTO), on `/pages` the
+	* aggregate 400 (since 0.1.155), the controls DTO
 	* ({@link validateControls}), then the `$with` relation names at every
 	* level — BEFORE the `$with` sub-query paths ({@link validateInsights}),
 	* so a hidden or nonexistent nested relation answers `Unknown relation`,
@@ -5334,6 +5340,7 @@ let AsDbReadableController = _AsDbReadableController = class AsDbReadableControl
 		const computedError = this.checkComputedSelect(parsed.controls);
 		if (computedError) return computedError;
 		const controls = parsed.controls;
+		if (type === "pages" && (controls?.$groupBy !== void 0 || computedMode(parsed))) return badRequest(controls?.$groupBy === void 0 ? "$select" : "$groupBy", "Aggregate queries are only valid on /query");
 		if (controls && typeof controls === "object") this._clientWith.set(controls, snapshotClientWith(controls.$with) ?? null);
 		const controlsError = this.validateControls(controls, type);
 		if (controlsError) return new _moostjs_event_http.HttpError(400, controlsError);
@@ -7012,13 +7019,15 @@ let AsDbReadableController = _AsDbReadableController = class AsDbReadableControl
 	*/
 	async query(url) {
 		const { parsed, controls } = await this.parseRequest("query", url);
-		const groupBy = controls.$groupBy;
-		if (groupBy?.length && controls.$with?.length) return new _moostjs_event_http.HttpError(400, "Cannot combine $with and $groupBy in the same query");
-		if (groupBy?.length && controls.$vector !== void 0) return new _moostjs_event_http.HttpError(400, "Cannot combine $vector and $groupBy in the same query");
+		const computed = computedMode(parsed);
+		if (computed && controls.$groupBy === void 0) controls.$groupBy = [];
+		const aggregate = computed || !!controls.$groupBy?.length;
+		if (aggregate && controls.$with?.length) return new _moostjs_event_http.HttpError(400, "Cannot combine $with and $groupBy in the same query");
+		if (aggregate && controls.$vector !== void 0) return new _moostjs_event_http.HttpError(400, "Cannot combine $vector and $groupBy in the same query");
 		const error = this.validateParsed(parsed, "query");
 		if (error) return error;
 		let gateRefs;
-		if (groupBy?.length && this._writeOnlySet.size > 0) {
+		if (aggregate && this._writeOnlySet.size > 0) {
 			gateRefs = (0, _atscript_db.collectQueryPaths)(parsed, computedMode(parsed));
 			const refs = gateRefs.aggregateMode ? gateRefs : (0, _atscript_db.collectQueryPaths)(parsed, true);
 			const sealed = [
@@ -7033,7 +7042,7 @@ let AsDbReadableController = _AsDbReadableController = class AsDbReadableControl
 		const gateError = gateRefs ? this._checkCapabilitiesWith(parsed, gateRefs) : this.checkCapabilities(parsed);
 		if (gateError) return gateError;
 		const clientFilter = await this._relationOverlay(parsed);
-		if (groupBy?.length) {
+		if (aggregate) {
 			const filter = this.applySearchFallback(await this.transformFilter(clientFilter), controls);
 			return this.readable.aggregate({
 				filter,

package/dist/index.d.cts

@@ -1064,13 +1064,17 @@ declare class FieldCapabilityIndex implements TQueryPathSource {
    * `predicate` is a filter entry's class (`collectQueryPaths` records it per
    * occurrence); it only matters for `op === "filter"` on a listed leaf.
    *
+   * `nullTest` (since 0.1.155): the filter entry only tests presence
+   * (`TFilterRef.nullTest`) — accepted on a nested-object parent whose leaves
+   * are all visible.
+   *
    * `prefix` (since 0.1.147) is this index's readable's dotted path from the
    * controller when it judges a relational predicate's operand (`"ticket."`):
    * `exists` still receives the LOCAL path, the verdict's `path` and message
    * name the prefixed one. A filter on a navigation path names the predicate
    * alternative (`ticket=$some(status=…)`).
    */
-  check(local: string, gateOp: TGateOp, exists: (path: string) => boolean, predicate?: TFilterPredicate, prefix?: string): TCapabilityVerdict | undefined;
+  check(local: string, gateOp: TGateOp, exists: (path: string) => boolean, predicate?: TFilterPredicate, prefix?: string, nullTest?: boolean): TCapabilityVerdict | undefined;
 }
 //#endregion
 //#region src/as-db-readable.controller.d.ts
@@ -1376,7 +1380,8 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
    */
   protected validateInsights(insights: Map<string, unknown>): string | undefined;
   /**
-   * {@link checkComputedSelect} (before the controls DTO), the controls DTO
+   * {@link checkComputedSelect} (before the controls DTO), on `/pages` the
+   * aggregate 400 (since 0.1.155), the controls DTO
    * ({@link validateControls}), then the `$with` relation names at every
    * level — BEFORE the `$with` sub-query paths ({@link validateInsights}),
    * so a hidden or nonexistent nested relation answers `Unknown relation`,

package/dist/index.d.mts

@@ -1064,13 +1064,17 @@ declare class FieldCapabilityIndex implements TQueryPathSource {
    * `predicate` is a filter entry's class (`collectQueryPaths` records it per
    * occurrence); it only matters for `op === "filter"` on a listed leaf.
    *
+   * `nullTest` (since 0.1.155): the filter entry only tests presence
+   * (`TFilterRef.nullTest`) — accepted on a nested-object parent whose leaves
+   * are all visible.
+   *
    * `prefix` (since 0.1.147) is this index's readable's dotted path from the
    * controller when it judges a relational predicate's operand (`"ticket."`):
    * `exists` still receives the LOCAL path, the verdict's `path` and message
    * name the prefixed one. A filter on a navigation path names the predicate
    * alternative (`ticket=$some(status=…)`).
    */
-  check(local: string, gateOp: TGateOp, exists: (path: string) => boolean, predicate?: TFilterPredicate, prefix?: string): TCapabilityVerdict | undefined;
+  check(local: string, gateOp: TGateOp, exists: (path: string) => boolean, predicate?: TFilterPredicate, prefix?: string, nullTest?: boolean): TCapabilityVerdict | undefined;
 }
 //#endregion
 //#region src/as-db-readable.controller.d.ts
@@ -1376,7 +1380,8 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
    */
   protected validateInsights(insights: Map<string, unknown>): string | undefined;
   /**
-   * {@link checkComputedSelect} (before the controls DTO), the controls DTO
+   * {@link checkComputedSelect} (before the controls DTO), on `/pages` the
+   * aggregate 400 (since 0.1.155), the controls DTO
    * ({@link validateControls}), then the `$with` relation names at every
    * level — BEFORE the `$with` sub-query paths ({@link validateInsights}),
    * so a hidden or nonexistent nested relation answers `Unknown relation`,

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { ValidatorError, defineAnnotatedType, isAnnotatedType, serializeAnnotate
 import { Body, Delete, Get, HttpError, MoostHttp, Patch, Post, Put, Query, Url, httpKind, prerenderJson } from "@moostjs/event-http";
 import { ApplyDecorators, Controller, Inherit, Inject, Intercept, Moost, Optional, Param, Pipe, Provide, Resolve, TInterceptorPriority, TPipePriority, current, defineBeforeInterceptor, defineInterceptor, definePipeFn, getMoostMate, useControllerContext, withControllerContext } from "moost";
 import { parseUrl } from "@uniqu/url";
-import { ADAPTER_FILTER_REASON, ALL_AGGREGATE_FNS, DbError, ENCRYPTED_REASON, acceptedOperatorsHint, aliasTargetOf, andFilters, bucketSourceVerdict, canFilterLeaf, checkHavingKeys, classifyQueryPath, collectQueryPaths, collectQueryPaths as collectQueryPaths$1, containsRelationFilter, findAncestorInSet, geoIndexNotFoundMessage, groupSourceVerdict, hasRelationOp, isEmptyObject, isJsonValueField, isPlainObject, isRelationOp, narrowerFilterOps, normalizeComputedSelect, numericOperandProblem, reconcileCas, searchIndexNotFoundMessage, searchMemberKind, selfOrAncestor, unsupportedOperatorMessage, vectorIndexNotFoundMessage } from "@atscript/db";
+import { ADAPTER_FILTER_REASON, ALL_AGGREGATE_FNS, DbError, ENCRYPTED_REASON, acceptedOperatorsHint, aliasTargetOf, andFilters, bucketSourceVerdict, canFilterLeaf, checkHavingKeys, classifyQueryPath, collectQueryPaths, collectQueryPaths as collectQueryPaths$1, containsRelationFilter, findAncestorInSet, geoIndexNotFoundMessage, groupSourceVerdict, hasRelationOp, isEmptyObject, isJsonValueField, isPlainObject, isRelationOp, narrowerFilterOps, normalizeComputedSelect, numericOperandProblem, reconcileCas, resolveDesignType, searchIndexNotFoundMessage, searchMemberKind, selfOrAncestor, unsupportedOperatorMessage, vectorIndexNotFoundMessage } from "@atscript/db";
 import { cached, current as current$1, defineWook, key, routeParamsKey, useRouteParams } from "@wooksjs/event-core";
 import { useBody } from "@wooksjs/http-body";
 import { BUCKET_UNITS } from "@uniqu/core";
@@ -1528,7 +1528,7 @@ var FieldCapabilityIndex = class FieldCapabilityIndex {
 		const ignored = source.ignoredFields;
 		for (const [path, entry] of flatMap) {
 			if (!path || this._entries.has(path) || this._objectParents.has(path)) continue;
-			if (entry?.type?.kind !== "object") continue;
+			if (!entry?.type || resolveDesignType(entry) !== "object") continue;
 			if (entry.metadata?.has?.("db.json")) continue;
 			if (isNavOrDescendant(path)) continue;
 			if (ignored.has(path)) continue;
@@ -1643,13 +1643,17 @@ var FieldCapabilityIndex = class FieldCapabilityIndex {
 	* `predicate` is a filter entry's class (`collectQueryPaths` records it per
 	* occurrence); it only matters for `op === "filter"` on a listed leaf.
 	*
+	* `nullTest` (since 0.1.155): the filter entry only tests presence
+	* (`TFilterRef.nullTest`) — accepted on a nested-object parent whose leaves
+	* are all visible.
+	*
 	* `prefix` (since 0.1.147) is this index's readable's dotted path from the
 	* controller when it judges a relational predicate's operand (`"ticket."`):
 	* `exists` still receives the LOCAL path, the verdict's `path` and message
 	* name the prefixed one. A filter on a navigation path names the predicate
 	* alternative (`ticket=$some(status=…)`).
 	*/
-	check(local, gateOp, exists, predicate = "compare", prefix = "") {
+	check(local, gateOp, exists, predicate = "compare", prefix = "", nullTest = false) {
 		const path = prefix + local;
 		const requires = prefix === "" ? this._decorations.get(local) : void 0;
 		if (requires) {
@@ -1706,6 +1710,7 @@ var FieldCapabilityIndex = class FieldCapabilityIndex {
 				const all = this._objectParents.get(local);
 				const leaves = all.filter(exists).map((leaf) => prefix + leaf);
 				if (leaves.length === 0 && all.length > 0) return unknownField(path);
+				if (op === "filter" && nullTest && all.length > 0 && all.every((leaf) => exists(leaf) && this._entries.get(leaf)?.filterBy.exists === void 0) && findAncestorInSet(local, this._bucketTable.jsonValueParents) === void 0) return;
 				return {
 					path,
 					message: `"${path}" is a nested object — filter or sort on one of its leaves (${leafHint(leaves)})`
@@ -1846,7 +1851,7 @@ var RelationPredicateGate = class {
 		const index = this._indexOf(target);
 		const visible = (p) => this._visibleAt(target, prefix, p);
 		for (const ref of refs.filter) {
-			const error = ref.predicate === "relation" ? this.checkRef(ref, state, target, prefix, depth) : verdictError(index.check(ref.path, "filter", visible, ref.predicate, prefix));
+			const error = ref.predicate === "relation" ? this.checkRef(ref, state, target, prefix, depth) : verdictError(index.check(ref.path, "filter", visible, ref.predicate, prefix, ref.nullTest));
 			if (error) return error;
 		}
 	}
@@ -5243,7 +5248,7 @@ let AsDbReadableController = _AsDbReadableController = class AsDbReadableControl
 				if (relError) return relError;
 				continue;
 			}
-			const verdict = capabilities.check(ref.path, "filter", isVisible, ref.predicate);
+			const verdict = capabilities.check(ref.path, "filter", isVisible, ref.predicate, "", ref.nullTest);
 			if (verdict) return badRequest(verdict.path, verdict.message);
 		}
 		const liveWith = parsed.controls?.$with;
@@ -5320,7 +5325,8 @@ let AsDbReadableController = _AsDbReadableController = class AsDbReadableControl
 		}
 	}
 	/**
-	* {@link checkComputedSelect} (before the controls DTO), the controls DTO
+	* {@link checkComputedSelect} (before the controls DTO), on `/pages` the
+	* aggregate 400 (since 0.1.155), the controls DTO
 	* ({@link validateControls}), then the `$with` relation names at every
 	* level — BEFORE the `$with` sub-query paths ({@link validateInsights}),
 	* so a hidden or nonexistent nested relation answers `Unknown relation`,
@@ -5331,6 +5337,7 @@ let AsDbReadableController = _AsDbReadableController = class AsDbReadableControl
 		const computedError = this.checkComputedSelect(parsed.controls);
 		if (computedError) return computedError;
 		const controls = parsed.controls;
+		if (type === "pages" && (controls?.$groupBy !== void 0 || computedMode(parsed))) return badRequest(controls?.$groupBy === void 0 ? "$select" : "$groupBy", "Aggregate queries are only valid on /query");
 		if (controls && typeof controls === "object") this._clientWith.set(controls, snapshotClientWith(controls.$with) ?? null);
 		const controlsError = this.validateControls(controls, type);
 		if (controlsError) return new HttpError(400, controlsError);
@@ -7009,13 +7016,15 @@ let AsDbReadableController = _AsDbReadableController = class AsDbReadableControl
 	*/
 	async query(url) {
 		const { parsed, controls } = await this.parseRequest("query", url);
-		const groupBy = controls.$groupBy;
-		if (groupBy?.length && controls.$with?.length) return new HttpError(400, "Cannot combine $with and $groupBy in the same query");
-		if (groupBy?.length && controls.$vector !== void 0) return new HttpError(400, "Cannot combine $vector and $groupBy in the same query");
+		const computed = computedMode(parsed);
+		if (computed && controls.$groupBy === void 0) controls.$groupBy = [];
+		const aggregate = computed || !!controls.$groupBy?.length;
+		if (aggregate && controls.$with?.length) return new HttpError(400, "Cannot combine $with and $groupBy in the same query");
+		if (aggregate && controls.$vector !== void 0) return new HttpError(400, "Cannot combine $vector and $groupBy in the same query");
 		const error = this.validateParsed(parsed, "query");
 		if (error) return error;
 		let gateRefs;
-		if (groupBy?.length && this._writeOnlySet.size > 0) {
+		if (aggregate && this._writeOnlySet.size > 0) {
 			gateRefs = collectQueryPaths$1(parsed, computedMode(parsed));
 			const refs = gateRefs.aggregateMode ? gateRefs : collectQueryPaths$1(parsed, true);
 			const sealed = [
@@ -7030,7 +7039,7 @@ let AsDbReadableController = _AsDbReadableController = class AsDbReadableControl
 		const gateError = gateRefs ? this._checkCapabilitiesWith(parsed, gateRefs) : this.checkCapabilities(parsed);
 		if (gateError) return gateError;
 		const clientFilter = await this._relationOverlay(parsed);
-		if (groupBy?.length) {
+		if (aggregate) {
 			const filter = this.applySearchFallback(await this.transformFilter(clientFilter), controls);
 			return this.readable.aggregate({
 				filter,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/moost-db",
-  "version": "0.1.153",
+  "version": "0.1.155",
   "description": "Generic database controller for Moost with Atscript.",
   "keywords": [
     "annotations",
@@ -44,29 +44,29 @@
   },
   "dependencies": {
     "@uniqu/url": "^0.1.15",
-    "@atscript/db-memory": "^0.1.153"
+    "@atscript/db-memory": "^0.1.155"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.103",
-    "@atscript/typescript": "^0.1.103",
-    "@moostjs/event-http": "^0.6.49",
+    "@atscript/core": "^0.1.105",
+    "@atscript/typescript": "^0.1.105",
+    "@moostjs/event-http": "^0.6.51",
     "@uniqu/core": "^0.1.15",
-    "@wooksjs/event-core": "^0.7.28",
-    "@wooksjs/event-http": "^0.7.28",
-    "@wooksjs/http-body": "^0.7.28",
+    "@wooksjs/event-core": "^0.7.29",
+    "@wooksjs/event-http": "^0.7.29",
+    "@wooksjs/http-body": "^0.7.29",
     "better-sqlite3": "^12.6.2",
-    "moost": "^0.6.49",
-    "unplugin-atscript": "^0.1.103",
-    "@atscript/db-sqlite": "^0.1.153"
+    "moost": "^0.6.51",
+    "unplugin-atscript": "^0.1.105",
+    "@atscript/db-sqlite": "^0.1.155"
   },
   "peerDependencies": {
-    "@atscript/typescript": "^0.1.103",
-    "@moostjs/event-http": "^0.6.49",
+    "@atscript/typescript": "^0.1.105",
+    "@moostjs/event-http": "^0.6.51",
     "@uniqu/core": "^0.1.15",
-    "@wooksjs/event-core": "^0.7.28",
-    "@wooksjs/http-body": "^0.7.28",
-    "moost": "^0.6.49",
-    "@atscript/db": "^0.1.153"
+    "@wooksjs/event-core": "^0.7.29",
+    "@wooksjs/http-body": "^0.7.29",
+    "moost": "^0.6.51",
+    "@atscript/db": "^0.1.155"
   },
   "scripts": {
     "postinstall": "asc -f dts",