refactor(common): move maybe out of common/utils

exuanbo · Dec 5, 2023 · b775b9a · b775b9a
1 parent f177357
commit b775b9a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/__tests__/common/utils/maybe.test.ts → __tests__/common/maybe.test.ts b/__tests__/common/utils/maybe.test.ts → __tests__/common/maybe.test.ts
@@ -1,4 +1,4 @@
-import { just, maybeNullable, nothing } from '@/common/utils'
+import { just, maybeNullable, nothing } from '@/common/maybe'
 
 describe('Maybe', () => {
   describe('maybeNullable', () => {

diff --git a/src/common/utils/maybe.ts → src/common/maybe.ts b/src/common/utils/maybe.ts → src/common/maybe.ts
@@ -1,11 +1,11 @@
-import type { Nullable } from './types'
+import type { Nullable } from './utils/types'
 
 export interface Maybe<T extends {}> {
   isJust: () => boolean
   isNothing: () => boolean
   map: <U extends {}>(f: (value: T) => U) => Maybe<U>
   chain: <U extends {}>(f: (value: T) => Maybe<U>) => Maybe<U>
-  orDefault: (defaultValue: T) => T
+  orDefault: <U>(defaultValue: U) => T | U
   extract: () => T | undefined
   extractNullable: () => T | null
   ifJust: (f: (value: T) => void) => this

diff --git a/src/common/utils/index.ts b/src/common/utils/index.ts
@@ -1,5 +1,4 @@
-export { classNames } from './classNames'
+export * from './classNames'
 export * from './common'
-export * from './maybe'
 export * from './merge'
 export * from './types'
diff --git a/src/features/editor/codemirror/highlightLine.ts b/src/features/editor/codemirror/highlightLine.ts
@@ -2,7 +2,7 @@ import { type Extension, StateEffect, StateField } from '@codemirror/state'
 import { Decoration, type DecorationSet, EditorView } from '@codemirror/view'
 import { filterEffects, mapEffectValue, reduceRangeSet } from '@codemirror-toolkit/utils'
 
-import { maybeNullable } from '@/common/utils'
+import { maybeNullable } from '@/common/maybe'
 
 import { ClassName } from './classNames'
 import type { RangeSetUpdateFilter } from './rangeSet'

diff --git a/src/features/editor/codemirror/wavyUnderline.ts b/src/features/editor/codemirror/wavyUnderline.ts
@@ -2,7 +2,7 @@ import { type Extension, StateEffect, StateField } from '@codemirror/state'
 import { Decoration, type DecorationSet, EditorView } from '@codemirror/view'
 import { filterEffects, mapEffectValue } from '@codemirror-toolkit/utils'
 
-import { maybeNullable } from '@/common/utils'
+import { maybeNullable } from '@/common/maybe'
 
 import { ClassName } from './classNames'
 import type { RangeSetUpdateFilter } from './rangeSet'