refactor: structure

kazupon · kazupon · commit bcd283e3bb6d · 2020-05-01T00:29:57.000+09:00
diff --git a/src/components/DatetimeFormat.ts b/src/components/DatetimeFormat.ts
@@ -5,7 +5,7 @@ import {
   PropType
 } from 'vue'
 import { useI18n, getComposer } from '../i18n'
-import { DateTimeOptions } from '../runtime'
+import { DateTimeOptions } from '../core'
 import { renderFormatter, FormattableProps } from './formatRenderer'
 
 const DATETIME_FORMAT_KEYS = [
diff --git a/src/components/NumberFormat.ts b/src/components/NumberFormat.ts
@@ -1,6 +1,6 @@
 import { getCurrentInstance, defineComponent, SetupContext } from 'vue'
 import { useI18n, getComposer } from '../i18n'
-import { NumberOptions } from '../runtime'
+import { NumberOptions } from '../core'
 import { renderFormatter, FormattableProps } from './formatRenderer'
 
 const NUMBER_FORMAT_KEYS = [
diff --git a/src/components/Translation.ts b/src/components/Translation.ts
@@ -7,8 +7,8 @@ import {
   getCurrentInstance
 } from 'vue'
 import { useI18n, getComposer } from '../i18n'
-import { TranslateOptions, Locale } from '../runtime'
-import { NamedValue } from '../message/context'
+import { TranslateOptions, Locale } from '../core'
+import { NamedValue } from '../message/runtime'
 import { isNumber, isString } from '../utils'
 
 export type TranslationProps = {
diff --git a/src/components/formatRenderer.ts b/src/components/formatRenderer.ts
@@ -1,5 +1,5 @@
 import { h, RenderFunction, SetupContext, VNodeArrayChildren } from 'vue'
-import { Locale, NumberOptions, DateTimeOptions } from '../runtime'
+import { Locale, NumberOptions, DateTimeOptions } from '../core'
 import { isString, isPlainObject, isArray } from '../utils'
 
 export type FormattableProps<Value, Format> = {
diff --git a/src/composer.ts b/src/composer.ts
@@ -22,13 +22,13 @@ import {
   NumberFormats,
   DateTimeFormat,
   NumberFormat
-} from './runtime/types'
+} from './core/types'
 import {
   LinkedModifiers,
   PluralizationRules,
   NamedValue,
   MessageProcessor
-} from './message/context'
+} from './message/runtime'
 import {
   Locale,
   LocaleMessages,
@@ -40,25 +40,25 @@ import {
   MISSING_RESOLVE_VALUE,
   updateFallbackLocale,
   FallbackLocale
-} from './runtime/context'
+} from './core/context'
 import {
   translate,
   parseTranslateArgs,
   TranslateOptions
-} from './runtime/translate'
+} from './core/translate'
 import {
   datetime,
   parseDateTimeArgs,
   clearDateTimeFormat,
   DateTimeOptions
-} from './runtime/datetime'
+} from './core/datetime'
 import {
   number,
   parseNumberArgs,
   clearNumberFormat,
   NumberOptions
-} from './runtime/number'
-import { NOT_REOSLVED } from './runtime/context'
+} from './core/number'
+import { NOT_REOSLVED } from './core/context'
 import {
   warn,
   isArray,
diff --git a/src/core/context.ts b/src/core/context.ts
@@ -4,7 +4,7 @@ import {
   PluralizationRules,
   MessageProcessor,
   DEFAULT_MESSAGE_DATA_TYPE
-} from '../message/context'
+} from '../message/runtime'
 import { Path } from '../path'
 import {
   warn,
diff --git a/src/core/datetime.ts b/src/core/datetime.ts
diff --git a/src/core/index.ts b/src/core/index.ts
diff --git a/src/core/number.ts b/src/core/number.ts
diff --git a/src/core/translate.ts b/src/core/translate.ts
@@ -6,7 +6,7 @@ import {
   createMessageContext,
   NamedValue,
   MessageContextOptions
-} from '../message/context'
+} from '../message/runtime'
 import {
   Locale,
   RuntimeContext,
diff --git a/src/core/types.ts b/src/core/types.ts
diff --git a/src/index.ts b/src/index.ts
@@ -1,16 +1,16 @@
 export { Path, PathValue } from './path'
 export { createParser, Parser } from './message/parser'
 export { CompileOptions } from './message/options'
-export { PluralizationRule, LinkedModifiers } from './message/context'
+export { PluralizationRule, LinkedModifiers } from './message/runtime'
 export {
   Locale,
   FallbackLocale,
   LocaleMessageDictionary,
   LocaleMessage,
   LocaleMessages,
   PostTranslationHandler
-} from './runtime'
-export * from './runtime/types'
+} from './core'
+export * from './core/types'
 export { MissingHandler, ComposerOptions, Composer } from './composer'
 export {
   TranslateResult,
diff --git a/src/legacy.ts b/src/legacy.ts
@@ -13,22 +13,22 @@ import {
   PluralizationRules,
   LinkedModifiers,
   NamedValue
-} from './message/context'
+} from './message/runtime'
 import {
   Locale,
   LocaleMessages,
   LocaleMessage,
   LocaleMessageDictionary,
   PostTranslationHandler,
   FallbackLocale
-} from './runtime/context'
-import { TranslateOptions } from './runtime/translate'
+} from './core/context'
+import { TranslateOptions } from './core/translate'
 import {
   DateTimeFormats,
   NumberFormats,
   DateTimeFormat,
   NumberFormat
-} from './runtime/types'
+} from './core/types'
 import {
   MissingHandler,
   CustomBlocks,
diff --git a/src/message/generator.ts b/src/message/generator.ts
@@ -13,7 +13,7 @@ import {
   LiteralNode
 } from './parser'
 import { CodeGenOptions } from './options'
-import { HelperNameMap } from './context'
+import { HelperNameMap } from './runtime'
 import { isString } from '../utils'
 
 type CodeGenContext = {
diff --git a/src/message/runtime.ts b/src/message/runtime.ts
diff --git a/src/message/transformer.ts b/src/message/transformer.ts
@@ -7,7 +7,7 @@ import {
   LinkedNode
 } from './parser'
 import { TransformOptions } from './options'
-import { HelperNameMap } from './context'
+import { HelperNameMap } from './runtime'
 
 // TODO: if we offer custom transform for uses, should be defined TransformOptions type to here
 // ex.
diff --git a/src/mixin.ts b/src/mixin.ts
@@ -1,6 +1,6 @@
 import { ComponentOptions } from 'vue'
 import { Path } from './path'
-import { Locale } from './runtime/context'
+import { Locale } from './core/context'
 import { Composer } from './composer'
 import {
   VueI18n,
diff --git a/test/core/context.test.ts b/test/core/context.test.ts
@@ -1,7 +1,7 @@
 import {
   createRuntimeContext as context,
   getLocaleChain
-} from '../../src/runtime/context'
+} from '../../src/core/context'
 
 describe('locale', () => {
   test('default', () => {
diff --git a/test/core/datetime.test.ts b/test/core/datetime.test.ts
@@ -8,17 +8,17 @@ jest.mock('../../src/utils', () => ({
 import { warn } from '../../src/utils'
 
 // runtime/types
-jest.mock('../../src/runtime/types', () => ({
-  ...jest.requireActual('../../src/runtime/types'),
+jest.mock('../../src/core/types', () => ({
+  ...jest.requireActual('../../src/core/types'),
   Availabilities: jest.fn()
 }))
-import { Availabilities } from '../../src/runtime/types'
+import { Availabilities } from '../../src/core/types'
 
 import {
   createRuntimeContext as context,
   NOT_REOSLVED
-} from '../../src/runtime/context'
-import { datetime } from '../../src/runtime/datetime'
+} from '../../src/core/context'
+import { datetime } from '../../src/core/datetime'
 
 const datetimeFormats = {
   'en-US': {
diff --git a/test/core/number.test.ts b/test/core/number.test.ts
@@ -8,17 +8,17 @@ jest.mock('../../src/utils', () => ({
 import { warn } from '../../src/utils'
 
 // runtime/types
-jest.mock('../../src/runtime/types', () => ({
-  ...jest.requireActual('../../src/runtime/types'),
+jest.mock('../../src/core/types', () => ({
+  ...jest.requireActual('../../src/core/types'),
   Availabilities: jest.fn()
 }))
-import { Availabilities } from '../../src/runtime/types'
+import { Availabilities } from '../../src/core/types'
 
 import {
   createRuntimeContext as context,
   NOT_REOSLVED
-} from '../../src/runtime/context'
-import { number } from '../../src/runtime/number'
+} from '../../src/core/context'
+import { number } from '../../src/core/number'
 
 const numberFormats = {
   'en-US': {
diff --git a/test/core/translate.test.ts b/test/core/translate.test.ts
@@ -10,8 +10,8 @@ import { warn } from '../../src/utils'
 import {
   createRuntimeContext as context,
   NOT_REOSLVED
-} from '../../src/runtime/context'
-import { translate } from '../../src/runtime/translate'
+} from '../../src/core/context'
+import { translate } from '../../src/core/translate'
 
 describe('features', () => {
   test('simple text', () => {
diff --git a/test/message/__snapshots__/runtime.test.ts.snap b/test/message/__snapshots__/runtime.test.ts.snap
diff --git a/test/message/runtime.test.ts b/test/message/runtime.test.ts
@@ -1,5 +1,5 @@
 import { compile } from '../../src/message/compiler'
-import { createMessageContext } from '../../src/message/context'
+import { createMessageContext } from '../../src/message/runtime'
 import { isString } from '../../src/utils'
 
 describe('text', () => {
