@typegoose/typegoose - npm Package Compare versions

Comparing version 7.1.0 to 7.1.1

lib/defaultClasses.d.ts

 import type { Types } from 'mongoose';
-import type { DocumentType, RefType } from './types';
+import type { AnyParamConstructor, DocumentType, RefType } from './types';
 export declare abstract class TimeStamps {
@@ -12,4 +12,4 @@ createdAt: Readonly<Date>;
     _id: T_ID;
-    __v: number;
-    __t: undefined | string | number;
+    __v?: number;
+    __t?: string | number;
 }
@@ -24,3 +24,3 @@ export interface FindOrCreateResult<T> {
 export declare abstract class FindOrCreate {
-    static findOrCreate: <T extends FindOrCreate>(this: new (...a: any[]) => T, condition: any) => Promise<FindOrCreateResult<T>>;
+    static findOrCreate: <T extends FindOrCreate>(this: AnyParamConstructor<T>, condition: any) => Promise<FindOrCreateResult<T>>;
 }

lib/index.d.ts

@@ -13,2 +13,2 @@ import type { IndexOptions } from './types';
 export declare function index<T = {}>(fields: T, options?: IndexOptions<T>): (target: any) => void;
-export declare const Index: typeof index;
+export { index as Index };

lib/index.js

@@ -27,4 +27,3 @@ "use strict";
 exports.index = index;
-// Export it PascalCased
 exports.Index = index;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsb0RBQXFEO0FBQ3JELDRDQUEyQztBQUMzQywrQ0FBdUM7QUFHdkM7Ozs7Ozs7OztHQVNHO0FBQ0gsU0FBZ0IsS0FBSyxDQUFTLE1BQVMsRUFBRSxPQUF5QjtJQUNoRSxPQUFPLENBQUMsTUFBVyxFQUFFLEVBQUU7O1FBQ3JCLG9CQUFNLENBQUMsSUFBSSxDQUFDLDJCQUEyQixFQUFFLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxFQUFFLGVBQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQy9FLE1BQU0sT0FBTyxHQUF1QixLQUFLLENBQUMsSUFBSSxPQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMseUJBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxDQUFDLG1DQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ3ZHLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztRQUNsQyxPQUFPLENBQUMsY0FBYyxDQUFDLHlCQUFhLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUMvRCxDQUFDLENBQUM7QUFDSixDQUFDO0FBUEQsc0JBT0M7QUFFRCx3QkFBd0I7QUFDWCxRQUFBLEtBQUssR0FBRyxLQUFLLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsb0RBQXFEO0FBQ3JELDRDQUEyQztBQUMzQywrQ0FBdUM7QUFHdkM7Ozs7Ozs7OztHQVNHO0FBQ0gsU0FBZ0IsS0FBSyxDQUFTLE1BQVMsRUFBRSxPQUF5QjtJQUNoRSxPQUFPLENBQUMsTUFBVyxFQUFFLEVBQUU7O1FBQ3JCLG9CQUFNLENBQUMsSUFBSSxDQUFDLDJCQUEyQixFQUFFLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxFQUFFLGVBQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQy9FLE1BQU0sT0FBTyxHQUF1QixLQUFLLENBQUMsSUFBSSxPQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMseUJBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxDQUFDLG1DQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ3ZHLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztRQUNsQyxPQUFPLENBQUMsY0FBYyxDQUFDLHlCQUFhLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUMvRCxDQUFDLENBQUM7QUFDSixDQUFDO0FBUEQsc0JBT0M7QUFHaUIsc0JBQUsifQ==

lib/internal/utils.d.ts

 import * as mongoose from 'mongoose';
-import type { AnyParamConstructor, Func, IObjectWithTypegooseFunction, IObjectWithTypegooseName, IPrototype, PropOptionsWithNumberValidate, PropOptionsWithStringValidate, VirtualOptions } from '../types';
+import type { AnyParamConstructor, Func, IObjectWithTypegooseFunction, IObjectWithTypegooseName, IPrototype, PropOptionsForNumber, PropOptionsForString, VirtualOptions } from '../types';
 import { DecoratorKeys, WhatIsIt } from './constants';
@@ -56,3 +56,3 @@ /**
  */
-export declare function isWithStringValidate(options: PropOptionsWithStringValidate): options is PropOptionsWithStringValidate;
+export declare function isWithStringValidate(options: PropOptionsForString): options is PropOptionsForString;
 /**
@@ -62,3 +62,3 @@ * Return true if there are Options
  */
-export declare function isWithStringTransform(options: PropOptionsWithStringValidate): options is PropOptionsWithStringValidate;
+export declare function isWithStringTransform(options: PropOptionsForString): options is PropOptionsForString;
 /**
@@ -68,3 +68,3 @@ * Return true if there are Options
  */
-export declare function isWithNumberValidate(options: PropOptionsWithNumberValidate): options is PropOptionsWithNumberValidate;
+export declare function isWithNumberValidate(options: PropOptionsForNumber): options is PropOptionsForNumber;
 /**
@@ -71,0 +71,0 @@ * Check if Options include Virtual Populate Options

lib/internal/utils.js

@@ -526,2 +526,2 @@ "use strict";
 exports.isConstructor = isConstructor;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/internal/utils.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/internal/utils.ts"],"names":[],"mappings":"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"}

lib/modelOptions.d.ts

@@ -14,2 +14,2 @@ import type { IModelOptions } from './types';
 export declare function modelOptions(options: IModelOptions): (target: any) => void;
-export declare const ModelOptions: typeof modelOptions;
+export { modelOptions as ModelOptions };

lib/modelOptions.js

@@ -24,4 +24,3 @@ "use strict";
 exports.modelOptions = modelOptions;
-// Export it PascalCased
 exports.ModelOptions = modelOptions;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kZWxPcHRpb25zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21vZGVsT3B0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxvREFBcUQ7QUFDckQsNENBQTRFO0FBRzVFOzs7Ozs7Ozs7O0dBVUc7QUFDSCxTQUFnQixZQUFZLENBQUMsT0FBc0I7SUFDakQsT0FBTyxDQUFDLE1BQVcsRUFBRSxFQUFFO1FBQ3JCLGdDQUF3QixDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ2pDLHNCQUFjLENBQUMseUJBQWEsQ0FBQyxZQUFZLEVBQUUsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQzlELENBQUMsQ0FBQztBQUNKLENBQUM7QUFMRCxvQ0FLQztBQUVELHdCQUF3QjtBQUNYLFFBQUEsWUFBWSxHQUFHLFlBQVksQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kZWxPcHRpb25zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21vZGVsT3B0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxvREFBcUQ7QUFDckQsNENBQTRFO0FBRzVFOzs7Ozs7Ozs7O0dBVUc7QUFDSCxTQUFnQixZQUFZLENBQUMsT0FBc0I7SUFDakQsT0FBTyxDQUFDLE1BQVcsRUFBRSxFQUFFO1FBQ3JCLGdDQUF3QixDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ2pDLHNCQUFjLENBQUMseUJBQWEsQ0FBQyxZQUFZLEVBQUUsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQzlELENBQUMsQ0FBQztBQUNKLENBQUM7QUFMRCxvQ0FLQztBQUd3QixvQ0FBWSJ9

lib/plugin.d.ts

@@ -8,2 +8,2 @@ import type { Func } from './types';
 export declare function plugin<TFunc extends Func, TParams = Parameters<TFunc>[1]>(mongoosePlugin: TFunc, options?: TParams): (target: any) => void;
-export declare const Plugin: typeof plugin;
+export { plugin as Plugins };

lib/plugin.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Plugin = exports.plugin = void 0;
+exports.Plugins = exports.plugin = void 0;
 const constants_1 = require("./internal/constants");
@@ -23,4 +23,3 @@ const utils_1 = require("./internal/utils");
 exports.plugin = plugin;
-// Export it PascalCased
-exports.Plugin = plugin;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3BsdWdpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxvREFBcUQ7QUFDckQsNENBQTJDO0FBQzNDLCtDQUF1QztBQUd2Qzs7OztHQUlHO0FBQ0gsU0FBZ0IsTUFBTSxDQUFxRCxjQUFxQixFQUFFLE9BQWlCO0lBQ2pILGlGQUFpRjtJQUNqRixPQUFPLENBQUMsTUFBVyxFQUFFLEVBQUU7O1FBQ3JCLG9CQUFNLENBQUMsSUFBSSxDQUFDLCtDQUErQyxFQUFFLGNBQWMsQ0FBQyxJQUFJLEVBQUUsZUFBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQzVHLE1BQU0sT0FBTyxHQUF5QixLQUFLLENBQUMsSUFBSSxPQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMseUJBQWEsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLG1DQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQzNHLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxjQUFjLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztRQUMxQyxPQUFPLENBQUMsY0FBYyxDQUFDLHlCQUFhLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNqRSxDQUFDLENBQUM7QUFDSixDQUFDO0FBUkQsd0JBUUM7QUFFRCx3QkFBd0I7QUFDWCxRQUFBLE1BQU0sR0FBRyxNQUFNLENBQUMifQ==
+exports.Plugins = plugin;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3BsdWdpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxvREFBcUQ7QUFDckQsNENBQTJDO0FBQzNDLCtDQUF1QztBQUd2Qzs7OztHQUlHO0FBQ0gsU0FBZ0IsTUFBTSxDQUFxRCxjQUFxQixFQUFFLE9BQWlCO0lBQ2pILGlGQUFpRjtJQUNqRixPQUFPLENBQUMsTUFBVyxFQUFFLEVBQUU7O1FBQ3JCLG9CQUFNLENBQUMsSUFBSSxDQUFDLCtDQUErQyxFQUFFLGNBQWMsQ0FBQyxJQUFJLEVBQUUsZUFBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQzVHLE1BQU0sT0FBTyxHQUF5QixLQUFLLENBQUMsSUFBSSxPQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMseUJBQWEsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLG1DQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQzNHLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxjQUFjLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztRQUMxQyxPQUFPLENBQUMsY0FBYyxDQUFDLHlCQUFhLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNqRSxDQUFDLENBQUM7QUFDSixDQUFDO0FBUkQsd0JBUUM7QUFHa0IseUJBQU8ifQ==

lib/prop.d.ts

@@ -1,2 +0,3 @@
-import type { ArrayPropOptions, DecoratedPropertyMetadata, MapPropOptions, PropOptionsWithValidate } from './types';
+import { WhatIsIt } from './internal/constants';
+import type { ArrayPropOptions, BasePropOptions, DecoratedPropertyMetadata, MapPropOptions, PropOptionsForNumber, PropOptionsForString, VirtualOptions } from './types';
 /**
@@ -10,19 +11,25 @@ * Function that is the actual processing of the prop's (used for caching)
  * @param options Options
- * @public
+ * @param kind Overwrite auto-inferred kind
  */
-export declare function prop(options?: PropOptionsWithValidate): (target: any, key: string) => void;
+declare function prop(options?: BasePropOptions, kind?: WhatIsIt): any;
+declare function prop(options?: ArrayPropOptions, kind?: WhatIsIt): any;
+declare function prop(options?: MapPropOptions, kind?: WhatIsIt): any;
+declare function prop(options?: VirtualOptions, kind?: WhatIsIt): any;
+declare function prop(options?: PropOptionsForNumber, kind?: WhatIsIt): any;
+declare function prop(options?: PropOptionsForString, kind?: WhatIsIt): any;
 /**
  * Set Property(that are Maps) Options for the property below
  * @param options Options for the Map
- * @public
+ *
+ * @deprecated use "prop"
  */
-export declare function mapProp(options: MapPropOptions): (target: any, key: string) => void;
+declare function mapProp(options: MapPropOptions): any;
 /**
  * Set Property(that are Arrays) Options for the property below
  * @param options Options
- * @public
+ *
+ * @deprecated use "prop"
  */
-export declare function arrayProp(options: ArrayPropOptions): (target: any, key: string) => void;
-export declare const Prop: typeof prop;
-export declare const ArrayProp: typeof arrayProp;
-export declare const MapProp: typeof mapProp;
+declare function arrayProp(options: ArrayPropOptions): any;
+export { prop, arrayProp, mapProp };
+export { prop as Prop, arrayProp as ArrayProp, mapProp as MapProp };

lib/prop.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MapProp = exports.ArrayProp = exports.Prop = exports.arrayProp = exports.mapProp = exports.prop = exports._buildPropMetadata = void 0;
+exports.MapProp = exports.ArrayProp = exports.Prop = exports.mapProp = exports.arrayProp = exports.prop = exports._buildPropMetadata = void 0;
 const mongoose = require("mongoose");
@@ -114,3 +114,3 @@ const util_1 = require("util");
         if (!Array.isArray(enumOption)) {
-            if (Type === String) {
+            if (Type === String || Type === mongoose.Schema.Types.String) {
                 rawOptions.enum = Object.entries(enumOption) // get all key-value pairs of the enum
@@ -128,3 +128,3 @@ // no reverse-filtering because if it is full of strings, there is no reverse mapping
             }
-            else if (Type === Number) {
+            else if (Type === Number || Type === mongoose.Schema.Types.Number) {
                 rawOptions.enum = Object.entries(enumOption) // get all key-value pairs of the enum
@@ -234,26 +234,26 @@ // filter out the "reverse (value -> name) mappings"
 exports._buildPropMetadata = _buildPropMetadata;
-/**
- * Set Property Options for the property below
- * @param options Options
- * @public
- */
-function prop(options = {}) {
+function prop(options = {}, kind) {
     return (target, key) => {
         let Type = Reflect.getMetadata(constants_1.DecoratorKeys.Type, target, key);
         utils.assertion(!utils.isNullOrUndefined(Type), new errors_1.NoMetadataError(key));
-        let whatis = constants_1.WhatIsIt.NONE;
-        if (Type === Array) {
-            whatis = constants_1.WhatIsIt.ARRAY;
+        options = options !== null && options !== void 0 ? options : {};
+        if (!kind) {
+            if (Type === Array || Type === mongoose.Types.Array || Type === mongoose.Schema.Types.Array) {
+                kind = constants_1.WhatIsIt.ARRAY;
+            }
+            else if (Type === Map || Type === mongoose.Types.Map || Type === mongoose.Schema.Types.Map) {
+                kind = constants_1.WhatIsIt.MAP;
+            }
+            else {
+                kind = constants_1.WhatIsIt.NONE;
+            }
         }
-        else if (Type === Map) {
-            whatis = constants_1.WhatIsIt.MAP;
-        }
-        // soft errors
-        switch (whatis) {
+        // soft errors & "type"-alias mapping
+        switch (kind) {
             case constants_1.WhatIsIt.NONE:
                 if ('items' in options) {
-                    logSettings_1.logger.warn('You might not want to use option "items" in an normal @prop (%s.%s)', utils.getName(target), key);
+                    logSettings_1.logger.warn('You might not want to use option "items" for an non-array @prop type (%s.%s)', utils.getName(target), key);
                 }
                 if ('of' in options) {
-                    logSettings_1.logger.warn('You might not want to use option "of" in an normal @prop (%s.%s)', utils.getName(target), key);
+                    logSettings_1.logger.warn('You might not want to use option "of" for an non-map @prop type (%s.%s)', utils.getName(target), key);
                 }
@@ -263,3 +263,3 @@ break;
                 if ('items' in options) {
-                    Type = utils.getType(options.items);
+                    options.type = options.items;
                     delete options.items;
@@ -270,6 +270,10 @@ }
                 }
+                // set the "Type" to undefined, if "ref" or "refPath" are defined, otherwise the "refType" will be wrong
+                if ((('ref' in options) || ('refPath' in options)) && !('type' in options)) {
+                    Type = undefined;
+                }
                 break;
             case constants_1.WhatIsIt.MAP:
                 if ('of' in options) {
-                    Type = utils.getType(options.of);
+                    options.type = options.of;
                     delete options.of;
@@ -287,3 +291,3 @@ }
             target,
-            whatis
+            whatis: kind
         });
@@ -293,53 +297,25 @@ };
 exports.prop = prop;
+exports.Prop = prop;
 /**
  * Set Property(that are Maps) Options for the property below
  * @param options Options for the Map
- * @public
+ *
+ * @deprecated use "prop"
  */
 function mapProp(options) {
-    return (target, key) => {
-        const Type = utils.getType(options === null || options === void 0 ? void 0 : options.of);
-        delete options.of;
-        if ('items' in options) {
-            logSettings_1.logger.warn('You might not want to use option "items" in a @mapProp, use @arrayProp (%s.%s)', utils.getName(target), key);
-        }
-        baseProp({
-            Type,
-            key,
-            origOptions: options,
-            target,
-            whatis: constants_1.WhatIsIt.MAP
-        });
-    };
+    return prop(options, constants_1.WhatIsIt.MAP);
 }
 exports.mapProp = mapProp;
+exports.MapProp = mapProp;
 /**
  * Set Property(that are Arrays) Options for the property below
  * @param options Options
- * @public
+ *
+ * @deprecated use "prop"
  */
 function arrayProp(options) {
-    return (target, key) => {
-        const Type = utils.getType(options === null || options === void 0 ? void 0 : options.items);
-        if ('of' in options) {
-            logSettings_1.logger.warn('You might not want to use option "of" in a @arrayProp, use @mapProp (%s.%s)', utils.getName(target), key);
-        }
-        // Delete the "items" option from options because it got set as "Type"
-        if ('items' in options) {
-            delete options.items;
-        }
-        baseProp({
-            Type,
-            key,
-            origOptions: options,
-            target,
-            whatis: constants_1.WhatIsIt.ARRAY
-        });
-    };
+    return prop(options, constants_1.WhatIsIt.ARRAY);
 }
 exports.arrayProp = arrayProp;
-// Export it PascalCased
-exports.Prop = prop;
 exports.ArrayProp = arrayProp;
-exports.MapProp = mapProp;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prop.js","sourceRoot":"","sources":["../src/prop.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prop.js","sourceRoot":"","sources":["../src/prop.ts"],"names":[],"mappings":"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"}

lib/queryMethod.d.ts

@@ -28,2 +28,2 @@ /// <reference types="mongoose" />
 export declare function queryMethod<QueryHelpers, U extends AnyParamConstructor<any>>(func: (this: ReturnModelType<U, QueryHelpers>, ...params: any[]) => mongoose.DocumentQuery<any, any>): (target: any) => void;
-export declare const QueryMethod: typeof queryMethod;
+export { queryMethod as QueryMethod };

lib/queryMethod.js

@@ -40,4 +40,3 @@ "use strict";
 exports.queryMethod = queryMethod;
-// Export it PascalCased
 exports.QueryMethod = queryMethod;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnlNZXRob2QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcXVlcnlNZXRob2QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsb0RBQXFEO0FBQ3JELDRDQUEyQztBQUMzQywrQ0FBdUM7QUFJdkM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FzQkc7QUFDSCxTQUFnQixXQUFXLENBQ3pCLElBQW9HO0lBRXBHLE9BQU8sQ0FBQyxNQUFXLEVBQUUsRUFBRTs7UUFDckIsb0JBQU0sQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxlQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUMxRSxNQUFNLFlBQVksR0FBbUIsSUFBSSxHQUFHLE9BQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyx5QkFBYSxDQUFDLFdBQVcsRUFBRSxNQUFNLENBQUMsbUNBQUksRUFBRSxDQUFDLENBQUM7UUFDM0csWUFBWSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ2xDLE9BQU8sQ0FBQyxjQUFjLENBQUMseUJBQWEsQ0FBQyxXQUFXLEVBQUUsWUFBWSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQzFFLENBQUMsQ0FBQztBQUNKLENBQUM7QUFURCxrQ0FTQztBQUVELHdCQUF3QjtBQUNYLFFBQUEsV0FBVyxHQUFHLFdBQVcsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnlNZXRob2QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcXVlcnlNZXRob2QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsb0RBQXFEO0FBQ3JELDRDQUEyQztBQUMzQywrQ0FBdUM7QUFJdkM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FzQkc7QUFDSCxTQUFnQixXQUFXLENBQ3pCLElBQW9HO0lBRXBHLE9BQU8sQ0FBQyxNQUFXLEVBQUUsRUFBRTs7UUFDckIsb0JBQU0sQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxlQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUMxRSxNQUFNLFlBQVksR0FBbUIsSUFBSSxHQUFHLE9BQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyx5QkFBYSxDQUFDLFdBQVcsRUFBRSxNQUFNLENBQUMsbUNBQUksRUFBRSxDQUFDLENBQUM7UUFDM0csWUFBWSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ2xDLE9BQU8sQ0FBQyxjQUFjLENBQUMseUJBQWEsQ0FBQyxXQUFXLEVBQUUsWUFBWSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQzFFLENBQUMsQ0FBQztBQUNKLENBQUM7QUFURCxrQ0FTQztBQUd1QixrQ0FBVyJ9

lib/types.d.ts

@@ -162,7 +162,5 @@ /// <reference types="node" />
      */
-    autopopulate?: boolean | Function | {
-        [key: string]: any;
-    };
+    autopopulate?: boolean | Function | KeyStringAny;
     /** Reference an other Document (you should use Ref<T> as Prop type) */
-    ref?: any | DeferredFunc;
+    ref?: DeferredFunc | string | AnyParamConstructor<any>;
     /** Take the Path and try to resolve it to a Model */
@@ -177,4 +175,2 @@ refPath?: string;
 }
-export interface PropOptions extends BasePropOptions {
-}
 export interface ArrayPropOptions extends BasePropOptions {
@@ -192,5 +188,3 @@ /** What array is it?
      */
-    innerOptions?: {
-        [key: string]: any;
-    };
+    innerOptions?: KeyStringAny;
     /**
@@ -202,5 +196,3 @@ * Use this to define outer-options
      */
-    outerOptions?: {
-        [key: string]: any;
-    };
+    outerOptions?: KeyStringAny;
     /**
@@ -220,15 +212,17 @@ * How many dimensions this Array should have
 export interface ValidateNumberOptions {
-    /** The Number must be at least this high */
+    /** Only allow numbers that are higher than this */
     min?: number | [number, string];
-    /** The Number can only be lower than this */
+    /** Only allow numbers lower than this */
     max?: number | [number, string];
+    /** Only allow Values from the enum */
+    enum?: number[];
 }
 export interface ValidateStringOptions {
-    /** Only Allowes if the value matches an RegExp */
+    /** Only allow values that match this RegExp */
     match?: RegExp | [RegExp, string];
-    /** Only Allowes if the value is in the Enum */
+    /** Only allow Values from the enum */
     enum?: string[];
-    /** Only Allowes if the value is at least the lenght */
+    /** Only allow values that have at least this length */
     minlength?: number | [number, string];
-    /** Only Allowes if the value is not longer than the maxlenght */
+    /** Only allow values that have at max this length */
     maxlength?: number | [number, string];
@@ -246,3 +240,3 @@ }
     /** Reference an other Document (you should use Ref<T> as Prop type) */
-    ref: any | DeferredFunc;
+    ref: NonNullable<BasePropOptions['ref']>;
     /** Which property(on the current-Class) to match `foreignField` against */
@@ -256,6 +250,9 @@ localField: string;
     count?: boolean;
+    /** Extra Query Options */
+    options?: KeyStringAny;
+    /** Match Options */
+    match?: KeyStringAny | ((doc: any) => KeyStringAny);
 }
-export declare type PropOptionsWithNumberValidate = PropOptions & ValidateNumberOptions;
-export declare type PropOptionsWithStringValidate = PropOptions & TransformStringOptions & ValidateStringOptions;
-export declare type PropOptionsWithValidate = PropOptionsWithNumberValidate | PropOptionsWithStringValidate | VirtualOptions;
+export declare type PropOptionsForNumber = BasePropOptions & ValidateNumberOptions;
+export declare type PropOptionsForString = BasePropOptions & TransformStringOptions & ValidateStringOptions;
 export declare type RefType = number | string | mongoose.Types.ObjectId | Buffer | undefined;
@@ -385,5 +382,3 @@ export declare type RefSchemaType = typeof mongoose.Schema.Types.Number | typeof mongoose.Schema.Types.String | typeof mongoose.Schema.Types.Buffer | typeof mongoose.Schema.Types.ObjectId;
 export interface IIndexArray<T> {
-    fields: {
-        [key: string]: any;
-    };
+    fields: KeyStringAny;
     options?: IndexOptions<T>;
@@ -468,1 +463,5 @@ }
 }
+/** An Helper Interface for key: any: string */
+export interface KeyStringAny {
+    [key: string]: any;
+}

package.json

 {
   "name": "@typegoose/typegoose",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "description": "Define Mongoose models using TypeScript classes",
@@ -5,0 +5,0 @@ "main": "lib/typegoose.js",

README.md

@@ -114,12 +114,4 @@ # Typegoose
 * `experimentalDecorators` and `emitDecoratorMetadata` must be enabled in `tsconfig.json`
-* if you use the [Babel TypeScript preset](https://babeljs.io/docs/en/babel-preset-typescript), you will need to reproduce the `--experimentalDecorators` and `--emitDecoratorMetadata` [TypeScript compiler options](https://babeljs.io/docs/en/babel-plugin-transform-typescript#typescript-compiler-options) by using the corresponding plugins for [enabling decorators](https://babeljs.io/docs/en/babel-plugin-proposal-decorators) and [emitting decorator metadata](https://github.com/leonardfactory/babel-plugin-transform-typescript-metadata):
 
-```js
-module.exports = {
-  plugins: [
-    ['@babel/plugin-proposal-decorators', { legacy: true }],
-    'babel-plugin-transform-typescript-metadata',
-  ]
-}
-```
+Note: it is recommended to not use babel [see here why](https://typegoose.github.io/typegoose/guides/known-issues/#babel)
 
@@ -126,0 +118,0 @@ ## Install

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Deprecated

Maintenance

The maintainer of the package marked it as deprecated. This could indicate that a single version should not be used, or that the package is no longer maintained and any new vulnerabilities will not be fixed.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

177032

decreased by-0.77%

Lines of code

2741

decreased by-0.8%

Number of medium maintenance alerts

1

increased byInfinity%

Number of lines in readme file

163

decreased by-4.68%

No dependency changes