@toa.io/norm 1.0.0-alpha.4 → 1.0.0-alpha.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/norm",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-alpha.41",
   "description": "Toa declarations normalization and validation",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -20,11 +20,11 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/core": "1.0.0-alpha.4",
-    "@toa.io/generic": "1.0.0-alpha.4",
-    "@toa.io/schema": "1.0.0-alpha.4",
-    "@toa.io/schemas": "1.0.0-alpha.4",
-    "@toa.io/yaml": "1.0.0-alpha.4"
+    "@toa.io/core": "1.0.0-alpha.41",
+    "@toa.io/generic": "1.0.0-alpha.41",
+    "@toa.io/schema": "1.0.0-alpha.41",
+    "@toa.io/schemas": "1.0.0-alpha.41",
+    "@toa.io/yaml": "1.0.0-alpha.41"
   },
-  "gitHead": "80a91c0d9c167484247a91e69a0c0a3c344f90d0"
+  "gitHead": "3b338a3f21ff9113cefa75d7789d9267917d41e3"
 }

package/src/.component/.expand/version.js

@@ -1,19 +1,45 @@
 'use strict'
 
-function version (manifest) {
-  if (manifest.version === undefined) {
-    const bridge = require(manifest.bridge)
+const { join } = require('node:path')
+const { createHash } = require('node:crypto')
+const fs = require('node:fs/promises')
+const { createReadStream } = require('node:fs')
+const { once } = require('node:events')
 
-    if ('version' in bridge)
-      manifest.version = bridge.version(manifest)
-  }
+async function version (manifest) {
+  manifest.version ??= await hash(manifest.path)
+}
+
+async function hash (path) {
+  const hash = await hashd(path)
+
+  return hash.digest('hex').slice(0, 8)
+}
 
-  if (manifest.version === undefined) {
-    console.warn(`Component '${manifest.namespace ? manifest.namespace + '.' : ''}${manifest.name}' has no version`)
+/**
+ * @param {string} path
+ * @param {import('node:crypto').Hash} hash
+ */
+async function hashd (path, hash = createHash('sha256')) {
+  const stat = await fs.stat(path)
 
-    manifest.version = Math.random().toString(36).slice(2)
+  if (stat.isFile()) {
+    const stream = createReadStream(path)
+
+    stream.pipe(hash, { end: false })
+
+    return await once(stream, 'end')
   }
 
+  if (stat.isDirectory()) {
+    const entries = await fs.opendir(path)
+
+    for await (const entry of entries) {
+      await hashd(join(path, entry.name), hash)
+    }
+
+    return hash
+  }
 }
 
 exports.version = version

package/src/.component/.normalize/operations.js

@@ -4,7 +4,7 @@ const operations = (component) => {
   if (component.operations === undefined) return
 
   for (const [endpoint, operation] of Object.entries(component.operations)) {
-    if (operation.type === 'computation' || operation.type === 'effect')
+    if (operation.scope === 'none')
       operation.query = false
 
     if (operation.bindings === undefined) operation.bindings = component.bindings

package/src/.component/defaults.js

@@ -4,8 +4,11 @@ const { hash } = require('@toa.io/generic')
 const assert = require('node:assert')
 
 // these defaults are required before validation
-const defaults = (manifest) => {
-  if (manifest.name === undefined) manifest.name = protoName(manifest)
+const defaults = (manifest, proto) => {
+  if (manifest.name === undefined)
+    if (proto) manifest.name = protoName(manifest)
+    else nameAfterDir(manifest)
+
   if (manifest.bindings === undefined) manifest.bindings = ['@toa.io/bindings.amqp']
   if (manifest.bridge === undefined) manifest.bridge = '@toa.io/bridges.node'
 
@@ -24,4 +27,13 @@ function protoName (manifest) {
   return 'proto' + hash(manifest.path)
 }
 
+function nameAfterDir (manifest) {
+  const parts = manifest.path.split('/')
+  const dirname = parts[parts.length - 1]
+  const [name, namespace] = dirname.split('.').reverse()
+
+  manifest.name = name
+  manifest.namespace = namespace
+}
+
 exports.defaults = defaults

package/src/.component/expand.js

@@ -11,7 +11,7 @@ const {
   version
 } = require('./.expand')
 
-const expand = (manifest) => {
+async function expand (manifest) {
   entity(manifest)
   bridge(manifest)
   operations(manifest)
@@ -19,7 +19,8 @@ const expand = (manifest) => {
   receivers(manifest)
   properties(manifest)
   extensions(manifest)
-  version(manifest)
+
+  await version(manifest)
 }
 
 exports.expand = expand

package/src/.component/schema.yaml

@@ -79,8 +79,24 @@ properties:
             propertyNames:
               oneOf:
                 - $ref: '#/definitions/name'
-                - enum: [_version]
-      dependent:
+                - enum: [_version, _created, _updated, _deleted]
+      unique:
+        type: object
+        patternProperties:
+          '.*':
+            type: array
+            items:
+              type: string
+      index:
+        type: object
+        patternProperties:
+          '.*':
+            type: object
+            patternProperties:
+              '.*':
+                type: string
+                enum: [asc, desc, hash]
+      associated:
         type: boolean
         default: false
       custom:
@@ -109,7 +125,7 @@ properties:
           type:
             enum: [transition, observation, assignment, computation, effect]
           scope:
-            enum: [object, objects, changeset, none]
+            enum: [object, objects, changeset, stream, none]
           concurrency:
             enum: [none, retry]
           forward:
@@ -158,7 +174,7 @@ properties:
             then:
               properties:
                 scope:
-                  enum: [object, objects, none]
+                  enum: [object, objects, stream, none]
                 query:
                   not:
                     const: false
@@ -189,11 +205,8 @@ properties:
             then:
               properties:
                 scope:
-                  const: none
                   default: none
-                query:
-                  const: false
-                  default: false
+                  enum: [object, objects, stream, none]
         additionalProperties: false
     additionalProperties: false
 
@@ -244,6 +257,8 @@ properties:
           adaptive:
             type: boolean
             default: false
+          arguments:
+            type: array
         required: [operation]
         additionalProperties: false
 

package/src/.context/schema.yaml

@@ -11,6 +11,7 @@ properties:
     type: string
   packages:
     type: string
+    default: components/*
   build:
     type: object
     properties:
@@ -64,5 +65,5 @@ properties:
       required: [name, components]
   annotations:
     type: object
-required: [runtime, name, packages, registry]
+required: [runtime, name, registry]
 additionalProperties: false

package/src/component.js

@@ -20,7 +20,7 @@ const {
 const component = async (path) => {
   const manifest = await load(path)
 
-  normalize(manifest)
+  normalize(manifest, path)
   validate(manifest)
   extensions(manifest)
 
@@ -29,7 +29,7 @@ const component = async (path) => {
   return manifest
 }
 
-const load = async (path, base) => {
+const load = async (path, base, proto = false) => {
   if (base !== undefined) path = find(path, base, MANIFEST)
 
   const file = join(path, MANIFEST)
@@ -37,13 +37,13 @@ const load = async (path, base) => {
 
   manifest.path = path
 
-  defaults(manifest)
-  expand(manifest)
+  defaults(manifest, proto)
+  await expand(manifest)
 
   await merge(path, manifest)
 
   if (manifest.prototype !== null) {
-    const prototype = await load(manifest.prototype, path)
+    const prototype = await load(manifest.prototype, path, true)
 
     collapse(manifest, prototype)
   }

package/test/component/validate.test.js

@@ -112,15 +112,18 @@ describe('entity', () => {
     })
 
     it('should allow default id', () => {
-      manifest.entity.schema.properties.id = { type: 'string', pattern: '^[a-fA-F0-9]+$' }
+      manifest.entity.schema.properties.id = {
+        type: 'string',
+        pattern: '^[a-fA-F0-9]+$'
+      }
       expect(() => validate(manifest)).not.toThrow()
     })
   })
 
-  describe('dependent', () => {
+  describe('associated', () => {
     it('should provide default', () => {
       expect(() => validate(manifest)).not.toThrow()
-      expect(manifest.entity.dependent).toBe(false)
+      expect(manifest.entity.associated).toBe(false)
     })
   })
 })
@@ -173,8 +176,7 @@ describe('operations', () => {
   })
 
   it.each([
-    ['computation', 'compute'],
-    ['effect', 'affect']
+    ['computation', 'compute']
   ])('should set query: false for %s', async (_, operation) => {
     validate(manifest)
 

package/test/context/validate.test.js

@@ -72,9 +72,10 @@ it('should require name as label', () => {
   expect(() => validate(context)).not.toThrow(/pattern/)
 })
 
-it('should require packages location', () => {
+it('should set default packages location', () => {
   delete context.packages
-  expect(() => validate(context)).toThrow(/required/)
+  expect(() => validate(context)).not.toThrow()
+  expect(context.packages).toBe('components/*')
 })
 
 it('should require registry url', () => {

package/types/component.d.ts

@@ -37,7 +37,7 @@ type Receiver = {
 type Entity = {
   schema: Object
   storage?: string
-  dependent?: boolean
+  associated?: boolean
 }
 
 type Declaration = {