@toa.io/core 1.0.0-alpha.2 → 1.0.0-alpha.20

package/package.json

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

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/contract/schemas/query.yaml

@@ -18,14 +18,13 @@ properties:
     minItems: 1
     items:
       type: string
-      pattern: ^[a-zA-Z]+([-a-zA-Z0-9]*[a-zA-Z0-9]+)?(:(asc|desc))?$
+      pattern: ^\w{1,32}(?::(?:asc|desc))?$
   projection:
     type: array
     uniqueItems: true
     minItems: 1
     items:
       type: string
-      pattern: ^([a-zA-Z]+([-a-zA-Z0-9]*[a-zA-Z0-9]+)?)$
       not:
         const: id
 additionalProperties: false

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

@@ -1,6 +1,9 @@
 'use strict'
 
-const { difference, newid } = require('@toa.io/generic')
+const {
+  difference,
+  newid
+} = require('@toa.io/generic')
 
 const { EntityContractException } = require('../exceptions')
 
@@ -43,13 +46,25 @@ class Entity {
   }
 
   #init (id) {
-    const value = { ...this.#schema.defaults({ id }), _version: 0 }
+    const value = {
+      ...this.#schema.defaults({ id }),
+      _version: 0,
+      _created: Date.now()
+    }
 
     this.#set(value)
   }
 
   #set (value) {
-    Object.defineProperty(value, 'id', { writable: false, configurable: false })
+    Object.defineProperty(value, 'id', {
+      writable: false,
+      configurable: false
+    })
+
+    if (this.#state !== undefined) {
+      value._updated = Date.now()
+      value._version++
+    }
 
     this.#state = value
   }

package/src/exceptions.js

@@ -19,6 +19,7 @@ const codes = {
   StatePrecondition: 303,
   StateConcurrency: 304,
   StateInitialization: 305,
+  Duplicate: 306,
 
   Communication: 400,
   Transmission: 401
@@ -88,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/query/criteria.js

@@ -33,9 +33,9 @@ const coerce = (node, properties) => {
 }
 
 const COERCE = {
-  number: Number,
-  integer: parseInt,
-  boolean: Boolean
+  number: Number.parseFloat,
+  integer: Number.parseInt,
+  boolean: (value) => value === 'true'
 }
 
 exports.criteria = criteria

package/src/state.js

@@ -4,27 +4,20 @@ const { empty } = require('@toa.io/generic')
 
 const {
   StatePreconditionException,
-  StateNotFoundException,
-  StateInitializationException
+  StateNotFoundException
 } = require('./exceptions')
 
-/**
- * @implements {toa.core.State}
- */
 class State {
-  /** @type {toa.core.Storage} */
+  #associated
   #storage
-
-  /** @type {toa.core.entity.Factory} */
   #entity
   #emission
-  #dependent
 
-  constructor (storage, entity, emission, dependent) {
+  constructor (storage, entity, emission, associated) {
     this.#storage = storage
     this.#entity = entity
     this.#emission = emission
-    this.#dependent = dependent === true
+    this.#associated = associated === true
   }
 
   init (id) {
@@ -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.#associated && 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) {
@@ -68,30 +65,34 @@ 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) 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,10 @@
 const { retry } = require('@toa.io/generic')
 
 const { Operation } = require('./operation')
-const { StateConcurrencyException, StateNotFoundException } = require('./exceptions')
+const {
+  StateConcurrencyException,
+  StateNotFoundException
+} = require('./exceptions')
 
 class Transition extends Operation {
   #concurrency
@@ -23,23 +26,33 @@ 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()
   }
 
   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) {
+      if (this.#concurrency === 'retry') {
+        return retry()
+      } else {
+        throw new StateConcurrencyException()
+      }
     }
   }
 

package/test/entities/entity.fixtures.js

@@ -16,10 +16,13 @@ const state = () => ({
   _created: generate(),
   _updated: generate(),
   _deleted: generate(),
-  _version: generate()
+  _version: 0
 })
 
-const failed = () => ({ ...state(), fail: true })
+const failed = () => ({
+  ...state(),
+  fail: true
+})
 
 exports.schema = schema
 exports.state = state

package/test/entities/entity.test.js

@@ -28,9 +28,12 @@ describe('argument', () => {
   it('should provide initial state if no argument passed', () => {
     const entity = new Entity(fixtures.schema)
     const defaults = fixtures.schema.defaults.mock.results[0].value
-    const expected = { ...defaults, _version: 0 }
+    const expected = {
+      ...defaults,
+      _version: 0
+    }
 
-    expect(entity.get()).toStrictEqual(expected)
+    expect(entity.get()).toStrictEqual(expect.objectContaining(expected))
   })
 
   it('should set state', () => {
@@ -51,11 +54,14 @@ it('should provide event', () => {
 
   const event = entity.event()
 
-  expect(event).toEqual({
+  expect(event).toEqual(expect.objectContaining({
     state,
     origin,
-    changeset: { foo: 'new value' }
-  })
+    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)