lvyjs 0.1.3 → 0.2.0

package/bin/index.js

@@ -12,17 +12,20 @@ if (args.includes('build')) {
   const jsFile = join(currentDirPath, '../lib/index.js')
   const jsdir = relative(process.cwd(), jsFile)
   const argsx = args.filter(arg => arg !== 'build')
-  const msg = fork(
-    join(currentDirPath, '../../tsx/dist/cli.mjs'),
-    [jsdir, '--lvy-build', ...argsx],
-    {
-      stdio: 'inherit',
-      env: Object.assign({}, process.env, {
-        PKG_DIR: pkgFilr
-      }),
-      shell: process.platform === 'win32'
-    }
-  )
+  let tsxDir = join(currentDirPath, '../../tsx/dist/cli.mjs')
+  if (!existsSync(tsxDir)) {
+    tsxDir = join(currentDirPath, '../node_modules/tsx/dist/cli.mjs')
+  }
+  if (!existsSync(tsxDir)) {
+    tsxDir = join(process.cwd(), 'node_modules/tsx/dist/cli.mjs')
+  }
+  const msg = fork(tsxDir, [jsdir, '--lvy-build', ...argsx], {
+    stdio: 'inherit',
+    env: Object.assign({}, process.env, {
+      PKG_DIR: pkgFilr
+    }),
+    shell: process.platform === 'win32'
+  })
   if (msg.error) {
     console.error(msg.error)
     process.exit()
@@ -40,6 +43,9 @@ if (args.includes('build')) {
   if (!existsSync(tsxDir)) {
     tsxDir = join(currentDirPath, '../node_modules/tsx/dist/cli.mjs')
   }
+  if (!existsSync(tsxDir)) {
+    tsxDir = join(process.cwd(), 'node_modules/tsx/dist/cli.mjs')
+  }
   const msg = fork(tsxDir, [...argv, ...argsx], {
     stdio: 'inherit',
     env: Object.assign({}, process.env, {

package/lib/build/rullup.js

@@ -35,94 +35,93 @@ const buildJS = async (inputs, output) => {
         global.lvyConfig.build = {};
     // 插件
     const plugins = [];
-    for (const key in global.lvyConfig.build) {
-        if (typeof global.lvyConfig.build[key] == 'boolean') {
-            continue;
-        }
-        if (key === 'alias' && !global.lvyConfig.build['@rollup/plugin-alias']) {
-            plugins.push(alias(global.lvyConfig.build[key]));
-        }
-        else if (key === 'assets') {
-            plugins.push(rollupAssets(global.lvyConfig.build[key]));
-        }
-        else if (key === 'styles') {
-            plugins.push(styles({
-                mode: ['inject', () => '']
-            }));
-            plugins.push(rollupStylesCSSImport(global.lvyConfig.build[key]));
-        }
-        else if (key === 'commonjs' && !global.lvyConfig.build['@rollup/plugin-commonjs']) {
-            plugins.push(commonjs(global.lvyConfig.build[key]));
-        }
-        else if (key === 'json' && !global.lvyConfig.build['@rollup/plugin-json']) {
-            plugins.push(json(global.lvyConfig.build[key]));
-        }
-        else if (key === 'typescript' && !global.lvyConfig.build['@rollup/plugin-typescript']) {
-            plugins.push(typescript(global.lvyConfig.build[key]));
-        }
-        else if (key === 'plugins') {
-            if (Array.isArray(global.lvyConfig.build[key])) {
-                for (const plugin of global.lvyConfig.build[key]) {
-                    plugins.push(plugin);
-                }
-            }
-        }
-        else {
-            const plugin = (await import(key)).default;
-            plugins.push(plugin(global.lvyConfig.build[key]));
-        }
+    if (global.lvyConfig.alias) {
+        plugins.push(alias(global.lvyConfig.alias));
     }
-    // 如果不存在这些配置
-    const keys = ['assets', 'styles', 'commonjs', 'json', 'typescript'];
-    for (const key of keys) {
-        // 如果是布尔值
-        if (typeof global.lvyConfig.build[key] == 'boolean') {
-            continue;
-        }
-        // 存在这些配置
-        if (global.lvyConfig.build[key]) {
-            continue;
-        }
+    if (global.lvyConfig.assets) {
+        plugins.push(rollupAssets(global.lvyConfig.assets));
+    }
+    else {
+        plugins.push(rollupAssets());
+    }
+    if (typeof global.lvyConfig.build != 'boolean') {
         //
-        if (key == 'assets') {
-            plugins.push(rollupAssets());
-        }
-        else if (key == 'styles') {
-            plugins.push(styles({
-                mode: ['inject', () => '']
-            }));
-            plugins.push(rollupStylesCSSImport());
-        }
-        else if (key === 'commonjs') {
-            plugins.push(commonjs());
-        }
-        else if (key === 'json') {
-            plugins.push(json());
-        }
-        else if (key === 'typescript') {
-            plugins.push(typescript());
+        for (const key in global.lvyConfig.build) {
+            if (typeof global.lvyConfig.build[key] == 'boolean') {
+                continue;
+            }
+            if (key === 'styles') {
+                plugins.push(styles({
+                    mode: ['inject', () => '']
+                }));
+                plugins.push(rollupStylesCSSImport(global.lvyConfig.build[key]));
+            }
+            else if (key === 'commonjs' && !global.lvyConfig.build['@rollup/plugin-commonjs']) {
+                plugins.push(commonjs(global.lvyConfig.build[key]));
+            }
+            else if (key === 'json' && !global.lvyConfig.build['@rollup/plugin-json']) {
+                plugins.push(json(global.lvyConfig.build[key]));
+            }
+            else if (key === 'typescript' && !global.lvyConfig.build['@rollup/plugin-typescript']) {
+                plugins.push(typescript(global.lvyConfig.build[key]));
+            }
+            else if (key === 'plugins') {
+                if (Array.isArray(global.lvyConfig.build[key])) {
+                    for (const plugin of global.lvyConfig.build[key]) {
+                        plugins.push(plugin);
+                    }
+                }
+            }
+            else {
+                const plugin = (await import(key)).default;
+                plugins.push(plugin(global.lvyConfig.build[key]));
+            }
         }
-        else if (key === 'plugins') {
-            plugins.push(alias());
+        // 如果不存在这些配置
+        const keys = ['styles', 'commonjs', 'json', 'typescript'];
+        for (const key of keys) {
+            // 如果是布尔值
+            if (typeof global.lvyConfig.build[key] == 'boolean') {
+                continue;
+            }
+            // 存在这些配置
+            if (global.lvyConfig.build[key]) {
+                continue;
+            }
+            //
+            if (key == 'styles') {
+                plugins.push(styles({
+                    mode: ['inject', () => '']
+                }));
+                plugins.push(rollupStylesCSSImport());
+            }
+            else if (key === 'commonjs') {
+                plugins.push(commonjs());
+            }
+            else if (key === 'json') {
+                plugins.push(json());
+            }
+            else if (key === 'typescript') {
+                plugins.push(typescript());
+            }
         }
     }
     // rollup 配置
-    const Options = global.lvyConfig.build?.rollupOptions ?? {};
-    // rollup 配置
-    const rollupOptions = {
-        input: inputs,
-        plugins: plugins,
-        onwarn: onwarn,
-        ...Options
-    };
+    const rollupOptions = global.lvyConfig?.rollupOptions ?? {};
+    const rollupPlugins = global.lvyConfig?.rollupPlugins ?? [];
     // build
-    const bundle = await rollup(rollupOptions);
+    const bundle = await rollup({
+        input: inputs,
+        plugins: [...plugins, ...rollupPlugins],
+        onwarn: onwarn
+    });
     // 写入输出文件
     await bundle.write({
         dir: output,
         format: 'es',
         sourcemap: false,
-        preserveModules: true
+        preserveModules: true,
+        ...rollupOptions
     });
 };
 /**

package/lib/loader/esbuild.js

@@ -1,14 +1,14 @@
 import esbuild from 'esbuild';
-import { esBuildAsstes, esBuildCSS } from './plugins.js';
+import { esBuildAlias, esBuildAsstes, esBuildCSS } from './plugins.js';
 
 // 插件
 const plugins = [];
 /**
  *
  */
-const initPlugins = async () => {
-    if (typeof global.lvyConfig?.esbuild?.assets != 'boolean') {
-        plugins.push(esBuildAsstes(global.lvyConfig.esbuild.assets));
+const initPlugins = () => {
+    if (typeof global.lvyConfig?.assets != 'boolean') {
+        plugins.push(esBuildAsstes(global.lvyConfig.assets));
     }
     if (typeof global.lvyConfig?.esbuild?.styles != 'boolean') {
         plugins.push(esBuildCSS(global.lvyConfig.esbuild.styles));
@@ -25,13 +25,16 @@ const ESBuild = async (input) => {
         global.lvyConfig = {};
     if (!global.lvyConfig.esbuild)
         global.lvyConfig.esbuild = {};
+    // alias
+    if (global.lvyConfig.alias)
+        esBuildAlias(global.lvyConfig.alias);
     // 没有插件时，检查是否有可用插件。
     if (plugins.length === 0) {
         // init plugisn
         await initPlugins();
     }
     //
-    const options = global.lvyConfig.esbuild?.options || {};
+    const options = global.lvyConfig?.esBuildOptions || {};
     // 构建
     const result = await esbuild.build({
         // 入口文件

package/lib/loader/plugins.d.ts

@@ -1,10 +1,6 @@
-type ESBuildAsstesOptions = {
-    filter?: RegExp;
-    namespace?: string;
-};
 type ESBuildCSSOptions = {
     filter?: RegExp;
     namespace?: string;
 };
 
-export type { ESBuildAsstesOptions, ESBuildCSSOptions };
+export type { ESBuildCSSOptions };

package/lib/loader/plugins.js

@@ -1,32 +1,9 @@
 import { resolve, relative, dirname, join } from 'path';
-import { existsSync, readFileSync } from 'fs';
 import { spawn } from 'child_process';
 import crypto from 'node:crypto';
-import JSON5 from 'json5';
 
-let tsconfig = null;
-let aliases = {};
 const assetsReg = /\.(png|jpg|jpeg|gif|svg|webp|ico)$/;
 const cssReg = /\.(css|scss)$/;
-// 初始化函数，读取并解析 tsconfig.json 文件
-const init = () => {
-    try {
-        const tsconfigPath = resolve(process.cwd(), 'tsconfig.json');
-        if (existsSync(tsconfigPath)) {
-            const tsconfigContent = readFileSync(tsconfigPath, 'utf-8');
-            tsconfig = JSON5.parse(tsconfigContent);
-            aliases = tsconfig.compilerOptions?.paths || {};
-        }
-        else {
-            tsconfig = 'error';
-        }
-    }
-    catch {
-        tsconfig = 'error';
-    }
-};
-// 初始化配置
-init();
 /**
  *
  * @param input
@@ -79,13 +56,25 @@ const getHash = (str) => {
     hash.update(str);
     return hash.digest('hex');
 };
+let entries = null;
+const esBuildAlias = (alias) => {
+    if (!entries) {
+        entries = alias?.entries ?? [];
+    }
+};
 const handleAsstesFile = (url) => {
-    for (const alias in aliases) {
-        const aliasPattern = alias.replace('/*', '');
-        if (url.startsWith(aliasPattern)) {
-            const aliasPaths = aliases[alias];
-            for (const aliasPath of aliasPaths) {
-                const fileUrl = join(process.cwd(), aliasPath.replace('/*', ''), url.replace(aliasPattern, ''));
+    for (const { find, replacement } of entries) {
+        if (typeof find === 'string') {
+            // 使用 startsWith 处理字符串类型
+            if (url.startsWith(find)) {
+                const fileUrl = join(replacement, url.replace(find, ''));
+                return `export default "${convertPath(fileUrl)}";`;
+            }
+        }
+        else if (find instanceof RegExp) {
+            // 使用 test 方法处理正则表达式类型
+            if (find.test(url)) {
+                const fileUrl = join(replacement, url.replace(find, ''));
                 return `export default "${convertPath(fileUrl)}";`;
             }
         }
@@ -109,15 +98,22 @@ const handleCSS = (fileUrl) => {
 /**
  * 处理路径别名的加载
  * @param {string} url URL
- * @returns {object|null} 加载结果
+ * @returns {string|null} 加载结果
  */
 const handleCSSPath = (url) => {
-    for (const alias in aliases) {
-        const aliasPattern = alias.replace('/*', '');
-        if (url.startsWith(aliasPattern)) {
-            const aliasPaths = aliases[alias];
-            for (const aliasPath of aliasPaths) {
-                const fileUrl = join(process.cwd(), aliasPath.replace('/*', ''), url.replace(aliasPattern, ''));
+    for (const { find, replacement } of entries) {
+        if (typeof find === 'string') {
+            // 使用 startsWith 处理字符串类型
+            if (url.startsWith(find)) {
+                const fileUrl = join(replacement, url.replace(find, ''));
+                const outputDir = handleCSS(fileUrl);
+                return `export default "${convertPath(outputDir)}";`;
+            }
+        }
+        else if (find instanceof RegExp) {
+            // 使用 test 方法处理正则表达式类型
+            if (find.test(url)) {
+                const fileUrl = join(replacement, url.replace(find, ''));
                 const outputDir = handleCSS(fileUrl);
                 return `export default "${convertPath(outputDir)}";`;
             }
@@ -132,7 +128,7 @@ const handleCSSPath = (url) => {
 const esBuildAsstes = (optoins = {}) => {
     // 默认配置
     const filter = optoins?.filter ?? assetsReg;
-    const namespace = optoins?.namespace ?? 'assets';
+    const namespace = 'assets';
     // 返回插件
     return {
         name: 'assets-loader',
@@ -215,4 +211,4 @@ const esBuildCSS = (optoins = {}) => {
     };
 };
 
-export { esBuildAsstes, esBuildCSS };
+export { esBuildAlias, esBuildAsstes, esBuildCSS };

package/lib/loader/store.d.ts

@@ -1,13 +1,13 @@
 import { RollupAliasOptions } from '@rollup/plugin-alias';
-import { RollupOptions } from 'rollup';
 import { RollupStylesCSSImportOptions } from '../plugins/loader-css.js';
 import { RollupCommonJSOptions } from '@rollup/plugin-commonjs';
 import { RollupJsonOptions } from '@rollup/plugin-json';
 import { RollupTypescriptOptions } from '@rollup/plugin-typescript';
 import { SameShape, BuildOptions } from 'esbuild';
-import { RollupAssetsOptions } from '../plugins/loader-files.js';
-import { ESBuildAsstesOptions, ESBuildCSSOptions } from './plugins.js';
+import { ESBuildCSSOptions } from './plugins.js';
+import { RollupBuild } from 'rollup';
 
+type RollupBuildOptions = Parameters<RollupBuild['write']>['0'];
 type Options = {
     /**
      * 配置调整机及其回调插件
@@ -28,37 +28,45 @@ type Options = {
          */
         useApp?: () => void;
     }[];
+    /**
+     * 别名
+     */
+    alias?: {
+        entries?: RollupAliasOptions['entries'];
+    };
+    /**
+     * 静态资源识别
+     */
+    assets?: {
+        filter?: RegExp;
+    };
+    /**
+     *
+     */
+    esBuildOptions?: SameShape<BuildOptions, BuildOptions>;
     /**
      * 运行时配置
      */
     esbuild?: {
         [key: string]: any;
-        /**
-         * 资源
-         */
-        assets?: ESBuildAsstesOptions | false;
         /**
          * 样式处理
          */
         styles?: ESBuildCSSOptions | false;
-        /**
-         * ⚠️ 直接覆盖esbuild配置
-         */
-        options?: SameShape<BuildOptions, BuildOptions>;
     };
+    /**
+     * ⚠️ RollupBuild['write'] 配置
+     */
+    rollupOptions?: RollupBuildOptions;
+    /**
+     *使用插件
+     */
+    rollupPlugins?: any[];
     /**
      * 打包时配置
      */
     build?: {
         [key: string]: any;
-        /**
-         * 别名
-         */
-        alias?: RollupAliasOptions | false;
-        /**
-         * 文件过滤
-         */
-        assets?: RollupAssetsOptions | false;
         /**
          * 样式处理配置
          */
@@ -75,17 +83,7 @@ type Options = {
          * ts配置
          */
         typescript?: RollupTypescriptOptions | false;
-        /**
-         *
-         */
-        plugins?: any[];
-        /**
-         * ⚠️ 直接覆盖build配置
-         */
-        rollupOptions?: {
-            input?: string | string[];
-        } & RollupOptions;
-    };
+    } | false;
 };
 /**
  *

package/lib/loader/store.js

@@ -28,5 +28,10 @@ const initConfig = async () => {
         }
     }
 };
+/**
+ * @param param0
+ * @returns
+ */
+const defineConfig = (optoins) => optoins;
 
-export { initConfig };
+export { defineConfig, initConfig };

package/lib/main.js

@@ -1,3 +1,3 @@
-import { register } from 'node:module'
+import { register } from 'node:module';
 
-register('./loader.js', import.meta.url)
+register('./loader.js', import.meta.url);

package/lib/plugins/loader-css.d.ts

@@ -1,12 +1,5 @@
-import { InputPluginOption } from 'rollup';
-
 type RollupStylesCSSImportOptions = {
     include?: RegExp;
 };
-/**
- *
- * @returns
- */
-declare const rollupStylesCSSImport: ({ include }?: RollupStylesCSSImportOptions) => InputPluginOption;
 
-export { type RollupStylesCSSImportOptions, rollupStylesCSSImport };
+export type { RollupStylesCSSImportOptions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lvyjs",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "tsx compile script",
   "author": "lemonade",
   "license": "MIT",