@react-native-oh/react-native-harmony-cli 0.82.31 → 0.84.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -4
- package/dist/codegen/core/CodeGenerator.js +1 -1
- package/dist/codegen/core/CodegenError.js +1 -1
- package/dist/codegen/core/EventUtils.js +1 -1
- package/dist/codegen/core/TypeAnnotationToTS.js +15 -6
- package/dist/codegen/core/UberSchema.js +1 -1
- package/dist/codegen/core/index.js +1 -1
- package/dist/codegen/generators/AppBuildTimeGlueCodeGenerator.js +1 -1
- package/dist/codegen/generators/ArkTSComponentCodeGeneratorArkTS.js +1 -1
- package/dist/codegen/generators/ArkTSComponentCodeGeneratorCAPI.js +1 -1
- package/dist/codegen/generators/CppComponentCodeGenerator.js +1 -1
- package/dist/codegen/generators/LibGlueCodeGenerator.js +17 -7
- package/dist/codegen/generators/NativeModuleCodeGenerator.js +1 -1
- package/dist/codegen/generators/SharedComponentCodeGenerator.js +1 -1
- package/dist/codegen/generators/UberGeneratorV1.js +1 -1
- package/dist/codegen/generators/UberGeneratorV2.js +1 -1
- package/dist/codegen/generators/index.js +1 -1
- package/dist/codegen/index.js +1 -1
- package/dist/codegen/templates/BaseComponentInstanceHTemplate.js +1 -1
- package/dist/codegen/templates/BasePackageHTemplate.js +1 -1
- package/dist/codegen/templates/ComponentDescriptorHTemplate.js +1 -1
- package/dist/codegen/templates/ComponentJSIBinderHTemplate.js +1 -1
- package/dist/codegen/templates/ComponentUtilsTSTemplate.js +1 -1
- package/dist/codegen/templates/IndexTSTemplate.js +1 -1
- package/dist/codegen/templates/RNOHGeneratedPackageHTemplate.js +1 -1
- package/dist/codegen/templates/TurboModuleCppTemplate.js +1 -1
- package/dist/codegen/templates/TurboModuleHTemplate.js +1 -1
- package/dist/codegen/templates/TurboModuleSpecTSTemplate.js +1 -1
- package/dist/codegen/templates/index.js +1 -1
- package/dist/commands/bundle-harmony.js +1 -1
- package/dist/commands/clean-harmony.js +1 -1
- package/dist/commands/codegen-harmony.js +1 -1
- package/dist/commands/codegen-lib-harmony.js +79 -41
- package/dist/commands/index.js +1 -1
- package/dist/commands/init-harmony.js +1 -1
- package/dist/commands/link-harmony.js +1 -1
- package/dist/commands/types.js +1 -1
- package/dist/commands/verify-package-harmony.js +1 -1
- package/dist/core/AbsolutePath.js +2 -2
- package/dist/core/CodegenConfig.js +2 -2
- package/dist/core/DescriptiveError.js +2 -2
- package/dist/core/FileSystem.js +2 -2
- package/dist/core/OHPackageJSON5.js +2 -2
- package/dist/core/ValidationError.js +2 -2
- package/dist/core/ValueObject.js +2 -2
- package/dist/core/fs.js +2 -2
- package/dist/core/index.js +1 -1
- package/dist/index.js +1 -1
- package/dist/init/templates/AppScopeAppJSON5Template.js +1 -1
- package/dist/init/templates/AppScopeStringVarTemplate.js +1 -1
- package/dist/init/templates/EntryIndexTemplate.js +1 -1
- package/dist/init/templates/EntryStringVarTemplate.js +1 -1
- package/dist/init/templates/HvigorConfigJson5Template.js +1 -1
- package/dist/init/templates/MetroConfigTemplate.js +1 -1
- package/dist/init/templates/OhPackageJson5Template.js +1 -1
- package/dist/init/templates/harmony/entry/gitignore +1 -1
- package/dist/init/templates/harmony/entry/src/main/cpp/gitignore +1 -1
- package/dist/init/templates/harmony/entry/src/main/ets/PackageProvider.ets +1 -1
- package/dist/init/templates/harmony/entry/src/main/ets/codegen/gitignore +1 -1
- package/dist/init/templates/harmony/entry/src/main/ets/entryability/EntryAbility.ets +1 -1
- package/dist/init/templates/harmony/entry/src/main/ets/gitignore +1 -1
- package/dist/init/templates/harmony/entry/src/main/ets/workers/RNOHWorker.ets +1 -1
- package/dist/init/templates/harmony/entry/src/main/resources/gitignore +1 -1
- package/dist/init/templates/harmony/entry/src/ohosTest/ets/test/List.test.ets +1 -1
- package/dist/init/templates/harmony/gitignore +13 -1
- package/dist/init/templates/index.js +1 -1
- package/dist/io/CliExecutor.js +1 -1
- package/dist/io/Logger.js +1 -1
- package/dist/io/RealFS.js +1 -1
- package/dist/io/TarGz.js +1 -1
- package/dist/io/__fixtures__.js +1 -1
- package/dist/io/fsUtils.js +1 -1
- package/dist/io/index.js +1 -1
- package/dist/package-verifier/checks/HarmonyDirContainsOnlyHarsCheck.js +1 -1
- package/dist/package-verifier/checks/HarmonyDirExistsCheck.js +1 -1
- package/dist/package-verifier/checks/NpmAnAndOhPackageVersionsAreEqual.js +1 -1
- package/dist/package-verifier/checks/OhPackageNameFollowsNamingConventionCheck.js +1 -1
- package/dist/package-verifier/checks/index.js +1 -1
- package/dist/package-verifier/index.js +1 -1
- package/dist/package-verifier/types.js +1 -1
- package/dist/package-verifier/verify-package.js +1 -1
- package/harmony/rnoh-hvigor-plugin-0.84.2.tgz +0 -0
- package/jest.config.js +1 -1
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/00a68392 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/0544a6cc +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/0f36b2db +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/12f23f1e +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/13d95d98 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/1629e86b +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/180c8379 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/1a697147 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/1a8271b1 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/1b7fa689 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/255a9f13 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/268d155b +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/27db9aa4 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/28db79ed +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/2dc2bbcb +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/2df5f8c5 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/2f88aedb +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/31b3a7ea +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/36335b1c +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/38fca641 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/397722eb +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/397b6432 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/3b17421f +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/454f5e18 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/45ec6cce +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/482d51b1 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4ac5cd67 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4d40499a +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4dcad919 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4fc31929 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/54edc8f5 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/558a5405 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/58d2b670 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/5ec7feca +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/62180f3e +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/63981360 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/64096c89 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/64af560b +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/6585e783 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/6954304f +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/69fd6235 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/6d3a0478 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/6e131db7 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/778cd8f1 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/788206b6 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7882dc26 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7b3c14f7 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7cdfe667 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/8048c487 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/8332d9a3 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/84e5b603 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/854d8127 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/88c97376 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/90d5f644 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/967e25ac +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/969896c2 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/9790193e +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/97ae40c5 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/9a5bf482 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/a07adeb9 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/a427f355 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/a9dd7eb7 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/a9e9d79e +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/ab920855 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/ab9e3038 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/af054988 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/afe03e51 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b3b83913 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b4db7b4d +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b5225355 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b8c00f06 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b917a081 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b9e2f3bd +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/bd70db0e +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/bdbda648 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/be1e5469 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/c9462295 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/ca6e5efa +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/caf52beb +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/cb268960 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/cca16b15 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/cfc1c937 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/d10e6e05 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/d172fc04 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/d4e94e50 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/d59f8d2c +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/da964053 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/e0bb712a +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/e3e6ca34 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/e50f7385 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/f1a1d282 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/f2514c3c +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/f66207cf +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/f8d129ce +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/fb1e9558 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/ff7e3608 +0 -0
- package/package.json +3 -3
- package/react-native.config.js +1 -1
- package/scripts/copy-template.js +1 -1
- package/scripts/sync-hvigor.js +1 -3
- package/src/codegen/core/CodeGenerator.ts +1 -1
- package/src/codegen/core/CodegenError.ts +1 -1
- package/src/codegen/core/EventUtils.ts +1 -1
- package/src/codegen/core/TypeAnnotationToTS.test.ts +1 -1
- package/src/codegen/core/TypeAnnotationToTS.ts +33 -26
- package/src/codegen/core/UberSchema.ts +1 -1
- package/src/codegen/core/index.ts +1 -1
- package/src/codegen/generators/AppBuildTimeGlueCodeGenerator.ts +1 -1
- package/src/codegen/generators/ArkTSComponentCodeGeneratorArkTS.ts +1 -1
- package/src/codegen/generators/ArkTSComponentCodeGeneratorCAPI.ts +1 -1
- package/src/codegen/generators/CppComponentCodeGenerator.ts +1 -1
- package/src/codegen/generators/LibGlueCodeGenerator.ts +24 -13
- package/src/codegen/generators/NativeModuleCodeGenerator.ts +1 -1
- package/src/codegen/generators/SharedComponentCodeGenerator.ts +1 -1
- package/src/codegen/generators/UberGeneratorV1.ts +1 -1
- package/src/codegen/generators/UberGeneratorV2.ts +1 -1
- package/src/codegen/generators/index.ts +1 -1
- package/src/codegen/index.ts +1 -1
- package/src/codegen/templates/BaseComponentInstanceHTemplate.ts +1 -1
- package/src/codegen/templates/BasePackageHTemplate.ts +1 -1
- package/src/codegen/templates/ComponentDescriptorHTemplate.ts +1 -1
- package/src/codegen/templates/ComponentJSIBinderHTemplate.ts +1 -1
- package/src/codegen/templates/ComponentUtilsTSTemplate.ts +1 -1
- package/src/codegen/templates/IndexTSTemplate.ts +1 -1
- package/src/codegen/templates/RNOHGeneratedPackageHTemplate.ts +1 -1
- package/src/codegen/templates/TurboModuleCppTemplate.ts +1 -1
- package/src/codegen/templates/TurboModuleHTemplate.ts +1 -1
- package/src/codegen/templates/TurboModuleSpecTSTemplate.ts +1 -1
- package/src/codegen/templates/index.ts +1 -1
- package/src/commands/bundle-harmony.ts +1 -1
- package/src/commands/clean-harmony.ts +1 -1
- package/src/commands/codegen-harmony.ts +1 -1
- package/src/commands/codegen-lib-harmony.ts +111 -57
- package/src/commands/index.ts +1 -1
- package/src/commands/init-harmony.ts +1 -1
- package/src/commands/link-harmony.ts +1 -1
- package/src/commands/types.ts +1 -1
- package/src/commands/verify-package-harmony.ts +1 -1
- package/src/core/AbsolutePath.ts +2 -2
- package/src/core/CodegenConfig.ts +2 -2
- package/src/core/DescriptiveError.ts +2 -2
- package/src/core/FileSystem.ts +2 -2
- package/src/core/OHPackageJSON5.ts +2 -2
- package/src/core/ValidationError.ts +2 -2
- package/src/core/ValueObject.ts +2 -2
- package/src/core/fs.ts +2 -2
- package/src/core/index.ts +1 -1
- package/src/index.ts +1 -1
- package/src/init/templates/AppScopeAppJSON5Template.ts +1 -1
- package/src/init/templates/AppScopeStringVarTemplate.ts +1 -1
- package/src/init/templates/EntryIndexTemplate.ts +1 -1
- package/src/init/templates/EntryStringVarTemplate.ts +1 -1
- package/src/init/templates/HvigorConfigJson5Template.ts +1 -1
- package/src/init/templates/MetroConfigTemplate.ts +1 -1
- package/src/init/templates/OhPackageJson5Template.ts +1 -1
- package/src/init/templates/harmony/entry/gitignore +1 -1
- package/src/init/templates/harmony/entry/src/main/cpp/gitignore +1 -1
- package/src/init/templates/harmony/entry/src/main/ets/PackageProvider.ets +1 -1
- package/src/init/templates/harmony/entry/src/main/ets/codegen/gitignore +1 -1
- package/src/init/templates/harmony/entry/src/main/ets/entryability/EntryAbility.ets +1 -1
- package/src/init/templates/harmony/entry/src/main/ets/gitignore +1 -1
- package/src/init/templates/harmony/entry/src/main/ets/workers/RNOHWorker.ets +1 -1
- package/src/init/templates/harmony/entry/src/main/resources/gitignore +1 -1
- package/src/init/templates/harmony/entry/src/ohosTest/ets/test/List.test.ets +1 -1
- package/src/init/templates/harmony/gitignore +13 -1
- package/src/init/templates/index.ts +1 -1
- package/src/io/CliExecutor.ts +1 -1
- package/src/io/Logger.ts +1 -1
- package/src/io/RealFS.ts +1 -1
- package/src/io/TarGz.ts +1 -1
- package/src/io/__fixtures__.ts +1 -1
- package/src/io/fsUtils.ts +1 -1
- package/src/io/index.ts +1 -1
- package/src/package-verifier/checks/HarmonyDirContainsOnlyHarsCheck.ts +1 -1
- package/src/package-verifier/checks/HarmonyDirExistsCheck.ts +1 -1
- package/src/package-verifier/checks/NpmAnAndOhPackageVersionsAreEqual.ts +1 -1
- package/src/package-verifier/checks/OhPackageNameFollowsNamingConventionCheck.ts +1 -1
- package/src/package-verifier/checks/index.ts +1 -1
- package/src/package-verifier/index.ts +1 -1
- package/src/package-verifier/types.ts +1 -1
- package/src/package-verifier/verify-package.ts +1 -1
- package/harmony/rnoh-hvigor-plugin-0.82.31.tgz +0 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright (c) 2025
|
|
2
|
+
* Copyright (c) 2025 Huawei Technologies Co., Ltd.
|
|
3
3
|
*
|
|
4
4
|
* This source code is licensed under the MIT license found in the
|
|
5
5
|
* LICENSE file in the root directory of this source tree.
|
|
@@ -26,6 +26,9 @@ import { LibGlueCodeGenerator } from '../codegen/generators/LibGlueCodeGenerator
|
|
|
26
26
|
|
|
27
27
|
const COMMAND_NAME = 'codegen-lib-harmony';
|
|
28
28
|
|
|
29
|
+
const VALID_GENERATE_TYPES = ['all', 'turbo-module', 'fabric'] as const;
|
|
30
|
+
type GenerateType = (typeof VALID_GENERATE_TYPES)[number];
|
|
31
|
+
|
|
29
32
|
export const commandCodegenLibHarmony: Command = {
|
|
30
33
|
name: COMMAND_NAME,
|
|
31
34
|
description:
|
|
@@ -69,6 +72,14 @@ export const commandCodegenLibHarmony: Command = {
|
|
|
69
72
|
description:
|
|
70
73
|
'Skips the check that prevents file operations outside the current working directory. This command permanently deletes previously generated files. Files are generated in the path specified by cpp-output-path.',
|
|
71
74
|
},
|
|
75
|
+
{
|
|
76
|
+
name: '--generate-type <string>',
|
|
77
|
+
description:
|
|
78
|
+
'Controls which type of code to generate. ' +
|
|
79
|
+
'Possible values: "all" (default, generates both TurboModule and Fabric code), ' +
|
|
80
|
+
'"turbo-module" (generates only TurboModule code), ' +
|
|
81
|
+
'"fabric" (generates only Fabric component code).',
|
|
82
|
+
},
|
|
72
83
|
],
|
|
73
84
|
func: async (_argv, _config, rawArgs: any) => {
|
|
74
85
|
const logger = new Logger();
|
|
@@ -98,6 +109,7 @@ type RawArgs = {
|
|
|
98
109
|
cppOutputPath?: string;
|
|
99
110
|
etsOutputPath?: string;
|
|
100
111
|
safetyCheck?: boolean;
|
|
112
|
+
generateType?: string;
|
|
101
113
|
};
|
|
102
114
|
|
|
103
115
|
function validateArgsAndRetrieveUberSchemaByType(rawArgs: RawArgs) {
|
|
@@ -141,6 +153,7 @@ type Args = {
|
|
|
141
153
|
cppOutputPath: AbsolutePath;
|
|
142
154
|
etsOutputPath: AbsolutePath;
|
|
143
155
|
safetyCheck: boolean;
|
|
156
|
+
generateType: GenerateType;
|
|
144
157
|
};
|
|
145
158
|
|
|
146
159
|
function validateRawArgs(rawArgs: RawArgs): Args {
|
|
@@ -162,6 +175,15 @@ function validateRawArgs(rawArgs: RawArgs): Args {
|
|
|
162
175
|
whatCanUserDo: ['Please specify --ets-output-path'],
|
|
163
176
|
});
|
|
164
177
|
}
|
|
178
|
+
const generateType = (rawArgs.generateType ?? 'all') as GenerateType;
|
|
179
|
+
if (!VALID_GENERATE_TYPES.includes(generateType)) {
|
|
180
|
+
throw new DescriptiveError({
|
|
181
|
+
whatHappened: `Invalid --generate-type value: "${rawArgs.generateType}". Valid values are: ${VALID_GENERATE_TYPES.join(', ')}`,
|
|
182
|
+
whatCanUserDo: [
|
|
183
|
+
`Please specify one of: ${VALID_GENERATE_TYPES.join(', ')}`,
|
|
184
|
+
],
|
|
185
|
+
});
|
|
186
|
+
}
|
|
165
187
|
return {
|
|
166
188
|
npmPackageName: rawArgs.npmPackageName!,
|
|
167
189
|
tmSpecPaths: (rawArgs.turboModulesSpecPaths ?? []).map(
|
|
@@ -176,6 +198,7 @@ function validateRawArgs(rawArgs: RawArgs): Args {
|
|
|
176
198
|
etsOutputPath: new AbsolutePath(rawArgs.etsOutputPath!),
|
|
177
199
|
cppOutputPath: new AbsolutePath(rawArgs.cppOutputPath!),
|
|
178
200
|
safetyCheck: !!rawArgs.safetyCheck,
|
|
201
|
+
generateType,
|
|
179
202
|
};
|
|
180
203
|
}
|
|
181
204
|
|
|
@@ -220,25 +243,36 @@ function generateCodeInMemory({
|
|
|
220
243
|
fileContentByPath.set(path, fileContent);
|
|
221
244
|
};
|
|
222
245
|
|
|
223
|
-
const
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
)
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
246
|
+
const { generateType } = args;
|
|
247
|
+
const shouldGenerateTurboModule =
|
|
248
|
+
generateType === 'all' || generateType === 'turbo-module';
|
|
249
|
+
const shouldGenerateFabric =
|
|
250
|
+
generateType === 'all' || generateType === 'fabric';
|
|
251
|
+
|
|
252
|
+
let turboModuleGlueCodeData: ReturnType<
|
|
253
|
+
NativeModuleCodeGenerator['getGlueCodeData']
|
|
254
|
+
> = [];
|
|
255
|
+
if (shouldGenerateTurboModule) {
|
|
256
|
+
turboModuleGlueCodeData = turboModulesUberSchema
|
|
257
|
+
.findAllSpecSchemasByType('NativeModule')
|
|
258
|
+
.map((specSchema) => {
|
|
259
|
+
const nativeModuleCodeGenerator = new NativeModuleCodeGenerator(
|
|
260
|
+
args.cppOutputPath.copyWithNewSegment(
|
|
261
|
+
'RNOH',
|
|
262
|
+
'generated',
|
|
263
|
+
'turbo_modules'
|
|
264
|
+
),
|
|
265
|
+
args.etsOutputPath.copyWithNewSegment('turboModules'),
|
|
266
|
+
CODEGEN_NOTICE_LINES,
|
|
267
|
+
'@rnoh/react-native-openharmony/ts'
|
|
268
|
+
);
|
|
269
|
+
nativeModuleCodeGenerator
|
|
270
|
+
.generate(specSchema)
|
|
271
|
+
.forEach(appendToFileContentByPath);
|
|
272
|
+
return nativeModuleCodeGenerator.getGlueCodeData();
|
|
273
|
+
})
|
|
274
|
+
.flat();
|
|
275
|
+
}
|
|
242
276
|
|
|
243
277
|
const arkTSComponentCodeGeneratorCAPI = new ArkTSComponentCodeGeneratorCAPI(
|
|
244
278
|
args.cppOutputPath.copyWithNewSegment('RNOH', 'generated', 'components'),
|
|
@@ -246,9 +280,12 @@ function generateCodeInMemory({
|
|
|
246
280
|
CODEGEN_NOTICE_LINES,
|
|
247
281
|
'@rnoh/react-native-openharmony/ts'
|
|
248
282
|
);
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
283
|
+
|
|
284
|
+
if (shouldGenerateFabric) {
|
|
285
|
+
arkTSComponentCodeGeneratorCAPI
|
|
286
|
+
.generate(arkTSComponentsUberSchema)
|
|
287
|
+
.forEach(appendToFileContentByPath);
|
|
288
|
+
}
|
|
252
289
|
|
|
253
290
|
const libraryCppName = deriveLibraryCppNameFromNpmPackageName(
|
|
254
291
|
args.npmPackageName
|
|
@@ -264,27 +301,29 @@ function generateCodeInMemory({
|
|
|
264
301
|
},
|
|
265
302
|
CODEGEN_NOTICE_LINES
|
|
266
303
|
);
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
304
|
+
if (shouldGenerateFabric) {
|
|
305
|
+
cppComponentCodeGenerator
|
|
306
|
+
.generate({
|
|
307
|
+
libraryCppName: libraryCppName,
|
|
308
|
+
uberSchema: cppComponentsUberSchema,
|
|
309
|
+
})
|
|
310
|
+
.forEach(appendToFileContentByPath);
|
|
273
311
|
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
})
|
|
283
|
-
.generate({
|
|
284
|
-
libraryCppName: libraryCppName,
|
|
285
|
-
uberSchema: componentsUberSchema,
|
|
312
|
+
new SharedComponentCodeGenerator((filename) => {
|
|
313
|
+
return args.cppOutputPath.copyWithNewSegment(
|
|
314
|
+
'react',
|
|
315
|
+
'renderer',
|
|
316
|
+
'components',
|
|
317
|
+
libraryCppName,
|
|
318
|
+
filename
|
|
319
|
+
);
|
|
286
320
|
})
|
|
287
|
-
|
|
321
|
+
.generate({
|
|
322
|
+
libraryCppName: libraryCppName,
|
|
323
|
+
uberSchema: componentsUberSchema,
|
|
324
|
+
})
|
|
325
|
+
.forEach(appendToFileContentByPath);
|
|
326
|
+
}
|
|
288
327
|
|
|
289
328
|
new LibGlueCodeGenerator(
|
|
290
329
|
args.cppOutputPath,
|
|
@@ -293,11 +332,15 @@ function generateCodeInMemory({
|
|
|
293
332
|
)
|
|
294
333
|
.generate({
|
|
295
334
|
libraryCppName,
|
|
296
|
-
arkTSComponents:
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
335
|
+
arkTSComponents: shouldGenerateFabric
|
|
336
|
+
? arkTSComponentCodeGeneratorCAPI.getLibGlueCodeData()
|
|
337
|
+
: [],
|
|
338
|
+
cppComponents: shouldGenerateFabric
|
|
339
|
+
? cppComponentCodeGenerator
|
|
340
|
+
.getGlueCodeData()
|
|
341
|
+
.map(({ name }) => ({ componentName: name }))
|
|
342
|
+
: [],
|
|
343
|
+
turboModules: shouldGenerateTurboModule ? turboModuleGlueCodeData : [],
|
|
301
344
|
})
|
|
302
345
|
.forEach(appendToFileContentByPath);
|
|
303
346
|
|
|
@@ -325,7 +368,8 @@ function saveAndLogCodegenResult(
|
|
|
325
368
|
fileContentByPath,
|
|
326
369
|
args.cppOutputPath,
|
|
327
370
|
args.etsOutputPath,
|
|
328
|
-
args.safetyCheck
|
|
371
|
+
args.safetyCheck,
|
|
372
|
+
args.generateType
|
|
329
373
|
);
|
|
330
374
|
logCodegenResult(logger, fileContentByPath, new AbsolutePath(''));
|
|
331
375
|
}
|
|
@@ -334,18 +378,28 @@ function saveCodegenResultToFileSystem(
|
|
|
334
378
|
fileContentByPath: Map<AbsolutePath, string>,
|
|
335
379
|
cppOutputPath: AbsolutePath,
|
|
336
380
|
etsOutputPath: AbsolutePath,
|
|
337
|
-
enableSafetyCheck: boolean
|
|
381
|
+
enableSafetyCheck: boolean,
|
|
382
|
+
generateType: GenerateType
|
|
338
383
|
) {
|
|
384
|
+
const shouldGenerateTurboModule =
|
|
385
|
+
generateType === 'all' || generateType === 'turbo-module';
|
|
386
|
+
const shouldGenerateFabric =
|
|
387
|
+
generateType === 'all' || generateType === 'fabric';
|
|
388
|
+
|
|
339
389
|
prepareDirectory(cppOutputPath, enableSafetyCheck);
|
|
340
390
|
prepareDirectory(etsOutputPath, enableSafetyCheck);
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
391
|
+
if (shouldGenerateFabric) {
|
|
392
|
+
prepareDirectory(
|
|
393
|
+
etsOutputPath.copyWithNewSegment('components'),
|
|
394
|
+
enableSafetyCheck
|
|
395
|
+
);
|
|
396
|
+
}
|
|
397
|
+
if (shouldGenerateTurboModule) {
|
|
398
|
+
prepareDirectory(
|
|
399
|
+
etsOutputPath.copyWithNewSegment('turboModules'),
|
|
400
|
+
enableSafetyCheck
|
|
401
|
+
);
|
|
402
|
+
}
|
|
349
403
|
fileContentByPath.forEach((_fileContent, path) => {
|
|
350
404
|
prepareDirectory(path.getDirectoryPath(), enableSafetyCheck);
|
|
351
405
|
});
|
package/src/commands/index.ts
CHANGED
package/src/commands/types.ts
CHANGED
package/src/core/AbsolutePath.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright (c) 2025
|
|
2
|
+
* Copyright (c) 2025 Huawei Technologies Co., Ltd.
|
|
3
3
|
*
|
|
4
4
|
* This source code is licensed under the MIT license found in the
|
|
5
|
-
* LICENSE file in the root directory of this source tree.
|
|
5
|
+
* LICENSE-MIT file in the root directory of this source tree.
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import pathUtils from 'node:path';
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright (c) 2025
|
|
2
|
+
* Copyright (c) 2025 Huawei Technologies Co., Ltd.
|
|
3
3
|
*
|
|
4
4
|
* This source code is licensed under the MIT license found in the
|
|
5
|
-
* LICENSE file in the root directory of this source tree.
|
|
5
|
+
* LICENSE-MIT file in the root directory of this source tree.
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import fs from 'node:fs';
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright (c) 2025
|
|
2
|
+
* Copyright (c) 2025 Huawei Technologies Co., Ltd.
|
|
3
3
|
*
|
|
4
4
|
* This source code is licensed under the MIT license found in the
|
|
5
|
-
* LICENSE file in the root directory of this source tree.
|
|
5
|
+
* LICENSE-MIT file in the root directory of this source tree.
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
export class DescriptiveError extends Error {
|
package/src/core/FileSystem.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright (c) 2025
|
|
2
|
+
* Copyright (c) 2025 Huawei Technologies Co., Ltd.
|
|
3
3
|
*
|
|
4
4
|
* This source code is licensed under the MIT license found in the
|
|
5
|
-
* LICENSE file in the root directory of this source tree.
|
|
5
|
+
* LICENSE-MIT file in the root directory of this source tree.
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import { AbsolutePath } from './AbsolutePath';
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright (c) 2025
|
|
2
|
+
* Copyright (c) 2025 Huawei Technologies Co., Ltd.
|
|
3
3
|
*
|
|
4
4
|
* This source code is licensed under the MIT license found in the
|
|
5
|
-
* LICENSE file in the root directory of this source tree.
|
|
5
|
+
* LICENSE-MIT file in the root directory of this source tree.
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import json5 from 'json5';
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright (c) 2025
|
|
2
|
+
* Copyright (c) 2025 Huawei Technologies Co., Ltd.
|
|
3
3
|
*
|
|
4
4
|
* This source code is licensed under the MIT license found in the
|
|
5
|
-
* LICENSE file in the root directory of this source tree.
|
|
5
|
+
* LICENSE-MIT file in the root directory of this source tree.
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
export class ValidationError extends Error {}
|
package/src/core/ValueObject.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright (c) 2025
|
|
2
|
+
* Copyright (c) 2025 Huawei Technologies Co., Ltd.
|
|
3
3
|
*
|
|
4
4
|
* This source code is licensed under the MIT license found in the
|
|
5
|
-
* LICENSE file in the root directory of this source tree.
|
|
5
|
+
* LICENSE-MIT file in the root directory of this source tree.
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
/** https://en.wikipedia.org/wiki/Value_object */
|
package/src/core/fs.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright (c) 2025
|
|
2
|
+
* Copyright (c) 2025 Huawei Technologies Co., Ltd.
|
|
3
3
|
*
|
|
4
4
|
* This source code is licensed under the MIT license found in the
|
|
5
|
-
* LICENSE file in the root directory of this source tree.
|
|
5
|
+
* LICENSE-MIT file in the root directory of this source tree.
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import fs from 'node:fs';
|
package/src/core/index.ts
CHANGED
package/src/index.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Copyright (c)
|
|
1
|
+
# Copyright (c) 2025 Huawei Technologies Co., Ltd.
|
|
2
2
|
#
|
|
3
3
|
# This source code is licensed under the MIT license found in the
|
|
4
4
|
# LICENSE file in the root directory of this source tree.
|
|
@@ -19,3 +19,15 @@
|
|
|
19
19
|
hvigorw
|
|
20
20
|
hvigorw.bat
|
|
21
21
|
hvigor/hvigor-wrapper.js
|
|
22
|
+
/build-profile.json5
|
|
23
|
+
|
|
24
|
+
# ---
|
|
25
|
+
|
|
26
|
+
/local.properties
|
|
27
|
+
/.idea
|
|
28
|
+
**/build
|
|
29
|
+
/.hvigor
|
|
30
|
+
.cxx
|
|
31
|
+
.clangd
|
|
32
|
+
.clang-format
|
|
33
|
+
.clang-tidy
|
package/src/io/CliExecutor.ts
CHANGED
package/src/io/Logger.ts
CHANGED
package/src/io/RealFS.ts
CHANGED
package/src/io/TarGz.ts
CHANGED
package/src/io/__fixtures__.ts
CHANGED
package/src/io/fsUtils.ts
CHANGED
package/src/io/index.ts
CHANGED