@idlizer/arktscgen 2.1.9-arktscgen-5 → 2.1.9-arktscgen-8

package/build/libarkts-copy/src/generated/peers/TSTypeParameterDeclaration.ts

@@ -38,7 +38,7 @@ import { TSTypeParameter } from "./TSTypeParameter"
 
 export class TSTypeParameterDeclaration extends Expression {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 119)
+        assertValidPeer(pointer, 121)
         super(pointer)
     }
     static createTSTypeParameterDeclaration(params: readonly TSTypeParameter[], requiredParams: number): TSTypeParameterDeclaration {

package/build/libarkts-copy/src/generated/peers/TSTypeParameterInstantiation.ts

@@ -38,7 +38,7 @@ import { TypeNode } from "./TypeNode"
 
 export class TSTypeParameterInstantiation extends Expression {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 120)
+        assertValidPeer(pointer, 122)
         super(pointer)
     }
     static createTSTypeParameterInstantiation(params: readonly TypeNode[]): TSTypeParameterInstantiation {

package/build/libarkts-copy/src/generated/peers/TSTypePredicate.ts

@@ -38,7 +38,7 @@ import { TypeNode } from "./TypeNode"
 
 export class TSTypePredicate extends TypeNode {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 121)
+        assertValidPeer(pointer, 123)
         super(pointer)
     }
     static createTSTypePredicate(parameterName: Expression | undefined, typeAnnotation: TypeNode | undefined, asserts: boolean): TSTypePredicate {

package/build/libarkts-copy/src/generated/peers/TSTypeQuery.ts

@@ -38,7 +38,7 @@ import { TypeNode } from "./TypeNode"
 
 export class TSTypeQuery extends TypeNode {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 137)
+        assertValidPeer(pointer, 139)
         super(pointer)
     }
     static createTSTypeQuery(exprName?: Expression): TSTypeQuery {

package/build/libarkts-copy/src/generated/peers/TSTypeReference.ts

@@ -40,7 +40,7 @@ import { TypeNode } from "./TypeNode"
 
 export class TSTypeReference extends TypeNode {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 128)
+        assertValidPeer(pointer, 130)
         super(pointer)
     }
     static createTSTypeReference(typeName?: Expression, typeParams?: TSTypeParameterInstantiation): TSTypeReference {

package/build/libarkts-copy/src/generated/peers/TSUndefinedKeyword.ts

@@ -37,7 +37,7 @@ import { TypeNode } from "./TypeNode"
 
 export class TSUndefinedKeyword extends TypeNode {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 95)
+        assertValidPeer(pointer, 97)
         super(pointer)
     }
     static createTSUndefinedKeyword(): TSUndefinedKeyword {

package/build/libarkts-copy/src/generated/peers/TSUnionType.ts

@@ -37,7 +37,7 @@ import { TypeNode } from "./TypeNode"
 
 export class TSUnionType extends TypeNode {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 103)
+        assertValidPeer(pointer, 105)
         super(pointer)
     }
     static createTSUnionType(types: readonly TypeNode[]): TSUnionType {

package/build/libarkts-copy/src/generated/peers/TSUnknownKeyword.ts

@@ -37,7 +37,7 @@ import { TypeNode } from "./TypeNode"
 
 export class TSUnknownKeyword extends TypeNode {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 96)
+        assertValidPeer(pointer, 98)
         super(pointer)
     }
     static createTSUnknownKeyword(): TSUnknownKeyword {

package/build/libarkts-copy/src/generated/peers/TSVoidKeyword.ts

@@ -37,7 +37,7 @@ import { TypeNode } from "./TypeNode"
 
 export class TSVoidKeyword extends TypeNode {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 94)
+        assertValidPeer(pointer, 96)
         super(pointer)
     }
     static createTSVoidKeyword(): TSVoidKeyword {

package/build/libarkts-copy/src/generated/peers/TaggedTemplateExpression.ts

@@ -39,7 +39,7 @@ import { TemplateLiteral } from "./TemplateLiteral"
 
 export class TaggedTemplateExpression extends Expression {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 141)
+        assertValidPeer(pointer, 143)
         super(pointer)
     }
     static createTaggedTemplateExpression(tag?: Expression, quasi?: TemplateLiteral, typeParams?: TSTypeParameterInstantiation): TaggedTemplateExpression {

package/build/libarkts-copy/src/generated/peers/TemplateElement.ts

@@ -37,7 +37,7 @@ import { Expression } from "./Expression"
 
 export class TemplateElement extends Expression {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 142)
+        assertValidPeer(pointer, 144)
         super(pointer)
     }
     static create1TemplateElement(raw: string, cooked: string): TemplateElement {

package/build/libarkts-copy/src/generated/peers/TemplateLiteral.ts

@@ -38,7 +38,7 @@ import { TemplateElement } from "./TemplateElement"
 
 export class TemplateLiteral extends Expression {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 143)
+        assertValidPeer(pointer, 145)
         super(pointer)
     }
     static createTemplateLiteral(quasis: readonly TemplateElement[], expressions: readonly Expression[], multilineString: string): TemplateLiteral {

package/build/libarkts-copy/src/generated/peers/ThisExpression.ts

@@ -37,7 +37,7 @@ import { Expression } from "./Expression"
 
 export class ThisExpression extends Expression {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 144)
+        assertValidPeer(pointer, 146)
         super(pointer)
     }
     static createThisExpression(): ThisExpression {

package/build/libarkts-copy/src/generated/peers/ThrowStatement.ts

@@ -38,7 +38,7 @@ import { Statement } from "./Statement"
 
 export class ThrowStatement extends Statement {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 146)
+        assertValidPeer(pointer, 148)
         super(pointer)
     }
     static createThrowStatement(argument?: Expression): ThrowStatement {

package/build/libarkts-copy/src/generated/peers/TryStatement.ts

@@ -40,7 +40,7 @@ import { Statement } from "./Statement"
 
 export class TryStatement extends Statement {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 147)
+        assertValidPeer(pointer, 149)
         super(pointer)
     }
     static createTryStatement(block: BlockStatement | undefined, catchClauses: readonly CatchClause[], finalizer: BlockStatement | undefined, finalizerInsertionsLabelPair: readonly LabelPair[], finalizerInsertionsStatement: readonly Statement[]): TryStatement {

package/build/libarkts-copy/src/generated/peers/TypeofExpression.ts

@@ -37,7 +37,7 @@ import { Expression } from "./Expression"
 
 export class TypeofExpression extends Expression {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 145)
+        assertValidPeer(pointer, 147)
         super(pointer)
     }
     static createTypeofExpression(argument?: Expression): TypeofExpression {

package/build/libarkts-copy/src/generated/peers/UnaryExpression.ts

@@ -38,7 +38,7 @@ import { Expression } from "./Expression"
 
 export class UnaryExpression extends Expression {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 148)
+        assertValidPeer(pointer, 150)
         super(pointer)
     }
     static createUnaryExpression(argument: Expression | undefined, unaryOperator: Es2pandaTokenType): UnaryExpression {

package/build/libarkts-copy/src/generated/peers/UpdateExpression.ts

@@ -38,7 +38,7 @@ import { Expression } from "./Expression"
 
 export class UpdateExpression extends Expression {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 149)
+        assertValidPeer(pointer, 151)
         super(pointer)
     }
     static createUpdateExpression(argument: Expression | undefined, updateOperator: Es2pandaTokenType, isPrefix: boolean): UpdateExpression {

package/build/libarkts-copy/src/generated/peers/VariableDeclaration.ts

@@ -41,16 +41,24 @@ import { VariableDeclarator } from "./VariableDeclarator"
 
 export class VariableDeclaration extends Statement {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 150)
+        assertValidPeer(pointer, 152)
         super(pointer)
     }
-    static createVariableDeclaration(kind: Es2pandaVariableDeclarationKind, declarators: readonly VariableDeclarator[]): VariableDeclaration {
+    static createVariableDeclaration(kind: Es2pandaVariableDeclarationKind, declarators: readonly VariableDeclarator[], annotations?: readonly AnnotationUsage[]): VariableDeclaration {
         const result: VariableDeclaration = new VariableDeclaration(global.generatedEs2panda._CreateVariableDeclaration(global.context, kind, passNodeArray(declarators), declarators.length))
+        if (annotations)
+        {
+            result.setAnnotations(annotations)
+        }
         result.setChildrenParentPtr()
         return result
     }
-    static updateVariableDeclaration(original: VariableDeclaration | undefined, kind: Es2pandaVariableDeclarationKind, declarators: readonly VariableDeclarator[]): VariableDeclaration {
+    static updateVariableDeclaration(original: VariableDeclaration | undefined, kind: Es2pandaVariableDeclarationKind, declarators: readonly VariableDeclarator[], annotations?: readonly AnnotationUsage[]): VariableDeclaration {
         const result: VariableDeclaration = new VariableDeclaration(global.generatedEs2panda._UpdateVariableDeclaration(global.context, passNode(original), kind, passNodeArray(declarators), declarators.length))
+        if (annotations)
+        {
+            result.setAnnotations(annotations)
+        }
         result.setChildrenParentPtr()
         return result
     }

package/build/libarkts-copy/src/generated/peers/VariableDeclarator.ts

@@ -39,7 +39,7 @@ import { TypedStatement } from "./TypedStatement"
 
 export class VariableDeclarator extends TypedStatement {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 151)
+        assertValidPeer(pointer, 153)
         super(pointer)
     }
     static create1VariableDeclarator(flag: Es2pandaVariableDeclaratorFlag, ident?: Expression, init?: Expression): VariableDeclarator {

package/build/libarkts-copy/src/generated/peers/WhileStatement.ts

@@ -39,7 +39,7 @@ import { Statement } from "./Statement"
 
 export class WhileStatement extends LoopStatement {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 152)
+        assertValidPeer(pointer, 154)
         super(pointer)
     }
     static createWhileStatement(test?: Expression, body?: Statement): WhileStatement {

package/build/libarkts-copy/src/generated/peers/YieldExpression.ts

@@ -37,7 +37,7 @@ import { Expression } from "./Expression"
 
 export class YieldExpression extends Expression {
     constructor(pointer: KNativePointer) {
-        assertValidPeer(pointer, 153)
+        assertValidPeer(pointer, 155)
         super(pointer)
     }
     static createYieldExpression(argument: Expression | undefined, isDelegate: boolean): YieldExpression {

package/build/libarkts-copy/src/index.ts

@@ -25,12 +25,8 @@ export * from "./arkts-api/factory/nodeFactory"
 export * from "./arkts-api/visitor"
 export * from "./arkts-api/AbstractVisitor"
 export * from "./arkts-api/ChainExpressionFilter"
-export * from "./arkts-api/CheckedBackFilter"
-export * from "./arkts-api/CompileWithCache"
-export * from "./arkts-api/SetBaseOverloads"
 export * from "./arkts-api/plugins"
 export * from "./arkts-api/ImportStorage"
-export * from "./arkts-api/InferVoidReturnType"
 export * from "./arkts-api/ProgramProvider"
 export * from "./arkts-api/node-utilities/Program"
 export * from "./arkts-api/node-utilities/ArkTsConfig"
@@ -38,6 +34,7 @@ export * from "./arkts-api/node-utilities/ArkTsConfig"
 export * from "./arkts-api/peers/AstNode"
 export * from "./arkts-api/peers/Config"
 export * from "./arkts-api/peers/Context"
+export { GlobalContext } from "./arkts-api/peers/Context"
 export * from "./arkts-api/peers/ExternalSource"
 export * from "./arkts-api/peers/ImportPathManager"
 export * from "./arkts-api/peers/Options"

package/build/libarkts-copy/src/plugin-utils.ts

@@ -17,20 +17,18 @@ import {
     Es2pandaContextState,
     PluginContext,
     ImportStorage,
-    setBaseOverloads,
     arktsGlobal,
     ChainExpressionFilter,
     ProgramTransformer,
     Program,
-    inferVoidReturnType,
     ProgramProvider,
-    CompilationOptions
+    CompilationOptions,
+    dumpProgramSrcFormatted
 } from "./arkts-api"
-import { AstNode } from "./reexport-for-generated"
 
 export interface RunTransformerHooks {
-    onProgramTransformStart?(options: CompilationOptions): void
-    onProgramTransformEnd?(options: CompilationOptions): void
+    onProgramTransformStart?(options: CompilationOptions, program: Program): void
+    onProgramTransformEnd?(options: CompilationOptions, program: Program): void
 }
 
 class ASTCache {
@@ -44,36 +42,50 @@ class ASTCache {
     }
 }
 
+export class DumpingHooks implements RunTransformerHooks {
+    constructor(private state: Es2pandaContextState, private pluginName: string, private dumpAst: boolean = false) {
+        if (process.env.KOALA_DUMP_PLUGIN_AST) {
+            this.dumpAst = true
+        }
+    }
+    onProgramTransformStart(options: CompilationOptions, program: Program) {
+        if (this.dumpAst) {
+            console.log(`BEFORE ${this.pluginName}:`)
+            dumpProgramSrcFormatted(program, true)
+        }
+        if (!options.isMainProgram) arktsGlobal.profiler.transformDepStarted()
+    }
+    onProgramTransformEnd(options: CompilationOptions, program: Program) {
+        if (!options.isMainProgram) arktsGlobal.profiler.transformDepEnded(this.state, this.pluginName)
+        if (this.dumpAst) {
+            console.log(`AFTER ${this.pluginName}:`)
+            dumpProgramSrcFormatted(program, true)
+        }
+    }
+}
+
+
 export function runTransformerOnProgram(program: Program, options: CompilationOptions, transform: ProgramTransformer | undefined, pluginContext: PluginContext, hooks: RunTransformerHooks = {}) {
     // Perform some additional actions before the transformation start
-    hooks.onProgramTransformStart?.(options)
-
-    // AST to be transformed
-    const ast = program.ast
+    hooks.onProgramTransformStart?.(options, program)
 
     // Save currently existing imports in the program
-    const importStorage = new ImportStorage(program, options.stage == Es2pandaContextState.ES2PANDA_STATE_PARSED)
-
-    // Run some common plugins that should be run before plugin usage and depends on the current stage
-    stageSpecificPreFilters(ast, options.stage)
+    const importStorage = new ImportStorage(program, options.state == Es2pandaContextState.ES2PANDA_STATE_PARSED)
 
     // Run the plugin itself
     transform?.(program, options, pluginContext)
 
-    // Run some common plugins that should be run after plugin usage and depends on the current stage
-    stageSpecificPostFilters(ast, options.stage)
-
-    // For oveloads, set additional pointer to base overload to fix AST
-    setBaseOverloads(ast)
+    // Run some common plugins that should be run after plugin usage and depends on the current state
+    stateSpecificPostFilters(program, options.state)
 
     // Update internal import information based on import modification by plugin
     importStorage.update()
 
     // Perform some additional actions after the transformation end
-    hooks.onProgramTransformEnd?.(options)
+    hooks.onProgramTransformEnd?.(options, program)
 }
 
-export function runTransformer(prog: Program, state: Es2pandaContextState, restart: boolean, transform: ProgramTransformer | undefined, pluginContext: PluginContext, hooks: RunTransformerHooks = {}) {
+export function runTransformer(prog: Program, state: Es2pandaContextState, transform: ProgramTransformer | undefined, pluginContext: PluginContext, hooks: RunTransformerHooks = {}) {
     // Program provider used to provide programs to transformer dynamically relative to inserted imports
     const provider = new ProgramProvider(prog)
 
@@ -85,14 +97,12 @@ export function runTransformer(prog: Program, state: Es2pandaContextState, resta
         // Options passed to plugin and hooks
         const options: CompilationOptions = {
             isMainProgram,
-            stage: state,
-            restart,
+            state,
         }
 
         runTransformerOnProgram(currentProgram, options, transform, pluginContext, hooks)
 
-        // The first program is always the main program, so break here if should not proceed external sources
-        if (restart) break
+        // The first program is always the main program
         isMainProgram = false
 
         // Proceed to the next program
@@ -100,18 +110,8 @@ export function runTransformer(prog: Program, state: Es2pandaContextState, resta
     }
 }
 
-function setAllParents(ast: AstNode) {
-    arktsGlobal.es2panda._AstNodeUpdateAll(arktsGlobal.context, ast.peer)
-}
-
-function stageSpecificPreFilters(script: AstNode, state: Es2pandaContextState) {
-    if (state == Es2pandaContextState.ES2PANDA_STATE_CHECKED) {
-        inferVoidReturnType(script)
-    }
-}
-
-function stageSpecificPostFilters(script: AstNode, state: Es2pandaContextState) {
+function stateSpecificPostFilters(program: Program, state: Es2pandaContextState) {
     if (state == Es2pandaContextState.ES2PANDA_STATE_CHECKED) {
-        new ChainExpressionFilter().visitor(script)
+        program.setAst(new ChainExpressionFilter().visitor(program.ast))
     }
 }

package/build/libarkts-copy/src/reexport-for-generated.ts

@@ -31,3 +31,10 @@ export {
 export { nodeByType } from "./arkts-api/class-by-peer"
 export { global } from "./arkts-api/static/global"
 export { Es2pandaMemberExpressionKind } from "./generated/Es2pandaEnums"
+export {
+    extension_ETSModuleGetNamespaceFlag,
+    extension_MethodDefinitionOnUpdate,
+    extension_MethodDefinitionSetChildrenParentPtr,
+    extension_ScriptFunctionGetPreferredReturnTypePointer,
+    extension_ScriptFunctionSetPreferredReturnTypePointer,
+} from "./arkts-api/utilities/extensions"

package/build/libarkts-copy/src/ts-api/factory/nodeFactory.ts

@@ -85,7 +85,7 @@ import {
     ImportSpecifier,
 } from "../types"
 
-// TODO: add flags and base
+// Improve: add flags and base
 export function createNodeFactory() {
     return {
         createSourceFile,
@@ -154,7 +154,7 @@ export function createNodeFactory() {
         return new SourceFile(node)
     }
 
-    // TODO: fix (now doesn't create a new node)
+    // Improve: fix (now doesn't create a new node)
     // @api
     // updateSourceFile(
     //     node: SourceFile,
@@ -315,7 +315,7 @@ export function createNodeFactory() {
     ): VariableDeclaration {
         return new VariableDeclaration(
             arkts.factory.createVariableDeclarator(
-                // TODO: maybe incorrect
+                // Improve: maybe incorrect
                 Es2pandaVariableDeclaratorFlag.VARIABLE_DECLARATOR_FLAG_UNKNOWN,
                 passIdentifier(name, type),
                 passNode(initializer)
@@ -341,7 +341,7 @@ export function createNodeFactory() {
         return new VariableDeclaration(
             arkts.factory.updateVariableDeclarator(
                 node.node,
-                // TODO: maybe incorrect
+                // Improve: maybe incorrect
                 Es2pandaVariableDeclaratorFlag.VARIABLE_DECLARATOR_FLAG_UNKNOWN,
                 passIdentifier(name, type),
                 passNode(initializer)
@@ -867,7 +867,7 @@ export function createNodeFactory() {
         )
     }
 
-    // TODO: rewrite maybe
+    // Improve: rewrite maybe
     // @api
     // createToken(
     //     token: SyntaxKind._
@@ -1017,7 +1017,7 @@ export function createNodeFactory() {
                     passNodeArray(members),
                     // passModifiers(modifiers) | es2panda_ModifierFlags.MODIFIER_FLAGS_PUBLIC | es2panda_ModifierFlags.MODIFIER_FLAGS_STATIC,
                     Es2pandaModifierFlags.MODIFIER_FLAGS_NONE,
-                    // TODO: pass through modifiers
+                    // Improve: pass through modifiers
                     Es2pandaClassDefinitionModifiers.CLASS_DEFINITION_MODIFIERS_NONE,
                     passTypeParams(typeParameters),
                     undefined
@@ -1052,7 +1052,7 @@ export function createNodeFactory() {
                     passNodeArray(members),
                     // passModifiers(modifiers) | es2panda_ModifierFlags.MODIFIER_FLAGS_PUBLIC | es2panda_ModifierFlags.MODIFIER_FLAGS_STATIC,
                     Es2pandaModifierFlags.MODIFIER_FLAGS_NONE,
-                    // TODO: pass through modifiers
+                    // Improve: pass through modifiers
                     Es2pandaClassDefinitionModifiers.CLASS_DEFINITION_MODIFIERS_NONE,
                     passTypeParams(typeParameters)
                 )
@@ -1109,7 +1109,7 @@ export function createNodeFactory() {
         )
     }
 
-    // TODO: fix modifiers
+    // Improve: fix modifiers
     // @api
     // createMethodDeclaration(
     //     modifiers: readonly ModifierLike[] | undefined,
@@ -1186,7 +1186,7 @@ export function createNodeFactory() {
                 Es2pandaMethodDefinitionKind.METHOD_DEFINITION_KIND_METHOD,
                 _name,
                 arkts.factory.createFunctionExpression(
-                    // TODO: maybe fix
+                    // Improve: maybe fix
                     arkts.factory.updateScriptFunction(
                         node.node.scriptFunction,
                         passNode(body),
@@ -1231,7 +1231,7 @@ export function createNodeFactory() {
                         arkts.FunctionSignature.create(
                             undefined,
                             passNodeArray(parameters),
-                            // TODO: change to void maybe
+                            // Improve: change to void maybe
                             undefined
                         ),
                         passModifiersToScriptFunction(modifiers) | Es2pandaScriptFunctionFlags.SCRIPT_FUNCTION_FLAGS_CONSTRUCTOR,
@@ -1269,14 +1269,14 @@ export function createNodeFactory() {
                 Es2pandaMethodDefinitionKind.METHOD_DEFINITION_KIND_CONSTRUCTOR,
                 _name,
                 arkts.factory.createFunctionExpression(
-                    // TODO: maybe fix
+                    // Improve: maybe fix
                     arkts.factory.updateScriptFunction(
                         node.node.scriptFunction,
                         passNode(body),
                         arkts.FunctionSignature.create(
                             undefined,
                             passNodeArray(parameters),
-                            // TODO: change to void maybe
+                            // Improve: change to void maybe
                             undefined
                         ),
                         passModifiersToScriptFunction(modifiers) | Es2pandaScriptFunctionFlags.SCRIPT_FUNCTION_FLAGS_CONSTRUCTOR,
@@ -1324,7 +1324,7 @@ export function createNodeFactory() {
         expression: Expression
     ): ParenthesizedExpression {
         return expression
-        // TODO:
+        // Improve:
         // return new ParenthesizedExpression(
         //     expression
         // )
@@ -1340,7 +1340,7 @@ export function createNodeFactory() {
         expression: Expression
     ): ParenthesizedExpression {
         return expression
-        // TODO:
+        // Improve:
         // return new ParenthesizedExpression(
         //     expression
         // )

package/build/libarkts-copy/src/ts-api/index.ts

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-// TODO: remove private export
+// Improve: remove private export
 export * from "./utilities/private"
 export * from "./utilities/public"
 export * from "./types"