expo-harmony-toolkit 1.7.2 → 1.8.0

package/build/core/build/reporting.js

@@ -0,0 +1,67 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderBuildReport = renderBuildReport;
+exports.getBundleOutputPath = getBundleOutputPath;
+exports.getAssetsOutputPath = getAssetsOutputPath;
+exports.createBuildReport = createBuildReport;
+exports.createStepReport = createStepReport;
+const path_1 = __importDefault(require("path"));
+const constants_1 = require("../constants");
+function renderBuildReport(report) {
+    const lines = [
+        'Expo Harmony build report',
+        `Project: ${report.projectRoot}`,
+        `Command: ${report.command}`,
+        `Mode: ${report.mode ?? 'n/a'}`,
+        `Status: ${report.status}`,
+        `Harmony project: ${report.harmonyProjectRoot ?? 'not found'}`,
+        `Entry file: ${report.entryFile ?? 'n/a'}`,
+        `Bundle output: ${report.bundleOutputPath ?? 'n/a'}`,
+        `Artifacts: ${report.artifactPaths.join(', ') || 'none'}`,
+        '',
+        'Steps:',
+        ...report.steps.map((step) => `- [${step.exitCode ?? 'n/a'}] ${step.label}: ${step.command} (cwd ${step.cwd})`),
+    ];
+    if (report.blockingIssues.length > 0) {
+        lines.push('', 'Blocking issues:', ...report.blockingIssues.map((issue) => `- ${issue.code}: ${issue.message}${issue.subject ? ` (${issue.subject})` : ''}`));
+    }
+    if (report.warnings.length > 0) {
+        lines.push('', 'Warnings:', ...report.warnings.map((warning) => `- ${warning}`));
+    }
+    return lines.join('\n');
+}
+function getBundleOutputPath(projectRoot) {
+    return path_1.default.join(projectRoot, 'harmony', 'entry', 'src', 'main', 'resources', 'rawfile', 'bundle.harmony.js');
+}
+function getAssetsOutputPath(projectRoot) {
+    return path_1.default.join(projectRoot, 'harmony', 'entry', 'src', 'main', 'resources', 'rawfile', 'assets');
+}
+function createBuildReport(input) {
+    return {
+        generatedAt: new Date().toISOString(),
+        projectRoot: input.projectRoot,
+        toolkitVersion: constants_1.TOOLKIT_VERSION,
+        command: input.command,
+        mode: input.mode,
+        status: input.status,
+        harmonyProjectRoot: input.harmonyProjectRoot ?? path_1.default.join(input.projectRoot, 'harmony'),
+        entryFile: input.entryFile,
+        bundleOutputPath: input.bundleOutputPath,
+        assetsDestPath: input.assetsDestPath,
+        artifactPaths: input.artifactPaths,
+        blockingIssues: input.blockingIssues,
+        warnings: input.warnings,
+        steps: input.steps,
+    };
+}
+function createStepReport(label, file, args, cwd, exitCode) {
+    return {
+        label,
+        command: [file, ...args].join(' '),
+        cwd,
+        exitCode,
+    };
+}

package/build/core/build/rnohCompatibility.d.ts

@@ -0,0 +1 @@
+export declare function normalizeProjectRnohCliAutolinkingTemplates(projectRoot: string): Promise<() => Promise<void>>;

package/build/core/build/rnohCompatibility.js

@@ -0,0 +1,38 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeProjectRnohCliAutolinkingTemplates = normalizeProjectRnohCliAutolinkingTemplates;
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const RNOH_CLI_AUTOLINKING_TEMPLATE_RELATIVE_PATHS = [
+    path_1.default.join('node_modules', '@react-native-oh', 'react-native-harmony-cli', 'dist', 'autolinking', 'Autolinking.js'),
+    path_1.default.join('node_modules', '@react-native-oh', 'react-native-harmony-cli', 'src', 'autolinking', 'Autolinking.ts'),
+];
+async function normalizeProjectRnohCliAutolinkingTemplates(projectRoot) {
+    const originalContentsByPath = new Map();
+    for (const relativePath of RNOH_CLI_AUTOLINKING_TEMPLATE_RELATIVE_PATHS) {
+        const targetPath = path_1.default.join(projectRoot, relativePath);
+        if (!(await fs_extra_1.default.pathExists(targetPath))) {
+            continue;
+        }
+        const currentContents = await fs_extra_1.default.readFile(targetPath, 'utf8');
+        const normalizedContents = normalizeRnohCliAutolinkingTemplateContents(currentContents);
+        if (normalizedContents === currentContents) {
+            continue;
+        }
+        originalContentsByPath.set(targetPath, currentContents);
+        await fs_extra_1.default.writeFile(targetPath, normalizedContents);
+    }
+    return async () => {
+        for (const [targetPath, originalContents] of originalContentsByPath.entries()) {
+            await fs_extra_1.default.writeFile(targetPath, originalContents);
+        }
+    };
+}
+function normalizeRnohCliAutolinkingTemplateContents(contents) {
+    return contents
+        .replace(/import type \{ RNPackageContext, RNOHPackage \} from '@rnoh\/react-native-openharmony';/g, "import type { RNPackageContext, RNPackage } from '@rnoh/react-native-openharmony';")
+        .replace(/export function createRNOHPackages\(ctx: RNPackageContext\): RNOHPackage\[\] \{/g, 'export function createRNOHPackages(ctx: RNPackageContext): RNPackage[] {');
+}

package/build/core/build.d.ts

@@ -1,13 +1,7 @@
-import { BuildReport } from '../types';
-export interface CommandRunnerResult {
-    exitCode: number;
-    stdout: string;
-    stderr: string;
-}
-export type CommandRunner = (file: string, args: string[], options: {
-    cwd: string;
-    env: NodeJS.ProcessEnv;
-}) => Promise<CommandRunnerResult>;
+import type { BuildReport } from '../types';
+import type { CommandRunner } from './build/commands';
+export type { CommandRunner, CommandRunnerResult } from './build/commands';
+export { renderBuildReport } from './build/reporting';
 interface BundleProjectOptions {
     env?: NodeJS.ProcessEnv;
     runner?: CommandRunner;
@@ -20,6 +14,4 @@ interface BuildHapProjectOptions {
 }
 export declare function bundleProject(projectRoot: string, options?: BundleProjectOptions): Promise<BuildReport>;
 export declare function buildHapProject(projectRoot: string, options: BuildHapProjectOptions): Promise<BuildReport>;
-export declare function renderBuildReport(report: BuildReport): string;
 export declare function getDesiredHarmonyScripts(projectRoot: string): Promise<Record<string, string>>;
-export {};