@idlizer/arktscgen 2.1.10-arktscgen-4 → 2.1.10-arktscgen-5

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

@@ -14,19 +14,19 @@
  */
 
 export function throwError(error: string): never {
-    throw new Error(error)
+    throw new Error(error);
 }
 
 export function withWarning<T>(value: T, message: string): T {
     // console.warn(message)
-    return value
+    return value;
 }
 
 export function isNumber(value: any): value is number {
-    return typeof value === `number`
+    return typeof value === `number`;
 }
 
-function replacePercentOutsideStrings(code: string): string  {
+function replacePercentOutsideStrings(code: string): string {
     const stringPattern = /("[^"]*"|'[^']*'|`[^`]*`)/g;
     const percentPattern = /(?<!["'`])(%)(?![\d\s])/g;
     const strings = code.match(stringPattern) || [];
@@ -70,127 +70,154 @@ function replaceIllegalHashes(code: string): string {
 }
 
 function replaceGensymWrappers(code: string): string {
-    const indices = [...code.matchAll(/\({let/g)].map(it => it.index)
-    const replacements: string[][] = []
+    const indices = [...code.matchAll(/\({let/g)].map((it) => it.index);
+    const replacements: string[][] = [];
     for (var i of indices) {
         if (!i) {
-            continue
+            continue;
         }
-        var j = i + 1, depth = 1
+        var j = i + 1,
+            depth = 1;
         while (j < code.length) {
             if (code[j] == '(') {
-                depth++
+                depth++;
             }
             if (code[j] == ')') {
-                depth--
+                depth--;
             }
             if (depth == 0) {
-                break
+                break;
             }
-            j++
+            j++;
         }
 
         if (j == code.length) {
-            continue
+            continue;
         }
 
-        const base = code.substring(i, j + 1)
-        if (base.match(/\({let/)?.length! > 1) { // don't touch if contains nested constructions
-            continue
+        const base = code.substring(i, j + 1);
+        if (base.match(/\({let/)?.length! > 1) {
+            // don't touch if contains nested constructions
+            continue;
         }
-        const fixed = base.replaceAll(/^\({let ([_%a-zA-Z0-9]+?) = (?!\({let)([\s\S]*?);\n([\s\S]*?)}\)$/g,
+        const fixed = base.replaceAll(
+            /^\({let ([_%a-zA-Z0-9]+?) = (?!\({let)([\s\S]*?);\n([\s\S]*?)}\)$/g,
             (match, name: string, val: string, expr: string) => {
-                let rightExpr = expr.slice(expr.lastIndexOf(name) + name.length, -1)
+                let rightExpr = expr.slice(expr.lastIndexOf(name) + name.length, -1);
                 if (rightExpr[0] != '.') {
-                    rightExpr = `.${rightExpr}`
+                    rightExpr = `.${rightExpr}`;
                 }
-                return `(${val}?${rightExpr})`
+                return `(${val}?${rightExpr})`;
             }
-        )
-        replacements.push([base, fixed])
+        );
+        replacements.push([base, fixed]);
     }
     for (var [b, f] of replacements) {
-        code = code.replace(b, f)
+        code = code.replace(b, f);
     }
-    return code
+    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",
-        "@Retention({policy:\"SOURCE\"}) @interface", "@memo() function", "@memo_entry() function", "@memo_intrinsic() function",
-    ]
+    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',
+        '@Retention({policy:"SOURCE"}) @interface',
+        '@memo() function',
+        '@memo_entry() function',
+        '@memo_intrinsic() function',
+    ];
     exportAstNodes.forEach((astNodeText) => {
-            code = code.replaceAll(`\n${astNodeText}`, `\nexport ${astNodeText}`)
-        }
-    )
+        code = code.replaceAll(`\n${astNodeText}`, `\nexport ${astNodeText}`);
+    });
     // 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')
+    code = code.replaceAll(/\n(@memo\(\) @BuilderLambda\(\{value:"\w+"\}\)) function/g, '\n$1 export function');
     const fix = [
-        ["export @memo() function", "@memo() export function"],
-        ["export @memo_entry() function", "@memo_entry() export function"],
-        ["export @memo_intrinsic() function", "@memo_intrinsic() export function"],
-        ["export @memo_stable()", "@memo_stable() export"],
-        ["export class OhosRouter", "export default class OhosRouter"]
-    ]
+        ['export @memo() function', '@memo() export function'],
+        ['export @memo_entry() function', '@memo_entry() export function'],
+        ['export @memo_intrinsic() function', '@memo_intrinsic() export function'],
+        ['export @memo_stable()', '@memo_stable() export'],
+        ['export class OhosRouter', 'export default class OhosRouter'],
+    ];
     for (var [f, t] of fix) {
-        code = code.replaceAll(f, t)
+        code = code.replaceAll(f, t);
     }
-    return code.replaceAll("\nexport function main()", "\nfunction main()")
+    return code.replaceAll('\nexport function main()', '\nfunction main()');
 }
 
 function excludePartialInterfaces(code: string): string {
     return code
-    .replaceAll(/export interface (.*)\$partial<>([\s\S]*?)}/g, '')
-    .replaceAll(/interface (.*)\$partial<>([\s\S]*?)}/g, '')
+        .replaceAll(/export interface (.*)\$partial<>([\s\S]*?)}/g, '')
+        .replaceAll(/interface (.*)\$partial<>([\s\S]*?)}/g, '');
 }
 
 function fixEnums(code: string) {
-    const lines = code.split('\n')
-    const enums = []
+    const lines = code.split('\n');
+    const enums = [];
     for (let i = 0; i + 1 < lines.length; i++) {
-        if (lines[i].trimStart().startsWith(`export final class`)
-            && lines[i + 1].trimStart().startsWith(`private readonly _ordinal`)
+        if (
+            lines[i].trimStart().startsWith(`export final class`) &&
+            lines[i + 1].trimStart().startsWith(`private readonly _ordinal`)
         ) {
-            const name = lines[i].split(' ')[3]
-            enums.push(name)
+            const name = lines[i].split(' ')[3];
+            enums.push(name);
         }
     }
     enums.forEach((name) => {
-        const regexp = new RegExp(`${name}\\.(\\w+)(.)`, `g`)
+        const regexp = new RegExp(`${name}\\.(\\w+)(.)`, `g`);
         code = code.replaceAll(regexp, (match, p1, p2) => {
-            if (!p1.startsWith('_') && p2 == ":") { // this colon is for switch case, not for type
-                return `${name}.${p1}.valueOf()${p2}`
+            if (!p1.startsWith('_') && p2 == ':') {
+                // this colon is for switch case, not for type
+                return `${name}.${p1}.valueOf()${p2}`;
             }
-            return match
-        })
-        const idents = [...code.matchAll(new RegExp(`(\\w+?)([\\W])(\\w+?): ${name}`, `g`))].filter(it => it[1] != "readonly" && it[1] != "_get").map(it => it[3])
+            return match;
+        });
+        const idents = [...code.matchAll(new RegExp(`(\\w+?)([\\W])(\\w+?): ${name}`, `g`))]
+            .filter((it) => it[1] != 'readonly' && it[1] != '_get')
+            .map((it) => it[3]);
         // work manually with a couple of cases not to write one more bracket parser
         if (code.includes(`const eventKind = (deserializer.readInt32() as CallbackEventKind);`)) {
             // this is for file arkui/src/generated/peers/CallbacksChecker.ts
-            idents.push(`eventKind`)
-            code = code.replace(`const eventKind = (deserializer.readInt32() as CallbackEventKind);`, `const eventKind = CallbackEventKind.fromValue(deserializer.readInt32());`)
+            idents.push(`eventKind`);
+            code = code.replace(
+                `const eventKind = (deserializer.readInt32() as CallbackEventKind);`,
+                `const eventKind = CallbackEventKind.fromValue(deserializer.readInt32());`
+            );
         }
         if (code.includes(`switch ((type as EventType))`)) {
             // this is for file arkui/src/Application.ts
-            code = code.replace(`switch ((type as EventType))`, `switch (type)`)
+            code = code.replace(`switch ((type as EventType))`, `switch (type)`);
         }
         idents.forEach((id) => {
-            code = code.replaceAll(`${id} as int32`, `${id}.valueOf()`)
-            code = code.replaceAll(`switch (${id})`, `switch (${id}.valueOf())`)
-        })
-    })
-    return code
+            code = code.replaceAll(`${id} as int32`, `${id}.valueOf()`);
+            code = code.replaceAll(`switch (${id})`, `switch (${id}.valueOf())`);
+        });
+    });
+    return code;
 }
 
 function fixEmptyDeclareNamespace(code: string): string {
-    const lines = code.split('\n')
+    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] += ' {}'
+            lines[i] += ' {}';
         }
     }
-    return lines.join('\n')
+    return lines.join('\n');
 }
 
 /*
@@ -211,14 +238,14 @@ export function filterSource(text: string): string {
         replaceIllegalHashes,
         replacePercentOutsideStrings,
         excludePartialInterfaces,
-        (code: string) => code.replaceAll("<cctor>", "_cctor_"),
-        (code: string) => code.replaceAll("public constructor() {}", ""),
-    ]
+        (code: string) => code.replaceAll('<cctor>', '_cctor_'),
+        (code: string) => code.replaceAll('public constructor() {}', ''),
+    ];
     // console.error("====")
     // console.error(dumperUnwrappers.reduceRight((code, f) => f(code), text).split('\n').map((it, index) => `${`${index + 1}`.padStart(4)} |${it}`).join('\n'))
-    return dumperUnwrappers.reduceRight((code, f) => f(code), text)
+    return dumperUnwrappers.reduceRight((code, f) => f(code), text);
 }
 
 export function getEnumName(enumType: any, value: number): string | undefined {
     return enumType[value];
-}
+}

package/build/libarkts-copy/tsconfig.json

@@ -3,12 +3,13 @@
     "compilerOptions": {
         "outDir": "build",
         "baseUrl": ".",
-        "rootDir": "./src",
+        "rootDir": ".",
         "module": "esnext",
         "tsBuildInfoFile": "./build/tsconfig.tsbuildinfo"
     },
     "include": [
-        "./src/**/*.ts"
+        "./src/**/*.ts",
+        "./generated/**/*.ts"
     ],
     "exclude": [
         "./src/ts-api/**/*.ts"