@live-change/framework 0.7.2 → 0.7.4

package/index.js

@@ -14,6 +14,7 @@ module.exports.validation = require('./lib/utils/validation.js')
 module.exports.rangeProperties = module.exports.utils.rangeProperties
 module.exports.encodeIdentifier = module.exports.utils.encodeIdentifier
 module.exports.extractRange = module.exports.utils.extractRange
+module.exports.isomorphic = module.exports.utils.isomorphic
 
 
 module.exports.ActionDefinition = require('./lib/definition/ActionDefinition.js')

package/lib/App.js

@@ -25,7 +25,7 @@ const indexCode = require("./processors/indexCode.js")
 
 const databaseUpdater = require("./updaters/database.js")
 
-const accessControlFilter = require("./clientSideFilters/accessControlFilter.js")
+const accessControlFilter = require("./clientSideFilters/accessFilter.js")
 const clientSideFilter = require("./clientSideFilters/clientSideFilter.js")
 
 const commandExecutor = require("./processes/commandExecutor.js")
@@ -186,10 +186,20 @@ class App {
   }
 
   async clientSideDefinition( service, client, filters ) {
-    let definition = JSON.parse(JSON.stringify(service.definition.toJSON()))
+    if(!service.clientSideDefinition) {
+      service.clientSideDefinition = JSON.stringify(service.definition.toJSON(), (key, value) => {
+        if (value && typeof value == 'object' && value.function && value.isomorphic) return {
+          function: value.function.toString(),
+          isomorphic: value.isomorphic
+        }
+        return value
+      })
+    }
+    let definition = JSON.parse(service.clientSideDefinition)
     delete definition.use
     if(!filters) filters = this.defaultClientSideFilters
     for(let filter of filters) await filter(service, definition, this, client)
+    for(let filter of service.definition.clientSideFilters) await filter(service, definition, this, client)
     return definition
   }
 

package/lib/definition/ServiceDefinition.js

@@ -87,6 +87,7 @@ class ServiceDefinition {
     this.beforeStartCallbacks = []
     this.endpoints = []
     this.validators = defaultValidators
+    this.clientSideFilters = []
     for(let key in definition) this[key] = definition[key]
   }
 
@@ -161,6 +162,14 @@ class ServiceDefinition {
     this.endpoints.push(endpoint)
   }
 
+  validator(validator) {
+    this.validators.push(validator)
+  }
+
+  clientSideFilter(filter) {
+    this.clientSideFilters.push(filter)
+  }
+
   toJSON() {
     let models = {}
     for(let key in this.models) models[key] = this.models[key].toJSON()

package/lib/processors/autoValidation.js

@@ -20,20 +20,21 @@ module.exports = function(service, app) {
     if(view.skipValidation) continue
     const validators = getValidators(view, service, view)
     if(Object.keys(validators).length > 0) {
-      if (view.read && !view.fetch) {
-        const oldRead = view.read
-        view.read = async (...args) => {
+      if (view.observable) {
+        const oldObservable = view.observable
+        view.observable = async (...args) => {
           const context = args[1]
           return validate(args[0], validators, { source: view, view, service, app, ...context }).then(() =>
-              oldRead.apply(view, args)
+              oldObservable.apply(view, args)
           )
         }
-      } else {
-        const oldFetch = view.fetch
-        view.fetch = async (...args) => {
+      }
+      if(view.get) {
+        const oldGet = view.get
+        view.get = async (...args) => {
           const context = args[1]
           return validate(args[0], validators, { source: view, view, service, app, ...context }).then(() =>
-              oldFetch.apply(view, args)
+              oldGet.apply(view, args)
           )
         }
       }

package/lib/utils/validators.js

@@ -34,6 +34,9 @@ let validators = {
   minLength: ({ length }) => (value) => value.length < length ? 'tooShort' : undefined,
   maxLength: ({ length }) => (value) => value.length > length ? 'tooLong' : undefined,
 
+  number: () => (value) => isNaN(value) ? 'notANumber' : undefined,
+  integer: () => (value) => !Number.isInteger(value) ? 'notAnInteger' : undefined,
+
   elementsNonEmpty: (settings) => (value) => {
     if(!value) return
     for(let el of value) {
@@ -76,4 +79,4 @@ let validators = {
 
 }
 
-module.exports = validators
+module.exports = validators

package/lib/utils.js

@@ -267,9 +267,22 @@ function extractRange(properties) {
   }
 }
 
+function isomorphic( v ) {
+  if(typeof v == 'function') {
+    return {
+      isomorphic: true,
+      function: v
+    }
+  }
+  return {
+    isomorphic: true,
+    value: v
+  }
+}
+
 module.exports = {
   typeName, toJSON, setDifference, mapDifference, crudChanges,
   getProperty, setProperty, getField, setField, isObject, mergeDeep, generateDefault,
   prefixRange, rangeProperties, fieldListToFieldsObject,
-  encodeIdentifier, extractRange
+  encodeIdentifier, extractRange, isomorphic
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {
@@ -21,13 +21,13 @@
   },
   "homepage": "https://github.com/live-change/live-change-framework",
   "devDependencies": {
-    "@live-change/dao": "0.5.6",
-    "@live-change/dao-websocket": "0.5.6",
-    "@live-change/db": "0.5.18",
-    "@live-change/db-store-level": "0.5.18",
-    "@live-change/db-store-lmdb": "0.5.18",
+    "@live-change/dao": "0.5.8",
+    "@live-change/dao-websocket": "0.5.8",
+    "@live-change/db": "0.5.19",
+    "@live-change/db-store-level": "0.5.19",
+    "@live-change/db-store-lmdb": "0.5.19",
     "@live-change/sockjs": "0.4.1",
-    "@live-change/uid": "^0.7.2",
+    "@live-change/uid": "^0.7.4",
     "cookie": "^0.4.1",
     "express": "^4.18.1",
     "os-service": "^2.2.0",
@@ -35,5 +35,5 @@
     "tape": "^5.3.2",
     "websocket": "^1.0.34"
   },
-  "gitHead": "946630a9b716bf48c6b77aea43c79b200bc82f9e"
+  "gitHead": "b4634f8267f89859042f176e5430567fd796082e"
 }