archive-gh-me/systemjs
1
0
Fork 0
mirror of https://github.com/systemjs/systemjs.git synced 2026-01-25 14:57:38 +00:00
Code Issues Projects Releases Wiki Activity

fixes #129 and makes it possible to list require as a dependency

Browse Source
This commit is contained in:
Justin Meyer 2014-06-29 23:20:28 -05:00
parent c14cea43dd
commit 4c9ecbdf57
9 changed files with 143 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dist/system-production-csp.js vendored
View File

@ -1039,13 +1039,19 @@ function cjs(loader) {
// CJS Module Format
// require('...') || exports[''] = ... || exports.asd = ... || module.exports = ...
var cjsExportsRegEx = /(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/;
var cjsRequireRegEx = /(?:^\s*|[}{\(\);,\n=:\?\&]\s*)require\s*\(\s*("([^"]+)"|'([^']+)')\s*\)/g;
var cjsRequirePre = "(?:^\\s*|[}{\\(\\);,\\n=:\\?\\&]\\s*)";
var cjsRequirePost = "\\s*\\(\\s*(\"([^\"]+)\"|'([^']+)')\\s*\\)";
var cjsRequireRegEx = new RegExp(cjsRequirePre+"require"+cjsRequirePost,"g");
var commentRegEx = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
function getCJSDeps(source) {
function getCJSDeps(source, requireAlias) {
cjsExportsRegEx.lastIndex = 0;
cjsRequireRegEx.lastIndex = 0;
// If a requireAlias is given, generate the regexp; otherwise, use the cached version.
var requireRegEx = requireAlias ?
new RegExp(cjsRequirePre+(requireAlias)+cjsRequirePost,"g") :
cjsRequireRegEx;
requireRegEx.lastIndex = 0;
var deps = [];
// remove comments from the source first
@ -1053,7 +1059,7 @@ function cjs(loader) {
var match;
while (match = cjsRequireRegEx.exec(source))
while (match = requireRegEx.exec(source))
deps.push(match[2] || match[3]);
return deps;
@ -1150,11 +1156,26 @@ function amd(loader) {
var isNode = typeof module != 'undefined' && module.exports;
// Matches parenthesis
var parensRegExp = /\(([^)]+)/;
var commentRegEx = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
var argRegEx = /[\w\d]+/g;
function getRequireAlias(source, index){
var match = source.match(parensRegExp);
if(match){
var args = [];
match[1].replace(commentRegEx,"").replace(argRegEx, function(arg){
args.push(arg);
});
return args[index||0];
}
};
// AMD Module Format Detection RegEx
// define([.., .., ..], ...)
// define(varName); || define(function(require, exports) {}); || define({})
var amdRegEx = /(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,\s*|'[^']+'\s*,\s*)?\s*(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*,?\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/;
/*
AMD-compatible require
To copy RequireJS, set window.require = window.requirejs = loader.require
@ -1229,10 +1250,7 @@ function amd(loader) {
}
if (!(deps instanceof Array)) {
factory = deps;
// CommonJS AMD form
if (!loader._getCJSDeps)
throw "AMD extension needs CJS extension for AMD CJS support";
deps = ['require', 'exports', 'module'].concat(loader._getCJSDeps(factory.toString()));
deps = ['require','exports','module']
}
if (typeof factory != 'function')
@ -1242,8 +1260,17 @@ function amd(loader) {
// remove system dependencies
var requireIndex, exportsIndex, moduleIndex
if ((requireIndex = indexOf.call(deps, 'require')) != -1)
deps.splice(requireIndex, 1);
if ((requireIndex = indexOf.call(deps, 'require')) != -1) {
deps.splice(requireIndex, 1);
// CommonJS AMD form
if (!loader._getCJSDeps)
throw "AMD extension needs CJS extension for AMD CJS support";
var factoryText = factory.toString();
deps = deps.concat(loader._getCJSDeps(factoryText, getRequireAlias(factoryText, requireIndex)));
}
if ((exportsIndex = indexOf.call(deps, 'exports')) != -1)
deps.splice(exportsIndex, 1);

2
dist/system-production-csp.min.js vendored
View File

File diff suppressed because one or more lines are too long

51
dist/system.js vendored
View File

@ -980,13 +980,19 @@ function cjs(loader) {
// CJS Module Format
// require('...') || exports[''] = ... || exports.asd = ... || module.exports = ...
var cjsExportsRegEx = /(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/;
var cjsRequireRegEx = /(?:^\s*|[}{\(\);,\n=:\?\&]\s*)require\s*\(\s*("([^"]+)"|'([^']+)')\s*\)/g;
var cjsRequirePre = "(?:^\\s*|[}{\\(\\);,\\n=:\\?\\&]\\s*)";
var cjsRequirePost = "\\s*\\(\\s*(\"([^\"]+)\"|'([^']+)')\\s*\\)";
var cjsRequireRegEx = new RegExp(cjsRequirePre+"require"+cjsRequirePost,"g");
var commentRegEx = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
function getCJSDeps(source) {
function getCJSDeps(source, requireAlias) {
cjsExportsRegEx.lastIndex = 0;
cjsRequireRegEx.lastIndex = 0;
// If a requireAlias is given, generate the regexp; otherwise, use the cached version.
var requireRegEx = requireAlias ?
new RegExp(cjsRequirePre+(requireAlias)+cjsRequirePost,"g") :
cjsRequireRegEx;
requireRegEx.lastIndex = 0;
var deps = [];
// remove comments from the source first
@ -994,7 +1000,7 @@ function cjs(loader) {
var match;
while (match = cjsRequireRegEx.exec(source))
while (match = requireRegEx.exec(source))
deps.push(match[2] || match[3]);
return deps;
@ -1091,11 +1097,26 @@ function amd(loader) {
var isNode = typeof module != 'undefined' && module.exports;
// Matches parenthesis
var parensRegExp = /\(([^)]+)/;
var commentRegEx = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
var argRegEx = /[\w\d]+/g;
function getRequireAlias(source, index){
var match = source.match(parensRegExp);
if(match){
var args = [];
match[1].replace(commentRegEx,"").replace(argRegEx, function(arg){
args.push(arg);
});
return args[index||0];
}
};
// AMD Module Format Detection RegEx
// define([.., .., ..], ...)
// define(varName); || define(function(require, exports) {}); || define({})
var amdRegEx = /(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,\s*|'[^']+'\s*,\s*)?\s*(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*,?\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/;
/*
AMD-compatible require
To copy RequireJS, set window.require = window.requirejs = loader.require
@ -1170,10 +1191,7 @@ function amd(loader) {
}
if (!(deps instanceof Array)) {
factory = deps;
// CommonJS AMD form
if (!loader._getCJSDeps)
throw "AMD extension needs CJS extension for AMD CJS support";
deps = ['require', 'exports', 'module'].concat(loader._getCJSDeps(factory.toString()));
deps = ['require','exports','module']
}
if (typeof factory != 'function')
@ -1183,8 +1201,17 @@ function amd(loader) {
// remove system dependencies
var requireIndex, exportsIndex, moduleIndex
if ((requireIndex = indexOf.call(deps, 'require')) != -1)
deps.splice(requireIndex, 1);
if ((requireIndex = indexOf.call(deps, 'require')) != -1) {
deps.splice(requireIndex, 1);
// CommonJS AMD form
if (!loader._getCJSDeps)
throw "AMD extension needs CJS extension for AMD CJS support";
var factoryText = factory.toString();
deps = deps.concat(loader._getCJSDeps(factoryText, getRequireAlias(factoryText, requireIndex)));
}
if ((exportsIndex = indexOf.call(deps, 'exports')) != -1)
deps.splice(exportsIndex, 1);

2
dist/system.min.js vendored
View File

File diff suppressed because one or more lines are too long

35
lib/extension-amd.js
View File

@ -7,11 +7,26 @@ function amd(loader) {
var isNode = typeof module != 'undefined' && module.exports;
// Matches parenthesis
var parensRegExp = /\(([^)]+)/;
var commentRegEx = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
var argRegEx = /[\w\d]+/g;
function getRequireAlias(source, index){
var match = source.match(parensRegExp);
if(match){
var args = [];
match[1].replace(commentRegEx,"").replace(argRegEx, function(arg){
args.push(arg);
});
return args[index||0];
}
};
// AMD Module Format Detection RegEx
// define([.., .., ..], ...)
// define(varName); || define(function(require, exports) {}); || define({})
var amdRegEx = /(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,\s*|'[^']+'\s*,\s*)?\s*(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*,?\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/;
/*
AMD-compatible require
To copy RequireJS, set window.require = window.requirejs = loader.require
@ -86,10 +101,7 @@ function amd(loader) {
}
if (!(deps instanceof Array)) {
factory = deps;
// CommonJS AMD form
if (!loader._getCJSDeps)
throw "AMD extension needs CJS extension for AMD CJS support";
deps = ['require', 'exports', 'module'].concat(loader._getCJSDeps(factory.toString()));
deps = ['require','exports','module']
}
if (typeof factory != 'function')
@ -99,8 +111,17 @@ function amd(loader) {
// remove system dependencies
var requireIndex, exportsIndex, moduleIndex
if ((requireIndex = indexOf.call(deps, 'require')) != -1)
deps.splice(requireIndex, 1);
if ((requireIndex = indexOf.call(deps, 'require')) != -1) {
deps.splice(requireIndex, 1);
// CommonJS AMD form
if (!loader._getCJSDeps)
throw "AMD extension needs CJS extension for AMD CJS support";
var factoryText = factory.toString();
deps = deps.concat(loader._getCJSDeps(factoryText, getRequireAlias(factoryText, requireIndex)));
}
if ((exportsIndex = indexOf.call(deps, 'exports')) != -1)
deps.splice(exportsIndex, 1);

16
lib/extension-cjs.js
View File

@ -6,13 +6,19 @@ function cjs(loader) {
// CJS Module Format
// require('...') || exports[''] = ... || exports.asd = ... || module.exports = ...
var cjsExportsRegEx = /(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/;
var cjsRequireRegEx = /(?:^\s*|[}{\(\);,\n=:\?\&]\s*)require\s*\(\s*("([^"]+)"|'([^']+)')\s*\)/g;
var cjsRequirePre = "(?:^\\s*|[}{\\(\\);,\\n=:\\?\\&]\\s*)";
var cjsRequirePost = "\\s*\\(\\s*(\"([^\"]+)\"|'([^']+)')\\s*\\)";
var cjsRequireRegEx = new RegExp(cjsRequirePre+"require"+cjsRequirePost,"g");
var commentRegEx = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
function getCJSDeps(source) {
function getCJSDeps(source, requireAlias) {
cjsExportsRegEx.lastIndex = 0;
cjsRequireRegEx.lastIndex = 0;
// If a requireAlias is given, generate the regexp; otherwise, use the cached version.
var requireRegEx = requireAlias ?
new RegExp(cjsRequirePre+(requireAlias)+cjsRequirePost,"g") :
cjsRequireRegEx;
requireRegEx.lastIndex = 0;
var deps = [];
// remove comments from the source first
@ -20,7 +26,7 @@ function cjs(loader) {
var match;
while (match = cjsRequireRegEx.exec(source))
while (match = requireRegEx.exec(source))
deps.push(match[2] || match[3]);
return deps;

9
test/test.js
View File

@ -497,3 +497,12 @@ asyncTest('AMD -> System.register circular -> ES6', function() {
}, err);
});
asyncTest('AMD simplified CommonJS wrapping with an aliased require', function() {
System['import']('tests/amd-simplified-cjs-aliased-require1').then(function(m) {
ok(m.require2,"got dependency from aliased require");
ok(m.require2.amdCJS,"got dependency from aliased require listed as a dependency");
start();
}, err);
});
console.log("here")

7
test/tests/amd-simplified-cjs-aliased-require1.js Normal file
View File

@ -0,0 +1,7 @@
define(function(req){
var r2 = req("./amd-simplified-cjs-aliased-require2");
return {
name: "require1",
require2: r2
};
});

8
test/tests/amd-simplified-cjs-aliased-require2.js Normal file
View File

@ -0,0 +1,8 @@
define(["./amd-dep","require"],function(amdDep, req){
var amdCJS = req("./amd-cjs-module");
return {
name: "require2",
amdCJS: amdCJS,
amdDep: amdDep
};
});