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

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

@@ -115,7 +115,6 @@ function replaceGensymWrappers(code: string): string {
     return code
 }
 
-
 function addExports(code: string): string {
     const exportAstNodes = ["  enum", "let", "const", "class", "abstract class", "@Entry() @Component() final class", "@Component() final class", "interface", "@interface", "type", "enum", "final class", "function",
         "declare interface", "@memo_stable() declare interface",  "@memo_stable() interface",
@@ -125,7 +124,7 @@ function addExports(code: string): string {
             code = code.replaceAll(`\n${astNodeText}`, `\nexport ${astNodeText}`)
         }
     )
-    // TODO this is a temporary workaround and should be replaced with a proper import/export handling in future
+    // Improve: this is a temporary workaround and should be replaced with a proper import/export handling in future
     code = code.replaceAll(/\n(@memo\(\) @BuilderLambda\(\{value:"\w+"\}\)) function/g, '\n$1 export function')
     const fix = [
         ["export @memo() function", "@memo() export function"],
@@ -140,162 +139,12 @@ function addExports(code: string): string {
     return code.replaceAll("\nexport function main()", "\nfunction main()")
 }
 
-function removeAbstractFromInterfaces(code: string): string {
-    const interfaces = [...code.matchAll(/interface([\s\S]*?){([\s\S]*?)\n}\n/g)].map(it => it[0])
-    interfaces.forEach((content) => {
-        const newContent = content.replaceAll('abstract ', '')
-        code = code.replaceAll(content, newContent)
-    })
-    return code
-}
-
-function removeInvalidLambdaTyping(code: string): string {
-    const knownTypes = ['boolean', 'int64', 'void']
-    return code.replaceAll(/\(([^\n\(\)]*?)\): ([\S]*?) => {/g, (match, p1, p2) => {
-        if (knownTypes.includes(p2)) {
-            return match
-        }
-        return `(${p1}) => {`
-    })
-}
-
-function returnOptionalParams(code: string): string {
-    const reduce = (line: string): string => {
-        if (line.includes("constructor")) {
-            return line
-        }
-        for (var i = 0; i < line.length; i++) {
-            if (line[i] == '(') {
-                let ignore = false
-                for (var k = i; k >= 0; k--) {
-                    if (line[k].match(/[a-zA-Z<>_0-9]/)) {
-                        break
-                    }
-                    if (line[k] == ':') {
-                        ignore = true
-                    }
-                }
-                if (ignore) {
-                    continue
-                }
-                const initi = i
-                let j = i + 1, depth = 1
-                let parts: string[] = []
-                while (j < line.length) {
-                    if (line[j] == '(') {
-                        depth++
-                    }
-                    if (line[j] == ')') {
-                        depth--
-                        if (depth == 0) {
-                            parts.push(line.substring(i + 1, j))
-                            break
-                        }
-                    }
-                    if (line[j] == ',' && depth == 1) {
-                        parts.push(line.substring(i + 1, j))
-                        i = j + 1
-                    }
-                    j++
-                }
-                if (depth == 0 && parts.length && parts.every(it => it.includes(": ") && !it.includes("? "))) {
-                    let k = parts.length - 1
-                    while (k >= 0) {
-                        if (parts[k].endsWith(" | undefined")) {
-                            let w = parts[k].substring(0, parts[k].length - " | undefined".length)
-                            let i = w.indexOf(':')
-                            if (w[i - 1] != '?') {
-                                parts[k] = w.substring(0, i) + "?" + w.substring(i)
-                            }
-                        } else {
-                            break
-                        }
-                        k--
-                    }
-                    if (k != parts.length - 1) {
-                        let nline = line.substring(0, initi + 1) + parts.join(', ') + line.substring(j)
-                        return nline
-                    }
-                }
-                i = initi
-            }
-        }
-        return line
-    }
-    return code.split('\n').map((line) => {
-        let nline = reduce(line)
-        while (nline != line) {
-            line = nline
-            nline = reduce(line)
-        }
-        return line
-    }).join('\n')
-}
-
-function fixPropertyLines(code: string): string {
-    /*
-
-    for some properties the following construction is generated:
-
-    private readonly <property>name = false;
-
-    public name(<property>name) { // for readonly properties "setter" is also generated
-        (this).<property>name = <property>name = false; // sometimes there is a typing here
-        return;
-    }
-
-    public name() {
-        return (this).<property>name;
-    }
-
-    this function wraps this back to `readonly name = false;`
-
-    */
-    return code.replaceAll(/(private|public)(.*)?<property>(.*?)\n((.*?)\n){9}/g, (match, p1, p2, p3) => {
-        return `public ${p2} ${p3}`
-    })
-}
-
-function fixDuplicateSettersInInterfaces(code: string): string {
-    /*
-
-    sometimes interfaces contains duplicate setters, this functions fixes it
-
-    */
-    code = code.replaceAll(/\n[ ]*(.*)interface(.*){\n([\s\S]*?)\n[ ]*}\n/g, (match, modifiers, p1, p2: string) => {
-        const keep = p2.split('\n').filter((it) => !it.trimStart().startsWith(`set`))
-        const setters = [...new Set(p2.split('\n').filter((it) => it.trimStart().startsWith(`set`)))]
-        return `\n${modifiers}interface${p1}{\n${keep.join('\n')}\n${setters.join('\n')}\n}\n`
-    })
-    return code
-}
-
 function excludePartialInterfaces(code: string): string {
     return code
     .replaceAll(/export interface (.*)\$partial<>([\s\S]*?)}/g, '')
     .replaceAll(/interface (.*)\$partial<>([\s\S]*?)}/g, '')
 }
 
-function fixNamespace(code: string) {
-    /*
-    namespaces become abstract classes, and enums become final classes
-    enum in namespace -> class in class -> not supported
-
-    we have only one such place, so fix manually
-    */
-    code = code.replaceAll(/export (declare )?abstract class (Profiler|GestureControl|text|common2D|common|observer|unifiedDataChannel|uniformTypeDescriptor|drawing|uiEffect|intl|matrix4|image|pointer|promptAction|webview|window) {/g, `export $1 namespace $2 {`)
-    code = code.replaceAll(`public static _$init$_() {}`, ``)
-    code = code.replaceAll(`public static _$init$_(): void {}`, ``)
-    code = code.replaceAll(/.*_\$initializerBlockInit\$_.*/g, ``)
-    code = code.replaceAll(/public static ((?:un)?registerVsyncCallback)/g, "export function $1")
-    code = code.replaceAll(/public static (setCursor)/g, "export function $1")
-    code = code.replaceAll(/public static (restoreDefault)/g, "export function $1")
-    code = code.replaceAll(/public static (requestFocus\(value)/g, "export function $1")
-    code = code.replaceAll(/public static (getSystemFontFullNamesByType|getFontDescriptorByFullName|matchFontDescriptors|createEffect|createBrightnessBlender)/g, "export function $1")
-    code = code.replaceAll('\n  type Blender =', '\n  export type Blender = ')
-    return code
-}
-
 function fixEnums(code: string) {
     const lines = code.split('\n')
     const enums = []
@@ -334,8 +183,18 @@ function fixEnums(code: string) {
     return code
 }
 
+function fixEmptyDeclareNamespace(code: string): string {
+    const lines = code.split('\n')
+    for (let i = 0; i < lines.length; i++) {
+        if (lines[i].startsWith('export declare namespace') && !lines[i].endsWith('{')) {
+            lines[i] += ' {}'
+        }
+    }
+    return lines.join('\n')
+}
+
 /*
-    TODO:
+    Improve:
      The lowerings insert %% and other special symbols into names of temporary variables.
      Until we keep feeding ast dumps back to the parser this function is needed.
  */
@@ -344,10 +203,8 @@ export function filterSource(text: string): string {
     // console.error(text.split('\n').map((it, index) => `${`${index + 1}`.padStart(4)} |${it}`).join('\n'))
     const dumperUnwrappers = [
         addExports,
-        fixNamespace,
+        fixEmptyDeclareNamespace,
         fixEnums,
-        fixDuplicateSettersInInterfaces,
-        removeAbstractFromInterfaces,
         replaceGensymWrappers, // nested
         replaceGensymWrappers, // nested
         replaceGensymWrappers,
@@ -356,9 +213,6 @@ export function filterSource(text: string): string {
         excludePartialInterfaces,
         (code: string) => code.replaceAll("<cctor>", "_cctor_"),
         (code: string) => code.replaceAll("public constructor() {}", ""),
-        (code: string) => code.replaceAll("@Module()", ""),
-        (code: string) => code.replaceAll("export * as  from", "export * from"),
-        fixPropertyLines
     ]
     // console.error("====")
     // console.error(dumperUnwrappers.reduceRight((code, f) => f(code), text).split('\n').map((it, index) => `${`${index + 1}`.padStart(4)} |${it}`).join('\n'))

package/build/libarkts-copy/src/wrapper-compat/README.md

@@ -14,3 +14,7 @@ For each file in the `./arkts-api`:
 3. Add a reexport to the `./arkts-api/index.ts`
 
 Once all the sources are be removed we can drop this compatibility layer at all
+
+## Deprecated APIs
+- Context.createCacheContextFromFile — Use Context.createCacheFromFile
+- Context.destroyAndRecreate

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

@@ -73,16 +73,15 @@ export * from "./factory/nodeTests"
 export * from "./visitor"
 export * from "./peers/AstNode"
 
-export * from "./peers/Config"
-export * from "./peers/Context"
+export * from "../../arkts-api/peers/Config"
+export * from "../../arkts-api/peers/Context"
 export * from "./peers/Program"
 export * from "./peers/ImportPathManager"
-export * from "./peers/SourcePosition"
+export * from "../../arkts-api/peers/SourcePosition"
 export * from "./peers/SourceRange"
 export * from "./peers/Diagnostic"
 export * from "./peers/DiagnosticInfo"
 export * from "./peers/DiagnosticKind"
 export * from "./peers/SuggestionInfo"
 export * from "./to-be-generated/MemberExpression"
-export * from "./static/globalUtils"
 export { global as arktsGlobal } from "./static/global"

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

@@ -14,7 +14,7 @@
  */
 
 import { ArrayExpression, Expression } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
 
 export function updateArrayExpression(original: ArrayExpression, elements: readonly Expression[]): ArrayExpression {

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

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

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

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { AstNode } from '../peers/AstNode';
 import { AssignmentExpression } from '../types';
 import { attachModifiers, updateThenAttach } from '../utilities/private';

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

@@ -14,7 +14,7 @@
  */
 
 import { BlockStatement, Statement } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
 
 export function updateBlockStatement(original: BlockStatement, statementList: readonly Statement[]): BlockStatement {

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

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

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

@@ -14,7 +14,7 @@
  */
 
 import { ClassDeclaration, ClassDefinition } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
 
 export function updateClassDeclaration(original: ClassDeclaration, def?: ClassDefinition): ClassDeclaration {

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

@@ -21,7 +21,7 @@ import {
     TSTypeParameterDeclaration,
     TSTypeParameterInstantiation,
 } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { AstNode } from '../peers/AstNode';
 import { MethodDefinition } from '../types';
 import { updateThenAttach } from '../utilities/private';
@@ -49,7 +49,7 @@ export function updateClassDefinition(
         isSameNativeObject(body, original.body) &&
         isSameNativeObject(modifiers, original.modifiers) &&
         isSameNativeObject(flags, classDefinitionFlags(original))
-        /* TODO: no getter for ctor */
+        /* Improve: no getter for ctor */
     ) {
         return original;
     }

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

@@ -14,7 +14,7 @@
  */
 
 import { ClassProperty, Expression, TypeNode } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { updateThenAttach } from '../utilities/private';
 import { classPropertySetOptional, hasModifierFlag } from '../utilities/public';
 import { Es2pandaModifierFlags } from '../../../generated/Es2pandaEnums';

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

@@ -14,7 +14,7 @@
  */
 
 import { ETSFunctionType, FunctionSignature } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
 import { Es2pandaScriptFunctionFlags } from '../../../generated/Es2pandaEnums';
 
@@ -28,7 +28,7 @@ export function updateETSFunctionType(
         isSameNativeObject(signature?.returnType, original.returnType) &&
         isSameNativeObject(signature?.params, original.params) &&
         isSameNativeObject(funcFlags, original.flags)
-        /* TODO: no getter for signature's hasReceiver */
+        /* Improve: no getter for signature's hasReceiver */
     ) {
         return original;
     }

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

@@ -14,7 +14,7 @@
  */
 
 import { ETSImportDeclaration, StringLiteral } 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';
 import { Es2pandaImportKinds } from '../../../generated/Es2pandaEnums';
@@ -30,7 +30,7 @@ export function updateETSImportDeclaration(
         isSameNativeObject(specifiers, original.specifiers) &&
         isSameNativeObject(importKind, Number(original.isTypeKind))
     ) {
-        /* TODO: probably should set importMetadata, but no getter provided yet */
+        /* Improve: probably should set importMetadata, but no getter provided yet */
         return original;
     }
 

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

@@ -14,7 +14,7 @@
  */
 
 import { Identifier } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { AstNode } from '../peers/AstNode';
 import { ETSParameterExpression } from '../types';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
@@ -26,7 +26,7 @@ export function updateETSParameterExpression(
 ): ETSParameterExpression {
     if (
         isSameNativeObject(identifier, original.identifier) &&
-        !initializer // TODO: get this from ETSParameterExpression
+        !initializer // Improve: get this from ETSParameterExpression
     ) {
         return original;
     }

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

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { AstNode } from '../peers/AstNode';
 import { ExpressionStatement } from '../types';
 import { attachModifiers, updateThenAttach } from '../utilities/private';

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

@@ -15,7 +15,7 @@
 
 import { AnnotationUsage, ScriptFunction } from '../../../generated';
 import { FunctionDeclaration } from '../types';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
 
 export function updateFunctionDeclaration(

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

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

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

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { AstNode } from '../peers/AstNode';
 import { IfStatement } from '../types';
 import { attachModifiers, updateThenAttach } from '../utilities/private';

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

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { AstNode } from '../peers/AstNode';
 import { MemberExpression } from '../to-be-generated/MemberExpression';
 import { attachModifiers, updateThenAttach } from '../utilities/private';

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

@@ -14,7 +14,7 @@
  */
 
 import { KInt } from '@koalaui/interop';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { AstNode } from '../peers/AstNode';
 import { MethodDefinition } from '../types';
 import { updateThenAttach } from '../utilities/private';
@@ -34,7 +34,7 @@ export function updateMethodDefinition(
         isSameNativeObject(key, original.name) &&
         isSameNativeObject(value, original.scriptFunction) &&
         isSameNativeObject(modifiers, original.modifiers)
-        /* TODO: no getter for isComputed */
+        /* Improve: no getter for isComputed */
     ) {
         return original;
     }

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

@@ -14,7 +14,7 @@
  */
 
 import { NumberLiteral } from '../types';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { attachModifiers, compose, updateThenAttach } from '../utilities/private';
 
 export function updateNumberLiteral(original: NumberLiteral, value: number): NumberLiteral {
@@ -23,7 +23,7 @@ export function updateNumberLiteral(original: NumberLiteral, value: number): Num
     }
 
     const update = updateThenAttach(
-        compose(NumberLiteral.create), // TODO: No UpdateNumberLiteral, need to change this
+        compose(NumberLiteral.create), // Improve: No UpdateNumberLiteral, need to change this
         attachModifiers
     );
     return update(original, value);

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

@@ -14,7 +14,7 @@
  */
 
 import { ObjectExpression, Property } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
 import { Es2pandaAstNodeType } from '../../../generated/Es2pandaEnums';
 
@@ -26,8 +26,8 @@ export function updateObjectExpression(
 ): ObjectExpression {
     if (
         isSameNativeObject(properties, original.properties)
-        /* TODO: no getter for nodeType */
-        /* TODO: no getter for trailingComma */
+        /* Improve: no getter for nodeType */
+        /* Improve: no getter for trailingComma */
     ) {
         return original;
     }

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

@@ -14,7 +14,7 @@
  */
 
 import { Expression, Property } from '../../../generated';
-import { isSameNativeObject } from '../peers/ArktsObject';
+import { isSameNativeObject } from '../../../arkts-api/peers/ArktsObject';
 import { attachModifiers, updateThenAttach } from '../utilities/private';
 
 export function updateProperty(original: Property, key?: Expression, value?: Expression): Property {

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

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

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

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

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';