@radatek/microserver 2.3.6 → 2.3.8

package/microserver.d.ts

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.3.6
+ * @version 2.3.8
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -495,8 +495,10 @@ export declare class ProxyPlugin extends Plugin {
 }
 /** User info */
 export interface UserInfo {
+    /** User _id */
+    _id?: string;
     /** User id */
-    id: string;
+    id?: string;
     /** User password plain or hash */
     password?: string;
     /** ACL options */
@@ -658,8 +660,8 @@ interface ModelContextOptions {
     validate?: boolean;
     /** use default */
     default?: boolean;
-    /** is required */
-    required?: boolean;
+    /** use primary key only for filter */
+    primaryKey?: boolean;
     /** projection fields */
     projection?: Record<string, 0 | 1 | true | false>;
 }
@@ -682,6 +684,8 @@ export interface ModelFieldSchema {
     type: ModelFieldSimpleType;
     /** Is array */
     array?: true | false;
+    /** Is primary key, used for filtering */
+    primaryKey?: true | false;
     /** Is required */
     required?: boolean | string | ModelCallbackFunc;
     /** Can read */
@@ -704,6 +708,7 @@ export interface ModelFieldSchema {
 interface ResolvedFieldSchema {
     type: string;
     model?: Model<any>;
+    primaryKey?: boolean;
     required?: ModelCallbackFunc;
     canRead: ModelCallbackFunc;
     canWrite: ModelCallbackFunc;

package/microserver.js

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.3.6
+ * @version 2.3.8
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -2752,7 +2752,8 @@ export class Model {
                 };
             else
                 modelField.validate = validate;
-            modelField.required = field.required ? this._fieldFunction(field.required, false) : undefined;
+            modelField.primaryKey = field.primaryKey;
+            modelField.required = (field.primaryKey || field.required) ? this._fieldFunction(field.primaryKey || field.required, false) : undefined;
             modelField.canWrite = this._fieldFunction(field.canWrite, typeof field.canWrite === 'string' && field.canWrite.startsWith('$') ? false : true);
             modelField.canRead = this._fieldFunction(field.canRead, typeof field.canRead === 'string' && field.canRead.startsWith('$') ? false : true);
             if (field.default !== undefined) {
@@ -2826,11 +2827,14 @@ export class Model {
     document(data, options) {
         options = options || {};
         const prefix = options.name ? options.name + '.' : '';
-        if (options.validate === false)
-            return data;
         const res = {};
         for (const name in this.model) {
             const field = this.model[name];
+            if (options.validate === false) {
+                if (name in data)
+                    res[name] = data[name];
+                continue;
+            }
             const paramOptions = { ...this.options, ...options, field, name: prefix + name, model: this };
             const canWrite = field.canWrite(paramOptions), canRead = field.canRead(paramOptions), required = field.required?.(paramOptions);
             if (options.readOnly) {
@@ -2900,40 +2904,29 @@ export class Model {
             if (!(name in res)) {
                 const field = this.model[name];
                 const paramOptions = { ...this.options, ...options, field, name, model: this };
-                if ((!options?.required && name in data) || (field.required && field.default)) {
-                    if (typeof field.required === 'function' && field.required(paramOptions) && field.default && (!(name in data) || field.canWrite(options) === false))
-                        res[name] = options?.default !== false ? field.default.length ? field.default(paramOptions) : field.default() : data[name];
-                    else if (name in data)
-                        res[name] = options?.validate !== false ? this._validateField(data[name], paramOptions) : data[name];
-                }
+                if ((!options?.primaryKey && name in data) || field.primaryKey)
+                    res[name] = options?.validate !== false ? this._validateField(data[name], paramOptions) : data[name];
             }
         }
-        if (typeof options?.projection === 'object')
-            for (const name in options.projection) {
-                if (name !== '_id' && name in this.model && !res[name])
-                    res[name] = options.projection[name];
-            }
         return res;
     }
     /** Find one document */
     async findOne(query, options) {
-        if (this.collection instanceof Promise)
-            this.collection = await this.collection;
-        if (!this.collection)
+        const collection = await this.collection;
+        if (!collection)
             throw new AccessDenied('Database not configured');
         options = { readOnly: true, ...this.options, ...options };
-        const doc = await this.collection.findOne(this.getFilter(query, options));
+        const doc = await collection.findOne(this.getFilter(query, options));
         return doc ? this.document(doc, options) : undefined;
     }
     /** Find many documents */
     async findMany(query, options) {
-        if (this.collection instanceof Promise)
-            this.collection = await this.collection;
-        if (!this.collection)
+        const collection = await this.collection;
+        if (!collection)
             throw new AccessDenied('Database not configured');
         const res = [];
         options = { readOnly: true, ...this.options, ...options };
-        await this.collection.find(this.getFilter(query || {}, options)).forEach((doc) => res.push(this.document(doc, options)));
+        await collection.find(this.getFilter(query || {}, options)).forEach((doc) => res.push(this.document(doc, options)));
         return res;
     }
     /** Insert a new document */
@@ -2942,9 +2935,8 @@ export class Model {
     }
     /** Update one matching document */
     async update(query, options) {
-        if (this.collection instanceof Promise)
-            this.collection = await this.collection;
-        if (!this.collection)
+        const collection = await this.collection;
+        if (!collection)
             throw new AccessDenied('Database not configured');
         options = { ...this.options, ...options };
         if (options?.validate !== false)
@@ -2957,19 +2949,18 @@ export class Model {
                 delete query[n];
             }
         }
-        const res = await this.collection.findAndModify({ query: this.getFilter(query, { required: true, validate: false, default: false }), update: query, upsert: options?.insert });
+        const res = await collection.findAndModify({ query: this.getFilter(query, { primaryKey: true, validate: false }), update: query, upsert: options?.insert });
         if (!res)
             throw new NotFound('Document not found');
         return res;
     }
     /** Delete one matching document */
     async delete(query, options) {
-        if (this.collection instanceof Promise)
-            this.collection = await this.collection;
-        if (!this.collection)
+        const collection = await this.collection;
+        if (!collection)
             throw new AccessDenied('Database not configured');
         if (query._id)
-            await this.collection.deleteOne(this.getFilter(query, { ...this.options, ...options }));
+            await collection.deleteOne(this.getFilter(query, { ...this.options, ...options }));
     }
     /** Microserver middleware */
     handler(req, res) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radatek/microserver",
-  "version": "2.3.6",
+  "version": "2.3.8",
   "description": "HTTP MicroServer",
   "author": "Darius Kisonas",
   "license": "MIT",