@toa.io/core 1.0.0-alpha.36 → 1.0.0-alpha.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/core",
-  "version": "1.0.0-alpha.36",
+  "version": "1.0.0-alpha.38",
   "description": "Toa Core",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -21,13 +21,13 @@
   },
   "dependencies": {
     "@rsql/parser": "1.2.4",
-    "@toa.io/console": "1.0.0-alpha.36",
-    "@toa.io/generic": "1.0.0-alpha.36",
-    "@toa.io/yaml": "1.0.0-alpha.36",
+    "@toa.io/console": "1.0.0-alpha.38",
+    "@toa.io/generic": "1.0.0-alpha.38",
+    "@toa.io/yaml": "1.0.0-alpha.38",
     "error-value": "0.3.0"
   },
   "devDependencies": {
     "clone-deep": "4.0.1"
   },
-  "gitHead": "565b8309bc46dfde7bbb49bd760c2dca0c89b0ff"
+  "gitHead": "fcb0693848f04244383cfa638855724aff75e41f"
 }

package/src/effect.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const { Observation } = require('./observation')
+
+class Effect extends Observation {
+
+  async acquire (store) {
+    const { query, entity } = store.request
+
+    if (entity === undefined)
+      return super.acquire(store)
+
+    store.scope = await this.scope.ensure(query, entity)
+    store.state = store.scope.get()
+  }
+
+}
+
+exports.Effect = Effect

package/src/entities/entity.js

@@ -46,8 +46,7 @@ class Entity {
   #init (id) {
     const value = {
       ...this.#schema.defaults({ id }),
-      _version: 0,
-      _created: Date.now()
+      _version: 0
     }
 
     this.#set(value)
@@ -62,6 +61,9 @@ class Entity {
         value: {}
       })
 
+    if (!('_created' in value))
+      value._created = Date.now()
+
     if (this.#state !== undefined) {
       value._updated = Date.now()
       value._version++

package/src/entities/factory.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const { newid } = require('@toa.io/generic')
+
 const { Entity } = require('./entity')
 const { EntitySet } = require('./set')
 const { Changeset } = require('./changeset')
@@ -11,6 +13,10 @@ class Factory {
     this.#schema = schema
   }
 
+  fit (values) {
+    this.#schema.validate({ id: newid(), ...values }, 'Entity')
+  }
+
   init (id) {
     return new Entity(this.#schema, id)
   }

package/src/exceptions.js

@@ -49,18 +49,13 @@ class SystemException extends Exception {
 }
 
 class ContractException extends Exception {
-  keyword
-  property
-  schema
-  path
-
   constructor (code, error) {
-    super(code || codes.Contract, error.message)
+    super(code || codes.Contract, typeof error === 'string' ? error : error?.message)
 
-    this.keyword = error.keyword
-    this.property = error.property
-    this.schema = error.schema
-    this.path = error.path
+    if (typeof error === 'object' && error !== null)
+      for (const k of ['keyword', 'property', 'schema', 'path'])
+        if (k in error)
+          this[k] = error[k]
   }
 }
 

package/src/index.js

@@ -5,6 +5,7 @@ const { Composition } = require('./composition')
 const { Connector } = require('./connector')
 const { Context } = require('./context')
 const { Discovery } = require('./discovery')
+const { Effect } = require('./effect')
 const { Emission } = require('./emission')
 const { Event } = require('./event')
 const { Exposition } = require('./exposition')
@@ -32,6 +33,7 @@ exports.Composition = Composition
 exports.Connector = Connector
 exports.Context = Context
 exports.Discovery = Discovery
+exports.Effect = Effect
 exports.Emission = Emission
 exports.Event = Event
 exports.Exposition = Exposition

package/src/operation.js

@@ -1,8 +1,7 @@
 'use strict'
 
 const { Connector } = require('./connector')
-const { SystemException } = require('./exceptions')
-const { Entity } = require('./entities/entity')
+const { SystemException, RequestContractException } = require('./exceptions')
 const { Readable } = require('node:stream')
 
 class Operation extends Connector {
@@ -28,13 +27,22 @@ class Operation extends Connector {
 
   async invoke (request) {
     try {
-      if (request.authentic !== true) this.#contracts.request.fit(request)
-      if ('query' in request) request.query = this.#query.parse(request.query)
+      if (request.authentic !== true)
+        this.#contracts.request.fit(request)
+
+      if ('query' in request)
+        request.query = this.#query.parse(request.query)
+
+      // validate entity
+      if ('entity' in request)
+        this.scope.fit(request.entity)
 
       const store = { request }
 
       return await this.process(store)
     } catch (e) {
+      console.error(e)
+
       const exception = e instanceof Error ? new SystemException(e) : e
 
       return { exception }
@@ -73,6 +81,9 @@ class Operation extends Connector {
   async commit () {}
 
   async query (query) {
+    if (query === undefined)
+      throw new RequestContractException('Request query is required')
+
     return this.scope[this.#scope](query)
   }
 }

package/src/state.js

@@ -1,49 +1,47 @@
 'use strict'
 
-const { empty } = require('@toa.io/generic')
-
-const {
-  StatePreconditionException,
-  StateNotFoundException
-} = require('./exceptions')
+const { empty, newid } = require('@toa.io/generic')
+const { StatePreconditionException, StateNotFoundException } = require('./exceptions')
 
 class State {
   #associated
   #storage
-  #entity
+  #entities
   #emission
 
   constructor (storage, entity, emission, associated) {
     this.#storage = storage
-    this.#entity = entity
+    this.#entities = entity
     this.#emission = emission
     this.#associated = associated === true
   }
 
   init (id) {
-    return this.#entity.init(id)
+    return this.#entities.init(id)
+  }
+
+  fit (values) {
+    return this.#entities.fit(values)
   }
 
   async object (query) {
     const record = await this.#storage.get(query)
 
     if (record === null) {
-      if (this.#associated && query.id !== undefined && query.version === undefined) {
+      if (this.#associated && query.id !== undefined && query.version === undefined)
         return this.init(query.id)
-      } else if (query.version !== undefined) throw new StatePreconditionException()
-    }
+      else if (query.version !== undefined)
+        throw new StatePreconditionException()
 
-    if (record === null) {
       return null
-    } else {
-      return this.#entity.object(record)
-    }
+    } else
+      return this.#entities.object(record)
   }
 
   async objects (query) {
     const recordset = await this.#storage.find(query)
 
-    return this.#entity.objects(recordset)
+    return this.#entities.objects(recordset)
   }
 
   async stream (query) {
@@ -51,13 +49,31 @@ class State {
   }
 
   changeset (query) {
-    return this.#entity.changeset(query)
+    return this.#entities.changeset(query)
   }
 
   none () {
     return null
   }
 
+  async ensure (query, properties) {
+    const object = this.#entities.init()
+    const blank = object.get()
+
+    Object.assign(blank, properties)
+
+    object.set(blank)
+
+    const record = await this.#storage.ensure(query, properties, object.get())
+
+    if (record.id !== blank.id) // exists
+      return this.#entities.object(record)
+
+    await this.#emission.emit(object.event())
+
+    return object
+  }
+
   async commit (state) {
     const event = state.event()