@atscript/db-mongo 0.1.155 → 0.1.157

package/dist/index.cjs

@@ -1770,6 +1770,27 @@ async function dropColumnsImpl(host, columns) {
 	await host.collection.updateMany({}, { $unset: unsetSpec }, host._getSessionOpts());
 }
 /**
+* Drops the managed indexes over any of `columns` (or a path under one).
+* Schema sync calls it before {@link dropColumnsImpl}: a unique index on a
+* required field indexes a `$unset` document as `null`, so the second one
+* collides (E11000) — e.g. the old key field's `__pk` index when a `@meta.id`
+* move removes that field. `syncIndexesImpl` then builds what the model wants.
+*/
+async function dropIndexesForColumnsImpl(host, columns) {
+	const dropped = new Set(columns);
+	let existing;
+	try {
+		existing = await host.collection.listIndexes().toArray();
+	} catch (error) {
+		if (error.code === 26) return;
+		throw error;
+	}
+	for (const remote of existing) if (remote.name.startsWith("atscript__") && coversAny(remote.key, remote.weights, dropped)) {
+		host._log("dropIndex", remote.name);
+		await host.collection.dropIndex(remote.name);
+	}
+}
+/**
 * The segments of a field's physical document path with `$[]` after every
 * segment whose logical prefix is an array in the flatMap — Mongo's
 * all-positional operator walks every element. `physicalPath` defaults to
@@ -1803,7 +1824,23 @@ function resolveSyncDefault(field) {
 	if (!field.defaultValue) return;
 	if (field.defaultValue.kind === "value") return field.designType === "string" ? field.defaultValue.value : JSON.parse(field.defaultValue.value);
 }
-async function syncIndexesImpl(host) {
+/**
+* Whether an index's fields include one of `paths` or a path under one —
+* a text index lists its fields in `weights` (its key is `_fts` / `_ftsx`).
+*/
+function coversAny(key, weights, paths) {
+	return [...Object.keys(key), ...Object.keys(weights ?? {})].some((f) => paths.has(f) || hasAncestorIn(f, paths));
+}
+/** The `__pk` unique index of non-`_id` `@meta.id` fields. */
+const PK_INDEX = mongoIndexKey("unique", "__pk");
+/**
+* Reconciles the managed indexes with the model. `opts` (schema sync, safe
+* mode) names the indexes that stay as they are — neither dropped, replaced
+* nor created — because the change they depend on was skipped: the `__pk`
+* index of a skipped key rebuild, the indexes over a column whose type change
+* is pending (its present-only filter is typed).
+*/
+async function syncIndexesImpl(host, opts) {
 	await host.ensureCollectionExists();
 	const allIndexes = /* @__PURE__ */ new Map();
 	for (const [key, index] of host._table.indexes.entries()) {
@@ -1844,6 +1881,12 @@ async function syncIndexesImpl(host) {
 	} else allIndexes.set(key, index);
 	const existingIndexes = await host.collection.listIndexes().toArray();
 	const indexesToCreate = new Map(allIndexes);
+	const keepColumns = new Set(opts?.keepColumns ?? []);
+	const isKept = (name, key, weights) => opts?.keepPrimaryKey === true && name === PK_INDEX || coversAny(key, weights, keepColumns);
+	const kept = /* @__PURE__ */ new Set();
+	for (const index of allIndexes.values()) if (isPlainIndex(index) && isKept(index.key, index.fields, index.weights)) kept.add(index.key);
+	for (const remote of existingIndexes) if (isKept(remote.name, remote.key, remote.weights)) kept.add(remote.name);
+	for (const name of kept) indexesToCreate.delete(name);
 	const { attempt, throwIfAny } = (0, _atscript_db.createFailureCollector)("index sync");
 	let defaultCollation;
 	const collectionDefaultCollation = async () => {
@@ -1851,7 +1894,7 @@ async function syncIndexesImpl(host) {
 		return defaultCollation ?? void 0;
 	};
 	for (const remote of existingIndexes) {
-		if (!remote.name.startsWith("atscript__")) continue;
+		if (!remote.name.startsWith("atscript__") || kept.has(remote.name)) continue;
 		if (indexesToCreate.has(remote.name)) {
 			const local = indexesToCreate.get(remote.name);
 			if (isPlainIndex(local)) {
@@ -3168,11 +3211,12 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 	* No physical primary key on MongoDB (`_id` is fixed): a `@meta.id` move is
 	* an index change that `syncIndexes` reconciles. Like on the other adapters,
 	* schema sync refuses it on a populated collection whose documents do not
-	* satisfy the new key.
+	* satisfy the new key. An old key field removed in the same sync loses its
+	* `__pk` index first (`dropIndexesForColumns`).
 	*/
 	async rebuildPrimaryKey(_change) {}
-	async syncIndexes() {
-		return syncIndexesImpl(this);
+	async syncIndexes(opts) {
+		return syncIndexesImpl(this, opts);
 	}
 	async syncColumns(diff) {
 		return syncColumnsImpl(this, diff);
@@ -3180,6 +3224,9 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 	async dropColumns(columns) {
 		return dropColumnsImpl(this, columns);
 	}
+	async dropIndexesForColumns(columns) {
+		return dropIndexesForColumnsImpl(this, columns);
+	}
 	async renameTable(oldName) {
 		return renameTableImpl(this, oldName);
 	}

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { a as buildMongoFilter, c as mongoFilterStages, i as TMongoFilterPlan, l as planStages, n as TMongoFieldCollation, o as buildMongoQuery, r as TMongoFilterOptions, s as collationOfAdapter, t as REL_FILTER_TEMP_PREFIX } from "./mongo-filter-CGd9ryOD.cjs";
-import { BaseDbAdapter, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbCollation, TDbDeleteResult, TDbFieldMeta, TDbForeignKey, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbRelation, TDbUpdateOptions, TDbUpdateResult, TExistingTableOption, TFieldOps, TMetadataOverrides, TPrimaryKeyChange, TSearchIndexInfo, TSyncColumnResult, TTableResolver, TViewCapability, TableMetadata, WithRelation, getKeyProps } from "@atscript/db";
+import { BaseDbAdapter, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbCollation, TDbDeleteResult, TDbFieldMeta, TDbForeignKey, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbRelation, TDbUpdateOptions, TDbUpdateResult, TExistingTableOption, TFieldOps, TMetadataOverrides, TPrimaryKeyChange, TSearchIndexInfo, TSyncColumnResult, TSyncIndexesOptions, TTableResolver, TViewCapability, TableMetadata, WithRelation, getKeyProps } from "@atscript/db";
 import { AggregateOptions, AggregationCursor, ClientSession, Collection, Db, Document, Filter, MongoClient, ObjectId, UpdateFilter, UpdateOptions } from "mongodb";
 import { TAtscriptAnnotatedType, TMetadataMap, TValidatorOptions, TValidatorPlugin, Validator } from "@atscript/typescript/utils";
 import { AggregateFn, BucketUnit } from "@uniqu/core";
@@ -592,12 +592,14 @@ declare class MongoAdapter extends BaseDbAdapter {
    * No physical primary key on MongoDB (`_id` is fixed): a `@meta.id` move is
    * an index change that `syncIndexes` reconciles. Like on the other adapters,
    * schema sync refuses it on a populated collection whose documents do not
-   * satisfy the new key.
+   * satisfy the new key. An old key field removed in the same sync loses its
+   * `__pk` index first (`dropIndexesForColumns`).
    */
   rebuildPrimaryKey(_change: TPrimaryKeyChange): Promise<void>;
-  syncIndexes(): Promise<void>;
+  syncIndexes(opts?: TSyncIndexesOptions): Promise<void>;
   syncColumns(diff: TColumnDiff): Promise<TSyncColumnResult>;
   dropColumns(columns: string[]): Promise<void>;
+  dropIndexesForColumns(columns: string[]): Promise<void>;
   renameTable(oldName: string): Promise<void>;
   recreateTable(): Promise<void>;
   dropTable(): Promise<void>;

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { a as buildMongoFilter, c as mongoFilterStages, i as TMongoFilterPlan, l as planStages, n as TMongoFieldCollation, o as buildMongoQuery, r as TMongoFilterOptions, s as collationOfAdapter, t as REL_FILTER_TEMP_PREFIX } from "./mongo-filter-CGd9ryOD.mjs";
-import { BaseDbAdapter, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbCollation, TDbDeleteResult, TDbFieldMeta, TDbForeignKey, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbRelation, TDbUpdateOptions, TDbUpdateResult, TExistingTableOption, TFieldOps, TMetadataOverrides, TPrimaryKeyChange, TSearchIndexInfo, TSyncColumnResult, TTableResolver, TViewCapability, TableMetadata, WithRelation, getKeyProps } from "@atscript/db";
+import { BaseDbAdapter, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbCollation, TDbDeleteResult, TDbFieldMeta, TDbForeignKey, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbRelation, TDbUpdateOptions, TDbUpdateResult, TExistingTableOption, TFieldOps, TMetadataOverrides, TPrimaryKeyChange, TSearchIndexInfo, TSyncColumnResult, TSyncIndexesOptions, TTableResolver, TViewCapability, TableMetadata, WithRelation, getKeyProps } from "@atscript/db";
 import { AggregateOptions, AggregationCursor, ClientSession, Collection, Db, Document, Filter, MongoClient, ObjectId, UpdateFilter, UpdateOptions } from "mongodb";
 import { AggregateFn, BucketUnit } from "@uniqu/core";
 import { TAtscriptAnnotatedType, TMetadataMap, TValidatorOptions, TValidatorPlugin, Validator } from "@atscript/typescript/utils";
@@ -592,12 +592,14 @@ declare class MongoAdapter extends BaseDbAdapter {
    * No physical primary key on MongoDB (`_id` is fixed): a `@meta.id` move is
    * an index change that `syncIndexes` reconciles. Like on the other adapters,
    * schema sync refuses it on a populated collection whose documents do not
-   * satisfy the new key.
+   * satisfy the new key. An old key field removed in the same sync loses its
+   * `__pk` index first (`dropIndexesForColumns`).
    */
   rebuildPrimaryKey(_change: TPrimaryKeyChange): Promise<void>;
-  syncIndexes(): Promise<void>;
+  syncIndexes(opts?: TSyncIndexesOptions): Promise<void>;
   syncColumns(diff: TColumnDiff): Promise<TSyncColumnResult>;
   dropColumns(columns: string[]): Promise<void>;
+  dropIndexesForColumns(columns: string[]): Promise<void>;
   renameTable(oldName: string): Promise<void>;
   recreateTable(): Promise<void>;
   dropTable(): Promise<void>;

package/dist/index.mjs

@@ -1769,6 +1769,27 @@ async function dropColumnsImpl(host, columns) {
 	await host.collection.updateMany({}, { $unset: unsetSpec }, host._getSessionOpts());
 }
 /**
+* Drops the managed indexes over any of `columns` (or a path under one).
+* Schema sync calls it before {@link dropColumnsImpl}: a unique index on a
+* required field indexes a `$unset` document as `null`, so the second one
+* collides (E11000) — e.g. the old key field's `__pk` index when a `@meta.id`
+* move removes that field. `syncIndexesImpl` then builds what the model wants.
+*/
+async function dropIndexesForColumnsImpl(host, columns) {
+	const dropped = new Set(columns);
+	let existing;
+	try {
+		existing = await host.collection.listIndexes().toArray();
+	} catch (error) {
+		if (error.code === 26) return;
+		throw error;
+	}
+	for (const remote of existing) if (remote.name.startsWith("atscript__") && coversAny(remote.key, remote.weights, dropped)) {
+		host._log("dropIndex", remote.name);
+		await host.collection.dropIndex(remote.name);
+	}
+}
+/**
 * The segments of a field's physical document path with `$[]` after every
 * segment whose logical prefix is an array in the flatMap — Mongo's
 * all-positional operator walks every element. `physicalPath` defaults to
@@ -1802,7 +1823,23 @@ function resolveSyncDefault(field) {
 	if (!field.defaultValue) return;
 	if (field.defaultValue.kind === "value") return field.designType === "string" ? field.defaultValue.value : JSON.parse(field.defaultValue.value);
 }
-async function syncIndexesImpl(host) {
+/**
+* Whether an index's fields include one of `paths` or a path under one —
+* a text index lists its fields in `weights` (its key is `_fts` / `_ftsx`).
+*/
+function coversAny(key, weights, paths) {
+	return [...Object.keys(key), ...Object.keys(weights ?? {})].some((f) => paths.has(f) || hasAncestorIn(f, paths));
+}
+/** The `__pk` unique index of non-`_id` `@meta.id` fields. */
+const PK_INDEX = mongoIndexKey("unique", "__pk");
+/**
+* Reconciles the managed indexes with the model. `opts` (schema sync, safe
+* mode) names the indexes that stay as they are — neither dropped, replaced
+* nor created — because the change they depend on was skipped: the `__pk`
+* index of a skipped key rebuild, the indexes over a column whose type change
+* is pending (its present-only filter is typed).
+*/
+async function syncIndexesImpl(host, opts) {
 	await host.ensureCollectionExists();
 	const allIndexes = /* @__PURE__ */ new Map();
 	for (const [key, index] of host._table.indexes.entries()) {
@@ -1843,6 +1880,12 @@ async function syncIndexesImpl(host) {
 	} else allIndexes.set(key, index);
 	const existingIndexes = await host.collection.listIndexes().toArray();
 	const indexesToCreate = new Map(allIndexes);
+	const keepColumns = new Set(opts?.keepColumns ?? []);
+	const isKept = (name, key, weights) => opts?.keepPrimaryKey === true && name === PK_INDEX || coversAny(key, weights, keepColumns);
+	const kept = /* @__PURE__ */ new Set();
+	for (const index of allIndexes.values()) if (isPlainIndex(index) && isKept(index.key, index.fields, index.weights)) kept.add(index.key);
+	for (const remote of existingIndexes) if (isKept(remote.name, remote.key, remote.weights)) kept.add(remote.name);
+	for (const name of kept) indexesToCreate.delete(name);
 	const { attempt, throwIfAny } = createFailureCollector("index sync");
 	let defaultCollation;
 	const collectionDefaultCollation = async () => {
@@ -1850,7 +1893,7 @@ async function syncIndexesImpl(host) {
 		return defaultCollation ?? void 0;
 	};
 	for (const remote of existingIndexes) {
-		if (!remote.name.startsWith("atscript__")) continue;
+		if (!remote.name.startsWith("atscript__") || kept.has(remote.name)) continue;
 		if (indexesToCreate.has(remote.name)) {
 			const local = indexesToCreate.get(remote.name);
 			if (isPlainIndex(local)) {
@@ -3167,11 +3210,12 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 	* No physical primary key on MongoDB (`_id` is fixed): a `@meta.id` move is
 	* an index change that `syncIndexes` reconciles. Like on the other adapters,
 	* schema sync refuses it on a populated collection whose documents do not
-	* satisfy the new key.
+	* satisfy the new key. An old key field removed in the same sync loses its
+	* `__pk` index first (`dropIndexesForColumns`).
 	*/
 	async rebuildPrimaryKey(_change) {}
-	async syncIndexes() {
-		return syncIndexesImpl(this);
+	async syncIndexes(opts) {
+		return syncIndexesImpl(this, opts);
 	}
 	async syncColumns(diff) {
 		return syncColumnsImpl(this, diff);
@@ -3179,6 +3223,9 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 	async dropColumns(columns) {
 		return dropColumnsImpl(this, columns);
 	}
+	async dropIndexesForColumns(columns) {
+		return dropIndexesForColumnsImpl(this, columns);
+	}
 	async renameTable(oldName) {
 		return renameTableImpl(this, oldName);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mongo",
-  "version": "0.1.155",
+  "version": "0.1.157",
   "description": "Mongodb plugin for atscript.",
   "keywords": [
     "atscript",
@@ -46,19 +46,19 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.105",
-    "@atscript/typescript": "^0.1.105",
+    "@atscript/core": "^0.1.106",
+    "@atscript/typescript": "^0.1.106",
     "@uniqu/core": "^0.1.15",
     "mongodb": "^6.17.0",
     "mongodb-memory-server-core": "^10.0.0",
-    "unplugin-atscript": "^0.1.105"
+    "unplugin-atscript": "^0.1.106"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.105",
-    "@atscript/typescript": "^0.1.105",
+    "@atscript/core": "^0.1.106",
+    "@atscript/typescript": "^0.1.106",
     "@uniqu/core": "^0.1.15",
     "mongodb": "^6.17.0",
-    "@atscript/db": "^0.1.155"
+    "@atscript/db": "^0.1.157"
   },
   "scripts": {
     "postinstall": "asc -f dts",