@atscript/db-mongo 0.1.127 → 0.1.128

package/dist/agg.cjs

@@ -26,19 +26,36 @@ function toAccumulator(expr) {
 	throw new Error(`Unsupported aggregate function: ${expr.$fn}`);
 }
 /**
+* `$group` output field names (including `_id` sub-keys) may not contain `.`,
+* so a dotted `$groupBy` path (a JSON/nested descendant such as
+* `metadata.clicks`) is keyed positionally inside `_id` (`k0`, `k1`, …) and
+* projected back under its dotted path — `$project` accepts dotted output
+* keys and nests them, which is the row shape a dotted `$select` yields on
+* find (`{ metadata: { clicks } }`). Plain paths keep their own name.
+*/
+function groupIdKey(field, index) {
+	return field.includes(".") ? `k${index}` : field;
+}
+/**
 * Builds the common prefix stages: $match + $group._id from groupBy fields.
 * Shared by both full aggregate and count pipelines.
+* `groupKeys` maps each `$groupBy` path to its `_id` sub-key.
 */
 function buildPrefix(query) {
 	const controls = query.controls || {};
 	const groupBy = controls.$groupBy ?? [];
 	const pipeline = [{ $match: require_mongo_filter.buildMongoFilter(query.filter) }];
 	const groupId = {};
-	for (const field of groupBy) groupId[field] = `$${field}`;
+	const groupKeys = [];
+	for (const [index, field] of groupBy.entries()) {
+		const idKey = groupIdKey(field, index);
+		groupId[idKey] = `$${field}`;
+		groupKeys.push([field, idKey]);
+	}
 	return {
 		pipeline,
 		groupId,
-		groupBy,
+		groupKeys,
 		controls
 	};
 }
@@ -48,11 +65,11 @@ function buildPrefix(query) {
 * Pipeline: $match → $group → $project → $match(having) → $sort → $skip → $limit
 */
 function buildAggregatePipeline(query) {
-	const { pipeline, groupId, groupBy, controls } = buildPrefix(query);
+	const { pipeline, groupId, groupKeys, controls } = buildPrefix(query);
 	const groupStage = { _id: groupId };
 	const project = { _id: 0 };
 	const aggregates = controls.$select?.aggregates;
-	for (const field of groupBy) project[field] = `$_id.${field}`;
+	for (const [field, idKey] of groupKeys) project[field] = `$_id.${idKey}`;
 	if (aggregates) for (const expr of aggregates) {
 		const alias = (0, _atscript_db_agg.resolveAlias)(expr);
 		groupStage[alias] = toAccumulator(expr);
@@ -72,11 +89,11 @@ function buildAggregatePipeline(query) {
 * Pipeline: $match → $group (just _id) → $project → $match(having) → $count
 */
 function buildCountPipeline(query) {
-	const { pipeline, groupId, groupBy, controls } = buildPrefix(query);
+	const { pipeline, groupId, groupKeys, controls } = buildPrefix(query);
 	pipeline.push({ $group: { _id: groupId } });
 	if (controls.$having) {
 		const project = { _id: 0 };
-		for (const field of groupBy) project[field] = `$_id.${field}`;
+		for (const [field, idKey] of groupKeys) project[field] = `$_id.${idKey}`;
 		pipeline.push({ $project: project });
 		pipeline.push({ $match: require_mongo_filter.buildMongoFilter(controls.$having) });
 	}

package/dist/agg.mjs

@@ -25,19 +25,36 @@ function toAccumulator(expr) {
 	throw new Error(`Unsupported aggregate function: ${expr.$fn}`);
 }
 /**
+* `$group` output field names (including `_id` sub-keys) may not contain `.`,
+* so a dotted `$groupBy` path (a JSON/nested descendant such as
+* `metadata.clicks`) is keyed positionally inside `_id` (`k0`, `k1`, …) and
+* projected back under its dotted path — `$project` accepts dotted output
+* keys and nests them, which is the row shape a dotted `$select` yields on
+* find (`{ metadata: { clicks } }`). Plain paths keep their own name.
+*/
+function groupIdKey(field, index) {
+	return field.includes(".") ? `k${index}` : field;
+}
+/**
 * Builds the common prefix stages: $match + $group._id from groupBy fields.
 * Shared by both full aggregate and count pipelines.
+* `groupKeys` maps each `$groupBy` path to its `_id` sub-key.
 */
 function buildPrefix(query) {
 	const controls = query.controls || {};
 	const groupBy = controls.$groupBy ?? [];
 	const pipeline = [{ $match: buildMongoFilter(query.filter) }];
 	const groupId = {};
-	for (const field of groupBy) groupId[field] = `$${field}`;
+	const groupKeys = [];
+	for (const [index, field] of groupBy.entries()) {
+		const idKey = groupIdKey(field, index);
+		groupId[idKey] = `$${field}`;
+		groupKeys.push([field, idKey]);
+	}
 	return {
 		pipeline,
 		groupId,
-		groupBy,
+		groupKeys,
 		controls
 	};
 }
@@ -47,11 +64,11 @@ function buildPrefix(query) {
 * Pipeline: $match → $group → $project → $match(having) → $sort → $skip → $limit
 */
 function buildAggregatePipeline(query) {
-	const { pipeline, groupId, groupBy, controls } = buildPrefix(query);
+	const { pipeline, groupId, groupKeys, controls } = buildPrefix(query);
 	const groupStage = { _id: groupId };
 	const project = { _id: 0 };
 	const aggregates = controls.$select?.aggregates;
-	for (const field of groupBy) project[field] = `$_id.${field}`;
+	for (const [field, idKey] of groupKeys) project[field] = `$_id.${idKey}`;
 	if (aggregates) for (const expr of aggregates) {
 		const alias = resolveAlias(expr);
 		groupStage[alias] = toAccumulator(expr);
@@ -71,11 +88,11 @@ function buildAggregatePipeline(query) {
 * Pipeline: $match → $group (just _id) → $project → $match(having) → $count
 */
 function buildCountPipeline(query) {
-	const { pipeline, groupId, groupBy, controls } = buildPrefix(query);
+	const { pipeline, groupId, groupKeys, controls } = buildPrefix(query);
 	pipeline.push({ $group: { _id: groupId } });
 	if (controls.$having) {
 		const project = { _id: 0 };
-		for (const field of groupBy) project[field] = `$_id.${field}`;
+		for (const [field, idKey] of groupKeys) project[field] = `$_id.${idKey}`;
 		pipeline.push({ $project: project });
 		pipeline.push({ $match: buildMongoFilter(controls.$having) });
 	}

package/dist/index.cjs

@@ -1007,8 +1007,8 @@ function getDesiredTableOptionsImpl(cappedOptions) {
 	});
 	return opts;
 }
-async function getExistingTableOptionsImpl(host) {
-	const cols = await host.db.listCollections({ name: host._table.tableName }, { nameOnly: false }).toArray();
+async function getExistingTableOptionsImpl(host, tableName) {
+	const cols = await host.db.listCollections({ name: tableName ?? host._table.tableName }, { nameOnly: false }).toArray();
 	if (cols.length === 0) return [];
 	const collOpts = cols[0].options;
 	if (!collOpts?.capped) return [];
@@ -1027,9 +1027,22 @@ async function getExistingTableOptionsImpl(host) {
 	return opts;
 }
 async function ensureTableImpl(host, table) {
-	if (table instanceof _atscript_db.AtscriptDbView && !table.isExternal) return ensureView(host, table);
+	if ((0, _atscript_db.isAtscriptDbView)(table) && !table.isExternal) return ensureView(host, table);
 	return host.ensureCollectionExists();
 }
+/** Whether the collection has at least one document (exact — `findOne`, not the estimated count). */
+async function hasRowsImpl(host, tableName) {
+	return await host.db.collection(tableName ?? host.resolveTableName(false)).findOne({}, {
+		projection: { _id: 1 },
+		...host._getSessionOpts()
+	}) !== null;
+}
+/** Kind of the object stored under `name` (`listCollections` reports views as `"view"`). */
+async function getObjectKindImpl(host, name) {
+	const type = (await host.db.listCollections({ name }, { nameOnly: true }).toArray())[0]?.type;
+	if (type === void 0) return;
+	return type === "view" ? "view" : "table";
+}
 /** Creates a MongoDB view from the AtscriptDbView's view plan. */
 async function ensureView(host, view) {
 	if (await host.collectionExists()) return;
@@ -1554,7 +1567,7 @@ const OBJECT_ID_HEX = /^[a-fA-F0-9]{24}$/;
 function isObjectIdColumn(fieldType) {
 	const t = fieldType.type;
 	if (t.kind === "array") return !!t.of && isObjectIdColumn(t.of);
-	return t.tags?.has("objectId") === true && t.tags?.has("mongo") === true;
+	return t.tags?.has("objectId") === true && t.tags?.has("mongo");
 }
 function objectIdToStorage(value) {
 	if (typeof value === "string" && OBJECT_ID_HEX.test(value)) return new mongodb.ObjectId(value);
@@ -1604,6 +1617,10 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 	get _client() {
 		return this.client;
 	}
+	/** Every adapter over this client (or database handle) shares one session (since 0.1.128). */
+	_transactionOwner() {
+		return this.client ?? this.db;
+	}
 	/**
 	* Per-client cache: whether transactions are unavailable (standalone MongoDB).
 	* Shared across all adapter instances for the same client so topology is probed once.
@@ -2163,6 +2180,18 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 	async ensureTable() {
 		return ensureTableImpl(this, this._table);
 	}
+	async hasRows(tableName) {
+		return hasRowsImpl(this, tableName);
+	}
+	async getObjectKind(name) {
+		return getObjectKindImpl(this, name);
+	}
+	/**
+	* No physical primary key on MongoDB (`_id` is fixed): a `@meta.id` move is
+	* an index change that `syncIndexes` reconciles. Schema sync refuses the
+	* change on a populated collection for cross-adapter consistency.
+	*/
+	async rebuildPrimaryKey(_change) {}
 	async syncIndexes() {
 		return syncIndexesImpl(this);
 	}
@@ -2190,8 +2219,8 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 	getDesiredTableOptions() {
 		return getDesiredTableOptionsImpl(this._cappedOptions);
 	}
-	async getExistingTableOptions() {
-		return getExistingTableOptionsImpl(this);
+	async getExistingTableOptions(tableName) {
+		return getExistingTableOptionsImpl(this, tableName);
 	}
 	destructiveOptionKeys() {
 		return DESTRUCTIVE_OPTION_KEYS;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { BaseDbAdapter, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDeleteResult, TDbFieldMeta, TDbForeignKey, TDbInsertManyResult, TDbInsertResult, TDbRelation, TDbUpdateResult, TExistingTableOption, TFieldOps, TMetadataOverrides, TSearchIndexInfo, TSyncColumnResult, TTableResolver, TableMetadata, WithRelation, getKeyProps } from "@atscript/db";
+import { BaseDbAdapter, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDeleteResult, TDbFieldMeta, TDbForeignKey, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbRelation, TDbUpdateResult, TExistingTableOption, TFieldOps, TMetadataOverrides, TPrimaryKeyChange, TSearchIndexInfo, TSyncColumnResult, TTableResolver, TableMetadata, WithRelation, getKeyProps } from "@atscript/db";
 import { AggregationCursor, ClientSession, Collection, Db, Document, Filter, MongoClient, ObjectId, UpdateFilter, UpdateOptions } from "mongodb";
 import { TAtscriptAnnotatedType, TMetadataMap, TValidatorOptions, TValidatorPlugin, Validator } from "@atscript/typescript/utils";
 
@@ -268,6 +268,8 @@ declare class MongoAdapter extends BaseDbAdapter {
   private _pendingUniqueFields;
   constructor(db: Db, client?: MongoClient | undefined);
   private get _client();
+  /** Every adapter over this client (or database handle) shares one session (since 0.1.128). */
+  protected _transactionOwner(): unknown;
   /**
    * Per-client cache: whether transactions are unavailable (standalone MongoDB).
    * Shared across all adapter instances for the same client so topology is probed once.
@@ -393,6 +395,14 @@ declare class MongoAdapter extends BaseDbAdapter {
   clearCollectionCache(): void;
   tableExists(): Promise<boolean>;
   ensureTable(): Promise<void>;
+  hasRows(tableName?: string): Promise<boolean>;
+  getObjectKind(name: string): Promise<TDbObjectKind | undefined>;
+  /**
+   * No physical primary key on MongoDB (`_id` is fixed): a `@meta.id` move is
+   * an index change that `syncIndexes` reconciles. Schema sync refuses the
+   * change on a populated collection for cross-adapter consistency.
+   */
+  rebuildPrimaryKey(_change: TPrimaryKeyChange): Promise<void>;
   syncIndexes(): Promise<void>;
   syncColumns(diff: TColumnDiff): Promise<TSyncColumnResult>;
   dropColumns(columns: string[]): Promise<void>;
@@ -402,7 +412,7 @@ declare class MongoAdapter extends BaseDbAdapter {
   dropViewByName(viewName: string): Promise<void>;
   dropTableByName(tableName: string): Promise<void>;
   getDesiredTableOptions(): TExistingTableOption[];
-  getExistingTableOptions(): Promise<TExistingTableOption[]>;
+  getExistingTableOptions(tableName?: string): Promise<TExistingTableOption[]>;
   destructiveOptionKeys(): ReadonlySet<string>;
   /** Returns the counters collection used for atomic auto-increment. */
   protected get _countersCollection(): Collection<{

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { BaseDbAdapter, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDeleteResult, TDbFieldMeta, TDbForeignKey, TDbInsertManyResult, TDbInsertResult, TDbRelation, TDbUpdateResult, TExistingTableOption, TFieldOps, TMetadataOverrides, TSearchIndexInfo, TSyncColumnResult, TTableResolver, TableMetadata, WithRelation, getKeyProps } from "@atscript/db";
+import { BaseDbAdapter, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDeleteResult, TDbFieldMeta, TDbForeignKey, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbRelation, TDbUpdateResult, TExistingTableOption, TFieldOps, TMetadataOverrides, TPrimaryKeyChange, TSearchIndexInfo, TSyncColumnResult, TTableResolver, TableMetadata, WithRelation, getKeyProps } from "@atscript/db";
 import { AggregationCursor, ClientSession, Collection, Db, Document, Filter, MongoClient, ObjectId, UpdateFilter, UpdateOptions } from "mongodb";
 import { TAtscriptAnnotatedType, TMetadataMap, TValidatorOptions, TValidatorPlugin, Validator } from "@atscript/typescript/utils";
 
@@ -268,6 +268,8 @@ declare class MongoAdapter extends BaseDbAdapter {
   private _pendingUniqueFields;
   constructor(db: Db, client?: MongoClient | undefined);
   private get _client();
+  /** Every adapter over this client (or database handle) shares one session (since 0.1.128). */
+  protected _transactionOwner(): unknown;
   /**
    * Per-client cache: whether transactions are unavailable (standalone MongoDB).
    * Shared across all adapter instances for the same client so topology is probed once.
@@ -393,6 +395,14 @@ declare class MongoAdapter extends BaseDbAdapter {
   clearCollectionCache(): void;
   tableExists(): Promise<boolean>;
   ensureTable(): Promise<void>;
+  hasRows(tableName?: string): Promise<boolean>;
+  getObjectKind(name: string): Promise<TDbObjectKind | undefined>;
+  /**
+   * No physical primary key on MongoDB (`_id` is fixed): a `@meta.id` move is
+   * an index change that `syncIndexes` reconciles. Schema sync refuses the
+   * change on a populated collection for cross-adapter consistency.
+   */
+  rebuildPrimaryKey(_change: TPrimaryKeyChange): Promise<void>;
   syncIndexes(): Promise<void>;
   syncColumns(diff: TColumnDiff): Promise<TSyncColumnResult>;
   dropColumns(columns: string[]): Promise<void>;
@@ -402,7 +412,7 @@ declare class MongoAdapter extends BaseDbAdapter {
   dropViewByName(viewName: string): Promise<void>;
   dropTableByName(tableName: string): Promise<void>;
   getDesiredTableOptions(): TExistingTableOption[];
-  getExistingTableOptions(): Promise<TExistingTableOption[]>;
+  getExistingTableOptions(tableName?: string): Promise<TExistingTableOption[]>;
   destructiveOptionKeys(): ReadonlySet<string>;
   /** Returns the counters collection used for atomic auto-increment. */
   protected get _countersCollection(): Collection<{

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { t as buildMongoFilter } from "./mongo-filter-DceAGI-S.mjs";
-import { AtscriptDbView, BaseDbAdapter, DbError, DbSpace, computeInsights, createFailureCollector, getDbFieldOp, getKeyProps, resolveDesignType } from "@atscript/db";
+import { BaseDbAdapter, DbError, DbSpace, computeInsights, createFailureCollector, getDbFieldOp, getKeyProps, isAtscriptDbView, resolveDesignType } from "@atscript/db";
 import { MongoClient, MongoServerError, ObjectId } from "mongodb";
 //#region src/lib/path-utils.ts
 function joinPath(prefix, segment) {
@@ -1006,8 +1006,8 @@ function getDesiredTableOptionsImpl(cappedOptions) {
 	});
 	return opts;
 }
-async function getExistingTableOptionsImpl(host) {
-	const cols = await host.db.listCollections({ name: host._table.tableName }, { nameOnly: false }).toArray();
+async function getExistingTableOptionsImpl(host, tableName) {
+	const cols = await host.db.listCollections({ name: tableName ?? host._table.tableName }, { nameOnly: false }).toArray();
 	if (cols.length === 0) return [];
 	const collOpts = cols[0].options;
 	if (!collOpts?.capped) return [];
@@ -1026,9 +1026,22 @@ async function getExistingTableOptionsImpl(host) {
 	return opts;
 }
 async function ensureTableImpl(host, table) {
-	if (table instanceof AtscriptDbView && !table.isExternal) return ensureView(host, table);
+	if (isAtscriptDbView(table) && !table.isExternal) return ensureView(host, table);
 	return host.ensureCollectionExists();
 }
+/** Whether the collection has at least one document (exact — `findOne`, not the estimated count). */
+async function hasRowsImpl(host, tableName) {
+	return await host.db.collection(tableName ?? host.resolveTableName(false)).findOne({}, {
+		projection: { _id: 1 },
+		...host._getSessionOpts()
+	}) !== null;
+}
+/** Kind of the object stored under `name` (`listCollections` reports views as `"view"`). */
+async function getObjectKindImpl(host, name) {
+	const type = (await host.db.listCollections({ name }, { nameOnly: true }).toArray())[0]?.type;
+	if (type === void 0) return;
+	return type === "view" ? "view" : "table";
+}
 /** Creates a MongoDB view from the AtscriptDbView's view plan. */
 async function ensureView(host, view) {
 	if (await host.collectionExists()) return;
@@ -1553,7 +1566,7 @@ const OBJECT_ID_HEX = /^[a-fA-F0-9]{24}$/;
 function isObjectIdColumn(fieldType) {
 	const t = fieldType.type;
 	if (t.kind === "array") return !!t.of && isObjectIdColumn(t.of);
-	return t.tags?.has("objectId") === true && t.tags?.has("mongo") === true;
+	return t.tags?.has("objectId") === true && t.tags?.has("mongo");
 }
 function objectIdToStorage(value) {
 	if (typeof value === "string" && OBJECT_ID_HEX.test(value)) return new ObjectId(value);
@@ -1603,6 +1616,10 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 	get _client() {
 		return this.client;
 	}
+	/** Every adapter over this client (or database handle) shares one session (since 0.1.128). */
+	_transactionOwner() {
+		return this.client ?? this.db;
+	}
 	/**
 	* Per-client cache: whether transactions are unavailable (standalone MongoDB).
 	* Shared across all adapter instances for the same client so topology is probed once.
@@ -2162,6 +2179,18 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 	async ensureTable() {
 		return ensureTableImpl(this, this._table);
 	}
+	async hasRows(tableName) {
+		return hasRowsImpl(this, tableName);
+	}
+	async getObjectKind(name) {
+		return getObjectKindImpl(this, name);
+	}
+	/**
+	* No physical primary key on MongoDB (`_id` is fixed): a `@meta.id` move is
+	* an index change that `syncIndexes` reconciles. Schema sync refuses the
+	* change on a populated collection for cross-adapter consistency.
+	*/
+	async rebuildPrimaryKey(_change) {}
 	async syncIndexes() {
 		return syncIndexesImpl(this);
 	}
@@ -2189,8 +2218,8 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 	getDesiredTableOptions() {
 		return getDesiredTableOptionsImpl(this._cappedOptions);
 	}
-	async getExistingTableOptions() {
-		return getExistingTableOptionsImpl(this);
+	async getExistingTableOptions(tableName) {
+		return getExistingTableOptionsImpl(this, tableName);
 	}
 	destructiveOptionKeys() {
 		return DESTRUCTIVE_OPTION_KEYS;

package/package.json

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