lvyjs 0.2.0 → 0.2.1

package/lib/build/get-files.js

@@ -6,13 +6,13 @@ import { readdirSync } from 'fs';
  * @param dir 目录路径
  * @returns 文件路径数组
  */
-const getFiles = (dir) => {
+const getScriptFiles = (dir) => {
     const results = [];
     const list = readdirSync(dir, { withFileTypes: true });
     list.forEach(item => {
         const fullPath = join(dir, item.name);
         if (item.isDirectory()) {
-            results.push(...getFiles(fullPath));
+            results.push(...getScriptFiles(fullPath));
         }
         else if (item.isFile() &&
             /\.(ts|js|jsx|tsx)$/.test(item.name) &&
@@ -23,4 +23,4 @@ const getFiles = (dir) => {
     return results;
 };
 
-export { getFiles };
+export { getScriptFiles };

package/lib/build/rullup.js

@@ -4,7 +4,7 @@ import typescript from '@rollup/plugin-typescript';
 import commonjs from '@rollup/plugin-commonjs';
 import json from '@rollup/plugin-json';
 import styles from 'rollup-plugin-styles';
-import { getFiles } from './get-files.js';
+import { getScriptFiles } from './get-files.js';
 import alias from '@rollup/plugin-alias';
 import { rollupStylesCSSImport } from '../plugins/loader-css.js';
 import { rollupAssets } from '../plugins/loader-files.js';
@@ -28,14 +28,14 @@ const onwarn = (warning, warn) => {
  * @param inputs
  * @param output
  */
-const buildJS = async (inputs, output) => {
+const buildJS = async (inputs) => {
     if (!global.lvyConfig)
         global.lvyConfig = {};
     if (!global.lvyConfig.build)
         global.lvyConfig.build = {};
     // 插件
     const plugins = [];
-    if (global.lvyConfig.alias) {
+    if (global.lvyConfig?.alias) {
         plugins.push(alias(global.lvyConfig.alias));
     }
     if (global.lvyConfig.assets) {
@@ -117,10 +117,11 @@ const buildJS = async (inputs, output) => {
     });
     // 写入输出文件
     await bundle.write({
-        dir: output,
+        dir: 'lib',
         format: 'es',
         sourcemap: false,
         preserveModules: true,
+        assetFileNames: 'assets/[name]-[hash][extname]',
         ...rollupOptions
     });
 };
@@ -128,9 +129,15 @@ const buildJS = async (inputs, output) => {
  *
  * @param script
  */
-async function buildAndRun(input, output) {
-    const inputFiles = getFiles(join(process.cwd(), input));
-    await buildJS(inputFiles, output);
+async function buildAndRun() {
+    // rollup 配置
+    let inputDir = 'src';
+    if (global.lvyConfig?.rollupOptions?.input) {
+        inputDir = global.lvyConfig.rollupOptions.input;
+        delete global.lvyConfig.rollupOptions['input'];
+    }
+    const inputFiles = getScriptFiles(join(process.cwd(), inputDir));
+    await buildJS(inputFiles);
 }
 
 export { buildAndRun, buildJS };

package/lib/index.d.ts

@@ -1 +1 @@
-export { defineConfig, initConfig } from './loader/store.js';
+export { defineConfig, initConfig, usePlugin } from './loader/store.js';

package/lib/index.js

@@ -1,40 +1,32 @@
 import { buildAndRun } from './build/rullup.js';
 import { initConfig } from './loader/store.js';
-export { defineConfig } from './loader/store.js';
+export { defineConfig, usePlugin } from './loader/store.js';
 
 /**
  * @param input
  */
 const onDev = async () => {
-    // 修改config
-    for (const plugin of global.lvyConfig.plugins) {
-        if (plugin?.config) {
-            const cfg = await plugin.config(global.lvyConfig);
-            for (const key in cfg) {
-                // 不能覆盖plugins
-                if (cfg[key] != 'plugins') {
-                    // 覆盖
-                    global.lvyConfig[key] = cfg[key];
-                }
+    const apps = [];
+    if (Array.isArray(global.lvyConfig?.plugins)) {
+        // 修改config
+        for (const plugin of global.lvyConfig.plugins) {
+            if (!plugin) {
+                continue;
             }
+            apps.push(plugin(global.lvyConfig));
         }
     }
     // 执行loader
     await import('./main.js');
-    // 执行 useApp
-    for (const plugin of global.lvyConfig.plugins) {
-        if (plugin?.useApp)
-            await plugin.useApp();
+    //
+    for (const app of apps) {
+        if (!app) {
+            continue;
+        }
+        if (typeof app == 'function')
+            app(global.lvyConfig);
     }
 };
-/**
- *
- * @param input
- * @param ouput
- */
-const onBuild = () => {
-    buildAndRun('src', 'lib');
-};
 const main = async () => {
     if (process.argv.includes('--lvy-dev')) {
         await initConfig();
@@ -42,7 +34,7 @@ const main = async () => {
     }
     else if (process.argv.includes('--lvy-build')) {
         await initConfig();
-        onBuild();
+        buildAndRun();
     }
 };
 main();

package/lib/loader/config.js

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

package/lib/loader/esbuild.js

@@ -7,11 +7,11 @@ const plugins = [];
  *
  */
 const initPlugins = () => {
-    if (typeof global.lvyConfig?.assets != 'boolean') {
+    if (global.lvyConfig?.assets) {
         plugins.push(esBuildAsstes(global.lvyConfig.assets));
     }
     if (typeof global.lvyConfig?.esbuild?.styles != 'boolean') {
-        plugins.push(esBuildCSS(global.lvyConfig.esbuild.styles));
+        plugins.push(esBuildCSS(global.lvyConfig.esbuild?.styles));
     }
 };
 /**
@@ -52,6 +52,9 @@ const ESBuild = async (input) => {
         external: ['*'],
         ...options
     });
+    if (!result.outputFiles) {
+        return '';
+    }
     // 返回结果
     return result.outputFiles.map(file => new TextDecoder().decode(file.contents)).join('\n');
 };

package/lib/loader/plugins.js

@@ -1,9 +1,8 @@
 import { resolve, relative, dirname, join } from 'path';
 import { spawn } from 'child_process';
 import crypto from 'node:crypto';
+import { assetsReg, cssReg } from './config.js';
 
-const assetsReg = /\.(png|jpg|jpeg|gif|svg|webp|ico)$/;
-const cssReg = /\.(css|scss)$/;
 /**
  *
  * @param input
@@ -63,19 +62,21 @@ const esBuildAlias = (alias) => {
     }
 };
 const handleAsstesFile = (url) => {
-    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)}";`;
+    if (entries) {
+        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)}";`;
+            else if (find instanceof RegExp) {
+                // 使用 test 方法处理正则表达式类型
+                if (find.test(url)) {
+                    const fileUrl = join(replacement, url.replace(find, ''));
+                    return `export default "${convertPath(fileUrl)}";`;
+                }
             }
         }
     }
@@ -101,21 +102,23 @@ const handleCSS = (fileUrl) => {
  * @returns {string|null} 加载结果
  */
 const handleCSSPath = (url) => {
-    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)}";`;
+    if (entries) {
+        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)}";`;
+            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)}";`;
+                }
             }
         }
     }
@@ -125,7 +128,7 @@ const handleCSSPath = (url) => {
  *
  * @param param0
  */
-const esBuildAsstes = (optoins = {}) => {
+const esBuildAsstes = (optoins) => {
     // 默认配置
     const filter = optoins?.filter ?? assetsReg;
     const namespace = 'assets';
@@ -169,7 +172,7 @@ const esBuildAsstes = (optoins = {}) => {
  * @param param0
  * @returns
  */
-const esBuildCSS = (optoins = {}) => {
+const esBuildCSS = (optoins) => {
     const filter = optoins?.filter || cssReg;
     const namespace = optoins?.namespace || 'css';
     // 返回插件

package/lib/loader/store.d.ts

@@ -1,4 +1,4 @@
-import { RollupAliasOptions } from '@rollup/plugin-alias';
+import { Alias } from '@rollup/plugin-alias';
 import { RollupStylesCSSImportOptions } from '../plugins/loader-css.js';
 import { RollupCommonJSOptions } from '@rollup/plugin-commonjs';
 import { RollupJsonOptions } from '@rollup/plugin-json';
@@ -12,32 +12,23 @@ type Options = {
     /**
      * 配置调整机及其回调插件
      */
-    plugins?: {
-        /**
-         * 应用名
-         */
-        name: string;
-        /**
-         * ⚠️直接optoins进行调整
-         * @param options
-         * @returns
-         */
-        config?: (options: Options) => Options;
-        /**
-         * 执行
-         */
-        useApp?: () => void;
-    }[];
+    plugins?: ((options: Options) => ((options: Options) => void) | void | undefined | null)[];
     /**
      * 别名
      */
     alias?: {
-        entries?: RollupAliasOptions['entries'];
+        /**
+         * 别名规则
+         */
+        entries?: Alias[];
     };
     /**
      * 静态资源识别
      */
     assets?: {
+        /**
+         * 过滤得到指定格式的文件识别之为静态资源
+         */
         filter?: RegExp;
     };
     /**
@@ -57,7 +48,12 @@ type Options = {
     /**
      * ⚠️ RollupBuild['write'] 配置
      */
-    rollupOptions?: RollupBuildOptions;
+    rollupOptions?: RollupBuildOptions & {
+        /**
+         * 默认 src
+         */
+        input?: string;
+    };
     /**
      *使用插件
      */
@@ -85,6 +81,12 @@ type Options = {
         typescript?: RollupTypescriptOptions | false;
     } | false;
 };
+/**
+ *
+ * @param options
+ * @returns
+ */
+declare const usePlugin: (load: (options: Options) => ((options: Options) => void) | void | undefined | null) => (options: Options) => ((options: Options) => void) | void | undefined | null;
 /**
  *
  */
@@ -99,6 +101,6 @@ declare const initConfig: () => Promise<void>;
  * @param param0
  * @returns
  */
-declare const defineConfig: (optoins?: Options) => Options;
+declare const defineConfig: (optoins?: Options) => Options | undefined;
 
-export { type Options, defineConfig, initConfig };
+export { type Options, defineConfig, initConfig, usePlugin };

package/lib/loader/store.js

@@ -1,6 +1,12 @@
 import { existsSync } from 'fs';
 import { join } from 'path';
 
+/**
+ *
+ * @param options
+ * @returns
+ */
+const usePlugin = (load) => load;
 /**
  *
  */
@@ -34,4 +40,4 @@ const initConfig = async () => {
  */
 const defineConfig = (optoins) => optoins;
 
-export { defineConfig, initConfig };
+export { defineConfig, initConfig, usePlugin };

package/lib/plugins/config.js

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

package/lib/plugins/loader-css.js

@@ -1,16 +1,18 @@
 import { createFilter } from '@rollup/pluginutils';
 import { resolve, dirname, basename } from 'node:path';
+import { cssReg } from './config.js';
 
 /**
  *
  * @returns
  */
-const rollupStylesCSSImport = ({ include = /\.(css|scss)$/i } = {}) => {
+const rollupStylesCSSImport = (options) => {
+    const { include = cssReg } = options ?? {};
     const filter = createFilter(include, null);
     return {
         name: 'c-css',
         resolveId(source, importer) {
-            if (filter(source)) {
+            if (filter(source) && importer) {
                 return resolve(dirname(importer), source);
             }
         },

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

@@ -7,6 +7,6 @@ type RollupAssetsOptions = {
  * @param {Object} options
  * @returns {Object}
  */
-declare const rollupAssets: ({ filter }?: RollupAssetsOptions) => InputPluginOption;
+declare const rollupAssets: (options?: RollupAssetsOptions) => InputPluginOption;
 
 export { type RollupAssetsOptions, rollupAssets };

package/lib/plugins/loader-files.js

@@ -1,15 +1,17 @@
 import { resolve, dirname, basename } from 'path';
 import { readFileSync } from 'fs';
+import { assetsReg } from './config.js';
 
 /**
  * @param {Object} options
  * @returns {Object}
  */
-const rollupAssets = ({ filter = /\.(png|jpg|jpeg|gif|svg|webp|ico)$/ } = {}) => {
+const rollupAssets = (options) => {
+    const { filter = assetsReg } = options ?? {};
     return {
         name: 'rollup-node-files',
         resolveId(source, importer) {
-            if (filter.test(source)) {
+            if (filter.test(source) && importer) {
                 return resolve(dirname(importer), source);
             }
         },

package/package.json

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

package/tsconfig.json

@@ -1,25 +1,31 @@
 {
   "compilerOptions": {
-    // model
+    /* model */
     "target": "ESNext",
     "module": "ESNext",
-    "allowJs": false,
     "esModuleInterop": true,
+    /* json */
     "resolveJsonModule": true,
-    // jsx
+    /* Bundler mode */
     "jsx": "react",
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
+    "moduleDetection": "force",
     "noEmit": true,
-    // version
+    "skipLibCheck": true,
+    /* version */
     "ignoreDeprecations": "5.0",
-    // strict
+    /* strict */
+    "allowJs": false,
     "noImplicitAny": false,
     "useDefineForClassFields": true,
     "isolatedModules": true,
+    "forceConsistentCasingInFileNames": true,
+    /* Linting */
+    "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true,
-    "forceConsistentCasingInFileNames": true
+    "noUncheckedSideEffectImports": true
   }
 }