@atscript/mongo 0.0.22 → 0.0.24

package/dist/index.cjs

@@ -431,9 +431,7 @@ else t.prop(key, (0, __atscript_typescript.defineAnnotatedType)().refTo(val).cop
 				}
 				return def;
 			},
-			partial: (def, path) => {
-				return path !== "" && def.metadata.get("mongo.patch.strategy") === "merge";
-			}
+			partial: (def, path) => path !== "" && def.metadata.get("mongo.patch.strategy") === "merge"
 		});
 	}
 	/**
@@ -772,29 +770,61 @@ else {
 			if (analyzer) index.definition.mappings.fields[fieldName].analyzer = analyzer;
 		}
 	}
-	_flattenType(type, prefix = "", inComplexTypeOrArray = false) {
-		switch (type.type.kind) {
+	_addFieldToFlatMap(name, def) {
+		if (this._flatMap) {
+			const existing = this._flatMap.get(name);
+			if (existing) {
+				const flatUnion = (0, __atscript_typescript.defineAnnotatedType)("union").copyMetadata(existing.metadata).copyMetadata(def.metadata);
+				if (existing.__flat_union) existing.type.items.forEach((item) => flatUnion.item(item));
+else flatUnion.item(existing);
+				flatUnion.item(def);
+				const type = flatUnion.$type;
+				type.__flat_union = true;
+				this._flatMap.set(name, flatUnion.$type);
+			} else this._flatMap.set(name, def);
+		}
+	}
+	_flattenType(def, prefix = "", inComplexTypeOrArray = false) {
+		switch (def.type.kind) {
 			case "object":
-				this._flatMap?.set(prefix || "", type);
-				const items = Array.from(type.type.props.entries());
+				this._addFieldToFlatMap(prefix || "", def);
+				const items = Array.from(def.type.props.entries());
 				for (const [key, value] of items) this._flattenType(value, prefix ? `${prefix}.${key}` : key, inComplexTypeOrArray);
 				break;
 			case "array":
-				let typeArray = type;
+				let typeArray = def;
 				if (!inComplexTypeOrArray) {
-					typeArray = (0, __atscript_typescript.defineAnnotatedType)().refTo(type).copyMetadata(type.metadata).$type;
+					typeArray = (0, __atscript_typescript.defineAnnotatedType)().refTo(def).copyMetadata(def.metadata).$type;
 					typeArray.metadata.set("mongo.__topLevelArray", true);
 				}
-				this._flatMap?.set(prefix || "", typeArray);
+				this._addFieldToFlatMap(prefix || "", typeArray);
+				if (!(0, __atscript_typescript.isAnnotatedTypeOfPrimitive)(typeArray.type.of)) this._flattenArray(typeArray.type.of, prefix);
 				break;
 			case "intersection":
 			case "tuple":
-			case "union": for (const item of type.type.items) this._flattenType(item, prefix, true);
+			case "union": for (const item of def.type.items) this._flattenType(item, prefix, true);
 			default:
-				this._flatMap?.set(prefix || "", type);
+				this._addFieldToFlatMap(prefix || "", def);
+				break;
+		}
+		if (prefix) this._prepareIndexesForField(prefix, def.metadata);
+	}
+	_flattenArray(def, name) {
+		switch (def.type.kind) {
+			case "object":
+				const items = Array.from(def.type.props.entries());
+				for (const [key, value] of items) this._flattenType(value, name ? `${name}.${key}` : key, true);
 				break;
+			case "union":
+			case "intersection":
+			case "tuple":
+				for (const item of def.type.items) this._flattenArray(item, name);
+				break;
+			case "array":
+				this._flattenArray(def.type.of, name);
+				break;
+			default:
 		}
-		if (prefix) this._prepareIndexesForField(prefix, type.metadata);
 	}
 	_prepareIndexesForCollection() {
 		const typeMeta = this.type.metadata;

package/dist/index.d.ts

@@ -80,7 +80,9 @@ declare class AsCollection<T extends TAtscriptAnnotatedTypeConstructor> {
     protected _addIndexField(type: TPlainIndex['type'], name: string, field: string, weight?: number): void;
     protected _setSearchIndex(type: TSearchIndex['type'], name: string | undefined, definition: TMongoSearchIndexDefinition): void;
     protected _addFieldToSearchIndex(type: TSearchIndex['type'], _name: string | undefined, fieldName: string, analyzer?: string): void;
-    protected _flattenType(type: TAtscriptAnnotatedType, prefix?: string, inComplexTypeOrArray?: boolean): void;
+    protected _addFieldToFlatMap(name: string, def: TAtscriptAnnotatedType): void;
+    protected _flattenType(def: TAtscriptAnnotatedType, prefix?: string, inComplexTypeOrArray?: boolean): void;
+    _flattenArray(def: TAtscriptAnnotatedType, name: string): void;
     protected _prepareIndexesForCollection(): void;
     protected _uniqueProps: Set<string>;
     get uniqueProps(): Set<string>;

package/dist/index.mjs

@@ -407,9 +407,7 @@ else t.prop(key, defineAnnotatedType().refTo(val).copyMetadata(def.metadata).opt
 				}
 				return def;
 			},
-			partial: (def, path) => {
-				return path !== "" && def.metadata.get("mongo.patch.strategy") === "merge";
-			}
+			partial: (def, path) => path !== "" && def.metadata.get("mongo.patch.strategy") === "merge"
 		});
 	}
 	/**
@@ -748,29 +746,61 @@ else {
 			if (analyzer) index.definition.mappings.fields[fieldName].analyzer = analyzer;
 		}
 	}
-	_flattenType(type, prefix = "", inComplexTypeOrArray = false) {
-		switch (type.type.kind) {
+	_addFieldToFlatMap(name, def) {
+		if (this._flatMap) {
+			const existing = this._flatMap.get(name);
+			if (existing) {
+				const flatUnion = defineAnnotatedType("union").copyMetadata(existing.metadata).copyMetadata(def.metadata);
+				if (existing.__flat_union) existing.type.items.forEach((item) => flatUnion.item(item));
+else flatUnion.item(existing);
+				flatUnion.item(def);
+				const type = flatUnion.$type;
+				type.__flat_union = true;
+				this._flatMap.set(name, flatUnion.$type);
+			} else this._flatMap.set(name, def);
+		}
+	}
+	_flattenType(def, prefix = "", inComplexTypeOrArray = false) {
+		switch (def.type.kind) {
 			case "object":
-				this._flatMap?.set(prefix || "", type);
-				const items = Array.from(type.type.props.entries());
+				this._addFieldToFlatMap(prefix || "", def);
+				const items = Array.from(def.type.props.entries());
 				for (const [key, value] of items) this._flattenType(value, prefix ? `${prefix}.${key}` : key, inComplexTypeOrArray);
 				break;
 			case "array":
-				let typeArray = type;
+				let typeArray = def;
 				if (!inComplexTypeOrArray) {
-					typeArray = defineAnnotatedType().refTo(type).copyMetadata(type.metadata).$type;
+					typeArray = defineAnnotatedType().refTo(def).copyMetadata(def.metadata).$type;
 					typeArray.metadata.set("mongo.__topLevelArray", true);
 				}
-				this._flatMap?.set(prefix || "", typeArray);
+				this._addFieldToFlatMap(prefix || "", typeArray);
+				if (!isAnnotatedTypeOfPrimitive(typeArray.type.of)) this._flattenArray(typeArray.type.of, prefix);
 				break;
 			case "intersection":
 			case "tuple":
-			case "union": for (const item of type.type.items) this._flattenType(item, prefix, true);
+			case "union": for (const item of def.type.items) this._flattenType(item, prefix, true);
 			default:
-				this._flatMap?.set(prefix || "", type);
+				this._addFieldToFlatMap(prefix || "", def);
+				break;
+		}
+		if (prefix) this._prepareIndexesForField(prefix, def.metadata);
+	}
+	_flattenArray(def, name) {
+		switch (def.type.kind) {
+			case "object":
+				const items = Array.from(def.type.props.entries());
+				for (const [key, value] of items) this._flattenType(value, name ? `${name}.${key}` : key, true);
 				break;
+			case "union":
+			case "intersection":
+			case "tuple":
+				for (const item of def.type.items) this._flattenArray(item, name);
+				break;
+			case "array":
+				this._flattenArray(def.type.of, name);
+				break;
+			default:
 		}
-		if (prefix) this._prepareIndexesForField(prefix, type.metadata);
 	}
 	_prepareIndexesForCollection() {
 		const typeMeta = this.type.metadata;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/mongo",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "Mongodb plugin for atscript.",
   "type": "module",
   "main": "dist/index.mjs",
@@ -34,8 +34,8 @@
   "license": "ISC",
   "peerDependencies": {
     "mongodb": "^6.17.0",
-    "@atscript/core": "^0.0.22",
-    "@atscript/typescript": "^0.0.22"
+    "@atscript/core": "^0.0.24",
+    "@atscript/typescript": "^0.0.24"
   },
   "devDependencies": {
     "vitest": "3.2.4"