@orion-js/mongodb 4.0.0-alpha.3 → 4.0.0-next.0

package/dist/index.cjs

@@ -31518,151 +31518,133 @@ var require_jsbn = __commonJS((exports2, module2) => {
 
 // ../../node_modules/sprintf-js/src/sprintf.js
 var require_sprintf = __commonJS((exports2) => {
-  (function() {
+  (function(window2) {
     var re = {
       not_string: /[^s]/,
-      not_bool: /[^t]/,
-      not_type: /[^T]/,
-      not_primitive: /[^v]/,
       number: /[diefg]/,
-      numeric_arg: /[bcdiefguxX]/,
       json: /[j]/,
       not_json: /[^j]/,
       text: /^[^\x25]+/,
       modulo: /^\x25{2}/,
-      placeholder: /^\x25(?:([1-9]\d*)\$|\(([^)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijostTuvxX])/,
+      placeholder: /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijosuxX])/,
       key: /^([a-z_][a-z_\d]*)/i,
       key_access: /^\.([a-z_][a-z_\d]*)/i,
       index_access: /^\[(\d+)\]/,
-      sign: /^[+-]/
+      sign: /^[\+\-]/
     };
-    function sprintf(key) {
-      return sprintf_format(sprintf_parse(key), arguments);
-    }
-    function vsprintf(fmt, argv) {
-      return sprintf.apply(null, [fmt].concat(argv || []));
+    function sprintf() {
+      var key = arguments[0], cache2 = sprintf.cache;
+      if (!(cache2[key] && cache2.hasOwnProperty(key))) {
+        cache2[key] = sprintf.parse(key);
+      }
+      return sprintf.format.call(null, cache2[key], arguments);
     }
-    function sprintf_format(parse_tree, argv) {
-      var cursor = 1, tree_length = parse_tree.length, arg, output = "", i, k, ph, pad, pad_character, pad_length, is_positive, sign;
+    sprintf.format = function(parse_tree, argv) {
+      var cursor = 1, tree_length = parse_tree.length, node_type = "", arg, output = [], i, k, match, pad, pad_character, pad_length, is_positive = true, sign = "";
       for (i = 0;i < tree_length; i++) {
-        if (typeof parse_tree[i] === "string") {
-          output += parse_tree[i];
-        } else if (typeof parse_tree[i] === "object") {
-          ph = parse_tree[i];
-          if (ph.keys) {
+        node_type = get_type(parse_tree[i]);
+        if (node_type === "string") {
+          output[output.length] = parse_tree[i];
+        } else if (node_type === "array") {
+          match = parse_tree[i];
+          if (match[2]) {
             arg = argv[cursor];
-            for (k = 0;k < ph.keys.length; k++) {
-              if (arg == undefined) {
-                throw new Error(sprintf('[sprintf] Cannot access property "%s" of undefined value "%s"', ph.keys[k], ph.keys[k - 1]));
+            for (k = 0;k < match[2].length; k++) {
+              if (!arg.hasOwnProperty(match[2][k])) {
+                throw new Error(sprintf("[sprintf] property '%s' does not exist", match[2][k]));
               }
-              arg = arg[ph.keys[k]];
+              arg = arg[match[2][k]];
             }
-          } else if (ph.param_no) {
-            arg = argv[ph.param_no];
+          } else if (match[1]) {
+            arg = argv[match[1]];
           } else {
             arg = argv[cursor++];
           }
-          if (re.not_type.test(ph.type) && re.not_primitive.test(ph.type) && arg instanceof Function) {
+          if (get_type(arg) == "function") {
             arg = arg();
           }
-          if (re.numeric_arg.test(ph.type) && (typeof arg !== "number" && isNaN(arg))) {
-            throw new TypeError(sprintf("[sprintf] expecting number but found %T", arg));
+          if (re.not_string.test(match[8]) && re.not_json.test(match[8]) && (get_type(arg) != "number" && isNaN(arg))) {
+            throw new TypeError(sprintf("[sprintf] expecting number but found %s", get_type(arg)));
           }
-          if (re.number.test(ph.type)) {
+          if (re.number.test(match[8])) {
             is_positive = arg >= 0;
           }
-          switch (ph.type) {
+          switch (match[8]) {
             case "b":
-              arg = parseInt(arg, 10).toString(2);
+              arg = arg.toString(2);
               break;
             case "c":
-              arg = String.fromCharCode(parseInt(arg, 10));
+              arg = String.fromCharCode(arg);
               break;
             case "d":
             case "i":
               arg = parseInt(arg, 10);
               break;
             case "j":
-              arg = JSON.stringify(arg, null, ph.width ? parseInt(ph.width) : 0);
+              arg = JSON.stringify(arg, null, match[6] ? parseInt(match[6]) : 0);
               break;
             case "e":
-              arg = ph.precision ? parseFloat(arg).toExponential(ph.precision) : parseFloat(arg).toExponential();
+              arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential();
               break;
             case "f":
-              arg = ph.precision ? parseFloat(arg).toFixed(ph.precision) : parseFloat(arg);
+              arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg);
               break;
             case "g":
-              arg = ph.precision ? String(Number(arg.toPrecision(ph.precision))) : parseFloat(arg);
+              arg = match[7] ? parseFloat(arg).toPrecision(match[7]) : parseFloat(arg);
               break;
             case "o":
-              arg = (parseInt(arg, 10) >>> 0).toString(8);
+              arg = arg.toString(8);
               break;
             case "s":
-              arg = String(arg);
-              arg = ph.precision ? arg.substring(0, ph.precision) : arg;
-              break;
-            case "t":
-              arg = String(!!arg);
-              arg = ph.precision ? arg.substring(0, ph.precision) : arg;
-              break;
-            case "T":
-              arg = Object.prototype.toString.call(arg).slice(8, -1).toLowerCase();
-              arg = ph.precision ? arg.substring(0, ph.precision) : arg;
+              arg = (arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg;
               break;
             case "u":
-              arg = parseInt(arg, 10) >>> 0;
-              break;
-            case "v":
-              arg = arg.valueOf();
-              arg = ph.precision ? arg.substring(0, ph.precision) : arg;
+              arg = arg >>> 0;
               break;
             case "x":
-              arg = (parseInt(arg, 10) >>> 0).toString(16);
+              arg = arg.toString(16);
               break;
             case "X":
-              arg = (parseInt(arg, 10) >>> 0).toString(16).toUpperCase();
+              arg = arg.toString(16).toUpperCase();
               break;
           }
-          if (re.json.test(ph.type)) {
-            output += arg;
+          if (re.json.test(match[8])) {
+            output[output.length] = arg;
           } else {
-            if (re.number.test(ph.type) && (!is_positive || ph.sign)) {
+            if (re.number.test(match[8]) && (!is_positive || match[3])) {
               sign = is_positive ? "+" : "-";
               arg = arg.toString().replace(re.sign, "");
             } else {
               sign = "";
             }
-            pad_character = ph.pad_char ? ph.pad_char === "0" ? "0" : ph.pad_char.charAt(1) : " ";
-            pad_length = ph.width - (sign + arg).length;
-            pad = ph.width ? pad_length > 0 ? pad_character.repeat(pad_length) : "" : "";
-            output += ph.align ? sign + arg + pad : pad_character === "0" ? sign + pad + arg : pad + sign + arg;
+            pad_character = match[4] ? match[4] === "0" ? "0" : match[4].charAt(1) : " ";
+            pad_length = match[6] - (sign + arg).length;
+            pad = match[6] ? pad_length > 0 ? str_repeat(pad_character, pad_length) : "" : "";
+            output[output.length] = match[5] ? sign + arg + pad : pad_character === "0" ? sign + pad + arg : pad + sign + arg;
           }
         }
       }
-      return output;
-    }
-    var sprintf_cache = Object.create(null);
-    function sprintf_parse(fmt) {
-      if (sprintf_cache[fmt]) {
-        return sprintf_cache[fmt];
-      }
-      var _fmt = fmt, match, parse_tree = [], arg_names = 0;
+      return output.join("");
+    };
+    sprintf.cache = {};
+    sprintf.parse = function(fmt) {
+      var _fmt = fmt, match = [], parse_tree = [], arg_names = 0;
       while (_fmt) {
         if ((match = re.text.exec(_fmt)) !== null) {
-          parse_tree.push(match[0]);
+          parse_tree[parse_tree.length] = match[0];
         } else if ((match = re.modulo.exec(_fmt)) !== null) {
-          parse_tree.push("%");
+          parse_tree[parse_tree.length] = "%";
         } else if ((match = re.placeholder.exec(_fmt)) !== null) {
           if (match[2]) {
             arg_names |= 1;
             var field_list = [], replacement_field = match[2], field_match = [];
             if ((field_match = re.key.exec(replacement_field)) !== null) {
-              field_list.push(field_match[1]);
+              field_list[field_list.length] = field_match[1];
               while ((replacement_field = replacement_field.substring(field_match[0].length)) !== "") {
                 if ((field_match = re.key_access.exec(replacement_field)) !== null) {
-                  field_list.push(field_match[1]);
+                  field_list[field_list.length] = field_match[1];
                 } else if ((field_match = re.index_access.exec(replacement_field)) !== null) {
-                  field_list.push(field_match[1]);
+                  field_list[field_list.length] = field_match[1];
                 } else {
                   throw new SyntaxError("[sprintf] failed to parse named argument key");
                 }
@@ -31677,32 +31659,32 @@ var require_sprintf = __commonJS((exports2) => {
           if (arg_names === 3) {
             throw new Error("[sprintf] mixing positional and named placeholders is not (yet) supported");
           }
-          parse_tree.push({
-            placeholder: match[0],
-            param_no: match[1],
-            keys: match[2],
-            sign: match[3],
-            pad_char: match[4],
-            align: match[5],
-            width: match[6],
-            precision: match[7],
-            type: match[8]
-          });
+          parse_tree[parse_tree.length] = match;
         } else {
           throw new SyntaxError("[sprintf] unexpected placeholder");
         }
         _fmt = _fmt.substring(match[0].length);
       }
-      return sprintf_cache[fmt] = parse_tree;
+      return parse_tree;
+    };
+    var vsprintf = function(fmt, argv, _argv) {
+      _argv = (argv || []).slice(0);
+      _argv.splice(0, 0, fmt);
+      return sprintf.apply(null, _argv);
+    };
+    function get_type(variable) {
+      return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase();
     }
-    if (typeof exports2 !== "undefined") {
-      exports2["sprintf"] = sprintf;
-      exports2["vsprintf"] = vsprintf;
+    function str_repeat(input, multiplier) {
+      return Array(multiplier + 1).join(input);
     }
-    if (typeof window !== "undefined") {
-      window["sprintf"] = sprintf;
-      window["vsprintf"] = vsprintf;
-      if (typeof define === "function" && define["amd"]) {
+    if (typeof exports2 !== "undefined") {
+      exports2.sprintf = sprintf;
+      exports2.vsprintf = vsprintf;
+    } else {
+      window2.sprintf = sprintf;
+      window2.vsprintf = vsprintf;
+      if (typeof define === "function" && define.amd) {
         define(function() {
           return {
             sprintf,
@@ -31711,7 +31693,7 @@ var require_sprintf = __commonJS((exports2) => {
         });
       }
     }
-  })();
+  })(typeof window === "undefined" ? exports2 : window);
 });
 
 // ../../node_modules/ip-address/dist/ipv4.js
@@ -46863,7 +46845,7 @@ function findOne_default(collection) {
   return findOne;
 }
 
-// ../schema/dist/index.js
+// node_modules/@orion-js/schema/dist/index.js
 var __create2 = Object.create;
 var __getProtoOf2 = Object.getPrototypeOf;
 var __defProp2 = Object.defineProperty;
@@ -50516,7 +50498,7 @@ function loadOne_default(collection) {
   return loadOne;
 }
 
-// ../helpers/dist/index.js
+// node_modules/@orion-js/helpers/dist/index.js
 var import_node_module = require("node:module");
 var import_crypto = __toESM(require("crypto"));
 var __create3 = Object.create;
@@ -54630,7 +54612,7 @@ function getDBName(url) {
   return dbName;
 }
 
-// ../env/dist/index.js
+// node_modules/@orion-js/env/dist/index.js
 var import_node_module2 = require("node:module");
 var import_node_fs = __toESM(require("node:fs"));
 var __create4 = Object.create;
@@ -63937,7 +63919,7 @@ var getMongoURLFromEnv = (connectionName) => {
   return uri;
 };
 
-// ../logger/dist/index.js
+// node_modules/@orion-js/logger/dist/index.js
 var import_node_module3 = require("node:module");
 var import_node_util = __toESM(require("node:util"));
 var __create5 = Object.create;
@@ -80604,7 +80586,7 @@ var improveFileName = (path) => {
   return path;
 };
 var transports2 = [
-  process.env.ORION_DEV || process.env.JEST_WORKER_ID ? textConsoleTransport : jsonConsoleTransport
+  textConsoleTransport
 ];
 var winstonLogger = import_winston2.createLogger({
   levels: import_winston2.config.npm.levels,
@@ -80718,7 +80700,7 @@ class Collection {
   createIndexesPromise;
   connectionPromise;
 }
-// ../services/dist/index.js
+// node_modules/@orion-js/services/dist/index.js
 var __create6 = Object.create;
 var __getProtoOf6 = Object.getPrototypeOf;
 var __defProp6 = Object.defineProperty;

package/dist/index.d.ts

@@ -1,388 +1,10 @@
 // Generated by dts-bundle-generator v9.5.1
 
+import { Model } from '@orion-js/models';
+import { Blackbox, Schema } from '@orion-js/schema';
 import * as MongoDB from 'mongodb';
 import { Db, MongoClient } from 'mongodb';
 
-// Generated by dts-bundle-generator v9.5.1
-// Generated by dts-bundle-generator v9.5.1
-// Generated by dts-bundle-generator v9.5.1
-export interface StoredCacheData {
-	value: any;
-	expires?: Date;
-}
-export interface SetCacheOptions {
-	ttl?: number;
-}
-export interface GetCacheOptions {
-	ttl?: number;
-	fallback?(): Promise<any>;
-}
-export interface OrionCache {
-	/**
-	 * Save data in the cache
-	 */
-	set(key: string, value: any, options?: SetCacheOptions): Promise<void> | void;
-	/**
-	 * Get data from the cache
-	 */
-	get(key: string, options?: GetCacheOptions): Promise<StoredCacheData>;
-	/**
-	 * Removes data from the cache
-	 */
-	invalidate(key: string): Promise<void> | void;
-}
-export type Blackbox = {
-	[name: string]: any;
-};
-export type ModelResolverResolve = (item: any, params: any, viewer: any, info?: any) => Promise<any>;
-export type GlobalCheckPermissions = (params: any, viewer: any, info?: any) => Promise<string | void>;
-export type ModelCheckPermissions = (parent: any, params: any, viewer: any, info?: any) => Promise<string | void>;
-export type GlobalGetCacheKey = (params: any, viewer: any, info: any) => Promise<any>;
-export type ModelGetCacheKey = (parent: any, params: any, viewer: any, info: any) => Promise<any>;
-export interface ExecuteOptions {
-	params: Blackbox;
-	viewer: any;
-	parent?: any;
-	info?: any;
-	options: ResolverOptions;
-}
-export type Parameters$1<T> = T extends (...args: infer P) => any ? P : never;
-export type ReturnType$1<T> = T extends (...args: any) => infer R ? R : any;
-export type ResolverParams<Resolve, IsModel> = IsModel extends undefined ? Parameters$1<Resolve>[0] : Parameters$1<Resolve>[1];
-export interface ExecuteParams<Resolve = Function, IsModel = undefined> {
-	params?: ResolverParams<Resolve, IsModel>;
-	viewer?: any;
-	parent?: IsModel extends undefined ? undefined : Parameters$1<Resolve>[0];
-	info?: any;
-}
-export type Execute<Resolve = Function, IsModel = undefined> = (executeOptions: ExecuteParams<Resolve, IsModel>) => ReturnType$1<Resolve>;
-export interface SharedResolverOptions {
-	resolverId?: string;
-	params?: any;
-	returns?: any;
-	mutation?: boolean;
-	private?: boolean;
-	checkPermission?: GlobalCheckPermissions | ModelCheckPermissions;
-	getCacheKey?: GlobalGetCacheKey | ModelGetCacheKey;
-	cache?: number;
-	cacheProvider?: OrionCache;
-	permissionsOptions?: any;
-	middlewares?: ResolverMiddleware[];
-}
-export interface ResolverOptions<Resolve = Function> extends SharedResolverOptions {
-	resolve: Resolve;
-}
-export type OmitFirstArg<F> = F extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never;
-export interface Resolver<Resolve = Function, IsModel = undefined> extends SharedResolverOptions {
-	execute: Execute<Resolve, IsModel>;
-	resolve: Resolve;
-	modelResolve: IsModel extends undefined ? undefined : OmitFirstArg<Resolve>;
-}
-export type ModelResolver<Resolve = Function> = Resolver<Resolve, true>;
-export type ResolverMiddleware = (executeOptions: ExecuteOptions, next: () => Promise<any>) => Promise<any>;
-export interface FieldType {
-	name: string;
-	validate: ValidateFunction;
-	clean: CleanFunction;
-	meta?: any;
-	toGraphQLType?: (GraphQL: any) => any;
-	_isFieldType: boolean;
-}
-export type Constructor<T> = new (...args: any[]) => T;
-export type FieldTypesList = "string" | "date" | "integer" | "number" | "ID" | "boolean" | "email" | "blackbox" | "any";
-export type TypedModelOnSchema = Function;
-export type ConstructorsTypesList = Constructor<String> | Constructor<Number> | Constructor<Boolean> | Constructor<Date>;
-export type SchemaRecursiveNodeTypeExtras = {
-	_isFieldType?: boolean;
-	__clean?: CleanFunction;
-	__validate?: ValidateFunction;
-	__skipChildValidation?: (value: any, info: CurrentNodeInfo) => Promise<boolean>;
-};
-export interface Schema {
-	[key: string]: SchemaNode | Function;
-}
-export type SchemaRecursiveNodeType = Schema & SchemaRecursiveNodeTypeExtras;
-export type SchemaMetaFieldTypeSingle = FieldTypesList | ConstructorsTypesList | SchemaRecursiveNodeType | FieldType | TypedModelOnSchema;
-export type SchemaMetaFieldType = SchemaMetaFieldTypeSingle | SchemaMetaFieldTypeSingle[];
-export type ValidateFunction = (value: any, info?: Partial<CurrentNodeInfo>, ...args: any[]) => object | string | void | Promise<object | string | void>;
-export type CleanFunction = (value: any, info?: Partial<CurrentNodeInfo>, ...args: any[]) => any | Promise<any>;
-export interface SchemaNode {
-	/**
-	 * The type of the field. Used for type validations. Can also contain a subschema.
-	 */
-	type: SchemaMetaFieldType;
-	/**
-	 * Defaults to false
-	 */
-	optional?: boolean;
-	allowedValues?: Array<any>;
-	defaultValue?: ((info: CurrentNodeInfo, ...args: any[]) => any | Promise<any>) | any;
-	/**
-	 * Function that takes a value and returns an error message if there are any errors. Must return null or undefined otherwise.
-	 */
-	validate?: ValidateFunction;
-	/**
-	 * Function that preprocesses a value before it is set.
-	 */
-	clean?: CleanFunction;
-	autoValue?: (value: any, info: CurrentNodeInfo, ...args: any[]) => any | Promise<any>;
-	/**
-	 * The minimum value if it's a number, the minimum length if it's a string or array.
-	 */
-	min?: number;
-	/**
-	 * The maximum value if it's a number, the maximum length if it's a string or array.
-	 */
-	max?: number;
-	/**
-	 * Internal use only.
-	 */
-	isBlackboxChild?: boolean;
-	/**
-	 * @deprecated
-	 */
-	custom?: ValidateFunction;
-	/**
-	 * Used in GraphQL. If true, the field will be omitted from the schema.
-	 */
-	private?: boolean;
-	/**
-	 * Used in GraphQL. When in GraphQL, this resolver will replace the static field.
-	 */
-	graphQLResolver?: (...args: any) => any;
-	/**
-	 * Used in GraphQL. Sets the key of the field in the GraphQL schema. You must set this value when building your schema.
-	 */
-	key?: string;
-	/**
-	 * The name that would be displayed in a front-end form
-	 */
-	label?: string;
-	/**
-	 * The description that would be displayed in a front-end form
-	 */
-	description?: string;
-	/**
-	 * The placeholder that would be displayed in a front-end form
-	 */
-	placeholder?: string;
-	/**
-	 * The field type that would be used in a front-end form
-	 */
-	fieldType?: string;
-	/**
-	 * The field options that will be passed as props to the front-end field
-	 */
-	fieldOptions?: any;
-}
-export interface CurrentNodeInfoOptions {
-	autoConvert?: boolean;
-	filter?: boolean;
-	trimStrings?: boolean;
-	removeEmptyStrings?: boolean;
-	forceDoc?: any;
-	omitRequired?: boolean;
-}
-export interface CurrentNodeInfo {
-	/**
-	 * The global schema, prefaced by {type: {...}} to be compatible with subschemas
-	 * Sometimes it's given without {type: {...}}. TODO: Normalize this.
-	 */
-	schema?: SchemaNode | Schema;
-	/**
-	 * The current node subschema
-	 */
-	currentSchema?: Partial<SchemaNode>;
-	value: any;
-	doc?: any;
-	currentDoc?: any;
-	options?: CurrentNodeInfoOptions;
-	args?: any[];
-	type?: SchemaMetaFieldType;
-	keys?: string[];
-	addError?: (keys: string[], code: string | object) => void;
-}
-export interface ModelResolversMap {
-	[key: string]: ModelResolver<ModelResolverResolve>;
-}
-export interface CloneOptions {
-	name: string;
-	omitFields?: string[];
-	pickFields?: string[];
-	mapFields?: (field: any, key: string) => any;
-	extendSchema?: Schema;
-	extendResolvers?: ModelResolversMap;
-}
-export interface Model<TSchema = any> {
-	__isModel: boolean;
-	/**
-	 * The name of the model, used for example for GraphQL
-	 */
-	name: string;
-	/**
-	 * Returns the schema of the model
-	 */
-	getSchema: () => Schema & {
-		__model: Model;
-	};
-	/**
-	 * Returns the schema without adding __model to the schema
-	 */
-	getCleanSchema: () => Schema;
-	/**
-	 * Returns the model resolvers
-	 */
-	getResolvers: () => ModelResolversMap;
-	/**
-	 * Adds the model resolvers to a item
-	 */
-	initItem: (item: any) => any;
-	/**
-	 * Validates an item using @orion-js/schema
-	 */
-	validate: (item: any) => Promise<any>;
-	/**
-	 * Cleans an item using @orion-js/schema
-	 */
-	clean: (item: any) => Promise<TSchema>;
-	/**
-	 * Cleans and validates an item using @orion-js/schema
-	 */
-	cleanAndValidate: (item: any) => Promise<TSchema>;
-	/**
-	 * Creates a new model using this one as a base
-	 */
-	clone: (cloneOptions: CloneOptions) => Model;
-	/**
-	 * The type of the model. Only use this in typescript
-	 */
-	type: TSchema;
-}
-interface FieldType$1 {
-	name: string;
-	validate: ValidateFunction$1;
-	clean: CleanFunction$1;
-	meta?: any;
-	toGraphQLType?: (GraphQL: any) => any;
-	_isFieldType: boolean;
-}
-type Constructor$1<T> = new (...args: any[]) => T;
-type Blackbox$1 = {
-	[name: string]: any;
-};
-type FieldTypesList$1 = "string" | "date" | "integer" | "number" | "ID" | "boolean" | "email" | "blackbox" | "any";
-type TypedModelOnSchema$1 = Function;
-type ConstructorsTypesList$1 = Constructor$1<String> | Constructor$1<Number> | Constructor$1<Boolean> | Constructor$1<Date>;
-type SchemaRecursiveNodeTypeExtras$1 = {
-	_isFieldType?: boolean;
-	__clean?: CleanFunction$1;
-	__validate?: ValidateFunction$1;
-	__skipChildValidation?: (value: any, info: CurrentNodeInfo$1) => Promise<boolean>;
-};
-interface Schema$1 {
-	[key: string]: SchemaNode$1 | Function;
-}
-type SchemaRecursiveNodeType$1 = Schema$1 & SchemaRecursiveNodeTypeExtras$1;
-type SchemaMetaFieldTypeSingle$1 = FieldTypesList$1 | ConstructorsTypesList$1 | SchemaRecursiveNodeType$1 | FieldType$1 | TypedModelOnSchema$1;
-type SchemaMetaFieldType$1 = SchemaMetaFieldTypeSingle$1 | SchemaMetaFieldTypeSingle$1[];
-type ValidateFunction$1 = (value: any, info?: Partial<CurrentNodeInfo$1>, ...args: any[]) => object | string | void | Promise<object | string | void>;
-type CleanFunction$1 = (value: any, info?: Partial<CurrentNodeInfo$1>, ...args: any[]) => any | Promise<any>;
-interface SchemaNode$1 {
-	/**
-	 * The type of the field. Used for type validations. Can also contain a subschema.
-	 */
-	type: SchemaMetaFieldType$1;
-	/**
-	 * Defaults to false
-	 */
-	optional?: boolean;
-	allowedValues?: Array<any>;
-	defaultValue?: ((info: CurrentNodeInfo$1, ...args: any[]) => any | Promise<any>) | any;
-	/**
-	 * Function that takes a value and returns an error message if there are any errors. Must return null or undefined otherwise.
-	 */
-	validate?: ValidateFunction$1;
-	/**
-	 * Function that preprocesses a value before it is set.
-	 */
-	clean?: CleanFunction$1;
-	autoValue?: (value: any, info: CurrentNodeInfo$1, ...args: any[]) => any | Promise<any>;
-	/**
-	 * The minimum value if it's a number, the minimum length if it's a string or array.
-	 */
-	min?: number;
-	/**
-	 * The maximum value if it's a number, the maximum length if it's a string or array.
-	 */
-	max?: number;
-	/**
-	 * Internal use only.
-	 */
-	isBlackboxChild?: boolean;
-	/**
-	 * @deprecated
-	 */
-	custom?: ValidateFunction$1;
-	/**
-	 * Used in GraphQL. If true, the field will be omitted from the schema.
-	 */
-	private?: boolean;
-	/**
-	 * Used in GraphQL. When in GraphQL, this resolver will replace the static field.
-	 */
-	graphQLResolver?: (...args: any) => any;
-	/**
-	 * Used in GraphQL. Sets the key of the field in the GraphQL schema. You must set this value when building your schema.
-	 */
-	key?: string;
-	/**
-	 * The name that would be displayed in a front-end form
-	 */
-	label?: string;
-	/**
-	 * The description that would be displayed in a front-end form
-	 */
-	description?: string;
-	/**
-	 * The placeholder that would be displayed in a front-end form
-	 */
-	placeholder?: string;
-	/**
-	 * The field type that would be used in a front-end form
-	 */
-	fieldType?: string;
-	/**
-	 * The field options that will be passed as props to the front-end field
-	 */
-	fieldOptions?: any;
-}
-interface CurrentNodeInfoOptions$1 {
-	autoConvert?: boolean;
-	filter?: boolean;
-	trimStrings?: boolean;
-	removeEmptyStrings?: boolean;
-	forceDoc?: any;
-	omitRequired?: boolean;
-}
-interface CurrentNodeInfo$1 {
-	/**
-	 * The global schema, prefaced by {type: {...}} to be compatible with subschemas
-	 * Sometimes it's given without {type: {...}}. TODO: Normalize this.
-	 */
-	schema?: SchemaNode$1 | Schema$1;
-	/**
-	 * The current node subschema
-	 */
-	currentSchema?: Partial<SchemaNode$1>;
-	value: any;
-	doc?: any;
-	currentDoc?: any;
-	options?: CurrentNodeInfoOptions$1;
-	args?: any[];
-	type?: SchemaMetaFieldType$1;
-	keys?: string[];
-	addError?: (keys: string[], code: string | object) => void;
-}
 export interface OrionMongoClient {
 	client: MongoClient;
 	db: Db;
@@ -402,7 +24,7 @@ export type RemoveFunctions<T extends ModelClassBase> = Pick<T, {
 };
 export type ModelClassBase = {
 	_id: string;
-} & Blackbox$1;
+} & Blackbox;
 export type DocumentWithIdOptional<T extends ModelClassBase> = Omit<T, "_id"> & {
 	/**
 	 * The ID of the document
@@ -520,14 +142,14 @@ export type CreateCollection = <ModelClass extends ModelClassBase = any>(options
 export declare class Collection<ModelClass extends ModelClassBase = ModelClassBase> {
 	name: string;
 	connectionName?: string;
-	schema?: Schema$1;
+	schema?: Schema;
 	/**
 	 * @deprecated Use schema instead. If you use model, all items will be initialized with the model to add resolvers (which are also deprecated)
 	 */
 	model?: Model;
 	indexes: Array<CollectionIndex>;
 	generateId: () => ModelClass["_id"];
-	getSchema: () => Schema$1;
+	getSchema: () => Schema;
 	db: MongoDB.Db;
 	client: OrionMongoClient;
 	rawCollection: MongoDB.Collection<ModelClass>;

package/dist/index.js

@@ -31496,151 +31496,133 @@ var require_jsbn = __commonJS((exports, module) => {
 
 // ../../node_modules/sprintf-js/src/sprintf.js
 var require_sprintf = __commonJS((exports) => {
-  (function() {
+  (function(window2) {
     var re = {
       not_string: /[^s]/,
-      not_bool: /[^t]/,
-      not_type: /[^T]/,
-      not_primitive: /[^v]/,
       number: /[diefg]/,
-      numeric_arg: /[bcdiefguxX]/,
       json: /[j]/,
       not_json: /[^j]/,
       text: /^[^\x25]+/,
       modulo: /^\x25{2}/,
-      placeholder: /^\x25(?:([1-9]\d*)\$|\(([^)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijostTuvxX])/,
+      placeholder: /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijosuxX])/,
       key: /^([a-z_][a-z_\d]*)/i,
       key_access: /^\.([a-z_][a-z_\d]*)/i,
       index_access: /^\[(\d+)\]/,
-      sign: /^[+-]/
+      sign: /^[\+\-]/
     };
-    function sprintf(key) {
-      return sprintf_format(sprintf_parse(key), arguments);
-    }
-    function vsprintf(fmt, argv) {
-      return sprintf.apply(null, [fmt].concat(argv || []));
+    function sprintf() {
+      var key = arguments[0], cache2 = sprintf.cache;
+      if (!(cache2[key] && cache2.hasOwnProperty(key))) {
+        cache2[key] = sprintf.parse(key);
+      }
+      return sprintf.format.call(null, cache2[key], arguments);
     }
-    function sprintf_format(parse_tree, argv) {
-      var cursor = 1, tree_length = parse_tree.length, arg, output = "", i, k, ph, pad, pad_character, pad_length, is_positive, sign;
+    sprintf.format = function(parse_tree, argv) {
+      var cursor = 1, tree_length = parse_tree.length, node_type = "", arg, output = [], i, k, match, pad, pad_character, pad_length, is_positive = true, sign = "";
       for (i = 0;i < tree_length; i++) {
-        if (typeof parse_tree[i] === "string") {
-          output += parse_tree[i];
-        } else if (typeof parse_tree[i] === "object") {
-          ph = parse_tree[i];
-          if (ph.keys) {
+        node_type = get_type(parse_tree[i]);
+        if (node_type === "string") {
+          output[output.length] = parse_tree[i];
+        } else if (node_type === "array") {
+          match = parse_tree[i];
+          if (match[2]) {
             arg = argv[cursor];
-            for (k = 0;k < ph.keys.length; k++) {
-              if (arg == undefined) {
-                throw new Error(sprintf('[sprintf] Cannot access property "%s" of undefined value "%s"', ph.keys[k], ph.keys[k - 1]));
+            for (k = 0;k < match[2].length; k++) {
+              if (!arg.hasOwnProperty(match[2][k])) {
+                throw new Error(sprintf("[sprintf] property '%s' does not exist", match[2][k]));
               }
-              arg = arg[ph.keys[k]];
+              arg = arg[match[2][k]];
             }
-          } else if (ph.param_no) {
-            arg = argv[ph.param_no];
+          } else if (match[1]) {
+            arg = argv[match[1]];
           } else {
             arg = argv[cursor++];
           }
-          if (re.not_type.test(ph.type) && re.not_primitive.test(ph.type) && arg instanceof Function) {
+          if (get_type(arg) == "function") {
             arg = arg();
           }
-          if (re.numeric_arg.test(ph.type) && (typeof arg !== "number" && isNaN(arg))) {
-            throw new TypeError(sprintf("[sprintf] expecting number but found %T", arg));
+          if (re.not_string.test(match[8]) && re.not_json.test(match[8]) && (get_type(arg) != "number" && isNaN(arg))) {
+            throw new TypeError(sprintf("[sprintf] expecting number but found %s", get_type(arg)));
           }
-          if (re.number.test(ph.type)) {
+          if (re.number.test(match[8])) {
             is_positive = arg >= 0;
           }
-          switch (ph.type) {
+          switch (match[8]) {
             case "b":
-              arg = parseInt(arg, 10).toString(2);
+              arg = arg.toString(2);
               break;
             case "c":
-              arg = String.fromCharCode(parseInt(arg, 10));
+              arg = String.fromCharCode(arg);
               break;
             case "d":
             case "i":
               arg = parseInt(arg, 10);
               break;
             case "j":
-              arg = JSON.stringify(arg, null, ph.width ? parseInt(ph.width) : 0);
+              arg = JSON.stringify(arg, null, match[6] ? parseInt(match[6]) : 0);
               break;
             case "e":
-              arg = ph.precision ? parseFloat(arg).toExponential(ph.precision) : parseFloat(arg).toExponential();
+              arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential();
               break;
             case "f":
-              arg = ph.precision ? parseFloat(arg).toFixed(ph.precision) : parseFloat(arg);
+              arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg);
               break;
             case "g":
-              arg = ph.precision ? String(Number(arg.toPrecision(ph.precision))) : parseFloat(arg);
+              arg = match[7] ? parseFloat(arg).toPrecision(match[7]) : parseFloat(arg);
               break;
             case "o":
-              arg = (parseInt(arg, 10) >>> 0).toString(8);
+              arg = arg.toString(8);
               break;
             case "s":
-              arg = String(arg);
-              arg = ph.precision ? arg.substring(0, ph.precision) : arg;
-              break;
-            case "t":
-              arg = String(!!arg);
-              arg = ph.precision ? arg.substring(0, ph.precision) : arg;
-              break;
-            case "T":
-              arg = Object.prototype.toString.call(arg).slice(8, -1).toLowerCase();
-              arg = ph.precision ? arg.substring(0, ph.precision) : arg;
+              arg = (arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg;
               break;
             case "u":
-              arg = parseInt(arg, 10) >>> 0;
-              break;
-            case "v":
-              arg = arg.valueOf();
-              arg = ph.precision ? arg.substring(0, ph.precision) : arg;
+              arg = arg >>> 0;
               break;
             case "x":
-              arg = (parseInt(arg, 10) >>> 0).toString(16);
+              arg = arg.toString(16);
               break;
             case "X":
-              arg = (parseInt(arg, 10) >>> 0).toString(16).toUpperCase();
+              arg = arg.toString(16).toUpperCase();
               break;
           }
-          if (re.json.test(ph.type)) {
-            output += arg;
+          if (re.json.test(match[8])) {
+            output[output.length] = arg;
           } else {
-            if (re.number.test(ph.type) && (!is_positive || ph.sign)) {
+            if (re.number.test(match[8]) && (!is_positive || match[3])) {
               sign = is_positive ? "+" : "-";
               arg = arg.toString().replace(re.sign, "");
             } else {
               sign = "";
             }
-            pad_character = ph.pad_char ? ph.pad_char === "0" ? "0" : ph.pad_char.charAt(1) : " ";
-            pad_length = ph.width - (sign + arg).length;
-            pad = ph.width ? pad_length > 0 ? pad_character.repeat(pad_length) : "" : "";
-            output += ph.align ? sign + arg + pad : pad_character === "0" ? sign + pad + arg : pad + sign + arg;
+            pad_character = match[4] ? match[4] === "0" ? "0" : match[4].charAt(1) : " ";
+            pad_length = match[6] - (sign + arg).length;
+            pad = match[6] ? pad_length > 0 ? str_repeat(pad_character, pad_length) : "" : "";
+            output[output.length] = match[5] ? sign + arg + pad : pad_character === "0" ? sign + pad + arg : pad + sign + arg;
           }
         }
       }
-      return output;
-    }
-    var sprintf_cache = Object.create(null);
-    function sprintf_parse(fmt) {
-      if (sprintf_cache[fmt]) {
-        return sprintf_cache[fmt];
-      }
-      var _fmt = fmt, match, parse_tree = [], arg_names = 0;
+      return output.join("");
+    };
+    sprintf.cache = {};
+    sprintf.parse = function(fmt) {
+      var _fmt = fmt, match = [], parse_tree = [], arg_names = 0;
       while (_fmt) {
         if ((match = re.text.exec(_fmt)) !== null) {
-          parse_tree.push(match[0]);
+          parse_tree[parse_tree.length] = match[0];
         } else if ((match = re.modulo.exec(_fmt)) !== null) {
-          parse_tree.push("%");
+          parse_tree[parse_tree.length] = "%";
         } else if ((match = re.placeholder.exec(_fmt)) !== null) {
           if (match[2]) {
             arg_names |= 1;
             var field_list = [], replacement_field = match[2], field_match = [];
             if ((field_match = re.key.exec(replacement_field)) !== null) {
-              field_list.push(field_match[1]);
+              field_list[field_list.length] = field_match[1];
               while ((replacement_field = replacement_field.substring(field_match[0].length)) !== "") {
                 if ((field_match = re.key_access.exec(replacement_field)) !== null) {
-                  field_list.push(field_match[1]);
+                  field_list[field_list.length] = field_match[1];
                 } else if ((field_match = re.index_access.exec(replacement_field)) !== null) {
-                  field_list.push(field_match[1]);
+                  field_list[field_list.length] = field_match[1];
                 } else {
                   throw new SyntaxError("[sprintf] failed to parse named argument key");
                 }
@@ -31655,32 +31637,32 @@ var require_sprintf = __commonJS((exports) => {
           if (arg_names === 3) {
             throw new Error("[sprintf] mixing positional and named placeholders is not (yet) supported");
           }
-          parse_tree.push({
-            placeholder: match[0],
-            param_no: match[1],
-            keys: match[2],
-            sign: match[3],
-            pad_char: match[4],
-            align: match[5],
-            width: match[6],
-            precision: match[7],
-            type: match[8]
-          });
+          parse_tree[parse_tree.length] = match;
         } else {
           throw new SyntaxError("[sprintf] unexpected placeholder");
         }
         _fmt = _fmt.substring(match[0].length);
       }
-      return sprintf_cache[fmt] = parse_tree;
+      return parse_tree;
+    };
+    var vsprintf = function(fmt, argv, _argv) {
+      _argv = (argv || []).slice(0);
+      _argv.splice(0, 0, fmt);
+      return sprintf.apply(null, _argv);
+    };
+    function get_type(variable) {
+      return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase();
+    }
+    function str_repeat(input, multiplier) {
+      return Array(multiplier + 1).join(input);
     }
     if (typeof exports !== "undefined") {
       exports.sprintf = sprintf;
       exports.vsprintf = vsprintf;
-    }
-    if (typeof window !== "undefined") {
-      window["sprintf"] = sprintf;
-      window["vsprintf"] = vsprintf;
-      if (typeof define === "function" && define["amd"]) {
+    } else {
+      window2.sprintf = sprintf;
+      window2.vsprintf = vsprintf;
+      if (typeof define === "function" && define.amd) {
         define(function() {
           return {
             sprintf,
@@ -31689,7 +31671,7 @@ var require_sprintf = __commonJS((exports) => {
         });
       }
     }
-  })();
+  })(typeof window === "undefined" ? exports : window);
 });
 
 // ../../node_modules/ip-address/dist/ipv4.js
@@ -46827,7 +46809,7 @@ function findOne_default(collection) {
   return findOne;
 }
 
-// ../schema/dist/index.js
+// node_modules/@orion-js/schema/dist/index.js
 var __create2 = Object.create;
 var __getProtoOf2 = Object.getPrototypeOf;
 var __defProp2 = Object.defineProperty;
@@ -50480,7 +50462,7 @@ function loadOne_default(collection) {
   return loadOne;
 }
 
-// ../helpers/dist/index.js
+// node_modules/@orion-js/helpers/dist/index.js
 import { createRequire as createRequire2 } from "node:module";
 import crypto2 from "crypto";
 var __create3 = Object.create;
@@ -54594,7 +54576,7 @@ function getDBName(url) {
   return dbName;
 }
 
-// ../env/dist/index.js
+// node_modules/@orion-js/env/dist/index.js
 import { createRequire as createRequire3 } from "node:module";
 import fs from "node:fs";
 var __create4 = Object.create;
@@ -63901,7 +63883,7 @@ var getMongoURLFromEnv = (connectionName) => {
   return uri;
 };
 
-// ../logger/dist/index.js
+// node_modules/@orion-js/logger/dist/index.js
 import { createRequire as createRequire4 } from "node:module";
 import util from "node:util";
 var __create5 = Object.create;
@@ -80568,7 +80550,7 @@ var improveFileName = (path) => {
   return path;
 };
 var transports2 = [
-  process.env.ORION_DEV || process.env.JEST_WORKER_ID ? textConsoleTransport : jsonConsoleTransport
+  textConsoleTransport
 ];
 var winstonLogger = import_winston2.createLogger({
   levels: import_winston2.config.npm.levels,
@@ -80682,7 +80664,7 @@ class Collection {
   createIndexesPromise;
   connectionPromise;
 }
-// ../services/dist/index.js
+// node_modules/@orion-js/services/dist/index.js
 var __create6 = Object.create;
 var __getProtoOf6 = Object.getPrototypeOf;
 var __defProp6 = Object.defineProperty;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/mongodb",
-  "version": "4.0.0-alpha.3",
+  "version": "4.0.0-next.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -22,14 +22,14 @@
     "clean": "rm -rf ./dist"
   },
   "dependencies": {
-    "@orion-js/env": "^4.0.0-alpha.2",
-    "@orion-js/helpers": "^4.0.0-alpha.2",
-    "@orion-js/logger": "^4.0.0-alpha.2",
-    "@orion-js/models": "^4.0.0-alpha.2",
-    "@orion-js/resolvers": "^4.0.0-alpha.2",
-    "@orion-js/schema": "^4.0.0-alpha.2",
-    "@orion-js/services": "^4.0.0-alpha.2",
-    "@orion-js/typed-model": "^4.0.0-alpha.2",
+    "@orion-js/env": "^4.0.0-next.0",
+    "@orion-js/helpers": "^4.0.0-next.0",
+    "@orion-js/logger": "^4.0.0-next.0",
+    "@orion-js/models": "^4.0.0-next.0",
+    "@orion-js/resolvers": "^4.0.0-next.0",
+    "@orion-js/schema": "^4.0.0-next.0",
+    "@orion-js/services": "^4.0.0-next.0",
+    "@orion-js/typed-model": "^4.0.0-next.0",
     "bson": "^6.10.3",
     "dataloader": "2.2.2",
     "dot-object": "2.1.4",