@atscript/mongo 0.1.26 → 0.1.28

package/dist/index.cjs

@@ -43,15 +43,10 @@ const analyzers = [
 	"lucene.russian",
 	"lucene.arabic"
 ];
-const annotations = { mongo: {
+const annotations = {
 	collection: new __atscript_core.AnnotationSpec({
-		description: "Defines a **MongoDB collection**. This annotation is required to mark an interface as a collection.\n\n- Automatically enforces a **non-optional** `_id` field.\n- `_id` must be of type **`string`**, **`number`**, or **`mongo.objectId`**.\n- Ensures that `_id` is included if not explicitly defined.\n\n**Example:**\n```atscript\n@mongo.collection \"users\"\nexport interface User {\n    _id: mongo.objectId\n    email: string.email\n}\n```\n",
+		description: "Marks an interface as a **MongoDB collection**.\n\n- Use together with `@db.table \"name\"` which provides the collection name.\n- Automatically injects a **non-optional** `_id` field if not explicitly defined.\n- `_id` must be of type **`string`**, **`number`**, or **`mongo.objectId`**.\n\n**Example:**\n```atscript\n@db.table \"users\"\n@db.mongo.collection\nexport interface User {\n    _id: mongo.objectId\n    email: string.email\n}\n```\n",
 		nodeType: ["interface"],
-		argument: {
-			name: "name",
-			type: "string",
-			description: "The **name of the MongoDB collection**."
-		},
 		validate(token, args, doc) {
 			const parent = token.parentNode;
 			const struc = parent?.getDefinition();
@@ -60,7 +55,7 @@ const annotations = { mongo: {
 				const _id = parent.props.get("_id");
 				const isOptional = !!_id.token("optional");
 				if (isOptional) errors.push({
-					message: `[mongo] _id can't be optional in Mongo Collection`,
+					message: `[db.mongo] _id can't be optional in Mongo Collection`,
 					severity: 1,
 					range: _id.token("identifier").range
 				});
@@ -72,7 +67,7 @@ const annotations = { mongo: {
 					if ((0, __atscript_core.isPrimitive)(def) && !["string", "number"].includes(def.config.type)) wrongType = true;
 				} else wrongType = true;
 				if (wrongType) errors.push({
-					message: `[mongo] _id must be of type string, number or mongo.objectId`,
+					message: `[db.mongo] _id must be of type string, number or mongo.objectId`,
 					severity: 1,
 					range: _id.token("identifier").range
 				});
@@ -98,43 +93,19 @@ const annotations = { mongo: {
 			description: "On/Off the automatic index creation"
 		}
 	}),
-	index: {
-		plain: new __atscript_core.AnnotationSpec({
-			description: "Defines a **standard MongoDB index** on a field.\n\n- Improves query performance on indexed fields.\n- Can be used for **single-field** or **compound** indexes.\n\n**Example:**\n```atscript\n@mongo.index.plain \"departmentIndex\"\ndepartment: string\n```\n",
-			multiple: true,
-			nodeType: ["prop"],
-			argument: {
-				optional: true,
-				name: "indexName",
-				type: "string",
-				description: "The **name of the index** (optional). If omitted, property name is used."
-			}
-		}),
-		unique: new __atscript_core.AnnotationSpec({
-			description: "Creates a **unique index** on a field to ensure no duplicate values exist.\n\n- Enforces uniqueness at the database level.\n- Automatically prevents duplicate entries.\n- Typically used for **emails, usernames, and IDs**.\n\n**Example:**\n```atscript\n@mongo.index.unique \"uniqueEmailIndex\"\nemail: string.email\n```\n",
-			multiple: true,
-			nodeType: ["prop"],
-			argument: {
-				optional: true,
-				name: "indexName",
-				type: "string",
-				description: "The **name of the unique index** (optional). If omitted, property name is used."
-			}
-		}),
-		text: new __atscript_core.AnnotationSpec({
-			description: "Creates a **legacy MongoDB text index** for full-text search.\n\n**⚠ WARNING:** *Text indexes slow down database operations. Use `@mongo.defineTextSearch` instead for better performance.*\n\n- Allows **basic full-text search** on a field.\n- Does **not support fuzzy matching or ranking**.\n- **Replaced by MongoDB Atlas Search Indexes (`@mongo.searchIndex.text`).**\n\n**Example:**\n```atscript\n@mongo.index.text 5\nbio: string\n```\n",
-			nodeType: ["prop"],
-			argument: {
-				optional: true,
-				name: "weight",
-				type: "number",
-				description: "Field importance in search results (higher = more relevant). Defaults to `1`."
-			}
-		})
-	},
+	index: { text: new __atscript_core.AnnotationSpec({
+		description: "Creates a **legacy MongoDB text index** for full-text search with optional **weight** specification.\n\nUse this when you need per-field weight control. For simple full-text indexing without weights, use the generic `@db.index.fulltext` instead.\n\n**Example:**\n```atscript\n@db.mongo.index.text 5\nbio: string\n```\n",
+		nodeType: ["prop"],
+		argument: {
+			optional: true,
+			name: "weight",
+			type: "number",
+			description: "Field importance in search results (higher = more relevant). Defaults to `1`."
+		}
+	}) },
 	search: {
 		dynamic: new __atscript_core.AnnotationSpec({
-			description: "Creates a **dynamic MongoDB Search Index** that applies to the entire collection.\n\n- **Indexes all text fields automatically** (no need to specify fields).\n- Supports **language analyzers** for text tokenization.\n- Enables **fuzzy search** (typo tolerance) if needed.\n\n**Example:**\n```atscript\n@mongo.search.dynamic \"lucene.english\", 1\nexport interface MongoCollection {}\n```\n",
+			description: "Creates a **dynamic MongoDB Search Index** that applies to the entire collection.\n\n- **Indexes all text fields automatically** (no need to specify fields).\n- Supports **language analyzers** for text tokenization.\n- Enables **fuzzy search** (typo tolerance) if needed.\n\n**Example:**\n```atscript\n@db.mongo.search.dynamic \"lucene.english\", 1\nexport interface MongoCollection {}\n```\n",
 			nodeType: ["interface"],
 			multiple: false,
 			argument: [{
@@ -151,7 +122,7 @@ const annotations = { mongo: {
 			}]
 		}),
 		static: new __atscript_core.AnnotationSpec({
-			description: "Defines a **MongoDB Atlas Search Index** for the collection. The props can refer to this index using `@mongo.search.text` annotation.\n\n- **Creates a named search index** for full-text search.\n- **Specify analyzers and fuzzy search** behavior at the index level.\n- **Fields must explicitly use `@mongo.useTextSearch`** to be included in this search index.\n\n**Example:**\n```atscript\n@mongo.search.static \"lucene.english\", 1, \"mySearchIndex\"\nexport interface MongoCollection {}\n```\n",
+			description: "Defines a **MongoDB Atlas Search Index** for the collection. The props can refer to this index using `@db.mongo.search.text` annotation.\n\n- **Creates a named search index** for full-text search.\n- **Specify analyzers and fuzzy search** behavior at the index level.\n- **Fields must explicitly use `@db.mongo.search.text`** to be included in this search index.\n\n**Example:**\n```atscript\n@db.mongo.search.static \"lucene.english\", 1, \"mySearchIndex\"\nexport interface MongoCollection {}\n```\n",
 			nodeType: ["interface"],
 			multiple: true,
 			argument: [
@@ -172,12 +143,12 @@ const annotations = { mongo: {
 					optional: true,
 					name: "indexName",
 					type: "string",
-					description: "The name of the search index. Fields must reference this name using `@mongo.search.text`. If not set, defaults to `\"DEFAULT\"`."
+					description: "The name of the search index. Fields must reference this name using `@db.mongo.search.text`. If not set, defaults to `\"DEFAULT\"`."
 				}
 			]
 		}),
 		text: new __atscript_core.AnnotationSpec({
-			description: "Marks a field to be **included in a MongoDB Atlas Search Index** defined by `@mongo.search.static`.\n\n- **The field has to reference an existing search index name**.\n- If index name is not defined, a new search index with default attributes will be created.\n\n**Example:**\n```atscript\n@mongo.search.text \"lucene.english\", \"mySearchIndex\"\nfirstName: string\n```\n",
+			description: "Marks a field to be **included in a MongoDB Atlas Search Index** defined by `@db.mongo.search.static`.\n\n- **The field has to reference an existing search index name**.\n- If index name is not defined, a new search index with default attributes will be created.\n\n**Example:**\n```atscript\n@db.mongo.search.text \"lucene.english\", \"mySearchIndex\"\nfirstName: string\n```\n",
 			nodeType: ["prop"],
 			multiple: true,
 			argument: [{
@@ -190,11 +161,11 @@ const annotations = { mongo: {
 				optional: true,
 				name: "indexName",
 				type: "string",
-				description: "The **name of the search index** defined in `@mongo.defineTextSearch`. This links the field to the correct index. If not set, defaults to `\"DEFAULT\"`."
+				description: "The **name of the search index** defined in `@db.mongo.search.static`. This links the field to the correct index. If not set, defaults to `\"DEFAULT\"`."
 			}]
 		}),
 		vector: new __atscript_core.AnnotationSpec({
-			description: "Creates a **MongoDB Vector Search Index** for **semantic search, embeddings, and AI-powered search**.\n\n- Each field that stores vector embeddings **must define its own vector index**.\n- Supports **cosine similarity, Euclidean distance, and dot product similarity**.\n- Vector fields must be an **array of numbers**.\n\n**Example:**\n```atscript\n@mongo.search.vector 512, \"cosine\"\nembedding: mongo.vector\n```\n",
+			description: "Creates a **MongoDB Vector Search Index** for **semantic search, embeddings, and AI-powered search**.\n\n- Each field that stores vector embeddings **must define its own vector index**.\n- Supports **cosine similarity, Euclidean distance, and dot product similarity**.\n- Vector fields must be an **array of numbers**.\n\n**Example:**\n```atscript\n@db.mongo.search.vector 512, \"cosine\"\nembedding: mongo.vector\n```\n",
 			nodeType: ["prop"],
 			multiple: false,
 			argument: [
@@ -232,7 +203,7 @@ const annotations = { mongo: {
 			]
 		}),
 		filter: new __atscript_core.AnnotationSpec({
-			description: "Assigns a field as a **filter field** for a **MongoDB Vector Search Index**.\n\n- The assigned field **must be indexed** for efficient filtering.\n- Filters allow vector search queries to return results **only within a specific category, user group, or tag**.\n- The vector index must be defined using `@mongo.search.vector`.\n\n**Example:**\n```atscript\n@mongo.search.vector 512, \"cosine\"\nembedding: number[]\n\n@mongo.search.filter \"embedding\"\ncategory: string\n```\n",
+			description: "Assigns a field as a **filter field** for a **MongoDB Vector Search Index**.\n\n- The assigned field **must be indexed** for efficient filtering.\n- Filters allow vector search queries to return results **only within a specific category, user group, or tag**.\n- The vector index must be defined using `@db.mongo.search.vector`.\n\n**Example:**\n```atscript\n@db.mongo.search.vector 512, \"cosine\"\nembedding: number[]\n\n@db.mongo.search.filter \"embedding\"\ncategory: string\n```\n",
 			nodeType: ["prop"],
 			multiple: true,
 			argument: [{
@@ -244,7 +215,7 @@ const annotations = { mongo: {
 		})
 	},
 	patch: { strategy: new __atscript_core.AnnotationSpec({
-		description: "Defines the **patching strategy** for updating MongoDB documents.\n\n- **\"replace\"** → The field or object will be **fully replaced**.\n- **\"merge\"** → The field or object will be **merged recursively** (applies only to objects, not arrays).\n\n**Example:**\n```atscript\n@mongo.patch.strategy \"merge\"\nsettings: {\n  notifications: boolean\n  preferences: {\n    theme: string\n  }\n}\n```\n",
+		description: "Defines the **patching strategy** for updating MongoDB documents.\n\n- **\"replace\"** → The field or object will be **fully replaced**.\n- **\"merge\"** → The field or object will be **merged recursively** (applies only to objects, not arrays).\n\n**Example:**\n```atscript\n@db.mongo.patch.strategy \"merge\"\nsettings: {\n  notifications: boolean\n  preferences: {\n    theme: string\n  }\n}\n```\n",
 		nodeType: ["prop"],
 		multiple: false,
 		argument: {
@@ -264,7 +235,7 @@ const annotations = { mongo: {
 				if (!(0, __atscript_core.isStructure)(def) && !(0, __atscript_core.isInterface)(def) && !(0, __atscript_core.isArray)(def)) wrongType = true;
 			} else if (!(0, __atscript_core.isStructure)(definition) && !(0, __atscript_core.isInterface)(definition) && !(0, __atscript_core.isArray)(definition)) wrongType = true;
 			if (wrongType) errors.push({
-				message: `[mongo] type of object or array expected when using @mongo.patch.strategy`,
+				message: `[db.mongo] type of object or array expected when using @db.mongo.patch.strategy`,
 				severity: 1,
 				range: token.range
 			});
@@ -272,7 +243,7 @@ const annotations = { mongo: {
 		}
 	}) },
 	array: { uniqueItems: new __atscript_core.AnnotationSpec({
-		description: "Marks an **array field** as containing *globally unique items* when handling **patch `$insert` operations**.\n\n- Forces the patcher to use **set-semantics** (`$setUnion`) instead of a plain append, so duplicates are silently skipped.\n- Has **no effect** on `$replace`, `$update`, or `$remove`.\n- If the array’s element type already defines one or more `@meta.isKey` properties, *uniqueness is implied* and this annotation is unnecessary (but harmless).\n\n**Example:**\n```atscript\n@mongo.array.uniqueItems\ntags: string[]\n\n// Later in a patch payload …\n{\n  $insert: {\n    tags: [\"mongo\", \"mongo\"] // second \"mongo\" is ignored\n  }\n}\n```\n",
+		description: "Marks an **array field** as containing *globally unique items* when handling **patch `$insert` operations**.\n\n- Forces the patcher to use **set-semantics** (`$setUnion`) instead of a plain append, so duplicates are silently skipped.\n- Has **no effect** on `$replace`, `$update`, or `$remove`.\n- If the array's element type already defines one or more `@expect.array.key` properties, *uniqueness is implied* and this annotation is unnecessary (but harmless).\n\n**Example:**\n```atscript\n@db.mongo.array.uniqueItems\ntags: string[]\n\n// Later in a patch payload …\n{\n  $insert: {\n    tags: [\"mongo\", \"mongo\"] // second \"mongo\" is ignored\n  }\n}\n```\n",
 		nodeType: ["prop"],
 		multiple: false,
 		validate(token, args, doc) {
@@ -286,14 +257,14 @@ const annotations = { mongo: {
 				if (!(0, __atscript_core.isArray)(def)) wrongType = true;
 			} else if (!(0, __atscript_core.isArray)(definition)) wrongType = true;
 			if (wrongType) errors.push({
-				message: `[mongo] type of array expected when using @mongo.array.uniqueItems`,
+				message: `[db.mongo] type of array expected when using @db.mongo.array.uniqueItems`,
 				severity: 1,
 				range: token.range
 			});
 			return errors;
 		}
 	}) }
-} };
+};
 
 //#endregion
 //#region packages/mongo/src/plugin/primitives.ts
@@ -301,7 +272,7 @@ const primitives = { mongo: { extensions: {
 	objectId: {
 		type: "string",
 		documentation: "Represents a **MongoDB ObjectId**.\n\n- Stored as a **string** but can be converted to an ObjectId at runtime.\n- Useful for handling `_id` fields and queries that require ObjectId conversion.\n- Automatically converts string `_id` values into **MongoDB ObjectId** when needed.\n\n**Example:**\n```atscript\nuserId: mongo.objectId\n```\n",
-		expect: { pattern: /^[a-fA-F0-9]{24}$/ }
+		annotations: { "expect.pattern": { pattern: "^[a-fA-F0-9]{24}$" } }
 	},
 	vector: {
 		type: {
@@ -319,7 +290,7 @@ const MongoPlugin = () => ({
 	config() {
 		return {
 			primitives,
-			annotations
+			annotations: { db: { mongo: annotations } }
 		};
 	}
 });
@@ -330,7 +301,7 @@ const validateMongoIdPlugin = (ctx, def, value) => {
 	if (ctx.path === "_id" && def.type.tags.has("objectId")) return ctx.validateAnnotatedType(def, value instanceof mongodb.ObjectId ? value.toString() : value);
 };
 const validateMongoUniqueArrayItemsPlugin = (ctx, def, value) => {
-	if (def.metadata.has("mongo.array.uniqueItems") && def.type.kind === "array") {
+	if (def.metadata.has("db.mongo.array.uniqueItems") && def.type.kind === "array") {
 		if (Array.isArray(value)) {
 			const separator = "▼↩";
 			const seen = new Set();
@@ -364,7 +335,7 @@ else obj[key] = value;
 }
 var CollectionPatcher = class CollectionPatcher {
 	/**
-	* Extract a set of *key properties* (annotated with `@meta.isKey`) from an
+	* Extract a set of *key properties* (annotated with `@expect.array.key`) from an
 	* array‐of‐objects type definition. These keys uniquely identify an element
 	* inside the array and are later used for `$update`, `$remove` and `$upsert`.
 	*
@@ -374,7 +345,7 @@ var CollectionPatcher = class CollectionPatcher {
 		if (def.type.of.type.kind === "object") {
 			const objType = def.type.of.type;
 			const keyProps = new Set();
-			for (const [key, val] of objType.props.entries()) if (val.metadata.get("meta.isKey")) keyProps.add(key);
+			for (const [key, val] of objType.props.entries()) if (val.metadata.get("expect.array.key")) keyProps.add(key);
 			return keyProps;
 		}
 		return new Set();
@@ -383,7 +354,7 @@ var CollectionPatcher = class CollectionPatcher {
 	* Build a runtime *Validator* that understands the extended patch payload.
 	*
 	*  * Adds per‑array *patch* wrappers (the `$replace`, `$insert`, … fields).
-	*  * Honors `mongo.patch.strategy === "merge"` metadata.
+	*  * Honors `db.mongo.patch.strategy === "merge"` metadata.
 	*
 	* @param collection Target collection wrapper
 	* @returns Atscript Validator
@@ -396,12 +367,12 @@ var CollectionPatcher = class CollectionPatcher {
 					for (const [prop, type] of def.type.props.entries()) obj.prop(prop, (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(type).copyMetadata(type.metadata).optional(prop !== "_id").$type);
 					return obj.$type;
 				}
-				if (def.type.kind === "array" && collection.flatMap.get(path)?.metadata.get("mongo.__topLevelArray") && !def.metadata.has("mongo.__patchArrayValue")) {
+				if (def.type.kind === "array" && collection.flatMap.get(path)?.metadata.get("db.mongo.__topLevelArray") && !def.metadata.has("db.mongo.__patchArrayValue")) {
 					const defArray = def;
-					const mergeStrategy = defArray.metadata.get("mongo.patch.strategy") === "merge";
+					const mergeStrategy = defArray.metadata.get("db.mongo.patch.strategy") === "merge";
 					function getPatchType() {
 						const isPrimitive$1 = (0, __atscript_typescript_utils.isAnnotatedTypeOfPrimitive)(defArray.type.of);
-						if (isPrimitive$1) return (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(def).copyMetadata(def.metadata).annotate("mongo.__patchArrayValue").optional().$type;
+						if (isPrimitive$1) return (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(def).copyMetadata(def.metadata).annotate("db.mongo.__patchArrayValue").optional().$type;
 						if (defArray.type.of.type.kind === "object") {
 							const objType = defArray.type.of.type;
 							const t = (0, __atscript_typescript_utils.defineAnnotatedType)("object").copyMetadata(defArray.type.of.metadata);
@@ -409,17 +380,17 @@ var CollectionPatcher = class CollectionPatcher {
 							for (const [key, val] of objType.props.entries()) if (keyProps.size > 0) if (keyProps.has(key)) t.prop(key, (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(val).copyMetadata(def.metadata).$type);
 else t.prop(key, (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(val).copyMetadata(def.metadata).optional().$type);
 else t.prop(key, (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(val).copyMetadata(def.metadata).optional(!!val.optional).$type);
-							return (0, __atscript_typescript_utils.defineAnnotatedType)("array").of(t.$type).copyMetadata(def.metadata).annotate("mongo.__patchArrayValue").optional().$type;
+							return (0, __atscript_typescript_utils.defineAnnotatedType)("array").of(t.$type).copyMetadata(def.metadata).annotate("db.mongo.__patchArrayValue").optional().$type;
 						}
 						return undefined;
 					}
-					const fullType = (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(def).copyMetadata(def.metadata).annotate("mongo.__patchArrayValue").optional().$type;
+					const fullType = (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(def).copyMetadata(def.metadata).annotate("db.mongo.__patchArrayValue").optional().$type;
 					const patchType = getPatchType();
 					return patchType ? (0, __atscript_typescript_utils.defineAnnotatedType)("object").prop("$replace", fullType).prop("$insert", fullType).prop("$upsert", fullType).prop("$update", mergeStrategy ? patchType : fullType).prop("$remove", patchType).optional().$type : (0, __atscript_typescript_utils.defineAnnotatedType)("object").prop("$replace", fullType).prop("$insert", fullType).optional().$type;
 				}
 				return def;
 			},
-			partial: (def, path) => path !== "" && def.metadata.get("mongo.patch.strategy") === "merge"
+			partial: (def, path) => path !== "" && def.metadata.get("db.mongo.patch.strategy") === "merge"
 		});
 	}
 	/**
@@ -470,9 +441,9 @@ else t.prop(key, (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(va
 		for (const [_key, value] of Object.entries(payload)) {
 			const key = evalKey(_key);
 			const flatType = this.collection.flatMap.get(key);
-			const topLevelArray = flatType?.metadata?.get("mongo.__topLevelArray");
+			const topLevelArray = flatType?.metadata?.get("db.mongo.__topLevelArray");
 			if (typeof value === "object" && topLevelArray) this.parseArrayPatch(key, value);
-else if (typeof value === "object" && this.collection.flatMap.get(key)?.metadata?.get("mongo.patch.strategy") === "merge") this.flattenPayload(value, key);
+else if (typeof value === "object" && this.collection.flatMap.get(key)?.metadata?.get("db.mongo.patch.strategy") === "merge") this.flattenPayload(value, key);
 else if (key !== "_id") this._set(key, value);
 		}
 		return this.updatePipeline;
@@ -526,7 +497,7 @@ else if (key !== "_id") this._set(key, value);
 	* - unique / keyed    → delegate to _upsert (insert-or-update)
 	*/ _insert(key, input, keyProps) {
 		if (!input?.length) return;
-		const uniqueItems = this.collection.flatMap.get(key)?.metadata?.has("mongo.array.uniqueItems");
+		const uniqueItems = this.collection.flatMap.get(key)?.metadata?.has("db.mongo.array.uniqueItems");
 		if (uniqueItems || keyProps.size > 0) this._upsert(key, input, keyProps);
 else this._set(key, { $concatArrays: [{ $ifNull: [`$${key}`, []] }, input] });
 	}
@@ -564,7 +535,7 @@ else this._set(key, { $concatArrays: [{ $ifNull: [`$${key}`, []] }, input] });
 	*/ _update(key, input, keyProps) {
 		if (!input?.length) return;
 		if (keyProps.size > 0) {
-			const mergeStrategy = this.collection.flatMap.get(key)?.metadata?.get("mongo.patch.strategy") === "merge";
+			const mergeStrategy = this.collection.flatMap.get(key)?.metadata?.get("db.mongo.patch.strategy") === "merge";
 			const keys = [...keyProps];
 			this._set(key, { $reduce: {
 				input,
@@ -773,13 +744,13 @@ else {
 	}
 	_prepareIndexesForCollection() {
 		const typeMeta = this.type.metadata;
-		const dynamicText = typeMeta.get("mongo.search.dynamic");
+		const dynamicText = typeMeta.get("db.mongo.search.dynamic");
 		if (dynamicText) this._setSearchIndex("dynamic_text", "_", {
 			mappings: { dynamic: true },
 			analyzer: dynamicText.analyzer,
 			text: { fuzzy: { maxEdits: dynamicText.fuzzy || 0 } }
 		});
-		for (const textSearch of typeMeta.get("mongo.search.static") || []) this._setSearchIndex("search_text", textSearch.indexName, {
+		for (const textSearch of typeMeta.get("db.mongo.search.static") || []) this._setSearchIndex("search_text", textSearch.indexName, {
 			mappings: { fields: {} },
 			analyzer: textSearch.analyzer,
 			text: { fuzzy: { maxEdits: textSearch.fuzzy || 0 } }
@@ -802,25 +773,35 @@ else {
 		}
 	}
 	_prepareIndexesForField(fieldName, metadata) {
-		for (const index of metadata.get("mongo.index.plain") || []) this._addIndexField("plain", index === true ? fieldName : index, fieldName);
-		for (const index of metadata.get("mongo.index.unique") || []) this._addIndexField("unique", index === true ? fieldName : index, fieldName);
-		const textWeight = metadata.get("mongo.index.text");
+		for (const index of metadata.get("db.index.plain") || []) {
+			const name = index === true ? fieldName : index.name || fieldName;
+			this._addIndexField("plain", name, fieldName);
+		}
+		for (const index of metadata.get("db.index.unique") || []) {
+			const name = index === true ? fieldName : index.name || fieldName;
+			this._addIndexField("unique", name, fieldName);
+		}
+		for (const index of metadata.get("db.index.fulltext") || []) {
+			const name = index === true ? "" : index.name || "";
+			this._addIndexField("text", name, fieldName, 1);
+		}
+		const textWeight = metadata.get("db.mongo.index.text");
 		if (textWeight) this._addIndexField("text", "", fieldName, textWeight === true ? 1 : textWeight);
-		for (const index of metadata.get("mongo.search.text") || []) this._addFieldToSearchIndex("search_text", index.indexName, fieldName, index.analyzer);
-		const vectorIndex = metadata.get("mongo.search.vector");
+		for (const index of metadata.get("db.mongo.search.text") || []) this._addFieldToSearchIndex("search_text", index.indexName, fieldName, index.analyzer);
+		const vectorIndex = metadata.get("db.mongo.search.vector");
 		if (vectorIndex) this._setSearchIndex("vector", vectorIndex.indexName || fieldName, { fields: [{
 			type: "vector",
 			path: fieldName,
 			similarity: vectorIndex.similarity || "dotProduct",
 			numDimensions: vectorIndex.dimensions
 		}] });
-		for (const index of metadata.get("mongo.search.filter") || []) this._vectorFilters.set(indexKey("vector", index.indexName), fieldName);
+		for (const index of metadata.get("db.mongo.search.filter") || []) this._vectorFilters.set(indexKey("vector", index.indexName), fieldName);
 	}
 	_flatten() {
 		if (!this._flatMap) {
 			this._prepareIndexesForCollection();
 			this._flatMap = (0, __atscript_typescript_utils.flattenAnnotatedType)(this.type, {
-				topLevelArrayTag: "mongo.__topLevelArray",
+				topLevelArrayTag: "db.mongo.__topLevelArray",
 				excludePhantomTypes: true,
 				onField: (path, _type, metadata) => this._prepareIndexesForField(path, metadata)
 			});
@@ -1032,8 +1013,8 @@ else if (this.idType !== "objectId") throw new Error("Missing \"_id\" field");
 		this._vectorFilters = new Map();
 		this._uniqueProps = new Set();
 		if (!(0, __atscript_typescript_utils.isAnnotatedType)(_type)) throw new Error("Atscript Annotated Type expected");
-		const name = _type.metadata.get("mongo.collection");
-		if (!name) throw new Error("@mongo.collection annotation expected with collection name");
+		const name = _type.metadata.get("db.table");
+		if (!name) throw new Error("@db.table annotation expected with collection name");
 		if (_type.type.kind !== "object") throw new Error("Mongo collection must be an object type");
 		this.name = name;
 		this.collection = asMongo.db.collection(name);