@toa.io/norm 1.0.0-alpha.28 → 1.0.0-alpha.283

package/test/context/normalize.test.js

@@ -1,10 +1,12 @@
-'use strict'
+import * as runtime from '@toa.io/runtime'
+import { it, beforeEach } from 'node:test'
+import assert from 'node:assert/strict'
 
-const clone = require('clone-deep')
-const { generate } = require('randomstring')
+import clone from 'clone-deep'
+import { generate } from 'randomstring'
 
-const fixtures = require('./normalize.fixtures')
-const { normalize } = require('../../src/.context')
+import * as fixtures from './normalize.fixtures.js'
+import { normalize } from '../../src/.context/index.js'
 
 let context
 
@@ -17,8 +19,8 @@ it('should resolve local version', () => {
 
   normalize(context)
 
-  expect(context.runtime).not.toEqual('.')
-  expect(context.runtime.version).toEqual(require('@toa.io/runtime').version)
+  assert.notDeepStrictEqual(context.runtime, '.')
+  assert.deepStrictEqual(context.runtime.version, runtime.version)
 })
 
 it('should expand registry', () => {
@@ -28,7 +30,7 @@ it('should expand registry', () => {
 
   normalize(context)
 
-  expect(context.registry).toEqual({
+  assert.deepStrictEqual(context.registry, {
     base
   })
 })

package/test/context/validate.fixtures.js

@@ -1,13 +1,10 @@
-'use strict'
-
-const context = {
+export const context = {
   runtime: {
     version: '0.0.0'
   },
   name: 'test',
   description: 'context fixture',
   version: '0.0.0',
-  packages: 'namespaces/**/*',
   build: {
     command: 'echo test'
   },
@@ -37,5 +34,3 @@ const context = {
     }
   }
 }
-
-exports.context = context

package/test/context/validate.test.js

@@ -1,14 +1,15 @@
-'use strict'
+import { describe, it, before, beforeEach } from 'node:test'
+import assert from 'node:assert/strict'
 
-const clone = require('clone-deep')
+import clone from 'clone-deep'
 
-const { validate } = require('../../src/.context')
-const fixtures = require('./validate.fixtures')
+import { validate } from '../../src/.context/index.js'
+import * as fixtures from './validate.fixtures.js'
 
 let context
 
-beforeAll(() => {
-  expect(() => validate(fixtures.context)).not.toThrow()
+before(() => {
+  assert.doesNotThrow(() => validate(fixtures.context))
 })
 
 beforeEach(() => {
@@ -18,23 +19,23 @@ beforeEach(() => {
 describe('runtime', () => {
   it('should require', () => {
     delete context.runtime
-    expect(() => validate(context)).toThrow(/required/)
+    assert.throws(() => validate(context), (error) => /required/.test(error.message))
   })
 
   it('should require registry to match uri format', () => {
     context.runtime.registry = 'not-a-uri'
-    expect(() => validate(context)).toThrow(/must match format/)
+    assert.throws(() => validate(context), (error) => /must match format/.test(error.message))
 
     context.runtime.registry = 'http://localhost'
-    expect(() => validate(context)).not.toThrow()
+    assert.doesNotThrow(() => validate(context))
   })
 
   it('should require proxy to match uri format', () => {
     context.runtime.proxy = 'not-a-uri'
-    expect(() => validate(context)).toThrow(/must match format/)
+    assert.throws(() => validate(context), (error) => /must match format/.test(error.message))
 
     context.runtime.proxy = 'http://localhost'
-    expect(() => validate(context)).not.toThrow()
+    assert.doesNotThrow(() => validate(context))
   })
 })
 
@@ -42,13 +43,7 @@ describe('registry', () => {
   it('should require', () => {
     delete context.registry
 
-    expect(() => validate(context)).toThrow(/required property 'registry'/)
-  })
-
-  it('should require base', () => {
-    delete context.registry.base
-
-    expect(() => validate(context)).toThrow(/required property 'base'/)
+    assert.throws(() => validate(context), (error) => /required property 'registry'/.test(error.message))
   })
 
   it('should set default platforms', () => {
@@ -56,29 +51,58 @@ describe('registry', () => {
 
     validate(context)
 
-    expect(context.registry.platforms).toBeInstanceOf(Array)
-    expect(context.registry.platforms).toStrictEqual(['linux/amd64', 'linux/arm/v7', 'linux/arm64'])
+    assert.ok(context.registry.platforms instanceof Array)
+    assert.deepStrictEqual(context.registry.platforms, ['linux/amd64', 'linux/arm/v7', 'linux/arm64'])
   })
 })
 
 it('should require name as label', () => {
   delete context.name
-  expect(() => validate(context)).toThrow(/required/)
+  assert.throws(() => validate(context), (error) => /required/.test(error.message))
 
   context.name = 'foo bar'
-  expect(() => validate(context)).toThrow(/pattern/)
+  assert.throws(() => validate(context), (error) => /pattern/.test(error.message))
 
   context.name = 'foo-bar'
-  expect(() => validate(context)).not.toThrow(/pattern/)
-})
-
-it('should set default packages location', () => {
-  delete context.packages
-  expect(() => validate(context)).not.toThrow()
-  expect(context.packages).toBe('components/*')
+  assert.doesNotThrow(() => validate(context))
 })
 
 it('should require registry url', () => {
   delete context.registry
-  expect(() => validate(context)).toThrow(/required/)
+  assert.throws(() => validate(context), (error) => /required/.test(error.message))
+})
+
+it('should allow mono replicas and resources', () => {
+  context.mono = {
+    replicas: 2,
+    resources: {
+      cpu: ['200m', '2'],
+      memory: ['256Mi', '2Gi']
+    }
+  }
+
+  assert.doesNotThrow(() => validate(context))
+})
+
+describe('compositions', () => {
+  it('should allow services', () => {
+    context.compositions[0].services = ['@toa.io/extensions.exposition']
+
+    assert.doesNotThrow(() => validate(context))
+  })
+
+  it('should require services to be a non-empty array of strings', () => {
+    context.compositions[0].services = []
+    assert.throws(() => validate(context), (error) => /fewer than 1 items/.test(error.message))
+
+    context.compositions[0].services = 'exposition'
+    assert.throws(() => validate(context), (error) => /must be array/.test(error.message))
+  })
+
+  it('should reject an unknown property', () => {
+    context.compositions[0].compoments = ['a.b']
+
+    assert.throws(() => validate(context),
+      (error) => /Property compoments is not expected to be here/.test(error.message))
+  })
 })

package/test/shortcuts.fixtures.js

@@ -1,14 +1,9 @@
-'use strict'
+import { generate } from 'randomstring'
+import { random } from '@toa.io/generic'
 
-const { generate } = require('randomstring')
-const { random } = require('@toa.io/generic')
-
-const SHORTCUTS = {
+export const SHORTCUTS = {
   amqp: '@toa.io/bindings.amqp',
   mongodb: '@toa.io/storages.mongodb'
 }
 
-const object = { foo: random(), bar: { baz: generate() } }
-
-exports.object = object
-exports.SHORTCUTS = SHORTCUTS
+export const object = { foo: random(), bar: { baz: generate() } }

package/test/shortcuts.test.js

@@ -1,10 +1,11 @@
-'use strict'
+import { describe, it, beforeEach } from 'node:test'
+import assert from 'node:assert/strict'
 
-const clone = require('clone-deep')
-const { generate } = require('randomstring')
+import clone from 'clone-deep'
+import { generate } from 'randomstring'
 
-const { recognize, resolve } = require('../src/shortcuts')
-const fixtures = require('./shortcuts.fixtures')
+import { recognize, resolve } from '../src/shortcuts.js'
+import * as fixtures from './shortcuts.fixtures.js'
 
 let object
 
@@ -14,16 +15,16 @@ beforeEach(() => {
 
 describe('resolve', () => {
   it('should be defined', () => {
-    expect(resolve).toBeDefined()
+    assert.notStrictEqual(resolve, undefined)
   })
 
   it('should resolve', () => {
-    expect(Object.keys(fixtures.SHORTCUTS).length).toBeGreaterThan(0)
+    assert.ok(Object.keys(fixtures.SHORTCUTS).length > 0)
 
     for (const [key, value] of Object.entries(fixtures.SHORTCUTS)) {
       const resolved = resolve(key)
 
-      expect(resolved).toStrictEqual(value)
+      assert.deepStrictEqual(resolved, value)
     }
   })
 })
@@ -32,7 +33,7 @@ describe('recognize', () => {
   it('should not change unknown', () => {
     recognize(fixtures.SHORTCUTS, object)
 
-    expect(object).toStrictEqual(fixtures.object)
+    assert.deepStrictEqual(object, fixtures.object)
   })
 
   it('should resolve known', () => {
@@ -41,8 +42,8 @@ describe('recognize', () => {
     recognize(fixtures.SHORTCUTS, object)
 
     for (const [alias, name] of Object.entries(fixtures.SHORTCUTS)) {
-      expect(object[alias]).toBeUndefined()
-      expect(object[name]).toStrictEqual(known[name])
+      assert.strictEqual(object[alias], undefined)
+      assert.deepStrictEqual(object[name], known[name])
     }
   })
 
@@ -52,9 +53,9 @@ describe('recognize', () => {
 
     recognize(fixtures.SHORTCUTS, object, group)
 
-    expect(object[group]).toStrictEqual(known)
+    assert.deepStrictEqual(object[group], known)
 
-    for (const alias of Object.keys(fixtures.SHORTCUTS)) expect(object[alias]).toBeUndefined()
+    for (const alias of Object.keys(fixtures.SHORTCUTS)) assert.strictEqual(object[alias], undefined)
   })
 
   it('should not overwrite group', () => {
@@ -67,7 +68,7 @@ describe('recognize', () => {
 
     recognize(fixtures.SHORTCUTS, object, group)
 
-    expect(object[group]).toStrictEqual(expect.objectContaining(existing))
+    assert.partialDeepStrictEqual(object[group], existing)
   })
 
   it('should not create empty group', () => {
@@ -75,7 +76,7 @@ describe('recognize', () => {
 
     recognize(object, group)
 
-    expect(object[group]).toBeUndefined()
+    assert.strictEqual(object[group], undefined)
   })
 
   const append = () => {

package/types/context/declaration.d.ts

@@ -1,8 +1,30 @@
-import { Composition, Registry, Runtime } from '../context'
+import { Registry, Runtime } from '../context.js'
 
+/** A composition as declared, before its members are resolved. */
 interface Composition {
   name: string,
   components: string[]
+  services?: string[]
+}
+
+export interface Resources {
+  cpu?: [string, string]
+  memory?: [string, string]
+}
+
+export interface Mono {
+  replicas?: number
+  resources?: Resources
+}
+
+/**
+ * Cluster-level ingress configuration, applied to every service that declares one.
+ */
+export interface Ingress {
+  hosts?: string[]
+  class?: string
+  annotations?: Record<string, string>
+  default?: boolean
 }
 
 export interface Declaration {
@@ -11,7 +33,8 @@ export interface Declaration {
   version?: string
   runtime?: Runtime | string
   registry?: Registry | string
-  packages?: string
   compositions?: Composition[]
+  mono?: Mono
+  ingress?: Ingress
   annotations?: Record<string, object>
 }

package/types/context.d.ts

@@ -1,6 +1,6 @@
-import { Manifest } from './component'
+import { Manifest } from './component.js'
 import { Locator } from '@toa.io/core'
-import type { Declaration } from './context/declaration'
+import type { Declaration } from './context/declaration.js'
 
 interface Runtime{
   version: string
@@ -20,7 +20,8 @@ interface Registry{
 
 interface Composition{
   name: string,
-  components: _component.Component[]
+  components: Manifest[]
+  services?: string[]
 }
 
 export interface Dependency<T = undefined>{
@@ -34,7 +35,7 @@ interface Context extends Declaration{
   environment?: string
   registry?: Registry
   compositions?: Composition[]
-  components?: _component.Component[]
+  components?: Manifest[]
   dependencies?: Record<string, Dependency[]>
 }
 

package/types/index.d.ts

@@ -1,4 +1,4 @@
-export * as context from './context'
-export * as component from './component'
+export * as context from './context.js'
+export * as component from './component.js'
 
-export { Manifest } from './component'
+export { Manifest } from './component.js'