From 7b6aed1b004ece367dd8cb50b58aa36c463aeab9 Mon Sep 17 00:00:00 2001 From: Piotr Walczyszyn Date: Tue, 12 Jun 2012 09:54:03 -0700 Subject: [PATCH] - upgraded to almond 0.1.1 - updated BackStack version to 0.1.1 --- backstack-min.js | 26 +- backstack.js | 189 +- build/{almond-0.0.3.js => almond.js} | 131 +- build/build.js | 4 +- build/r.js | 10782 ++++++++++++++++++++----- build/wrap-end.frag | 8 +- build/wrap-start.frag | 18 +- 7 files changed, 9064 insertions(+), 2094 deletions(-) rename build/{almond-0.0.3.js => almond.js} (70%) diff --git a/backstack-min.js b/backstack-min.js index a63e76f..8c2f88a 100644 --- a/backstack-min.js +++ b/backstack-min.js @@ -1 +1,25 @@ -(function(a,b){typeof exports!="undefined"?b(a,exports,require("underscore"),require("jquery"),require("Backbone")):typeof define=="function"&&define.amd?define(["underscore","jquery","Backbone","exports"],function(c,d,e,f){a.BackStack=b(a,f,c,d,e)}):a.BackStack=b(a,{},a._,a.jQuery||a.Zepto||a.ender,a.Backbone)})(this,function(a,b,c,d,e){var f,g,h;return function(a){function j(a,b){if(a&&a.charAt(0)==="."&&b){b=b.split("/"),b=b.slice(0,b.length-1),a=b.concat(a.split("/"));var c,d;for(c=0;d=a[c];c++)if(d===".")a.splice(c,1),c-=1;else if(d==="..")if(c!==1||a[2]!==".."&&a[0]!=="..")c>0&&(a.splice(c-1,2),c-=2);else break;a=a.join("/")}return a}function k(b,c){return function(){return i.apply(a,d.call(arguments,0).concat([b,c]))}}function l(a){return function(b){return j(b,a)}}function m(a){return function(c){b[a]=c}}function n(d){if(c.hasOwnProperty(d)){var f=c[d];delete c[d],e.apply(a,f)}return b[d]}function o(a,b){var c,d,e=a.indexOf("!");return e!==-1?(c=j(a.slice(0,e),b),a=a.slice(e+1),d=n(c),d&&d.normalize?a=d.normalize(a,l(b)):a=j(a,b)):a=j(a,b),{f:c?c+"!"+a:a,n:a,p:d}}var b={},c={},d=[].slice,e,i;if(typeof h=="function")return;e=function(d,e,f,g){var h=[],i,j,l,p,q,r;g||(g=d);if(typeof f=="function"){!e.length&&f.length&&(e=["require","exports","module"]);for(p=0;p=0){h--;var g=d(a.target);g.css(j,""),g.css(k,""),b&&b[0]==a.target&&b.css("left",0),h==0&&c&&(f&&clearTimeout(f),c.call(e))}};a&&(h++,a.one(g.transitionEndEvent,l),a.css("left",0),a.css(k,[j," ",g.fromViewTransitionProps.duration,"s ",g.fromViewTransitionProps.easing," ",g.fromViewTransitionProps.delay,"s"].join(""))),b&&(h++,b.one(g.transitionEndEvent,l),b.css("left",g.direction=="left"?e.$el.width():-e.$el.width()),b.css(k,[j," ",g.toViewTransitionProps.duration,"s ",g.toViewTransitionProps.easing," ",g.toViewTransitionProps.delay,"s"].join("")),b.css("visibility","visible"));if(a||b)e.$el.css("width"),i="translate3d("+(g.direction=="left"?-e.$el.width():e.$el.width())+"px, 0, 0)";var m=Math.max(g.fromViewTransitionProps.duration,g.toViewTransitionProps.duration)+Math.max(g.fromViewTransitionProps.delay,g.toViewTransitionProps.delay);f=setTimeout(function(){h>0&&(h=-1,console.log("Warning "+g.transitionEndEvent+" didn't trigger in expected time!"),b&&(b.off(g.transitionEndEvent,l),b.css(k,""),b.css(j,""),b.css("left",0)),a&&(a.off(g.transitionEndEvent,l),a.css(k,""),a.css(j,"")),c.call(e))},m*1.5*1e3);var n;a&&b?n=a.add(b):b?n=b:a&&(n=a),n&&n.css(j,i)}});return b}),h("StackNavigator",["effects/SlideEffect"],function(a){function b(a,b){a.__backStackRendered__?a.$el.css({visibility:"hidden"}):(a.stackNavigator=b,typeof a.destructionPolicy=="undefined"&&(a.destructionPolicy="auto"),a.$el.css({position:"absolute",visibility:"hidden",overflow:"hidden",width:"100%",height:"100%"})),b.$el.append(a.el),a.__backStackRendered__||(a.render.call(a),a.__backStackRendered__=!0)}function d(a,b,d){return c.extend({type:a,cancelable:c.isUndefined(d)?!1:d,preventDefault:function(){this.cancelable&&(this.isDefaultPrevented=function(){return!0})},isDefaultPrevented:function(){return!1},trigger:function(a){return a.trigger(this.type,this),this}},b)}function f(e,f,g,h){b(f.instance,this),h=h||this.defaultPushTransition||(this.defaultPushTransition=new a({direction:"left"})),h.play(e?e.instance.$el:null,f.instance.$el,function(){var a=g>0?this.viewsStack.splice(this.viewsStack.length-g,g):e?[e]:null;c.each(a,function(a){d("viewDeactivate",{target:a.instance}).trigger(a.instance),a.instance.destructionPolicy=="never"?a.instance.$el.detach():(a.instance.remove(),a.instance=null)},this),this.viewsStack.push(f),this.activeView=f.instance,d("viewActivate",{target:f.instance}).trigger(f.instance),d("viewChanged",{target:this}).trigger(this),m.call(this)},this)}function g(e,f,g,h){f&&(f.instance=f.instance?f.instance:new f.viewClass(f.options),b(f.instance,this)),h=h||this.defaultPopTransition||(this.defaultPopTransition=new a({direction:"right"})),h.play(e.instance.$el,f?f.instance.$el:null,function(){var a=this.viewsStack.splice(this.viewsStack.length-g,g);c.each(a,function(a){d("viewDeactivate",{target:a.instance}).trigger(a.instance),a.instance.destructionPolicy=="never"?a.instance.$el.detach():(a.instance.remove(),a.instance=null)},this),f?(this.activeView=f.instance,d("viewActivate",{target:f.instance}).trigger(f.instance)):this.activeView=null,d("viewChanged",{target:this}).trigger(this),m.call(this)},this)}function h(a,b,e){var g=c.last(this.viewsStack),h=c.isFunction(a)?new a(b):a,i={instance:h,viewClass:h.constructor,options:b},j=d("viewChanging",{action:"push",fromViewClass:g?g.viewClass:null,fromView:g?g.instance:null,toViewClass:i.viewClass,toView:i.instance},!0).trigger(this);if(j.isDefaultPrevented())return null;f.call(this,g,i,0,e)}function i(a){if(this.viewsStack.length==0)throw new Error("Popping from an empty stack!");var b=c.last(this.viewsStack),e=this.viewsStack.length>1?this.viewsStack[this.viewsStack.length-2]:null,f=d("viewChanging",{action:"pop",fromViewClass:b.viewClass,fromView:b.instance,toViewClass:e?e.viewClass:null,toView:e?e.instance:null},!0).trigger(this);if(f.isDefaultPrevented())return;g.call(this,b,e,1,a)}function j(a){if(this.viewsStack.length==0)throw new Error("Popping from an empty stack!");var b=c.last(this.viewsStack),e=d("viewChanging",{action:"popAll",fromViewClass:b.viewClass,fromView:b.instance,toViewClass:null,toView:null},!0).trigger(this);if(e.isDefaultPrevented())return;g.call(this,b,null,this.viewsStack.length,a)}function k(a,b,e){if(this.viewsStack.length==0)throw new Error("Replacing on an empty stack!");var g=c.last(this.viewsStack),h=c.isFunction(a)?new a(b):a,i={instance:h,viewClass:h.constructor,options:b},j=d("viewChanging",{action:"replace",fromViewClass:g.viewClass,fromView:g.instance,toViewClass:i.viewClass,toView:i.instance},!0).trigger(this);if(j.isDefaultPrevented())return null;f.call(this,g,i,1,e)}function l(a,b,e){if(this.viewsStack.length==0)throw new Error("Replacing on an empty stack!");var g=c.last(this.viewsStack),h=c.isFunction(a)?new a(b):a,i={instance:h,viewClass:h.constructor,options:b},j=d("viewChanging",{action:"replaceAll",fromViewClass:g.viewClass,fromView:g.instance,toViewClass:i.viewClass,toView:i.instance},!0).trigger(this);if(j.isDefaultPrevented())return null;f.call(this,g,i,this.viewsStack.length,e)}function m(){this.actionsQueue.splice(0,1);if(this.actionsQueue.length>0){var a=this.actionsQueue[0],b=Array.prototype.slice.call(a.arguments);switch(a.function){case"pushView":h.apply(this,b);break;case"popView":i.apply(this,b);break;case"popAll":j.apply(this,b);break;case"replaceView":k.apply(this,b);break;case"replaceAll":l.apply(this,b)}}}var n=e.View.extend({viewsStack:null,activeView:null,defaultPushTransition:null,defaultPopTransition:null,actionsQueue:null,initialize:function(a){this.$el.css({overflow:"hidden"}),this.viewsStack=[],this.actionsQueue=[],a.popTransition&&(this.defaultPopTransition=a.popTransition),a.pushTransition&&(this.defaultPushTransition=a.pushTransition)},pushView:function(a,b,c){this.actionsQueue.push({"function":"pushView",arguments:arguments}),this.actionsQueue.length==1&&h.call(this,a,b,c)},popView:function(a){this.actionsQueue.push({"function":"popView",arguments:arguments}),this.actionsQueue.length==1&&i.call(this,a)},popAll:function(a){this.actionsQueue.push({"function":"popAll",arguments:arguments}),this.actionsQueue.length==1&&j.call(this,a)},replaceView:function(a,b,c){this.actionsQueue.push({"function":"replaceView",arguments:arguments}),this.actionsQueue.length==1&&k.call(this,a,b,c)},replaceAll:function(a,b,c){this.actionsQueue.push({"function":"replaceAll",arguments:arguments}),this.actionsQueue.length==1&&l.call(this,a,b,c)}});return n}),h("effects/FadeEffect",["effects/Effect"],function(a){var b=a.extend({fromViewTransitionProps:{duration:.4,easing:"linear",delay:.1},toViewTransitionProps:{duration:.4,easing:"linear",delay:.1},play:function(a,b,c,e){var f=this,g,h=0,i=f.vendorPrefix==""?"transition":["-"+f.vendorPrefix.toLowerCase(),"-","transition"].join(""),j=function(a){h>=0&&(h--,d(a.target).css(i,""),h==0&&c&&(g&&clearTimeout(g),c.call(e)))};a&&(h++,a.one(f.transitionEndEvent,j),a.css(i,["opacity ",f.fromViewTransitionProps.duration,"s ",f.fromViewTransitionProps.easing," ",f.fromViewTransitionProps.delay,"s"].join(""))),b&&(h++,b.one(f.transitionEndEvent,j),b.css("opacity",0),b.css(i,["opacity ",f.toViewTransitionProps.duration,"s ",f.toViewTransitionProps.easing," ",f.toViewTransitionProps.delay,"s"].join("")),b.css("visibility","visible")),e.$el.css("width");var k=Math.max(f.fromViewTransitionProps.duration,f.toViewTransitionProps.duration)+Math.max(f.fromViewTransitionProps.delay,f.toViewTransitionProps.delay);g=setTimeout(function(){h>0&&(h=-1,console.log("Warning "+f.transitionEndEvent+" didn't trigger in expected time!"),b&&(b.off(f.transitionEndEvent,j),b.css(i,"")),a&&(a.off(f.transitionEndEvent,j),a.css(i,"")),c.call(e))},k*1.5*1e3),b&&b.css("opacity",1),a&&a.css("opacity",0)}});return b}),h("BackStack",["StackNavigator","effects/Effect","effects/NoEffect","effects/SlideEffect","effects/FadeEffect"],function(a,c,d,e,f){return b.StackNavigator=a,b.Effect=c,b.NoEffect=d,b.SlideEffect=e,b.FadeEffect=f,b}),b}) \ No newline at end of file +////////////////////////////////////////////////////////////////////////////////////// +// +// Copyright 2012 Piotr Walczyszyn (http://outof.me | @pwalczyszyn) +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +////////////////////////////////////////////////////////////////////////////////////// + +/** + * almond 0.1.1 Copyright (c) 2011, The Dojo Foundation All Rights Reserved. + * Available via the MIT or new BSD license. + * see: http://github.com/jrburke/almond for details + */ + +(function(a,b){typeof define=="function"&&define.amd?define(["jquery","underscore","Backbone"],b):a.BackStack=b(a.jQuery||a.Zepto||a.ender,a._,a.Backbone)})(this,function(a,b,c){var d,e,f;return function(a){function l(a,b){var c=b&&b.split("/"),d=g.map,e=d&&d["*"]||{},f,h,i,j,k,l,m;if(a&&a.charAt(0)==="."&&b){c=c.slice(0,c.length-1),a=c.concat(a.split("/"));for(k=0;m=a[k];k++)if(m===".")a.splice(k,1),k-=1;else if(m===".."){if(k===1&&(a[2]===".."||a[0]===".."))return!0;k>0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}if((c||e)&&d){f=a.split("/");for(k=f.length;k>0;k-=1){h=f.slice(0,k).join("/");if(c)for(l=c.length;l>0;l-=1){i=d[c.slice(0,l).join("/")];if(i){i=i[h];if(i){j=i;break}}}j=j||e[h];if(j){f.splice(0,k,j),a=f.join("/");break}}}return a}function m(b,c){return function(){return k.apply(a,i.call(arguments,0).concat([b,c]))}}function n(a){return function(b){return l(b,a)}}function o(a){return function(c){b[a]=c}}function p(d){if(c.hasOwnProperty(d)){var e=c[d];delete c[d],h[d]=!0,j.apply(a,e)}if(!b.hasOwnProperty(d))throw new Error("No "+d);return b[d]}function q(a,b){var c,d,e=a.indexOf("!");return e!==-1?(c=l(a.slice(0,e),b),a=a.slice(e+1),d=p(c),d&&d.normalize?a=d.normalize(a,n(b)):a=l(a,b)):a=l(a,b),{f:c?c+"!"+a:a,n:a,p:d}}function r(a){return function(){return g&&g.config&&g.config[a]||{}}}var b={},c={},g={},h={},i=[].slice,j,k;j=function(d,e,f,g){var i=[],j,k,l,n,s,t;g=g||d;if(typeof f=="function"){e=!e.length&&f.length?["require","exports","module"]:e;for(t=0;t=0){h--;var g=a(b.target);g.css(j,""),g.css(k,""),c&&c[0]==b.target&&c.css("left",0),h==0&&d&&(f&&clearTimeout(f),d.call(e))}};b&&(h++,b.one(g.transitionEndEvent,l),b.css("left",0),b.css(k,[j," ",g.fromViewTransitionProps.duration,"s ",g.fromViewTransitionProps.easing," ",g.fromViewTransitionProps.delay,"s"].join(""))),c&&(h++,c.one(g.transitionEndEvent,l),c.css("left",g.direction=="left"?e.$el.width():-e.$el.width()),c.css(k,[j," ",g.toViewTransitionProps.duration,"s ",g.toViewTransitionProps.easing," ",g.toViewTransitionProps.delay,"s"].join("")),c.css("visibility","visible"));if(b||c)e.$el.css("width"),i="translate3d("+(g.direction=="left"?-e.$el.width():e.$el.width())+"px, 0, 0)";var m=Math.max(g.fromViewTransitionProps.duration,g.toViewTransitionProps.duration)+Math.max(g.fromViewTransitionProps.delay,g.toViewTransitionProps.delay);f=setTimeout(function(){h>0&&(h=-1,console.log("Warning "+g.transitionEndEvent+" didn't trigger in expected time!"),c&&(c.off(g.transitionEndEvent,l),c.css(k,""),c.css(j,""),c.css("left",0)),b&&(b.off(g.transitionEndEvent,l),b.css(k,""),b.css(j,"")),d.call(e))},m*1.5*1e3);var n;b&&c?n=b.add(c):c?n=c:b&&(n=b),n&&n.css(j,i)}});return c}),f("StackNavigator",["effects/SlideEffect"],function(a){function d(a,b){a.__backStackRendered__?a.$el.css({visibility:"hidden"}):(a.stackNavigator=b,typeof a.destructionPolicy=="undefined"&&(a.destructionPolicy="auto"),a.$el.css({position:"absolute",visibility:"hidden",overflow:"hidden",width:"100%",height:"100%"})),b.$el.append(a.el),a.__backStackRendered__||(a.render.call(a),a.__backStackRendered__=!0)}function e(a,c,d){return b.extend({type:a,cancelable:b.isUndefined(d)?!1:d,preventDefault:function(){this.cancelable&&(this.isDefaultPrevented=function(){return!0})},isDefaultPrevented:function(){return!1},trigger:function(a){return a.trigger(this.type,this),this}},c)}function f(c,f,g,h){d(f.instance,this),h=h||this.defaultPushTransition||(this.defaultPushTransition=new a({direction:"left"})),h.play(c?c.instance.$el:null,f.instance.$el,function(){var a=g>0?this.viewsStack.splice(this.viewsStack.length-g,g):c?[c]:null;b.each(a,function(a){e("viewDeactivate",{target:a.instance}).trigger(a.instance),a.instance.destructionPolicy=="never"?a.instance.$el.detach():(a.instance.remove(),a.instance=null)},this),this.viewsStack.push(f),this.activeView=f.instance,e("viewActivate",{target:f.instance}).trigger(f.instance),e("viewChanged",{target:this}).trigger(this),m.call(this)},this)}function g(c,f,g,h){f&&(f.instance=f.instance?f.instance:new f.viewClass(f.options),d(f.instance,this)),h=h||this.defaultPopTransition||(this.defaultPopTransition=new a({direction:"right"})),h.play(c.instance.$el,f?f.instance.$el:null,function(){var a=this.viewsStack.splice(this.viewsStack.length-g,g);b.each(a,function(a){e("viewDeactivate",{target:a.instance}).trigger(a.instance),a.instance.destructionPolicy=="never"?a.instance.$el.detach():(a.instance.remove(),a.instance=null)},this),f?(this.activeView=f.instance,e("viewActivate",{target:f.instance}).trigger(f.instance)):this.activeView=null,e("viewChanged",{target:this}).trigger(this),m.call(this)},this)}function h(a,c,d){var g=b.last(this.viewsStack),h=b.isFunction(a)?new a(c):a,i={instance:h,viewClass:h.constructor,options:c},j=e("viewChanging",{action:"push",fromViewClass:g?g.viewClass:null,fromView:g?g.instance:null,toViewClass:i.viewClass,toView:i.instance},!0).trigger(this);if(j.isDefaultPrevented())return null;f.call(this,g,i,0,d)}function i(a){if(this.viewsStack.length==0)throw new Error("Popping from an empty stack!");var c=b.last(this.viewsStack),d=this.viewsStack.length>1?this.viewsStack[this.viewsStack.length-2]:null,f=e("viewChanging",{action:"pop",fromViewClass:c.viewClass,fromView:c.instance,toViewClass:d?d.viewClass:null,toView:d?d.instance:null},!0).trigger(this);if(f.isDefaultPrevented())return;g.call(this,c,d,1,a)}function j(a){if(this.viewsStack.length==0)throw new Error("Popping from an empty stack!");var c=b.last(this.viewsStack),d=e("viewChanging",{action:"popAll",fromViewClass:c.viewClass,fromView:c.instance,toViewClass:null,toView:null},!0).trigger(this);if(d.isDefaultPrevented())return;g.call(this,c,null,this.viewsStack.length,a)}function k(a,c,d){if(this.viewsStack.length==0)throw new Error("Replacing on an empty stack!");var g=b.last(this.viewsStack),h=b.isFunction(a)?new a(c):a,i={instance:h,viewClass:h.constructor,options:c},j=e("viewChanging",{action:"replace",fromViewClass:g.viewClass,fromView:g.instance,toViewClass:i.viewClass,toView:i.instance},!0).trigger(this);if(j.isDefaultPrevented())return null;f.call(this,g,i,1,d)}function l(a,c,d){if(this.viewsStack.length==0)throw new Error("Replacing on an empty stack!");var g=b.last(this.viewsStack),h=b.isFunction(a)?new a(c):a,i={instance:h,viewClass:h.constructor,options:c},j=e("viewChanging",{action:"replaceAll",fromViewClass:g.viewClass,fromView:g.instance,toViewClass:i.viewClass,toView:i.instance},!0).trigger(this);if(j.isDefaultPrevented())return null;f.call(this,g,i,this.viewsStack.length,d)}function m(){this.actionsQueue.splice(0,1);if(this.actionsQueue.length>0){var a=this.actionsQueue[0],b=Array.prototype.slice.call(a.arguments);switch(a.function){case"pushView":h.apply(this,b);break;case"popView":i.apply(this,b);break;case"popAll":j.apply(this,b);break;case"replaceView":k.apply(this,b);break;case"replaceAll":l.apply(this,b)}}}var n=c.View.extend({viewsStack:null,activeView:null,defaultPushTransition:null,defaultPopTransition:null,actionsQueue:null,initialize:function(a){this.$el.css({overflow:"hidden"}),this.viewsStack=[],this.actionsQueue=[],a.popTransition&&(this.defaultPopTransition=a.popTransition),a.pushTransition&&(this.defaultPushTransition=a.pushTransition)},pushView:function(a,b,c){this.actionsQueue.push({"function":"pushView",arguments:arguments}),this.actionsQueue.length==1&&h.call(this,a,b,c)},popView:function(a){this.actionsQueue.push({"function":"popView",arguments:arguments}),this.actionsQueue.length==1&&i.call(this,a)},popAll:function(a){this.actionsQueue.push({"function":"popAll",arguments:arguments}),this.actionsQueue.length==1&&j.call(this,a)},replaceView:function(a,b,c){this.actionsQueue.push({"function":"replaceView",arguments:arguments}),this.actionsQueue.length==1&&k.call(this,a,b,c)},replaceAll:function(a,b,c){this.actionsQueue.push({"function":"replaceAll",arguments:arguments}),this.actionsQueue.length==1&&l.call(this,a,b,c)}});return n}),f("effects/FadeEffect",["effects/Effect"],function(b){var c=b.extend({fromViewTransitionProps:{duration:.4,easing:"linear",delay:.1},toViewTransitionProps:{duration:.4,easing:"linear",delay:.1},play:function(b,c,d,e){var f=this,g,h=0,i=f.vendorPrefix==""?"transition":["-"+f.vendorPrefix.toLowerCase(),"-","transition"].join(""),j=function(b){h>=0&&(h--,a(b.target).css(i,""),h==0&&d&&(g&&clearTimeout(g),d.call(e)))};b&&(h++,b.one(f.transitionEndEvent,j),b.css(i,["opacity ",f.fromViewTransitionProps.duration,"s ",f.fromViewTransitionProps.easing," ",f.fromViewTransitionProps.delay,"s"].join(""))),c&&(h++,c.one(f.transitionEndEvent,j),c.css("opacity",0),c.css(i,["opacity ",f.toViewTransitionProps.duration,"s ",f.toViewTransitionProps.easing," ",f.toViewTransitionProps.delay,"s"].join("")),c.css("visibility","visible")),e.$el.css("width");var k=Math.max(f.fromViewTransitionProps.duration,f.toViewTransitionProps.duration)+Math.max(f.fromViewTransitionProps.delay,f.toViewTransitionProps.delay);g=setTimeout(function(){h>0&&(h=-1,console.log("Warning "+f.transitionEndEvent+" didn't trigger in expected time!"),c&&(c.off(f.transitionEndEvent,j),c.css(i,"")),b&&(b.off(f.transitionEndEvent,j),b.css(i,"")),d.call(e))},k*1.5*1e3),c&&c.css("opacity",1),b&&b.css("opacity",0)}});return c}),f("effects/NoEffect",["effects/Effect"],function(a){var b=a.extend();return b.prototype.play=function(a,b,c,d){b&&b.css("visibility","visible"),c.call(d)},b}),{StackNavigator:e("StackNavigator"),Effect:e("effects/Effect"),NoEffect:e("effects/NoEffect"),SlideEffect:e("effects/SlideEffect"),FadeEffect:e("effects/FadeEffect")}}) \ No newline at end of file diff --git a/backstack.js b/backstack.js index 5797fe6..f31ab93 100644 --- a/backstack.js +++ b/backstack.js @@ -20,45 +20,34 @@ (function (root, factory) { // Set up BackStack appropriately for the environment. - if (typeof exports !== 'undefined') { - // Node/CommonJS, no need for jQuery in that case. - factory(root, exports, require('underscore'), require('jquery'), require('Backbone')); - } else if (typeof define === 'function' && define.amd) { + if (typeof define === 'function' && define.amd) { // AMD - define(['underscore', 'jquery', 'Backbone', 'exports'], - function (_, $, Backbone, exports) { - // Export global even in AMD case in case this script is loaded with - // others that may still expect a global Backbone. - root.BackStack = factory(root, exports, _, $, Backbone); - }); + define(['jquery', 'underscore', 'Backbone'], factory); } else { // Browser globals - root.BackStack = factory(root, {}, root._, (root.jQuery || root.Zepto || root.ender), root.Backbone); + root.BackStack = factory((root.jQuery || root.Zepto || root.ender), root._, root.Backbone); } -}(this, function (root, BackStack, _, $, Backbone) { +}(this, function ($, _, Backbone) { /** - * almond 0.0.3 Copyright (c) 2011, The Dojo Foundation All Rights Reserved. + * almond 0.1.1 Copyright (c) 2011, The Dojo Foundation All Rights Reserved. * Available via the MIT or new BSD license. * see: http://github.com/jrburke/almond for details */ -/*jslint strict: false, plusplus: false */ +//Going sloppy to avoid 'use strict' string cost, but strict practices should +//be followed. +/*jslint sloppy: true */ /*global setTimeout: false */ var requirejs, require, define; (function (undef) { - var defined = {}, waiting = {}, + config = {}, + defining = {}, aps = [].slice, main, req; - if (typeof define === "function") { - //If a define is already in play via another AMD loader, - //do not overwrite. - return; - } - /** * Given a relative module name, like ./something, normalize it to * a real name that can be mapped to a path. @@ -68,6 +57,11 @@ var requirejs, require, define; * @returns {String} normalized name */ function normalize(name, baseName) { + var baseParts = baseName && baseName.split("/"), + map = config.map, + starMap = (map && map['*']) || {}, + nameParts, nameSegment, mapValue, foundMap, i, j, part; + //Adjust any relative paths. if (name && name.charAt(0) === ".") { //If have a base name, try to normalize against it, @@ -79,13 +73,11 @@ var requirejs, require, define; //module. For instance, baseName of "one/two/three", maps to //"one/two/three.js", but we want the directory, "one/two" for //this normalization. - baseName = baseName.split("/"); - baseName = baseName.slice(0, baseName.length - 1); + baseParts = baseParts.slice(0, baseParts.length - 1); - name = baseName.concat(name.split("/")); + name = baseParts.concat(name.split("/")); //start trimDots - var i, part; for (i = 0; (part = name[i]); i++) { if (part === ".") { name.splice(i, 1); @@ -98,7 +90,7 @@ var requirejs, require, define; //no path mapping for a path starting with '..'. //This can still fail, but catches the most reasonable //uses of .. - break; + return true; } else if (i > 0) { name.splice(i - 1, 2); i -= 2; @@ -110,6 +102,43 @@ var requirejs, require, define; name = name.join("/"); } } + + //Apply map config if available. + if ((baseParts || starMap) && map) { + nameParts = name.split('/'); + + for (i = nameParts.length; i > 0; i -= 1) { + nameSegment = nameParts.slice(0, i).join("/"); + + if (baseParts) { + //Find the longest baseName segment match in the config. + //So, do joins on the biggest to smallest lengths of baseParts. + for (j = baseParts.length; j > 0; j -= 1) { + mapValue = map[baseParts.slice(0, j).join('/')]; + + //baseName segment has config, find if it has one for + //this name. + if (mapValue) { + mapValue = mapValue[nameSegment]; + if (mapValue) { + //Match, update name to the new value. + foundMap = mapValue; + break; + } + } + } + } + + foundMap = foundMap || starMap[nameSegment]; + + if (foundMap) { + nameParts.splice(0, i, foundMap); + name = nameParts.join('/'); + break; + } + } + } + return name; } @@ -138,8 +167,13 @@ var requirejs, require, define; if (waiting.hasOwnProperty(name)) { var args = waiting[name]; delete waiting[name]; + defining[name] = true; main.apply(undef, args); } + + if (!defined.hasOwnProperty(name)) { + throw new Error('No ' + name); + } return defined[name]; } @@ -175,27 +209,27 @@ var requirejs, require, define; }; } + function makeConfig(name) { + return function () { + return (config && config.config && config.config[name]) || {}; + }; + } + main = function (name, deps, callback, relName) { var args = [], usingExports, - cjsModule, depName, i, ret, map; + cjsModule, depName, ret, map, i; //Use name if no relName - if (!relName) { - relName = name; - } + relName = relName || name; //Call the callback to define the module, if necessary. if (typeof callback === 'function') { - //Default to require, exports, module if no deps if - //the factory arg has any arguments specified. - if (!deps.length && callback.length) { - deps = ['require', 'exports', 'module']; - } - //Pull out the defined dependencies and pass the ordered //values to the callback. + //Default to [require, exports, module] if no deps + deps = !deps.length && callback.length ? ['require', 'exports', 'module'] : deps; for (i = 0; i < deps.length; i++) { map = makeMap(deps[i], relName); depName = map.f; @@ -212,15 +246,16 @@ var requirejs, require, define; cjsModule = args[i] = { id: name, uri: '', - exports: defined[name] + exports: defined[name], + config: makeConfig(name) }; } else if (defined.hasOwnProperty(depName) || waiting.hasOwnProperty(depName)) { args[i] = callDep(depName); } else if (map.p) { map.p.load(map.n, makeRequire(relName, true), makeLoad(depName), {}); args[i] = defined[depName]; - } else { - throw name + ' missing ' + depName; + } else if (!defining[depName]) { + throw new Error(name + ' missing ' + depName); } } @@ -230,9 +265,10 @@ var requirejs, require, define; //If setting exports via "module" is in play, //favor that over return value and exports. After that, //favor a non-undefined return value over exports use. - if (cjsModule && cjsModule.exports !== undef) { + if (cjsModule && cjsModule.exports !== undef && + cjsModule.exports !== defined[name]) { defined[name] = cjsModule.exports; - } else if (!usingExports) { + } else if (ret !== undef || !usingExports) { //Use the return value from the function. defined[name] = ret; } @@ -244,9 +280,8 @@ var requirejs, require, define; } }; - requirejs = req = function (deps, callback, relName, forceSync) { + requirejs = require = req = function (deps, callback, relName, forceSync) { if (typeof deps === "string") { - //Just return the module wanted. In this scenario, the //deps arg is the module name, and second arg (if passed) //is just the relName. @@ -254,17 +289,21 @@ var requirejs, require, define; return callDep(makeMap(deps, callback).f); } else if (!deps.splice) { //deps is a config object, not an array. - //Drop the config stuff on the ground. + config = deps; if (callback.splice) { //callback is an array, which means it is a dependency list. //Adjust args if there are dependencies deps = callback; - callback = arguments[2]; + callback = relName; + relName = null; } else { - deps = []; + deps = undef; } } + //Support require(['a']) + callback = callback || function () {}; + //Simulate async callback; if (forceSync) { main(undef, deps, callback, relName); @@ -281,17 +320,11 @@ var requirejs, require, define; * Just drops the config on the floor, but returns req in case * the config return value is used. */ - req.config = function () { + req.config = function (cfg) { + config = cfg; return req; }; - /** - * Export require as a global, but only if it does not already exist. - */ - if (!require) { - require = req; - } - define = function (name, deps, callback) { //This module may not have dependencies @@ -303,11 +336,7 @@ var requirejs, require, define; deps = []; } - if (define.unordered) { - waiting[name] = [name, deps, callback]; - } else { - main(name, deps, callback); - } + waiting[name] = [name, deps, callback]; }; define.amd = { @@ -395,19 +424,6 @@ define('effects/Effect',['effects/vendorPrefix'], function (vendorPrefix) { return Effect; }); -define('effects/NoEffect',['effects/Effect'], function (Effect) { - - var NoEffect = Effect.extend(); - NoEffect.prototype.play = function ($fromView, $toView, callback, context) { - if ($toView) { - // Showing the view - $toView.css('visibility', 'visible'); - } - callback.call(context); - }; - - return NoEffect; -}); define('effects/SlideEffect',['effects/Effect'], function (Effect) { var SlideEffect = Effect.extend({ @@ -1076,17 +1092,24 @@ define('effects/FadeEffect',['effects/Effect'], function (Effect) { return FadeEffect; }); -define('BackStack',['StackNavigator', 'effects/Effect', 'effects/NoEffect', 'effects/SlideEffect', 'effects/FadeEffect'], - function (StackNavigator, Effect, NoEffect, SlideEffect, FadeEffect) { - - BackStack.StackNavigator = StackNavigator; - BackStack.Effect = Effect; - BackStack.NoEffect = NoEffect; - BackStack.SlideEffect = SlideEffect; - BackStack.FadeEffect = FadeEffect; +define('effects/NoEffect',['effects/Effect'], function (Effect) { - return BackStack; - }); + var NoEffect = Effect.extend(); + NoEffect.prototype.play = function ($fromView, $toView, callback, context) { + if ($toView) { + // Showing the view + $toView.css('visibility', 'visible'); + } + callback.call(context); + }; - return BackStack; + return NoEffect; +}); + return { + StackNavigator : require('StackNavigator'), + Effect : require('effects/Effect'), + NoEffect : require('effects/NoEffect'), + SlideEffect : require('effects/SlideEffect'), + FadeEffect : require('effects/FadeEffect') + }; })); \ No newline at end of file diff --git a/build/almond-0.0.3.js b/build/almond.js similarity index 70% rename from build/almond-0.0.3.js rename to build/almond.js index 613854a..f530767 100644 --- a/build/almond-0.0.3.js +++ b/build/almond.js @@ -1,25 +1,22 @@ /** - * almond 0.0.3 Copyright (c) 2011, The Dojo Foundation All Rights Reserved. + * almond 0.1.1 Copyright (c) 2011, The Dojo Foundation All Rights Reserved. * Available via the MIT or new BSD license. * see: http://github.com/jrburke/almond for details */ -/*jslint strict: false, plusplus: false */ +//Going sloppy to avoid 'use strict' string cost, but strict practices should +//be followed. +/*jslint sloppy: true */ /*global setTimeout: false */ var requirejs, require, define; (function (undef) { - var defined = {}, waiting = {}, + config = {}, + defining = {}, aps = [].slice, main, req; - if (typeof define === "function") { - //If a define is already in play via another AMD loader, - //do not overwrite. - return; - } - /** * Given a relative module name, like ./something, normalize it to * a real name that can be mapped to a path. @@ -29,6 +26,11 @@ var requirejs, require, define; * @returns {String} normalized name */ function normalize(name, baseName) { + var baseParts = baseName && baseName.split("/"), + map = config.map, + starMap = (map && map['*']) || {}, + nameParts, nameSegment, mapValue, foundMap, i, j, part; + //Adjust any relative paths. if (name && name.charAt(0) === ".") { //If have a base name, try to normalize against it, @@ -40,13 +42,11 @@ var requirejs, require, define; //module. For instance, baseName of "one/two/three", maps to //"one/two/three.js", but we want the directory, "one/two" for //this normalization. - baseName = baseName.split("/"); - baseName = baseName.slice(0, baseName.length - 1); + baseParts = baseParts.slice(0, baseParts.length - 1); - name = baseName.concat(name.split("/")); + name = baseParts.concat(name.split("/")); //start trimDots - var i, part; for (i = 0; (part = name[i]); i++) { if (part === ".") { name.splice(i, 1); @@ -59,7 +59,7 @@ var requirejs, require, define; //no path mapping for a path starting with '..'. //This can still fail, but catches the most reasonable //uses of .. - break; + return true; } else if (i > 0) { name.splice(i - 1, 2); i -= 2; @@ -71,6 +71,43 @@ var requirejs, require, define; name = name.join("/"); } } + + //Apply map config if available. + if ((baseParts || starMap) && map) { + nameParts = name.split('/'); + + for (i = nameParts.length; i > 0; i -= 1) { + nameSegment = nameParts.slice(0, i).join("/"); + + if (baseParts) { + //Find the longest baseName segment match in the config. + //So, do joins on the biggest to smallest lengths of baseParts. + for (j = baseParts.length; j > 0; j -= 1) { + mapValue = map[baseParts.slice(0, j).join('/')]; + + //baseName segment has config, find if it has one for + //this name. + if (mapValue) { + mapValue = mapValue[nameSegment]; + if (mapValue) { + //Match, update name to the new value. + foundMap = mapValue; + break; + } + } + } + } + + foundMap = foundMap || starMap[nameSegment]; + + if (foundMap) { + nameParts.splice(0, i, foundMap); + name = nameParts.join('/'); + break; + } + } + } + return name; } @@ -99,8 +136,13 @@ var requirejs, require, define; if (waiting.hasOwnProperty(name)) { var args = waiting[name]; delete waiting[name]; + defining[name] = true; main.apply(undef, args); } + + if (!defined.hasOwnProperty(name)) { + throw new Error('No ' + name); + } return defined[name]; } @@ -136,27 +178,27 @@ var requirejs, require, define; }; } + function makeConfig(name) { + return function () { + return (config && config.config && config.config[name]) || {}; + }; + } + main = function (name, deps, callback, relName) { var args = [], usingExports, - cjsModule, depName, i, ret, map; + cjsModule, depName, ret, map, i; //Use name if no relName - if (!relName) { - relName = name; - } + relName = relName || name; //Call the callback to define the module, if necessary. if (typeof callback === 'function') { - //Default to require, exports, module if no deps if - //the factory arg has any arguments specified. - if (!deps.length && callback.length) { - deps = ['require', 'exports', 'module']; - } - //Pull out the defined dependencies and pass the ordered //values to the callback. + //Default to [require, exports, module] if no deps + deps = !deps.length && callback.length ? ['require', 'exports', 'module'] : deps; for (i = 0; i < deps.length; i++) { map = makeMap(deps[i], relName); depName = map.f; @@ -173,15 +215,16 @@ var requirejs, require, define; cjsModule = args[i] = { id: name, uri: '', - exports: defined[name] + exports: defined[name], + config: makeConfig(name) }; } else if (defined.hasOwnProperty(depName) || waiting.hasOwnProperty(depName)) { args[i] = callDep(depName); } else if (map.p) { map.p.load(map.n, makeRequire(relName, true), makeLoad(depName), {}); args[i] = defined[depName]; - } else { - throw name + ' missing ' + depName; + } else if (!defining[depName]) { + throw new Error(name + ' missing ' + depName); } } @@ -191,9 +234,10 @@ var requirejs, require, define; //If setting exports via "module" is in play, //favor that over return value and exports. After that, //favor a non-undefined return value over exports use. - if (cjsModule && cjsModule.exports !== undef) { + if (cjsModule && cjsModule.exports !== undef && + cjsModule.exports !== defined[name]) { defined[name] = cjsModule.exports; - } else if (!usingExports) { + } else if (ret !== undef || !usingExports) { //Use the return value from the function. defined[name] = ret; } @@ -205,9 +249,8 @@ var requirejs, require, define; } }; - requirejs = req = function (deps, callback, relName, forceSync) { + requirejs = require = req = function (deps, callback, relName, forceSync) { if (typeof deps === "string") { - //Just return the module wanted. In this scenario, the //deps arg is the module name, and second arg (if passed) //is just the relName. @@ -215,17 +258,21 @@ var requirejs, require, define; return callDep(makeMap(deps, callback).f); } else if (!deps.splice) { //deps is a config object, not an array. - //Drop the config stuff on the ground. + config = deps; if (callback.splice) { //callback is an array, which means it is a dependency list. //Adjust args if there are dependencies deps = callback; - callback = arguments[2]; + callback = relName; + relName = null; } else { - deps = []; + deps = undef; } } + //Support require(['a']) + callback = callback || function () {}; + //Simulate async callback; if (forceSync) { main(undef, deps, callback, relName); @@ -242,17 +289,11 @@ var requirejs, require, define; * Just drops the config on the floor, but returns req in case * the config return value is used. */ - req.config = function () { + req.config = function (cfg) { + config = cfg; return req; }; - /** - * Export require as a global, but only if it does not already exist. - */ - if (!require) { - require = req; - } - define = function (name, deps, callback) { //This module may not have dependencies @@ -264,11 +305,7 @@ var requirejs, require, define; deps = []; } - if (define.unordered) { - waiting[name] = [name, deps, callback]; - } else { - main(name, deps, callback); - } + waiting[name] = [name, deps, callback]; }; define.amd = { diff --git a/build/build.js b/build/build.js index 3d6c015..ca6691d 100644 --- a/build/build.js +++ b/build/build.js @@ -1,9 +1,9 @@ ({ baseUrl:"../src", paths:{ - "almond":"../build/almond-0.0.3" + "almond":"../build/almond" }, - include:["almond", "BackStack"], + include:["almond", "StackNavigator", "effects/Effect", "effects/FadeEffect", "effects/NoEffect", "effects/SlideEffect"], preserveLicenseComments:true, out:"backstack-built.js", wrap:{ diff --git a/build/r.js b/build/r.js index 50a2386..239ad78 100644 --- a/build/r.js +++ b/build/r.js @@ -1,5 +1,5 @@ /** - * @license r.js 1.0.7 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. + * @license r.js 2.0.1 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. * Available via the MIT or new BSD license. * see: http://github.com/jrburke/requirejs for details */ @@ -11,16 +11,16 @@ * the shell of the r.js file. */ -/*jslint strict: false, evil: true, nomen: false */ +/*jslint evil: true, nomen: true, sloppy: true */ /*global readFile: true, process: false, Packages: false, print: false, -console: false, java: false, module: false */ +console: false, java: false, module: false, requirejsVars */ var requirejs, require, define; (function (console, args, readFileFunc) { var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire, - nodeDefine, exists, reqMain, loadedOptimizedLib, - version = '1.0.7', + nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode, + version = '2.0.1', jsSuffixRegExp = /\.js$/, commandOption = '', useLibLoaded = {}, @@ -70,6 +70,9 @@ var requirejs, require, define; fs = require('fs'); vm = require('vm'); path = require('path'); + //In Node 0.7+ existsSync is on fs. + existsForNode = fs.existsSync || path.existsSync; + nodeRequire = require; nodeDefine = define; reqMain = require.main; @@ -89,7 +92,7 @@ var requirejs, require, define; }; exists = function (fileName) { - return path.existsSync(fileName); + return existsForNode(fileName); }; @@ -102,56 +105,100 @@ var requirejs, require, define; } /** vim: et:ts=4:sw=4:sts=4 - * @license RequireJS 1.0.7 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. + * @license RequireJS 2.0.1 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. * Available via the MIT or new BSD license. * see: http://github.com/jrburke/requirejs for details */ -/*jslint strict: false, plusplus: false, sub: true */ +/*jslint regexp: true, nomen: true */ /*global window, navigator, document, importScripts, jQuery, setTimeout, opera */ -(function () { - //Change this version number for each release. - var version = "1.0.7", +(function (global) { + 'use strict'; + + var version = '2.0.1', commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, - cjsRequireRegExp = /require\(\s*["']([^'"\s]+)["']\s*\)/g, - currDirRegExp = /^\.\//, + cjsRequireRegExp = /require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, jsSuffixRegExp = /\.js$/, + currDirRegExp = /^\.\//, ostring = Object.prototype.toString, ap = Array.prototype, aps = ap.slice, apsp = ap.splice, - isBrowser = !!(typeof window !== "undefined" && navigator && document), - isWebWorker = !isBrowser && typeof importScripts !== "undefined", + isBrowser = !!(typeof window !== 'undefined' && navigator && document), + isWebWorker = !isBrowser && typeof importScripts !== 'undefined', //PS3 indicates loaded and complete, but need to wait for complete - //specifically. Sequence is "loading", "loaded", execution, - // then "complete". The UA check is unfortunate, but not sure how + //specifically. Sequence is 'loading', 'loaded', execution, + // then 'complete'. The UA check is unfortunate, but not sure how //to feature test w/o causing perf issues. readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ? /^complete$/ : /^(complete|loaded)$/, - defContextName = "_", + defContextName = '_', //Oh the tragedy, detecting opera. See the usage of isOpera for reason. - isOpera = typeof opera !== "undefined" && opera.toString() === "[object Opera]", - empty = {}, + isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]', contexts = {}, + cfg = {}, globalDefQueue = [], - interactiveScript = null, - checkLoadedDepth = 0, useInteractive = false, - reservedDependencies = { - require: true, - module: true, - exports: true - }, - req, cfg = {}, currentlyAddingScript, s, head, baseElement, scripts, script, - src, subPath, mainScript, dataMain, globalI, ctx, jQueryCheck, checkLoadedTimeoutId; + req, s, head, baseElement, dataMain, src, + interactiveScript, currentlyAddingScript, mainScript, subPath; function isFunction(it) { - return ostring.call(it) === "[object Function]"; + return ostring.call(it) === '[object Function]'; } function isArray(it) { - return ostring.call(it) === "[object Array]"; + return ostring.call(it) === '[object Array]'; + } + + /** + * Helper function for iterating over an array. If the func returns + * a true value, it will break out of the loop. + */ + function each(ary, func) { + if (ary) { + var i; + for (i = 0; i < ary.length; i += 1) { + if (func(ary[i], i, ary)) { + break; + } + } + } + } + + /** + * Helper function for iterating over an array backwards. If the func + * returns a true value, it will break out of the loop. + */ + function eachReverse(ary, func) { + if (ary) { + var i; + for (i = ary.length - 1; i > -1; i -= 1) { + if (func(ary[i], i, ary)) { + break; + } + } + } + } + + function hasProp(obj, prop) { + return obj.hasOwnProperty(prop); + } + + /** + * Cycles over properties in an object and calls a function for each + * property value. If the function returns a truthy value, then the + * iteration is stopped. + */ + function eachProp(obj, func) { + var prop; + for (prop in obj) { + if (obj.hasOwnProperty(prop)) { + if (func(obj[prop], prop)) { + break; + } + } + } } /** @@ -162,12 +209,64 @@ var requirejs, require, define; * trigger a problem related to that. */ function mixin(target, source, force) { - for (var prop in source) { - if (!(prop in empty) && (!(prop in target) || force)) { - target[prop] = source[prop]; - } + if (source) { + eachProp(source, function (value, prop) { + if (force || !hasProp(target, prop)) { + target[prop] = value; + } + }); + } + } + + //Similar to Function.prototype.bind, but the 'this' object is specified + //first, since it is easier to read/figure out what 'this' will be. + function bind(obj, fn) { + return function () { + return fn.apply(obj, arguments); + }; + } + + function scripts() { + return document.getElementsByTagName('script'); + } + + //Allow getting a global that expressed in + //dot notation, like 'a.b.c'. + function getGlobal(value) { + if (!value) { + return value; } - return req; + var g = global; + each(value.split('.'), function (part) { + g = g[part]; + }); + return g; + } + + function makeContextModuleFunc(func, relMap, enableBuildCallback) { + return function () { + //A version of a require function that passes a moduleName + //value for items that may need to + //look up paths relative to the moduleName + var args = aps.call(arguments, 0), lastArg; + if (enableBuildCallback && + isFunction((lastArg = args[args.length - 1]))) { + lastArg.__requireJsBuild = true; + } + args.push(relMap); + return func.apply(null, args); + }; + } + + function addRequireMethods(req, context, relMap) { + each([ + ['toUrl'], + ['undef'], + ['defined', 'requireDefined'], + ['specified', 'requireSpecified'] + ], function (item) { + req[item[0]] = makeContextModuleFunc(context[item[1] || item[0]], relMap); + }); } /** @@ -178,128 +277,61 @@ var requirejs, require, define; * * @returns {Error} */ - function makeError(id, msg, err) { + function makeError(id, msg, err, requireModules) { var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id); + e.requireType = id; + e.requireModules = requireModules; if (err) { e.originalError = err; } return e; } - /** - * Used to set up package paths from a packagePaths or packages config object. - * @param {Object} pkgs the object to store the new package config - * @param {Array} currentPackages an array of packages to configure - * @param {String} [dir] a prefix dir to use. - */ - function configurePackageDir(pkgs, currentPackages, dir) { - var i, location, pkgObj; - - for (i = 0; (pkgObj = currentPackages[i]); i++) { - pkgObj = typeof pkgObj === "string" ? { name: pkgObj } : pkgObj; - location = pkgObj.location; - - //Add dir to the path, but avoid paths that start with a slash - //or have a colon (indicates a protocol) - if (dir && (!location || (location.indexOf("/") !== 0 && location.indexOf(":") === -1))) { - location = dir + "/" + (location || pkgObj.name); - } - - //Create a brand new object on pkgs, since currentPackages can - //be passed in again, and config.pkgs is the internal transformed - //state for all package configs. - pkgs[pkgObj.name] = { - name: pkgObj.name, - location: location || pkgObj.name, - //Remove leading dot in main, so main paths are normalized, - //and remove any trailing .js, since different package - //envs have different conventions: some use a module name, - //some use a file name. - main: (pkgObj.main || "main") - .replace(currDirRegExp, '') - .replace(jsSuffixRegExp, '') - }; - } - } - - /** - * jQuery 1.4.3-1.5.x use a readyWait/ready() pairing to hold DOM - * ready callbacks, but jQuery 1.6 supports a holdReady() API instead. - * At some point remove the readyWait/ready() support and just stick - * with using holdReady. - */ - function jQueryHoldReady($, shouldHold) { - if ($.holdReady) { - $.holdReady(shouldHold); - } else if (shouldHold) { - $.readyWait += 1; - } else { - $.ready(true); - } - } - - if (typeof define !== "undefined") { + if (typeof define !== 'undefined') { //If a define is already in play via another AMD loader, //do not overwrite. return; } - if (typeof requirejs !== "undefined") { + if (typeof requirejs !== 'undefined') { if (isFunction(requirejs)) { //Do not overwrite and existing requirejs instance. return; - } else { - cfg = requirejs; - requirejs = undefined; } + cfg = requirejs; + requirejs = undefined; } //Allow for a require config object - if (typeof require !== "undefined" && !isFunction(require)) { + if (typeof require !== 'undefined' && !isFunction(require)) { //assume it is a config object. cfg = require; require = undefined; } - /** - * Creates a new context for use in require and define calls. - * Handle most of the heavy lifting. Do not want to use an object - * with prototype here to avoid using "this" in require, in case it - * needs to be used in more super secure envs that do not want this. - * Also there should not be that many contexts in the page. Usually just - * one for the default context, but could be extra for multiversion cases - * or if a package needs a special context for a dependency that conflicts - * with the standard context. - */ function newContext(contextName) { - var context, resume, - config = { + var config = { waitSeconds: 7, - baseUrl: "./", + baseUrl: './', paths: {}, pkgs: {}, - catchError: {} + shim: {} }, + registry = {}, + undefEvents = {}, defQueue = [], - specified = { - "require": true, - "exports": true, - "module": true - }, - urlMap = {}, defined = {}, - loaded = {}, - waiting = {}, - waitAry = [], + urlMap = {}, urlFetched = {}, - managerCounter = 0, - managerCallbacks = {}, - plugins = {}, - //Used to indicate which modules in a build scenario - //need to be full executed. - needFullExec = {}, - fullExec = {}, - resumeDepth = 0; + requireCounter = 1, + unnormalizedCounter = 1, + //Used to track the order in which modules + //should be executed, by the order they + //load. Important for consistent cycle resolution + //behavior. + waitAry = [], + inCheckLoaded, Module, context, handlers, + checkLoadedTimeoutId; /** * Trims the . and .. from an array of path segments. @@ -312,11 +344,12 @@ var requirejs, require, define; */ function trimDots(ary) { var i, part; - for (i = 0; (part = ary[i]); i++) { - if (part === ".") { + for (i = 0; ary[i]; i+= 1) { + part = ary[i]; + if (part === '.') { ary.splice(i, 1); i -= 1; - } else if (part === "..") { + } else if (part === '..') { if (i === 1 && (ary[2] === '..' || ary[0] === '..')) { //End of the line. Keep at least one non-dot //path segment at the front so it can be mapped @@ -339,13 +372,19 @@ var requirejs, require, define; * @param {String} name the relative name * @param {String} baseName a real name that the name arg is relative * to. + * @param {Boolean} applyMap apply the map config to the value. Should + * only be done if this normalization is for a dependency ID. * @returns {String} normalized name */ - function normalize(name, baseName) { - var pkgName, pkgConfig; + function normalize(name, baseName, applyMap) { + var baseParts = baseName && baseName.split('/'), + map = config.map, + starMap = map && map['*'], + pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment, + foundMap; //Adjust any relative paths. - if (name && name.charAt(0) === ".") { + if (name && name.charAt(0) === '.') { //If have a base name, try to normalize against it, //otherwise, assume it is a top-level require that will //be relative to baseUrl in the end. @@ -353,36 +392,99 @@ var requirejs, require, define; if (config.pkgs[baseName]) { //If the baseName is a package name, then just treat it as one //name to concat the name with. - baseName = [baseName]; + baseParts = [baseName]; } else { //Convert baseName to array, and lop off the last part, - //so that . matches that "directory" and not name of the baseName's - //module. For instance, baseName of "one/two/three", maps to - //"one/two/three.js", but we want the directory, "one/two" for + //so that . matches that 'directory' and not name of the baseName's + //module. For instance, baseName of 'one/two/three', maps to + //'one/two/three.js', but we want the directory, 'one/two' for //this normalization. - baseName = baseName.split("/"); - baseName = baseName.slice(0, baseName.length - 1); + baseParts = baseParts.slice(0, baseParts.length - 1); } - name = baseName.concat(name.split("/")); + name = baseParts.concat(name.split('/')); trimDots(name); //Some use of packages may use a . path to reference the - //"main" module name, so normalize for that. + //'main' module name, so normalize for that. pkgConfig = config.pkgs[(pkgName = name[0])]; - name = name.join("/"); + name = name.join('/'); if (pkgConfig && name === pkgName + '/' + pkgConfig.main) { name = pkgName; } - } else if (name.indexOf("./") === 0) { + } else if (name.indexOf('./') === 0) { // No baseName, so this is ID is resolved relative // to baseUrl, pull off the leading dot. name = name.substring(2); } } + + //Apply map config if available. + if (applyMap && (baseParts || starMap) && map) { + nameParts = name.split('/'); + + for (i = nameParts.length; i > 0; i -= 1) { + nameSegment = nameParts.slice(0, i).join('/'); + + if (baseParts) { + //Find the longest baseName segment match in the config. + //So, do joins on the biggest to smallest lengths of baseParts. + for (j = baseParts.length; j > 0; j -= 1) { + mapValue = map[baseParts.slice(0, j).join('/')]; + + //baseName segment has config, find if it has one for + //this name. + if (mapValue) { + mapValue = mapValue[nameSegment]; + if (mapValue) { + //Match, update name to the new value. + foundMap = mapValue; + break; + } + } + } + } + + if (!foundMap && starMap && starMap[nameSegment]) { + foundMap = starMap[nameSegment]; + } + + if (foundMap) { + nameParts.splice(0, i, foundMap); + name = nameParts.join('/'); + break; + } + } + } + return name; } + function removeScript(name) { + if (isBrowser) { + each(scripts(), function (scriptNode) { + if (scriptNode.getAttribute('data-requiremodule') === name && + scriptNode.getAttribute('data-requirecontext') === context.contextName) { + scriptNode.parentNode.removeChild(scriptNode); + return true; + } + }); + } + } + + function hasPathFallback(id) { + var pathConfig = config.paths[id]; + if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) { + removeScript(id); + //Pop off the first array value, since it failed, and + //retry + pathConfig.shift(); + context.undef(id); + context.require([id]); + return true; + } + } + /** * Creates a module mapping that includes plugin prefix, module * name, and path. If parentModuleMap is provided it will @@ -391,15 +493,28 @@ var requirejs, require, define; * @param {String} name the module name * @param {String} [parentModuleMap] parent module map * for the module name, used to resolve relative names. + * @param {Boolean} isNormalized: is the ID already normalized. + * This is true if this call is done for a define() module ID. + * @param {Boolean} applyMap: apply the map config to the ID. + * Should only be true if this map is for a dependency. * * @returns {Object} */ - function makeModuleMap(name, parentModuleMap) { - var index = name ? name.indexOf("!") : -1, + function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) { + var index = name ? name.indexOf('!') : -1, prefix = null, parentName = parentModuleMap ? parentModuleMap.name : null, originalName = name, - normalizedName, url, pluginModule; + isDefine = true, + normalizedName = '', + url, pluginModule, suffix; + + //If no name, then it means it is a require call, generate an + //internal name. + if (!name) { + isDefine = false; + name = '_@r' + (requireCounter += 1); + } if (index !== -1) { prefix = name.substring(0, index); @@ -407,24 +522,24 @@ var requirejs, require, define; } if (prefix) { - prefix = normalize(prefix, parentName); + prefix = normalize(prefix, parentName, applyMap); + pluginModule = defined[prefix]; } //Account for relative paths if there is a base name. if (name) { if (prefix) { - pluginModule = defined[prefix]; if (pluginModule && pluginModule.normalize) { //Plugin is loaded, use its normalize method. normalizedName = pluginModule.normalize(name, function (name) { - return normalize(name, parentName); + return normalize(name, parentName, applyMap); }); } else { - normalizedName = normalize(name, parentName); + normalizedName = normalize(name, parentName, applyMap); } } else { //A regular module. - normalizedName = normalize(name, parentName); + normalizedName = normalize(name, parentName, applyMap); url = urlMap[normalizedName]; if (!url) { @@ -445,50 +560,91 @@ var requirejs, require, define; } } + //If the id is a plugin id that cannot be determined if it needs + //normalization, stamp it with a unique ID so two matching relative + //ids that may conflict can be separate. + suffix = prefix && !pluginModule && !isNormalized ? + '_unnormalized' + (unnormalizedCounter += 1) : + ''; + return { prefix: prefix, name: normalizedName, parentMap: parentModuleMap, + unnormalized: !!suffix, url: url, originalName: originalName, - fullName: prefix ? prefix + "!" + (normalizedName || '') : normalizedName + isDefine: isDefine, + id: (prefix ? + prefix + '!' + normalizedName : + normalizedName) + suffix }; } - /** - * Determine if priority loading is done. If so clear the priorityWait - */ - function isPriorityDone() { - var priorityDone = true, - priorityWait = config.priorityWait, - priorityName, i; - if (priorityWait) { - for (i = 0; (priorityName = priorityWait[i]); i++) { - if (!loaded[priorityName]) { - priorityDone = false; - break; - } + function getModule(depMap) { + var id = depMap.id, + mod = registry[id]; + + if (!mod) { + mod = registry[id] = new context.Module(depMap); + } + + return mod; + } + + function on(depMap, name, fn) { + var id = depMap.id, + mod = registry[id]; + + if (hasProp(defined, id) && + (!mod || mod.defineEmitComplete)) { + if (name === 'defined') { + fn(defined[id]); } - if (priorityDone) { - delete config.priorityWait; + } else { + getModule(depMap).on(name, fn); + } + } + + function onError(err, errback) { + var ids = err.requireModules, + notified = false; + + if (errback) { + errback(err); + } else { + each(ids, function (id) { + var mod = registry[id]; + if (mod) { + //Set error on module, so it skips timeout checks. + mod.error = err; + if (mod.events.error) { + notified = true; + mod.emit('error', err); + } + } + }); + + if (!notified) { + req.onError(err); } } - return priorityDone; } - function makeContextModuleFunc(func, relModuleMap, enableBuildCallback) { - return function () { - //A version of a require function that passes a moduleName - //value for items that may need to - //look up paths relative to the moduleName - var args = aps.call(arguments, 0), lastArg; - if (enableBuildCallback && - isFunction((lastArg = args[args.length - 1]))) { - lastArg.__requireJsBuild = true; - } - args.push(relModuleMap); - return func.apply(null, args); - }; + /** + * Internal method to transfer globalQueue items to this context's + * defQueue. + */ + function takeGlobalQueue() { + //Push all the globalDefQueue items into the context's defQueue + if (globalDefQueue.length) { + //Array splice in the values since the context code has a + //local var ref to defQueue, so cannot just reassign the one + //on context. + apsp.apply(defQueue, + [defQueue.length - 1, 0].concat(globalDefQueue)); + globalDefQueue = []; + } } /** @@ -497,925 +653,785 @@ var requirejs, require, define; * per module because of the implication of path mappings that may * need to be relative to the module name. */ - function makeRequire(relModuleMap, enableBuildCallback, altRequire) { - var modRequire = makeContextModuleFunc(altRequire || context.require, relModuleMap, enableBuildCallback); - - mixin(modRequire, { - nameToUrl: makeContextModuleFunc(context.nameToUrl, relModuleMap), - toUrl: makeContextModuleFunc(context.toUrl, relModuleMap), - defined: makeContextModuleFunc(context.requireDefined, relModuleMap), - specified: makeContextModuleFunc(context.requireSpecified, relModuleMap), - isBrowser: req.isBrowser - }); + function makeRequire(mod, enableBuildCallback, altRequire) { + var relMap = mod && mod.map, + modRequire = makeContextModuleFunc(altRequire || context.require, + relMap, + enableBuildCallback); + + addRequireMethods(modRequire, context, relMap); + modRequire.isBrowser = isBrowser; + return modRequire; } - /* - * Queues a dependency for checking after the loader is out of a - * "paused" state, for example while a script file is being loaded - * in the browser, where it may have many modules defined in it. - */ - function queueDependency(manager) { - context.paused.push(manager); - } - - function execManager(manager) { - var i, ret, err, errFile, errModuleTree, - cb = manager.callback, - map = manager.map, - fullName = map.fullName, - args = manager.deps, - listeners = manager.listeners, - cjsModule; - - //Call the callback to define the module, if necessary. - if (cb && isFunction(cb)) { - if (config.catchError.define) { - try { - ret = req.execCb(fullName, manager.callback, args, defined[fullName]); - } catch (e) { - err = e; - } - } else { - ret = req.execCb(fullName, manager.callback, args, defined[fullName]); - } - - if (fullName) { - //If setting exports via "module" is in play, - //favor that over return value and exports. After that, - //favor a non-undefined return value over exports use. - cjsModule = manager.cjsModule; - if (cjsModule && - cjsModule.exports !== undefined && - //Make sure it is not already the exports value - cjsModule.exports !== defined[fullName]) { - ret = defined[fullName] = manager.cjsModule.exports; - } else if (ret === undefined && manager.usingExports) { - //exports already set the defined value. - ret = defined[fullName]; - } else { - //Use the return value from the function. - defined[fullName] = ret; - //If this module needed full execution in a build - //environment, mark that now. - if (needFullExec[fullName]) { - fullExec[fullName] = true; - } - } + handlers = { + 'require': function (mod) { + return makeRequire(mod); + }, + 'exports': function (mod) { + mod.usingExports = true; + if (mod.map.isDefine) { + return (mod.exports = defined[mod.map.id] = {}); } - } else if (fullName) { - //May just be an object definition for the module. Only - //worry about defining if have a module name. - ret = defined[fullName] = cb; - - //If this module needed full execution in a build - //environment, mark that now. - if (needFullExec[fullName]) { - fullExec[fullName] = true; - } - } - - //Clean up waiting. Do this before error calls, and before - //calling back listeners, so that bookkeeping is correct - //in the event of an error and error is reported in correct order, - //since the listeners will likely have errors if the - //onError function does not throw. - if (waiting[manager.id]) { - delete waiting[manager.id]; - manager.isDone = true; - context.waitCount -= 1; - if (context.waitCount === 0) { - //Clear the wait array used for cycles. - waitAry = []; - } - } - - //Do not need to track manager callback now that it is defined. - delete managerCallbacks[fullName]; - - //Allow instrumentation like the optimizer to know the order - //of modules executed and their dependencies. - if (req.onResourceLoad && !manager.placeholder) { - req.onResourceLoad(context, map, manager.depArray); - } - - if (err) { - errFile = (fullName ? makeModuleMap(fullName).url : '') || - err.fileName || err.sourceURL; - errModuleTree = err.moduleTree; - err = makeError('defineerror', 'Error evaluating ' + - 'module "' + fullName + '" at location "' + - errFile + '":\n' + - err + '\nfileName:' + errFile + - '\nlineNumber: ' + (err.lineNumber || err.line), err); - err.moduleName = fullName; - err.moduleTree = errModuleTree; - return req.onError(err); - } - - //Let listeners know of this manager's value. - for (i = 0; (cb = listeners[i]); i++) { - cb(ret); + }, + 'module': function (mod) { + return (mod.module = { + id: mod.map.id, + uri: mod.map.url, + config: function () { + return (config.config && config.config[mod.map.id]) || {}; + }, + exports: defined[mod.map.id] + }); } + }; - return undefined; - } + function removeWaiting(id) { + //Clean up machinery used for waiting modules. + delete registry[id]; - /** - * Helper that creates a callack function that is called when a dependency - * is ready, and sets the i-th dependency for the manager as the - * value passed to the callback generated by this function. - */ - function makeArgCallback(manager, i) { - return function (value) { - //Only do the work if it has not been done - //already for a dependency. Cycle breaking - //logic in forceExec could mean this function - //is called more than once for a given dependency. - if (!manager.depDone[i]) { - manager.depDone[i] = true; - manager.deps[i] = value; - manager.depCount -= 1; - if (!manager.depCount) { - //All done, execute! - execManager(manager); + each(waitAry, function (mod, i) { + if (mod.map.id === id) { + waitAry.splice(i, 1); + if (!mod.defined) { + context.waitCount -= 1; } + return true; } - }; + }); } - function callPlugin(pluginName, depManager) { - var map = depManager.map, - fullName = map.fullName, - name = map.name, - plugin = plugins[pluginName] || - (plugins[pluginName] = defined[pluginName]), - load; + function findCycle(mod, traced) { + var id = mod.map.id, + depArray = mod.depMaps, + foundModule; - //No need to continue if the manager is already - //in the process of loading. - if (depManager.loading) { + //Do not bother with unitialized modules or not yet enabled + //modules. + if (!mod.inited) { return; } - depManager.loading = true; - - load = function (ret) { - depManager.callback = function () { - return ret; - }; - execManager(depManager); - - loaded[depManager.id] = true; - //The loading of this plugin - //might have placed other things - //in the paused queue. In particular, - //a loader plugin that depends on - //a different plugin loaded resource. - resume(); - }; + //Found the cycle. + if (traced[id]) { + return mod; + } - //Allow plugins to load other code without having to know the - //context or how to "complete" the load. - load.fromText = function (moduleName, text) { - /*jslint evil: true */ - var hasInteractive = useInteractive; + traced[id] = true; - //Indicate a the module is in process of loading. - loaded[moduleName] = false; - context.scriptCount += 1; + //Trace through the dependencies. + each(depArray, function (depMap) { + var depId = depMap.id, + depMod = registry[depId]; - //Indicate this is not a "real" module, so do not track it - //for builds, it does not map to a real file. - context.fake[moduleName] = true; + if (!depMod) { + return; + } - //Turn off interactive script matching for IE for any define - //calls in the text, then turn it back on at the end. - if (hasInteractive) { - useInteractive = false; + if (!depMod.inited || !depMod.enabled) { + //Dependency is not inited, so this cannot + //be used to determine a cycle. + foundModule = null; + delete traced[id]; + return true; } - req.exec(text); + return (foundModule = findCycle(depMod, traced)); + }); - if (hasInteractive) { - useInteractive = true; - } + return foundModule; + } - //Support anonymous modules. - context.completeLoad(moduleName); - }; + function forceExec(mod, traced, uninited) { + var id = mod.map.id, + depArray = mod.depMaps; - //No need to continue if the plugin value has already been - //defined by a build. - if (fullName in defined) { - load(defined[fullName]); - } else { - //Use parentName here since the plugin's name is not reliable, - //could be some weird string with no path that actually wants to - //reference the parentName's path. - plugin.load(name, makeRequire(map.parentMap, true, function (deps, cb) { - var moduleDeps = [], - i, dep, depMap; - //Convert deps to full names and hold on to them - //for reference later, when figuring out if they - //are blocked by a circular dependency. - for (i = 0; (dep = deps[i]); i++) { - depMap = makeModuleMap(dep, map.parentMap); - deps[i] = depMap.fullName; - if (!depMap.prefix) { - moduleDeps.push(deps[i]); - } - } - depManager.moduleDeps = (depManager.moduleDeps || []).concat(moduleDeps); - return context.require(deps, cb); - }), load, config); + if (!mod.inited || !mod.map.isDefine) { + return; } - } - /** - * Adds the manager to the waiting queue. Only fully - * resolved items should be in the waiting queue. - */ - function addWait(manager) { - if (!waiting[manager.id]) { - waiting[manager.id] = manager; - waitAry.push(manager); - context.waitCount += 1; + if (traced[id]) { + return defined[id]; } - } - /** - * Function added to every manager object. Created out here - * to avoid new function creation for each manager instance. - */ - function managerAdd(cb) { - this.listeners.push(cb); - } - - function getManager(map, shouldQueue) { - var fullName = map.fullName, - prefix = map.prefix, - plugin = prefix ? plugins[prefix] || - (plugins[prefix] = defined[prefix]) : null, - manager, created, pluginManager, prefixMap; - - if (fullName) { - manager = managerCallbacks[fullName]; - } - - if (!manager) { - created = true; - manager = { - //ID is just the full name, but if it is a plugin resource - //for a plugin that has not been loaded, - //then add an ID counter to it. - id: (prefix && !plugin ? - (managerCounter++) + '__p@:' : '') + - (fullName || '__r@' + (managerCounter++)), - map: map, - depCount: 0, - depDone: [], - depCallbacks: [], - deps: [], - listeners: [], - add: managerAdd - }; + traced[id] = mod; - specified[manager.id] = true; + each(depArray, function(depMap) { + var depId = depMap.id, + depMod = registry[depId], + value; - //Only track the manager/reuse it if this is a non-plugin - //resource. Also only track plugin resources once - //the plugin has been loaded, and so the fullName is the - //true normalized value. - if (fullName && (!prefix || plugins[prefix])) { - managerCallbacks[fullName] = manager; + if (handlers[depId]) { + return; } - } - //If there is a plugin needed, but it is not loaded, - //first load the plugin, then continue on. - if (prefix && !plugin) { - prefixMap = makeModuleMap(prefix); + if (depMod) { + if (!depMod.inited || !depMod.enabled) { + //Dependency is not inited, + //so this module cannot be + //given a forced value yet. + uninited[id] = true; + return; + } + + //Get the value for the current dependency + value = forceExec(depMod, traced, uninited); - //Clear out defined and urlFetched if the plugin was previously - //loaded/defined, but not as full module (as in a build - //situation). However, only do this work if the plugin is in - //defined but does not have a module export value. - if (prefix in defined && !defined[prefix]) { - delete defined[prefix]; - delete urlFetched[prefixMap.url]; + //Even with forcing it may not be done, + //in particular if the module is waiting + //on a plugin resource. + if (!uninited[depId]) { + mod.defineDepById(depId, value); + } } + }); - pluginManager = getManager(prefixMap, true); - pluginManager.add(function (plugin) { - //Create a new manager for the normalized - //resource ID and have it call this manager when - //done. - var newMap = makeModuleMap(map.originalName, map.parentMap), - normalizedManager = getManager(newMap, true); + mod.check(true); - //Indicate this manager is a placeholder for the real, - //normalized thing. Important for when trying to map - //modules and dependencies, for instance, in a build. - manager.placeholder = true; + return defined[id]; + } - normalizedManager.add(function (resource) { - manager.callback = function () { - return resource; - }; - execManager(manager); - }); - }); - } else if (created && shouldQueue) { - //Indicate the resource is not loaded yet if it is to be - //queued. - loaded[manager.id] = false; - queueDependency(manager); - addWait(manager); - } - - return manager; - } - - function main(inName, depArray, callback, relModuleMap) { - var moduleMap = makeModuleMap(inName, relModuleMap), - name = moduleMap.name, - fullName = moduleMap.fullName, - manager = getManager(moduleMap), - id = manager.id, - deps = manager.deps, - i, depArg, depName, depPrefix, cjsMod; - - if (fullName) { - //If module already defined for context, or already loaded, - //then leave. Also leave if jQuery is registering but it does - //not match the desired version number in the config. - if (fullName in defined || loaded[id] === true || - (fullName === "jquery" && config.jQuery && - config.jQuery !== callback().fn.jquery)) { + function modCheck(mod) { + mod.check(); + } + + function checkLoaded() { + var waitInterval = config.waitSeconds * 1000, + //It is possible to disable the wait interval by using waitSeconds of 0. + expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(), + noLoads = [], + stillLoading = false, + needCycleCheck = true, + map, modId, err, usingPathFallback; + + //Do not bother if this call was a result of a cycle break. + if (inCheckLoaded) { + return; + } + + inCheckLoaded = true; + + //Figure out the state of all the modules. + eachProp(registry, function (mod) { + map = mod.map; + modId = map.id; + + //Skip things that are not enabled or in error state. + if (!mod.enabled) { return; } - //Set specified/loaded here for modules that are also loaded - //as part of a layer, where onScriptLoad is not fired - //for those cases. Do this after the inline define and - //dependency tracing is done. - specified[id] = true; - loaded[id] = true; - - //If module is jQuery set up delaying its dom ready listeners. - if (fullName === "jquery" && callback) { - jQueryCheck(callback()); - } - } - - //Attach real depArray and callback to the manager. Do this - //only if the module has not been defined already, so do this after - //the fullName checks above. IE can call main() more than once - //for a module. - manager.depArray = depArray; - manager.callback = callback; - - //Add the dependencies to the deps field, and register for callbacks - //on the dependencies. - for (i = 0; i < depArray.length; i++) { - depArg = depArray[i]; - //There could be cases like in IE, where a trailing comma will - //introduce a null dependency, so only treat a real dependency - //value as a dependency. - if (depArg) { - //Split the dependency name into plugin and name parts - depArg = makeModuleMap(depArg, (name ? moduleMap : relModuleMap)); - depName = depArg.fullName; - depPrefix = depArg.prefix; - - //Fix the name in depArray to be just the name, since - //that is how it will be called back later. - depArray[i] = depName; - - //Fast path CommonJS standard dependencies. - if (depName === "require") { - deps[i] = makeRequire(moduleMap); - } else if (depName === "exports") { - //CommonJS module spec 1.1 - deps[i] = defined[fullName] = {}; - manager.usingExports = true; - } else if (depName === "module") { - //CommonJS module spec 1.1 - manager.cjsModule = cjsMod = deps[i] = { - id: name, - uri: name ? context.nameToUrl(name, null, relModuleMap) : undefined, - exports: defined[fullName] - }; - } else if (depName in defined && !(depName in waiting) && - (!(fullName in needFullExec) || - (fullName in needFullExec && fullExec[depName]))) { - //Module already defined, and not in a build situation - //where the module is a something that needs full - //execution and this dependency has not been fully - //executed. See r.js's requirePatch.js for more info - //on fullExec. - deps[i] = defined[depName]; - } else { - //Mark this dependency as needing full exec if - //the current module needs full exec. - if (fullName in needFullExec) { - needFullExec[depName] = true; - //Reset state so fully executed code will get - //picked up correctly. - delete defined[depName]; - urlFetched[depArg.url] = false; - } - - //Either a resource that is not loaded yet, or a plugin - //resource for either a plugin that has not - //loaded yet. - manager.depCount += 1; - manager.depCallbacks[i] = makeArgCallback(manager, i); - getManager(depArg, true).add(manager.depCallbacks[i]); + if (!mod.error) { + //If the module should be executed, and it has not + //been inited and time is up, remember it. + if (!mod.inited && expired) { + if (hasPathFallback(modId)) { + usingPathFallback = true; + stillLoading = true; + } else { + noLoads.push(modId); + removeScript(modId); + } + } else if (!mod.inited && mod.fetched && map.isDefine) { + stillLoading = true; + if (!map.prefix) { + //No reason to keep looking for unfinished + //loading. If the only stillLoading is a + //plugin resource though, keep going, + //because it may be that a plugin resource + //is waiting on a non-plugin cycle. + return (needCycleCheck = false); + } } } - } + }); - //Do not bother tracking the manager if it is all done. - if (!manager.depCount) { - //All done, execute! - execManager(manager); - } else { - addWait(manager); + if (expired && noLoads.length) { + //If wait time expired, throw error of unloaded modules. + err = makeError('timeout', 'Load timeout for modules: ' + noLoads, null, noLoads); + err.contextName = context.contextName; + return onError(err); } - } - /** - * Convenience method to call main for a define call that was put on - * hold in the defQueue. - */ - function callDefMain(args) { - main.apply(null, args); - } + //Not expired, check for a cycle. + if (needCycleCheck) { - /** - * jQuery 1.4.3+ supports ways to hold off calling - * calling jQuery ready callbacks until all scripts are loaded. Be sure - * to track it if the capability exists.. Also, since jQuery 1.4.3 does - * not register as a module, need to do some global inference checking. - * Even if it does register as a module, not guaranteed to be the precise - * name of the global. If a jQuery is tracked for this context, then go - * ahead and register it as a module too, if not already in process. - */ - jQueryCheck = function (jqCandidate) { - if (!context.jQuery) { - var $ = jqCandidate || (typeof jQuery !== "undefined" ? jQuery : null); - - if ($) { - //If a specific version of jQuery is wanted, make sure to only - //use this jQuery if it matches. - if (config.jQuery && $.fn.jquery !== config.jQuery) { + each(waitAry, function (mod) { + if (mod.defined) { return; } - if ("holdReady" in $ || "readyWait" in $) { - context.jQuery = $; + var cycleMod = findCycle(mod, {}), + traced = {}; - //Manually create a "jquery" module entry if not one already - //or in process. Note this could trigger an attempt at - //a second jQuery registration, but does no harm since - //the first one wins, and it is the same value anyway. - callDefMain(["jquery", [], function () { - return jQuery; - }]); + if (cycleMod) { + forceExec(cycleMod, traced, {}); - //Ask jQuery to hold DOM ready callbacks. - if (context.scriptCount) { - jQueryHoldReady($, true); - context.jQueryIncremented = true; - } + //traced modules may have been + //removed from the registry, but + //their listeners still need to + //be called. + eachProp(traced, modCheck); } + }); + + //Now that dependencies have + //been satisfied, trigger the + //completion check that then + //notifies listeners. + eachProp(registry, modCheck); + } + + //If still waiting on loads, and the waiting load is something + //other than a plugin resource, or there are still outstanding + //scripts, then just try back later. + if ((!expired || usingPathFallback) && stillLoading) { + //Something is still waiting to load. Wait for it, but only + //if a timeout is not already in effect. + if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) { + checkLoadedTimeoutId = setTimeout(function () { + checkLoadedTimeoutId = 0; + checkLoaded(); + }, 50); } } + + inCheckLoaded = false; + } + + Module = function (map) { + this.events = undefEvents[map.id] || {}; + this.map = map; + this.shim = config.shim[map.id]; + this.depExports = []; + this.depMaps = []; + this.depMatched = []; + this.pluginMaps = {}; + this.depCount = 0; + + /* this.exports this.factory + this.depMaps = [], + this.enabled, this.fetched + */ }; - function findCycle(manager, traced) { - var fullName = manager.map.fullName, - depArray = manager.depArray, - fullyLoaded = true, - i, depName, depManager, result; + Module.prototype = { + init: function(depMaps, factory, errback, options) { + options = options || {}; - if (manager.isDone || !fullName || !loaded[fullName]) { - return result; - } + //Do not do more inits if already done. Can happen if there + //are multiple define calls for the same module. That is not + //a normal, common case, but it is also not unexpected. + if (this.inited) { + return; + } - //Found the cycle. - if (traced[fullName]) { - return manager; - } + this.factory = factory; - traced[fullName] = true; + if (errback) { + //Register for errors on this module. + this.on('error', errback); + } else if (this.events.error) { + //If no errback already, but there are error listeners + //on this module, set up an errback to pass to the deps. + errback = bind(this, function (err) { + this.emit('error', err); + }); + } - //Trace through the dependencies. - if (depArray) { - for (i = 0; i < depArray.length; i++) { - //Some array members may be null, like if a trailing comma - //IE, so do the explicit [i] access and check if it has a value. - depName = depArray[i]; - if (!loaded[depName] && !reservedDependencies[depName]) { - fullyLoaded = false; - break; + each(depMaps, bind(this, function (depMap, i) { + if (typeof depMap === 'string') { + depMap = makeModuleMap(depMap, + (this.map.isDefine ? this.map : this.map.parentMap), + false, + true); + this.depMaps.push(depMap); } - depManager = waiting[depName]; - if (depManager && !depManager.isDone && loaded[depName]) { - result = findCycle(depManager, traced); - if (result) { - break; - } + + var handler = handlers[depMap.id]; + + if (handler) { + this.depExports[i] = handler(this); + return; } - } - if (!fullyLoaded) { - //Discard the cycle that was found, since it cannot - //be forced yet. Also clear this module from traced. - result = undefined; - delete traced[fullName]; - } - } - return result; - } + this.depCount += 1; - function forceExec(manager, traced) { - var fullName = manager.map.fullName, - depArray = manager.depArray, - i, depName, depManager, prefix, prefixManager, value; + on(depMap, 'defined', bind(this, function (depExports) { + this.defineDep(i, depExports); + this.check(); + })); + if (errback) { + on(depMap, 'error', errback); + } + })); - if (manager.isDone || !fullName || !loaded[fullName]) { - return undefined; - } + //Indicate this module has be initialized + this.inited = true; - if (fullName) { - if (traced[fullName]) { - return defined[fullName]; + this.ignore = options.ignore; + + //Could have option to init this module in enabled mode, + //or could have been previously marked as enabled. However, + //the dependencies are not known until init is called. So + //if enabled previously, now trigger dependencies as enabled. + if (options.enabled || this.enabled) { + //Enable this module and dependencies. + //Will call this.check() + this.enable(); + } else { + this.check(); } + }, - traced[fullName] = true; - } + defineDepById: function (id, depExports) { + var i; - //Trace through the dependencies. - if (depArray) { - for (i = 0; i < depArray.length; i++) { - //Some array members may be null, like if a trailing comma - //IE, so do the explicit [i] access and check if it has a value. - depName = depArray[i]; - if (depName) { - //First, make sure if it is a plugin resource that the - //plugin is not blocked. - prefix = makeModuleMap(depName).prefix; - if (prefix && (prefixManager = waiting[prefix])) { - forceExec(prefixManager, traced); - } - depManager = waiting[depName]; - if (depManager && !depManager.isDone && loaded[depName]) { - value = forceExec(depManager, traced); - manager.depCallbacks[i](value); - } + //Find the index for this dependency. + each(this.depMaps, function (map, index) { + if (map.id === id) { + i = index; + return true; } + }); + + return this.defineDep(i, depExports); + }, + + defineDep: function (i, depExports) { + //Because of cycles, defined callback for a given + //export can be called more than once. + if (!this.depMatched[i]) { + this.depMatched[i] = true; + this.depCount -= 1; + this.depExports[i] = depExports; } - } + }, - return defined[fullName]; - } + fetch: function () { + if (this.fetched) { + return; + } + this.fetched = true; - /** - * Checks if all modules for a context are loaded, and if so, evaluates the - * new ones in right dependency order. - * - * @private - */ - function checkLoaded() { - var waitInterval = config.waitSeconds * 1000, - //It is possible to disable the wait interval by using waitSeconds of 0. - expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(), - noLoads = "", hasLoadedProp = false, stillLoading = false, - cycleDeps = [], - i, prop, err, manager, cycleManager, moduleDeps; - - //If there are items still in the paused queue processing wait. - //This is particularly important in the sync case where each paused - //item is processed right away but there may be more waiting. - if (context.pausedCount > 0) { - return undefined; - } - - //Determine if priority loading is done. If so clear the priority. If - //not, then do not check - if (config.priorityWait) { - if (isPriorityDone()) { - //Call resume, since it could have - //some waiting dependencies to trace. - resume(); + context.startTime = (new Date()).getTime(); + + var map = this.map; + + //If the manager is for a plugin managed resource, + //ask the plugin to load it now. + if (map.prefix) { + this.callPlugin(); + } else if (this.shim) { + makeRequire(this, true)(this.shim.deps || [], bind(this, function () { + this.load(); + })); } else { - return undefined; + //Regular dependency. + this.load(); } - } + }, - //See if anything is still in flight. - for (prop in loaded) { - if (!(prop in empty)) { - hasLoadedProp = true; - if (!loaded[prop]) { - if (expired) { - noLoads += prop + " "; - } else { - stillLoading = true; - if (prop.indexOf('!') === -1) { - //No reason to keep looking for unfinished - //loading. If the only stillLoading is a - //plugin resource though, keep going, - //because it may be that a plugin resource - //is waiting on a non-plugin cycle. - cycleDeps = []; - break; + load: function() { + var url = this.map.url; + + //Regular dependency. + if (!urlFetched[url]) { + urlFetched[url] = true; + context.load(this.map.id, url); + } + }, + + /** + * Checks is the module is ready to define itself, and if so, + * define it. If the silent argument is true, then it will just + * define, but not notify listeners, and not ask for a context-wide + * check of all loaded modules. That is useful for cycle breaking. + */ + check: function (silent) { + if (!this.enabled) { + return; + } + + var id = this.map.id, + depExports = this.depExports, + exports = this.exports, + factory = this.factory, + err, cjsModule; + + if (!this.inited) { + this.fetch(); + } else if (this.error) { + this.emit('error', this.error); + } else if (!this.defining) { + //The factory could trigger another require call + //that would result in checking this module to + //define itself again. If already in the process + //of doing that, skip this work. + this.defining = true; + + if (this.depCount < 1 && !this.defined) { + if (isFunction(factory)) { + //If there is an error listener, favor passing + //to that instead of throwing an error. + if (this.events.error) { + try { + exports = context.execCb(id, factory, depExports, exports); + } catch (e) { + err = e; + } } else { - moduleDeps = managerCallbacks[prop] && managerCallbacks[prop].moduleDeps; - if (moduleDeps) { - cycleDeps.push.apply(cycleDeps, moduleDeps); + exports = context.execCb(id, factory, depExports, exports); + } + + if (this.map.isDefine) { + //If setting exports via 'module' is in play, + //favor that over return value and exports. After that, + //favor a non-undefined return value over exports use. + cjsModule = this.module; + if (cjsModule && + cjsModule.exports !== undefined && + //Make sure it is not already the exports value + cjsModule.exports !== this.exports) { + exports = cjsModule.exports; + } else if (exports === undefined && this.usingExports) { + //exports already set the defined value. + exports = this.exports; } } + + if (err) { + err.requireMap = this.map; + err.requireModules = [this.map.id]; + err.requireType = 'define'; + return onError((this.error = err)); + } + + } else { + //Just a literal value + exports = factory; + } + + this.exports = exports; + + if (this.map.isDefine && !this.ignore) { + defined[id] = exports; + + if (req.onResourceLoad) { + req.onResourceLoad(context, this.map, this.depMaps); + } + } + + //Clean up + delete registry[id]; + + this.defined = true; + context.waitCount -= 1; + if (context.waitCount === 0) { + //Clear the wait array used for cycles. + waitAry = []; } } - } - } - //Check for exit conditions. - if (!hasLoadedProp && !context.waitCount) { - //If the loaded object had no items, then the rest of - //the work below does not need to be done. - return undefined; - } - if (expired && noLoads) { - //If wait time expired, throw error of unloaded modules. - err = makeError("timeout", "Load timeout for modules: " + noLoads); - err.requireType = "timeout"; - err.requireModules = noLoads; - err.contextName = context.contextName; - return req.onError(err); - } + //Finished the define stage. Allow calling check again + //to allow define notifications below in the case of a + //cycle. + this.defining = false; - //If still loading but a plugin is waiting on a regular module cycle - //break the cycle. - if (stillLoading && cycleDeps.length) { - for (i = 0; (manager = waiting[cycleDeps[i]]); i++) { - if ((cycleManager = findCycle(manager, {}))) { - forceExec(cycleManager, {}); - break; + if (!silent) { + if (this.defined && !this.defineEmitted) { + this.defineEmitted = true; + this.emit('defined', this.exports); + this.defineEmitComplete = true; + } } } + }, - } + callPlugin: function() { + var map = this.map, + id = map.id, + pluginMap = makeModuleMap(map.prefix, null, false, true); + + on(pluginMap, 'defined', bind(this, function (plugin) { + var name = this.map.name, + parentName = this.map.parentMap ? this.map.parentMap.name : null, + load, normalizedMap, normalizedMod; + + //If current map is not normalized, wait for that + //normalized name to load instead of continuing. + if (this.map.unnormalized) { + //Normalize the ID if the plugin allows it. + if (plugin.normalize) { + name = plugin.normalize(name, function (name) { + return normalize(name, parentName, true); + }) || ''; + } - //If still waiting on loads, and the waiting load is something - //other than a plugin resource, or there are still outstanding - //scripts, then just try back later. - if (!expired && (stillLoading || context.scriptCount)) { - //Something is still waiting to load. Wait for it, but only - //if a timeout is not already in effect. - if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) { - checkLoadedTimeoutId = setTimeout(function () { - checkLoadedTimeoutId = 0; - checkLoaded(); - }, 50); - } - return undefined; - } + normalizedMap = makeModuleMap(map.prefix + '!' + name); + on(normalizedMap, + 'defined', bind(this, function (value) { + this.init([], function () { return value; }, null, { + enabled: true, + ignore: true + }); + })); + normalizedMod = registry[normalizedMap.id]; + if (normalizedMod) { + if (this.events.error) { + normalizedMod.on('error', bind(this, function (err) { + this.emit('error', err); + })); + } + normalizedMod.enable(); + } - //If still have items in the waiting cue, but all modules have - //been loaded, then it means there are some circular dependencies - //that need to be broken. - //However, as a waiting thing is fired, then it can add items to - //the waiting cue, and those items should not be fired yet, so - //make sure to redo the checkLoaded call after breaking a single - //cycle, if nothing else loaded then this logic will pick it up - //again. - if (context.waitCount) { - //Cycle through the waitAry, and call items in sequence. - for (i = 0; (manager = waitAry[i]); i++) { - forceExec(manager, {}); - } + return; + } - //If anything got placed in the paused queue, run it down. - if (context.paused.length) { - resume(); - } + load = bind(this, function (value) { + this.init([], function () { return value; }, null, { + enabled: true + }); + }); - //Only allow this recursion to a certain depth. Only - //triggered by errors in calling a module in which its - //modules waiting on it cannot finish loading, or some circular - //dependencies that then may add more dependencies. - //The value of 5 is a bit arbitrary. Hopefully just one extra - //pass, or two for the case of circular dependencies generating - //more work that gets resolved in the sync node case. - if (checkLoadedDepth < 5) { - checkLoadedDepth += 1; - checkLoaded(); - } - } + load.error = bind(this, function (err) { + this.inited = true; + this.error = err; + err.requireModules = [id]; - checkLoadedDepth = 0; + //Remove temp unnormalized modules for this module, + //since they will never be resolved otherwise now. + eachProp(registry, function (mod) { + if (mod.map.id.indexOf(id + '_unnormalized') === 0) { + removeWaiting(mod.map.id); + } + }); - //Check for DOM ready, and nothing is waiting across contexts. - req.checkReadyState(); + onError(err); + }); - return undefined; - } + //Allow plugins to load other code without having to know the + //context or how to 'complete' the load. + load.fromText = function (moduleName, text) { + /*jslint evil: true */ + var hasInteractive = useInteractive; - /** - * Resumes tracing of dependencies and then checks if everything is loaded. - */ - resume = function () { - var manager, map, url, i, p, args, fullName; + //Turn off interactive script matching for IE for any define + //calls in the text, then turn it back on at the end. + if (hasInteractive) { + useInteractive = false; + } - //Any defined modules in the global queue, intake them now. - context.takeGlobalQueue(); + req.exec(text); - resumeDepth += 1; + if (hasInteractive) { + useInteractive = true; + } - if (context.scriptCount <= 0) { - //Synchronous envs will push the number below zero with the - //decrement above, be sure to set it back to zero for good measure. - //require() calls that also do not end up loading scripts could - //push the number negative too. - context.scriptCount = 0; - } + //Support anonymous modules. + context.completeLoad(moduleName); + }; - //Make sure any remaining defQueue items get properly processed. - while (defQueue.length) { - args = defQueue.shift(); - if (args[0] === null) { - return req.onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1])); - } else { - callDefMain(args); - } - } + //Use parentName here since the plugin's name is not reliable, + //could be some weird string with no path that actually wants to + //reference the parentName's path. + plugin.load(map.name, makeRequire(map.parentMap, true, function (deps, cb) { + return context.require(deps, cb); + }), load, config); + })); - //Skip the resume of paused dependencies - //if current context is in priority wait. - if (!config.priorityWait || isPriorityDone()) { - while (context.paused.length) { - p = context.paused; - context.pausedCount += p.length; - //Reset paused list - context.paused = []; + context.enable(pluginMap, this); + this.pluginMaps[pluginMap.id] = pluginMap; + }, - for (i = 0; (manager = p[i]); i++) { - map = manager.map; - url = map.url; - fullName = map.fullName; + enable: function () { + this.enabled = true; - //If the manager is for a plugin managed resource, - //ask the plugin to load it now. - if (map.prefix) { - callPlugin(map.prefix, manager); - } else { - //Regular dependency. - if (!urlFetched[url] && !loaded[fullName]) { - req.load(context, fullName, url); - - //Mark the URL as fetched, but only if it is - //not an empty: URL, used by the optimizer. - //In that case we need to be sure to call - //load() for each module that is mapped to - //empty: so that dependencies are satisfied - //correctly. - if (url.indexOf('empty:') !== 0) { - urlFetched[url] = true; - } - } - } + if (!this.waitPushed) { + waitAry.push(this); + context.waitCount += 1; + this.waitPushed = true; + } + + //Enable each dependency + each(this.depMaps, bind(this, function (map) { + var id = map.id, + mod = registry[id]; + //Skip special modules like 'require', 'exports', 'module' + //Also, don't call enable if it is already enabled, + //important in circular dependency cases. + if (!handlers[id] && mod && !mod.enabled) { + context.enable(map, this); } + })); + + //Enable each plugin that is used in + //a dependency + eachProp(this.pluginMaps, bind(this, function (pluginMap) { + var mod = registry[pluginMap.id]; + if (mod && !mod.enabled) { + context.enable(pluginMap, this); + } + })); + + this.check(); + }, + + on: function(name, cb) { + var cbs = this.events[name]; + if (!cbs) { + cbs = this.events[name] = []; + } + cbs.push(cb); + }, - //Move the start time for timeout forward. - context.startTime = (new Date()).getTime(); - context.pausedCount -= p.length; + emit: function (name, evt) { + each(this.events[name], function (cb) { + cb(evt); + }); + if (name === 'error') { + //Now that the error handler was triggered, remove + //the listeners, since this broken Module instance + //can stay around for a while in the registry/waitAry. + delete this.events[name]; } } + }; - //Only check if loaded when resume depth is 1. It is likely that - //it is only greater than 1 in sync environments where a factory - //function also then calls the callback-style require. In those - //cases, the checkLoaded should not occur until the resume - //depth is back at the top level. - if (resumeDepth === 1) { - checkLoaded(); + function callGetModule(args) { + getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]); + } + + function removeListener(node, func, name, ieName) { + //Favor detachEvent because of IE9 + //issue, see attachEvent/addEventListener comment elsewhere + //in this file. + if (node.detachEvent && !isOpera) { + //Probably IE. If not it will throw an error, which will be + //useful to know. + if (ieName) { + node.detachEvent(ieName, func); + } + } else { + node.removeEventListener(name, func, false); } + } + + /** + * Given an event from a script node, get the requirejs info from it, + * and then removes the event listeners on the node. + * @param {Event} evt + * @returns {Object} + */ + function getScriptData(evt) { + //Using currentTarget instead of target for Firefox 2.0's sake. Not + //all old browsers will be supported, but this one was easy enough + //to support and still makes sense. + var node = evt.currentTarget || evt.srcElement; - resumeDepth -= 1; + //Remove the listeners once here. + removeListener(node, context.onScriptLoad, 'load', 'onreadystatechange'); + removeListener(node, context.onScriptError, 'error'); - return undefined; - }; + return { + node: node, + id: node && node.getAttribute('data-requiremodule') + }; + } - //Define the context object. Many of these fields are on here - //just to make debugging easier. - context = { - contextName: contextName, + return (context = { config: config, - defQueue: defQueue, - waiting: waiting, - waitCount: 0, - specified: specified, - loaded: loaded, + contextName: contextName, + registry: registry, + defined: defined, urlMap: urlMap, urlFetched: urlFetched, - scriptCount: 0, - defined: defined, - paused: [], - pausedCount: 0, - plugins: plugins, - needFullExec: needFullExec, - fake: {}, - fullExec: fullExec, - managerCallbacks: managerCallbacks, + waitCount: 0, + defQueue: defQueue, + Module: Module, makeModuleMap: makeModuleMap, - normalize: normalize, + /** * Set a configuration for the context. * @param {Object} cfg config object to integrate. */ configure: function (cfg) { - var paths, prop, packages, pkgs, packagePaths, requireWait; - //Make sure the baseUrl ends in a slash. if (cfg.baseUrl) { - if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== "/") { - cfg.baseUrl += "/"; + if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') { + cfg.baseUrl += '/'; } } //Save off the paths and packages since they require special processing, //they are additive. - paths = config.paths; - packages = config.packages; - pkgs = config.pkgs; + var paths = config.paths, + pkgs = config.pkgs, + shim = config.shim, + map = config.map || {}; //Mix in the config values, favoring the new values over //existing ones in context.config. mixin(config, cfg, true); - //Adjust paths if necessary. - if (cfg.paths) { - for (prop in cfg.paths) { - if (!(prop in empty)) { - paths[prop] = cfg.paths[prop]; - } - } - config.paths = paths; + //Merge paths. + mixin(paths, cfg.paths, true); + config.paths = paths; + + //Merge map + if (cfg.map) { + mixin(map, cfg.map, true); + config.map = map; } - packagePaths = cfg.packagePaths; - if (packagePaths || cfg.packages) { - //Convert packagePaths into a packages config. - if (packagePaths) { - for (prop in packagePaths) { - if (!(prop in empty)) { - configurePackageDir(pkgs, packagePaths[prop], prop); - } + //Merge shim + if (cfg.shim) { + eachProp(cfg.shim, function (value, id) { + //Normalize the structure + if (isArray(value)) { + value = { + deps: value + }; } - } + if (value.exports && !value.exports.__buildReady) { + value.exports = context.makeShimExports(value.exports); + } + shim[id] = value; + }); + config.shim = shim; + } - //Adjust packages if necessary. - if (cfg.packages) { - configurePackageDir(pkgs, cfg.packages); - } + //Adjust packages if necessary. + if (cfg.packages) { + each(cfg.packages, function (pkgObj) { + var location; + + pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj; + location = pkgObj.location; + + //Create a brand new object on pkgs, since currentPackages can + //be passed in again, and config.pkgs is the internal transformed + //state for all package configs. + pkgs[pkgObj.name] = { + name: pkgObj.name, + location: location || pkgObj.name, + //Remove leading dot in main, so main paths are normalized, + //and remove any trailing .js, since different package + //envs have different conventions: some use a module name, + //some use a file name. + main: (pkgObj.main || 'main') + .replace(currDirRegExp, '') + .replace(jsSuffixRegExp, '') + }; + }); //Done with modifications, assing packages back to context config config.pkgs = pkgs; } - //If priority loading is in effect, trigger the loads now - if (cfg.priority) { - //Hold on to requireWait value, and reset it after done - requireWait = context.requireWait; - - //Allow tracing some require calls to allow the fetching - //of the priority config. - context.requireWait = false; - //But first, call resume to register any defined modules that may - //be in a data-main built file before the priority config - //call. - resume(); - - context.require(cfg.priority); - - //Trigger a resume right away, for the case when - //the script with the priority load is done as part - //of a data-main call. In that case the normal resume - //call will not happen because the scriptCount will be - //at 1, since the script for data-main is being processed. - resume(); - - //Restore previous state. - context.requireWait = requireWait; - config.priorityWait = cfg.priority; - } - //If a deps array or a config callback is specified, then call //require with those args. This is useful when require is defined as a //config object before require.js is loaded. @@ -1424,77 +1440,133 @@ var requirejs, require, define; } }, - requireDefined: function (moduleName, relModuleMap) { - return makeModuleMap(moduleName, relModuleMap).fullName in defined; + makeShimExports: function (exports) { + var func; + if (typeof exports === 'string') { + func = function () { + return getGlobal(exports); + }; + //Save the exports for use in nodefine checking. + func.exports = exports; + return func; + } else { + return function () { + return exports.apply(global, arguments); + }; + } + }, + + requireDefined: function (id, relMap) { + return hasProp(defined, makeModuleMap(id, relMap, false, true).id); }, - requireSpecified: function (moduleName, relModuleMap) { - return makeModuleMap(moduleName, relModuleMap).fullName in specified; + requireSpecified: function (id, relMap) { + id = makeModuleMap(id, relMap, false, true).id; + return hasProp(defined, id) || hasProp(registry, id); }, - require: function (deps, callback, relModuleMap) { - var moduleName, fullName, moduleMap; - if (typeof deps === "string") { + require: function (deps, callback, errback, relMap) { + var moduleName, id, map, requireMod, args; + if (typeof deps === 'string') { if (isFunction(callback)) { //Invalid call - return req.onError(makeError("requireargs", "Invalid require call")); + return onError(makeError('requireargs', 'Invalid require call'), errback); } //Synchronous access to one module. If require.get is //available (as in the Node adapter), prefer that. //In this case deps is the moduleName and callback is - //the relModuleMap + //the relMap if (req.get) { return req.get(context, deps, callback); } //Just return the module wanted. In this scenario, the - //second arg (if passed) is just the relModuleMap. + //second arg (if passed) is just the relMap. moduleName = deps; - relModuleMap = callback; + relMap = callback; //Normalize module name, if it contains . or .. - moduleMap = makeModuleMap(moduleName, relModuleMap); - fullName = moduleMap.fullName; + map = makeModuleMap(moduleName, relMap, false, true); + id = map.id; - if (!(fullName in defined)) { - return req.onError(makeError("notloaded", "Module name '" + - moduleMap.fullName + - "' has not been loaded yet for context: " + + if (!hasProp(defined, id)) { + return onError(makeError('notloaded', 'Module name "' + + id + + '" has not been loaded yet for context: ' + contextName)); } - return defined[fullName]; + return defined[id]; } - //Call main but only if there are dependencies or - //a callback to call. - if (deps && deps.length || callback) { - main(null, deps, callback, relModuleMap); + //Callback require. Normalize args. if callback or errback is + //not a function, it means it is a relMap. Test errback first. + if (errback && !isFunction(errback)) { + relMap = errback; + errback = undefined; + } + if (callback && !isFunction(callback)) { + relMap = callback; + callback = undefined; } - //If the require call does not trigger anything new to load, - //then resume the dependency processing. - if (!context.requireWait) { - while (!context.scriptCount && context.paused.length) { - resume(); + //Any defined modules in the global queue, intake them now. + takeGlobalQueue(); + + //Make sure any remaining defQueue items get properly processed. + while (defQueue.length) { + args = defQueue.shift(); + if (args[0] === null) { + return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1])); + } else { + //args are id, deps, factory. Should be normalized by the + //define() function. + callGetModule(args); } } + + //Mark all the dependencies as needing to be loaded. + requireMod = getModule(makeModuleMap(null, relMap)); + + requireMod.init(deps, callback, errback, { + enabled: true + }); + + checkLoaded(); + return context.require; }, + undef: function (id) { + var map = makeModuleMap(id, null, true), + mod = registry[id]; + + delete defined[id]; + delete urlMap[id]; + delete urlFetched[map.url]; + delete undefEvents[id]; + + if (mod) { + //Hold on to listeners in case the + //module will be attempted to be reloaded + //using a different config. + if (mod.events.defined) { + undefEvents[id] = mod.events; + } + + removeWaiting(id); + } + }, + /** - * Internal method to transfer globalQueue items to this context's - * defQueue. + * Called to enable a module if it is still in the registry + * awaiting enablement. parent module is passed in for context, + * used by the optimizer. */ - takeGlobalQueue: function () { - //Push all the globalDefQueue items into the context's defQueue - if (globalDefQueue.length) { - //Array splice in the values since the context code has a - //local var ref to defQueue, so cannot just reassign the one - //on context. - apsp.apply(context.defQueue, - [context.defQueue.length - 1, 0].concat(globalDefQueue)); - globalDefQueue = []; + enable: function (depMap, parent) { + var mod = registry[depMap.id]; + if (mod) { + getModule(depMap).enable(); } }, @@ -1505,51 +1577,55 @@ var requirejs, require, define; * @param {String} moduleName the name of the module to potentially complete. */ completeLoad: function (moduleName) { - var args; + var shim = config.shim[moduleName] || {}, + shExports = shim.exports && shim.exports.exports, + found, args, mod; - context.takeGlobalQueue(); + takeGlobalQueue(); while (defQueue.length) { args = defQueue.shift(); - if (args[0] === null) { args[0] = moduleName; - break; + //If already found an anonymous module and bound it + //to this name, then this is some other anon module + //waiting for its completeLoad to fire. + if (found) { + break; + } + found = true; } else if (args[0] === moduleName) { //Found matching define call for this script! - break; - } else { - //Some other named define call, most likely the result - //of a build layer that included many define calls. - callDefMain(args); - args = null; + found = true; } + + callGetModule(args); } - if (args) { - callDefMain(args); - } else { - //A script that does not call define(), so just simulate - //the call for it. Special exception for jQuery dynamic load. - callDefMain([moduleName, [], - moduleName === "jquery" && typeof jQuery !== "undefined" ? - function () { - return jQuery; - } : null]); - } - - //Doing this scriptCount decrement branching because sync envs - //need to decrement after resume, otherwise it looks like - //loading is complete after the first dependency is fetched. - //For browsers, it works fine to decrement after, but it means - //the checkLoaded setTimeout 50 ms cost is taken. To avoid - //that cost, decrement beforehand. - if (req.isAsync) { - context.scriptCount -= 1; - } - resume(); - if (!req.isAsync) { - context.scriptCount -= 1; + + //Do this after the cycle of callGetModule in case the result + //of those calls/init calls changes the registry. + mod = registry[moduleName]; + + if (!found && + !defined[moduleName] && + mod && !mod.inited) { + if (config.enforceDefine && (!shExports || !getGlobal(shExports))) { + if (hasPathFallback(moduleName)) { + return; + } else { + return onError(makeError('nodefine', + 'No define call for ' + moduleName, + null, + [moduleName])); + } + } else { + //A script that does not call define(), so just simulate + //the call for it. + callGetModule([moduleName, (shim.deps || []), shim.exports]); + } } + + checkLoaded(); }, /** @@ -1558,7 +1634,7 @@ var requirejs, require, define; * plain URLs like nameToUrl. */ toUrl: function (moduleNamePlusExt, relModuleMap) { - var index = moduleNamePlusExt.lastIndexOf("."), + var index = moduleNamePlusExt.lastIndexOf('.'), ext = null; if (index !== -1) { @@ -1575,34 +1651,42 @@ var requirejs, require, define; */ nameToUrl: function (moduleName, ext, relModuleMap) { var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url, - config = context.config; + parentPath; //Normalize module name if have a base relative module name to work from. - moduleName = normalize(moduleName, relModuleMap && relModuleMap.fullName); + moduleName = normalize(moduleName, relModuleMap && relModuleMap.id, true); //If a colon is in the URL, it indicates a protocol is used and it is just - //an URL to a file, or if it starts with a slash or ends with .js, it is just a plain file. + //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?) + //or ends with .js, then assume the user meant to use an url and not a module id. //The slash is important for protocol-less URLs as well as full paths. if (req.jsExtRegExp.test(moduleName)) { //Just a plain path, not module name lookup, so just return it. //Add extension if it is included. This is a bit wonky, only non-.js things pass //an extension, this method probably needs to be reworked. - url = moduleName + (ext ? ext : ""); + url = moduleName + (ext || ''); } else { //A module that needs to be converted to a path. paths = config.paths; pkgs = config.pkgs; - syms = moduleName.split("/"); + syms = moduleName.split('/'); //For each module name segment, see if there is a path //registered for it. Start with most specific name //and work up from it. - for (i = syms.length; i > 0; i--) { - parentModule = syms.slice(0, i).join("/"); - if (paths[parentModule]) { - syms.splice(0, i, paths[parentModule]); + for (i = syms.length; i > 0; i -= 1) { + parentModule = syms.slice(0, i).join('/'); + pkg = pkgs[parentModule]; + parentPath = paths[parentModule]; + if (parentPath) { + //If an array, it means there are a few choices, + //Choose the one that is desired + if (isArray(parentPath)) { + parentPath = parentPath[0]; + } + syms.splice(0, i, parentPath); break; - } else if ((pkg = pkgs[parentModule])) { + } else if (pkg) { //If module name is just the package name, then looking //for the main module. if (moduleName === pkg.name) { @@ -1616,22 +1700,64 @@ var requirejs, require, define; } //Join the path parts together, then figure out if baseUrl is needed. - url = syms.join("/") + (ext || ".js"); - url = (url.charAt(0) === '/' || url.match(/^\w+:/) ? "" : config.baseUrl) + url; + url = syms.join('/') + (ext || '.js'); + url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url; } return config.urlArgs ? url + ((url.indexOf('?') === -1 ? '?' : '&') + config.urlArgs) : url; - } - }; + }, + + //Delegates to req.load. Broken out as a separate function to + //allow overriding in the optimizer. + load: function (id, url) { + req.load(context, id, url); + }, + + /** + * Executes a module callack function. Broken out as a separate function + * solely to allow the build system to sequence the files in the built + * layer in the right sequence. + * + * @private + */ + execCb: function (name, callback, args, exports) { + return callback.apply(exports, args); + }, - //Make these visible on the context so can be called at the very - //end of the file to bootstrap - context.jQueryCheck = jQueryCheck; - context.resume = resume; + /** + * callback for script loads, used to check status of loading. + * + * @param {Event} evt the event from the browser for the script + * that was loaded. + */ + onScriptLoad: function (evt) { + //Using currentTarget instead of target for Firefox 2.0's sake. Not + //all old browsers will be supported, but this one was easy enough + //to support and still makes sense. + if (evt.type === 'load' || + (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) { + //Reset interactive script so a script node is not held onto for + //to long. + interactiveScript = null; + + //Pull out the name of the module and the context. + var data = getScriptData(evt); + context.completeLoad(data.id); + } + }, - return context; + /** + * Callback for script errors. + */ + onScriptError: function (evt) { + var data = getScriptData(evt); + if (!hasPathFallback(data.id)) { + return onError(makeError('scripterror', 'Script error', evt, [data.id])); + } + } + }); } /** @@ -1648,20 +1774,21 @@ var requirejs, require, define; * on a require that are not standardized), and to give a short * name for minification/local scope use. */ - req = requirejs = function (deps, callback) { + req = requirejs = function (deps, callback, errback, optional) { //Find the right context, use default var contextName = defContextName, context, config; // Determine if have config object in the call. - if (!isArray(deps) && typeof deps !== "string") { + if (!isArray(deps) && typeof deps !== 'string') { // deps is a config object config = deps; if (isArray(callback)) { // Adjust args if there are dependencies deps = callback; - callback = arguments[2]; + callback = errback; + errback = optional; } else { deps = []; } @@ -1671,14 +1798,16 @@ var requirejs, require, define; contextName = config.context; } - context = contexts[contextName] || - (contexts[contextName] = newContext(contextName)); + context = contexts[contextName]; + if (!context) { + context = contexts[contextName] = req.s.newContext(contextName); + } if (config) { context.configure(config); } - return context.require(deps, callback); + return context.require(deps, callback, errback); }; /** @@ -1696,31 +1825,29 @@ var requirejs, require, define; require = req; } - /** - * Global require.toUrl(), to match global require, mostly useful - * for debugging/work in the global space. - */ - req.toUrl = function (moduleNamePlusExt) { - return contexts[defContextName].toUrl(moduleNamePlusExt); - }; - req.version = version; //Used to filter out dependencies that are already paths. req.jsExtRegExp = /^\/|:|\?|\.js$/; + req.isBrowser = isBrowser; s = req.s = { contexts: contexts, - //Stores a list of URLs that should not get async script tag treatment. - skipAsync: {} + newContext: newContext }; - req.isAsync = req.isBrowser = isBrowser; + //Create default context. + req({}); + + //Exports some context-sensitive methods on global require, using + //default context if no context specified. + addRequireMethods(req, contexts[defContextName]); + if (isBrowser) { - head = s.head = document.getElementsByTagName("head")[0]; + head = s.head = document.getElementsByTagName('head')[0]; //If BASE tag is in play, using appendChild is a problem for IE6. //When that browser dies, this can be removed. Details in this jQuery bug: //http://dev.jquery.com/ticket/2709 - baseElement = document.getElementsByTagName("base")[0]; + baseElement = document.getElementsByTagName('base')[0]; if (baseElement) { head = s.head = baseElement.parentNode; } @@ -1745,34 +1872,137 @@ var requirejs, require, define; * @param {Object} url the URL to the module. */ req.load = function (context, moduleName, url) { - req.resourcesReady(false); + var config = (context && context.config) || {}, + node; + if (isBrowser) { + //In the browser so use a script tag + node = config.xhtml ? + document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') : + document.createElement('script'); + node.type = config.scriptType || 'text/javascript'; + node.charset = 'utf-8'; - context.scriptCount += 1; - req.attach(url, context, moduleName); + node.setAttribute('data-requirecontext', context.contextName); + node.setAttribute('data-requiremodule', moduleName); - //If tracking a jQuery, then make sure its ready callbacks - //are put on hold to prevent its ready callbacks from - //triggering too soon. - if (context.jQuery && !context.jQueryIncremented) { - jQueryHoldReady(context.jQuery, true); - context.jQueryIncremented = true; - } - }; + //Set up load listener. Test attachEvent first because IE9 has + //a subtle issue in its addEventListener and script onload firings + //that do not match the behavior of all other browsers with + //addEventListener support, which fire the onload event for a + //script right after the script execution. See: + //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution + //UNFORTUNATELY Opera implements attachEvent but does not follow the script + //script execution mode. + if (node.attachEvent && + //Check if node.attachEvent is artificially added by custom script or + //natively supported by browser + //read https://github.com/jrburke/requirejs/issues/187 + //if we can NOT find [native code] then it must NOT natively supported. + //in IE8, node.attachEvent does not have toString() + //Note the test for "[native code" with no closing brace, see: + //https://github.com/jrburke/requirejs/issues/273 + !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) && + !isOpera) { + //Probably IE. IE (at least 6-8) do not fire + //script onload right after executing the script, so + //we cannot tie the anonymous define call to a name. + //However, IE reports the script as being in 'interactive' + //readyState at the time of the define call. + useInteractive = true; - function getInteractiveScript() { - var scripts, i, script; - if (interactiveScript && interactiveScript.readyState === 'interactive') { - return interactiveScript; - } + node.attachEvent('onreadystatechange', context.onScriptLoad); + //It would be great to add an error handler here to catch + //404s in IE9+. However, onreadystatechange will fire before + //the error handler, so that does not help. If addEvenListener + //is used, then IE will fire error before load, but we cannot + //use that pathway given the connect.microsoft.com issue + //mentioned above about not doing the 'script execute, + //then fire the script load event listener before execute + //next script' that other browsers do. + //Best hope: IE10 fixes the issues, + //and then destroys all installs of IE 6-9. + //node.attachEvent('onerror', context.onScriptError); + } else { + node.addEventListener('load', context.onScriptLoad, false); + node.addEventListener('error', context.onScriptError, false); + } + node.src = url; - scripts = document.getElementsByTagName('script'); - for (i = scripts.length - 1; i > -1 && (script = scripts[i]); i--) { - if (script.readyState === 'interactive') { - return (interactiveScript = script); + //For some cache cases in IE 6-8, the script executes before the end + //of the appendChild execution, so to tie an anonymous define + //call to the module name (which is stored on the node), hold on + //to a reference to this node, but clear after the DOM insertion. + currentlyAddingScript = node; + if (baseElement) { + head.insertBefore(node, baseElement); + } else { + head.appendChild(node); } - } + currentlyAddingScript = null; - return null; + return node; + } else if (isWebWorker) { + //In a web worker, use importScripts. This is not a very + //efficient use of importScripts, importScripts will block until + //its script is downloaded and evaluated. However, if web workers + //are in play, the expectation that a build has been done so that + //only one script needs to be loaded anyway. This may need to be + //reevaluated if other use cases become common. + importScripts(url); + + //Account for anonymous modules + context.completeLoad(moduleName); + } + }; + + function getInteractiveScript() { + if (interactiveScript && interactiveScript.readyState === 'interactive') { + return interactiveScript; + } + + eachReverse(scripts(), function (script) { + if (script.readyState === 'interactive') { + return (interactiveScript = script); + } + }); + return interactiveScript; + } + + //Look for a data-main script attribute, which could also adjust the baseUrl. + if (isBrowser) { + //Figure out baseUrl. Get it from the script tag with require.js in it. + eachReverse(scripts(), function (script) { + //Set the 'head' where we can append children by + //using the script's parent. + if (!head) { + head = script.parentNode; + } + + //Look for a data-main attribute to set main script for the page + //to load. If it is there, the path to data main becomes the + //baseUrl, if it is not already set. + dataMain = script.getAttribute('data-main'); + if (dataMain) { + if (!cfg.baseUrl) { + //Pull off the directory of data-main for use as the + //baseUrl. + src = dataMain.split('/'); + mainScript = src.pop(); + subPath = src.length ? src.join('/') + '/' : './'; + + //Set final config. + cfg.baseUrl = subPath; + //Strip off any trailing .js since dataMain is now + //like a module name. + dataMain = mainScript.replace(jsSuffixRegExp, ''); + } + + //Put the data-main script in the files to load. + cfg.deps = cfg.deps ? cfg.deps.concat(dataMain) : [dataMain]; + + return true; + } + }); } /** @@ -1808,7 +2038,7 @@ var requirejs, require, define; if (callback.length) { callback .toString() - .replace(commentRegExp, "") + .replace(commentRegExp, '') .replace(cjsRequireRegExp, function (match, dep) { deps.push(dep); }); @@ -1818,7 +2048,7 @@ var requirejs, require, define; //work though if it just needs require. //REQUIRES the function to expect the CommonJS variables in the //order listed below. - deps = (callback.length === 1 ? ["require"] : ["require", "exports", "module"]).concat(deps); + deps = (callback.length === 1 ? ['require'] : ['require', 'exports', 'module']).concat(deps); } } @@ -1828,9 +2058,9 @@ var requirejs, require, define; node = currentlyAddingScript || getInteractiveScript(); if (node) { if (!name) { - name = node.getAttribute("data-requiremodule"); + name = node.getAttribute('data-requiremodule'); } - context = contexts[node.getAttribute("data-requirecontext")]; + context = contexts[node.getAttribute('data-requirecontext')]; } } @@ -1841,319 +2071,27 @@ var requirejs, require, define; //occurs. If no context, use the global queue, and get it processed //in the onscript load callback. (context ? context.defQueue : globalDefQueue).push([name, deps, callback]); - - return undefined; }; define.amd = { - multiversion: true, - plugins: true, jQuery: true }; + /** * Executes the text. Normally just uses eval, but can be modified - * to use a more environment specific call. + * to use a better, environment-specific call. Only used for transpiling + * loader plugins, not for plain JS modules. * @param {String} text the text to execute/evaluate. */ req.exec = function (text) { + /*jslint evil: true */ return eval(text); }; - /** - * Executes a module callack function. Broken out as a separate function - * solely to allow the build system to sequence the files in the built - * layer in the right sequence. - * - * @private - */ - req.execCb = function (name, callback, args, exports) { - return callback.apply(exports, args); - }; - - - /** - * Adds a node to the DOM. Public function since used by the order plugin. - * This method should not normally be called by outside code. - */ - req.addScriptToDom = function (node) { - //For some cache cases in IE 6-8, the script executes before the end - //of the appendChild execution, so to tie an anonymous define - //call to the module name (which is stored on the node), hold on - //to a reference to this node, but clear after the DOM insertion. - currentlyAddingScript = node; - if (baseElement) { - head.insertBefore(node, baseElement); - } else { - head.appendChild(node); - } - currentlyAddingScript = null; - }; - - /** - * callback for script loads, used to check status of loading. - * - * @param {Event} evt the event from the browser for the script - * that was loaded. - * - * @private - */ - req.onScriptLoad = function (evt) { - //Using currentTarget instead of target for Firefox 2.0's sake. Not - //all old browsers will be supported, but this one was easy enough - //to support and still makes sense. - var node = evt.currentTarget || evt.srcElement, contextName, moduleName, - context; - - if (evt.type === "load" || (node && readyRegExp.test(node.readyState))) { - //Reset interactive script so a script node is not held onto for - //to long. - interactiveScript = null; - - //Pull out the name of the module and the context. - contextName = node.getAttribute("data-requirecontext"); - moduleName = node.getAttribute("data-requiremodule"); - context = contexts[contextName]; - - contexts[contextName].completeLoad(moduleName); - - //Clean up script binding. Favor detachEvent because of IE9 - //issue, see attachEvent/addEventListener comment elsewhere - //in this file. - if (node.detachEvent && !isOpera) { - //Probably IE. If not it will throw an error, which will be - //useful to know. - node.detachEvent("onreadystatechange", req.onScriptLoad); - } else { - node.removeEventListener("load", req.onScriptLoad, false); - } - } - }; - - /** - * Attaches the script represented by the URL to the current - * environment. Right now only supports browser loading, - * but can be redefined in other environments to do the right thing. - * @param {String} url the url of the script to attach. - * @param {Object} context the context that wants the script. - * @param {moduleName} the name of the module that is associated with the script. - * @param {Function} [callback] optional callback, defaults to require.onScriptLoad - * @param {String} [type] optional type, defaults to text/javascript - * @param {Function} [fetchOnlyFunction] optional function to indicate the script node - * should be set up to fetch the script but do not attach it to the DOM - * so that it can later be attached to execute it. This is a way for the - * order plugin to support ordered loading in IE. Once the script is fetched, - * but not executed, the fetchOnlyFunction will be called. - */ - req.attach = function (url, context, moduleName, callback, type, fetchOnlyFunction) { - var node; - if (isBrowser) { - //In the browser so use a script tag - callback = callback || req.onScriptLoad; - node = context && context.config && context.config.xhtml ? - document.createElementNS("http://www.w3.org/1999/xhtml", "html:script") : - document.createElement("script"); - node.type = type || (context && context.config.scriptType) || - "text/javascript"; - node.charset = "utf-8"; - //Use async so Gecko does not block on executing the script if something - //like a long-polling comet tag is being run first. Gecko likes - //to evaluate scripts in DOM order, even for dynamic scripts. - //It will fetch them async, but only evaluate the contents in DOM - //order, so a long-polling script tag can delay execution of scripts - //after it. But telling Gecko we expect async gets us the behavior - //we want -- execute it whenever it is finished downloading. Only - //Helps Firefox 3.6+ - //Allow some URLs to not be fetched async. Mostly helps the order! - //plugin - node.async = !s.skipAsync[url]; - - if (context) { - node.setAttribute("data-requirecontext", context.contextName); - } - node.setAttribute("data-requiremodule", moduleName); - - //Set up load listener. Test attachEvent first because IE9 has - //a subtle issue in its addEventListener and script onload firings - //that do not match the behavior of all other browsers with - //addEventListener support, which fire the onload event for a - //script right after the script execution. See: - //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution - //UNFORTUNATELY Opera implements attachEvent but does not follow the script - //script execution mode. - if (node.attachEvent && !isOpera) { - //Probably IE. IE (at least 6-8) do not fire - //script onload right after executing the script, so - //we cannot tie the anonymous define call to a name. - //However, IE reports the script as being in "interactive" - //readyState at the time of the define call. - useInteractive = true; - - - if (fetchOnlyFunction) { - //Need to use old school onreadystate here since - //when the event fires and the node is not attached - //to the DOM, the evt.srcElement is null, so use - //a closure to remember the node. - node.onreadystatechange = function (evt) { - //Script loaded but not executed. - //Clear loaded handler, set the real one that - //waits for script execution. - if (node.readyState === 'loaded') { - node.onreadystatechange = null; - node.attachEvent("onreadystatechange", callback); - fetchOnlyFunction(node); - } - }; - } else { - node.attachEvent("onreadystatechange", callback); - } - } else { - node.addEventListener("load", callback, false); - } - node.src = url; - - //Fetch only means waiting to attach to DOM after loaded. - if (!fetchOnlyFunction) { - req.addScriptToDom(node); - } - - return node; - } else if (isWebWorker) { - //In a web worker, use importScripts. This is not a very - //efficient use of importScripts, importScripts will block until - //its script is downloaded and evaluated. However, if web workers - //are in play, the expectation that a build has been done so that - //only one script needs to be loaded anyway. This may need to be - //reevaluated if other use cases become common. - importScripts(url); - - //Account for anonymous modules - context.completeLoad(moduleName); - } - return null; - }; - - //Look for a data-main script attribute, which could also adjust the baseUrl. - if (isBrowser) { - //Figure out baseUrl. Get it from the script tag with require.js in it. - scripts = document.getElementsByTagName("script"); - - for (globalI = scripts.length - 1; globalI > -1 && (script = scripts[globalI]); globalI--) { - //Set the "head" where we can append children by - //using the script's parent. - if (!head) { - head = script.parentNode; - } - - //Look for a data-main attribute to set main script for the page - //to load. If it is there, the path to data main becomes the - //baseUrl, if it is not already set. - if ((dataMain = script.getAttribute('data-main'))) { - if (!cfg.baseUrl) { - //Pull off the directory of data-main for use as the - //baseUrl. - src = dataMain.split('/'); - mainScript = src.pop(); - subPath = src.length ? src.join('/') + '/' : './'; - - //Set final config. - cfg.baseUrl = subPath; - //Strip off any trailing .js since dataMain is now - //like a module name. - dataMain = mainScript.replace(jsSuffixRegExp, ''); - } - - //Put the data-main script in the files to load. - cfg.deps = cfg.deps ? cfg.deps.concat(dataMain) : [dataMain]; - - break; - } - } - } - - //See if there is nothing waiting across contexts, and if not, trigger - //resourcesReady. - req.checkReadyState = function () { - var contexts = s.contexts, prop; - for (prop in contexts) { - if (!(prop in empty)) { - if (contexts[prop].waitCount) { - return; - } - } - } - req.resourcesReady(true); - }; - - /** - * Internal function that is triggered whenever all scripts/resources - * have been loaded by the loader. Can be overridden by other, for - * instance the domReady plugin, which wants to know when all resources - * are loaded. - */ - req.resourcesReady = function (isReady) { - var contexts, context, prop; - - //First, set the public variable indicating that resources are loading. - req.resourcesDone = isReady; - - if (req.resourcesDone) { - //If jQuery with DOM ready delayed, release it now. - contexts = s.contexts; - for (prop in contexts) { - if (!(prop in empty)) { - context = contexts[prop]; - if (context.jQueryIncremented) { - jQueryHoldReady(context.jQuery, false); - context.jQueryIncremented = false; - } - } - } - } - }; - - //FF < 3.6 readyState fix. Needed so that domReady plugin - //works well in that environment, since require.js is normally - //loaded via an HTML script tag so it will be there before window load, - //where the domReady plugin is more likely to be loaded after window load. - req.pageLoaded = function () { - if (document.readyState !== "complete") { - document.readyState = "complete"; - } - }; - if (isBrowser) { - if (document.addEventListener) { - if (!document.readyState) { - document.readyState = "loading"; - window.addEventListener("load", req.pageLoaded, false); - } - } - } - - //Set up default context. If require was a configuration object, use that as base config. + //Set up with config info. req(cfg); - - //If modules are built into require.js, then need to make sure dependencies are - //traced. Use a setTimeout in the browser world, to allow all the modules to register - //themselves. In a non-browser env, assume that modules are not built into require.js, - //which seems odd to do on the server. - if (req.isAsync && typeof setTimeout !== "undefined") { - ctx = s.contexts[(cfg.context || defContextName)]; - //Indicate that the script that includes require() is still loading, - //so that require()'d dependencies are not traced until the end of the - //file is parsed (approximated via the setTimeout call). - ctx.requireWait = true; - setTimeout(function () { - ctx.requireWait = false; - - if (!ctx.scriptCount) { - ctx.resume(); - } - req.checkReadyState(); - }, 0); - } -}()); +}(this)); if (env === 'rhino') { @@ -2163,14 +2101,12 @@ var requirejs, require, define; * see: http://github.com/jrburke/requirejs for details */ -/*jslint strict: false */ +/*jslint */ /*global require: false, java: false, load: false */ (function () { - + 'use strict'; require.load = function (context, moduleName, url) { - //Indicate a the module is in process of loading. - context.scriptCount += 1; load(url); @@ -2194,7 +2130,7 @@ var requirejs, require, define; * see: http://github.com/jrburke/requirejs for details */ -/*jslint regexp: false, strict: false */ +/*jslint regexp: false */ /*global require: false, define: false, requirejsVars: false, process: false */ /** @@ -2205,12 +2141,16 @@ var requirejs, require, define; */ (function () { + 'use strict'; + var nodeReq = requirejsVars.nodeRequire, req = requirejsVars.require, def = requirejsVars.define, fs = nodeReq('fs'), path = nodeReq('path'), - vm = nodeReq('vm'); + vm = nodeReq('vm'), + //In Node 0.7+ existsSync is on fs. + exists = fs.existsSync || path.existsSync; //Supply an implementation that allows synchronous get of a module. req.get = function (context, moduleName, relModuleMap) { @@ -2222,9 +2162,9 @@ var requirejs, require, define; moduleMap = context.makeModuleMap(moduleName, relModuleMap); //Normalize module name, if it contains . or .. - moduleName = moduleMap.fullName; + moduleName = moduleMap.id; - if (moduleName in context.defined) { + if (context.defined.hasOwnProperty(moduleName)) { ret = context.defined[moduleName]; } else { if (ret === undefined) { @@ -2250,10 +2190,7 @@ var requirejs, require, define; req.load = function (context, moduleName, url) { var contents, err; - //Indicate a the module is in process of loading. - context.scriptCount += 1; - - if (path.existsSync(url)) { + if (exists(url)) { contents = fs.readFileSync(url, 'utf8'); contents = req.makeNodeWrapper(contents); @@ -2283,8 +2220,6 @@ var requirejs, require, define; //Support anonymous modules. context.completeLoad(moduleName); - - return undefined; }; //Override to provide the function wrapper for define/require. @@ -2356,6 +2291,40 @@ var requirejs, require, define; } }); }()); +if(env === 'node') { +/** + * @license RequireJS Copyright (c) 2012, The Dojo Foundation All Rights Reserved. + * Available via the MIT or new BSD license. + * see: http://github.com/jrburke/requirejs for details + */ + +/*jslint strict: false */ +/*global define: false, load: false */ + +//Needed so that rhino/assert can return a stub for uglify's consolidator.js +define('node/assert', ['assert'], function (assert) { + return assert; +}); + +} + +if(env === 'rhino') { +/** + * @license RequireJS Copyright (c) 2012, The Dojo Foundation All Rights Reserved. + * Available via the MIT or new BSD license. + * see: http://github.com/jrburke/requirejs for details + */ + +/*jslint strict: false */ +/*global define: false, load: false */ + +//Just a stub for use with uglify's consolidator.js +define('rhino/assert', function () { + return {}; +}); + +} + if(env === 'node') { /** * @license Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. @@ -2970,6 +2939,27 @@ define('rhino/file', function () { return file; }); +} + +if(env === 'node') { +/*global process */ +define('node/quit', function () { + 'use strict'; + return function (code) { + return process.exit(code); + }; +}); +} + +if(env === 'rhino') { +/*global quit */ +define('rhino/quit', function () { + 'use strict'; + return function (code) { + return quit(code); + }; +}); + } /** * @license Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. @@ -3043,20 +3033,70 @@ define('lang', function () { } return tmp; // Object }; - }()) - }; - return lang; -}); + }()), -if(env === 'node') { -/** - * @license RequireJS Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ - -/*jslint strict: false */ -/*global define: false, console: false */ + /** + * Helper function for iterating over an array. If the func returns + * a true value, it will break out of the loop. + */ + each: function each(ary, func) { + if (ary) { + var i; + for (i = 0; i < ary.length; i += 1) { + if (func(ary[i], i, ary)) { + break; + } + } + } + }, + + /** + * Cycles over properties in an object and calls a function for each + * property value. If the function returns a truthy value, then the + * iteration is stopped. + */ + eachProp: function eachProp(obj, func) { + var prop; + for (prop in obj) { + if (obj.hasOwnProperty(prop)) { + if (func(obj[prop], prop)) { + break; + } + } + } + }, + + //Similar to Function.prototype.bind, but the "this" object is specified + //first, since it is easier to read/figure out what "this" will be. + bind: function bind(obj, fn) { + return function () { + return fn.apply(obj, arguments); + }; + }, + + //Escapes a content string to be be a string that has characters escaped + //for inclusion as part of a JS string. + jsEscape: function (content) { + return content.replace(/(["'\\])/g, '\\$1') + .replace(/[\f]/g, "\\f") + .replace(/[\b]/g, "\\b") + .replace(/[\n]/g, "\\n") + .replace(/[\t]/g, "\\t") + .replace(/[\r]/g, "\\r"); + } + }; + return lang; +}); + +if(env === 'node') { +/** + * @license RequireJS Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. + * Available via the MIT or new BSD license. + * see: http://github.com/jrburke/requirejs for details + */ + +/*jslint strict: false */ +/*global define: false, console: false */ define('node/print', function () { function print(msg) { @@ -3149,7 +3189,6190 @@ define('logger', ['env!env/print'], function (print) { //so that the build does not attempt to inline some env modules, //like Node's fs and path. -define('uglifyjs/parse-js', ["require", "exports", "module"], function(require, exports, module) { +//Commit d72ed0a000c455290fde6f8114fe38f4aaf31469 on May 15, 2012 +define('esprima', ['exports'], function(exports) { +/* + Copyright (C) 2012 Ariya Hidayat + Copyright (C) 2012 Mathias Bynens + Copyright (C) 2012 Joost-Wim Boekesteijn + Copyright (C) 2012 Kris Kowal + Copyright (C) 2012 Yusuke Suzuki + Copyright (C) 2012 Arpad Borsos + Copyright (C) 2011 Ariya Hidayat + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +/*jslint bitwise:true plusplus:true */ +/*global esprima:true, exports:true, +throwError: true, createLiteral: true, generateStatement: true, +parseAssignmentExpression: true, parseBlock: true, parseExpression: true, +parseFunctionDeclaration: true, parseFunctionExpression: true, +parseFunctionSourceElements: true, parseVariableIdentifier: true, +parseLeftHandSideExpression: true, +parseStatement: true, parseSourceElement: true */ + +(function (exports) { + 'use strict'; + + var Token, + TokenName, + Syntax, + PropertyKind, + Messages, + Regex, + source, + strict, + index, + lineNumber, + lineStart, + length, + buffer, + state, + extra; + + Token = { + BooleanLiteral: 1, + EOF: 2, + Identifier: 3, + Keyword: 4, + NullLiteral: 5, + NumericLiteral: 6, + Punctuator: 7, + StringLiteral: 8 + }; + + TokenName = {}; + TokenName[Token.BooleanLiteral] = 'Boolean'; + TokenName[Token.EOF] = ''; + TokenName[Token.Identifier] = 'Identifier'; + TokenName[Token.Keyword] = 'Keyword'; + TokenName[Token.NullLiteral] = 'Null'; + TokenName[Token.NumericLiteral] = 'Numeric'; + TokenName[Token.Punctuator] = 'Punctuator'; + TokenName[Token.StringLiteral] = 'String'; + + Syntax = { + AssignmentExpression: 'AssignmentExpression', + ArrayExpression: 'ArrayExpression', + BlockStatement: 'BlockStatement', + BinaryExpression: 'BinaryExpression', + BreakStatement: 'BreakStatement', + CallExpression: 'CallExpression', + CatchClause: 'CatchClause', + ConditionalExpression: 'ConditionalExpression', + ContinueStatement: 'ContinueStatement', + DoWhileStatement: 'DoWhileStatement', + DebuggerStatement: 'DebuggerStatement', + EmptyStatement: 'EmptyStatement', + ExpressionStatement: 'ExpressionStatement', + ForStatement: 'ForStatement', + ForInStatement: 'ForInStatement', + FunctionDeclaration: 'FunctionDeclaration', + FunctionExpression: 'FunctionExpression', + Identifier: 'Identifier', + IfStatement: 'IfStatement', + Literal: 'Literal', + LabeledStatement: 'LabeledStatement', + LogicalExpression: 'LogicalExpression', + MemberExpression: 'MemberExpression', + NewExpression: 'NewExpression', + ObjectExpression: 'ObjectExpression', + Program: 'Program', + Property: 'Property', + ReturnStatement: 'ReturnStatement', + SequenceExpression: 'SequenceExpression', + SwitchStatement: 'SwitchStatement', + SwitchCase: 'SwitchCase', + ThisExpression: 'ThisExpression', + ThrowStatement: 'ThrowStatement', + TryStatement: 'TryStatement', + UnaryExpression: 'UnaryExpression', + UpdateExpression: 'UpdateExpression', + VariableDeclaration: 'VariableDeclaration', + VariableDeclarator: 'VariableDeclarator', + WhileStatement: 'WhileStatement', + WithStatement: 'WithStatement' + }; + + PropertyKind = { + Data: 1, + Get: 2, + Set: 4 + }; + + // Error messages should be identical to V8. + Messages = { + UnexpectedToken: 'Unexpected token %0', + UnexpectedNumber: 'Unexpected number', + UnexpectedString: 'Unexpected string', + UnexpectedIdentifier: 'Unexpected identifier', + UnexpectedReserved: 'Unexpected reserved word', + UnexpectedEOS: 'Unexpected end of input', + NewlineAfterThrow: 'Illegal newline after throw', + InvalidRegExp: 'Invalid regular expression', + UnterminatedRegExp: 'Invalid regular expression: missing /', + InvalidLHSInAssignment: 'Invalid left-hand side in assignment', + InvalidLHSInForIn: 'Invalid left-hand side in for-in', + NoCatchOrFinally: 'Missing catch or finally after try', + UnknownLabel: 'Undefined label \'%0\'', + Redeclaration: '%0 \'%1\' has already been declared', + IllegalContinue: 'Illegal continue statement', + IllegalBreak: 'Illegal break statement', + IllegalReturn: 'Illegal return statement', + StrictModeWith: 'Strict mode code may not include a with statement', + StrictCatchVariable: 'Catch variable may not be eval or arguments in strict mode', + StrictVarName: 'Variable name may not be eval or arguments in strict mode', + StrictParamName: 'Parameter name eval or arguments is not allowed in strict mode', + StrictParamDupe: 'Strict mode function may not have duplicate parameter names', + StrictFunctionName: 'Function name may not be eval or arguments in strict mode', + StrictOctalLiteral: 'Octal literals are not allowed in strict mode.', + StrictDelete: 'Delete of an unqualified identifier in strict mode.', + StrictDuplicateProperty: 'Duplicate data property in object literal not allowed in strict mode', + AccessorDataProperty: 'Object literal may not have data and accessor property with the same name', + AccessorGetSet: 'Object literal may not have multiple get/set accessors with the same name', + StrictLHSAssignment: 'Assignment to eval or arguments is not allowed in strict mode', + StrictLHSPostfix: 'Postfix increment/decrement may not have eval or arguments operand in strict mode', + StrictLHSPrefix: 'Prefix increment/decrement may not have eval or arguments operand in strict mode', + StrictReservedWord: 'Use of future reserved word in strict mode' + }; + + // See also tools/generate-unicode-regex.py. + Regex = { + NonAsciiIdentifierStart: new RegExp('[\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0\u08a2-\u08ac\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa80-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]'), + NonAsciiIdentifierPart: new RegExp('[\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0300-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u0483-\u0487\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u05d0-\u05ea\u05f0-\u05f2\u0610-\u061a\u0620-\u0669\u066e-\u06d3\u06d5-\u06dc\u06df-\u06e8\u06ea-\u06fc\u06ff\u0710-\u074a\u074d-\u07b1\u07c0-\u07f5\u07fa\u0800-\u082d\u0840-\u085b\u08a0\u08a2-\u08ac\u08e4-\u08fe\u0900-\u0963\u0966-\u096f\u0971-\u0977\u0979-\u097f\u0981-\u0983\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bc-\u09c4\u09c7\u09c8\u09cb-\u09ce\u09d7\u09dc\u09dd\u09df-\u09e3\u09e6-\u09f1\u0a01-\u0a03\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a59-\u0a5c\u0a5e\u0a66-\u0a75\u0a81-\u0a83\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abc-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ad0\u0ae0-\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3c-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b5c\u0b5d\u0b5f-\u0b63\u0b66-\u0b6f\u0b71\u0b82\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd0\u0bd7\u0be6-\u0bef\u0c01-\u0c03\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c58\u0c59\u0c60-\u0c63\u0c66-\u0c6f\u0c82\u0c83\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbc-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0cde\u0ce0-\u0ce3\u0ce6-\u0cef\u0cf1\u0cf2\u0d02\u0d03\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d-\u0d44\u0d46-\u0d48\u0d4a-\u0d4e\u0d57\u0d60-\u0d63\u0d66-\u0d6f\u0d7a-\u0d7f\u0d82\u0d83\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e01-\u0e3a\u0e40-\u0e4e\u0e50-\u0e59\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb9\u0ebb-\u0ebd\u0ec0-\u0ec4\u0ec6\u0ec8-\u0ecd\u0ed0-\u0ed9\u0edc-\u0edf\u0f00\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e-\u0f47\u0f49-\u0f6c\u0f71-\u0f84\u0f86-\u0f97\u0f99-\u0fbc\u0fc6\u1000-\u1049\u1050-\u109d\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u135d-\u135f\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176c\u176e-\u1770\u1772\u1773\u1780-\u17d3\u17d7\u17dc\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u1820-\u1877\u1880-\u18aa\u18b0-\u18f5\u1900-\u191c\u1920-\u192b\u1930-\u193b\u1946-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u19d0-\u19d9\u1a00-\u1a1b\u1a20-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1aa7\u1b00-\u1b4b\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1bf3\u1c00-\u1c37\u1c40-\u1c49\u1c4d-\u1c7d\u1cd0-\u1cd2\u1cd4-\u1cf6\u1d00-\u1de6\u1dfc-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u200c\u200d\u203f\u2040\u2054\u2071\u207f\u2090-\u209c\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d7f-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2de0-\u2dff\u2e2f\u3005-\u3007\u3021-\u302f\u3031-\u3035\u3038-\u303c\u3041-\u3096\u3099\u309a\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua62b\ua640-\ua66f\ua674-\ua67d\ua67f-\ua697\ua69f-\ua6f1\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua827\ua840-\ua873\ua880-\ua8c4\ua8d0-\ua8d9\ua8e0-\ua8f7\ua8fb\ua900-\ua92d\ua930-\ua953\ua960-\ua97c\ua980-\ua9c0\ua9cf-\ua9d9\uaa00-\uaa36\uaa40-\uaa4d\uaa50-\uaa59\uaa60-\uaa76\uaa7a\uaa7b\uaa80-\uaac2\uaadb-\uaadd\uaae0-\uaaef\uaaf2-\uaaf6\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabea\uabec\uabed\uabf0-\uabf9\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe00-\ufe0f\ufe20-\ufe26\ufe33\ufe34\ufe4d-\ufe4f\ufe70-\ufe74\ufe76-\ufefc\uff10-\uff19\uff21-\uff3a\uff3f\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]') + }; + + // Ensure the condition is true, otherwise throw an error. + // This is only to have a better contract semantic, i.e. another safety net + // to catch a logic error. The condition shall be fulfilled in normal case. + // Do NOT use this to enforce a certain condition on any user input. + + function assert(condition, message) { + if (!condition) { + throw new Error('ASSERT: ' + message); + } + } + + function sliceSource(from, to) { + return source.slice(from, to); + } + + if (typeof 'esprima'[0] === 'undefined') { + sliceSource = function sliceArraySource(from, to) { + return source.slice(from, to).join(''); + }; + } + + function isDecimalDigit(ch) { + return '0123456789'.indexOf(ch) >= 0; + } + + function isHexDigit(ch) { + return '0123456789abcdefABCDEF'.indexOf(ch) >= 0; + } + + function isOctalDigit(ch) { + return '01234567'.indexOf(ch) >= 0; + } + + + // 7.2 White Space + + function isWhiteSpace(ch) { + return (ch === ' ') || (ch === '\u0009') || (ch === '\u000B') || + (ch === '\u000C') || (ch === '\u00A0') || + (ch.charCodeAt(0) >= 0x1680 && + '\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\uFEFF'.indexOf(ch) >= 0); + } + + // 7.3 Line Terminators + + function isLineTerminator(ch) { + return (ch === '\n' || ch === '\r' || ch === '\u2028' || ch === '\u2029'); + } + + // 7.6 Identifier Names and Identifiers + + function isIdentifierStart(ch) { + return (ch === '$') || (ch === '_') || (ch === '\\') || + (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || + ((ch.charCodeAt(0) >= 0x80) && Regex.NonAsciiIdentifierStart.test(ch)); + } + + function isIdentifierPart(ch) { + return (ch === '$') || (ch === '_') || (ch === '\\') || + (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || + ((ch >= '0') && (ch <= '9')) || + ((ch.charCodeAt(0) >= 0x80) && Regex.NonAsciiIdentifierPart.test(ch)); + } + + // 7.6.1.2 Future Reserved Words + + function isFutureReservedWord(id) { + switch (id) { + + // Future reserved words. + case 'class': + case 'enum': + case 'export': + case 'extends': + case 'import': + case 'super': + return true; + } + + return false; + } + + function isStrictModeReservedWord(id) { + switch (id) { + + // Strict Mode reserved words. + case 'implements': + case 'interface': + case 'package': + case 'private': + case 'protected': + case 'public': + case 'static': + case 'yield': + case 'let': + return true; + } + + return false; + } + + function isRestrictedWord(id) { + return id === 'eval' || id === 'arguments'; + } + + // 7.6.1.1 Keywords + + function isKeyword(id) { + var keyword = false; + switch (id.length) { + case 2: + keyword = (id === 'if') || (id === 'in') || (id === 'do'); + break; + case 3: + keyword = (id === 'var') || (id === 'for') || (id === 'new') || (id === 'try'); + break; + case 4: + keyword = (id === 'this') || (id === 'else') || (id === 'case') || (id === 'void') || (id === 'with'); + break; + case 5: + keyword = (id === 'while') || (id === 'break') || (id === 'catch') || (id === 'throw'); + break; + case 6: + keyword = (id === 'return') || (id === 'typeof') || (id === 'delete') || (id === 'switch'); + break; + case 7: + keyword = (id === 'default') || (id === 'finally'); + break; + case 8: + keyword = (id === 'function') || (id === 'continue') || (id === 'debugger'); + break; + case 10: + keyword = (id === 'instanceof'); + break; + } + + if (keyword) { + return true; + } + + switch (id) { + // Future reserved words. + // 'const' is specialized as Keyword in V8. + case 'const': + return true; + + // For compatiblity to SpiderMonkey and ES.next + case 'yield': + case 'let': + return true; + } + + if (strict && isStrictModeReservedWord(id)) { + return true; + } + + return isFutureReservedWord(id); + } + + // Return the next character and move forward. + + function nextChar() { + return source[index++]; + } + + // 7.4 Comments + + function skipComment() { + var ch, blockComment, lineComment; + + blockComment = false; + lineComment = false; + + while (index < length) { + ch = source[index]; + + if (lineComment) { + ch = nextChar(); + if (isLineTerminator(ch)) { + lineComment = false; + if (ch === '\r' && source[index] === '\n') { + ++index; + } + ++lineNumber; + lineStart = index; + } + } else if (blockComment) { + if (isLineTerminator(ch)) { + if (ch === '\r' && source[index + 1] === '\n') { + ++index; + } + ++lineNumber; + ++index; + lineStart = index; + if (index >= length) { + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + } else { + ch = nextChar(); + if (index >= length) { + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + if (ch === '*') { + ch = source[index]; + if (ch === '/') { + ++index; + blockComment = false; + } + } + } + } else if (ch === '/') { + ch = source[index + 1]; + if (ch === '/') { + index += 2; + lineComment = true; + } else if (ch === '*') { + index += 2; + blockComment = true; + if (index >= length) { + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + } else { + break; + } + } else if (isWhiteSpace(ch)) { + ++index; + } else if (isLineTerminator(ch)) { + ++index; + if (ch === '\r' && source[index] === '\n') { + ++index; + } + ++lineNumber; + lineStart = index; + } else { + break; + } + } + } + + function scanHexEscape(prefix) { + var i, len, ch, code = 0; + + len = (prefix === 'u') ? 4 : 2; + for (i = 0; i < len; ++i) { + if (index < length && isHexDigit(source[index])) { + ch = nextChar(); + code = code * 16 + '0123456789abcdef'.indexOf(ch.toLowerCase()); + } else { + return ''; + } + } + return String.fromCharCode(code); + } + + function scanIdentifier() { + var ch, start, id, restore; + + ch = source[index]; + if (!isIdentifierStart(ch)) { + return; + } + + start = index; + if (ch === '\\') { + ++index; + if (source[index] !== 'u') { + return; + } + ++index; + restore = index; + ch = scanHexEscape('u'); + if (ch) { + if (ch === '\\' || !isIdentifierStart(ch)) { + return; + } + id = ch; + } else { + index = restore; + id = 'u'; + } + } else { + id = nextChar(); + } + + while (index < length) { + ch = source[index]; + if (!isIdentifierPart(ch)) { + break; + } + if (ch === '\\') { + ++index; + if (source[index] !== 'u') { + return; + } + ++index; + restore = index; + ch = scanHexEscape('u'); + if (ch) { + if (ch === '\\' || !isIdentifierPart(ch)) { + return; + } + id += ch; + } else { + index = restore; + id += 'u'; + } + } else { + id += nextChar(); + } + } + + // There is no keyword or literal with only one character. + // Thus, it must be an identifier. + if (id.length === 1) { + return { + type: Token.Identifier, + value: id, + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + if (isKeyword(id)) { + return { + type: Token.Keyword, + value: id, + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + // 7.8.1 Null Literals + + if (id === 'null') { + return { + type: Token.NullLiteral, + value: id, + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + // 7.8.2 Boolean Literals + + if (id === 'true' || id === 'false') { + return { + type: Token.BooleanLiteral, + value: id, + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + return { + type: Token.Identifier, + value: id, + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + // 7.7 Punctuators + + function scanPunctuator() { + var start = index, + ch1 = source[index], + ch2, + ch3, + ch4; + + // Check for most common single-character punctuators. + + if (ch1 === ';' || ch1 === '{' || ch1 === '}') { + ++index; + return { + type: Token.Punctuator, + value: ch1, + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + if (ch1 === ',' || ch1 === '(' || ch1 === ')') { + ++index; + return { + type: Token.Punctuator, + value: ch1, + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + // Dot (.) can also start a floating-point number, hence the need + // to check the next character. + + ch2 = source[index + 1]; + if (ch1 === '.' && !isDecimalDigit(ch2)) { + return { + type: Token.Punctuator, + value: nextChar(), + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + // Peek more characters. + + ch3 = source[index + 2]; + ch4 = source[index + 3]; + + // 4-character punctuator: >>>= + + if (ch1 === '>' && ch2 === '>' && ch3 === '>') { + if (ch4 === '=') { + index += 4; + return { + type: Token.Punctuator, + value: '>>>=', + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + } + + // 3-character punctuators: === !== >>> <<= >>= + + if (ch1 === '=' && ch2 === '=' && ch3 === '=') { + index += 3; + return { + type: Token.Punctuator, + value: '===', + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + if (ch1 === '!' && ch2 === '=' && ch3 === '=') { + index += 3; + return { + type: Token.Punctuator, + value: '!==', + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + if (ch1 === '>' && ch2 === '>' && ch3 === '>') { + index += 3; + return { + type: Token.Punctuator, + value: '>>>', + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + if (ch1 === '<' && ch2 === '<' && ch3 === '=') { + index += 3; + return { + type: Token.Punctuator, + value: '<<=', + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + if (ch1 === '>' && ch2 === '>' && ch3 === '=') { + index += 3; + return { + type: Token.Punctuator, + value: '>>=', + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + // 2-character punctuators: <= >= == != ++ -- << >> && || + // += -= *= %= &= |= ^= /= + + if (ch2 === '=') { + if ('<>=!+-*%&|^/'.indexOf(ch1) >= 0) { + index += 2; + return { + type: Token.Punctuator, + value: ch1 + ch2, + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + } + + if (ch1 === ch2 && ('+-<>&|'.indexOf(ch1) >= 0)) { + if ('+-<>&|'.indexOf(ch2) >= 0) { + index += 2; + return { + type: Token.Punctuator, + value: ch1 + ch2, + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + } + + // The remaining 1-character punctuators. + + if ('[]<>+-*%&|^!~?:=/'.indexOf(ch1) >= 0) { + return { + type: Token.Punctuator, + value: nextChar(), + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + } + + // 7.8.3 Numeric Literals + + function scanNumericLiteral() { + var number, start, ch; + + ch = source[index]; + assert(isDecimalDigit(ch) || (ch === '.'), + 'Numeric literal must start with a decimal digit or a decimal point'); + + start = index; + number = ''; + if (ch !== '.') { + number = nextChar(); + ch = source[index]; + + // Hex number starts with '0x'. + // Octal number starts with '0'. + if (number === '0') { + if (ch === 'x' || ch === 'X') { + number += nextChar(); + while (index < length) { + ch = source[index]; + if (!isHexDigit(ch)) { + break; + } + number += nextChar(); + } + + if (number.length <= 2) { + // only 0x + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + + if (index < length) { + ch = source[index]; + if (isIdentifierStart(ch)) { + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + } + return { + type: Token.NumericLiteral, + value: parseInt(number, 16), + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } else if (isOctalDigit(ch)) { + number += nextChar(); + while (index < length) { + ch = source[index]; + if (!isOctalDigit(ch)) { + break; + } + number += nextChar(); + } + + if (index < length) { + ch = source[index]; + if (isIdentifierStart(ch) || isDecimalDigit(ch)) { + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + } + return { + type: Token.NumericLiteral, + value: parseInt(number, 8), + octal: true, + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + // decimal number starts with '0' such as '09' is illegal. + if (isDecimalDigit(ch)) { + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + } + + while (index < length) { + ch = source[index]; + if (!isDecimalDigit(ch)) { + break; + } + number += nextChar(); + } + } + + if (ch === '.') { + number += nextChar(); + while (index < length) { + ch = source[index]; + if (!isDecimalDigit(ch)) { + break; + } + number += nextChar(); + } + } + + if (ch === 'e' || ch === 'E') { + number += nextChar(); + + ch = source[index]; + if (ch === '+' || ch === '-') { + number += nextChar(); + } + + ch = source[index]; + if (isDecimalDigit(ch)) { + number += nextChar(); + while (index < length) { + ch = source[index]; + if (!isDecimalDigit(ch)) { + break; + } + number += nextChar(); + } + } else { + ch = 'character ' + ch; + if (index >= length) { + ch = ''; + } + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + } + + if (index < length) { + ch = source[index]; + if (isIdentifierStart(ch)) { + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + } + + return { + type: Token.NumericLiteral, + value: parseFloat(number), + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + // 7.8.4 String Literals + + function scanStringLiteral() { + var str = '', quote, start, ch, code, unescaped, restore, octal = false; + + quote = source[index]; + assert((quote === '\'' || quote === '"'), + 'String literal must starts with a quote'); + + start = index; + ++index; + + while (index < length) { + ch = nextChar(); + + if (ch === quote) { + quote = ''; + break; + } else if (ch === '\\') { + ch = nextChar(); + if (!isLineTerminator(ch)) { + switch (ch) { + case 'n': + str += '\n'; + break; + case 'r': + str += '\r'; + break; + case 't': + str += '\t'; + break; + case 'u': + case 'x': + restore = index; + unescaped = scanHexEscape(ch); + if (unescaped) { + str += unescaped; + } else { + index = restore; + str += ch; + } + break; + case 'b': + str += '\b'; + break; + case 'f': + str += '\f'; + break; + case 'v': + str += '\v'; + break; + + default: + if (isOctalDigit(ch)) { + code = '01234567'.indexOf(ch); + + // \0 is not octal escape sequence + if (code !== 0) { + octal = true; + } + + if (index < length && isOctalDigit(source[index])) { + octal = true; + code = code * 8 + '01234567'.indexOf(nextChar()); + + // 3 digits are only allowed when string starts + // with 0, 1, 2, 3 + if ('0123'.indexOf(ch) >= 0 && + index < length && + isOctalDigit(source[index])) { + code = code * 8 + '01234567'.indexOf(nextChar()); + } + } + str += String.fromCharCode(code); + } else { + str += ch; + } + break; + } + } else { + ++lineNumber; + if (ch === '\r' && source[index] === '\n') { + ++index; + } + } + } else if (isLineTerminator(ch)) { + break; + } else { + str += ch; + } + } + + if (quote !== '') { + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + + return { + type: Token.StringLiteral, + value: str, + octal: octal, + lineNumber: lineNumber, + lineStart: lineStart, + range: [start, index] + }; + } + + function scanRegExp() { + var str = '', ch, start, pattern, flags, value, classMarker = false, restore; + + buffer = null; + skipComment(); + + start = index; + ch = source[index]; + assert(ch === '/', 'Regular expression literal must start with a slash'); + str = nextChar(); + + while (index < length) { + ch = nextChar(); + str += ch; + if (classMarker) { + if (ch === ']') { + classMarker = false; + } + } else { + if (ch === '\\') { + ch = nextChar(); + // ECMA-262 7.8.5 + if (isLineTerminator(ch)) { + throwError({}, Messages.UnterminatedRegExp); + } + str += ch; + } + else if (ch === '/') { + break; + } + else if (ch === '[') { + classMarker = true; + } + else if (isLineTerminator(ch)) { + throwError({}, Messages.UnterminatedRegExp); + } + } + } + + if (str.length === 1) { + throwError({}, Messages.UnterminatedRegExp); + } + + // Exclude leading and trailing slash. + pattern = str.substr(1, str.length - 2); + + flags = ''; + while (index < length) { + ch = source[index]; + if (!isIdentifierPart(ch)) { + break; + } + + ++index; + if (ch === '\\' && index < length) { + ch = source[index]; + if (ch === 'u') { + ++index; + restore = index; + ch = scanHexEscape('u'); + if (ch) { + flags += ch; + str += '\\u'; + for (; restore < index; ++restore) { + str += source[restore]; + } + } else { + index = restore; + flags += 'u'; + str += '\\u'; + } + } else { + str += '\\'; + } + } else { + flags += ch; + str += ch; + } + } + + try { + value = new RegExp(pattern, flags); + } catch (e) { + throwError({}, Messages.InvalidRegExp); + } + + return { + literal: str, + value: value, + range: [start, index] + }; + } + + function isIdentifierName(token) { + return token.type === Token.Identifier || + token.type === Token.Keyword || + token.type === Token.BooleanLiteral || + token.type === Token.NullLiteral; + } + + function advance() { + var ch, token; + + skipComment(); + + if (index >= length) { + return { + type: Token.EOF, + lineNumber: lineNumber, + lineStart: lineStart, + range: [index, index] + }; + } + + token = scanPunctuator(); + if (typeof token !== 'undefined') { + return token; + } + + ch = source[index]; + + if (ch === '\'' || ch === '"') { + return scanStringLiteral(); + } + + if (ch === '.' || isDecimalDigit(ch)) { + return scanNumericLiteral(); + } + + token = scanIdentifier(); + if (typeof token !== 'undefined') { + return token; + } + + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + + function lex() { + var token; + + if (buffer) { + index = buffer.range[1]; + lineNumber = buffer.lineNumber; + lineStart = buffer.lineStart; + token = buffer; + buffer = null; + return token; + } + + buffer = null; + return advance(); + } + + function lookahead() { + var pos, line, start; + + if (buffer !== null) { + return buffer; + } + + pos = index; + line = lineNumber; + start = lineStart; + buffer = advance(); + index = pos; + lineNumber = line; + lineStart = start; + + return buffer; + } + + // Return true if there is a line terminator before the next token. + + function peekLineTerminator() { + var pos, line, start, found; + + pos = index; + line = lineNumber; + start = lineStart; + skipComment(); + found = lineNumber !== line; + index = pos; + lineNumber = line; + lineStart = start; + + return found; + } + + // Throw an exception + + function throwError(token, messageFormat) { + var error, + args = Array.prototype.slice.call(arguments, 2), + msg = messageFormat.replace( + /%(\d)/g, + function (whole, index) { + return args[index] || ''; + } + ); + + if (typeof token.lineNumber === 'number') { + error = new Error('Line ' + token.lineNumber + ': ' + msg); + error.index = token.range[0]; + error.lineNumber = token.lineNumber; + error.column = token.range[0] - lineStart + 1; + } else { + error = new Error('Line ' + lineNumber + ': ' + msg); + error.index = index; + error.lineNumber = lineNumber; + error.column = index - lineStart + 1; + } + + throw error; + } + + function throwErrorTolerant() { + var error; + try { + throwError.apply(null, arguments); + } catch (e) { + if (extra.errors) { + extra.errors.push(e); + } else { + throw e; + } + } + } + + + // Throw an exception because of the token. + + function throwUnexpected(token) { + var s; + + if (token.type === Token.EOF) { + throwError(token, Messages.UnexpectedEOS); + } + + if (token.type === Token.NumericLiteral) { + throwError(token, Messages.UnexpectedNumber); + } + + if (token.type === Token.StringLiteral) { + throwError(token, Messages.UnexpectedString); + } + + if (token.type === Token.Identifier) { + throwError(token, Messages.UnexpectedIdentifier); + } + + if (token.type === Token.Keyword) { + if (isFutureReservedWord(token.value)) { + throwError(token, Messages.UnexpectedReserved); + } else if (strict && isStrictModeReservedWord(token.value)) { + throwError(token, Messages.StrictReservedWord); + } + throwError(token, Messages.UnexpectedToken, token.value); + } + + // BooleanLiteral, NullLiteral, or Punctuator. + throwError(token, Messages.UnexpectedToken, token.value); + } + + // Expect the next token to match the specified punctuator. + // If not, an exception will be thrown. + + function expect(value) { + var token = lex(); + if (token.type !== Token.Punctuator || token.value !== value) { + throwUnexpected(token); + } + } + + // Expect the next token to match the specified keyword. + // If not, an exception will be thrown. + + function expectKeyword(keyword) { + var token = lex(); + if (token.type !== Token.Keyword || token.value !== keyword) { + throwUnexpected(token); + } + } + + // Return true if the next token matches the specified punctuator. + + function match(value) { + var token = lookahead(); + return token.type === Token.Punctuator && token.value === value; + } + + // Return true if the next token matches the specified keyword + + function matchKeyword(keyword) { + var token = lookahead(); + return token.type === Token.Keyword && token.value === keyword; + } + + // Return true if the next token is an assignment operator + + function matchAssign() { + var token = lookahead(), + op = token.value; + + if (token.type !== Token.Punctuator) { + return false; + } + return op === '=' || + op === '*=' || + op === '/=' || + op === '%=' || + op === '+=' || + op === '-=' || + op === '<<=' || + op === '>>=' || + op === '>>>=' || + op === '&=' || + op === '^=' || + op === '|='; + } + + function consumeSemicolon() { + var token, line; + + // Catch the very common case first. + if (source[index] === ';') { + lex(); + return; + } + + line = lineNumber; + skipComment(); + if (lineNumber !== line) { + return; + } + + if (match(';')) { + lex(); + return; + } + + token = lookahead(); + if (token.type !== Token.EOF && !match('}')) { + throwUnexpected(token); + } + return; + } + + // Return true if provided expression is LeftHandSideExpression + + function isLeftHandSide(expr) { + switch (expr.type) { + case 'AssignmentExpression': + case 'BinaryExpression': + case 'ConditionalExpression': + case 'LogicalExpression': + case 'SequenceExpression': + case 'UnaryExpression': + case 'UpdateExpression': + return false; + } + return true; + } + + // 11.1.4 Array Initialiser + + function parseArrayInitialiser() { + var elements = [], + undef; + + expect('['); + + while (!match(']')) { + if (match(',')) { + lex(); + elements.push(undef); + } else { + elements.push(parseAssignmentExpression()); + + if (!match(']')) { + expect(','); + } + } + } + + expect(']'); + + return { + type: Syntax.ArrayExpression, + elements: elements + }; + } + + // 11.1.5 Object Initialiser + + function parsePropertyFunction(param, first) { + var previousStrict, body; + + previousStrict = strict; + body = parseFunctionSourceElements(); + if (first && strict && isRestrictedWord(param[0].name)) { + throwError(first, Messages.StrictParamName); + } + strict = previousStrict; + + return { + type: Syntax.FunctionExpression, + id: null, + params: param, + body: body + }; + } + + function parseObjectPropertyKey() { + var token = lex(); + + // Note: This function is called only from parseObjectProperty(), where + // EOF and Punctuator tokens are already filtered out. + + if (token.type === Token.StringLiteral || token.type === Token.NumericLiteral) { + if (strict && token.octal) { + throwError(token, Messages.StrictOctalLiteral); + } + return createLiteral(token); + } + + return { + type: Syntax.Identifier, + name: token.value + }; + } + + function parseObjectProperty() { + var token, key, id, param; + + token = lookahead(); + + if (token.type === Token.Identifier) { + + id = parseObjectPropertyKey(); + + // Property Assignment: Getter and Setter. + + if (token.value === 'get' && !match(':')) { + key = parseObjectPropertyKey(); + expect('('); + expect(')'); + return { + type: Syntax.Property, + key: key, + value: parsePropertyFunction([]), + kind: 'get' + }; + } else if (token.value === 'set' && !match(':')) { + key = parseObjectPropertyKey(); + expect('('); + token = lookahead(); + if (token.type !== Token.Identifier) { + throwUnexpected(lex()); + } + param = [ parseVariableIdentifier() ]; + expect(')'); + return { + type: Syntax.Property, + key: key, + value: parsePropertyFunction(param, token), + kind: 'set' + }; + } else { + expect(':'); + return { + type: Syntax.Property, + key: id, + value: parseAssignmentExpression(), + kind: 'init' + }; + } + } else if (token.type === Token.EOF || token.type === Token.Punctuator) { + throwUnexpected(token); + } else { + key = parseObjectPropertyKey(); + expect(':'); + return { + type: Syntax.Property, + key: key, + value: parseAssignmentExpression(), + kind: 'init' + }; + } + } + + function parseObjectInitialiser() { + var token, properties = [], property, name, kind, map = {}, toString = String; + + expect('{'); + + while (!match('}')) { + property = parseObjectProperty(); + + if (property.key.type === Syntax.Identifier) { + name = property.key.name; + } else { + name = toString(property.key.value); + } + kind = (property.kind === 'init') ? PropertyKind.Data : (property.kind === 'get') ? PropertyKind.Get : PropertyKind.Set; + if (Object.prototype.hasOwnProperty.call(map, name)) { + if (map[name] === PropertyKind.Data) { + if (strict && kind === PropertyKind.Data) { + throwErrorTolerant({}, Messages.StrictDuplicateProperty); + } else if (kind !== PropertyKind.Data) { + throwError({}, Messages.AccessorDataProperty); + } + } else { + if (kind === PropertyKind.Data) { + throwError({}, Messages.AccessorDataProperty); + } else if (map[name] & kind) { + throwError({}, Messages.AccessorGetSet); + } + } + map[name] |= kind; + } else { + map[name] = kind; + } + + properties.push(property); + + if (!match('}')) { + expect(','); + } + } + + expect('}'); + + return { + type: Syntax.ObjectExpression, + properties: properties + }; + } + + // 11.1 Primary Expressions + + function parsePrimaryExpression() { + var expr, + token = lookahead(), + type = token.type; + + if (type === Token.Identifier) { + return { + type: Syntax.Identifier, + name: lex().value + }; + } + + if (type === Token.StringLiteral || type === Token.NumericLiteral) { + if (strict && token.octal) { + throwErrorTolerant(token, Messages.StrictOctalLiteral); + } + return createLiteral(lex()); + } + + if (type === Token.Keyword) { + if (matchKeyword('this')) { + lex(); + return { + type: Syntax.ThisExpression + }; + } + + if (matchKeyword('function')) { + return parseFunctionExpression(); + } + } + + if (type === Token.BooleanLiteral) { + lex(); + token.value = (token.value === 'true'); + return createLiteral(token); + } + + if (type === Token.NullLiteral) { + lex(); + token.value = null; + return createLiteral(token); + } + + if (match('[')) { + return parseArrayInitialiser(); + } + + if (match('{')) { + return parseObjectInitialiser(); + } + + if (match('(')) { + lex(); + state.lastParenthesized = expr = parseExpression(); + expect(')'); + return expr; + } + + if (match('/') || match('/=')) { + return createLiteral(scanRegExp()); + } + + return throwUnexpected(lex()); + } + + // 11.2 Left-Hand-Side Expressions + + function parseArguments() { + var args = []; + + expect('('); + + if (!match(')')) { + while (index < length) { + args.push(parseAssignmentExpression()); + if (match(')')) { + break; + } + expect(','); + } + } + + expect(')'); + + return args; + } + + function parseNonComputedProperty() { + var token = lex(); + + if (!isIdentifierName(token)) { + throwUnexpected(token); + } + + return { + type: Syntax.Identifier, + name: token.value + }; + } + + function parseNonComputedMember(object) { + return { + type: Syntax.MemberExpression, + computed: false, + object: object, + property: parseNonComputedProperty() + }; + } + + function parseComputedMember(object) { + var property, expr; + + expect('['); + property = parseExpression(); + expr = { + type: Syntax.MemberExpression, + computed: true, + object: object, + property: property + }; + expect(']'); + return expr; + } + + function parseCallMember(object) { + return { + type: Syntax.CallExpression, + callee: object, + 'arguments': parseArguments() + }; + } + + function parseNewExpression() { + var expr; + + expectKeyword('new'); + + expr = { + type: Syntax.NewExpression, + callee: parseLeftHandSideExpression(), + 'arguments': [] + }; + + if (match('(')) { + expr['arguments'] = parseArguments(); + } + + return expr; + } + + function parseLeftHandSideExpressionAllowCall() { + var useNew, expr; + + useNew = matchKeyword('new'); + expr = useNew ? parseNewExpression() : parsePrimaryExpression(); + + while (index < length) { + if (match('.')) { + lex(); + expr = parseNonComputedMember(expr); + } else if (match('[')) { + expr = parseComputedMember(expr); + } else if (match('(')) { + expr = parseCallMember(expr); + } else { + break; + } + } + + return expr; + } + + function parseLeftHandSideExpression() { + var useNew, expr; + + useNew = matchKeyword('new'); + expr = useNew ? parseNewExpression() : parsePrimaryExpression(); + + while (index < length) { + if (match('.')) { + lex(); + expr = parseNonComputedMember(expr); + } else if (match('[')) { + expr = parseComputedMember(expr); + } else { + break; + } + } + + return expr; + } + + // 11.3 Postfix Expressions + + function parsePostfixExpression() { + var expr = parseLeftHandSideExpressionAllowCall(); + + if ((match('++') || match('--')) && !peekLineTerminator()) { + // 11.3.1, 11.3.2 + if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) { + throwError({}, Messages.StrictLHSPostfix); + } + expr = { + type: Syntax.UpdateExpression, + operator: lex().value, + argument: expr, + prefix: false + }; + } + + return expr; + } + + // 11.4 Unary Operators + + function parseUnaryExpression() { + var token, expr; + + if (match('++') || match('--')) { + token = lex(); + expr = parseUnaryExpression(); + // 11.4.4, 11.4.5 + if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) { + throwError({}, Messages.StrictLHSPrefix); + } + expr = { + type: Syntax.UpdateExpression, + operator: token.value, + argument: expr, + prefix: true + }; + return expr; + } + + if (match('+') || match('-') || match('~') || match('!')) { + expr = { + type: Syntax.UnaryExpression, + operator: lex().value, + argument: parseUnaryExpression() + }; + return expr; + } + + if (matchKeyword('delete') || matchKeyword('void') || matchKeyword('typeof')) { + expr = { + type: Syntax.UnaryExpression, + operator: lex().value, + argument: parseUnaryExpression() + }; + if (strict && expr.operator === 'delete' && expr.argument.type === Syntax.Identifier) { + throwErrorTolerant({}, Messages.StrictDelete); + } + return expr; + } + + return parsePostfixExpression(); + } + + // 11.5 Multiplicative Operators + + function parseMultiplicativeExpression() { + var expr = parseUnaryExpression(); + + while (match('*') || match('/') || match('%')) { + expr = { + type: Syntax.BinaryExpression, + operator: lex().value, + left: expr, + right: parseUnaryExpression() + }; + } + + return expr; + } + + // 11.6 Additive Operators + + function parseAdditiveExpression() { + var expr = parseMultiplicativeExpression(); + + while (match('+') || match('-')) { + expr = { + type: Syntax.BinaryExpression, + operator: lex().value, + left: expr, + right: parseMultiplicativeExpression() + }; + } + + return expr; + } + + // 11.7 Bitwise Shift Operators + + function parseShiftExpression() { + var expr = parseAdditiveExpression(); + + while (match('<<') || match('>>') || match('>>>')) { + expr = { + type: Syntax.BinaryExpression, + operator: lex().value, + left: expr, + right: parseAdditiveExpression() + }; + } + + return expr; + } + // 11.8 Relational Operators + + function parseRelationalExpression() { + var expr, previousAllowIn; + + previousAllowIn = state.allowIn; + state.allowIn = true; + expr = parseShiftExpression(); + state.allowIn = previousAllowIn; + + if (match('<') || match('>') || match('<=') || match('>=')) { + expr = { + type: Syntax.BinaryExpression, + operator: lex().value, + left: expr, + right: parseRelationalExpression() + }; + } else if (state.allowIn && matchKeyword('in')) { + lex(); + expr = { + type: Syntax.BinaryExpression, + operator: 'in', + left: expr, + right: parseRelationalExpression() + }; + } else if (matchKeyword('instanceof')) { + lex(); + expr = { + type: Syntax.BinaryExpression, + operator: 'instanceof', + left: expr, + right: parseRelationalExpression() + }; + } + + return expr; + } + + // 11.9 Equality Operators + + function parseEqualityExpression() { + var expr = parseRelationalExpression(); + + while (match('==') || match('!=') || match('===') || match('!==')) { + expr = { + type: Syntax.BinaryExpression, + operator: lex().value, + left: expr, + right: parseRelationalExpression() + }; + } + + return expr; + } + + // 11.10 Binary Bitwise Operators + + function parseBitwiseANDExpression() { + var expr = parseEqualityExpression(); + + while (match('&')) { + lex(); + expr = { + type: Syntax.BinaryExpression, + operator: '&', + left: expr, + right: parseEqualityExpression() + }; + } + + return expr; + } + + function parseBitwiseORExpression() { + var expr = parseBitwiseANDExpression(); + + while (match('|')) { + lex(); + expr = { + type: Syntax.BinaryExpression, + operator: '|', + left: expr, + right: parseBitwiseANDExpression() + }; + } + + return expr; + } + + function parseBitwiseXORExpression() { + var expr = parseBitwiseORExpression(); + + while (match('^')) { + lex(); + expr = { + type: Syntax.BinaryExpression, + operator: '^', + left: expr, + right: parseBitwiseORExpression() + }; + } + + return expr; + } + + // 11.11 Binary Logical Operators + + function parseLogicalANDExpression() { + var expr = parseBitwiseXORExpression(); + + while (match('&&')) { + lex(); + expr = { + type: Syntax.LogicalExpression, + operator: '&&', + left: expr, + right: parseBitwiseXORExpression() + }; + } + + return expr; + } + + function parseLogicalORExpression() { + var expr = parseLogicalANDExpression(); + + while (match('||')) { + lex(); + expr = { + type: Syntax.LogicalExpression, + operator: '||', + left: expr, + right: parseLogicalANDExpression() + }; + } + + return expr; + } + + // 11.12 Conditional Operator + + function parseConditionalExpression() { + var expr, previousAllowIn, consequent; + + expr = parseLogicalORExpression(); + + if (match('?')) { + lex(); + previousAllowIn = state.allowIn; + state.allowIn = true; + consequent = parseAssignmentExpression(); + state.allowIn = previousAllowIn; + expect(':'); + + expr = { + type: Syntax.ConditionalExpression, + test: expr, + consequent: consequent, + alternate: parseAssignmentExpression() + }; + } + + return expr; + } + + // 11.13 Assignment Operators + + function parseAssignmentExpression() { + var expr; + + expr = parseConditionalExpression(); + + if (matchAssign()) { + // LeftHandSideExpression + if (state.lastParenthesized !== expr && !isLeftHandSide(expr)) { + throwError({}, Messages.InvalidLHSInAssignment); + } + + // 11.13.1 + if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) { + throwError({}, Messages.StrictLHSAssignment); + } + + expr = { + type: Syntax.AssignmentExpression, + operator: lex().value, + left: expr, + right: parseAssignmentExpression() + }; + } + + return expr; + } + + // 11.14 Comma Operator + + function parseExpression() { + var expr = parseAssignmentExpression(); + + if (match(',')) { + expr = { + type: Syntax.SequenceExpression, + expressions: [ expr ] + }; + + while (index < length) { + if (!match(',')) { + break; + } + lex(); + expr.expressions.push(parseAssignmentExpression()); + } + + } + return expr; + } + + // 12.1 Block + + function parseStatementList() { + var list = [], + statement; + + while (index < length) { + if (match('}')) { + break; + } + statement = parseSourceElement(); + if (typeof statement === 'undefined') { + break; + } + list.push(statement); + } + + return list; + } + + function parseBlock() { + var block; + + expect('{'); + + block = parseStatementList(); + + expect('}'); + + return { + type: Syntax.BlockStatement, + body: block + }; + } + + // 12.2 Variable Statement + + function parseVariableIdentifier() { + var token = lex(); + + if (token.type !== Token.Identifier) { + throwUnexpected(token); + } + + return { + type: Syntax.Identifier, + name: token.value + }; + } + + function parseVariableDeclaration(kind) { + var id = parseVariableIdentifier(), + init = null; + + // 12.2.1 + if (strict && isRestrictedWord(id.name)) { + throwErrorTolerant({}, Messages.StrictVarName); + } + + if (kind === 'const') { + expect('='); + init = parseAssignmentExpression(); + } else if (match('=')) { + lex(); + init = parseAssignmentExpression(); + } + + return { + type: Syntax.VariableDeclarator, + id: id, + init: init + }; + } + + function parseVariableDeclarationList(kind) { + var list = []; + + while (index < length) { + list.push(parseVariableDeclaration(kind)); + if (!match(',')) { + break; + } + lex(); + } + + return list; + } + + function parseVariableStatement() { + var declarations; + + expectKeyword('var'); + + declarations = parseVariableDeclarationList(); + + consumeSemicolon(); + + return { + type: Syntax.VariableDeclaration, + declarations: declarations, + kind: 'var' + }; + } + + // kind may be `const` or `let` + // Both are experimental and not in the specification yet. + // see http://wiki.ecmascript.org/doku.php?id=harmony:const + // and http://wiki.ecmascript.org/doku.php?id=harmony:let + function parseConstLetDeclaration(kind) { + var declarations; + + expectKeyword(kind); + + declarations = parseVariableDeclarationList(kind); + + consumeSemicolon(); + + return { + type: Syntax.VariableDeclaration, + declarations: declarations, + kind: kind + }; + } + + // 12.3 Empty Statement + + function parseEmptyStatement() { + expect(';'); + + return { + type: Syntax.EmptyStatement + }; + } + + // 12.4 Expression Statement + + function parseExpressionStatement() { + var expr = parseExpression(); + + consumeSemicolon(); + + return { + type: Syntax.ExpressionStatement, + expression: expr + }; + } + + // 12.5 If statement + + function parseIfStatement() { + var test, consequent, alternate; + + expectKeyword('if'); + + expect('('); + + test = parseExpression(); + + expect(')'); + + consequent = parseStatement(); + + if (matchKeyword('else')) { + lex(); + alternate = parseStatement(); + } else { + alternate = null; + } + + return { + type: Syntax.IfStatement, + test: test, + consequent: consequent, + alternate: alternate + }; + } + + // 12.6 Iteration Statements + + function parseDoWhileStatement() { + var body, test, oldInIteration; + + expectKeyword('do'); + + oldInIteration = state.inIteration; + state.inIteration = true; + + body = parseStatement(); + + state.inIteration = oldInIteration; + + expectKeyword('while'); + + expect('('); + + test = parseExpression(); + + expect(')'); + + if (match(';')) { + lex(); + } + + return { + type: Syntax.DoWhileStatement, + body: body, + test: test + }; + } + + function parseWhileStatement() { + var test, body, oldInIteration; + + expectKeyword('while'); + + expect('('); + + test = parseExpression(); + + expect(')'); + + oldInIteration = state.inIteration; + state.inIteration = true; + + body = parseStatement(); + + state.inIteration = oldInIteration; + + return { + type: Syntax.WhileStatement, + test: test, + body: body + }; + } + + function parseForVariableDeclaration() { + var token = lex(); + + return { + type: Syntax.VariableDeclaration, + declarations: parseVariableDeclarationList(), + kind: token.value + }; + } + + function parseForStatement() { + var init, test, update, left, right, body, oldInIteration; + + init = test = update = null; + + expectKeyword('for'); + + expect('('); + + if (match(';')) { + lex(); + } else { + if (matchKeyword('var') || matchKeyword('let')) { + state.allowIn = false; + init = parseForVariableDeclaration(); + state.allowIn = true; + + if (init.declarations.length === 1 && matchKeyword('in')) { + lex(); + left = init; + right = parseExpression(); + init = null; + } + } else { + state.allowIn = false; + init = parseExpression(); + state.allowIn = true; + + if (matchKeyword('in')) { + // LeftHandSideExpression + if (matchKeyword('in') && (state.lastParenthesized !== init && !isLeftHandSide(init))) { + throwError({}, Messages.InvalidLHSInForIn); + } + lex(); + left = init; + right = parseExpression(); + init = null; + } + } + + if (typeof left === 'undefined') { + expect(';'); + } + } + + if (typeof left === 'undefined') { + + if (!match(';')) { + test = parseExpression(); + } + expect(';'); + + if (!match(')')) { + update = parseExpression(); + } + } + + expect(')'); + + oldInIteration = state.inIteration; + state.inIteration = true; + + body = parseStatement(); + + state.inIteration = oldInIteration; + + if (typeof left === 'undefined') { + return { + type: Syntax.ForStatement, + init: init, + test: test, + update: update, + body: body + }; + } + + return { + type: Syntax.ForInStatement, + left: left, + right: right, + body: body, + each: false + }; + } + + // 12.7 The continue statement + + function parseContinueStatement() { + var token, label = null; + + expectKeyword('continue'); + + // Optimize the most common form: 'continue;'. + if (source[index] === ';') { + lex(); + + if (!state.inIteration) { + throwError({}, Messages.IllegalContinue); + } + + return { + type: Syntax.ContinueStatement, + label: null + }; + } + + if (peekLineTerminator()) { + if (!state.inIteration) { + throwError({}, Messages.IllegalContinue); + } + + return { + type: Syntax.ContinueStatement, + label: null + }; + } + + token = lookahead(); + if (token.type === Token.Identifier) { + label = parseVariableIdentifier(); + + if (!Object.prototype.hasOwnProperty.call(state.labelSet, label.name)) { + throwError({}, Messages.UnknownLabel, label.name); + } + } + + consumeSemicolon(); + + if (label === null && !state.inIteration) { + throwError({}, Messages.IllegalContinue); + } + + return { + type: Syntax.ContinueStatement, + label: label + }; + } + + // 12.8 The break statement + + function parseBreakStatement() { + var token, label = null; + + expectKeyword('break'); + + // Optimize the most common form: 'break;'. + if (source[index] === ';') { + lex(); + + if (!(state.inIteration || state.inSwitch)) { + throwError({}, Messages.IllegalBreak); + } + + return { + type: Syntax.BreakStatement, + label: null + }; + } + + if (peekLineTerminator()) { + if (!(state.inIteration || state.inSwitch)) { + throwError({}, Messages.IllegalBreak); + } + + return { + type: Syntax.BreakStatement, + label: null + }; + } + + token = lookahead(); + if (token.type === Token.Identifier) { + label = parseVariableIdentifier(); + + if (!Object.prototype.hasOwnProperty.call(state.labelSet, label.name)) { + throwError({}, Messages.UnknownLabel, label.name); + } + } + + consumeSemicolon(); + + if (label === null && !(state.inIteration || state.inSwitch)) { + throwError({}, Messages.IllegalBreak); + } + + return { + type: Syntax.BreakStatement, + label: label + }; + } + + // 12.9 The return statement + + function parseReturnStatement() { + var token, argument = null; + + expectKeyword('return'); + + if (!state.inFunctionBody) { + throwErrorTolerant({}, Messages.IllegalReturn); + } + + // 'return' followed by a space and an identifier is very common. + if (source[index] === ' ') { + if (isIdentifierStart(source[index + 1])) { + argument = parseExpression(); + consumeSemicolon(); + return { + type: Syntax.ReturnStatement, + argument: argument + }; + } + } + + if (peekLineTerminator()) { + return { + type: Syntax.ReturnStatement, + argument: null + }; + } + + if (!match(';')) { + token = lookahead(); + if (!match('}') && token.type !== Token.EOF) { + argument = parseExpression(); + } + } + + consumeSemicolon(); + + return { + type: Syntax.ReturnStatement, + argument: argument + }; + } + + // 12.10 The with statement + + function parseWithStatement() { + var object, body; + + if (strict) { + throwErrorTolerant({}, Messages.StrictModeWith); + } + + expectKeyword('with'); + + expect('('); + + object = parseExpression(); + + expect(')'); + + body = parseStatement(); + + return { + type: Syntax.WithStatement, + object: object, + body: body + }; + } + + // 12.10 The swith statement + + function parseSwitchCase() { + var test, + consequent = [], + statement; + + if (matchKeyword('default')) { + lex(); + test = null; + } else { + expectKeyword('case'); + test = parseExpression(); + } + expect(':'); + + while (index < length) { + if (match('}') || matchKeyword('default') || matchKeyword('case')) { + break; + } + statement = parseStatement(); + if (typeof statement === 'undefined') { + break; + } + consequent.push(statement); + } + + return { + type: Syntax.SwitchCase, + test: test, + consequent: consequent + }; + } + + function parseSwitchStatement() { + var discriminant, cases, oldInSwitch; + + expectKeyword('switch'); + + expect('('); + + discriminant = parseExpression(); + + expect(')'); + + expect('{'); + + if (match('}')) { + lex(); + return { + type: Syntax.SwitchStatement, + discriminant: discriminant + }; + } + + cases = []; + + oldInSwitch = state.inSwitch; + state.inSwitch = true; + + while (index < length) { + if (match('}')) { + break; + } + cases.push(parseSwitchCase()); + } + + state.inSwitch = oldInSwitch; + + expect('}'); + + return { + type: Syntax.SwitchStatement, + discriminant: discriminant, + cases: cases + }; + } + + // 12.13 The throw statement + + function parseThrowStatement() { + var argument; + + expectKeyword('throw'); + + if (peekLineTerminator()) { + throwError({}, Messages.NewlineAfterThrow); + } + + argument = parseExpression(); + + consumeSemicolon(); + + return { + type: Syntax.ThrowStatement, + argument: argument + }; + } + + // 12.14 The try statement + + function parseCatchClause() { + var param; + + expectKeyword('catch'); + + expect('('); + if (!match(')')) { + param = parseExpression(); + // 12.14.1 + if (strict && param.type === Syntax.Identifier && isRestrictedWord(param.name)) { + throwErrorTolerant({}, Messages.StrictCatchVariable); + } + } + expect(')'); + + return { + type: Syntax.CatchClause, + param: param, + guard: null, + body: parseBlock() + }; + } + + function parseTryStatement() { + var block, handlers = [], finalizer = null; + + expectKeyword('try'); + + block = parseBlock(); + + if (matchKeyword('catch')) { + handlers.push(parseCatchClause()); + } + + if (matchKeyword('finally')) { + lex(); + finalizer = parseBlock(); + } + + if (handlers.length === 0 && !finalizer) { + throwError({}, Messages.NoCatchOrFinally); + } + + return { + type: Syntax.TryStatement, + block: block, + handlers: handlers, + finalizer: finalizer + }; + } + + // 12.15 The debugger statement + + function parseDebuggerStatement() { + expectKeyword('debugger'); + + consumeSemicolon(); + + return { + type: Syntax.DebuggerStatement + }; + } + + // 12 Statements + + function parseStatement() { + var token = lookahead(), + expr, + labeledBody; + + if (token.type === Token.EOF) { + throwUnexpected(token); + } + + if (token.type === Token.Punctuator) { + switch (token.value) { + case ';': + return parseEmptyStatement(); + case '{': + return parseBlock(); + case '(': + return parseExpressionStatement(); + default: + break; + } + } + + if (token.type === Token.Keyword) { + switch (token.value) { + case 'break': + return parseBreakStatement(); + case 'continue': + return parseContinueStatement(); + case 'debugger': + return parseDebuggerStatement(); + case 'do': + return parseDoWhileStatement(); + case 'for': + return parseForStatement(); + case 'function': + return parseFunctionDeclaration(); + case 'if': + return parseIfStatement(); + case 'return': + return parseReturnStatement(); + case 'switch': + return parseSwitchStatement(); + case 'throw': + return parseThrowStatement(); + case 'try': + return parseTryStatement(); + case 'var': + return parseVariableStatement(); + case 'while': + return parseWhileStatement(); + case 'with': + return parseWithStatement(); + default: + break; + } + } + + expr = parseExpression(); + + // 12.12 Labelled Statements + if ((expr.type === Syntax.Identifier) && match(':')) { + lex(); + + if (Object.prototype.hasOwnProperty.call(state.labelSet, expr.name)) { + throwError({}, Messages.Redeclaration, 'Label', expr.name); + } + + state.labelSet[expr.name] = true; + labeledBody = parseStatement(); + delete state.labelSet[expr.name]; + + return { + type: Syntax.LabeledStatement, + label: expr, + body: labeledBody + }; + } + + consumeSemicolon(); + + return { + type: Syntax.ExpressionStatement, + expression: expr + }; + } + + // 13 Function Definition + + function parseFunctionSourceElements() { + var sourceElement, sourceElements = [], token, directive, firstRestricted, + oldLabelSet, oldInIteration, oldInSwitch, oldInFunctionBody; + + expect('{'); + + while (index < length) { + token = lookahead(); + if (token.type !== Token.StringLiteral) { + break; + } + + sourceElement = parseSourceElement(); + sourceElements.push(sourceElement); + if (sourceElement.expression.type !== Syntax.Literal) { + // this is not directive + break; + } + directive = sliceSource(token.range[0] + 1, token.range[1] - 1); + if (directive === 'use strict') { + strict = true; + if (firstRestricted) { + throwError(firstRestricted, Messages.StrictOctalLiteral); + } + } else { + if (!firstRestricted && token.octal) { + firstRestricted = token; + } + } + } + + oldLabelSet = state.labelSet; + oldInIteration = state.inIteration; + oldInSwitch = state.inSwitch; + oldInFunctionBody = state.inFunctionBody; + + state.labelSet = {}; + state.inIteration = false; + state.inSwitch = false; + state.inFunctionBody = true; + + while (index < length) { + if (match('}')) { + break; + } + sourceElement = parseSourceElement(); + if (typeof sourceElement === 'undefined') { + break; + } + sourceElements.push(sourceElement); + } + + expect('}'); + + state.labelSet = oldLabelSet; + state.inIteration = oldInIteration; + state.inSwitch = oldInSwitch; + state.inFunctionBody = oldInFunctionBody; + + return { + type: Syntax.BlockStatement, + body: sourceElements + }; + } + + function parseFunctionDeclaration() { + var id, param, params = [], body, token, firstRestricted, message, previousStrict, paramSet; + + expectKeyword('function'); + token = lookahead(); + id = parseVariableIdentifier(); + if (strict) { + if (isRestrictedWord(token.value)) { + throwError(token, Messages.StrictFunctionName); + } + } else { + if (isRestrictedWord(token.value)) { + firstRestricted = token; + message = Messages.StrictFunctionName; + } else if (isStrictModeReservedWord(token.value)) { + firstRestricted = token; + message = Messages.StrictReservedWord; + } + } + + expect('('); + + if (!match(')')) { + paramSet = {}; + while (index < length) { + token = lookahead(); + param = parseVariableIdentifier(); + if (strict) { + if (isRestrictedWord(token.value)) { + throwError(token, Messages.StrictParamName); + } + if (Object.prototype.hasOwnProperty.call(paramSet, token.value)) { + throwError(token, Messages.StrictParamDupe); + } + } else if (!firstRestricted) { + if (isRestrictedWord(token.value)) { + firstRestricted = token; + message = Messages.StrictParamName; + } else if (isStrictModeReservedWord(token.value)) { + firstRestricted = token; + message = Messages.StrictReservedWord; + } else if (Object.prototype.hasOwnProperty.call(paramSet, token.value)) { + firstRestricted = token; + message = Messages.StrictParamDupe; + } + } + params.push(param); + paramSet[param.name] = true; + if (match(')')) { + break; + } + expect(','); + } + } + + expect(')'); + + previousStrict = strict; + body = parseFunctionSourceElements(); + if (strict && firstRestricted) { + throwError(firstRestricted, message); + } + strict = previousStrict; + + return { + type: Syntax.FunctionDeclaration, + id: id, + params: params, + body: body + }; + } + + function parseFunctionExpression() { + var token, id = null, firstRestricted, message, param, params = [], body, previousStrict, paramSet; + + expectKeyword('function'); + + if (!match('(')) { + token = lookahead(); + id = parseVariableIdentifier(); + if (strict) { + if (isRestrictedWord(token.value)) { + throwError(token, Messages.StrictFunctionName); + } + } else { + if (isRestrictedWord(token.value)) { + firstRestricted = token; + message = Messages.StrictFunctionName; + } else if (isStrictModeReservedWord(token.value)) { + firstRestricted = token; + message = Messages.StrictReservedWord; + } + } + } + + expect('('); + + if (!match(')')) { + paramSet = {}; + while (index < length) { + token = lookahead(); + param = parseVariableIdentifier(); + if (strict) { + if (isRestrictedWord(token.value)) { + throwError(token, Messages.StrictParamName); + } + if (Object.prototype.hasOwnProperty.call(paramSet, token.value)) { + throwError(token, Messages.StrictParamDupe); + } + } else if (!firstRestricted) { + if (isRestrictedWord(token.value)) { + firstRestricted = token; + message = Messages.StrictParamName; + } else if (isStrictModeReservedWord(token.value)) { + firstRestricted = token; + message = Messages.StrictReservedWord; + } else if (Object.prototype.hasOwnProperty.call(paramSet, token.value)) { + firstRestricted = token; + message = Messages.StrictParamDupe; + } + } + params.push(param); + paramSet[param.name] = true; + if (match(')')) { + break; + } + expect(','); + } + } + + expect(')'); + + previousStrict = strict; + body = parseFunctionSourceElements(); + if (strict && firstRestricted) { + throwError(firstRestricted, message); + } + strict = previousStrict; + + return { + type: Syntax.FunctionExpression, + id: id, + params: params, + body: body + }; + } + + // 14 Program + + function parseSourceElement() { + var token = lookahead(); + + if (token.type === Token.Keyword) { + switch (token.value) { + case 'const': + case 'let': + return parseConstLetDeclaration(token.value); + case 'function': + return parseFunctionDeclaration(); + default: + return parseStatement(); + } + } + + if (token.type !== Token.EOF) { + return parseStatement(); + } + } + + function parseSourceElements() { + var sourceElement, sourceElements = [], token, directive, firstRestricted; + + while (index < length) { + token = lookahead(); + if (token.type !== Token.StringLiteral) { + break; + } + + sourceElement = parseSourceElement(); + sourceElements.push(sourceElement); + if (sourceElement.expression.type !== Syntax.Literal) { + // this is not directive + break; + } + directive = sliceSource(token.range[0] + 1, token.range[1] - 1); + if (directive === 'use strict') { + strict = true; + if (firstRestricted) { + throwError(firstRestricted, Messages.StrictOctalLiteral); + } + } else { + if (!firstRestricted && token.octal) { + firstRestricted = token; + } + } + } + + while (index < length) { + sourceElement = parseSourceElement(); + if (typeof sourceElement === 'undefined') { + break; + } + sourceElements.push(sourceElement); + } + return sourceElements; + } + + function parseProgram() { + var program; + strict = false; + program = { + type: Syntax.Program, + body: parseSourceElements() + }; + return program; + } + + // The following functions are needed only when the option to preserve + // the comments is active. + + function addComment(start, end, type, value) { + assert(typeof start === 'number', 'Comment must have valid position'); + + // Because the way the actual token is scanned, often the comments + // (if any) are skipped twice during the lexical analysis. + // Thus, we need to skip adding a comment if the comment array already + // handled it. + if (extra.comments.length > 0) { + if (extra.comments[extra.comments.length - 1].range[1] > start) { + return; + } + } + + extra.comments.push({ + range: [start, end], + type: type, + value: value + }); + } + + function scanComment() { + var comment, ch, start, blockComment, lineComment; + + comment = ''; + blockComment = false; + lineComment = false; + + while (index < length) { + ch = source[index]; + + if (lineComment) { + ch = nextChar(); + if (index >= length) { + lineComment = false; + comment += ch; + addComment(start, index, 'Line', comment); + } else if (isLineTerminator(ch)) { + lineComment = false; + addComment(start, index, 'Line', comment); + if (ch === '\r' && source[index] === '\n') { + ++index; + } + ++lineNumber; + lineStart = index; + comment = ''; + } else { + comment += ch; + } + } else if (blockComment) { + if (isLineTerminator(ch)) { + if (ch === '\r' && source[index + 1] === '\n') { + ++index; + comment += '\r\n'; + } else { + comment += ch; + } + ++lineNumber; + ++index; + lineStart = index; + if (index >= length) { + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + } else { + ch = nextChar(); + if (index >= length) { + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + comment += ch; + if (ch === '*') { + ch = source[index]; + if (ch === '/') { + comment = comment.substr(0, comment.length - 1); + blockComment = false; + ++index; + addComment(start, index, 'Block', comment); + comment = ''; + } + } + } + } else if (ch === '/') { + ch = source[index + 1]; + if (ch === '/') { + start = index; + index += 2; + lineComment = true; + } else if (ch === '*') { + start = index; + index += 2; + blockComment = true; + if (index >= length) { + throwError({}, Messages.UnexpectedToken, 'ILLEGAL'); + } + } else { + break; + } + } else if (isWhiteSpace(ch)) { + ++index; + } else if (isLineTerminator(ch)) { + ++index; + if (ch === '\r' && source[index] === '\n') { + ++index; + } + ++lineNumber; + lineStart = index; + } else { + break; + } + } + } + + function collectToken() { + var token = extra.advance(), + range, + value; + + if (token.type !== Token.EOF) { + range = [token.range[0], token.range[1]]; + value = sliceSource(token.range[0], token.range[1]); + extra.tokens.push({ + type: TokenName[token.type], + value: value, + range: range + }); + } + + return token; + } + + function collectRegex() { + var pos, regex, token; + + skipComment(); + + pos = index; + regex = extra.scanRegExp(); + + // Pop the previous token, which is likely '/' or '/=' + if (extra.tokens.length > 0) { + token = extra.tokens[extra.tokens.length - 1]; + if (token.range[0] === pos && token.type === 'Punctuator') { + if (token.value === '/' || token.value === '/=') { + extra.tokens.pop(); + } + } + } + + extra.tokens.push({ + type: 'RegularExpression', + value: regex.literal, + range: [pos, index] + }); + + return regex; + } + + function createLiteral(token) { + return { + type: Syntax.Literal, + value: token.value + }; + } + + function createRawLiteral(token) { + return { + type: Syntax.Literal, + value: token.value, + raw: sliceSource(token.range[0], token.range[1]) + }; + } + + function wrapTrackingFunction(range, loc) { + + return function (parseFunction) { + + function isBinary(node) { + return node.type === Syntax.LogicalExpression || + node.type === Syntax.BinaryExpression; + } + + function visit(node) { + if (isBinary(node.left)) { + visit(node.left); + } + if (isBinary(node.right)) { + visit(node.right); + } + + if (range && typeof node.range === 'undefined') { + node.range = [node.left.range[0], node.right.range[1]]; + } + if (loc && typeof node.loc === 'undefined') { + node.loc = { + start: node.left.loc.start, + end: node.right.loc.end + }; + } + } + + return function () { + var node, rangeInfo, locInfo; + + skipComment(); + rangeInfo = [index, 0]; + locInfo = { + start: { + line: lineNumber, + column: index - lineStart + } + }; + + node = parseFunction.apply(null, arguments); + if (typeof node !== 'undefined') { + + if (range) { + rangeInfo[1] = index; + node.range = rangeInfo; + } + + if (loc) { + locInfo.end = { + line: lineNumber, + column: index - lineStart + }; + node.loc = locInfo; + } + + if (isBinary(node)) { + visit(node); + } + + if (node.type === Syntax.MemberExpression) { + if (typeof node.object.range !== 'undefined') { + node.range[0] = node.object.range[0]; + } + if (typeof node.object.loc !== 'undefined') { + node.loc.start = node.object.loc.start; + } + } + return node; + } + }; + + }; + } + + function patch() { + + var wrapTracking; + + if (extra.comments) { + extra.skipComment = skipComment; + skipComment = scanComment; + } + + if (extra.raw) { + extra.createLiteral = createLiteral; + createLiteral = createRawLiteral; + } + + if (extra.range || extra.loc) { + + wrapTracking = wrapTrackingFunction(extra.range, extra.loc); + + extra.parseAdditiveExpression = parseAdditiveExpression; + extra.parseAssignmentExpression = parseAssignmentExpression; + extra.parseBitwiseANDExpression = parseBitwiseANDExpression; + extra.parseBitwiseORExpression = parseBitwiseORExpression; + extra.parseBitwiseXORExpression = parseBitwiseXORExpression; + extra.parseBlock = parseBlock; + extra.parseFunctionSourceElements = parseFunctionSourceElements; + extra.parseCallMember = parseCallMember; + extra.parseCatchClause = parseCatchClause; + extra.parseComputedMember = parseComputedMember; + extra.parseConditionalExpression = parseConditionalExpression; + extra.parseConstLetDeclaration = parseConstLetDeclaration; + extra.parseEqualityExpression = parseEqualityExpression; + extra.parseExpression = parseExpression; + extra.parseForVariableDeclaration = parseForVariableDeclaration; + extra.parseFunctionDeclaration = parseFunctionDeclaration; + extra.parseFunctionExpression = parseFunctionExpression; + extra.parseLogicalANDExpression = parseLogicalANDExpression; + extra.parseLogicalORExpression = parseLogicalORExpression; + extra.parseMultiplicativeExpression = parseMultiplicativeExpression; + extra.parseNewExpression = parseNewExpression; + extra.parseNonComputedMember = parseNonComputedMember; + extra.parseNonComputedProperty = parseNonComputedProperty; + extra.parseObjectProperty = parseObjectProperty; + extra.parseObjectPropertyKey = parseObjectPropertyKey; + extra.parsePostfixExpression = parsePostfixExpression; + extra.parsePrimaryExpression = parsePrimaryExpression; + extra.parseProgram = parseProgram; + extra.parsePropertyFunction = parsePropertyFunction; + extra.parseRelationalExpression = parseRelationalExpression; + extra.parseStatement = parseStatement; + extra.parseShiftExpression = parseShiftExpression; + extra.parseSwitchCase = parseSwitchCase; + extra.parseUnaryExpression = parseUnaryExpression; + extra.parseVariableDeclaration = parseVariableDeclaration; + extra.parseVariableIdentifier = parseVariableIdentifier; + + parseAdditiveExpression = wrapTracking(extra.parseAdditiveExpression); + parseAssignmentExpression = wrapTracking(extra.parseAssignmentExpression); + parseBitwiseANDExpression = wrapTracking(extra.parseBitwiseANDExpression); + parseBitwiseORExpression = wrapTracking(extra.parseBitwiseORExpression); + parseBitwiseXORExpression = wrapTracking(extra.parseBitwiseXORExpression); + parseBlock = wrapTracking(extra.parseBlock); + parseFunctionSourceElements = wrapTracking(extra.parseFunctionSourceElements); + parseCallMember = wrapTracking(extra.parseCallMember); + parseCatchClause = wrapTracking(extra.parseCatchClause); + parseComputedMember = wrapTracking(extra.parseComputedMember); + parseConditionalExpression = wrapTracking(extra.parseConditionalExpression); + parseConstLetDeclaration = wrapTracking(extra.parseConstLetDeclaration); + parseEqualityExpression = wrapTracking(extra.parseEqualityExpression); + parseExpression = wrapTracking(extra.parseExpression); + parseForVariableDeclaration = wrapTracking(extra.parseForVariableDeclaration); + parseFunctionDeclaration = wrapTracking(extra.parseFunctionDeclaration); + parseFunctionExpression = wrapTracking(extra.parseFunctionExpression); + parseLogicalANDExpression = wrapTracking(extra.parseLogicalANDExpression); + parseLogicalORExpression = wrapTracking(extra.parseLogicalORExpression); + parseMultiplicativeExpression = wrapTracking(extra.parseMultiplicativeExpression); + parseNewExpression = wrapTracking(extra.parseNewExpression); + parseNonComputedMember = wrapTracking(extra.parseNonComputedMember); + parseNonComputedProperty = wrapTracking(extra.parseNonComputedProperty); + parseObjectProperty = wrapTracking(extra.parseObjectProperty); + parseObjectPropertyKey = wrapTracking(extra.parseObjectPropertyKey); + parsePostfixExpression = wrapTracking(extra.parsePostfixExpression); + parsePrimaryExpression = wrapTracking(extra.parsePrimaryExpression); + parseProgram = wrapTracking(extra.parseProgram); + parsePropertyFunction = wrapTracking(extra.parsePropertyFunction); + parseRelationalExpression = wrapTracking(extra.parseRelationalExpression); + parseStatement = wrapTracking(extra.parseStatement); + parseShiftExpression = wrapTracking(extra.parseShiftExpression); + parseSwitchCase = wrapTracking(extra.parseSwitchCase); + parseUnaryExpression = wrapTracking(extra.parseUnaryExpression); + parseVariableDeclaration = wrapTracking(extra.parseVariableDeclaration); + parseVariableIdentifier = wrapTracking(extra.parseVariableIdentifier); + } + + if (typeof extra.tokens !== 'undefined') { + extra.advance = advance; + extra.scanRegExp = scanRegExp; + + advance = collectToken; + scanRegExp = collectRegex; + } + } + + function unpatch() { + if (typeof extra.skipComment === 'function') { + skipComment = extra.skipComment; + } + + if (extra.raw) { + createLiteral = extra.createLiteral; + } + + if (extra.range || extra.loc) { + parseAdditiveExpression = extra.parseAdditiveExpression; + parseAssignmentExpression = extra.parseAssignmentExpression; + parseBitwiseANDExpression = extra.parseBitwiseANDExpression; + parseBitwiseORExpression = extra.parseBitwiseORExpression; + parseBitwiseXORExpression = extra.parseBitwiseXORExpression; + parseBlock = extra.parseBlock; + parseFunctionSourceElements = extra.parseFunctionSourceElements; + parseCallMember = extra.parseCallMember; + parseCatchClause = extra.parseCatchClause; + parseComputedMember = extra.parseComputedMember; + parseConditionalExpression = extra.parseConditionalExpression; + parseConstLetDeclaration = extra.parseConstLetDeclaration; + parseEqualityExpression = extra.parseEqualityExpression; + parseExpression = extra.parseExpression; + parseForVariableDeclaration = extra.parseForVariableDeclaration; + parseFunctionDeclaration = extra.parseFunctionDeclaration; + parseFunctionExpression = extra.parseFunctionExpression; + parseLogicalANDExpression = extra.parseLogicalANDExpression; + parseLogicalORExpression = extra.parseLogicalORExpression; + parseMultiplicativeExpression = extra.parseMultiplicativeExpression; + parseNewExpression = extra.parseNewExpression; + parseNonComputedMember = extra.parseNonComputedMember; + parseNonComputedProperty = extra.parseNonComputedProperty; + parseObjectProperty = extra.parseObjectProperty; + parseObjectPropertyKey = extra.parseObjectPropertyKey; + parsePrimaryExpression = extra.parsePrimaryExpression; + parsePostfixExpression = extra.parsePostfixExpression; + parseProgram = extra.parseProgram; + parsePropertyFunction = extra.parsePropertyFunction; + parseRelationalExpression = extra.parseRelationalExpression; + parseStatement = extra.parseStatement; + parseShiftExpression = extra.parseShiftExpression; + parseSwitchCase = extra.parseSwitchCase; + parseUnaryExpression = extra.parseUnaryExpression; + parseVariableDeclaration = extra.parseVariableDeclaration; + parseVariableIdentifier = extra.parseVariableIdentifier; + } + + if (typeof extra.scanRegExp === 'function') { + advance = extra.advance; + scanRegExp = extra.scanRegExp; + } + } + + function stringToArray(str) { + var length = str.length, + result = [], + i; + for (i = 0; i < length; ++i) { + result[i] = str.charAt(i); + } + return result; + } + + function parse(code, options) { + var program, toString; + + toString = String; + if (typeof code !== 'string' && !(code instanceof String)) { + code = toString(code); + } + + source = code; + index = 0; + lineNumber = (source.length > 0) ? 1 : 0; + lineStart = 0; + length = source.length; + buffer = null; + state = { + allowIn: true, + labelSet: {}, + lastParenthesized: null, + inFunctionBody: false, + inIteration: false, + inSwitch: false + }; + + extra = {}; + if (typeof options !== 'undefined') { + extra.range = (typeof options.range === 'boolean') && options.range; + extra.loc = (typeof options.loc === 'boolean') && options.loc; + extra.raw = (typeof options.raw === 'boolean') && options.raw; + if (typeof options.tokens === 'boolean' && options.tokens) { + extra.tokens = []; + } + if (typeof options.comment === 'boolean' && options.comment) { + extra.comments = []; + } + if (typeof options.tolerant === 'boolean' && options.tolerant) { + extra.errors = []; + } + } + + if (length > 0) { + if (typeof source[0] === 'undefined') { + // Try first to convert to a string. This is good as fast path + // for old IE which understands string indexing for string + // literals only and not for string object. + if (code instanceof String) { + source = code.valueOf(); + } + + // Force accessing the characters via an array. + if (typeof source[0] === 'undefined') { + source = stringToArray(code); + } + } + } + + patch(); + try { + program = parseProgram(); + if (typeof extra.comments !== 'undefined') { + program.comments = extra.comments; + } + if (typeof extra.tokens !== 'undefined') { + program.tokens = extra.tokens; + } + if (typeof extra.errors !== 'undefined') { + program.errors = extra.errors; + } + } catch (e) { + throw e; + } finally { + unpatch(); + extra = {}; + } + + return program; + } + + // Sync with package.json. + exports.version = '1.0.0-dev'; + + exports.parse = parse; + + // Deep copy. + exports.Syntax = (function () { + var name, types = {}; + + if (typeof Object.create === 'function') { + types = Object.create(null); + } + + for (name in Syntax) { + if (Syntax.hasOwnProperty(name)) { + types[name] = Syntax[name]; + } + } + + if (typeof Object.freeze === 'function') { + Object.freeze(types); + } + + return types; + }()); + +}(typeof exports === 'undefined' ? (esprima = {}) : exports)); +/* vim: set sw=4 ts=4 et tw=80 : */ +}); +define('uglifyjs/consolidator', ["require", "exports", "module", "env!env/assert", "./parse-js", "./process"], function(require, exports, module, assert) { + +/** + * @preserve Copyright 2012 Robert Gust-Bardon . + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/** + * @fileoverview Enhances UglifyJS with consolidation of null, Boolean, and String values. + *

Also known as aliasing, this feature has been deprecated in the Closure Compiler since its + * initial release, where it is unavailable from the CLI. The Closure Compiler allows one to log and + * influence this process. In contrast, this implementation does not introduce + * any variable declarations in global code and derives String values from + * identifier names used as property accessors.

+ *

Consolidating literals may worsen the data compression ratio when an encoding + * transformation is applied. For instance, jQuery 1.7.1 takes 248235 bytes. + * Building it with + * UglifyJS v1.2.5 results in 93647 bytes (37.73% of the original) which are + * then compressed to 33154 bytes (13.36% of the original) using gzip(1). Building it with the same + * version of UglifyJS 1.2.5 patched with the implementation of consolidation + * results in 80784 bytes (a decrease of 12863 bytes, i.e. 13.74%, in comparison + * to the aforementioned 93647 bytes) which are then compressed to 34013 bytes + * (an increase of 859 bytes, i.e. 2.59%, in comparison to the aforementioned + * 33154 bytes).

+ *

Written in the strict variant + * of ECMA-262 5.1 Edition. Encoded in UTF-8. Follows Revision 2.28 of the Google JavaScript Style Guide (except for the + * discouraged use of the {@code function} tag and the {@code namespace} tag). + * 100% typed for the Closure Compiler Version 1741.

+ *

Should you find this software useful, please consider a donation.

+ * @author follow.me@RGustBardon (Robert Gust-Bardon) + * @supported Tested with: + * + */ + +/*global console:false, exports:true, module:false, require:false */ +/*jshint sub:true */ +/** + * Consolidates null, Boolean, and String values found inside an AST. + * @param {!TSyntacticCodeUnit} oAbstractSyntaxTree An array-like object + * representing an AST. + * @return {!TSyntacticCodeUnit} An array-like object representing an AST with its null, Boolean, and + * String values consolidated. + */ +// TODO(user) Consolidation of mathematical values found in numeric literals. +// TODO(user) Unconsolidation. +// TODO(user) Consolidation of ECMA-262 6th Edition programs. +// TODO(user) Rewrite in ECMA-262 6th Edition. +exports['ast_consolidate'] = function(oAbstractSyntaxTree) { + 'use strict'; + /*jshint bitwise:true, curly:true, eqeqeq:true, forin:true, immed:true, + latedef:true, newcap:true, noarge:true, noempty:true, nonew:true, + onevar:true, plusplus:true, regexp:true, undef:true, strict:true, + sub:false, trailing:true */ + + var _, + /** + * A record consisting of data about one or more source elements. + * @constructor + * @nosideeffects + */ + TSourceElementsData = function() { + /** + * The category of the elements. + * @type {number} + * @see ESourceElementCategories + */ + this.nCategory = ESourceElementCategories.N_OTHER; + /** + * The number of occurrences (within the elements) of each primitive + * value that could be consolidated. + * @type {!Array.>} + */ + this.aCount = []; + this.aCount[EPrimaryExpressionCategories.N_IDENTIFIER_NAMES] = {}; + this.aCount[EPrimaryExpressionCategories.N_STRING_LITERALS] = {}; + this.aCount[EPrimaryExpressionCategories.N_NULL_AND_BOOLEAN_LITERALS] = + {}; + /** + * Identifier names found within the elements. + * @type {!Array.} + */ + this.aIdentifiers = []; + /** + * Prefixed representation Strings of each primitive value that could be + * consolidated within the elements. + * @type {!Array.} + */ + this.aPrimitiveValues = []; + }, + /** + * A record consisting of data about a primitive value that could be + * consolidated. + * @constructor + * @nosideeffects + */ + TPrimitiveValue = function() { + /** + * The difference in the number of terminal symbols between the original + * source text and the one with the primitive value consolidated. If the + * difference is positive, the primitive value is considered worthwhile. + * @type {number} + */ + this.nSaving = 0; + /** + * An identifier name of the variable that will be declared and assigned + * the primitive value if the primitive value is consolidated. + * @type {string} + */ + this.sName = ''; + }, + /** + * A record consisting of data on what to consolidate within the range of + * source elements that is currently being considered. + * @constructor + * @nosideeffects + */ + TSolution = function() { + /** + * An object whose keys are prefixed representation Strings of each + * primitive value that could be consolidated within the elements and + * whose values are corresponding data about those primitive values. + * @type {!Object.} + * @see TPrimitiveValue + */ + this.oPrimitiveValues = {}; + /** + * The difference in the number of terminal symbols between the original + * source text and the one with all the worthwhile primitive values + * consolidated. + * @type {number} + * @see TPrimitiveValue#nSaving + */ + this.nSavings = 0; + }, + /** + * The processor of ASTs found + * in UglifyJS. + * @namespace + * @type {!TProcessor} + */ + oProcessor = (/** @type {!TProcessor} */ require('./process')), + /** + * A record consisting of a number of constants that represent the + * difference in the number of terminal symbols between a source text with + * a modified syntactic code unit and the original one. + * @namespace + * @type {!Object.} + */ + oWeights = { + /** + * The difference in the number of punctuators required by the bracket + * notation and the dot notation. + *

'[]'.length - '.'.length

+ * @const + * @type {number} + */ + N_PROPERTY_ACCESSOR: 1, + /** + * The number of punctuators required by a variable declaration with an + * initialiser. + *

':'.length + ';'.length

+ * @const + * @type {number} + */ + N_VARIABLE_DECLARATION: 2, + /** + * The number of terminal symbols required to introduce a variable + * statement (excluding its variable declaration list). + *

'var '.length

+ * @const + * @type {number} + */ + N_VARIABLE_STATEMENT_AFFIXATION: 4, + /** + * The number of terminal symbols needed to enclose source elements + * within a function call with no argument values to a function with an + * empty parameter list. + *

'(function(){}());'.length

+ * @const + * @type {number} + */ + N_CLOSURE: 17 + }, + /** + * Categories of primary expressions from which primitive values that + * could be consolidated are derivable. + * @namespace + * @enum {number} + */ + EPrimaryExpressionCategories = { + /** + * Identifier names used as property accessors. + * @type {number} + */ + N_IDENTIFIER_NAMES: 0, + /** + * String literals. + * @type {number} + */ + N_STRING_LITERALS: 1, + /** + * Null and Boolean literals. + * @type {number} + */ + N_NULL_AND_BOOLEAN_LITERALS: 2 + }, + /** + * Prefixes of primitive values that could be consolidated. + * The String values of the prefixes must have same number of characters. + * The prefixes must not be used in any properties defined in any version + * of ECMA-262. + * @namespace + * @enum {string} + */ + EValuePrefixes = { + /** + * Identifies String values. + * @type {string} + */ + S_STRING: '#S', + /** + * Identifies null and Boolean values. + * @type {string} + */ + S_SYMBOLIC: '#O' + }, + /** + * Categories of source elements in terms of their appropriateness of + * having their primitive values consolidated. + * @namespace + * @enum {number} + */ + ESourceElementCategories = { + /** + * Identifies a source element that includes the {@code with} statement. + * @type {number} + */ + N_WITH: 0, + /** + * Identifies a source element that includes the {@code eval} identifier name. + * @type {number} + */ + N_EVAL: 1, + /** + * Identifies a source element that must be excluded from the process + * unless its whole scope is examined. + * @type {number} + */ + N_EXCLUDABLE: 2, + /** + * Identifies source elements not posing any problems. + * @type {number} + */ + N_OTHER: 3 + }, + /** + * The list of literals (other than the String ones) whose primitive + * values can be consolidated. + * @const + * @type {!Array.} + */ + A_OTHER_SUBSTITUTABLE_LITERALS = [ + 'null', // The null literal. + 'false', // The Boolean literal {@code false}. + 'true' // The Boolean literal {@code true}. + ]; + + (/** + * Consolidates all worthwhile primitive values in a syntactic code unit. + * @param {!TSyntacticCodeUnit} oSyntacticCodeUnit An array-like object + * representing the branch of the abstract syntax tree representing the + * syntactic code unit along with its scope. + * @see TPrimitiveValue#nSaving + */ + function fExamineSyntacticCodeUnit(oSyntacticCodeUnit) { + var _, + /** + * Indicates whether the syntactic code unit represents global code. + * @type {boolean} + */ + bIsGlobal = 'toplevel' === oSyntacticCodeUnit[0], + /** + * Indicates whether the whole scope is being examined. + * @type {boolean} + */ + bIsWhollyExaminable = !bIsGlobal, + /** + * An array-like object representing source elements that constitute a + * syntactic code unit. + * @type {!TSyntacticCodeUnit} + */ + oSourceElements, + /** + * A record consisting of data about the source element that is + * currently being examined. + * @type {!TSourceElementsData} + */ + oSourceElementData, + /** + * The scope of the syntactic code unit. + * @type {!TScope} + */ + oScope, + /** + * An instance of an object that allows the traversal of an AST. + * @type {!TWalker} + */ + oWalker, + /** + * An object encompassing collections of functions used during the + * traversal of an AST. + * @namespace + * @type {!Object.>} + */ + oWalkers = { + /** + * A collection of functions used during the surveyance of source + * elements. + * @namespace + * @type {!Object.} + */ + oSurveySourceElement: { + /**#nocode+*/ // JsDoc Toolkit 2.4.0 hides some of the keys. + /** + * Classifies the source element as excludable if it does not + * contain a {@code with} statement or the {@code eval} identifier + * name. Adds the identifier of the function and its formal + * parameters to the list of identifier names found. + * @param {string} sIdentifier The identifier of the function. + * @param {!Array.} aFormalParameterList Formal parameters. + * @param {!TSyntacticCodeUnit} oFunctionBody Function code. + */ + 'defun': function( + sIdentifier, + aFormalParameterList, + oFunctionBody) { + fClassifyAsExcludable(); + fAddIdentifier(sIdentifier); + aFormalParameterList.forEach(fAddIdentifier); + }, + /** + * Increments the count of the number of occurrences of the String + * value that is equivalent to the sequence of terminal symbols + * that constitute the encountered identifier name. + * @param {!TSyntacticCodeUnit} oExpression The nonterminal + * MemberExpression. + * @param {string} sIdentifierName The identifier name used as the + * property accessor. + * @return {!Array} The encountered branch of an AST with its nonterminal + * MemberExpression traversed. + */ + 'dot': function(oExpression, sIdentifierName) { + fCountPrimaryExpression( + EPrimaryExpressionCategories.N_IDENTIFIER_NAMES, + EValuePrefixes.S_STRING + sIdentifierName); + return ['dot', oWalker.walk(oExpression), sIdentifierName]; + }, + /** + * Adds the optional identifier of the function and its formal + * parameters to the list of identifier names found. + * @param {?string} sIdentifier The optional identifier of the + * function. + * @param {!Array.} aFormalParameterList Formal parameters. + * @param {!TSyntacticCodeUnit} oFunctionBody Function code. + */ + 'function': function( + sIdentifier, + aFormalParameterList, + oFunctionBody) { + if ('string' === typeof sIdentifier) { + fAddIdentifier(sIdentifier); + } + aFormalParameterList.forEach(fAddIdentifier); + }, + /** + * Either increments the count of the number of occurrences of the + * encountered null or Boolean value or classifies a source element + * as containing the {@code eval} identifier name. + * @param {string} sIdentifier The identifier encountered. + */ + 'name': function(sIdentifier) { + if (-1 !== A_OTHER_SUBSTITUTABLE_LITERALS.indexOf(sIdentifier)) { + fCountPrimaryExpression( + EPrimaryExpressionCategories.N_NULL_AND_BOOLEAN_LITERALS, + EValuePrefixes.S_SYMBOLIC + sIdentifier); + } else { + if ('eval' === sIdentifier) { + oSourceElementData.nCategory = + ESourceElementCategories.N_EVAL; + } + fAddIdentifier(sIdentifier); + } + }, + /** + * Classifies the source element as excludable if it does not + * contain a {@code with} statement or the {@code eval} identifier + * name. + * @param {TSyntacticCodeUnit} oExpression The expression whose + * value is to be returned. + */ + 'return': function(oExpression) { + fClassifyAsExcludable(); + }, + /** + * Increments the count of the number of occurrences of the + * encountered String value. + * @param {string} sStringValue The String value of the string + * literal encountered. + */ + 'string': function(sStringValue) { + if (sStringValue.length > 0) { + fCountPrimaryExpression( + EPrimaryExpressionCategories.N_STRING_LITERALS, + EValuePrefixes.S_STRING + sStringValue); + } + }, + /** + * Adds the identifier reserved for an exception to the list of + * identifier names found. + * @param {!TSyntacticCodeUnit} oTry A block of code in which an + * exception can occur. + * @param {Array} aCatch The identifier reserved for an exception + * and a block of code to handle the exception. + * @param {TSyntacticCodeUnit} oFinally An optional block of code + * to be evaluated regardless of whether an exception occurs. + */ + 'try': function(oTry, aCatch, oFinally) { + if (Array.isArray(aCatch)) { + fAddIdentifier(aCatch[0]); + } + }, + /** + * Classifies the source element as excludable if it does not + * contain a {@code with} statement or the {@code eval} identifier + * name. Adds the identifier of each declared variable to the list + * of identifier names found. + * @param {!Array.} aVariableDeclarationList Variable + * declarations. + */ + 'var': function(aVariableDeclarationList) { + fClassifyAsExcludable(); + aVariableDeclarationList.forEach(fAddVariable); + }, + /** + * Classifies a source element as containing the {@code with} + * statement. + * @param {!TSyntacticCodeUnit} oExpression An expression whose + * value is to be converted to a value of type Object and + * become the binding object of a new object environment + * record of a new lexical environment in which the statement + * is to be executed. + * @param {!TSyntacticCodeUnit} oStatement The statement to be + * executed in the augmented lexical environment. + * @return {!Array} An empty array to stop the traversal. + */ + 'with': function(oExpression, oStatement) { + oSourceElementData.nCategory = ESourceElementCategories.N_WITH; + return []; + } + /**#nocode-*/ // JsDoc Toolkit 2.4.0 hides some of the keys. + }, + /** + * A collection of functions used while looking for nested functions. + * @namespace + * @type {!Object.} + */ + oExamineFunctions: { + /**#nocode+*/ // JsDoc Toolkit 2.4.0 hides some of the keys. + /** + * Orders an examination of a nested function declaration. + * @this {!TSyntacticCodeUnit} An array-like object representing + * the branch of an AST representing the syntactic code unit along with + * its scope. + * @return {!Array} An empty array to stop the traversal. + */ + 'defun': function() { + fExamineSyntacticCodeUnit(this); + return []; + }, + /** + * Orders an examination of a nested function expression. + * @this {!TSyntacticCodeUnit} An array-like object representing + * the branch of an AST representing the syntactic code unit along with + * its scope. + * @return {!Array} An empty array to stop the traversal. + */ + 'function': function() { + fExamineSyntacticCodeUnit(this); + return []; + } + /**#nocode-*/ // JsDoc Toolkit 2.4.0 hides some of the keys. + } + }, + /** + * Records containing data about source elements. + * @type {Array.} + */ + aSourceElementsData = [], + /** + * The index (in the source text order) of the source element + * immediately following a Directive Prologue. + * @type {number} + */ + nAfterDirectivePrologue = 0, + /** + * The index (in the source text order) of the source element that is + * currently being considered. + * @type {number} + */ + nPosition, + /** + * The index (in the source text order) of the source element that is + * the last element of the range of source elements that is currently + * being considered. + * @type {(undefined|number)} + */ + nTo, + /** + * Initiates the traversal of a source element. + * @param {!TWalker} oWalker An instance of an object that allows the + * traversal of an abstract syntax tree. + * @param {!TSyntacticCodeUnit} oSourceElement A source element from + * which the traversal should commence. + * @return {function(): !TSyntacticCodeUnit} A function that is able to + * initiate the traversal from a given source element. + */ + cContext = function(oWalker, oSourceElement) { + /** + * @return {!TSyntacticCodeUnit} A function that is able to + * initiate the traversal from a given source element. + */ + var fLambda = function() { + return oWalker.walk(oSourceElement); + }; + + return fLambda; + }, + /** + * Classifies the source element as excludable if it does not + * contain a {@code with} statement or the {@code eval} identifier + * name. + */ + fClassifyAsExcludable = function() { + if (oSourceElementData.nCategory === + ESourceElementCategories.N_OTHER) { + oSourceElementData.nCategory = + ESourceElementCategories.N_EXCLUDABLE; + } + }, + /** + * Adds an identifier to the list of identifier names found. + * @param {string} sIdentifier The identifier to be added. + */ + fAddIdentifier = function(sIdentifier) { + if (-1 === oSourceElementData.aIdentifiers.indexOf(sIdentifier)) { + oSourceElementData.aIdentifiers.push(sIdentifier); + } + }, + /** + * Adds the identifier of a variable to the list of identifier names + * found. + * @param {!Array} aVariableDeclaration A variable declaration. + */ + fAddVariable = function(aVariableDeclaration) { + fAddIdentifier(/** @type {string} */ aVariableDeclaration[0]); + }, + /** + * Increments the count of the number of occurrences of the prefixed + * String representation attributed to the primary expression. + * @param {number} nCategory The category of the primary expression. + * @param {string} sName The prefixed String representation attributed + * to the primary expression. + */ + fCountPrimaryExpression = function(nCategory, sName) { + if (!oSourceElementData.aCount[nCategory].hasOwnProperty(sName)) { + oSourceElementData.aCount[nCategory][sName] = 0; + if (-1 === oSourceElementData.aPrimitiveValues.indexOf(sName)) { + oSourceElementData.aPrimitiveValues.push(sName); + } + } + oSourceElementData.aCount[nCategory][sName] += 1; + }, + /** + * Consolidates all worthwhile primitive values in a range of source + * elements. + * @param {number} nFrom The index (in the source text order) of the + * source element that is the first element of the range. + * @param {number} nTo The index (in the source text order) of the + * source element that is the last element of the range. + * @param {boolean} bEnclose Indicates whether the range should be + * enclosed within a function call with no argument values to a + * function with an empty parameter list if any primitive values + * are consolidated. + * @see TPrimitiveValue#nSaving + */ + fExamineSourceElements = function(nFrom, nTo, bEnclose) { + var _, + /** + * The index of the last mangled name. + * @type {number} + */ + nIndex = oScope.cname, + /** + * The index of the source element that is currently being + * considered. + * @type {number} + */ + nPosition, + /** + * A collection of functions used during the consolidation of + * primitive values and identifier names used as property + * accessors. + * @namespace + * @type {!Object.} + */ + oWalkersTransformers = { + /** + * If the String value that is equivalent to the sequence of + * terminal symbols that constitute the encountered identifier + * name is worthwhile, a syntactic conversion from the dot + * notation to the bracket notation ensues with that sequence + * being substituted by an identifier name to which the value + * is assigned. + * Applies to property accessors that use the dot notation. + * @param {!TSyntacticCodeUnit} oExpression The nonterminal + * MemberExpression. + * @param {string} sIdentifierName The identifier name used as + * the property accessor. + * @return {!Array} A syntactic code unit that is equivalent to + * the one encountered. + * @see TPrimitiveValue#nSaving + */ + 'dot': function(oExpression, sIdentifierName) { + /** + * The prefixed String value that is equivalent to the + * sequence of terminal symbols that constitute the + * encountered identifier name. + * @type {string} + */ + var sPrefixed = EValuePrefixes.S_STRING + sIdentifierName; + + return oSolutionBest.oPrimitiveValues.hasOwnProperty( + sPrefixed) && + oSolutionBest.oPrimitiveValues[sPrefixed].nSaving > 0 ? + ['sub', + oWalker.walk(oExpression), + ['name', + oSolutionBest.oPrimitiveValues[sPrefixed].sName]] : + ['dot', oWalker.walk(oExpression), sIdentifierName]; + }, + /** + * If the encountered identifier is a null or Boolean literal + * and its value is worthwhile, the identifier is substituted + * by an identifier name to which that value is assigned. + * Applies to identifier names. + * @param {string} sIdentifier The identifier encountered. + * @return {!Array} A syntactic code unit that is equivalent to + * the one encountered. + * @see TPrimitiveValue#nSaving + */ + 'name': function(sIdentifier) { + /** + * The prefixed representation String of the identifier. + * @type {string} + */ + var sPrefixed = EValuePrefixes.S_SYMBOLIC + sIdentifier; + + return [ + 'name', + oSolutionBest.oPrimitiveValues.hasOwnProperty(sPrefixed) && + oSolutionBest.oPrimitiveValues[sPrefixed].nSaving > 0 ? + oSolutionBest.oPrimitiveValues[sPrefixed].sName : + sIdentifier + ]; + }, + /** + * If the encountered String value is worthwhile, it is + * substituted by an identifier name to which that value is + * assigned. + * Applies to String values. + * @param {string} sStringValue The String value of the string + * literal encountered. + * @return {!Array} A syntactic code unit that is equivalent to + * the one encountered. + * @see TPrimitiveValue#nSaving + */ + 'string': function(sStringValue) { + /** + * The prefixed representation String of the primitive value + * of the literal. + * @type {string} + */ + var sPrefixed = + EValuePrefixes.S_STRING + sStringValue; + + return oSolutionBest.oPrimitiveValues.hasOwnProperty( + sPrefixed) && + oSolutionBest.oPrimitiveValues[sPrefixed].nSaving > 0 ? + ['name', + oSolutionBest.oPrimitiveValues[sPrefixed].sName] : + ['string', sStringValue]; + } + }, + /** + * Such data on what to consolidate within the range of source + * elements that is currently being considered that lead to the + * greatest known reduction of the number of the terminal symbols + * in comparison to the original source text. + * @type {!TSolution} + */ + oSolutionBest = new TSolution(), + /** + * Data representing an ongoing attempt to find a better + * reduction of the number of the terminal symbols in comparison + * to the original source text than the best one that is + * currently known. + * @type {!TSolution} + * @see oSolutionBest + */ + oSolutionCandidate = new TSolution(), + /** + * A record consisting of data about the range of source elements + * that is currently being examined. + * @type {!TSourceElementsData} + */ + oSourceElementsData = new TSourceElementsData(), + /** + * Variable declarations for each primitive value that is to be + * consolidated within the elements. + * @type {!Array.} + */ + aVariableDeclarations = [], + /** + * Augments a list with a prefixed representation String. + * @param {!Array.} aList A list that is to be augmented. + * @return {function(string)} A function that augments a list + * with a prefixed representation String. + */ + cAugmentList = function(aList) { + /** + * @param {string} sPrefixed Prefixed representation String of + * a primitive value that could be consolidated within the + * elements. + */ + var fLambda = function(sPrefixed) { + if (-1 === aList.indexOf(sPrefixed)) { + aList.push(sPrefixed); + } + }; + + return fLambda; + }, + /** + * Adds the number of occurrences of a primitive value of a given + * category that could be consolidated in the source element with + * a given index to the count of occurrences of that primitive + * value within the range of source elements that is currently + * being considered. + * @param {number} nPosition The index (in the source text order) + * of a source element. + * @param {number} nCategory The category of the primary + * expression from which the primitive value is derived. + * @return {function(string)} A function that performs the + * addition. + * @see cAddOccurrencesInCategory + */ + cAddOccurrences = function(nPosition, nCategory) { + /** + * @param {string} sPrefixed The prefixed representation String + * of a primitive value. + */ + var fLambda = function(sPrefixed) { + if (!oSourceElementsData.aCount[nCategory].hasOwnProperty( + sPrefixed)) { + oSourceElementsData.aCount[nCategory][sPrefixed] = 0; + } + oSourceElementsData.aCount[nCategory][sPrefixed] += + aSourceElementsData[nPosition].aCount[nCategory][ + sPrefixed]; + }; + + return fLambda; + }, + /** + * Adds the number of occurrences of each primitive value of a + * given category that could be consolidated in the source + * element with a given index to the count of occurrences of that + * primitive values within the range of source elements that is + * currently being considered. + * @param {number} nPosition The index (in the source text order) + * of a source element. + * @return {function(number)} A function that performs the + * addition. + * @see fAddOccurrences + */ + cAddOccurrencesInCategory = function(nPosition) { + /** + * @param {number} nCategory The category of the primary + * expression from which the primitive value is derived. + */ + var fLambda = function(nCategory) { + Object.keys( + aSourceElementsData[nPosition].aCount[nCategory] + ).forEach(cAddOccurrences(nPosition, nCategory)); + }; + + return fLambda; + }, + /** + * Adds the number of occurrences of each primitive value that + * could be consolidated in the source element with a given index + * to the count of occurrences of that primitive values within + * the range of source elements that is currently being + * considered. + * @param {number} nPosition The index (in the source text order) + * of a source element. + */ + fAddOccurrences = function(nPosition) { + Object.keys(aSourceElementsData[nPosition].aCount).forEach( + cAddOccurrencesInCategory(nPosition)); + }, + /** + * Creates a variable declaration for a primitive value if that + * primitive value is to be consolidated within the elements. + * @param {string} sPrefixed Prefixed representation String of a + * primitive value that could be consolidated within the + * elements. + * @see aVariableDeclarations + */ + cAugmentVariableDeclarations = function(sPrefixed) { + if (oSolutionBest.oPrimitiveValues[sPrefixed].nSaving > 0) { + aVariableDeclarations.push([ + oSolutionBest.oPrimitiveValues[sPrefixed].sName, + [0 === sPrefixed.indexOf(EValuePrefixes.S_SYMBOLIC) ? + 'name' : 'string', + sPrefixed.substring(EValuePrefixes.S_SYMBOLIC.length)] + ]); + } + }, + /** + * Sorts primitive values with regard to the difference in the + * number of terminal symbols between the original source text + * and the one with those primitive values consolidated. + * @param {string} sPrefixed0 The prefixed representation String + * of the first of the two primitive values that are being + * compared. + * @param {string} sPrefixed1 The prefixed representation String + * of the second of the two primitive values that are being + * compared. + * @return {number} + *
+ *
-1
+ *
if the first primitive value must be placed before + * the other one,
+ *
0
+ *
if the first primitive value may be placed before + * the other one,
+ *
1
+ *
if the first primitive value must not be placed + * before the other one.
+ *
+ * @see TSolution.oPrimitiveValues + */ + cSortPrimitiveValues = function(sPrefixed0, sPrefixed1) { + /** + * The difference between: + *
    + *
  1. the difference in the number of terminal symbols + * between the original source text and the one with the + * first primitive value consolidated, and
    2. + *
  2. the difference in the number of terminal symbols + * between the original source text and the one with the + * second primitive value consolidated.
    3. + *
+ * @type {number} + */ + var nDifference = + oSolutionCandidate.oPrimitiveValues[sPrefixed0].nSaving - + oSolutionCandidate.oPrimitiveValues[sPrefixed1].nSaving; + + return nDifference > 0 ? -1 : nDifference < 0 ? 1 : 0; + }, + /** + * Assigns an identifier name to a primitive value and calculates + * whether instances of that primitive value are worth + * consolidating. + * @param {string} sPrefixed The prefixed representation String + * of a primitive value that is being evaluated. + */ + fEvaluatePrimitiveValue = function(sPrefixed) { + var _, + /** + * The index of the last mangled name. + * @type {number} + */ + nIndex, + /** + * The representation String of the primitive value that is + * being evaluated. + * @type {string} + */ + sName = + sPrefixed.substring(EValuePrefixes.S_SYMBOLIC.length), + /** + * The number of source characters taken up by the + * representation String of the primitive value that is + * being evaluated. + * @type {number} + */ + nLengthOriginal = sName.length, + /** + * The number of source characters taken up by the + * identifier name that could substitute the primitive + * value that is being evaluated. + * substituted. + * @type {number} + */ + nLengthSubstitution, + /** + * The number of source characters taken up by by the + * representation String of the primitive value that is + * being evaluated when it is represented by a string + * literal. + * @type {number} + */ + nLengthString = oProcessor.make_string(sName).length; + + oSolutionCandidate.oPrimitiveValues[sPrefixed] = + new TPrimitiveValue(); + do { // Find an identifier unused in this or any nested scope. + nIndex = oScope.cname; + oSolutionCandidate.oPrimitiveValues[sPrefixed].sName = + oScope.next_mangled(); + } while (-1 !== oSourceElementsData.aIdentifiers.indexOf( + oSolutionCandidate.oPrimitiveValues[sPrefixed].sName)); + nLengthSubstitution = oSolutionCandidate.oPrimitiveValues[ + sPrefixed].sName.length; + if (0 === sPrefixed.indexOf(EValuePrefixes.S_SYMBOLIC)) { + // foo:null, or foo:null; + oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving -= + nLengthSubstitution + nLengthOriginal + + oWeights.N_VARIABLE_DECLARATION; + // null vs foo + oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving += + oSourceElementsData.aCount[ + EPrimaryExpressionCategories. + N_NULL_AND_BOOLEAN_LITERALS][sPrefixed] * + (nLengthOriginal - nLengthSubstitution); + } else { + // foo:'fromCharCode'; + oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving -= + nLengthSubstitution + nLengthString + + oWeights.N_VARIABLE_DECLARATION; + // .fromCharCode vs [foo] + if (oSourceElementsData.aCount[ + EPrimaryExpressionCategories.N_IDENTIFIER_NAMES + ].hasOwnProperty(sPrefixed)) { + oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving += + oSourceElementsData.aCount[ + EPrimaryExpressionCategories.N_IDENTIFIER_NAMES + ][sPrefixed] * + (nLengthOriginal - nLengthSubstitution - + oWeights.N_PROPERTY_ACCESSOR); + } + // 'fromCharCode' vs foo + if (oSourceElementsData.aCount[ + EPrimaryExpressionCategories.N_STRING_LITERALS + ].hasOwnProperty(sPrefixed)) { + oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving += + oSourceElementsData.aCount[ + EPrimaryExpressionCategories.N_STRING_LITERALS + ][sPrefixed] * + (nLengthString - nLengthSubstitution); + } + } + if (oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving > + 0) { + oSolutionCandidate.nSavings += + oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving; + } else { + oScope.cname = nIndex; // Free the identifier name. + } + }, + /** + * Adds a variable declaration to an existing variable statement. + * @param {!Array} aVariableDeclaration A variable declaration + * with an initialiser. + */ + cAddVariableDeclaration = function(aVariableDeclaration) { + (/** @type {!Array} */ oSourceElements[nFrom][1]).unshift( + aVariableDeclaration); + }; + + if (nFrom > nTo) { + return; + } + // If the range is a closure, reuse the closure. + if (nFrom === nTo && + 'stat' === oSourceElements[nFrom][0] && + 'call' === oSourceElements[nFrom][1][0] && + 'function' === oSourceElements[nFrom][1][1][0]) { + fExamineSyntacticCodeUnit(oSourceElements[nFrom][1][1]); + return; + } + // Create a list of all derived primitive values within the range. + for (nPosition = nFrom; nPosition <= nTo; nPosition += 1) { + aSourceElementsData[nPosition].aPrimitiveValues.forEach( + cAugmentList(oSourceElementsData.aPrimitiveValues)); + } + if (0 === oSourceElementsData.aPrimitiveValues.length) { + return; + } + for (nPosition = nFrom; nPosition <= nTo; nPosition += 1) { + // Add the number of occurrences to the total count. + fAddOccurrences(nPosition); + // Add identifiers of this or any nested scope to the list. + aSourceElementsData[nPosition].aIdentifiers.forEach( + cAugmentList(oSourceElementsData.aIdentifiers)); + } + // Distribute identifier names among derived primitive values. + do { // If there was any progress, find a better distribution. + oSolutionBest = oSolutionCandidate; + if (Object.keys(oSolutionCandidate.oPrimitiveValues).length > 0) { + // Sort primitive values descending by their worthwhileness. + oSourceElementsData.aPrimitiveValues.sort(cSortPrimitiveValues); + } + oSolutionCandidate = new TSolution(); + oSourceElementsData.aPrimitiveValues.forEach( + fEvaluatePrimitiveValue); + oScope.cname = nIndex; + } while (oSolutionCandidate.nSavings > oSolutionBest.nSavings); + // Take the necessity of adding a variable statement into account. + if ('var' !== oSourceElements[nFrom][0]) { + oSolutionBest.nSavings -= oWeights.N_VARIABLE_STATEMENT_AFFIXATION; + } + if (bEnclose) { + // Take the necessity of forming a closure into account. + oSolutionBest.nSavings -= oWeights.N_CLOSURE; + } + if (oSolutionBest.nSavings > 0) { + // Create variable declarations suitable for UglifyJS. + Object.keys(oSolutionBest.oPrimitiveValues).forEach( + cAugmentVariableDeclarations); + // Rewrite expressions that contain worthwhile primitive values. + for (nPosition = nFrom; nPosition <= nTo; nPosition += 1) { + oWalker = oProcessor.ast_walker(); + oSourceElements[nPosition] = + oWalker.with_walkers( + oWalkersTransformers, + cContext(oWalker, oSourceElements[nPosition])); + } + if ('var' === oSourceElements[nFrom][0]) { // Reuse the statement. + (/** @type {!Array.} */ aVariableDeclarations.reverse( + )).forEach(cAddVariableDeclaration); + } else { // Add a variable statement. + Array.prototype.splice.call( + oSourceElements, + nFrom, + 0, + ['var', aVariableDeclarations]); + nTo += 1; + } + if (bEnclose) { + // Add a closure. + Array.prototype.splice.call( + oSourceElements, + nFrom, + 0, + ['stat', ['call', ['function', null, [], []], []]]); + // Copy source elements into the closure. + for (nPosition = nTo + 1; nPosition > nFrom; nPosition -= 1) { + Array.prototype.unshift.call( + oSourceElements[nFrom][1][1][3], + oSourceElements[nPosition]); + } + // Remove source elements outside the closure. + Array.prototype.splice.call( + oSourceElements, + nFrom + 1, + nTo - nFrom + 1); + } + } + if (bEnclose) { + // Restore the availability of identifier names. + oScope.cname = nIndex; + } + }; + + oSourceElements = (/** @type {!TSyntacticCodeUnit} */ + oSyntacticCodeUnit[bIsGlobal ? 1 : 3]); + if (0 === oSourceElements.length) { + return; + } + oScope = bIsGlobal ? oSyntacticCodeUnit.scope : oSourceElements.scope; + // Skip a Directive Prologue. + while (nAfterDirectivePrologue < oSourceElements.length && + 'stat' === oSourceElements[nAfterDirectivePrologue][0] && + 'string' === oSourceElements[nAfterDirectivePrologue][1][0]) { + nAfterDirectivePrologue += 1; + aSourceElementsData.push(null); + } + if (oSourceElements.length === nAfterDirectivePrologue) { + return; + } + for (nPosition = nAfterDirectivePrologue; + nPosition < oSourceElements.length; + nPosition += 1) { + oSourceElementData = new TSourceElementsData(); + oWalker = oProcessor.ast_walker(); + // Classify a source element. + // Find its derived primitive values and count their occurrences. + // Find all identifiers used (including nested scopes). + oWalker.with_walkers( + oWalkers.oSurveySourceElement, + cContext(oWalker, oSourceElements[nPosition])); + // Establish whether the scope is still wholly examinable. + bIsWhollyExaminable = bIsWhollyExaminable && + ESourceElementCategories.N_WITH !== oSourceElementData.nCategory && + ESourceElementCategories.N_EVAL !== oSourceElementData.nCategory; + aSourceElementsData.push(oSourceElementData); + } + if (bIsWhollyExaminable) { // Examine the whole scope. + fExamineSourceElements( + nAfterDirectivePrologue, + oSourceElements.length - 1, + false); + } else { // Examine unexcluded ranges of source elements. + for (nPosition = oSourceElements.length - 1; + nPosition >= nAfterDirectivePrologue; + nPosition -= 1) { + oSourceElementData = (/** @type {!TSourceElementsData} */ + aSourceElementsData[nPosition]); + if (ESourceElementCategories.N_OTHER === + oSourceElementData.nCategory) { + if ('undefined' === typeof nTo) { + nTo = nPosition; // Indicate the end of a range. + } + // Examine the range if it immediately follows a Directive Prologue. + if (nPosition === nAfterDirectivePrologue) { + fExamineSourceElements(nPosition, nTo, true); + } + } else { + if ('undefined' !== typeof nTo) { + // Examine the range that immediately follows this source element. + fExamineSourceElements(nPosition + 1, nTo, true); + nTo = void 0; // Obliterate the range. + } + // Examine nested functions. + oWalker = oProcessor.ast_walker(); + oWalker.with_walkers( + oWalkers.oExamineFunctions, + cContext(oWalker, oSourceElements[nPosition])); + } + } + } + }(oAbstractSyntaxTree = oProcessor.ast_add_scope(oAbstractSyntaxTree))); + return oAbstractSyntaxTree; +}; +/*jshint sub:false */ + + +if (require.main === module) { + (function() { + 'use strict'; + /*jshint bitwise:true, curly:true, eqeqeq:true, forin:true, immed:true, + latedef:true, newcap:true, noarge:true, noempty:true, nonew:true, + onevar:true, plusplus:true, regexp:true, undef:true, strict:true, + sub:false, trailing:true */ + + var _, + /** + * NodeJS module for unit testing. + * @namespace + * @type {!TAssert} + * @see http://nodejs.org/docs/v0.6.10/api/all.html#assert + */ + oAssert = (/** @type {!TAssert} */ require('env!env/assert')), + /** + * The parser of ECMA-262 found in UglifyJS. + * @namespace + * @type {!TParser} + */ + oParser = (/** @type {!TParser} */ require('./parse-js')), + /** + * The processor of ASTs + * found in UglifyJS. + * @namespace + * @type {!TProcessor} + */ + oProcessor = (/** @type {!TProcessor} */ require('./process')), + /** + * An instance of an object that allows the traversal of an AST. + * @type {!TWalker} + */ + oWalker, + /** + * A collection of functions for the removal of the scope information + * during the traversal of an AST. + * @namespace + * @type {!Object.} + */ + oWalkersPurifiers = { + /**#nocode+*/ // JsDoc Toolkit 2.4.0 hides some of the keys. + /** + * Deletes the scope information from the branch of the abstract + * syntax tree representing the encountered function declaration. + * @param {string} sIdentifier The identifier of the function. + * @param {!Array.} aFormalParameterList Formal parameters. + * @param {!TSyntacticCodeUnit} oFunctionBody Function code. + */ + 'defun': function( + sIdentifier, + aFormalParameterList, + oFunctionBody) { + delete oFunctionBody.scope; + }, + /** + * Deletes the scope information from the branch of the abstract + * syntax tree representing the encountered function expression. + * @param {?string} sIdentifier The optional identifier of the + * function. + * @param {!Array.} aFormalParameterList Formal parameters. + * @param {!TSyntacticCodeUnit} oFunctionBody Function code. + */ + 'function': function( + sIdentifier, + aFormalParameterList, + oFunctionBody) { + delete oFunctionBody.scope; + } + /**#nocode-*/ // JsDoc Toolkit 2.4.0 hides some of the keys. + }, + /** + * Initiates the traversal of a source element. + * @param {!TWalker} oWalker An instance of an object that allows the + * traversal of an abstract syntax tree. + * @param {!TSyntacticCodeUnit} oSourceElement A source element from + * which the traversal should commence. + * @return {function(): !TSyntacticCodeUnit} A function that is able to + * initiate the traversal from a given source element. + */ + cContext = function(oWalker, oSourceElement) { + /** + * @return {!TSyntacticCodeUnit} A function that is able to + * initiate the traversal from a given source element. + */ + var fLambda = function() { + return oWalker.walk(oSourceElement); + }; + + return fLambda; + }, + /** + * A record consisting of configuration for the code generation phase. + * @type {!Object} + */ + oCodeGenerationOptions = { + beautify: true + }, + /** + * Tests whether consolidation of an ECMAScript program yields expected + * results. + * @param {{ + * sTitle: string, + * sInput: string, + * sOutput: string + * }} oUnitTest A record consisting of data about a unit test: its + * name, an ECMAScript program, and, if consolidation is to take + * place, the resulting ECMAScript program. + */ + cAssert = function(oUnitTest) { + var _, + /** + * An array-like object representing the AST obtained after consolidation. + * @type {!TSyntacticCodeUnit} + */ + oSyntacticCodeUnitActual = + exports.ast_consolidate(oParser.parse(oUnitTest.sInput)), + /** + * An array-like object representing the expected AST. + * @type {!TSyntacticCodeUnit} + */ + oSyntacticCodeUnitExpected = oParser.parse( + oUnitTest.hasOwnProperty('sOutput') ? + oUnitTest.sOutput : oUnitTest.sInput); + + delete oSyntacticCodeUnitActual.scope; + oWalker = oProcessor.ast_walker(); + oWalker.with_walkers( + oWalkersPurifiers, + cContext(oWalker, oSyntacticCodeUnitActual)); + try { + oAssert.deepEqual( + oSyntacticCodeUnitActual, + oSyntacticCodeUnitExpected); + } catch (oException) { + console.error( + '########## A unit test has failed.\n' + + oUnitTest.sTitle + '\n' + + '##### actual code (' + + oProcessor.gen_code(oSyntacticCodeUnitActual).length + + ' bytes)\n' + + oProcessor.gen_code( + oSyntacticCodeUnitActual, + oCodeGenerationOptions) + '\n' + + '##### expected code (' + + oProcessor.gen_code(oSyntacticCodeUnitExpected).length + + ' bytes)\n' + + oProcessor.gen_code( + oSyntacticCodeUnitExpected, + oCodeGenerationOptions)); + } + }; + + [ + // 7.6.1 Reserved Words. + { + sTitle: + 'Omission of keywords while choosing an identifier name.', + sInput: + '(function() {' + + ' var a, b, c, d, e, f, g, h, i, j, k, l, m,' + + ' n, o, p, q, r, s, t, u, v, w, x, y, z,' + + ' A, B, C, D, E, F, G, H, I, J, K, L, M,' + + ' N, O, P, Q, R, S, T, U, V, W, X, Y, Z,' + + ' $, _,' + + ' aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am,' + + ' an, ao, ap, aq, ar, as, at, au, av, aw, ax, ay, az,' + + ' aA, aB, aC, aD, aE, aF, aG, aH, aI, aJ, aK, aL, aM,' + + ' aN, aO, aP, aQ, aR, aS, aT, aU, aV, aW, aX, aY, aZ,' + + ' a$, a_,' + + ' ba, bb, bc, bd, be, bf, bg, bh, bi, bj, bk, bl, bm,' + + ' bn, bo, bp, bq, br, bs, bt, bu, bv, bw, bx, by, bz,' + + ' bA, bB, bC, bD, bE, bF, bG, bH, bI, bJ, bK, bL, bM,' + + ' bN, bO, bP, bQ, bR, bS, bT, bU, bV, bW, bX, bY, bZ,' + + ' b$, b_,' + + ' ca, cb, cc, cd, ce, cf, cg, ch, ci, cj, ck, cl, cm,' + + ' cn, co, cp, cq, cr, cs, ct, cu, cv, cw, cx, cy, cz,' + + ' cA, cB, cC, cD, cE, cF, cG, cH, cI, cJ, cK, cL, cM,' + + ' cN, cO, cP, cQ, cR, cS, cT, cU, cV, cW, cX, cY, cZ,' + + ' c$, c_,' + + ' da, db, dc, dd, de, df, dg, dh, di, dj, dk, dl, dm,' + + ' dn, dq, dr, ds, dt, du, dv, dw, dx, dy, dz,' + + ' dA, dB, dC, dD, dE, dF, dG, dH, dI, dJ, dK, dL, dM,' + + ' dN, dO, dP, dQ, dR, dS, dT, dU, dV, dW, dX, dY, dZ,' + + ' d$, d_;' + + ' void ["abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",' + + ' "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"];' + + '}());', + sOutput: + '(function() {' + + ' var dp =' + + ' "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",' + + ' a, b, c, d, e, f, g, h, i, j, k, l, m,' + + ' n, o, p, q, r, s, t, u, v, w, x, y, z,' + + ' A, B, C, D, E, F, G, H, I, J, K, L, M,' + + ' N, O, P, Q, R, S, T, U, V, W, X, Y, Z,' + + ' $, _,' + + ' aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am,' + + ' an, ao, ap, aq, ar, as, at, au, av, aw, ax, ay, az,' + + ' aA, aB, aC, aD, aE, aF, aG, aH, aI, aJ, aK, aL, aM,' + + ' aN, aO, aP, aQ, aR, aS, aT, aU, aV, aW, aX, aY, aZ,' + + ' a$, a_,' + + ' ba, bb, bc, bd, be, bf, bg, bh, bi, bj, bk, bl, bm,' + + ' bn, bo, bp, bq, br, bs, bt, bu, bv, bw, bx, by, bz,' + + ' bA, bB, bC, bD, bE, bF, bG, bH, bI, bJ, bK, bL, bM,' + + ' bN, bO, bP, bQ, bR, bS, bT, bU, bV, bW, bX, bY, bZ,' + + ' b$, b_,' + + ' ca, cb, cc, cd, ce, cf, cg, ch, ci, cj, ck, cl, cm,' + + ' cn, co, cp, cq, cr, cs, ct, cu, cv, cw, cx, cy, cz,' + + ' cA, cB, cC, cD, cE, cF, cG, cH, cI, cJ, cK, cL, cM,' + + ' cN, cO, cP, cQ, cR, cS, cT, cU, cV, cW, cX, cY, cZ,' + + ' c$, c_,' + + ' da, db, dc, dd, de, df, dg, dh, di, dj, dk, dl, dm,' + + ' dn, dq, dr, ds, dt, du, dv, dw, dx, dy, dz,' + + ' dA, dB, dC, dD, dE, dF, dG, dH, dI, dJ, dK, dL, dM,' + + ' dN, dO, dP, dQ, dR, dS, dT, dU, dV, dW, dX, dY, dZ,' + + ' d$, d_;' + + ' void [dp, dp];' + + '}());' + }, + // 7.8.1 Null Literals. + { + sTitle: + 'Evaluation with regard to the null value.', + sInput: + '/*jshint evil:true */' + + '(function() {' + + ' var foo;' + + ' void [null, null, null];' + + '}());' + + 'eval("");' + + '(function() {' + + ' var foo;' + + ' void [null, null];' + + '}());', + sOutput: + '/*jshint evil:true */' + + '(function() {' + + ' var a = null, foo;' + + ' void [a, a, a];' + + '}());' + + 'eval("");' + + '(function() {' + + ' var foo;' + + ' void [null, null];' + + '}());' + }, + // 7.8.2 Boolean Literals. + { + sTitle: + 'Evaluation with regard to the false value.', + sInput: + '/*jshint evil:true */' + + '(function() {' + + ' var foo;' + + ' void [false, false, false];' + + '}());' + + 'eval("");' + + '(function() {' + + ' var foo;' + + ' void [false, false];' + + '}());', + sOutput: + '/*jshint evil:true */' + + '(function() {' + + ' var a = false, foo;' + + ' void [a, a, a];' + + '}());' + + 'eval("");' + + '(function() {' + + ' var foo;' + + ' void [false, false];' + + '}());' + }, + { + sTitle: + 'Evaluation with regard to the true value.', + sInput: + '/*jshint evil:true */' + + '(function() {' + + ' var foo;' + + ' void [true, true, true];' + + '}());' + + 'eval("");' + + '(function() {' + + ' var foo;' + + ' void [true, true];' + + '}());', + sOutput: + '/*jshint evil:true */' + + '(function() {' + + ' var a = true, foo;' + + ' void [a, a, a];' + + '}());' + + 'eval("");' + + '(function() {' + + ' var foo;' + + ' void [true, true];' + + '}());' + }, + // 7.8.4 String Literals. + { + sTitle: + 'Evaluation with regard to the String value of a string literal.', + sInput: + '(function() {' + + ' var foo;' + + ' void ["abcd", "abcd", "abc", "abc"];' + + '}());', + sOutput: + '(function() {' + + ' var a = "abcd", foo;' + + ' void [a, a, "abc", "abc"];' + + '}());' + }, + // 7.8.5 Regular Expression Literals. + { + sTitle: + 'Preservation of the pattern of a regular expression literal.', + sInput: + 'void [/abcdefghijklmnopqrstuvwxyz/, /abcdefghijklmnopqrstuvwxyz/];' + }, + { + sTitle: + 'Preservation of the flags of a regular expression literal.', + sInput: + 'void [/(?:)/gim, /(?:)/gim, /(?:)/gim, /(?:)/gim, /(?:)/gim,' + + ' /(?:)/gim, /(?:)/gim, /(?:)/gim, /(?:)/gim, /(?:)/gim,' + + ' /(?:)/gim, /(?:)/gim, /(?:)/gim, /(?:)/gim, /(?:)/gim];' + }, + // 10.2 Lexical Environments. + { + sTitle: + 'Preservation of identifier names in the same scope.', + sInput: + '/*jshint shadow:true */' + + 'var a;' + + 'function b(i) {' + + '}' + + 'for (var c; 0 === Math.random(););' + + 'for (var d in {});' + + 'void ["abcdefghijklmnopqrstuvwxyz"];' + + 'void [b(a), b(c), b(d)];' + + 'void [typeof e];' + + 'i: for (; 0 === Math.random();) {' + + ' if (42 === (new Date()).getMinutes()) {' + + ' continue i;' + + ' } else {' + + ' break i;' + + ' }' + + '}' + + 'try {' + + '} catch (f) {' + + '} finally {' + + '}' + + '(function g(h) {' + + '}());' + + 'void [{' + + ' i: 42,' + + ' "j": 42,' + + ' \'k\': 42' + + '}];' + + 'void ["abcdefghijklmnopqrstuvwxyz"];', + sOutput: + '/*jshint shadow:true */' + + 'var a;' + + 'function b(i) {' + + '}' + + 'for (var c; 0 === Math.random(););' + + 'for (var d in {});' + + '(function() {' + + ' var i = "abcdefghijklmnopqrstuvwxyz";' + + ' void [i];' + + ' void [b(a), b(c), b(d)];' + + ' void [typeof e];' + + ' i: for (; 0 === Math.random();) {' + + ' if (42 === (new Date()).getMinutes()) {' + + ' continue i;' + + ' } else {' + + ' break i;' + + ' }' + + ' }' + + ' try {' + + ' } catch (f) {' + + ' } finally {' + + ' }' + + ' (function g(h) {' + + ' }());' + + ' void [{' + + ' i: 42,' + + ' "j": 42,' + + ' \'k\': 42' + + ' }];' + + ' void [i];' + + '}());' + }, + { + sTitle: + 'Preservation of identifier names in nested function code.', + sInput: + '(function() {' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + ' (function() {' + + ' var a;' + + ' for (var b; 0 === Math.random(););' + + ' for (var c in {});' + + ' void [typeof d];' + + ' h: for (; 0 === Math.random();) {' + + ' if (42 === (new Date()).getMinutes()) {' + + ' continue h;' + + ' } else {' + + ' break h;' + + ' }' + + ' }' + + ' try {' + + ' } catch (e) {' + + ' } finally {' + + ' }' + + ' (function f(g) {' + + ' }());' + + ' void [{' + + ' h: 42,' + + ' "i": 42,' + + ' \'j\': 42' + + ' }];' + + ' }());' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + '}());', + sOutput: + '(function() {' + + ' var h = "abcdefghijklmnopqrstuvwxyz";' + + ' void [h];' + + ' (function() {' + + ' var a;' + + ' for (var b; 0 === Math.random(););' + + ' for (var c in {});' + + ' void [typeof d];' + + ' h: for (; 0 === Math.random();) {' + + ' if (42 === (new Date()).getMinutes()) {' + + ' continue h;' + + ' } else {' + + ' break h;' + + ' }' + + ' }' + + ' try {' + + ' } catch (e) {' + + ' } finally {' + + ' }' + + ' (function f(g) {' + + ' }());' + + ' void [{' + + ' h: 42,' + + ' "i": 42,' + + ' \'j\': 42' + + ' }];' + + ' }());' + + ' void [h];' + + '}());' + }, + { + sTitle: + 'Consolidation of a closure with other source elements.', + sInput: + '(function(foo) {' + + '}("abcdefghijklmnopqrstuvwxyz"));' + + 'void ["abcdefghijklmnopqrstuvwxyz"];', + sOutput: + '(function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' (function(foo) {' + + ' })(a);' + + ' void [a];' + + '}());' + }, + { + sTitle: + 'Consolidation of function code instead of a sole closure.', + sInput: + '(function(foo, bar) {' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + '}("abcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwxyz"));', + sOutput: + '(function(foo, bar) {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + '}("abcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwxyz"));' + }, + // 11.1.5 Object Initialiser. + { + sTitle: + 'Preservation of property names of an object initialiser.', + sInput: + 'var foo = {' + + ' abcdefghijklmnopqrstuvwxyz: 42,' + + ' "zyxwvutsrqponmlkjihgfedcba": 42,' + + ' \'mlkjihgfedcbanopqrstuvwxyz\': 42' + + '};' + + 'void [' + + ' foo.abcdefghijklmnopqrstuvwxyz,' + + ' "zyxwvutsrqponmlkjihgfedcba",' + + ' \'mlkjihgfedcbanopqrstuvwxyz\'' + + '];' + }, + { + sTitle: + 'Evaluation with regard to String values derived from identifier ' + + 'names used as property accessors.', + sInput: + '(function() {' + + ' var foo;' + + ' void [' + + ' Math.abcdefghij,' + + ' Math.abcdefghij,' + + ' Math.abcdefghi,' + + ' Math.abcdefghi' + + ' ];' + + '}());', + sOutput: + '(function() {' + + ' var a = "abcdefghij", foo;' + + ' void [' + + ' Math[a],' + + ' Math[a],' + + ' Math.abcdefghi,' + + ' Math.abcdefghi' + + ' ];' + + '}());' + }, + // 11.2.1 Property Accessors. + { + sTitle: + 'Preservation of identifiers in the nonterminal MemberExpression.', + sInput: + 'void [' + + ' Math.E,' + + ' Math.LN10,' + + ' Math.LN2,' + + ' Math.LOG2E,' + + ' Math.LOG10E,' + + ' Math.PI,' + + ' Math.SQRT1_2,' + + ' Math.SQRT2,' + + ' Math.abs,' + + ' Math.acos' + + '];' + }, + // 12.2 Variable Statement. + { + sTitle: + 'Preservation of the identifier of a variable that is being ' + + 'declared in a variable statement.', + sInput: + '(function() {' + + ' var abcdefghijklmnopqrstuvwxyz;' + + ' void [abcdefghijklmnopqrstuvwxyz];' + + '}());' + }, + { + sTitle: + 'Exclusion of a variable statement in global code.', + sInput: + 'void ["abcdefghijklmnopqrstuvwxyz"];' + + 'var foo = "abcdefghijklmnopqrstuvwxyz",' + + ' bar = "abcdefghijklmnopqrstuvwxyz";' + + 'void ["abcdefghijklmnopqrstuvwxyz"];' + }, + { + sTitle: + 'Exclusion of a variable statement in function code that ' + + 'contains a with statement.', + sInput: + '(function() {' + + ' with ({});' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + ' var foo;' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + '}());' + }, + { + sTitle: + 'Exclusion of a variable statement in function code that ' + + 'contains a direct call to the eval function.', + sInput: + '/*jshint evil:true */' + + 'void [' + + ' function() {' + + ' eval("");' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + ' var foo;' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + ' }' + + '];' + }, + { + sTitle: + 'Consolidation within a variable statement in global code.', + sInput: + 'var foo = function() {' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + '};', + sOutput: + 'var foo = function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + '};' + }, + { + sTitle: + 'Consolidation within a variable statement excluded in function ' + + 'code due to the presence of a with statement.', + sInput: + '(function() {' + + ' with ({});' + + ' var foo = function() {' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + ' };' + + '}());', + sOutput: + '(function() {' + + ' with ({});' + + ' var foo = function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + ' };' + + '}());' + }, + { + sTitle: + 'Consolidation within a variable statement excluded in function ' + + 'code due to the presence of a direct call to the eval function.', + sInput: + '/*jshint evil:true */' + + '(function() {' + + ' eval("");' + + ' var foo = function() {' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + ' };' + + '}());', + sOutput: + '/*jshint evil:true */' + + '(function() {' + + ' eval("");' + + ' var foo = function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + ' };' + + '}());' + }, + { + sTitle: + 'Inclusion of a variable statement in function code that ' + + 'contains no with statement and no direct call to the eval ' + + 'function.', + sInput: + '(function() {' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + ' var foo;' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + '}());', + sOutput: + '(function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a];' + + ' var foo;' + + ' void [a];' + + '}());' + }, + { + sTitle: + 'Ignorance with regard to a variable statement in global code.', + sInput: + 'var foo = "abcdefghijklmnopqrstuvwxyz";' + + 'void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];', + sOutput: + 'var foo = "abcdefghijklmnopqrstuvwxyz";' + + '(function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + '}());' + }, + // 12.4 Expression Statement. + { + sTitle: + 'Preservation of identifiers in an expression statement.', + sInput: + 'void [typeof abcdefghijklmnopqrstuvwxyz,' + + ' typeof abcdefghijklmnopqrstuvwxyz];' + }, + // 12.6.3 The {@code for} Statement. + { + sTitle: + 'Preservation of identifiers in the variable declaration list of ' + + 'a for statement.', + sInput: + 'for (var abcdefghijklmnopqrstuvwxyz; 0 === Math.random(););' + + 'for (var abcdefghijklmnopqrstuvwxyz; 0 === Math.random(););' + }, + // 12.6.4 The {@code for-in} Statement. + { + sTitle: + 'Preservation of identifiers in the variable declaration list of ' + + 'a for-in statement.', + sInput: + 'for (var abcdefghijklmnopqrstuvwxyz in {});' + + 'for (var abcdefghijklmnopqrstuvwxyz in {});' + }, + // 12.7 The {@code continue} Statement. + { + sTitle: + 'Preservation of the identifier in a continue statement.', + sInput: + 'abcdefghijklmnopqrstuvwxyz: for (; 0 === Math.random();) {' + + ' continue abcdefghijklmnopqrstuvwxyz;' + + '}' + + 'abcdefghijklmnopqrstuvwxyz: for (; 0 === Math.random();) {' + + ' continue abcdefghijklmnopqrstuvwxyz;' + + '}' + }, + // 12.8 The {@code break} Statement. + { + sTitle: + 'Preservation of the identifier in a break statement.', + sInput: + 'abcdefghijklmnopqrstuvwxyz: for (; 0 === Math.random();) {' + + ' break abcdefghijklmnopqrstuvwxyz;' + + '}' + + 'abcdefghijklmnopqrstuvwxyz: for (; 0 === Math.random();) {' + + ' break abcdefghijklmnopqrstuvwxyz;' + + '}' + }, + // 12.9 The {@code return} Statement. + { + sTitle: + 'Exclusion of a return statement in function code that contains ' + + 'a with statement.', + sInput: + '(function() {' + + ' with ({});' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + ' if (0 === Math.random()) {' + + ' return;' + + ' } else {' + + ' }' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + '}());' + }, + { + sTitle: + 'Exclusion of a return statement in function code that contains ' + + 'a direct call to the eval function.', + sInput: + '/*jshint evil:true */' + + '(function() {' + + ' eval("");' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + ' if (0 === Math.random()) {' + + ' return;' + + ' } else {' + + ' }' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + '}());' + }, + { + sTitle: + 'Consolidation within a return statement excluded in function ' + + 'code due to the presence of a with statement.', + sInput: + '(function() {' + + ' with ({});' + + ' return function() {' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + ' };' + + '}());', + sOutput: + '(function() {' + + ' with ({});' + + ' return function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + ' };' + + '}());' + }, + { + sTitle: + 'Consolidation within a return statement excluded in function ' + + 'code due to the presence of a direct call to the eval function.', + sInput: + '/*jshint evil:true */' + + '(function() {' + + ' eval("");' + + ' return function() {' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + ' };' + + '}());', + sOutput: + '/*jshint evil:true */' + + '(function() {' + + ' eval("");' + + ' return function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + ' };' + + '}());' + }, + { + sTitle: + 'Inclusion of a return statement in function code that contains ' + + 'no with statement and no direct call to the eval function.', + sInput: + '(function() {' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + ' if (0 === Math.random()) {' + + ' return;' + + ' } else {' + + ' }' + + ' void ["abcdefghijklmnopqrstuvwxyz"];' + + '}());', + sOutput: + '(function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a];' + + ' if (0 === Math.random()) {' + + ' return;' + + ' } else {' + + ' }' + + ' void [a];' + + '}());' + }, + // 12.10 The {@code with} Statement. + { + sTitle: + 'Preservation of the statement in a with statement.', + sInput: + 'with ({}) {' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + '}' + }, + { + sTitle: + 'Exclusion of a with statement in the same syntactic code unit.', + sInput: + 'void ["abcdefghijklmnopqrstuvwxyz"];' + + 'with ({' + + ' foo: "abcdefghijklmnopqrstuvwxyz",' + + ' bar: "abcdefghijklmnopqrstuvwxyz"' + + '}) {' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + '}' + + 'void ["abcdefghijklmnopqrstuvwxyz"];' + }, + { + sTitle: + 'Exclusion of a with statement in nested function code.', + sInput: + 'void ["abcdefghijklmnopqrstuvwxyz"];' + + '(function() {' + + ' with ({' + + ' foo: "abcdefghijklmnopqrstuvwxyz",' + + ' bar: "abcdefghijklmnopqrstuvwxyz"' + + ' }) {' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + ' }' + + '}());' + + 'void ["abcdefghijklmnopqrstuvwxyz"];' + }, + // 12.12 Labelled Statements. + { + sTitle: + 'Preservation of the label of a labelled statement.', + sInput: + 'abcdefghijklmnopqrstuvwxyz: for (; 0 === Math.random(););' + + 'abcdefghijklmnopqrstuvwxyz: for (; 0 === Math.random(););' + }, + // 12.14 The {@code try} Statement. + { + sTitle: + 'Preservation of the identifier in the catch clause of a try' + + 'statement.', + sInput: + 'try {' + + '} catch (abcdefghijklmnopqrstuvwxyz) {' + + '} finally {' + + '}' + + 'try {' + + '} catch (abcdefghijklmnopqrstuvwxyz) {' + + '} finally {' + + '}' + }, + // 13 Function Definition. + { + sTitle: + 'Preservation of the identifier of a function declaration.', + sInput: + 'function abcdefghijklmnopqrstuvwxyz() {' + + '}' + + 'void [abcdefghijklmnopqrstuvwxyz];' + }, + { + sTitle: + 'Preservation of the identifier of a function expression.', + sInput: + 'void [' + + ' function abcdefghijklmnopqrstuvwxyz() {' + + ' },' + + ' function abcdefghijklmnopqrstuvwxyz() {' + + ' }' + + '];' + }, + { + sTitle: + 'Preservation of a formal parameter of a function declaration.', + sInput: + 'function foo(abcdefghijklmnopqrstuvwxyz) {' + + '}' + + 'function bar(abcdefghijklmnopqrstuvwxyz) {' + + '}' + }, + { + sTitle: + 'Preservation of a formal parameter in a function expression.', + sInput: + 'void [' + + ' function(abcdefghijklmnopqrstuvwxyz) {' + + ' },' + + ' function(abcdefghijklmnopqrstuvwxyz) {' + + ' }' + + '];' + }, + { + sTitle: + 'Exclusion of a function declaration.', + sInput: + 'void ["abcdefghijklmnopqrstuvwxyz"];' + + 'function foo() {' + + '}' + + 'void ["abcdefghijklmnopqrstuvwxyz"];' + }, + { + sTitle: + 'Consolidation within a function declaration.', + sInput: + 'function foo() {' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + '}', + sOutput: + 'function foo() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + '}' + }, + // 14 Program. + { + sTitle: + 'Preservation of a program without source elements.', + sInput: + '' + }, + // 14.1 Directive Prologues and the Use Strict Directive. + { + sTitle: + 'Preservation of a Directive Prologue in global code.', + sInput: + '"abcdefghijklmnopqrstuvwxyz";' + + '\'zyxwvutsrqponmlkjihgfedcba\';' + }, + { + sTitle: + 'Preservation of a Directive Prologue in a function declaration.', + sInput: + 'function foo() {' + + ' "abcdefghijklmnopqrstuvwxyz";' + + ' \'zyxwvutsrqponmlkjihgfedcba\';' + + '}' + }, + { + sTitle: + 'Preservation of a Directive Prologue in a function expression.', + sInput: + 'void [' + + ' function() {' + + ' "abcdefghijklmnopqrstuvwxyz";' + + ' \'zyxwvutsrqponmlkjihgfedcba\';' + + ' }' + + '];' + }, + { + sTitle: + 'Ignorance with regard to a Directive Prologue in global code.', + sInput: + '"abcdefghijklmnopqrstuvwxyz";' + + 'void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];', + sOutput: + '"abcdefghijklmnopqrstuvwxyz";' + + '(function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + '}());' + }, + { + sTitle: + 'Ignorance with regard to a Directive Prologue in a function' + + 'declaration.', + sInput: + 'function foo() {' + + ' "abcdefghijklmnopqrstuvwxyz";' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + '}', + sOutput: + 'function foo() {' + + ' "abcdefghijklmnopqrstuvwxyz";' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + '}' + }, + { + sTitle: + 'Ignorance with regard to a Directive Prologue in a function' + + 'expression.', + sInput: + '(function() {' + + ' "abcdefghijklmnopqrstuvwxyz";' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + '}());', + sOutput: + '(function() {' + + ' "abcdefghijklmnopqrstuvwxyz";' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + '}());' + }, + // 15.1 The Global Object. + { + sTitle: + 'Preservation of a property of the global object.', + sInput: + 'void [undefined, undefined, undefined, undefined, undefined];' + }, + // 15.1.2.1.1 Direct Call to Eval. + { + sTitle: + 'Exclusion of a direct call to the eval function in the same ' + + 'syntactic code unit.', + sInput: + '/*jshint evil:true */' + + 'void ["abcdefghijklmnopqrstuvwxyz"];' + + 'eval("");' + + 'void ["abcdefghijklmnopqrstuvwxyz"];' + }, + { + sTitle: + 'Exclusion of a direct call to the eval function in nested ' + + 'function code.', + sInput: + '/*jshint evil:true */' + + 'void ["abcdefghijklmnopqrstuvwxyz"];' + + '(function() {' + + ' eval("");' + + '}());' + + 'void ["abcdefghijklmnopqrstuvwxyz"];' + }, + { + sTitle: + 'Consolidation within a direct call to the eval function.', + sInput: + '/*jshint evil:true */' + + 'eval(function() {' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + '}());', + sOutput: + '/*jshint evil:true */' + + 'eval(function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + '}());' + }, + // Consolidation proper. + { + sTitle: + 'No consolidation if it does not result in a reduction of the ' + + 'number of source characters.', + sInput: + '(function() {' + + ' var foo;' + + ' void ["ab", "ab", "abc", "abc"];' + + '}());' + }, + { + sTitle: + 'Identification of a range of source elements at the beginning ' + + 'of global code.', + sInput: + '/*jshint evil:true */' + + '"abcdefghijklmnopqrstuvwxyz";' + + 'void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + 'eval("");', + sOutput: + '/*jshint evil:true */' + + '"abcdefghijklmnopqrstuvwxyz";' + + '(function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + '}());' + + 'eval("");' + }, + { + sTitle: + 'Identification of a range of source elements in the middle of ' + + 'global code.', + sInput: + '/*jshint evil:true */' + + '"abcdefghijklmnopqrstuvwxyz";' + + 'eval("");' + + 'void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + 'eval("");', + sOutput: + '/*jshint evil:true */' + + '"abcdefghijklmnopqrstuvwxyz";' + + 'eval("");' + + '(function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + '}());' + + 'eval("");' + }, + { + sTitle: + 'Identification of a range of source elements at the end of ' + + 'global code.', + sInput: + '/*jshint evil:true */' + + '"abcdefghijklmnopqrstuvwxyz";' + + 'eval("");' + + 'void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];', + sOutput: + '/*jshint evil:true */' + + '"abcdefghijklmnopqrstuvwxyz";' + + 'eval("");' + + '(function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + '}());' + }, + { + sTitle: + 'Identification of a range of source elements at the beginning ' + + 'of function code.', + sInput: + '/*jshint evil:true */' + + '(function() {' + + ' "abcdefghijklmnopqrstuvwxyz";' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + ' eval("");' + + '}());', + sOutput: + '/*jshint evil:true */' + + '(function() {' + + ' "abcdefghijklmnopqrstuvwxyz";' + + ' (function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + ' }());' + + ' eval("");' + + '}());' + }, + { + sTitle: + 'Identification of a range of source elements in the middle of ' + + 'function code.', + sInput: + '/*jshint evil:true */' + + '(function() {' + + ' "abcdefghijklmnopqrstuvwxyz";' + + ' eval("");' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + ' eval("");' + + '}());', + sOutput: + '/*jshint evil:true */' + + '(function() {' + + ' "abcdefghijklmnopqrstuvwxyz";' + + ' eval("");' + + ' (function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + ' }());' + + ' eval("");' + + '}());' + }, + { + sTitle: + 'Identification of a range of source elements at the end of ' + + 'function code.', + sInput: + '/*jshint evil:true */' + + '(function() {' + + ' "abcdefghijklmnopqrstuvwxyz";' + + ' eval("");' + + ' void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];' + + '}());', + sOutput: + '/*jshint evil:true */' + + '(function() {' + + ' "abcdefghijklmnopqrstuvwxyz";' + + ' eval("");' + + ' (function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + ' }());' + + '}());' + }, + { + sTitle: + 'Evaluation with regard to String values of String literals and ' + + 'String values derived from identifier names used as property' + + 'accessors.', + sInput: + '(function() {' + + ' var foo;' + + ' void ["abcdefg", Math.abcdefg, "abcdef", Math.abcdef];' + + '}());', + sOutput: + '(function() {' + + ' var a = "abcdefg", foo;' + + ' void [a, Math[a], "abcdef", Math.abcdef];' + + '}());' + }, + { + sTitle: + 'Evaluation with regard to the necessity of adding a variable ' + + 'statement.', + sInput: + '/*jshint evil:true */' + + '(function() {' + + ' void ["abcdefgh", "abcdefgh"];' + + '}());' + + 'eval("");' + + '(function() {' + + ' void ["abcdefg", "abcdefg"];' + + '}());' + + 'eval("");' + + '(function() {' + + ' var foo;' + + ' void ["abcd", "abcd"];' + + '}());', + sOutput: + '/*jshint evil:true */' + + '(function() {' + + ' var a = "abcdefgh";' + + ' void [a, a];' + + '}());' + + 'eval("");' + + '(function() {' + + ' void ["abcdefg", "abcdefg"];' + + '}());' + + 'eval("");' + + '(function() {' + + ' var a = "abcd", foo;' + + ' void [a, a];' + + '}());' + }, + { + sTitle: + 'Evaluation with regard to the necessity of enclosing source ' + + 'elements.', + sInput: + '/*jshint evil:true */' + + 'void ["abcdefghijklmnopqrstuvwxy", "abcdefghijklmnopqrstuvwxy"];' + + 'eval("");' + + 'void ["abcdefghijklmnopqrstuvwx", "abcdefghijklmnopqrstuvwx"];' + + 'eval("");' + + '(function() {' + + ' void ["abcdefgh", "abcdefgh"];' + + '}());' + + '(function() {' + + ' void ["abcdefghijklmnopqrstuvwxy",' + + ' "abcdefghijklmnopqrstuvwxy"];' + + ' eval("");' + + ' void ["abcdefghijklmnopqrstuvwx",' + + ' "abcdefghijklmnopqrstuvwx"];' + + ' eval("");' + + ' (function() {' + + ' void ["abcdefgh", "abcdefgh"];' + + ' }());' + + '}());', + sOutput: + '/*jshint evil:true */' + + '(function() {' + + ' var a = "abcdefghijklmnopqrstuvwxy";' + + ' void [a, a];' + + '}());' + + 'eval("");' + + 'void ["abcdefghijklmnopqrstuvwx", "abcdefghijklmnopqrstuvwx"];' + + 'eval("");' + + '(function() {' + + ' var a = "abcdefgh";' + + ' void [a, a];' + + '}());' + + '(function() {' + + ' (function() {' + + ' var a = "abcdefghijklmnopqrstuvwxy";' + + ' void [a, a];' + + ' }());' + + ' eval("");' + + ' void ["abcdefghijklmnopqrstuvwx", "abcdefghijklmnopqrstuvwx"];' + + ' eval("");' + + ' (function() {' + + ' var a = "abcdefgh";' + + ' void [a, a];' + + ' }());' + + '}());' + }, + { + sTitle: + 'Employment of a closure while consolidating in global code.', + sInput: + 'void ["abcdefghijklmnopqrstuvwxyz",' + + ' "abcdefghijklmnopqrstuvwxyz"];', + sOutput: + '(function() {' + + ' var a = "abcdefghijklmnopqrstuvwxyz";' + + ' void [a, a];' + + '}());' + }, + { + sTitle: + 'Assignment of a shorter identifier to a value whose ' + + 'consolidation results in a greater reduction of the number of ' + + 'source characters.', + sInput: + '(function() {' + + ' var b, c, d, e, f, g, h, i, j, k, l, m,' + + ' n, o, p, q, r, s, t, u, v, w, x, y, z,' + + ' A, B, C, D, E, F, G, H, I, J, K, L, M,' + + ' N, O, P, Q, R, S, T, U, V, W, X, Y, Z,' + + ' $, _;' + + ' void ["abcde", "abcde", "edcba", "edcba", "edcba"];' + + '}());', + sOutput: + '(function() {' + + ' var a = "edcba",' + + ' b, c, d, e, f, g, h, i, j, k, l, m,' + + ' n, o, p, q, r, s, t, u, v, w, x, y, z,' + + ' A, B, C, D, E, F, G, H, I, J, K, L, M,' + + ' N, O, P, Q, R, S, T, U, V, W, X, Y, Z,' + + ' $, _;' + + ' void ["abcde", "abcde", a, a, a];' + + '}());' + } + ].forEach(cAssert); + }()); +} + +/* Local Variables: */ +/* mode: js */ +/* coding: utf-8 */ +/* indent-tabs-mode: nil */ +/* tab-width: 2 */ +/* End: */ +/* vim: set ft=javascript fenc=utf-8 et ts=2 sts=2 sw=2: */ +/* :mode=javascript:noTabs=true:tabSize=2:indentSize=2:deepIndent=true: */ + +}); +define('uglifyjs/parse-js', ["exports"], function(exports) { + /*********************************************************************** A JavaScript tokenizer / parser / beautifier / compressor. @@ -3217,6 +9440,7 @@ var KEYWORDS = array_to_hash([ "catch", "const", "continue", + "debugger", "default", "delete", "do", @@ -3245,7 +9469,6 @@ var RESERVED_WORDS = array_to_hash([ "byte", "char", "class", - "debugger", "double", "enum", "export", @@ -3343,7 +9566,7 @@ var OPERATORS = array_to_hash([ var WHITESPACE_CHARS = array_to_hash(characters(" \u00a0\n\r\t\f\u000b\u200b\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000")); -var PUNC_BEFORE_EXPRESSION = array_to_hash(characters("[{}(,.;:")); +var PUNC_BEFORE_EXPRESSION = array_to_hash(characters("[{(,.;:")); var PUNC_CHARS = array_to_hash(characters("[]{}(),;:")); @@ -3638,10 +9861,10 @@ function tokenizer($TEXT) { }; function read_name() { - var backslash = false, name = "", ch; + var backslash = false, name = "", ch, escaped = false, hex; while ((ch = peek()) != null) { if (!backslash) { - if (ch == "\\") backslash = true, next(); + if (ch == "\\") escaped = backslash = true, next(); else if (is_identifier_char(ch)) name += next(); else break; } @@ -3653,6 +9876,10 @@ function tokenizer($TEXT) { backslash = false; } } + if (HOP(KEYWORDS, name) && escaped) { + hex = name.charCodeAt(0).toString(16).toUpperCase(); + name = "\\u" + "0000".substr(hex.length) + hex + name.slice(1); + } return name; }; @@ -4061,8 +10288,11 @@ function parse($TEXT, exigent_mode, embed_tokens) { init = is("keyword", "var") ? (next(), var_(true)) : expression(true, true); - if (is("operator", "in")) + if (is("operator", "in")) { + if (init[0] == "var" && init[1].length > 1) + croak("Only one variable declaration allowed in for..in loop"); return for_in(init); + } } return regular_for(init); }; @@ -4540,6 +10770,10 @@ function ast_squeeze_more(ast) { } }, "call": function(expr, args) { + if (expr[0] == "dot" && expr[1][0] == "string" && args.length == 1 + && (args[0][1] > 0 && expr[2] == "substring" || expr[2] == "substr")) { + return [ "call", [ "dot", expr[1], "slice"], args]; + } if (expr[0] == "dot" && expr[2] == "toString" && args.length == 0) { // foo.toString() ==> foo+"" return [ "binary", "+", expr[1], [ "string", "" ]]; @@ -4706,6 +10940,9 @@ function ast_walker() { "function": function(name, args, body) { return [ this[0], name, args.slice(), MAP(body, walk) ]; }, + "debugger": function() { + return [ this[0] ]; + }, "defun": function(name, args, body) { return [ this[0], name, args.slice(), MAP(body, walk) ]; }, @@ -4849,12 +11086,13 @@ function Scope(parent) { }; var base54 = (function(){ - var DIGITS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_"; + var DIGITS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789"; return function(num) { - var ret = ""; + var ret = "", base = 54; do { - ret = DIGITS.charAt(num % 54) + ret; - num = Math.floor(num / 54); + ret += DIGITS.charAt(num % base); + num = Math.floor(num / base); + base = 64; } while (num > 0); return ret; }; @@ -5308,7 +11546,9 @@ var when_constant = (function(){ case "string": ast = [ "string", val ]; break; case "number": ast = [ "num", val ]; break; case "boolean": ast = [ "name", String(val) ]; break; - default: throw new Error("Can't handle constant of type: " + (typeof val)); + default: + if (val === null) { ast = [ "atom", "null" ]; break; } + throw new Error("Can't handle constant of type: " + (typeof val)); } return yes.call(expr, ast, val); } catch(ex) { @@ -5377,17 +11617,15 @@ function prepare_ifs(ast) { var conditional = walk(fi[1]); - var e_body = statements.slice(i + 1); + var e_body = redo_if(statements.slice(i + 1)); var e = e_body.length == 1 ? e_body[0] : [ "block", e_body ]; - var ret = statements.slice(0, i).concat([ [ + return statements.slice(0, i).concat([ [ fi[0], // "if" conditional, // conditional t, // then e // else ] ]); - - return redo_if(ret); } return statements; @@ -5752,6 +11990,16 @@ function ast_squeeze(ast, options) { }); }; + function abort_else(c, t, e) { + var ret = [ [ "if", negate(c), e ] ]; + if (t[0] == "block") { + if (t[1]) ret = ret.concat(t[1]); + } else { + ret.push(t); + } + return walk([ "block", ret ]); + }; + function make_real_if(c, t, e) { c = walk(c); t = walk(t); @@ -5785,9 +12033,10 @@ function ast_squeeze(ast, options) { } else if (t[0] == "stat") { if (e) { - if (e[0] == "stat") { + if (e[0] == "stat") ret = best_of(ret, [ "stat", make_conditional(c, t[1], e[1]) ]); - } + else if (aborts(e)) + ret = abort_else(c, t, e); } else { ret = best_of(ret, [ "stat", make_conditional(c, t[1]) ]); @@ -5807,13 +12056,7 @@ function ast_squeeze(ast, options) { ret = walk([ "block", ret ]); } else if (t && aborts(e)) { - ret = [ [ "if", negate(c), e ] ]; - if (t[0] == "block") { - if (t[1]) ret = ret.concat(t[1]); - } else { - ret.push(t); - } - ret = walk([ "block", ret ]); + ret = abort_else(c, t, e); } return ret; }; @@ -5945,7 +12188,6 @@ function make_string(str, ascii_only) { case "\f": return "\\f"; case "\n": return "\\n"; case "\r": return "\\r"; - case "\t": return "\\t"; case "\u2028": return "\\u2028"; case "\u2029": return "\\u2029"; case '"': ++dq; return '"'; @@ -6106,6 +12348,7 @@ function gen_code(ast, options) { "string": encode_string, "num": make_num, "name": make_name, + "debugger": function(){ return "debugger" }, "toplevel": function(statements) { return make_block_statements(statements) .join(newline + newline); @@ -6189,7 +12432,7 @@ function gen_code(ast, options) { if (expr[0] == "num") { if (!/\./.test(expr[1])) out += "."; - } else if (needs_parens(expr)) + } else if (expr[0] != "function" && needs_parens(expr)) out = "(" + out + ")"; while (i < arguments.length) out += "." + make_name(arguments[i++]); @@ -6287,7 +12530,7 @@ function gen_code(ast, options) { if (p.length == 3) { // getter/setter. The name is in p[0], the arg.list in p[1][2], the // body in p[1][3] and type ("get" / "set") in p[2]. - return indent(make_function(p[0], p[1][2], p[1][3], p[2])); + return indent(make_function(p[0], p[1][2], p[1][3], p[2], true)); } var key = p[0], val = parenthesize(p[1], "seq"); if (options.quote_keys) { @@ -6364,14 +12607,14 @@ function gen_code(ast, options) { return make(th); }; - function make_function(name, args, body, keyword) { + function make_function(name, args, body, keyword, no_parens) { var out = keyword || "function"; if (name) { out += " " + make_name(name); } out += "(" + add_commas(MAP(args, make_name)) + ")"; out = add_spaces([ out, make_block(body) ]); - return needs_parens(this) ? "(" + out + ")" : out; + return (!no_parens && needs_parens(this)) ? "(" + out + ")" : out; }; function must_has_semicolon(node) { @@ -6568,7 +12811,7 @@ exports.MAP = MAP; // keep this last! exports.ast_squeeze_more = require("./squeeze-more").ast_squeeze_more; -});define('uglifyjs/index', ["require", "exports", "module", "./parse-js", "./process"], function(require, exports, module) { +});define('uglifyjs/index', ["require", "exports", "module", "./parse-js", "./process", "./consolidator"], function(require, exports, module) { //convienence function(src, [options]); function uglify(orig_code, options){ @@ -6585,6 +12828,7 @@ function uglify(orig_code, options){ uglify.parser = require("./parse-js"); uglify.uglify = require("./process"); +uglify.consolidator = require("./consolidator"); module.exports = uglify @@ -6594,10 +12838,12 @@ module.exports = uglify * see: http://github.com/jrburke/requirejs for details */ -/*jslint plusplus: false, strict: false */ +/*jslint plusplus: true */ /*global define: false */ -define('parse', ['./uglifyjs/index'], function (uglify) { +define('parse', ['./esprima', './uglifyjs/index'], function (esprima, uglify) { + 'use strict'; + var parser = uglify.parser, processor = uglify.uglify, ostring = Object.prototype.toString, @@ -6638,7 +12884,8 @@ define('parse', ['./uglifyjs/index'], function (uglify) { ], i, item; - for (i = 0; (item = ary[i]); i++) { + for (i = 0; i < ary.length; i++) { + item = ary[i]; output[1].push([ 'string', item @@ -6770,7 +13017,8 @@ define('parse', ['./uglifyjs/index'], function (uglify) { name = null; } - if (!(deps = getValidDeps(deps))) { + deps = getValidDeps(deps); + if (!deps) { deps = []; } @@ -6806,7 +13054,8 @@ define('parse', ['./uglifyjs/index'], function (uglify) { } if (moduleDeps.length || moduleList.length) { - for (i = 0; (moduleCall = moduleList[i]); i++) { + for (i = 0; i < moduleList.length; i++) { + moduleCall = moduleList[i]; if (result) { result += '\n'; } @@ -6831,7 +13080,7 @@ define('parse', ['./uglifyjs/index'], function (uglify) { } } - return result ? result : null; + return result || null; } //Add some private methods to object for use in derived objects. @@ -6878,12 +13127,12 @@ define('parse', ['./uglifyjs/index'], function (uglify) { this.recurse([node[3]], onMatch, options, recurseCallback); } } else { - if (recurseCallback(node, onMatch)) { - //The onMatch indicated parsing should - //stop for children of this node. - continue; + //If the onMatch indicated parsing should + //stop for children of this node, stop, otherwise, + //keep going. + if (!recurseCallback(node, onMatch)) { + this.recurse(node, onMatch, options, recurseCallback); } - this.recurse(node, onMatch, options, recurseCallback); } } } @@ -6953,7 +13202,7 @@ define('parse', ['./uglifyjs/index'], function (uglify) { var callback, i, n, call, args; if (isArray(node)) { - if (node[0] === 'call') { + if (node[0] === 'call' && node.length > 2) { call = node[1]; args = node[2]; if ((call[0] === 'name' && call[1] === 'define') || @@ -6973,7 +13222,8 @@ define('parse', ['./uglifyjs/index'], function (uglify) { //Check child nodes for (i = 0; i < node.length; i++) { n = node[i]; - if ((callback = this.findAnonDefineFactory(n))) { + callback = this.findAnonDefineFactory(n); + if (callback) { return callback; } } @@ -7036,7 +13286,8 @@ define('parse', ['./uglifyjs/index'], function (uglify) { name = null; } - if ((deps = getValidDeps(deps))) { + deps = getValidDeps(deps); + if (deps) { dependencies = dependencies.concat(deps); } }, options); @@ -7199,12 +13450,14 @@ define('parse', ['./uglifyjs/index'], function (uglify) { * @returns {Boolean} */ parse.nodeHasRequire = function (node) { + var i, n; + if (this.isDefineNode(node)) { return true; } if (isArray(node)) { - for (var i = 0, n; i < node.length; i++) { + for (i = 0; i < node.length; i++) { n = node[i]; if (this.nodeHasRequire(n)) { return true; @@ -7272,7 +13525,8 @@ define('parse', ['./uglifyjs/index'], function (uglify) { config = null; } - if (!(deps = validateDeps(deps))) { + deps = validateDeps(deps); + if (!deps) { return null; } @@ -7432,19 +13686,331 @@ define('parse', ['./uglifyjs/index'], function (uglify) { return processor.gen_code(node, true); }; + /** + * Extracts license comments from JS text. + * @param {String} fileName + * @param {String} contents + * @returns {String} a string of license comments. + */ + parse.getLicenseComments = function (fileName, contents) { + var ast = esprima.parse(contents, { + comment: true + }), + result = '', + lineEnd = contents.indexOf('\r') === -1 ? '\n' : '\r\n', + commentNode, refNode, subNode, value, i, j; + + if (ast.comments) { + for (i = 0; i < ast.comments.length; i++) { + commentNode = ast.comments[i]; + + if (commentNode.type === 'Line') { + value = '//' + commentNode.value + lineEnd; + refNode = commentNode; + + if (i + 1 >= ast.comments.length) { + value += lineEnd; + } else { + //Look for immediately adjacent single line comments since + //it could from a multiple line comment made out of single + //line comments. Like this comment. + for (j = i + 1; j < ast.comments.length; j++) { + subNode = ast.comments[j]; + if (subNode.type === 'Line' && subNode.range[0] === refNode.range[1]) { + //Adjacent single line comment. Collect it. + value += '//' + subNode.value + lineEnd; + refNode = subNode; + } else { + //No more single line comment blocks. Break out + //and continue outer looping. + value += lineEnd; + i = j - 1; + break; + } + } + } + } else { + value = '/*' + commentNode.value + '*/' + lineEnd + lineEnd; + } + + if (value.indexOf('license') !== -1 || + (commentNode.type === 'Block' && value.indexOf('/*!') === 0) || + value.indexOf('opyright') !== -1 || + value.indexOf('(c)') !== -1) { + + result += value; + } + + } + } + + return result; + }; + return parse; }); /** + * @license Copyright (c) 2012, The Dojo Foundation All Rights Reserved. + * Available via the MIT or new BSD license. + * see: http://github.com/jrburke/requirejs for details + */ + +/*jslint */ + +define('transform', ['./esprima', './parse', 'logger'], function (esprima, parse, logger) { + 'use strict'; + + return { + toTransport: function (namespace, moduleName, path, contents, onFound) { + + var defineRanges = [], + contentInsertion = '', + depString = '', + tokens, info, deps; + + try { + tokens = esprima.parse(contents, { + tokens: true, + range: true + }).tokens; + } catch(e) { + logger.trace('toTransport skipping ' + path + ': ' + + e.toString()); + return contents; + } + + //Find the define calls and their position in the files. + tokens.forEach(function (token, i) { + var namespaceExists = false, + prev, prev2, next, next2, next3, next4, + needsId, depAction, nameCommaRange, foundId; + + if (token.type === 'Identifier' && token.value === 'define') { + //Possible match. Do not want something.define calls + //though, and only defines follow by a paren + prev = tokens[i - 1]; + next = tokens[i + 1]; + + if (prev && prev.type === 'Punctuator' && + prev.value === '.') { + //a define on a sub-object, not a top level + //define() call. If the sub object is the + //namespace, then it is ok. + prev2 = tokens[i - 2]; + if (!prev2) { + return; + } + + //If the prev2 does not match namespace, then bail. + if (!namespace || prev2.type !== 'Identifier' || + prev2.value !== namespace) { + return; + } else if (namespace) { + namespaceExists = true; + } + } + + if (!next || next.type !== 'Punctuator' || + next.value !== '(') { + //Not a define() function call. Bail. + return; + } + + next2 = tokens[i + 2]; + if (!next2) { + return; + } + + //Figure out if this needs a named define call. + if (next2.type === 'Punctuator' && + next2.value === '[') { + //Dependency array + needsId = true; + depAction = 'skip'; + } else if (next2.type === 'Punctuator' && + next2.value === '{') { + //Object literal + needsId = true; + depAction = 'skip'; + } else if (next2.type === 'Keyword' && + next2.value === 'function') { + //function + needsId = true; + depAction = 'scan'; + } else if (next2.type === 'String') { + //Named module + needsId = false; + + //The value includes the quotes around the string, + //so remove them. + foundId = next2.value.substring(1, + next2.value.length - 1); + + //assumed it does not need dependencies injected + + //If next argument is a function it means we need + //dependency scanning. + next3 = tokens[i + 3]; + next4 = tokens[i + 4]; + if (!next3 || !next4) { + return; + } + + if (next3.type === 'Punctuator' && + next3.value === ',' && + next4.type === 'Keyword' && + next4.value === 'function') { + depAction = 'scan'; + nameCommaRange = next3.range; + } else { + depAction = 'skip'; + } + } else if (next2.type === 'Identifier') { + //May be the define(factory); type. + next3 = tokens[i + 3]; + if (!next3) { + return; + } + if (next3.type === 'Punctuator' && + next3.value === ')') { + needsId = true; + depAction = 'empty'; + } else { + return; + } + } else if (next2.type === 'Numeric') { + //May be the define(12345); type. + next3 = tokens[i + 3]; + if (!next3) { + return; + } + if (next3.type === 'Punctuator' && + next3.value === ')') { + needsId = true; + depAction = 'skip'; + } else { + return; + } + } else if (next2.type === 'Punctuator' && + next2.value === '-') { + //May be the define(-12345); type. + next3 = tokens[i + 3]; + if (!next3) { + return; + } + if (next3.type === 'Numeric') { + next4 = tokens[i + 4]; + if (!next4) { + return; + } + if (next4.type === 'Punctuator' && + next4.value === ')') { + needsId = true; + depAction = 'skip'; + } else { + return; + } + } else { + return; + } + } else { + //Not a match, skip it. + return; + } + + defineRanges.push({ + foundId: foundId, + needsId: needsId, + depAction: depAction, + namespaceExists: namespaceExists, + defineRange: token.range, + parenRange: next.range, + nameCommaRange: nameCommaRange + }); + } + }); + + //Only do naming and dependency injection if there is one define + //call in the file. + if (defineRanges.length > 1) { + return contents; + } + if (!defineRanges.length) { + return contents; + } + + info = defineRanges[0]; + + //Do the modifications "backwards", in other words, start with the + //one that is farthest down and work up, so that the ranges in the + //defineRanges still apply. So that means deps, id, then namespace. + + if (info.needsId && moduleName) { + contentInsertion += "'" + moduleName + "',"; + } + + if (info.depAction === 'scan') { + deps = parse.getAnonDeps(path, contents); + + if (deps.length) { + depString = '[' + deps.map(function (dep) { + return "'" + dep + "'"; + }) + ']'; + } else { + depString = '[]'; + } + depString += ','; + + if (info.nameCommaRange) { + //Already have a named module, need to insert the + //dependencies after the name. + contents = contents.substring(0, info.nameCommaRange[1]) + + depString + + contents.substring(info.nameCommaRange[1], + contents.length); + } else { + contentInsertion += depString; + } + } else if (info.depAction === 'empty') { + contentInsertion += '[],'; + } + + if (contentInsertion) { + contents = contents.substring(0, info.parenRange[1]) + + contentInsertion + + contents.substring(info.parenRange[1], + contents.length); + } + + //Do namespace last so that ui does not mess upthe parenRange + //used above. + if (namespace && !info.namespaceExists) { + contents = contents.substring(0, info.defineRange[0]) + + namespace + '.' + + contents.substring(info.defineRange[0], + contents.length); + } + + + //Notify any listener for the found info + if (onFound) { + onFound(info); + } + + return contents; + } + }; +});/** * @license Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. * Available via the MIT or new BSD license. * see: http://github.com/jrburke/requirejs for details */ -/*jslint regexp: false, strict: false, plusplus: false */ +/*jslint regexp: true, plusplus: true */ /*global define: false */ define('pragma', ['parse', 'logger'], function (parse, logger) { - + 'use strict'; function Temp() {} function create(obj, mixin) { @@ -7456,7 +14022,7 @@ define('pragma', ['parse', 'logger'], function (parse, logger) { if (mixin) { for (prop in mixin) { - if (mixin.hasOwnProperty(prop) && !(prop in temp)) { + if (mixin.hasOwnProperty(prop) && !temp.hasOwnProperty(prop)) { temp[prop] = mixin[prop]; } } @@ -7469,10 +14035,11 @@ define('pragma', ['parse', 'logger'], function (parse, logger) { conditionalRegExp: /(exclude|include)Start\s*\(\s*["'](\w+)["']\s*,(.*)\)/, useStrictRegExp: /['"]use strict['"];/g, hasRegExp: /has\s*\(\s*['"]([^'"]+)['"]\s*\)/g, - nsRegExp: /(^|[^\.])(requirejs|require|define)\s*\(/, + nsRegExp: /(^|[^\.])(requirejs|require|define)(\.config)?\s*\(/g, nsWrapRegExp: /\/\*requirejs namespace: true \*\//, apiDefRegExp: /var requirejs, require, define;/, defineCheckRegExp: /typeof\s+define\s*===\s*["']function["']\s*&&\s*define\s*\.\s*amd/g, + defineTypeFirstCheckRegExp: /\s*["']function["']\s*===\s*typeof\s+define\s*&&\s*define\s*\.\s*amd/g, defineJQueryRegExp: /typeof\s+define\s*===\s*["']function["']\s*&&\s*define\s*\.\s*amd\s*&&\s*define\s*\.\s*amd\s*\.\s*jQuery/g, defineHasRegExp: /typeof\s+define\s*==(=)?\s*['"]function['"]\s*&&\s*typeof\s+define\.amd\s*==(=)?\s*['"]object['"]\s*&&\s*define\.amd/g, defineTernaryRegExp: /typeof\s+define\s*===\s*['"]function["']\s*&&\s*define\s*\.\s*amd\s*\?\s*define/, @@ -7485,7 +14052,7 @@ define('pragma', ['parse', 'logger'], function (parse, logger) { namespace: function (fileContents, ns, onLifecycleName) { if (ns) { //Namespace require/define calls - fileContents = fileContents.replace(pragma.nsRegExp, '$1' + ns + '.$2('); + fileContents = fileContents.replace(pragma.nsRegExp, '$1' + ns + '.$2$3('); //Namespace define ternary use: fileContents = fileContents.replace(pragma.defineTernaryRegExp, @@ -7500,10 +14067,12 @@ define('pragma', ['parse', 'logger'], function (parse, logger) { "typeof " + ns + ".define === 'function' && typeof " + ns + ".define.amd === 'object' && " + ns + ".define.amd"); //Namespace define checks. - //Do this one last, since it is a subset of the more specific + //Do these ones last, since they are a subset of the more specific //checks above. fileContents = fileContents.replace(pragma.defineCheckRegExp, "typeof " + ns + ".define === 'function' && " + ns + ".define.amd"); + fileContents = fileContents.replace(pragma.defineTypeFirstCheckRegExp, + "'function' === typeof " + ns + ".define && " + ns + ".define.amd"); //Check for require.js with the require/define definitions if (pragma.apiDefRegExp.test(fileContents) && @@ -7534,7 +14103,7 @@ define('pragma', ['parse', 'logger'], function (parse, logger) { 'requirejs = ' + ns + '.requirejs,' + 'define = ' + ns + '.define;\n' + fileContents + - '\n}());' + '\n}());'; } } @@ -7549,7 +14118,7 @@ define('pragma', ['parse', 'logger'], function (parse, logger) { var foundIndex = -1, startIndex = 0, lineEndIndex, conditionLine, matches, type, marker, condition, isTrue, endRegExp, endMatches, endMarkerIndex, shouldInclude, startLength, lifecycleHas, deps, - i, dep, moduleName, + i, dep, moduleName, collectorMod, lifecyclePragmas, pragmas = config.pragmas, hasConfig = config.has, //Legacy arg defined to help in dojo conversion script. Remove later //when dojo no longer needs conversion: @@ -7575,7 +14144,7 @@ define('pragma', ['parse', 'logger'], function (parse, logger) { //Replace has references if desired if (hasConfig) { fileContents = fileContents.replace(pragma.hasRegExp, function (match, test) { - if (test in hasConfig) { + if (hasConfig.hasOwnProperty(test)) { return !!hasConfig[test]; } return match; @@ -7657,10 +14226,14 @@ define('pragma', ['parse', 'logger'], function (parse, logger) { try { deps = parse.findDependencies(fileName, fileContents); if (deps.length) { - for (i = 0; (dep = deps[i]); i++) { + for (i = 0; i < deps.length; i++) { + dep = deps[i]; if (dep.indexOf('!') !== -1) { - (pluginCollector[moduleName] || - (pluginCollector[moduleName] = [])).push(dep); + collectorMod = pluginCollector[moduleName]; + if (!collectorMod) { + collectorMod = pluginCollector[moduleName] = []; + } + collectorMod.push(dep); } } } @@ -7807,16 +14380,18 @@ define('rhino/optimize', ['logger'], function (logger) { * see: http://github.com/jrburke/requirejs for details */ -/*jslint plusplus: false, nomen: false, regexp: false */ +/*jslint plusplus: true, nomen: true, regexp: true */ /*global define: false */ define('optimize', [ 'lang', 'logger', 'env!env/optimize', 'env!env/file', 'parse', 'pragma', 'uglifyjs/index'], function (lang, logger, envOptimize, file, parse, pragma, uglify) { + 'use strict'; var optimize, cssImportRegExp = /\@import\s+(url\()?\s*([^);]+)\s*(\))?([\w, ]*)(;)?/g, + cssCommentImportRegExp = /\/\*[^\*]*@import[^\*]*\*\//g, cssUrlRegExp = /\url\(\s*([^\)]+)\s*\)?/g; /** @@ -7840,26 +14415,34 @@ function (lang, logger, envOptimize, file, parse, /** * Inlines nested stylesheets that have @import calls in them. - * @param {String} fileName - * @param {String} fileContents - * @param {String} [cssImportIgnore] + * @param {String} fileName the file name + * @param {String} fileContents the file contents + * @param {String} cssImportIgnore comma delimited string of files to ignore + * @param {Object} included an object used to track the files already imported */ - function flattenCss(fileName, fileContents, cssImportIgnore) { + function flattenCss(fileName, fileContents, cssImportIgnore, included) { //Find the last slash in the name. fileName = fileName.replace(lang.backSlashRegExp, "/"); var endIndex = fileName.lastIndexOf("/"), //Make a file path based on the last slash. //If no slash, so must be just a file name. Use empty string then. - filePath = (endIndex !== -1) ? fileName.substring(0, endIndex + 1) : ""; + filePath = (endIndex !== -1) ? fileName.substring(0, endIndex + 1) : "", + //store a list of merged files + importList = [], + skippedList = []; + + //First make a pass by removing an commented out @import calls. + fileContents = fileContents.replace(cssCommentImportRegExp, ''); //Make sure we have a delimited ignore list to make matching faster if (cssImportIgnore && cssImportIgnore.charAt(cssImportIgnore.length - 1) !== ",") { cssImportIgnore += ","; } - return fileContents.replace(cssImportRegExp, function (fullMatch, urlStart, importFileName, urlEnd, mediaTypes) { + fileContents = fileContents.replace(cssImportRegExp, function (fullMatch, urlStart, importFileName, urlEnd, mediaTypes) { //Only process media type "all" or empty media type rules. if (mediaTypes && ((mediaTypes.replace(/^\s\s*/, '').replace(/\s\s*$/, '')) !== "all")) { + skippedList.push(fileName); return fullMatch; } @@ -7879,10 +14462,24 @@ function (lang, logger, envOptimize, file, parse, //and we will just skip that import. var fullImportFileName = importFileName.charAt(0) === "/" ? importFileName : filePath + importFileName, importContents = file.readFile(fullImportFileName), i, - importEndIndex, importPath, fixedUrlMatch, colonIndex, parts; + importEndIndex, importPath, fixedUrlMatch, colonIndex, parts, flat; + + //Skip the file if it has already been included. + if (included[fullImportFileName]) { + return ''; + } + included[fullImportFileName] = true; //Make sure to flatten any nested imports. - importContents = flattenCss(fullImportFileName, importContents); + flat = flattenCss(fullImportFileName, importContents, cssImportIgnore, included); + importContents = flat.fileContents; + + if (flat.importList.length) { + importList.push.apply(importList, flat.importList); + } + if (flat.skippedList.length) { + skippedList.push.apply(skippedList, flat.skippedList); + } //Make the full import path importEndIndex = importFileName.lastIndexOf("/"); @@ -7925,41 +14522,42 @@ function (lang, logger, envOptimize, file, parse, return "url(" + parts.join("/") + ")"; }); + importList.push(fullImportFileName); return importContents; } catch (e) { - logger.trace(fileName + "\n Cannot inline css import, skipping: " + importFileName); + logger.warn(fileName + "\n Cannot inline css import, skipping: " + importFileName); return fullMatch; } }); + + return { + importList : importList, + skippedList: skippedList, + fileContents : fileContents + }; } optimize = { - licenseCommentRegExp: /\/\*[\s\S]*?\*\//g, - /** * Optimizes a file that contains JavaScript content. Optionally collects * plugin resources mentioned in a file, and then passes the content * through an minifier if one is specified via config.optimize. * * @param {String} fileName the name of the file to optimize + * @param {String} fileContents the contents to optimize. If this is + * a null value, then fileName will be used to read the fileContents. * @param {String} outFileName the name of the file to use for the * saved optimized content. * @param {Object} config the build config object. - * @param {String} [moduleName] the module name to use for the file. - * Used for plugin resource collection. * @param {Array} [pluginCollector] storage for any plugin resources * found. */ - jsFile: function (fileName, outFileName, config, moduleName, pluginCollector) { - var parts = (config.optimize + "").split('.'), - optimizerName = parts[0], - keepLines = parts[1] === 'keepLines', - fileContents; - - fileContents = file.readFile(fileName); + jsFile: function (fileName, fileContents, outFileName, config, pluginCollector) { + if (!fileContents) { + fileContents = file.readFile(fileName); + } - fileContents = optimize.js(fileName, fileContents, optimizerName, - keepLines, config, pluginCollector); + fileContents = optimize.js(fileName, fileContents, config, pluginCollector); file.saveUtf8File(outFileName, fileContents); }, @@ -7972,16 +14570,16 @@ function (lang, logger, envOptimize, file, parse, * @param {String} fileName the name of the file that matches the * fileContents. * @param {String} fileContents the string of JS to optimize. - * @param {String} [optimizerName] optional name of the optimizer to - * use. 'uglify' is default. - * @param {Boolean} [keepLines] whether to keep line returns in the optimization. * @param {Object} [config] the build config object. * @param {Array} [pluginCollector] storage for any plugin resources * found. */ - js: function (fileName, fileContents, optimizerName, keepLines, config, pluginCollector) { - var licenseContents = '', - optFunc, match, comment; + js: function (fileName, fileContents, config, pluginCollector) { + var parts = (String(config.optimize)).split('.'), + optimizerName = parts[0], + keepLines = parts[1] === 'keepLines', + licenseContents = '', + optFunc; config = config || {}; @@ -7999,14 +14597,10 @@ function (lang, logger, envOptimize, file, parse, if (config.preserveLicenseComments) { //Pull out any license comments for prepending after optimization. - optimize.licenseCommentRegExp.lastIndex = 0; - while ((match = optimize.licenseCommentRegExp.exec(fileContents))) { - comment = match[0]; - //Only keep the comments if they are license comments. - if (comment.indexOf('@license') !== -1 || - comment.indexOf('/*!') === 0) { - licenseContents += comment + '\n'; - } + try { + licenseContents = parse.getLicenseComments(fileName, fileContents); + } catch (e) { + logger.error('Cannot parse file: ' + fileName + ' for comments. Skipping it. Error is:\n' + e.toString()); } } @@ -8026,21 +14620,43 @@ function (lang, logger, envOptimize, file, parse, * cssImportIgnore options. */ cssFile: function (fileName, outFileName, config) { + //Read in the file. Make sure we have a JS string. var originalFileContents = file.readFile(fileName), - fileContents = flattenCss(fileName, originalFileContents, config.cssImportIgnore), - startIndex, endIndex; + flat = flattenCss(fileName, originalFileContents, config.cssImportIgnore, {}), + //Do not use the flattened CSS if there was one that was skipped. + fileContents = flat.skippedList.length ? originalFileContents : flat.fileContents, + startIndex, endIndex, buildText, comment; + + if (flat.skippedList.length) { + logger.warn('Cannot inline @imports for ' + fileName + + ',\nthe following files had media queries in them:\n' + + flat.skippedList.join('\n')); + } //Do comment removal. try { - startIndex = -1; - //Get rid of comments. - while ((startIndex = fileContents.indexOf("/*")) !== -1) { - endIndex = fileContents.indexOf("*/", startIndex + 2); - if (endIndex === -1) { - throw "Improper comment in CSS file: " + fileName; + if (config.optimizeCss.indexOf(".keepComments") === -1) { + startIndex = 0; + //Get rid of comments. + while ((startIndex = fileContents.indexOf("/*", startIndex)) !== -1) { + endIndex = fileContents.indexOf("*/", startIndex + 2); + if (endIndex === -1) { + throw "Improper comment in CSS file: " + fileName; + } + comment = fileContents.substring(startIndex, endIndex); + + if (config.preserveLicenseComments && + (comment.indexOf('license') !== -1 || + comment.indexOf('opyright') !== -1 || + comment.indexOf('(c)') !== -1)) { + //Keep the comment, just increment the startIndex + startIndex = endIndex; + } else { + fileContents = fileContents.substring(0, startIndex) + fileContents.substring(endIndex + 2, fileContents.length); + startIndex = 0; + } } - fileContents = fileContents.substring(0, startIndex) + fileContents.substring(endIndex + 2, fileContents.length); } //Get rid of newlines. if (config.optimizeCss.indexOf(".keepLines") === -1) { @@ -8059,6 +14675,14 @@ function (lang, logger, envOptimize, file, parse, } file.saveUtf8File(outFileName, fileContents); + + //text output to stdout and/or written to build.txt file + buildText = "\n"+ outFileName.replace(config.dir, "") +"\n----------------\n"; + flat.importList.push(fileName); + buildText += flat.importList.map(function(path){ + return path.replace(config.dir, ""); + }).join("\n"); + return buildText +"\n"; }, /** @@ -8069,100 +14693,365 @@ function (lang, logger, envOptimize, file, parse, * cssImportIgnore options. */ css: function (startDir, config) { + var buildText = "", + i, fileName, fileList; if (config.optimizeCss.indexOf("standard") !== -1) { - var i, fileName, - fileList = file.getFilteredFileList(startDir, /\.css$/, true); + fileList = file.getFilteredFileList(startDir, /\.css$/, true); if (fileList) { for (i = 0; i < fileList.length; i++) { fileName = fileList[i]; logger.trace("Optimizing (" + config.optimizeCss + ") CSS file: " + fileName); - optimize.cssFile(fileName, fileName, config); + buildText += optimize.cssFile(fileName, fileName, config); } } } + return buildText; }, optimizers: { uglify: function (fileName, fileContents, keepLines, config) { var parser = uglify.parser, processor = uglify.uglify, - ast; + ast, errMessage, errMatch; + + config = config || {}; + + logger.trace("Uglifying file: " + fileName); + + try { + ast = parser.parse(fileContents, config.strict_semicolons); + ast = processor.ast_mangle(ast, config); + ast = processor.ast_squeeze(ast, config); + + fileContents = processor.gen_code(ast, config); + + if (config.max_line_length) { + fileContents = processor.split_lines(fileContents, config.max_line_length); + } + } catch (e) { + errMessage = e.toString(); + errMatch = /\nError(\r)?\n/.exec(errMessage); + if (errMatch) { + errMessage = errMessage.substring(0, errMatch.index); + } + logger.error('Cannot uglify file: ' + fileName + '. Skipping it. Error is:\n' + errMessage); + } + return fileContents; + } + } + }; + + return optimize; +}); +/** + * @license RequireJS Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. + * Available via the MIT or new BSD license. + * see: http://github.com/jrburke/requirejs for details + */ +/* + * This file patches require.js to communicate with the build system. + */ + +//Using sloppy since this uses eval for some code like plugins, +//which may not be strict mode compliant. So if use strict is used +//below they will have strict rules applied and may cause an error. +/*jslint sloppy: true, nomen: true, plusplus: true, regexp: true */ +/*global require, define: true */ + +//NOT asking for require as a dependency since the goal is to modify the +//global require below +define('requirePatch', [ 'env!env/file', 'pragma', 'parse', 'lang', 'logger'], +function (file, pragma, parse, lang, logger) { + + var allowRun = true; + + //This method should be called when the patches to require should take hold. + return function () { + if (!allowRun) { + return; + } + allowRun = false; + + var layer, + pluginBuilderRegExp = /(["']?)pluginBuilder(["']?)\s*[=\:]\s*["']([^'"\s]+)["']/, + oldNewContext = require.s.newContext, + oldDef; + + //Stored cached file contents for reuse in other layers. + require._cachedFileContents = {}; + + /** + * Makes sure the URL is something that can be supported by the + * optimization tool. + * @param {String} url + * @returns {Boolean} + */ + require._isSupportedBuildUrl = function (url) { + //Ignore URLs with protocols, hosts or question marks, means either network + //access is needed to fetch it or it is too dynamic. Note that + //on Windows, full paths are used for some urls, which include + //the drive, like c:/something, so need to test for something other + //than just a colon. + if (url.indexOf("://") === -1 && url.indexOf("?") === -1 && + url.indexOf('empty:') !== 0 && url.indexOf('//') !== 0) { + return true; + } else { + if (!layer.ignoredUrls[url]) { + logger.info('Cannot optimize network URL, skipping: ' + url); + layer.ignoredUrls[url] = true; + } + return false; + } + }; + + function normalizeUrlWithBase(context, moduleName, url) { + //Adjust the URL if it was not transformed to use baseUrl. + if (require.jsExtRegExp.test(moduleName)) { + url = (context.config.dir || context.config.dirBaseUrl) + url; + } + return url; + } + + //Overrides the new context call to add existing tracking features. + require.s.newContext = function (name) { + var context = oldNewContext(name), + oldEnable = context.enable, + moduleProto = context.Module.prototype, + oldInit = moduleProto.init, + oldCallPlugin = moduleProto.callPlugin; + + //Only do this for the context used for building. + if (name === '_') { + context.needFullExec = {}; + context.fullExec = {}; + context.plugins = {}; + + //Override the shim exports function generator to just + //spit out strings that can be used in the stringified + //build output. + context.makeShimExports = function (exports) { + var result; + if (typeof exports === 'string') { + result = function () { + return '(function (global) {\n' + + ' return function () {\n' + + ' return global.' + exports + ';\n' + + ' }\n' + + '}(this))'; + }; + } else { + result = function () { + return '(function (global) {\n' + + ' return function () {\n' + + ' var func = ' + exports.toString() + ';\n' + + ' return func.apply(global, arguments);\n' + + ' }\n' + + '}(this))'; + }; + } + + //Mark the result has being tranformed by the build already. + result.__buildReady = true; + return result; + }; + + context.enable = function (depMap, parent) { + var id = depMap.id, + parentId = parent && parent.map.id, + needFullExec = context.needFullExec, + fullExec = context.fullExec, + mod = context.registry[id]; + + if (mod && !mod.defined) { + if (parentId && needFullExec[parentId]) { + needFullExec[id] = true; + } + } else if ((needFullExec[id] && !fullExec[id]) || + (parentId && needFullExec[parentId] && !fullExec[id])) { + context.undef(id); + } + + return oldEnable.apply(context, arguments); + }; + + //Override load so that the file paths can be collected. + context.load = function (moduleName, url) { + /*jslint evil: true */ + var contents, pluginBuilderMatch, builderName; + + //Do not mark the url as fetched if it is + //not an empty: URL, used by the optimizer. + //In that case we need to be sure to call + //load() for each module that is mapped to + //empty: so that dependencies are satisfied + //correctly. + if (url.indexOf('empty:') === 0) { + delete context.urlFetched[url]; + } + + //Only handle urls that can be inlined, so that means avoiding some + //URLs like ones that require network access or may be too dynamic, + //like JSONP + if (require._isSupportedBuildUrl(url)) { + //Adjust the URL if it was not transformed to use baseUrl. + url = normalizeUrlWithBase(context, moduleName, url); + + //Save the module name to path and path to module name mappings. + layer.buildPathMap[moduleName] = url; + layer.buildFileToModule[url] = moduleName; + + if (context.plugins.hasOwnProperty(moduleName)) { + //plugins need to have their source evaled as-is. + context.needFullExec[moduleName] = true; + } + + try { + if (require._cachedFileContents.hasOwnProperty(url) && + (!context.needFullExec[moduleName] || context.fullExec[moduleName])) { + contents = require._cachedFileContents[url]; + } else { + //Load the file contents, process for conditionals, then + //evaluate it. + contents = file.readFile(url); - config = config || {}; + //If there is a read filter, run it now. + if (context.config.onBuildRead) { + contents = context.config.onBuildRead(moduleName, url, contents); + } - logger.trace("Uglifying file: " + fileName); + contents = pragma.process(url, contents, context.config, 'OnExecute'); - try { - ast = parser.parse(fileContents, config.strict_semicolons); - ast = processor.ast_mangle(ast, config); - ast = processor.ast_squeeze(ast, config); + //Find out if the file contains a require() definition. Need to know + //this so we can inject plugins right after it, but before they are needed, + //and to make sure this file is first, so that define calls work. + //This situation mainly occurs when the build is done on top of the output + //of another build, where the first build may include require somewhere in it. + try { + if (!layer.existingRequireUrl && parse.definesRequire(url, contents)) { + layer.existingRequireUrl = url; + } + } catch (e1) { + throw new Error('Parse error using UglifyJS ' + + 'for file: ' + url + '\n' + e1); + } - fileContents = processor.gen_code(ast, config); - } catch (e) { - logger.error('Cannot uglify file: ' + fileName + '. Skipping it. Error is:\n' + e.toString()); - } - return fileContents; - } - } - }; + if (context.plugins.hasOwnProperty(moduleName)) { + //This is a loader plugin, check to see if it has a build extension, + //otherwise the plugin will act as the plugin builder too. + pluginBuilderMatch = pluginBuilderRegExp.exec(contents); + if (pluginBuilderMatch) { + //Load the plugin builder for the plugin contents. + builderName = context.makeModuleMap(pluginBuilderMatch[3], + context.makeModuleMap(moduleName), + null, + true).id; + contents = file.readFile(context.nameToUrl(builderName)); + } + } - return optimize; -}); -/** - * @license RequireJS Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ -/* - * This file patches require.js to communicate with the build system. - */ + //Parse out the require and define calls. + //Do this even for plugins in case they have their own + //dependencies that may be separate to how the pluginBuilder works. + try { + if (!context.needFullExec[moduleName]) { + contents = parse(moduleName, url, contents, { + insertNeedsDefine: true, + has: context.config.has, + findNestedDependencies: context.config.findNestedDependencies + }); + } + } catch (e2) { + throw new Error('Parse error using UglifyJS ' + + 'for file: ' + url + '\n' + e2); + } -/*jslint nomen: false, plusplus: false, regexp: false, strict: false */ -/*global require: false, define: true */ + require._cachedFileContents[url] = contents; + } -//NOT asking for require as a dependency since the goal is to modify the -//global require below -define('requirePatch', [ 'env!env/file', 'pragma', 'parse'], -function (file, pragma, parse) { + if (contents) { + eval(contents); + } - var allowRun = true; + //Need to close out completion of this module + //so that listeners will get notified that it is available. + try { + context.completeLoad(moduleName); + } catch (e) { + //Track which module could not complete loading. + if (!e.moduleTree) { + e.moduleTree = []; + } + e.moduleTree.push(moduleName); + throw e; + } - //This method should be called when the patches to require should take hold. - return function () { - if (!allowRun) { - return; - } - allowRun = false; + } catch (eOuter) { + if (!eOuter.fileName) { + eOuter.fileName = url; + } + throw eOuter; + } + } else { + //With unsupported URLs still need to call completeLoad to + //finish loading. + context.completeLoad(moduleName); + } + }; - var layer, - pluginBuilderRegExp = /(["']?)pluginBuilder(["']?)\s*[=\:]\s*["']([^'"\s]+)["']/, - oldDef; + //Marks module has having a name, and optionally executes the + //callback, but only if it meets certain criteria. + context.execCb = function (name, cb, args, exports) { + if (!layer.needsDefine[name]) { + layer.modulesWithNames[name] = true; + } + if (cb.__requireJsBuild || layer.context.needFullExec[name]) { + return cb.apply(exports, args); + } + return undefined; + }; + + moduleProto.init = function(depMaps) { + if (context.needFullExec[this.map.id]) { + lang.each(depMaps, lang.bind(this, function (depMap) { + if (typeof depMap === 'string') { + depMap = context.makeModuleMap(depMap, + (this.map.isDefine ? this.map : this.map.parentMap)); + } + + if (!context.fullExec[depMap.id]) { + context.undef(depMap.id); + } + })); + } + return oldInit.apply(this, arguments); + }; - /** Print out some extrs info about the module tree that caused the error. **/ - require.onError = function (err) { + moduleProto.callPlugin = function () { + var map = this.map, + pluginMap = context.makeModuleMap(map.prefix), + pluginId = pluginMap.id, + pluginMod = context.registry[pluginId]; - var msg = '\nIn module tree:\n', - standardIndent = ' ', - tree = err.moduleTree, - i, j, mod; + context.plugins[pluginId] = true; + context.needFullExec[pluginId] = true; - if (tree && tree.length > 0) { - for (i = tree.length - 1; i > -1 && (mod = tree[i]); i--) { - for (j = tree.length - i; j > -1; j--) { - msg += standardIndent; + //If the module is not waiting to finish being defined, + //undef it and start over, to get full execution. + if (!context.fullExec[pluginId] && (!pluginMod || pluginMod.defined)) { + context.undef(pluginMap.id); } - msg += mod + '\n'; - } - err = new Error(err.toString() + msg); + return oldCallPlugin.apply(this, arguments); + }; } - throw err; + return context; }; - //Stored cached file contents for reuse in other layers. - require._cachedFileContents = {}; + //Clear up the existing context so that the newContext modifications + //above will be active. + delete require.s.contexts._; /** Reset state for each build layer pass. */ require._buildReset = function () { @@ -8182,6 +15071,7 @@ function (file, pragma, parse) { modulesWithNames: {}, needsDefine: {}, existingRequireUrl: "", + ignoredUrls: {}, context: require.s.contexts._ }; @@ -8192,31 +15082,15 @@ function (file, pragma, parse) { require._buildReset(); - /** - * Makes sure the URL is something that can be supported by the - * optimization tool. - * @param {String} url - * @returns {Boolean} - */ - require._isSupportedBuildUrl = function (url) { - //Ignore URLs with protocols, hosts or question marks, means either network - //access is needed to fetch it or it is too dynamic. Note that - //on Windows, full paths are used for some urls, which include - //the drive, like c:/something, so need to test for something other - //than just a colon. - return url.indexOf("://") === -1 && url.indexOf("?") === -1 && - url.indexOf('empty:') !== 0 && url.indexOf('//') !== 0; - }; - //Override define() to catch modules that just define an object, so that //a dummy define call is not put in the build file for them. They do - //not end up getting defined via require.execCb, so we need to catch them + //not end up getting defined via context.execCb, so we need to catch them //at the define call. oldDef = define; //This function signature does not have to be exact, just match what we //are looking for. - define = function (name, obj) { + define = function (name) { if (typeof name === "string" && !layer.needsDefine[name]) { layer.modulesWithNames[name] = true; } @@ -8231,157 +15105,37 @@ function (file, pragma, parse) { return file.exists(path); }; - function normalizeUrlWithBase(context, moduleName, url) { - //Adjust the URL if it was not transformed to use baseUrl. - if (require.jsExtRegExp.test(moduleName)) { - url = (context.config.dir || context.config.dirBaseUrl) + url; - } - return url; - } - - //Override load so that the file paths can be collected. - require.load = function (context, moduleName, url) { - /*jslint evil: true */ - var contents, pluginBuilderMatch, builderName; - - context.scriptCount += 1; - - //Only handle urls that can be inlined, so that means avoiding some - //URLs like ones that require network access or may be too dynamic, - //like JSONP - if (require._isSupportedBuildUrl(url)) { - //Adjust the URL if it was not transformed to use baseUrl. - url = normalizeUrlWithBase(context, moduleName, url); - - //Save the module name to path and path to module name mappings. - layer.buildPathMap[moduleName] = url; - layer.buildFileToModule[url] = moduleName; - - if (moduleName in context.plugins) { - //plugins need to have their source evaled as-is. - context.needFullExec[moduleName] = true; - } - - try { - if (url in require._cachedFileContents && - (!context.needFullExec[moduleName] || context.fullExec[moduleName])) { - contents = require._cachedFileContents[url]; - } else { - //Load the file contents, process for conditionals, then - //evaluate it. - contents = file.readFile(url); - - //If there is a read filter, run it now. - if (context.config.onBuildRead) { - contents = context.config.onBuildRead(moduleName, url, contents); - } - - contents = pragma.process(url, contents, context.config, 'OnExecute'); - - //Find out if the file contains a require() definition. Need to know - //this so we can inject plugins right after it, but before they are needed, - //and to make sure this file is first, so that define calls work. - //This situation mainly occurs when the build is done on top of the output - //of another build, where the first build may include require somewhere in it. - try { - if (!layer.existingRequireUrl && parse.definesRequire(url, contents)) { - layer.existingRequireUrl = url; - } - } catch (e1) { - throw new Error('Parse error using UglifyJS ' + - 'for file: ' + url + '\n' + e1); - } - - if (moduleName in context.plugins) { - //This is a loader plugin, check to see if it has a build extension, - //otherwise the plugin will act as the plugin builder too. - pluginBuilderMatch = pluginBuilderRegExp.exec(contents); - if (pluginBuilderMatch) { - //Load the plugin builder for the plugin contents. - builderName = context.normalize(pluginBuilderMatch[3], moduleName); - contents = file.readFile(context.nameToUrl(builderName)); - } - } - - //Parse out the require and define calls. - //Do this even for plugins in case they have their own - //dependencies that may be separate to how the pluginBuilder works. - try { - if (!context.needFullExec[moduleName]) { - contents = parse(moduleName, url, contents, { - insertNeedsDefine: true, - has: context.config.has, - findNestedDependencies: context.config.findNestedDependencies - }); - } - } catch (e2) { - throw new Error('Parse error using UglifyJS ' + - 'for file: ' + url + '\n' + e2); - } - - require._cachedFileContents[url] = contents; - } - - if (contents) { - eval(contents); - } - - //Need to close out completion of this module - //so that listeners will get notified that it is available. - try { - context.completeLoad(moduleName); - } catch (e) { - //Track which module could not complete loading. - (e.moduleTree || (e.moduleTree = [])).push(moduleName); - throw e; - } - - } catch (eOuter) { - if (!eOuter.fileName) { - eOuter.fileName = url; - } - throw eOuter; - } - } else { - //With unsupported URLs still need to call completeLoad to - //finish loading. - context.completeLoad(moduleName); - } - - //Mark the module loaded. - context.loaded[moduleName] = true; - }; - - //Called when execManager runs for a dependency. Used to figure out //what order of execution. require.onResourceLoad = function (context, map) { - var fullName = map.fullName, + var id = map.id, url; - //Ignore "fake" modules, usually generated by plugin code, since - //they do not map back to a real file to include in the optimizer, - //or it will be included, but in a different form. - if (context.fake[fullName]) { - return; + //If build needed a full execution, indicate it + //has been done now. But only do it if the context is tracking + //that. Only valid for the context used in a build, not for + //other contexts being run, like for useLib, plain requirejs + //use in node/rhino. + if (context.needFullExec && context.needFullExec[id]) { + context.fullExec[id] = true; } //A plugin. if (map.prefix) { - if (!layer.pathAdded[fullName]) { - layer.buildFilePaths.push(fullName); + if (!layer.pathAdded[id]) { + layer.buildFilePaths.push(id); //For plugins the real path is not knowable, use the name //for both module to file and file to module mappings. - layer.buildPathMap[fullName] = fullName; - layer.buildFileToModule[fullName] = fullName; - layer.modulesWithNames[fullName] = true; - layer.pathAdded[fullName] = true; + layer.buildPathMap[id] = id; + layer.buildFileToModule[id] = id; + layer.modulesWithNames[id] = true; + layer.pathAdded[id] = true; } } else if (map.url && require._isSupportedBuildUrl(map.url)) { //If the url has not been added to the layer yet, and it //is from an actual file that was loaded, add it now. - url = normalizeUrlWithBase(context, map.fullName, map.url); - if (!layer.pathAdded[url] && layer.buildPathMap[fullName]) { + url = normalizeUrlWithBase(context, id, map.url); + if (!layer.pathAdded[url] && layer.buildPathMap[id]) { //Remember the list of dependencies for this layer. layer.buildFilePaths.push(url); layer.pathAdded[url] = true; @@ -8396,18 +15150,6 @@ function (file, pragma, parse) { require.needsDefine = function (moduleName) { layer.needsDefine[moduleName] = true; }; - - //Marks module has having a name, and optionally executes the - //callback, but only if it meets certain criteria. - require.execCb = function (name, cb, args, exports) { - if (!layer.needsDefine[name]) { - layer.modulesWithNames[name] = true; - } - if (cb.__requireJsBuild || layer.context.needFullExec[name]) { - return cb.apply(exports, args); - } - return undefined; - }; }; }); /** @@ -8568,14 +15310,14 @@ define('commonJs', ['env!env/file', 'uglifyjs/index'], function (file, uglify) { * see: http://github.com/jrburke/requirejs for details */ -/*jslint plusplus: true, nomen: true */ +/*jslint plusplus: true, nomen: true, regexp: true */ /*global define, require */ define('build', [ 'lang', 'logger', 'env!env/file', 'parse', 'optimize', 'pragma', - 'env!env/load', 'requirePatch'], + 'transform', 'env!env/load', 'requirePatch', 'env!env/quit'], function (lang, logger, file, parse, optimize, pragma, - load, requirePatch) { + transform, load, requirePatch, quit) { 'use strict'; var build, buildBaseConfig, @@ -8610,33 +15352,16 @@ function (lang, logger, file, parse, optimize, pragma, } } - /** - * If the path looks like an URL, throw an error. This is to prevent - * people from using URLs with protocols in the build config, since - * the optimizer is not set up to do network access. However, be - * sure to allow absolute paths on Windows, like C:\directory. - */ - function disallowUrls(path) { - if ((path.indexOf('://') !== -1 || path.indexOf('//') === 0) && path !== 'empty:') { - throw new Error('Path is not supported: ' + path + - '\nOptimizer can only handle' + - ' local paths. Download the locally if necessary' + - ' and update the config to use a local path.\n' + - 'http://requirejs.org/docs/errors.html#pathnotsupported'); - } - } - function endsWithSlash(dirName) { if (dirName.charAt(dirName.length - 1) !== "/") { dirName += "/"; } - disallowUrls(dirName); return dirName; } //Method used by plugin writeFile calls, defined up here to avoid //jslint warning about "making a function in a loop". - function makeWriteFile(anonDefRegExp, namespaceWithDot, layer) { + function makeWriteFile(namespace, layer) { function writeFile(name, contents) { logger.trace('Saving plugin-optimized file: ' + name); file.saveUtf8File(name, contents); @@ -8644,7 +15369,7 @@ function (lang, logger, file, parse, optimize, pragma, writeFile.asModule = function (moduleName, fileName, contents) { writeFile(fileName, - build.toTransport(anonDefRegExp, namespaceWithDot, moduleName, fileName, contents, layer)); + build.toTransport(namespace, moduleName, fileName, contents, layer)); }; return writeFile; @@ -8667,31 +15392,83 @@ function (lang, logger, file, parse, optimize, pragma, * there is a problem completing the build. */ build = function (args) { - var buildFile, cmdConfig; + var stackRegExp = /( {4}at[^\n]+)\n/, + standardIndent = ' ', + buildFile, cmdConfig, errorMsg, errorStack, stackMatch, errorTree, + i, j, errorMod; + + try { + if (!args || lang.isArray(args)) { + if (!args || args.length < 1) { + logger.error("build.js buildProfile.js\n" + + "where buildProfile.js is the name of the build file (see example.build.js for hints on how to make a build file)."); + return undefined; + } + + //Next args can include a build file path as well as other build args. + //build file path comes first. If it does not contain an = then it is + //a build file path. Otherwise, just all build args. + if (args[0].indexOf("=") === -1) { + buildFile = args[0]; + args.splice(0, 1); + } - if (!args || lang.isArray(args)) { - if (!args || args.length < 1) { - logger.error("build.js buildProfile.js\n" + - "where buildProfile.js is the name of the build file (see example.build.js for hints on how to make a build file)."); - return undefined; + //Remaining args are options to the build + cmdConfig = build.convertArrayToObject(args); + cmdConfig.buildFile = buildFile; + } else { + cmdConfig = args; } - //Next args can include a build file path as well as other build args. - //build file path comes first. If it does not contain an = then it is - //a build file path. Otherwise, just all build args. - if (args[0].indexOf("=") === -1) { - buildFile = args[0]; - args.splice(0, 1); + return build._run(cmdConfig); + } catch (e) { + errorMsg = e.toString(); + errorTree = e.moduleTree; + stackMatch = stackRegExp.exec(errorMsg); + + if (stackMatch) { + errorMsg += errorMsg.substring(0, stackMatch.index + stackMatch[0].length + 1); } - //Remaining args are options to the build - cmdConfig = build.convertArrayToObject(args); - cmdConfig.buildFile = buildFile; - } else { - cmdConfig = args; - } + //If a module tree that shows what module triggered the error, + //print it out. + if (errorTree && errorTree.length > 0) { + errorMsg += '\nIn module tree:\n'; + + for (i = errorTree.length - 1; i > -1; i--) { + errorMod = errorTree[i]; + if (errorMod) { + for (j = errorTree.length - i; j > -1; j--) { + errorMsg += standardIndent; + } + errorMsg += errorMod + '\n'; + } + } + + logger.error(errorMsg); + } + + errorStack = e.stack; + + if (typeof args === 'string' && args.indexOf('stacktrace=true') !== -1) { + errorMsg += '\n' + errorStack; + } else { + if (!stackMatch && errorStack) { + //Just trim out the first "at" in the stack. + stackMatch = stackRegExp.exec(errorStack); + if (stackMatch) { + errorMsg += '\n' + stackMatch[0] || ''; + } + } + } - return build._run(cmdConfig); + if (logger.level > logger.ERROR) { + throw new Error(errorMsg); + } else { + logger.error(errorMsg); + quit(1); + } + } }; build._run = function (cmdConfig) { @@ -8702,7 +15479,7 @@ function (lang, logger, file, parse, optimize, pragma, baseConfig, config, modules, builtModule, srcPath, buildContext, destPath, moduleName, moduleMap, parentModuleMap, context, - resources, resource, pluginProcessed = {}, plugin; + resources, resource, pluginProcessed = {}, plugin, fileContents; //Can now run the patches to require.js to allow it to be used for //build generation. Do it here instead of at the top of the module @@ -8731,36 +15508,41 @@ function (lang, logger, file, parse, optimize, pragma, //the paths to use the dirBaseUrl for (prop in paths) { if (paths.hasOwnProperty(prop)) { - buildPaths[prop] = paths[prop].replace(config.baseUrl, config.dirBaseUrl); + buildPaths[prop] = paths[prop].replace(config.appDir, config.dir); } } } else { //If no appDir, then make sure to copy the other paths to this directory. for (prop in paths) { if (paths.hasOwnProperty(prop)) { - //Set up build path for each path prefix. - buildPaths[prop] = paths[prop] === 'empty:' ? 'empty:' : prop.replace(/\./g, "/"); + //Set up build path for each path prefix, but only do so + //if the path falls out of the current baseUrl + if (paths[prop].indexOf(config.baseUrl) === 0) { + buildPaths[prop] = paths[prop].replace(config.baseUrl, config.dirBaseUrl); + } else { + buildPaths[prop] = paths[prop] === 'empty:' ? 'empty:' : prop.replace(/\./g, "/"); - //Make sure source path is fully formed with baseUrl, - //if it is a relative URL. - srcPath = paths[prop]; - if (srcPath.indexOf('/') !== 0 && srcPath.indexOf(':') === -1) { - srcPath = config.baseUrl + srcPath; - } + //Make sure source path is fully formed with baseUrl, + //if it is a relative URL. + srcPath = paths[prop]; + if (srcPath.indexOf('/') !== 0 && srcPath.indexOf(':') === -1) { + srcPath = config.baseUrl + srcPath; + } - destPath = config.dirBaseUrl + buildPaths[prop]; + destPath = config.dirBaseUrl + buildPaths[prop]; - //Skip empty: paths - if (srcPath !== 'empty:') { - //If the srcPath is a directory, copy the whole directory. - if (file.exists(srcPath) && file.isDirectory(srcPath)) { - //Copy files to build area. Copy all files (the /\w/ regexp) - file.copyDir(srcPath, destPath, /\w/, true); - } else { - //Try a .js extension - srcPath += '.js'; - destPath += '.js'; - file.copyFile(srcPath, destPath); + //Skip empty: paths + if (srcPath !== 'empty:') { + //If the srcPath is a directory, copy the whole directory. + if (file.exists(srcPath) && file.isDirectory(srcPath)) { + //Copy files to build area. Copy all files (the /\w/ regexp) + file.copyDir(srcPath, destPath, /\w/, true); + } else { + //Try a .js extension + srcPath += '.js'; + destPath += '.js'; + file.copyFile(srcPath, destPath); + } } } } @@ -8802,7 +15584,8 @@ function (lang, logger, file, parse, optimize, pragma, //Just set up the _buildPath for the module layer. require(config); if (!config.cssIn) { - config.modules[0]._buildPath = config.out; + config.modules[0]._buildPath = typeof config.out === 'function' ? + 'FUNCTION' : config.out; } } else if (!config.cssIn) { //Now set up the config for require to use the build area, and calculate the @@ -8831,7 +15614,7 @@ function (lang, logger, file, parse, optimize, pragma, //things like text loader plugins loading CSS to get the optimized //CSS. if (config.optimizeCss && config.optimizeCss !== "none" && config.dir) { - optimize.css(config.dir, config); + buildFileContents += optimize.css(config.dir, config); } if (modules) { @@ -8887,17 +15670,36 @@ function (lang, logger, file, parse, optimize, pragma, //Save it to a temp file for now, in case there are other layers that //contain optimized content that should not be included in later //layer optimizations. See issue #56. - file.saveUtf8File(module._buildPath + '-temp', builtModule.text); + if (module._buildPath === 'FUNCTION') { + module._buildText = builtModule.text; + } else { + file.saveUtf8File(module._buildPath + '-temp', builtModule.text); + } buildFileContents += builtModule.buildText; }); //Now move the build layers to their final position. modules.forEach(function (module) { var finalPath = module._buildPath; - if (file.exists(finalPath)) { - file.deleteFile(finalPath); + if (finalPath !== 'FUNCTION') { + if (file.exists(finalPath)) { + file.deleteFile(finalPath); + } + file.renameFile(finalPath + '-temp', finalPath); + + //And finally, if removeCombined is specified, remove + //any of the files that were used in this layer. + //Be sure not to remove other build layers. + if (config.removeCombined) { + module.layer.buildFilePaths.forEach(function (path) { + if (file.exists(path) && !modules.some(function (mod) { + return mod._buildPath === path; + })) { + file.deleteFile(path); + } + }); + } } - file.renameFile(finalPath + '-temp', finalPath); }); } @@ -8905,18 +15707,36 @@ function (lang, logger, file, parse, optimize, pragma, if (config.out && !config.cssIn) { //Just need to worry about one JS file. fileName = config.modules[0]._buildPath; - optimize.jsFile(fileName, fileName, config); + if (fileName === 'FUNCTION') { + config.modules[0]._buildText = optimize.js(fileName, + config.modules[0]._buildText, + config); + } else { + optimize.jsFile(fileName, null, fileName, config); + } } else if (!config.cssIn) { //Normal optimizations across modules. //JS optimizations. fileNames = file.getFilteredFileList(config.dir, /\.js$/, true); - for (i = 0; (fileName = fileNames[i]); i++) { + for (i = 0; i < fileNames.length; i++) { + fileName = fileNames[i]; + //Generate the module name from the config.dir root. moduleName = fileName.replace(config.dir, ''); //Get rid of the extension moduleName = moduleName.substring(0, moduleName.length - 3); - optimize.jsFile(fileName, fileName, config, moduleName, pluginCollector); + + //Convert the file to transport format, but without a name + //inserted (by passing null for moduleName) since the files are + //standalone, one module per file. + fileContents = file.readFile(fileName); + fileContents = build.toTransport(config.namespace, + null, + fileName, + fileContents); + + optimize.jsFile(fileName, fileContents, fileName, config, pluginCollector); } //Normalize all the plugin resources. @@ -8926,7 +15746,8 @@ function (lang, logger, file, parse, optimize, pragma, if (pluginCollector.hasOwnProperty(moduleName)) { parentModuleMap = context.makeModuleMap(moduleName); resources = pluginCollector[moduleName]; - for (i = 0; (resource = resources[i]); i++) { + for (i = 0; i < resources.length; i++) { + resource = resources[i]; moduleMap = context.makeModuleMap(resource, parentModuleMap); if (!context.plugins[moduleMap.prefix]) { //Set the value in context.plugins so it @@ -8961,8 +15782,7 @@ function (lang, logger, file, parse, optimize, pragma, moduleMap.name, require, makeWriteFile( - config.anonDefRegExp, - config.namespaceWithDot + config.namespace ), context.config ); @@ -8984,7 +15804,11 @@ function (lang, logger, file, parse, optimize, pragma, //If just have one CSS file to optimize, do that here. if (config.cssIn) { - optimize.cssFile(config.cssIn, config.out, config); + buildFileContents += optimize.cssFile(config.cssIn, config.out, config); + } + + if (typeof config.out === 'function') { + config.out(config.modules[0]._buildText); } //Print out what was built into which layers. @@ -9002,12 +15826,21 @@ function (lang, logger, file, parse, optimize, pragma, * name = paths.foo and value = ../some/path, so it assumes the * name=value splitting has already happened. */ - function stringDotToObj(result, prop, name, value) { - if (!result[prop]) { - result[prop] = {}; - } - name = name.substring((prop + '.').length, name.length); - result[prop][name] = value; + function stringDotToObj(result, name, value) { + var parts = name.split('.'), + prop = parts[0]; + + parts.forEach(function (prop, i) { + if (i === parts.length - 1) { + result[prop] = value; + } else { + if (!result[prop]) { + result[prop] = {}; + } + result = result[prop]; + } + + }); } //Used by convertArrayToObject to convert some things from prop.name=value @@ -9043,7 +15876,8 @@ function (lang, logger, file, parse, optimize, pragma, needArray = { "include": true, "exclude": true, - "excludeShallow": true + "excludeShallow": true, + "insertRequire": true }; for (i = 0; i < ary.length; i++) { @@ -9067,7 +15901,7 @@ function (lang, logger, file, parse, optimize, pragma, } if (build.hasDotPropMatch(prop)) { - stringDotToObj(result, prop.split('.')[0], prop, value); + stringDotToObj(result, prop, value); } else { result[prop] = value; } @@ -9090,8 +15924,9 @@ function (lang, logger, file, parse, optimize, pragma, build.makeAbsObject = function (props, obj, absFilePath) { var i, prop; if (obj) { - for (i = 0; (prop = props[i]); i++) { - if (obj.hasOwnProperty(prop)) { + for (i = 0; i < props.length; i++) { + prop = props[i]; + if (obj.hasOwnProperty(prop) && typeof obj[prop] === 'string') { obj[prop] = build.makeAbsPath(obj[prop], absFilePath); } } @@ -9106,7 +15941,9 @@ function (lang, logger, file, parse, optimize, pragma, var props, prop, i; props = ["appDir", "dir", "baseUrl"]; - for (i = 0; (prop = props[i]); i++) { + for (i = 0; i < props.length; i++) { + prop = props[i]; + if (config[prop]) { //Add abspath if necessary, make sure these paths end in //slashes @@ -9189,7 +16026,7 @@ function (lang, logger, file, parse, optimize, pragma, build.createConfig = function (cfg) { /*jslint evil: true */ var config = {}, buildFileContents, buildFileConfig, mainConfig, - mainConfigFile, prop, buildFile, absFilePath; + mainConfigFile, mainConfigPath, prop, buildFile, absFilePath; //Make sure all paths are relative to current directory. absFilePath = file.absPath('.'); @@ -9221,6 +16058,12 @@ function (lang, logger, file, parse, optimize, pragma, buildFileConfig.dir = (buildFileConfig.baseUrl || config.baseUrl) + "/build/"; } + //Mix in the config now so that items in mainConfigFile can + //be resolved relative to them if necessary, like if appDir + //is set here, but the baseUrl is in mainConfigFile. Will + //re-mix in the same build config later after mainConfigFile + //is processed, since build config should take priority. + mixConfig(config, buildFileConfig); } catch (e) { throw new Error("Build file " + buildFile + " is malformed: " + e); } @@ -9229,6 +16072,9 @@ function (lang, logger, file, parse, optimize, pragma, mainConfigFile = config.mainConfigFile || (buildFileConfig && buildFileConfig.mainConfigFile); if (mainConfigFile) { mainConfigFile = build.makeAbsPath(mainConfigFile, absFilePath); + if (!file.exists(mainConfigFile)) { + throw new Error(mainConfigFile + ' does not exist.'); + } try { mainConfig = parse.findConfig(mainConfigFile, file.readFile(mainConfigFile)); } catch (configError) { @@ -9241,11 +16087,21 @@ function (lang, logger, file, parse, optimize, pragma, ' into a build file or command line arguments given to the optimizer.'); } if (mainConfig) { + mainConfigPath = mainConfigFile.substring(0, mainConfigFile.lastIndexOf('/')); + + //Add in some existing config, like appDir, since they can be + //used inside the mainConfigFile -- paths and baseUrl are + //relative to them. + if (config.appDir && !mainConfig.appDir) { + mainConfig.appDir = config.appDir; + } + //If no baseUrl, then use the directory holding the main config. if (!mainConfig.baseUrl) { - mainConfig.baseUrl = mainConfigFile.substring(0, mainConfigFile.lastIndexOf('/')); + mainConfig.baseUrl = mainConfigPath; } - build.makeAbsConfig(mainConfig, mainConfigFile); + + build.makeAbsConfig(mainConfig, mainConfigPath); mixConfig(config, mainConfig); } } @@ -9259,7 +16115,6 @@ function (lang, logger, file, parse, optimize, pragma, //args should take precedence over build file values. mixConfig(config, cfg); - //Set final output dir if (config.hasOwnProperty("baseUrl")) { if (config.appDir) { @@ -9277,7 +16132,8 @@ function (lang, logger, file, parse, optimize, pragma, throw new Error("ERROR: 'out' option missing."); } if (!config.cssIn && !config.baseUrl) { - throw new Error("ERROR: 'baseUrl' option missing."); + //Just use the current directory as the baseUrl + config.baseUrl = './'; } if (!config.out && !config.dir) { throw new Error('Missing either an "out" or "dir" config value. ' + @@ -9297,6 +16153,11 @@ function (lang, logger, file, parse, optimize, pragma, ' or baseUrl directories optimized.'); } + if (config.insertRequire && !lang.isArray(config.insertRequire)) { + throw new Error('insertRequire should be a list of module IDs' + + ' to insert in to a require([]) call.'); + } + if ((config.name || config.include) && !config.modules) { //Just need to build one file, but may be part of a whole appDir/ //baseUrl copy, but specified on the command line, so cannot do @@ -9308,9 +16169,20 @@ function (lang, logger, file, parse, optimize, pragma, out: config.out, include: config.include, exclude: config.exclude, - excludeShallow: config.excludeShallow + excludeShallow: config.excludeShallow, + insertRequire: config.insertRequire } ]; + } else if (config.modules && config.out) { + throw new Error('If the "modules" option is used, then there ' + + 'should be a "dir" option set and "out" should ' + + 'not be used since "out" is only for single file ' + + 'optimization output.'); + } else if (config.modules && config.name) { + throw new Error('"name" and "modules" options are incompatible. ' + + 'Either use "name" if doing a single file ' + + 'optimization, or "modules" if you want to target ' + + 'more than one file for optimization.'); } if (config.out && !config.cssIn) { @@ -9325,13 +16197,13 @@ function (lang, logger, file, parse, optimize, pragma, } } - //Do not allow URLs for paths resources. - if (config.paths) { - for (prop in config.paths) { - if (config.paths.hasOwnProperty(prop)) { - disallowUrls(config.paths[prop]); - } - } + //Create a hash lookup for the stubModules config to make lookup + //cheaper later. + if (config.stubModules) { + config.stubModules._byName = {}; + config.stubModules.forEach(function (id) { + config.stubModules._byName[id] = true; + }); } //Get any wrap text. @@ -9355,12 +16227,6 @@ function (lang, logger, file, parse, optimize, pragma, 'startFile/endFile: ' + wrapError.toString()); } - - //Set up proper info for namespaces and using namespaces in transport - //wrappings. - config.namespaceWithDot = config.namespace ? config.namespace + '.' : ''; - config.anonDefRegExp = build.makeAnonDefRegExp(config.namespaceWithDot); - //Do final input verification if (config.context) { throw new Error('The build argument "context" is not supported' + @@ -9369,19 +16235,22 @@ function (lang, logger, file, parse, optimize, pragma, } //Set file.fileExclusionRegExp if desired - if ('fileExclusionRegExp' in config) { + if (config.hasOwnProperty('fileExclusionRegExp')) { if (typeof config.fileExclusionRegExp === "string") { file.exclusionRegExp = new RegExp(config.fileExclusionRegExp); } else { file.exclusionRegExp = config.fileExclusionRegExp; } - } else if ('dirExclusionRegExp' in config) { + } else if (config.hasOwnProperty('dirExclusionRegExp')) { //Set file.dirExclusionRegExp if desired, this is the old //name for fileExclusionRegExp before 1.0.2. Support for backwards //compatibility file.exclusionRegExp = config.dirExclusionRegExp; } + //Remove things that may cause problems in the build. + delete config.jQuery; + return config; }; @@ -9394,7 +16263,8 @@ function (lang, logger, file, parse, optimize, pragma, */ build.findBuildModule = function (moduleName, modules) { var i, module; - for (i = 0; (module = modules[i]); i++) { + for (i = 0; i < modules.length; i++) { + module = modules[i]; if (module.name === moduleName) { return module; } @@ -9414,10 +16284,6 @@ function (lang, logger, file, parse, optimize, pragma, if (index !== -1) { layer.buildFilePaths.splice(index, 1); } - - //Take it out of the specified modules. Specified modules are mostly - //used to find require modifiers. - delete layer.specified[module]; }; /** @@ -9431,7 +16297,12 @@ function (lang, logger, file, parse, optimize, pragma, * be in the flattened module. */ build.traceDependencies = function (module, config) { - var include, override, layer, context, baseConfig, oldContext; + var include, override, layer, context, baseConfig, oldContext, + registry, id, idParts, pluginId, + errMessage = '', + failedPluginMap = {}, + failedPluginIds = [], + errIds = []; //Reset some state set up in requirePatch.js, and clean up require's //current context. @@ -9447,7 +16318,7 @@ function (lang, logger, file, parse, optimize, pragma, //WARNING: probably not robust for paths and packages/packagePaths, //since those property's objects can be modified. But for basic //config clone it works out. - require(lang.delegate(baseConfig)); + require(lang.mixin({}, baseConfig, true)); logger.trace("\nTracing dependencies for: " + (module.name || module.out)); include = module.name && !module.create ? [module.name] : []; @@ -9457,7 +16328,7 @@ function (lang, logger, file, parse, optimize, pragma, //If there are overrides to basic config, set that up now.; if (module.override) { - override = lang.delegate(baseConfig); + override = lang.mixin({}, baseConfig, true); lang.mixin(override, module.override, true); require(override); } @@ -9465,14 +16336,42 @@ function (lang, logger, file, parse, optimize, pragma, //Figure out module layer dependencies by calling require to do the work. require(include); - //Pull out the layer dependencies. - layer.specified = context.specified; - //Reset config if (module.override) { require(baseConfig); } + //Check to see if it all loaded. If not, then stop, and give + //a message on what is left. + registry = context.registry; + for (id in registry) { + if (registry.hasOwnProperty(id) && id.indexOf('_@r') !== 0) { + if (id.indexOf('_unnormalized') === -1) { + errIds.push(id); + } + + //Look for plugins that did not call load() + idParts = id.split('!'); + pluginId = idParts[0]; + if (idParts.length > 1 && !failedPluginMap.hasOwnProperty(pluginId)) { + failedPluginIds.push(pluginId); + failedPluginMap[pluginId] = true; + } + } + } + + if (errIds.length || failedPluginIds.length) { + if (failedPluginIds.length) { + errMessage += 'Loader plugin' + + (failedPluginIds.length === 1 ? '' : 's') + + ' did not call ' + + 'the load callback in the build: ' + + failedPluginIds.join(', ') + '\n'; + } + errMessage += 'Module loading did not complete for: ' + errIds.join(', '); + throw new Error(errMessage); + } + return layer; }; @@ -9492,16 +16391,17 @@ function (lang, logger, file, parse, optimize, pragma, */ build.flattenModule = function (module, layer, config) { var buildFileContents = "", - namespace = config.namespace ? config.namespace + '.' : '', + namespace = config.namespace || '', + namespaceWithDot = namespace ? namespace + '.' : '', + stubModulesByName = (config.stubModules && config.stubModules._byName) || {}, context = layer.context, - anonDefRegExp = config.anonDefRegExp, path, reqIndex, fileContents, currContents, - i, moduleName, + i, moduleName, shim, packageConfig, parts, builder, writeApi; //Use override settings, particularly for pragmas if (module.override) { - config = lang.delegate(config); + config = lang.mixin({}, config, true); lang.mixin(config, module.override, true); } @@ -9521,9 +16421,18 @@ function (lang, logger, file, parse, optimize, pragma, //Write the built module to disk, and build up the build output. fileContents = ""; - for (i = 0; (path = layer.buildFilePaths[i]); i++) { + for (i = 0; i < layer.buildFilePaths.length; i++) { + path = layer.buildFilePaths[i]; moduleName = layer.buildFileToModule[path]; + //If the moduleName is for a package main, then update it to the + //real main value. + packageConfig = layer.context.config.pkgs && + layer.context.config.pkgs[moduleName]; + if (packageConfig) { + moduleName += '/' + packageConfig.main; + } + //Figure out if the module is a result of a build plugin, and if so, //then delegate to that plugin. parts = context.makeModuleMap(moduleName); @@ -9539,7 +16448,7 @@ function (lang, logger, file, parse, optimize, pragma, writeApi.asModule = function (moduleName, input) { fileContents += "\n" + addSemiColon( - build.toTransport(anonDefRegExp, namespace, moduleName, path, input, layer)); + build.toTransport(namespace, moduleName, path, input, layer)); if (config.onBuildWrite) { fileContents = config.onBuildWrite(moduleName, path, fileContents); } @@ -9547,17 +16456,37 @@ function (lang, logger, file, parse, optimize, pragma, builder.write(parts.prefix, parts.name, writeApi); } } else { - currContents = file.readFile(path); + if (stubModulesByName.hasOwnProperty(moduleName)) { + //Just want to insert a simple module definition instead + //of the source module. Useful for plugins that inline + //all their resources. + if (layer.context.plugins.hasOwnProperty(moduleName)) { + //Slightly different content for plugins, to indicate + //that dynamic loading will not work. + currContents = 'define({load: function(id){throw new Error("Dynamic load not allowed: " + id);}});'; + } else { + currContents = 'define({});'; + } + } else { + currContents = file.readFile(path); + } if (config.onBuildRead) { currContents = config.onBuildRead(moduleName, path, currContents); } - if (config.namespace) { - currContents = pragma.namespace(currContents, config.namespace); + if (namespace) { + currContents = pragma.namespace(currContents, namespace); } - currContents = build.toTransport(anonDefRegExp, namespace, moduleName, path, currContents, layer); + currContents = build.toTransport(namespace, moduleName, path, currContents, layer); + + if (packageConfig) { + currContents = addSemiColon(currContents) + '\n'; + currContents += namespaceWithDot + "define('" + + packageConfig.name + "', ['" + moduleName + + "'], function (main) { return main; });\n"; + } if (config.onBuildWrite) { currContents = config.onBuildWrite(moduleName, path, currContents); @@ -9574,22 +16503,26 @@ function (lang, logger, file, parse, optimize, pragma, //after the module is processed. //If we have a name, but no defined module, then add in the placeholder. if (moduleName && !layer.modulesWithNames[moduleName] && !config.skipModuleInsertion) { - //If including jquery, register the module correctly, otherwise - //register an empty function. For jquery, make sure jQuery is - //a real object, and perhaps not some other file mapping, like - //to zepto. - if (moduleName === 'jquery') { - fileContents += '\n(function () {\n' + - 'var jq = typeof jQuery !== "undefined" && jQuery;\n' + - namespace + - 'define("jquery", [], function () { return jq; });\n' + - '}());\n'; + shim = config.shim && config.shim[moduleName]; + if (shim) { + fileContents += '\n' + namespaceWithDot + 'define("' + moduleName + '", ' + + (shim.deps && shim.deps.length ? + build.makeJsArrayString(shim.deps) + ', ' : '') + + (shim.exports ? shim.exports() : 'function(){}') + + ');\n'; } else { - fileContents += '\n' + namespace + 'define("' + moduleName + '", function(){});\n'; + fileContents += '\n' + namespaceWithDot + 'define("' + moduleName + '", function(){});\n'; } } } + //Add a require at the end to kick start module execution, if that + //was desired. Usually this is only specified when using small shim + //loaders like almond. + if (module.insertRequire) { + fileContents += '\n' + namespaceWithDot + 'require(["' + module.insertRequire.join('", "') + '"]);\n'; + } + return { text: config.wrap ? config.wrap.start + fileContents + config.wrap.end : @@ -9598,64 +16531,25 @@ function (lang, logger, file, parse, optimize, pragma, }; }; - /** - * Creates the regexp to find anonymous defines. - * @param {String} namespace an optional namespace to use. The namespace - * should *include* a trailing dot. So a valid value would be 'foo.' - * @returns {RegExp} - */ - build.makeAnonDefRegExp = function (namespace) { - //This regexp is not bullet-proof, and it has one optional part to - //avoid issues with some Dojo transition modules that use a - //define(\n//begin v1.x content - //for a comment. - return new RegExp('(^|[^\\.])(' + (namespace || '').replace(/\./g, '\\.') + - 'define|define)\\s*\\(\\s*(\\/\\/[^\\n\\r]*[\\r\\n])?(\\[|function|[\\w\\d_\\-\\$]+\\s*\\)|\\{|["\']([^"\']+)["\'])(\\s*,\\s*f)?'); + //Converts an JS array of strings to a string representation. + //Not using JSON.stringify() for Rhino's sake. + build.makeJsArrayString = function (ary) { + return '["' + ary.map(function (item) { + //Escape any double quotes, backslashes + return lang.jsEscape(item); + }).join('","') + '"]'; }; - build.leadingCommaRegExp = /^\s*,/; - - build.toTransport = function (anonDefRegExp, namespace, moduleName, path, contents, layer) { - - //If anonymous module, insert the module name. - return contents.replace(anonDefRegExp, function (match, start, callName, possibleComment, suffix, namedModule, namedFuncStart) { - //A named module with either listed dependencies or an object - //literal for a value. Skip it. If named module, only want ones - //whose next argument is a function literal to scan for - //require('') dependecies. - if (namedModule && !namedFuncStart) { - return match; - } - + build.toTransport = function (namespace, moduleName, path, contents, layer) { + function onFound(info) { //Only mark this module as having a name if not a named module, //or if a named module and the name matches expectations. - if (layer && (!namedModule || namedModule === moduleName)) { + if (layer && (info.needsId || info.foundId === moduleName)) { layer.modulesWithNames[moduleName] = true; } + } - var deps = null; - - //Look for CommonJS require calls inside the function if this is - //an anonymous define call that just has a function registered. - //Also look if a named define function but has a factory function - //as the second arg that should be scanned for dependencies. - if (suffix.indexOf('f') !== -1 || (namedModule)) { - deps = parse.getAnonDeps(path, contents); - - if (deps.length) { - deps = deps.map(function (dep) { - return "'" + dep + "'"; - }); - } else { - deps = []; - } - } - - return start + namespace + "define('" + (namedModule || moduleName) + "'," + - (deps ? ('[' + deps.toString() + '],') : '') + - (namedModule ? namedFuncStart.replace(build.leadingCommaRegExp, '') : suffix); - }); - + return transform.toTransport(namespace, moduleName, path, contents, onFound); }; return build; @@ -9710,12 +16604,6 @@ function (lang, logger, file, parse, optimize, pragma, } }; - //Enable execution of this callback in a build setting. - //Normally, once requirePatch is run, by default it will - //not execute callbacks, unless this property is set on - //the callback. - runBuild.__requireJsBuild = true; - requirejs({ context: 'build' }, ['build', 'logger'], runBuild); diff --git a/build/wrap-end.frag b/build/wrap-end.frag index 7d397b4..db86807 100644 --- a/build/wrap-end.frag +++ b/build/wrap-end.frag @@ -1,3 +1,9 @@ - return BackStack; + return { + StackNavigator : require('StackNavigator'), + Effect : require('effects/Effect'), + NoEffect : require('effects/NoEffect'), + SlideEffect : require('effects/SlideEffect'), + FadeEffect : require('effects/FadeEffect') + }; })); \ No newline at end of file diff --git a/build/wrap-start.frag b/build/wrap-start.frag index 8bed76d..fbf6019 100644 --- a/build/wrap-start.frag +++ b/build/wrap-start.frag @@ -16,23 +16,15 @@ // ////////////////////////////////////////////////////////////////////////////////////// -// BackStack version 1.1.0 +// BackStack version 1.1.1 (function (root, factory) { // Set up BackStack appropriately for the environment. - if (typeof exports !== 'undefined') { - // Node/CommonJS, no need for jQuery in that case. - factory(root, exports, require('underscore'), require('jquery'), require('Backbone')); - } else if (typeof define === 'function' && define.amd) { + if (typeof define === 'function' && define.amd) { // AMD - define(['underscore', 'jquery', 'Backbone', 'exports'], - function (_, $, Backbone, exports) { - // Export global even in AMD case in case this script is loaded with - // others that may still expect a global Backbone. - root.BackStack = factory(root, exports, _, $, Backbone); - }); + define(['jquery', 'underscore', 'Backbone'], factory); } else { // Browser globals - root.BackStack = factory(root, {}, root._, (root.jQuery || root.Zepto || root.ender), root.Backbone); + root.BackStack = factory((root.jQuery || root.Zepto || root.ender), root._, root.Backbone); } -}(this, function (root, BackStack, _, $, Backbone) { +}(this, function ($, _, Backbone) {