@atscript/db-mongo 0.1.110 → 0.1.112

package/dist/index.cjs

@@ -352,6 +352,9 @@ var CollectionPatcher = class {
 const INDEX_PREFIX = "atscript__";
 const DEFAULT_INDEX_NAME = "DEFAULT";
 const JOINED_PREFIX = "__joined_";
+function isPlainIndex(index) {
+	return index.type === "plain" || index.type === "unique" || index.type === "text" || index.type === "2dsphere";
+}
 function mongoIndexKey(type, name) {
 	return `${INDEX_PREFIX}${type}__${name.replace(/[^a-z0-9_.-]/gi, "_").replace(/_+/g, "_").slice(0, 117 - type.length - 2)}`;
 }
@@ -1312,61 +1315,60 @@ async function syncIndexesImpl(host) {
 	} else allIndexes.set(key, index);
 	const existingIndexes = await host.collection.listIndexes().toArray();
 	const indexesToCreate = new Map(allIndexes);
+	const { attempt, throwIfAny } = (0, _atscript_db.createFailureCollector)("index sync");
 	for (const remote of existingIndexes) {
 		if (!remote.name.startsWith("atscript__")) continue;
 		if (indexesToCreate.has(remote.name)) {
 			const local = indexesToCreate.get(remote.name);
-			switch (local.type) {
-				case "plain":
-				case "unique":
-				case "text":
-				case "2dsphere": {
-					const fieldsMatch = local.type === "text" || objMatch(local.fields, remote.key);
-					const weightsMatch = objMatch(local.weights || {}, remote.weights || {});
-					const optionsMatch = local.type === "text" || local.type === "unique" === (remote.unique === true) && partialFilterEqual(local.partialFilterExpression, remote.partialFilterExpression);
-					if (fieldsMatch && weightsMatch && optionsMatch) indexesToCreate.delete(remote.name);
-					else {
-						host._log("dropIndex", remote.name);
-						await host.collection.dropIndex(remote.name);
-					}
-					break;
+			if (isPlainIndex(local)) {
+				const fieldsMatch = local.type === "text" || objMatch(local.fields, remote.key);
+				const weightsMatch = objMatch(local.weights || {}, remote.weights || {});
+				const optionsMatch = local.type === "text" || local.type === "unique" === (remote.unique === true) && partialFilterEqual(local.partialFilterExpression, remote.partialFilterExpression);
+				if (fieldsMatch && weightsMatch && optionsMatch) indexesToCreate.delete(remote.name);
+				else {
+					host._log("dropIndex", remote.name);
+					await attempt(`drop index "${remote.name}"`, () => host.collection.dropIndex(remote.name));
 				}
-				default:
 			}
 		} else {
 			host._log("dropIndex", remote.name);
-			await host.collection.dropIndex(remote.name);
+			await attempt(`drop index "${remote.name}"`, () => host.collection.dropIndex(remote.name));
 		}
 	}
-	for (const [key, value] of allIndexes.entries()) switch (value.type) {
-		case "plain":
-			if (!indexesToCreate.has(key)) continue;
-			host._log("createIndex", key, value.fields);
-			await host.collection.createIndex(value.fields, { name: key });
-			break;
-		case "unique":
-			if (!indexesToCreate.has(key)) continue;
-			host._log("createIndex (unique)", key, value.fields, value.partialFilterExpression);
-			await host.collection.createIndex(value.fields, {
-				name: key,
-				unique: true,
-				...value.partialFilterExpression ? { partialFilterExpression: value.partialFilterExpression } : {}
-			});
-			break;
-		case "text":
-			if (!indexesToCreate.has(key)) continue;
-			host._log("createIndex (text)", key, value.fields);
-			await host.collection.createIndex(value.fields, {
-				weights: value.weights,
-				name: key
-			});
-			break;
-		case "2dsphere":
-			if (!indexesToCreate.has(key)) continue;
-			host._log("createIndex (2dsphere)", key, value.fields);
-			await host.collection.createIndex(value.fields, { name: key });
-			break;
-		default:
+	for (const [key, value] of allIndexes.entries()) {
+		if (!isPlainIndex(value) || !indexesToCreate.has(key)) continue;
+		let label;
+		let indexOptions;
+		switch (value.type) {
+			case "plain":
+				host._log("createIndex", key, value.fields);
+				label = `create index "${key}"`;
+				indexOptions = { name: key };
+				break;
+			case "unique":
+				host._log("createIndex (unique)", key, value.fields, value.partialFilterExpression);
+				label = `create unique index "${key}"`;
+				indexOptions = {
+					name: key,
+					unique: true,
+					...value.partialFilterExpression ? { partialFilterExpression: value.partialFilterExpression } : {}
+				};
+				break;
+			case "text":
+				host._log("createIndex (text)", key, value.fields);
+				label = `create text index "${key}"`;
+				indexOptions = {
+					weights: value.weights,
+					name: key
+				};
+				break;
+			case "2dsphere":
+				host._log("createIndex (2dsphere)", key, value.fields);
+				label = `create 2dsphere index "${key}"`;
+				indexOptions = { name: key };
+				break;
+		}
+		await attempt(label, () => host.collection.createIndex(value.fields, indexOptions));
 	}
 	try {
 		const toUpdate = /* @__PURE__ */ new Set();
@@ -1414,6 +1416,7 @@ async function syncIndexesImpl(host) {
 			default:
 		}
 	} catch {}
+	throwIfAny();
 }
 /**
 * Maps an engine-agnostic design type to the MongoDB BSON `$type` alias(es)
@@ -2414,7 +2417,9 @@ function createAdapter(connection, _options) {
 }
 //#endregion
 exports.CollectionPatcher = CollectionPatcher;
+exports.INDEX_PREFIX = INDEX_PREFIX;
 exports.MongoAdapter = MongoAdapter;
 exports.buildMongoFilter = require_mongo_filter.buildMongoFilter;
 exports.createAdapter = createAdapter;
+exports.mongoIndexKey = mongoIndexKey;
 exports.validateMongoIdPlugin = validateMongoIdPlugin;

package/dist/index.d.cts

@@ -145,6 +145,7 @@ declare class CollectionPatcher {
 }
 //#endregion
 //#region src/lib/mongo-types.d.ts
+declare const INDEX_PREFIX = "atscript__";
 interface TPlainIndex {
   key: string;
   name: string;
@@ -185,6 +186,7 @@ interface TSearchIndex {
   strategy?: "compound" | "autocomplete" | "text";
 }
 type TMongoIndex = TPlainIndex | TSearchIndex;
+declare function mongoIndexKey(type: TMongoIndex["type"], name: string): string;
 type TVectorSimilarity = "cosine" | "euclidean" | "dotProduct";
 /**
  * One Atlas Search field-type mapping. `type: "string"` is plain word matching;
@@ -457,4 +459,4 @@ declare const validateMongoIdPlugin: TValidatorPlugin;
 //#region src/lib/index.d.ts
 declare function createAdapter(connection: string, _options?: Record<string, unknown>): DbSpace;
 //#endregion
-export { CollectionPatcher, MongoAdapter, TCollectionPatcherContext, type TMongoIndex, type TMongoSearchIndexDefinition, type TPlainIndex, type TSearchIndex, buildMongoFilter, createAdapter, validateMongoIdPlugin };
+export { CollectionPatcher, INDEX_PREFIX, MongoAdapter, TCollectionPatcherContext, type TMongoIndex, type TMongoSearchIndexDefinition, type TPlainIndex, type TSearchIndex, buildMongoFilter, createAdapter, mongoIndexKey, validateMongoIdPlugin };

package/dist/index.d.mts

@@ -145,6 +145,7 @@ declare class CollectionPatcher {
 }
 //#endregion
 //#region src/lib/mongo-types.d.ts
+declare const INDEX_PREFIX = "atscript__";
 interface TPlainIndex {
   key: string;
   name: string;
@@ -185,6 +186,7 @@ interface TSearchIndex {
   strategy?: "compound" | "autocomplete" | "text";
 }
 type TMongoIndex = TPlainIndex | TSearchIndex;
+declare function mongoIndexKey(type: TMongoIndex["type"], name: string): string;
 type TVectorSimilarity = "cosine" | "euclidean" | "dotProduct";
 /**
  * One Atlas Search field-type mapping. `type: "string"` is plain word matching;
@@ -457,4 +459,4 @@ declare const validateMongoIdPlugin: TValidatorPlugin;
 //#region src/lib/index.d.ts
 declare function createAdapter(connection: string, _options?: Record<string, unknown>): DbSpace;
 //#endregion
-export { CollectionPatcher, MongoAdapter, TCollectionPatcherContext, type TMongoIndex, type TMongoSearchIndexDefinition, type TPlainIndex, type TSearchIndex, buildMongoFilter, createAdapter, validateMongoIdPlugin };
+export { CollectionPatcher, INDEX_PREFIX, MongoAdapter, TCollectionPatcherContext, type TMongoIndex, type TMongoSearchIndexDefinition, type TPlainIndex, type TSearchIndex, buildMongoFilter, createAdapter, mongoIndexKey, validateMongoIdPlugin };

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { t as buildMongoFilter } from "./mongo-filter-DceAGI-S.mjs";
-import { AtscriptDbView, BaseDbAdapter, DbError, DbSpace, computeInsights, getDbFieldOp, getKeyProps, resolveDesignType } from "@atscript/db";
+import { AtscriptDbView, BaseDbAdapter, DbError, DbSpace, computeInsights, createFailureCollector, getDbFieldOp, getKeyProps, resolveDesignType } from "@atscript/db";
 import { MongoClient, MongoServerError, ObjectId } from "mongodb";
 //#region src/lib/path-utils.ts
 function joinPath(prefix, segment) {
@@ -351,6 +351,9 @@ var CollectionPatcher = class {
 const INDEX_PREFIX = "atscript__";
 const DEFAULT_INDEX_NAME = "DEFAULT";
 const JOINED_PREFIX = "__joined_";
+function isPlainIndex(index) {
+	return index.type === "plain" || index.type === "unique" || index.type === "text" || index.type === "2dsphere";
+}
 function mongoIndexKey(type, name) {
 	return `${INDEX_PREFIX}${type}__${name.replace(/[^a-z0-9_.-]/gi, "_").replace(/_+/g, "_").slice(0, 117 - type.length - 2)}`;
 }
@@ -1311,61 +1314,60 @@ async function syncIndexesImpl(host) {
 	} else allIndexes.set(key, index);
 	const existingIndexes = await host.collection.listIndexes().toArray();
 	const indexesToCreate = new Map(allIndexes);
+	const { attempt, throwIfAny } = createFailureCollector("index sync");
 	for (const remote of existingIndexes) {
 		if (!remote.name.startsWith("atscript__")) continue;
 		if (indexesToCreate.has(remote.name)) {
 			const local = indexesToCreate.get(remote.name);
-			switch (local.type) {
-				case "plain":
-				case "unique":
-				case "text":
-				case "2dsphere": {
-					const fieldsMatch = local.type === "text" || objMatch(local.fields, remote.key);
-					const weightsMatch = objMatch(local.weights || {}, remote.weights || {});
-					const optionsMatch = local.type === "text" || local.type === "unique" === (remote.unique === true) && partialFilterEqual(local.partialFilterExpression, remote.partialFilterExpression);
-					if (fieldsMatch && weightsMatch && optionsMatch) indexesToCreate.delete(remote.name);
-					else {
-						host._log("dropIndex", remote.name);
-						await host.collection.dropIndex(remote.name);
-					}
-					break;
+			if (isPlainIndex(local)) {
+				const fieldsMatch = local.type === "text" || objMatch(local.fields, remote.key);
+				const weightsMatch = objMatch(local.weights || {}, remote.weights || {});
+				const optionsMatch = local.type === "text" || local.type === "unique" === (remote.unique === true) && partialFilterEqual(local.partialFilterExpression, remote.partialFilterExpression);
+				if (fieldsMatch && weightsMatch && optionsMatch) indexesToCreate.delete(remote.name);
+				else {
+					host._log("dropIndex", remote.name);
+					await attempt(`drop index "${remote.name}"`, () => host.collection.dropIndex(remote.name));
 				}
-				default:
 			}
 		} else {
 			host._log("dropIndex", remote.name);
-			await host.collection.dropIndex(remote.name);
+			await attempt(`drop index "${remote.name}"`, () => host.collection.dropIndex(remote.name));
 		}
 	}
-	for (const [key, value] of allIndexes.entries()) switch (value.type) {
-		case "plain":
-			if (!indexesToCreate.has(key)) continue;
-			host._log("createIndex", key, value.fields);
-			await host.collection.createIndex(value.fields, { name: key });
-			break;
-		case "unique":
-			if (!indexesToCreate.has(key)) continue;
-			host._log("createIndex (unique)", key, value.fields, value.partialFilterExpression);
-			await host.collection.createIndex(value.fields, {
-				name: key,
-				unique: true,
-				...value.partialFilterExpression ? { partialFilterExpression: value.partialFilterExpression } : {}
-			});
-			break;
-		case "text":
-			if (!indexesToCreate.has(key)) continue;
-			host._log("createIndex (text)", key, value.fields);
-			await host.collection.createIndex(value.fields, {
-				weights: value.weights,
-				name: key
-			});
-			break;
-		case "2dsphere":
-			if (!indexesToCreate.has(key)) continue;
-			host._log("createIndex (2dsphere)", key, value.fields);
-			await host.collection.createIndex(value.fields, { name: key });
-			break;
-		default:
+	for (const [key, value] of allIndexes.entries()) {
+		if (!isPlainIndex(value) || !indexesToCreate.has(key)) continue;
+		let label;
+		let indexOptions;
+		switch (value.type) {
+			case "plain":
+				host._log("createIndex", key, value.fields);
+				label = `create index "${key}"`;
+				indexOptions = { name: key };
+				break;
+			case "unique":
+				host._log("createIndex (unique)", key, value.fields, value.partialFilterExpression);
+				label = `create unique index "${key}"`;
+				indexOptions = {
+					name: key,
+					unique: true,
+					...value.partialFilterExpression ? { partialFilterExpression: value.partialFilterExpression } : {}
+				};
+				break;
+			case "text":
+				host._log("createIndex (text)", key, value.fields);
+				label = `create text index "${key}"`;
+				indexOptions = {
+					weights: value.weights,
+					name: key
+				};
+				break;
+			case "2dsphere":
+				host._log("createIndex (2dsphere)", key, value.fields);
+				label = `create 2dsphere index "${key}"`;
+				indexOptions = { name: key };
+				break;
+		}
+		await attempt(label, () => host.collection.createIndex(value.fields, indexOptions));
 	}
 	try {
 		const toUpdate = /* @__PURE__ */ new Set();
@@ -1413,6 +1415,7 @@ async function syncIndexesImpl(host) {
 			default:
 		}
 	} catch {}
+	throwIfAny();
 }
 /**
 * Maps an engine-agnostic design type to the MongoDB BSON `$type` alias(es)
@@ -2412,4 +2415,4 @@ function createAdapter(connection, _options) {
 	return new DbSpace(() => new MongoAdapter(db, client));
 }
 //#endregion
-export { CollectionPatcher, MongoAdapter, buildMongoFilter, createAdapter, validateMongoIdPlugin };
+export { CollectionPatcher, INDEX_PREFIX, MongoAdapter, buildMongoFilter, createAdapter, mongoIndexKey, validateMongoIdPlugin };

package/dist/plugin.cjs

@@ -158,6 +158,7 @@ const annotations = {
 		text: new _atscript_core.AnnotationSpec({
 			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"],
+			passedWhenReferred: false,
 			multiple: true,
 			argument: [{
 				optional: true,
@@ -175,6 +176,7 @@ const annotations = {
 		autocomplete: new _atscript_core.AnnotationSpec({
 			description: "Marks a field for **prefix / typeahead (as-you-type)** matching in a MongoDB Atlas Search Index.\n\n- Indexes the field as the Atlas **`autocomplete`** type, **and** double-maps it as `string` so exact-word hits still rank.\n- Lets `search()` match partial words: with the default `edgeGram` tokenization, `\"art\"` matches `\"Artem\"` **as you type** (no whole word required).\n- Use `nGram` tokenization for true mid-word (infix/substring) matching at higher index cost.\n- Like `@db.mongo.search.text`, the field joins the index named by `indexName` (or the default index).\n\n**Example:**\n```atscript\n@db.mongo.search.autocomplete \"users\"\nusername: string\n```\n",
 			nodeType: ["prop"],
+			passedWhenReferred: false,
 			multiple: true,
 			argument: [
 				{

package/dist/plugin.mjs

@@ -154,6 +154,7 @@ const annotations = {
 		text: new AnnotationSpec({
 			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"],
+			passedWhenReferred: false,
 			multiple: true,
 			argument: [{
 				optional: true,
@@ -171,6 +172,7 @@ const annotations = {
 		autocomplete: new AnnotationSpec({
 			description: "Marks a field for **prefix / typeahead (as-you-type)** matching in a MongoDB Atlas Search Index.\n\n- Indexes the field as the Atlas **`autocomplete`** type, **and** double-maps it as `string` so exact-word hits still rank.\n- Lets `search()` match partial words: with the default `edgeGram` tokenization, `\"art\"` matches `\"Artem\"` **as you type** (no whole word required).\n- Use `nGram` tokenization for true mid-word (infix/substring) matching at higher index cost.\n- Like `@db.mongo.search.text`, the field joins the index named by `indexName` (or the default index).\n\n**Example:**\n```atscript\n@db.mongo.search.autocomplete \"users\"\nusername: string\n```\n",
 			nodeType: ["prop"],
+			passedWhenReferred: false,
 			multiple: true,
 			argument: [
 				{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mongo",
-  "version": "0.1.110",
+  "version": "0.1.112",
   "description": "Mongodb plugin for atscript.",
   "keywords": [
     "atscript",
@@ -46,17 +46,17 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.78",
-    "@atscript/typescript": "^0.1.78",
+    "@atscript/core": "^0.1.80",
+    "@atscript/typescript": "^0.1.80",
     "mongodb": "^6.17.0",
     "mongodb-memory-server-core": "^10.0.0",
-    "unplugin-atscript": "^0.1.78"
+    "unplugin-atscript": "^0.1.80"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.78",
-    "@atscript/typescript": "^0.1.78",
+    "@atscript/core": "^0.1.80",
+    "@atscript/typescript": "^0.1.80",
     "mongodb": "^6.17.0",
-    "@atscript/db": "^0.1.110"
+    "@atscript/db": "^0.1.112"
   },
   "scripts": {
     "postinstall": "asc -f dts",