@react-native-oh/react-native-harmony-cli 0.0.40 → 0.0.42
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 +74 -77
- package/dist/autolinking/Autolinking.js +179 -179
- package/dist/autolinking/JSON5Writer.js +61 -0
- 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 +65 -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 +79 -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,24 @@ 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 ENABLE_DEBUG_LOG = process.env.RNOH_BUNDLE_DEBUG === 'true';
|
|
25
|
+
function debugLog(message) {
|
|
26
|
+
if (ENABLE_DEBUG_LOG) {
|
|
27
|
+
const timestamp = new Date().toISOString().replace('T', ' ').substring(0, 23);
|
|
28
|
+
console.log(`[${timestamp}] ${message}`);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
const ALLOWED_SCALES = [1, 2, 3, 4];
|
|
49
32
|
function filterAssetScales(scales) {
|
|
50
|
-
|
|
33
|
+
const result = scales.filter(scale => ALLOWED_SCALES.includes(scale));
|
|
51
34
|
if (result.length === 0 && scales.length > 0) {
|
|
52
35
|
// No matching scale found, but there are some available. Ideally we don't
|
|
53
36
|
// want to be in this situation and should throw, but for now as a fallback
|
|
54
37
|
// let's just use the closest larger image
|
|
55
|
-
|
|
56
|
-
for (
|
|
57
|
-
var scale = scales_1[_i];
|
|
38
|
+
const maxScale = ALLOWED_SCALES[ALLOWED_SCALES.length - 1];
|
|
39
|
+
for (const scale of scales) {
|
|
58
40
|
if (scale > maxScale) {
|
|
59
41
|
result.push(scale);
|
|
60
42
|
break;
|
|
@@ -68,69 +50,65 @@ function filterAssetScales(scales) {
|
|
|
68
50
|
return result;
|
|
69
51
|
}
|
|
70
52
|
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
|
-
});
|
|
53
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
54
|
+
if (assetsDest == null) {
|
|
55
|
+
logger.warn((s) => 'Assets destination folder is not set, skipping...');
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
const filesToCopy = {};
|
|
59
|
+
const addAssetToCopy = (asset) => {
|
|
60
|
+
const validScales = filterAssetScales(asset.scales);
|
|
61
|
+
asset.scales.forEach((scale, idx) => {
|
|
62
|
+
if (!validScales.includes(scale)) {
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
const src = asset.files[idx];
|
|
66
|
+
const dest = path_1.default.join(assetsDest, getAssetDestRelativePath(asset, scale));
|
|
67
|
+
filesToCopy[src] = dest;
|
|
68
|
+
});
|
|
69
|
+
};
|
|
70
|
+
assetsData.forEach(addAssetToCopy);
|
|
71
|
+
return copyFiles(logger, filesToCopy);
|
|
93
72
|
});
|
|
94
73
|
}
|
|
95
|
-
function getAssetDestRelativePath(asset, scale) {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
var fileName = getResourceIdentifier(asset);
|
|
74
|
+
function getAssetDestRelativePath(asset, scale = 1) {
|
|
75
|
+
const suffix = scale === 1 ? '' : `@${scale}x`;
|
|
76
|
+
const fileName = getResourceIdentifier(asset);
|
|
99
77
|
// Assets can have relative paths outside of the project root.
|
|
100
78
|
// Replace `../` with `_` to make sure they don't end up outside of
|
|
101
79
|
// the expected assets directory.
|
|
102
|
-
return
|
|
80
|
+
return `${fileName + suffix}.${asset.type}`.replace(/\.\.\//g, '_');
|
|
103
81
|
}
|
|
104
82
|
function getResourceIdentifier(asset) {
|
|
105
|
-
|
|
106
|
-
return
|
|
83
|
+
const folderPath = getBasePath(asset);
|
|
84
|
+
return `${folderPath}/${asset.name}`.replace(/^assets\//, '');
|
|
107
85
|
}
|
|
108
86
|
function getBasePath(asset) {
|
|
109
|
-
|
|
87
|
+
const basePath = asset.httpServerLocation;
|
|
110
88
|
return basePath.startsWith('/') ? basePath.slice(1) : basePath;
|
|
111
89
|
}
|
|
112
90
|
function copyFiles(logger, fileDestBySrc) {
|
|
113
|
-
|
|
91
|
+
const fileSources = Object.keys(fileDestBySrc);
|
|
114
92
|
if (fileSources.length === 0) {
|
|
115
93
|
return Promise.resolve();
|
|
116
94
|
}
|
|
117
|
-
|
|
118
|
-
return new Promise(
|
|
119
|
-
|
|
95
|
+
const assetFilesCount = fileSources.length;
|
|
96
|
+
return new Promise((resolve, reject) => {
|
|
97
|
+
const copyNext = (error) => {
|
|
120
98
|
if (error) {
|
|
121
99
|
reject(error);
|
|
122
100
|
return;
|
|
123
101
|
}
|
|
124
102
|
if (fileSources.length === 0) {
|
|
125
|
-
logger.info(
|
|
126
|
-
|
|
127
|
-
});
|
|
103
|
+
logger.info(() => `Copied ${assetFilesCount} ${assetFilesCount === 1 ? 'asset' : 'assets'}`);
|
|
104
|
+
debugLog('All assets copied, resolving promise...');
|
|
128
105
|
resolve();
|
|
106
|
+
debugLog('Assets copy promise resolved');
|
|
129
107
|
}
|
|
130
108
|
else {
|
|
131
109
|
// fileSources.length === 0 is checked in previous branch, so this is string
|
|
132
|
-
|
|
133
|
-
|
|
110
|
+
const src = fileSources.shift();
|
|
111
|
+
const dest = fileDestBySrc[src];
|
|
134
112
|
copyFile(src, dest, copyNext);
|
|
135
113
|
}
|
|
136
114
|
};
|
|
@@ -138,14 +116,33 @@ function copyFiles(logger, fileDestBySrc) {
|
|
|
138
116
|
});
|
|
139
117
|
}
|
|
140
118
|
function copyFile(src, dest, onFinished) {
|
|
141
|
-
|
|
142
|
-
fs_1.default.mkdir(destDir, { recursive: true },
|
|
119
|
+
const destDir = path_1.default.dirname(dest);
|
|
120
|
+
fs_1.default.mkdir(destDir, { recursive: true }, (err) => {
|
|
143
121
|
if (err) {
|
|
144
122
|
onFinished(err);
|
|
145
123
|
return;
|
|
146
124
|
}
|
|
147
|
-
fs_1.default.createReadStream(src)
|
|
148
|
-
|
|
149
|
-
|
|
125
|
+
const readStream = fs_1.default.createReadStream(src);
|
|
126
|
+
const writeStream = fs_1.default.createWriteStream(dest);
|
|
127
|
+
let finished = false;
|
|
128
|
+
const handleError = (err) => {
|
|
129
|
+
if (!finished) {
|
|
130
|
+
finished = true;
|
|
131
|
+
console.error(`[Asset Copy Error] ${src} -> ${dest}:`, err.message);
|
|
132
|
+
readStream.destroy();
|
|
133
|
+
writeStream.destroy();
|
|
134
|
+
onFinished(err);
|
|
135
|
+
}
|
|
136
|
+
};
|
|
137
|
+
const handleFinish = () => {
|
|
138
|
+
if (!finished) {
|
|
139
|
+
finished = true;
|
|
140
|
+
onFinished();
|
|
141
|
+
}
|
|
142
|
+
};
|
|
143
|
+
readStream.on('error', handleError);
|
|
144
|
+
writeStream.on('error', handleError);
|
|
145
|
+
writeStream.on('finish', handleFinish);
|
|
146
|
+
readStream.pipe(writeStream);
|
|
150
147
|
});
|
|
151
148
|
}
|