codehooks-js 1.2.15 → 1.2.17

package/crudlify/index.mjs

@@ -52,15 +52,19 @@ export default async function crudlify(app, schema = {}, options = { schema: "yu
         // schema provider other than Yup?
         for (const property in schema) {
             //console.log(`${property}: ${schema[property].toString()}`);
-            if (schema[property] !== undefined) {
-                if (schema[property].parse) {
-                    _opt.schema = 'zod';
-                } else if (schema[property].properties) {
-                    _opt.schema = 'json-schema';
+            try {
+                if (schema[property] !== undefined) {
+                    if (schema[property].parse) {
+                        _opt.schema = 'zod';
+                    } else if (schema[property].properties) {
+                        _opt.schema = 'json-schema';
+                    }
+                } else {
+                    console.error(`${property} is undefined`)
+                    //schema[property] = null;
                 }
-            } else {
-                console.error(`${property} is undefined`)
-                //schema[property] = null;
+            } catch (error) {
+                console.error("Unknown schema validator", error.message)
             }
         }
         
@@ -137,7 +141,7 @@ async function createFunc(req, res) {
             }
         }
     } else {
-        if (Object.keys(_schema).length === 0) {
+        if (_schema[collection] === null || Object.keys(_schema).length === 0) {
             console.debug("data", collection, document)
             // insert any collection name no schema definitions, anything goes
             try {
@@ -150,7 +154,7 @@ async function createFunc(req, res) {
                 res.status(400).send(ex);
             }
         } else {
-            console.error('schema for' ,collection, 'is not valid:', _schema[collection])
+            console.error('schema for' ,collection, 'is not found:', _schema[collection])
             return res.status(400).json({ "error": `Collection schema not found: ${collection}` });
         }
         

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

@@ -4,9 +4,9 @@ export const validate = (schema, document) => {
     
     return new Promise(async (resolve, reject) => {
         debug('Validate Yup', document)
-        if (schema == null) {
+        if (schema === null || (schema && !schema.validate)) {
             debug('Null validator')
-            resolve(document)
+            return resolve(document)
         }
         try {
             const valid = await schema.validate(document);
@@ -27,7 +27,7 @@ export const validate = (schema, document) => {
 
 export const cast = (schema, document) => {
     debug('Cast', document, schema)
-    return schema.cast(document)
+    return schema.cast ? schema.cast(document) : document;
 }
 
 export const prepare = (schemas) => {

package/index.js

@@ -116,7 +116,7 @@ class Codehooks {
     })
   }
 
-  init = (...hook) => {
+  init = (hook) => {
     const manifest = {
       workerhooks: this.workers,
       routehooks: this.routes,

package/package.json

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

package/types/index.d.ts

@@ -225,6 +225,7 @@ export type NoSQLAPI = {
   updateOne: (
     query: string | object,
     document: object,
+    updateoperators?: object,
     options?: object
   ) => Promise<object>;
   /**
@@ -262,6 +263,34 @@ export type NoSQLAPI = {
    * - Remove multiple data objects in a collection in the current Datastore
    */
   removeMany: (query: object) => Promise<object>;
+  /**
+   * Validate database colletion data agains JSON-Schema
+   * @param schema JSON-schema
+   * @returns Promise with result
+   */
+  createSchema: (schema: object) => Promise<object>;
+  /**
+   * Validate database colletion data agains JSON-Schema
+   * @param schema JSON-schema
+   * @returns Promise with result
+   */
+  setSchema: (schema: object) => Promise<object>;
+  /**
+   * Remove JSON-schema for database collection
+   * @param collection string
+   * @returns Promise with result
+   */
+  removeSchema: () => Promise<object>;
+  /**
+   * Get JSON-schema for database collection
+   * @returns Promise with result
+   */
+  getSchema: () => Promise<object>;
+  /**
+   * Count database collection items
+   * @returns Promise result
+   */
+  count: () => Promise<object>;
 };
 /**
  * Database API
@@ -300,6 +329,7 @@ export type DatastoreAPI = {
   updateOne: (
     collection: string,
     query: string | object,
+    updateoperators?: object,
     options?: object
   ) => Promise<any>;
   /**
@@ -310,7 +340,7 @@ export type DatastoreAPI = {
     collection: string,
     query: object,
     document: object,
-    options?: object
+    updateoperators?: object
   ) => Promise<any>;
   /**
    * - Replace one data object by ID in a datastore collection.
@@ -400,6 +430,37 @@ export type DatastoreAPI = {
     topic: string,
     options?: object
   ) => Promise<object>;
+  /**
+   * Validate database colletion data agains JSON-Schema
+   * @param collection string
+   * @param schema JSON-schema
+   * @returns Promise with result
+   */
+  createSchema: (collection: string, schema: object) => Promise<object>;
+  /**
+   * Validate database colletion data agains JSON-Schema
+   * @param collection string
+   * @param schema JSON-schema
+   * @returns Promise with result
+   */
+  setSchema: (collection: string, schema: object) => Promise<object>;
+  /**
+   * Remove JSON-schema for database collection
+   * @param collection string
+   * @returns Promise with result
+   */
+  removeSchema: (collection: string) => Promise<object>;
+  /**
+   * Get JSON-schema for database collection
+   * @param collection string
+   * @returns Promise with result
+   */
+  getSchema: (collection: string) => Promise<object>;
+   /**
+   * Count database collection items
+   * @returns Promise result
+   */
+   count: (collection: string) => Promise<object>;
 };
 /**
  * Persistent NoSql and Kev-Value datastore
@@ -811,7 +872,7 @@ declare class Codehooks {
   ) => void;
   /**
    * Add application worker function
-   * @param {string} name a unique worker name
+   * @param {object} name a unique worker name or JSON configuration
    * @param  {...function(httpRequest, httpResponse, function(string):void)} hook - callback function(s) with parameters (req, res, [next])
    * @example
    * app.worker('myworker', (data, job) => {
@@ -820,9 +881,16 @@ declare class Codehooks {
    *  // do stuff with payload data
    *  job.end()
    *})
+   * @example
+   * app.worker({name: 'myworker', workers: 5}, (data, job) => {
+   *  const {body:{payload}} = data
+   *  //console.debug('worker payload data', payload)
+   *  // do stuff with payload data
+   *  job.end()
+   *})
    */
   worker: (
-    name: string,
+    name: string | object,
     ...hook: ((
       request: httpRequest,
       response: httpResponse,

package/webserver.mjs

@@ -86,9 +86,9 @@ export function serveStatic(options, app, filestore, hook, fsoptions) {
                 })
 
         } catch (error) {
-            console.error("Error message", error.message)
-            console.error(error)
-            res.status(404).end('No file here:' + filePath)
+            console.debug("Error message", error.message)
+            console.debug(error)
+            res.status(404).end(`No file here: ${filePath} (${error.message})`)
         }
     }
     const farr = [readFunc]