@toa.io/core 1.0.0-alpha.7 → 1.0.0-alpha.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/core",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.8",
   "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.7",
-    "@toa.io/generic": "1.0.0-alpha.7",
-    "@toa.io/yaml": "1.0.0-alpha.7",
+    "@toa.io/console": "1.0.0-alpha.8",
+    "@toa.io/generic": "1.0.0-alpha.8",
+    "@toa.io/yaml": "1.0.0-alpha.8",
     "error-value": "0.3.0"
   },
   "devDependencies": {
     "clone-deep": "4.0.1"
   },
-  "gitHead": "4f5ac0bc342d4b7bd469fbe5c74266f050b55c9f"
+  "gitHead": "2ee18835c8214600e1d354251fa632913bff38c3"
 }

package/src/assignment.js

@@ -9,13 +9,22 @@ class Assignment extends Operation {
   }
 
   async commit (store) {
-    const { scope, state, reply } = store
+    const {
+      scope,
+      state,
+      reply
+    } = store
 
     if (reply.error !== undefined) return
 
     scope.set(state)
 
-    await this.scope.apply(scope)
+    const output = await this.scope.apply(scope)
+
+    // assignment returns new state by default
+    if (store.reply.output === undefined) {
+      store.reply.output = output
+    }
   }
 }
 

package/src/exceptions.js

@@ -19,6 +19,7 @@ const codes = {
   StatePrecondition: 303,
   StateConcurrency: 304,
   StateInitialization: 305,
+  Duplicate: 306,
 
   Communication: 400,
   Transmission: 401

package/src/state.js

@@ -4,21 +4,14 @@ const { empty } = require('@toa.io/generic')
 
 const {
   StatePreconditionException,
-  StateNotFoundException,
-  StateInitializationException
+  StateNotFoundException
 } = require('./exceptions')
 
-/**
- * @implements {toa.core.State}
- */
 class State {
-  /** @type {toa.core.Storage} */
+  #dependent
   #storage
-
-  /** @type {toa.core.entity.Factory} */
   #entity
   #emission
-  #dependent
 
   constructor (storage, entity, emission, dependent) {
     this.#storage = storage
@@ -35,12 +28,16 @@ class State {
     const record = await this.#storage.get(query)
 
     if (record === null) {
-      if (this.#dependent && query.id !== undefined && query.version === undefined) return this.init(query.id)
-      else if (query.version !== undefined) throw new StatePreconditionException()
+      if (this.#dependent && query.id !== undefined && query.version === undefined) {
+        return this.init(query.id)
+      } else if (query.version !== undefined) throw new StatePreconditionException()
     }
 
-    if (record === null) return null
-    else return this.#entity.object(record)
+    if (record === null) {
+      return null
+    } else {
+      return this.#entity.object(record)
+    }
   }
 
   async objects (query) {
@@ -75,7 +72,10 @@ class State {
   }
 
   async apply (state) {
-    const { changeset, insert } = state.export()
+    const {
+      changeset,
+      insert
+    } = state.export()
 
     let upsert
 
@@ -86,12 +86,20 @@ class State {
     const result = await this.#storage.upsert(state.query, changeset, upsert)
 
     if (result === null) {
-      if (state.query.version !== undefined) throw new StatePreconditionException()
-      else throw new StateNotFoundException()
+      if (state.query.version !== undefined) {
+        throw new StatePreconditionException()
+      } else {
+        throw new StateNotFoundException()
+      }
+    } else {
+      // same as above
+      await this.#emission.emit({
+        changeset,
+        state: result
+      })
     }
 
-    // same as above
-    await this.#emission.emit({ changeset, state: result })
+    return result
   }
 }
 

package/src/transition.js

@@ -3,7 +3,12 @@
 const { retry } = require('@toa.io/generic')
 
 const { Operation } = require('./operation')
-const { StateConcurrencyException, StateNotFoundException } = require('./exceptions')
+const {
+  StateConcurrencyException,
+  StateNotFoundException,
+  DuplicateException,
+  Exception
+} = require('./exceptions')
 
 class Transition extends Operation {
   #concurrency
@@ -29,18 +34,29 @@ class Transition extends Operation {
   }
 
   async commit (store) {
-    const { scope, state, reply, retry } = store
+    const {
+      scope,
+      state,
+      reply,
+      retry
+    } = store
 
     if (reply.error !== undefined) return
 
     scope.set(state)
 
-    const ok = await this.scope.commit(scope)
+    const result = await this.scope.commit(scope)
 
-    if (ok !== true) {
-      if (this.#concurrency === 'retry') retry()
-      else throw new StateConcurrencyException()
+    if (result === false ||
+      (result instanceof DuplicateException && result.message.includes('_id'))) {
+      if (this.#concurrency === 'retry') {
+        return retry()
+      } else {
+        throw new StateConcurrencyException()
+      }
     }
+
+    if (result instanceof Exception) throw result
   }
 
   async #retry (store, retry) {