@idlizer/core 2.1.2 → 2.1.7

package/webidl2.js/dist/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

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);
   }
 
@@ -1661,7 +1708,7 @@ __webpack_require__.r(__webpack_exports__);
  * @param {string} identifier
  */
 function unescape(identifier) {
-  return identifier.startsWith("_") ? identifier.slice(1) : identifier;
+  return identifier;
 }
 
 /** @typedef {'callbackInterface'|'dictionary'|'interface'|'mixin'|'namespace'} ExtendableInterfaces */
@@ -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,
       },
     );
   }
@@ -3109,9 +3157,8 @@ function generic_type(tokeniser, typeName) {
     tokeniser.error(`No opening bracket after ${base.value}`);
   switch (base.value) {
     case "Promise": {
-      if (tokeniser.probe("["))
-        tokeniser.error("Promise type cannot have extended attribute");
       const subtype =
+        (0,_helpers_js__WEBPACK_IMPORTED_MODULE_1__.type_with_extended_attributes)(tokeniser, typeName) ||
         (0,_helpers_js__WEBPACK_IMPORTED_MODULE_1__.return_type)(tokeniser, typeName) ||
         tokeniser.error("Missing Promise subtype");
       ret.subtype.push(subtype);
@@ -3586,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,
@@ -3696,8 +3743,6 @@ const punctuations = [
 const reserved = [
   // "constructor" is now a keyword
   "_constructor",
-  "toString",
-  "_toString",
 ];
 
 /**
@@ -3725,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");
@@ -3757,6 +3802,7 @@ function tokenise(str) {
           trivia,
           line,
           index,
+          position: lastCharIndex,
         });
         trivia = "";
         lastCharIndex += punctuation.length;
@@ -3783,6 +3829,7 @@ function tokenise(str) {
     trivia,
     line,
     index,
+    position: lastCharIndex,
   });
 
   return tokens;
@@ -3797,7 +3844,14 @@ function tokenise(str) {
     re.lastIndex = lastCharIndex;
     const result = re.exec(str);
     if (result) {
-      tokens.push({ type, value: result[0], trivia, line, index });
+      tokens.push({
+        type,
+        value: result[0],
+        trivia,
+        line,
+        index,
+        position: lastCharIndex,
+      });
       if (!noFlushTrivia) {
         trivia = "";
       }
@@ -4251,7 +4305,8 @@ function* checkInterfaceMemberDuplication(defs, i) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   parse: () => (/* binding */ parse)
+/* harmony export */   parse: () => (/* binding */ parse),
+/* harmony export */   parseType: () => (/* binding */ parseType)
 /* harmony export */ });
 /* harmony import */ var _tokeniser_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./tokeniser.js */ "./lib/tokeniser.js");
 /* harmony import */ var _productions_enum_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./productions/enum.js */ "./lib/productions/enum.js");
@@ -4367,6 +4422,20 @@ function parse(str, options = {}) {
   return parseByTokens(tokeniser, options);
 }
 
+/**
+ * @param {string} str
+ * @param {string} fileName
+ */
+function parseType(str, fileName) {
+  const tokeniser = new _tokeniser_js__WEBPACK_IMPORTED_MODULE_0__.Tokeniser(str);
+  // @ts-ignore (See Tokeniser.source in supplement.d.ts)
+  tokeniser.source.name = fileName;
+  return (
+    (0,_productions_helpers_js__WEBPACK_IMPORTED_MODULE_15__.type_with_extended_attributes)(tokeniser, "type") ||
+    (0,_productions_helpers_js__WEBPACK_IMPORTED_MODULE_15__.return_type)(tokeniser, "return-type")
+  );
+}
+
 
 /***/ }),
 
@@ -4516,6 +4585,8 @@ function write(ast, { templates: ts = templates } = {}) {
 /******/ 	
 /************************************************************************/
 var __webpack_exports__ = {};
+// This entry needs to be wrapped in an IIFE because it needs to be isolated against other modules in the chunk.
+(() => {
 /*!******************!*\
   !*** ./index.js ***!
   \******************/
@@ -4523,6 +4594,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   WebIDLParseError: () => (/* reexport safe */ _lib_tokeniser_js__WEBPACK_IMPORTED_MODULE_3__.WebIDLParseError),
 /* harmony export */   parse: () => (/* reexport safe */ _lib_webidl2_js__WEBPACK_IMPORTED_MODULE_0__.parse),
+/* harmony export */   parseType: () => (/* reexport safe */ _lib_webidl2_js__WEBPACK_IMPORTED_MODULE_0__.parseType),
 /* harmony export */   validate: () => (/* reexport safe */ _lib_validator_js__WEBPACK_IMPORTED_MODULE_2__.validate),
 /* harmony export */   write: () => (/* reexport safe */ _lib_writer_js__WEBPACK_IMPORTED_MODULE_1__.write)
 /* harmony export */ });
@@ -4541,6 +4613,8 @@ __webpack_require__.r(__webpack_exports__);
 
 if (false) {}
 
+})();
+
 /******/ 	return __webpack_exports__;
 /******/ })()
 ;