@idlizer/core 2.0.31 → 2.0.33

package/build/lib/src/peer-generation/PeerMethod.js

@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { generatorTypePrefix } from "../config";
 import { mangleMethodName, MethodModifier } from "../LanguageWriters/LanguageWriter";
 import { capitalize, isDefined } from "../util";
 import { PrimitiveTypesInstance } from "./PrimitiveType";
@@ -69,13 +70,16 @@ export class PeerMethod {
         return !((_a = this.method.modifiers) === null || _a === void 0 ? void 0 : _a.includes(MethodModifier.STATIC));
     }
     generateAPIParameters(converter) {
+        var _a;
         const args = this.argAndOutConvertors.map(it => {
             let isPointer = it.isPointerType();
             return `${isPointer ? "const " : ""}${converter.convert(it.nativeType())}${isPointer ? "*" : ""} ${it.param}`;
         });
         const receiver = this.generateReceiver();
         if (receiver)
-            return [`${receiver.argType} ${receiver.argName}`, ...args];
+            args.unshift(`${receiver.argType} ${receiver.argName}`);
+        if ((_a = this.method.modifiers) === null || _a === void 0 ? void 0 : _a.includes(MethodModifier.THROWS))
+            args.unshift(`${generatorTypePrefix()}VMContext vmContext`);
         return args;
     }
     generateReceiver() {

package/build/lib/src/peer-generation/idl/IdlNameConvertor.js

@@ -53,15 +53,16 @@ export class ETSDeclarationNameConvertor extends DeclarationNameConvertor {
         return idl.getFQName(decl);
     }
     convertEnum(decl) {
-        const namespace = idl.getNamespacesPathFor(decl).map(it => it.name).join('_');
-        return `${namespace ? `${namespace}_` : ``}${decl.name}`;
+        return idl.getFQName(decl);
     }
 }
 ETSDeclarationNameConvertor.I = new ETSDeclarationNameConvertor();
 export class ETSFeatureNameConvertor extends DeclarationNameConvertor {
     convertEnum(decl) {
-        const namespace = idl.getNamespacesPathFor(decl).map(it => it.name).join('');
-        return `${namespace ? `${namespace}_` : ``}${decl.name}`;
+        const namespace = idl.getNamespacesPathFor(decl).map(it => it.name);
+        if (namespace.length > 0)
+            return namespace[0];
+        return decl.name;
     }
 }
 ETSFeatureNameConvertor.I = new ETSFeatureNameConvertor();

package/build/lib/src/peer-generation/idl/common.js

@@ -39,9 +39,9 @@ export function qualifiedName(decl, languageOrDelimiter) {
     const delimiter = typeof languageOrDelimiter === "string"
         ? languageOrDelimiter
         : (languageOrDelimiter === Language.CPP ? '_' : '.');
-    if (idl.isEntry(decl) && decl.namespace)
-        return qualifiedName(decl.namespace, delimiter) + delimiter + idl.forceAsNamedNode(decl).name;
-    return idl.forceAsNamedNode(decl).name;
+    if (!idl.isEntry(decl))
+        throw new Error(`Expected to have an IDLEntry, got ${idl.IDLKind[decl.kind]}`);
+    return idl.getFQName(decl).split(".").join(delimiter);
 }
 export function collapseTypes(types, name) {
     const seenNames = new Set();

package/build/lib/src/util.d.ts

@@ -1,4 +1,5 @@
 import * as ts from "typescript";
+import * as idl from "./idl";
 import { Language } from './Language';
 export interface NameWithType {
     name?: ts.DeclarationName;
@@ -80,4 +81,5 @@ export declare class Lazy<T> {
     get value(): T;
 }
 export declare function lazy<T>(factory: () => T): Lazy<T>;
+export declare function isInNamespace(node: idl.IDLEntry): boolean;
 //# sourceMappingURL=util.d.ts.map

package/build/lib/src/util.js

@@ -15,6 +15,7 @@
 import * as path from 'path';
 import * as fs from "fs";
 import * as ts from "typescript";
+import * as idl from "./idl";
 import { Language } from './Language';
 /** True if this is visible outside this file, false otherwise */
 export function isNodePublic(node) {
@@ -635,4 +636,7 @@ export class Lazy {
 export function lazy(factory) {
     return new Lazy(factory);
 }
+export function isInNamespace(node) {
+    return idl.getNamespacesPathFor(node).length > 0;
+}
 //# sourceMappingURL=util.js.map

package/build/lib/src/visitor.js

@@ -103,7 +103,7 @@ export class IDLDependencyCollector {
     }
     visitSupertype(type) {
         if (idl.isInterface(type)) {
-            return this.walk(idl.createReferenceType(type.name, undefined, type));
+            return this.walk(idl.createReferenceType(type));
         }
         return this.walk(type);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idlizer/core",
-  "version": "2.0.31",
+  "version": "2.0.33",
   "description": "",
   "types": "build/lib/src/index.d.ts",
   "exports": {

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),
             );