@toa.io/extensions.configuration 1.1.0-dev.0 → 1.1.0-dev.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/extensions.configuration",
-  "version": "1.1.0-dev.0",
+  "version": "1.1.0-dev.10",
   "description": "Toa Configuration",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -16,11 +16,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@toa.io/core": "1.1.0-dev.0",
-    "@toa.io/generic": "0.11.0-dev.0",
-    "@toa.io/schema": "0.7.6-dev.0",
-    "@toa.io/yaml": "0.7.6-dev.0",
+    "@toa.io/core": "1.1.0-dev.10",
+    "@toa.io/generic": "0.11.0-dev.10",
+    "@toa.io/schema": "0.7.6-dev.10",
+    "@toa.io/yaml": "0.7.6-dev.10",
     "clone-deep": "4.0.1"
   },
-  "gitHead": "44a59b3ec335a1be8655b543891767bae799dba1"
+  "gitHead": "df6df35ff3e9f2d9416118a979d3885a8a1cd897"
 }

package/source/.manifest/.normalize/verbose.js

@@ -21,7 +21,7 @@ const convert = (node) => {
 }
 
 function property (node) {
-  if (node === null) throw new Error('Configuration: cannot resolve type of null, use JSONSchema declaration.')
+  if (node === null) return { type: 'null', default: null }
 
   const type = Array.isArray(node) ? 'array' : typeof node
 

package/source/.manifest/schema.yaml

@@ -2,6 +2,7 @@ $schema: https://json-schema.org/draft/2019-09/schema
 $id: https://schemas.toa.io/0.0.0/extensions/configuration/manifest
 
 $ref: 'https://schemas.toa.io/0.0.0/definitions#/definitions/schema'
+type: object
 properties:
   type:
     const: object

package/source/.provider/form.js

@@ -8,7 +8,7 @@ const { traverse } = require('@toa.io/generic')
  */
 const form = (schema) => {
   const defaults = (node) => {
-    if (node.properties !== undefined) return { ...node.properties }
+    if (node.type === 'object' && node.properties !== undefined) return { ...node.properties }
     if (node.default !== undefined) return node.default
 
     return null

package/source/annotation.fixtures.js

@@ -10,6 +10,7 @@ const instance = () => {
   const locator = new Locator(name, namespace)
 
   const manifest = {
+    type: 'object',
     properties: {
       foo: {
         type: 'number',

package/source/aspect.fixtures.js

@@ -3,21 +3,20 @@
 const { generate } = require('randomstring')
 
 const schema = {
+  type: 'object',
   properties: {
     foo: {
       type: 'string',
       default: generate()
     },
     bar: {
+      type: 'object',
       properties: {
         baz: {
           type: 'number',
           default: 1
         }
       }
-    },
-    quu: {
-      type: 'number'
     }
   }
 }

package/source/aspect.test.js

@@ -46,8 +46,7 @@ describe('defaults', () => {
       foo: fixtures.schema.properties.foo.default,
       bar: {
         baz: fixtures.schema.properties.bar.properties.baz.default
-      },
-      quu: 0
+      }
     })
   })
 })

package/source/factory.js

@@ -11,11 +11,11 @@ const { Provider } = require('./provider')
 class Factory {
   /**
    * @param {toa.core.Locator} locator
-   * @param {toa.schema.JSON | Object} declaration
+   * @param {toa.schema.JSON | Object} annotation
    * @return {toa.extensions.configuration.Aspect}
    */
-  aspect (locator, declaration) {
-    const schema = new Schema(declaration)
+  aspect (locator, annotation) {
+    const schema = new Schema(annotation)
     const provider = new Provider(locator, schema)
     const configuration = new Configuration(provider)
 

package/source/manifest.test.js

@@ -120,10 +120,4 @@ describe('normalization', () => {
 
     expect(() => manifest(concise)).toThrow(/array items type because it's empty/)
   })
-
-  it('should throw on null', () => {
-    const concise = { foo: null }
-
-    expect(() => manifest(concise)).toThrow(/type of null/)
-  })
 })