reorganize @emotion/utils types

.changeset/six-hotels-double.md

@@ -0,0 +1,10 @@
+---
+'@emotion/cache': minor
+'@emotion/css': minor
+'@emotion/react': minor
+'@emotion/serialize': minor
+'@emotion/server': minor
+'@emotion/utils': minor
+---
+
+Reorganize @emotion/utils types

packages/cache/src/index.js

@@ -1,6 +1,7 @@
 // @flow
 import { StyleSheet } from '@emotion/sheet'
-import { type EmotionCache, type SerializedStyles } from '@emotion/utils'
+import { type SerializedStyles } from '@emotion/serialize'
+import { type EmotionCache } from '@emotion/cache'
 import {
  serialize,
  compile,

packages/cache/types/index.d.ts

@@ -1,8 +1,27 @@
 // Definitions by: Junyoung Clare Jang <https://github.com/Ailrun>
 // TypeScript Version: 2.2
-import { EmotionCache } from '@emotion/utils'
+import { SerializedStyles } from '@emotion/serialize'
 
-export { EmotionCache }
+export interface RegisteredCache {
+ [key: string]: string
+}
+
+export interface EmotionCache {
+ inserted: {
+ [key: string]: string | true
+ }
+ registered: RegisteredCache
+ sheet: StyleSheet & { constructor: StyleSheet }
+ key: string
+ compat?: true
+ nonce?: string
+ insert(
+ selector: string,
+ serialized: SerializedStyles,
+ sheet: StyleSheet,
+ shouldCache: boolean
+ ): string | void
+}
 
 export interface StylisElement {
  type: string

packages/css/src/create-instance.js

@@ -1,12 +1,7 @@
 // @flow
-import createCache from '@emotion/cache'
-import { serializeStyles } from '@emotion/serialize'
-import {
- insertStyles,
- getRegisteredStyles,
- type EmotionCache,
- type SerializedStyles
-} from '@emotion/utils'
+import createCache, { type EmotionCache } from '@emotion/cache'
+import { serializeStyles, type SerializedStyles } from '@emotion/serialize'
+import { insertStyles, getRegisteredStyles } from '@emotion/utils'
 
 function insertWithoutScoping(cache, serialized: SerializedStyles) {
  if (cache.inserted[serialized.name] === undefined) {

packages/react/src/context.js

@@ -1,8 +1,7 @@
 // @flow
-import { type EmotionCache } from '@emotion/utils'
 import * as React from 'react'
 import { useContext, forwardRef } from 'react'
-import createCache from '@emotion/cache'
+import createCache, { type EmotionCache } from '@emotion/cache'
 import { isBrowser } from './utils'
 
 let EmotionCacheContext: React.Context<EmotionCache | null> =

packages/react/src/css.js

@@ -1,9 +1,12 @@
 // @flow
 
-import type { Interpolation, SerializedStyles } from '@emotion/utils'
-import { serializeStyles } from '@emotion/serialize'
+import {
+ serializeStyles,
+ type SerializedStyles,
+ type ArrayInterpolation
+} from '@emotion/serialize'
 
-function css(...args: Array<Interpolation>): SerializedStyles {
+function css(...args: ArrayInterpolation): SerializedStyles {
  return serializeStyles(args)
 }
 

packages/react/src/index.js

@@ -1,6 +1,6 @@
 // @flow
 import pkg from '../package.json'
-export type { SerializedStyles } from '@emotion/utils'
+export type { SerializedStyles } from '@emotion/serialize'
 export {
  withEmotionCache,
  CacheProvider,

packages/serialize/src/index.js

@@ -1,9 +1,6 @@
 // @flow
-import type {
- Interpolation,
- SerializedStyles,
- RegisteredCache
-} from '@emotion/utils'
+import type { SerializedStyles, Interpolation } from '@emotion/serialize'
+import type { RegisteredCache } from '@emotion/cache'
 import hashString from '@emotion/hash'
 import unitless from '@emotion/unitless'
 import memoize from '@emotion/memoize'

packages/serialize/types/index.d.ts

@@ -1,10 +1,14 @@
 // Definitions by: Junyoung Clare Jang <https://github.com/Ailrun>
 // TypeScript Version: 2.8
-
-import { RegisteredCache, SerializedStyles } from '@emotion/utils'
+import type { RegisteredCache } from '@emotion/cache'
 import * as CSS from 'csstype'
 
-export { RegisteredCache, SerializedStyles }
+export interface SerializedStyles {
+ name: string
+ styles: string
+ map?: string
+ next?: SerializedStyles
+}
 
 export type CSSProperties = CSS.PropertiesFallback<number | string>
 export type CSSPropertiesWithMultiValues = {

packages/server/src/create-instance/construct-style-tags-from-chunks.js

@@ -1,5 +1,5 @@
 // @flow
-import type { EmotionCache } from '@emotion/utils'
+import type { EmotionCache } from '@emotion/cache'
 import { generateStyleTag } from './utils'
 
 const createConstructStyleTagsFromChunks =

packages/server/src/create-instance/extract-critical-to-chunks.js

@@ -1,5 +1,5 @@
 // @flow
-import type { EmotionCache } from '@emotion/utils'
+import type { EmotionCache } from '@emotion/cache'
 
 const createExtractCriticalToChunks =
  (cache: EmotionCache) => (html: string) => {

packages/server/src/create-instance/extract-critical.js

@@ -1,5 +1,5 @@
 // @flow
-import type { EmotionCache } from '@emotion/utils'
+import type { EmotionCache } from '@emotion/cache'
 
 const createExtractCritical = (cache: EmotionCache) => (html: string) => {
  // parse out ids from html

packages/server/src/create-instance/index.js

@@ -1,5 +1,5 @@
 // @flow
-import type { EmotionCache } from '@emotion/utils'
+import type { EmotionCache } from '@emotion/cache'
 import createExtractCritical from './extract-critical'
 import createExtractCriticalToChunks from './extract-critical-to-chunks'
 import createRenderStylesToString from './inline'

packages/server/src/create-instance/inline.js

@@ -1,5 +1,5 @@
 // @flow
-import type { EmotionCache } from '@emotion/utils'
+import type { EmotionCache } from '@emotion/cache'
 import { generateStyleTag } from './utils'
 
 const createRenderStylesToString =

packages/server/src/create-instance/stream.js

@@ -1,5 +1,5 @@
 // @flow
-import type { EmotionCache } from '@emotion/utils'
+import type { EmotionCache } from '@emotion/cache'
 import through from 'through'
 import tokenize from 'html-tokenize'
 import pipe from 'multipipe'

packages/server/types/create-instance.d.ts

@@ -2,7 +2,7 @@
 // TypeScript Version: 2.8
 
 /// <reference types="node" />
-import { EmotionCache } from '@emotion/utils'
+import { EmotionCache } from '@emotion/cache'
 
 export interface EmotionCritical {
  html: string

packages/server/types/tests-create-instance.ts

@@ -1,5 +1,5 @@
 import createEmotionServer from '@emotion/server/create-instance'
-import { EmotionCache } from '@emotion/utils'
+import { EmotionCache } from '@emotion/cache'
 
 declare const cache: EmotionCache
 

packages/utils/src/index.js

@@ -1,5 +1,6 @@
 // @flow
-import type { RegisteredCache, EmotionCache, SerializedStyles } from './types'
+import type { RegisteredCache, EmotionCache } from '@emotion/cache'
+import type { SerializedStyles } from '@emotion/serialize'
 
 const isBrowser = typeof document !== 'undefined'
 
@@ -73,5 +74,3 @@ export const insertStyles = (
  }
  }
 }
-
-export * from './types'

packages/utils/types/index.d.ts

@@ -1,42 +1,7 @@
 // Definitions by: Junyoung Clare Jang <https://github.com/Ailrun>
 // TypeScript Version: 2.2
-
-export interface RegisteredCache {
- [key: string]: string
-}
-
-export interface StyleSheet {
- container: HTMLElement
- nonce?: string
- key: string
- insert(rule: string): void
- flush(): void
- tags: Array<HTMLStyleElement>
-}
-
-export interface EmotionCache {
- inserted: {
- [key: string]: string | true
- }
- registered: RegisteredCache
- sheet: StyleSheet
- key: string
- compat?: true
- nonce?: string
- insert(
- selector: string,
- serialized: SerializedStyles,
- sheet: StyleSheet,
- shouldCache: boolean
- ): string | void
-}
-
-export interface SerializedStyles {
- name: string
- styles: string
- map?: string
- next?: SerializedStyles
-}
+import type { SerializedStyles } from '@emotion/serialize'
+import type { RegisteredCache, EmotionCache } from '@emotion/cache'
 
 export const isBrowser: boolean
 

packages/utils/types/tests.ts

@@ -1,12 +1,5 @@
-import {
- EmotionCache,
- RegisteredCache,
- SerializedStyles,
- StyleSheet,
- getRegisteredStyles,
- insertStyles,
- isBrowser
-} from '@emotion/utils'
+import type { EmotionCache, RegisteredCache } from '@emotion/cache'
+import { getRegisteredStyles, insertStyles, isBrowser } from '@emotion/utils'
 
 declare const testCache: EmotionCache
 declare const testRegisteredCache: RegisteredCache