@idlizer/core 2.1.10-arktscgen-5 → 2.1.10-arktscgen-7

package/build/lib/src/LanguageWriters/writers/TsLanguageWriter.js

@@ -16,7 +16,7 @@ import * as idl from '../../idl';
 import { isOptionalType } from '../../idl';
 import { Language } from '../../Language';
 import { IndentedPrinter } from "../../IndentedPrinter";
-import { AssignStatement, BlockStatement, DelegationType, ExpressionStatement, FieldModifier, IfStatement, LambdaExpression, LanguageWriter, Method, MethodModifier, MethodSignature, NamedMethodSignature, NaryOpExpression, ReturnStatement, StringExpression } from "../LanguageWriter";
+import { ACCESS_MODIFIERS_SET, AssignStatement, BlockStatement, DelegationType, ExpressionStatement, FieldModifier, IfStatement, LambdaExpression, LanguageWriter, Method, MethodModifier, MethodSignature, NamedMethodSignature, NaryOpExpression, ReturnStatement, StringExpression } from "../LanguageWriter";
 import { RuntimeType } from "../common";
 import { rightmostIndexOf } from "../../util";
 import { TSKeywords } from '../../languageSpecificKeywords';
@@ -67,7 +67,7 @@ class TSThrowErrorStatement {
         this.message = message;
     }
     write(writer) {
-        writer.print(`throw new Error("${this.message}")`);
+        writer.print(`throw new Error('${this.message}')`);
     }
 }
 export class TSReturnStatement extends ReturnStatement {
@@ -121,6 +121,7 @@ export class TsTupleAllocStatement {
 export class TSLanguageWriter extends LanguageWriter {
     constructor(printer, resolver, typeConvertor, language = Language.TS) {
         super(printer, resolver, language);
+        this.writingClassBody = false;
         this.typeConvertor = typeConvertor;
     }
     maybeSemicolon() { return ""; }
@@ -159,7 +160,7 @@ export class TSLanguageWriter extends LanguageWriter {
         let abstractClause = isAbstract ? ` abstract` : '';
         this.printer.print(`export${declaredClause}${abstractClause} class ${name}${genericsClause}${extendsClause}${implementsClause} {`);
         this.pushIndent();
-        op(this);
+        this.classOp(() => op(this));
         this.popIndent();
         this.printer.print(`}`);
     }
@@ -201,7 +202,7 @@ export class TSLanguageWriter extends LanguageWriter {
                 value = member.alias;
             }
             else {
-                value = `${member.stringId != undefined ? `"${member.stringId}"` : `${member.numberId}`}`;
+                value = `${member.stringId != undefined ? `'${member.stringId}'` : `${member.numberId}`}`;
             }
             const maybeComma = index < members.length - 1 ? "," : "";
             this.printer.print(`${member.name} = ${value}${maybeComma}`);
@@ -210,6 +211,11 @@ export class TSLanguageWriter extends LanguageWriter {
         this.printer.print("}");
     }
     writeFieldDeclaration(name, type, modifiers, optional, initExpr) {
+        var _a;
+        if (this.writingClassBody && !(modifiers === null || modifiers === void 0 ? void 0 : modifiers.some(m => ACCESS_MODIFIERS_SET.has(m)))) {
+            modifiers = (_a = modifiers === null || modifiers === void 0 ? void 0 : modifiers.slice()) !== null && _a !== void 0 ? _a : [];
+            modifiers.unshift(FieldModifier.PUBLIC);
+        }
         let prefix = this.makeFieldModifiersList(modifiers);
         if (prefix)
             prefix += " ";
@@ -300,7 +306,7 @@ export class TSLanguageWriter extends LanguageWriter {
         for (let i = 0; i < importedFeatures.length; i++) {
             importNodes.push(importedFeatures[i] + (aliases[i] ? ` as ${aliases[i]}` : ``));
         }
-        this.writeExpressionStatement(this.makeString(`import { ${importNodes.join(', ')} } from "${moduleName}"`));
+        this.writeExpressionStatement(this.makeString(`import { ${importNodes.join(', ')} } from '${moduleName}'`));
     }
     writeDeclaration(name, signature, needReturn, needBracket, modifiers, generics) {
         let prefix = !modifiers ? undefined : this.supportedModifiers
@@ -354,6 +360,11 @@ export class TSLanguageWriter extends LanguageWriter {
         var _a;
         return new TSCastExpression(value, this.getNodeName(node), (_a = options === null || options === void 0 ? void 0 : options.unsafe) !== null && _a !== void 0 ? _a : false);
     }
+    instanceOf(value, type) {
+        return idl.IDLContainerUtils.isSequence(type)
+            ? this.makeString(`Array.isArray(${value})`)
+            : super.instanceOf(value, type);
+    }
     typeInstanceOf(type, value, members) {
         if (idl.isInterface(type)) {
             if (idl.isInterfaceSubkind(type)) {
@@ -435,21 +446,34 @@ export class TSLanguageWriter extends LanguageWriter {
     }
     i32FromEnum(value, enumEntry) {
         const enumName = this.getNodeName(enumEntry);
-        if (idl.isEnum(enumEntry) && idl.isStringEnum(enumEntry)) {
-            return this.makeString(`Object.values(${enumName}).indexOf(${value.asString()})`);
+        if (idl.isStringEnum(enumEntry)) {
+            let extractorStatement = this.makeString(`Object.values(${enumName}).indexOf(${value.asString()})`);
+            if (enumEntry.elements.some(it => idl.hasExtAttribute(it, idl.IDLExtendedAttributes.OriginalEnumMemberName))) {
+                extractorStatement = this.makeNaryOp('%', [
+                    extractorStatement,
+                    this.makeString(enumEntry.elements.length.toString())
+                ]);
+            }
+            return extractorStatement;
         }
         return this.makeString(`${value.asString()}.valueOf()`);
     }
-    castToBoolean(value) { return `+${value}`; }
+    castToBoolean(value) { return `!!${value}`; }
     makeCallIsObject(value) {
         return this.makeString(`${value} instanceof Object`);
     }
     escapeKeyword(keyword) {
-        return TSKeywords.has(keyword) ? keyword + "_" : keyword;
+        return TSKeywords.has(keyword) ? keyword + "Val" : keyword;
     }
     discriminate(value, index, type, runtimeTypes) {
         const runtimeTypeList = runtimeTypes.map(ty => "RuntimeType." + RuntimeType[ty]).join(", ");
         return `[${runtimeTypeList}].includes(runtimeType(${value}))`;
     }
+    classOp(op) {
+        const old = this.writingClassBody;
+        this.writingClassBody = true;
+        op();
+        this.writingClassBody = old;
+    }
 }
 //# sourceMappingURL=TsLanguageWriter.js.map