@atscript/mongo 0.0.29 → 0.0.30

package/dist/index.cjs

@@ -23,7 +23,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 const __atscript_core = __toESM(require("@atscript/core"));
-const __atscript_typescript = __toESM(require("@atscript/typescript"));
+const __atscript_typescript_utils = __toESM(require("@atscript/typescript/utils"));
 const mongodb = __toESM(require("mongodb"));
 
 //#region packages/mongo/src/plugin/primitives.ts
@@ -404,30 +404,30 @@ var CollectionPatcher = class CollectionPatcher {
 			plugins: [validateMongoIdPlugin, validateMongoUniqueArrayItemsPlugin],
 			replace: (def, path) => {
 				if (path === "" && def.type.kind === "object") {
-					const obj = (0, __atscript_typescript.defineAnnotatedType)("object").copyMetadata(def.metadata);
-					for (const [prop, type] of def.type.props.entries()) obj.prop(prop, (0, __atscript_typescript.defineAnnotatedType)().refTo(type).copyMetadata(type.metadata).optional(prop !== "_id").$type);
+					const obj = (0, __atscript_typescript_utils.defineAnnotatedType)("object").copyMetadata(def.metadata);
+					for (const [prop, type] of def.type.props.entries()) obj.prop(prop, (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(type).copyMetadata(type.metadata).optional(prop !== "_id").$type);
 					return obj.$type;
 				}
 				if (def.type.kind === "array" && collection.flatMap.get(path)?.metadata.get("mongo.__topLevelArray") && !def.metadata.has("mongo.__patchArrayValue")) {
 					const defArray = def;
 					const mergeStrategy = defArray.metadata.get("mongo.patch.strategy") === "merge";
 					function getPatchType() {
-						const isPrimitive$1 = (0, __atscript_typescript.isAnnotatedTypeOfPrimitive)(defArray.type.of);
-						if (isPrimitive$1) return (0, __atscript_typescript.defineAnnotatedType)().refTo(def).copyMetadata(def.metadata).annotate("mongo.__patchArrayValue").optional().$type;
+						const isPrimitive$1 = (0, __atscript_typescript_utils.isAnnotatedTypeOfPrimitive)(defArray.type.of);
+						if (isPrimitive$1) return (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(def).copyMetadata(def.metadata).annotate("mongo.__patchArrayValue").optional().$type;
 						if (defArray.type.of.type.kind === "object") {
 							const objType = defArray.type.of.type;
-							const t = (0, __atscript_typescript.defineAnnotatedType)("object").copyMetadata(defArray.type.of.metadata);
+							const t = (0, __atscript_typescript_utils.defineAnnotatedType)("object").copyMetadata(defArray.type.of.metadata);
 							const keyProps = CollectionPatcher.getKeyProps(defArray);
-							for (const [key, val] of objType.props.entries()) if (keyProps.size) if (keyProps.has(key)) t.prop(key, (0, __atscript_typescript.defineAnnotatedType)().refTo(val).copyMetadata(def.metadata).$type);
-else t.prop(key, (0, __atscript_typescript.defineAnnotatedType)().refTo(val).copyMetadata(def.metadata).optional().$type);
-else t.prop(key, (0, __atscript_typescript.defineAnnotatedType)().refTo(val).copyMetadata(def.metadata).optional(!!val.optional).$type);
-							return (0, __atscript_typescript.defineAnnotatedType)("array").of(t.$type).copyMetadata(def.metadata).annotate("mongo.__patchArrayValue").optional().$type;
+							for (const [key, val] of objType.props.entries()) if (keyProps.size) if (keyProps.has(key)) t.prop(key, (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(val).copyMetadata(def.metadata).$type);
+else t.prop(key, (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(val).copyMetadata(def.metadata).optional().$type);
+else t.prop(key, (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(val).copyMetadata(def.metadata).optional(!!val.optional).$type);
+							return (0, __atscript_typescript_utils.defineAnnotatedType)("array").of(t.$type).copyMetadata(def.metadata).annotate("mongo.__patchArrayValue").optional().$type;
 						}
 						return undefined;
 					}
-					const fullType = (0, __atscript_typescript.defineAnnotatedType)().refTo(def).copyMetadata(def.metadata).annotate("mongo.__patchArrayValue").optional().$type;
+					const fullType = (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(def).copyMetadata(def.metadata).annotate("mongo.__patchArrayValue").optional().$type;
 					const patchType = getPatchType();
-					return patchType ? (0, __atscript_typescript.defineAnnotatedType)("object").prop("$replace", fullType).prop("$insert", fullType).prop("$upsert", fullType).prop("$update", mergeStrategy ? patchType : fullType).prop("$remove", patchType).optional().$type : (0, __atscript_typescript.defineAnnotatedType)("object").prop("$replace", fullType).prop("$insert", fullType).optional().$type;
+					return patchType ? (0, __atscript_typescript_utils.defineAnnotatedType)("object").prop("$replace", fullType).prop("$insert", fullType).prop("$upsert", fullType).prop("$update", mergeStrategy ? patchType : fullType).prop("$remove", patchType).optional().$type : (0, __atscript_typescript_utils.defineAnnotatedType)("object").prop("$replace", fullType).prop("$insert", fullType).optional().$type;
 				}
 				return def;
 			},
@@ -774,7 +774,7 @@ else {
 		if (this._flatMap) {
 			const existing = this._flatMap.get(name);
 			if (existing) {
-				const flatUnion = (0, __atscript_typescript.defineAnnotatedType)("union").copyMetadata(existing.metadata).copyMetadata(def.metadata);
+				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);
@@ -794,11 +794,11 @@ else flatUnion.item(existing);
 			case "array":
 				let typeArray = def;
 				if (!inComplexTypeOrArray) {
-					typeArray = (0, __atscript_typescript.defineAnnotatedType)().refTo(def).copyMetadata(def.metadata).$type;
+					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.isAnnotatedTypeOfPrimitive)(typeArray.type.of)) this._flattenArray(typeArray.type.of, prefix);
+				if (!(0, __atscript_typescript_utils.isAnnotatedTypeOfPrimitive)(typeArray.type.of)) this._flattenArray(typeArray.type.of, prefix);
 				break;
 			case "intersection":
 			case "tuple":
@@ -1072,7 +1072,7 @@ else if (this.idType !== "objectId") throw new Error("Missing \"_id\" field");
 		this._indexes = new Map();
 		this._vectorFilters = new Map();
 		this._uniqueProps = new Set();
-		if (!(0, __atscript_typescript.isAnnotatedType)(_type)) throw new Error("Atscript Annotated Type expected");
+		if (!(0, __atscript_typescript_utils.isAnnotatedType)(_type)) throw new Error("Atscript Annotated Type expected");
 		const name = _type.metadata.get("mongo.collection");
 		if (!name) throw new Error("@mongo.collection annotation expected with collection name");
 		if (_type.type.kind !== "object") throw new Error("Mongo collection must be an object type");

package/dist/index.d.ts

@@ -1,7 +1,8 @@
 import { TAtscriptPlugin } from '@atscript/core';
 import * as mongodb from 'mongodb';
 import { MongoClient, Collection, ObjectId, InsertOneOptions, ReplaceOptions, UpdateOptions, OptionalUnlessRequiredId, Filter, WithoutId } from 'mongodb';
-import { TAtscriptAnnotatedTypeConstructor, TAtscriptAnnotatedType, TAtscriptTypeObject, TMetadataMap } from '@atscript/typescript';
+import * as _atscript_typescript_utils from '@atscript/typescript/utils';
+import { TAtscriptAnnotatedTypeConstructor, Validator, TAtscriptAnnotatedType, TAtscriptTypeObject, TMetadataMap } from '@atscript/typescript/utils';
 
 declare const MongoPlugin: () => TAtscriptPlugin;
 
@@ -74,7 +75,7 @@ declare class AsCollection<T extends TAtscriptAnnotatedTypeConstructor> {
      * @returns {Validator} The corresponding validator instance.
      * @throws {Error} If an unknown purpose is provided.
      */
-    getValidator(purpose: TValidatorPurpose): any;
+    getValidator(purpose: TValidatorPurpose): Validator<T> | undefined;
     get type(): TAtscriptAnnotatedType<TAtscriptTypeObject>;
     get indexes(): Map<string, TIndex>;
     protected _addIndexField(type: TPlainIndex['type'], name: string, field: string, weight?: number): void;
@@ -92,7 +93,7 @@ declare class AsCollection<T extends TAtscriptAnnotatedTypeConstructor> {
     protected _searchIndexesMap?: Map<string, TIndex>;
     getSearchIndexes(): Map<string, TIndex>;
     getSearchIndex(name?: string): TIndex | undefined;
-    get flatMap(): Map<string, TAtscriptAnnotatedType>;
+    get flatMap(): Map<string, TAtscriptAnnotatedType<_atscript_typescript_utils.TAtscriptTypeDef>>;
     syncIndexes(): Promise<void>;
     insert(payload: (Omit<InstanceType<T>, '_id'> & {
         _id?: InstanceType<T>['_id'] | ObjectId;

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { AnnotationSpec, isArray, isInterface, isPrimitive, isRef, isStructure } from "@atscript/core";
-import { defineAnnotatedType, isAnnotatedType, isAnnotatedTypeOfPrimitive } from "@atscript/typescript";
+import { defineAnnotatedType, isAnnotatedType, isAnnotatedTypeOfPrimitive } from "@atscript/typescript/utils";
 import { MongoClient, ObjectId } from "mongodb";
 
 //#region packages/mongo/src/plugin/primitives.ts

package/package.json

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