codehooks-js 1.2.12 → 1.2.14

package/crudlify/index.mjs

@@ -15,7 +15,6 @@ let _query = null;
 let _eventHooks = null;
 
 export default async function crudlify(app, schema = {}, options = { schema: "yup", query: "q2m", prefix: "" }) {
-    console.log('Init crudlify', schema, options)
     _schema = schema;
     _opt = options;
     if (_opt.prefix === undefined || _opt.prefix === '/') {
@@ -111,6 +110,7 @@ async function createFunc(req, res) {
     if (_schema[collection] != undefined) {
         
         if (_schema[collection] != null) {
+            console.debug('validate', document)
             _validate(_schema[collection], document, _opt)
                 .then(async function (value) {
                     document = _cast(_schema[collection], value)
@@ -213,8 +213,7 @@ async function updateFunc(req, res) {
                     document._id = ID; // put back id that was removed for validation
                     const conn = await Datastore.open();
                     await _eventHooks.fireBefore(collection, 'PUT', document);
-                    const result = await conn.replaceOne(collection, ID, document, {});
-                    console.debug('replaceOne result 1', result)
+                    const result = await conn.replaceOne(collection, ID, document, {});                    
                     await _eventHooks.fireAfter(collection, 'PUT', result);
                     res.json(result);
                 })
@@ -226,16 +225,20 @@ async function updateFunc(req, res) {
             document._id = ID; // put back id that was removed for validation
             const conn = await Datastore.open();
             await _eventHooks.fireBefore(collection, 'PUT', document);
-            const result = await conn.replaceOne(collection, ID, document, {});
-            console.debug('replaceOne result 2', result)
+            const result = await conn.replaceOne(collection, ID, document, {});            
             await _eventHooks.fireAfter(collection, 'PUT', result);
             res.json(result);
         }
     } catch (e) {
-        console.error(e.message)
-        res
+        if (e.schemaError) {
+            res
+            .status(400) // validator
+            .end(e);
+        } else {
+            res
             .status(404) // not found
             .end(e.message);
+        }  
     }
 }
 

package/crudlify/lib/schema/yup/index.mjs

@@ -1,20 +1,26 @@
 const debug = console.debug;
 
 export const validate = (schema, document) => {
-    debug('Validate Yup', document, schema)
+    
     return new Promise(async (resolve, reject) => {
+        debug('Validate Yup', document)
         if (schema == null) {
             debug('Null validator')
-            resolve(true)
+            resolve(document)
         }
-        const valid = await schema.validate(document);
-        
-        if (valid) {
-            debug('Validate ok', valid)
-            resolve(valid)
-        } else {
-            debug('Validate error', valid)
-            resolve(valid)
+        try {
+            const valid = await schema.validate(document);
+            console.debug('validated result', valid)
+            if (valid) {
+                debug('Validate ok', valid)
+                resolve(document)
+            } else {
+                debug('Validate error', valid)
+                reject(valid)
+            }
+        } catch (error) {
+            console.error('Yup error', error)
+            reject(error)
         }
     });    
 }

package/index.js

@@ -22,7 +22,8 @@ class Codehooks {
   datastore = null;
   listeners = [];
   workers = {};
-  realtime = {}
+  realtime = {};
+  startup = {};
   
   post = (path, ...hook) => {
     this.routes[`POST ${createRoute(path)}`] = hook;
@@ -118,7 +119,7 @@ class Codehooks {
     })
   }
 
-  init = () => {
+  init = (...hook) => {
     const manifest = {
       workerhooks: this.workers,
       routehooks: this.routes,
@@ -131,8 +132,13 @@ class Codehooks {
       realtime: this.realtime,
       app: this
     };
+    if (hook) {
+      manifest.startup = hook;
+    }
     return manifest;
   };
+  // alias
+  start = this.init;
 
   useExpress = async (express, options) => {
     cronjob = import("./cronjob.mjs")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codehooks-js",
-  "version": "1.2.12",
+  "version": "1.2.14",
   "type": "module",
   "description": "Codehooks.io official library - provides express.JS like syntax",
   "main": "index.js",

package/types/index.d.ts

@@ -894,7 +894,14 @@ declare class Codehooks {
    * export default app.init();
    * @returns {Object} App instance
    */
-  init: () => any;
+  init: (cb?: any) => any;
+  /**
+   * Alias for app.init()
+   * @example
+   * export default app.start();
+   * @returns {Object} App instance
+   */
+  start: (cb?: any) => any;
   /**
    * Use Node Express app to run standalone
    * All Codehooks routes will be applied as Express Routes