@idlizer/core 2.1.5 → 2.1.7

package/webidl2.js/dist/webidl2.js

@@ -855,19 +855,52 @@ __webpack_require__.r(__webpack_exports__);
 /**
  * @param {import("../tokeniser.js").Tokeniser} tokeniser
  */
-function inheritance(tokeniser) {
+function inheritanceItem(tokeniser) {
+  const extAttrs = _extended_attributes_js__WEBPACK_IMPORTED_MODULE_2__.ExtendedAttributes.parse(tokeniser);
+  const inheritance = tokeniser.consumeKind("identifier");
+  if (!inheritance) {
+    return undefined;
+  }
+  return {
+    extAttrs,
+    inheritance,
+    tokens: {},
+  };
+}
+
+/**
+ * @param {import("../tokeniser.js").Tokeniser} tokeniser
+ * @param {boolean} multipleInheritance
+ */
+function inheritance(tokeniser, multipleInheritance) {
   const colon = tokeniser.consume(":");
   if (!colon) {
     return {};
   }
-  const extAttrs = _extended_attributes_js__WEBPACK_IMPORTED_MODULE_2__.ExtendedAttributes.parse(tokeniser);
-  const inheritance =
-    tokeniser.consumeKind("identifier") ||
-    tokeniser.error("Inheritance lacks a type");
+  const first =
+    inheritanceItem(tokeniser) || tokeniser.error("Inheritance lacks a type");
+  if (!multipleInheritance) {
+    return {
+      colon,
+      extAttrs: first.extAttrs,
+      inheritance: first.inheritance,
+    };
+  }
+  first.tokens.separator = tokeniser.consume(",");
+  if (!first.tokens.separator) {
+    return {
+      colon,
+      inheritance: [first],
+    };
+  }
+  const rest = (0,_helpers_js__WEBPACK_IMPORTED_MODULE_3__.list)(tokeniser, {
+    parser: inheritanceItem,
+    listName: "inheritance-list",
+    allowDangler: false,
+  });
   return {
     colon,
-    extAttrs: extAttrs && extAttrs.length ? extAttrs : undefined,
-    inheritance,
+    inheritance: [first, ...rest],
   };
 }
 
@@ -890,7 +923,11 @@ class Container extends _base_js__WEBPACK_IMPORTED_MODULE_0__.Base {
    * @param {*} instance TODO: This should be {T extends Container}, but see https://github.com/microsoft/TypeScript/issues/4628
    * @param {*} args
    */
-  static parse(tokeniser, instance, { inheritable, allowedMembers }) {
+  static parse(
+    tokeniser,
+    instance,
+    { inheritable, allowedMembers, multipleInheritance = false },
+  ) {
     const { tokens, type } = instance;
     tokens.name =
       tokeniser.consumeKind("identifier") ||
@@ -898,10 +935,12 @@ class Container extends _base_js__WEBPACK_IMPORTED_MODULE_0__.Base {
     tokeniser.current = instance;
     instance = (0,_helpers_js__WEBPACK_IMPORTED_MODULE_3__.autoParenter)(instance);
     if (inheritable) {
-      const inheritanceParsed = inheritance(tokeniser);
+      const inheritanceParsed = inheritance(tokeniser, multipleInheritance);
       tokens.colon = inheritanceParsed.colon;
       tokens.inheritance = inheritanceParsed.inheritance;
-      instance.inheritanceExtAttrs = inheritanceParsed.extAttrs;
+      if (!multipleInheritance) {
+        instance.inheritanceExtAttrs = inheritanceParsed.extAttrs;
+      }
     }
     tokens.open = tokeniser.consume("{") || tokeniser.error(`Bodyless ${type}`);
     instance.members = [];
@@ -944,6 +983,14 @@ class Container extends _base_js__WEBPACK_IMPORTED_MODULE_0__.Base {
     if (!this.tokens.inheritance) {
       return null;
     }
+    if (Array.isArray(this.tokens.inheritance)) {
+      return this.tokens.inheritance.map((it) => {
+        return {
+          extAttrs: it.extAttrs,
+          inheritance: (0,_helpers_js__WEBPACK_IMPORTED_MODULE_3__.unescape)(it.inheritance.value),
+        };
+      });
+    }
     return (0,_helpers_js__WEBPACK_IMPORTED_MODULE_3__.unescape)(this.tokens.inheritance.value);
   }
 
@@ -1829,13 +1876,13 @@ function return_type(tokeniser, typeName) {
     typ.tokens.closeRT = closeRT;
     return typ;
   } while (false);
-  const typ = Type.parse(tokeniser, typeName || "return-type");
+  const typ = _type_js__WEBPACK_IMPORTED_MODULE_0__.Type.parse(tokeniser, typeName || "return-type");
   if (typ) {
     return typ;
   }
   const voidToken = tokeniser.consume("void");
   if (voidToken) {
-    const ret = new Type({
+    const ret = new _type_js__WEBPACK_IMPORTED_MODULE_0__.Type({
       source: tokeniser.source,
       tokens: { base: voidToken },
     });
@@ -2250,6 +2297,7 @@ class Interface extends _container_js__WEBPACK_IMPORTED_MODULE_0__.Container {
           [_attribute_js__WEBPACK_IMPORTED_MODULE_1__.Attribute.parse],
           [_operation_js__WEBPACK_IMPORTED_MODULE_2__.Operation.parse],
         ],
+        multipleInheritance: true,
       },
     );
   }
@@ -3585,7 +3633,7 @@ const tokenRe = {
   decimal:
     /-?(?=[0-9]*\.|[0-9]+[eE])(([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([Ee][-+]?[0-9]+)?|[0-9]+[Ee][-+]?[0-9]+)/y,
   integer: /-?(0([Xx][0-9A-Fa-f]+|[0-7]*)|[1-9][0-9]*)/y,
-  identifier: /[_-]?[A-Za-z](\.?[0-9A-Z_a-z-])*/y,
+  identifier: /[-$_A-Za-z](\.?[$0-9A-Z_a-z-])*/y,
   string: /"(\\"|[^"])*"/y,
   whitespace: /[\t\n\r ]+/y,
   comment: /\/\/.*|\/\*[\s\S]*?\*\//y,
@@ -3695,8 +3743,6 @@ const punctuations = [
 const reserved = [
   // "constructor" is now a keyword
   "_constructor",
-  "toString",
-  "_toString",
 ];
 
 /**
@@ -3724,7 +3770,7 @@ function tokenise(str) {
       line += (currentTrivia.match(/\n/g) || []).length;
       trivia += currentTrivia;
       index -= 1;
-    } else if (/[-0-9.A-Z_a-z]/.test(nextChar)) {
+    } else if (/[-$0-9.A-Z_a-z]/.test(nextChar)) {
       result = attemptTokenMatch("decimal");
       if (result === -1) {
         result = attemptTokenMatch("integer");