@toa.io/pointer 0.7.1 → 0.8.0-dev.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/pointer",
-  "version": "0.7.1",
+  "version": "0.8.0-dev.0",
   "description": "Toa Pointer",
   "homepage": "https://toa.io",
   "author": {
@@ -24,9 +24,9 @@
   "main": "source/index.js",
   "dependencies": {
     "@toa.io/console": "0.6.0",
-    "@toa.io/generic": "0.7.0",
-    "@toa.io/schema": "0.7.1",
-    "@toa.io/yaml": "0.7.1"
+    "@toa.io/generic": "0.8.0-dev.0",
+    "@toa.io/schemas": "0.8.0-dev.0",
+    "@toa.io/yaml": "0.7.2-dev.1"
   },
-  "gitHead": "9989ea316ebf5698b1eee933e83a86e6a18b406b"
+  "gitHead": "5f1bfd167bb7919492d249f78bbcc6bd9fc645a4"
 }

package/source/uris/construct.js

@@ -1,8 +1,12 @@
 'use strict'
 
-const { normalize, validate } = require('./.construct')
+const { normalize } = require('./normalize')
+const { validate } = require('./validate')
 
-/** @type {toa.pointer.uris.Constructor} */
+/**
+ * @param {toa.pointer.URIs} declaration
+ * @returns {toa.pointer.URIs}
+ */
 const construct = (declaration) => {
   const normalized = normalize(declaration)
 

package/source/uris/index.js

@@ -2,6 +2,8 @@
 
 const { construct } = require('./construct')
 const { resolve } = require('./resolve')
+const { validate } = require('./validate')
 
 exports.construct = construct
 exports.resolve = resolve
+exports.validate = validate

package/source/uris/normalize.js

@@ -0,0 +1,12 @@
+'use strict'
+
+/**
+ * @param {toa.pointer.URIs | string} declaration
+ * @returns {toa.pointer.URIs}
+ */
+const normalize = (declaration) => {
+  if (typeof declaration === 'string') return { default: declaration }
+  return declaration
+}
+
+exports.normalize = normalize

package/source/uris/{.construct/schema.yaml → schema.yaml}

@@ -1,5 +1,4 @@
 $schema: https://json-schema.org/draft/2019-09/schema
-$id: https://schemas.toa.io/0.0.0/storages/mongodb/annotations
 
 definitions:
   node:

package/source/uris/{.construct/validate.js → validate.js}

@@ -2,14 +2,14 @@
 
 const path = require('path')
 
-const { Schema } = require('@toa.io/schema')
+const schemas = require('@toa.io/schemas')
 const { load } = require('@toa.io/yaml')
 
-const schema = load.sync(path.resolve(__dirname, 'schema.yaml'))
-const validator = new Schema(schema)
+const cos = load.sync(path.resolve(__dirname, 'schema.yaml'))
+const schema = schemas.schema(cos)
 
 const validate = (declaration) => {
-  const error = validator.fit(declaration)
+  const error = schema.fit(declaration)
 
   if (error) throw new TypeError(error.message)
 }

package/test/uris.test.js

@@ -138,3 +138,7 @@ describe('resolve', () => {
     expect(url.href).toStrictEqual(uri)
   })
 })
+
+it('should expose validate function', async () => {
+  expect(uris.validate).toBeInstanceOf(Function)
+})

package/types/uris.d.ts

@@ -8,8 +8,6 @@ declare namespace toa.pointer {
       [key: string]: Node
     }
 
-    type Constructor = (declaration: URIs | string) => URIs
-
     type Resolution = {
       url: URL
       entry: string
@@ -27,6 +25,3 @@ declare namespace toa.pointer {
 }
 
 export type URIs = toa.pointer.URIs
-
-export const construct: toa.pointer.uris.Constructor
-export const resolve: toa.pointer.uris.Resolver

package/source/uris/.construct/index.js

@@ -1,7 +0,0 @@
-'use strict'
-
-const { normalize } = require('./normalize')
-const { validate } = require('./validate')
-
-exports.normalize = normalize
-exports.validate = validate

package/source/uris/.construct/normalize.js

@@ -1,17 +0,0 @@
-'use strict'
-
-/**
- * @param {toa.pointer.URIs | string} declaration
- * @returns {toa.pointer.URIs}
- */
-const normalize = (declaration) => {
-  /** @type {toa.pointer.URIs} */
-  let annotation
-
-  if (typeof declaration === 'string') annotation = { default: declaration }
-  else annotation = declaration
-
-  return annotation
-}
-
-exports.normalize = normalize