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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idlizer/arktscgen",
-  "version": "2.1.9-arktscgen-5",
+  "version": "2.1.9-arktscgen-8",
   "description": "",
   "main": "lib/index.js",
   "bin": "lib/index.js",
@@ -19,7 +19,7 @@
   "license": "Apache-2.0",
   "keywords": [],
   "dependencies": {
-    "@idlizer/core": "2.1.9-arktscgen-5",
+    "@idlizer/core": "2.1.9-arktscgen-8",
     "@types/node": "^18.0.0",
     "commander": "^10.0.0",
     "typescript": "^4.9.5"

package/templates/Es2pandaNativeModule.ts

@@ -28,7 +28,7 @@ import {
     KLong
 } from "@koalaui/interop"
 
-// TODO: this type should be in interop
+// Improve: this type should be in interop
 export type KNativePointerArray = BigUint64Array
 
 export class Es2pandaNativeModule {

package/templates/bridges.cc

@@ -15,4 +15,9 @@
 
 #include <common.h>
 
+/*
+ * THIS FILE IS AUTOGENERATED BY arktscgen v%GEN_VERSION%. DO NOT EDIT MANUALLY!
+ * es2panda %SDK_VERSION%
+ */
+
 %GENERATED_PART%

package/build/libarkts-copy/src/arkts-api/CheckedBackFilter.ts

@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2022-2025 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { AnnotationUsage, ClassDefinition, ClassElement, Expression, isArrowFunctionExpression, isClassDefinition, isClassProperty, isETSFunctionType, isETSModule, isETSNewClassInstanceExpression, isScriptFunction, isTSEnumDeclaration, TSEnumDeclaration, TSEnumMember } from "src/generated";
-import { AbstractVisitor } from "./AbstractVisitor";
-import { AstNode } from "./peers/AstNode"
-import { Es2pandaModifierFlags } from "src/generated/Es2pandaEnums";
-import { factory } from "src/generated/factory";
-import { arkts } from "src";
-import { TypeAliasDeclaration } from "@koalaui/ets-tsc";
-
-function filterAnnotations(annotations: AnnotationUsage[]): AnnotationUsage[] {
-    return annotations.filter(it => it.baseName?.name != "OptionalParametersAnnotation")
-}
-
-export abstract class ContextAwareVisitor extends AbstractVisitor {
-    private contextStack: ('global' | 'namespace')[] = ['global']
-    protected get context() {
-        return this.contextStack.at(-1)!
-    }
-    private enter(node:AstNode): () => void {
-        if (isETSModule(node) && node.ident?.name !== 'ETSGLOBAL') {
-            this.contextStack.push('namespace')
-            return () => this.contextStack.pop()
-        }
-        if (isClassDefinition(node) && node.isNamespaceTransformed && node.ident?.name !== 'ETSGLOBAL') {
-            this.contextStack.push('namespace')
-            return () => this.contextStack.pop()
-        }
-        return () => {}
-    }
-
-    visitEachChild(node: AstNode, options?: object): AstNode {
-        const leave = this.enter(node)
-        const r = super.visitEachChild(node, options)
-        leave()
-        return r
-    }
-}
-
-export class CheckedBackFilter extends ContextAwareVisitor {
-    transformInitializer(node: Expression|undefined): Expression|undefined {
-        if (node == undefined) return undefined
-        if (!isETSNewClassInstanceExpression(node)) return node
-        return node.arguments[1]
-    }
-    transformEnum(node: ClassDefinition): AstNode {
-        return TSEnumDeclaration.createTSEnumDeclaration(
-            node.ident,
-            node.body.map(it => {
-                const member: ClassElement = it as ClassElement
-                if (!isClassProperty(member)) return undefined
-                if (isClassProperty(member) && member.id?.name.startsWith("#")) return undefined
-                return factory.createTSEnumMember(
-                    member.key,
-                    this.transformInitializer(member.value),
-                    false
-                )
-            }).filter(it => it != undefined) as TSEnumMember[],
-            false,
-            false,
-            !!(node.modifierFlags & Es2pandaModifierFlags.MODIFIER_FLAGS_DECLARE) && this.context !== 'namespace'
-        )
-    }
-    transformScopedClass(node:ClassDefinition): ClassDefinition {
-        return ClassDefinition.createClassDefinition(
-            node.ident,
-            node.typeParams,
-            node.superTypeParams,
-            node.implements,
-            node.ctor,
-            node.super,
-            node.body,
-            node.modifiers,
-            this.context === 'namespace'
-                ? node.modifierFlags & (~Es2pandaModifierFlags.MODIFIER_FLAGS_DECLARE)
-                : node.modifierFlags
-        )
-    }
-    transformScopedEnum(node:TSEnumDeclaration): TSEnumDeclaration {
-        return TSEnumDeclaration.createTSEnumDeclaration(
-            node.key,
-            node.members,
-            node.isConst,
-            false,
-            !!(node.modifierFlags & Es2pandaModifierFlags.MODIFIER_FLAGS_DECLARE) && this.context !== 'namespace'
-        )
-    }
-    visitor(beforeChildren: AstNode): AstNode {
-        const node = this.visitEachChild(beforeChildren)
-        if (isTSEnumDeclaration(node)) {
-            return this.transformScopedEnum(node)
-        }
-        if (isClassDefinition(node)) {
-            if (node.isEnumTransformed) {
-                return this.transformEnum(node)
-            } else {
-                const transformed = this.context === 'namespace'
-                    ? this.transformScopedClass(node)
-                    : node
-                return transformed.setAnnotations(filterAnnotations([...node.annotations]))
-            }
-        }
-        if (isClassProperty(node)) {
-            return node.setAnnotations(filterAnnotations([...node.annotations]))
-        }
-        if (isArrowFunctionExpression(node)) {
-            return node.setAnnotations(filterAnnotations([...node.annotations]))
-        }
-        if (isETSFunctionType(node)) {
-            return node.setAnnotations(filterAnnotations([...node.annotations]))
-        }
-        if (isScriptFunction(node)) {
-            return node.setAnnotations(filterAnnotations([...node.annotations]))
-        }
-
-        return node
-    }
-}

package/build/libarkts-copy/src/arkts-api/CompileWithCache.ts

@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2025 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Config } from "./peers/Config"
-import { CompilationOptions, PluginContextImpl, ProgramTransformer } from "./plugins"
-import { findStdlib, proceedToState, recheckContext } from "./utilities/public"
-import { global } from "./static/global"
-import { passString, passStringArray } from "./utilities/private"
-import { Context } from "./peers/Context"
-import { Es2pandaContextState } from "../generated/Es2pandaEnums"
-import { Program } from "../generated"
-import { runTransformerOnProgram } from "../plugin-utils"
-import { ProgramProvider } from "./ProgramProvider"
-import { Options } from "./peers/Options"
-
-export interface ProgramInfo {
-    /**
-     * Input to compile (absolute file path)
-     */
-    absoluteName: string
-    /**
-     * Location of output (undefined for external sources)
-     */
-    output: string | undefined
-}
-
-export function getProgramsForPluginApplication(
-    programs: ProgramInfo[],
-) {
-    const programsForCodeGeneration = programs
-        .filter(it => it.output != undefined)
-        .map(it => it.absoluteName)
-    // Generally, it would be ok to return just the list above,
-    // but for experimental purpose let's filter programs that
-    // are mentioned as both codegeneration and caching
-    const programsForCaching = new Set(
-        programs
-        .filter(it => it.output == undefined)
-        .map(it => it.absoluteName)
-    )
-    return programsForCodeGeneration.filter(it => !programsForCaching.has(it))
-}
-
-export function compileWithCache(
-    configPath: string,
-    orderedPrograms: ProgramInfo[],
-    parsedPlugins: ProgramTransformer[] | undefined,
-    checkedPlugins: ProgramTransformer[] | undefined,
-) {
-    if (orderedPrograms.length == 0) {
-        console.log("No files to compile")
-        return
-    }
-    const globalConfig = Config.create(
-        [
-            '_', '--arktsconfig', configPath, '--extension', 'ets', '--stdlib', findStdlib(),
-            orderedPrograms[0].absoluteName // Putting some file here to avoid "Fatal error: Unresolved module name"
-        ]
-    )
-    console.log(orderedPrograms)
-    const globalContext = global.es2panda._CreateGlobalContext(
-        globalConfig.peer,
-        passStringArray(orderedPrograms.map(it => it.absoluteName)),
-        orderedPrograms.length,
-        false
-    )
-
-    const programsForPluginApplication = getProgramsForPluginApplication(
-        orderedPrograms
-    )
-
-    orderedPrograms.forEach((it) => {
-        console.log(">>>", "considering", it.absoluteName)
-        const args = ['_', '--arktsconfig', configPath, '--extension', 'ets', '--stdlib', findStdlib()]
-        if (it.output) {
-            args.push('--output', it.output, it.absoluteName)
-        }
-        const config = Config.create(
-            args
-        )
-        const isExternalProgram = (it.output == undefined)
-        const context = global.es2panda._CreateCacheContextFromFile(
-            config.peer,
-            passString(it.absoluteName),
-            globalContext,
-            isExternalProgram,
-        )
-
-        global.config = config.peer
-        global.compilerContext = new Context(context)
-        const options = Options.createOptions(new Config(global.config))
-        global.arktsconfig = options.getArkTsConfig()
-
-        function applyPlugins(plugins: ProgramTransformer[] | undefined, state: Es2pandaContextState) {
-            plugins?.forEach(plugin => {
-                const program = new Program(global.es2panda._ContextProgram(context))
-                const provider = new ProgramProvider(program)
-                let currentProgram = provider.next()
-                let isFirstProgram = true
-                while (currentProgram) {
-                    if (
-                        (!isExternalProgram && programsForPluginApplication.includes(currentProgram.absoluteName)) ||
-                        (isExternalProgram && currentProgram.absoluteName == it.absoluteName)
-                     ) {
-                        const options: CompilationOptions = {
-                            isMainProgram: isFirstProgram,
-                            stage: state,
-                            restart: false,
-                        }
-                        runTransformerOnProgram(
-                            currentProgram,
-                            options,
-                            plugin,
-                            new PluginContextImpl(),
-                        )
-                    }
-                    currentProgram = provider.next()
-                    isFirstProgram = false
-                }
-                if (state == Es2pandaContextState.ES2PANDA_STATE_CHECKED) {
-                    recheckContext(context)
-                }
-            })
-        }
-
-        function proceedToParsed() {
-            proceedToState(Es2pandaContextState.ES2PANDA_STATE_PARSED)
-        }
-
-        function applyParsedPlugins() {
-            applyPlugins(parsedPlugins, Es2pandaContextState.ES2PANDA_STATE_PARSED)
-        }
-
-        function proceedToChecked() {
-            proceedToState(Es2pandaContextState.ES2PANDA_STATE_CHECKED)
-        }
-
-        function applyCheckedPlugins() {
-            applyPlugins(checkedPlugins, Es2pandaContextState.ES2PANDA_STATE_CHECKED)
-        }
-
-        function proceedToFinalState() {
-            if (isExternalProgram) {
-                proceedToState(Es2pandaContextState.ES2PANDA_STATE_LOWERED)
-            } else {
-                proceedToState(Es2pandaContextState.ES2PANDA_STATE_BIN_GENERATED)
-            }
-        }
-
-        function cleanup() {
-            global.es2panda._DestroyContext(
-                context
-            )
-            global.es2panda._DestroyConfig(
-                config.peer
-            )
-        }
-
-        const operations = [
-            proceedToParsed,
-            applyParsedPlugins,
-            proceedToChecked,
-            applyCheckedPlugins,
-            proceedToFinalState,
-            cleanup,
-        ]
-
-        operations.forEach(operation => {
-            console.log('>>>', operation.name)
-            operation()
-            console.log('>>>', operation.name, 'OK')
-        })
-    })
-
-    global.es2panda._DestroyGlobalContext(
-        globalContext
-    )
-    global.es2panda._DestroyConfig(
-        globalConfig.peer
-    )
-}

package/build/libarkts-copy/src/arkts-api/InferVoidReturnType.ts

@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { factory } from "./factory/nodeFactory"
-import { isReturnStatement, isScriptFunction, ScriptFunction } from "../generated"
-import { AbstractVisitor } from "./AbstractVisitor"
-import { AstNode } from "./peers/AstNode"
-import { Es2pandaPrimitiveType, Es2pandaScriptFunctionFlags } from "src/generated/Es2pandaEnums"
-
-interface IsScriptFunctionRoot {
-    isScriptFunctionRoot: boolean
-}
-
-// TODO: this is to workaround compiler not beeing able to infer return type on recheck
-class CheckReturns extends AbstractVisitor {
-    visitor(node: AstNode, options?: IsScriptFunctionRoot): AstNode {
-        if (isReturnStatement(node) && node.argument !== undefined) {
-            this.seenNonVoidReturn = true
-        }
-        if (isScriptFunction(node) && !options?.isScriptFunctionRoot) {
-            return node
-        }
-        return this.visitEachChild(node)
-    }
-
-    seenNonVoidReturn: boolean = false
-    static instance?: CheckReturns
-}
-
-// This function checks that it is possible to infer return type of script function as void
-function checkReturns(node: AstNode): boolean {
-    if (!CheckReturns.instance) {
-        CheckReturns.instance = new CheckReturns()
-    }
-    CheckReturns.instance.seenNonVoidReturn = false
-    CheckReturns.instance.visitor(node, { isScriptFunctionRoot: true })
-    return CheckReturns.instance.seenNonVoidReturn == false
-}
-
-class InferVoidReturnType extends AbstractVisitor {
-    visitor(node: AstNode): AstNode {
-        const result = this.visitEachChild(node)
-        if (isScriptFunction(result) &&
-            result.returnTypeAnnotation === undefined &&
-            !result.isConstructor && // constructors should not have return type
-            (result.flags & Es2pandaScriptFunctionFlags.SCRIPT_FUNCTION_FLAGS_SETTER) == 0 // setters should not return void
-        ) {
-            const isVoid = checkReturns(result)
-            if (isVoid) {
-                return factory.updateScriptFunction(
-                    result,
-                    result.body,
-                    result.typeParams,
-                    result.params,
-                    factory.createETSPrimitiveType(
-                        Es2pandaPrimitiveType.PRIMITIVE_TYPE_VOID,
-                    ),
-                    result.hasReceiver,
-                    result.flags,
-                    result.modifierFlags,
-                    result.id,
-                    result.annotations,
-                )
-            }
-        }
-        return result
-    }
-
-    static instance?: InferVoidReturnType
-}
-
-export function inferVoidReturnType(node: AstNode) {
-    if (!InferVoidReturnType.instance) {
-        InferVoidReturnType.instance = new InferVoidReturnType()
-    }
-    InferVoidReturnType.instance.visitor(node)
-}

package/build/libarkts-copy/src/arkts-api/SetBaseOverloads.ts

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { factory } from "./factory/nodeFactory"
-import { isMethodDefinition } from "../generated"
-import { AbstractVisitor } from "./AbstractVisitor"
-import { AstNode } from "./peers/AstNode"
-
-export class SetBaseOverloads extends AbstractVisitor {
-    visitor(node: AstNode): AstNode {
-        if (isMethodDefinition(node)) {
-            const baseOverloadMethod = node
-            return factory.updateMethodDefinition(
-                node,
-                node.kind,
-                node.key,
-                node.value,
-                node.modifierFlags,
-                node.isComputed,
-                node.overloads.map((it) => {
-                    it.setBaseOverloadMethod(baseOverloadMethod)
-                    return it
-                })
-            )
-        }
-        return this.visitEachChild(node)
-    }
-}
-
-export function setBaseOverloads(node: AstNode) {
-    new SetBaseOverloads().visitor(node)
-}

package/build/libarkts-copy/src/arkts-api/node-utilities/AnnotationUsage.ts

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { AnnotationUsage, Expression } from '../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
-
-// TODO generate this function
-export function updateAnnotationUsage(original: AnnotationUsage, expr?: Expression): AnnotationUsage {
-    if (isSameNativeObject(expr, original.expr)) {
-        return original;
-    }
-
-    const newNode = AnnotationUsage.updateAnnotationUsage(original, expr);
-    original.onUpdate(newNode)
-    return newNode
-}
-

package/build/libarkts-copy/src/arkts-api/node-utilities/ArrowFunctionExpression.ts

@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { ArrowFunctionExpression, AnnotationUsage, ScriptFunction } from "../../generated"
-import { isSameNativeObject } from "../peers/ArktsObject"
-import { updateNodeByNode } from "../utilities/private"
-
-export function createArrowFunctionExpression(
-    func?: ScriptFunction,
-    annotations?: readonly AnnotationUsage[],
-): ArrowFunctionExpression {
-    const res = ArrowFunctionExpression.createArrowFunctionExpression(
-        func
-    )
-    if (annotations) {
-        res.setAnnotations(annotations)
-    }
-    return res
-}
-
-export function updateArrowFunctionExpression(
-    original: ArrowFunctionExpression,
-    func?: ScriptFunction,
-    annotations?: readonly AnnotationUsage[],
-): ArrowFunctionExpression {
-    if (isSameNativeObject(original.function, func)
-        && isSameNativeObject(original.annotations, annotations)) {
-        return original
-    }
-    return updateNodeByNode(
-        createArrowFunctionExpression(
-            func,
-            annotations,
-        ),
-        original
-    )
-}

package/build/libarkts-copy/src/arkts-api/node-utilities/ClassDeclaration.ts

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2025 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {
-    ClassDeclaration,
-    ClassDefinition,
-} from "../../generated"
-import { isSameNativeObject } from "../peers/ArktsObject"
-import { updateNodeByNode } from "../utilities/private"
-import { Es2pandaModifierFlags } from "../../generated/Es2pandaEnums"
-
-export function createClassDeclaration(
-    def?: ClassDefinition,
-    modifierFlags?: Es2pandaModifierFlags,
-): ClassDeclaration {
-    const res = ClassDeclaration.createClassDeclaration(
-        def,
-    )
-    if (modifierFlags) {
-        res.modifierFlags = modifierFlags
-    }
-    return res
-}
-
-export function updateClassDeclaration(
-    original: ClassDeclaration,
-    def?: ClassDefinition,
-    modifierFlags?: Es2pandaModifierFlags,
-): ClassDeclaration {
-    if (isSameNativeObject(def, original.definition)
-        && isSameNativeObject(modifierFlags, original.modifierFlags)
-    ) {
-        return original
-    }
-    return updateNodeByNode(
-        createClassDeclaration(
-            def,
-            modifierFlags,
-        ),
-        original
-    )
-}