lvyjs 0.2.6 → 0.2.7

package/bin/index.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+
 import { fork } from 'child_process'
 import { join, dirname, relative } from 'path'
 import { fileURLToPath } from 'node:url'
@@ -7,10 +8,8 @@ const args = [...process.argv.slice(2)]
 const currentFilePath = fileURLToPath(import.meta.url)
 const currentDirPath = dirname(currentFilePath)
 const pkgFilr = join(currentDirPath, '../package.json')
-
 const jsFile = join(currentDirPath, '../lib/index.js')
 const jsdir = relative(process.cwd(), jsFile)
-
 let tsxDir = join(currentDirPath, '../../tsx/dist/cli.mjs')
 if (!existsSync(tsxDir)) {
   tsxDir = join(currentDirPath, '../node_modules/tsx/dist/cli.mjs')
@@ -18,8 +17,10 @@ if (!existsSync(tsxDir)) {
 if (!existsSync(tsxDir)) {
   tsxDir = join(process.cwd(), 'node_modules/tsx/dist/cli.mjs')
 }
+if (!existsSync(tsxDir)) {
+  new Error('无法搜寻tsx')
+}
 
-// 启动模式
 if (args.includes('build')) {
   const argsx = args.filter(arg => arg !== 'build')
   const msg = fork(tsxDir, [jsdir, '--lvy-build', ...argsx], {

package/lib/config.js

@@ -1,4 +1,17 @@
 const assetsReg = /\.(png|jpg|jpeg|gif|svg|webp|ico)$/;
 const cssReg = /\.(css|scss|less|sass|less)$/;
+/**
+ *
+ * @param val
+ * @returns
+ */
+const createAlias = val => {
+    const alias = {};
+    // 遍历 entries 数组
+    val.entries.forEach(entry => {
+        alias[entry.find] = entry.replacement;
+    });
+    return alias;
+};
 
-export { assetsReg, cssReg };
+export { assetsReg, createAlias, cssReg };

package/lib/content.js

@@ -0,0 +1,52 @@
+import { join } from 'path';
+import crypto from 'node:crypto';
+
+/**
+ * @param inputPath
+ * @returns
+ */
+const convertPath = (inputPath) => {
+    return ['win32'].includes(process.platform) ? inputPath : inputPath.replace(/\\/g, '/');
+};
+/**
+ * 生成模块内容
+ * @param {string} relativePath 相对路径
+ */
+const generateModuleContent = (relativePath) => {
+    const contents = [
+        `const reg = ['win32'].includes(process.platform) ? /^file:\\/\\/\\// : /^file:\\/\\// ;`,
+        `const fileUrl = import.meta.resolve('${convertPath(relativePath)}').replace(reg, '');`,
+        'export default fileUrl;'
+    ].join('\n');
+    return contents;
+};
+const getRandomName = (str) => {
+    // 使用 MD5 算法创建哈希对象
+    const hash = crypto.createHash('md5');
+    // 更新哈希对象内容
+    hash.update(str);
+    return hash.digest('hex');
+};
+const chache = {};
+/**
+ *
+ * @param fileUrl
+ * @returns
+ */
+const generateCSSModuleContent = (pathURL) => {
+    const fileName = getRandomName(pathURL);
+    const outputFileURL = convertPath(join(process.cwd(), 'node_modules', 'lvyjs', 'assets', `${fileName}.css`));
+    if (!chache[pathURL]) {
+        global.lvyWorkerProt.postMessage({
+            type: 'CSS_MODULE_GENERATED',
+            payload: {
+                from: pathURL,
+                to: outputFileURL
+            }
+        });
+        chache[pathURL] = true;
+    }
+    return `export default "${outputFileURL}";`;
+};
+
+export { generateCSSModuleContent, generateModuleContent };

package/lib/esbuild/utils/content.js

@@ -6,7 +6,7 @@ import crypto from 'node:crypto';
  * @returns
  */
 const convertPath = (inputPath) => {
-    return process.platform === 'win32' ? inputPath.replace(/\\/g, '/') : inputPath;
+    return ['win32'].includes(process.platform) ? inputPath : inputPath.replace(/\\/g, '/');
 };
 /**
  * 生成模块内容
@@ -14,13 +14,8 @@ const convertPath = (inputPath) => {
  */
 const generateModuleContent = (relativePath) => {
     const contents = [
-        'const createUrl = (basePath, path) => {',
-        "const platform = ['linux', 'android', 'darwin'];",
-        'const T = platform.includes(process.platform);',
-        'const reg = T ? /^file:\\/\\// : /^file:\\/\\/\\//;',
-        "return new URL(path, basePath).href.replace(reg, '');",
-        '};',
-        `const fileUrl = createUrl(import.meta.url, '${convertPath(relativePath)}');`,
+        `const reg = ['win32'].includes(process.platform) ? /^file:\\/\\/\\// : /^file:\\/\\// ;`,
+        `const fileUrl = import.meta.resolve('${convertPath(relativePath)}').replace(reg, '');`,
         'export default fileUrl;'
     ].join('\n');
     return contents;

package/lib/index.d.ts

@@ -1,3 +1,2 @@
 export { Options, defineConfig, getOptions, initConfig, usePlugin } from './store.js';
 export { buildAndRun, buildJS } from './rullup/index.js';
-export { ESBuild } from './esbuild/index.js';

package/lib/index.js

@@ -2,7 +2,6 @@ import { buildAndRun } from './rullup/index.js';
 export { buildJS } from './rullup/index.js';
 import { initConfig } from './store.js';
 export { defineConfig, getOptions, usePlugin } from './store.js';
-export { ESBuild } from './esbuild/index.js';
 
 /**
  * @param input

package/lib/loader.d.ts

@@ -3,16 +3,27 @@ import { MessagePort } from 'worker_threads';
 declare global {
     var lvyWorkerProt: MessagePort;
 }
+/**
+ *
+ * @param param0
+ */
 declare function initialize({ port, lvyConfig }: {
     port: any;
     lvyConfig: any;
 }): Promise<void>;
+/**
+ * @param specifier
+ * @param context
+ * @param nextResolve
+ * @returns
+ */
+declare function resolve(specifier: any, context: any, nextResolve: any): Promise<any>;
 /**
  * @param url
  * @param context
  * @param defaultLoad
  * @returns
  */
-declare const load: (url: any, context: any, defaultLoad: any) => Promise<any>;
+declare const load: (url: any, context: any, nextLoad: any) => any;
 
-export { initialize, load };
+export { initialize, load, resolve };

package/lib/loader.js

@@ -1,31 +1,75 @@
-import { ESBuild } from './esbuild/index.js';
+import { generateModuleContent, generateCSSModuleContent } from './content.js';
 
 const platform = ['win32'].includes(process.platform);
 const reg = platform ? /^file:\/\/\// : /^file:\/\//;
 const nodeReg = /(node_modules|node_|node:)/;
-const jsReg = /\.(js|ts|jsx|tsx)$/;
+/**
+ *
+ * @param param0
+ */
 async function initialize({ port, lvyConfig }) {
     global.lvyConfig = lvyConfig;
     global.lvyWorkerProt = port;
 }
+/**
+ * @param specifier
+ * @param context
+ * @param nextResolve
+ * @returns
+ */
+async function resolve(specifier, context, nextResolve) {
+    const { parentURL = null } = context;
+    if (!global.lvyConfig?.alias) {
+        global.lvyConfig.alias = {};
+    }
+    if (global.lvyConfig.alias?.entries) {
+        for (const { find, replacement } of global.lvyConfig.alias?.entries) {
+            if (specifier.startsWith(find)) {
+                const url = specifier.replace(find, replacement);
+                return nextResolve(specifier, {
+                    ...context,
+                    parentURL: parentURL ? new URL(url, parentURL).href : new URL(url).href
+                });
+            }
+        }
+    }
+    return nextResolve(specifier, context);
+}
 /**
  * @param url
  * @param context
  * @param defaultLoad
  * @returns
  */
-const load = async (url, context, defaultLoad) => {
+const load = (url, context, nextLoad) => {
     if (nodeReg.test(url)) {
-        return defaultLoad(url, context);
+        return nextLoad(url, context);
+    }
+    const urls = url.split('?');
+    const baseURL = urls[0];
+    // 得到静态资源。转为普通的文件引用。
+    if (!global.lvyConfig.assets) {
+        global.lvyConfig.assets = {};
+    }
+    // 匹配静态资源
+    if (global.lvyConfig.assets?.filter && global.lvyConfig.assets?.filter.test(baseURL)) {
+        const code = generateModuleContent(baseURL.replace(reg, ''));
+        return nextLoad(baseURL, {
+            format: 'module',
+            source: code
+        });
+    }
+    if (!global.lvyConfig.styles) {
+        global.lvyConfig.styles = {};
     }
-    if (!jsReg.test(url)) {
-        return defaultLoad(url, context);
+    if (global.lvyConfig.styles?.filter && global.lvyConfig.styles?.filter.test(baseURL)) {
+        const code = generateCSSModuleContent(baseURL.replace(reg, ''));
+        return nextLoad(baseURL, {
+            format: 'module',
+            source: code
+        });
     }
-    const code = await ESBuild(url.replace(reg, ''));
-    return defaultLoad(url, {
-        format: 'module',
-        source: code
-    });
+    return nextLoad(url, context);
 };
 
-export { initialize, load };
+export { initialize, load, resolve };

package/lib/main.js

@@ -15,7 +15,6 @@ port1.on('message', msg => {
             cache[from] = true;
         }
     }
-    else if (msg.type == 'JS_MODULE_GENERATED') ;
 });
 // port1.unref()
 module.register('./loader.js', {

package/lib/postcss.js

@@ -10,6 +10,12 @@ const config = {
     less: null,
     scss: null
 };
+/**
+ *
+ * @param configPath
+ * @param typing
+ * @returns
+ */
 const loadPostcssConfig = (configPath, typing) => {
     if (config[typing]) {
         return {
@@ -100,21 +106,24 @@ const loadPostcssConfig = (configPath, typing) => {
         plugins: config[typing]
     };
 };
+/**
+ *
+ * @param inputPath
+ * @param outputPath
+ * @returns
+ */
 const postCSS = (inputPath, outputPath) => {
     const configPath = join(process.cwd(), 'postcss.config.cjs');
     let typing = 'css';
     let parser = undefined;
     if (/\.sass$/.test(inputPath)) {
         typing = 'sass';
-        // parser = require('postcss-sass')
     }
     else if (/\.less$/.test(inputPath)) {
         typing = 'less';
-        // parser = require('postcss-less')
     }
     else if (/\.scss$/.test(inputPath)) {
         typing = 'scss';
-        // parser = require('postcss-scss')
     }
     const postcssConfig = loadPostcssConfig(configPath, 'css');
     if (!postcssConfig)

package/lib/rullup/index.js

@@ -8,6 +8,7 @@ import { getScriptFiles } from './utils/files.js';
 import alias from '@rollup/plugin-alias';
 import { rollupStylesCSSImport } from './plugins/loader-css.js';
 import { rollupAssets } from './plugins/loader-files.js';
+import { createAlias } from '../config.js';
 
 /**
  * 用于忽略警告
@@ -44,16 +45,8 @@ const buildJS = async (inputs) => {
     if (typeof global.lvyConfig?.styles !== 'boolean') {
         if (!global.lvyConfig.alias)
             global.lvyConfig.alias = {};
-        const newAlias = val => {
-            const alias = {};
-            // 遍历 entries 数组
-            val.entries.forEach(entry => {
-                alias[entry.find] = entry.replacement;
-            });
-            return alias;
-        };
         plugins.push(styles({
-            alias: newAlias(global.lvyConfig?.alias),
+            alias: createAlias(global.lvyConfig?.alias),
             mode: ['inject', () => '']
         }));
         plugins.push(rollupStylesCSSImport(global.lvyConfig.styles));
@@ -99,14 +92,16 @@ const buildJS = async (inputs) => {
         }
     }
     const RollupOptions = global.lvyConfig?.build?.RollupOptions ?? {};
-    const OutputOptions = global.lvyConfig?.build?.OutputOptions ?? [];
+    const plg = await RollupOptions?.plugins;
+    const pl = plg && typeof plg != 'boolean' ? plg : [];
     // build
     const bundle = await rollup({
         input: inputs,
-        plugins: [...plugins],
         onwarn: onwarn,
-        ...RollupOptions
+        ...RollupOptions,
+        plugins: Array.isArray(pl) ? [...plugins, ...pl] : pl
     });
+    const OutputOptions = global.lvyConfig?.build?.OutputOptions ?? [];
     // 写入输出文件
     await bundle.write({
         dir: 'lib',

package/lib/rullup/plugins/loader-css.js

@@ -43,15 +43,11 @@ const rollupStylesCSSImport = (options) => {
                 // 内容
                 source: csscode
             });
-            const contents = `
-      const createUrl = () => {
-        const platform = ['linux', 'android', 'darwin'];
-        const T = platform.includes(process.platform);
-        const reg = T ?  /^file:\\/\\// : /^file:\\/\\/\\//
-        return import.meta.ROLLUP_FILE_URL_${refeId}.replace(reg, '') 
-      };
-      export default createUrl();
-    `;
+            const contents = [
+                `const reg = ['win32'].includes(process.platform) ? /^file:\\/\\/\\// : /^file:\\/\\// ;`,
+                `const fileUrl = import.meta.ROLLUP_FILE_URL_${refeId}.replace(reg, '');`,
+                'export default fileUrl;'
+            ].join('\n');
             return contents;
         }
     };

package/lib/rullup/plugins/loader-files.js

@@ -22,16 +22,12 @@ const rollupAssets = (options) => {
                     name: basename(id),
                     source: readFileSync(id)
                 });
-                const content = [
-                    'const createUrl = () => {',
-                    "const platform = ['linux', 'android', 'darwin'];",
-                    'const T = platform.includes(process.platform);',
-                    'const reg = T ?  /^file:\\/\\// : /^file:\\/\\/\\//',
-                    'return import.meta.ROLLUP_FILE_URL_' + referenceId + ".replace(reg, '')",
-                    '};',
-                    'export default createUrl();'
+                const contents = [
+                    `const reg = ['win32'].includes(process.platform) ? /^file:\\/\\/\\// : /^file:\\/\\// ;`,
+                    `const fileUrl = import.meta.ROLLUP_FILE_URL_${referenceId}.replace(reg, '');`,
+                    'export default fileUrl;'
                 ].join('\n');
-                return content;
+                return contents;
             }
         }
     };

package/lib/server.js

@@ -0,0 +1,11 @@
+import Koa from 'koa';
+import KoaStatic from 'koa-static';
+
+const app = new Koa();
+// 使用 koa-static 中间件来提供静态文件
+app.use(KoaStatic(process.cwd()));
+// 设定端口并启动服务器
+const PORT = 8989;
+app.listen(8989, () => {
+    console.log(`Server running at http://localhost:${PORT}`);
+});

package/lib/store.d.ts

@@ -1,12 +1,8 @@
 import { RollupCommonJSOptions } from '@rollup/plugin-commonjs';
 import { RollupTypescriptOptions } from '@rollup/plugin-typescript';
-import { SameShape, BuildOptions } from 'esbuild';
 import { RollupOptions, OutputOptions } from 'rollup';
+import { Alias } from './typing.js';
 
-interface Alias {
-    find: string | RegExp;
-    replacement: string;
-}
 type Options = {
     /**
      * 配置调整机及其回调插件
@@ -36,15 +32,6 @@ type Options = {
          */
         filter?: RegExp;
     } | false;
-    /**
-     * 运行时配置
-     */
-    esbuild?: {
-        /**
-         *
-         */
-        options?: SameShape<BuildOptions, BuildOptions>;
-    };
     /**
      * 打包时配置
      */

package/lib/typing.d.ts

@@ -0,0 +1,6 @@
+interface Alias {
+    find: string;
+    replacement: string;
+}
+
+export type { Alias };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lvyjs",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "tsx compile script",
   "author": "lemonade",
   "license": "MIT",
@@ -13,14 +13,12 @@
     "@rollup/plugin-typescript": "^11.1.6",
     "@rollup/pluginutils": "^5.1.3",
     "autoprefixer": "^10.4.20",
-    "esbuild": "^0.24.0",
     "postcss": "^8.4.47",
     "postcss-import": "^16.1.0",
     "postcss-url": "^10.1.3",
     "rollup": "^4.18.1",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-styles": "^4.0.0",
-    "tailwindcss": "^3.4.3",
     "tsx": "^4.19.1",
     "typescript": "^5.5.3"
   },

package/lib/esbuild/config.js

@@ -1,4 +0,0 @@
-const assetsReg = /\.(png|jpg|jpeg|gif|svg|webp|ico)$/
-const cssReg = /\.(css|scss|less|sass|less)$/
-
-export { assetsReg, cssReg }

package/lib/esbuild/index.d.ts

@@ -1,8 +0,0 @@
-/**
- *
- * @param input
- * @returns
- */
-declare const ESBuild: (input: string) => Promise<string>;
-
-export { ESBuild };

package/lib/esbuild/index.js

@@ -1,64 +0,0 @@
-import esbuild from 'esbuild';
-import { esBuildCSS } from './plugins/css.js';
-import { esBuildAlias } from './plugins/alias.js';
-import { esBuildAsstes } from './plugins/Asstes.js';
-
-// 插件
-const plugins = [];
-/**
- *
- */
-const initPlugins = () => {
-    if (typeof global.lvyConfig?.alias != 'boolean') {
-        plugins.push(esBuildAlias(global.lvyConfig.alias));
-    }
-    if (typeof global.lvyConfig?.assets != 'boolean') {
-        plugins.push(esBuildAsstes(global.lvyConfig.assets));
-    }
-    if (typeof global.lvyConfig?.styles != 'boolean') {
-        plugins.push(esBuildCSS(global.lvyConfig?.styles ?? {}));
-    }
-};
-/**
- *
- * @param input
- * @returns
- */
-const ESBuild = async (input) => {
-    // 如果没有配置
-    if (!global.lvyConfig)
-        global.lvyConfig = {};
-    if (!global.lvyConfig.esbuild)
-        global.lvyConfig.esbuild = {};
-    // 没有插件时，检查是否有可用插件。
-    if (plugins.length === 0) {
-        // init plugisn
-        await initPlugins();
-    }
-    const options = global.lvyConfig?.esbuild?.options ?? {};
-    const pl = options?.plugins ?? [];
-    // 构建
-    const result = await esbuild.build({
-        // 入口文件
-        entryPoints: [input],
-        //
-        bundle: true,
-        // 平台
-        platform: 'node',
-        // 输出格式
-        format: 'esm',
-        // 不写入文件
-        write: false,
-        // 忽略所有外部依赖
-        external: ['*'],
-        ...options,
-        plugins: [...plugins, ...pl]
-    });
-    if (!result.outputFiles) {
-        return '';
-    }
-    // 返回结果
-    return result.outputFiles.map(file => new TextDecoder().decode(file.contents)).join('\n');
-};
-
-export { ESBuild };

package/lib/esbuild/plugins/Asstes.js

@@ -1,26 +0,0 @@
-import { assetsReg } from '../../config.js';
-import { generateModuleContent } from '../utils/content.js';
-
-/**
- *
- * @param param0
- */
-const esBuildAsstes = (optoins) => {
-    // 默认配置
-    const filter = optoins?.filter ?? assetsReg;
-    // 返回插件
-    return {
-        name: 'assets',
-        setup(build) {
-            build.onLoad({ filter }, args => {
-                const content = generateModuleContent(args.path);
-                return {
-                    contents: content,
-                    loader: 'js'
-                };
-            });
-        }
-    };
-};
-
-export { esBuildAsstes };

package/lib/esbuild/plugins/alias.js

@@ -1,44 +0,0 @@
-import { assetsReg, cssReg } from '../../config.js';
-import { resolve } from 'path';
-
-/**
- * esbuild alias 插件
- * @param alias 配置对象
- * @returns 插件
- */
-const esBuildAlias = (alias) => {
-    const entries = alias?.entries;
-    let assets = null;
-    if (typeof global.lvyConfig?.assets != 'boolean') {
-        assets = global.lvyConfig?.assets?.filter ?? assetsReg;
-    }
-    let styles = null;
-    if (typeof global.lvyConfig?.styles != 'boolean') {
-        styles = global.lvyConfig?.styles?.filter ?? cssReg;
-    }
-    return {
-        name: 'alias',
-        setup(build) {
-            if (entries) {
-                build.onResolve({ filter: /.*/ }, args => {
-                    const url = args.path;
-                    const resolveDir = args.resolveDir;
-                    if (assets?.test(url) || styles?.test(url)) {
-                        for (const { find, replacement } of entries) {
-                            if ((find instanceof RegExp && find.test(url)) ||
-                                (typeof find === 'string' && url.startsWith(find))) {
-                                let resolvedPath = url.replace(find, replacement);
-                                return { path: resolvedPath };
-                            }
-                        }
-                        return {
-                            path: resolve(resolveDir, url)
-                        };
-                    }
-                });
-            }
-        }
-    };
-};
-
-export { esBuildAlias };

package/lib/esbuild/plugins/css.js

@@ -1,27 +0,0 @@
-import { generateCSSModuleContent } from '../utils/content.js';
-import { cssReg } from '../../config.js';
-
-/**
- * css资源处理插件
- * @param param0
- * @returns
- */
-const esBuildCSS = (optoins) => {
-    const filter = optoins?.filter || cssReg;
-    // 返回插件
-    return {
-        name: 'css-loader',
-        setup(build) {
-            // 加载 CSS/SCSS 文件
-            build.onLoad({ filter }, args => {
-                const contents = generateCSSModuleContent(args.path);
-                return {
-                    contents: contents,
-                    loader: 'js'
-                };
-            });
-        }
-    };
-};
-
-export { esBuildCSS };

package/lib/rullup/plugins/config.js

@@ -1,4 +0,0 @@
-const assetsReg = /\.(png|jpg|jpeg|gif|svg|webp|ico)$/
-const cssReg = /\.(css|scss|less|sass|less)$/
-
-export { assetsReg, cssReg }