@live-change/framework 0.7.38 → 0.8.0

package/index.js

@@ -1,30 +1,44 @@
-const App = require('./lib/App.js')
+import App from './lib/App.js'
 
-module.exports = App
-
-module.exports.app = () => {
+App.app = () => {
   if(!globalThis.liveChangeFrameworkApp) {
     globalThis.liveChangeFrameworkApp = new App()
   }
   return globalThis.liveChangeFrameworkApp
 }
 
-module.exports.utils = require('./lib/utils.js')
-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
+import * as utils from './lib/utils.js'
+import * as validation from './lib/utils/validation.js'
+
+App.utils = utils
+App.validation = validation
+App.rangeProperties = utils.rangeProperties
+App.encodeIdentifier = utils.encodeIdentifier
+App.extractRange = utils.extractRange
+App.isomorphic = utils.isomorphic
 
+export default App
 
-module.exports.ActionDefinition = require('./lib/definition/ActionDefinition.js')
-module.exports.EventDefinition = require('./lib/definition/EventDefinition.js')
-module.exports.ForeignIndexDefinition = require('./lib/definition/ForeignIndexDefinition.js')
-module.exports.ForeignModelDefinition = require('./lib/definition/ForeignModelDefinition.js')
-module.exports.IndexDefinition = require('./lib/definition/IndexDefinition.js')
-module.exports.ModelDefinition = require('./lib/definition/ModelDefinition.js')
-module.exports.PropertyDefinition = require('./lib/definition/PropertyDefinition.js')
-module.exports.ServiceDefinition = require('./lib/definition/ServiceDefinition.js')
-module.exports.TriggerDefinition = require('./lib/definition/TriggerDefinition.js')
-module.exports.ViewDefinition = require('./lib/definition/ViewDefinition.js')
+import ActionDefinition from './lib/definition/ActionDefinition.js'
+import EventDefinition from './lib/definition/EventDefinition.js'
+import ForeignIndexDefinition from './lib/definition/ForeignIndexDefinition.js'
+import ForeignModelDefinition from './lib/definition/ForeignModelDefinition.js'
+import IndexDefinition from './lib/definition/IndexDefinition.js'
+import ModelDefinition from './lib/definition/ModelDefinition.js'
+import PropertyDefinition from './lib/definition/PropertyDefinition.js'
+import ServiceDefinition from './lib/definition/ServiceDefinition.js'
+import TriggerDefinition from './lib/definition/TriggerDefinition.js'
+import ViewDefinition from './lib/definition/ViewDefinition.js'
 
+export {
+  ActionDefinition,
+  EventDefinition,
+  ForeignIndexDefinition,
+  ForeignModelDefinition,
+  IndexDefinition,
+  ModelDefinition,
+  PropertyDefinition,
+  ServiceDefinition,
+  TriggerDefinition,
+  ViewDefinition
+}

package/lib/App.js

@@ -1,42 +1,42 @@
-const { uidGenerator, randomString } = require('@live-change/uid')
+import { uidGenerator, randomString } from '@live-change/uid'
 
-const ReactiveDao = require("@live-change/dao")
+import ReactiveDao from "@live-change/dao"
 
-const ServiceDefinition = require("./definition/ServiceDefinition.js")
+import ServiceDefinition from "./definition/ServiceDefinition.js"
 
-const Service = require("./runtime/Service.js")
+import Service from "./runtime/Service.js"
 
-const profileLog = require("./utils/profileLog.js")
+import profileLog from "./utils/profileLog.js"
 
-const Dao = require("./runtime/Dao.js")
-const SessionDao = require("./runtime/SessionDao.js")
-const LiveDao = require("./runtime/LiveDao.js")
-const ApiServer = require("./runtime/ApiServer.js")
+import Dao from "./runtime/Dao.js"
+import SessionDao from "./runtime/SessionDao.js"
+import LiveDao from "./runtime/LiveDao.js"
+import ApiServer from "./runtime/ApiServer.js"
 
-const reverseRelationProcessor = require("./processors/reverseRelation.js")
-const indexListProcessor = require("./processors/indexList.js")
-const crudGenerator = require("./processors/crudGenerator.js")
-const draftGenerator = require("./processors/draftGenerator.js")
-const daoPathView = require("./processors/daoPathView.js")
-const fetchView = require("./processors/fetchView.js")
-const accessControl = require("./processors/accessControl.js")
-const autoValidation = require("./processors/autoValidation.js")
-const indexCode = require("./processors/indexCode.js")
+import reverseRelationProcessor from "./processors/reverseRelation.js"
+import indexListProcessor from "./processors/indexList.js"
+import crudGenerator from "./processors/crudGenerator.js"
+import draftGenerator from "./processors/draftGenerator.js"
+import daoPathView from "./processors/daoPathView.js"
+import fetchView from "./processors/fetchView.js"
+import accessControl from "./processors/accessControl.js"
+import autoValidation from "./processors/autoValidation.js"
+import indexCode from "./processors/indexCode.js"
 
-const databaseUpdater = require("./updaters/database.js")
+import databaseUpdater from "./updaters/database.js"
 
-const accessControlFilter = require("./clientSideFilters/accessFilter.js")
-const clientSideFilter = require("./clientSideFilters/clientSideFilter.js")
+import accessControlFilter from "./clientSideFilters/accessFilter.js"
+import clientSideFilter from "./clientSideFilters/clientSideFilter.js"
 
-const commandExecutor = require("./processes/commandExecutor.js")
-const triggerExecutor = require("./processes/triggerExecutor.js")
-const eventListener = require('./processes/eventListener.js')
+import commandExecutor from "./processes/commandExecutor.js"
+import triggerExecutor from "./processes/triggerExecutor.js"
+import eventListener from './processes/eventListener.js'
 
-const utils = require('./utils.js')
-const SplitEmitQueue = require("./utils/SplitEmitQueue.js");
-const SingleEmitQueue = require("./utils/SingleEmitQueue.js");
+import SplitEmitQueue from "./utils/SplitEmitQueue.js"
+import SingleEmitQueue from "./utils/SingleEmitQueue.js"
 
-const debug = require('debug')('framework')
+import Debug from 'debug'
+const debug = Debug('framework')
 
 class App {
 
@@ -89,8 +89,9 @@ class App {
   }
 
   createServiceDefinition( definition ) {
-    const config = this.config && this.config.services && this.config.services.find
+    const sourceConfig = this.config && this.config.services && this.config.services.find
       && this.config.services.find(c => c.name == definition.name)
+    const config = { ...sourceConfig, module: null }
     return new ServiceDefinition({ ...definition, config })
   }
 
@@ -542,5 +543,4 @@ class App {
 
 }
 
-
-module.exports = App
+export default App

package/lib/clientSideFilters/accessFilter.js

@@ -1,6 +1,6 @@
-const getAccessMethod = require("../processors/accessMethod.js")
+import getAccessMethod from "../processors/accessMethod.js"
 
-module.exports = async function(service, definition, app, client) {
+export default async function(service, definition, app, client) {
 
   for(let actionName in definition.actions) {
     const action = service.definition.actions[actionName]

package/lib/clientSideFilters/clientSideFilter.js

@@ -1,5 +1,5 @@
 
-module.exports = function(service, definition, app) {
+export default function clientSideFilter(service, definition, app) {
 /*  for(let actionName in service.actions) {
     const action = service.actions[actionName]
 

package/lib/definition/ActionDefinition.js

@@ -1,5 +1,4 @@
-const PropertyDefinition = require("./PropertyDefinition.js")
-const utils = require("../utils.js")
+import PropertyDefinition from "./PropertyDefinition.js"
 
 class ActionDefinition {
 
@@ -37,4 +36,4 @@ class ActionDefinition {
 
 }
 
-module.exports = ActionDefinition
+export default ActionDefinition

package/lib/definition/EventDefinition.js

@@ -1,5 +1,4 @@
-const PropertyDefinition = require("./PropertyDefinition.js")
-const utils = require("../utils.js")
+import PropertyDefinition from "./PropertyDefinition.js"
 
 class EventDefinition {
 
@@ -43,4 +42,4 @@ class EventDefinition {
   }
 }
 
-module.exports = EventDefinition
+export default EventDefinition

package/lib/definition/ForeignIndexDefinition.js

@@ -1,4 +1,3 @@
-const utils = require("../utils.js")
 
 class ForeignIndexDefinition {
 
@@ -16,4 +15,4 @@ class ForeignIndexDefinition {
 
 }
 
-module.exports = ForeignIndexDefinition
+export default ForeignIndexDefinition

package/lib/definition/ForeignModelDefinition.js

@@ -1,5 +1,3 @@
-const utils = require("../utils.js")
-
 class ForeignModelDefinition {
 
   constructor(serviceName, modelName) {
@@ -20,4 +18,4 @@ class ForeignModelDefinition {
 
 }
 
-module.exports = ForeignModelDefinition
+export default ForeignModelDefinition

package/lib/definition/IndexDefinition.js

@@ -1,5 +1,3 @@
-const PropertyDefinition = require("./PropertyDefinition.js")
-const utils = require("../utils.js")
 
 class IndexDefinition {
 
@@ -37,8 +35,6 @@ class IndexDefinition {
     return changes
   }
 
-
-
 }
 
-module.exports = IndexDefinition
+export default IndexDefinition

package/lib/definition/ModelDefinition.js

@@ -1,5 +1,5 @@
-const PropertyDefinition = require("./PropertyDefinition.js")
-const utils = require("../utils.js")
+import PropertyDefinition from "./PropertyDefinition.js"
+import { crudChanges } from "../utils.js"
 
 class ModelDefinition {
 
@@ -55,9 +55,9 @@ class ModelDefinition {
     oldModel.indexes = oldModel.indexes || {}
     let changes = []
     const json = this.toJSON()
-    changes.push(...utils.crudChanges(oldModel.properties || {}, json.properties || {},
+    changes.push(...crudChanges(oldModel.properties || {}, json.properties || {},
         "Property", "property", { model: this.name }))
-    changes.push(...utils.crudChanges(oldModel.indexes || {}, json.indexes || {},
+    changes.push(...crudChanges(oldModel.indexes || {}, json.indexes || {},
         "Index", "index", { model: this.name, storage: this.storage }))
     if(oldModel.search && !this.search) changes.push({ operation: "searchDisabled", model: this.name })
     if(!oldModel.search && this.search) changes.push({ operation: "searchEnabled", model: this.name })
@@ -76,8 +76,6 @@ class ModelDefinition {
     return changes
   }
 
-
-
 }
 
-module.exports = ModelDefinition
+export default ModelDefinition

package/lib/definition/PropertyDefinition.js

@@ -1,4 +1,4 @@
-const utils = require("../utils.js")
+import { typeName } from "../utils.js"
 
 class PropertyDefinition {
 
@@ -30,7 +30,7 @@ class PropertyDefinition {
     }
     let json = {
       ...this,
-      type: utils.typeName(this.type),
+      type: typeName(this.type),
       properties
     }
     if(this.of) {
@@ -43,8 +43,8 @@ class PropertyDefinition {
   computeChanges( oldProperty, params, name) {
     let changes = []
     let typeChanged = false
-    if(utils.typeName(this.type) != utils.typeName(oldProperty.type)) typeChanged = true
-    if((this.of && utils.typeName(this.of.type)) != (oldProperty.of && utils.typeName(oldProperty.of.type)))
+    if(typeName(this.type) != typeName(oldProperty.type)) typeChanged = true
+    if((this.of && typeName(this.of.type)) != (oldProperty.of && typeName(oldProperty.of.type)))
       typeChanged = true
     if(typeChanged) {
       changes.push({
@@ -67,4 +67,4 @@ class PropertyDefinition {
 
 }
 
-module.exports = PropertyDefinition
+export default PropertyDefinition

package/lib/definition/ServiceDefinition.js

@@ -1,13 +1,13 @@
-const ModelDefinition = require("./ModelDefinition.js")
-const ForeignModelDefinition = require("./ForeignModelDefinition.js")
-const IndexDefinition = require("./IndexDefinition.js")
-const ForeignIndexDefinition = require("./ForeignIndexDefinition.js")
-const ActionDefinition = require("./ActionDefinition.js")
-const TriggerDefinition = require("./TriggerDefinition.js")
-const ViewDefinition = require("./ViewDefinition.js")
-const EventDefinition = require("./EventDefinition.js")
-const defaultValidators = require('../utils/validators.js')
-const utils = require("../utils.js")
+import ModelDefinition from "./ModelDefinition.js"
+import ForeignModelDefinition from "./ForeignModelDefinition.js"
+import IndexDefinition from "./IndexDefinition.js"
+import ForeignIndexDefinition from "./ForeignIndexDefinition.js"
+import ActionDefinition from "./ActionDefinition.js"
+import TriggerDefinition from "./TriggerDefinition.js"
+import ViewDefinition from "./ViewDefinition.js"
+import EventDefinition from "./EventDefinition.js"
+import defaultValidators from '../utils/validators.js'
+import { crudChanges } from "../utils.js"
 
 function createModelProxy(definition, model) {
   return new Proxy(model, {
@@ -86,7 +86,7 @@ class ServiceDefinition {
     this.authenticators = []
     this.beforeStartCallbacks = []
     this.endpoints = []
-    this.validators = defaultValidators
+    this.validators = { ...defaultValidators }
     this.clientSideFilters = []
     for(let key in definition) this[key] = definition[key]
   }
@@ -209,11 +209,11 @@ class ServiceDefinition {
   computeChanges( oldModuleParam ) {
     let oldModule = JSON.parse(JSON.stringify(oldModuleParam))
     let changes = []
-    changes.push(...utils.crudChanges(oldModule.models || {}, this.models || {},
+    changes.push(...crudChanges(oldModule.models || {}, this.models || {},
         "Model", "model", { }))
     return changes
   }
 
 }
 
-module.exports = ServiceDefinition
+export default ServiceDefinition

package/lib/definition/TriggerDefinition.js

@@ -1,4 +1,4 @@
-const PropertyDefinition = require("./PropertyDefinition.js")
+import PropertyDefinition from "./PropertyDefinition.js"
 
 class TriggerDefinition {
 
@@ -36,4 +36,4 @@ class TriggerDefinition {
 
 }
 
-module.exports = TriggerDefinition
+export default TriggerDefinition

package/lib/definition/ViewDefinition.js

@@ -1,4 +1,4 @@
-const PropertyDefinition = require("./PropertyDefinition.js")
+import PropertyDefinition from "./PropertyDefinition.js"
 
 class ViewDefinition {
 
@@ -36,4 +36,4 @@ class ViewDefinition {
 
 }
 
-module.exports = ViewDefinition
+export default ViewDefinition

package/lib/processes/commandExecutor.js

@@ -1,7 +1,7 @@
-const KeyBasedExecutionQueues = require('../utils/KeyBasedExecutionQueues.js')
-const CommandQueue = require('../utils/CommandQueue.js')
-const SingleEmitQueue = require('../utils/SingleEmitQueue.js')
-const SplitEmitQueue = require('../utils/SplitEmitQueue.js')
+import KeyBasedExecutionQueues from '../utils/KeyBasedExecutionQueues.js';
+import CommandQueue from '../utils/CommandQueue.js';
+import SingleEmitQueue from '../utils/SingleEmitQueue.js';
+import SplitEmitQueue from '../utils/SplitEmitQueue.js';
 
 async function startCommandExecutor(service, config) {
   if(!config.runCommands) return
@@ -94,4 +94,4 @@ async function startCommandExecutor(service, config) {
   service.commandQueue.start()
 }
 
-module.exports = startCommandExecutor
+export default startCommandExecutor

package/lib/processes/eventListener.js

@@ -1,4 +1,4 @@
-const EventSourcing = require('../utils/EventSourcing.js')
+import EventSourcing from '../utils/EventSourcing.js'
 
 async function startEventListener(service, config) {
   if(!config.handleEvents) return
@@ -36,4 +36,4 @@ async function startEventListener(service, config) {
   service.eventSourcing.start()
 }
 
-module.exports = startEventListener
+export default startEventListener

package/lib/processes/triggerExecutor.js

@@ -1,7 +1,7 @@
-const KeyBasedExecutionQueues = require('../utils/KeyBasedExecutionQueues.js')
-const CommandQueue = require('../utils/CommandQueue.js')
-const SingleEmitQueue = require('../utils/SingleEmitQueue.js')
-const SplitEmitQueue = require('../utils/SplitEmitQueue.js')
+import KeyBasedExecutionQueues from '../utils/KeyBasedExecutionQueues.js'
+import CommandQueue from '../utils/CommandQueue.js'
+import SingleEmitQueue from '../utils/SingleEmitQueue.js'
+import SplitEmitQueue from '../utils/SplitEmitQueue.js'
 
 async function startTriggerExecutor(service, config) {
   if(!config.runCommands) return
@@ -34,4 +34,4 @@ async function startTriggerExecutor(service, config) {
   service.triggerQueue.start()
 }
 
-module.exports = startTriggerExecutor
+export default startTriggerExecutor

package/lib/processors/accessControl.js

@@ -1,6 +1,6 @@
-const getAccessMethod = require("./accessMethod.js")
+import getAccessMethod from "./accessMethod.js"
 
-module.exports = function(module, app) {
+export default function(module, app) {
   for(let actionName in module.actions) {
     const action = module.actions[actionName]
     if(!action.access) continue;

package/lib/processors/accessMethod.js

@@ -1,4 +1,4 @@
-function getAccessMethod(access) {
+export default function getAccessMethod(access) {
   if(typeof access == 'function') {
     return access
   } else if(Array.isArray(access)) {
@@ -10,5 +10,3 @@ function getAccessMethod(access) {
     }
   } else throw new Error("unknown view access definition "+access)
 }
-
-module.exports = getAccessMethod

package/lib/processors/autoValidation.js

@@ -1,6 +1,6 @@
-const { getValidators, validate } = require('../utils/validation.js')
+import { getValidators, validate } from '../utils/validation.js'
 
-module.exports = function(service, app) {
+export default function(service, app) {
   for(let actionName in service.actions) {
     const action = service.actions[actionName]
     if(action.skipValidation) continue

package/lib/processors/crudGenerator.js

@@ -1,4 +1,4 @@
-const utils = require("../utils.js")
+import * as utils from "../utils.js"
 
 function ignoreValidation(prop) {
   delete prop.validation
@@ -12,7 +12,7 @@ function ignoreValidation(prop) {
   }
 }
 
-module.exports = function(service, app) {
+export default function(service, app) {
   if(!service) throw new Error("no service")
   if(!app) throw new Error("no service")
   for(let modelName in service.models) {

package/lib/processors/daoPathView.js

@@ -1,6 +1,6 @@
-const ReactiveDao = require("@live-change/dao")
+import ReactiveDao from "@live-change/dao"
 
-module.exports = function(service, app) {
+export default function(service, app) {
   for(let viewName in service.views) {
     const view = service.views[viewName]
     if(view.daoPath) {

package/lib/processors/draftGenerator.js

@@ -1,4 +1,4 @@
-const utils = require("../utils.js")
+import * as utils from "../utils.js"
 
 function propertyWithoutValidation(property) {
   let prop = { ...property }
@@ -20,7 +20,7 @@ function propertiesWithoutValidation(properties, validateFields) {
   return propertiesWV
 }
 
-module.exports = function(service, app) {
+export default function(service, app) {
   if(!service) throw new Error("no service")
   if(!app) throw new Error("no service")
   for(let actionName in service.actions) {

package/lib/processors/fetchView.js

@@ -1,6 +1,6 @@
-const ReactiveDao = require("@live-change/dao")
+import ReactiveDao from "@live-change/dao"
 
-module.exports = function(service, app) {
+export default function(service, app) {
   for(let viewName in service.views) {
     const view = service.views[viewName]
     if(view.fetch) {

package/lib/processors/indexCode.js

@@ -1,5 +1,4 @@
-
-module.exports = function(module, app) {
+export default function(module, app) {
   for(let modelName in module.models) {
     const model = module.models[modelName]
     for(let indexName in model.indexes) {

package/lib/processors/indexList.js

@@ -1,6 +1,6 @@
-const utils = require("../utils.js")
+import * as utils from "../utils.js"
 
-module.exports = function(module, app) {
+export default function(module, app) {
   for(let modelName in module.models) {
     const model = module.models[modelName]
     for(let propertyName in model.properties) {

package/lib/processors/reverseRelation.js

@@ -1,6 +1,6 @@
-const utils = require("../utils.js")
+import * as utils from "../utils.js"
 
-module.exports = function(module, app) {
+export default function(module, app) {
   for(let modelName in module.models) {
     const model = module.models[modelName]
     for(let propertyName in model.properties) {

package/lib/runtime/Action.js

@@ -1,4 +1,4 @@
-const { prepareParameters, processReturn, preFilterParameters } = require("./params.js")
+import { prepareParameters, processReturn, preFilterParameters } from "./params.js"
 
 class Action {
 
@@ -48,4 +48,4 @@ class Action {
   }
 }
 
-module.exports = Action
+export default Action

package/lib/runtime/ApiServer.js

@@ -1,8 +1,8 @@
-const LcDao = require("@live-change/dao")
-const Dao = require("./Dao.js")
-const cookie = require('cookie')
+import LcDao from "@live-change/dao"
+import Dao from "./Dao.js"
+import cookie from 'cookie'
 
-const { getIp } = require("./utils.js")
+import { getIp } from "./utils.js"
 
 class ApiServer {
   constructor(config, DaoConstructor = Dao) {
@@ -55,4 +55,4 @@ class ApiServer {
   }
 }
 
-module.exports = ApiServer
+export default ApiServer

package/lib/runtime/Dao.js

@@ -1,6 +1,6 @@
-const ReactiveDao = require("@live-change/dao")
+import ReactiveDao from "@live-change/dao"
 
-const profileLog = require("../utils/profileLog.js")
+import profileLog from "../utils/profileLog.js"
 
 function promiseMap(promise, fn) {
   if(promise.then) return promise.then(fn)
@@ -181,4 +181,4 @@ class Dao extends ReactiveDao {
   }
 }
 
-module.exports = Dao
+export default Dao

package/lib/runtime/EventHandler.js

@@ -1,4 +1,4 @@
-const { prepareParameters, processReturn } = require("./params.js")
+import { prepareParameters, processReturn } from "./params.js"
 
 class EventHandler {
 
@@ -31,4 +31,4 @@ class EventHandler {
   }
 }
 
-module.exports = EventHandler
+export default EventHandler

package/lib/runtime/ForeignModel.js

@@ -1,4 +1,4 @@
-const ReaderModel = require("./ReaderModel.js")
+import ReaderModel from "./ReaderModel.js"
 
 class ForeignModel extends ReaderModel {
 
@@ -9,4 +9,4 @@ class ForeignModel extends ReaderModel {
 
 }
 
-module.exports = ForeignModel
+export default ForeignModel

package/lib/runtime/Index.js

@@ -1,5 +1,5 @@
-const ReactiveDao = require("@live-change/dao")
-const utils = require("../utils.js");
+import ReactiveDao from "@live-change/dao"
+import { prefixRange } from "../utils.js"
 
 class Index {
 
@@ -19,7 +19,7 @@ class Index {
       const values = Array.isArray(range) ? range : [range]
       const prefix = values.map(value => value === undefined ? '' : JSON.stringify(value)).join(':')
       if(pathRange) {
-        return this.rangePath(utils.prefixRange(pathRange, prefix, prefix))
+        return this.rangePath(prefixRange(pathRange, prefix, prefix))
       }
       return this.rangePath({ gte: prefix+':', lte: prefix+'_\xFF\xFF\xFF\xFF' })
     }
@@ -45,4 +45,4 @@ class Index {
 
 }
 
-module.exports = Index
+export default Index

package/lib/runtime/LiveDao.js

@@ -1,7 +1,7 @@
-const LcDao = require("@live-change/dao")
-const Dao = require("./Dao.js")
+import LcDao from "@live-change/dao"
+import Dao from "./Dao.js"
 
-const { waitForSignal } = require('./utils.js')
+import { waitForSignal } from './utils.js'
 
 class LiveDao extends LcDao.DaoProxy {
   constructor(config, credentials) {
@@ -94,4 +94,4 @@ class LiveDao extends LcDao.DaoProxy {
   }
 }
 
-module.exports = LiveDao
+export default LiveDao

package/lib/runtime/Model.js

@@ -1,5 +1,5 @@
-const ReaderModel = require("./ReaderModel.js")
-const utils = require("../utils.js");
+import ReaderModel from "./ReaderModel.js"
+import { prefixRange }from "../utils.js"
 
 class Model extends ReaderModel {
 
@@ -44,7 +44,7 @@ class Model extends ReaderModel {
       const values = Array.isArray(range) ? range : [range]
       const prefix = values.map(value => value === undefined ? '' : JSON.stringify(value)).join(':')
       if(pathRange) {
-        return this.rangePath(utils.prefixRange(pathRange, prefix, prefix))
+        return this.rangePath(prefixRange(pathRange, prefix, prefix))
       }
       return this.rangePath({ gte: prefix+':', lte: prefix+'_\xFF\xFF\xFF\xFF' })
     }
@@ -63,7 +63,7 @@ class Model extends ReaderModel {
       const values = Array.isArray(range) ? range : [range]
       const prefix = values.map(value => value === undefined ? '' : JSON.stringify(value)).join(':')
       if(pathRange) {
-        return this.indexRangeDelete(index, utils.prefixRange(pathRange, prefix, prefix))
+        return this.indexRangeDelete(index, prefixRange(pathRange, prefix, prefix))
       }
       return this.indexRangeDelete(index,{ gte: prefix+':', lte: prefix+'_\xFF\xFF\xFF\xFF' })
     }
@@ -81,7 +81,7 @@ class Model extends ReaderModel {
       const values = Array.isArray(range) ? range : [range]
       const prefix = values.map(value => value === undefined ? '' : JSON.stringify(value)).join(':')
       if(pathRange) {
-        return this.indexRangeUpdate(index, update, utils.prefixRange(pathRange, prefix, prefix))
+        return this.indexRangeUpdate(index, update, prefixRange(pathRange, prefix, prefix))
       }
       return this.indexRangeUpdate(index, update,{ gte: prefix+':', lte: prefix+'_\xFF\xFF\xFF\xFF' })
     }
@@ -95,8 +95,6 @@ class Model extends ReaderModel {
     })`, { indexName: this.tableName+'_'+index, tableName: this.tableName, range, operations })
   }
 
-
-
 }
 
-module.exports = Model
+export default Model

package/lib/runtime/ReaderModel.js

@@ -1,5 +1,5 @@
-const ReactiveDao = require("@live-change/dao")
-const utils = require('../utils.js')
+import LcDao from "@live-change/dao"
+import { prefixRange, fieldListToFieldsObject } from "../utils.js"
 
 class ReaderModel {
 
@@ -16,7 +16,7 @@ class ReaderModel {
 
   limitedPath(id, fields) { // takes object or list of fields
     if(Array.isArray(fields)) {
-      fields = utils.fieldListToFieldsObject(fields)
+      fields = fieldListToFieldsObject(fields)
     }
     fields.id = true // id is required
     return ['database', 'queryObject', this.service.databaseName, `(${
@@ -44,7 +44,7 @@ class ReaderModel {
       const values = Array.isArray(range) ? range : [range]
       const prefix = values.map(value => value === undefined ? '' : JSON.stringify(value)).join(':')
       if(pathRange) {
-        return this.rangePath(utils.prefixRange(pathRange, prefix, prefix))
+        return this.rangePath(prefixRange(pathRange, prefix, prefix))
       }
       return this.rangePath({ gte: prefix+':', lte: prefix+'_\xFF\xFF\xFF\xFF' })
     }
@@ -57,7 +57,7 @@ class ReaderModel {
       const values = Array.isArray(range) ? range : [range]
       const prefix = values.map(value => value === undefined ? '' : JSON.stringify(value)).join(':')
       if(pathRange) {
-        return this.indexRangePath(index, utils.prefixRange(pathRange, prefix, prefix))
+        return this.indexRangePath(index, prefixRange(pathRange, prefix, prefix))
       }
       return this.indexRangePath(index, { gte: prefix+':', lte: prefix+'_\xFF\xFF\xFF\xFF' })
     }
@@ -115,7 +115,7 @@ class ReaderModel {
       const values = Array.isArray(range) ? range : [range]
       const prefix = values.map(value => value === undefined ? '' : JSON.stringify(value)).join(':')
       if(pathRange) {
-        return this.sortedIndexRangePath(index, utils.prefixRange(pathRange, prefix, prefix))
+        return this.sortedIndexRangePath(index, prefixRange(pathRange, prefix, prefix))
       }
       return this.sortedIndexRangePath(index, { gte: prefix+':', lte: prefix+'_\xFF\xFF\xFF\xFF' })
     }
@@ -178,7 +178,7 @@ class ReaderModel {
       const values = Array.isArray(range) ? range : [range]
       const prefix = values.map(value => value === undefined ? '' : JSON.stringify(value)).join(':')
       if(pathRange) {
-        return this.indexObjectPath(index, utils.prefixRange(pathRange, prefix, prefix))
+        return this.indexObjectPath(index, prefixRange(pathRange, prefix, prefix))
       }
       return this.indexObjectPath(index,{ gte: prefix+':', lte: prefix+'_\xFF\xFF\xFF\xFF' })
     }
@@ -216,7 +216,7 @@ class ReaderModel {
       const values = Array.isArray(range) ? range : [range]
       const prefix = values.map(value => value === undefined ? '' : JSON.stringify(value)).join(':')
       if(pathRange) {
-        return this.countPath(utils.prefixRange(pathRange, prefix, prefix))
+        return this.countPath(prefixRange(pathRange, prefix, prefix))
       }
       return this.countPath({ gte: prefix+':', lte: prefix+'_\xFF\xFF\xFF\xFF' })
     }
@@ -225,22 +225,22 @@ class ReaderModel {
   }
 
   observable(id) {
-    return this.service.dao.observable(this.path(id), ReactiveDao.ObservableValue)
+    return this.service.dao.observable(this.path(id), LcDao.ObservableValue)
   }
   async get(id) {
-    return this.service.dao.get(this.path(id), ReactiveDao.ObservableValue)
+    return this.service.dao.get(this.path(id), LcDao.ObservableValue)
   }
   rangeObservable(range) {
-    return this.service.dao.observable(this.rangePath(range), ReactiveDao.ObservableList)
+    return this.service.dao.observable(this.rangePath(range), LcDao.ObservableList)
   }
   async rangeGet(range) {
-    return this.service.dao.get(this.rangePath(range), ReactiveDao.ObservableList)
+    return this.service.dao.get(this.rangePath(range), LcDao.ObservableList)
   }
   indexRangeObservable(index, range, pathRange = null) {
-    return this.service.dao.observable(this.indexRangePath(index, range, pathRange), ReactiveDao.ObservableList)
+    return this.service.dao.observable(this.indexRangePath(index, range, pathRange), LcDao.ObservableList)
   }
   async indexRangeGet(index, range, pathRange = null) {
-    return this.service.dao.get(this.indexRangePath(index, range, pathRange), ReactiveDao.ObservableList)
+    return this.service.dao.get(this.indexRangePath(index, range, pathRange), LcDao.ObservableList)
   }
   indexObjectObservable(index, range, pathRange = null) {
     return this.service.dao.observable(this.indexObjectPath(index, range, pathRange))
@@ -249,16 +249,16 @@ class ReaderModel {
     return this.service.dao.get(this.indexObjectPath(index, range, pathRange))
   }
   sortedIndexRangeObservable(index, range, pathRange = null) {
-    return this.service.dao.observable(this.sortedIndexRangePath(index, range, pathRange), ReactiveDao.ObservableList)
+    return this.service.dao.observable(this.sortedIndexRangePath(index, range, pathRange), LcDao.ObservableList)
   }
   async sortedIndexRangeGet(index, range, pathRange = null) {
-    return this.service.dao.get(this.sortedIndexRangePath(index, range, pathRange), ReactiveDao.ObservableList)
+    return this.service.dao.get(this.sortedIndexRangePath(index, range, pathRange), LcDao.ObservableList)
   }
   countObservable(range) {
-    return this.service.dao.observable(this.countPath(range), ReactiveDao.ObservableList)
+    return this.service.dao.observable(this.countPath(range), LcDao.ObservableList)
   }
   async countGet(range) {
-    return this.service.dao.get(this.countPath(range), ReactiveDao.ObservableList)
+    return this.service.dao.get(this.countPath(range), LcDao.ObservableList)
   }
 
   condition(id, condition = x => !!x, timeout = 10000) {
@@ -286,4 +286,4 @@ class ReaderModel {
 
 }
 
-module.exports = ReaderModel
+export default ReaderModel

package/lib/runtime/SearchIndexer.js

@@ -1,5 +1,3 @@
-
-
 const SEARCH_INDEX_NOTSTARTED = 0
 const SEARCH_INDEX_CREATING = 1
 const SEARCH_INDEX_UPDATING = 2
@@ -313,4 +311,4 @@ class SearchIndexer {
 
 }
 
-module.exports = SearchIndexer
+export default SearchIndexer

package/lib/runtime/Service.js

@@ -1,11 +1,11 @@
-const Model = require("./Model.js")
-const ForeignModel = require("./ForeignModel.js")
-const Index = require("./Index.js")
-const View = require("./View.js")
-const Action = require("./Action.js")
-const EventHandler = require("./EventHandler.js")
-const TriggerHandler = require("./TriggerHandler.js")
-const ExecutionQueue = require("../utils/ExecutionQueue.js")
+import Model from "./Model.js"
+import ForeignModel from "./ForeignModel.js"
+import Index from "./Index.js"
+import View from "./View.js"
+import Action from "./Action.js"
+import EventHandler from "./EventHandler.js"
+import TriggerHandler from "./TriggerHandler.js"
+import ExecutionQueue from "../utils/ExecutionQueue.js"
 
 class Service {
 
@@ -99,4 +99,4 @@ class Service {
 }
 
 
-module.exports = Service
+export default Service

package/lib/runtime/SessionDao.js

@@ -1,7 +1,7 @@
-const LcDao = require("@live-change/dao")
-const Dao = require("./Dao.js")
+import LcDao from "@live-change/dao"
+import Dao from "./Dao.js"
 
-const { waitForSignal } = require('./utils.js')
+import { waitForSignal } from './utils.js'
 
 class SessionDao extends LcDao.DaoProxy {
   constructor(config, credentials) {
@@ -90,4 +90,4 @@ class SessionDao extends LcDao.DaoProxy {
   }
 }
 
-module.exports = SessionDao
+export default SessionDao

package/lib/runtime/TriggerHandler.js

@@ -1,6 +1,6 @@
-const { prepareParameters, processReturn } = require("./params.js")
-const SplitEmitQueue = require("../utils/SplitEmitQueue.js");
-const SingleEmitQueue = require("../utils/SingleEmitQueue.js");
+import { prepareParameters, processReturn } from "./params.js"
+import SplitEmitQueue from "../utils/SplitEmitQueue.js"
+import SingleEmitQueue from "../utils/SingleEmitQueue.js"
 
 class TriggerHandler {
 
@@ -108,4 +108,4 @@ class TriggerHandler {
 
 }
 
-module.exports = TriggerHandler
+export default TriggerHandler

package/lib/runtime/View.js

@@ -1,6 +1,6 @@
-const ReactiveDao = require('@live-change/dao')
+import LcDao from '@live-change/dao'
 
-const { prepareParameters, processReturn } = require("./params.js")
+import { prepareParameters, processReturn } from "./params.js"
 
 class View {
   constructor(definition, service) {
@@ -15,7 +15,7 @@ class View {
     }
     const preparedParameters = await prepareParameters(parameters, this.definition.properties, this.service)
     const observable = this.definition.observable(preparedParameters, context)
-    if(observable === null) return new ReactiveDao.ObservableValue(null)
+    if(observable === null) return new LcDao.ObservableValue(null)
     return observable
   }
 
@@ -29,4 +29,4 @@ class View {
   }
 }
 
-module.exports = View
+export default View

package/lib/runtime/params.js

@@ -1,6 +1,5 @@
-const Model = require('./Model.js')
-
-const ModelDefinition = require('../definition/ModelDefinition')
+import Model from './Model.js'
+import ModelDefinition from '../definition/ModelDefinition.js'
 
 function getModelName(t) {
   let modelName = null
@@ -96,7 +95,7 @@ async function processReturn(data, definition, service) {
   return data
 }
 
-module.exports = {
+export {
   processReturn,
   prepareParameters,
   preFilterParameters

package/lib/runtime/utils.js

@@ -1,4 +1,4 @@
-function getIp(connection) {
+export function getIp(connection) {
   let ip =
       connection.headers['x-real-ip'] ||
       connection.headers['x-forwarded-for'] ||
@@ -9,7 +9,7 @@ function getIp(connection) {
   return ip
 }
 
-function waitForSignal(observable, timeout = 1000, filter = () => true) {
+export function waitForSignal(observable, timeout = 1000, filter = () => true) {
   let observer
   let done = false
   return new Promise((resolve, reject) => {
@@ -32,7 +32,3 @@ function waitForSignal(observable, timeout = 1000, filter = () => true) {
     observable.unobserve(observer)
   })
 }
-
-
-module.exports.getIp = getIp
-module.exports.waitForSignal = waitForSignal

package/lib/updaters/database.js

@@ -1,5 +1,6 @@
-const utils = require("../utils.js")
-const debug = require('debug')('framework:updaters:db')
+import * as utils from "../utils.js"
+import Debug from 'debug'
+const debug = Debug('framework:updaters:db')
 
 async function update(changes, service, app, force) {
 
@@ -278,5 +279,5 @@ async function update(changes, service, app, force) {
   }
 }
 
-module.exports = update
+export default update
 

package/lib/utils/CommandQueue.js

@@ -1,4 +1,4 @@
-const ReactiveDao = require('@live-change/dao')
+import ReactiveDao from '@live-change/dao'
 
 class CommandQueue {
   constructor(connection, database, tableName, serviceName, config) {
@@ -165,4 +165,4 @@ class CommandQueue {
   }
 }
 
-module.exports = CommandQueue
+export default CommandQueue

package/lib/utils/EventSourcing.js

@@ -1,5 +1,5 @@
-const EventsReader = require('./EventsReader.js')
-const ReactiveDao = require('@live-change/dao')
+import EventsReader from './EventsReader.js'
+import ReactiveDao from '@live-change/dao'
 
 function sleep(ms) {
   return new Promise((resolve, reject) => setTimeout(resolve, ms))
@@ -141,4 +141,4 @@ class EventSourcing {
   }
 }
 
-module.exports = EventSourcing
+export default EventSourcing

package/lib/utils/EventsReader.js

@@ -90,4 +90,4 @@ class EventsReader {
 
 }
 
-module.exports = EventsReader
+export default EventsReader

package/lib/utils/ExecutionQueue.js

@@ -45,4 +45,4 @@ class ExecutionQueue {
 
 }
 
-module.exports = ExecutionQueue
+export default ExecutionQueue

package/lib/utils/KeyBasedExecutionQueues.js

@@ -1,4 +1,4 @@
-const ExecutionQueue = require('./ExecutionQueue.js')
+import ExecutionQueue from './ExecutionQueue.js'
 
 class KeyBasedExecutionQueues {
   constructor(keyFunction) {
@@ -22,4 +22,4 @@ class KeyBasedExecutionQueues {
   }
 }
 
-module.exports = KeyBasedExecutionQueues
+export default KeyBasedExecutionQueues

package/lib/utils/ProfileLogFilesystemWriter.js

@@ -1,6 +1,6 @@
-const fs = require('fs')
-const os = require('os')
-const { once } = require('events')
+import fs from 'fs'
+import os from 'os'
+import { once } from 'events'
 
 class ProfileLogFilesystemWriter {
   constructor(path) {
@@ -37,4 +37,4 @@ class ProfileLogFilesystemWriter {
   }
 }
 
-module.exports = ProfileLogFilesystemWriter
+export default ProfileLogFilesystemWriter

package/lib/utils/SingleEmitQueue.js

@@ -41,4 +41,4 @@ class SingleEmitQueue {
   }
 }
 
-module.exports = SingleEmitQueue
+export default SingleEmitQueue

package/lib/utils/SplitEmitQueue.js

@@ -64,4 +64,4 @@ class SplitEmitQueue {
   }
 }
 
-module.exports = SplitEmitQueue
+export default SplitEmitQueue

package/lib/utils/profileLog.js

@@ -74,4 +74,4 @@ function getParamNames(func) {
 const profileLog = new ProfileLog()
 profileLog.ProfileLog = ProfileLog
 
-module.exports = profileLog
+export default profileLog

package/lib/utils/validation.js

@@ -52,4 +52,4 @@ async function validate(props, validators, context) {
   if(Object.keys(propErrors).length > 0) throw { properties: propErrors }
 }
 
-module.exports = { getValidator, getValidators, validate }
+export { getValidator, getValidators, validate }

package/lib/utils/validators.js

@@ -28,7 +28,7 @@ function getField(context, fieldName) {
 
 nonEmpty.isRequired = () => true
 
-let validators = {
+const validators = {
   nonEmpty: (settings) => nonEmpty,
 
   minLength: ({ length }) => (value) => value.length < length ? 'tooShort' : undefined,
@@ -174,4 +174,4 @@ let validators = {
   }
 }
 
-module.exports = validators
+export default validators

package/lib/utils.js

@@ -280,7 +280,7 @@ function isomorphic( v ) {
   }
 }
 
-module.exports = {
+export {
   typeName, toJSON, setDifference, mapDifference, crudChanges,
   getProperty, setProperty, getField, setField, isObject, mergeDeep, generateDefault,
   prefixRange, rangeProperties, fieldListToFieldsObject,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.7.38",
+  "version": "0.8.0",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {
@@ -15,25 +15,15 @@
     "name": "Michał Łaszczewski",
     "url": "https://www.viamage.com/"
   },
+  "type": "module",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/live-change/live-change-framework/issues"
   },
   "homepage": "https://github.com/live-change/live-change-framework",
   "devDependencies": {
-    "@live-change/dao": "0.5.22",
-    "@live-change/dao-websocket": "0.5.22",
-    "@live-change/db": "0.6.23",
-    "@live-change/db-store-level": "0.6.23",
-    "@live-change/db-store-lmdb": "0.6.23",
-    "@live-change/sockjs": "0.4.1",
-    "@live-change/uid": "^0.7.38",
-    "cookie": "^0.4.1",
-    "express": "^4.18.2",
-    "os-service": "^2.2.0",
-    "rimraf": "^3.0.2",
-    "tape": "^5.3.2",
-    "websocket": "^1.0.34"
+    "@live-change/dao": "0.6.0",
+    "@live-change/uid": "^0.8.0"
   },
-  "gitHead": "9636ce5e683e6eb467e1af75e84a238baaeee6de"
+  "gitHead": "59b8c38965b6b737b6123fdcdf12fd0b5bed164f"
 }