@atscript/moost-mongo 0.1.3 → 0.1.4

package/dist/index.d.ts

@@ -2,8 +2,8 @@ import { HttpError } from '@moostjs/event-http';
 import { TConsoleBase, Moost } from 'moost';
 import { UrlqlQuery } from 'urlql';
 import { AsMongo, AsCollection } from '@atscript/mongo';
-import { TAtscriptAnnotatedTypeConstructor, Validator, ValidatorError } from '@atscript/typescript/utils';
-import { Document, Filter, WithId, InsertOneResult, InsertManyResult, UpdateResult, DeleteResult, DeleteOptions, ObjectId, OptionalUnlessRequiredId, InsertOneOptions, BulkWriteOptions, WithoutId, ReplaceOptions, UpdateFilter, UpdateOptions } from 'mongodb';
+import { TAtscriptAnnotatedType, Validator, ValidatorError } from '@atscript/typescript/utils';
+import { Document, Filter, WithId, InsertOneResult, InsertManyResult, UpdateResult, DeleteResult, DeleteOptions, ObjectId, InsertOneOptions, BulkWriteOptions, ReplaceOptions, UpdateFilter, UpdateOptions } from 'mongodb';
 
 /**
  * Generic **Moost** controller that exposes a full REST‑style CRUD surface over a
@@ -23,7 +23,11 @@ import { Document, Filter, WithId, InsertOneResult, InsertManyResult, UpdateResu
  * @typeParam T - The **atscript** annotated class (constructor) representing the
  *               collection schema. Must be decorated with `@AsCollection`.
  */
-declare class AsMongoController<T extends TAtscriptAnnotatedTypeConstructor> {
+declare class AsMongoController<T extends TAtscriptAnnotatedType = TAtscriptAnnotatedType, DataType = T extends {
+    type: {
+        __dataType?: infer D;
+    };
+} ? unknown extends D ? T extends new (...args: any[]) => infer I ? I : unknown : D : unknown> {
     protected asMongo: AsMongo;
     protected type: T;
     /** Reference to the lazily created {@link AsCollection}. */
@@ -112,7 +116,7 @@ declare class AsMongoController<T extends TAtscriptAnnotatedTypeConstructor> {
      * @param filter - The original filter object.
      * @returns The transformed filter object (may return `Promise`).
      */
-    protected transformFilter(filter: Document): Filter<InstanceType<T>>;
+    protected transformFilter(filter: Document): Filter<any>;
     /**
      * Builds MongoDB `FindOptions` object out of URLQL controls.
      *
@@ -156,7 +160,7 @@ declare class AsMongoController<T extends TAtscriptAnnotatedTypeConstructor> {
      * @param url - Full request URL provided by Moost (includes query string).
      * @returns Documents array **or** document count number.
      */
-    query(url: string): Promise<InstanceType<T>[] | number | HttpError>;
+    query(url: string): Promise<DataType[] | number | HttpError>;
     /**
      * **GET /pages** – returns paginated documents plus basic pagination meta.
      *
@@ -164,7 +168,7 @@ declare class AsMongoController<T extends TAtscriptAnnotatedTypeConstructor> {
      * @returns An object with keys: `documents`, `page`, `size`, `totalPages`, `totalDocuments`.
      */
     pages(url: string): Promise<{
-        documents: InstanceType<T>[];
+        documents: DataType[];
         page: number;
         size: number;
         totalPages: number;
@@ -180,7 +184,7 @@ declare class AsMongoController<T extends TAtscriptAnnotatedTypeConstructor> {
      * @param id - Document `_id` or alternate unique key value.
      * @param url - Full request URL (supports `$select`, `$insights`, etc.).
      */
-    getOne(id: string, url: string): Promise<InstanceType<T> | HttpError | ValidatorError>;
+    getOne(id: string, url: string): Promise<DataType | HttpError | ValidatorError>;
     /**
      * Helper that unwraps a promise returning an array of documents and
      * guarantees zero‑or‑one semantics expected by **one** endpoint.
@@ -188,7 +192,7 @@ declare class AsMongoController<T extends TAtscriptAnnotatedTypeConstructor> {
      * @param result - Promise resolving to an array of documents.
      * @returns Document, 400 or 404 { @link HttpError }.
      */
-    protected returnOne(result: Promise<WithId<InstanceType<T>>[]>): Promise<InstanceType<T> | HttpError>;
+    protected returnOne(result: Promise<WithId<DataType>[]>): Promise<DataType | HttpError>;
     /**
      * **POST /** – inserts one or many documents.
      *
@@ -200,7 +204,7 @@ declare class AsMongoController<T extends TAtscriptAnnotatedTypeConstructor> {
      *
      * @param payload - Object containing `_id` plus full replacement document.
      */
-    replace(payload: Parameters<AsCollection<T>['prepareReplace']>[0]): Promise<HttpError | UpdateResult<InstanceType<T>>>;
+    replace(payload: Parameters<AsCollection<T>['prepareReplace']>[0]): Promise<HttpError | UpdateResult>;
     /**
      * **PATCH /** – updates one document using MongoDB update operators.
      *
@@ -227,10 +231,10 @@ declare class AsMongoController<T extends TAtscriptAnnotatedTypeConstructor> {
      * Override to validate or mutate data, or tweak driver options. Return
      * `undefined` to abort the write – the endpoint will respond with *500 Not saved*.
      */
-    protected onWrite(action: 'insert', data: OptionalUnlessRequiredId<InstanceType<T>>, opts: InsertOneOptions): OptionalUnlessRequiredId<InstanceType<T>> | Promise<OptionalUnlessRequiredId<InstanceType<T>> | undefined> | undefined;
-    protected onWrite(action: 'insertMany', data: OptionalUnlessRequiredId<InstanceType<T>>[], opts: BulkWriteOptions): OptionalUnlessRequiredId<InstanceType<T>>[] | Promise<OptionalUnlessRequiredId<InstanceType<T>>[] | undefined> | undefined;
-    protected onWrite(action: 'replace', data: WithoutId<InstanceType<T>>, opts: ReplaceOptions): WithoutId<InstanceType<T>> | Promise<WithoutId<InstanceType<T>> | undefined> | undefined;
-    protected onWrite(action: 'update', data: UpdateFilter<InstanceType<T>>, opts: UpdateOptions): UpdateFilter<InstanceType<T>> | Promise<UpdateFilter<InstanceType<T>> | undefined> | undefined;
+    protected onWrite(action: 'insert', data: DataType, opts: InsertOneOptions): DataType | Promise<DataType | undefined> | undefined;
+    protected onWrite(action: 'insertMany', data: DataType[], opts: BulkWriteOptions): DataType[] | Promise<DataType[] | undefined> | undefined;
+    protected onWrite(action: 'replace', data: DataType, opts: ReplaceOptions): DataType | Promise<DataType | undefined> | undefined;
+    protected onWrite(action: 'update', data: UpdateFilter<any>, opts: UpdateOptions): UpdateFilter<any> | Promise<UpdateFilter<any> | undefined> | undefined;
 }
 
 /**
@@ -260,7 +264,9 @@ declare const COLLECTION_DEF = "__atscript_mongo_collection_def";
  * export class UsersController extends AsMongoController<typeof UserModel> {}
  * ```
  */
-declare const CollectionController: (type: TAtscriptAnnotatedTypeConstructor, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
+declare const CollectionController: (type: TAtscriptAnnotatedType & {
+    name?: string;
+}, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
 /**
  * Parameter decorator that injects the lazily-resolved {@link AsCollection}
  * instance for a given AtScript model.
@@ -282,6 +288,6 @@ declare const CollectionController: (type: TAtscriptAnnotatedTypeConstructor, pr
  * }
  * ```
  */
-declare const InjectCollection: (type: TAtscriptAnnotatedTypeConstructor) => ParameterDecorator & PropertyDecorator;
+declare const InjectCollection: (type: TAtscriptAnnotatedType) => ParameterDecorator & PropertyDecorator;
 
 export { AsMongoController, COLLECTION_DEF, CollectionController, InjectCollection };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/moost-mongo",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Atscript Mongo for Moost.",
   "type": "module",
   "main": "dist/index.mjs",
@@ -39,14 +39,14 @@
   },
   "devDependencies": {
     "vitest": "3.2.4",
-    "@atscript/core": "^0.1.3"
+    "@atscript/core": "^0.1.4"
   },
   "peerDependencies": {
     "@moostjs/event-http": "^0.5.32",
     "mongodb": "^6.17.0",
     "moost": "^0.5.32",
-    "@atscript/mongo": "^0.1.3",
-    "@atscript/typescript": "^0.1.3"
+    "@atscript/mongo": "^0.1.4",
+    "@atscript/typescript": "^0.1.4"
   },
   "scripts": {
     "pub": "pnpm publish --access public",