@toa.io/norm 0.20.0-dev.17 → 0.20.0-dev.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/norm",
-  "version": "0.20.0-dev.17",
+  "version": "0.20.0-dev.19",
   "description": "Toa declarations normalization and validation",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -12,6 +12,7 @@
     "url": "https://github.com/toa-io/toa/issues"
   },
   "main": "src/index.js",
+  "types": "types/index.d.ts",
   "publishConfig": {
     "access": "public"
   },
@@ -19,11 +20,11 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/core": "0.20.0-dev.17",
-    "@toa.io/generic": "0.20.0-dev.17",
-    "@toa.io/schema": "0.20.0-dev.17",
-    "@toa.io/schemas": "0.20.0-dev.17",
-    "@toa.io/yaml": "0.20.0-dev.17"
+    "@toa.io/core": "0.20.0-dev.19",
+    "@toa.io/generic": "0.20.0-dev.19",
+    "@toa.io/schema": "0.20.0-dev.19",
+    "@toa.io/schemas": "0.20.0-dev.19",
+    "@toa.io/yaml": "0.20.0-dev.19"
   },
-  "gitHead": "cafb719d8e80d3e78a00904dc6ab6d6b0d5b568b"
+  "gitHead": "e10214f746cf4fc699af42dba90e099487177a43"
 }

package/src/.component/.expand/extensions.js

@@ -10,7 +10,8 @@ function extensions (manifest) {
 const SHORTCUTS = {
   exposition: '@toa.io/extensions.exposition',
   origins: '@toa.io/extensions.origins',
-  configuration: '@toa.io/extensions.configuration'
+  configuration: '@toa.io/extensions.configuration',
+  stash: '@toa.io/extensions.stash'
 }
 
 exports.extensions = extensions

package/src/.component/normalize.js

@@ -1,10 +1,8 @@
 'use strict'
 
-const { convolve } = require('@toa.io/generic')
 const { events, operations, extensions, receivers } = require('./.normalize')
 
 const normalize = (component, environment) => {
-  convolve(component, environment)
   operations(component)
   events(component)
   receivers(component)

package/src/shortcuts.js

@@ -47,7 +47,8 @@ const SHORTCUTS = {
   queues: '@toa.io/storages.queues',
   exposition: '@toa.io/extensions.exposition',
   configuration: '@toa.io/extensions.configuration',
-  origins: '@toa.io/extensions.origins'
+  origins: '@toa.io/extensions.origins',
+  stash: '@toa.io/extensions.stash'
 }
 
 exports.recognize = recognize

package/test/component/normalize.test.js

@@ -12,13 +12,6 @@ beforeEach(() => {
   manifest = clone(fixtures.operations)
 })
 
-describe('environment', () => {
-  it('should convolve with environment argument', () => {
-    normalize(manifest, 'local')
-    expect(manifest.operations.add.bindings).toStrictEqual(['foo'])
-  })
-})
-
 describe('operations', () => {
   it('should set default bindings', () => {
     normalize(manifest)

package/types/context/declaration.d.ts

@@ -0,0 +1,17 @@
+import { Composition, Registry, Runtime } from '../context'
+
+interface Composition {
+  name: string,
+  components: string[]
+}
+
+export interface Declaration {
+  name: string
+  description?: string
+  version?: string
+  runtime?: Runtime | string
+  registry?: Registry | string
+  packages?: string
+  compositions?: Composition[]
+  annotations?: Record<string, object>
+}

package/types/context.d.ts

@@ -1,77 +1,40 @@
 import * as _component from './component'
 import { Locator } from '@toa.io/core/types'
+import type { Declaration } from './context/declaration'
 
-declare namespace toa.norm {
-
-  namespace context {
-
-    interface Runtime {
-      version: string
-      registry?: string
-      proxy?: string
-    }
-
-    interface Registry {
-      base?: string
-      platforms?: string[] | null
-      build?: {
-        arguments?: string[]
-        run?: string
-      },
-      credentials: string
-    }
-
-    interface Composition {
-      name: string,
-      components: string[] | _component.Component[]
-    }
-
-    namespace dependencies {
-
-      type Instance = {
-        locator: Locator
-        manifest?: Object
-      }
-
-      type References = {
-        [reference: string]: _component.Component[]
-      }
-
-    }
-
-    interface Dependencies {
-      [reference: string]: dependencies.Instance[]
-    }
-
-    interface Declaration {
-      name: string
-      description?: string
-      version?: string
-      runtime?: Runtime | string
-      registry?: Registry | string
-      packages?: string
-      compositions?: Composition[]
-      annotations?: Record<string, object>
-    }
-
-    type Constructor = (path: string, environment?: string) => Promise<Context>
-  }
+interface Runtime {
+  version: string
+  registry?: string
+  proxy?: string
+}
 
-  interface Context extends context.Declaration {
-    runtime?: context.Runtime
-    environment?: string
-    registry?: context.Registry
-    components?: _component.Component[]
-    dependencies?: context.Dependencies
-  }
+interface Registry {
+  base?: string
+  platforms?: string[] | null
+  build?: {
+    arguments?: string[]
+    run?: string
+  },
+  credentials: string
+}
 
+interface Composition {
+  name: string,
+  components: _component.Component[]
 }
 
-export type Composition = toa.norm.context.Composition
-export type Context = toa.norm.Context
+export interface Dependency {
+  locator: Locator
+  manifest?: object
+}
 
-export namespace dependencies {
-  export type Instance = toa.norm.context.dependencies.Instance
+interface Context extends Declaration {
+  runtime?: Runtime
+  environment?: string
+  registry?: Registry
+  compositions?: Composition[]
+  components?: _component.Component[]
+  dependencies?: Record<string, Dependency[]>
 }
 
-export const context: toa.norm.context.Constructor
+export function context (path: string, environment?: string): Promise<Context>

package/types/index.d.ts

@@ -1,5 +1 @@
-export { component } from './component'
-export { context } from './context'
-
-export type { Composition, dependencies } from './context'
-export type { Component, Operation } from './component'
+export * as context from './context'