@toa.io/norm 1.0.0-alpha.3 → 1.0.0-alpha.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/norm",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.31",
   "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.3",
-    "@toa.io/generic": "1.0.0-alpha.3",
-    "@toa.io/schema": "1.0.0-alpha.3",
-    "@toa.io/schemas": "1.0.0-alpha.3",
-    "@toa.io/yaml": "1.0.0-alpha.3"
+    "@toa.io/core": "1.0.0-alpha.31",
+    "@toa.io/generic": "1.0.0-alpha.31",
+    "@toa.io/schema": "1.0.0-alpha.31",
+    "@toa.io/schemas": "1.0.0-alpha.31",
+    "@toa.io/yaml": "1.0.0-alpha.31"
   },
-  "gitHead": "e36ac7871fc14d15863aaf8f9bbdeace8bdfa9f0"
+  "gitHead": "91839a488176853a0731f49abc70dc7103ed7cca"
 }

package/src/.component/.expand/index.js

@@ -7,6 +7,7 @@ const { extensions } = require('./extensions')
 const { operations } = require('./operations')
 const { properties } = require('./properties')
 const { receivers } = require('./receivers')
+const { version } = require('./version')
 
 exports.bridge = bridge
 exports.entity = entity
@@ -15,3 +16,4 @@ exports.extensions = extensions
 exports.operations = operations
 exports.properties = properties
 exports.receivers = receivers
+exports.version = version

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

@@ -0,0 +1,45 @@
+'use strict'
+
+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')
+
+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)
+}
+
+/**
+ * @param {string} path
+ * @param {import('node:crypto').Hash} hash
+ */
+async function hashd (path, hash = createHash('sha256')) {
+  const stat = await fs.stat(path)
+
+  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/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'
 
@@ -18,25 +21,19 @@ const defaults = (manifest) => {
   }
 
   if (manifest.prototype === undefined) manifest.prototype = '@toa.io/prototype'
-
-  // TODO: bridge.version()
-
-  if (manifest.version === undefined) {
-    const bridge = require(manifest.bridge)
-
-    if ('version' in bridge)
-      manifest.version = bridge.version(manifest)
-  }
-
-  if (manifest.version === undefined) {
-    console.warn(`Component '${manifest.namespace ? manifest.namespace + '.' : ''}${manifest.name}' has no version`)
-
-    manifest.version = Math.random().toString(36).slice(2)
-  }
 }
 
 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

@@ -7,10 +7,11 @@ const {
   events,
   receivers,
   extensions,
-  properties
+  properties,
+  version
 } = require('./.expand')
 
-const expand = (manifest) => {
+async function expand (manifest) {
   entity(manifest)
   bridge(manifest)
   operations(manifest)
@@ -18,6 +19,8 @@ const expand = (manifest) => {
   receivers(manifest)
   properties(manifest)
   extensions(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:
@@ -244,6 +260,8 @@ properties:
           adaptive:
             type: boolean
             default: false
+          arguments:
+            type: array
         required: [operation]
         additionalProperties: false
 

package/src/.context/.dependencies/connectors.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const { resolve } = require('node:path')
+
 const connectors = (context, extracted) => {
   const connectors = {}
 
@@ -10,11 +12,14 @@ const connectors = (context, extracted) => {
 
   for (const component of components) {
     if (component.entity !== undefined) {
-      if (connectors[component.entity.storage] === undefined) {
-        connectors[component.entity.storage] = []
+      let storage = component.entity.storage
+
+      if (storage[0] === '.') {
+        storage = resolve(component.path, storage)
       }
 
-      connectors[component.entity.storage].push(component)
+      connectors[storage] ??= []
+      connectors[storage].push(component)
     }
 
     const bindings = new Set()

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/expand.fixtures.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const source = {
+  path: '',
   entity: {
     schema: {
       properties: {

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)
     })
   })
 })

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 = {