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

package/build/libarkts-copy/src/wrapper-compat/arkts-api/node-utilities/TSInterfaceDeclaration.ts

@@ -14,7 +14,7 @@
  */
 
 import { TSInterfaceDeclaration, TSInterfaceHeritage } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { AstNode } from '../peers/AstNode';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
 

package/build/libarkts-copy/src/wrapper-compat/arkts-api/node-utilities/TSTypeAliasDeclaration.ts

@@ -14,7 +14,7 @@
  */
 
 import { Identifier, TSTypeAliasDeclaration, TSTypeParameterDeclaration, TypeNode } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
 
 export function updateTSTypeAliasDeclaration(

package/build/libarkts-copy/src/wrapper-compat/arkts-api/node-utilities/TSTypeParameter.ts

@@ -14,7 +14,7 @@
  */
 
 import { Identifier, TSTypeParameter, TypeNode } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
 
 export function updateTSTypeParameter(

package/build/libarkts-copy/src/wrapper-compat/arkts-api/node-utilities/TryStatement.ts

@@ -15,7 +15,7 @@
 
 import { LabelPair } from '../../../generated/peers/LabelPair';
 import { BlockStatement, CatchClause, Statement, TryStatement } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
 
 export function updateTryStatement(
@@ -30,8 +30,8 @@ export function updateTryStatement(
         isSameNativeObject(block, original.block) &&
         isSameNativeObject(catchClauses, original.catchClauses) &&
         isSameNativeObject(finalizer, original.finallyBlock)
-        /* TODO: no getter for finalizerInsertionsLabelPair */
-        /* TODO: no getter for finalizerInsertionsStatement */
+        /* Improve: no getter for finalizerInsertionsLabelPair */
+        /* Improve: no getter for finalizerInsertionsStatement */
     ) {
         return original;
     }

package/build/libarkts-copy/src/wrapper-compat/arkts-api/node-utilities/VariableDeclaration.ts

@@ -14,7 +14,7 @@
  */
 
 import { KInt } from '@koalaui/interop';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { VariableDeclaration, VariableDeclarator } from '../types';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
 import { Es2pandaVariableDeclarationKind } from '../../../generated/Es2pandaEnums';

package/build/libarkts-copy/src/wrapper-compat/arkts-api/node-utilities/VariableDeclarator.ts

@@ -14,7 +14,7 @@
  */
 
 import { Identifier } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { VariableDeclarator } from '../types';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
 import { Es2pandaVariableDeclaratorFlag } from '../../../generated/Es2pandaEnums';
@@ -29,7 +29,7 @@ export function updateVariableDeclarator(
     if (
         isSameNativeObject(name, original.name) &&
         isSameNativeObject(initializer, original.initializer)
-        /* TODO: no getter for flag */
+        /* Improve: no getter for flag */
     ) {
         return original;
     }

package/build/libarkts-copy/src/wrapper-compat/arkts-api/peers/Diagnostic.ts

@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-import { ArktsObject } from './ArktsObject';
+import { ArktsObject } from '../../../arkts-api/peers/ArktsObject';
 import { global } from '../static/global';
 import { KNativePointer } from '@koalaui/interop';
 import { DiagnosticKind } from './DiagnosticKind';
 import { passStringArray } from '../utilities/private';
-import { SourcePosition } from './SourcePosition';
+import { SourcePosition } from '../../../arkts-api/peers/SourcePosition';
 import { SourceRange } from './SourceRange';
 import { DiagnosticInfo } from './DiagnosticInfo';
 import { SuggestionInfo } from './SuggestionInfo';
@@ -31,9 +31,8 @@ export class Diagnostic extends ArktsObject {
     global.es2panda._LogDiagnostic(global.context, kind.peer, passStringArray(args), args.length, pos.peer);
   }
 
-  static logDiagnosticWithSuggestion(diagnosticInfo: DiagnosticInfo, suggestionInfo: SuggestionInfo,
-    range: SourceRange): void {
-    global.es2panda._LogDiagnosticWithSuggestion(global.context, diagnosticInfo.peer, suggestionInfo.peer, range.peer);
+  static logDiagnosticWithSuggestion(diagnosticInfo: DiagnosticInfo, suggestionInfo: SuggestionInfo): void {
+    global.es2panda._LogDiagnosticWithSuggestion(global.context, diagnosticInfo.peer, suggestionInfo.peer);
   }
 
 }

package/build/libarkts-copy/src/wrapper-compat/arkts-api/peers/DiagnosticInfo.ts

@@ -13,10 +13,11 @@
  * limitations under the License.
  */
 
-import { ArktsObject } from './ArktsObject';
+import { ArktsObject } from '../../../arkts-api/peers/ArktsObject';
 import { global } from '../static/global';
 import { KNativePointer } from '@koalaui/interop';
 import { DiagnosticKind } from './DiagnosticKind';
+import { SourcePosition } from "./SourcePosition";
 import { passStringArray } from '../utilities/private';
 
 export class DiagnosticInfo extends ArktsObject {
@@ -24,9 +25,9 @@ export class DiagnosticInfo extends ArktsObject {
     super(peer);
   }
 
-  static create(kind: DiagnosticKind, ...args: string[]): DiagnosticInfo {
+  static create(kind: DiagnosticKind, pos: SourcePosition, ...args: string[]): DiagnosticInfo {
     return new DiagnosticInfo(
-      global.es2panda._CreateDiagnosticInfo(global.context, kind.peer, passStringArray(args), args.length)
+      global.es2panda._CreateDiagnosticInfo(global.context, kind.peer, passStringArray(args), args.length, pos.peer)
     );
   }
 

package/build/libarkts-copy/src/wrapper-compat/arkts-api/peers/DiagnosticKind.ts

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { ArktsObject } from './ArktsObject';
+import { ArktsObject } from '../../../arkts-api/peers/ArktsObject';
 import { global } from '../static/global';
 import { KNativePointer } from '@koalaui/interop';
 import { Es2pandaPluginDiagnosticType as PluginDiagnosticType } from '../../../generated/Es2pandaEnums';

package/build/libarkts-copy/src/wrapper-compat/arkts-api/peers/ImportPathManager.ts

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { ArktsObject } from "./ArktsObject"
+import { ArktsObject } from "../../../arkts-api/peers/ArktsObject"
 import { global } from "../static/global"
 import { KNativePointer } from "@koalaui/interop"
 
@@ -29,6 +29,6 @@ export class ImportPathManager extends ArktsObject {
     }
 
     resolvePath(currentModulePath: string, importPath: string): string {
-        return ''; // TODO: no longer support this.
+        return ''; // Improve: no longer support this.
     }
 }

package/build/libarkts-copy/src/wrapper-compat/arkts-api/peers/Program.ts

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { ArktsObject } from "./ArktsObject"
+import { ArktsObject } from "../../../arkts-api/peers/ArktsObject"
 import { global } from "../static/global"
 import { acceptNativeObjectArrayResult, unpackString } from "../utilities/private"
 import { KNativePointer } from "@koalaui/interop"

package/build/libarkts-copy/src/wrapper-compat/arkts-api/peers/SourcePosition.ts

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { ArktsObject } from "./ArktsObject"
+import { ArktsObject } from "../../../arkts-api/peers/ArktsObject"
 import { global } from "../static/global"
 import { KNativePointer } from "@koalaui/interop"
 
@@ -35,4 +35,4 @@ export class SourcePosition extends ArktsObject {
     line(): number {
         return global.es2panda._SourcePositionLine(global.context, this.peer);
     }
-}
+}

package/build/libarkts-copy/src/wrapper-compat/arkts-api/peers/SourceRange.ts

@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SourcePosition } from './SourcePosition';
-import { ArktsObject } from './ArktsObject';
+import { SourcePosition } from '../../../arkts-api/peers/SourcePosition';
+import { ArktsObject } from '../../../arkts-api/peers/ArktsObject';
 import { global } from '../static/global';
 import { KNativePointer } from '@koalaui/interop';
 

package/build/libarkts-copy/src/wrapper-compat/arkts-api/peers/SuggestionInfo.ts

@@ -13,20 +13,21 @@
  * limitations under the License.
  */
 
-import { ArktsObject } from './ArktsObject';
+import { ArktsObject } from '../../../arkts-api/peers/ArktsObject';
 import { global } from '../static/global';
 import { KNativePointer } from '@koalaui/interop';
 import { DiagnosticKind } from './DiagnosticKind';
 import { passStringArray } from '../utilities/private';
+import { SourceRange } from './SourceRange';
 
 export class SuggestionInfo extends ArktsObject {
   constructor(peer: KNativePointer) {
     super(peer);
   }
 
-  static create(kind: DiagnosticKind, substitutionCode: string, ...args: string[]): SuggestionInfo {
+  static create(kind: DiagnosticKind, substitutionCode: string, range: SourceRange, ...args: string[]): SuggestionInfo {
     return new SuggestionInfo(
-      global.es2panda._CreateSuggestionInfo(global.context, kind.peer, passStringArray(args), args.length, substitutionCode)
+      global.es2panda._CreateSuggestionInfo(global.context, kind.peer, passStringArray(args), args.length, substitutionCode, range.peer)
     );
   }
 

package/build/libarkts-copy/src/wrapper-compat/arkts-api/to-be-generated/MemberExpression.ts

@@ -92,7 +92,7 @@ export class MemberExpression extends Expression {
     }
 
     get optional(): boolean {
-        return false; // todo: no corresponding method in es2panda
+        return false; // Improve: no corresponding method in es2panda
     }
 
     /** @deprecated */

package/build/libarkts-copy/src/wrapper-compat/arkts-api/types.ts

@@ -35,9 +35,9 @@ import {
     updatePeerByNode,
 } from './utilities/private';
 import { proceedToState } from './utilities/public';
-import { AstNode } from './peers/AstNode';
-import { Config } from './peers/Config';
-import { Context } from './peers/Context';
+import { AstNode } from '../../arkts-api/peers/AstNode';
+import { Config } from '../../arkts-api/peers/Config';
+import { Context } from '../../arkts-api/peers/Context';
 import { nodeByType } from './class-by-peer';
 import { MemberExpression } from './to-be-generated/MemberExpression';
 import {
@@ -45,6 +45,7 @@ import {
     ArrayExpression,
     BlockStatement,
     ClassDefinition,
+    ETSModule,
     ETSTypeReference,
     ETSTypeReferencePart,
     Expression,
@@ -56,14 +57,8 @@ import {
     TSTypeParameterInstantiation,
     TypeNode,
 } from '../../generated';
-import { createCallExpression, updateCallExpression } from 'src/arkts-api/node-utilities/CallExpression';
-
-export class EtsScript extends AstNode {
-    constructor(peer: KPtr) {
-        assertValidPeer(peer, Es2pandaAstNodeType.AST_NODE_TYPE_ETS_MODULE);
-        super(peer);
-    }
 
+export class EtsScript extends ETSModule {
     static fromContext(): EtsScript {
         console.log('[TS WRAPPER] GET AST FROM CONTEXT');
         return new EtsScript(
@@ -81,7 +76,7 @@ export class EtsScript extends AstNode {
         if (!global.configIsInitialized()) {
             global.config = Config.createDefault().peer;
         }
-        global.compilerContext = Context.createFromString(source) as any; // TODO commonize context
+        global.compilerContext = Context.createFromString(source) as any; // Improve: commonize context
         proceedToState(state, global.context);
         return new EtsScript(
             global.es2panda._ProgramAst(global.context, global.es2panda._ContextProgram(global.context))
@@ -100,19 +95,6 @@ export class EtsScript extends AstNode {
         );
         return node;
     }
-
-    get statements(): readonly AstNode[] {
-        return unpackNodeArray(global.generatedEs2panda._BlockStatementStatements(global.context, this.peer));
-    }
-
-    set statements(nodes: readonly AstNode[]) {
-        global.generatedEs2panda._BlockStatementSetStatements(
-            global.context,
-            this.peer,
-            passNodeArray(nodes),
-            nodes.length
-        );
-    }
 }
 
 export class ExpressionStatement extends AstNode {
@@ -145,7 +127,7 @@ export class ExpressionStatement extends AstNode {
     }
 }
 
-// TODO:
+// Improve:
 //  the CallExpression idl Create signature doesn't include the trailing block at all.
 //  Need to clarify with the compiler people if they will provide create signature with a trailing block argument.
 export class CallExpression extends Expression {
@@ -398,13 +380,13 @@ export class FunctionDeclaration extends AstNode {
             global.generatedEs2panda._CreateFunctionDeclaration(
                 global.context,
                 scriptFunction.peer,
-                // TODO: support annotations
+                // Improve: support annotations
                 arrayOfNullptr,
                 0,
                 isAnon
             )
         );
-        // TODO: maybe wrong
+        // Improve: maybe wrong
         res.modifiers = scriptFunction.modifiers;
         if (annotations) {
             res.annotations = annotations;
@@ -423,7 +405,7 @@ export class FunctionDeclaration extends AstNode {
                 global.context,
                 node.peer,
                 scriptFunction.peer,
-                // TODO: support annotations
+                // Improve: support annotations
                 passNodeArray(annotations),
                 0,
                 isAnon
@@ -626,7 +608,7 @@ export class StructDeclaration extends AstNode {
     constructor(peer: KPtr) {
         assertValidPeer(peer, Es2pandaAstNodeType.AST_NODE_TYPE_STRUCT_DECLARATION);
         super(peer);
-        // TODO: is struct definition the same as struct definition?
+        // Improve: is struct definition the same as struct definition?
         this.definition = unpackNonNullableNode(
             global.generatedEs2panda._ClassDeclarationDefinition(global.context, this.peer)
         );
@@ -711,7 +693,7 @@ export class MethodDefinition extends AstNode {
         );
     }
 
-    // TODO: does not work
+    // Improve: does not work
     isConstructor(): boolean {
         return global.generatedEs2panda._MethodDefinitionIsConstructorConst(global.context, this.peer);
     }

package/build/libarkts-copy/src/wrapper-compat/arkts-api/utilities/nativePtrDecoder.ts

@@ -61,7 +61,7 @@ export class NativePtrDecoder extends ArrayDecoder<pointer> {
         return global.interop._GetPtrVectorSize(blob)
     }
     disposeArray(blob: pointer): void {
-        // TODO
+        // Improve:
     }
     getArrayElement(blob: pointer, index: int32): pointer {
         return global.interop._GetPtrVectorElement(blob, index)

package/build/libarkts-copy/src/wrapper-compat/arkts-api/utilities/private.ts

@@ -27,7 +27,7 @@ import { NativePtrDecoder } from './nativePtrDecoder';
 import { Es2pandaModifierFlags, Es2pandaScriptFunctionFlags } from '../../../generated/Es2pandaEnums';
 import { classByPeer } from '../class-by-peer';
 import type { AstNode } from '../peers/AstNode';
-import { ArktsObject } from '../peers/ArktsObject';
+import { ArktsObject } from '../../../arkts-api/peers/ArktsObject';
 import { Es2pandaAstNodeType } from '../../../generated/Es2pandaEnums';
 
 export const arrayOfNullptr = new BigUint64Array([nullptr]);
@@ -128,8 +128,8 @@ export function scriptFunctionHasBody(peer: KNativePointer): boolean {
     );
 }
 
-// TODO: remove this
-// TODO: update scopes and other data
+// Improve: remove this
+// Improve: update scopes and other data
 export function updatePeerByNode<T extends AstNode>(peer: KNativePointer, original: T | undefined): KNativePointer {
     if (peer === nullptr) {
         throwError('updatePeerByNode called on NULLPTR');
@@ -150,7 +150,7 @@ export function updatePeerByNode<T extends AstNode>(peer: KNativePointer, origin
     return peer;
 }
 
-// TODO: update scopes and other data
+// Improve: update scopes and other data
 export function updateNodeByNode<T extends AstNode>(node: T, original: AstNode): T {
     if (original.peer === nullptr) {
         throwError('update called on NULLPTR');

package/build/libarkts-copy/src/wrapper-compat/arkts-api/utilities/public.ts

@@ -40,7 +40,7 @@ import {
 } from '../../../generated';
 import { Program } from '../peers/Program';
 import { clearNodeCache, nodeByType } from '../class-by-peer';
-import { SourcePosition } from '../peers/SourcePosition';
+import { SourcePosition } from '../../../arkts-api/peers/SourcePosition';
 import { MemberExpression } from '../to-be-generated/MemberExpression';
 
 export function proceedToState(state: Es2pandaContextState, context: KNativePointer, forceDtsEmit = false): void {
@@ -166,7 +166,7 @@ export function getAnnotations(node: AstNode): readonly AnnotationUsage[] {
 
 export function getOriginalNode(node: AstNode): AstNode {
     if (node === undefined) {
-        // TODO: fix this
+        // Improve: fix this
         throwError('there is no arkts pair of ts node (unable to getOriginalNode)');
     }
     if (node.originalPeer === nullptr) {
@@ -195,15 +195,15 @@ export function ImportSpecifierIsRemovableConst(node: ImportSpecifier): boolean
     return global.generatedEs2panda._ImportSpecifierIsRemovableConst(global.context, node.peer);
 }
 
-// TODO: It seems like Definition overrides AstNode  modifiers
-// with it's own modifiers which is completely unrelated set of flags.
+// Improve: It seems like Definition overrides AstNode  modifiers
+// with its own modifiers which is completely unrelated set of flags.
 // Use this function if you need
 // the language level modifiers: public, declare, export, etc.
 export function classDefinitionFlags(node: ClassDefinition): Es2pandaModifierFlags {
     return global.generatedEs2panda._AstNodeModifiers(global.context, node.peer);
 }
 
-// TODO: Import statements should be inserted to the statements
+// Improve: Import statements should be inserted to the statements
 export function importDeclarationInsert(node: ETSImportDeclaration, program: Program): void {
     global.es2panda._InsertETSImportDeclarationAndParse(global.context, program.peer, node.peer);
 }
@@ -224,7 +224,7 @@ export function hasModifierFlag(node: AstNode, flag: Es2pandaModifierFlags): boo
     return (modifiers & flag) === flag;
 }
 
-// TODO: ClassProperty's optional flag is set by AstNode's modifiers flags.
+// Improve: ClassProperty's optional flag is set by AstNode's modifiers flags.
 export function classPropertySetOptional(node: ClassProperty, value: boolean): ClassProperty {
     if (value) {
         node.modifiers |= Es2pandaModifierFlags.MODIFIER_FLAGS_OPTIONAL;
@@ -256,14 +256,16 @@ export function generateTsDeclarationsFromContext(
   outputDeclEts: string,
   outputEts: string,
   exportAll: boolean,
-  isolated: boolean
+  isolated: boolean,
+  recordFile: string
 ): KInt {
   return global.es2panda._GenerateTsDeclarationsFromContext(
     global.context,
     passString(outputDeclEts),
     passString(outputEts),
     exportAll,
-    isolated
+    isolated,
+    recordFile
   );
 }
 

package/build/libarkts-copy/src/wrapper-compat/arkts-api/visitor.ts

@@ -64,7 +64,7 @@ import { Es2pandaAstNodeType } from '../../generated/Es2pandaEnums';
 
 type Visitor = (node: AstNode) => AstNode;
 
-// TODO: rethink (remove as)
+// Improve: rethink (remove as)
 function nodeVisitor<T extends AstNode | undefined>(node: T, visitor: Visitor): T {
     if (node === undefined) {
         return node;
@@ -72,7 +72,7 @@ function nodeVisitor<T extends AstNode | undefined>(node: T, visitor: Visitor):
     return visitor(node) as T;
 }
 
-// TODO: rethink (remove as)
+// Improve: rethink (remove as)
 function nodesVisitor<T extends AstNode, TIn extends readonly T[] | undefined>(
     nodes: TIn,
     visitor: Visitor
@@ -97,7 +97,7 @@ export function visitEachChild(node: AstNode, visitor: Visitor): AstNode {
     script = visitInnerExpression(script, visitor);
     script = visitTrivialExpression(script, visitor);
     script = visitLiteral(script, visitor);
-    // TODO
+    // Improve:
     return visitWithoutUpdate(script, visitor);
 }
 
@@ -194,7 +194,7 @@ function visitInnerExpression(node: AstNode, visitor: Visitor): AstNode {
         updated = true;
         return factory.updateProperty(node, node.key, nodeVisitor(node.value, visitor));
     }
-    // TODO
+    // Improve:
     return node;
 }
 
@@ -211,7 +211,7 @@ function visitTrivialExpression(node: AstNode, visitor: Visitor): AstNode {
             node.operatorType
         );
     }
-    // TODO
+    // Improve:
     return node;
 }
 
@@ -245,7 +245,7 @@ function visitDeclaration(node: AstNode, visitor: Visitor): AstNode {
             nodeVisitor(node.typeParams, visitor),
             nodeVisitor(node.body, visitor),
             node.isStatic,
-            // TODO: how do I get it?
+            // Improve: how do I get it?
             true
         );
     }
@@ -258,7 +258,7 @@ function visitDeclaration(node: AstNode, visitor: Visitor): AstNode {
             nodesVisitor(node.declarators, visitor)
         );
     }
-    // TODO
+    // Improve:
     return node;
 }
 
@@ -344,7 +344,7 @@ function visitStatement(node: AstNode, visitor: Visitor): AstNode {
             []
         );
     }
-    // TODO
+    // Improve:
     return node;
 }
 
@@ -389,7 +389,7 @@ function visitDefinitionBody(node: AstNode, visitor: Visitor): AstNode {
             node.isComputed
         );
     }
-    // TODO
+    // Improve:
     return node;
 }
 
@@ -409,7 +409,7 @@ function visitLiteral(node: AstNode, visitor: Visitor): AstNode {
     return node;
 }
 
-// TODO: apply this to all nodes that does not require updating
+// Improve: apply this to all nodes that does not require updating
 function visitWithoutUpdate<T extends AstNode>(node: T, visitor: Visitor): T {
     if (updated) {
         return node;