@idlizer/core 2.0.30 → 2.0.32

package/webidl2.js/dist/webidl2.js

@@ -2073,32 +2073,35 @@ class Import extends _base_js__WEBPACK_IMPORTED_MODULE_0__.Base {
       return;
     }
     const tokens = { import: importKeyword };
-    tokens.name =
+    tokens.clause =
       tokeniser.consumeKind("string") ||
+      tokeniser.consumeKind("identifier") ||
       tokeniser.error("Incomplete import statement");
+    tokens.as = tokeniser.consume("as");
+    if (tokens.as)
+      tokens.alias =
+        tokeniser.consumeKind("identifier") ||
+        tokeniser.error("Incomplete import statement");
     tokens.termination =
       tokeniser.consume(";") ||
       tokeniser.error("No terminating ; for import statement");
     const ret = (0,_helpers_js__WEBPACK_IMPORTED_MODULE_1__.autoParenter)(new Import({ source: tokeniser.source, tokens }));
-    ret.nameValue = tokens.name.value;
+    ret.clause = tokens.clause.value;
+    ret.alias = tokens.alias?.value;
     return ret.this;
   }
 
   get type() {
     return "import";
   }
-  get target() {
-    return (0,_helpers_js__WEBPACK_IMPORTED_MODULE_1__.unescape)(this.tokens.target.value);
-  }
-  get import() {
-    return (0,_helpers_js__WEBPACK_IMPORTED_MODULE_1__.unescape)(this.tokens.importName.value);
-  }
 
   write(w) {
     return w.ts.definition(
       w.ts.wrap([
         w.token(this.tokens.import),
-        w.reference_token(this.tokens.name, this),
+        w.reference_token(this.tokens.clause, this),
+        w.token(this.tokens.as),
+        w.token(this.tokens.alias),
         w.token(this.tokens.termination),
       ]),
       { data: this },
@@ -2838,27 +2841,26 @@ class Package extends _base_js__WEBPACK_IMPORTED_MODULE_0__.Base {
       return;
     }
     const tokens = { base: packageKeyword };
-    tokens.name =
-      tokeniser.consumeKind("string") || tokeniser.error("No name for package");
+    tokens.clause =
+      tokeniser.consumeKind("string") ||
+      tokeniser.consumeKind("identifier") ||
+      tokeniser.error("No clause for package");
     tokens.termination =
       tokeniser.consume(";") || tokeniser.error("No semicolon after package");
     const ret = (0,_helpers_js__WEBPACK_IMPORTED_MODULE_1__.autoParenter)(new Package({ source: tokeniser.source, tokens }));
-    ret.nameValue = tokens.name.value;
+    ret.clause = tokens.clause.value;
     return ret.this;
   }
 
   get type() {
     return "package";
   }
-  get name() {
-    return (0,_helpers_js__WEBPACK_IMPORTED_MODULE_1__.unescape)(this.tokens.name.value);
-  }
 
   write(w) {
     return w.ts.definition(
       w.ts.wrap([
         w.token(this.tokens.base),
-        w.reference_token(this.tokens.name, this),
+        w.reference_token(this.tokens.clause, this),
         w.token(this.tokens.termination),
       ]),
       { data: this },
@@ -3640,6 +3642,7 @@ const argumentNameKeywords = [
   "unrestricted",
   "package",
   "import",
+  "as",
   "version",
 ];
 
@@ -3733,9 +3736,7 @@ function tokenise(str) {
         const token = tokens[lastIndex];
         if (result !== -1) {
           if (reserved.includes(token.value)) {
-            const message = `${(0,_productions_helpers_js__WEBPACK_IMPORTED_MODULE_1__.unescape)(
-              token.value,
-            )} is a reserved identifier and must not be used.`;
+            const message = `${(0,_productions_helpers_js__WEBPACK_IMPORTED_MODULE_1__.unescape)(token.value)} is a reserved identifier and must not be used.`;
             throw new WebIDLParseError(
               (0,_error_js__WEBPACK_IMPORTED_MODULE_0__.syntaxError)(tokens, lastIndex, null, message),
             );