lvyjs 0.2.7 → 0.2.9

package/lib/config.d.ts

@@ -0,0 +1,12 @@
+declare const assetsRegExp: RegExp;
+declare const stylesRegExp: RegExp;
+/**
+ *
+ * @param val
+ * @returns
+ */
+declare const createAlias: (val: any) => {};
+declare const isWin32: () => boolean;
+declare const convertPath: (inputPath: string) => string;
+
+export { assetsRegExp, convertPath, createAlias, isWin32, stylesRegExp };

package/lib/config.js

@@ -1,5 +1,5 @@
-const assetsReg = /\.(png|jpg|jpeg|gif|svg|webp|ico)$/;
-const cssReg = /\.(css|scss|less|sass|less)$/;
+const assetsRegExp = /\.(png|jpg|jpeg|gif|svg|webp|ico)$/;
+const stylesRegExp = /\.(css|scss|less|sass|less)$/;
 /**
  *
  * @param val
@@ -13,5 +13,11 @@ const createAlias = val => {
     });
     return alias;
 };
+const isWin32 = () => {
+    return ['win32'].includes(process.platform);
+};
+const convertPath = (inputPath) => {
+    return isWin32() ? inputPath.replace(/\\/g, '/') : inputPath;
+};
 
-export { assetsReg, createAlias, cssReg };
+export { assetsRegExp, convertPath, createAlias, isWin32, stylesRegExp };

package/lib/content.js

@@ -1,13 +1,7 @@
 import { join } from 'path';
 import crypto from 'node:crypto';
+import { convertPath } from './config.js';
 
-/**
- * @param inputPath
- * @returns
- */
-const convertPath = (inputPath) => {
-    return ['win32'].includes(process.platform) ? inputPath : inputPath.replace(/\\/g, '/');
-};
 /**
  * 生成模块内容
  * @param {string} relativePath 相对路径

package/lib/index.d.ts

@@ -1,2 +1,3 @@
-export { Options, defineConfig, getOptions, initConfig, usePlugin } from './store.js';
+export { Options, PluginsCallBack, PluginsOptions, PluginsValue, defineConfig, getOptions, initConfig } from './store.js';
 export { buildAndRun, buildJS } from './rullup/index.js';
+export { assetsRegExp, convertPath, createAlias, isWin32, stylesRegExp } from './config.js';

package/lib/index.js

@@ -1,7 +1,8 @@
 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 { defineConfig, getOptions } from './store.js';
+export { assetsRegExp, convertPath, createAlias, isWin32, stylesRegExp } from './config.js';
 
 /**
  * @param input
@@ -14,7 +15,7 @@ const onDev = async () => {
             if (!plugin) {
                 continue;
             }
-            apps.push(plugin(global.lvyConfig));
+            await apps.push(plugin(global.lvyConfig));
         }
     }
     // 执行loader
@@ -24,17 +25,51 @@ const onDev = async () => {
         if (!app) {
             continue;
         }
-        if (typeof app == 'function')
-            app(global.lvyConfig);
+        if (typeof app == 'function') {
+            await app(global.lvyConfig);
+        }
+        else if (typeof app.load == 'function') {
+            app.load(global.lvyConfig);
+        }
+    }
+};
+/**
+ * @param input
+ */
+const onBuild = async () => {
+    const apps = [];
+    if (Array.isArray(global.lvyConfig?.plugins)) {
+        // 修改config
+        for (const plugin of global.lvyConfig.plugins) {
+            if (!plugin) {
+                continue;
+            }
+            await apps.push(plugin(global.lvyConfig));
+        }
+    }
+    // 执行loader
+    await import('./main.js');
+    //
+    for (const app of apps) {
+        if (!app) {
+            continue;
+        }
+        if (typeof app == 'function') {
+            await app(global.lvyConfig);
+        }
+        else if (typeof app.build == 'function') {
+            app.build(global.lvyConfig);
+        }
     }
 };
 const main = async () => {
     if (process.argv.includes('--lvy-dev')) {
         await initConfig();
-        onDev();
+        await onDev();
     }
     else if (process.argv.includes('--lvy-build')) {
         await initConfig();
+        await onBuild();
         buildAndRun();
     }
 };

package/lib/loader.d.ts

@@ -4,7 +4,6 @@ declare global {
     var lvyWorkerProt: MessagePort;
 }
 /**
- *
  * @param param0
  */
 declare function initialize({ port, lvyConfig }: {

package/lib/loader.js

@@ -1,10 +1,10 @@
 import { generateModuleContent, generateCSSModuleContent } from './content.js';
+import { isWin32, convertPath } from './config.js';
 
-const platform = ['win32'].includes(process.platform);
-const reg = platform ? /^file:\/\/\// : /^file:\/\//;
+const reg = isWin32() ? /^file:\/\/\// : /^file:\/\//;
+const baseURL = isWin32() ? 'file:///' : 'file://';
 const nodeReg = /(node_modules|node_|node:)/;
 /**
- *
  * @param param0
  */
 async function initialize({ port, lvyConfig }) {
@@ -18,17 +18,16 @@ async function initialize({ port, lvyConfig }) {
  * @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);
+                const parentURL = `${baseURL}${convertPath(specifier.replace(find, replacement))}`;
                 return nextResolve(specifier, {
                     ...context,
-                    parentURL: parentURL ? new URL(url, parentURL).href : new URL(url).href
+                    parentURL: parentURL
                 });
             }
         }

package/lib/postcss.js

@@ -1,7 +1,8 @@
 import fs from 'fs';
 import postcss from 'postcss';
 import { createRequire } from 'module';
-import { join, resolve, dirname } from 'path';
+import { join, resolve, dirname, isAbsolute } from 'path';
+import { createAlias } from './config.js';
 
 const require = createRequire(import.meta.url);
 const config = {
@@ -10,6 +11,27 @@ const config = {
     less: null,
     scss: null
 };
+function LessAliasPlugin(aliases) {
+    return {
+        install: function (less, pluginManager) {
+            const AliasFileManager = new less.FileManager();
+            AliasFileManager.loadFile = function (filename, currentDirectory, options, environment) {
+                // 替换路径中的别名
+                for (const alias in aliases) {
+                    if (filename.startsWith(alias)) {
+                        filename = filename.replace(alias, aliases[alias]);
+                        break;
+                    }
+                }
+                const fullPath = isAbsolute(filename) ? filename : resolve(currentDirectory, filename);
+                return less.FileManager.prototype.loadFile.call(this, fullPath, currentDirectory, options, environment);
+            };
+            // 注册自定义文件管理器
+            pluginManager.addFileManager(AliasFileManager);
+        },
+        minVersion: [3, 0] // 支持的最低 LESS 版本
+    };
+}
 /**
  *
  * @param configPath
@@ -132,7 +154,10 @@ const postCSS = (inputPath, outputPath) => {
         let css = '';
         if (typing === 'less') {
             const less = require('less');
-            const lessResult = await less.render(fs.readFileSync(inputPath, 'utf-8'));
+            const lessResult = await less.render(fs.readFileSync(inputPath, 'utf-8'), {
+                filename: inputPath,
+                plugins: [LessAliasPlugin(createAlias(global.lvyConfig?.alias))] // 使用插件
+            });
             css = lessResult.css;
         }
         else if (typing === 'sass' || typing === 'scss') {
@@ -174,4 +199,4 @@ const postCSS = (inputPath, outputPath) => {
     });
 };
 
-export { postCSS };
+export { LessAliasPlugin as default, postCSS };

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

@@ -1,13 +1,13 @@
 import { createFilter } from '@rollup/pluginutils';
 import { resolve, dirname, basename } from 'node:path';
-import { cssReg } from '../../config.js';
+import { stylesRegExp } from '../../config.js';
 
 /**
  *
  * @returns
  */
 const rollupStylesCSSImport = (options) => {
-    const include = options?.filter ?? cssReg;
+    const include = options?.filter ?? stylesRegExp;
     const filter = createFilter(include, null);
     return {
         name: 'c-css',

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

@@ -1,13 +1,13 @@
 import { resolve, dirname, basename } from 'path';
 import { readFileSync } from 'fs';
-import { assetsReg } from '../../config.js';
+import { assetsRegExp } from '../../config.js';
 
 /**
  * @param {Object} options
  * @returns {Object}
  */
 const rollupAssets = (options) => {
-    const { filter = assetsReg } = options ?? {};
+    const { filter = assetsRegExp } = options ?? {};
     return {
         name: 'rollup-node-files',
         resolveId(source, importer) {

package/lib/store.d.ts

@@ -3,11 +3,17 @@ import { RollupTypescriptOptions } from '@rollup/plugin-typescript';
 import { RollupOptions, OutputOptions } from 'rollup';
 import { Alias } from './typing.js';
 
+type PluginsValue = (options: Options) => void;
+type PluginsCallBack = PluginsValue | {
+    load?: PluginsValue;
+    build?: PluginsValue;
+};
+type PluginsOptions = ((options: Options) => PluginsCallBack | void);
 type Options = {
     /**
      * 配置调整机及其回调插件
      */
-    plugins?: ((options: Options) => ((options: Options) => void) | void | undefined | null)[];
+    plugins?: PluginsOptions[];
     /**
      * 别名
      */
@@ -59,12 +65,6 @@ type Options = {
         };
     } | false;
 };
-/**
- *
- * @param options
- * @returns
- */
-declare const usePlugin: (load: (options: Options) => ((options: Options) => void) | void | undefined | null) => (options: Options) => ((options: Options) => void) | void | undefined | null;
 /**
  *
  */
@@ -85,4 +85,4 @@ declare const getOptions: () => Options;
  */
 declare const defineConfig: (optoins?: Options) => Options | undefined;
 
-export { type Options, defineConfig, getOptions, initConfig, usePlugin };
+export { type Options, type PluginsCallBack, type PluginsOptions, type PluginsValue, defineConfig, getOptions, initConfig };

package/lib/store.js

@@ -1,12 +1,6 @@
 import { existsSync } from 'fs';
 import { join } from 'path';
 
-/**
- *
- * @param options
- * @returns
- */
-const usePlugin = (load) => load;
 /**
  *
  */
@@ -44,4 +38,4 @@ const getOptions = () => global.lvyConfig;
  */
 const defineConfig = (optoins) => optoins;
 
-export { defineConfig, getOptions, initConfig, usePlugin };
+export { defineConfig, getOptions, initConfig };

package/package.json

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

package/lib/esbuild/utils/content.js

@@ -1,52 +0,0 @@
-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/server.js

@@ -1,11 +0,0 @@
-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}`);
-});