@idlizer/core 2.1.9-arktscgen-6 → 2.1.9-arktscgen-9

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

@@ -1,13 +1,14 @@
 import { stringOrNone } from "./util";
 export declare class IndentedPrinter {
     private output;
-    constructor(output?: string[]);
     private indent;
+    constructor(output?: string[], indent?: number);
     print(value: stringOrNone): void;
     pushIndent(level?: number): void;
     popIndent(level?: number): void;
     indentDepth(): number;
     append(printer: IndentedPrinter): void;
+    appendLastString(value: stringOrNone): void;
     private indented;
     getOutput(): string[];
     printTo(file: string): void;

package/build/lib/src/IndentedPrinter.js

@@ -16,9 +16,9 @@ import * as fs from "fs";
 import { indentedBy } from "./util";
 import path from "path";
 export class IndentedPrinter {
-    constructor(output = []) {
+    constructor(output = [], indent = 0) {
         this.output = output;
-        this.indent = 0;
+        this.indent = indent;
     }
     print(value) {
         if (value != undefined)
@@ -36,6 +36,13 @@ export class IndentedPrinter {
     append(printer) {
         this.output = [...this.output, ...printer.output];
     }
+    appendLastString(value) {
+        if (value != undefined) {
+            let last = this.output.pop();
+            last = last ? last.concat(value) : value;
+            this.output.push(last);
+        }
+    }
     indented(input) {
         return indentedBy(input, this.indent);
     }

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

@@ -1,7 +1,6 @@
 export declare class Language {
     name: string;
     extension: string;
-    needsUnionDiscrimination: boolean;
     static TS: Language;
     static ARKTS: Language;
     static JAVA: Language;

package/build/lib/src/Language.js

@@ -13,10 +13,9 @@
  * limitations under the License.
  */
 export class Language {
-    constructor(name, extension, needsUnionDiscrimination) {
+    constructor(name, extension) {
         this.name = name;
         this.extension = extension;
-        this.needsUnionDiscrimination = needsUnionDiscrimination;
     }
     toString() {
         return this.name;
@@ -36,10 +35,10 @@ export class Language {
         }
     }
 }
-Language.TS = new Language("TS", ".ts", true);
-Language.ARKTS = new Language("ArkTS", ".ts", true); // using .ts for ArkTS until we get rit of tsc preprocessing
-Language.JAVA = new Language("Java", ".java", false);
-Language.CPP = new Language("C++", ".cc", false);
-Language.CJ = new Language("CangJie", ".cj", false);
-Language.KOTLIN = new Language("Kotlin", ".kt", false);
+Language.TS = new Language("TS", ".ts");
+Language.ARKTS = new Language("ArkTS", ".ts"); // using .ts for ArkTS until we get rit of tsc preprocessing
+Language.JAVA = new Language("Java", ".java");
+Language.CPP = new Language("C++", ".cc");
+Language.CJ = new Language("CangJie", ".cj");
+Language.KOTLIN = new Language("Kotlin", ".kt");
 //# sourceMappingURL=Language.js.map

package/build/lib/src/LanguageWriters/ArgConvertors.d.ts

@@ -15,7 +15,7 @@ export interface ArgConvertor {
     runtimeTypes: RuntimeType[];
     isOut?: true;
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, writer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     holdResource(resourceName: string, holder: string, writer: LanguageWriter): void;
     interopType(): idl.IDLType;
@@ -42,17 +42,17 @@ export declare abstract class BaseArgConvertor implements ArgConvertor {
     interopType(): idl.IDLType;
     targetType(writer: LanguageWriter): string;
     abstract convertorArg(param: string, writer: LanguageWriter): string;
-    abstract convertorSerialize(param: string, value: string, writer: LanguageWriter): void;
+    abstract convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     abstract convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     unionDiscriminator(value: string, index: number, writer: LanguageWriter, duplicates: Set<string>): LanguageExpression | undefined;
     getMembers(): string[];
     getObjectAccessor(language: Language, value: string, args?: Record<string, string>, writer?: LanguageWriter): string;
-    protected discriminatorFromFields<T>(value: string, writer: LanguageWriter, uniqueFields: T[] | undefined, nameAccessor: (field: T) => string, optionalAccessor: (field: T) => boolean, duplicates: Set<string>): LanguageExpression | undefined;
+    protected discriminatorFromFields<T>(value: string, writer: LanguageWriter, uniqueFields: T[] | undefined, nameAccessor: (field: T) => string, optionalAccessor: (field: T) => boolean): LanguageExpression | undefined;
 }
 export declare class BooleanConvertor extends BaseArgConvertor {
     constructor(param: string);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, printer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -61,7 +61,7 @@ export declare class BooleanConvertor extends BaseArgConvertor {
 export declare class UndefinedConvertor extends BaseArgConvertor {
     constructor(param: string);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, printer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -76,7 +76,7 @@ export declare class StringConvertor extends BaseArgConvertor {
     private literalValue?;
     constructor(param: string);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, writer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -88,7 +88,7 @@ export declare class EnumConvertor extends BaseArgConvertor {
     enumEntry: idl.IDLEnum;
     constructor(param: string, enumEntry: idl.IDLEnum);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, writer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -99,7 +99,7 @@ export declare class EnumConvertor extends BaseArgConvertor {
 export declare class NumberConvertor extends BaseArgConvertor {
     constructor(param: string);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -109,7 +109,7 @@ export declare class NumericConvertor extends BaseArgConvertor {
     private readonly interopNameConvertor;
     constructor(param: string, type: idl.IDLPrimitiveType);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -118,7 +118,7 @@ export declare class NumericConvertor extends BaseArgConvertor {
 export declare class BigIntToU64Convertor extends BaseArgConvertor {
     constructor(param: string);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -127,7 +127,7 @@ export declare class BigIntToU64Convertor extends BaseArgConvertor {
 export declare class ObjectConvertor extends BaseArgConvertor {
     constructor(param: string, type: idl.IDLType);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     holdResource(name: string, holder: string, writer: LanguageWriter): void;
     nativeType(): idl.IDLType;
@@ -137,7 +137,7 @@ export declare class ObjectConvertor extends BaseArgConvertor {
 export declare class PointerConvertor extends BaseArgConvertor {
     constructor(param: string);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -146,7 +146,7 @@ export declare class PointerConvertor extends BaseArgConvertor {
 export declare class BufferConvertor extends BaseArgConvertor {
     constructor(param: string);
     convertorArg(param: string, _: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     convertorDeserialize(_: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -161,7 +161,7 @@ export declare class AggregateConvertor extends BaseArgConvertor {
     readonly aliasName: string | undefined;
     constructor(library: LibraryInterface, param: string, type: idl.IDLType, decl: idl.IDLInterface);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, printer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     protected makeAssigneeExpression(fields: [string, LanguageExpression][], writer: LanguageWriter): LanguageExpression;
     nativeType(): idl.IDLType;
@@ -173,7 +173,7 @@ export declare class AggregateConvertor extends BaseArgConvertor {
 export declare class TupleConvertor extends AggregateConvertor {
     constructor(library: LibraryInterface, param: string, type: idl.IDLType, decl: idl.IDLInterface);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, printer: LanguageWriter): LanguageStatement;
     protected makeAssigneeExpression(fields: [string, LanguageExpression][], writer: LanguageWriter): LanguageExpression;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -185,7 +185,7 @@ export declare class InterfaceConvertor extends BaseArgConvertor {
     declaration: idl.IDLInterface;
     constructor(library: LibraryInterface, name: string, param: string, declaration: idl.IDLInterface);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -204,7 +204,7 @@ export declare class ArrayConvertor extends BaseArgConvertor {
     elementConvertor: ArgConvertor;
     constructor(library: LibraryInterface, param: string, type: idl.IDLContainerType, elementType: idl.IDLType);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, printer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -220,7 +220,7 @@ export declare class MapConvertor extends BaseArgConvertor {
     valueConvertor: ArgConvertor;
     constructor(library: LibraryInterface, param: string, type: idl.IDLType, keyType: idl.IDLType, valueType: idl.IDLType);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, printer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -231,7 +231,7 @@ export declare class MapConvertor extends BaseArgConvertor {
 export declare class DateConvertor extends BaseArgConvertor {
     constructor(param: string);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, writer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -242,7 +242,7 @@ export declare class ProxyConvertor extends BaseArgConvertor {
     constructor(convertor: ArgConvertor, suggestedReference?: idl.IDLReferenceType);
     convertorArg(param: string, writer: LanguageWriter): string;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, printer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
     isPointerType(): boolean;
@@ -258,7 +258,7 @@ export declare class CustomTypeConvertor extends BaseArgConvertor {
     constructor(param: string, customTypeName: string, isGenericType: boolean, tsType: string);
     convertorArg(param: string, writer: LanguageWriter): string;
     /** todo: check */
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, printer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -269,7 +269,7 @@ export declare class OptionConvertor extends BaseArgConvertor {
     private readonly typeConvertor;
     constructor(library: LibraryInterface, param: string, type: idl.IDLType);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, printer: LanguageWriter): LanguageStatement;
     convertorCArg(param: string): string;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
@@ -284,7 +284,7 @@ export declare class UnionConvertor extends BaseArgConvertor {
     private unionChecker;
     constructor(library: LibraryInterface, param: string, type: idl.IDLUnionType);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, printer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -296,7 +296,7 @@ export declare class FunctionConvertor extends BaseArgConvertor {
     private library;
     constructor(library: LibraryInterface, param: string);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, writer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -307,19 +307,7 @@ export declare class MaterializedClassConvertor extends BaseArgConvertor {
     declaration: idl.IDLInterface;
     constructor(library: LibraryInterface, param: string, declaration: idl.IDLInterface);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
-    convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
-    nativeType(): idl.IDLType;
-    interopType(): idl.IDLType;
-    isPointerType(): boolean;
-    unionDiscriminator(value: string, index: number, writer: LanguageWriter, duplicates: Set<string>): LanguageExpression | undefined;
-}
-export declare class ExternalTypeConvertor extends BaseArgConvertor {
-    private library;
-    declaration: idl.IDLInterface;
-    constructor(library: PeerLibrary, param: string, declaration: idl.IDLInterface);
-    convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, printer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -330,7 +318,7 @@ export declare class ImportTypeConvertor extends BaseArgConvertor {
     protected importedName: string;
     constructor(param: string, importedName: string);
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, printer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, printer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter): LanguageStatement;
     nativeType(): idl.IDLType;
     interopType(): idl.IDLType;
@@ -344,11 +332,10 @@ export declare class CallbackConvertor extends BaseArgConvertor {
     private get isTransformed();
     private get transformedDecl();
     convertorArg(param: string, writer: LanguageWriter): string;
-    convertorSerialize(param: string, value: string, writer: LanguageWriter): void;
+    convertorSerialize(param: string, value: string, writer: LanguageWriter): LanguageStatement;
     convertorDeserialize(bufferName: string, deserializerName: string, assigneer: ExpressionAssigner, writer: LanguageWriter, useSyncVersion?: boolean): LanguageStatement;
     nativeType(): idl.IDLType;
     isPointerType(): boolean;
-    unionDiscriminator(value: string, index: number, writer: LanguageWriter, duplicates: Set<string>): LanguageExpression | undefined;
 }
 export declare const CallbackKind = "CallbackKind";
 export declare function generateCallbackKindName(callback: idl.IDLCallback): string;