use commander.js for args handling; add --ast and --js-ast for debugging purposes

xkxx · xkxx · commit 5beba7b6ee03 · 2014-04-24T00:39:39.000-07:00
diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
   },
   "dependencies": {
     "escodegen": "git://github.com/Constellation/escodegen.git#master",
-    "base64-encode": "~1.0.1"
+    "base64-encode": "~1.0.1",
+    "commander": ">=2.2.0"
   }
 }
diff --git a/src/wisp.wisp b/src/wisp.wisp
@@ -4,9 +4,10 @@
   (:require [fs :refer [createReadStream]]
             [path :refer [basename dirname join resolve]]
             [module :refer [Module]]
+            [commander]
 
             [wisp.string :refer [split join upper-case replace]]
-            [wisp.sequence :refer [first second last count reduce rest
+            [wisp.sequence :refer [first second last count reduce rest map
                                    conj partition assoc drop empty?]]
 
             [wisp.repl :refer [start] :rename {start start-repl}]
@@ -53,9 +54,10 @@
 
 (defn compile-file
   [path options]
-  (with-stream-content (createReadStream path)
+  (map (fn [file] (with-stream-content
+                       (createReadStream file)
                        compile-string
-                       (conj {:source-uri path} options)))
+                       (conj {:source-uri file} options))) path))
 
 (defn compile-string
   [source options]
@@ -64,6 +66,12 @@
         content (if (= channel :code)
                   (:code output)
                   (JSON.stringify (get output channel) 2 2))]
+    (if (:ast options) (map (fn [item]
+                              (.write process.stdout
+                                      (str (pr-str item.form) "\n")))
+                              output.ast))
+    (if (:js-ast options) (.write process.stdout
+                                      (str (pr-str (:body (:js-ast output))) "\n")))
     (.write process.stdout (or content "nil"))
     (if (:error output) (throw (:error output)))))
 
@@ -80,15 +88,37 @@
   [path]
   ;; Loading module as main one, same way as nodejs does it:
   ;; https://github.com/joyent/node/blob/master/lib/module.js#L489-493
-  (Module._load (resolve path) null true))
+  (Module._load (resolve (get path 0)) null true))
 
+(defmacro ->
+  [& operations]
+  (reduce
+   (fn [form operation]
+     (cons (first operation)
+           (cons form (rest operation))))
+   (first operations)
+   (rest operations)))
 
 (defn main
   []
-  (let [options (parse-params (drop 2 process.argv))]
-    (cond (:run options) (run (:run options))
+  (let [options commander]
+    (-> options
+      (.usage "[options] <file ...>")
+      (.option "-r, --run"           "Compile and execute the file")
+      (.option "-c, --compile"       "Compile to JavaScript and save as .js files")
+      (.option "-i, --interactive"   "Run an interactive wisp REPL")
+      (.option "-p, --print"         "Print compiled JavaScript")
+      (.option "-o, --output <dir>"  "Output to specified directory")
+      (.option "--no-map"            "Disable source map generation")
+      (.option "--ast"               "Print the wisp AST produced by the reader")
+      (.option "--js-ast"            "Print the JavaScript AST produced by the compiler")
+      (.parse process.argv))
+    (set! (aget options "no-map") (aget options "noMap")) ;; commander auto translates to camelCase
+    (set! (aget options "js-ast") (aget options "jsAst"))
+    (cond options.run (run options.args)
           (not process.stdin.isTTY) (compile-stdin options)
-          (< (count process.argv) 3) (start-repl)
-          (and (= (count process.argv) 3)
-               (not (flag? (last process.argv)))) (run (last process.argv))
-          (:compile options) (compile-file (:compile options) options))))
+          options.interactive (start-repl)
+          options.compile (compile-file options.args options)
+          options.args (run options.args)
+          :else (start-repl)
+   )))

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@`
`48`	`48`	`},`
`49`	`49`	`"dependencies": {`
`50`	`50`	`"escodegen": "git://github.com/Constellation/escodegen.git#master",`
`51`		`- "base64-encode": "~1.0.1"`
	`51`	`+ "base64-encode": "~1.0.1",`
	`52`	`+ "commander": ">=2.2.0"`
`52`	`53`	`}`
`53`	`54`	`}`