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

package/src/plugin/compiler/swc.ts

@@ -1,55 +1,55 @@
-import type { TsxConfig } from './compiler';
-
-export interface SwcConfig extends TsxConfig {
-    watch?: boolean;
-    options?: any;
-    onSuccess?: (data: { watch: boolean; first: boolean; duration: number }) => any;
-    onFail?: (data: { watch: boolean; first: boolean; duration: number; reasons: Map<string, string> }) => any;
-}
-
-export async function swc(options: SwcConfig) {
-    const { watch = false, outDir } = options;
-    const { swcDir } = require('@swc/cli');
-
-    // https://swc.rs/docs/configuration/swcrc
-    const swcOptions = {
-        jsc: {
-            parser: {
-                syntax: 'typescript',
-            },
-            target: 'esnext',
-            externalHelpers: true,
-        },
-        module: {
-            type: 'commonjs',
-            // type: 'es6',
-            ignoreDynamic: true,
-        },
-        sourceMaps: true,
-    };
-
-    let first = true;
-
-    await swcDir({
-        cliOptions: {
-            outDir,
-            watch,
-            filenames: ['./src'],
-            extensions: ['.ts', '.tsx'],
-            stripLeadingPaths: true,
-        },
-        swcOptions,
-        callbacks: {
-            onSuccess: ({ duration }: any) => {
-                options?.onSuccess?.({ watch, first, duration });
-                first = false;
-            },
-            onFail: (e: any) => {
-                options?.onFail?.({ ...e, watch, first });
-                // 不退出，下次修复报错后清空屏幕
-                first = false;
-            },
-            onWatchReady: () => {},
-        },
-    });
-}
+import type { TsxConfig } from './compiler';
+
+export interface SwcConfig extends TsxConfig {
+    watch?: boolean;
+    options?: any;
+    onSuccess?: (data: { watch: boolean; first: boolean; duration: number }) => any;
+    onFail?: (data: { watch: boolean; first: boolean; duration: number; reasons: Map<string, string> }) => any;
+}
+
+export async function swc(options: SwcConfig) {
+    const { watch = false, outDir } = options;
+    const { swcDir } = require('@swc/cli');
+
+    // https://swc.rs/docs/configuration/swcrc
+    const swcOptions = {
+        jsc: {
+            parser: {
+                syntax: 'typescript',
+            },
+            target: 'esnext',
+            externalHelpers: true,
+        },
+        module: {
+            type: 'commonjs',
+            // type: 'es6',
+            ignoreDynamic: true,
+        },
+        sourceMaps: true,
+    };
+
+    let first = true;
+
+    await swcDir({
+        cliOptions: {
+            outDir,
+            watch,
+            filenames: ['./src'],
+            extensions: ['.ts', '.tsx'],
+            stripLeadingPaths: true,
+        },
+        swcOptions,
+        callbacks: {
+            onSuccess: ({ duration }: any) => {
+                options?.onSuccess?.({ watch, first, duration });
+                first = false;
+            },
+            onFail: (e: any) => {
+                options?.onFail?.({ ...e, watch, first });
+                // 不退出，下次修复报错后清空屏幕
+                first = false;
+            },
+            onWatchReady: () => {},
+        },
+    });
+}

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/release.ts

@@ -1,32 +1,32 @@
-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 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;
+}

package/src/pnpmfile.ts

@@ -1,121 +1,147 @@
-let root: any;
-let exit: (message: string) => any;
-const origin: any = {};
-
-export function parseVersion(version: string) {
-    const [_, a = '', b = '', c = '', d = ''] = /(\d+?)\.(\d+?)\.(\d+?)\D*(\d+)?/.exec(version) || [];
-    if (!a || !b || !c) {
-        exit(`version ${version}`);
-    }
-    return [a, b, c, d].map(t => t.padStart(3, '0')).join('.');
-}
-
-function compareVersion(v1: string, v2: string) {
-    const v = [v1, v2].filter(t => Boolean(t));
-    if (v.length === 0) {
-        exit('version empty');
-    }
-    if (v.length === 1) {
-        return v[0];
-    }
-
-    return parseVersion(v1) > parseVersion(v2) ? v1 : v2;
-}
-
-const host: any = {};
-function updateRoot(type: 'dependencies' | 'devDependencies', name: string, version: string, from: string) {
-    if (origin[type][name]) return;
-    if (!host[type]) {
-        host[type] = {};
-    }
-    const dependencies = host[type];
-    dependencies[name] = {
-        version: compareVersion(version, dependencies[name]?.version),
-        from,
-    };
-}
-
-export const readPackage = (pkg: any, context: any) => {
-    if (!exit) {
-        exit = (message: string) => {
-            context.log(message);
-            // @ts-ignore
-            process.exit(1);
-        };
-    }
-    if (!root) {
-        root = pkg;
-        origin.dependencies = { ...root.dependencies };
-        origin.devDependencies = { ...root.devDependencies };
-    }
-    const dependencies = pkg.dependencies || {};
-    const devDependencies = pkg.devDependencies || {};
-    const peerDependencies = (pkg.peerDependencies = pkg.peerDependencies || {});
-    const { hostDependencies = {} } = pkg.rife || {};
-    const from = `${pkg.name}@${pkg.version}`;
-    Object.keys(hostDependencies).forEach(name => {
-        const version = dependencies[name] || devDependencies[name];
-        if (!version) {
-            exit('cannot not found version');
-        }
-        const isDev = Boolean(devDependencies[name]);
-        if (isDev) {
-            peerDependencies[name] = version;
-            updateRoot('devDependencies', name, version, from);
-        } else {
-            updateRoot('dependencies', name, version, from);
-        }
-    });
-    return pkg;
-};
-
-export const afterAllResolved = (lockfile, context) => {
-    const fact = lockfile.importers['.'];
-    context.log(JSON.stringify(host));
-    return lockfile;
-};
-
-// const logDiff = (type: 'dependencies' | 'devDependencies', diff: any, context) => {
-//     if (diff.desc) {
-//         context.log(`${type} is wrong, ${diff.desc}.`);
-//     }
-// };
-
-// export function testReadPackage(list: any[]) {
-//     root = null;
-//     origin = {};
-//     list.map(t => readPackage(t, { log: console.log }));
-//     return root;
-// }
-
-// function compareObject(fact: any = {}, expect: any = {}) {
-//     const more: any[] = [];
-//     const less: any[] = [];
-//     Object.keys(fact).forEach(name => {
-//         if (fact[name] !== expect[name]) {
-//             more.push({ name, version: fact[name] });
-//         }
-//     });
-//     Object.keys(expect).forEach(name => {
-//         if (fact[name] !== expect[name]) {
-//             less.push({ name, version: expect[name] });
-//         }
-//     });
-//     const desc: string[] = [];
-//     if (more.length) {
-//         desc.push(`${more.map(t => `${t.name}@${t.version}`).join(' ')} is redundant`);
-//     }
-//     if (less.length) {
-//         desc.push(`cannot found ${less.map(t => `${t.name}@${t.version}`).join(' ')}`);
-//     }
-//     return {
-//         more, //
-//         less,
-//         desc: desc.join(', '),
-//     };
-// }
-
-// export function testCompareObject(fact: any = {}, expect: any = {}) {
-//     const { more, less } = compareObject(fact, expect);
-//     return { more, less };
-// }
+// @ts-ignore
+const fs = require('fs');
+// @ts-ignore
+const h = require('https');
+
+const request = h.request;
+h.request = function (...args: any[]) {
+    const path = args[0].path || '';
+    if (path.startsWith('/@rife') && !path.endsWith('.tgz')) {
+        console.log(path);
+        args[0].headers['accept'] = 'application/json';
+    }
+    return request(...args);
+};
+
+let root: any;
+let exit: (message: string) => any;
+const origin: any = {};
+
+export function parseVersion(version: string) {
+    const [_, a = '', b = '', c = '', d = ''] = /(\d+?)\.(\d+?)\.(\d+?)\D*(\d+)?/.exec(version) || [];
+    if (!a || !b || !c) {
+        exit(`version ${version}`);
+    }
+    return [a, b, c, d].map(t => t.padStart(3, '0')).join('.');
+}
+
+function compareVersion(v1: string, v2: string) {
+    const v = [v1, v2].filter(t => Boolean(t));
+    if (v.length === 0) {
+        exit('version empty');
+    }
+    if (v.length === 1) {
+        return v[0];
+    }
+
+    return parseVersion(v1) > parseVersion(v2) ? v1 : v2;
+}
+
+const host: any = {};
+function updateRoot(type: 'dependencies' | 'devDependencies', name: string, version: string, from: string) {
+    if (origin[type][name]) return;
+    if (!host[type]) {
+        host[type] = {};
+    }
+    const dependencies = host[type];
+    dependencies[name] = {
+        version: compareVersion(version, dependencies[name]?.version),
+        from,
+    };
+}
+
+export const readPackage = (pkg: any, context: any) => {
+    if (!exit) {
+        exit = (message: string) => {
+            context.log(message);
+            // @ts-ignore
+            process.exit(1);
+        };
+    }
+    if (!root) {
+        root = pkg;
+        origin.dependencies = { ...root.dependencies };
+        origin.devDependencies = { ...root.devDependencies };
+    }
+    const dependencies = pkg.dependencies || {};
+    const devDependencies = pkg.devDependencies || {};
+    const { hostDependencies = {} } = pkg.rife || {};
+    const from = {
+        name: pkg.name,
+        version: pkg.version,
+    };
+    Object.keys(hostDependencies).forEach(name => {
+        const version = dependencies[name] || devDependencies[name];
+        if (!version) {
+            exit('cannot not found version');
+        }
+        const isDev = Boolean(devDependencies[name]);
+        if (isDev) {
+            dependencies[name] = version;
+            updateRoot('devDependencies', name, version, from);
+        } else {
+            updateRoot('dependencies', name, version, from);
+        }
+    });
+    return pkg;
+};
+
+const deps = ['devDependencies', 'dependencies'];
+const need: any[] = [];
+
+let aaaa = [];
+
+export const afterAllResolved = (lockfile, context) => {
+    fs.writeFileSync('./temp/1.json', JSON.stringify(host, undefined, 4));
+    debugger;
+
+    deps.map(dep => {
+        Object.entries(host[dep as any]).forEach(([name, data]: any) => {
+            need.push({
+                key: `${name}@${data.version}`,
+                name,
+                dep,
+                version: data.version,
+                from: data.from,
+                source: `${data.from.name}@${data.from.version}`,
+            });
+        });
+    });
+
+    // debugger;
+    const current = lockfile.importers['.'];
+    const { packages } = lockfile;
+
+    const list = Object.keys(packages).map(key => {
+        const pack = {
+            key,
+            value: packages[key],
+        };
+        return pack;
+    });
+    const t = Object.keys(packages).filter(t => t.startsWith('@rife/cli'));
+    aaaa = need.map(n => {
+        const f = list.find(t => t.key.startsWith(n.key));
+        if (f) {
+            return f;
+        }
+        const s = list.find(t2 => t2.key.startsWith(n.source));
+        const v = s?.value?.dependencies[n.name];
+        if (v) {
+            const newKey = `${n.name}@${v}`;
+            const ff = list.find(t => t.key.startsWith(newKey));
+            if (ff) {
+                return ff;
+            }
+        }
+        debugger;
+    });
+
+    debugger;
+    return lockfile;
+};
+
+process.on('exit', () => {
+    // const exits = aaaa.map(a => fs.exitsSync(`./node_modules/.pnpm/${a.replace('/', '_')}`));
+    // debugger;
+});