validno 0.4.3 → 0.4.5

package/dist/dev.d.ts

@@ -1,2 +1,7 @@
-export {};
+export declare const AccessScopes: {
+    readonly Inherit: "inherit";
+    readonly Public: "public";
+    readonly Project: "workspace";
+    readonly User: "user";
+};
 //# sourceMappingURL=dev.d.ts.map

package/dist/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":""}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY;;;;;CAKf,CAAC"}

package/dist/dev.js

@@ -1,17 +1,60 @@
 import { Schema } from "./Schema.js";
+import isObjectId from "./utils/isObjectId.js";
+import { ObjectId } from "mongodb";
+export const AccessScopes = {
+    Inherit: 'inherit',
+    Public: 'public',
+    Project: 'workspace',
+    User: 'user'
+};
+const checkMethodScope = (value, context) => {
+    const authCollection = context.input.authCollection;
+    if (isObjectId(authCollection, ObjectId))
+        return true;
+    const mainScope = context.input.scope;
+    const methods = context.input.methods;
+    const allMethodsScopes = [
+        mainScope,
+        ...Object.values(methods).filter(method => method.isActive).map(method => method.scope)
+    ];
+    if (!allMethodsScopes.includes(AccessScopes.User) && !allMethodsScopes.includes(AccessScopes.Project)) {
+        return true;
+    }
+    return {
+        result: false,
+        details: 'Invalid scope. To use User or Project scope, the collection must have authCollection to be set.'
+    };
+};
 const test = () => {
-    console.log('--- Custom Test ---');
-    const AccessScopes = {
-        Public: 'public',
-        Project: 'workspace',
-        User: 'user'
+    const data = {
+        scope: 'public',
+        methods: {
+            get: { isActive: false, scope: 'public' },
+            getAll: {
+                isActive: true,
+                scope: 'public',
+                sort: [Object],
+                filter: [Object],
+                search: [Object]
+            },
+            create: { isActive: true, scope: 'public' },
+            update: { isActive: false, scope: 'public', allowedFields: [] },
+            delete: { isActive: false, scope: 'public' },
+            distinct: { isActive: false, scope: 'public', fields: [] }
+        },
+        authSettings: null,
+        authCollection: null
     };
     const collectionSettingsSchema = new Schema({
-        auth: { type: null },
+        authCollection: {
+            type: [ObjectId, null],
+            required: false,
+        },
         scope: {
             type: String,
             rules: {
-                enum: Object.values(AccessScopes)
+                enum: Object.values(AccessScopes).filter(scope => scope !== AccessScopes.Inherit),
+                custom: checkMethodScope
             },
         },
         methods: {
@@ -32,9 +75,9 @@ const test = () => {
                     },
                     required: false
                 },
-                sort: { default: { type: String } },
-                filter: { fields: { type: Array, eachType: String } },
-                search: { fields: { type: Array, eachType: String } }
+                sort: { default: { type: String, required: false } },
+                filter: { fields: { type: Array, eachType: String, required: false } },
+                search: { fields: { type: Array, eachType: String, required: false } }
             },
             create: {
                 isActive: { type: Boolean },
@@ -51,7 +94,7 @@ const test = () => {
                     rules: { enum: Object.values(AccessScopes) },
                     required: false
                 },
-                allowedFields: { type: Array, eachType: String }
+                allowedFields: { type: Array, eachType: String, required: false }
             },
             delete: {
                 isActive: { type: Boolean },
@@ -72,8 +115,7 @@ const test = () => {
             }
         }
     });
-    const settingsData = { text: 1 };
-    const res = collectionSettingsSchema.validate(settingsData);
-    console.log(res);
+    const validateResult = collectionSettingsSchema.validate(data);
+    console.log(validateResult);
 };
 test();

package/dist/engine/methods/validateType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateType.d.ts","sourceRoot":"","sources":["../../../src/engine/methods/validateType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,uBAAuB,CAAC;AACtE,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAiLhD,MAAM,WAAW,kBAAkB;IAC/B,OAAO,EAAE,aAAa,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,GAAG,CAAC;IACX,IAAI,EAAE,gBAAgB,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,EAAE,CAAA;CACzB;AAED,iBAAS,YAAY,CAAC,KAAK,EAAE,kBAAkB,QAU9C;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"validateType.d.ts","sourceRoot":"","sources":["../../../src/engine/methods/validateType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,uBAAuB,CAAC;AACtE,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAqLhD,MAAM,WAAW,kBAAkB;IAC/B,OAAO,EAAE,aAAa,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,GAAG,CAAC;IACX,IAAI,EAAE,gBAAgB,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,EAAE,CAAA;CACzB;AAED,iBAAS,YAAY,CAAC,KAAK,EAAE,kBAAkB,QAU9C;AAED,eAAe,YAAY,CAAC"}

package/dist/engine/methods/validateType.js

@@ -115,6 +115,10 @@ const handleTypeValidation = (key, value, requirements, keyName = key) => {
             break;
         }
         default: {
+            if (value === null && typeBySchema !== null) {
+                result.push(_validateType.getResult(keyName, false, getDetails(false)));
+                break;
+            }
             const isInstanceOf = typeof typeBySchema === 'function' && value instanceof typeBySchema;
             const isConstructorSame = typeof typeBySchema === 'function' && ((_a = value.constructor) === null || _a === void 0 ? void 0 : _a.name) === (typeBySchema === null || typeBySchema === void 0 ? void 0 : typeBySchema.name);
             const isBothObjectId = isObjectId(value, typeBySchema);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "validno",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "A lightweight TypeScript validation library for runtime data validation. Used as part of Kodzero API framework.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,6 +11,7 @@
     "tscw": "tsc --b --watch src/",
     "dev": "nodemon dist/dev.js",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
+    "test:coverage": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage",
     "prepublishOnly": "npm run tsc"
   },
   "files": [
@@ -35,7 +36,8 @@
     "@types/node": "^18.14.2",
     "eslint": "^8.14.0",
     "jest": "^29.7.0",
-    "mongodb": "^6.19.0"
+    "mongodb": "^6.19.0",
+    "ts-jest": "^29.4.6"
   },
   "directories": {
     "test": "tests"