@atscript/mongo 0.1.8 → 0.1.9

package/dist/index.cjs

@@ -773,68 +773,6 @@ else {
 			if (analyzer) index.definition.mappings.fields[fieldName].analyzer = analyzer;
 		}
 	}
-	_addFieldToFlatMap(name, def) {
-		if (this._flatMap) {
-			const existing = this._flatMap.get(name);
-			if (existing) {
-				const flatUnion = (0, __atscript_typescript_utils.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._addFieldToFlatMap(prefix || "", def);
-				const items = Array.from(def.type.props.entries());
-				for (const [key, value] of items) {
-					if ((0, __atscript_typescript_utils.isPhantomType)(value)) continue;
-					this._flattenType(value, prefix ? `${prefix}.${key}` : key, inComplexTypeOrArray);
-				}
-				break;
-			case "array":
-				let typeArray = def;
-				if (!inComplexTypeOrArray) {
-					typeArray = (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(def).copyMetadata(def.metadata).$type;
-					typeArray.metadata.set("mongo.__topLevelArray", true);
-				}
-				this._addFieldToFlatMap(prefix || "", typeArray);
-				if (!(0, __atscript_typescript_utils.isAnnotatedTypeOfPrimitive)(typeArray.type.of)) this._flattenArray(typeArray.type.of, prefix);
-				break;
-			case "intersection":
-			case "tuple":
-			case "union": for (const item of def.type.items) this._flattenType(item, prefix, true);
-			default:
-				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) {
-					if ((0, __atscript_typescript_utils.isPhantomType)(value)) continue;
-					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:
-		}
-	}
 	_prepareIndexesForCollection() {
 		const typeMeta = this.type.metadata;
 		const dynamicText = typeMeta.get("mongo.search.dynamic");
@@ -882,9 +820,12 @@ else flatUnion.item(existing);
 	}
 	_flatten() {
 		if (!this._flatMap) {
-			this._flatMap = new Map();
 			this._prepareIndexesForCollection();
-			this._flattenType(this.type);
+			this._flatMap = (0, __atscript_typescript_utils.flattenAnnotatedType)(this.type, {
+				topLevelArrayTag: "mongo.__topLevelArray",
+				excludePhantomTypes: true,
+				onField: (path, _type, metadata) => this._prepareIndexesForField(path, metadata)
+			});
 			this._finalizeIndexesForCollection();
 		}
 	}

package/dist/index.d.ts

@@ -86,9 +86,6 @@ declare class AsCollection<T extends TAtscriptAnnotatedType = TAtscriptAnnotated
     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 _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

@@ -1,5 +1,5 @@
 import { AnnotationSpec, isArray, isInterface, isPrimitive, isRef, isStructure } from "@atscript/core";
-import { defineAnnotatedType, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType } from "@atscript/typescript/utils";
+import { defineAnnotatedType, flattenAnnotatedType, isAnnotatedType, isAnnotatedTypeOfPrimitive } from "@atscript/typescript/utils";
 import { MongoClient, ObjectId } from "mongodb";
 
 //#region packages/mongo/src/plugin/primitives.ts
@@ -749,68 +749,6 @@ else {
 			if (analyzer) index.definition.mappings.fields[fieldName].analyzer = analyzer;
 		}
 	}
-	_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._addFieldToFlatMap(prefix || "", def);
-				const items = Array.from(def.type.props.entries());
-				for (const [key, value] of items) {
-					if (isPhantomType(value)) continue;
-					this._flattenType(value, prefix ? `${prefix}.${key}` : key, inComplexTypeOrArray);
-				}
-				break;
-			case "array":
-				let typeArray = def;
-				if (!inComplexTypeOrArray) {
-					typeArray = defineAnnotatedType().refTo(def).copyMetadata(def.metadata).$type;
-					typeArray.metadata.set("mongo.__topLevelArray", true);
-				}
-				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 def.type.items) this._flattenType(item, prefix, true);
-			default:
-				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) {
-					if (isPhantomType(value)) continue;
-					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:
-		}
-	}
 	_prepareIndexesForCollection() {
 		const typeMeta = this.type.metadata;
 		const dynamicText = typeMeta.get("mongo.search.dynamic");
@@ -858,9 +796,12 @@ else flatUnion.item(existing);
 	}
 	_flatten() {
 		if (!this._flatMap) {
-			this._flatMap = new Map();
 			this._prepareIndexesForCollection();
-			this._flattenType(this.type);
+			this._flatMap = flattenAnnotatedType(this.type, {
+				topLevelArrayTag: "mongo.__topLevelArray",
+				excludePhantomTypes: true,
+				onField: (path, _type, metadata) => this._prepareIndexesForField(path, metadata)
+			});
 			this._finalizeIndexesForCollection();
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/mongo",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "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.1.8",
-    "@atscript/typescript": "^0.1.8"
+    "@atscript/core": "^0.1.9",
+    "@atscript/typescript": "^0.1.9"
   },
   "devDependencies": {
     "vitest": "3.2.4"