@react-native-oh/react-native-harmony-cli 0.0.24 → 0.0.26-1

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.
Files changed (109) hide show
  1. package/.prettierrc +6 -6
  2. package/dist/assetResolver.js +1 -23
  3. package/dist/codegen/core/CodeGenerator.js +2 -0
  4. package/dist/codegen/core/UberSchema.js +35 -9
  5. package/dist/codegen/core/index.js +1 -1
  6. package/dist/codegen/generators/{ComponentCodeGenerator.js → ComponentCodeGeneratorArkTS.js} +12 -4
  7. package/dist/codegen/generators/ComponentCodeGeneratorCAPI.js +79 -0
  8. package/dist/codegen/generators/GlueCodeGenerator.js +60 -0
  9. package/dist/codegen/generators/NativeModuleCodeGenerator.js +14 -6
  10. package/dist/codegen/generators/UberGeneratorV1.js +49 -0
  11. package/dist/codegen/generators/UberGeneratorV2.js +60 -0
  12. package/dist/codegen/generators/index.js +5 -2
  13. package/dist/codegen/templates/BaseComponentInstanceHTemplate.js +103 -0
  14. package/dist/codegen/templates/ComponentDescriptorHTemplate.js +42 -36
  15. package/dist/codegen/templates/ComponentJSIBinderHTemplate.js +45 -36
  16. package/dist/codegen/templates/ComponentUtilsTSTemplate.js +135 -127
  17. package/dist/codegen/templates/GeneratedPackageHTemplate.js +101 -0
  18. package/dist/codegen/templates/IndexTSTemplate.js +23 -5
  19. package/dist/codegen/templates/RNOHGeneratedPackageHTemplate.js +88 -82
  20. package/dist/codegen/templates/TurboModuleCppTemplate.js +26 -18
  21. package/dist/codegen/templates/TurboModuleHTemplate.js +27 -17
  22. package/dist/codegen/templates/TurboModuleSpecTSTemplate.js +37 -27
  23. package/dist/codegen/templates/index.js +1 -0
  24. package/dist/commands/codegen-harmony.js +99 -14
  25. package/dist/commands/index.js +1 -0
  26. package/dist/commands/verify-package-harmony.js +127 -0
  27. package/dist/core/AbsolutePath.js +6 -0
  28. package/dist/core/CodegenConfig.js +8 -4
  29. package/dist/core/OHPackageJSON5.js +23 -0
  30. package/dist/core/PackageJSON.js +8 -3
  31. package/dist/core/ProjectDependenciesManager.js +2 -2
  32. package/dist/core/index.js +1 -0
  33. package/dist/index.js +1 -0
  34. package/dist/io/TarGz.js +28 -0
  35. package/dist/io/index.js +1 -0
  36. package/dist/package-verifier/checks/HarmonyDirContainsOnlyHarsCheck.js +38 -0
  37. package/dist/package-verifier/checks/HarmonyDirExistsCheck.js +32 -0
  38. package/dist/package-verifier/checks/NpmAnAndOhPackageVersionsAreEqual.js +26 -0
  39. package/dist/package-verifier/checks/OhPackageNameFollowsNamingConventionCheck.js +51 -0
  40. package/dist/package-verifier/checks/index.js +20 -0
  41. package/dist/package-verifier/index.js +18 -0
  42. package/dist/package-verifier/types.js +2 -0
  43. package/dist/package-verifier/verify-package.js +100 -0
  44. package/jest.config.js +5 -5
  45. package/package.json +57 -52
  46. package/react-native.config.js +10 -10
  47. package/src/assetResolver.ts +21 -44
  48. package/src/codegen/core/CodeGenerator.ts +9 -0
  49. package/src/codegen/core/CodegenError.ts +3 -3
  50. package/src/codegen/core/EventUtils.ts +18 -18
  51. package/src/codegen/core/TypeAnnotationToTS.test.ts +75 -75
  52. package/src/codegen/core/TypeAnnotationToTS.ts +188 -188
  53. package/src/codegen/core/UberSchema.ts +142 -99
  54. package/src/codegen/core/index.ts +5 -5
  55. package/src/codegen/generators/{ComponentCodeGenerator.ts → ComponentCodeGeneratorArkTS.ts} +112 -98
  56. package/src/codegen/generators/ComponentCodeGeneratorCAPI.ts +114 -0
  57. package/src/codegen/generators/GlueCodeGenerator.ts +109 -0
  58. package/src/codegen/generators/NativeModuleCodeGenerator.ts +115 -95
  59. package/src/codegen/generators/UberGeneratorV1.ts +64 -0
  60. package/src/codegen/generators/UberGeneratorV2.ts +91 -0
  61. package/src/codegen/generators/index.ts +6 -3
  62. package/src/codegen/index.ts +2 -2
  63. package/src/codegen/templates/BaseComponentInstanceHTemplate.ts +116 -0
  64. package/src/codegen/templates/ComponentDescriptorHTemplate.ts +55 -49
  65. package/src/codegen/templates/ComponentJSIBinderHTemplate.ts +93 -85
  66. package/src/codegen/templates/ComponentUtilsTSTemplate.ts +210 -202
  67. package/src/codegen/templates/GeneratedPackageHTemplate.ts +107 -0
  68. package/src/codegen/templates/IndexTSTemplate.ts +53 -33
  69. package/src/codegen/templates/RNOHGeneratedPackageHTemplate.ts +130 -124
  70. package/src/codegen/templates/TurboModuleCppTemplate.ts +54 -47
  71. package/src/codegen/templates/TurboModuleHTemplate.ts +35 -26
  72. package/src/codegen/templates/TurboModuleSpecTSTemplate.ts +90 -81
  73. package/src/codegen/templates/index.ts +9 -8
  74. package/src/commands/bundle-harmony.ts +203 -202
  75. package/src/commands/codegen-harmony.ts +272 -143
  76. package/src/commands/create-metro-host-constants.ts +48 -48
  77. package/src/commands/index.ts +6 -5
  78. package/src/commands/pack-harmony.ts +121 -121
  79. package/src/commands/unpack-harmony.ts +231 -231
  80. package/src/commands/verify-package-harmony.ts +106 -0
  81. package/src/core/AbsolutePath.ts +50 -43
  82. package/src/core/CodegenConfig.ts +62 -54
  83. package/src/core/DescriptiveError.ts +61 -61
  84. package/src/core/OHPackageJSON5.ts +23 -0
  85. package/src/core/PackageJSON.ts +75 -63
  86. package/src/core/ProjectDependenciesManager.ts +77 -77
  87. package/src/core/ValidationError.ts +1 -1
  88. package/src/core/ValueObject.ts +2 -2
  89. package/src/core/fs.ts +31 -31
  90. package/src/core/index.ts +9 -8
  91. package/src/index.ts +20 -18
  92. package/src/io/Logger.ts +68 -68
  93. package/src/io/TarGz.ts +26 -0
  94. package/src/io/fsUtils.ts +24 -24
  95. package/src/io/index.ts +3 -2
  96. package/src/package-verifier/checks/HarmonyDirContainsOnlyHarsCheck.ts +28 -0
  97. package/src/package-verifier/checks/HarmonyDirExistsCheck.ts +24 -0
  98. package/src/package-verifier/checks/NpmAnAndOhPackageVersionsAreEqual.ts +18 -0
  99. package/src/package-verifier/checks/OhPackageNameFollowsNamingConventionCheck.ts +47 -0
  100. package/src/package-verifier/checks/index.ts +4 -0
  101. package/src/package-verifier/index.ts +2 -0
  102. package/src/package-verifier/types.ts +12 -0
  103. package/src/package-verifier/verify-package.ts +117 -0
  104. package/tsconfig.build.json +6 -6
  105. package/tsconfig.json +2 -2
  106. package/dist/codegen/core/Codegen.js +0 -35
  107. package/dist/codegen/generators/PackageCodeGenerator.js +0 -52
  108. package/src/codegen/core/Codegen.ts +0 -44
  109. package/src/codegen/generators/PackageCodeGenerator.ts +0 -73
@@ -1,121 +1,121 @@
1
- import { Command } from '@react-native-community/cli-types';
2
- import { globSync } from 'glob';
3
- import pathUtils from 'path';
4
- import tar from 'tar';
5
- import fs from 'fs';
6
- import { ValidationError } from '../core';
7
- import ignore, { Ignore } from 'ignore';
8
- import JSON5 from 'json5';
9
-
10
- export const commandPackHarmony: Command = {
11
- name: 'pack-harmony',
12
- description: 'Pack native code. Used for package development.',
13
- options: [
14
- {
15
- name: '--oh-module-path <string>',
16
- description: 'Path to the OH module',
17
- },
18
- {
19
- name: '--harmony-dir-path <string>',
20
- description: 'Path to the harmony dir',
21
- },
22
- {
23
- name: '--package-json-path <string>',
24
- description: 'Path to the package.json',
25
- },
26
- ],
27
- func: async (argv, config, args: any) => {
28
- try {
29
- await pack(
30
- pathUtils.resolve(args.harmonyDirPath),
31
- pathUtils.resolve(args.ohModulePath),
32
- pathUtils.resolve(args.packageJsonPath)
33
- );
34
- } catch (err) {
35
- if (err instanceof ValidationError) {
36
- console.error('[ERROR]', err.message);
37
- process.exit(1);
38
- } else {
39
- throw err;
40
- }
41
- }
42
- },
43
- };
44
-
45
- async function pack(
46
- harmonyDirPath: string,
47
- ohModuleDirPath: string,
48
- packageJSONPath: string
49
- ) {
50
- syncVersions(
51
- packageJSONPath,
52
- pathUtils.join(ohModuleDirPath, 'oh-package.json5')
53
- );
54
- if (!fs.existsSync(harmonyDirPath)) {
55
- fs.mkdirSync(harmonyDirPath, { recursive: true });
56
- }
57
- await createTGZFromDir(
58
- ohModuleDirPath,
59
- pathUtils.join(
60
- harmonyDirPath,
61
- `${pathUtils.parse(ohModuleDirPath).name}.tar.gz`
62
- )
63
- );
64
- await createTGZFromDir(
65
- harmonyDirPath,
66
- pathUtils.join(pathUtils.dirname(harmonyDirPath), 'harmony.tar.gz')
67
- );
68
- }
69
-
70
- function syncVersions(
71
- packageJSONFilePath: string,
72
- ohPackageJSONFilePath: string
73
- ) {
74
- const packageJSONFileContent = JSON.parse(
75
- fs.readFileSync(packageJSONFilePath, { encoding: 'utf-8' })
76
- );
77
- if (fs.existsSync(ohPackageJSONFilePath)) {
78
- const ohPackageJSONFileContent = JSON5.parse(
79
- fs.readFileSync(ohPackageJSONFilePath, { encoding: 'utf-8' })
80
- );
81
- ohPackageJSONFileContent['version'] = packageJSONFileContent['version'];
82
- fs.writeFileSync(
83
- ohPackageJSONFilePath,
84
- JSON5.stringify(ohPackageJSONFileContent, null, 2)
85
- );
86
- }
87
- }
88
-
89
- async function createTGZFromDir(dirPath: string, outputFilePath: string) {
90
- const ig = getIgnoreUtil(pathUtils.join(dirPath, '.tarignore'));
91
- const filesToInclude = globSync('**', {
92
- cwd: dirPath,
93
- nodir: true,
94
- }).filter((path) => !ig.ignores(path));
95
- await createArchive(outputFilePath, dirPath, filesToInclude);
96
- }
97
-
98
- function getIgnoreUtil(tarignorePath: string): Ignore {
99
- if (!fs.existsSync(tarignorePath)) {
100
- return ignore();
101
- }
102
- return ignore().add(fs.readFileSync(tarignorePath).toString());
103
- }
104
-
105
- async function createArchive(
106
- outputFilePath: string,
107
- packageDirPath: string,
108
- filesToInclude: string[]
109
- ) {
110
- if (filesToInclude.length === 0) {
111
- throw new ValidationError('Nothing to pack');
112
- }
113
- await tar.c(
114
- {
115
- gzip: true,
116
- file: outputFilePath,
117
- cwd: packageDirPath,
118
- },
119
- filesToInclude
120
- );
121
- }
1
+ import { Command } from '@react-native-community/cli-types';
2
+ import { globSync } from 'glob';
3
+ import pathUtils from 'path';
4
+ import tar from 'tar';
5
+ import fs from 'fs';
6
+ import { ValidationError } from '../core';
7
+ import ignore, { Ignore } from 'ignore';
8
+ import JSON5 from 'json5';
9
+
10
+ export const commandPackHarmony: Command = {
11
+ name: 'pack-harmony',
12
+ description: 'Pack native code. Used for package development.',
13
+ options: [
14
+ {
15
+ name: '--oh-module-path <string>',
16
+ description: 'Path to the OH module',
17
+ },
18
+ {
19
+ name: '--harmony-dir-path <string>',
20
+ description: 'Path to the harmony dir',
21
+ },
22
+ {
23
+ name: '--package-json-path <string>',
24
+ description: 'Path to the package.json',
25
+ },
26
+ ],
27
+ func: async (argv, config, args: any) => {
28
+ try {
29
+ await pack(
30
+ pathUtils.resolve(args.harmonyDirPath),
31
+ pathUtils.resolve(args.ohModulePath),
32
+ pathUtils.resolve(args.packageJsonPath)
33
+ );
34
+ } catch (err) {
35
+ if (err instanceof ValidationError) {
36
+ console.error('[ERROR]', err.message);
37
+ process.exit(1);
38
+ } else {
39
+ throw err;
40
+ }
41
+ }
42
+ },
43
+ };
44
+
45
+ async function pack(
46
+ harmonyDirPath: string,
47
+ ohModuleDirPath: string,
48
+ packageJSONPath: string
49
+ ) {
50
+ syncVersions(
51
+ packageJSONPath,
52
+ pathUtils.join(ohModuleDirPath, 'oh-package.json5')
53
+ );
54
+ if (!fs.existsSync(harmonyDirPath)) {
55
+ fs.mkdirSync(harmonyDirPath, { recursive: true });
56
+ }
57
+ await createTGZFromDir(
58
+ ohModuleDirPath,
59
+ pathUtils.join(
60
+ harmonyDirPath,
61
+ `${pathUtils.parse(ohModuleDirPath).name}.tar.gz`
62
+ )
63
+ );
64
+ await createTGZFromDir(
65
+ harmonyDirPath,
66
+ pathUtils.join(pathUtils.dirname(harmonyDirPath), 'harmony.tar.gz')
67
+ );
68
+ }
69
+
70
+ function syncVersions(
71
+ packageJSONFilePath: string,
72
+ ohPackageJSONFilePath: string
73
+ ) {
74
+ const packageJSONFileContent = JSON.parse(
75
+ fs.readFileSync(packageJSONFilePath, { encoding: 'utf-8' })
76
+ );
77
+ if (fs.existsSync(ohPackageJSONFilePath)) {
78
+ const ohPackageJSONFileContent = JSON5.parse(
79
+ fs.readFileSync(ohPackageJSONFilePath, { encoding: 'utf-8' })
80
+ );
81
+ ohPackageJSONFileContent['version'] = packageJSONFileContent['version'];
82
+ fs.writeFileSync(
83
+ ohPackageJSONFilePath,
84
+ JSON5.stringify(ohPackageJSONFileContent, null, 2)
85
+ );
86
+ }
87
+ }
88
+
89
+ async function createTGZFromDir(dirPath: string, outputFilePath: string) {
90
+ const ig = getIgnoreUtil(pathUtils.join(dirPath, '.tarignore'));
91
+ const filesToInclude = globSync('**', {
92
+ cwd: dirPath,
93
+ nodir: true,
94
+ }).filter((path) => !ig.ignores(path));
95
+ await createArchive(outputFilePath, dirPath, filesToInclude);
96
+ }
97
+
98
+ function getIgnoreUtil(tarignorePath: string): Ignore {
99
+ if (!fs.existsSync(tarignorePath)) {
100
+ return ignore();
101
+ }
102
+ return ignore().add(fs.readFileSync(tarignorePath).toString());
103
+ }
104
+
105
+ async function createArchive(
106
+ outputFilePath: string,
107
+ packageDirPath: string,
108
+ filesToInclude: string[]
109
+ ) {
110
+ if (filesToInclude.length === 0) {
111
+ throw new ValidationError('Nothing to pack');
112
+ }
113
+ await tar.c(
114
+ {
115
+ gzip: true,
116
+ file: outputFilePath,
117
+ cwd: packageDirPath,
118
+ },
119
+ filesToInclude
120
+ );
121
+ }