@atscript/mongo 0.1.3 → 0.1.4

package/dist/index.cjs

@@ -400,7 +400,7 @@ var CollectionPatcher = class CollectionPatcher {
 	* @param collection Target collection wrapper
 	* @returns Atscript Validator
 	*/ static prepareValidator(collection) {
-		return collection.type.validator({
+		return collection.createValidator({
 			plugins: [validateMongoIdPlugin, validateMongoUniqueArrayItemsPlugin],
 			replace: (def, path) => {
 				if (path === "" && def.type.kind === "object") {
@@ -656,6 +656,9 @@ const DEFAULT_INDEX_NAME = "DEFAULT";
 	return `${INDEX_PREFIX}${type}__${cleanName}`;
 }
 var AsCollection = class {
+	createValidator(opts) {
+		return this._type.validator(opts);
+	}
 	async exists() {
 		return this.asMongo.collectionExists(this.name);
 	}
@@ -697,7 +700,7 @@ var AsCollection = class {
 	*/ getValidator(purpose) {
 		if (!this.validators.has(purpose)) switch (purpose) {
 			case "insert": {
-				this.validators.set(purpose, this.type.validator({
+				this.validators.set(purpose, this.createValidator({
 					plugins: [validateMongoIdPlugin, validateMongoUniqueArrayItemsPlugin],
 					replace(type, path) {
 						if (path === "_id" && type.type.tags.has("objectId")) return {
@@ -710,7 +713,7 @@ var AsCollection = class {
 				break;
 			}
 			case "update": {
-				this.validators.set(purpose, this.type.validator({ plugins: [validateMongoIdPlugin] }));
+				this.validators.set(purpose, this.createValidator({ plugins: [validateMongoIdPlugin] }));
 				break;
 			}
 			case "patch": {
@@ -789,7 +792,10 @@ else flatUnion.item(existing);
 			case "object":
 				this._addFieldToFlatMap(prefix || "", def);
 				const items = Array.from(def.type.props.entries());
-				for (const [key, value] of items) this._flattenType(value, prefix ? `${prefix}.${key}` : key, inComplexTypeOrArray);
+				for (const [key, value] of items) {
+					if ((0, __atscript_typescript_utils.isPhantomType)(value)) continue;
+					this._flattenType(value, prefix ? `${prefix}.${key}` : key, inComplexTypeOrArray);
+				}
 				break;
 			case "array":
 				let typeArray = def;
@@ -813,7 +819,10 @@ else flatUnion.item(existing);
 		switch (def.type.kind) {
 			case "object":
 				const items = Array.from(def.type.props.entries());
-				for (const [key, value] of items) this._flattenType(value, name ? `${name}.${key}` : key, true);
+				for (const [key, value] of items) {
+					if ((0, __atscript_typescript_utils.isPhantomType)(value)) continue;
+					this._flattenType(value, name ? `${name}.${key}` : key, true);
+				}
 				break;
 			case "union":
 			case "intersection":

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { TAtscriptPlugin } from '@atscript/core';
 import * as mongodb from 'mongodb';
-import { MongoClient, Collection, ObjectId, InsertOneOptions, ReplaceOptions, UpdateOptions, OptionalUnlessRequiredId, Filter, WithoutId } from 'mongodb';
+import { MongoClient, Collection, ObjectId, InsertOneOptions, ReplaceOptions, UpdateOptions, Filter } from 'mongodb';
 import * as _atscript_typescript_utils from '@atscript/typescript/utils';
-import { TAtscriptAnnotatedTypeConstructor, Validator, TAtscriptAnnotatedType, TAtscriptTypeObject, TMetadataMap } from '@atscript/typescript/utils';
+import { TAtscriptAnnotatedType, Validator, TValidatorOptions, TAtscriptTypeObject, TMetadataMap } from '@atscript/typescript/utils';
 
 declare const MongoPlugin: () => TAtscriptPlugin;
 
@@ -22,7 +22,7 @@ declare class AsMongo {
     protected collectionsList?: Promise<Set<string>>;
     protected getCollectionsList(): Promise<Set<string>>;
     collectionExists(name: string): Promise<boolean>;
-    getCollection<T extends TAtscriptAnnotatedTypeConstructor>(type: T, logger?: TGenericLogger): AsCollection<T>;
+    getCollection<T extends TAtscriptAnnotatedType>(type: T, logger?: TGenericLogger): AsCollection<T>;
     private _collections;
 }
 
@@ -41,17 +41,18 @@ type TSearchIndex = {
 };
 type TIndex = TPlainIndex | TSearchIndex;
 type TValidatorPurpose = 'insert' | 'update' | 'patch';
-declare class AsCollection<T extends TAtscriptAnnotatedTypeConstructor> {
+declare class AsCollection<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 readonly asMongo: AsMongo;
     protected readonly _type: T;
     protected readonly logger: TGenericLogger;
     readonly name: string;
-    readonly collection: Collection<InstanceType<T>>;
-    protected readonly validators: Map<TValidatorPurpose, Validator<T, T extends {
-        type: {
-            __dataType?: infer D;
-        };
-    } ? unknown extends D ? T extends new (...args: any[]) => infer I ? I : D : D : unknown>>;
+    readonly collection: Collection<any>;
+    protected readonly validators: Map<TValidatorPurpose, Validator<T, DataType>>;
+    createValidator(opts?: Partial<TValidatorOptions>): Validator<T, DataType>;
     protected _indexes: Map<string, TIndex>;
     protected _vectorFilters: Map<string, string>;
     protected _flatMap?: Map<string, TAtscriptAnnotatedType>;
@@ -79,11 +80,7 @@ declare class AsCollection<T extends TAtscriptAnnotatedTypeConstructor> {
      * @returns {Validator} The corresponding validator instance.
      * @throws {Error} If an unknown purpose is provided.
      */
-    getValidator(purpose: TValidatorPurpose): Validator<T, T extends {
-        type: {
-            __dataType?: infer D;
-        };
-    } ? unknown extends D ? T extends new (...args: any[]) => infer I ? I : D : D : unknown> | undefined;
+    getValidator(purpose: TValidatorPurpose): Validator<T, DataType> | undefined;
     get type(): TAtscriptAnnotatedType<TAtscriptTypeObject>;
     get indexes(): Map<string, TIndex>;
     protected _addIndexField(type: TPlainIndex['type'], name: string, field: string, weight?: number): void;
@@ -103,35 +100,35 @@ declare class AsCollection<T extends TAtscriptAnnotatedTypeConstructor> {
     getSearchIndex(name?: string): TIndex | undefined;
     get flatMap(): Map<string, TAtscriptAnnotatedType<_atscript_typescript_utils.TAtscriptTypeDef<unknown>, unknown>>;
     syncIndexes(): Promise<void>;
-    insert(payload: (Omit<InstanceType<T>, '_id'> & {
-        _id?: InstanceType<T>['_id'] | ObjectId;
-    }) | (Omit<InstanceType<T>, '_id'> & {
-        _id?: InstanceType<T>['_id'] | ObjectId;
-    })[], options?: InsertOneOptions): Promise<mongodb.InsertManyResult<InstanceType<T>>> | Promise<mongodb.InsertOneResult<InstanceType<T>>>;
-    replace(payload: Omit<InstanceType<T>, '_id'> & {
-        _id: InstanceType<T>['_id'] | ObjectId;
-    }, options?: ReplaceOptions): Promise<mongodb.UpdateResult<InstanceType<T>>>;
-    update(payload: AsMongoPatch<Omit<InstanceType<T>, '_id'>> & {
-        _id: InstanceType<T>['_id'] | ObjectId;
-    }, options?: UpdateOptions): Promise<mongodb.UpdateResult<InstanceType<T>>>;
-    prepareInsert(payload: (Omit<InstanceType<T>, '_id'> & {
-        _id?: InstanceType<T>['_id'] | ObjectId;
-    }) | (Omit<InstanceType<T>, '_id'> & {
-        _id?: InstanceType<T>['_id'] | ObjectId;
-    })[]): OptionalUnlessRequiredId<InstanceType<T>> | OptionalUnlessRequiredId<InstanceType<T>>[];
-    prepareReplace(payload: Omit<InstanceType<T>, '_id'> & {
-        _id: InstanceType<T>['_id'] | ObjectId;
+    insert(payload: (Omit<DataType, '_id'> & {
+        _id?: string | number | ObjectId;
+    }) | (Omit<DataType, '_id'> & {
+        _id?: string | number | ObjectId;
+    })[], options?: InsertOneOptions): Promise<mongodb.InsertManyResult<any>> | Promise<mongodb.InsertOneResult<any>>;
+    replace(payload: Omit<DataType, '_id'> & {
+        _id: string | number | ObjectId;
+    }, options?: ReplaceOptions): Promise<mongodb.UpdateResult<any>>;
+    update(payload: AsMongoPatch<Omit<DataType, '_id'>> & {
+        _id: string | number | ObjectId;
+    }, options?: UpdateOptions): Promise<mongodb.UpdateResult<any>>;
+    prepareInsert(payload: (Omit<DataType, '_id'> & {
+        _id?: string | number | ObjectId;
+    }) | (Omit<DataType, '_id'> & {
+        _id?: string | number | ObjectId;
+    })[]): DataType | DataType[];
+    prepareReplace(payload: Omit<DataType, '_id'> & {
+        _id: string | number | ObjectId;
     }): {
-        toArgs: () => [Filter<InstanceType<T>>, WithoutId<InstanceType<T>>, ReplaceOptions];
-        filter: Filter<InstanceType<T>>;
-        updateFilter: WithoutId<InstanceType<T>>;
+        toArgs: () => [Filter<any>, any, ReplaceOptions];
+        filter: Filter<any>;
+        updateFilter: any;
         updateOptions: ReplaceOptions;
     };
-    prepareUpdate(payload: AsMongoPatch<Omit<InstanceType<T>, '_id'>> & {
-        _id: InstanceType<T>['_id'] | ObjectId;
+    prepareUpdate(payload: AsMongoPatch<Omit<DataType, '_id'>> & {
+        _id: string | number | ObjectId;
     }): {
-        toArgs: () => [Filter<InstanceType<T>>, mongodb.Document[] | mongodb.UpdateFilter<InstanceType<T>>, UpdateOptions];
-        filter: Filter<InstanceType<T>>;
+        toArgs: () => [Filter<any>, mongodb.UpdateFilter<any> | mongodb.Document[], UpdateOptions];
+        filter: Filter<any>;
         updateFilter: mongodb.Document[];
         updateOptions: UpdateOptions;
     };

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { AnnotationSpec, isArray, isInterface, isPrimitive, isRef, isStructure } from "@atscript/core";
-import { defineAnnotatedType, isAnnotatedType, isAnnotatedTypeOfPrimitive } from "@atscript/typescript/utils";
+import { defineAnnotatedType, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType } from "@atscript/typescript/utils";
 import { MongoClient, ObjectId } from "mongodb";
 
 //#region packages/mongo/src/plugin/primitives.ts
@@ -376,7 +376,7 @@ var CollectionPatcher = class CollectionPatcher {
 	* @param collection Target collection wrapper
 	* @returns Atscript Validator
 	*/ static prepareValidator(collection) {
-		return collection.type.validator({
+		return collection.createValidator({
 			plugins: [validateMongoIdPlugin, validateMongoUniqueArrayItemsPlugin],
 			replace: (def, path) => {
 				if (path === "" && def.type.kind === "object") {
@@ -632,6 +632,9 @@ const DEFAULT_INDEX_NAME = "DEFAULT";
 	return `${INDEX_PREFIX}${type}__${cleanName}`;
 }
 var AsCollection = class {
+	createValidator(opts) {
+		return this._type.validator(opts);
+	}
 	async exists() {
 		return this.asMongo.collectionExists(this.name);
 	}
@@ -673,7 +676,7 @@ var AsCollection = class {
 	*/ getValidator(purpose) {
 		if (!this.validators.has(purpose)) switch (purpose) {
 			case "insert": {
-				this.validators.set(purpose, this.type.validator({
+				this.validators.set(purpose, this.createValidator({
 					plugins: [validateMongoIdPlugin, validateMongoUniqueArrayItemsPlugin],
 					replace(type, path) {
 						if (path === "_id" && type.type.tags.has("objectId")) return {
@@ -686,7 +689,7 @@ var AsCollection = class {
 				break;
 			}
 			case "update": {
-				this.validators.set(purpose, this.type.validator({ plugins: [validateMongoIdPlugin] }));
+				this.validators.set(purpose, this.createValidator({ plugins: [validateMongoIdPlugin] }));
 				break;
 			}
 			case "patch": {
@@ -765,7 +768,10 @@ else flatUnion.item(existing);
 			case "object":
 				this._addFieldToFlatMap(prefix || "", def);
 				const items = Array.from(def.type.props.entries());
-				for (const [key, value] of items) this._flattenType(value, prefix ? `${prefix}.${key}` : key, inComplexTypeOrArray);
+				for (const [key, value] of items) {
+					if (isPhantomType(value)) continue;
+					this._flattenType(value, prefix ? `${prefix}.${key}` : key, inComplexTypeOrArray);
+				}
 				break;
 			case "array":
 				let typeArray = def;
@@ -789,7 +795,10 @@ else flatUnion.item(existing);
 		switch (def.type.kind) {
 			case "object":
 				const items = Array.from(def.type.props.entries());
-				for (const [key, value] of items) this._flattenType(value, name ? `${name}.${key}` : key, true);
+				for (const [key, value] of items) {
+					if (isPhantomType(value)) continue;
+					this._flattenType(value, name ? `${name}.${key}` : key, true);
+				}
 				break;
 			case "union":
 			case "intersection":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/mongo",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Mongodb plugin for atscript.",
   "type": "module",
   "main": "dist/index.mjs",
@@ -34,8 +34,8 @@
   "license": "ISC",
   "peerDependencies": {
     "mongodb": "^6.17.0",
-    "@atscript/core": "^0.1.3",
-    "@atscript/typescript": "^0.1.3"
+    "@atscript/core": "^0.1.4",
+    "@atscript/typescript": "^0.1.4"
   },
   "devDependencies": {
     "vitest": "3.2.4"