first pass at an autoloader script, run_prettify.js which will be hosted, with compiled JS and CSS under /loader.

Author: [email protected]

Makefile

@@ -14,39 +14,26 @@ YUI_COMPRESSOR=java -jar yui-compressor/yuicompressor-2.4.4.jar \
 
 TAR_ROOT=distrib/google-code-prettify
 
-all: src/prettify.js distrib
+all: distrib
 
 clean:
-	rm -rf distrib.tstamp distrib src/prettify.js
+	rm -rf distrib.tstamp distrib src/prettify.js src/run_prettify.js
 
 src/prettify.js: js-modules/*.js js-modules/*.pl
-	@if [ -e $@ ]; then chmod +w $@; fi
-	@perl -e '\
-	  sub readInclude($$$$) {\
-	    my $$prefix = $$_[0];\
-	    my $$name = "js-modules/" . $$_[1];\
-	    my $$buf = "";\
-	    if ($$name =~ /\.pl$$/) {\
-	      open(IN, "|perl $$name") or die "$$name: $$!";\
-	    } else {\
-	      open(IN, "<$$name") or die "$$name: $$!";\
-	    }\
-	    while (<IN>) {\
-	      $$buf .= "$$prefix$$_";\
-	    }\
-	    return $$buf;\
-	  }' \
-	  -pe 's/^(\s*)include\("([^"]+)"\);/readInclude($$1, $$2)/ge' \
-	  js-modules/prettify.js \
-	  > src/prettify.js \
-	  || rm src/prettify.js
-	@if [ -e $@ ]; then chmod -w $@; fi
+	@if [ -e "$@" ]; then chmod +w "$@"; fi
+	@perl js-modules/js_include.pl "$$(basename $@)" > "$@"
+	@if [ -e "$@" ]; then chmod -w "$@"; fi
+
+src/run_prettify.js: js-modules/*.js js-modules/*.pl
+	@if [ -e "$@" ]; then chmod +w "$@"; fi
+	@perl js-modules/js_include.pl "$$(basename $@)" > "$@"
+	@if [ -e "$@" ]; then chmod -w "$@"; fi
 
 distrib: distrib.tstamp distrib/prettify-small.tgz distrib/prettify-small.zip distrib/prettify-small.tar.bz2
 	@wc -c distrib/prettify-small.{tar.bz2,tgz,zip} \
 	    | grep -v total
 
-distrib.tstamp: src/*.js src/*.css
+distrib.tstamp: src/prettify.js src/run_prettify.js src/*.js src/*.css
 	@echo Compiling
 	@mkdir -p $(TAR_ROOT)
 	@for f in src/*.css; do \
@@ -57,10 +44,20 @@ distrib.tstamp: src/*.js src/*.css
 	done
 	@$(CLOSURE_COMPILER) --js src/prettify.js \
 	    --externs closure-compiler/console-externs.js \
-            --externs closure-compiler/amd-externs.js \
+	    --externs closure-compiler/amd-externs.js \
+	    --define IN_GLOBAL_SCOPE=true \
+	    --output_wrapper='!function(){%output%}()' \
 	    > $(TAR_ROOT)/prettify.js
 	@wc -c src/prettify.js $(TAR_ROOT)/prettify.js \
 	    | grep -v total
+	@$(CLOSURE_COMPILER) --js src/run_prettify.js \
+	    --externs closure-compiler/console-externs.js \
+	    --externs closure-compiler/amd-externs.js \
+	    --define IN_GLOBAL_SCOPE=false \
+	    --output_wrapper='!function(){%output%}()' \
+	    > $(TAR_ROOT)/run_prettify.js
+	@wc -c src/run_prettify.js $(TAR_ROOT)/run_prettify.js \
+	    | grep -v total
 	@for f in src/lang*.js; do \
 	  if [ $$f -nt $(TAR_ROOT)/$$(basename $$f) ]; then \
 	    $(CLOSURE_COMPILER) --js $$f --externs js-modules/externs.js \

js-modules/js_include.pl

@@ -0,0 +1,76 @@
+#!/usr/bin/perl
+
+# Given a JS file looks for lines like
+#    include("path/to/file/to/include");
+# and replaces them with the quoted file relative to the js-modules directory.
+# If the included file ends with ".pl" then it is treated as a perl file to
+# execute and the stdout is used as the JS to include.
+
+use strict;
+
+# Closure Compiler @define annotations that need to be pulled out of included
+# files because @defines need to be top-level vars.
+my $global_defs = "";
+
+# Find @defines at the top of a JS file by pulling off comments and looking for
+# comments containing @define followed by a var declaration.
+sub extractGlobalDefs($) {
+  my @headerComments;
+  my $s = shift;
+  while ($s) {
+    last unless $s =~ m#^\s*(?://[^\r\n]*|/\*.*?\*/[ \t]*)[\r\n]*#s;
+    my $comment = $&;
+    $s = $';
+    if ($comment =~ /[\@]define/ && $s =~ /^\s*var\s+[^;]+;[ \t]*[\r\n]*/) {
+      my $global = $&;
+      $s = $';
+      $global =~ s/(var\s*IN_GLOBAL_SCOPE\s*=\s*)true\b/$1false/;
+      $global_defs .= "$comment$global";
+    } else {
+      push(@headerComments, $comment);
+    }
+  }
+  return (join "", @headerComments) . $s;
+}
+
+# readInclude(whiteSpacePrefix, path) returns the JS content at path
+# (with the ".pl" adjustment above) and prepends each line with the
+# whitespace in whiteSpacePrefix to produce a chunk of JS that matches the
+# indentation of the including file.
+# @defines are extracted so that they can all appear globally at the top of
+# the file.
+sub readInclude($$) {
+  my $prefix = shift;
+  my $name = "js-modules/" . (shift);
+  my $in;
+  if ($name =~ /\.pl$/) {
+    open($in, "perl $name|") or die "$name: $!";
+  } else {
+    open($in, "<$name")      or die "$name: $!";
+  }
+  my $buf = "";
+  while (<$in>) {
+    if (m/(\s*)include\("([^"]+)"\);\s*$/) {
+      my $inc = extractGlobalDefs(readInclude("$prefix$1", $2));
+      $buf .= $inc;
+    } else {
+      $buf .= "$prefix$_";
+    }
+  }
+  close($in);
+  return $buf;
+}
+
+my $target = shift;
+my $inc = readInclude("", $target);
+my $header = "";
+# Put descriptive top level comments above the grouped @defines.
+if ($inc =~ s#^(?://[^\r\n]*|/\*.*?\*/|\s)+##s) {
+  $header = $&;
+}
+my $globals = $global_defs;
+# Un-indent @defines.
+$globals =~ s#^[ \t]*##gm;
+$globals .= "\n" unless $globals eq "";
+
+print "$header$globals$inc";

js-modules/prettify.js

@@ -55,6 +55,9 @@
 // JSLint declarations
 /*global console, document, navigator, setTimeout, window, define */
 
+/** @define {boolean} */
+var IN_GLOBAL_SCOPE = true;
+
 /**
  * Split {@code prettyPrint} into multiple timeouts so as not to interfere with
  * UI events.
@@ -783,7 +786,7 @@ var prettyPrint;
    * @param opt_numberLines {number|boolean} True to number lines,
    *     or the 1-indexed number of the first line in sourceCodeHtml.
    */
-  function prettyPrintOne(sourceCodeHtml, opt_langExtension, opt_numberLines) {
+  function $prettyPrintOne(sourceCodeHtml, opt_langExtension, opt_numberLines) {
     var container = document.createElement('div');
     // This could cause images to load and onload listeners to fire.
     // E.g. <img onerror="alert(1337)" src="nosuchimage.png">.
@@ -817,7 +820,7 @@ var prettyPrint;
     *   containing all the elements to pretty print.
     *   Defaults to {@code document.body}.
     */
-  function prettyPrint(opt_whenDone, opt_root) {
+  function $prettyPrint(opt_whenDone, opt_root) {
     var root = opt_root || document.body;
     var doc = root.ownerDocument || document;
     function byTagName(tn) { return root.getElementsByTagName(tn); }
@@ -963,8 +966,14 @@ var prettyPrint;
         'PR_STRING': PR_STRING,
         'PR_TAG': PR_TAG,
         'PR_TYPE': PR_TYPE,
-        'prettyPrintOne': win['prettyPrintOne'] = prettyPrintOne,
-        'prettyPrint': win['prettyPrint'] = prettyPrint
+        'prettyPrintOne':
+           IN_GLOBAL_SCOPE
+             ? (win['prettyPrintOne'] = $prettyPrintOne)
+             : (prettyPrintOne = $prettyPrintOne),
+        'prettyPrint': prettyPrint =
+           IN_GLOBAL_SCOPE
+             ? (win['prettyPrint'] = $prettyPrint)
+             : (prettyPrint = $prettyPrint)
       };
 
   // Make PR available via the Asynchronous Module Definition (AMD) API.