alemonjs 1.0.16 → 1.0.18

package/bin/build.js

@@ -1,100 +1,22 @@
 #!/usr/bin/env node
 
-import { existsSync, mkdirSync } from 'fs'
-import { execSync, exec, spawn } from 'child_process'
 import { compilationTools } from 'alemon-rollup'
-import { join } from 'path'
-
-/**
- * 执行指令
- * @param {*} cess
- * @param {*} cmd
- * @returns
- */
-async function command(cess, cmd) {
-  // 错误参数
-  if (!cmd) process.exit()
-  // 锁定位置
-  const dirPath = `./`
-  // 没有存在
-  mkdirSync(dirPath, { recursive: true })
-  console.info('\n')
-  try {
-    // 切换目录
-    process.chdir(dirPath)
-    console.info(`[command] ${cmd}`)
-    if (cess == 'execSync') {
-      execSync(cmd, { stdio: 'inherit' })
-    } else if (cess == 'exec') {
-      exec(cmd)
-    }
-  } catch (error) {
-    console.info(`${error}`)
-    return
-  }
-}
-
-/**
- * 执行脚本
- * @param {*} name
- * @param {*} file
- * @param {*} ars
- */
-function nodeScripts(name = 'node', file = '', ars = []) {
-  const command = spawn(`${name} ${file} ${ars.join(' ')}`, { shell: true })
-  command.stdout.on('data', data => {
-    process.stdout.write(data.toString())
-  })
-  command.stderr.on('data', data => {
-    process.stderr.write(data.toString())
-  })
-}
-
 ;(async function run() {
-  /**
-   * 得到配置
-   */
   const ars = process.argv.slice(2)
-  const msg = ars.join(' ')
-  const files = msg.match(/(\S+\.js|\S+\.ts)/g) ?? ['alemon.build.js']
-  /**
-   * 判断是文件是否存在
-   */
-  let Options = {}
-
-  if (existsSync(join(process.cwd(), files[0]))) {
-    console.log('[CONFIG]', files[0])
-    Options = await import(`../${files[0]}`)
+  let Options = {
+    input: 'apps/**/*.ts',
+    output: 'alemon.app.js'
   }
-
-  /**
-   * 开始打包
-   */
-  await compilationTools({
-    aInput: Options?.input ?? 'apps/**/*.ts',
-    aOutput: Options?.output ?? 'app.alemon.js'
-  })
-
-  /**
-   * 附加指令
-   */
-  if (Options?.command) {
-    for await (const item of Options.command) {
-      if (item?.cmd) {
-        await command(item?.cess ?? 'execSync', item?.cmd)
-      }
-    }
+  const i = ars.indexOf('--i')
+  if (i != -1) {
+    Options.input = ars[i + 1]
   }
-
-  /**
-   * **********
-   * 附加脚本
-   * **********
-   */
-  if (Options?.scripts) {
-    for await (const item of Options.scripts) {
-      const name = item?.name ?? 'node'
-      nodeScripts(name, item?.file, item?.ars ?? [])
-    }
+  const o = ars.indexOf('--o')
+  if (ars.indexOf('--o') != -1) {
+    Options.output = ars[o + 1]
   }
+  await compilationTools({
+    aInput: Options.input,
+    aOutput: Options.output
+  })
 })()

package/lib/config/pup.js

@@ -12,7 +12,6 @@ if (process.platform == 'win32' && existsSync(win32Edge)) {
     //  win32  Edge
     skipDownload = true;
     executablePath = win32Edge;
-    console.info('[Win32 Edge] start');
 }
 else if (platform == 'linux' || platform == 'android') {
     // linux | android
@@ -30,12 +29,10 @@ else if (platform == 'linux' || platform == 'android') {
             if (chromiumPath) {
                 skipDownload = true;
                 executablePath = realpathSync(chromiumPath);
-                console.info('[Chromium] start');
                 break;
             }
         }
         catch (error) {
-            console.error('Failed to get Chromium path:', error);
             continue;
         }
     }
@@ -53,14 +50,12 @@ else if (platform == 'linux' || platform == 'android') {
             if (existsSync(item)) {
                 skipDownload = true;
                 executablePath = item;
-                console.info('[Chromium] start');
                 break;
             }
         }
     }
     //  arm64/arrch64
     if (isArch == 'arm64' || isArch == 'aarch64') {
-        console.info('[arm64/aarch64] system');
         skipDownload = true;
     }
 }

package/lib/core/configs.js

@@ -7,7 +7,7 @@ const ApplicationProcessingConfiguration = {
     // 打开正则
     openRegex: /./,
     // 屏蔽正则
-    closeRegex: /./,
+    closeRegex: undefined,
     // 指令生成地址
     route: '/public/defset'
 };

package/lib/define/main.js

@@ -219,7 +219,7 @@ export async function defineAlemonConfig(Options) {
      * 开始解析
      * ************
      */
-    if (Options?.mount) {
+    if (Options?.mount !== false) {
         await appsInit();
     }
     setTimeout(async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "阿柠檬框架",
   "author": "ningmengchongshui",
   "license": "GPL-2.0",
@@ -17,7 +17,6 @@
     "@discordjs/core": "^0.6.0",
     "@discordjs/rest": "^1.7.1",
     "alemon-rollup": "^1.0.3",
-    "alemonjs": "^1.0.13",
     "axios": "^1.4.0",
     "discord.js": "^14.11.0",
     "image-size": "^1.0.2",

package/types/core/configs.d.ts

@@ -3,7 +3,7 @@ interface ApplicationProcessingOpsion {
     main: string;
     type: 'ts' | 'js';
     openRegex: RegExp;
-    closeRegex: RegExp;
+    closeRegex: RegExp | undefined;
     route: string;
 }
 export declare function setAppProCoinfg<T extends keyof ApplicationProcessingOpsion>(key: T, val: ApplicationProcessingOpsion[T]): void;