@toa.io/core 1.0.0-alpha.12 → 1.0.0-alpha.14

package/package.json

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

package/src/entities/changeset.js

@@ -1,6 +1,10 @@
 'use strict'
 
-const { merge, overwrite, newid } = require('@toa.io/generic')
+const {
+  merge,
+  overwrite,
+  newid
+} = require('@toa.io/generic')
 const { EntityContractException } = require('../exceptions')
 
 class Changeset {
@@ -26,21 +30,13 @@ class Changeset {
 
     if (error !== null) throw new EntityContractException(error)
 
+    value._updated = Date.now()
+
     this.#state = value
   }
 
   export () {
-    const changeset = this.#state
-    const result = { changeset }
-    const insert = merge({ id: newid() }, changeset)
-    const error = this.#schema.fit(insert)
-
-    if (error === null) {
-      delete insert.id
-      result.insert = overwrite(insert, changeset)
-    }
-
-    return result
+    return this.#state
   }
 }
 

package/src/entities/entity.js

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

package/src/exceptions.js

@@ -89,7 +89,7 @@ for (const [name, code] of Object.entries(codes)) {
   if (exports[classname] === undefined) {
     exports[classname] = class extends Exception {
       constructor (message) {
-        super(code, message || classname)
+        super(code, message ?? classname)
       }
     }
   }

package/src/locator.js

@@ -12,6 +12,7 @@ class Locator {
   id
   label
   uppercase
+  lowercase
 
   /**
    * @param {string} name
@@ -26,6 +27,7 @@ class Locator {
     this.id = concat(namespace, '.') + name
     this.label = (concat(namespace, '-') + name).toLowerCase()
     this.uppercase = (concat(namespace, '_') + name).toUpperCase()
+    this.lowercase = (concat(namespace, '_') + name).toLowerCase()
   }
 
   hostname (prefix) {
@@ -39,8 +41,11 @@ class Locator {
   static parse (string) {
     const [namespace, name] = string.split(DOT)
 
-    if (name === undefined) return new Locator(namespace)
-    else return new Locator(name, namespace)
+    if (name === undefined) {
+      return new Locator(namespace)
+    } else {
+      return new Locator(name, namespace)
+    }
   }
 }
 

package/src/state.js

@@ -65,25 +65,18 @@ class State {
       ok = await this.#storage.store(object)
 
       // #20
-      await this.#emission.emit(event)
+      if (ok === true) {
+        await this.#emission.emit(event)
+      }
     }
 
     return ok
   }
 
   async apply (state) {
-    const {
-      changeset,
-      insert
-    } = state.export()
-
-    let upsert
-
-    if (this.#dependent && state.query.id !== undefined && state.query.version === undefined) {
-      upsert = insert
-    }
+    const changeset = state.export()
 
-    const result = await this.#storage.upsert(state.query, changeset, upsert)
+    const result = await this.#storage.upsert(state.query, changeset)
 
     if (result === null) {
       if (state.query.version !== undefined) {

package/src/transition.js

@@ -5,9 +5,7 @@ const { retry } = require('@toa.io/generic')
 const { Operation } = require('./operation')
 const {
   StateConcurrencyException,
-  StateNotFoundException,
-  DuplicateException,
-  Exception
+  StateNotFoundException
 } = require('./exceptions')
 
 class Transition extends Operation {
@@ -28,7 +26,9 @@ class Transition extends Operation {
 
     store.scope = request.query ? await this.query(request.query) : this.scope.init()
 
-    if (store.scope === null) throw new StateNotFoundException()
+    if (store.scope === null) {
+      throw new StateNotFoundException()
+    }
 
     store.state = store.scope.get()
   }
@@ -47,16 +47,13 @@ class Transition extends Operation {
 
     const result = await this.scope.commit(scope)
 
-    if (result === false ||
-      (result instanceof DuplicateException && result.message.includes('_id'))) {
+    if (result === false) {
       if (this.#concurrency === 'retry') {
         return retry()
       } else {
         throw new StateConcurrencyException()
       }
     }
-
-    if (result instanceof Exception) throw result
   }
 
   async #retry (store, retry) {

package/test/entities/entity.test.js

@@ -33,7 +33,7 @@ describe('argument', () => {
       _version: 0
     }
 
-    expect(entity.get()).toStrictEqual(expected)
+    expect(entity.get()).toStrictEqual(expect.objectContaining(expected))
   })
 
   it('should set state', () => {
@@ -54,14 +54,14 @@ it('should provide event', () => {
 
   const event = entity.event()
 
-  expect(event).toEqual({
+  expect(event).toEqual(expect.objectContaining({
     state,
     origin,
-    changeset: {
+    changeset: expect.objectContaining({
       foo: 'new value',
       _version: 1
-    }
-  })
+    })
+  }))
 })
 
 it('should define `id` as readonly', async () => {

package/types/locator.d.ts

@@ -1,10 +1,11 @@
-export class Locator {
+export class Locator{
   public readonly name: string
   public readonly namespace: string
 
   public readonly id: string
   public readonly label: string
   public readonly uppercase: string
+  public readonly lowercase: string
 
   constructor (name: string, namespace?: string)