@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.
Files changed (64) hide show
  1. package/README.md +11 -11
  2. package/dist/assetResolver.js +43 -74
  3. package/dist/autolinking/Autolinking.js +178 -179
  4. package/dist/codegen/core/CodegenError.js +3 -23
  5. package/dist/codegen/core/EventUtils.js +3 -3
  6. package/dist/codegen/core/TypeAnnotationToTS.js +24 -28
  7. package/dist/codegen/core/UberSchema.js +57 -96
  8. package/dist/codegen/generators/AppBuildTimeGlueCodeGenerator.js +28 -41
  9. package/dist/codegen/generators/ArkTSComponentCodeGeneratorArkTS.js +27 -34
  10. package/dist/codegen/generators/ArkTSComponentCodeGeneratorCAPI.js +25 -33
  11. package/dist/codegen/generators/CppComponentCodeGenerator.js +23 -28
  12. package/dist/codegen/generators/LibGlueCodeGenerator.js +26 -29
  13. package/dist/codegen/generators/NativeModuleCodeGenerator.js +25 -30
  14. package/dist/codegen/generators/SharedComponentCodeGenerator.js +15 -15
  15. package/dist/codegen/generators/UberGeneratorV1.js +24 -23
  16. package/dist/codegen/generators/UberGeneratorV2.js +34 -35
  17. package/dist/codegen/templates/BaseComponentInstanceHTemplate.js +50 -24
  18. package/dist/codegen/templates/BasePackageHTemplate.js +120 -21
  19. package/dist/codegen/templates/ComponentDescriptorHTemplate.js +53 -8
  20. package/dist/codegen/templates/ComponentJSIBinderHTemplate.js +75 -27
  21. package/dist/codegen/templates/ComponentUtilsTSTemplate.js +162 -29
  22. package/dist/codegen/templates/IndexTSTemplate.js +37 -17
  23. package/dist/codegen/templates/RNOHGeneratedPackageHTemplate.js +119 -24
  24. package/dist/codegen/templates/TurboModuleCppTemplate.js +38 -15
  25. package/dist/codegen/templates/TurboModuleHTemplate.js +32 -11
  26. package/dist/codegen/templates/TurboModuleSpecTSTemplate.js +52 -19
  27. package/dist/commands/bundle-harmony.js +53 -138
  28. package/dist/commands/codegen-harmony.js +105 -165
  29. package/dist/commands/codegen-lib-harmony.js +76 -116
  30. package/dist/commands/create-metro-host-constants.js +18 -47
  31. package/dist/commands/init.js +537 -961
  32. package/dist/commands/link-harmony.js +33 -71
  33. package/dist/commands/pack-harmony.js +47 -108
  34. package/dist/commands/run-harmony.js +372 -518
  35. package/dist/commands/unpack-harmony.js +105 -198
  36. package/dist/commands/verify-package-harmony.js +54 -108
  37. package/dist/core/AbsolutePath.js +31 -47
  38. package/dist/core/CodegenConfig.js +24 -22
  39. package/dist/core/DescriptiveError.js +18 -37
  40. package/dist/core/FileSystem.js +14 -18
  41. package/dist/core/OHPackageJSON5.js +17 -23
  42. package/dist/core/PackageJSON.js +26 -42
  43. package/dist/core/ProjectDependenciesManager.js +40 -92
  44. package/dist/core/ValidationError.js +2 -22
  45. package/dist/core/fs.js +9 -6
  46. package/dist/index.js +1 -1
  47. package/dist/io/CliExecutor.js +46 -98
  48. package/dist/io/Logger.js +40 -46
  49. package/dist/io/RealFS.js +35 -88
  50. package/dist/io/TarGz.js +11 -8
  51. package/dist/io/__fixtures__.js +79 -141
  52. package/dist/io/fsUtils.js +13 -12
  53. package/dist/package-verifier/checks/HarmonyDirContainsOnlyHarsCheck.js +19 -47
  54. package/dist/package-verifier/checks/HarmonyDirExistsCheck.js +13 -41
  55. package/dist/package-verifier/checks/NpmAnAndOhPackageVersionsAreEqual.js +8 -38
  56. package/dist/package-verifier/checks/OhPackageNameFollowsNamingConventionCheck.js +22 -54
  57. package/dist/package-verifier/verify-package.js +55 -132
  58. package/dist/simulator/LaunchSimulator.js +224 -301
  59. package/harmony/rnoh-hvigor-plugin-0.3.0.tgz +0 -0
  60. package/jest.config.js +12 -12
  61. package/package.json +78 -78
  62. package/react-native.config.js +17 -17
  63. package/tsconfig.build.json +6 -6
  64. package/tsconfig.json +2 -2
@@ -14,39 +14,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
14
14
  step((generator = generator.apply(thisArg, _arguments || [])).next());
15
15
  });
16
16
  };
17
- var __generator = (this && this.__generator) || function (thisArg, body) {
18
- 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);
19
- return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
20
- function verb(n) { return function (v) { return step([n, v]); }; }
21
- function step(op) {
22
- if (f) throw new TypeError("Generator is already executing.");
23
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
24
- 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;
25
- if (y = 0, t) op = [op[0] & 2, t.value];
26
- switch (op[0]) {
27
- case 0: case 1: t = op; break;
28
- case 4: _.label++; return { value: op[1], done: false };
29
- case 5: _.label++; y = op[1]; op = [0]; continue;
30
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
31
- default:
32
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
33
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
34
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
35
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
36
- if (t[2]) _.ops.pop();
37
- _.trys.pop(); continue;
38
- }
39
- op = body.call(thisArg, _);
40
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
41
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
42
- }
43
- };
44
17
  Object.defineProperty(exports, "__esModule", { value: true });
45
18
  exports.commandLinkHarmony = void 0;
46
- var core_1 = require("../core");
47
- var io_1 = require("../io");
48
- var autolinking_1 = require("../autolinking");
49
- var COMMAND_NAME = 'link-harmony';
19
+ const core_1 = require("../core");
20
+ const io_1 = require("../io");
21
+ const autolinking_1 = require("../autolinking");
22
+ const COMMAND_NAME = 'link-harmony';
50
23
  exports.commandLinkHarmony = {
51
24
  name: COMMAND_NAME,
52
25
  description: 'Handles the automatic linking of RNOH libraries. This command is meant to be used by the RNOH HvigorPlugin.',
@@ -90,46 +63,35 @@ exports.commandLinkHarmony = {
90
63
  description: "Lists npm package names to be included from the autolinking process, separated by semicolons. By default every library is included. Can't be used with --excluded-npm-packages.",
91
64
  },
92
65
  ],
93
- func: function (_argv, _config, rawArgs) { return __awaiter(void 0, void 0, void 0, function () {
94
- var logger, fs, autolinking, config, result, err_1;
66
+ func: (_argv, _config, rawArgs) => __awaiter(void 0, void 0, void 0, function* () {
95
67
  var _a, _b;
96
- return __generator(this, function (_c) {
97
- switch (_c.label) {
98
- case 0:
99
- logger = new io_1.Logger();
100
- fs = new io_1.RealFS();
101
- autolinking = new autolinking_1.Autolinking(fs, logger);
102
- _c.label = 1;
103
- case 1:
104
- _c.trys.push([1, 3, , 4]);
105
- return [4 /*yield*/, autolinking.prepareInput({
106
- harmonyProjectPath: new core_1.AbsolutePath(rawArgs.harmonyProjectPath),
107
- nodeModulesPath: new core_1.AbsolutePath(rawArgs.nodeModulesPath),
108
- cmakeAutolinkPathRelativeToHarmony: rawArgs.cmakeAutolinkPathRelativeToHarmony,
109
- cppRNOHPackagesFactoryPathRelativeToHarmony: rawArgs.cppRnohPackagesFactoryPathRelativeToHarmony,
110
- etsRNOHPackagesFactoryPathRelativeToHarmony: rawArgs.etsRnohPackagesFactoryPathRelativeToHarmony,
111
- ohPackagePathRelativeToHarmony: rawArgs.ohPackagePathRelativeToHarmony,
112
- excludedNpmPackageNames: new Set(rawArgs.excludeNpmPackages
113
- ? ((_a = rawArgs.excludeNpmPackages) !== null && _a !== void 0 ? _a : '').split(';')
114
- : undefined),
115
- includedNpmPackageNames: new Set(rawArgs.includeNpmPackages
116
- ? ((_b = rawArgs.includeNpmPackages) !== null && _b !== void 0 ? _b : '').split(';')
117
- : undefined),
118
- })];
119
- case 2:
120
- config = _c.sent();
121
- result = autolinking.evaluate(config);
122
- autolinking.saveAndLogOutput(result);
123
- return [3 /*break*/, 4];
124
- case 3:
125
- err_1 = _c.sent();
126
- if (err_1 instanceof core_1.DescriptiveError && !err_1.isUnexpected()) {
127
- logger.descriptiveError(err_1);
128
- return [2 /*return*/];
129
- }
130
- throw err_1;
131
- case 4: return [2 /*return*/];
68
+ const logger = new io_1.Logger();
69
+ const fs = new io_1.RealFS();
70
+ const autolinking = new autolinking_1.Autolinking(fs, logger);
71
+ try {
72
+ const config = yield autolinking.prepareInput({
73
+ harmonyProjectPath: new core_1.AbsolutePath(rawArgs.harmonyProjectPath),
74
+ nodeModulesPath: new core_1.AbsolutePath(rawArgs.nodeModulesPath),
75
+ cmakeAutolinkPathRelativeToHarmony: rawArgs.cmakeAutolinkPathRelativeToHarmony,
76
+ cppRNOHPackagesFactoryPathRelativeToHarmony: rawArgs.cppRnohPackagesFactoryPathRelativeToHarmony,
77
+ etsRNOHPackagesFactoryPathRelativeToHarmony: rawArgs.etsRnohPackagesFactoryPathRelativeToHarmony,
78
+ ohPackagePathRelativeToHarmony: rawArgs.ohPackagePathRelativeToHarmony,
79
+ excludedNpmPackageNames: new Set(rawArgs.excludeNpmPackages
80
+ ? ((_a = rawArgs.excludeNpmPackages) !== null && _a !== void 0 ? _a : '').split(';')
81
+ : undefined),
82
+ includedNpmPackageNames: new Set(rawArgs.includeNpmPackages
83
+ ? ((_b = rawArgs.includeNpmPackages) !== null && _b !== void 0 ? _b : '').split(';')
84
+ : undefined),
85
+ });
86
+ const result = autolinking.evaluate(config);
87
+ autolinking.saveAndLogOutput(result);
88
+ }
89
+ catch (err) {
90
+ if (err instanceof core_1.DescriptiveError && !err.isUnexpected()) {
91
+ logger.descriptiveError(err);
92
+ return;
132
93
  }
133
- });
134
- }); },
94
+ throw err;
95
+ }
96
+ }),
135
97
  };
@@ -14,42 +14,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
14
14
  step((generator = generator.apply(thisArg, _arguments || [])).next());
15
15
  });
16
16
  };
17
- var __generator = (this && this.__generator) || function (thisArg, body) {
18
- 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);
19
- return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
20
- function verb(n) { return function (v) { return step([n, v]); }; }
21
- function step(op) {
22
- if (f) throw new TypeError("Generator is already executing.");
23
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
24
- 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;
25
- if (y = 0, t) op = [op[0] & 2, t.value];
26
- switch (op[0]) {
27
- case 0: case 1: t = op; break;
28
- case 4: _.label++; return { value: op[1], done: false };
29
- case 5: _.label++; y = op[1]; op = [0]; continue;
30
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
31
- default:
32
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
33
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
34
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
35
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
36
- if (t[2]) _.ops.pop();
37
- _.trys.pop(); continue;
38
- }
39
- op = body.call(thisArg, _);
40
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
41
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
42
- }
17
+ var __importDefault = (this && this.__importDefault) || function (mod) {
18
+ return (mod && mod.__esModule) ? mod : { "default": mod };
43
19
  };
44
20
  Object.defineProperty(exports, "__esModule", { value: true });
45
21
  exports.commandPackHarmony = void 0;
46
- var glob_1 = require("glob");
47
- var path_1 = require("path");
48
- var tar_1 = require("tar");
49
- var fs_1 = require("fs");
50
- var core_1 = require("../core");
51
- var ignore_1 = require("ignore");
52
- var json5_1 = require("json5");
22
+ const glob_1 = require("glob");
23
+ const path_1 = __importDefault(require("path"));
24
+ const tar_1 = __importDefault(require("tar"));
25
+ const fs_1 = __importDefault(require("fs"));
26
+ const core_1 = require("../core");
27
+ const ignore_1 = __importDefault(require("ignore"));
28
+ const json5_1 = __importDefault(require("json5"));
53
29
  exports.commandPackHarmony = {
54
30
  name: 'pack-harmony',
55
31
  description: 'Pack native code. Used for package development.',
@@ -67,76 +43,47 @@ exports.commandPackHarmony = {
67
43
  description: 'Path to the package.json',
68
44
  },
69
45
  ],
70
- func: function (argv, config, args) { return __awaiter(void 0, void 0, void 0, function () {
71
- var err_1;
72
- return __generator(this, function (_a) {
73
- switch (_a.label) {
74
- case 0:
75
- _a.trys.push([0, 2, , 3]);
76
- return [4 /*yield*/, pack(path_1.default.resolve(args.harmonyDirPath), path_1.default.resolve(args.ohModulePath), path_1.default.resolve(args.packageJsonPath))];
77
- case 1:
78
- _a.sent();
79
- return [3 /*break*/, 3];
80
- case 2:
81
- err_1 = _a.sent();
82
- if (err_1 instanceof core_1.ValidationError) {
83
- console.error('[ERROR]', err_1.message);
84
- process.exit(1);
85
- }
86
- else {
87
- throw err_1;
88
- }
89
- return [3 /*break*/, 3];
90
- case 3: return [2 /*return*/];
46
+ func: (argv, config, args) => __awaiter(void 0, void 0, void 0, function* () {
47
+ try {
48
+ yield pack(path_1.default.resolve(args.harmonyDirPath), path_1.default.resolve(args.ohModulePath), path_1.default.resolve(args.packageJsonPath));
49
+ }
50
+ catch (err) {
51
+ if (err instanceof core_1.ValidationError) {
52
+ console.error('[ERROR]', err.message);
53
+ process.exit(1);
54
+ }
55
+ else {
56
+ throw err;
91
57
  }
92
- });
93
- }); },
58
+ }
59
+ }),
94
60
  };
95
61
  function pack(harmonyDirPath, ohModuleDirPath, packageJSONPath) {
96
- return __awaiter(this, void 0, void 0, function () {
97
- return __generator(this, function (_a) {
98
- switch (_a.label) {
99
- case 0:
100
- syncVersions(packageJSONPath, path_1.default.join(ohModuleDirPath, 'oh-package.json5'));
101
- if (!fs_1.default.existsSync(harmonyDirPath)) {
102
- fs_1.default.mkdirSync(harmonyDirPath, { recursive: true });
103
- }
104
- return [4 /*yield*/, createTGZFromDir(ohModuleDirPath, path_1.default.join(harmonyDirPath, "".concat(path_1.default.parse(ohModuleDirPath).name, ".tar.gz")))];
105
- case 1:
106
- _a.sent();
107
- return [4 /*yield*/, createTGZFromDir(harmonyDirPath, path_1.default.join(path_1.default.dirname(harmonyDirPath), 'harmony.tar.gz'))];
108
- case 2:
109
- _a.sent();
110
- return [2 /*return*/];
111
- }
112
- });
62
+ return __awaiter(this, void 0, void 0, function* () {
63
+ syncVersions(packageJSONPath, path_1.default.join(ohModuleDirPath, 'oh-package.json5'));
64
+ if (!fs_1.default.existsSync(harmonyDirPath)) {
65
+ fs_1.default.mkdirSync(harmonyDirPath, { recursive: true });
66
+ }
67
+ yield createTGZFromDir(ohModuleDirPath, path_1.default.join(harmonyDirPath, `${path_1.default.parse(ohModuleDirPath).name}.tar.gz`));
68
+ yield createTGZFromDir(harmonyDirPath, path_1.default.join(path_1.default.dirname(harmonyDirPath), 'harmony.tar.gz'));
113
69
  });
114
70
  }
115
71
  function syncVersions(packageJSONFilePath, ohPackageJSONFilePath) {
116
- var packageJSONFileContent = JSON.parse(fs_1.default.readFileSync(packageJSONFilePath, { encoding: 'utf-8' }));
72
+ const packageJSONFileContent = JSON.parse(fs_1.default.readFileSync(packageJSONFilePath, { encoding: 'utf-8' }));
117
73
  if (fs_1.default.existsSync(ohPackageJSONFilePath)) {
118
- var ohPackageJSONFileContent = json5_1.default.parse(fs_1.default.readFileSync(ohPackageJSONFilePath, { encoding: 'utf-8' }));
74
+ const ohPackageJSONFileContent = json5_1.default.parse(fs_1.default.readFileSync(ohPackageJSONFilePath, { encoding: 'utf-8' }));
119
75
  ohPackageJSONFileContent['version'] = packageJSONFileContent['version'];
120
76
  fs_1.default.writeFileSync(ohPackageJSONFilePath, json5_1.default.stringify(ohPackageJSONFileContent, null, 2));
121
77
  }
122
78
  }
123
79
  function createTGZFromDir(dirPath, outputFilePath) {
124
- return __awaiter(this, void 0, void 0, function () {
125
- var ig, filesToInclude;
126
- return __generator(this, function (_a) {
127
- switch (_a.label) {
128
- case 0:
129
- ig = getIgnoreUtil(path_1.default.join(dirPath, '.tarignore'));
130
- filesToInclude = (0, glob_1.globSync)('**', {
131
- cwd: dirPath,
132
- nodir: true,
133
- }).filter(function (path) { return !ig.ignores(path); });
134
- return [4 /*yield*/, createArchive(outputFilePath, dirPath, filesToInclude)];
135
- case 1:
136
- _a.sent();
137
- return [2 /*return*/];
138
- }
139
- });
80
+ return __awaiter(this, void 0, void 0, function* () {
81
+ const ig = getIgnoreUtil(path_1.default.join(dirPath, '.tarignore'));
82
+ const filesToInclude = (0, glob_1.globSync)('**', {
83
+ cwd: dirPath,
84
+ nodir: true,
85
+ }).filter((path) => !ig.ignores(path));
86
+ yield createArchive(outputFilePath, dirPath, filesToInclude);
140
87
  });
141
88
  }
142
89
  function getIgnoreUtil(tarignorePath) {
@@ -146,22 +93,14 @@ function getIgnoreUtil(tarignorePath) {
146
93
  return (0, ignore_1.default)().add(fs_1.default.readFileSync(tarignorePath).toString());
147
94
  }
148
95
  function createArchive(outputFilePath, packageDirPath, filesToInclude) {
149
- return __awaiter(this, void 0, void 0, function () {
150
- return __generator(this, function (_a) {
151
- switch (_a.label) {
152
- case 0:
153
- if (filesToInclude.length === 0) {
154
- throw new core_1.ValidationError('Nothing to pack');
155
- }
156
- return [4 /*yield*/, tar_1.default.c({
157
- gzip: true,
158
- file: outputFilePath,
159
- cwd: packageDirPath,
160
- }, filesToInclude)];
161
- case 1:
162
- _a.sent();
163
- return [2 /*return*/];
164
- }
165
- });
96
+ return __awaiter(this, void 0, void 0, function* () {
97
+ if (filesToInclude.length === 0) {
98
+ throw new core_1.ValidationError('Nothing to pack');
99
+ }
100
+ yield tar_1.default.c({
101
+ gzip: true,
102
+ file: outputFilePath,
103
+ cwd: packageDirPath,
104
+ }, filesToInclude);
166
105
  });
167
106
  }