shinkansen-transmission 2.3.0 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shinkansen-transmission",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Shinkansen Transmission",
   "keywords": [
     "Shinkansen",

package/src/transmission/common/index.d.mts

@@ -63,7 +63,8 @@ export function getMetaValue (values?: ValuesType, uri?: string, schema?: Schema
 
 export function transformToValue (schema?: string | number | object | boolean | null): string | number | object | boolean | null | undefined
 
-export function findByUri (parentUri: string, uri: string): (key: string | number) => boolean
+export function findByKey (parentUri: string, uri: string): (key: string | number) => boolean
+export function findByIndex (parentUri: string, uri: string): (item: SchemaType, index: number) => boolean
 export function findByValue (value?: string | number | object | boolean | null): (item?: string | number | object | boolean | null | string[] | number[] | object[] | boolean[] | null[]) => boolean
 export function findByEqual (value?: string | number | object | boolean | null): (item?: string | number | object | boolean | null | string[] | number[] | object[] | boolean[] | null[]) => boolean
 

package/src/transmission/common/index.mjs

@@ -328,9 +328,9 @@ export function transformToValue (item) {
  *  @param {string} uri
  *  @returns {(key: string | number) => boolean}
  */
-export function findByUri (parentUri, uri) {
+export function findByKey (parentUri, uri) {
   /*
-   *  log('findByUri')
+   *  log('findByKey')
    */
   return function find (key) {
     /*
@@ -343,6 +343,60 @@ export function findByUri (parentUri, uri) {
   }
 }
 
+/**
+ *  @param {string} parentUri
+ *  @param {string} uri
+ *  @returns {(item: SchemaType, index: number) => boolean}
+ */
+export function findByIndex (parentUri, uri) {
+  /*
+   *  log('findByIndex')
+   */
+  return function find (item, index) {
+    /*
+     *  log('find')
+     */
+
+    /**
+     *  It's a schema not a value
+     */
+
+    if (hasEnum(item)) {
+      /**
+       *  Do the `parentUri` and `uri` match?
+       */
+
+      return (
+        getUri(parentUri, index) === uri
+      )
+    } else {
+      if (hasAnyOf(item)) {
+        const array = getAnyOf(item)
+
+        return (
+          array.filter(isObject).some(findByIndex(parentUri, uri))
+        )
+      } else {
+        if (hasOneOf(item)) {
+          const array = getOneOf(item)
+
+          return (
+            array.filter(isObject).some(findByIndex(parentUri, uri))
+          )
+        }
+      }
+    }
+
+    /**
+     *  It's any other kind of schema/sub-schema
+     */
+
+    return (
+      getUri(parentUri, index) === uri
+    )
+  }
+}
+
 /**
  *  @param {string | number | object | boolean | null} [value]
  *  @returns {(item?: string | number | object | boolean | null | string[] | number[] | object[] | boolean[] | null[]) => boolean}
@@ -395,14 +449,17 @@ export function toString (value) {
  *  @param {string} uri
  *  @returns {SchemaType | undefined}
  */
-function getArray ({ items /* array or object */ } = {}, parentUri = '', uri = '') {
+export function getArray ({ items /* array or object */ } = {}, parentUri = '', uri = '') {
+  /*
+   *  log('getArray')
+   */
+
   if (isArray(items)) {
-    const keys = Object.keys(items).map(Number)
-    const find = findByUri(parentUri, uri)
+    const find = findByIndex(parentUri, uri)
 
-    const key = keys.find(find)
-    if (typeof key === 'number') return items[key]
-    return undefined
+    return (
+      items.find(find)
+    )
   }
 
   if (isObject(items)) return items
@@ -422,11 +479,14 @@ export function getObject ({ properties /* object */ } = {}, parentUri = '', uri
    */
 
   if (isObject(properties)) {
-    const keys = Object.keys(properties).map(String)
-    const find = findByUri(parentUri, uri)
+    const find = findByKey(parentUri, uri)
+    const key = Object.keys(properties).find(find)
 
-    const key = keys.find(find)
-    if (typeof key === 'string') return properties[key]
+    if (key) {
+      return (
+        properties[key]
+      )
+    }
   }
 
   return undefined
@@ -456,6 +516,7 @@ export function getSchema (schema = {}, parentUri = '', uri = '') {
   /*
    *  log('getSchema')
    */
+
   const {
     type
   } = schema