@atscript/moost-db 0.1.60 → 0.1.61

package/dist/index.cjs

@@ -199,9 +199,6 @@ function isAsValueHelpControllerSubclass(ctor) {
 	if (!asValueHelpCtor) return false;
 	return asValueHelpCtor.prototype.isPrototypeOf(ctor.prototype);
 }
-function isAsDbReadableControllerInstance(value) {
-	return !!asDbReadableCtor && value instanceof asDbReadableCtor;
-}
 //#endregion
 //#region src/actions/keys.ts
 /** Log-message prefix for warnings emitted from the actions subsystem. */
@@ -873,14 +870,12 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 	readable;
 	_gates;
 	_preferredIdSet;
-	_compositeIdShapes;
 	_overlayIsNoOp;
 	constructor(readable, app) {
 		super(readable.type, readable.tableName, app, readable.isView ? "view" : "table");
 		this.readable = readable;
 		this._gates = this._buildGates();
 		this._preferredIdSet = new Set(readable.preferredId ?? []);
-		this._compositeIdShapes = (readable.identifications ?? []).filter((id) => id.fields.length >= 2);
 		const defaultOverlay = AsReadableController.prototype.applyMetaOverlay;
 		this._overlayIsNoOp = this.applyMetaOverlay === defaultOverlay;
 	}
@@ -1104,12 +1099,9 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 		});
 		return result;
 	}
-	/**
-	* Extracts a composite identifier object from query params.
-	* Tries composite primary key first, then compound unique indexes.
-	*/
-	extractCompositeId(query) {
-		for (const id of this._compositeIdShapes) {
+	/** Pick the first identification (PK or unique index) whose fields are all present in the query. */
+	extractIdShape(query) {
+		for (const id of this.readable.identifications) {
 			const idObj = {};
 			let allPresent = true;
 			for (const field of id.fields) {
@@ -1121,7 +1113,7 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 			}
 			if (allPresent) return idObj;
 		}
-		return new _moostjs_event_http.HttpError(400, "Query params do not match any composite primary key or compound unique index");
+		return new _moostjs_event_http.HttpError(400, "Query params do not match any primary key or unique index");
 	}
 	/**
 	* **GET /query** — returns an array of records or a count.
@@ -1237,7 +1229,7 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 	* (composite primary key or compound unique index).
 	*/
 	async getOneComposite(query, url) {
-		const idObj = this.extractCompositeId(query);
+		const idObj = this.extractIdShape(query);
 		if (idObj instanceof _moostjs_event_http.HttpError) return idObj;
 		const parsed = this.parseQueryString(url);
 		this._coerceActionsControl(parsed.controls);
@@ -1437,7 +1429,7 @@ let AsDbController = class AsDbController extends AsDbReadableController {
 	* (composite primary key or compound unique index).
 	*/
 	async removeComposite(query) {
-		const idObj = this.extractCompositeId(query);
+		const idObj = this.extractIdShape(query);
 		if (idObj instanceof _moostjs_event_http.HttpError) return idObj;
 		const resolvedId = await this.onRemove(idObj);
 		if (resolvedId === void 0) return new _moostjs_event_http.HttpError(500, "Not deleted");
@@ -1860,7 +1852,7 @@ const SOURCE_CACHE = /* @__PURE__ */ new WeakMap();
 function getSourceCache(source) {
 	let cache = SOURCE_CACHE.get(source);
 	if (cache) return cache;
-	const identifications = source.getIdentifications();
+	const identifications = source.identifications;
 	const byKeySig = /* @__PURE__ */ new Map();
 	for (const ident of identifications) byKeySig.set(fieldsSig(ident.fields), ident);
 	const fieldByName = /* @__PURE__ */ new Map();
@@ -1879,7 +1871,7 @@ function fieldsSig(fields) {
 function isIdValidationSource(value) {
 	if (!value || typeof value !== "object") return false;
 	const v = value;
-	return typeof v.getIdentifications === "function" && Array.isArray(v.fieldDescriptors);
+	return Array.isArray(v.identifications) && Array.isArray(v.fieldDescriptors);
 }
 function validateSingleId(body, source, path = "") {
 	const errors = collectIdErrors(body, source, path);
@@ -1947,15 +1939,27 @@ function isPlainObject(value) {
 //#endregion
 //#region src/actions/id-cache.ts
 const boundTableKey = (0, _wooksjs_event_core.key)("atscript_db_action_bound_table");
-function getActionTable(ctx) {
-	const fromSlot = ctx.has(boundTableKey) ? ctx.get(boundTableKey) : void 0;
-	if (fromSlot) return fromSlot;
+function controllerTable(ctx) {
 	const ctrl = (0, moost.useControllerContext)(ctx).getController();
 	return ctrl?.readable ?? ctrl?.table ?? null;
 }
+function getActionTable(ctx) {
+	return (ctx.has(boundTableKey) ? ctx.get(boundTableKey) : void 0) ?? controllerTable(ctx);
+}
+const warnedTags = /* @__PURE__ */ new Set();
 function noTableError(ctx) {
 	const actionName = readCurrentActionMeta(ctx)?.name;
-	return new _moostjs_event_http.HttpError(500, `${WARN_PREFIX} ${actionName ? `"${actionName}"` : "<unknown>"}: controller has no readable/table property and the action declares no opts.table. Either expose readable/table on the controller, extend AsDbReadableController, or pass opts.table on @DbAction.`);
+	const tag = actionName ? `"${actionName}"` : "<unknown>";
+	if (!warnedTags.has(tag)) {
+		warnedTags.add(tag);
+		console.warn(`${WARN_PREFIX} ${tag}: controller has no readable/table property and the action declares no opts.table. Either expose readable/table on the controller, extend AsDbReadableController, or pass opts.table on @DbAction.`);
+	}
+	return new _moostjs_event_http.HttpError(500, {
+		statusCode: 500,
+		error: "Internal Server Error",
+		message: "Internal server error",
+		code: "ACTION_TABLE_NOT_BOUND"
+	});
 }
 async function resolveValidatedId(ctx, validate) {
 	const table = getActionTable(ctx);
@@ -2062,15 +2066,11 @@ const useDbActionRows = (0, _wooksjs_event_core.defineWook)((ctx) => ({ load: ()
 //#endregion
 //#region src/actions/gate-interceptor.ts
 const GATE_PRIORITY = moost.TInterceptorPriority.AFTER_GUARD;
-function injectBoundTable(table) {
+function injectBoundTable(fallback) {
 	const ctx = (0, _wooksjs_event_core.current)();
 	if (ctx.has(boundTableKey)) return;
-	const controller = (0, moost.useControllerContext)(ctx).getController();
-	if (isAsDbReadableControllerInstance(controller)) {
-		ctx.set(boundTableKey, controller.readable);
-		return;
-	}
-	if (table != null) ctx.set(boundTableKey, table);
+	const t = controllerTable(ctx) ?? fallback;
+	if (t != null) ctx.set(boundTableKey, t);
 }
 function buildGateInterceptor(opts) {
 	const { action, level, disabled, onDisabledRows, table } = opts;

package/dist/index.d.cts

@@ -155,7 +155,6 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
   protected readable: AtscriptDbReadable<T>;
   private readonly _gates;
   private readonly _preferredIdSet;
-  private readonly _compositeIdShapes;
   private readonly _overlayIsNoOp;
   constructor(readable: AtscriptDbReadable<T>, app: Moost);
   private _buildGates;
@@ -200,11 +199,8 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
    * family (count vs no-count).
    */
   private _runReadWithActions;
-  /**
-   * Extracts a composite identifier object from query params.
-   * Tries composite primary key first, then compound unique indexes.
-   */
-  protected extractCompositeId(query: Record<string, string>): Record<string, unknown> | HttpError;
+  /** Pick the first identification (PK or unique index) whose fields are all present in the query. */
+  protected extractIdShape(query: Record<string, string>): Record<string, unknown> | HttpError;
   /**
    * **GET /query** — returns an array of records or a count.
    */
@@ -734,9 +730,10 @@ interface TDbActionEnvelope {
 declare function discoverActions(controllerCtor: Function, app: Moost, logger: TConsoleBase): TDbActionEnvelope[];
 //#endregion
 //#region src/actions/id-validation.d.ts
+/** Duck-typed shape; matches `AtscriptDbReadable`'s public surface. */
 interface IdValidationSource {
-  getIdentifications(): readonly TIdentification[];
-  fieldDescriptors: readonly TDbFieldMeta[];
+  readonly identifications: readonly TIdentification[];
+  readonly fieldDescriptors: readonly TDbFieldMeta[];
 }
 //#endregion
 //#region src/actions/id-cache.d.ts

package/dist/index.d.mts

@@ -155,7 +155,6 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
   protected readable: AtscriptDbReadable<T>;
   private readonly _gates;
   private readonly _preferredIdSet;
-  private readonly _compositeIdShapes;
   private readonly _overlayIsNoOp;
   constructor(readable: AtscriptDbReadable<T>, app: Moost);
   private _buildGates;
@@ -200,11 +199,8 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
    * family (count vs no-count).
    */
   private _runReadWithActions;
-  /**
-   * Extracts a composite identifier object from query params.
-   * Tries composite primary key first, then compound unique indexes.
-   */
-  protected extractCompositeId(query: Record<string, string>): Record<string, unknown> | HttpError;
+  /** Pick the first identification (PK or unique index) whose fields are all present in the query. */
+  protected extractIdShape(query: Record<string, string>): Record<string, unknown> | HttpError;
   /**
    * **GET /query** — returns an array of records or a count.
    */
@@ -734,9 +730,10 @@ interface TDbActionEnvelope {
 declare function discoverActions(controllerCtor: Function, app: Moost, logger: TConsoleBase): TDbActionEnvelope[];
 //#endregion
 //#region src/actions/id-validation.d.ts
+/** Duck-typed shape; matches `AtscriptDbReadable`'s public surface. */
 interface IdValidationSource {
-  getIdentifications(): readonly TIdentification[];
-  fieldDescriptors: readonly TDbFieldMeta[];
+  readonly identifications: readonly TIdentification[];
+  readonly fieldDescriptors: readonly TDbFieldMeta[];
 }
 //#endregion
 //#region src/actions/id-cache.d.ts

package/dist/index.mjs

@@ -198,9 +198,6 @@ function isAsValueHelpControllerSubclass(ctor) {
 	if (!asValueHelpCtor) return false;
 	return asValueHelpCtor.prototype.isPrototypeOf(ctor.prototype);
 }
-function isAsDbReadableControllerInstance(value) {
-	return !!asDbReadableCtor && value instanceof asDbReadableCtor;
-}
 //#endregion
 //#region src/actions/keys.ts
 /** Log-message prefix for warnings emitted from the actions subsystem. */
@@ -872,14 +869,12 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 	readable;
 	_gates;
 	_preferredIdSet;
-	_compositeIdShapes;
 	_overlayIsNoOp;
 	constructor(readable, app) {
 		super(readable.type, readable.tableName, app, readable.isView ? "view" : "table");
 		this.readable = readable;
 		this._gates = this._buildGates();
 		this._preferredIdSet = new Set(readable.preferredId ?? []);
-		this._compositeIdShapes = (readable.identifications ?? []).filter((id) => id.fields.length >= 2);
 		const defaultOverlay = AsReadableController.prototype.applyMetaOverlay;
 		this._overlayIsNoOp = this.applyMetaOverlay === defaultOverlay;
 	}
@@ -1103,12 +1098,9 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 		});
 		return result;
 	}
-	/**
-	* Extracts a composite identifier object from query params.
-	* Tries composite primary key first, then compound unique indexes.
-	*/
-	extractCompositeId(query) {
-		for (const id of this._compositeIdShapes) {
+	/** Pick the first identification (PK or unique index) whose fields are all present in the query. */
+	extractIdShape(query) {
+		for (const id of this.readable.identifications) {
 			const idObj = {};
 			let allPresent = true;
 			for (const field of id.fields) {
@@ -1120,7 +1112,7 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 			}
 			if (allPresent) return idObj;
 		}
-		return new HttpError(400, "Query params do not match any composite primary key or compound unique index");
+		return new HttpError(400, "Query params do not match any primary key or unique index");
 	}
 	/**
 	* **GET /query** — returns an array of records or a count.
@@ -1236,7 +1228,7 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 	* (composite primary key or compound unique index).
 	*/
 	async getOneComposite(query, url) {
-		const idObj = this.extractCompositeId(query);
+		const idObj = this.extractIdShape(query);
 		if (idObj instanceof HttpError) return idObj;
 		const parsed = this.parseQueryString(url);
 		this._coerceActionsControl(parsed.controls);
@@ -1436,7 +1428,7 @@ let AsDbController = class AsDbController extends AsDbReadableController {
 	* (composite primary key or compound unique index).
 	*/
 	async removeComposite(query) {
-		const idObj = this.extractCompositeId(query);
+		const idObj = this.extractIdShape(query);
 		if (idObj instanceof HttpError) return idObj;
 		const resolvedId = await this.onRemove(idObj);
 		if (resolvedId === void 0) return new HttpError(500, "Not deleted");
@@ -1859,7 +1851,7 @@ const SOURCE_CACHE = /* @__PURE__ */ new WeakMap();
 function getSourceCache(source) {
 	let cache = SOURCE_CACHE.get(source);
 	if (cache) return cache;
-	const identifications = source.getIdentifications();
+	const identifications = source.identifications;
 	const byKeySig = /* @__PURE__ */ new Map();
 	for (const ident of identifications) byKeySig.set(fieldsSig(ident.fields), ident);
 	const fieldByName = /* @__PURE__ */ new Map();
@@ -1878,7 +1870,7 @@ function fieldsSig(fields) {
 function isIdValidationSource(value) {
 	if (!value || typeof value !== "object") return false;
 	const v = value;
-	return typeof v.getIdentifications === "function" && Array.isArray(v.fieldDescriptors);
+	return Array.isArray(v.identifications) && Array.isArray(v.fieldDescriptors);
 }
 function validateSingleId(body, source, path = "") {
 	const errors = collectIdErrors(body, source, path);
@@ -1946,15 +1938,27 @@ function isPlainObject(value) {
 //#endregion
 //#region src/actions/id-cache.ts
 const boundTableKey = key("atscript_db_action_bound_table");
-function getActionTable(ctx) {
-	const fromSlot = ctx.has(boundTableKey) ? ctx.get(boundTableKey) : void 0;
-	if (fromSlot) return fromSlot;
+function controllerTable(ctx) {
 	const ctrl = useControllerContext(ctx).getController();
 	return ctrl?.readable ?? ctrl?.table ?? null;
 }
+function getActionTable(ctx) {
+	return (ctx.has(boundTableKey) ? ctx.get(boundTableKey) : void 0) ?? controllerTable(ctx);
+}
+const warnedTags = /* @__PURE__ */ new Set();
 function noTableError(ctx) {
 	const actionName = readCurrentActionMeta(ctx)?.name;
-	return new HttpError(500, `${WARN_PREFIX} ${actionName ? `"${actionName}"` : "<unknown>"}: controller has no readable/table property and the action declares no opts.table. Either expose readable/table on the controller, extend AsDbReadableController, or pass opts.table on @DbAction.`);
+	const tag = actionName ? `"${actionName}"` : "<unknown>";
+	if (!warnedTags.has(tag)) {
+		warnedTags.add(tag);
+		console.warn(`${WARN_PREFIX} ${tag}: controller has no readable/table property and the action declares no opts.table. Either expose readable/table on the controller, extend AsDbReadableController, or pass opts.table on @DbAction.`);
+	}
+	return new HttpError(500, {
+		statusCode: 500,
+		error: "Internal Server Error",
+		message: "Internal server error",
+		code: "ACTION_TABLE_NOT_BOUND"
+	});
 }
 async function resolveValidatedId(ctx, validate) {
 	const table = getActionTable(ctx);
@@ -2061,15 +2065,11 @@ const useDbActionRows = defineWook((ctx) => ({ load: () => ctx.get(dbActionRowsS
 //#endregion
 //#region src/actions/gate-interceptor.ts
 const GATE_PRIORITY = TInterceptorPriority.AFTER_GUARD;
-function injectBoundTable(table) {
+function injectBoundTable(fallback) {
 	const ctx = current();
 	if (ctx.has(boundTableKey)) return;
-	const controller = useControllerContext(ctx).getController();
-	if (isAsDbReadableControllerInstance(controller)) {
-		ctx.set(boundTableKey, controller.readable);
-		return;
-	}
-	if (table != null) ctx.set(boundTableKey, table);
+	const t = controllerTable(ctx) ?? fallback;
+	if (t != null) ctx.set(boundTableKey, t);
 }
 function buildGateInterceptor(opts) {
 	const { action, level, disabled, onDisabledRows, table } = opts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/moost-db",
-  "version": "0.1.60",
+  "version": "0.1.61",
   "description": "Generic database controller for Moost with Atscript.",
   "keywords": [
     "annotations",
@@ -58,7 +58,7 @@
     "@wooksjs/event-core": "^0.7.10",
     "@wooksjs/http-body": "^0.7.10",
     "moost": "^0.6.8",
-    "@atscript/db": "^0.1.60"
+    "@atscript/db": "^0.1.61"
   },
   "scripts": {
     "postinstall": "asc -f dts",