@rife/cli 0.0.6-beta.1 → 0.0.6-beta.11

package/src/plugin/compiler/tsc.ts

@@ -1,101 +1,101 @@
-import type { ChildProcess } from 'child_process';
-import path from 'path';
-
-import type * as ts from 'typescript';
-
-import type { TsxConfig } from './compiler';
-
-type Status = 'startWatch' | 'reCompile' | 'error' | 'success' | '';
-export interface TscConfig extends TsxConfig {
-    watch?: boolean;
-    options?: ts.CompilerOptions;
-    onWatchStatusChanged?: (data: { status: Status; message: string }) => any;
-    onReportDiagnostic?: (data: { diagnostic: ts.Diagnostic }) => any;
-    onEmitDiagnostics?: (data: { diagnostics: ts.Diagnostic[] }) => any;
-}
-export function tsc(config: TscConfig) {
-    const logger = console;
-    const ts: typeof import('typescript') = require('typescript');
-    // https://github.com/microsoft/TypeScript/wiki/Using-the-Compiler-API#writing-an-incremental-program-watcher
-
-    const rootDir = config.rootDir || '.';
-
-    const formatHost: ts.FormatDiagnosticsHost = {
-        getCanonicalFileName: path => path,
-        getCurrentDirectory: ts.sys.getCurrentDirectory,
-        getNewLine: () => ts.sys.newLine,
-    };
-
-    function reportDiagnostic(diagnostic: ts.Diagnostic) {
-        config.onReportDiagnostic?.({ diagnostic });
-    }
-
-    /**
-     * Prints a diagnostic every time the watch status changes.
-     * This is mainly for messages like "Starting compilation" or "Compilation completed".
-     */
-    let a: ChildProcess | any;
-    function reportWatchStatusChanged(diagnostic: ts.Diagnostic) {
-        const message = `${ts.formatDiagnostic(diagnostic, formatHost)}`.trimEnd();
-        let status: Status = '';
-        if (message.includes('message TS6031: Starting compilation in watch mode')) {
-            status = 'startWatch';
-        } else if (message.includes('message TS6032: File change detected')) {
-            status = 'reCompile';
-        } else if (message.includes('Found 0 errors')) {
-            status = 'success';
-        } else if (/Found \d+ error/.test(message)) {
-            status = 'error';
-        }
-
-        config.onWatchStatusChanged?.({ status, message });
-    }
-
-    const configPath = ts.findConfigFile(rootDir, ts.sys.fileExists, 'tsconfig.json');
-    if (!configPath) {
-        throw new Error('找不到tsconfig.json');
-    }
-
-    const createProgram = ts.createSemanticDiagnosticsBuilderProgram;
-
-    if (config.watch) {
-        const host = ts.createWatchCompilerHost(
-            configPath,
-            {
-                ...config.options,
-                outDir: config.outDir,
-                noEmit: false,
-                incremental: true,
-            },
-            ts.sys,
-            createProgram,
-            reportDiagnostic,
-            reportWatchStatusChanged,
-        );
-
-        ts.createWatchProgram(host);
-    } else {
-        // 读取 tsconfig.json 文件
-        const configFile = ts.readConfigFile(configPath, ts.sys.readFile);
-
-        // 解析 tsconfig.json 文件
-        const compilerOptions = ts.parseJsonConfigFileContent(configFile.config, ts.sys, path.dirname(configPath), {
-            ...config.options,
-            outDir: config.outDir,
-            noEmit: false,
-            incremental: false,
-        });
-
-        // 获取编译器实例
-        const host = ts.createCompilerHost(compilerOptions.options);
-        const program = ts.createProgram(compilerOptions.fileNames, compilerOptions.options, host);
-
-        // 执行编译
-        const emitResult = program.emit();
-
-        // 处理编译结果
-        const diagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
-
-        config.onEmitDiagnostics?.({ diagnostics });
-    }
-}
+import type { ChildProcess } from 'child_process';
+import path from 'path';
+
+import type * as ts from 'typescript';
+
+import type { TsxConfig } from './compiler';
+
+type Status = 'startWatch' | 'reCompile' | 'error' | 'success' | '';
+export interface TscConfig extends TsxConfig {
+    watch?: boolean;
+    options?: ts.CompilerOptions;
+    onWatchStatusChanged?: (data: { status: Status; message: string }) => any;
+    onReportDiagnostic?: (data: { diagnostic: ts.Diagnostic }) => any;
+    onEmitDiagnostics?: (data: { diagnostics: ts.Diagnostic[] }) => any;
+}
+export function tsc(config: TscConfig) {
+    const logger = console;
+    const ts: typeof import('typescript') = require('typescript');
+    // https://github.com/microsoft/TypeScript/wiki/Using-the-Compiler-API#writing-an-incremental-program-watcher
+
+    const rootDir = config.rootDir || '.';
+
+    const formatHost: ts.FormatDiagnosticsHost = {
+        getCanonicalFileName: path => path,
+        getCurrentDirectory: ts.sys.getCurrentDirectory,
+        getNewLine: () => ts.sys.newLine,
+    };
+
+    function reportDiagnostic(diagnostic: ts.Diagnostic) {
+        config.onReportDiagnostic?.({ diagnostic });
+    }
+
+    /**
+     * Prints a diagnostic every time the watch status changes.
+     * This is mainly for messages like "Starting compilation" or "Compilation completed".
+     */
+    let a: ChildProcess | any;
+    function reportWatchStatusChanged(diagnostic: ts.Diagnostic) {
+        const message = `${ts.formatDiagnostic(diagnostic, formatHost)}`.trimEnd();
+        let status: Status = '';
+        if (message.includes('message TS6031: Starting compilation in watch mode')) {
+            status = 'startWatch';
+        } else if (message.includes('message TS6032: File change detected')) {
+            status = 'reCompile';
+        } else if (message.includes('Found 0 errors')) {
+            status = 'success';
+        } else if (/Found \d+ error/.test(message)) {
+            status = 'error';
+        }
+
+        config.onWatchStatusChanged?.({ status, message });
+    }
+
+    const configPath = ts.findConfigFile(rootDir, ts.sys.fileExists, 'tsconfig.json');
+    if (!configPath) {
+        throw new Error('找不到tsconfig.json');
+    }
+
+    const createProgram = ts.createSemanticDiagnosticsBuilderProgram;
+
+    if (config.watch) {
+        const host = ts.createWatchCompilerHost(
+            configPath,
+            {
+                ...config.options,
+                outDir: config.outDir,
+                noEmit: false,
+                incremental: true,
+            },
+            ts.sys,
+            createProgram,
+            reportDiagnostic,
+            reportWatchStatusChanged,
+        );
+
+        ts.createWatchProgram(host);
+    } else {
+        // 读取 tsconfig.json 文件
+        const configFile = ts.readConfigFile(configPath, ts.sys.readFile);
+
+        // 解析 tsconfig.json 文件
+        const compilerOptions = ts.parseJsonConfigFileContent(configFile.config, ts.sys, path.dirname(configPath), {
+            ...config.options,
+            outDir: config.outDir,
+            noEmit: false,
+            incremental: false,
+        });
+
+        // 获取编译器实例
+        const host = ts.createCompilerHost(compilerOptions.options);
+        const program = ts.createProgram(compilerOptions.fileNames, compilerOptions.options, host);
+
+        // 执行编译
+        const emitResult = program.emit();
+
+        // 处理编译结果
+        const diagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
+
+        config.onEmitDiagnostics?.({ diagnostics });
+    }
+}

package/src/plugin/config.ts

@@ -1,63 +1,78 @@
-import path from 'path';
-
-import type { Config, Plugin } from '../runner';
-
-export function pluginConfig() {
-    const plugin: Plugin = {
-        name: pluginConfig.name,
-        apply: runner => {
-            const { logger, hook, config, fs, z } = runner;
-            const log = logger.withTag(pluginConfig.name);
-
-            hook.loadConfig.tapPromise(pluginConfig.name, async () => {
-                const fileName = '.app.js';
-                const filePath = path.posix.resolve(fileName);
-                log.debug(`filePath %s`, filePath);
-                if (!fs.existsSync(filePath)) {
-                    log.error(`找不到配置文件 ${fileName}`);
-                    process.exit(1);
-                }
-                const all: Config[] = require(filePath);
-                runner.config.all = all;
-            });
-
-            hook.validateConfig.tapPromise(pluginConfig.name, async () => {
-                const validation = z
-                    .array(
-                        z.object({
-                            name: z.string().trim().min(1),
-                        }),
-                    )
-                    .min(1)
-                    .safeParse(config.all);
-                if (!validation.success) {
-                    log.error(validation.error.message);
-                    process.exit(1);
-                }
-            });
-
-            hook.applyConfig.tapPromise(pluginConfig.name, async options => {
-                const result = z
-                    .object({
-                        name: z.string().trim().optional(),
-                    })
-                    .safeParse(options);
-                const name = result.data?.name;
-                if (!name) {
-                    log.debug('没有指定 --name，默认使用列表第一个');
-                    config.current = config.all[0];
-                } else {
-                    log.debug(`指定 --name ${name}`);
-                    const find = config.all.find(t => t.name === name);
-                    if (!find) {
-                        log.error(`未找到 name '%s'`, name);
-                        process.exit(1);
-                    }
-                    config.current = find;
-                }
-                config.current.plugins.forEach(plugin => plugin.apply(runner));
-            });
-        },
-    };
-    return plugin;
-}
+import path from 'path';
+
+import type { Config, Plugin } from '../runner';
+
+export function pluginConfig() {
+    const plugin: Plugin = {
+        name: pluginConfig.name,
+        apply: runner => {
+            const { logger, hook, config, command, fs, z } = runner;
+            const log = logger.withTag(pluginConfig.name);
+
+            hook.loadConfig.tapPromise(pluginConfig.name, async () => {
+                let filePath = '';
+                const mjs = 'app.mjs';
+                const fileNames = ['app.js', 'app.cjs', mjs];
+                let isEsm = false;
+                for (const fileName of fileNames) {
+                    if (await fs.exists(fileName)) {
+                        filePath = path.posix.resolve(fileName);
+                        isEsm = fileName === mjs;
+                        break;
+                    }
+                }
+                log.debug(`filePath %s`, filePath);
+                if (!filePath) {
+                    log.error(`找不到配置文件 app.(c|m)?js`);
+                    process.exit(1);
+                }
+                let all: Config[] = [];
+                if (isEsm) {
+                    all = (await import(filePath)).default;
+                } else {
+                    all = require(filePath);
+                }
+                runner.config.all = all;
+            });
+
+            hook.validateConfig.tapPromise(pluginConfig.name, async () => {
+                const validation = z
+                    .array(
+                        z.object({
+                            name: z.string().trim().min(1),
+                        }),
+                    )
+                    .min(1)
+                    .safeParse(config.all);
+                if (!validation.success) {
+                    log.error(validation.error.message);
+                    process.exit(1);
+                }
+            });
+
+            hook.applyConfig.tapPromise(pluginConfig.name, async () => {
+                const result = z
+                    .object({
+                        name: z.string().trim().default(''),
+                    })
+                    .default({})
+                    .safeParse(command.opts());
+                const name = result.data?.name;
+                if (!name) {
+                    log.debug('没有指定 --name，默认使用列表第一个');
+                    config.current = config.all[0];
+                } else {
+                    log.debug(`指定 --name ${name}`);
+                    const find = config.all.find(t => t.name === name);
+                    if (!find) {
+                        log.error(`未找到 name '%s'`, name);
+                        process.exit(1);
+                    }
+                    config.current = find;
+                }
+                config.current.plugins.forEach(plugin => plugin.apply(runner));
+            });
+        },
+    };
+    return plugin;
+}

package/src/plugin/index.ts

@@ -2,3 +2,4 @@ export * from './config';
 export * from './package';
 export * from './commander';
 export * from './compiler';
+export * from './release';

package/src/plugin/package.ts

@@ -1,8 +1,5 @@
-import type { ChildProcess } from 'child_process';
 import path from 'path';
 
-import { AsyncSeriesHook } from 'tapable';
-
 import type { Plugin } from '../runner';
 
 export function pluginPackage() {

package/src/plugin/release.ts

@@ -1,32 +1,113 @@
-import type { ChildProcess } from 'child_process';
-import path from 'path';
-
-import { AsyncSeriesHook } from 'tapable';
-
-import type { Plugin } from '../runner';
-
-export function pluginRelease() {
-    const plugin: Plugin = {
-        name: pluginRelease.name,
-        apply: runner => {
-            const { logger, hook, fs } = runner;
-            const log = logger.withTag(pluginRelease.name);
-            hook.loadPackage.tapPromise(pluginRelease.name, async () => {
-                const fileName = 'package.json';
-                const filePath = path.resolve(fileName);
-                if (!fs.existsSync(filePath)) {
-                    log.error(`找不到文件 ${fileName}`);
-                    process.exit(1);
-                }
-                try {
-                    const data = require(filePath);
-                    runner.package = data;
-                } catch (e) {
-                    log.error(`读取文件失败`, e.message);
-                    process.exit(1);
-                }
-            });
-        },
-    };
-    return plugin;
-}
+import { execSync } from 'child_process';
+
+import type { Plugin } from '../runner';
+
+export function pluginRelease() {
+    const plugin: Plugin = {
+        name: pluginRelease.name,
+        apply: runner => {
+            const { logger, hook, fs } = runner;
+            const log = logger.withTag(pluginRelease.name);
+            hook.release.tapPromise(pluginRelease.name, async () => {
+                runner.clear();
+                await hook.build.promise();
+
+                log.start('开始发布');
+                const packageVersion = runner.package.version;
+                const packageName = runner.package.name;
+                const url = `https://registry.npmjs.org/${packageName}`;
+                let nextVersion = packageVersion;
+                log.debug(`查询版本号 ${packageVersion} 是否存在`);
+                const res = await (await fetch(url)).json();
+                const exist = res?.versions?.[packageVersion];
+                if (exist) {
+                    const split = packageVersion.split('.');
+                    split[split.length - 1] = Number(split[split.length - 1]) + 1;
+                    nextVersion = split.join('.');
+                    log.debug(`版本号 ${packageVersion} 存在，更新版本号为 ${nextVersion}`);
+                    const text = fs.readFileSync('./package.json').toString();
+                    const nextText = text.replace(new RegExp(`"version":\\s*"${packageVersion}"`), `"version": "${nextVersion}"`);
+                    fs.writeFileSync('./package.json', nextText);
+                }
+                log.debug(`版本号 ${packageVersion} 不存在`);
+                log.info(`版本号为 ${nextVersion}`);
+
+                const tempDir = `./node_modules/.rife/release/`;
+                log.info(`清空目录 ${tempDir}`);
+                fs.emptyDirSync(tempDir);
+
+                const pack = `pnpm pack --pack-destination ${tempDir} --json`;
+                log.info(`打包文件 ${pack}`);
+                const packOutput = JSON.parse(execSync(pack).toString());
+                const filename = packOutput.filename;
+                for (const item of packOutput.files) {
+                    log.debug(item.path);
+                }
+
+                const debug = false;
+                const publish = `pnpm publish ${filename} --registry https://registry.npmjs.org --no-git-checks ${
+                    debug ? '--dry-run' : ''
+                }`;
+                log.info(`发布文件 ${publish}`);
+                execSync(publish, { stdio: 'inherit' });
+                log.success(`发布成功，${runner.duration}`);
+
+                log.info('同步版本');
+                let hasSync = false;
+                while (true) {
+                    const res = await queryVersion(packageName);
+                    const nextManifest = res?.versions?.[nextVersion];
+                    const exist = Boolean(nextManifest);
+                    const latest = res?.['dist-tags']?.latest;
+                    if (exist) {
+                        log.debug(`同步版本存在`);
+                        break;
+                    }
+                    log.info(`检查版本 ${nextVersion} 不存在，最新版本为 ${latest}`);
+                    if (!hasSync) {
+                        hasSync = true;
+                        log.start(`开始同步`);
+                        const sync = await syncVersion(packageName);
+                        if (sync.ok === true) {
+                            log.info(
+                                `调用同步接口成功，日志 https://registry.npmmirror.com/-/package/${packageName}/syncs/${sync.id}/log`,
+                            );
+                        } else {
+                            log.debug(`调用同步接口失败，%j`, sync);
+                        }
+                    }
+                    await new Promise(resolve => setTimeout(resolve, 2000));
+                }
+                log.success(`同步成功，${runner.duration}`);
+            });
+        },
+    };
+    return plugin;
+}
+
+async function queryVersion(packageName: string) {
+    const res = await (await fetch(`https://registry.npmmirror.com/${packageName}?t=${Math.random()}`)).json();
+    return res;
+}
+
+async function syncVersion(packageName: string) {
+    const sync = await (
+        await fetch(`https://registry-direct.npmmirror.com/-/package/${packageName}/syncs`, {
+            headers: {
+                accept: '*/*',
+                'accept-language': 'zh-CN,zh;q=0.9,en;q=0.8',
+                'sec-ch-ua': '"Not_A Brand";v="8", "Chromium";v="120", "Google Chrome";v="120"',
+                'sec-ch-ua-mobile': '?0',
+                'sec-ch-ua-platform': '"Windows"',
+                'sec-fetch-dest': 'empty',
+                'sec-fetch-mode': 'cors',
+                'sec-fetch-site': 'same-site',
+                Referer: 'https://npmmirror.com/',
+                'Referrer-Policy': 'strict-origin-when-cross-origin',
+            },
+            body: null,
+            method: 'PUT',
+        })
+    ).json();
+    return sync;
+}