update constructor name

jsdom · Oct 22, 2019 · f62a3b5 · f62a3b5
1 parent c8ca6cb
commit f62a3b5
Show file tree

Hide file tree

Showing 2 changed files with 215 additions and 217 deletions.
diff --git a/lib/constructs/interface.js b/lib/constructs/interface.js
@@ -66,8 +66,6 @@ class Interface {
     this.ctx = ctx;
     this.idl = idl;
     this.name = idl.name;
-    this.sharedConstructorName = `Shared${this.name}`;
-
     for (const member of this.idl.members) {
       member.definingInterface = this.name;
     }
@@ -1407,15 +1405,15 @@ class Interface {
   }
 
   generateInstall() {
-    const { idl, name, sharedConstructorName } = this;
+    const { idl, name } = this;
 
     this.str += `
       install(globalObject) {
     `;
 
     const ctor = this.getConstructor();
     this.str += `
-      const ${name} = function(${formatArgs(ctor.argNames)}) {
+      const ctor = function ${name}(${formatArgs(ctor.argNames)}) {
         ${ctor.body}
       };
     `;
@@ -1426,7 +1424,7 @@ class Interface {
     ];
     if (staticPropertyNames.length) {
       this.str += `
-        Object.defineProperties(${name}, {
+        Object.defineProperties(ctor, {
       `;
 
       for (const staticProperty of staticPropertyNames) {
@@ -1436,7 +1434,7 @@ class Interface {
           propertyKey.replace("[", "").replace("]", "") :
           `"${propertyKey}"`;
 
-        this.str += `${propertyKey}: Object.getOwnPropertyDescriptor(${sharedConstructorName}, ${propertyValue}),\n`;
+        this.str += `${propertyKey}: Object.getOwnPropertyDescriptor(${name}, ${propertyValue}),\n`;
       }
 
       this.str += `
@@ -1464,14 +1462,14 @@ class Interface {
     // newly created constructor.
     this.str += `
       Object.defineProperties(proto, {
-        ...Object.getOwnPropertyDescriptors(${sharedConstructorName}.prototype),
+        ...Object.getOwnPropertyDescriptors(${name}.prototype),
         constructor: {
           writable: true,
           configurable: true,
-          value: ${name}
+          value: ctor
         }
       });
-      Object.defineProperty(${name}, "prototype", {
+      Object.defineProperty(ctor, "prototype", {
         writable: false,
         value: proto
       });
@@ -1483,12 +1481,12 @@ class Interface {
         if (globalObject[ctorRegistry] === undefined) {
           globalObject[ctorRegistry] = {};
         }
-        globalObject[ctorRegistry]["${name}"] = ${name};
+        globalObject[ctorRegistry]["${name}"] = ctor;
 
         Object.defineProperty(globalObject, "${name}", {
           configurable: true,
           writable: true,
-          value: ${name}
+          value: ctor
         });
       },
     `;
@@ -1497,7 +1495,7 @@ class Interface {
   generate() {
     this.generateIterator();
 
-    this.str += `class ${this.sharedConstructorName} {`;
+    this.str += `class ${this.name} {`;
 
     this.generateOffInstanceMethods();