@typegoose/typegoose - npm Package Compare versions

Comparing version 11.0.0 to 11.1.0-beta.1

lib/internal/processProp.js

@@ -209,8 +209,17 @@ "use strict";
     }
-    const enumOption = rawOptions.enum;
-    if (!utils.isNullOrUndefined(enumOption)) {
-        // check if the supplied value is already "mongoose-consumable"
-        if (!Array.isArray(enumOption)) {
+    if (!utils.isNullOrUndefined(rawOptions.enum)) {
+        let useType = rawOptions.enum;
+        let inValues = false;
+        if (rawOptions.enum?.constructor === Object && 'values' in rawOptions.enum) {
+            useType = rawOptions.enum.values;
+            inValues = true;
+        }
+        // disabling lint line, because eslint seemingly cant handle a changing value and a unchanging value in the same destruction
+        // eslint-disable-next-line prefer-const
+        let { dim: enumDim, type: enumType } = utils.getType(useType, true);
+        utils.assertion(enumDim === 1 || enumDim === 0, () => new errors_1.OptionDoesNotSupportOptionError('enum', 'dim', '0 or 1', `dim: ${enumDim}`));
+        // check if the option is already a array (mongoose enum), if not convert it
+        if (!Array.isArray(enumType)) {
             if (Type === String || Type === typegoose_1.mongoose.Schema.Types.String) {
-                rawOptions.enum = Object.entries(enumOption) // get all key-value pairs of the enum
+                enumType = Object.entries(enumType) // get all key-value pairs of the enum
                     // no reverse-filtering because if it is full of strings, there is no reverse mapping
@@ -228,3 +237,3 @@ .map(([enumKey, enumValue]) => {
             else if (Type === Number || Type === typegoose_1.mongoose.Schema.Types.Number) {
-                rawOptions.enum = Object.entries(enumOption) // get all key-value pairs of the enum
+                enumType = Object.entries(enumType) // get all key-value pairs of the enum
                     // filter out the "reverse (value -> name) mappings"
@@ -255,2 +264,9 @@ // https://www.typescriptlang.org/docs/handbook/enums.html#reverse-mappings
         }
+        // re-assign the option with the updated type
+        if (inValues) {
+            rawOptions.enum.values = enumType;
+        }
+        else {
+            rawOptions.enum = enumType;
+        }
     }
@@ -393,2 +409,2 @@ if (!utils.isNullOrUndefined(rawOptions.addNullToEnum)) {
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"processProp.js","sourceRoot":"","sources":["../../src/internal/processProp.ts"],"names":[],"mappings":";;;AAAA,gDAAwC;AACxC,4CAAkE;AAWlE,2CAAsD;AACtD,qCAakB;AAClB,iCAAiC;AAEjC;;;GAGG;AACH,SAAgB,WAAW,CAAC,KAAyB;IACnD,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,UAAU,GAAiB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAClE,IAAI,IAAI,GAAoB,OAAO,CAAC,WAAW,CAAC,yBAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;IACjF,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;IAExD,oBAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACvD,KAAK,CAAC,SAAS,CAAC,OAAO,GAAG,KAAK,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,4BAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IAEnF,iCAAiC;IAEjC;QACE,qCAAqC;QACrC,QAAQ,QAAQ,EAAE;YAChB,KAAK,oBAAQ,CAAC,IAAI;gBAChB,MAAM;YACR,KAAK,oBAAQ,CAAC,GAAG,CAAC;YAClB,KAAK,oBAAQ,CAAC,KAAK;gBACjB,mHAAmH;gBACnH,IAAI,CAAC,KAAK,IAAI,UAAU,IAAI,SAAS,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,UAAU,CAAC,EAAE;oBAC/E,IAAI,GAAG,SAAS,CAAC;iBAClB;gBAED,MAAM;SACT;KACF;IAED,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QAC7C,oBAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QAEpB,IAAI,OAAO,CAAC,GAAG,GAAG,CAAC,EAAE;YACnB,UAAU,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;SAC9B;QAED,OAAO,UAAU,CAAC,IAAI,CAAC;KACxB;IAED,oEAAoE;IACpE,IAAI,IAAI,KAAK,MAAM,CAAC,WAAW,EAAE;QAC/B,MAAM,IAAI,iCAAwB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAC/C;IAED,mEAAmE;IACnE,IAAI,IAAI,KAAK,oBAAQ,CAAC,KAAK,CAAC,MAAM,EAAE;QAClC,IAAI,GAAG,oBAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;KACrC;IAED,iGAAiG;IACjG,oEAAoE;IACpE,IAAI,QAAQ,KAAK,oBAAQ,CAAC,KAAK,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,oBAAQ,CAAC,KAAK,EAAE;QAC1E,oBAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC1D,IAAI,GAAG,oBAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;KACpC;IAED,6FAA6F;IAC7F,IAAI,QAAQ,KAAK,oBAAQ,CAAC,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,oBAAQ,CAAC,GAAG,EAAE;QACtE,oBAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;QACxD,IAAI,GAAG,oBAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;KACpC;IAED,IAAI,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QAC5B,IAAA,uBAAW,EAAC,IAAI,CAAC,CAAC;KACnB;IAED,MAAM,kBAAkB,GAAkB,OAAO,CAAC,WAAW,CAAC,yBAAa,CAAC,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;IAE5G,8FAA8F;IAC9F,IAAI,gBAAgB,IAAI,UAAU,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE;QAC3G,MAAM,IAAI,8BAAqB,CAAC,CAAC,6BAA6B,EAAE,8BAA8B,CAAC,CAAC,CAAC;KAClG;IAED,IAAI,gBAAgB,IAAI,UAAU,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE;QAC3G,MAAM,mBAAmB,GAAG,UAAU,EAAE,cAAc,IAAI,kBAAkB,EAAE,OAAO,EAAE,cAAc,CAAC;QACtG,oBAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;QACzD,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,wCAA+B,CAAC,gBAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACnI,MAAM,cAAc,GAA2B,OAAO,CAAC,IAA2D,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACpI,IAAI,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE;gBAC5B,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;aACtB;YACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC3B,IAAI,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC,EAAE;oBACpB,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,IAAI,GAAG,0BAA0B,KAAK,2DAA2D,CAAC,CAAC;iBAC5H;gBAED,OAAO,GAAG,CAAC;aACZ;YAED,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,IAAI,GAAG,2BAA2B,KAAK,uCAAuC,CAAC,CAAC;QAC1G,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAA4B,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,yBAAa,CAAC,oBAAoB,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QACnI,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QAChC,OAAO,CAAC,cAAc,CAAC,yBAAa,CAAC,oBAAoB,EAAE,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QAEvF,OAAO,UAAU,CAAC,cAAc,CAAC;KAClC;IAED,wCAAwC;IACxC,IAAI,KAAK,IAAI,UAAU,EAAE;QACvB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC9C,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,wCAA+B,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACxH,UAAU,CAAC,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;QAC9B,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,kCAAyB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QAE1G,UAAU,CAAC,GAAG;YACZ,OAAO,UAAU,CAAC,GAAG,KAAK,QAAQ;gBAChC,CAAC,CAAC,UAAU,CAAC,GAAG;gBAChB,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC;oBACrC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;oBAC/B,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;KACtB;IAED,IAAI,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE;QACtC,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE;YAC5C,MAAM,IAAI,gCAAuB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SAC9C;QAED,MAAM,QAAQ,GAAuB,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,yBAAa,CAAC,eAAe,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3H,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC9B,OAAO,CAAC,cAAc,CAAC,yBAAa,CAAC,eAAe,EAAE,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QAEpF,OAAO;KACR;IAED,IAAI,SAAS,IAAI,UAAU,EAAE;QAC3B,oBAAM,CAAC,IAAI,CACT,mCAAmC,IAAI,IAAI,GAAG,sCAAsC;YAClF,8FAA8F,CACjG,CAAC;KACH;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEnD,+GAA+G;IAC/G,IAAI,IAAI,YAAY,uBAAW,EAAE;QAC/B,oBAAM,CAAC,KAAK,CAAC,4DAA4D,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7G,yFAAyF;QACzF,MAAM,OAAO,GAAQ,IAAI,CAAC,GAAG,CAAC;QAE9B,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,UAAU,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;YAE1B,OAAO;SACR;QAED,QAAQ,QAAQ,EAAE;YAChB,KAAK,oBAAQ,CAAC,KAAK;gBACjB,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,eAAe,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;gBAE1E,OAAO;YACT,KAAK,oBAAQ,CAAC,GAAG;gBACf,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;gBAElE,UAAU,CAAC,GAAG,CAAC,GAAG;oBAChB,GAAG,MAAM,CAAC,KAAK;oBACf,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE;iBACvC,CAAC;gBAEF,OAAO;YACT,KAAK,oBAAQ,CAAC,IAAI;gBAChB,UAAU,CAAC,GAAG,CAAC,GAAG;oBAChB,GAAG,UAAU;oBACb,IAAI,EAAE,OAAO;iBACd,CAAC;gBAEF,OAAO;YACT;gBACE,MAAM,IAAI,6BAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,uBAAuB,CAAC,CAAC;SAChF;KACF;IAED,iFAAiF;IACjF,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;IAEhF,IAAI,KAAK,IAAI,UAAU,EAAE;QACvB,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC;QAC3B,OAAO,UAAU,CAAC,GAAG,CAAC;QAEtB,QAAQ,QAAQ,EAAE;YAChB,KAAK,oBAAQ,CAAC,KAAK;gBACjB,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,eAAe,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;gBAC9F,MAAM;YACR,KAAK,oBAAQ,CAAC,IAAI;gBAChB,UAAU,CAAC,GAAG,CAAC,GAAG;oBAChB,IAAI,EAAE,OAAO;oBACb,GAAG;oBACH,GAAG,UAAU;iBACd,CAAC;gBACF,MAAM;YACR,KAAK,oBAAQ,CAAC,GAAG;gBACf,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;gBAElE,UAAU,CAAC,GAAG,CAAC,GAAG;oBAChB,GAAG,MAAM,CAAC,KAAK;oBACf,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE;wBACF,IAAI,EAAE,OAAO;wBACb,GAAG;wBACH,GAAG,MAAM,CAAC,KAAK;qBAChB;iBACF,CAAC;gBACF,MAAM;YACR;gBACE,MAAM,IAAI,6BAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;SACxE;QAED,OAAO;KACR;IAED,IAAI,SAAS,IAAI,UAAU,EAAE;QAC3B,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;QACnC,OAAO,UAAU,CAAC,OAAO,CAAC;QAE1B,KAAK,CAAC,SAAS,CACb,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EACjD,GAAG,EAAE,CAAC,IAAI,kCAAyB,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,IAAI,GAAG,EAAE,EAAE,SAAS,CAAC,CAC7E,CAAC;QAEF,QAAQ,QAAQ,EAAE;YAChB,KAAK,oBAAQ,CAAC,KAAK;gBACjB,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,eAAe,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;gBAClG,MAAM;YACR,KAAK,oBAAQ,CAAC,IAAI;gBAChB,UAAU,CAAC,GAAG,CAAC,GAAG;oBAChB,IAAI,EAAE,OAAO;oBACb,OAAO;oBACP,GAAG,UAAU;iBACd,CAAC;gBACF,MAAM;YACR;gBACE,MAAM,IAAI,6BAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,mBAAmB,CAAC,CAAC;SAC5E;QAED,OAAO;KACR;IAED,gDAAgD;IAChD,IAAI,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;QAC/D,MAAM,IAAI,yBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;KAC7C;IAED,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC;IAEnC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE;QACxC,+DAA+D;QAC/D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC9B,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,oBAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE;gBAC5D,UAAU,CAAC,IAAI,GAAG,MAAM,CAAC,OAAO,CAAS,UAAU,CAAC,CAAC,sCAAsC;oBACzF,qFAAqF;qBACpF,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE;oBAC5B,qDAAqD;oBACrD,6FAA6F;oBAC7F,iCAAiC;oBACjC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;wBACjC,MAAM,IAAI,2BAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,SAAS,CAAC,CAAC;qBACpE;oBAED,OAAO,SAAS,CAAC;gBACnB,CAAC,CAAC,CAAC;aACN;iBAAM,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,oBAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE;gBACnE,UAAU,CAAC,IAAI,GAAG,MAAM,CAAC,OAAO,CAAkB,UAAU,CAAC,CAAC,sCAAsC;oBAClG,oDAAoD;oBACpD,2EAA2E;qBAC1E,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE;oBACxC,6FAA6F;oBAC7F,iCAAiC;oBACjC,IAAI,KAAK,CAAC,iBAAiB,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE;wBAClG,iDAAiD;wBACjD,MAAM,IAAI,2BAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,SAAS,CAAC,CAAC;qBACpE;oBAED,OAAO,OAAO,SAAS,KAAK,QAAQ,CAAC;gBACvC,CAAC,CAAC;qBACD,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE;oBAC5B,sDAAsD;oBACtD,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;wBACjC,MAAM,IAAI,2BAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,SAAS,CAAC,CAAC;qBACpE;oBAED,OAAO,SAAS,CAAC;gBACnB,CAAC,CAAC,CAAC;aACN;iBAAM;gBACL,gEAAgE;gBAChE,uGAAuG;gBACvG,MAAM,IAAI,6BAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aACjD;SACF;KACF;IAED,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACtD,UAAU,CAAC,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3B,OAAO,UAAU,CAAC,aAAa,CAAC;KACjC;IAED;QACE,IAAI,QAAQ,GAAa,KAAK,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAEhE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACzB,kEAAkE;YAClE,KAAK,CAAC,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;SACnF;QAED,QAAQ,GAAG,KAAK,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAEnD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACzB,mEAAmE;YACnE,KAAK,CAAC,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,CAAC,CAAC;SACpF;QAED,QAAQ,GAAG,KAAK,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAElD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACzB,kEAAkE;YAClE,KAAK,CAAC,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;SACnF;QAED,QAAQ,GAAG,KAAK,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAEhD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClD,0DAA0D;YAC1D,KAAK,CAAC,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,iBAAiB,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;SAClF;KACF;IAED,gDAAgD;IAChD,MAAM,eAAe,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,yBAAa,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IAExG,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;QAC3B,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YAC9B,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;SAC9B;QAED,QAAQ,QAAQ,EAAE;YAChB,KAAK,oBAAQ,CAAC,KAAK;gBACjB,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,eAAe,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;gBAEvE,OAAO;YACT,KAAK,oBAAQ,CAAC,GAAG;gBACf,IAAI,MAA+B,CAAC;gBACpC,IAAI,SAA0C,CAAC;gBAE/C,2CAA2C;gBAC3C,IAAI,KAAK,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE;oBAC1C,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,oBAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;oBAChF,sGAAsG;oBACtG,SAAS,GAAG,KAAK,CAAC,eAAe,CAAC,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;iBAChG;qBAAM;oBACL,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;oBACzD,SAAS,GAAG,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;iBAC7C;gBAED,UAAU,CAAC,GAAG,CAAC,GAAG;oBAChB,GAAG,MAAM,CAAC,KAAK;oBACf,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,EAAE,GAAG,SAAS,EAAE;iBACrB,CAAC;gBAEF,OAAO;YACT,KAAK,oBAAQ,CAAC,IAAI;gBAChB,UAAU,CAAC,GAAG,CAAC,GAAG;oBAChB,GAAG,UAAU;oBACb,IAAI,EAAE,IAAI;iBACX,CAAC;gBAEF,OAAO;YACT;gBACE,MAAM,IAAI,6BAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,qBAAqB,CAAC,CAAC;SAC9E;KACF;IAED,gGAAgG;IAChG,mDAAmD;IACnD,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;QAC5C,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC7B,oBAAM,CAAC,IAAI,CACT,6IAA6I,CAC9I,CAAC;QACF,UAAU,CAAC,GAAG,CAAC,GAAG;YAChB,GAAG,UAAU;YACb,IAAI,EAAE,oBAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK;SAClC,CAAC;QAEF,OAAO;KACR;IAED,MAAM,aAAa,GAAG,IAAA,uBAAW,EAAC,IAAI,CAAC,CAAC;IACxC,QAAQ,QAAQ,EAAE;QAChB,KAAK,oBAAQ,CAAC,KAAK;YACjB,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAEtF,OAAO;QACT,KAAK,oBAAQ,CAAC,GAAG;YACf,wDAAwD;YACxD,IAAI,KAAK,IAAI,UAAU,EAAE;gBACvB,oBAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;gBAE7D,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;gBAE/F,UAAU,CAAC,GAAG,CAAC,GAAG;oBAChB,GAAG,KAAK;oBACR,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,IAAI;iBACT,CAAC;gBAEF,OAAO;aACR;YAED,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAE9E,UAAU,CAAC,GAAG,CAAC,GAAG;gBAChB,GAAG,MAAM,CAAC,KAAK;gBACf,IAAI,EAAE,GAAG;gBACT,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE;aAC7C,CAAC;YAEF,OAAO;QACT,KAAK,oBAAQ,CAAC,IAAI;YAChB,UAAU,CAAC,GAAG,CAAC,GAAG;gBAChB,GAAG,UAAU;gBACb,IAAI,EAAE,aAAa;aACpB,CAAC;YAEF,OAAO;QACT;YACE,MAAM,IAAI,6BAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,qBAAqB,CAAC,CAAC;KAC9E;AACH,CAAC;AAhbD,kCAgbC;AAED,4EAA4E;AAC5E;;;GAGG;AACH,8CAA8C;AAE9C;;;GAGG;AACH,SAAS,cAAc,CAAC,IAAS;IAC/B,oBAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAEnC,IACE,IAAI,KAAK,KAAK;QACd,IAAI,KAAK,oBAAQ,CAAC,KAAK,CAAC,KAAK;QAC7B,IAAI,KAAK,oBAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK;QACpC,IAAI,KAAK,oBAAQ,CAAC,KAAK,CAAC,aAAa;QACrC,IAAI,KAAK,oBAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,EAC5C;QACA,OAAO,oBAAQ,CAAC,KAAK,CAAC;KACvB;IACD,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,oBAAQ,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,KAAK,oBAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;QACrF,OAAO,oBAAQ,CAAC,GAAG,CAAC;KACrB;IAED,OAAO,oBAAQ,CAAC,IAAI,CAAC;AACvB,CAAC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"processProp.js","sourceRoot":"","sources":["../../src/internal/processProp.ts"],"names":[],"mappings":"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"}

lib/types.d.ts

@@ -60,2 +60,13 @@ import type * as mongoose from 'mongoose';
 export type NestedDiscriminatorsFunction = DeferredFunc<(AnyParamConstructor<any> | DiscriminatorObject)[]>;
+/** Type for enum "values" */
+export type EnumValues = Array<string | number | null> | ReadonlyArray<string | number | null> | {
+    [path: string | number]: string | number | null;
+};
+/** Type for the enum object with custom message*/
+export interface EnumObj {
+    values: EnumValues | DeferredFunc<EnumValues>;
+    message?: string;
+}
+/** Type for combines {@link EnumValues} and {@link @EnumObj} */
+export type EnumCombinedType = EnumValues | EnumObj;
 /**
@@ -78,3 +89,6 @@ * This Interface for most properties uses "mongoose.SchemaTypeOptions<any>['']", but for some special (or typegoose custom) options, it is not used
     /** Only accept Values from the Enum(|Array) */
-    enum?: mongoose.SchemaTypeOptions<any>['enum'];
+    enum?: EnumCombinedType | DeferredFunc<EnumCombinedType> | {
+        values: DeferredFunc<EnumValues>;
+        message?: string;
+    };
     /**
@@ -81,0 +95,0 @@ * Add "null" to the enum array

package.json

 {
   "name": "@typegoose/typegoose",
-  "version": "11.0.0",
+  "version": "11.1.0-beta.1",
   "description": "Define Mongoose models using TypeScript classes",
@@ -42,3 +42,3 @@ "main": "lib/typegoose.js",
   "devDependencies": {
-    "@commitlint/cli": "^17.5.0",
+    "@commitlint/cli": "^17.5.1",
     "@commitlint/config-conventional": "^17.4.4",
@@ -55,10 +55,10 @@ "@deepkit/core": "1.0.1-alpha.58",
     "@types/jest": "^29.5.0",
-    "@types/lodash": "^4.14.191",
+    "@types/lodash": "^4.14.192",
     "@types/node": "~14.14.31",
     "@types/semver": "^7.3.13",
-    "@typescript-eslint/eslint-plugin": "^5.56.0",
-    "@typescript-eslint/parser": "^5.56.0",
+    "@typescript-eslint/eslint-plugin": "^5.57.0",
+    "@typescript-eslint/parser": "^5.57.0",
     "class-transformer": "0.5.1",
-    "commitlint": "^17.5.0",
-    "eslint": "^8.36.0",
+    "commitlint": "^17.5.1",
+    "eslint": "^8.37.0",
     "eslint-config-prettier": "^8.8.0",
@@ -65,0 +65,0 @@ "eslint-plugin-prettier": "^4.2.1",

README.md

@@ -15,3 +15,3 @@ # Typegoose
 
-- [10 to 11](https://typegoose.github.io/typegoose/docs/guides/migration/migrate-11) (released on `XX-03-2023`)
+- [10 to 11](https://typegoose.github.io/typegoose/docs/guides/migration/migrate-11) (released on `27-03-2023`)
 - [9 to 10](https://typegoose.github.io/typegoose/docs/guides/migration/migrate-10) (released on `12-12-2022`)
@@ -18,0 +18,0 @@ - [8 to 9](https://typegoose.github.io/typegoose/docs/guides/migration/migrate-9) (released on `22-09-2021`)

New alerts

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

255340

increased by0.85%

Lines of code

3704

increased by0.82%

Worsened metrics

Number of low quality alerts

1

increased byInfinity%

No dependency changes