sibilant 0.0.2 → 0.0.3

data/js/sibilant/public/javascripts/browser.js

@@ -1,12 +1,10 @@
 (function() {
   var sibilant = {  };
   var error = (function(str) {
-    // str:required
     throw new Error (str);
   });
   ;
   var inspect = (function(item) {
-    // item:required
     return (function() {
       if (item.toSource) {
         return item.toSource();
@@ -19,7 +17,6 @@
   (window)["sibilant"] = sibilant;
   var exports = {  };
   var bulkMap = (function(arr, fn) {
-    // arr:required fn:required
     var index = 0,
         groupSize = fn.length,
         retArr = [  ];
@@ -37,12 +34,10 @@
   });
   
   var inject = (function(start, items, fn) {
-    // start:required items:required fn:required
     var value = start;
     (function() {
       if ((items) && (items).constructor.name === "Array") {
         return items.forEach((function(item, index) {
-          // item:required index:required
           return value = fn(value, item, index);
         }));
       }
@@ -51,18 +46,14 @@
   });
   
   var map = (function(items, fn) {
-    // items:required fn:required
     return inject([  ], items, (function(collector, item, index) {
-      // collector:required item:required index:required
       collector.push(fn(item, index));
       return collector;
     }));
   });
   
   var select = (function(items, fn) {
-    // items:required fn:required
     return inject([  ], items, (function(collector, item, index) {
-      // collector:required item:required index:required
       (function() {
         if (fn(item, index)) {
           return collector.push(item);
@@ -73,7 +64,6 @@
   });
   
   var detect = (function(items, fn) {
-    // items:required fn:required
     var returnItem = undefined,
         index = 0,
         items = items;
@@ -94,7 +84,6 @@
   });
   
   var reject = (function(items, fn) {
-    // items:required fn:required
     var args = [ items, fn ];
     return select(items, (function() {
       return (!fn.apply(undefined, arguments));
@@ -102,19 +91,15 @@
   });
   
   var compact = (function(arr) {
-    // arr:required
     return select(arr, (function(item) {
-      // item:required
       return (!!(item));
     }));
   });
   
   var flatten = (function(items) {
-    // items:rest
     var items = Array.prototype.slice.call(arguments, 0);
     
     return inject([  ], items, (function(collector, item) {
-      // collector:required item:required
       return collector.concat((function() {
         if ((item) && (item).constructor.name === "Array") {
           return flatten.apply(undefined, item);
@@ -141,12 +126,10 @@
   (sibilant.tokens)["specialLiteral"] = (sibilant.tokens.special + sibilant.tokens.literal);
   (sibilant)["tokenPrecedence"] = [ "regex", "comment", "string", "number", "specialLiteral", "otherChar", "specialOpenParen", "closeParen", "alternativeParens" ];
   var tokenize = sibilant.tokenize = (function(string) {
-    // string:required
     var tokens = [  ],
         parseStack = [ tokens ],
         specials = [  ];
     var acceptToken = (function(token) {
-      // token:required
       return (parseStack)[0].push(token);
     });
     ;
@@ -167,7 +150,6 @@
     });
     ;
     var handleToken = (function(token) {
-      // token:required
       var special = (token)[0],
           token = token;
       (function() {
@@ -216,11 +198,10 @@
     });
     ;
     var orderedRegexen = map(sibilant.tokenPrecedence, (function(x) {
-      // x:required
       return (sibilant.tokens)[x];
     })),
         masterRegex = (new RegExp((orderedRegexen).join("|"), "g"));
-    string // chain
+    string
       .match(masterRegex)
       .forEach(handleToken)
     ;
@@ -232,10 +213,9 @@
     return tokens;
   });
   var indent = (function(args) {
-    // args:rest
     var args = Array.prototype.slice.call(arguments, 0);
     
-    return (compact(args) // chain
+    return (compact(args)
       .join("\n")
       .replace(/^/, "\n")
       .replace(/\n/g, "\n  ")
@@ -243,9 +223,7 @@
   });
   
   var constructHash = (function(arrayOfArrays) {
-    // arrayOfArrays:required
     return inject({  }, arrayOfArrays, (function(object, item) {
-      // object:required item:required
       (object)[(item)[0]] = (object)[(item)[1]];
       return object;
     }));
@@ -254,7 +232,6 @@
   var macros = {  };
   (sibilant)["macros"] = macros;
   (macros)["return"] = (function(token) {
-    // token:required
     var defaultReturn = ("return " + translate(token));
     return (function() {
       if ((token) && (token).constructor.name === "Array") {
@@ -308,41 +285,39 @@
     })();
   });
   var asStatement = (function(string) {
-    // string:required
-    return string // chain
+    return string
       .toString()
       .replace(/;*\s*$/, ";")
     ;
   });
   
   macros.statement = (function(args) {
-    // args:rest
     var args = Array.prototype.slice.call(arguments, 0);
     
     return (macros.call.apply(undefined, args) + ";\n");
   });
   
   macros.progn = (function(body) {
-    // body:rest
     var body = Array.prototype.slice.call(arguments, 0);
     
     var lastIndex = Math.max(0, (body.length - 1));
     (body)[lastIndex] = [ "return", (body)[lastIndex] ];
     return (map(body, (function(arg) {
-      // arg:required
       return (asStatement(translate(arg)));
     }))).join("\n");
   });
   
+  macros.emptyList = (function() {
+    return "null";
+  });
+  
   macros.call = (function(fnName, args) {
-    // fnName:required args:rest
     var args = Array.prototype.slice.call(arguments, 1);
     
     return (translate(fnName) + "(" + (map(args, translate)).join(", ") + ")");
   });
   
   macros.defun = (function(fnName, argsAndBody) {
-    // fnName:required argsAndBody:rest
     var argsAndBody = Array.prototype.slice.call(arguments, 1);
     
     var fnNameTr = translate(fnName),
@@ -357,7 +332,6 @@
   });
   
   macros.defmacro = (function(name, argsAndBody) {
-    // name:required argsAndBody:rest
     var argsAndBody = Array.prototype.slice.call(arguments, 1);
     
     var js = macros.lambda.apply(undefined, argsAndBody),
@@ -373,18 +347,15 @@
   });
   
   macros.concat = (function(args) {
-    // args:rest
     var args = Array.prototype.slice.call(arguments, 0);
     
     return ("(" + (map(args, translate)).join(" + ") + ")");
   });
   
   var transformArgs = (function(arglist) {
-    // arglist:required
     var last = undefined,
         args = [  ];
     arglist.forEach((function(arg) {
-      // arg:required
       return (function() {
         if (((arg)[0] === "&")) {
           return last = arg.slice(1);
@@ -403,10 +374,8 @@
   });
   
   macros.reverse = (function(arr) {
-    // arr:required
     var reversed = [  ];
     arr.forEach((function(item) {
-      // item:required
       return reversed.unshift(item);
     }));
     return reversed;
@@ -414,17 +383,14 @@
   
   var reverse = macros.reverse;
   var buildArgsString = (function(args, rest) {
-    // args:required rest:required
     var argsString = "",
         optionalCount = 0;
     args.forEach((function(arg, optionIndex) {
-      // arg:required optionIndex:required
       return (function() {
         if (((arg)[0] === "optional")) {
-          argsString = (argsString + "if (arguments.length < " + (args.length - optionalCount) + ")" + " // if " + translate((arg)[1]) + " is missing" + indent(("var " + map(args.slice((optionIndex + 1)), (function(arg, argIndex) {
-            // arg:required argIndex:required
+          argsString = (argsString + "if (arguments.length < " + (args.length - optionalCount) + ")" + indent(("var " + map(args.slice((optionIndex + 1)), (function(arg, argIndex) {
             return (translate((arg)[1]) + " = " + translate(((args)[(optionIndex + argIndex)])[1]));
-          })) // chain
+          }))
             .reverse()
             .concat((translate((arg)[1]) + " = undefined"))
             .join(", ")
@@ -442,28 +408,11 @@
     })();
   });
   
-  var buildCommentString = (function(args) {
-    // args:required
-    return (function() {
-      if (((args).length === 0)) {
-        return "";
-      } else {
-        return ("// " + (map(args, (function(arg) {
-          // arg:required
-          return (translate((arg)[1]) + ":" + (arg)[0]);
-        }))).join(" "));
-      }
-    })();
-  });
-  
-  // brain 'splode
   macros.lambda = (function(arglist, body) {
-    // arglist:required body:rest
     var body = Array.prototype.slice.call(arguments, 1);
     
     var args = transformArgs(arglist),
         rest = (select(args, (function(arg) {
-      // arg:required
       return ("rest" === (arg)[0]);
     })))[0],
         docString = undefined;
@@ -480,13 +429,10 @@
         return args;
       }
     })(),
-        argsString = buildArgsString(noRestArgs, rest),
-        commentString = buildCommentString(args);
+        argsString = buildArgsString(noRestArgs, rest);
     return ("(function(" + (map(args, (function(arg) {
-      // arg:required
       return translate((arg)[1]);
-    }))).join(", ") + ") {" + indent(commentString, docString, argsString, (map(body, (function(stmt) {
-      // stmt:required
+    }))).join(", ") + ") {" + indent(docString, argsString, (map(body, (function(stmt) {
       var tstmt = translate(stmt);
       return (tstmt + (function() {
         if (((tstmt.slice(-1))[0] === ";")) {
@@ -499,7 +445,6 @@
   });
   
   macros.quote = (function(item) {
-    // item:required
     return (function() {
       if (("Array" === item.constructor.name)) {
         return ("[ " + (map(item, macros.quote)).join(", ") + " ]");
@@ -516,7 +461,6 @@
   });
   
   macros.hash = (function(pairs) {
-    // pairs:rest
     var pairs = Array.prototype.slice.call(arguments, 0);
     
     (function() {
@@ -525,7 +469,6 @@
       }
     })();
     var pairStrings = bulkMap(pairs, (function(key, value) {
-      // key:required value:required
       return (translate(key) + ": " + translate(value));
     }));
     return (function() {
@@ -538,19 +481,57 @@
   });
   
   var literal = (function(string) {
-    // string:required
-    return inject(string // chain
+    return inject(string
       .replace(/\*/g, "_")
       .replace(/\?$/, "__QUERY")
       .replace(/!$/, "__BANG")
     , string.match(/-(.)/g), (function(returnString, match) {
-      // returnString:required match:required
       return returnString.replace(match, (match)[1].toUpperCase());
     }));
   });
   
+  var translateListToken = (function(token, hint) {
+    return (function() {
+      if (((token).length === 0)) {
+        return macros.emptyList();
+      } else {
+        return (function() {
+          if (typeof((macros)[translate((token)[0])]) !== 'undefined') {
+            return (macros)[translate((token)[0])].apply(undefined, token.slice(1));
+          } else {
+            return (macros)[(hint || "call")].apply(undefined, token);
+          }
+        })();
+      }
+    })();
+  });
+  
+  var translateStringToken = (function(token, hint) {
+    return (function() {
+      if (token.match((new RegExp(("^" + sibilant.tokens.literal + "$"), undefined)))) {
+        return literal(token);
+      } else {
+        return (function() {
+          if (token.match((new RegExp("^;", undefined)))) {
+            return token.replace((new RegExp("^;+", undefined)), "//");
+          } else {
+            return (function() {
+              if (("\"" === (token)[0] &&
+               "\"" === (token.slice(-1))[0])) {
+                return token
+                  .split("\n")
+                  .join("\\n\" +\n\"");
+              } else {
+                return token;
+              }
+            })();
+          }
+        })();
+      }
+    })();
+  });
+  
   var translate = (function(token, hint) {
-    // token:required hint:required
     var hint = hint;
     (function() {
       if ((hint && typeof((macros)[hint]) === 'undefined')) {
@@ -568,34 +549,13 @@
           try {
             return (function() {
               if ((token) && (token).constructor.name === "Array") {
-                return (function() {
-                  if (typeof((macros)[translate((token)[0])]) !== 'undefined') {
-                    return (macros)[translate((token)[0])].apply(undefined, token.slice(1));
-                  } else {
-                    return (macros)[(hint || "call")].apply(undefined, token);
-                  }
-                })();
+                return translateListToken(token, hint);
               } else {
                 return (function() {
-                  if ((typeof(token) === "string" && token.match((new RegExp(("^" + sibilant.tokens.literal + "$"), undefined))))) {
-                    return literal(token);
+                  if (typeof(token) === "string") {
+                    return translateStringToken(token, hint);
                   } else {
-                    return (function() {
-                      if ((typeof(token) === "string" && token.match((new RegExp("^;", undefined))))) {
-                        return token.replace((new RegExp("^;+", undefined)), "//");
-                      } else {
-                        return (function() {
-                          if ((typeof(token) === "string" && ("\"" === (token)[0] &&
-                           "\"" === (token.slice(-1))[0]))) {
-                            return token // chain
-                              .split("\n")
-                              .join("\\n\" +\n\"");
-                          } else {
-                            return token;
-                          }
-                        })();
-                      }
-                    })();
+                    return token;
                   }
                 })();
               }
@@ -610,10 +570,8 @@
   
   (sibilant)["translate"] = translate;
   var translateAll = (function(contents) {
-    // contents:required
     var buffer = "";
     tokenize(contents).forEach((function(token) {
-      // token:required
       var line = translate(token, "statement");
       return (function() {
         if (line) {
@@ -630,7 +588,6 @@
     var sibilant = window.sibilant,
         scripts = [  ];
     var evalWithTryCatch = (function(js) {
-      // js:required
       return (function() {
         try {
           return eval(js);
@@ -646,13 +603,13 @@
           js = null;
       return (function() {
         if ((!sibilant.loadNextScript())) {
-          return $("script[type=\"text/sibilant\"]:not([src])") // chain
+          return $("script[type=\"text/sibilant\"]:not([src])")
             .each((function() {
-              lisp = $(this) // chain
+              lisp = $(this)
                 .text()
                 .replace(/(^\s*\/\/\<!\[CDATA\[)|(\/\/\]\]>\s*$)/g, "");
               js = sibilant.translateAll(lisp);
-              $(this) // chain
+              $(this)
                 .data("js", js)
               ;
               return evalWithTryCatch(js);
@@ -661,7 +618,7 @@
       })();
     });
     ;
-    scripts = $.makeArray($("script[type=\"text/sibilant\"][src]") // chain
+    scripts = $.makeArray($("script[type=\"text/sibilant\"][src]")
       .map((function() {
         return this.src;
       }))
@@ -671,7 +628,6 @@
       return (function() {
         if (typeof(nextScript) !== 'undefined') {
           $.get(nextScript, (function(data) {
-            // data:required
             evalWithTryCatch(sibilant.translateAll(data));
             return sibilant.scriptLoaded();
           }));

data/js/sibilant/public/javascripts/macros.sibilant

@@ -228,7 +228,7 @@
   (concat "(!!(" (translate expr) "))"))
 
 (defmacro chain (object &rest calls)
-  (concat (translate object) " // chain"
+  (concat (translate object)
 	  (indent (join "\n"
                         (map calls
                              (lambda (call, index)
@@ -237,6 +237,11 @@
                                (concat "." (translate method)
                                        "(" (join ", " (map args translate)) ")")))))))
 
+(defmacro chainable (&rest names)
+  (each (name) names
+    (macros.defmacro name ['target "&rest" 'calls]
+                     ['apply 'macros.chain ['cons ['macros.call ['quote name] 'target] 'calls]])))
+
 (defmacro try (tryblock catchblock)
   (concat
    "(function() {"

data/js/sibilant/src/core.sibilant

@@ -150,6 +150,8 @@
         (map body (lambda (arg)
                     (concat (as-statement (translate arg)))))))
 
+(defun macros.empty-list () 'null)
+
 (defun macros.call (fn-name &rest args)
   (concat (translate fn-name)
           "(" (join ", " (map args translate)) ")"))
@@ -206,7 +208,6 @@
         args-string
         "if (arguments.length < "
         (- args.length optional-count) ")"
-        " // if " (translate (second arg)) " is missing"
         (indent
          (concat "var "
                  (chain
@@ -229,15 +230,6 @@
             args.length ");\n")
     args-string))
 
-(defun build-comment-string (args)
-  (if (empty? args) ""
-      (concat "// "
-              (join " "
-                    (map args
-                         (lambda (arg)
-                           (concat (translate (second arg)) ":" (first arg))))))))
-
-;; brain 'splode
 (defun macros.lambda (arglist &rest body)
   (defvar args (transform-args arglist)
           rest (first (select args
@@ -254,13 +246,12 @@
           (concat "/* " (eval (body.shift)) " */\n")))
 
   (defvar no-rest-args (if rest (args.slice 0 -1) args)
-          args-string (build-args-string no-rest-args rest)
-          comment-string (build-comment-string args))
+          args-string (build-args-string no-rest-args rest))
 
   (concat "(function("
           (join ", " (map args (lambda (arg) (translate (second arg)))))
           ") {"
-          (indent comment-string doc-string args-string
+          (indent doc-string args-string
                   (join "\n"
                         (map body
                              (lambda (stmt)
@@ -301,6 +292,23 @@
                                    (send (second match) to-upper-case)))))
 
 
+
+(defun translate-list-token (token hint)
+  (if (empty? token)
+    (macros.empty-list)
+    (if (defined? (get macros (translate (first token))))
+      (apply (get macros (translate (first token))) (token.slice 1))
+      (apply (get macros (or hint 'call)) token))))
+
+(defun translate-string-token (token hint)
+  (if (token.match (regex (concat "^" sibilant.tokens.literal "$")))
+    (literal token)
+    (if (token.match (regex "^;"))
+      (token.replace (regex "^;+") "//")
+      (if (= "\"" (first token) (last token))
+        (chain token (split "\n") (join "\\n\" +\n\""))
+        token))))
+
 (defun translate (token hint)
   (defvar hint hint)
   (when (and hint (undefined? (get macros hint)))
@@ -310,17 +318,10 @@
     (when (string? token) (setf token (token.trim)))
     (try
       (if (list? token)
-        (if (defined? (get macros (translate (first token))))
-          (apply (get macros (translate (first token))) (token.slice 1))
-          (apply (get macros (or hint 'call)) token))
-        (if (and (string? token)
-                 (token.match (regex (concat "^" sibilant.tokens.literal "$"))))
-          (literal token)
-          (if (and (string? token) (token.match (regex "^;")))
-            (token.replace (regex "^;+") "//")
-            (if (and (string? token) (= "\"" (first token) (last token)))
-              (chain token (split "\n") (join "\\n\" +\n\""))
-              token))))
+        (translate-list-token token hint)
+        (if (string? token)
+          (translate-string-token token hint)
+          token))
       (error (concat e.stack "\n"
                      "Encountered when attempting to process:\n"
                      (indent (call inspect token)))))))

data/js/sibilant/test/test.sibilant

@@ -1,6 +1,8 @@
 #!/usr/bin/env sibilant -x
 (include "./testHelper.sibilant")
 
+
+(assert-translation "()"       "null")
 (assert-translation "5"        "5")
 (assert-translation "1,000,000.01" "1000000.01")
 (assert-translation "1,000.00" "1000")
@@ -169,7 +171,6 @@ delete bam.bibble;")
 (assert-translation "(number? x)" "typeof(x) === 'number'")
 
 (assert-translation "(defun foo.bar (a) (* a 2))" "foo.bar = (function(a) {
-  // a:required
   return (a * 2);
 });")
 
@@ -183,8 +184,7 @@ delete bam.bibble;")
 })();")
 
 (assert-translation "(lambda (&optional first-arg second-arg) true)" "(function(firstArg, secondArg) {
-  // firstArg:optional secondArg:required
-  if (arguments.length < 2) // if firstArg is missing
+  if (arguments.length < 2)
     var secondArg = firstArg, firstArg = undefined;
   
   return true;
@@ -212,7 +212,6 @@ delete bam.bibble;")
 
 (assert-translation "(each (x) arr a b c)"
 "arr.forEach((function(x) {
-  // x:required
   a;
   b;
   return c;
@@ -393,7 +392,6 @@ afterInclude2();")
 
 (assert-translation "(alias-macro lambda ->) (-> (a) a) (delmacro ->) (-> (a) a)"
 "(function(a) {
-  // a:required
   return a;
 })
 ->(a(), a);")
@@ -462,3 +460,24 @@ thunk(\"world\");
 (assert-translation
  "(defvar a (setf b c))"
  "var a = b = c;")
+
+
+(assert-translation
+ "(chainable $) ($ 'div (data 'jquery true) (css {background 'blue color 'light-blue}))"
+ "$(\"div\")
+  .data(\"jquery\", true)
+  .css({
+    background: \"blue\",
+    color: \"lightBlue\"
+  })")
+
+(assert-translation
+ "(chainable a b) (a target-a (fn-a 1) (fn-a 2)) (b target-b (fn-b 1) (fn-b 2))"
+ "a(targetA)
+  .fnA(1)
+  .fnA(2)
+
+b(targetB)
+  .fnB(1)
+  .fnB(2)")
+ 

data/lib/sibilant/version.rb

@@ -1,3 +1,3 @@
 module Sibilant
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/sibilant.rb

@@ -2,6 +2,12 @@ require "sibilant/version"
 require 'json'
 
 module Sibilant
+  class << self
+    def [](sibilant_code)
+      Sibilant::Compiler.new.translate sibilant_code
+    end
+  end
+
   class Compiler
     def sibilant_js_root
       File.join File.dirname(__FILE__), '..', 'js', 'sibilant'

data/spec/sibilant_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Sibilant do
+  it 'should provide a convenient array accessor sugar' do
+    Sibilant['(+ 1 2 3)'].should == '(1 + 2 + 3)'
+  end
+
   describe 'with an instance of sibilant compiler' do
     before(:each) { @compiler = Sibilant::Compiler.new }