Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add register import meta placeholder #2433

Merged
merged 1 commit into from
Oct 4, 2022
Merged

add register import meta placeholder #2433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/extras/named-register.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SystemJS named register extension
* Supports System.register('name', [..deps..], function (_export, _context) { ... })
*
*
* Names are written to the registry as-is
* System.register('x', ...) can be imported as System.import('x')
*/
Expand All @@ -25,10 +25,10 @@
}

var register = systemJSPrototype.register;
systemJSPrototype.register = function (name, deps, declare) {
systemJSPrototype.register = function (name, deps, declare, metas) {
if (typeof name !== 'string')
return register.apply(this, arguments);
var define = [deps, declare];
var define = [deps, declare, metas];
this.registerRegistry[name] = define;
if (!firstNamedDefine) {
firstNamedDefine = define;
Expand Down
9 changes: 5 additions & 4 deletions src/system-core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ function triggerOnload (loader, load, err, isErrSource) {
}

var lastRegister;
systemJSPrototype.register = function (deps, declare) {
lastRegister = [deps, declare];
systemJSPrototype.register = function (deps, declare, metas) {
lastRegister = [deps, declare, metas];
};

/*
Expand Down Expand Up @@ -130,7 +130,7 @@ export function getOrCreateLoad (loader, id, firstParentUrl) {
meta: loader.createContext(id)
} : undefined);
load.e = declared.execute || function () {};
return [registration[0], declared.setters || []];
return [registration[0], declared.setters || [], registration[2] || []];
}, function (err) {
load.e = null;
load.er = err;
Expand All @@ -142,9 +142,10 @@ export function getOrCreateLoad (loader, id, firstParentUrl) {
.then(function (instantiation) {
return Promise.all(instantiation[0].map(function (dep, i) {
var setter = instantiation[1][i];
var meta = instantiation[2][i];
return Promise.resolve(loader.resolve(dep, id))
.then(function (depId) {
var depLoad = getOrCreateLoad(loader, depId, id);
var depLoad = getOrCreateLoad(loader, depId, id, meta);
// depLoad.I may be undefined for already-evaluated
return Promise.resolve(depLoad.I)
.then(function () {
Expand Down