@toa.io/norm 1.0.0-alpha.182 → 1.0.0-alpha.190

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/norm",
-  "version": "1.0.0-alpha.182",
+  "version": "1.0.0-alpha.190",
   "description": "Toa declarations normalization and validation",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -20,10 +20,10 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/core": "1.0.0-alpha.182",
+    "@toa.io/core": "1.0.0-alpha.190",
     "@toa.io/generic": "1.0.0-alpha.173",
     "@toa.io/schemas": "1.0.0-alpha.182",
     "@toa.io/yaml": "1.0.0-alpha.182"
   },
-  "gitHead": "99d0b79680455e8746274bcfa07a5674e8514bff"
+  "gitHead": "494b1c8f05c21f377f1152a9d89df5cbbd1001de"
 }

package/src/.component/extensions.js

@@ -3,6 +3,8 @@
 const { directory: { find } } = require('@toa.io/filesystem')
 const { resolve } = require('../shortcuts')
 
+const cache = {}
+
 const extensions = (manifest) => {
   if (manifest.extensions === undefined)
     manifest.extensions = PREDEFINED
@@ -17,18 +19,12 @@ const extensions = (manifest) => {
     // relative path
     if (key[0] === '.') key = find(key, manifest.path)
 
-    const extension = require(key)
+    cache[key] ??= require(key)
+    const extension = cache[key]
 
     if (extension.manifest !== undefined) {
       declaration = extension.manifest(declaration, manifest)
-
-      if (declaration === undefined) throw new Error(`Extension '${reference}' hasn't returned manifest`)
     }
-
-    extensions[key] = declaration
-
-    // shortcut was used
-    if (reference !== key) delete extensions[reference]
   }
 }
 

package/src/.component/merge.js

@@ -6,7 +6,8 @@ const bridge = async (root, manifest) => {
   await Promise.all([
     define(root, manifest, 'operations'),
     define(root, manifest, 'events'),
-    define(root, manifest, 'receivers')
+    define(root, manifest, 'receivers'),
+    define(root, manifest, 'guards')
   ])
 }
 
@@ -19,7 +20,7 @@ const define = async (root, manifest, property) => {
       if (item.bridge === undefined || item.bridge === manifest.bridge) continue // default bridge later
 
       const bridge = item.bridge || manifest.bridge
-      const { define } = require(bridge)
+      const define = req(bridge).define
       const definition = await define[singular](root, endpoint)
 
       merge(item, definition)
@@ -55,8 +56,16 @@ const define = async (root, manifest, property) => {
   }
 }
 
+const cache = {}
+
+function req(mod) {
+  cache[mod] ??= require(mod)
+
+  return cache[mod]
+}
+
 const scan = async (bridge, root, property) => {
-  const { define } = require(bridge)
+  const define = req(bridge).define
 
   if (property in define)
     return define[property](root)

package/src/.component/schema.yaml

@@ -8,7 +8,7 @@ definitions:
   binding:
     type: string
     not:
-      const: '@toa.io/bindings.loop' # loop is for system use only
+      const: "@toa.io/bindings.loop" # loop is for system use only
 
 type: object
 properties:
@@ -17,19 +17,19 @@ properties:
     nullable: true
     properties:
       prototype:
-        $ref: '#/properties/prototype'
+        $ref: "#/properties/prototype"
       path:
         type: string
       operations:
         type: object
         propertyNames:
-          $ref: '#/definitions/name'
+          $ref: "#/definitions/name"
         patternProperties:
-          '.*':
+          ".*":
             type: object
             properties:
               bridge:
-                $ref: '#/properties/bridge'
+                $ref: "#/properties/bridge"
 
   path:
     type: string
@@ -51,10 +51,10 @@ properties:
   namespace:
     type: string
     pattern: ^[a-zA-Z]([a-zA-Z0-9]{1,31})?$
-    default: 'default'
+    default: "default"
     not:
       oneOf:
-        - const: 'system'
+        - const: "system"
 
   version:
     type: string
@@ -72,7 +72,7 @@ properties:
     properties:
       storage:
         type: string
-        default: '@toa.io/storages.mongodb'
+        default: "@toa.io/storages.mongodb"
       schema:
         $ref: https://json-schema.org/draft/2019-09/schema
         type: object
@@ -84,22 +84,22 @@ properties:
             type: object
             propertyNames:
               oneOf:
-                - $ref: '#/definitions/name'
+                - $ref: "#/definitions/name"
                 - 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, text]
       associated:
@@ -115,7 +115,7 @@ properties:
     type: array
     uniqueItems: true
     items:
-      $ref: '#/definitions/binding'
+      $ref: "#/definitions/binding"
 
   bridge:
     type: string
@@ -123,28 +123,36 @@ properties:
   operations:
     type: object
     propertyNames:
-      $ref: '#/definitions/name'
+      $ref: "#/definitions/name"
     patternProperties:
-      '.*':
+      ".*":
         type: object
         properties:
           type:
-            enum: [transition, observation, assignment, computation, effect, unmanaged]
+            enum:
+              [
+                transition,
+                observation,
+                assignment,
+                computation,
+                effect,
+                unmanaged,
+              ]
           scope:
             enum: [object, objects, changeset, stream, none]
           concurrency:
             enum: [none, retry]
           forward:
-            $ref: '#/definitions/name'
+            $ref: "#/definitions/name"
           bridge:
             type: string
           bindings:
-            $ref: '#/properties/bindings'
+            $ref: "#/properties/bindings"
           input:
             $ref: https://json-schema.org/draft/2019-09/schema
           output:
             $ref: https://json-schema.org/draft/2019-09/schema
-            default: { }
+            default: {}
           errors:
             type: array
             items:
@@ -224,9 +232,9 @@ properties:
   events:
     type: object
     propertyNames:
-      $ref: '#/definitions/name'
+      $ref: "#/definitions/name"
     patternProperties:
-      '.*':
+      ".*":
         type: object
         properties:
           bridge:
@@ -234,7 +242,7 @@ properties:
           path:
             type: string
           binding:
-            $ref: '#/definitions/binding'
+            $ref: "#/definitions/binding"
           conditioned:
             type: boolean
             default: false
@@ -247,17 +255,17 @@ properties:
   receivers:
     type: object
     patternProperties:
-      '.*':
+      ".*":
         type: object
         properties:
           operation:
-            $ref: '#/definitions/name'
+            $ref: "#/definitions/name"
           bridge:
             type: string
           binding:
             type: string
           source:
-            $ref: '#/definitions/name'
+            $ref: "#/definitions/name"
             not:
               const: context
           path:
@@ -273,6 +281,17 @@ properties:
         required: [operation]
         additionalProperties: false
 
+  guards:
+    type: object
+    patternProperties:
+      ".*":
+        type: object
+        properties:
+          bridge: { type: string }
+          path: { type: string }
+        required: [bridge, path]
+        additionalProperties: false
+
   extensions:
     type: object