Change dependency-resolving code so that modules work sensibly when c…

…oncatenated with jsbuild.
jcoglan · Jan 5, 2013 · d41c913 · d41c913
1 parent 5c2be15
commit d41c913
Show file tree

Hide file tree

Showing 55 changed files with 131 additions and 115 deletions.
diff --git a/bin/jsbuild b/bin/jsbuild
@@ -33,6 +33,8 @@ var fs      = require('fs'),
     include = params.argv.remain.slice(),
     dir     = new RegExp('^' + path.resolve(params.directory || '.') + '/')
 
+JSCLASS_PATH = path.dirname(__filename) + '/../src';
+
 var C = require('../src/console').Console,
     P = require('../index')
 

diff --git a/index.js b/index.js
@@ -1,4 +1,8 @@
-var path = require('path');
+var path    = require('path'),
+    cleanup = (typeof JSCLASS_PATH === 'undefined');
+
 JSCLASS_PATH = path.dirname(__filename) + '/src';
 module.exports = require(JSCLASS_PATH + '/loader');
 
+if (cleanup) delete JSCLASS_PATH;
+
diff --git a/source/benchmark.js b/source/benchmark.js
@@ -1,7 +1,8 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS,
+      js = (typeof JS === 'undefined') ? require('./core') : JS,
-      Console = (E ? require('./console') : JS).Console;
+
+      Console = js.Console || require('./console').Console;
 
   if (E) exports.JS = exports;
   factory(js, Console, E ? exports : js);

diff --git a/source/command.js b/source/command.js
@@ -1,9 +1,9 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS,
+      js = (typeof JS === 'undefined') ? require('./core') : JS,
 
-      Enumerable = (E ? require('./enumerable') : js).Enumerable,
+      Enumerable = js.Enumerable || require('./enumerable').Enumerable,
-      Observable = (E ? require('./observable') : js).Observable;
+      Observable = js.Observable || require('./observable').Observable;
 
   if (E) exports.JS = exports;
   factory(js, Enumerable, Observable, E ? exports : js);

diff --git a/source/comparable.js b/source/comparable.js
@@ -1,6 +1,6 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS;
+      js = (typeof JS === 'undefined') ? require('./core') : JS;
 
   if (E) exports.JS = exports;
   factory(js, E ? exports : js);

diff --git a/source/console/_head.js b/source/console/_head.js
@@ -1,8 +1,8 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS,
+      js = (typeof JS === 'undefined') ? require('./core') : JS,
 
-      Enumerable = (E ? require('./enumerable') : js).Enumerable;
+      Enumerable = js.Enumerable || require('./enumerable').Enumerable;
 
   if (E) exports.JS = exports;
   factory(js, Enumerable, E ? exports : js);

diff --git a/source/constant_scope.js b/source/constant_scope.js
@@ -1,6 +1,6 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS;
+      js = (typeof JS === 'undefined') ? require('./core') : JS;
 
   if (E) exports.JS = exports;
   factory(js, E ? exports : js);

diff --git a/source/core/_head.js b/source/core/_head.js
@@ -1,15 +1,16 @@
 <%= license %>
 
+var JS = (typeof JS === 'undefined') ? {} : JS;
+
 (function(factory) {
   var $ = (typeof this.global === 'object') ? this.global : this,
       E = (typeof exports === 'object');
 
-  if (E)
+  if (E) {
     exports.JS = exports;
-  else
+    JS = exports;
-    $.JS = $.JS || {};
+  }
-
+  factory($, JS);
-  factory($, E ? exports : $.JS);
 
 })(function(global, exports) {
 
diff --git a/source/core/method.js b/source/core/method.js
@@ -81,7 +81,7 @@ JS.extend(JS.Method.prototype, {
       return returnValue;
     };
 
-    var StackTrace = ((typeof require === 'function') ? require('./stack_trace') : global.JS).StackTrace;
+    var StackTrace = trace && (exports.StackTrace || require('./stack_trace').StackTrace);
     if (trace) return StackTrace.wrap(compiled, method, environment);
     return compiled;
   },
@@ -134,7 +134,8 @@ JS.Method.keyword = function(name, filter) {
 };
 
 JS.Method.tracing = function(classes, block, context) {
-  global.JS.require('JS.StackTrace', function(StackTrace) {
+  var pkg = exports.require ? exports : require('./loader');
+  pkg.require('JS.StackTrace', function(StackTrace) {
     var logger = StackTrace.logger,
         active = logger.active;
 

diff --git a/source/decorator.js b/source/decorator.js
@@ -1,6 +1,6 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS;
+      js = (typeof JS === 'undefined') ? require('./core') : JS;
 
   if (E) exports.JS = exports;
   factory(js, E ? exports : js);

diff --git a/source/deferrable.js b/source/deferrable.js
@@ -1,6 +1,6 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS;
+      js = (typeof JS === 'undefined') ? require('./core') : JS;
 
   if (E) exports.JS = exports;
   factory(js, E ? exports : js);

diff --git a/source/dom/_head.js b/source/dom/_head.js
@@ -1,6 +1,6 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS;
+      js = (typeof JS === 'undefined') ? require('./core') : JS;
 
   if (E) exports.JS = exports;
   factory(js, E ? exports : js);

diff --git a/source/enumerable.js b/source/enumerable.js
@@ -1,6 +1,6 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS;
+      js = (typeof JS === 'undefined') ? require('./core') : JS;
 
   if (E) exports.JS = exports;
   factory(js, E ? exports : js);

diff --git a/source/forwardable.js b/source/forwardable.js
@@ -1,6 +1,6 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS;
+      js = (typeof JS === 'undefined') ? require('./core') : JS;
 
   if (E) exports.JS = exports;
   factory(js, E ? exports : js);

diff --git a/source/hash.js b/source/hash.js
@@ -1,9 +1,9 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS,
+      js = (typeof JS === 'undefined') ? require('./core') : JS,
 
-      Enumerable = (E ? require('./enumerable') : js).Enumerable,
+      Enumerable = js.Enumerable || require('./enumerable').Enumerable,
-      Comparable = (E ? require('./comparable') : js).Comparable;
+      Comparable = js.Comparable || require('./comparable').Comparable;
 
   if (E) exports.JS = exports;
   factory(js, Enumerable, Comparable, E ? exports : js);

diff --git a/source/linked_list.js b/source/linked_list.js
@@ -1,7 +1,8 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS,
+      js = (typeof JS === 'undefined') ? require('./core') : JS,
-      Enumerable = (E ? require('./enumerable') : js).Enumerable;
+
+      Enumerable = js.Enumerable || require('./enumerable').Enumerable;
 
   if (E) exports.JS = exports;
   factory(js, Enumerable, E ? exports : js);

diff --git a/source/method_chain.js b/source/method_chain.js
@@ -1,6 +1,6 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS;
+      js = (typeof JS === 'undefined') ? require('./core') : JS;
 
   if (E) exports.JS = exports;
   factory(js, E ? exports : js);

diff --git a/source/observable.js b/source/observable.js
@@ -1,6 +1,6 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS;
+      js = (typeof JS === 'undefined') ? require('./core') : JS;
 
   if (E) exports.JS = exports;
   factory(js, E ? exports : js);

diff --git a/source/package/_head.js b/source/package/_head.js
@@ -6,8 +6,11 @@ var JS = (typeof JS === 'undefined') ? {} : JS;
   var $ = (typeof this.global === 'object') ? this.global : this,
       E = (typeof exports === 'object');
 
-  if (E) exports.JS = exports;
+  if (E) {
-  factory($, E ? exports : JS);
+    exports.JS = exports;
+    JS = exports;
+  }
+  factory($, JS);
 
 })(function(global, exports) {
 
diff --git a/source/package/config.js b/source/package/config.js
@@ -97,8 +97,8 @@ P.packages(function() { with(this) {
                                       'JS.OrderedSet',
                                       'JS.SortedSet')
                             .requires('JS.Class',
-                                      'JS.Enumerable')
+                                      'JS.Enumerable',
-                            .uses(    'JS.Hash');
+                                      'JS.Hash');
 
     module('linked_list')   .provides('JS.LinkedList',
                                       'JS.LinkedList.Doubly',

diff --git a/source/proxy.js b/source/proxy.js
@@ -1,6 +1,6 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS;
+      js = (typeof JS === 'undefined') ? require('./core') : JS;
 
   if (E) exports.JS = exports;
   factory(js, E ? exports : js);

diff --git a/source/range.js b/source/range.js
@@ -1,9 +1,9 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS,
+      js = (typeof JS === 'undefined') ? require('./core') : JS,
 
-      Enumerable = (E ? require('./enumerable') : js).Enumerable,
+      Enumerable = js.Enumerable || require('./enumerable').Enumerable,
-      Hash = (E ? require('./hash') : js).Hash;
+      Hash = js.Hash || require('./hash').Hash;
 
   if (E) exports.JS = exports;
   factory(js, Enumerable, Hash, E ? exports : js);

diff --git a/source/set.js b/source/set.js
@@ -1,9 +1,9 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS,
+      js = (typeof JS === 'undefined') ? require('./core') : JS,
 
-      Enumerable = (E ? require('./enumerable') : js).Enumerable,
+      Enumerable = js.Enumerable || require('./enumerable').Enumerable,
-      hash = (E ? require('./hash') : js);
+      hash = js.Hash ? js : require('./hash');
 
   if (E) exports.JS = exports;
   factory(js, Enumerable, hash, E ? exports : js);

diff --git a/source/stack_trace.js b/source/stack_trace.js
@@ -1,10 +1,10 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS,
+      js = (typeof JS === 'undefined') ? require('./core') : JS,
 
-      Observable = (E ? require('./observable') : js).Observable,
+      Observable = js.Observable || require('./observable').Observable,
-      Enumerable = (E ? require('./enumerable') : js).Enumerable,
+      Enumerable = js.Enumerable || require('./enumerable').Enumerable,
-      Console = (E ? require('./console') : js).Console;
+      Console    = js.Console    || require('./console').Console;
 
   if (E) exports.JS = exports;
   factory(js, Observable, Enumerable, Console, E ? exports : js);

diff --git a/source/state.js b/source/state.js
@@ -1,6 +1,6 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS;
+      js = (typeof JS === 'undefined') ? require('./core') : JS;
 
   if (E) exports.JS = exports;
   factory(js, E ? exports : js);

diff --git a/source/test/_head.js b/source/test/_head.js
@@ -1,15 +1,15 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS,
+      js = (typeof JS === 'undefined') ? require('./core') : JS,
 
-      Console     = (E ? require('./console') : js).Console,
+      Console     = js.Console     || require('./console').Console,
-      DOM         = (E ? require('./dom') : js).DOM,
+      DOM         = js.DOM         || require('./dom').DOM,
-      Enumerable  = (E ? require('./enumerable') : js).Enumerable,
+      Enumerable  = js.Enumerable  || require('./enumerable').Enumerable,
-      SortedSet   = (E ? require('./set') : js).SortedSet,
+      SortedSet   = js.SortedSet   || require('./set').SortedSet,
-      Range       = (E ? require('./range') : js).Range,
+      Range       = js.Range       || require('./range').Range,
-      MethodChain = (E ? require('./method_chain') : js).MethodChain,
+      MethodChain = js.MethodChain || require('./method_chain').MethodChain,
-      Comparable  = (E ? require('./comparable') : js).Comparable,
+      Comparable  = js.Comparable  || require('./comparable').Comparable,
-      StackTrace  = (E ? require('./stack_trace') : js).StackTrace;
+      StackTrace  = js.StackTrace  || require('./stack_trace').StackTrace;
 
   if (E) exports.JS = exports;
   factory(js, Console, DOM, Enumerable, SortedSet, Range, MethodChain, Comparable, StackTrace, E ? exports : js);

diff --git a/source/tsort.js b/source/tsort.js
@@ -1,7 +1,8 @@
 (function(factory) {
   var E  = (typeof exports === 'object'),
-      js = E ? require('./core') : JS,
+      js = (typeof JS === 'undefined') ? require('./core') : JS,
-      Hash = (E ? require('./hash') : js).Hash;
+
+      Hash = js.Hash || require('./hash').Hash;
 
   if (E) exports.JS = exports;
   factory(js, Hash, E ? exports : js);

diff --git a/test/console.js b/test/console.js
@@ -19,7 +19,7 @@ if (this.ActiveXObject) load = function(path) {
   }
 
   if (typeof require === 'function') {
-    $.JS = require('../' + path + 'loader');
+    $.PKG = require('../' + path + 'loader');
     require('./runner');
   } else {
     load(path + 'loader.js');

diff --git a/test/examples/async.js b/test/examples/async.js
@@ -1,5 +1,5 @@
 JSCLASS_PATH = "build/min/"
-require("../../" + JSCLASS_PATH + "loader")
+var JS = require("../../" + JSCLASS_PATH + "loader")
 
 JS.require("JS.Test", "JS.MethodChain", function(Test, MC) {
 

diff --git a/test/examples/benchmarks.js b/test/examples/benchmarks.js
@@ -4,7 +4,7 @@
 })()
 
 if (typeof require === 'function')
-  require('../../' + JSCLASS_PATH + 'loader')
+  var JS = require('../../' + JSCLASS_PATH + 'loader')
 else
   load(JSCLASS_PATH + 'loader.js')
 

diff --git a/test/examples/reformat.js b/test/examples/reformat.js
@@ -6,7 +6,7 @@
 //     $ node test/console -f json | node test/examples/reformat -f tap
 
 JSCLASS_PATH = 'build/src'
-require('../../' + JSCLASS_PATH + '/loader')
+var JS = require('../../' + JSCLASS_PATH + '/loader')
 
 JS.require('JS.Test', function(Test) {
   var options  = require('nopt')({format: String}),

diff --git a/test/examples/tracing.js b/test/examples/tracing.js
@@ -15,7 +15,7 @@ if (this.ActiveXObject) load = function(path) {
 })()
 
 if (typeof require === 'function') {
-  require('../../' + JSCLASS_PATH + 'loader')
+  var JS = require('../../' + JSCLASS_PATH + 'loader')
 } else {
   load(JSCLASS_PATH + 'loader.js')
 }

diff --git a/test/phantom.js b/test/phantom.js
@@ -1,7 +1,7 @@
 JSCLASS_PATH = '../build/src'
-require(JSCLASS_PATH + '/loader')
+var pkg = require(JSCLASS_PATH + '/loader')
 
-JS.require('JS.Test', function(Test) {
+pkg.require('JS.Test', function(Test) {
   var page     = new WebPage(),
       reporter = new Test.Reporters.PhantomJS({}, page)
 

diff --git a/test/runner.js b/test/runner.js
@@ -1,9 +1,10 @@
-JS.ENV.CWD = (typeof CWD === 'undefined') ? '.' : CWD
+PKG = (typeof PKG === 'object') ? PKG : JS
+PKG.ENV.CWD = (typeof CWD === 'undefined') ? '.' : CWD
 
-JS.cacheBust = true
+PKG.cacheBust = true
-if (JS.ENV.JS_DEBUG) JS.debug = true
+if (PKG.ENV.JS_DEBUG) PKG.debug = true
 
-JS.packages(function() { with(this) {
+PKG.packages(function() { with(this) {
   autoload(/^(.*)Spec$/, {from: CWD + '/test/specs', require: 'JS.$1'})
 
   pkg('Test.UnitSpec').requires('JS.Set', 'JS.Observable')
@@ -15,9 +16,10 @@ JS.packages(function() { with(this) {
   pkg('Test.MockingSpec').requires('TestSpecHelpers')
 }})
 
-JS.require('JS', 'JS.Test', function(js, Test) {
+PKG.require('JS', 'JS.Test', function(JS, Test) {
-  js.extend(JS, js)
+  PKG.ENV.JS = JS
-  JS.Test = Test
+  JS.Package = PKG.Package
+  JS.Test    = Test
 
   var specs = [ 'Test.UnitSpec',
                 'Test.ContextSpec',
@@ -51,6 +53,6 @@ JS.require('JS', 'JS.Test', function(js, Test) {
 
   specs = Test.filter(specs, 'Spec')
   specs.push(function() { Test.autorun() })
-  JS.require.apply(JS, specs)
+  PKG.require.apply(PKG, specs)
 })