Move media and mediaQuery into Css.Foreign

Author: Richard Feldman

src/Css/Foreign.elm

@@ -49,6 +49,8 @@ module Css.Foreign
         , li
         , line
         , main_
+        , media
+        , mediaQuery
         , menu
         , nav
         , ol
@@ -100,7 +102,7 @@ third-party DOM nodes!
 
 # Statements
 
-@docs class, id, selector, everything
+@docs class, id, selector, everything, media, mediaQuery
 
 
 # Combinators
@@ -150,7 +152,15 @@ third-party DOM nodes!
 -}
 
 import Css.Helpers exposing (identifierToString, toCssIdentifier)
-import Css.Preprocess as Preprocess exposing (Snippet(Snippet), SnippetDeclaration(StyleBlockDeclaration), Style, StyleBlock(StyleBlock))
+import Css.Media exposing (MediaQuery)
+import Css.Preprocess as Preprocess
+    exposing
+        ( Snippet(Snippet)
+        , SnippetDeclaration(StyleBlockDeclaration)
+        , Style
+        , StyleBlock(StyleBlock)
+        , unwrapSnippet
+        )
 import Css.Preprocess.Resolve as Resolve
 import Css.Structure as Structure
 import Html.Styled
@@ -255,6 +265,94 @@ everything styles =
         |> makeSnippet styles
 
 
+{-| Combines media queries into a `@media` rule.
+
+    (stylesheet << namespace "homepage")
+        [  media [ only screen [ Media.minWidth (px 300) ] ]
+               [ footer [ Css.maxWidth (px 300) ] ]
+        ]
+
+The above code translates into the following CSS.
+
+```css
+@media screen and (min-width: 300px) {
+    footer {
+        max-width: 300px;
+    }
+}
+```
+
+-}
+media :
+    List MediaQuery
+    -> List Snippet
+    -> Snippet
+media queries snippets =
+    let
+        snippetDeclarations : List Preprocess.SnippetDeclaration
+        snippetDeclarations =
+            List.concatMap unwrapSnippet snippets
+
+        extractStyleBlocks : List Preprocess.SnippetDeclaration -> List Preprocess.StyleBlock
+        extractStyleBlocks declarations =
+            case declarations of
+                [] ->
+                    []
+
+                (Preprocess.StyleBlockDeclaration styleBlock) :: rest ->
+                    styleBlock :: extractStyleBlocks rest
+
+                first :: rest ->
+                    extractStyleBlocks rest
+
+        mediaRuleFromStyleBlocks : Preprocess.SnippetDeclaration
+        mediaRuleFromStyleBlocks =
+            Preprocess.MediaRule queries
+                (extractStyleBlocks snippetDeclarations)
+
+        nestedMediaRules : List Preprocess.SnippetDeclaration -> List Preprocess.SnippetDeclaration
+        nestedMediaRules declarations =
+            case declarations of
+                [] ->
+                    []
+
+                (Preprocess.StyleBlockDeclaration _) :: rest ->
+                    -- These will already have been handled previously, with appropriate
+                    -- bundling, so don't create duplicates here.
+                    nestedMediaRules rest
+
+                (Preprocess.MediaRule nestedMediaQueries styleBlocks) :: rest ->
+                    -- nest the media queries
+                    Preprocess.MediaRule (List.append queries nestedMediaQueries) styleBlocks
+                        :: nestedMediaRules rest
+
+                first :: rest ->
+                    first :: nestedMediaRules rest
+    in
+    Preprocess.Snippet (mediaRuleFromStyleBlocks :: nestedMediaRules snippetDeclarations)
+
+
+{-| Manually specify a `@media` rule using a List of strings.
+
+    mediaQuery [ "screen and (min-width: 320px)", "screen and (max-height: 400px)" ]
+        [ body [ fontSize (px 14)] ]
+
+The above code translates into the following CSS.
+
+```css
+@media screen and (min-width: 320px), screen and (max-height: 400px) {
+    body {
+        font-size: 14px;
+    }
+}
+```
+
+-}
+mediaQuery : List String -> List Snippet -> Snippet
+mediaQuery stringQueries snippets =
+    media (List.map Structure.CustomQuery stringQueries) snippets
+
+
 {-| -}
 children : List Snippet -> Style
 children =

src/Css/Media.elm

@@ -51,8 +51,6 @@ module Css.Media
         , maxMonochrome
         , maxResolution
         , maxWidth
-        , media
-        , mediaQuery
         , minAspectRatio
         , minColor
         , minColorIndex
@@ -100,7 +98,7 @@ module Css.Media
 
 # `@media` rule constructors
 
-@docs media, withMedia, mediaQuery, withMediaQuery
+@docs withMedia, withMediaQuery
 
 
 # Query constructors
@@ -147,8 +145,8 @@ module Css.Media
 
 -}
 
-import Css
-import Css.Preprocess as Preprocess exposing (Style, unwrapSnippet)
+import Css exposing (Style)
+import Css.Preprocess as Preprocess exposing (unwrapSnippet)
 import Css.Structure as Structure exposing (..)
 
 
@@ -209,94 +207,6 @@ type alias Value compatible =
 {--Rule constructors--}
 
 
-{-| Combines media queries into a `@media` rule.
-
-    (stylesheet << namespace "homepage")
-        [  media [ only screen [ Media.minWidth (px 300) ] ]
-               [ footer [ Css.maxWidth (px 300) ] ]
-        ]
-
-The above code translates into the following CSS.
-
-```css
-@media screen and (min-width: 300px) {
-    footer {
-        max-width: 300px;
-    }
-}
-```
-
--}
-media :
-    List MediaQuery
-    -> List Css.Snippet
-    -> Css.Snippet
-media queries snippets =
-    let
-        snippetDeclarations : List Preprocess.SnippetDeclaration
-        snippetDeclarations =
-            List.concatMap unwrapSnippet snippets
-
-        extractStyleBlocks : List Preprocess.SnippetDeclaration -> List Preprocess.StyleBlock
-        extractStyleBlocks declarations =
-            case declarations of
-                [] ->
-                    []
-
-                (Preprocess.StyleBlockDeclaration styleBlock) :: rest ->
-                    styleBlock :: extractStyleBlocks rest
-
-                first :: rest ->
-                    extractStyleBlocks rest
-
-        mediaRuleFromStyleBlocks : Preprocess.SnippetDeclaration
-        mediaRuleFromStyleBlocks =
-            Preprocess.MediaRule queries
-                (extractStyleBlocks snippetDeclarations)
-
-        nestedMediaRules : List Preprocess.SnippetDeclaration -> List Preprocess.SnippetDeclaration
-        nestedMediaRules declarations =
-            case declarations of
-                [] ->
-                    []
-
-                (Preprocess.StyleBlockDeclaration _) :: rest ->
-                    -- These will already have been handled previously, with appropriate
-                    -- bundling, so don't create duplicates here.
-                    nestedMediaRules rest
-
-                (Preprocess.MediaRule nestedMediaQueries styleBlocks) :: rest ->
-                    -- nest the media queries
-                    Preprocess.MediaRule (List.append queries nestedMediaQueries) styleBlocks
-                        :: nestedMediaRules rest
-
-                first :: rest ->
-                    first :: nestedMediaRules rest
-    in
-    Preprocess.Snippet (mediaRuleFromStyleBlocks :: nestedMediaRules snippetDeclarations)
-
-
-{-| Manually specify a `@media` rule using a List of strings.
-
-    mediaQuery [ "screen and (min-width: 320px)", "screen and (max-height: 400px)" ]
-        [ body [ fontSize (px 14)] ]
-
-The above code translates into the following CSS.
-
-```css
-@media screen and (min-width: 320px), screen and (max-height: 400px) {
-    body {
-        font-size: 14px;
-    }
-}
-```
-
--}
-mediaQuery : List String -> List Css.Snippet -> Css.Snippet
-mediaQuery stringQueries snippets =
-    media (List.map Structure.CustomQuery stringQueries) snippets
-
-
 {-| Combines media queries that are nested under selectors into a `@media` rule.
 
     (stylesheet << namespace "homepage")
@@ -316,7 +226,7 @@ The above code translates into the following CSS.
 ```
 
 -}
-withMedia : List MediaQuery -> List Css.Style -> Css.Style
+withMedia : List MediaQuery -> List Style -> Style
 withMedia queries =
     Preprocess.WithMedia queries
 
@@ -340,7 +250,7 @@ The above code translates into the following CSS.
 ```
 
 -}
-withMediaQuery : List String -> List Css.Style -> Css.Style
+withMediaQuery : List String -> List Style -> Style
 withMediaQuery queries =
     queries
         |> List.map Structure.CustomQuery