Skip to content

Commit 2897998

Browse files
rksmrksm
committed
0.4.2
1 parent fdac825 commit 2897998

File tree

5 files changed

+432
-114
lines changed

5 files changed

+432
-114
lines changed

‎dist/lively.modules-with-lively.vm.js‎

Lines changed: 143 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -21845,7 +21845,8 @@ var categorizer = Object.freeze({
2184521845
var env = {
2184621846
loadError: undefined,
2184721847
recorderName: "__lvVarRecorder",
21848-
dontTransform: ["__rec__", "__lvVarRecorder", "global", "self", "_moduleExport", "_moduleImport"].concat(ast.query.knownGlobals),
21848+
dontTransform: ["__lvVarRecorder", "global", "self", "_moduleExport", "_moduleImport", "fetch" // doesn't like to be called as a method, i.e. __lvVarRecorder.fetch
21849+
].concat(ast.query.knownGlobals),
2184921850
recorder: Object.create(GLOBAL$1, {
2185021851
_moduleExport: {
2185121852
get: function get() {
@@ -22075,52 +22076,154 @@ var categorizer = Object.freeze({
2207522076
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
2207622077

2207722078
function importPackage$1(System, packageURL) {
22078-
return System.normalize(packageURL).then(function (url) {
22079-
return registerPackage$1(System, url);
22080-
}).then(function () {
22081-
return System.normalize(packageURL);
22082-
}).then(function (entry) {
22083-
return System["import"](entry);
22084-
});
22079+
return regeneratorRuntime.async(function importPackage$(context$1$0) {
22080+
while (1) switch (context$1$0.prev = context$1$0.next) {
22081+
case 0:
22082+
context$1$0.next = 2;
22083+
return regeneratorRuntime.awrap(registerPackage$1(System, packageURL));
22084+
22085+
case 2:
22086+
context$1$0.t0 = System;
22087+
context$1$0.next = 5;
22088+
return regeneratorRuntime.awrap(System.normalize(packageURL));
22089+
22090+
case 5:
22091+
context$1$0.t1 = context$1$0.sent;
22092+
return context$1$0.abrupt("return", context$1$0.t0["import"].call(context$1$0.t0, context$1$0.t1));
22093+
22094+
case 7:
22095+
case "end":
22096+
return context$1$0.stop();
22097+
}
22098+
}, null, this);
2208522099
}
2208622100

2208722101
function registerPackage$1(System, packageURL, packageLoadStack) {
22088-
if (!isURL(packageURL)) {
22089-
return Promise.reject(new Error("Error registering package: " + packageURL + " is not a valid URL"));
22090-
}
22102+
var url, registerSubPackages, packageInSystem, cfg, packageConfigResult, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, subp;
2209122103

22092-
// ensure it's a directory
22093-
if (!packageURL.match(/\.js/)) packageURL = packageURL;else if (packageURL.indexOf(packageURL + ".js") > -1) packageURL = packageURL.replace(/\.js$/, "");else packageURL = packageURL.split("/").slice(0, -1).join("/");
22104+
return regeneratorRuntime.async(function registerPackage$(context$1$0) {
22105+
while (1) switch (context$1$0.prev = context$1$0.next) {
22106+
case 0:
22107+
context$1$0.next = 2;
22108+
return regeneratorRuntime.awrap(System.normalize(packageURL));
2209422109

22095-
if (packageURL.match(/\.js$/)) {
22096-
return Promise.reject(new Error("[registerPackage] packageURL is expected to point to a directory but seems to be a .js file: " + packageURL));
22097-
}
22110+
case 2:
22111+
url = context$1$0.sent;
2209822112

22099-
packageURL = String(packageURL).replace(/\/$/, "");
22113+
if (isURL(url)) {
22114+
context$1$0.next = 5;
22115+
break;
22116+
}
2210022117

22101-
packageLoadStack = packageLoadStack || [];
22102-
var registerSubPackages = true;
22103-
// stop here to support circular deps
22104-
if (packageLoadStack.indexOf(packageURL) !== -1) {
22105-
registerSubPackages = false;
22106-
System.debug && console.log("[lively.modules package register] %s is a circular dependency, stopping registerign subpackages", packageURL);
22107-
} else {
22108-
packageLoadStack.push(packageURL);
22109-
}
22118+
return context$1$0.abrupt("return", Promise.reject(new Error("Error registering package: " + url + " is not a valid URL")));
2211022119

22111-
System.debug && console.log("[lively.modules package register] %s", packageURL);
22120+
case 5:
2211222121

22113-
var packageInSystem = System.packages[packageURL] || (System.packages[packageURL] = {});
22122+
// ensure it's a directory
22123+
if (!url.match(/\.js/)) url = url;else if (url.indexOf(url + ".js") > -1) url = url.replace(/\.js$/, "");else url = url.split("/").slice(0, -1).join("/");
2211422124

22115-
return tryToLoadPackageConfig(System, packageURL).then(function (cfg) {
22116-
return Promise.resolve(applyConfig(System, cfg, packageURL)).then(function (packageConfigResult) {
22117-
return registerSubPackages ? Promise.all(packageConfigResult.subPackages.map(function (subp) {
22118-
return registerPackage$1(System, subp.address, packageLoadStack);
22119-
})) : Promise.resolve();
22120-
}).then(function () {
22121-
return cfg.name;
22122-
});
22123-
});
22125+
if (!url.match(/\.js$/)) {
22126+
context$1$0.next = 8;
22127+
break;
22128+
}
22129+
22130+
return context$1$0.abrupt("return", Promise.reject(new Error("[registerPackage] packageURL is expected to point to a directory but seems to be a .js file: " + url)));
22131+
22132+
case 8:
22133+
22134+
url = String(url).replace(/\/$/, "");
22135+
22136+
packageLoadStack = packageLoadStack || [];
22137+
registerSubPackages = true;
22138+
22139+
// stop here to support circular deps
22140+
if (packageLoadStack.indexOf(url) !== -1) {
22141+
registerSubPackages = false;
22142+
System.debug && console.log("[lively.modules package register] %s is a circular dependency, stopping registerign subpackages", url);
22143+
} else packageLoadStack.push(url);
22144+
22145+
System.debug && console.log("[lively.modules package register] %s", url);
22146+
22147+
packageInSystem = System.packages[url] || (System.packages[url] = {});
22148+
context$1$0.next = 16;
22149+
return regeneratorRuntime.awrap(tryToLoadPackageConfig(System, url));
22150+
22151+
case 16:
22152+
cfg = context$1$0.sent;
22153+
context$1$0.next = 19;
22154+
return regeneratorRuntime.awrap(applyConfig(System, cfg, url));
22155+
22156+
case 19:
22157+
packageConfigResult = context$1$0.sent;
22158+
22159+
if (!registerSubPackages) {
22160+
context$1$0.next = 47;
22161+
break;
22162+
}
22163+
22164+
_iteratorNormalCompletion = true;
22165+
_didIteratorError = false;
22166+
_iteratorError = undefined;
22167+
context$1$0.prev = 24;
22168+
_iterator = packageConfigResult.subPackages[Symbol.iterator]();
22169+
22170+
case 26:
22171+
if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
22172+
context$1$0.next = 33;
22173+
break;
22174+
}
22175+
22176+
subp = _step.value;
22177+
context$1$0.next = 30;
22178+
return regeneratorRuntime.awrap(registerPackage$1(System, subp.address.replace(/\/?$/, "/"), packageLoadStack));
22179+
22180+
case 30:
22181+
_iteratorNormalCompletion = true;
22182+
context$1$0.next = 26;
22183+
break;
22184+
22185+
case 33:
22186+
context$1$0.next = 39;
22187+
break;
22188+
22189+
case 35:
22190+
context$1$0.prev = 35;
22191+
context$1$0.t0 = context$1$0["catch"](24);
22192+
_didIteratorError = true;
22193+
_iteratorError = context$1$0.t0;
22194+
22195+
case 39:
22196+
context$1$0.prev = 39;
22197+
context$1$0.prev = 40;
22198+
22199+
if (!_iteratorNormalCompletion && _iterator["return"]) {
22200+
_iterator["return"]();
22201+
}
22202+
22203+
case 42:
22204+
context$1$0.prev = 42;
22205+
22206+
if (!_didIteratorError) {
22207+
context$1$0.next = 45;
22208+
break;
22209+
}
22210+
22211+
throw _iteratorError;
22212+
22213+
case 45:
22214+
return context$1$0.finish(42);
22215+
22216+
case 46:
22217+
return context$1$0.finish(39);
22218+
22219+
case 47:
22220+
return context$1$0.abrupt("return", cfg.name);
22221+
22222+
case 48:
22223+
case "end":
22224+
return context$1$0.stop();
22225+
}
22226+
}, null, this, [[24, 35, 39, 47], [40,, 42, 46]]);
2212422227
}
2212522228

2212622229
function tryToLoadPackageConfig(System, packageURL) {
@@ -22315,6 +22418,9 @@ var categorizer = Object.freeze({
2231522418
return result;
2231622419
}
2231722420

22421+
// *after* the package is registered the normalize call should resolve to the
22422+
// package's main module
22423+
2231822424
var eventTypes = ["modulechange", "doitrequest", "doitresult"];
2231922425

2232022426
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-

0 commit comments

Comments
 (0)