@toa.io/pointer 0.4.0-dev.2 → 0.4.0-dev.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/pointer",
-  "version": "0.4.0-dev.2",
+  "version": "0.4.0-dev.6",
   "description": "Toa Pointer",
   "homepage": "https://toa.io",
   "author": {
@@ -23,9 +23,9 @@
   },
   "main": "source/index.js",
   "dependencies": {
-    "@toa.io/console": "0.4.0-dev.2",
-    "@toa.io/generic": "0.4.0-dev.2",
-    "@toa.io/schema": "0.4.0-dev.2",
-    "@toa.io/yaml": "0.4.0-dev.2"
+    "@toa.io/console": "0.4.0-dev.6",
+    "@toa.io/generic": "0.4.0-dev.6",
+    "@toa.io/schema": "0.4.0-dev.6",
+    "@toa.io/yaml": "0.4.0-dev.6"
   }
 }

package/source/.pointer/index.js

@@ -2,6 +2,8 @@
 
 const { env } = require('./env')
 const { local } = require('./local')
+const { label } = require('./label')
 
 exports.env = env
 exports.local = local
+exports.label = label

package/source/.pointer/label.js

@@ -0,0 +1,15 @@
+'use strict'
+
+/**
+ * @param {URL} url
+ * @returns {string}
+ */
+const label = (url) => {
+  const safe = new URL(url.href)
+
+  safe.password = ''
+
+  return safe.href
+}
+
+exports.label = label

package/source/pointer.js

@@ -27,20 +27,8 @@ class Pointer {
     this.username = url.username
     this.password = url.password
     this.reference = url.href
-    this.label = label(url)
+    this.label = get.label(url)
   }
 }
 
-/**
- * @param {URL} url
- * @returns {string}
- */
-const label = (url) => {
-  const safe = new URL(url.href)
-
-  safe.password = ''
-
-  return safe.href
-}
-
 exports.Pointer = Pointer

package/source/uris/resolve.js

@@ -2,27 +2,15 @@
 
 /** @type {toa.pointer.uris.Resolver} */
 const resolve = (locator, uris) => {
-  let entry
+  const keys = [locator.id, locator.namespace, 'default']
+  const entry = keys.find((key) => key in uris)
+  const uri = uris[entry]
 
-  /** @type {string} */
-  let uri
-
-  const entries = [locator.id, locator.namespace, 'default']
-
-  for (const key of entries) {
-    if (typeof uris[key] === 'string') {
-      uri = uris[key]
-      entry = key
-
-      break
-    }
-  }
-
-  if (uri === undefined) throw new Error(`URI annotation for '${locator.id}' is not found`)
+  if (entry === undefined) throw new Error(`URI annotation for '${locator.id}' is not found`)
 
   const url = new URL(uri)
 
-  if (url.hostname === '') throw new Error(`URI annotation for '${locator.id}' must contain hostname`)
+  if (url.hostname === '') throw new Error(`URI annotation for '${locator.id}' must contain a hostname`)
 
   return { url, entry }
 }

package/test/pointer.test.js

@@ -1,13 +1,13 @@
 'use strict'
 
+const { generate } = require('randomstring')
+const { encode, letters: { up } } = require('@toa.io/generic')
+
 const mock = { console: { info: jest.fn(), warn: jest.fn() } }
 
 jest.mock('@toa.io/console', () => mock)
 
-const { generate } = require('randomstring')
 const { Locator } = require('@toa.io/core')
-const { encode, letters: { up } } = require('@toa.io/generic')
-
 const { Pointer } = require('../')
 
 it('should be', () => {