@atscript/db-mongo 0.1.120 → 0.1.122

package/dist/index.cjs

@@ -1548,6 +1548,24 @@ const validateMongoIdPlugin = (ctx, def, value) => {
 };
 //#endregion
 //#region src/lib/mongo-adapter.ts
+/** Mirrors the `mongo.objectId` primitive's pattern — only definite hex ids convert. */
+const OBJECT_ID_HEX = /^[a-fA-F0-9]{24}$/;
+/** True for `mongo.objectId`-typed fields and arrays of them (tag-based, same as `prepareId`). */
+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;
+}
+function objectIdToStorage(value) {
+	if (typeof value === "string" && OBJECT_ID_HEX.test(value)) return new mongodb.ObjectId(value);
+	if (Array.isArray(value)) return value.map(objectIdToStorage);
+	return value;
+}
+function objectIdFromStorage(value) {
+	if (value instanceof mongodb.ObjectId) return value.toHexString();
+	if (Array.isArray(value)) return value.map(objectIdFromStorage);
+	return value;
+}
 var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 	db;
 	client;
@@ -1711,10 +1729,17 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 	* write `[lng, lat]` → `{ type: 'Point', coordinates: [lng, lat] }`,
 	* unwrap back to the tuple on read. Non-tuple values (e.g. `$geoWithin`
 	* operator objects flowing through filter translation) pass through.
+	*
+	* Converts `mongo.objectId` values between wire hex strings and native
+	* ObjectId storage. Filters, writes, and reads all flow through these
+	* formatters, so id envelopes (`@DbActionID` row loading), FK filters
+	* (`{ leadId: '<hex>' }`), and inserted documents match natively stored
+	* ObjectIds — and reads return the hex strings the declared type promises.
+	* Top-level fields only: nested values skip the write/read formatter passes,
+	* so a nested formatter would coerce filters against un-coerced storage.
 	*/
 	formatValue(field) {
-		if (!field.isGeoPoint) return;
-		return {
+		if (field.isGeoPoint) return {
 			toStorage: (value) => Array.isArray(value) && value.length === 2 && typeof value[0] === "number" && typeof value[1] === "number" ? {
 				type: "Point",
 				coordinates: value
@@ -1724,6 +1749,10 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 				return v && typeof v === "object" && v.type === "Point" && Array.isArray(v.coordinates) ? v.coordinates : value;
 			}
 		};
+		if (!field.path.includes(".") && isObjectIdColumn(field.type)) return {
+			toStorage: objectIdToStorage,
+			fromStorage: objectIdFromStorage
+		};
 	}
 	getAdapterTableName(_type) {}
 	supportsNativeRelations() {
@@ -2020,7 +2049,7 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		}
 		this._log("insertOne", data);
 		const result = await this._wrapDuplicateKeyError(() => this.collection.insertOne(data, this._getSessionOpts()));
-		return { insertedId: this._resolveInsertedId(data, result.insertedId) };
+		return { insertedId: objectIdFromStorage(this._resolveInsertedId(data, result.insertedId)) };
 	}
 	async insertMany(data) {
 		const versionColumn = this._table.versionColumn;
@@ -2036,7 +2065,7 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		const result = await this._wrapDuplicateKeyError(() => this.collection.insertMany(data, this._getSessionOpts()));
 		return {
 			insertedCount: result.insertedCount,
-			insertedIds: data.map((item, i) => this._resolveInsertedId(item, result.insertedIds[i]))
+			insertedIds: data.map((item, i) => objectIdFromStorage(this._resolveInsertedId(item, result.insertedIds[i])))
 		};
 	}
 	async findOne(query) {

package/dist/index.d.cts

@@ -315,6 +315,14 @@ declare class MongoAdapter extends BaseDbAdapter {
    * write `[lng, lat]` → `{ type: 'Point', coordinates: [lng, lat] }`,
    * unwrap back to the tuple on read. Non-tuple values (e.g. `$geoWithin`
    * operator objects flowing through filter translation) pass through.
+   *
+   * Converts `mongo.objectId` values between wire hex strings and native
+   * ObjectId storage. Filters, writes, and reads all flow through these
+   * formatters, so id envelopes (`@DbActionID` row loading), FK filters
+   * (`{ leadId: '<hex>' }`), and inserted documents match natively stored
+   * ObjectIds — and reads return the hex strings the declared type promises.
+   * Top-level fields only: nested values skip the write/read formatter passes,
+   * so a nested formatter would coerce filters against un-coerced storage.
    */
   formatValue(field: TDbFieldMeta): {
     toStorage: (value: unknown) => unknown;

package/dist/index.d.mts

@@ -315,6 +315,14 @@ declare class MongoAdapter extends BaseDbAdapter {
    * write `[lng, lat]` → `{ type: 'Point', coordinates: [lng, lat] }`,
    * unwrap back to the tuple on read. Non-tuple values (e.g. `$geoWithin`
    * operator objects flowing through filter translation) pass through.
+   *
+   * Converts `mongo.objectId` values between wire hex strings and native
+   * ObjectId storage. Filters, writes, and reads all flow through these
+   * formatters, so id envelopes (`@DbActionID` row loading), FK filters
+   * (`{ leadId: '<hex>' }`), and inserted documents match natively stored
+   * ObjectIds — and reads return the hex strings the declared type promises.
+   * Top-level fields only: nested values skip the write/read formatter passes,
+   * so a nested formatter would coerce filters against un-coerced storage.
    */
   formatValue(field: TDbFieldMeta): {
     toStorage: (value: unknown) => unknown;

package/dist/index.mjs

@@ -1547,6 +1547,24 @@ const validateMongoIdPlugin = (ctx, def, value) => {
 };
 //#endregion
 //#region src/lib/mongo-adapter.ts
+/** Mirrors the `mongo.objectId` primitive's pattern — only definite hex ids convert. */
+const OBJECT_ID_HEX = /^[a-fA-F0-9]{24}$/;
+/** True for `mongo.objectId`-typed fields and arrays of them (tag-based, same as `prepareId`). */
+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;
+}
+function objectIdToStorage(value) {
+	if (typeof value === "string" && OBJECT_ID_HEX.test(value)) return new ObjectId(value);
+	if (Array.isArray(value)) return value.map(objectIdToStorage);
+	return value;
+}
+function objectIdFromStorage(value) {
+	if (value instanceof ObjectId) return value.toHexString();
+	if (Array.isArray(value)) return value.map(objectIdFromStorage);
+	return value;
+}
 var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 	db;
 	client;
@@ -1710,10 +1728,17 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 	* write `[lng, lat]` → `{ type: 'Point', coordinates: [lng, lat] }`,
 	* unwrap back to the tuple on read. Non-tuple values (e.g. `$geoWithin`
 	* operator objects flowing through filter translation) pass through.
+	*
+	* Converts `mongo.objectId` values between wire hex strings and native
+	* ObjectId storage. Filters, writes, and reads all flow through these
+	* formatters, so id envelopes (`@DbActionID` row loading), FK filters
+	* (`{ leadId: '<hex>' }`), and inserted documents match natively stored
+	* ObjectIds — and reads return the hex strings the declared type promises.
+	* Top-level fields only: nested values skip the write/read formatter passes,
+	* so a nested formatter would coerce filters against un-coerced storage.
 	*/
 	formatValue(field) {
-		if (!field.isGeoPoint) return;
-		return {
+		if (field.isGeoPoint) return {
 			toStorage: (value) => Array.isArray(value) && value.length === 2 && typeof value[0] === "number" && typeof value[1] === "number" ? {
 				type: "Point",
 				coordinates: value
@@ -1723,6 +1748,10 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 				return v && typeof v === "object" && v.type === "Point" && Array.isArray(v.coordinates) ? v.coordinates : value;
 			}
 		};
+		if (!field.path.includes(".") && isObjectIdColumn(field.type)) return {
+			toStorage: objectIdToStorage,
+			fromStorage: objectIdFromStorage
+		};
 	}
 	getAdapterTableName(_type) {}
 	supportsNativeRelations() {
@@ -2019,7 +2048,7 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		}
 		this._log("insertOne", data);
 		const result = await this._wrapDuplicateKeyError(() => this.collection.insertOne(data, this._getSessionOpts()));
-		return { insertedId: this._resolveInsertedId(data, result.insertedId) };
+		return { insertedId: objectIdFromStorage(this._resolveInsertedId(data, result.insertedId)) };
 	}
 	async insertMany(data) {
 		const versionColumn = this._table.versionColumn;
@@ -2035,7 +2064,7 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		const result = await this._wrapDuplicateKeyError(() => this.collection.insertMany(data, this._getSessionOpts()));
 		return {
 			insertedCount: result.insertedCount,
-			insertedIds: data.map((item, i) => this._resolveInsertedId(item, result.insertedIds[i]))
+			insertedIds: data.map((item, i) => objectIdFromStorage(this._resolveInsertedId(item, result.insertedIds[i])))
 		};
 	}
 	async findOne(query) {

package/package.json

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