@globalbrain/sefirot 3.40.1 → 3.41.0

package/README.md

@@ -27,10 +27,16 @@ Sefirot follows the official [Vue Style Guide](https://v3.vuejs.org/style-guide/
 ### Development
 
 ```bash
-$ pnpm run serve
+$ pnpm run story
 ```
 
-Serve documentation website at http://localhost:3000.
+Serve Histoire at http://localhost:4010.
+
+```bash
+$ pnpm run docs
+```
+
+Serve documentation website at http://localhost:4011.
 
 ```bash
 $ pnpm run lint

package/lib/components/STableCellDay.vue

@@ -4,7 +4,7 @@ import { type Day } from '../support/Day'
 
 const props = defineProps<{
   value?: Day | null
-  record: any
+  record?: any
   align?: 'left' | 'center' | 'right'
   getter?: Day | null
   format?: string

package/lib/components/STableCellNumber.vue

@@ -7,7 +7,7 @@ import SLink from './SLink.vue'
 
 const props = defineProps<{
   value?: any
-  record: any
+  record?: any
   align?: 'left' | 'center' | 'right'
   icon?: any
   getter?: number | null

package/lib/components/STableCellPill.vue

@@ -4,7 +4,7 @@ import SPill, { type Mode } from './SPill.vue'
 
 const props = defineProps<{
   value?: any
-  record: any
+  record?: any
   getter?: string | ((value: any, record: any) => string)
   color?: Mode | ((value: any, record: any) => Mode)
 }>()

package/lib/components/STableCellPills.vue

@@ -4,12 +4,16 @@ import { type TableCellPillItem } from '../composables/Table'
 import STableCellPill from './STableCellPill.vue'
 
 const props = defineProps<{
-  value: string[]
-  record: any
-  pills(value: string[], record: any): TableCellPillItem[]
+  value?: any
+  record?: any
+  pills: TableCellPillItem[] | ((value: any, record: any) => TableCellPillItem[])
 }>()
 
-const items = computed(() => props.pills(props.value, props.record))
+const items = computed(() => {
+  return Array.isArray(props.pills)
+    ? props.pills
+    : props.pills(props.value, props.record)
+})
 </script>
 
 <template>

package/lib/composables/Error.ts

@@ -173,11 +173,11 @@ export function useErrorHandler({
   }
 
   return function errorHandler(
-    error: any,
+    e: any,
     instance: ComponentPublicInstance | null = null,
     info: string = ''
   ) {
-    error.set(error)
+    error.set(e)
 
     if (enabled) {
       pauseTracking()
@@ -187,7 +187,7 @@ export function useErrorHandler({
         userValue = null
       }
 
-      if (![403, 404].includes(error?.cause?.statusCode)) {
+      if (![403, 404].includes(e?.cause?.statusCode)) {
         const $ = instance && instance.$
         const metadata = $ && {
           componentName: formatComponentName($),
@@ -200,7 +200,7 @@ export function useErrorHandler({
           Sentry.withScope((scope) => {
             scope.setUser(userValue)
             scope.setContext('vue', metadata)
-            Sentry.captureException(error)
+            Sentry.captureException(e)
           })
         })
       }

package/lib/composables/Table.ts

@@ -140,7 +140,7 @@ export type TableCellPillColor = ColorModes
 
 export interface TableCellPills<V = any, R = any> extends TableCellBase {
   type: 'pills'
-  pills(value: V, record: R): TableCellPillItem[]
+  pills: TableCellPillItem[] | ((value: V, record: R) => TableCellPillItem[])
 }
 
 export interface TableCellPillItem {

package/lib/composables/Url.ts

@@ -131,7 +131,11 @@ function deepAssign(target: Record<string, any>, source: Record<string, any>) {
     const value = source[key]
 
     if (Array.isArray(value)) {
-      target[key].splice(0, target[key].length, ...value)
+      if (Array.isArray(target[key])) {
+        target[key].splice(0, target[key].length, ...value)
+      } else {
+        target[key] = value
+      }
     } else if (value && typeof value === 'object') {
       target[key] = deepAssign(target[key] || {}, value)
     } else {

package/lib/validation/rules/index.ts

@@ -16,8 +16,10 @@ export { negativeInteger } from './negativeInteger'
 export { positiveInteger } from './positiveInteger'
 export { required } from './required'
 export { requiredHms } from './requiredHms'
+export { requiredHmsIf } from './requiredHmsIf'
 export { requiredIf } from './requiredIf'
 export { requiredYmd } from './requiredYmd'
+export { requiredYmdIf } from './requiredYmdIf'
 export { rule } from './rule'
 export { slackChannelName } from './slackChannelName'
 export { url } from './url'

package/lib/validation/rules/requiredHms.ts

@@ -1,8 +1,7 @@
+import { type HmsType } from '../../support/Day'
 import { createRule } from '../Rule'
 import { requiredHms as baseRequiredHms } from '../validators/requiredHms'
 
-type HmsType = 'h' | 'm' | 's'
-
 export const message = {
   en: 'The field is required.',
   ja: 'この項目は必須です。'

package/lib/validation/rules/requiredHmsIf.ts

@@ -0,0 +1,16 @@
+import { type HmsType } from '../../support/Day'
+import { createRule } from '../Rule'
+import { type RequiredIfCondition, requiredHmsIf as baseRequiredHmsIf } from '../validators'
+
+export const message = {
+  en: 'The field is required.',
+  ja: 'この項目は必須です。'
+}
+
+export function requiredHmsIf(condition: RequiredIfCondition, required?: HmsType[], msg?: string) {
+  return createRule({
+    async: true,
+    message: ({ lang }) => msg ?? message[lang],
+    validation: (value) => baseRequiredHmsIf(value, condition, required)
+  })
+}

package/lib/validation/rules/requiredYmd.ts

@@ -1,8 +1,7 @@
+import { type YmdType } from '../../support/Day'
 import { createRule } from '../Rule'
 import { requiredYmd as baseRequiredYmd } from '../validators/requiredYmd'
 
-type YmdType = 'y' | 'm' | 'd'
-
 export const message = {
   en: 'The field is required.',
   ja: 'この項目は必須です。'

package/lib/validation/rules/requiredYmdIf.ts

@@ -0,0 +1,16 @@
+import { type YmdType } from '../../support/Day'
+import { createRule } from '../Rule'
+import { type RequiredIfCondition, requiredYmdIf as baseRequiredYmdIf } from '../validators'
+
+export const message = {
+  en: 'The field is required.',
+  ja: 'この項目は必須です。'
+}
+
+export function requiredYmdIf(condition: RequiredIfCondition, required?: YmdType[], msg?: string) {
+  return createRule({
+    async: true,
+    message: ({ lang }) => msg ?? message[lang],
+    validation: (value) => baseRequiredYmdIf(value, condition, required)
+  })
+}

package/lib/validation/validators/index.ts

@@ -15,8 +15,10 @@ export * from './negativeInteger'
 export * from './positiveInteger'
 export * from './required'
 export * from './requiredHms'
+export * from './requiredHmsIf'
 export * from './requiredIf'
 export * from './requiredYmd'
+export * from './requiredYmdIf'
 export * from './slackChannelName'
 export * from './url'
 export * from './ymd'

package/lib/validation/validators/requiredHmsIf.ts

@@ -0,0 +1,19 @@
+import { type HmsType } from '../../support/Day'
+import { requiredHms } from './requiredHms'
+import { type RequiredIfCondition } from './requiredIf'
+
+export async function requiredHmsIf(value: unknown, condition: RequiredIfCondition, required: HmsType[] = ['h', 'm', 's']): Promise<boolean> {
+  if (typeof condition === 'boolean' && condition) {
+    return requiredHms(value, required)
+  }
+
+  if (typeof condition === 'string' && condition) {
+    return requiredHms(value, required)
+  }
+
+  if (typeof condition === 'function' && (await condition())) {
+    return requiredHms(value, required)
+  }
+
+  return true
+}

package/lib/validation/validators/requiredYmdIf.ts

@@ -0,0 +1,19 @@
+import { type YmdType } from '../../support/Day'
+import { type RequiredIfCondition } from './requiredIf'
+import { requiredYmd } from './requiredYmd'
+
+export async function requiredYmdIf(value: unknown, condition: RequiredIfCondition, required: YmdType[] = ['y', 'm', 'd']): Promise<boolean> {
+  if (typeof condition === 'boolean' && condition) {
+    return requiredYmd(value, required)
+  }
+
+  if (typeof condition === 'string' && condition) {
+    return requiredYmd(value, required)
+  }
+
+  if (typeof condition === 'function' && (await condition())) {
+    return requiredYmd(value, required)
+  }
+
+  return true
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globalbrain/sefirot",
-  "version": "3.40.1",
+  "version": "3.41.0",
   "packageManager": "pnpm@8.15.5",
   "description": "Vue Components for Global Brain Design System.",
   "author": "Kia Ishii <ka.ishii@globalbrains.com>",
@@ -22,12 +22,13 @@
   ],
   "scripts": {
     "docs": "pnpm docs:dev",
-    "docs:dev": "vitepress dev docs --port 4000",
+    "docs:dev": "vitepress dev docs --port 4011",
     "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress serve docs --port 3000",
-    "story": "histoire dev --port 3000",
+    "docs:preview": "vitepress serve docs --port 4011",
+    "story": "pnpm story:dev",
+    "story:dev": "histoire dev --port 4010",
     "story:build": "histoire build",
-    "story:preview": "histoire preview --port 3000",
+    "story:preview": "histoire preview --port 4010",
     "type": "vue-tsc --noEmit",
     "lint": "eslint --fix .",
     "lint:fail": "eslint .",
@@ -75,7 +76,7 @@
   },
   "devDependencies": {
     "@globalbrain/eslint-config": "^1.6.0",
-    "@histoire/plugin-vue": "^0.17.14",
+    "@histoire/plugin-vue": "0.16.5",
     "@iconify-icons/ph": "^1.2.5",
     "@iconify-icons/ri": "^1.2.10",
     "@iconify/vue": "^4.1.1",
@@ -95,7 +96,7 @@
     "eslint": "^8.57.0",
     "fuse.js": "^7.0.0",
     "happy-dom": "^14.3.9",
-    "histoire": "^0.17.14",
+    "histoire": "0.16.5",
     "lodash-es": "^4.17.21",
     "markdown-it": "^14.1.0",
     "normalize.css": "^8.0.1",