@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
package/README.md
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
# @react-native-oh/react-native-harmony-cli
|
|
2
|
-
|
|
3
|
-
Please refer to: [RNOH repo](https://gitee.com/openharmony-sig/ohos_react_native) for more detail.
|
|
4
|
-
|
|
5
|
-
# Documentation
|
|
6
|
-
|
|
7
|
-
- [中文](https://gitee.com/openharmony-sig/ohos_react_native/blob/master/docs/zh-cn/README.md)
|
|
8
|
-
- [English](https://gitee.com/openharmony-sig/ohos_react_native/blob/master/docs/en/README.md)
|
|
9
|
-
|
|
10
|
-
# License
|
|
11
|
-
|
|
1
|
+
# @react-native-oh/react-native-harmony-cli
|
|
2
|
+
|
|
3
|
+
Please refer to: [RNOH repo](https://gitee.com/openharmony-sig/ohos_react_native) for more detail.
|
|
4
|
+
|
|
5
|
+
# Documentation
|
|
6
|
+
|
|
7
|
+
- [中文](https://gitee.com/openharmony-sig/ohos_react_native/blob/master/docs/zh-cn/README.md)
|
|
8
|
+
- [English](https://gitee.com/openharmony-sig/ohos_react_native/blob/master/docs/en/README.md)
|
|
9
|
+
|
|
10
|
+
# License
|
|
11
|
+
|
|
12
12
|
This library is licensed under The [MIT License (MIT)](https://gitee.com/openharmony-sig/ohos_react_native)
|
package/dist/assetResolver.js
CHANGED
|
@@ -8,32 +8,8 @@ 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
|
-
|
|
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
|
-
}
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
13
|
};
|
|
38
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
15
|
exports.copyAssets = copyAssets;
|
|
@@ -43,18 +19,17 @@ exports.copyAssets = copyAssets;
|
|
|
43
19
|
* This source code is licensed under the MIT license found in the
|
|
44
20
|
* LICENSE-MIT file in the root directory of this source tree.
|
|
45
21
|
*/
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
22
|
+
const fs_1 = __importDefault(require("fs"));
|
|
23
|
+
const path_1 = __importDefault(require("path"));
|
|
24
|
+
const ALLOWED_SCALES = [1, 2, 3, 4];
|
|
49
25
|
function filterAssetScales(scales) {
|
|
50
|
-
|
|
26
|
+
const result = scales.filter(scale => ALLOWED_SCALES.includes(scale));
|
|
51
27
|
if (result.length === 0 && scales.length > 0) {
|
|
52
28
|
// No matching scale found, but there are some available. Ideally we don't
|
|
53
29
|
// want to be in this situation and should throw, but for now as a fallback
|
|
54
30
|
// let's just use the closest larger image
|
|
55
|
-
|
|
56
|
-
for (
|
|
57
|
-
var scale = scales_1[_i];
|
|
31
|
+
const maxScale = ALLOWED_SCALES[ALLOWED_SCALES.length - 1];
|
|
32
|
+
for (const scale of scales) {
|
|
58
33
|
if (scale > maxScale) {
|
|
59
34
|
result.push(scale);
|
|
60
35
|
break;
|
|
@@ -68,69 +43,63 @@ function filterAssetScales(scales) {
|
|
|
68
43
|
return result;
|
|
69
44
|
}
|
|
70
45
|
function copyAssets(logger, assetsData, assetsDest) {
|
|
71
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
assetsData.forEach(addAssetToCopy);
|
|
91
|
-
return [2 /*return*/, copyFiles(logger, filesToCopy)];
|
|
92
|
-
});
|
|
46
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
47
|
+
if (assetsDest == null) {
|
|
48
|
+
logger.warn((s) => 'Assets destination folder is not set, skipping...');
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
const filesToCopy = {};
|
|
52
|
+
const addAssetToCopy = (asset) => {
|
|
53
|
+
const validScales = filterAssetScales(asset.scales);
|
|
54
|
+
asset.scales.forEach((scale, idx) => {
|
|
55
|
+
if (!validScales.includes(scale)) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
const src = asset.files[idx];
|
|
59
|
+
const dest = path_1.default.join(assetsDest, getAssetDestRelativePath(asset, scale));
|
|
60
|
+
filesToCopy[src] = dest;
|
|
61
|
+
});
|
|
62
|
+
};
|
|
63
|
+
assetsData.forEach(addAssetToCopy);
|
|
64
|
+
return copyFiles(logger, filesToCopy);
|
|
93
65
|
});
|
|
94
66
|
}
|
|
95
|
-
function getAssetDestRelativePath(asset, scale) {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
var fileName = getResourceIdentifier(asset);
|
|
67
|
+
function getAssetDestRelativePath(asset, scale = 1) {
|
|
68
|
+
const suffix = scale === 1 ? '' : `@${scale}x`;
|
|
69
|
+
const fileName = getResourceIdentifier(asset);
|
|
99
70
|
// Assets can have relative paths outside of the project root.
|
|
100
71
|
// Replace `../` with `_` to make sure they don't end up outside of
|
|
101
72
|
// the expected assets directory.
|
|
102
|
-
return
|
|
73
|
+
return `${fileName + suffix}.${asset.type}`.replace(/\.\.\//g, '_');
|
|
103
74
|
}
|
|
104
75
|
function getResourceIdentifier(asset) {
|
|
105
|
-
|
|
106
|
-
return
|
|
76
|
+
const folderPath = getBasePath(asset);
|
|
77
|
+
return `${folderPath}/${asset.name}`.replace(/^assets\//, '');
|
|
107
78
|
}
|
|
108
79
|
function getBasePath(asset) {
|
|
109
|
-
|
|
80
|
+
const basePath = asset.httpServerLocation;
|
|
110
81
|
return basePath.startsWith('/') ? basePath.slice(1) : basePath;
|
|
111
82
|
}
|
|
112
83
|
function copyFiles(logger, fileDestBySrc) {
|
|
113
|
-
|
|
84
|
+
const fileSources = Object.keys(fileDestBySrc);
|
|
114
85
|
if (fileSources.length === 0) {
|
|
115
86
|
return Promise.resolve();
|
|
116
87
|
}
|
|
117
|
-
|
|
118
|
-
return new Promise(
|
|
119
|
-
|
|
88
|
+
const assetFilesCount = fileSources.length;
|
|
89
|
+
return new Promise((resolve, reject) => {
|
|
90
|
+
const copyNext = (error) => {
|
|
120
91
|
if (error) {
|
|
121
92
|
reject(error);
|
|
122
93
|
return;
|
|
123
94
|
}
|
|
124
95
|
if (fileSources.length === 0) {
|
|
125
|
-
logger.info(
|
|
126
|
-
return "Copied ".concat(assetFilesCount, " ").concat(assetFilesCount === 1 ? 'asset' : 'assets');
|
|
127
|
-
});
|
|
96
|
+
logger.info(() => `Copied ${assetFilesCount} ${assetFilesCount === 1 ? 'asset' : 'assets'}`);
|
|
128
97
|
resolve();
|
|
129
98
|
}
|
|
130
99
|
else {
|
|
131
100
|
// fileSources.length === 0 is checked in previous branch, so this is string
|
|
132
|
-
|
|
133
|
-
|
|
101
|
+
const src = fileSources.shift();
|
|
102
|
+
const dest = fileDestBySrc[src];
|
|
134
103
|
copyFile(src, dest, copyNext);
|
|
135
104
|
}
|
|
136
105
|
};
|
|
@@ -138,8 +107,8 @@ function copyFiles(logger, fileDestBySrc) {
|
|
|
138
107
|
});
|
|
139
108
|
}
|
|
140
109
|
function copyFile(src, dest, onFinished) {
|
|
141
|
-
|
|
142
|
-
fs_1.default.mkdir(destDir, { recursive: true },
|
|
110
|
+
const destDir = path_1.default.dirname(dest);
|
|
111
|
+
fs_1.default.mkdir(destDir, { recursive: true }, (err) => {
|
|
143
112
|
if (err) {
|
|
144
113
|
onFinished(err);
|
|
145
114
|
return;
|