@react-native-oh/react-native-harmony-cli 0.0.37 → 0.0.40

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 (138) hide show
  1. package/README.md +11 -11
  2. package/dist/assetResolver.js +74 -43
  3. package/dist/autolinking/Autolinking.js +183 -179
  4. package/dist/codegen/core/CodegenError.js +23 -3
  5. package/dist/codegen/core/EventUtils.js +3 -3
  6. package/dist/codegen/core/TypeAnnotationToTS.js +28 -24
  7. package/dist/codegen/core/UberSchema.js +96 -57
  8. package/dist/codegen/generators/AppBuildTimeGlueCodeGenerator.js +41 -28
  9. package/dist/codegen/generators/ArkTSComponentCodeGeneratorArkTS.js +34 -27
  10. package/dist/codegen/generators/ArkTSComponentCodeGeneratorCAPI.js +33 -25
  11. package/dist/codegen/generators/CppComponentCodeGenerator.js +28 -23
  12. package/dist/codegen/generators/LibGlueCodeGenerator.js +29 -26
  13. package/dist/codegen/generators/NativeModuleCodeGenerator.js +30 -25
  14. package/dist/codegen/generators/SharedComponentCodeGenerator.js +15 -15
  15. package/dist/codegen/generators/UberGeneratorV1.js +24 -18
  16. package/dist/codegen/generators/UberGeneratorV2.js +36 -28
  17. package/dist/codegen/templates/BaseComponentInstanceHTemplate.js +24 -50
  18. package/dist/codegen/templates/BasePackageHTemplate.js +21 -120
  19. package/dist/codegen/templates/ComponentDescriptorHTemplate.js +8 -53
  20. package/dist/codegen/templates/ComponentJSIBinderHTemplate.js +27 -75
  21. package/dist/codegen/templates/ComponentUtilsTSTemplate.js +29 -162
  22. package/dist/codegen/templates/IndexTSTemplate.js +17 -37
  23. package/dist/codegen/templates/RNOHGeneratedPackageHTemplate.js +24 -119
  24. package/dist/codegen/templates/TurboModuleCppTemplate.js +15 -38
  25. package/dist/codegen/templates/TurboModuleHTemplate.js +11 -32
  26. package/dist/codegen/templates/TurboModuleSpecTSTemplate.js +19 -52
  27. package/dist/commands/bundle-harmony.js +138 -53
  28. package/dist/commands/codegen-harmony.js +175 -104
  29. package/dist/commands/codegen-lib-harmony.js +116 -76
  30. package/dist/commands/create-metro-host-constants.js +47 -18
  31. package/dist/commands/init.js +961 -537
  32. package/dist/commands/link-harmony.js +71 -33
  33. package/dist/commands/pack-harmony.js +108 -47
  34. package/dist/commands/run-harmony.js +518 -374
  35. package/dist/commands/unpack-harmony.js +198 -105
  36. package/dist/commands/verify-package-harmony.js +108 -54
  37. package/dist/core/AbsolutePath.js +47 -31
  38. package/dist/core/CodegenConfig.js +22 -24
  39. package/dist/core/DescriptiveError.js +37 -18
  40. package/dist/core/FileSystem.js +18 -14
  41. package/dist/core/OHPackageJSON5.js +23 -17
  42. package/dist/core/PackageJSON.js +42 -26
  43. package/dist/core/ProjectDependenciesManager.js +96 -46
  44. package/dist/core/ValidationError.js +22 -2
  45. package/dist/core/fs.js +6 -9
  46. package/dist/index.js +1 -1
  47. package/dist/io/CliExecutor.js +98 -46
  48. package/dist/io/Logger.js +46 -40
  49. package/dist/io/RealFS.js +88 -35
  50. package/dist/io/TarGz.js +8 -11
  51. package/dist/io/__fixtures__.js +141 -79
  52. package/dist/io/fsUtils.js +12 -13
  53. package/dist/package-verifier/checks/HarmonyDirContainsOnlyHarsCheck.js +47 -19
  54. package/dist/package-verifier/checks/HarmonyDirExistsCheck.js +41 -13
  55. package/dist/package-verifier/checks/NpmAnAndOhPackageVersionsAreEqual.js +38 -8
  56. package/dist/package-verifier/checks/OhPackageNameFollowsNamingConventionCheck.js +54 -22
  57. package/dist/package-verifier/verify-package.js +132 -55
  58. package/dist/simulator/LaunchSimulator.js +301 -217
  59. package/jest.config.js +12 -12
  60. package/package.json +78 -70
  61. package/react-native.config.js +17 -17
  62. package/tsconfig.build.json +6 -6
  63. package/tsconfig.json +2 -2
  64. package/.prettierrc +0 -6
  65. package/src/assetResolver.ts +0 -134
  66. package/src/autolinking/Autolinking.test.ts +0 -483
  67. package/src/autolinking/Autolinking.ts +0 -382
  68. package/src/autolinking/index.ts +0 -8
  69. package/src/codegen/core/CodeGenerator.ts +0 -16
  70. package/src/codegen/core/CodegenError.ts +0 -10
  71. package/src/codegen/core/EventUtils.ts +0 -23
  72. package/src/codegen/core/TypeAnnotationToTS.test.ts +0 -82
  73. package/src/codegen/core/TypeAnnotationToTS.ts +0 -195
  74. package/src/codegen/core/UberSchema.ts +0 -152
  75. package/src/codegen/core/index.ts +0 -12
  76. package/src/codegen/generators/AppBuildTimeGlueCodeGenerator.ts +0 -124
  77. package/src/codegen/generators/ArkTSComponentCodeGeneratorArkTS.ts +0 -128
  78. package/src/codegen/generators/ArkTSComponentCodeGeneratorCAPI.ts +0 -122
  79. package/src/codegen/generators/CppComponentCodeGenerator.ts +0 -95
  80. package/src/codegen/generators/LibGlueCodeGenerator.ts +0 -98
  81. package/src/codegen/generators/NativeModuleCodeGenerator.ts +0 -124
  82. package/src/codegen/generators/SharedComponentCodeGenerator.ts +0 -57
  83. package/src/codegen/generators/UberGeneratorV1.ts +0 -75
  84. package/src/codegen/generators/UberGeneratorV2.ts +0 -114
  85. package/src/codegen/generators/index.ts +0 -15
  86. package/src/codegen/index.ts +0 -9
  87. package/src/codegen/templates/BaseComponentInstanceHTemplate.ts +0 -128
  88. package/src/codegen/templates/BasePackageHTemplate.ts +0 -159
  89. package/src/codegen/templates/ComponentDescriptorHTemplate.ts +0 -63
  90. package/src/codegen/templates/ComponentJSIBinderHTemplate.ts +0 -121
  91. package/src/codegen/templates/ComponentUtilsTSTemplate.ts +0 -222
  92. package/src/codegen/templates/IndexTSTemplate.ts +0 -62
  93. package/src/codegen/templates/RNOHGeneratedPackageHTemplate.ts +0 -150
  94. package/src/codegen/templates/TurboModuleCppTemplate.ts +0 -61
  95. package/src/codegen/templates/TurboModuleHTemplate.ts +0 -42
  96. package/src/codegen/templates/TurboModuleSpecTSTemplate.ts +0 -101
  97. package/src/codegen/templates/index.ts +0 -16
  98. package/src/commands/bundle-harmony.ts +0 -134
  99. package/src/commands/codegen-harmony.ts +0 -297
  100. package/src/commands/codegen-lib-harmony.ts +0 -389
  101. package/src/commands/create-metro-host-constants.ts +0 -55
  102. package/src/commands/index.ts +0 -16
  103. package/src/commands/init.ts +0 -755
  104. package/src/commands/link-harmony.ts +0 -102
  105. package/src/commands/pack-harmony.ts +0 -128
  106. package/src/commands/run-harmony.ts +0 -506
  107. package/src/commands/types.ts +0 -21
  108. package/src/commands/unpack-harmony.ts +0 -238
  109. package/src/commands/verify-package-harmony.ts +0 -113
  110. package/src/core/AbsolutePath.ts +0 -66
  111. package/src/core/CodegenConfig.ts +0 -67
  112. package/src/core/DescriptiveError.ts +0 -68
  113. package/src/core/FileSystem.ts +0 -57
  114. package/src/core/OHPackageJSON5.ts +0 -30
  115. package/src/core/PackageJSON.ts +0 -104
  116. package/src/core/ProjectDependenciesManager.ts +0 -103
  117. package/src/core/ValidationError.ts +0 -8
  118. package/src/core/ValueObject.ts +0 -9
  119. package/src/core/fs.ts +0 -38
  120. package/src/core/index.ts +0 -17
  121. package/src/index.ts +0 -33
  122. package/src/io/CliExecutor.ts +0 -69
  123. package/src/io/Logger.ts +0 -112
  124. package/src/io/RealFS.ts +0 -62
  125. package/src/io/TarGz.ts +0 -33
  126. package/src/io/__fixtures__.ts +0 -139
  127. package/src/io/fsUtils.ts +0 -44
  128. package/src/io/index.ts +0 -11
  129. package/src/package-verifier/checks/HarmonyDirContainsOnlyHarsCheck.ts +0 -35
  130. package/src/package-verifier/checks/HarmonyDirExistsCheck.ts +0 -31
  131. package/src/package-verifier/checks/NpmAnAndOhPackageVersionsAreEqual.ts +0 -25
  132. package/src/package-verifier/checks/OhPackageNameFollowsNamingConventionCheck.ts +0 -54
  133. package/src/package-verifier/checks/index.ts +0 -11
  134. package/src/package-verifier/index.ts +0 -9
  135. package/src/package-verifier/types.ts +0 -19
  136. package/src/package-verifier/verify-package.ts +0 -123
  137. package/src/simulator/LaunchSimulator.ts +0 -352
  138. package/src/simulator/index.ts +0 -8
package/package.json CHANGED
@@ -1,70 +1,78 @@
1
- {
2
- "name": "@react-native-oh/react-native-harmony-cli",
3
- "version": "0.0.37",
4
- "description": "",
5
- "publishConfig": {
6
- "registry": "https://registry.npmjs.org/",
7
- "access": "public"
8
- },
9
- "scripts": {
10
- "build": "tsc --outDir dist -p tsconfig.build.json",
11
- "prepack": "npm run build",
12
- "verify": "tsc --noEmit && npm run test",
13
- "test": "npm run build && jest",
14
- "test:codegen": "jest ./src/codegen/.* && npm run build && jest tests/codegen.*",
15
- "rn": "npm run build && react-native",
16
- "prepublishOnly": "npm run verify"
17
- },
18
- "bin": {
19
- "rnoh-cli": "dist/commands/init.js"
20
- },
21
- "keywords": [],
22
- "author": "",
23
- "license": "MIT",
24
- "peerDependencies": {
25
- "metro": "*"
26
- },
27
- "main": "dist/index.js",
28
- "devDependencies": {
29
- "@react-native-community/cli": "^15.0.0",
30
- "@react-native-community/cli-types": "^11.3.0",
31
- "@types/adm-zip": "^0.5.5",
32
- "@types/fs-extra": "^11.0.1",
33
- "@types/jest": "^29.5.1",
34
- "@types/jszip": "^3.4.1",
35
- "@types/mustache": "^4.2.5",
36
- "@types/tar": "^6.1.5",
37
- "@types/tmp": "^0.2.3",
38
- "directory-tree": "^3.5.1",
39
- "execa": "npm:@esm2cjs/execa@^6.1.1-cjs.1",
40
- "jest": "^29.5.0",
41
- "react-native": "^0.72.0",
42
- "ts-jest": "^29.1.0",
43
- "ts-node": "^10.9.1",
44
- "typescript": "^5.0.4"
45
- },
46
- "dependencies": {
47
- "@react-native-community/cli-tools": "^13.6.5",
48
- "@react-native/codegen": "0.74.0",
49
- "@tsconfig/recommended": "^1.0.2",
50
- "adm-zip": "^0.5.12",
51
- "case": "^1.6.3",
52
- "chalk": "^4",
53
- "commander": "^14.0.0",
54
- "fs-extra": "^11.1.1",
55
- "glob": "^10.2.6",
56
- "ignore": "^5.2.4",
57
- "inquirer": "^12.7.0",
58
- "json5": "^2.2.3",
59
- "memfs": "4.12.0",
60
- "mustache": "^4.2.0",
61
- "tar": "^6.1.15",
62
- "tmp": "^0.2.1",
63
- "metro": "0.82.5"
64
- },
65
- "homepage": "https://gitcode.com/openharmony-sig/ohos_react_native",
66
- "repository": {
67
- "type": "gitcode",
68
- "url": "https://gitcode.com/openharmony-sig/ohos_react_native"
69
- }
70
- }
1
+ {
2
+ "name": "@react-native-oh/react-native-harmony-cli",
3
+ "version": "0.0.40",
4
+ "description": "",
5
+ "publishConfig": {
6
+ "registry": "https://registry.npmjs.org/",
7
+ "access": "public"
8
+ },
9
+ "scripts": {
10
+ "build": "tsc --outDir dist -p tsconfig.build.json",
11
+ "prepack": "npm run build && npm run _recreate-hvigor-plugin",
12
+ "_recreate-hvigor-plugin": "cd ../react-native-harmony-hvigor-plugin && npm i && npm run deploy && cd ../react-native-harmony-cli",
13
+ "verify": "tsc --noEmit && npm run test",
14
+ "test": "npm run build && jest",
15
+ "test:codegen": "jest ./src/codegen/.* && npm run build && jest tests/codegen.*",
16
+ "rn": "npm run build && react-native",
17
+ "prepublishOnly": "npm run verify"
18
+ },
19
+ "bin": {
20
+ "rnoh-cli": "dist/commands/init.js"
21
+ },
22
+ "keywords": [],
23
+ "author": "",
24
+ "license": "MIT",
25
+ "peerDependencies": {
26
+ "metro": "*"
27
+ },
28
+ "main": "dist/index.js",
29
+ "files": [
30
+ "./*.js",
31
+ "./*.json",
32
+ "./dist/*",
33
+ "./harmony/*",
34
+ "./README.md"
35
+ ],
36
+ "devDependencies": {
37
+ "@react-native-community/cli": "^15.0.0",
38
+ "@react-native-community/cli-types": "^11.3.0",
39
+ "@types/adm-zip": "^0.5.5",
40
+ "@types/fs-extra": "^11.0.1",
41
+ "@types/jest": "^29.5.1",
42
+ "@types/jszip": "^3.4.1",
43
+ "@types/mustache": "^4.2.5",
44
+ "@types/tar": "^6.1.5",
45
+ "@types/tmp": "^0.2.3",
46
+ "directory-tree": "^3.5.1",
47
+ "execa": "npm:@esm2cjs/execa@^6.1.1-cjs.1",
48
+ "jest": "^29.5.0",
49
+ "react-native": "^0.72.0",
50
+ "ts-jest": "^29.1.0",
51
+ "ts-node": "^10.9.1",
52
+ "typescript": "^5.0.4"
53
+ },
54
+ "dependencies": {
55
+ "@react-native-community/cli-tools": "^13.6.5",
56
+ "@react-native/codegen": "0.74.0",
57
+ "@tsconfig/recommended": "^1.0.2",
58
+ "adm-zip": "^0.5.12",
59
+ "case": "^1.6.3",
60
+ "chalk": "^4",
61
+ "commander": "^14.0.0",
62
+ "fs-extra": "^11.1.1",
63
+ "glob": "^10.2.6",
64
+ "ignore": "^5.2.4",
65
+ "inquirer": "^12.7.0",
66
+ "json5": "^2.2.3",
67
+ "memfs": "4.12.0",
68
+ "mustache": "^4.2.0",
69
+ "tar": "^6.1.15",
70
+ "tmp": "^0.2.1",
71
+ "metro": "0.82.5"
72
+ },
73
+ "homepage": "https://gitcode.com/openharmony-sig/ohos_react_native",
74
+ "repository": {
75
+ "type": "gitcode",
76
+ "url": "https://gitcode.com/openharmony-sig/ohos_react_native"
77
+ }
78
+ }
@@ -1,17 +1,17 @@
1
- /**
2
- * Copyright (c) 2024 Huawei Technologies Co., Ltd.
3
- *
4
- * This source code is licensed under the MIT license found in the
5
- * LICENSE-MIT file in the root directory of this source tree.
6
- */
7
-
8
- const { config: harmonyConfig } = require('./dist');
9
-
10
- /**
11
- * @type {import("@react-native-community/cli-types").Config}
12
- */
13
- const config = {
14
- commands: harmonyConfig.commands,
15
- };
16
-
17
- module.exports = config;
1
+ /**
2
+ * Copyright (c) 2024 Huawei Technologies Co., Ltd.
3
+ *
4
+ * This source code is licensed under the MIT license found in the
5
+ * LICENSE-MIT file in the root directory of this source tree.
6
+ */
7
+
8
+ const { config: harmonyConfig } = require('./dist');
9
+
10
+ /**
11
+ * @type {import("@react-native-community/cli-types").Config}
12
+ */
13
+ const config = {
14
+ commands: harmonyConfig.commands,
15
+ };
16
+
17
+ module.exports = config;
@@ -1,7 +1,7 @@
1
- {
2
- "extends": "./tsconfig.json",
3
- "exclude": [
4
- "tests",
5
- "**/*.test.ts",
6
- ]
1
+ {
2
+ "extends": "./tsconfig.json",
3
+ "exclude": [
4
+ "tests",
5
+ "**/*.test.ts",
6
+ ]
7
7
  }
package/tsconfig.json CHANGED
@@ -1,3 +1,3 @@
1
- {
2
- "extends": "@tsconfig/recommended/tsconfig.json",
1
+ {
2
+ "extends": "@tsconfig/recommended/tsconfig.json",
3
3
  }
package/.prettierrc DELETED
@@ -1,6 +0,0 @@
1
- {
2
- "trailingComma": "es5",
3
- "tabWidth": 2,
4
- "semi": true,
5
- "singleQuote": true
6
- }
@@ -1,134 +0,0 @@
1
- /**
2
- * Copyright (c) 2024 Huawei Technologies Co., Ltd.
3
- *
4
- * This source code is licensed under the MIT license found in the
5
- * LICENSE-MIT file in the root directory of this source tree.
6
- */
7
- import fs from 'fs';
8
- import pathUtils from 'path';
9
- import type { AssetData } from 'metro';
10
- import { Logger } from './io';
11
-
12
- type Path = string;
13
- type CopiedFiles = Record<Path, Path>;
14
-
15
- const ALLOWED_SCALES: number[] = [1, 2, 3, 4];
16
-
17
- function filterAssetScales(
18
- scales: readonly number[],
19
- ): readonly number[] {
20
- const result = scales.filter(scale => ALLOWED_SCALES.includes(scale));
21
- if (result.length === 0 && scales.length > 0) {
22
- // No matching scale found, but there are some available. Ideally we don't
23
- // want to be in this situation and should throw, but for now as a fallback
24
- // let's just use the closest larger image
25
- const maxScale = ALLOWED_SCALES[ALLOWED_SCALES.length - 1];
26
- for (const scale of scales) {
27
- if (scale > maxScale) {
28
- result.push(scale);
29
- break;
30
- }
31
- }
32
- // There is no larger scales available, use the largest we have
33
- if (result.length === 0) {
34
- result.push(scales[scales.length - 1]);
35
- }
36
- }
37
- return result;
38
- }
39
-
40
- export async function copyAssets(
41
- logger: Logger,
42
- assetsData: readonly AssetData[],
43
- assetsDest: Path
44
- ): Promise<void> {
45
- if (assetsDest == null) {
46
- logger.warn((s) => 'Assets destination folder is not set, skipping...');
47
- return;
48
- }
49
-
50
- const filesToCopy: CopiedFiles = {};
51
- const addAssetToCopy = (asset: AssetData) => {
52
- const validScales = filterAssetScales(asset.scales);
53
- asset.scales.forEach((scale, idx) => {
54
- if (!validScales.includes(scale)) {
55
- return;
56
- }
57
- const src = asset.files[idx];
58
- const dest = pathUtils.join(assetsDest, getAssetDestRelativePath(asset, scale));
59
- filesToCopy[src] = dest;
60
- });
61
- };
62
-
63
- assetsData.forEach(addAssetToCopy);
64
-
65
- return copyFiles(logger, filesToCopy);
66
- }
67
-
68
- function getAssetDestRelativePath(asset: AssetData, scale: number = 1): string {
69
- const suffix = scale === 1 ? '' : `@${scale}x`;
70
- const fileName = getResourceIdentifier(asset);
71
- // Assets can have relative paths outside of the project root.
72
- // Replace `../` with `_` to make sure they don't end up outside of
73
- // the expected assets directory.
74
- return `${fileName + suffix}.${asset.type}`.replace(/\.\.\//g, '_');
75
- }
76
-
77
- function getResourceIdentifier(asset: AssetData): string {
78
- const folderPath = getBasePath(asset);
79
- return `${folderPath}/${asset.name}`.replace(/^assets\//, '');
80
- }
81
-
82
- function getBasePath(asset: AssetData): string {
83
- const basePath = asset.httpServerLocation;
84
- return basePath.startsWith('/') ? basePath.slice(1) : basePath;
85
- }
86
-
87
- function copyFiles(logger: Logger, fileDestBySrc: CopiedFiles) {
88
- const fileSources = Object.keys(fileDestBySrc);
89
- if (fileSources.length === 0) {
90
- return Promise.resolve();
91
- }
92
-
93
- const assetFilesCount = fileSources.length;
94
- return new Promise<void>((resolve, reject) => {
95
- const copyNext = (error?: Error) => {
96
- if (error) {
97
- reject(error);
98
- return;
99
- }
100
- if (fileSources.length === 0) {
101
- logger.info(
102
- () =>
103
- `Copied ${assetFilesCount} ${
104
- assetFilesCount === 1 ? 'asset' : 'assets'
105
- }`
106
- );
107
- resolve();
108
- } else {
109
- // fileSources.length === 0 is checked in previous branch, so this is string
110
- const src = fileSources.shift()!;
111
- const dest = fileDestBySrc[src];
112
- copyFile(src, dest, copyNext);
113
- }
114
- };
115
- copyNext();
116
- });
117
- }
118
-
119
- function copyFile(
120
- src: string,
121
- dest: string,
122
- onFinished: (error?: Error) => void
123
- ): void {
124
- const destDir = pathUtils.dirname(dest);
125
- fs.mkdir(destDir, { recursive: true }, (err?) => {
126
- if (err) {
127
- onFinished(err);
128
- return;
129
- }
130
- fs.createReadStream(src)
131
- .pipe(fs.createWriteStream(dest))
132
- .on('finish', onFinished);
133
- });
134
- }