@toa.io/norm 1.0.0-alpha.27 → 1.0.0-alpha.272

package/test/component/normalize.test.js

@@ -1,9 +1,7 @@
 'use strict'
-
-const { dirname } = require('node:path')
 const clone = require('clone-deep')
 
-const { normalize } = require('../../src/.component')
+const { normalize, extensions } = require('../../src/.component')
 const fixtures = require('./normalize.fixtures')
 
 let manifest
@@ -21,13 +19,23 @@ describe('operations', () => {
 })
 
 describe('extensions', () => {
-  it('should resolve absolute references', () => {
-    const origins = manifest.extensions['@toa.io/extensions.origins']
-    const path = dirname(require.resolve('@toa.io/extensions.origins/package.json'))
+  it('should add predefined extensions', () => {
+    extensions(manifest)
 
-    normalize(manifest)
+    expect(manifest.extensions['@toa.io/extensions.telemetry']).toBeNull()
+    expect(manifest.extensions['@toa.io/extensions.fetch']).toBeNull()
+  })
 
-    expect(manifest.extensions[path]).toStrictEqual(origins)
+  it('should add predefined extensions without explicit declarations', () => {
+    delete manifest.extensions
+
+    extensions(manifest)
+
+    expect(manifest.extensions).toStrictEqual({
+      '@toa.io/extensions.telemetry': null,
+      '@toa.io/extensions.fetch': null,
+      '@toa.io/extensions.introspection': {}
+    })
   })
 })
 

package/test/component/validate.test.js

@@ -1,5 +1,3 @@
-// noinspection JSUnresolvedVariable
-
 'use strict'
 
 const clone = require('clone-deep')
@@ -20,13 +18,13 @@ it('should be ok', () => {
 it('should provide error', () => {
   manifest.foo = 'bar'
 
-  expect(() => validate(manifest)).toThrow(/must NOT have additional property/)
+  expect(() => validate(manifest)).toThrow()
 })
 
 it('should not have additional properties', () => {
   manifest.foo = 'bar'
 
-  expect(() => validate(manifest)).toThrow(/must NOT have additional property/)
+  expect(() => validate(manifest)).toThrow()
 })
 
 describe('namespace', () => {
@@ -83,13 +81,13 @@ describe('entity', () => {
 
   it('should not have additional properties', () => {
     manifest.entity.foo = 'bar'
-    expect(() => validate(manifest)).toThrow(/must NOT have additional property/)
+    expect(() => validate(manifest)).toThrow()
   })
 
   describe('schema', () => {
     it('should be required', () => {
       delete manifest.entity.schema
-      expect(() => validate(manifest)).toThrow(/must have required property/)
+      expect(() => validate(manifest)).toThrow()
     })
 
     it('should be JSON schema object', () => {
@@ -99,7 +97,7 @@ describe('entity', () => {
 
     it('should be JSON schema object of type object', () => {
       manifest.entity.schema = { type: 'integer' }
-      expect(() => validate(manifest)).toThrow(/must be equal to constant 'object'/)
+      expect(() => validate(manifest)).toThrow(/must be equal to constant/)
 
       manifest.entity.schema = {}
       validate(manifest)
@@ -154,7 +152,7 @@ describe('operations', () => {
 
   it('should not have additional properties', () => {
     manifest.operations.get.foo = 'bar'
-    expect(() => validate(manifest)).toThrow(/additional property/)
+    expect(() => validate(manifest)).toThrow()
   })
 
   it('should have type (transition or observation)', () => {
@@ -176,8 +174,7 @@ describe('operations', () => {
   })
 
   it.each([
-    ['computation', 'compute'],
-    ['effect', 'affect']
+    ['computation', 'compute']
   ])('should set query: false for %s', async (_, operation) => {
     validate(manifest)
 
@@ -250,7 +247,7 @@ describe('receivers', () => {
   it('should throw if transition points to observation', () => {
     manifest.receivers['foo.bar.happened'].operation = 'get'
 
-    expect(() => validate(manifest)).toThrow(/one of the allowed types/)
+    expect(() => validate(manifest)).toThrow(/of the allowed types/)
   })
 
   it('should throw if source has a name `context`', async () => {

package/test/context/complete.fixtures.js

@@ -21,7 +21,6 @@ const context = {
   name: 'test',
   description: 'context fixture',
   version: '0.0.0',
-  packages: 'namespaces/**/*',
   registry: 'localhost:5000',
   components: [
     component('a.b'),

package/test/context/dereference.fixtures.js

@@ -27,7 +27,6 @@ const context = {
   description: 'context fixture',
   version: '0.0.0',
   runtime: '0.0.0',
-  packages: 'namespaces/**/*',
   registry: 'localhost:5000',
   components: [component('a.b'), component('b.a'), component('d.c')],
   compositions: [

package/test/context/normalize.fixtures.js

@@ -9,7 +9,6 @@ const context = {
   name: 'test',
   description: 'context fixture',
   version: '0.0.0',
-  packages: 'namespaces/**/*',
   registry: 'localhost:5000',
   compositions: [
     {

package/test/context/validate.fixtures.js

@@ -7,7 +7,6 @@ const context = {
   name: 'test',
   description: 'context fixture',
   version: '0.0.0',
-  packages: 'namespaces/**/*',
   build: {
     command: 'echo test'
   },

package/test/context/validate.test.js

@@ -45,12 +45,6 @@ describe('registry', () => {
     expect(() => validate(context)).toThrow(/required property 'registry'/)
   })
 
-  it('should require base', () => {
-    delete context.registry.base
-
-    expect(() => validate(context)).toThrow(/required property 'base'/)
-  })
-
   it('should set default platforms', () => {
     delete context.registry.platforms
 
@@ -72,13 +66,19 @@ it('should require name as label', () => {
   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/*')
-})
-
 it('should require registry url', () => {
   delete context.registry
   expect(() => validate(context)).toThrow(/required/)
 })
+
+it('should allow mono replicas and resources', () => {
+  context.mono = {
+    replicas: 2,
+    resources: {
+      cpu: ['200m', '2'],
+      memory: ['256Mi', '2Gi']
+    }
+  }
+
+  expect(() => validate(context)).not.toThrow()
+})

package/types/context/declaration.d.ts

@@ -5,13 +5,34 @@ interface Composition {
   components: 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 {
   name: string
   description?: string
   version?: string
   runtime?: Runtime | string
   registry?: Registry | string
-  packages?: string
   compositions?: Composition[]
+  mono?: Mono
+  ingress?: Ingress
   annotations?: Record<string, object>
 }