@live-change/framework 0.9.76 → 0.9.78

package/index.ts

@@ -27,8 +27,8 @@ export {
 }
 
 // Export all types from definition files
-export type { ActionDefinitionSpecification, ActionParameters } from './lib/definition/ActionDefinition.js'
-export type { EventDefinitionSpecification, EventParameters } from './lib/definition/EventDefinition.js'
+export type { ActionDefinitionSpecification } from './lib/definition/ActionDefinition.js'
+export type { EventDefinitionSpecification } from './lib/definition/EventDefinition.js'
 export type { IndexDefinitionSpecification } from './lib/definition/IndexDefinition.js'
 export type { ModelDefinitionSpecification, ModelIndexDefinitionSpecification, ModelPropertyDefinitionSpecification } from './lib/definition/ModelDefinition.js'
 export type { PropertyDefinitionSpecification, ValidationSpecification, ValidationSpecificationObject } from './lib/definition/PropertyDefinition.js'
@@ -37,3 +37,5 @@ export type { TriggerDefinitionSpecification } from './lib/definition/TriggerDef
 export type { ClientContext, ContextBase, ViewContext, ActionContext } from './lib/definition/types.js'
 export type { ServiceDefinitionSpecification } from './lib/definition/ServiceDefinition.js'
 export type { AccessSpecification, AccessFunction } from './lib/processors/accessMethod.js'
+export type { EventDefinitionSpecification as EventDefinitionSpecificationAC } from './lib/definition/EventDefinition.js'
+export type * from './lib/definition/types.js'

package/lib/definition/ActionDefinition.ts

@@ -1,17 +1,16 @@
 import { AccessSpecification } from "../processors/accessMethod.js"
 import PropertyDefinition, { PropertyDefinitionSpecification } from "./PropertyDefinition.js"
-import type { ActionContext } from "./types.js"
-
-export type ActionParameters = Record<string, any>
+import type { ActionContext, ActionParameters } from "./types.js"
 
 export interface ActionDefinitionSpecification {  
   name: string
   properties: Record<string, PropertyDefinitionSpecification>
-  returns: PropertyDefinitionSpecification,
+  returns?: PropertyDefinitionSpecification,
   execute: (parameters: ActionParameters, context: ActionContext, emit: (event: any) => void) => any,
-  access: AccessSpecification,
-  skipValidation: boolean,
-  validation: (parameters: ActionParameters, context: ActionContext) => Promise<any>
+  access?: AccessSpecification,
+  skipValidation?: boolean,
+  validation?: (parameters: ActionParameters, context: ActionContext) => Promise<any>
+  waitForEvents?: boolean
 }
 
 class ActionDefinition<T extends ActionDefinitionSpecification> {

package/lib/definition/EventDefinition.ts

@@ -1,11 +1,10 @@
 import PropertyDefinition, { PropertyDefinitionSpecification } from "./PropertyDefinition.js"
 
-export type EventParameters = Record<string, any>
+import type { EventParameters } from "./types.js"
 
 export interface EventDefinitionSpecification {
   name: string
   properties: Record<string, PropertyDefinitionSpecification>
-  returns: PropertyDefinitionSpecification,
   execute: (parameters: EventParameters) => any
 }
 
@@ -22,9 +21,6 @@ class EventDefinition<T extends EventDefinitionSpecification> {
         this.createAndAddProperty(propName, propDefn)
       }
     }
-    if(definition.returns) {
-      this.returns = new PropertyDefinition(definition.returns)
-    }
   }
 
   createAndAddProperty(name, definition) {

package/lib/definition/PropertyDefinition.ts

@@ -7,12 +7,15 @@ export interface ValidationSpecificationObject {
 
 export type ValidationSpecification = ValidationSpecificationObject | string
 
+type PropertyDefinitionSpecificationType = string | StringConstructor | NumberConstructor | BooleanConstructor
+ | DateConstructor | ObjectConstructor | ArrayConstructor
+
 export interface PropertyDefinitionSpecification {
-  type: string
+  type: PropertyDefinitionSpecificationType
   of?: PropertyDefinitionSpecification
   items?: PropertyDefinitionSpecification
   properties?: Record<string, PropertyDefinitionSpecification>,
-  validation: ValidationSpecification[]
+  validation?: ValidationSpecification[]
 }
 
 class PropertyDefinition<T extends PropertyDefinitionSpecification> {

package/lib/definition/ServiceDefinition.ts

@@ -2,7 +2,7 @@ import ModelDefinition, { ModelDefinitionSpecification } from "./ModelDefinition
 import ForeignModelDefinition from "./ForeignModelDefinition.js"
 import IndexDefinition, { IndexDefinitionSpecification } from "./IndexDefinition.js"
 import ForeignIndexDefinition from "./ForeignIndexDefinition.js"
-import ActionDefinition from "./ActionDefinition.js"
+import ActionDefinition, { ActionDefinitionSpecification } from "./ActionDefinition.js"
 import TriggerDefinition, { TriggerDefinitionSpecification } from "./TriggerDefinition.js"
 import ViewDefinition, { ViewDefinitionSpecification } from "./ViewDefinition.js"
 import EventDefinition from "./EventDefinition.js"
@@ -127,9 +127,9 @@ class ServiceDefinition<T extends ServiceDefinitionSpecification> {
     return createForeignIndexProxy(this, index)
   }
 
-  action(definition) {
+  action<T extends ActionDefinitionSpecification>(definition: T) {
     if(this.actions[definition.name]) throw new Error('action ' + definition.name + ' already exists')
-    const action = new ActionDefinition(definition)
+    const action = new ActionDefinition<T>(definition)
     this.actions[action.name] = action
     return action
   }
@@ -143,7 +143,7 @@ class ServiceDefinition<T extends ServiceDefinitionSpecification> {
 
   view<T extends ViewDefinitionSpecification>(definition: T) {
     if(this.views[definition.name]) throw new Error('view ' + definition.name + ' already exists')
-    const view = new ViewDefinition(definition)
+    const view = new ViewDefinition<T>(definition)
     this.views[view.name] = view
     return view
   }

package/lib/definition/TriggerDefinition.ts

@@ -1,9 +1,15 @@
 import PropertyDefinition, { PropertyDefinitionSpecification } from "./PropertyDefinition.js"
 
+import { TriggerParameters, TriggerContext } from "./types.js"
+
 export interface TriggerDefinitionSpecification {
   name: string
   properties: Record<string, PropertyDefinitionSpecification>
-  returns: PropertyDefinitionSpecification
+  returns?: PropertyDefinitionSpecification,
+  waitForEvents?: boolean
+  skipValidation?: boolean
+  validation?: (parameters: TriggerParameters, context: TriggerContext) => Promise<any>
+  execute: (parameters: TriggerParameters, context: TriggerContext, emit: (event: any) => void) => any,
 }
 
 class TriggerDefinition<T extends TriggerDefinitionSpecification> {

package/lib/definition/types.ts

@@ -16,6 +16,30 @@ export interface ViewContext extends ContextBase {
   view: any,
 }
 
+export type ActionParameters = Record<string, any>
+export type TriggerParameters = Record<string, any>
+export type EventParameters = Record<string, any>
+
+export interface TriggerSettings {
+  service?: string,
+  type: string,
+}
+
+export interface TriggerServiceSettings {
+  service: string,
+  type: string,
+}
+
+type ContextTriggerFunction = (triggerSettings: TriggerSettings, parameters: ActionParameters) => void
+type ContextTriggerServiceFunction = (triggerSettings: TriggerServiceSettings, parameters: ActionParameters) => void
 export interface ActionContext extends ContextBase {
-  action: any
+  action: any,
+  trigger: ContextTriggerFunction,
+  triggerService: ContextTriggerServiceFunction,
+}
+
+export interface TriggerContext extends ContextBase {
+  reaction: any,
+  trigger: ContextTriggerFunction,
+  triggerService: ContextTriggerServiceFunction,
 }

package/lib/utils/validation.js

@@ -23,6 +23,33 @@ function getValidators(source, service) {
           else validators[propName] = [validator]
       }
     }
+    if(prop.type === Object) {
+      validators = {
+        ...validators,
+        ...Object.fromEntries(
+          Object.entries(getValidators(prop, service))
+            .map(([key, value]) => [propName + '.' + key, value])
+        )
+      }
+    }
+    if(prop.type === Array) {
+      const elementType = prop.of ?? prop.items
+      if(elementType?.type === Object) {
+        validators = {
+          ...validators,
+          ...Object.fromEntries(
+            Object.entries(getValidators(prop, service))
+              .map(([key, value]) => [propName + '.' + key, value])
+          )
+        }
+      } 
+      if(elementType?.validation) {  
+        validators[propName + '.#'] = validators[propName + '.#'] || []
+        for(let validation of elementType.validation) {
+          validators[propName + '.#'].push(getValidator(validation, context))            
+        }
+      }
+    }
   }
   return validators
 }
@@ -32,23 +59,39 @@ async function validate(props, validators, context) {
   let propPromises = {}
   for(let propName in validators) {
     let propValidators = validators[propName]
-    let promises = []
-    for(let validator of propValidators) {
-      //console.log("PROPS",props, propName)
-      promises.push(validator(props[propName], { ...context, props, propName }))
+    const path = propName.split('.')
+    function validateProperty(data, pathIndex, propNameAccumulator = '') {
+      //console.log('  '.repeat(pathIndex), "VALIDATE PROPERTY", pathIndex, propNameAccumulator)
+      if(pathIndex === path.length) {
+        const promises = (propPromises[propNameAccumulator] || [])
+        for(let validator of propValidators) {          
+          promises.push(validator(data, { ...context, props, propName: propNameAccumulator }))
+        }
+        propPromises[propNameAccumulator] = promises
+      } else {
+        if(path[pathIndex] === '#') {
+          for(let i = 0; i < data.length; i++) {
+            validateProperty(data[i], pathIndex + 1, 
+              propNameAccumulator + (propNameAccumulator ? '.' : '') + i)
+          }
+        } else {
+          const deeper = data?.[path[pathIndex]] ?? null
+          if(deeper === null) return
+          validateProperty(deeper, pathIndex + 1, 
+            propNameAccumulator + (propNameAccumulator ? '.' : '') + path[pathIndex])
+        }
+      }
     }
-    propPromises[propName] = Promise.all(promises)
+    validateProperty(props, 0)
   }
   let propErrors = {}
-  for(let propName in validators) {
-    let errors = (await propPromises[propName]).filter(e=>!!e)
-    //console.log("EERRS",propName, errors)
+  for(const [propName, promises] of Object.entries(propPromises)) {
+    let errors = (await Promise.all(promises)).filter(x=> !!x)
     if(errors.length > 0) {
-      //console.log("ERRS", propName)
       propErrors[propName] = errors[0]
     }
   }
-  //console.log("PROP ERRORS", propErrors)
+  console.log("PROP ERRORS", propErrors)
   if(Object.keys(propErrors).length > 0) throw { properties: propErrors }
 }
 

package/lib/utils/validators.js

@@ -1,6 +1,6 @@
 import { mergeDeep } from "../utils.js"
 
-function nonEmpty(value) {
+export function nonEmpty(value) {
   if(!value) return 'empty'
   if(typeof value == 'string') {
     if(!value.trim()) return 'empty'
@@ -14,7 +14,7 @@ function nonEmpty(value) {
   }
 }
 
-function getField(context, fieldName) {
+export function getField(context, fieldName) {
   const propPath = context.propName ? context.propName.split('.') : []
   propPath.pop()
   let path

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.9.76",
+  "version": "0.9.78",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {
@@ -22,11 +22,11 @@
   },
   "homepage": "https://github.com/live-change/live-change-stack",
   "devDependencies": {
-    "@live-change/dao": "^0.9.76",
-    "@live-change/uid": "^0.9.76",
+    "@live-change/dao": "^0.9.78",
+    "@live-change/uid": "^0.9.78",
     "typedoc": "0.28.3",
     "typedoc-plugin-markdown": "^4.6.3",
     "typedoc-plugin-rename-defaults": "^0.7.3"
   },
-  "gitHead": "7b28068b9dca33af82e94db52b8a778c289edfbc"
+  "gitHead": "747a9cb02377d924583925508f082c8dd5031d43"
 }