@react-native-oh/react-native-harmony-cli 0.77.22 → 0.77.33
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/dist/assetResolver.js +74 -43
- package/dist/autolinking/Autolinking.js +179 -178
- package/dist/codegen/core/CodegenError.js +23 -3
- package/dist/codegen/core/EventUtils.js +3 -3
- package/dist/codegen/core/TypeAnnotationToTS.js +28 -24
- package/dist/codegen/core/UberSchema.js +97 -55
- package/dist/codegen/generators/AppBuildTimeGlueCodeGenerator.js +41 -28
- package/dist/codegen/generators/ArkTSComponentCodeGeneratorArkTS.js +34 -27
- package/dist/codegen/generators/ArkTSComponentCodeGeneratorCAPI.js +33 -25
- package/dist/codegen/generators/CppComponentCodeGenerator.js +28 -23
- package/dist/codegen/generators/LibGlueCodeGenerator.js +29 -26
- package/dist/codegen/generators/NativeModuleCodeGenerator.js +30 -25
- package/dist/codegen/generators/SharedComponentCodeGenerator.js +15 -15
- package/dist/codegen/generators/UberGeneratorV1.js +24 -18
- package/dist/codegen/generators/UberGeneratorV2.js +36 -28
- package/dist/codegen/templates/BaseComponentInstanceHTemplate.js +24 -50
- package/dist/codegen/templates/BasePackageHTemplate.js +21 -120
- package/dist/codegen/templates/ComponentDescriptorHTemplate.js +8 -54
- package/dist/codegen/templates/ComponentJSIBinderHTemplate.js +27 -75
- package/dist/codegen/templates/ComponentUtilsTSTemplate.js +29 -162
- package/dist/codegen/templates/IndexTSTemplate.js +17 -37
- package/dist/codegen/templates/RNOHGeneratedPackageHTemplate.js +24 -119
- package/dist/codegen/templates/TurboModuleCppTemplate.js +15 -38
- package/dist/codegen/templates/TurboModuleHTemplate.js +11 -32
- package/dist/codegen/templates/TurboModuleSpecTSTemplate.js +19 -52
- package/dist/commands/bundle-harmony.js +221 -118
- package/dist/commands/clean-harmony.js +63 -58
- package/dist/commands/codegen-harmony.js +175 -104
- package/dist/commands/codegen-lib-harmony.js +116 -76
- package/dist/commands/init-harmony.js +196 -151
- package/dist/commands/init.js +961 -537
- package/dist/commands/link-harmony.js +82 -35
- package/dist/commands/run-harmony.js +518 -374
- package/dist/commands/verify-package-harmony.js +117 -54
- package/dist/core/AbsolutePath.js +49 -33
- package/dist/core/CodegenConfig.js +22 -24
- package/dist/core/DescriptiveError.js +37 -18
- package/dist/core/FileSystem.js +18 -14
- package/dist/core/OHPackageJSON5.js +23 -17
- package/dist/core/PackageJSON.js +42 -26
- package/dist/core/ProjectDependenciesManager.js +92 -40
- package/dist/core/ValidationError.js +22 -2
- package/dist/core/fs.js +7 -10
- package/dist/index.js +1 -1
- package/dist/init/templates/AppScopeAppJSON5Template.js +8 -21
- package/dist/init/templates/AppScopeStringVarTemplate.js +8 -19
- package/dist/init/templates/EntryIndexTemplate.js +8 -56
- package/dist/init/templates/EntryStringVarTemplate.js +8 -27
- package/dist/init/templates/HvigorConfigJson5Template.js +8 -33
- package/dist/init/templates/MetroConfigTemplate.js +8 -38
- package/dist/init/templates/OhPackageJson5Template.js +8 -28
- package/dist/io/CliExecutor.js +98 -46
- package/dist/io/Logger.js +46 -40
- package/dist/io/RealFS.js +100 -43
- package/dist/io/TarGz.js +8 -11
- package/dist/io/__fixtures__.js +141 -79
- package/dist/io/fsUtils.js +12 -13
- package/dist/package-verifier/checks/HarmonyDirContainsOnlyHarsCheck.js +47 -19
- package/dist/package-verifier/checks/HarmonyDirExistsCheck.js +41 -13
- package/dist/package-verifier/checks/NpmAnAndOhPackageVersionsAreEqual.js +38 -8
- package/dist/package-verifier/checks/OhPackageNameFollowsNamingConventionCheck.js +54 -22
- package/dist/package-verifier/verify-package.js +133 -56
- package/dist/simulator/LaunchSimulator.js +301 -217
- package/package.json +2 -11
- package/scripts/sync-hvigor.js +27 -0
- package/src/autolinking/Autolinking.ts +1 -1
- package/src/codegen/generators/UberGeneratorV1.ts +7 -2
- package/src/codegen/generators/UberGeneratorV2.ts +6 -1
- package/src/commands/codegen-harmony.ts +17 -7
- package/src/commands/run-harmony.ts +0 -2
- package/src/simulator/LaunchSimulator.ts +9 -2
- package/dist/init/templates/harmony/AppScope/app.json5 +0 -10
- package/dist/init/templates/harmony/AppScope/resources/base/element/string.json +0 -8
- package/dist/init/templates/harmony/AppScope/resources/base/media/app_icon.png +0 -0
- package/dist/init/templates/harmony/build-profile.json5 +0 -36
- package/dist/init/templates/harmony/codelinter.json +0 -32
- package/dist/init/templates/harmony/entry/build-profile.json5 +0 -18
- package/dist/init/templates/harmony/entry/gitignore +0 -7
- package/dist/init/templates/harmony/entry/hvigorfile.ts +0 -13
- package/dist/init/templates/harmony/entry/oh-package.json5 +0 -9
- package/dist/init/templates/harmony/entry/src/main/cpp/CMakeLists.txt +0 -27
- package/dist/init/templates/harmony/entry/src/main/cpp/PackageProvider.cpp +0 -13
- package/dist/init/templates/harmony/entry/src/main/cpp/gitignore +0 -4
- package/dist/init/templates/harmony/entry/src/main/ets/PackageProvider.ets +0 -8
- package/dist/init/templates/harmony/entry/src/main/ets/codegen/gitignore +0 -2
- package/dist/init/templates/harmony/entry/src/main/ets/entryability/EntryAbility.ets +0 -11
- package/dist/init/templates/harmony/entry/src/main/ets/gitignore +0 -1
- package/dist/init/templates/harmony/entry/src/main/ets/pages/.gitkeep +0 -0
- package/dist/init/templates/harmony/entry/src/main/ets/workers/RNOHWorker.ets +0 -16
- package/dist/init/templates/harmony/entry/src/main/module.json5 +0 -65
- package/dist/init/templates/harmony/entry/src/main/resources/base/element/color.json +0 -8
- package/dist/init/templates/harmony/entry/src/main/resources/base/element/string.json +0 -16
- package/dist/init/templates/harmony/entry/src/main/resources/base/media/background.png +0 -0
- package/dist/init/templates/harmony/entry/src/main/resources/base/media/foreground.png +0 -0
- package/dist/init/templates/harmony/entry/src/main/resources/base/media/layered_image.json +0 -7
- package/dist/init/templates/harmony/entry/src/main/resources/base/media/startIcon.png +0 -0
- package/dist/init/templates/harmony/entry/src/main/resources/base/profile/main_pages.json +0 -5
- package/dist/init/templates/harmony/entry/src/main/resources/gitignore +0 -1
- package/dist/init/templates/harmony/entry/src/ohosTest/ets/test/List.test.ets +0 -2
- package/dist/init/templates/harmony/entry/src/ohosTest/module.json5 +0 -13
- package/dist/init/templates/harmony/gitignore +0 -16
- package/dist/init/templates/harmony/hvigor/hvigor-config.json5 +0 -22
- package/dist/init/templates/harmony/hvigorfile.ts +0 -7
- package/harmony/rnoh-hvigor-plugin-0.77.22.tgz +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/02febc14 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/0429e5b7 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/05339e68 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/070be2fe +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/07851ff1 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/12e10c06 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/12e1d696 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/14950087 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/15e87372 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/19e6ecbe +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/1aac0ac4 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/1b8db102 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/1c181646 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/203e747c +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/21ba4c08 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/259939e5 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/288ba98c +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/2a45461c +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/2d773091 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/2eda89fc +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/2f584eca +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/35b495ca +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/36478aed +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/3844e772 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/3ee777f4 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/471ac436 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4a91abcc +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4d1a5094 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4d3ef38f +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4daf5855 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4ef0389f +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4f72da28 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/59d3e924 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/5a8edfaa +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/5d28a510 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/61a6391d +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/65921a14 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/6624e7fc +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/66d28144 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/6aceb8d2 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/702393d3 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/714f932b +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/73f9d4a6 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/78d3adae +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7b6564b8 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7c7c3e6e +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7cbc9b6a +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7dd579e0 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7e0b7d06 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7e153eef +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7ee84fd7 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7f5146a4 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/844e633a +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/8a1af22c +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/90a1680d +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/a15fb79a +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/ac288a8a +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/ad7a66b4 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/aee8805e +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b0487ec8 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b10e16d2 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b32d42ac +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b7d8f35c +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b96748af +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/bedb2fea +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/c01ad640 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/c0472cf5 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/c102ed0f +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/c1a91819 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/c243857a +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/c407792f +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/c4459bee +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/c72a4dcd +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/c83537a9 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/c88f7498 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/c8d04070 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/cc44d6f1 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/d4d913f6 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/da97f202 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/dc965522 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/dff6f700 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/e507c001 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/e52f3f2d +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/e5c3890d +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/e720074d +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/e7656fa7 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/e80bcaac +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/e8e7900e +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/ee8993f9 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/ef8cf362 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/f1405b1d +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/f20f0e0d +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/f2586978 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/f53cd716 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/fe71f6bb +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/febfc20b +0 -0
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -31,18 +8,42 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
31
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
9
|
});
|
|
33
10
|
};
|
|
34
|
-
var
|
|
35
|
-
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
13
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
36
37
|
};
|
|
37
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
39
|
exports.commandCleanHarmony = void 0;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
40
|
+
var core_1 = require("../core");
|
|
41
|
+
var json5_1 = require("json5");
|
|
42
|
+
var node_fs_1 = require("node:fs");
|
|
43
|
+
var node_path_1 = require("node:path");
|
|
44
|
+
var node_os_1 = require("node:os");
|
|
45
|
+
var crypto = require("node:crypto");
|
|
46
|
+
var COMMAND_NAME = 'clean-harmony';
|
|
46
47
|
exports.commandCleanHarmony = {
|
|
47
48
|
name: COMMAND_NAME,
|
|
48
49
|
description: 'Remove cached files in the OpenHarmony project.',
|
|
@@ -53,32 +54,36 @@ exports.commandCleanHarmony = {
|
|
|
53
54
|
default: "./harmony"
|
|
54
55
|
}
|
|
55
56
|
],
|
|
56
|
-
func: (_argv, _config, rawArgs)
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
if (
|
|
68
|
-
buildProfile.
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
57
|
+
func: function (_argv, _config, rawArgs) { return __awaiter(void 0, void 0, void 0, function () {
|
|
58
|
+
var harmonyProjectPath, md5Path, hvigorCachePath, buildProfilePath, buildProfileContent, buildProfile;
|
|
59
|
+
return __generator(this, function (_a) {
|
|
60
|
+
harmonyProjectPath = new core_1.AbsolutePath(rawArgs.harmonyProjectPath);
|
|
61
|
+
md5Path = crypto.createHash("md5").update(harmonyProjectPath.getValue()).digest("hex");
|
|
62
|
+
hvigorCachePath = new core_1.AbsolutePath(node_path_1.default.join(node_os_1.default.homedir(), ".hvigor", "project_caches", md5Path));
|
|
63
|
+
if (node_fs_1.default.existsSync(hvigorCachePath.getValue())) {
|
|
64
|
+
node_fs_1.default.rmSync(hvigorCachePath.getValue(), { recursive: true, force: true });
|
|
65
|
+
}
|
|
66
|
+
buildProfilePath = harmonyProjectPath.copyWithNewSegment('build-profile.json5');
|
|
67
|
+
buildProfileContent = (0, core_1.maybeReadFile)(buildProfilePath);
|
|
68
|
+
if (buildProfileContent) {
|
|
69
|
+
buildProfile = json5_1.default.parse(buildProfileContent);
|
|
70
|
+
if (Array.isArray(buildProfile.modules)) {
|
|
71
|
+
buildProfile.modules.forEach(function (module) {
|
|
72
|
+
if (module && module.srcPath) {
|
|
73
|
+
var modulePath = harmonyProjectPath.copyWithNewSegment(module.srcPath);
|
|
74
|
+
var cxxPath = modulePath.copyWithNewSegment('.cxx');
|
|
75
|
+
var buildPath = modulePath.copyWithNewSegment('build');
|
|
76
|
+
if (node_fs_1.default.existsSync(cxxPath.getValue())) {
|
|
77
|
+
node_fs_1.default.rmSync(cxxPath.getValue(), { recursive: true, force: true });
|
|
78
|
+
}
|
|
79
|
+
if (node_fs_1.default.existsSync(buildPath.getValue())) {
|
|
80
|
+
node_fs_1.default.rmSync(buildPath.getValue(), { recursive: true, force: true });
|
|
81
|
+
}
|
|
78
82
|
}
|
|
79
|
-
}
|
|
80
|
-
}
|
|
83
|
+
});
|
|
84
|
+
}
|
|
81
85
|
}
|
|
82
|
-
|
|
83
|
-
|
|
86
|
+
return [2 /*return*/];
|
|
87
|
+
});
|
|
88
|
+
}); }
|
|
84
89
|
};
|
|
@@ -8,23 +8,60 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var
|
|
12
|
-
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
13
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
39
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
40
|
+
if (ar || !(i in from)) {
|
|
41
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
42
|
+
ar[i] = from[i];
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
13
46
|
};
|
|
14
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
48
|
exports.commandCodegenHarmony = void 0;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
49
|
+
var node_path_1 = require("node:path");
|
|
50
|
+
var case_1 = require("case");
|
|
51
|
+
var core_1 = require("../core");
|
|
52
|
+
var codegen_1 = require("../codegen");
|
|
53
|
+
var io_1 = require("../io");
|
|
21
54
|
exports.commandCodegenHarmony = {
|
|
22
55
|
name: 'codegen-harmony',
|
|
23
56
|
description: 'Generates boilerplate, types, and utilities from Turbo Module and Fabric Component specifications. This command is meant to be executed during the application build process.',
|
|
24
57
|
options: [
|
|
25
58
|
{
|
|
26
59
|
name: '--rnoh-module-path <path>',
|
|
27
|
-
description: 'Specifies the relative path to the rnoh OHOS module',
|
|
60
|
+
description: '[deprecated] Specifies the relative path to the rnoh OHOS module',
|
|
61
|
+
},
|
|
62
|
+
{
|
|
63
|
+
name: '--ets-output-path <path>',
|
|
64
|
+
description: 'Specifies the relative path to the output directory intended for storing generated ETS files.',
|
|
28
65
|
},
|
|
29
66
|
{
|
|
30
67
|
name: '--cpp-output-path <path>',
|
|
@@ -46,109 +83,141 @@ exports.commandCodegenHarmony = {
|
|
|
46
83
|
description: '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.',
|
|
47
84
|
},
|
|
48
85
|
],
|
|
49
|
-
func: (_argv, _config, args)
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
86
|
+
func: function (_argv, _config, args) { return __awaiter(void 0, void 0, void 0, function () {
|
|
87
|
+
var logger, fs, MAX_SUPPORTED_CODEGEN_VERSION_1, etsOutputPath, isEndWithGenerated, enableSafetyCheck, cppOutputPath, projectRootPath, uberSchemaFromArkTSLibraries, cApiLibrariesData, codegenNoticeLines, uberGeneratorV1, uberGeneratorV2, glueCodeGenerator, fileContentByPath_1, appendToFileContentByPath, uberSchema_1, err_1;
|
|
88
|
+
return __generator(this, function (_a) {
|
|
89
|
+
switch (_a.label) {
|
|
90
|
+
case 0:
|
|
91
|
+
logger = new io_1.Logger();
|
|
92
|
+
fs = new io_1.RealFS();
|
|
93
|
+
_a.label = 1;
|
|
94
|
+
case 1:
|
|
95
|
+
_a.trys.push([1, 6, , 7]);
|
|
96
|
+
MAX_SUPPORTED_CODEGEN_VERSION_1 = 2;
|
|
97
|
+
// prepare the input data
|
|
98
|
+
validateArgs(args);
|
|
99
|
+
etsOutputPath = args.etsOutputPath || args.rnohModulePath;
|
|
100
|
+
isEndWithGenerated = /\/generated\/?$/.test(etsOutputPath);
|
|
101
|
+
etsOutputPath = new core_1.AbsolutePath(etsOutputPath);
|
|
102
|
+
if (!isEndWithGenerated) {
|
|
103
|
+
etsOutputPath = etsOutputPath.copyWithNewSegment('generated');
|
|
104
|
+
}
|
|
105
|
+
enableSafetyCheck = args.safetyCheck;
|
|
106
|
+
cppOutputPath = new core_1.AbsolutePath(args.cppOutputPath);
|
|
107
|
+
projectRootPath = new core_1.AbsolutePath(args.projectRootPath);
|
|
108
|
+
return [4 /*yield*/, codegen_1.UberSchema.fromProject(fs, projectRootPath, function (codegenVersion, packageName) {
|
|
109
|
+
throwErrorIfUnsupportedCodegenVersion(codegenVersion, MAX_SUPPORTED_CODEGEN_VERSION_1, packageName);
|
|
110
|
+
return codegenVersion === 1;
|
|
111
|
+
})];
|
|
112
|
+
case 2:
|
|
113
|
+
uberSchemaFromArkTSLibraries = _a.sent();
|
|
114
|
+
return [4 /*yield*/, collectLibrariesData(fs, projectRootPath, function (codegenVersion, packageName) {
|
|
115
|
+
throwErrorIfUnsupportedCodegenVersion(codegenVersion, MAX_SUPPORTED_CODEGEN_VERSION_1, packageName);
|
|
116
|
+
return codegenVersion === 2;
|
|
117
|
+
})];
|
|
118
|
+
case 3:
|
|
119
|
+
cApiLibrariesData = _a.sent();
|
|
120
|
+
codegenNoticeLines = [
|
|
121
|
+
'This code was generated by "react-native codegen-harmony"',
|
|
122
|
+
'',
|
|
123
|
+
'Do not edit this file as changes may cause incorrect behavior and will be',
|
|
124
|
+
'lost once the code is regenerated.',
|
|
125
|
+
];
|
|
126
|
+
uberGeneratorV1 = new codegen_1.UberGeneratorV1(cppOutputPath, etsOutputPath, __spreadArray(__spreadArray([], codegenNoticeLines, true), ['', '@generatorVersion: 1'], false));
|
|
127
|
+
uberGeneratorV2 = new codegen_1.UberGeneratorV2(cppOutputPath, etsOutputPath, __spreadArray(__spreadArray([], codegenNoticeLines, true), ['', '@generatorVersion: 2'], false));
|
|
128
|
+
glueCodeGenerator = new codegen_1.AppBuildTimeGlueCodeGenerator(cppOutputPath, etsOutputPath, codegenNoticeLines);
|
|
129
|
+
fileContentByPath_1 = new Map();
|
|
130
|
+
appendToFileContentByPath = function (fileContent, path) {
|
|
131
|
+
fileContentByPath_1.set(path, fileContent);
|
|
132
|
+
};
|
|
133
|
+
uberGeneratorV1
|
|
134
|
+
.generate(uberSchemaFromArkTSLibraries)
|
|
135
|
+
.forEach(appendToFileContentByPath);
|
|
136
|
+
uberGeneratorV2
|
|
137
|
+
.generate(cApiLibrariesData)
|
|
138
|
+
.forEach(appendToFileContentByPath);
|
|
139
|
+
glueCodeGenerator
|
|
140
|
+
.generate({
|
|
141
|
+
v1: uberGeneratorV1.getGlueCodeData(),
|
|
142
|
+
v2: uberGeneratorV2.getGlueCodeData(),
|
|
143
|
+
})
|
|
144
|
+
.forEach(appendToFileContentByPath);
|
|
145
|
+
if (!args.debug) return [3 /*break*/, 5];
|
|
146
|
+
return [4 /*yield*/, codegen_1.UberSchema.fromProject(fs, projectRootPath)];
|
|
147
|
+
case 4:
|
|
148
|
+
uberSchema_1 = _a.sent();
|
|
149
|
+
logger.debug(function (styles) {
|
|
150
|
+
return styles.gray(JSON.stringify(uberSchema_1.getValue(), null, 2));
|
|
151
|
+
});
|
|
152
|
+
_a.label = 5;
|
|
153
|
+
case 5:
|
|
154
|
+
saveCodegenResult(fs, fileContentByPath_1, cppOutputPath, etsOutputPath, enableSafetyCheck);
|
|
155
|
+
logCodegenResult(logger, fileContentByPath_1, projectRootPath);
|
|
156
|
+
return [3 /*break*/, 7];
|
|
157
|
+
case 6:
|
|
158
|
+
err_1 = _a.sent();
|
|
159
|
+
if (err_1 instanceof core_1.DescriptiveError) {
|
|
160
|
+
logger.descriptiveError(err_1);
|
|
161
|
+
process.exit(1);
|
|
162
|
+
}
|
|
163
|
+
throw err_1;
|
|
164
|
+
case 7: return [2 /*return*/];
|
|
107
165
|
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
}),
|
|
166
|
+
});
|
|
167
|
+
}); },
|
|
111
168
|
};
|
|
112
169
|
function validateArgs(args) {
|
|
113
|
-
if (!args.rnohModulePath) {
|
|
170
|
+
if (!args.rnohModulePath && !args.etsOutputPath) {
|
|
114
171
|
throw new core_1.DescriptiveError({
|
|
115
|
-
whatHappened:
|
|
172
|
+
whatHappened: '--ets-output-path is required',
|
|
116
173
|
whatCanUserDo: [
|
|
117
|
-
'Please provide
|
|
174
|
+
'Please provide an output path for the ETS file.',
|
|
175
|
+
'It is recommended to place it in the same directory as the custom component or TurboModule.',
|
|
176
|
+
'Do not place it inside @rnoh/react-native-openharmony, otherwise a jscrash may occur when using react_native_openharmony_release2.har.'
|
|
118
177
|
],
|
|
119
178
|
});
|
|
120
179
|
}
|
|
121
180
|
}
|
|
122
181
|
function collectLibrariesData(fs, projectRootPath, onShouldAcceptCodegenConfig) {
|
|
123
|
-
return __awaiter(this, void 0, void 0, function
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
results
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
182
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
183
|
+
var packageJSONs, results, _i, packageJSONs_1, packageJSON, codegenConfigs, _a, codegenConfigs_1, codegenConfig;
|
|
184
|
+
return __generator(this, function (_b) {
|
|
185
|
+
switch (_b.label) {
|
|
186
|
+
case 0:
|
|
187
|
+
packageJSONs = [
|
|
188
|
+
core_1.PackageJSON.fromProjectRootPath(fs, projectRootPath, projectRootPath),
|
|
189
|
+
];
|
|
190
|
+
return [4 /*yield*/, new core_1.ProjectDependenciesManager(fs, projectRootPath).forEachAsync(function (dependency) {
|
|
191
|
+
packageJSONs.push(dependency.readPackageJSON());
|
|
192
|
+
})];
|
|
193
|
+
case 1:
|
|
194
|
+
_b.sent();
|
|
195
|
+
results = [];
|
|
196
|
+
for (_i = 0, packageJSONs_1 = packageJSONs; _i < packageJSONs_1.length; _i++) {
|
|
197
|
+
packageJSON = packageJSONs_1[_i];
|
|
198
|
+
codegenConfigs = packageJSON.getCodegenConfigs();
|
|
199
|
+
for (_a = 0, codegenConfigs_1 = codegenConfigs; _a < codegenConfigs_1.length; _a++) {
|
|
200
|
+
codegenConfig = codegenConfigs_1[_a];
|
|
201
|
+
if (codegenConfig &&
|
|
202
|
+
onShouldAcceptCodegenConfig(codegenConfig.getVersion(), packageJSON.name)) {
|
|
203
|
+
results.push({
|
|
204
|
+
libraryCppName: deriveCppDirectoryNameFromNpmPackageName(packageJSON.name),
|
|
205
|
+
uberSchema: codegen_1.UberSchema.fromCodegenConfig(codegenConfig),
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
return [2 /*return*/, results];
|
|
141
211
|
}
|
|
142
|
-
}
|
|
143
|
-
return results;
|
|
212
|
+
});
|
|
144
213
|
});
|
|
145
214
|
}
|
|
146
215
|
function throwErrorIfUnsupportedCodegenVersion(codegenVersion, maxSupportedCodegenVersion, packageName) {
|
|
147
216
|
if (codegenVersion > maxSupportedCodegenVersion) {
|
|
148
217
|
throw new codegen_1.CodegenError({
|
|
149
|
-
whatHappened:
|
|
218
|
+
whatHappened: "Package \"".concat(packageName, "\" requires codegenVersion: ").concat(codegenVersion, ", which is not supported (maxSupportedCodegenVersion=").concat(maxSupportedCodegenVersion, ")."),
|
|
150
219
|
whatCanUserDo: [
|
|
151
|
-
|
|
220
|
+
"Try downgrading \"".concat(packageName, "\"."),
|
|
152
221
|
'Update the "@react-native-oh/react-native-harmony-cli" package.',
|
|
153
222
|
],
|
|
154
223
|
});
|
|
@@ -159,10 +228,10 @@ function saveCodegenResult(fs, fileContentByPath, cppOutputPath, etsOutputPath,
|
|
|
159
228
|
prepareDirectory(etsOutputPath, enableSafetyCheck);
|
|
160
229
|
prepareDirectory(etsOutputPath.copyWithNewSegment('components'), enableSafetyCheck);
|
|
161
230
|
prepareDirectory(etsOutputPath.copyWithNewSegment('turboModules'), enableSafetyCheck);
|
|
162
|
-
fileContentByPath.forEach((_fileContent, path)
|
|
231
|
+
fileContentByPath.forEach(function (_fileContent, path) {
|
|
163
232
|
prepareDirectory(path.getDirectoryPath(), enableSafetyCheck);
|
|
164
233
|
});
|
|
165
|
-
fileContentByPath.forEach((fileContent, path)
|
|
234
|
+
fileContentByPath.forEach(function (fileContent, path) {
|
|
166
235
|
fs.writeTextSync(path, fileContent);
|
|
167
236
|
});
|
|
168
237
|
}
|
|
@@ -170,24 +239,26 @@ function prepareDirectory(path, enableSafetyCheck) {
|
|
|
170
239
|
(0, core_1.maybeMakeDirectories)(path);
|
|
171
240
|
if (enableSafetyCheck && !path.getValue().startsWith(process.cwd())) {
|
|
172
241
|
throw new core_1.DescriptiveError({
|
|
173
|
-
whatHappened:
|
|
242
|
+
whatHappened: "Tried to remove files in ".concat(path.getValue(), "\nand that path is outside current working directory"),
|
|
174
243
|
whatCanUserDo: ['Run codegen from different location'],
|
|
175
244
|
});
|
|
176
245
|
}
|
|
177
246
|
(0, core_1.maybeRemoveFilesInDirectory)(path);
|
|
178
247
|
}
|
|
179
248
|
function logCodegenResult(logger, fileContentByPath, projectRootPath) {
|
|
180
|
-
|
|
249
|
+
var sortedRelativePathStrings = Array.from(fileContentByPath.keys()).map(function (path) { return node_path_1.default.relative(projectRootPath.getValue(), path.getValue()); });
|
|
181
250
|
sortedRelativePathStrings.sort();
|
|
182
|
-
sortedRelativePathStrings.forEach((pathStr)
|
|
183
|
-
logger.debug((styles)
|
|
251
|
+
sortedRelativePathStrings.forEach(function (pathStr) {
|
|
252
|
+
logger.debug(function (styles) { return styles.gray("\u2022 ".concat(pathStr)); });
|
|
253
|
+
});
|
|
254
|
+
logger.debug(function () { return ''; });
|
|
255
|
+
logger.info(function (styles) {
|
|
256
|
+
return "Generated ".concat(styles.green(styles.bold(fileContentByPath.size)), " file(s)");
|
|
184
257
|
});
|
|
185
|
-
logger.debug(()
|
|
186
|
-
logger.info((styles) => `Generated ${styles.green(styles.bold(fileContentByPath.size))} file(s)`);
|
|
187
|
-
logger.debug(() => '');
|
|
258
|
+
logger.debug(function () { return ''; });
|
|
188
259
|
}
|
|
189
260
|
function deriveCppDirectoryNameFromNpmPackageName(npmPackageName) {
|
|
190
|
-
|
|
261
|
+
var result = npmPackageName;
|
|
191
262
|
if (npmPackageName.includes('/')) {
|
|
192
263
|
result.replace('@', '');
|
|
193
264
|
result = npmPackageName.replace('/', '__');
|