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

Lazy wrapper instantiation #158

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Lazy wrapper instantiation #158

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 39 additions & 28 deletions lib/constructs/interface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,9 @@ class Interface {
generateRequires() {
this.requires.addRaw("impl", "utils.implSymbol");
this.requires.addRaw("ctorRegistry", "utils.ctorRegistrySymbol");
this.requires.addRaw("wrapperSymbol", "utils.wrapperSymbol");
this.requires.addRaw("globalObjectSymbol", "utils.globalObjectSymbol");
this.requires.addRaw("createWrapperSymbol", "utils.createWrapperSymbol");

if (this.idl.inheritance !== null) {
this.requires.add(this.idl.inheritance);
Expand Down Expand Up @@ -1126,7 +1129,9 @@ class Interface {

generateIface() {
this.str += `
exports.create = function create(globalObject, constructorArgs, privateData) {
function createWrapper(implObject) {
const globalObject = implObject[globalObjectSymbol];

if (globalObject[ctorRegistry] === undefined) {
throw new Error('Internal error: invalid global object');
}
Expand All @@ -1136,49 +1141,55 @@ class Interface {
throw new Error('Internal error: constructor ${this.name} is not installed on the passed global object');
}

let obj = Object.create(ctor.prototype);
obj = exports.setup(obj, globalObject, constructorArgs, privateData);
return obj;
};
exports.createImpl = function createImpl(globalObject, constructorArgs, privateData) {
const obj = exports.create(globalObject, constructorArgs, privateData);
return utils.implForWrapper(obj);
};
exports._internalSetup = function _internalSetup(obj) {
let wrapperObject = Object.create(ctor.prototype);
exports._internalSetup(wrapperObject);
`;

if (this.idl.inheritance) {
if (this.isLegacyPlatformObj) {
this.str += `
${this.idl.inheritance}._internalSetup(obj);
wrapperObject = new Proxy(wrapperObject, proxyHandler);
`;
}

this.generateOnInstance();

this.str += `
implObject[wrapperSymbol] = wrapperObject;
wrapperObject[impl] = implObject;
return wrapperObject;
};
exports.setup = function setup(obj, globalObject, constructorArgs = [], privateData = {}) {
privateData.wrapper = obj;
exports.create = function create(globalObject, constructorArgs, privateData) {
const implObject = exports.createImpl(globalObject, constructorArgs, privateData);
return utils.wrapperForImpl(implObject);
};
exports.createImpl = function createImpl(globalObject, constructorArgs = [], privateData = {}) {
const implObject = new Impl.implementation(globalObject, constructorArgs, privateData);

exports._internalSetup(obj);
Object.defineProperty(obj, impl, {
value: new Impl.implementation(globalObject, constructorArgs, privateData),
configurable: true
});
implObject[wrapperSymbol] = null;
Copy link
Contributor

@ExE-Boss ExE-Boss Feb 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use a getter that turns into a data property?

That will remove the need for createWrapperSymbol and globalObjectSymbol.

implObject[globalObjectSymbol] = globalObject;
implObject[createWrapperSymbol] = createWrapper;

return implObject;
};
exports.setup = function setup(wrapperObject, globalObject, constructorArgs = [], privateData = {}) {
const implObject = exports.createImpl(globalObject, constructorArgs, privateData);

implObject[wrapperSymbol] = wrapperObject;
wrapperObject[impl] = implObject;

exports._internalSetup(wrapperObject);

return wrapperObject;
};
exports._internalSetup = function _internalSetup(obj) {
`;

if (this.isLegacyPlatformObj) {
if (this.idl.inheritance) {
this.str += `
obj = new Proxy(obj, proxyHandler);
${this.idl.inheritance}._internalSetup(obj);
`;
}
this.generateOnInstance();

this.str += `
obj[impl][utils.wrapperSymbol] = obj;
if (Impl.init) {
Impl.init(obj[impl], privateData);
}
return obj;
};
`;
}
Expand Down
15 changes: 14 additions & 1 deletion lib/output/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ function hasOwn(obj, prop) {

const wrapperSymbol = Symbol("wrapper");
const implSymbol = Symbol("impl");
const globalObjectSymbol = Symbol("global object");
const createWrapperSymbol = Symbol("create wrapper");
const sameObjectCaches = Symbol("SameObject caches");
const ctorRegistrySymbol = Symbol.for("[webidl2js] constructor registry");

Expand All @@ -28,7 +30,16 @@ function getSameObject(wrapper, prop, creator) {
}

function wrapperForImpl(impl) {
return impl ? impl[wrapperSymbol] : null;
if (!impl) {
return null;
}

const wrapper = impl[wrapperSymbol];
if (wrapper === undefined || wrapper !== null) {
return wrapper;
}

return impl[createWrapperSymbol](impl);
}

function implForWrapper(wrapper) {
Expand Down Expand Up @@ -91,6 +102,8 @@ module.exports = exports = {
hasOwn,
wrapperSymbol,
implSymbol,
globalObjectSymbol,
createWrapperSymbol,
getSameObject,
ctorRegistrySymbol,
wrapperForImpl,
Expand Down
Loading