Relates to requirejs#333, initial implementation of default prefix.

jrburke · jrburke · commit b5f357d59fa2 · 2012-09-09T21:17:28.000-07:00
diff --git a/require.js b/require.js
@@ -437,9 +437,16 @@ var requirejs, require, define;
                 name = '_@r' + (requireCounter += 1);
             }
 
-            if (index !== -1) {
+            //Do not count IDs that are '!a', that just means
+            //'a'
+            if (index > -1) {
                 prefix = name.substring(0, index);
                 name = name.substring(index + 1, name.length);
+            } else if (parentModuleMap &&
+                       parentModuleMap.defaultPrefix) {
+                //This is dependency mentioned by a plugin that
+                //has a default prefix.
+                prefix = parentModuleMap.defaultPrefix;
             }
 
             if (prefix) {
@@ -1002,6 +1009,10 @@ var requirejs, require, define;
                         var hasInteractive = useInteractive,
                             moduleMap = makeModuleMap(moduleName);
 
+                        if (plugin.useDefaultPrefix) {
+                            moduleMap.defaultPrefix = map.prefix;
+                        }
+
                         //Turn off interactive script matching for IE for any define
                         //calls in the text, then turn it back on at the end.
                         if (hasInteractive) {
@@ -1012,7 +1023,12 @@ var requirejs, require, define;
                         //it.
                         getModule(moduleMap);
 
-                        req.exec(text);
+                        try {
+                            req.exec(text);
+                        } catch (e) {
+                            throw new Error('fromText eval for ' + moduleName +
+                                            ' failed: ' + e);
+                        }
 
                         if (hasInteractive) {
                             useInteractive = true;
diff --git a/tests/all.js b/tests/all.js
@@ -109,6 +109,7 @@ doh.registerUrl("pluginLast", "../plugins/pluginLast/pluginLast.html");
 doh.registerUrl("pluginShim", "../plugins/pluginShim/pluginShim.html");
 doh.registerUrl("pluginMap", "../plugins/pluginMap/pluginMap.html");
 doh.registerUrl("pluginMapDynamic", "../plugins/pluginMap/dynamic/pluginMapDynamic.html");
+doh.registerUrl("pluginDefaultPrefix", "../plugins/defaultPrefix/defaultPrefix.html");
 
 doh.registerUrl("requirePluginLoad", "../requirePluginLoad/requirePluginLoad.html");
 
diff --git a/tests/plugins/defaultPrefix/a.refine b/tests/plugins/defaultPrefix/a.refine
@@ -0,0 +1,11 @@
+//The refine plugin changes the word refine into define.
+refine(['refine!b', 'c', '!plain', 'text!a.txt'],
+function (b, c, plain, text) {
+    return {
+        name: 'a',
+        b: b,
+        c: c,
+        plain: plain,
+        text: text
+    };
+});
diff --git a/tests/plugins/defaultPrefix/a.txt b/tests/plugins/defaultPrefix/a.txt
@@ -0,0 +1 @@
+a.txt
diff --git a/tests/plugins/defaultPrefix/b.refine b/tests/plugins/defaultPrefix/b.refine
@@ -0,0 +1,7 @@
+refine(['!plain', 'text!b.txt'], function (plain, text) {
+    return {
+        name: 'b',
+        plain: plain,
+        text: text
+    }
+});
diff --git a/tests/plugins/defaultPrefix/b.txt b/tests/plugins/defaultPrefix/b.txt
@@ -0,0 +1 @@
+b.txt
diff --git a/tests/plugins/defaultPrefix/c.refine b/tests/plugins/defaultPrefix/c.refine
@@ -0,0 +1,6 @@
+refine(['b'], function (b) {
+    return {
+        name: 'c',
+        b: b
+    };
+});
diff --git a/tests/plugins/defaultPrefix/defaultPrefix-tests.js b/tests/plugins/defaultPrefix/defaultPrefix-tests.js
@@ -0,0 +1,30 @@
+require({
+        baseUrl: requirejs.isBrowser ? './' : './plugins/defaultPrefix',
+        paths: {
+            'text': '../../../../text/text'
+        },
+},      ['refine!a'],
+function (a) {
+
+    doh.register(
+        'pluginDefaultPrefix',
+        [
+            function pluginDefaultPrefix(t){
+                t.is('a', a.name);
+                t.is('b', a.b.name);
+                t.is('c', a.c.name);
+                t.is('plain', a.plain.name);
+                t.is(true, a.text.indexOf('a.txt') === 0);
+
+                t.is('plain', a.b.plain.name);
+                t.is(true, a.b.text.indexOf('b.txt') === 0);
+
+                t.is('b', a.c.b.name);
+                t.is('plain', a.c.b.plain.name);
+                t.is(true, a.c.b.text.indexOf('b.txt') === 0);
+
+             }
+        ]
+    );
+    doh.run();
+});
diff --git a/tests/plugins/defaultPrefix/defaultPrefix.html b/tests/plugins/defaultPrefix/defaultPrefix.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>require.js: Plugin Default Prefix Test</title>
+    <script type="text/javascript" src="../../doh/runner.js"></script>
+    <script type="text/javascript" src="../../doh/_browserRunner.js"></script>
+    <script type="text/javascript" data-main="defaultPrefix-tests.js"  src="../../../require.js"></script>
+</head>
+<body>
+    <h1>require.js: Plugin Default Prefix Test</h1>
+    <p>More info:
+    <a href="https://github.com/jrburke/requirejs/issues/333">333</a>.
+    <p>Check console for messages</p>
+</body>
+</html>
diff --git a/tests/plugins/defaultPrefix/plain.js b/tests/plugins/defaultPrefix/plain.js
@@ -0,0 +1,3 @@
+define({
+    name: 'plain'
+});
diff --git a/tests/plugins/defaultPrefix/refine.js b/tests/plugins/defaultPrefix/refine.js
@@ -0,0 +1,132 @@
+
+/*jslint strict: false, plusplus: false */
+/*global define: false, require: false,  XMLHttpRequest: false, ActiveXObject: false,
+  window: false, Packages: false, java: false, process: false */
+
+(function () {
+    //Load the text plugin, so that the XHR calls can be made.
+    var buildMap = {}, fetchText, fs,
+        progIds = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'];
+
+    function createXhr() {
+        //Would love to dump the ActiveX crap in here. Need IE 6 to die first.
+        var xhr, i, progId;
+        if (typeof XMLHttpRequest !== "undefined") {
+            return new XMLHttpRequest();
+        } else {
+            for (i = 0; i < 3; i++) {
+                progId = progIds[i];
+                try {
+                    xhr = new ActiveXObject(progId);
+                } catch (e) {}
+
+                if (xhr) {
+                    progIds = [progId];  // so faster next time
+                    break;
+                }
+            }
+        }
+
+        if (!xhr) {
+            throw new Error("require.getXhr(): XMLHttpRequest not available");
+        }
+
+        return xhr;
+    }
+
+    if (typeof window !== "undefined" && window.navigator && window.document) {
+        fetchText = function (url, callback) {
+            var xhr = createXhr();
+            xhr.open('GET', url, true);
+            xhr.onreadystatechange = function (evt) {
+                //Do not explicitly handle errors, those should be
+                //visible via console output in the browser.
+                if (xhr.readyState === 4) {
+                    callback(xhr.responseText);
+                }
+            };
+            xhr.send(null);
+        };
+    } else if (typeof process !== "undefined" &&
+             process.versions &&
+             !!process.versions.node) {
+        //Using special require.nodeRequire, something added by r.js.
+        fs = require.nodeRequire('fs');
+
+        fetchText = function (url, callback) {
+            callback(fs.readFileSync(url, 'utf8'));
+        };
+    } else if (typeof Packages !== 'undefined') {
+        //Why Java, why is this so awkward?
+        fetchText = function (url, callback) {
+            var encoding = "utf-8",
+                file = new java.io.File(url),
+                lineSeparator = java.lang.System.getProperty("line.separator"),
+                input = new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(file), encoding)),
+                stringBuffer, line,
+                content = '';
+            try {
+                stringBuffer = new java.lang.StringBuffer();
+                line = input.readLine();
+
+                // Byte Order Mark (BOM) - The Unicode Standard, version 3.0, page 324
+                // http://www.unicode.org/faq/utf_bom.html
+
+                // Note that when we use utf-8, the BOM should appear as "EF BB BF", but it doesn't due to this bug in the JDK:
+                // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4508058
+                if (line && line.length() && line.charAt(0) === 0xfeff) {
+                    // Eat the BOM, since we've already found the encoding on this file,
+                    // and we plan to concatenating this buffer with others; the BOM should
+                    // only appear at the top of a file.
+                    line = line.substring(1);
+                }
+
+                stringBuffer.append(line);
+
+                while ((line = input.readLine()) !== null) {
+                    stringBuffer.append(lineSeparator);
+                    stringBuffer.append(line);
+                }
+                //Make sure we return a JavaScript string and not a Java string.
+                content = String(stringBuffer.toString()); //String
+            } finally {
+                input.close();
+            }
+            callback(content);
+        };
+    }
+
+    define(function () {
+        return {
+            useDefaultPrefix: true,
+
+            load: function (name, parentRequire, load, config) {
+                var url = parentRequire.toUrl(name + '.refine');
+                fetchText(url, function (text) {
+                    text = text.replace(/refine\s*\(/g, 'define(');
+
+                    if (config.isBuild) {
+                        buildMap[name] = text;
+                    }
+
+                    //Add in helpful debug line
+                    text += "\r\n//@ sourceURL=" + url;
+
+                    load.fromText(name, text);
+
+                    parentRequire([name], function (value) {
+                        load(value);
+                    });
+                });
+            },
+
+            write: function (pluginName, name, write) {
+                if (name in buildMap) {
+                    var text = buildMap[name];
+                    write.asModule(pluginName + "!" + name, text);
+                }
+            }
+        };
+    });
+
+}());

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+define({`
	`2`	`+ name: 'plain'`
	`3`	`+});`