shinkansen-transmission 2.1.15 → 2.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shinkansen-transmission",
-  "version": "2.1.15",
+  "version": "2.2.2",
   "description": "Shinkansen Transmission",
   "keywords": [
     "Shinkansen",
@@ -22,50 +22,43 @@
   "scripts": {
     "prepublishOnly": "cross-env NODE_ENV=production npm run build",
     "prebuild": "npm run clean",
-    "build": "npm run babel",
+    "build": "cross-env DEBUG=shinkansen-transmission npm run babel",
     "build:watch": "npm run babel:watch",
     "clean": "rimraf lib",
     "babel": "babel src -d lib",
     "babel:watch": "npm run babel -- -w",
     "lint": "eslint .",
     "lint:fix": "npm run lint -- --fix",
-    "test": "NODE_ENV=test mocha -r @babel/register -r @babel/polyfill test --recursive --verbose",
+    "test": "NODE_ENV=test mocha -r @babel/register test --recursive --verbose",
     "coverage": "nyc --reporter=lcov npm run test",
     "pre-commit": "npm run lint && npm run coverage && npm run build && git add lib"
   },
   "dependencies": {
-    "debug": "^4.2.0",
+    "debug": "^4.3.2",
     "fast-deep-equal": "^3.1.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.1",
-    "@babel/core": "^7.12.3",
-    "@babel/eslint-parser": "^7.12.1",
-    "@babel/plugin-proposal-export-default-from": "^7.12.1",
-    "@babel/plugin-proposal-export-namespace-from": "^7.12.1",
-    "@babel/polyfill": "^7.12.1",
-    "@babel/preset-env": "^7.12.1",
-    "@babel/register": "^7.12.1",
-    "babel-loader": "^8.1.0",
-    "babel-plugin-module-resolver": "^4.0.0",
-    "chai": "^4.2.0",
-    "core-js": "^3.6.5",
-    "cross-env": "^7.0.2",
-    "eslint": "^7.11.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-import-resolver-babel-module": "^5.2.0",
-    "eslint-plugin-import": "^2.22.1",
+    "@babel/cli": "^7.15.4",
+    "@babel/core": "^7.15.5",
+    "@babel/eslint-parser": "^7.15.4",
+    "@babel/plugin-proposal-export-default-from": "^7.14.5",
+    "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
+    "@babel/preset-env": "^7.15.6",
+    "@babel/register": "^7.15.3",
+    "babel-loader": "^8.2.2",
+    "babel-plugin-module-resolver": "^4.1.0",
+    "chai": "^4.3.4",
+    "core-js": "^3.17.3",
+    "cross-env": "^7.0.3",
+    "eslint": "^7.32.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-import-resolver-babel-module": "^5.3.1",
+    "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
-    "husky": "^4.3.0",
-    "mocha": "^8.2.0",
+    "eslint-plugin-promise": "^5.1.0",
+    "husky": "^7.0.2",
+    "mocha": "^9.1.1",
     "nyc": "^15.1.0",
     "rimraf": "^3.0.2"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "npm run pre-commit"
-    }
   }
 }

package/src/transmission/from-document-to-hash/index.js

@@ -20,22 +20,30 @@ import {
 
 const log = debug('shinkansen-transmission:from-document-to-hash')
 
+log('`shinkansen-transmission` is awake')
+
 function findByKey (parentUri, uri) {
+  /*
+   *  log('findByKey')
+   */
   return function find (key) {
-    return uri === getUri(parentUri, key)
+    /*
+     *  log('find')
+     */
+    return getUri(parentUri, key) === uri
   }
 }
 
 function findByIndex (parentUri, uri) {
+  /*
+   *  log('findByIndex')
+   */
   return function find (schema, index) {
     /*
-     *  log('findByIndex')
+     *  log('find')
      */
-
     if (hasEnum(schema)) {
-      // const array = getEnum(schema)
-
-      // return array.find(findByIndex(parentUri, uri))
+      return getUri(parentUri, index) === uri
     } else {
       if (hasAnyOf(schema)) {
         const array = getAnyOf(schema)
@@ -55,30 +63,40 @@ function findByIndex (parentUri, uri) {
 }
 
 function findByValue (value) {
+  /*
+   *  log('findByValue')
+   */
   return function find (schema) {
     /*
-     *  log('findByValue')
+     *  log('find')
      */
-
     return value === transformValue(schema)
   }
 }
 
 function findByEqual (value) {
+  /*
+   *  log('findByEqual')
+   */
   return function find (schema) {
+    /*
+     *  log('find')
+     */
     return equal(value, transformValue(schema))
   }
 }
 
 function toString (value) {
+  /*
+   *  log('toString')
+   */
   return (value !== undefined) ? String(value) : ''
 }
 
-export function getObject ({ properties = {} /* object */ } = {}, parentUri, uri) {
+export function getObject ({ properties = {} /* object */ } = {}, parentUri = '', uri = '') {
   /*
    *  log('getObject')
    */
-
   return (
     Reflect.get(properties, (
       Object.keys(properties)
@@ -87,21 +105,19 @@ export function getObject ({ properties = {} /* object */ } = {}, parentUri, uri
   )
 }
 
-export function getArray ({ items = {} /* array or object */ } = {}, parentUri, uri) {
+export function getArray ({ items = {} /* array or object */ } = {}, parentUri = '', uri = '') {
   /*
    *  log('getArray')
    */
-
   return (isArray(items))
     ? items.find(findByIndex(parentUri, uri))
     : items
 }
 
-export function getSchema (schema = {}, parentUri, uri) {
+export function getSchema (schema = {}, parentUri = '', uri = '') {
   /*
    *  log('getSchema')
    */
-
   const { type } = schema
 
   switch (type) {
@@ -127,6 +143,9 @@ export const transformValue = (schema) => (
 )
 
 export function transformValueIndexFor (array, value) {
+  /*
+   *  log('transformValueIndexFor')
+   */
   const find = findByValue(value)
 
   if (array.some(find)) {
@@ -145,6 +164,9 @@ export function transformValueIndexFor (array, value) {
 }
 
 export function transformEqualIndexFor (array, value) {
+  /*
+   *  log('transformEqualIndexFor')
+   */
   const find = findByEqual(value)
 
   if (array.some(find)) {
@@ -166,7 +188,6 @@ export function transformArrayFor (document, schema, values, params, parentUri,
   /*
    *  log('transformArrayFor')
    */
-
   return (
     document
       .reduce((values, value, index) => {
@@ -181,7 +202,6 @@ export function transformObjectFor (document, schema, values, params, parentUri,
   /*
    *  log('transformObjectFor')
    */
-
   return (
     Object.entries(document)
       .reduce((values, [key, value]) => {
@@ -200,17 +220,23 @@ export function transformArray (document, schema, values, params, parentUri, uri
   if (hasEnum(schema)) {
     const array = getEnum(schema)
 
-    return { ...values, [uri]: document.map((value) => transformValueIndexFor(array, value)) }
+    values[uri] = document.map((value) => transformValueIndexFor(array, value))
+
+    return values
   } else {
     if (hasAnyOf(schema)) {
       const array = getAnyOf(schema)
 
-      return { ...values, [uri]: document.map((value) => transformValueIndexFor(array, value)) }
+      values[uri] = document.map((value) => transformValueIndexFor(array, value))
+
+      return values
     } else {
       if (hasOneOf(schema)) {
         const array = getOneOf(schema)
 
-        return { ...values, [uri]: document.map((value) => transformValueIndexFor(array, value)) }
+        values[uri] = document.map((value) => transformValueIndexFor(array, value))
+
+        return values
       } else {
         const { items = {} } = schema
 
@@ -227,17 +253,23 @@ export function transformArray (document, schema, values, params, parentUri, uri
             if (hasEnum(items)) {
               const array = getEnum(items)
 
-              return { ...values, [uri]: document.map((value) => transformValueIndexFor(array, value)) }
+              values[uri] = document.map((value) => transformValueIndexFor(array, value))
+
+              return values
             } else {
               if (hasAnyOf(items)) {
                 const array = getAnyOf(items)
 
-                return { ...values, [uri]: document.map((value) => transformValueIndexFor(array, value)) }
+                values[uri] = document.map((value) => transformValueIndexFor(array, value))
+
+                return values
               } else {
                 if (hasOneOf(items)) {
                   const array = getOneOf(items)
 
-                  return { ...values, [uri]: document.map((value) => transformValueIndexFor(array, value)) }
+                  values[uri] = document.map((value) => transformValueIndexFor(array, value))
+
+                  return values
                 }
               }
             }
@@ -261,17 +293,23 @@ export function transformObject (document, schema, values, params, parentUri, ur
   if (hasEnum(schema)) {
     const array = getEnum(schema)
 
-    return { ...values, [uri]: transformEqualIndexFor(array, document) }
+    values[uri] = transformEqualIndexFor(array, document)
+
+    return values
   } else {
     if (hasAnyOf(schema)) {
       const array = getAnyOf(schema)
 
-      return { ...values, [uri]: transformEqualIndexFor(array, document) }
+      values[uri] = transformEqualIndexFor(array, document)
+
+      return values
     } else {
       if (hasOneOf(schema)) {
         const array = getOneOf(schema)
 
-        return { ...values, [uri]: transformEqualIndexFor(array, document) }
+        values[uri] = transformEqualIndexFor(array, document)
+
+        return values
       }
     }
   }
@@ -306,17 +344,23 @@ export default function transform (document, schema = {}, values = {}, params =
       if (hasEnum(schema)) {
         const items = getEnum(schema)
 
-        return { ...values, [uri]: transformValueIndexFor(items, document) }
+        values[uri] = transformValueIndexFor(items, document)
+
+        return values
       } else {
         if (hasAnyOf(schema)) {
           const items = getAnyOf(schema)
 
-          return { ...values, [uri]: transformValueIndexFor(items, document) }
+          values[uri] = transformValueIndexFor(items, document)
+
+          return values
         } else {
           if (hasOneOf(schema)) {
             const items = getOneOf(schema)
 
-            return { ...values, [uri]: transformValueIndexFor(items, document) }
+            values[uri] = transformValueIndexFor(items, document)
+
+            return values
           }
         }
       }
@@ -326,5 +370,7 @@ export default function transform (document, schema = {}, values = {}, params =
   /*
    *  The hash should contain only strings
    */
-  return { ...values, [uri]: toString(document) }
+  values[uri] = toString(document)
+
+  return values
 }

package/src/transmission/from-hash-to-document/index.js

@@ -16,8 +16,9 @@ import {
   getUri
 } from 'shinkansen-transmission/transmission/common'
 
-const log = debug('shinkansen-transmission:from-hash-to-document:log')
-const error = debug('shinkansen-transmission:from-hash-to-document:error')
+const log = debug('shinkansen-transmission:from-hash-to-document')
+
+log('`shinkansen-transmission` is awake')
 
 export function toNull (v) {
   if (v === null || v === 'null') return null
@@ -78,7 +79,7 @@ export function transformValueFor (value, array) {
       return transformValue(v)
     }
   } catch ({ message = 'No error message defined' }) {
-    error(message)
+    log(message)
   }
 
   /*
@@ -87,7 +88,7 @@ export function transformValueFor (value, array) {
   return value
 }
 
-export function getArrayFor (values, array = [], uri) {
+export function getArrayFor (values, array = [], uri = '#') {
   /*
    *  log('getArrayFor')
    */
@@ -102,7 +103,7 @@ export function getArrayFor (values, array = [], uri) {
   return []
 }
 
-export function transformArrayFor (values, { items = null }, parentUri, uri) {
+export function transformArrayFor (values, { items = null } = {}, parentUri = '#', uri = getUri(parentUri)) {
   /*
    *  log('transformArrayFor')
    */
@@ -118,7 +119,7 @@ export function transformArrayFor (values, { items = null }, parentUri, uri) {
   return []
 }
 
-export function transformObjectFor (values, { properties = null }, parentUri, uri) {
+export function transformObjectFor (values, { properties = null } = {}, parentUri = '#', uri = getUri(parentUri)) {
   /*
    *  log('transformObjectFor')
    */
@@ -130,7 +131,9 @@ export function transformObjectFor (values, { properties = null }, parentUri, ur
         .reduce((accumulator, [key, schema]) => {
           const schemaUri = getUri(parentUri, key)
 
-          return ({ ...accumulator, [key]: transform(values, schema, schemaUri, schemaUri) })
+          accumulator[key] = transform(values, schema, schemaUri, schemaUri)
+
+          return accumulator
         }, {})
     )
   }
@@ -138,7 +141,7 @@ export function transformObjectFor (values, { properties = null }, parentUri, ur
   return {}
 }
 
-export function transformItemsArrayFor (values, items = [], parentUri, uri) {
+export function transformItemsArrayFor (values, items = [], parentUri = '#', uri = getUri(parentUri)) {
   /*
    *  log('transformItemsArrayFor')
    */
@@ -170,7 +173,7 @@ export function transformItemsArrayFor (values, items = [], parentUri, uri) {
   )
 }
 
-export function transformItemsObjectFor (values, items = {}, parentUri, uri) {
+export function transformItemsObjectFor (values, items = {}, parentUri = '#', uri = getUri(parentUri)) {
   /*
    *  log('transformItemsObjectFor')
    */
@@ -202,7 +205,7 @@ export function transformItemsObjectFor (values, items = {}, parentUri, uri) {
   )
 }
 
-const handleError = ({ message = 'No error message defined' }) => error(message)
+const handleError = ({ message = 'No error message defined' }) => log(message)
 
 // https://json-schema.org/draft/2019-09/json-schema-validation.html#rfc.section.6
 export function transformObjectSchemaNull (values, schema, { uri: parentUri, key: fieldKey }, uri = getUri(parentUri, fieldKey)) {