Fix purescript#1794, preserve external require expressions when minifying

paf31 · paf31 · commit 70ddf2be5596 · 2016-01-16T15:40:03.000-08:00
diff --git a/src/Language/PureScript/Bundle.hs b/src/Language/PureScript/Bundle.hs
@@ -95,7 +95,7 @@ data ExportType
 -- Each is labelled with the original AST node which generated it, so that we can dump it back
 -- into the output during codegen.
 data ModuleElement
-  = Require JSNode String ModuleIdentifier
+  = Require JSNode String (Either String ModuleIdentifier)
   | Member JSNode Bool String [JSNode] [Key]
   | ExportsList [(ExportType, String, JSNode, [Key])]
   | Other JSNode
@@ -137,13 +137,13 @@ node (NN n) = n
 node (NT n _ _) = n
 
 -- | Calculate the ModuleIdentifier which a require(...) statement imports.
-checkImportPath :: Maybe FilePath -> String -> ModuleIdentifier -> S.Set String -> Maybe ModuleIdentifier
+checkImportPath :: Maybe FilePath -> String -> ModuleIdentifier -> S.Set String -> Either String ModuleIdentifier
 checkImportPath _ "./foreign" m _ =
-  Just (ModuleIdentifier (moduleName m) Foreign)
+  Right (ModuleIdentifier (moduleName m) Foreign)
 checkImportPath requirePath name _ names
   | Just name' <- stripPrefix (fromMaybe "" requirePath) name
-  , name' `S.member` names = Just (ModuleIdentifier name' Regular)
-checkImportPath _ _ _ _ = Nothing
+  , name' `S.member` names = Right (ModuleIdentifier name' Regular)
+checkImportPath _ name _ _ = Left name
 
 -- | Compute the dependencies of all elements in a module, and add them to the tree.
 --
@@ -166,7 +166,7 @@ withDeps (Module modulePath es) = Module modulePath (map expandDeps es)
   imports = mapMaybe toImport es
     where
     toImport :: ModuleElement -> Maybe (String, ModuleIdentifier)
-    toImport (Require _ nm mid) = Just (nm, mid)
+    toImport (Require _ nm (Right mid)) = Just (nm, mid)
     toImport _ = Nothing
 
   -- | Collects all member names in scope, so that we can identify dependencies of the second type.
@@ -226,7 +226,7 @@ toModule requirePath mids mid top
     , JSIdentifier "require" <- node req
     , JSArguments _ [ impS ] _ <- node impP
     , JSStringLiteral _ importPath <- node impS
-    , Just importPath' <- checkImportPath requirePath importPath mid mids
+    , importPath' <- checkImportPath requirePath importPath mid mids
     = pure (Require n importName importPath')
   toModuleElement n
     | JSVariables var [ varIntro ] _ <- node n
@@ -371,7 +371,7 @@ sortModules modules = map (\v -> case nodeFor v of (n, _, _) -> n) (reverse (top
     return (m, mid, mapMaybe getKey els)
 
   getKey :: ModuleElement -> Maybe ModuleIdentifier
-  getKey (Require _ _ mi) = Just mi
+  getKey (Require _ _ (Right mi)) = Just mi
   getKey _ = Nothing
 
 -- | A module is empty if it contains no exported members (in other words,
@@ -416,9 +416,7 @@ codeGen optionsMainModule optionsNamespace ms = renderToString (NN (JSSourceElem
     declToJS (Require _ nm req) =
       [ NN (JSVariables (NT (JSLiteral "var") tokenPosnEmpty [ WhiteSpace tokenPosnEmpty "\n  " ])
                         [ NN (JSVarDecl (sp (JSIdentifier nm))
-                                        [ sp (JSLiteral "=")
-                                        , moduleReference sp (moduleName req)
-                                        ])
+                                        (sp (JSLiteral "=") : either require (return . moduleReference sp . moduleName) req))
                         ]
                         (nt (JSLiteral ";"))) ]
     declToJS (ExportsList exps) = map toExport exps
@@ -467,6 +465,11 @@ codeGen optionsMainModule optionsNamespace ms = renderToString (NN (JSSourceElem
     , lf
     ]
 
+  require :: String -> [JSNode]
+  require mn = [ sp (JSIdentifier "require")
+               , NN (JSArguments (nt (JSLiteral "(")) [ nt (JSStringLiteral '"' mn) ] (nt (JSLiteral ")")))
+               ]
+
   moduleReference :: (Node -> JSNode) -> String -> JSNode
   moduleReference f mn =
     NN (JSMemberSquare [ f (JSIdentifier optionsNamespace) ]
