xpress-mongo - npm Package Compare versions

Comparing version 0.0.51 to 0.0.52

js/src/XMongoDataType.js

@@ -15,2 +15,8 @@ "use strict";
     }
+    name(name) {
+        if (name) {
+            this.schema.name = name;
+        }
+        return this;
+    }
     /**
@@ -17,0 +23,0 @@ * Set Default value.

js/src/XMongoSchemaBuilder.js

@@ -96,2 +96,6 @@ "use strict";
     Number: (def = 0) => {
+        // if array return inArray
+        // noinspection SuspiciousTypeOfGuard
+        if (typeof def !== "number" && Array.isArray(def))
+            return is.InArray(def).name('Number');
         return new XMongoDataType('Number', def)
@@ -140,2 +144,5 @@ .validator(isNumber)
     String: (def = undefined) => {
+        // if array return inArray
+        if (def && typeof def !== "string" && Array.isArray(def))
+            return is.InArray(def).name('String');
         return new XMongoDataType('String', def)
@@ -142,0 +149,0 @@ .validator(isString)

package.json

 {
   "name": "xpress-mongo",
-  "version": "0.0.51",
+  "version": "0.0.52",
   "description": "Light Weight ODM for mongoDb",
@@ -5,0 +5,0 @@ "main": "js/index.js",

src/XMongoDataType.ts

@@ -19,2 +19,11 @@ import {ValidatorType, CastFunctionType, SchemaPropertiesType} from "./CustomTypes";
 
+
+    name(name: string) {
+        if (name) {
+            this.schema.name = name;
+        }
+
+        return this
+    }
+
     /**
@@ -21,0 +30,0 @@ * Set Default value.

src/XMongoSchemaBuilder.ts

@@ -34,10 +34,10 @@ import XMongoDataType = require("./XMongoDataType");
         validator: (value: any) => boolean,
-        error: string | { (key: string): string }
+        error?: string | { (key: string): string }
     ): XMongoDataType
     Date(def?: () => Date): XMongoDataType
-    InArray(list: any[], def: any): XMongoDataType
-    Number(def?: 0): XMongoDataType
+    InArray(list: any[], def?: any): XMongoDataType
+    Number(def?: number | number[]): XMongoDataType
     Object(def?: () => StringToAnyObject): XMongoDataType
     ObjectId(): XMongoDataType
-    String(def?: string): XMongoDataType
+    String(def?: string | string[]): XMongoDataType
     Types(types: XMongoDataType[]): XMongoDataType
@@ -112,3 +112,3 @@ Uuid(version: number, options?: UuidOptions): XMongoDataType
      */
-    InArray(list: any[], def: any): XMongoDataType {
+    InArray(list: any[], def?: any): XMongoDataType {
         return new XMongoDataType('InArray', def)
@@ -125,2 +125,7 @@ .validator((value) => list.includes(value))
     Number: (def = 0): XMongoDataType => {
+        // if array return inArray
+        // noinspection SuspiciousTypeOfGuard
+        if (typeof def !== "number" && Array.isArray(def))
+            return is.InArray(def).name('Number');
+
         return new XMongoDataType('Number', def)
@@ -175,2 +180,6 @@ .validator(isNumber)
     String: (def = undefined): XMongoDataType => {
+        // if array return inArray
+        if (def && typeof def !== "string" && Array.isArray(def))
+            return is.InArray(def).name('String');
+
         return new XMongoDataType('String', def)
@@ -177,0 +186,0 @@ .validator(isString)

types/src/XMongoDataType.d.ts

@@ -5,2 +5,3 @@ import { ValidatorType, CastFunctionType, SchemaPropertiesType } from "./CustomTypes";
     constructor(name: string, $default?: any);
+    name(name: string): this;
     /**
@@ -7,0 +8,0 @@ * Set Default value.

types/src/XMongoSchemaBuilder.d.ts

@@ -11,11 +11,11 @@ import XMongoDataType = require("./XMongoDataType");
     Boolean(def?: boolean): XMongoDataType;
-    CustomValidator(validator: (value: any) => boolean, error: string | {
+    CustomValidator(validator: (value: any) => boolean, error?: string | {
         (key: string): string;
     }): XMongoDataType;
     Date(def?: () => Date): XMongoDataType;
-    InArray(list: any[], def: any): XMongoDataType;
-    Number(def?: 0): XMongoDataType;
+    InArray(list: any[], def?: any): XMongoDataType;
+    Number(def?: number | number[]): XMongoDataType;
     Object(def?: () => StringToAnyObject): XMongoDataType;
     ObjectId(): XMongoDataType;
-    String(def?: string): XMongoDataType;
+    String(def?: string | string[]): XMongoDataType;
     Types(types: XMongoDataType[]): XMongoDataType;
@@ -22,0 +22,0 @@ Uuid(version: number, options?: UuidOptions): XMongoDataType;

No alert changes

Improved metrics

Total package byte prevSize

145059

increased by0.7%

Lines of code

4327

increased by0.63%

No dependency changes