@react-native-oh/react-native-harmony-cli 0.0.40 → 0.0.41
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 +11 -11
- package/dist/assetResolver.js +43 -74
- package/dist/autolinking/Autolinking.js +178 -179
- package/dist/codegen/core/CodegenError.js +3 -23
- package/dist/codegen/core/EventUtils.js +3 -3
- package/dist/codegen/core/TypeAnnotationToTS.js +24 -28
- package/dist/codegen/core/UberSchema.js +57 -96
- package/dist/codegen/generators/AppBuildTimeGlueCodeGenerator.js +28 -41
- package/dist/codegen/generators/ArkTSComponentCodeGeneratorArkTS.js +27 -34
- package/dist/codegen/generators/ArkTSComponentCodeGeneratorCAPI.js +25 -33
- package/dist/codegen/generators/CppComponentCodeGenerator.js +23 -28
- package/dist/codegen/generators/LibGlueCodeGenerator.js +26 -29
- package/dist/codegen/generators/NativeModuleCodeGenerator.js +25 -30
- package/dist/codegen/generators/SharedComponentCodeGenerator.js +15 -15
- package/dist/codegen/generators/UberGeneratorV1.js +24 -23
- package/dist/codegen/generators/UberGeneratorV2.js +34 -35
- package/dist/codegen/templates/BaseComponentInstanceHTemplate.js +50 -24
- package/dist/codegen/templates/BasePackageHTemplate.js +120 -21
- package/dist/codegen/templates/ComponentDescriptorHTemplate.js +53 -8
- package/dist/codegen/templates/ComponentJSIBinderHTemplate.js +75 -27
- package/dist/codegen/templates/ComponentUtilsTSTemplate.js +162 -29
- package/dist/codegen/templates/IndexTSTemplate.js +37 -17
- package/dist/codegen/templates/RNOHGeneratedPackageHTemplate.js +119 -24
- package/dist/codegen/templates/TurboModuleCppTemplate.js +38 -15
- package/dist/codegen/templates/TurboModuleHTemplate.js +32 -11
- package/dist/codegen/templates/TurboModuleSpecTSTemplate.js +52 -19
- package/dist/commands/bundle-harmony.js +53 -138
- package/dist/commands/codegen-harmony.js +105 -165
- package/dist/commands/codegen-lib-harmony.js +76 -116
- package/dist/commands/create-metro-host-constants.js +18 -47
- package/dist/commands/init.js +537 -961
- package/dist/commands/link-harmony.js +33 -71
- package/dist/commands/pack-harmony.js +47 -108
- package/dist/commands/run-harmony.js +372 -518
- package/dist/commands/unpack-harmony.js +105 -198
- package/dist/commands/verify-package-harmony.js +54 -108
- package/dist/core/AbsolutePath.js +31 -47
- package/dist/core/CodegenConfig.js +24 -22
- package/dist/core/DescriptiveError.js +18 -37
- package/dist/core/FileSystem.js +14 -18
- package/dist/core/OHPackageJSON5.js +17 -23
- package/dist/core/PackageJSON.js +26 -42
- package/dist/core/ProjectDependenciesManager.js +40 -92
- package/dist/core/ValidationError.js +2 -22
- package/dist/core/fs.js +9 -6
- package/dist/index.js +1 -1
- package/dist/io/CliExecutor.js +46 -98
- package/dist/io/Logger.js +40 -46
- package/dist/io/RealFS.js +35 -88
- package/dist/io/TarGz.js +11 -8
- package/dist/io/__fixtures__.js +79 -141
- package/dist/io/fsUtils.js +13 -12
- package/dist/package-verifier/checks/HarmonyDirContainsOnlyHarsCheck.js +19 -47
- package/dist/package-verifier/checks/HarmonyDirExistsCheck.js +13 -41
- package/dist/package-verifier/checks/NpmAnAndOhPackageVersionsAreEqual.js +8 -38
- package/dist/package-verifier/checks/OhPackageNameFollowsNamingConventionCheck.js +22 -54
- package/dist/package-verifier/verify-package.js +55 -132
- package/dist/simulator/LaunchSimulator.js +224 -301
- package/harmony/rnoh-hvigor-plugin-0.3.0.tgz +0 -0
- package/jest.config.js +12 -12
- package/package.json +78 -78
- package/react-native.config.js +17 -17
- package/tsconfig.build.json +6 -6
- package/tsconfig.json +2 -2
|
@@ -5,33 +5,6 @@
|
|
|
5
5
|
* This source code is licensed under the MIT license found in the
|
|
6
6
|
* LICENSE-MIT file in the root directory of this source tree.
|
|
7
7
|
*/
|
|
8
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
9
|
-
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);
|
|
10
|
-
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
11
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
12
|
-
function step(op) {
|
|
13
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
14
|
-
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
15
|
-
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;
|
|
16
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
17
|
-
switch (op[0]) {
|
|
18
|
-
case 0: case 1: t = op; break;
|
|
19
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
20
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
21
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
22
|
-
default:
|
|
23
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
24
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
25
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
26
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
27
|
-
if (t[2]) _.ops.pop();
|
|
28
|
-
_.trys.pop(); continue;
|
|
29
|
-
}
|
|
30
|
-
op = body.call(thisArg, _);
|
|
31
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
32
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
33
|
-
}
|
|
34
|
-
};
|
|
35
8
|
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
36
9
|
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
37
10
|
var m = o[Symbol.asyncIterator], i;
|
|
@@ -57,123 +30,73 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
|
|
|
57
30
|
function reject(value) { resume("throw", value); }
|
|
58
31
|
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
59
32
|
};
|
|
60
|
-
var
|
|
61
|
-
|
|
62
|
-
if (m) return m.call(o);
|
|
63
|
-
if (o && typeof o.length === "number") return {
|
|
64
|
-
next: function () {
|
|
65
|
-
if (o && i >= o.length) o = void 0;
|
|
66
|
-
return { value: o && o[i++], done: !o };
|
|
67
|
-
}
|
|
68
|
-
};
|
|
69
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
33
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
34
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
70
35
|
};
|
|
71
36
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
72
37
|
exports.verifyRNOHPackage = verifyRNOHPackage;
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
38
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
39
|
+
const tmp_1 = __importDefault(require("tmp"));
|
|
40
|
+
const core_1 = require("../core");
|
|
41
|
+
const checks_1 = require("./checks");
|
|
42
|
+
const io_1 = require("../io");
|
|
78
43
|
function verifyRNOHPackage(_a) {
|
|
79
|
-
return __asyncGenerator(this, arguments, function verifyRNOHPackage_1(
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
if (!harPath) {
|
|
97
|
-
throw new core_1.DescriptiveError({
|
|
98
|
-
whatHappened: 'Attempted to verify har but no har was found',
|
|
99
|
-
whatCanUserDo: [
|
|
100
|
-
'Run this command without --no-harmony-code flag.',
|
|
101
|
-
'Create har files by running DevEco Studio > Build > Make Module (MODULE_NAME). The har file can be later found in MODULE_NAME/build/default/outputs/default/MODULE_NAME.har. Copy that file to the PACKAGE_ROOT/harmony directory.',
|
|
102
|
-
],
|
|
103
|
-
});
|
|
104
|
-
}
|
|
105
|
-
tmpDirPath = new core_1.AbsolutePath(tmp_1.default.dirSync().name);
|
|
106
|
-
return [4 /*yield*/, __await({
|
|
107
|
-
type: 'START_PROCESS',
|
|
108
|
-
name: "Unpacking the har file to the tmpdir",
|
|
109
|
-
})];
|
|
110
|
-
case 3: return [4 /*yield*/, _c.sent()];
|
|
111
|
-
case 4:
|
|
112
|
-
_c.sent();
|
|
113
|
-
return [4 /*yield*/, __await((0, io_1.unpackTarGz)(harPath, tmpDirPath))];
|
|
114
|
-
case 5:
|
|
115
|
-
_c.sent();
|
|
116
|
-
ohPackageJson5 = core_1.OHPackageJSON5.fromPath(tmpDirPath.copyWithNewSegment('package', 'oh-package.json5'));
|
|
117
|
-
harChecks = [
|
|
118
|
-
(0, checks_1.createOhPackageNameFollowsNamingConventionCheck)(npmPackageJson.name, ohPackageJson5.name),
|
|
119
|
-
(0, checks_1.createNpmAndOhPackageVersionsAreEqualCheck)(npmPackageJson.version, ohPackageJson5.version),
|
|
120
|
-
];
|
|
121
|
-
return [5 /*yield**/, __values(__asyncDelegator(__asyncValues(runChecks(harChecks, checkNamesToSkip))))];
|
|
122
|
-
case 6: return [4 /*yield*/, __await.apply(void 0, [_c.sent()])];
|
|
123
|
-
case 7:
|
|
124
|
-
_c.sent();
|
|
125
|
-
_c.label = 8;
|
|
126
|
-
case 8: return [2 /*return*/];
|
|
44
|
+
return __asyncGenerator(this, arguments, function* verifyRNOHPackage_1({ npmPackagePath, hasHarmonyCode, checkNamesToSkip, }) {
|
|
45
|
+
const npmPackageJson = core_1.PackageJSON.fromProjectRootPath(new io_1.RealFS(), npmPackagePath, npmPackagePath);
|
|
46
|
+
const initialChecks = [
|
|
47
|
+
(0, checks_1.createHarmonyDirExistsCheck)(npmPackagePath, hasHarmonyCode),
|
|
48
|
+
(0, checks_1.createHarmonyDirContainsOnlyHarsCheck)(npmPackagePath, hasHarmonyCode),
|
|
49
|
+
];
|
|
50
|
+
yield __await(yield* __asyncDelegator(__asyncValues(runChecks(initialChecks, checkNamesToSkip))));
|
|
51
|
+
if (hasHarmonyCode) {
|
|
52
|
+
const harPath = findHarPath(npmPackagePath);
|
|
53
|
+
if (!harPath) {
|
|
54
|
+
throw new core_1.DescriptiveError({
|
|
55
|
+
whatHappened: 'Attempted to verify har but no har was found',
|
|
56
|
+
whatCanUserDo: [
|
|
57
|
+
'Run this command without --no-harmony-code flag.',
|
|
58
|
+
'Create har files by running DevEco Studio > Build > Make Module (MODULE_NAME). The har file can be later found in MODULE_NAME/build/default/outputs/default/MODULE_NAME.har. Copy that file to the PACKAGE_ROOT/harmony directory.',
|
|
59
|
+
],
|
|
60
|
+
});
|
|
127
61
|
}
|
|
128
|
-
|
|
62
|
+
const tmpDirPath = new core_1.AbsolutePath(tmp_1.default.dirSync().name);
|
|
63
|
+
yield yield __await({
|
|
64
|
+
type: 'START_PROCESS',
|
|
65
|
+
name: `Unpacking the har file to the tmpdir`,
|
|
66
|
+
});
|
|
67
|
+
yield __await((0, io_1.unpackTarGz)(harPath, tmpDirPath));
|
|
68
|
+
const ohPackageJson5 = core_1.OHPackageJSON5.fromPath(tmpDirPath.copyWithNewSegment('package', 'oh-package.json5'));
|
|
69
|
+
const harChecks = [
|
|
70
|
+
(0, checks_1.createOhPackageNameFollowsNamingConventionCheck)(npmPackageJson.name, ohPackageJson5.name),
|
|
71
|
+
(0, checks_1.createNpmAndOhPackageVersionsAreEqualCheck)(npmPackageJson.version, ohPackageJson5.version),
|
|
72
|
+
];
|
|
73
|
+
yield __await(yield* __asyncDelegator(__asyncValues(runChecks(harChecks, checkNamesToSkip))));
|
|
74
|
+
}
|
|
129
75
|
});
|
|
130
76
|
}
|
|
131
77
|
function runChecks(checks, checkNamesToSkip) {
|
|
132
|
-
return __asyncGenerator(this, arguments, function runChecks_1() {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
if (!checkNamesToSkip.includes(checkIf)) return [3 /*break*/, 4];
|
|
143
|
-
return [4 /*yield*/, __await({
|
|
144
|
-
type: 'FINISHED_CHECKING',
|
|
145
|
-
name: checkIf,
|
|
146
|
-
status: 'skip',
|
|
147
|
-
message: '',
|
|
148
|
-
})];
|
|
149
|
-
case 2: return [4 /*yield*/, _b.sent()];
|
|
150
|
-
case 3:
|
|
151
|
-
_b.sent();
|
|
152
|
-
return [3 /*break*/, 8];
|
|
153
|
-
case 4: return [4 /*yield*/, __await(run())];
|
|
154
|
-
case 5:
|
|
155
|
-
result = _b.sent();
|
|
156
|
-
status_1 = typeof result === 'string' ? result : result.status;
|
|
157
|
-
message = typeof result === 'string' ? '' : result.message;
|
|
158
|
-
return [4 /*yield*/, __await({ type: 'FINISHED_CHECKING', name: checkIf, status: status_1, message: message })];
|
|
159
|
-
case 6: return [4 /*yield*/, _b.sent()];
|
|
160
|
-
case 7:
|
|
161
|
-
_b.sent();
|
|
162
|
-
_b.label = 8;
|
|
163
|
-
case 8:
|
|
164
|
-
_i++;
|
|
165
|
-
return [3 /*break*/, 1];
|
|
166
|
-
case 9: return [2 /*return*/];
|
|
78
|
+
return __asyncGenerator(this, arguments, function* runChecks_1() {
|
|
79
|
+
for (const { checkIf, run } of checks) {
|
|
80
|
+
if (checkNamesToSkip.includes(checkIf)) {
|
|
81
|
+
yield yield __await({
|
|
82
|
+
type: 'FINISHED_CHECKING',
|
|
83
|
+
name: checkIf,
|
|
84
|
+
status: 'skip',
|
|
85
|
+
message: '',
|
|
86
|
+
});
|
|
87
|
+
continue;
|
|
167
88
|
}
|
|
168
|
-
|
|
89
|
+
const result = yield __await(run());
|
|
90
|
+
const status = typeof result === 'string' ? result : result.status;
|
|
91
|
+
const message = typeof result === 'string' ? '' : result.message;
|
|
92
|
+
yield yield __await({ type: 'FINISHED_CHECKING', name: checkIf, status, message });
|
|
93
|
+
}
|
|
169
94
|
});
|
|
170
95
|
}
|
|
171
96
|
function findHarPath(packagePath) {
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
return fileOrDirName.endsWith('.har');
|
|
176
|
-
});
|
|
97
|
+
const packageHarmonyPath = packagePath.copyWithNewSegment('harmony');
|
|
98
|
+
const fileOrDirNames = node_fs_1.default.readdirSync(packageHarmonyPath.getValue());
|
|
99
|
+
const harFilenames = fileOrDirNames.filter((fileOrDirName) => fileOrDirName.endsWith('.har'));
|
|
177
100
|
if (harFilenames.length != 1) {
|
|
178
101
|
return null;
|
|
179
102
|
}
|