shinkansen-pinion 1.3.2 → 1.3.3

package/eslint.config.mjs

@@ -130,11 +130,11 @@ export default [
       globals: {
         ...globals.browser
       }
-    },
+    }, // @ts-expect-error
     plugins: {
       ...reactPlugins,
       ...storybookPlugins
-    },
+    }, // @ts-expect-error
     rules: {
       ...reactRules
     },
@@ -160,11 +160,11 @@ export default [
         ...globals.browser,
         ...globals.jest
       }
-    },
+    }, // @ts-expect-error
     plugins: {
       ...reactPlugins,
       ...storybookPlugins
-    },
+    }, // @ts-expect-error
     rules: {
       ...reactRules
     },
@@ -215,7 +215,7 @@ export default [
   }),
   {
     files: [
-      'src/common/**/*.d.{mts,cts}'
+      'src/**/*.d.{mts,cts}'
     ],
     rules: {
       'no-redeclare': 'off',

package/index.d.mts

@@ -17,28 +17,38 @@ declare global {
     export type ArrayLiteralType = never[]
     export type ArrayType = unknown[]
 
+    export type MemberArrayType = string[] | number[] | object[] | boolean[] | null[] | never[]
+    export type MemberType = string | number | object | boolean | null
+    export type SelectedMemberArrayType = MemberType[]
+
     export interface EnumType {
       id: string
       name?: string
-      isRequired?: boolean
-      items?: string[] | number[] | boolean[] | null[]
-      selectedItems?: number[]
+      items?: MemberArrayType | ArrayLiteralType
+      selectedItems?: SelectedMemberArrayType | ArrayLiteralType
     }
 
     export interface AnyOfType {
       id: string
       name?: string
-      isRequired?: boolean
-      items?: string[]
-      selectedItems?: number[]
+      items?: MemberArrayType
+      selectedItems?: SelectedMemberArrayType
     }
 
     export interface OneOfType {
       id: string
       name?: string
-      isRequired?: boolean
-      items?: string[]
-      selectedItems?: number[]
+      items?: MemberArrayType
+      selectedItems?: SelectedMemberArrayType
+    }
+
+    export interface FieldType {
+      id: string
+      name?: string
+      items?: MemberArrayType
+      selectedItems?: SelectedMemberArrayType
+      value?: MemberType | MemberArrayType
+      defaultValue?: MemberType | MemberArrayType
     }
 
     export interface FieldError {
@@ -73,16 +83,6 @@ declare global {
 
     export type MetaFieldType = MetaType
 
-    export interface FieldType {
-      id: string
-      name?: string
-      isRequired?: boolean
-      items?: string[]
-      selectedItems?: number[]
-      value?: string | number | boolean | null | ObjectType | ArrayType
-      defaultValue?: string | number | boolean | null | ObjectType | ArrayType
-    }
-
     export interface ElementsType {
       title: string
       description?: string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shinkansen-pinion",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Shinkansen Pinion",
   "keywords": [
     "Shinkansen",
@@ -10,7 +10,7 @@
     "Karakuri",
     "React"
   ],
-  "main": "./src/index.cjs",
+  "main": "./src/index.mjs",
   "type": "module",
   "types": "./index.d.mts",
   "author": {
@@ -55,8 +55,8 @@
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
     "@modernpoacher/design-system": "1.1.30",
-    "@sequencemedia/eslint-config-standard": "^0.2.35",
-    "@sequencemedia/eslint-config-typescript": "^0.1.50",
+    "@sequencemedia/eslint-config-standard": "^0.2.36",
+    "@sequencemedia/eslint-config-typescript": "^0.1.51",
     "@storybook/addon-actions": "7.6.20",
     "@storybook/addon-essentials": "7.6.20",
     "@storybook/addon-links": "7.6.20",
@@ -119,7 +119,10 @@
   },
   "imports": {
     "#build/paths": "./build/paths.mjs",
-    "#pinion": "./src/index.mjs",
+    "#pinion": {
+      "require": "./src/index.cjs",
+      "import": "./src/index.mjs"
+    },
     "#pinion/common": "./src/common/index.mjs",
     "#pinion/common/*": "./src/common/*.mjs",
     "#pinion/components": {
@@ -133,8 +136,11 @@
     "#pinion/pinion": "./src/pinion/index.cjs",
     "#pinion/transformers": "./src/transformers/index.mjs",
     "#pinion/transformers/*": "./src/transformers/*/index.mjs",
+    "#pinion/transformers/check-answers": "./src/transformers/check-answers/index.mjs",
     "#pinion/transformers/check-answers/*": "./src/transformers/check-answers/*.mjs",
+    "#pinion/transformers/common": "./src/transformers/common/index.mjs",
     "#pinion/transformers/common/*": "./src/transformers/common/*.mjs",
+    "#pinion/transformers/error-message": "./src/transformers/error-message/index.mjs",
     "#pinion/transformers/error-message/*": "./src/transformers/error-message/*.mjs",
     "#stories/components/*": "./stories/components/*/index.stories.jsx",
     "#stories/definitions/*": "./stories/definitions/*.json",

package/src/transformers/check-answers/get-answer-title.d.mts

@@ -1 +1 @@
-export default function getAnswerTitle (answer: PinionTypes.AnswerType): string | null
+export default function getAnswerTitle (answer: PinionTypes.AnswerType): string | null | undefined

package/src/transformers/check-answers/get-answer-title.mjs

@@ -1,14 +1,14 @@
 import debug from 'debug'
 
-import transformAnswerTitle from './transform-answer-title.mjs'
+import transformAnswerTitle from '#pinion/transformers/check-answers/transform-answer-title'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 
 /**
- *  @param {PinionTypes.AnswerType} anser
- *  @returns {string | null}
+ *  @param {PinionTypes.AnswerType} answer
+ *  @returns {string | null | undefined}
  */
-export default function getAnswerTitle ({ elements = {} }) {
+export default function getAnswerTitle ({ elements }) {
   log('getAnswerTitle')
 
   return transformAnswerTitle(elements)

package/src/transformers/check-answers/get-answer-value-for-type-array.d.mts

@@ -1,3 +1,3 @@
-type GroupType = PinionTypes.ArrayType[] | PinionTypes.ArrayLiteralType[]
+type GroupType = PinionTypes.AnswerType[]
 
-export default function getAnswerValueForTypeArray (group: GroupType): Array<string | null>
+export default function getAnswerValueForTypeArray (group?: GroupType): Array<string | null | undefined>

package/src/transformers/check-answers/get-answer-value-for-type-array.mjs

@@ -1,14 +1,22 @@
+/**
+ *  @typedef {PinionTypes.AnswerType[]} GroupType
+ */
+
 import debug from 'debug'
 
-import transformAnswerValue from './transform-answer-value.mjs'
+import transformAnswerValue from '#pinion/transformers/check-answers/transform-answer-value'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 
+/**
+ *  @param {GroupType} group
+ *  @returns {Array<string | null | undefined>}
+ */
 export default function getAnswerValueForTypeArray (group = []) {
   log('getAnswerValueForTypeArray')
 
   return (
     group
-      .map(({ elements = {} }) => transformAnswerValue(elements))
+      .map(({ elements }) => transformAnswerValue(elements))
   )
 }

package/src/transformers/check-answers/get-answer-value-for-type-object.d.mts

@@ -1,3 +1,3 @@
-type GroupType = PinionTypes.ArrayType[] | PinionTypes.ArrayLiteralType[]
+type GroupType = PinionTypes.AnswerType[]
 
-export default function getAnswerValueForTypeObject (group: GroupType): Array<string | null>
+export default function getAnswerValueForTypeObject (group?: GroupType): Array<string | null | undefined>

package/src/transformers/check-answers/get-answer-value-for-type-object.mjs

@@ -1,14 +1,22 @@
+/**
+ *  @typedef {PinionTypes.AnswerType[]} GroupType
+ */
+
 import debug from 'debug'
 
-import transformAnswerValue from './transform-answer-value.mjs'
+import transformAnswerValue from '#pinion/transformers/check-answers/transform-answer-value'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 
+/**
+ *  @param {GroupType} group
+ *  @returns {Array<string | null | undefined>}
+ */
 export default function getAnswerValueForTypeObject (group = []) {
   log('getAnswerValueForTypeObject')
 
   return (
     group
-      .map(({ elements = {} }) => transformAnswerValue(elements))
+      .map(({ elements }) => transformAnswerValue(elements))
   )
 }

package/src/transformers/check-answers/get-answer-value.d.mts

@@ -1 +1 @@
-export default function getAnswerValue (answer: PinionTypes.AnswerType): string | null
+export default function getAnswerValue (answer: PinionTypes.AnswerType): string | null | undefined

package/src/transformers/check-answers/get-answer-value.mjs

@@ -1,14 +1,14 @@
 import debug from 'debug'
 
-import transformAnswerValue from './transform-answer-value.mjs'
+import transformAnswerValue from '#pinion/transformers/check-answers/transform-answer-value'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 
 /**
- *  @param {PinionTypes.AnswerType} anser
- *  @returns {string | null}
+ *  @param {PinionTypes.AnswerType} answer
+ *  @returns {string | null | undefined}
  */
-export default function getAnswerValue ({ elements = {} }) {
+export default function getAnswerValue ({ elements }) {
   log('getAnswerValue')
 
   return transformAnswerValue(elements)

package/src/transformers/check-answers/get-any-of-selected-item-value.d.mts

@@ -1,4 +1,4 @@
-type ItemsType = PinionTypes.MetaType['items']
-type SelectedItemsType = PinionTypes.MetaType['selectedItems']
+type MemberArrayType = PinionTypes.MemberArrayType
+type SelectedMemberArrayType = PinionTypes.SelectedMemberArrayType
 
-export default function getAnyOfSelectedItemValue (items: ItemsType, selectedItems: SelectedItemsType): string
+export default function getAnyOfSelectedItemValue (items?: MemberArrayType, selectedItems?: SelectedMemberArrayType): string

package/src/transformers/check-answers/get-any-of-selected-item-value.mjs

@@ -1,13 +1,24 @@
+// @ts-nocheck
+
 import debug from 'debug'
 
-import toAnswerValue from './to-answer-value.mjs'
+import toAnswerValue from '#pinion/transformers/check-answers/to-answer-value'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 
+/**
+ * @param {PinionTypes.MemberArrayType} [items]
+ * @param {PinionTypes.SelectedMemberArrayType} [selectedItems]
+ * @returns {string}
+ */
 export default function getAnyOfSelectedItemValue (items = [], [selectedItem] = []) {
   log('getAnyOfSelectedItemValue')
 
-  return (Reflect.has(items, selectedItem))
-    ? toAnswerValue(Reflect.get(items, selectedItem)) // || 'Not answered'
-    : '' // 'Not answered'
+  if (selectedItem in items) {
+    const item = items[selectedItem]
+
+    return toAnswerValue(item)
+  }
+
+  return '' // 'Not answered'
 }

package/src/transformers/check-answers/get-any-of-selected-items-value.d.mts

@@ -1,4 +1,4 @@
-type ItemsType = PinionTypes.MetaType['items']
-type SelectedItemsType = PinionTypes.MetaType['selectedItems']
+type MemberArrayType = PinionTypes.MemberArrayType
+type SelectedMemberArrayType = PinionTypes.SelectedMemberArrayType
 
-export default function getAnyOfSelectedItemsValue (items: ItemsType, selectedItems: SelectedItemsType): string
+export default function getAnyOfSelectedItemsValue (items?: MemberArrayType, selectedItems?: SelectedMemberArrayType): string

package/src/transformers/check-answers/get-any-of-selected-items-value.mjs

@@ -1,17 +1,28 @@
+// @ts-nocheck
+
 import debug from 'debug'
 
-import toAnswerValue from './to-answer-value.mjs'
+import toAnswerValue from '#pinion/transformers/check-answers/to-answer-value'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 
+/**
+ * @param {PinionTypes.MemberArrayType} [items]
+ * @param {PinionTypes.SelectedMemberArrayType} [selectedItems]
+ * @returns {string}
+ */
 export default function getAnyOfSelectedItemsValue (items = [], selectedItems = []) {
   log('getAnyOfSelectedItemsValue')
 
   return (
-    selectedItems.reduce((accumulator, selectedItem) => (
-      (Reflect.has(items, selectedItem))
-        ? accumulator.concat(toAnswerValue(Reflect.get(items, selectedItem)))
-        : accumulator
-    ), '') // || 'Not answered'
+    selectedItems.reduce((accumulator, selectedItem) => {
+      if (selectedItem in items) {
+        const item = items[selectedItem]
+
+        return accumulator + toAnswerValue(item)
+      }
+
+      return accumulator
+    }, '') // || 'Not answered'
   )
 }

package/src/transformers/check-answers/get-change-answer.mjs

@@ -1,7 +1,9 @@
+// @ts-nocheck
+
 import debug from 'debug'
 
 import getResourceUrl from '#pinion/transformers/common/get-resource-url'
-import getVisuallyHiddenText from './get-visually-hidden-text.mjs'
+import getVisuallyHiddenText from '#pinion/transformers/check-answers/get-visually-hidden-text'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 

package/src/transformers/check-answers/get-enum-selected-item-value.d.mts

@@ -1,4 +1,4 @@
-type ItemsType = PinionTypes.MetaType['items']
-type SelectedItemsType = PinionTypes.MetaType['selectedItems']
+type MemberArrayType = PinionTypes.MemberArrayType
+type SelectedMemberArrayType = PinionTypes.SelectedMemberArrayType
 
-export default function getEnumSelectedItemValue (items: ItemsType, selectedItems: SelectedItemsType): string
+export default function getEnumSelectedItemValue (item?: MemberArrayType, selectedItems?: SelectedMemberArrayType): string

package/src/transformers/check-answers/get-enum-selected-item-value.mjs

@@ -1,13 +1,22 @@
+// @ts-nocheck
+
 import debug from 'debug'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 
+/**
+ * @param {PinionTypes.MemberArrayType} [items]
+ * @param {PinionTypes.SelectedMemberArrayType} [selectedItems]
+ * @returns {string}
+ */
 export default function getEnumSelectedItemValue (items = [], [selectedItem] = []) {
   log('getEnumSelectedItemValue')
 
-  return (
-    Reflect.has(items, selectedItem)
-      ? String(Reflect.get(items, selectedItem))
-      : '' // 'Not answered'
-  )
+  if (selectedItem in items) {
+    const item = items[selectedItem]
+
+    return String(item)
+  }
+
+  return ''
 }

package/src/transformers/check-answers/get-enum-selected-items-value.d.mts

@@ -1,4 +1,4 @@
-type ItemsType = PinionTypes.MetaType['items']
-type SelectedItemsType = PinionTypes.MetaType['selectedItems']
+type MemberArrayType = PinionTypes.MemberArrayType
+type SelectedMemberArrayType = PinionTypes.SelectedMemberArrayType
 
-export default function getEnumSelectedItemsValue (items: ItemsType, selectedItems: SelectedItemsType): string
+export default function getEnumSelectedItemsValue (items?: MemberArrayType, selectedItems?: SelectedMemberArrayType): string

package/src/transformers/check-answers/get-enum-selected-items-value.mjs

@@ -1,15 +1,26 @@
+// @ts-nocheck
+
 import debug from 'debug'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 
+/**
+ * @param {PinionTypes.MemberArrayType} [items]
+ * @param {PinionTypes.SelectedMemberArrayType} [selectedItems]
+ * @returns {string}
+ */
 export default function getEnumSelectedItemsValue (items = [], selectedItems = []) {
   log('getEnumSelectedItemsValue')
 
   return (
-    selectedItems.reduce((accumulator, selectedItem) => (
-      (Reflect.has(items, selectedItem))
-        ? accumulator.concat(Reflect.get(items, selectedItem))
-        : accumulator
-    ), '') // || 'Not answered'
+    selectedItems.reduce((accumulator, selectedItem) => {
+      if (selectedItem in items) {
+        const item = items[selectedItem]
+
+        return accumulator + item
+      }
+
+      return accumulator
+    }, '') // || 'Not answered'
   )
 }

package/src/transformers/check-answers/get-one-of-selected-item-value.d.mts

@@ -1,4 +1,4 @@
-type ItemsType = PinionTypes.MetaType['items']
-type SelectedItemsType = PinionTypes.MetaType['selectedItems']
+type MemberArrayType = PinionTypes.MemberArrayType
+type SelectedMemberArrayType = PinionTypes.SelectedMemberArrayType
 
-export default function getOneOfSelectedItemValue (items: ItemsType, selectedItems: SelectedItemsType): string
+export default function getOneOfSelectedItemValue (items?: MemberArrayType, selectedItems?: SelectedMemberArrayType): string

package/src/transformers/check-answers/get-one-of-selected-item-value.mjs

@@ -1,13 +1,24 @@
+// @ts-nocheck
+
 import debug from 'debug'
 
-import toAnswerValue from './to-answer-value.mjs'
+import toAnswerValue from '#pinion/transformers/check-answers/to-answer-value'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 
+/**
+ * @param {PinionTypes.MemberArrayType} [items]
+ * @param {PinionTypes.SelectedMemberArrayType} [selectedItems]
+ * @returns {string}
+ */
 export default function getOneOfSelectedItemValue (items = [], [selectedItem] = []) {
   log('getOneOfSelectedItemValue')
 
-  return (Reflect.has(items, selectedItem))
-    ? toAnswerValue(Reflect.get(items, selectedItem)) // || 'Not answered'
-    : '' // 'Not answered'
+  if (selectedItem in items) {
+    const item = items[selectedItem]
+
+    return toAnswerValue(item)
+  }
+
+  return '' // 'Not answered'
 }

package/src/transformers/check-answers/get-one-of-selected-items-value.mjs

@@ -1,6 +1,8 @@
+// @ts-nocheck
+
 import debug from 'debug'
 
-import toAnswerValue from './to-answer-value.mjs'
+import toAnswerValue from '#pinion/transformers/check-answers/to-answer-value'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 
@@ -8,10 +10,14 @@ export default function getOneOfSelectedItemsValue (items = [], selectedItems =
   log('getOneOfSelectedItemsValue')
 
   return (
-    selectedItems.reduce((accumulator, selectedItem) => (
-      (Reflect.has(items, selectedItem))
-        ? accumulator.concat(toAnswerValue(Reflect.get(items, selectedItem)))
-        : accumulator
-    ), '') // || 'Not answered'
+    selectedItems.reduce((accumulator, selectedItem) => {
+      if (selectedItem in items) {
+        const item = items[selectedItem]
+
+        return accumulator + toAnswerValue(item)
+      }
+
+      return accumulator
+    }, '') // || 'Not answered'
   )
 }

package/src/transformers/check-answers/get-visually-hidden-text.d.mts

@@ -1 +1 @@
-export default function getVisuallyHiddenText (answer: PinionTypes.AnswerType): string
+export default function getVisuallyHiddenText (answer?: { elements?: PinionTypes.ElementsType }): string

package/src/transformers/check-answers/get-visually-hidden-text.mjs

@@ -5,11 +5,19 @@ import getTitle from '#pinion/transformers/common/get-title'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 
+/**
+ * @param {{ elements?: PinionTypes.ElementsType }} [answer]
+ * @returns {string}
+ */
 export default function getVisuallyHiddenText ({ elements } = {}) {
   log('getVisuallyHiddenText')
 
   if (hasTitle(elements)) {
-    return getTitle(elements).toLowerCase()
+    const title = getTitle(elements) ?? ''
+
+    return (
+      title.toLowerCase()
+    )
   }
 
   return ''

package/src/transformers/check-answers/index.mjs

@@ -3,13 +3,13 @@ import debug from 'debug'
 import hasElementsTitle from '#pinion/transformers/common/has-elements-title'
 import getGroup from '#pinion/transformers/common/get-group'
 
-import transformTypeStringAnswer from './transform-type-string-answer.mjs'
-import transformTypeNumberAnswer from './transform-type-number-answer.mjs'
-import transformTypeBooleanAnswer from './transform-type-boolean-answer.mjs'
-import transformTypeNullAnswer from './transform-type-null-answer.mjs'
+import transformTypeStringAnswer from '#pinion/transformers/check-answers/transform-type-string-answer'
+import transformTypeNumberAnswer from '#pinion/transformers/check-answers/transform-type-number-answer'
+import transformTypeBooleanAnswer from '#pinion/transformers/check-answers/transform-type-boolean-answer'
+import transformTypeNullAnswer from '#pinion/transformers/check-answers/transform-type-null-answer'
 
-import transformTypeObjectAnswers from './transform-type-object-answers.mjs'
-import transformTypeArrayAnswers from './transform-type-array-answers.mjs'
+import transformTypeObjectAnswers from '#pinion/transformers/check-answers/transform-type-object-answers'
+import transformTypeArrayAnswers from '#pinion/transformers/check-answers/transform-type-array-answers'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 

package/src/transformers/check-answers/to-answer-value.mjs

@@ -1,8 +1,11 @@
+// @ts-nocheck
+
 import debug from 'debug'
 
 import getValue from '#pinion/transformers/common/get-value'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
+const info = debug('shinkansen-pinion/transformers/check-answers:info')
 
 export default function toAnswerValue ({ elements } = {}) {
   log('toAnswerValue')
@@ -11,5 +14,6 @@ export default function toAnswerValue ({ elements } = {}) {
     title: value = getValue(elements)
   } = elements
 
+  info(elements, value)
   return value
 }

package/src/transformers/check-answers/transform-answer-title.d.mts

@@ -1,7 +1,6 @@
-type ElementsType = PinionTypes.ElementsType
 type ElementsEnumType = PinionTypes.ElementsEnumType
 type ElementsAnyOfType = PinionTypes.ElementsAnyOfType
 type ElementsOneOfType = PinionTypes.ElementsOneOfType
 type ElementsFieldType = PinionTypes.ElementsFieldType
 
-export default function transformAnswerTitle (elements: ElementsType | ElementsEnumType | ElementsAnyOfType | ElementsOneOfType): string | null
+export default function transformAnswerTitle (elements?: ElementsEnumType | ElementsAnyOfType | ElementsOneOfType | ElementsFieldType): string | null

package/src/transformers/check-answers/transform-answer-title.mjs

@@ -5,11 +5,19 @@ import getTitle from '#pinion/transformers/common/get-title'
 
 const log = debug('shinkansen-pinion/transformers/check-answers')
 
+/**
+ * @param {PinionTypes.ElementsType | PinionTypes.ElementsEnumType | PinionTypes.ElementsAnyOfType | PinionTypes.ElementsOneOfType} [elements]
+ * @returns {string | null | undefined}
+ */
 export default function transformAnswerTitle (elements) {
   log('transformAnswerTitle')
 
   if (hasTitle(elements)) {
-    return getTitle(elements) // : string | undefined
+    const title = getTitle(elements)
+
+    return (
+      title // string | undefined
+    )
   }
 
   return null

package/src/transformers/check-answers/transform-answer-value.d.mts

@@ -1,7 +1,6 @@
-type ElementsType = PinionTypes.ElementsType
 type ElementsEnumType = PinionTypes.ElementsEnumType
 type ElementsAnyOfType = PinionTypes.ElementsAnyOfType
 type ElementsOneOfType = PinionTypes.ElementsOneOfType
 type ElementsFieldType = PinionTypes.ElementsFieldType
 
-export default function transformAnswerValue (elements: ElementsType | ElementsEnumType | ElementsAnyOfType | ElementsOneOfType): string | null
+export default function transformAnswerValue (elements?: ElementsEnumType | ElementsAnyOfType | ElementsOneOfType | ElementsFieldType): string | null | undefined