@idlizer/arktscgen 2.1.7 → 2.1.9-arktscgen-5

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

@@ -15,43 +15,16 @@
 
 import { ETSImportDeclaration, StringLiteral } from "../../generated"
 import { isSameNativeObject } from "../peers/ArktsObject"
-import { passNode, passNodeArray, unpackNonNullableNode, updateNodeByNode } from "../utilities/private"
+import { updateNodeByNode } from "../utilities/private"
 import { AstNode } from "../peers/AstNode"
-import { Es2pandaImportFlags, Es2pandaImportKinds } from "../../generated/Es2pandaEnums"
-import { global } from "../static/global"
-import { Program } from "../peers/Program"
-
-export function createETSImportDeclaration(
-    source: StringLiteral | undefined,
-    specifiers: readonly AstNode[],
-    importKind: Es2pandaImportKinds,
-    program: Program,
-    flags: Es2pandaImportFlags
-) {
-    // TODO: check that plugin is on parsed stage
-    const res = unpackNonNullableNode(
-        global.es2panda._ETSParserBuildImportDeclaration(
-            global.context,
-            importKind,
-            passNodeArray(specifiers),
-            specifiers.length,
-            passNode(source),
-            program.peer,
-            flags
-        )
-    )
-    global.es2panda._InsertETSImportDeclarationAndParse(global.context, program.peer, res.peer)
-    // return new ETSImportDeclaration(res.peer)
-    // according to es2panda developers, import declaration is added to ast by compiler
-}
+import { Es2pandaImportKinds } from "../../generated/Es2pandaEnums"
 
 export function updateETSImportDeclaration(
     original: ETSImportDeclaration,
     source: StringLiteral | undefined,
     specifiers: readonly AstNode[],
     importKind: Es2pandaImportKinds
-) {
-    throw new Error("Do not update imports, insert them instead")
+): ETSImportDeclaration {
     if (isSameNativeObject(source, original.source)
         && isSameNativeObject(specifiers, original.specifiers)
         /* no getter for importKind */
@@ -59,11 +32,8 @@ export function updateETSImportDeclaration(
         /* TODO: probably should set importMetadata, but no getter provided yet */
         return original
     }
-    /*
     return updateNodeByNode(
         ETSImportDeclaration.createETSImportDeclaration(source, specifiers, importKind),
         original
     )
-    */
-    return original
 }

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

@@ -21,16 +21,12 @@ export function createETSParameterExpression(
     identOrSpread: AnnotatedExpression | undefined,
     isOptional: boolean,
     initExpr?: Expression,
-    typeAnnotation?: TypeNode,
     annotations?: readonly AnnotationUsage[]
-) {
+): ETSParameterExpression {
     const res = ETSParameterExpression.createETSParameterExpression(identOrSpread, isOptional)
     if (initExpr) {
         res.setInitializer(initExpr)
     }
-    if (typeAnnotation) {
-        res.setTypeAnnotation(typeAnnotation)
-    }
     if (annotations) {
         res.setAnnotations(annotations)
     }
@@ -42,19 +38,17 @@ export function updateETSParameterExpression(
     identOrSpread: AnnotatedExpression | undefined,
     isOptional: boolean,
     initExpr?: Expression,
-    typeAnnotation?: TypeNode,
     annotations?: readonly AnnotationUsage[],
-) {
+): ETSParameterExpression {
     if ((isSameNativeObject(identOrSpread, original.ident) || isSameNativeObject(identOrSpread, original.restParameter))
         && isSameNativeObject(isOptional, original.isOptional)
         && isSameNativeObject(initExpr, original.initializer)
-        && isSameNativeObject(typeAnnotation, original.typeAnnotation)
         && isSameNativeObject(annotations, original.annotations)
     ) {
         return original
     }
     return updateNodeByNode(
-        createETSParameterExpression(identOrSpread, isOptional, initExpr, typeAnnotation, annotations),
+        createETSParameterExpression(identOrSpread, isOptional, initExpr, annotations),
         original
     )
 }

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

@@ -20,7 +20,7 @@ import { updateNodeByNode } from "../utilities/private"
 export function updateETSStructDeclaration(
     original: ETSStructDeclaration,
     def?: ClassDefinition
-) {
+): ETSStructDeclaration {
     if (isSameNativeObject(def, original.definition)) {
         return original
     }

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

@@ -20,7 +20,7 @@ import { updateNodeByNode } from "../utilities/private"
 export function updateETSTuple(
     original: ETSTuple,
     typeList: readonly TypeNode[]
-) {
+): ETSTuple {
     if (isSameNativeObject(typeList, original.tupleTypeAnnotationsList)) {
         return original
     }

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

@@ -25,7 +25,7 @@ export function updateMemberExpression(
     kind: Es2pandaMemberExpressionKind,
     computed: boolean,
     optional_arg: boolean
-) {
+): MemberExpression {
     if (isSameNativeObject(object_arg, original.object)
         && isSameNativeObject(property, original.property)
         && isSameNativeObject(kind, original.kind)

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

@@ -29,7 +29,7 @@ export function createMethodDefinition(
     modifiers: Es2pandaModifierFlags,
     isComputed: boolean,
     overloads?: readonly MethodDefinition[]
-) {
+): MethodDefinition {
     const res = MethodDefinition.createMethodDefinition(
         kind,
         key,
@@ -51,7 +51,7 @@ export function updateMethodDefinition(
     modifiers: Es2pandaModifierFlags,
     isComputed: boolean,
     overloads?: readonly MethodDefinition[]
-) {
+): MethodDefinition {
     if (isSameNativeObject(kind, original.kind)
         && isSameNativeObject(key, original.key)
         && isSameNativeObject(value, original.value)

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

@@ -20,7 +20,7 @@ import { updateNodeByNode } from "../utilities/private"
 
 export function createNumberLiteral(
     value: number
-) {
+): NumberLiteral {
     return new NumberLiteral(
         global.es2panda._CreateNumberLiteral(
             global.context,
@@ -32,7 +32,7 @@ export function createNumberLiteral(
 export function updateNumberLiteral(
     original: NumberLiteral,
     value: number
-) {
+): NumberLiteral {
     if (isSameNativeObject(value.toString(), original.str)) {
         return original
     }

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

@@ -20,7 +20,7 @@ import { nodeType, updateNodeByNode } from "../utilities/private"
 export function updateObjectExpression(
     original: ObjectExpression,
     properties: readonly Expression[]
-) {
+): ObjectExpression {
     if (isSameNativeObject(properties, original.properties)){
         return original
     }

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

@@ -0,0 +1,40 @@
+/*
+ * 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 { ExternalSource } from "../peers/ExternalSource"
+import { acceptNativeObjectArrayResult } from "../utilities/private"
+import { KNativePointer } from "@koalaui/interop"
+import { global } from "../static/global"
+import { Program } from "../../generated"
+
+export function programGetExternalSources(program: Program, context: KNativePointer = global.context): ExternalSource[] {
+    return acceptNativeObjectArrayResult<ExternalSource>(
+        global.es2panda._ProgramExternalSources(context, program.peer),
+        (instance: KNativePointer) => new ExternalSource(instance)
+    )
+}
+
+export function dumpProgramInfo(program: Program) {
+    console.log(`Program info:`)
+    console.log(`\tAbsoluteName:          ${program.absoluteName}`)
+    console.log(`\tFileName:              ${program.fileName}`)
+    console.log(`\tFileNameWithExtension: ${program.fileNameWithExtension}`)
+    console.log(`\tModuleName:            ${program.moduleName}`)
+    console.log(`\tModulePrefix:          ${program.modulePrefix}`)
+    console.log(`\tRelativeFilePath:      ${program.relativeFilePath}`)
+    console.log(`\tResolvedFilePath:      ${program.resolvedFilePath}`)
+    console.log(`\tSourceFileFolder:      ${program.sourceFileFolder}`)
+    console.log(`\tSourceFilePath:        ${program.sourceFilePath}`)
+}

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

@@ -31,7 +31,7 @@ export function createTSInterfaceDeclaration(
     isStatic: boolean,
     isExternal: boolean,
     modifierFlags?: Es2pandaModifierFlags,
-) {
+): TSInterfaceDeclaration {
     const res = TSInterfaceDeclaration.createTSInterfaceDeclaration(
         _extends,
         id,
@@ -55,7 +55,7 @@ export function updateTSInterfaceDeclaration(
     isStatic: boolean,
     isExternal: boolean,
     modifierFlags?: Es2pandaModifierFlags,
-) {
+): TSInterfaceDeclaration {
     if (isSameNativeObject(_extends, original.extends)
         && isSameNativeObject(id, original.id)
         && isSameNativeObject(typeParams, original.typeParams)

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

@@ -24,7 +24,7 @@ export function updateTSTypeParameter(
     constraint: TypeNode | undefined,
     defaultType: TypeNode | undefined,
     flags: Es2pandaModifierFlags
-) {
+): TSTypeParameter {
     if (isSameNativeObject(name, original.name)
         && isSameNativeObject(constraint, original.constraint)
         && isSameNativeObject(defaultType, original.defaultType)

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

@@ -22,7 +22,7 @@ export function updateETSTypeReferencePart(
     name?: Expression,
     typeParams?: TSTypeParameterInstantiation,
     prev?: ETSTypeReferencePart
-) {
+): ETSTypeReferencePart {
     if (isSameNativeObject(name, original.name)
         && isSameNativeObject(typeParams, original.typeParams)
         && isSameNativeObject(prev, original.previous)

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

@@ -40,7 +40,7 @@ export function updateVariableDeclaration(
     kind: Es2pandaVariableDeclarationKind,
     declarators: readonly VariableDeclarator[],
     annotations?: readonly AnnotationUsage[]
-) {
+): VariableDeclaration {
     if (isSameNativeObject(kind, original.kind)
         && isSameNativeObject(declarators, original.declarators)
         && isSameNativeObject(annotations, original.annotations)

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

@@ -23,7 +23,7 @@ export function updateVariableDeclarator(
     flag: Es2pandaVariableDeclaratorFlag,
     ident?: Expression,
     init?: Expression
-) {
+): VariableDeclarator {
     if (isSameNativeObject(flag, original.flag)
         && isSameNativeObject(ident, original.id)
         && isSameNativeObject(init, original.init)

package/build/libarkts-copy/src/arkts-api/peers/ArktsObject.ts

@@ -20,7 +20,9 @@ export abstract class ArktsObject {
         this.peer = peer
     }
 
-    readonly peer: KNativePointer
+    peer: KNativePointer
+
+    public onUpdate(node: ArktsObject) {}
 }
 
 export function isSameNativeObject<T extends ArktsObject | number | string | boolean | undefined>(

package/build/libarkts-copy/src/arkts-api/peers/AstNode.ts

@@ -19,15 +19,18 @@ import { allFlags, unpackNodeArray, unpackNonNullableNode, unpackString } from "
 import { throwError } from "../../utils"
 import { Es2pandaModifierFlags } from "../../generated/Es2pandaEnums"
 import { ArktsObject } from "./ArktsObject"
+import { SourcePosition } from "./SourcePosition"
+import { NodeCache } from "../node-cache"
 
 export abstract class AstNode extends ArktsObject {
     protected constructor(peer: KNativePointer) {
-        global.profiler.createdNodes ++
+        global.profiler.nodeCreated()
         if (isNullPtr(peer)) {
             throwError(`attempted to create AstNode from nullptr`)
         }
         super(peer)
-        this.updateChildren()
+        this.setChildrenParentPtr()
+        NodeCache.addToCache(peer, this)
     }
 
     public get originalPeer(): KNativePointer {
@@ -56,11 +59,12 @@ export abstract class AstNode extends ArktsObject {
         )
     }
 
-    public updateChildren(): void {
+    public setChildrenParentPtr(): this {
         if (this.peer === nullptr) {
-            throwError('updateChildren called on NULLPTR')
+            throwError('AstNodeSetChildrenParentPtr called on NULLPTR')
         }
-        global.es2panda._AstNodeUpdateChildren(global.context, this.peer)
+        global.es2panda._AstNodeSetChildrenParentPtr(global.context, this.peer)
+        return this
     }
 
     public updateModifiers(modifierFlags: KInt | undefined): this {
@@ -95,20 +99,37 @@ export abstract class AstNode extends ArktsObject {
         return unpackString(global.es2panda._AstNodeDumpModifiers(global.context, this.peer))
     }
 
+    // public clone(): this {
+    //     return unpackNonNullableNode(global.generatedEs2panda._AstNodeClone(global.context, this.peer, this.parent.peer));
+    // }
+
+    // public get parent(): AstNode {
+    //     const parent = global.generatedEs2panda._AstNodeParent(global.context, this.peer)
+    //     if (parent === nullptr) {
+    //         throwError(`no parent`)
+    //     }
+    //     return unpackNonNullableNode(parent)
+    // }
+
+    // public set parent(node: AstNode) {
+    //     global.generatedEs2panda._AstNodeSetParent(global.context, this.peer, node.peer)
+    // }
+
     public clone(): this {
-        return unpackNonNullableNode(global.generatedEs2panda._AstNodeClone(global.context, this.peer, this.parent.peer));
+        const clonedNode = unpackNonNullableNode(
+            global.generatedEs2panda._AstNodeClone(global.context, this.peer, this.parent?.peer ?? nullptr)
+        );
+        clonedNode.parent = undefined;
+        return clonedNode as this;
     }
-
-    public get parent(): AstNode {
-        const parent = global.generatedEs2panda._AstNodeParent(global.context, this.peer)
-        if (parent === nullptr) {
-            throwError(`no parent`)
-        }
-        return unpackNonNullableNode(parent)
+    
+    public get parent(): AstNode | undefined {
+        const parent = global.generatedEs2panda._AstNodeParent(global.context, this.peer);
+        return unpackNonNullableNode(parent);
     }
 
-    public set parent(node: AstNode) {
-        global.generatedEs2panda._AstNodeSetParent(global.context, this.peer, node.peer)
+    public set parent(node: AstNode | undefined) {
+        global.generatedEs2panda._AstNodeSetParent(global.context, this.peer, node?.peer ?? nullptr);
     }
 
     public get modifierFlags(): Es2pandaModifierFlags {
@@ -119,4 +140,48 @@ export abstract class AstNode extends ArktsObject {
         global.generatedEs2panda._AstNodeClearModifier(global.context, this.peer, allFlags)
         global.generatedEs2panda._AstNodeAddModifier(global.context, this.peer, flags ?? Es2pandaModifierFlags.MODIFIER_FLAGS_NONE)
     }
+    
+    /** @deprecated Use {@link modifierFlags} instead */
+    public get modifiers(): KInt {
+        return this.modifierFlags
+    }
+
+    /** @deprecated Use {@link modifierFlags} instead */
+    public set modifiers(flags: KInt | undefined) {
+        this.modifierFlags = flags
+    }
+
+    public override onUpdate(node: AstNode): void {
+        // TODO Update modifiers only for specific AST nodes in the generated factory code
+        node.modifierFlags = this.modifierFlags
+        global.generatedEs2panda._AstNodeSetOriginalNode(global.context, node.peer, this.originalPeer)
+    }
+
+    public get isExport(): boolean {
+        return global.generatedEs2panda._AstNodeIsExportedConst(global.context, this.peer);
+    }
+
+    public get isDefaultExport(): boolean {
+        return global.generatedEs2panda._AstNodeIsDefaultExportedConst(global.context, this.peer);
+    }
+
+    public get isStatic(): boolean {
+        return global.generatedEs2panda._AstNodeIsStaticConst(global.context, this.peer);
+    }
+    
+    public get startPosition(): SourcePosition {
+        return new SourcePosition(global.generatedEs2panda._AstNodeStartConst(global.context, this.peer));
+    }
+
+    public set startPosition(start: SourcePosition) {
+        global.generatedEs2panda._AstNodeSetStart(global.context, this.peer, start.peer);
+    }
+
+    public get endPosition(): SourcePosition {
+        return new SourcePosition(global.generatedEs2panda._AstNodeEndConst(global.context, this.peer));
+    }
+
+    public set endPosition(end: SourcePosition) {
+        global.generatedEs2panda._AstNodeSetEnd(global.context, this.peer, end.peer);
+    }
 }

package/build/libarkts-copy/src/arkts-api/peers/Config.ts

@@ -16,7 +16,7 @@
 import { ArktsObject } from "./ArktsObject"
 import { global } from "../static/global"
 import { passStringArray } from "../utilities/private"
-import { KNativePointer } from "@koalaui/interop"
+import { KNativePointer, nullptr } from "@koalaui/interop"
 
 export class Config extends ArktsObject {
     constructor(peer: KNativePointer) {
@@ -48,5 +48,12 @@ export class Config extends ArktsObject {
         )
     }
 
+    destroy() {
+        if (this.peer != nullptr) {
+            global.es2panda._DestroyConfig(this.peer)
+            this.peer = nullptr
+        }
+    }
+
     readonly path: string
 }

package/build/libarkts-copy/src/arkts-api/peers/Context.ts

@@ -14,10 +14,11 @@
  */
 
 import { ArktsObject } from "./ArktsObject"
-import { Program } from "./Program"
+import { Program } from "../../generated"
 import { global } from "../static/global"
-import { passString } from "../utilities/private"
-import { KNativePointer } from "@koalaui/interop"
+import { passString, passStringArray } from "../utilities/private"
+import { KNativePointer, nullptr } from "@koalaui/interop"
+import { Config } from "./Config"
 
 export class Context extends ArktsObject {
     constructor(peer: KNativePointer) {
@@ -39,7 +40,73 @@ export class Context extends ArktsObject {
         )
     }
 
+    static createFromFile(filePath: string, configPath: string, stdlibPath: string, outputPath: string): Context | undefined {
+        const config = Config.create([
+            "",
+            "--arktsconfig",
+            configPath,
+            '--extension',
+            'ets',
+            '--stdlib',
+            stdlibPath,
+            filePath,
+            '--output',
+            outputPath,
+        ])
+        return new Context(
+            global.es2panda._CreateContextFromFile(
+                config.peer,
+                passString(filePath)
+            )
+        )
+    }
+
+    static createCacheFromFile(filePath: string, config: Config, globalContext: GlobalContext, isExternal: boolean) {
+        return new Context(
+            global.es2panda._CreateCacheContextFromFile(
+                config.peer,
+                passString(filePath),
+                globalContext.peer,
+                isExternal
+            )
+        )
+    }
+
+
+    destroy() {
+        if (this.peer != nullptr) {
+            global.es2panda._DestroyContext(this.peer)
+            this.peer = nullptr
+        }
+    }
+
     get program(): Program {
         return new Program(global.es2panda._ContextProgram(this.peer));
     }
-}
+}
+
+export class GlobalContext extends ArktsObject {
+    static create(
+        config: Config, externalFileList: string[]
+    ): GlobalContext {
+        return new GlobalContext(
+            global.es2panda._CreateGlobalContext(
+                config.peer,
+                passStringArray(externalFileList),
+                externalFileList.length,
+                false
+            )
+        )
+    }
+
+    constructor(peer: KNativePointer) {
+        super(peer)
+    }
+
+    destroy() {
+        if (this.peer != nullptr) {
+            global.es2panda._DestroyGlobalContext(this.peer)
+            this.peer = nullptr
+        }
+    }
+}

package/build/libarkts-copy/src/arkts-api/peers/{Program.ts → ExternalSource.ts}

@@ -13,31 +13,11 @@
  * limitations under the License.
  */
 
-import { ArktsObject } from "./ArktsObject"
 import { global } from "../static/global"
 import { acceptNativeObjectArrayResult, unpackString } from "../utilities/private"
 import { KNativePointer, nullptr } from "@koalaui/interop"
-import { ETSModule } from "../../generated"
-
-export class Program extends ArktsObject {
-    constructor(peer: KNativePointer) {
-        super(peer)
-    }
-
-    get astNode(): ETSModule {
-        let program = global.es2panda._ProgramAst(global.context, this.peer)
-        if (program == nullptr) throw new Error(`astNode() cannt get AST`)
-        return new ETSModule(program)
-    }
-
-    get externalSources(): ExternalSource[] {
-        return acceptNativeObjectArrayResult<ExternalSource>(
-            global.es2panda._ProgramExternalSources(global.context, this.peer),
-            (instance: KNativePointer) => new ExternalSource(instance)
-        )
-    }
-
-}
+import { Program } from "../../generated"
+import { ArktsObject } from "./ArktsObject"
 
 export class ExternalSource extends ArktsObject {
     constructor(peer: KNativePointer) {

package/build/libarkts-copy/src/arkts-api/peers/Options.ts

@@ -0,0 +1,34 @@
+/*
+ * 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 { KNativePointer } from "@koalaui/interop"
+import { ArktsObject } from "./ArktsObject"
+import { global } from "../static/global"
+import { Config } from "./Config"
+import { ArkTsConfig } from "../../generated"
+
+export class Options extends ArktsObject {
+    constructor(peer: KNativePointer) {
+        super(peer)
+    }
+
+    static createOptions(config: Config) {
+        return new Options(global.es2panda._ConfigGetOptions(config.peer))
+    }
+
+    getArkTsConfig(): ArkTsConfig {
+        return new ArkTsConfig(global.es2panda._OptionsArkTsConfig(global.context, this.peer))
+    }
+}

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

@@ -14,15 +14,34 @@
  */
 
 import { Es2pandaContextState } from "../generated/Es2pandaEnums"
-import { ExternalSource, Program } from "./peers/Program"
+import { Program } from "../generated"
+import { ExternalSource } from "./peers/ExternalSource"
+import { programGetExternalSources } from "./node-utilities/Program"
+import { KNativePointer } from "@koalaui/interop"
+import { global } from "./static/global"
 
 export interface CompilationOptions {
     readonly isMainProgram: boolean,
-    readonly name: string,
     readonly stage: Es2pandaContextState,
+    readonly restart: boolean,
 }
 
-export type ProgramTransformer = (program: Program, compilationOptions: CompilationOptions) => void
+export interface PluginContext {
+    setParameter<V>(name: string, value: V): void
+    parameter<V>(name: string) : V | undefined
+
+}
+export class PluginContextImpl implements PluginContext {
+    map = new Map<String, Object|undefined>()
+    parameter<V>(name: string): V|undefined {
+        return this.map.get(name) as (V|undefined)
+    }
+    setParameter<V>(name: string, value: V) {
+        this.map.set(name, value as Object)
+    }
+}
+
+export type ProgramTransformer = (program: Program, compilationOptions: CompilationOptions, context: PluginContext) => void
 
 export function defaultFilter(name: string) {
     if (name.startsWith("std.")) return false
@@ -30,17 +49,12 @@ export function defaultFilter(name: string) {
     return true
 }
 
-export interface ProgramWithName {
-    program: Program,
-    name: string
-}
-
-export function listPrograms(program: Program, filter: (name: string) => boolean = defaultFilter): ProgramWithName[] {
+export function listPrograms(program: Program, filter: (name: string) => boolean = defaultFilter, context: KNativePointer = global.context): Program[] {
     return [
-        { program, name: "" },
-        ...program.externalSources.flatMap((it: ExternalSource) => {
+        program,
+        ...programGetExternalSources(program, context).flatMap((it: ExternalSource) => {
             if (filter(it.getName())) {
-                return it.programs.map(program => ({ program, name: it.getName() } as ProgramWithName))
+                return it.programs
             }
             return []
         })