@atscript/moost-db 0.1.45 → 0.1.47

package/dist/index.cjs

@@ -36,7 +36,10 @@ const TABLE_DEF = READABLE_DEF;
 * export class UsersController extends AsDbController<typeof UserModel> {}
 * ```
 */
-const TableController = (table, prefix) => (0, moost.ApplyDecorators)((0, moost.Provide)(TABLE_DEF, () => table), (0, moost.Controller)(prefix || table.tableName), (0, moost.Inherit)());
+const TableController = (table, prefix) => {
+	const resolvedPath = prefix || table.type.metadata.get("db.http.path");
+	return (0, moost.ApplyDecorators)((0, moost.Provide)(TABLE_DEF, () => table), (0, moost.Controller)(resolvedPath || table.tableName), (0, moost.Inherit)());
+};
 /**
 * Combines the boilerplate needed to turn an {@link AsDbReadableController}
 * subclass into a fully wired HTTP controller for a given `@db.view` or `@db.table` model.
@@ -50,7 +53,10 @@ const TableController = (table, prefix) => (0, moost.ApplyDecorators)((0, moost.
 * export class ActiveTasksController extends AsDbReadableController<typeof ActiveTasks> {}
 * ```
 */
-const ReadableController = (readable, prefix) => (0, moost.ApplyDecorators)((0, moost.Provide)(READABLE_DEF, () => readable), (0, moost.Controller)(prefix || readable.tableName), (0, moost.Inherit)());
+const ReadableController = (readable, prefix) => {
+	const resolvedPath = prefix || readable.type.metadata.get("db.http.path");
+	return (0, moost.ApplyDecorators)((0, moost.Provide)(READABLE_DEF, () => readable), (0, moost.Controller)(resolvedPath || readable.tableName), (0, moost.Inherit)());
+};
 /**
 * Alias for {@link ReadableController} — use with view-backed controllers.
 *
@@ -199,18 +205,18 @@ let AsDbReadableController = class AsDbReadableController {
 	readable;
 	/** Application-scoped logger. */
 	logger;
-	/** Cached serialized type definition (static, computed once). */
+	/** Cached serialized type definition (lazy, computed on first access). */
 	_serializedType;
-	/** Cached search index list (static, computed once). */
-	_searchIndexes;
+	/** Moost application instance. */
+	app;
 	/** Cached full meta response (computed lazily on first meta() call). */
 	_metaResponse;
 	constructor(readable, app) {
 		this.readable = readable;
-		this._serializedType = (0, _atscript_typescript_utils.serializeAnnotatedType)(readable.type, this.getSerializeOptions());
-		this._searchIndexes = readable.getSearchIndexes();
+		this.app = app;
 		this.logger = app.getLogger(`db [${readable.tableName}]`);
 		this.logger.info(`Initializing ${readable.isView ? "view" : "table"} controller`);
+		this._resolveHttpPath();
 		try {
 			const p = this.init();
 			if (p instanceof Promise) p.catch((error) => {
@@ -221,6 +227,16 @@ let AsDbReadableController = class AsDbReadableController {
 			throw error;
 		}
 	}
+	/** Sets @db.http.path on the type metadata from the controller's computed prefix. */
+	_resolveHttpPath() {
+		const overview = this.app.getControllersOverview?.()?.find((o) => o.type === this.constructor);
+		if (overview?.computedPrefix) this.readable.type.metadata.set("db.http.path", overview.computedPrefix);
+	}
+	/** Lazily serializes the type (after all controllers have set their @db.http.path). */
+	getSerializedType() {
+		if (!this._serializedType) this._serializedType = (0, _atscript_typescript_utils.serializeAnnotatedType)(this.readable.type, this.getSerializeOptions());
+		return this._serializedType;
+	}
 	/**
 	* One-time initialization hook. Override to seed data, register watchers, etc.
 	*/
@@ -232,21 +248,24 @@ let AsDbReadableController = class AsDbReadableController {
 	* Override in subclass to customise what annotations are exposed to clients.
 	*/
 	getSerializeOptions() {
-		return { processAnnotation: ({ key, value }) => {
-			if (key.startsWith("meta.") || key.startsWith("expect.") || key.startsWith("db.rel.")) return {
-				key,
-				value
-			};
-			if (key === "db.json" || key === "db.patch.strategy" || key.startsWith("db.default")) return {
-				key,
-				value
-			};
-			if (key.startsWith("db.")) return;
-			return {
-				key,
-				value
-			};
-		} };
+		return {
+			refDepth: 1,
+			processAnnotation: ({ key, value }) => {
+				if (key.startsWith("meta.") || key.startsWith("expect.") || key.startsWith("db.rel.")) return {
+					key,
+					value
+				};
+				if (key === "db.json" || key === "db.patch.strategy" || key.startsWith("db.default") || key === "db.http.path") return {
+					key,
+					value
+				};
+				if (key.startsWith("db.")) return;
+				return {
+					key,
+					value
+				};
+			}
+		};
 	}
 	/**
 	* Whether this controller is read-only (no write endpoints).
@@ -507,12 +526,12 @@ let AsDbReadableController = class AsDbReadableController {
 		this._metaResponse = {
 			searchable: this.readable.isSearchable(),
 			vectorSearchable: this.readable.isVectorSearchable(),
-			searchIndexes: this._searchIndexes,
+			searchIndexes: this.readable.getSearchIndexes(),
 			primaryKeys: [...this.readable.primaryKeys],
 			readOnly: this._isReadOnly(),
 			relations,
 			fields,
-			type: this._serializedType
+			type: this.getSerializedType()
 		};
 		return this._metaResponse;
 	}

package/dist/index.d.cts

@@ -1,5 +1,6 @@
-import * as _uniqu_url0 from "@uniqu/url";
+import * as _atscript_typescript_utils0 from "@atscript/typescript/utils";
 import { TAtscriptAnnotatedType, TAtscriptDataType, TSerializeOptions, Validator, serializeAnnotatedType } from "@atscript/typescript/utils";
+import * as _uniqu_url0 from "@uniqu/url";
 import { AtscriptDbReadable, AtscriptDbTable, FilterExpr, Uniquery, UniqueryControls } from "@atscript/db";
 import { HttpError } from "@moostjs/event-http";
 import * as moost from "moost";
@@ -18,13 +19,17 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
   protected readable: AtscriptDbReadable<T>;
   /** Application-scoped logger. */
   protected logger: TConsoleBase;
-  /** Cached serialized type definition (static, computed once). */
-  private _serializedType;
-  /** Cached search index list (static, computed once). */
-  private _searchIndexes;
+  /** Cached serialized type definition (lazy, computed on first access). */
+  private _serializedType?;
+  /** Moost application instance. */
+  protected app: Moost;
   /** Cached full meta response (computed lazily on first meta() call). */
   private _metaResponse?;
   constructor(readable: AtscriptDbReadable<T>, app: Moost);
+  /** Sets @db.http.path on the type metadata from the controller's computed prefix. */
+  private _resolveHttpPath;
+  /** Lazily serializes the type (after all controllers have set their @db.http.path). */
+  protected getSerializedType(): _atscript_typescript_utils0.TSerializedAnnotatedType;
   /**
    * One-time initialization hook. Override to seed data, register watchers, etc.
    */

package/dist/index.d.mts

@@ -1,3 +1,4 @@
+import * as _atscript_typescript_utils0 from "@atscript/typescript/utils";
 import { TAtscriptAnnotatedType, TAtscriptDataType, TSerializeOptions, Validator, serializeAnnotatedType } from "@atscript/typescript/utils";
 import { HttpError } from "@moostjs/event-http";
 import * as moost from "moost";
@@ -18,13 +19,17 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
   protected readable: AtscriptDbReadable<T>;
   /** Application-scoped logger. */
   protected logger: TConsoleBase;
-  /** Cached serialized type definition (static, computed once). */
-  private _serializedType;
-  /** Cached search index list (static, computed once). */
-  private _searchIndexes;
+  /** Cached serialized type definition (lazy, computed on first access). */
+  private _serializedType?;
+  /** Moost application instance. */
+  protected app: Moost;
   /** Cached full meta response (computed lazily on first meta() call). */
   private _metaResponse?;
   constructor(readable: AtscriptDbReadable<T>, app: Moost);
+  /** Sets @db.http.path on the type metadata from the controller's computed prefix. */
+  private _resolveHttpPath;
+  /** Lazily serializes the type (after all controllers have set their @db.http.path). */
+  protected getSerializedType(): _atscript_typescript_utils0.TSerializedAnnotatedType;
   /**
    * One-time initialization hook. Override to seed data, register watchers, etc.
    */

package/dist/index.mjs

@@ -35,7 +35,10 @@ const TABLE_DEF = READABLE_DEF;
 * export class UsersController extends AsDbController<typeof UserModel> {}
 * ```
 */
-const TableController = (table, prefix) => ApplyDecorators(Provide(TABLE_DEF, () => table), Controller(prefix || table.tableName), Inherit());
+const TableController = (table, prefix) => {
+	const resolvedPath = prefix || table.type.metadata.get("db.http.path");
+	return ApplyDecorators(Provide(TABLE_DEF, () => table), Controller(resolvedPath || table.tableName), Inherit());
+};
 /**
 * Combines the boilerplate needed to turn an {@link AsDbReadableController}
 * subclass into a fully wired HTTP controller for a given `@db.view` or `@db.table` model.
@@ -49,7 +52,10 @@ const TableController = (table, prefix) => ApplyDecorators(Provide(TABLE_DEF, ()
 * export class ActiveTasksController extends AsDbReadableController<typeof ActiveTasks> {}
 * ```
 */
-const ReadableController = (readable, prefix) => ApplyDecorators(Provide(READABLE_DEF, () => readable), Controller(prefix || readable.tableName), Inherit());
+const ReadableController = (readable, prefix) => {
+	const resolvedPath = prefix || readable.type.metadata.get("db.http.path");
+	return ApplyDecorators(Provide(READABLE_DEF, () => readable), Controller(resolvedPath || readable.tableName), Inherit());
+};
 /**
 * Alias for {@link ReadableController} — use with view-backed controllers.
 *
@@ -198,18 +204,18 @@ let AsDbReadableController = class AsDbReadableController {
 	readable;
 	/** Application-scoped logger. */
 	logger;
-	/** Cached serialized type definition (static, computed once). */
+	/** Cached serialized type definition (lazy, computed on first access). */
 	_serializedType;
-	/** Cached search index list (static, computed once). */
-	_searchIndexes;
+	/** Moost application instance. */
+	app;
 	/** Cached full meta response (computed lazily on first meta() call). */
 	_metaResponse;
 	constructor(readable, app) {
 		this.readable = readable;
-		this._serializedType = serializeAnnotatedType(readable.type, this.getSerializeOptions());
-		this._searchIndexes = readable.getSearchIndexes();
+		this.app = app;
 		this.logger = app.getLogger(`db [${readable.tableName}]`);
 		this.logger.info(`Initializing ${readable.isView ? "view" : "table"} controller`);
+		this._resolveHttpPath();
 		try {
 			const p = this.init();
 			if (p instanceof Promise) p.catch((error) => {
@@ -220,6 +226,16 @@ let AsDbReadableController = class AsDbReadableController {
 			throw error;
 		}
 	}
+	/** Sets @db.http.path on the type metadata from the controller's computed prefix. */
+	_resolveHttpPath() {
+		const overview = this.app.getControllersOverview?.()?.find((o) => o.type === this.constructor);
+		if (overview?.computedPrefix) this.readable.type.metadata.set("db.http.path", overview.computedPrefix);
+	}
+	/** Lazily serializes the type (after all controllers have set their @db.http.path). */
+	getSerializedType() {
+		if (!this._serializedType) this._serializedType = serializeAnnotatedType(this.readable.type, this.getSerializeOptions());
+		return this._serializedType;
+	}
 	/**
 	* One-time initialization hook. Override to seed data, register watchers, etc.
 	*/
@@ -231,21 +247,24 @@ let AsDbReadableController = class AsDbReadableController {
 	* Override in subclass to customise what annotations are exposed to clients.
 	*/
 	getSerializeOptions() {
-		return { processAnnotation: ({ key, value }) => {
-			if (key.startsWith("meta.") || key.startsWith("expect.") || key.startsWith("db.rel.")) return {
-				key,
-				value
-			};
-			if (key === "db.json" || key === "db.patch.strategy" || key.startsWith("db.default")) return {
-				key,
-				value
-			};
-			if (key.startsWith("db.")) return;
-			return {
-				key,
-				value
-			};
-		} };
+		return {
+			refDepth: 1,
+			processAnnotation: ({ key, value }) => {
+				if (key.startsWith("meta.") || key.startsWith("expect.") || key.startsWith("db.rel.")) return {
+					key,
+					value
+				};
+				if (key === "db.json" || key === "db.patch.strategy" || key.startsWith("db.default") || key === "db.http.path") return {
+					key,
+					value
+				};
+				if (key.startsWith("db.")) return;
+				return {
+					key,
+					value
+				};
+			}
+		};
 	}
 	/**
 	* Whether this controller is read-only (no write endpoints).
@@ -506,12 +525,12 @@ let AsDbReadableController = class AsDbReadableController {
 		this._metaResponse = {
 			searchable: this.readable.isSearchable(),
 			vectorSearchable: this.readable.isVectorSearchable(),
-			searchIndexes: this._searchIndexes,
+			searchIndexes: this.readable.getSearchIndexes(),
 			primaryKeys: [...this.readable.primaryKeys],
 			readOnly: this._isReadOnly(),
 			relations,
 			fields,
-			type: this._serializedType
+			type: this.getSerializedType()
 		};
 		return this._metaResponse;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/moost-db",
-  "version": "0.1.45",
+  "version": "0.1.47",
   "description": "Generic database controller for Moost with Atscript.",
   "keywords": [
     "annotations",
@@ -41,19 +41,19 @@
     "@uniqu/url": "^0.1.2"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.44",
-    "@atscript/typescript": "^0.1.44",
-    "@moostjs/event-http": "^0.6.4",
+    "@atscript/core": "^0.1.47",
+    "@atscript/typescript": "^0.1.47",
+    "@moostjs/event-http": "^0.6.6",
     "@uniqu/core": "^0.1.2",
-    "moost": "^0.6.4",
-    "unplugin-atscript": "^0.1.44"
+    "moost": "^0.6.6",
+    "unplugin-atscript": "^0.1.47"
   },
   "peerDependencies": {
-    "@atscript/typescript": "^0.1.44",
-    "@moostjs/event-http": "^0.6.4",
+    "@atscript/typescript": "^0.1.47",
+    "@moostjs/event-http": "^0.6.6",
     "@uniqu/core": "^0.1.2",
-    "moost": "^0.6.4",
-    "@atscript/db": "^0.1.45"
+    "moost": "^0.6.6",
+    "@atscript/db": "^0.1.47"
   },
   "scripts": {
     "postinstall": "asc -f dts",