@react-native-oh/react-native-harmony-cli 0.0.24 → 0.0.26-1
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/.prettierrc +6 -6
- package/dist/assetResolver.js +1 -23
- package/dist/codegen/core/CodeGenerator.js +2 -0
- package/dist/codegen/core/UberSchema.js +35 -9
- package/dist/codegen/core/index.js +1 -1
- package/dist/codegen/generators/{ComponentCodeGenerator.js → ComponentCodeGeneratorArkTS.js} +12 -4
- package/dist/codegen/generators/ComponentCodeGeneratorCAPI.js +79 -0
- package/dist/codegen/generators/GlueCodeGenerator.js +60 -0
- package/dist/codegen/generators/NativeModuleCodeGenerator.js +14 -6
- package/dist/codegen/generators/UberGeneratorV1.js +49 -0
- package/dist/codegen/generators/UberGeneratorV2.js +60 -0
- package/dist/codegen/generators/index.js +5 -2
- package/dist/codegen/templates/BaseComponentInstanceHTemplate.js +103 -0
- package/dist/codegen/templates/ComponentDescriptorHTemplate.js +42 -36
- package/dist/codegen/templates/ComponentJSIBinderHTemplate.js +45 -36
- package/dist/codegen/templates/ComponentUtilsTSTemplate.js +135 -127
- package/dist/codegen/templates/GeneratedPackageHTemplate.js +101 -0
- package/dist/codegen/templates/IndexTSTemplate.js +23 -5
- package/dist/codegen/templates/RNOHGeneratedPackageHTemplate.js +88 -82
- package/dist/codegen/templates/TurboModuleCppTemplate.js +26 -18
- package/dist/codegen/templates/TurboModuleHTemplate.js +27 -17
- package/dist/codegen/templates/TurboModuleSpecTSTemplate.js +37 -27
- package/dist/codegen/templates/index.js +1 -0
- package/dist/commands/codegen-harmony.js +99 -14
- package/dist/commands/index.js +1 -0
- package/dist/commands/verify-package-harmony.js +127 -0
- package/dist/core/AbsolutePath.js +6 -0
- package/dist/core/CodegenConfig.js +8 -4
- package/dist/core/OHPackageJSON5.js +23 -0
- package/dist/core/PackageJSON.js +8 -3
- package/dist/core/ProjectDependenciesManager.js +2 -2
- package/dist/core/index.js +1 -0
- package/dist/index.js +1 -0
- package/dist/io/TarGz.js +28 -0
- package/dist/io/index.js +1 -0
- package/dist/package-verifier/checks/HarmonyDirContainsOnlyHarsCheck.js +38 -0
- package/dist/package-verifier/checks/HarmonyDirExistsCheck.js +32 -0
- package/dist/package-verifier/checks/NpmAnAndOhPackageVersionsAreEqual.js +26 -0
- package/dist/package-verifier/checks/OhPackageNameFollowsNamingConventionCheck.js +51 -0
- package/dist/package-verifier/checks/index.js +20 -0
- package/dist/package-verifier/index.js +18 -0
- package/dist/package-verifier/types.js +2 -0
- package/dist/package-verifier/verify-package.js +100 -0
- package/jest.config.js +5 -5
- package/package.json +57 -52
- package/react-native.config.js +10 -10
- package/src/assetResolver.ts +21 -44
- package/src/codegen/core/CodeGenerator.ts +9 -0
- package/src/codegen/core/CodegenError.ts +3 -3
- package/src/codegen/core/EventUtils.ts +18 -18
- package/src/codegen/core/TypeAnnotationToTS.test.ts +75 -75
- package/src/codegen/core/TypeAnnotationToTS.ts +188 -188
- package/src/codegen/core/UberSchema.ts +142 -99
- package/src/codegen/core/index.ts +5 -5
- package/src/codegen/generators/{ComponentCodeGenerator.ts → ComponentCodeGeneratorArkTS.ts} +112 -98
- package/src/codegen/generators/ComponentCodeGeneratorCAPI.ts +114 -0
- package/src/codegen/generators/GlueCodeGenerator.ts +109 -0
- package/src/codegen/generators/NativeModuleCodeGenerator.ts +115 -95
- package/src/codegen/generators/UberGeneratorV1.ts +64 -0
- package/src/codegen/generators/UberGeneratorV2.ts +91 -0
- package/src/codegen/generators/index.ts +6 -3
- package/src/codegen/index.ts +2 -2
- package/src/codegen/templates/BaseComponentInstanceHTemplate.ts +116 -0
- package/src/codegen/templates/ComponentDescriptorHTemplate.ts +55 -49
- package/src/codegen/templates/ComponentJSIBinderHTemplate.ts +93 -85
- package/src/codegen/templates/ComponentUtilsTSTemplate.ts +210 -202
- package/src/codegen/templates/GeneratedPackageHTemplate.ts +107 -0
- package/src/codegen/templates/IndexTSTemplate.ts +53 -33
- package/src/codegen/templates/RNOHGeneratedPackageHTemplate.ts +130 -124
- package/src/codegen/templates/TurboModuleCppTemplate.ts +54 -47
- package/src/codegen/templates/TurboModuleHTemplate.ts +35 -26
- package/src/codegen/templates/TurboModuleSpecTSTemplate.ts +90 -81
- package/src/codegen/templates/index.ts +9 -8
- package/src/commands/bundle-harmony.ts +203 -202
- package/src/commands/codegen-harmony.ts +272 -143
- package/src/commands/create-metro-host-constants.ts +48 -48
- package/src/commands/index.ts +6 -5
- package/src/commands/pack-harmony.ts +121 -121
- package/src/commands/unpack-harmony.ts +231 -231
- package/src/commands/verify-package-harmony.ts +106 -0
- package/src/core/AbsolutePath.ts +50 -43
- package/src/core/CodegenConfig.ts +62 -54
- package/src/core/DescriptiveError.ts +61 -61
- package/src/core/OHPackageJSON5.ts +23 -0
- package/src/core/PackageJSON.ts +75 -63
- package/src/core/ProjectDependenciesManager.ts +77 -77
- package/src/core/ValidationError.ts +1 -1
- package/src/core/ValueObject.ts +2 -2
- package/src/core/fs.ts +31 -31
- package/src/core/index.ts +9 -8
- package/src/index.ts +20 -18
- package/src/io/Logger.ts +68 -68
- package/src/io/TarGz.ts +26 -0
- package/src/io/fsUtils.ts +24 -24
- package/src/io/index.ts +3 -2
- package/src/package-verifier/checks/HarmonyDirContainsOnlyHarsCheck.ts +28 -0
- package/src/package-verifier/checks/HarmonyDirExistsCheck.ts +24 -0
- package/src/package-verifier/checks/NpmAnAndOhPackageVersionsAreEqual.ts +18 -0
- package/src/package-verifier/checks/OhPackageNameFollowsNamingConventionCheck.ts +47 -0
- package/src/package-verifier/checks/index.ts +4 -0
- package/src/package-verifier/index.ts +2 -0
- package/src/package-verifier/types.ts +12 -0
- package/src/package-verifier/verify-package.ts +117 -0
- package/tsconfig.build.json +6 -6
- package/tsconfig.json +2 -2
- package/dist/codegen/core/Codegen.js +0 -35
- package/dist/codegen/generators/PackageCodeGenerator.js +0 -52
- package/src/codegen/core/Codegen.ts +0 -44
- package/src/codegen/generators/PackageCodeGenerator.ts +0 -73
package/src/index.ts
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
|
-
import { Config } from '@react-native-community/cli-types';
|
|
2
|
-
import {
|
|
3
|
-
commandBundleHarmony,
|
|
4
|
-
commandPackHarmony,
|
|
5
|
-
commandUnpackHarmony,
|
|
6
|
-
commandCreateMetroConstantsHarmony,
|
|
7
|
-
commandCodegenHarmony,
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
1
|
+
import { Config } from '@react-native-community/cli-types';
|
|
2
|
+
import {
|
|
3
|
+
commandBundleHarmony,
|
|
4
|
+
commandPackHarmony,
|
|
5
|
+
commandUnpackHarmony,
|
|
6
|
+
commandCreateMetroConstantsHarmony,
|
|
7
|
+
commandCodegenHarmony,
|
|
8
|
+
commandVerifyPackageHarmony,
|
|
9
|
+
} from './commands';
|
|
10
|
+
|
|
11
|
+
export const config = {
|
|
12
|
+
commands: [
|
|
13
|
+
commandBundleHarmony,
|
|
14
|
+
commandPackHarmony,
|
|
15
|
+
commandUnpackHarmony,
|
|
16
|
+
commandCreateMetroConstantsHarmony,
|
|
17
|
+
commandCodegenHarmony,
|
|
18
|
+
commandVerifyPackageHarmony,
|
|
19
|
+
],
|
|
20
|
+
} satisfies Partial<Config>;
|
package/src/io/Logger.ts
CHANGED
|
@@ -1,68 +1,68 @@
|
|
|
1
|
-
import chalk from 'chalk';
|
|
2
|
-
import { DescriptiveError } from '../core';
|
|
3
|
-
|
|
4
|
-
export class Logger {
|
|
5
|
-
info(
|
|
6
|
-
prepareMsg: (styles: typeof chalk) => string,
|
|
7
|
-
options?: { prefix?: boolean }
|
|
8
|
-
) {
|
|
9
|
-
const prefix = options?.prefix ? `[${chalk.bold(chalk.cyan('INFO'))}]` : '';
|
|
10
|
-
if (prefix) {
|
|
11
|
-
console.info(prefix, prepareMsg(chalk));
|
|
12
|
-
} else {
|
|
13
|
-
console.info(prepareMsg(chalk));
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
debug(prepareMsg: (styles: typeof chalk) => string) {
|
|
18
|
-
console.debug(prepareMsg(chalk));
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
descriptiveError(error: DescriptiveError) {
|
|
22
|
-
const lines: string[] = [];
|
|
23
|
-
if (error.isUnexpected() && error.stack) {
|
|
24
|
-
lines.push('');
|
|
25
|
-
lines.push(chalk.bold('Stack'));
|
|
26
|
-
error.stack.split('\n').forEach((line) => lines.push(chalk.gray(line)));
|
|
27
|
-
}
|
|
28
|
-
const details = error.getDetails();
|
|
29
|
-
if (details) {
|
|
30
|
-
lines.push('');
|
|
31
|
-
lines.push(chalk.bold('Details'));
|
|
32
|
-
details.split('\n').forEach((line) => lines.push(line));
|
|
33
|
-
}
|
|
34
|
-
lines.push('');
|
|
35
|
-
let prefix = '';
|
|
36
|
-
if (error.isUnexpected()) {
|
|
37
|
-
prefix = '[' + chalk.red(chalk.bold('UNEXPECTED_ERROR')) + ']';
|
|
38
|
-
} else {
|
|
39
|
-
prefix = '[' + chalk.red(chalk.bold('ERROR')) + ']';
|
|
40
|
-
}
|
|
41
|
-
lines.push(`${prefix} ${error.getMessage()}`);
|
|
42
|
-
const suggestionsByRole = error.getSuggestionsByRole();
|
|
43
|
-
if (suggestionsByRole) {
|
|
44
|
-
if ((suggestionsByRole.default?.length ?? 0) > 0) {
|
|
45
|
-
lines.push('');
|
|
46
|
-
lines.push(chalk.bold(`Suggestions`));
|
|
47
|
-
suggestionsByRole.default?.forEach((suggestion) => {
|
|
48
|
-
lines.push(suggestion);
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
|
-
if ((suggestionsByRole.rnAppDeveloper?.length ?? 0) > 0) {
|
|
52
|
-
lines.push('');
|
|
53
|
-
lines.push(chalk.bold(`Suggestions for RN App developers`));
|
|
54
|
-
suggestionsByRole.rnAppDeveloper?.forEach((suggestion) => {
|
|
55
|
-
lines.push(suggestion);
|
|
56
|
-
});
|
|
57
|
-
}
|
|
58
|
-
if (suggestionsByRole.rnPackageDeveloper?.length ?? 0) {
|
|
59
|
-
lines.push('');
|
|
60
|
-
lines.push(chalk.bold(`Suggestions for RN package developers`));
|
|
61
|
-
suggestionsByRole.rnPackageDeveloper?.forEach((suggestion) => {
|
|
62
|
-
lines.push(suggestion);
|
|
63
|
-
});
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
console.error(lines.join('\n'));
|
|
67
|
-
}
|
|
68
|
-
}
|
|
1
|
+
import chalk from 'chalk';
|
|
2
|
+
import { DescriptiveError } from '../core';
|
|
3
|
+
|
|
4
|
+
export class Logger {
|
|
5
|
+
info(
|
|
6
|
+
prepareMsg: (styles: typeof chalk) => string,
|
|
7
|
+
options?: { prefix?: boolean }
|
|
8
|
+
) {
|
|
9
|
+
const prefix = options?.prefix ? `[${chalk.bold(chalk.cyan('INFO'))}]` : '';
|
|
10
|
+
if (prefix) {
|
|
11
|
+
console.info(prefix, prepareMsg(chalk));
|
|
12
|
+
} else {
|
|
13
|
+
console.info(prepareMsg(chalk));
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
debug(prepareMsg: (styles: typeof chalk) => string) {
|
|
18
|
+
console.debug(prepareMsg(chalk));
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
descriptiveError(error: DescriptiveError) {
|
|
22
|
+
const lines: string[] = [];
|
|
23
|
+
if (error.isUnexpected() && error.stack) {
|
|
24
|
+
lines.push('');
|
|
25
|
+
lines.push(chalk.bold('Stack'));
|
|
26
|
+
error.stack.split('\n').forEach((line) => lines.push(chalk.gray(line)));
|
|
27
|
+
}
|
|
28
|
+
const details = error.getDetails();
|
|
29
|
+
if (details) {
|
|
30
|
+
lines.push('');
|
|
31
|
+
lines.push(chalk.bold('Details'));
|
|
32
|
+
details.split('\n').forEach((line) => lines.push(line));
|
|
33
|
+
}
|
|
34
|
+
lines.push('');
|
|
35
|
+
let prefix = '';
|
|
36
|
+
if (error.isUnexpected()) {
|
|
37
|
+
prefix = '[' + chalk.red(chalk.bold('UNEXPECTED_ERROR')) + ']';
|
|
38
|
+
} else {
|
|
39
|
+
prefix = '[' + chalk.red(chalk.bold('ERROR')) + ']';
|
|
40
|
+
}
|
|
41
|
+
lines.push(`${prefix} ${error.getMessage()}`);
|
|
42
|
+
const suggestionsByRole = error.getSuggestionsByRole();
|
|
43
|
+
if (suggestionsByRole) {
|
|
44
|
+
if ((suggestionsByRole.default?.length ?? 0) > 0) {
|
|
45
|
+
lines.push('');
|
|
46
|
+
lines.push(chalk.bold(`Suggestions`));
|
|
47
|
+
suggestionsByRole.default?.forEach((suggestion) => {
|
|
48
|
+
lines.push(suggestion);
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
if ((suggestionsByRole.rnAppDeveloper?.length ?? 0) > 0) {
|
|
52
|
+
lines.push('');
|
|
53
|
+
lines.push(chalk.bold(`Suggestions for RN App developers`));
|
|
54
|
+
suggestionsByRole.rnAppDeveloper?.forEach((suggestion) => {
|
|
55
|
+
lines.push(suggestion);
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
if (suggestionsByRole.rnPackageDeveloper?.length ?? 0) {
|
|
59
|
+
lines.push('');
|
|
60
|
+
lines.push(chalk.bold(`Suggestions for RN package developers`));
|
|
61
|
+
suggestionsByRole.rnPackageDeveloper?.forEach((suggestion) => {
|
|
62
|
+
lines.push(suggestion);
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
console.error(lines.join('\n'));
|
|
67
|
+
}
|
|
68
|
+
}
|
package/src/io/TarGz.ts
ADDED
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import zlib from 'zlib';
|
|
3
|
+
import tar from 'tar';
|
|
4
|
+
import { AbsolutePath } from '../core';
|
|
5
|
+
|
|
6
|
+
export function unpackTarGz(
|
|
7
|
+
archivePath: AbsolutePath,
|
|
8
|
+
outputDirPath: AbsolutePath
|
|
9
|
+
) {
|
|
10
|
+
if (!fs.existsSync(outputDirPath.getValue())) {
|
|
11
|
+
fs.mkdirSync(outputDirPath.getValue(), { recursive: true });
|
|
12
|
+
}
|
|
13
|
+
const readStream = fs.createReadStream(archivePath.getValue());
|
|
14
|
+
const writeStream = tar.extract({
|
|
15
|
+
cwd: outputDirPath.getValue(),
|
|
16
|
+
});
|
|
17
|
+
readStream.pipe(zlib.createGunzip()).pipe(writeStream);
|
|
18
|
+
return new Promise((resolve, reject) => {
|
|
19
|
+
writeStream.on('finish', () => {
|
|
20
|
+
resolve(undefined);
|
|
21
|
+
});
|
|
22
|
+
writeStream.on('error', (err) => {
|
|
23
|
+
reject(err);
|
|
24
|
+
});
|
|
25
|
+
});
|
|
26
|
+
}
|
package/src/io/fsUtils.ts
CHANGED
|
@@ -1,24 +1,24 @@
|
|
|
1
|
-
import pathUtils from 'node:path';
|
|
2
|
-
import fs from 'node:fs';
|
|
3
|
-
import { AbsolutePath } from '../core';
|
|
4
|
-
|
|
5
|
-
export function findFilePathsWithExtensions(
|
|
6
|
-
dirPath: AbsolutePath,
|
|
7
|
-
fileExtensions: readonly string[]
|
|
8
|
-
): AbsolutePath[] {
|
|
9
|
-
let results: AbsolutePath[] = [];
|
|
10
|
-
const files = fs.readdirSync(dirPath.getValue(), { withFileTypes: true });
|
|
11
|
-
for (const file of files) {
|
|
12
|
-
const path = dirPath.copyWithNewSegment(file.name);
|
|
13
|
-
if (file.isDirectory()) {
|
|
14
|
-
results = results.concat(
|
|
15
|
-
findFilePathsWithExtensions(path, fileExtensions)
|
|
16
|
-
);
|
|
17
|
-
} else if (
|
|
18
|
-
fileExtensions.includes(pathUtils.extname(file.name).substring(1))
|
|
19
|
-
) {
|
|
20
|
-
results.push(path);
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
return results;
|
|
24
|
-
}
|
|
1
|
+
import pathUtils from 'node:path';
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import { AbsolutePath } from '../core';
|
|
4
|
+
|
|
5
|
+
export function findFilePathsWithExtensions(
|
|
6
|
+
dirPath: AbsolutePath,
|
|
7
|
+
fileExtensions: readonly string[]
|
|
8
|
+
): AbsolutePath[] {
|
|
9
|
+
let results: AbsolutePath[] = [];
|
|
10
|
+
const files = fs.readdirSync(dirPath.getValue(), { withFileTypes: true });
|
|
11
|
+
for (const file of files) {
|
|
12
|
+
const path = dirPath.copyWithNewSegment(file.name);
|
|
13
|
+
if (file.isDirectory()) {
|
|
14
|
+
results = results.concat(
|
|
15
|
+
findFilePathsWithExtensions(path, fileExtensions)
|
|
16
|
+
);
|
|
17
|
+
} else if (
|
|
18
|
+
fileExtensions.includes(pathUtils.extname(file.name).substring(1))
|
|
19
|
+
) {
|
|
20
|
+
results.push(path);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
return results;
|
|
24
|
+
}
|
package/src/io/index.ts
CHANGED
|
@@ -1,2 +1,3 @@
|
|
|
1
|
-
export * from './Logger';
|
|
2
|
-
export * from './fsUtils';
|
|
1
|
+
export * from './Logger';
|
|
2
|
+
export * from './fsUtils';
|
|
3
|
+
export * from './TarGz';
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import { AbsolutePath } from '../../core';
|
|
3
|
+
import { Check } from '../types';
|
|
4
|
+
|
|
5
|
+
export function createHarmonyDirContainsOnlyHarsCheck(
|
|
6
|
+
npmPackagePath: AbsolutePath,
|
|
7
|
+
hasNpmPackageNativeCode: boolean
|
|
8
|
+
): Check {
|
|
9
|
+
return {
|
|
10
|
+
checkIf: 'harmony_directory_contains_only_one_har_file',
|
|
11
|
+
run: async () => {
|
|
12
|
+
if (!hasNpmPackageNativeCode) {
|
|
13
|
+
return 'skip';
|
|
14
|
+
}
|
|
15
|
+
const harmonyPath = npmPackagePath
|
|
16
|
+
.copyWithNewSegment('harmony')
|
|
17
|
+
.getValue();
|
|
18
|
+
const fileOrDirNames = fs.readdirSync(harmonyPath);
|
|
19
|
+
if (fileOrDirNames.length !== 1) {
|
|
20
|
+
return { status: 'fail', message: JSON.stringify(fileOrDirNames) };
|
|
21
|
+
}
|
|
22
|
+
if (!fileOrDirNames[0].endsWith('.har')) {
|
|
23
|
+
return 'fail';
|
|
24
|
+
}
|
|
25
|
+
return 'pass';
|
|
26
|
+
},
|
|
27
|
+
};
|
|
28
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import { AbsolutePath } from '../../core';
|
|
3
|
+
import { Check } from '../types';
|
|
4
|
+
|
|
5
|
+
export function createHarmonyDirExistsCheck(
|
|
6
|
+
packagePath: AbsolutePath,
|
|
7
|
+
hasNativeCode: boolean
|
|
8
|
+
): Check {
|
|
9
|
+
return {
|
|
10
|
+
checkIf: 'package_has_harmony_dir',
|
|
11
|
+
run: async () => {
|
|
12
|
+
const harmonyDirExist = fs.existsSync(
|
|
13
|
+
packagePath.copyWithNewSegment('harmony').getValue()
|
|
14
|
+
);
|
|
15
|
+
if (!hasNativeCode) {
|
|
16
|
+
return 'skip';
|
|
17
|
+
}
|
|
18
|
+
if (!harmonyDirExist) {
|
|
19
|
+
return 'fail';
|
|
20
|
+
}
|
|
21
|
+
return 'pass';
|
|
22
|
+
},
|
|
23
|
+
};
|
|
24
|
+
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { Check } from '../types';
|
|
2
|
+
|
|
3
|
+
export function createNpmAndOhPackageVersionsAreEqualCheck(
|
|
4
|
+
npmPackageVersion: string,
|
|
5
|
+
ohPackageVersion: string
|
|
6
|
+
): Check {
|
|
7
|
+
return {
|
|
8
|
+
checkIf: 'npm_and_oh_package_versions_are_equal',
|
|
9
|
+
run: async () => {
|
|
10
|
+
return npmPackageVersion === ohPackageVersion
|
|
11
|
+
? 'pass'
|
|
12
|
+
: {
|
|
13
|
+
status: 'fail',
|
|
14
|
+
message: `expected OH package version (${ohPackageVersion}) to match NPM version (${npmPackageVersion})`,
|
|
15
|
+
};
|
|
16
|
+
},
|
|
17
|
+
};
|
|
18
|
+
}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { Check } from '../types';
|
|
2
|
+
|
|
3
|
+
export function createOhPackageNameFollowsNamingConventionCheck(
|
|
4
|
+
npmPackageName: string,
|
|
5
|
+
ohPackageName: string
|
|
6
|
+
): Check {
|
|
7
|
+
const npmPackageNameInfo = getPackageNameInfo(npmPackageName);
|
|
8
|
+
return {
|
|
9
|
+
checkIf: 'oh_package_name_is_derived_from_npm_package_name',
|
|
10
|
+
run: async () => {
|
|
11
|
+
if (npmPackageNameInfo.organizationName) {
|
|
12
|
+
const expectedOHPackageName = `@rnoh/${npmPackageNameInfo.organizationName}--${npmPackageNameInfo.unscopedName}`;
|
|
13
|
+
return expectedOHPackageName === ohPackageName
|
|
14
|
+
? 'pass'
|
|
15
|
+
: {
|
|
16
|
+
status: 'fail',
|
|
17
|
+
message: `expected '${expectedOHPackageName}', got: ${ohPackageName}`,
|
|
18
|
+
};
|
|
19
|
+
} else {
|
|
20
|
+
const expectedOHPackageName = `@rnoh/${npmPackageNameInfo.unscopedName}`;
|
|
21
|
+
return expectedOHPackageName === ohPackageName
|
|
22
|
+
? 'pass'
|
|
23
|
+
: {
|
|
24
|
+
status: 'fail',
|
|
25
|
+
message: `expected '${expectedOHPackageName}', got: ${ohPackageName}`,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
},
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
type PackageNameInfo = {
|
|
33
|
+
organizationName: string | null;
|
|
34
|
+
unscopedName: string;
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
function getPackageNameInfo(packageName: string): PackageNameInfo {
|
|
38
|
+
if (packageName.startsWith('@') && packageName.includes('/')) {
|
|
39
|
+
const [part1, part2] = packageName.split('/');
|
|
40
|
+
return {
|
|
41
|
+
organizationName: part1.replace('@', ''),
|
|
42
|
+
unscopedName: part2,
|
|
43
|
+
};
|
|
44
|
+
} else {
|
|
45
|
+
return { organizationName: null, unscopedName: packageName };
|
|
46
|
+
}
|
|
47
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export type CheckStatus = 'pass' | 'fail' | 'skip';
|
|
2
|
+
|
|
3
|
+
export type Check = {
|
|
4
|
+
checkIf: string;
|
|
5
|
+
run: () => Promise<CheckStatus | { status: CheckStatus; message: string }>;
|
|
6
|
+
};
|
|
7
|
+
|
|
8
|
+
export type CheckResult = {
|
|
9
|
+
name: string;
|
|
10
|
+
status: CheckStatus;
|
|
11
|
+
message: string;
|
|
12
|
+
};
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import tmp from 'tmp';
|
|
3
|
+
import {
|
|
4
|
+
AbsolutePath,
|
|
5
|
+
DescriptiveError,
|
|
6
|
+
OHPackageJSON5,
|
|
7
|
+
PackageJSON,
|
|
8
|
+
} from '../core';
|
|
9
|
+
import {
|
|
10
|
+
createHarmonyDirContainsOnlyHarsCheck,
|
|
11
|
+
createHarmonyDirExistsCheck,
|
|
12
|
+
createOhPackageNameFollowsNamingConventionCheck,
|
|
13
|
+
createNpmAndOhPackageVersionsAreEqualCheck,
|
|
14
|
+
} from './checks';
|
|
15
|
+
import { Check, CheckStatus } from './types';
|
|
16
|
+
import { unpackTarGz } from '../io';
|
|
17
|
+
|
|
18
|
+
type StartProcessMessage = {
|
|
19
|
+
type: 'START_PROCESS';
|
|
20
|
+
name: string;
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
type FinishedCheckingMessage = {
|
|
24
|
+
type: 'FINISHED_CHECKING';
|
|
25
|
+
name: string;
|
|
26
|
+
status: CheckStatus;
|
|
27
|
+
message: string;
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
type VerificationMessage = StartProcessMessage | FinishedCheckingMessage;
|
|
31
|
+
|
|
32
|
+
export async function* verifyRNOHPackage({
|
|
33
|
+
npmPackagePath,
|
|
34
|
+
hasHarmonyCode,
|
|
35
|
+
checkNamesToSkip,
|
|
36
|
+
}: {
|
|
37
|
+
npmPackagePath: AbsolutePath;
|
|
38
|
+
hasHarmonyCode: boolean;
|
|
39
|
+
checkNamesToSkip: string[];
|
|
40
|
+
}): AsyncGenerator<VerificationMessage, void, unknown> {
|
|
41
|
+
const npmPackageJson = PackageJSON.fromProjectRootPath(
|
|
42
|
+
npmPackagePath,
|
|
43
|
+
npmPackagePath
|
|
44
|
+
);
|
|
45
|
+
const initialChecks: Check[] = [
|
|
46
|
+
createHarmonyDirExistsCheck(npmPackagePath, hasHarmonyCode),
|
|
47
|
+
createHarmonyDirContainsOnlyHarsCheck(npmPackagePath, hasHarmonyCode),
|
|
48
|
+
];
|
|
49
|
+
yield* runChecks(initialChecks, checkNamesToSkip);
|
|
50
|
+
if (hasHarmonyCode) {
|
|
51
|
+
const harPath = findHarPath(npmPackagePath);
|
|
52
|
+
if (!harPath) {
|
|
53
|
+
throw new DescriptiveError({
|
|
54
|
+
whatHappened: 'Attempted to verify har but no har was found',
|
|
55
|
+
whatCanUserDo: {
|
|
56
|
+
default: [
|
|
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
|
+
},
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
const tmpDirPath = new AbsolutePath(tmp.dirSync().name);
|
|
64
|
+
yield {
|
|
65
|
+
type: 'START_PROCESS',
|
|
66
|
+
name: `Unpacking the har file to the tmpdir`,
|
|
67
|
+
};
|
|
68
|
+
await unpackTarGz(harPath, tmpDirPath);
|
|
69
|
+
const ohPackageJson5 = OHPackageJSON5.fromPath(
|
|
70
|
+
tmpDirPath.copyWithNewSegment('package', 'oh-package.json5')
|
|
71
|
+
);
|
|
72
|
+
const harChecks: Check[] = [
|
|
73
|
+
createOhPackageNameFollowsNamingConventionCheck(
|
|
74
|
+
npmPackageJson.name,
|
|
75
|
+
ohPackageJson5.name
|
|
76
|
+
),
|
|
77
|
+
createNpmAndOhPackageVersionsAreEqualCheck(
|
|
78
|
+
npmPackageJson.version,
|
|
79
|
+
ohPackageJson5.version
|
|
80
|
+
),
|
|
81
|
+
];
|
|
82
|
+
yield* runChecks(harChecks, checkNamesToSkip);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
async function* runChecks(
|
|
87
|
+
checks: Check[],
|
|
88
|
+
checkNamesToSkip: string[]
|
|
89
|
+
): AsyncGenerator<VerificationMessage, void, unknown> {
|
|
90
|
+
for (const { checkIf, run } of checks) {
|
|
91
|
+
if (checkNamesToSkip.includes(checkIf)) {
|
|
92
|
+
yield {
|
|
93
|
+
type: 'FINISHED_CHECKING',
|
|
94
|
+
name: checkIf,
|
|
95
|
+
status: 'skip' as CheckStatus,
|
|
96
|
+
message: '',
|
|
97
|
+
};
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
const result = await run();
|
|
101
|
+
const status = typeof result === 'string' ? result : result.status;
|
|
102
|
+
const message = typeof result === 'string' ? '' : result.message;
|
|
103
|
+
yield { type: 'FINISHED_CHECKING', name: checkIf, status, message };
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
function findHarPath(packagePath: AbsolutePath): AbsolutePath | null {
|
|
108
|
+
const packageHarmonyPath = packagePath.copyWithNewSegment('harmony');
|
|
109
|
+
const fileOrDirNames = fs.readdirSync(packageHarmonyPath.getValue());
|
|
110
|
+
const harFilenames = fileOrDirNames.filter((fileOrDirName) =>
|
|
111
|
+
fileOrDirName.endsWith('.har')
|
|
112
|
+
);
|
|
113
|
+
if (harFilenames.length != 1) {
|
|
114
|
+
return null;
|
|
115
|
+
}
|
|
116
|
+
return packageHarmonyPath.copyWithNewSegment(harFilenames[0]);
|
|
117
|
+
}
|
package/tsconfig.build.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
{
|
|
2
|
-
"extends": "./tsconfig.json",
|
|
3
|
-
"exclude": [
|
|
4
|
-
"tests",
|
|
5
|
-
"**/*.test.ts",
|
|
6
|
-
]
|
|
1
|
+
{
|
|
2
|
+
"extends": "./tsconfig.json",
|
|
3
|
+
"exclude": [
|
|
4
|
+
"tests",
|
|
5
|
+
"**/*.test.ts",
|
|
6
|
+
]
|
|
7
7
|
}
|
package/tsconfig.json
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
{
|
|
2
|
-
"extends": "@tsconfig/recommended/tsconfig.json",
|
|
1
|
+
{
|
|
2
|
+
"extends": "@tsconfig/recommended/tsconfig.json",
|
|
3
3
|
}
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Codegen = void 0;
|
|
4
|
-
const CodegenError_1 = require("./CodegenError");
|
|
5
|
-
class Codegen {
|
|
6
|
-
constructor(packageCodeGenerator, codeGeneratorBySpecSchemaType) {
|
|
7
|
-
this.packageCodeGenerator = packageCodeGenerator;
|
|
8
|
-
this.codeGeneratorBySpecSchemaType = codeGeneratorBySpecSchemaType;
|
|
9
|
-
}
|
|
10
|
-
generate(uberSchema) {
|
|
11
|
-
const result = new Map();
|
|
12
|
-
for (const [_fileName, specSchema] of uberSchema
|
|
13
|
-
.getSpecSchemaByFilenameMap()
|
|
14
|
-
.entries()) {
|
|
15
|
-
if (!(specSchema.type in this.codeGeneratorBySpecSchemaType)) {
|
|
16
|
-
throw new CodegenError_1.CodegenError({
|
|
17
|
-
whatHappened: `Could not find a code generator for a specification of type '${specSchema.type}'`,
|
|
18
|
-
unexpected: true,
|
|
19
|
-
});
|
|
20
|
-
}
|
|
21
|
-
this.codeGeneratorBySpecSchemaType[specSchema.type]
|
|
22
|
-
.generate(specSchema)
|
|
23
|
-
.forEach((fileContent, filePath) => {
|
|
24
|
-
result.set(filePath, fileContent);
|
|
25
|
-
});
|
|
26
|
-
}
|
|
27
|
-
this.packageCodeGenerator
|
|
28
|
-
.generate(uberSchema)
|
|
29
|
-
.forEach((fileContent, filePath) => {
|
|
30
|
-
result.set(filePath, fileContent);
|
|
31
|
-
});
|
|
32
|
-
return result;
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
exports.Codegen = Codegen;
|
|
@@ -1,52 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.PackageCodeGenerator = void 0;
|
|
4
|
-
const core_1 = require("../core");
|
|
5
|
-
const templates_1 = require("../templates");
|
|
6
|
-
class PackageCodeGenerator {
|
|
7
|
-
constructor(cppOutputPath, etsOutputPath) {
|
|
8
|
-
this.cppOutputPath = cppOutputPath;
|
|
9
|
-
this.etsOutputPath = etsOutputPath;
|
|
10
|
-
}
|
|
11
|
-
generate(uberSchema) {
|
|
12
|
-
const result = new Map();
|
|
13
|
-
const generatedPackageH = new templates_1.RNOHGeneratedPackageHTemplate();
|
|
14
|
-
const components_indexTS = new templates_1.IndexTSTemplate();
|
|
15
|
-
const turboModules_indexTS = new templates_1.IndexTSTemplate();
|
|
16
|
-
const generated_indexETS = new templates_1.IndexTSTemplate();
|
|
17
|
-
generated_indexETS.addReexport({ from: './ts' });
|
|
18
|
-
uberSchema
|
|
19
|
-
.findAllSpecSchemasByType('NativeModule')
|
|
20
|
-
.forEach((nativeModuleSchema) => {
|
|
21
|
-
generatedPackageH.addTurboModule({
|
|
22
|
-
name: nativeModuleSchema.moduleName,
|
|
23
|
-
});
|
|
24
|
-
turboModules_indexTS.addReexport({
|
|
25
|
-
from: `./${nativeModuleSchema.moduleName}`,
|
|
26
|
-
});
|
|
27
|
-
});
|
|
28
|
-
uberSchema
|
|
29
|
-
.findAllSpecSchemasByType('Component')
|
|
30
|
-
.forEach((componentSchema) => {
|
|
31
|
-
Object.entries(componentSchema.components).forEach(([name, componentShape]) => {
|
|
32
|
-
components_indexTS.addReexport({ from: `./${name}` });
|
|
33
|
-
generatedPackageH.addComponent({
|
|
34
|
-
name: name,
|
|
35
|
-
supportedEventNames: componentShape.events.map((e) => {
|
|
36
|
-
return (0, core_1.createEventNameFromEventHandlerName)(e.name);
|
|
37
|
-
}),
|
|
38
|
-
});
|
|
39
|
-
});
|
|
40
|
-
});
|
|
41
|
-
result.set(this.cppOutputPath.copyWithNewSegment('RNOHGeneratedPackage.h'), generatedPackageH.build());
|
|
42
|
-
result.set(this.etsOutputPath.copyWithNewSegment('ts.ts'), new templates_1.IndexTSTemplate()
|
|
43
|
-
.addReexport({ from: './components/ts', as: 'RNC' })
|
|
44
|
-
.addReexport({ from: './turboModules/ts', as: 'TM' })
|
|
45
|
-
.build());
|
|
46
|
-
result.set(this.etsOutputPath.copyWithNewSegment('components', 'ts.ts'), components_indexTS.build());
|
|
47
|
-
result.set(this.etsOutputPath.copyWithNewSegment('turboModules', 'ts.ts'), turboModules_indexTS.build());
|
|
48
|
-
result.set(this.etsOutputPath.copyWithNewSegment('index.ets'), generated_indexETS.build());
|
|
49
|
-
return result;
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
exports.PackageCodeGenerator = PackageCodeGenerator;
|