alemonjs 2.0.0 → 2.0.2

package/bin/start.js

@@ -1,7 +1,30 @@
 #!/usr/bin/env node
 
-import { readFileSync } from 'fs'
-import { join } from 'path'
+import path from 'path';
+import fs from 'fs'
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+const createExports = (packageJson) => {
+  if (packageJson?.exports) {
+    if (typeof packageJson.exports === 'string') {
+      return packageJson.exports;
+    } else if (typeof packageJson.exports === 'object') {
+      return packageJson.exports['.'] || packageJson.exports['./index.js'];
+    }
+  }
+}
+
+const getInputExportPath = (input) => {
+  const packageJsonPath = path.join(input ?? process.cwd(), 'package.json');
+  if (fs.existsSync(packageJsonPath)) {
+    const packageJson = require(packageJsonPath);
+    const main = packageJson?.main || createExports(packageJson);
+    if (main) {
+      return main;
+    }
+  }
+}
 
 /**
  *
@@ -9,9 +32,7 @@ import { join } from 'path'
  */
 export const start = () => {
   // 读取配置文件
-  const dir = join(process.cwd(), 'package.json')
-  const start = readFileSync(dir, 'utf-8')
-  const { main } = JSON.parse(start) ?? {}
+  const main = getInputExportPath();
   import('../lib/index.js').then(res => {
     res.start(main)
   })

package/lib/app/load.js

@@ -1,20 +1,10 @@
 import { dirname, join } from 'path';
-import { existsSync, readFileSync } from 'fs';
+import { existsSync } from 'fs';
 import { unChildren } from './hook-use-api.js';
 import { showErrorModule, getRecursiveDirFiles, createEventName } from './utils.js';
+import { createRequire } from 'module';
 
-// import { createRequire } from 'module'
-// const createChildrenKey = () => {
-//   // 随机一个key
-//   const KEY = `${Date.now()}:${Math.random()}`
-//   // 如果存在。则重新生成
-//   // 把子应用挂起来
-//   // if (alemonjsCore.storeChildren[KEY]) {
-//   //   return createChildrenKey()
-//   // }
-//   //
-// }
-// const require = createRequire(import.meta.url)
+const require = createRequire(import.meta.url);
 const mwReg = /^mw(\.|\..*\.)(js|ts|jsx|tsx)$/;
 /**
  * 加载文件
@@ -68,7 +58,7 @@ const loadChildren = async (mainPath, node) => {
         return;
     }
     const mainDir = dirname(mainPath);
-    const show = e => {
+    const show = (e) => {
         showErrorModule(e);
         // 卸载索引
         unChildren(mainDir);
@@ -149,17 +139,8 @@ const loadChildrenFile = async (node) => {
         logger.error('The module name is not correct');
         return;
     }
-    const dir = join(process.cwd(), 'node_modules', node);
-    const pkgPath = join(dir, 'package.json');
-    if (!existsSync(pkgPath)) {
-        logger.error('The package.json does not exist', pkgPath);
-        return;
-    }
     try {
-        // 存在 package
-        const packageJson = JSON.parse(readFileSync(pkgPath, 'utf-8'));
-        // main
-        const mainPath = join(dir, packageJson.main);
+        const mainPath = require.resolve(node);
         // 不存在 main
         if (!existsSync(mainPath)) {
             logger.error('The main file does not exist', mainPath);

package/lib/app/utils.d.ts

@@ -54,5 +54,6 @@ declare const showErrorModule: (e: Error) => void;
  * @deprecated
  */
 declare const ErrorModule: (e: Error) => void;
+declare const getInputExportPath: (input?: string) => any;
 
-export { ErrorModule, createEventName, createHash, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey };
+export { ErrorModule, createEventName, createHash, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey };

package/lib/app/utils.js

@@ -1,7 +1,9 @@
 import crypto from 'crypto';
-import { existsSync, readdirSync } from 'fs';
-import { join } from 'path';
+import fs, { existsSync, readdirSync } from 'fs';
+import path, { join } from 'path';
+import { createRequire } from 'module';
 
+const require = createRequire(import.meta.url);
 /**
  * 将字符串转为定长字符串
  * @param str 输入字符串
@@ -113,5 +115,25 @@ const showErrorModule = (e) => {
  * @deprecated
  */
 const ErrorModule = showErrorModule;
+const createExports = (packageJson) => {
+    if (packageJson?.exports) {
+        if (typeof packageJson.exports === 'string') {
+            return packageJson.exports;
+        }
+        else if (typeof packageJson.exports === 'object') {
+            return packageJson.exports['.'] || packageJson.exports['./index.js'];
+        }
+    }
+};
+const getInputExportPath = (input) => {
+    const packageJsonPath = path.join(input ?? process.cwd(), 'package.json');
+    if (fs.existsSync(packageJsonPath)) {
+        const packageJson = require(packageJsonPath);
+        const main = packageJson?.main || createExports(packageJson);
+        if (main) {
+            return main;
+        }
+    }
+};
 
-export { ErrorModule, createEventName, createHash, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey };
+export { ErrorModule, createEventName, createHash, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey };

package/lib/index.d.ts

@@ -27,18 +27,19 @@ export { Image, ImageFile, ImageURL, Mention, Text } from './app/hook-message-fo
 export { createSelects, unChildren, unMount, useMention, useSend } from './app/hook-use-api.js';
 export { eventState, onState, unEventState, unState, useState } from './app/hook-use-state.js';
 export { useObserver, useSubscribe } from './app/hook-use-subscribe.js';
-export { ErrorModule, createEventName, createHash, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './app/utils.js';
+export { ErrorModule, createEventName, createHash, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './app/utils.js';
 export { ConfigCore, getConfig, getConfigValue } from './config.js';
 
 /**
  * 运行指定 main
- * @param input
+ * @param input 入口地址
  * @returns
  */
 declare const run: (input: string) => void;
 /**
  * 启动
- * @param input
+ * @param input (可选)main入口地址，默认选择 package.json 中的 main
+ * @param pm (可选)平台名称，默认@alemonjs/gui。
  */
 declare const start: (input?: string, pm?: string) => Promise<void>;
 

package/lib/index.js

@@ -5,7 +5,7 @@ import { existsSync } from 'fs';
 import { getConfig } from './config.js';
 export { ConfigCore, getConfigValue } from './config.js';
 import { loadChildren, loadChildrenFile } from './app/load.js';
-import { showErrorModule } from './app/utils.js';
+import { showErrorModule, getInputExportPath } from './app/utils.js';
 export { ErrorModule, createEventName, createHash, getRecursiveDirFiles, stringToNumber, useUserHashKey } from './app/utils.js';
 export { createSendDataFormat, sendToChannel, sendToUser } from './app/api.js';
 export { defineBot, definePlatform } from './app/event-bot.js';
@@ -20,18 +20,16 @@ export { useObserver, useSubscribe } from './app/hook-use-subscribe.js';
 
 /**
  * 运行指定 main
- * @param input
+ * @param input 入口地址
  * @returns
  */
 const run = (input) => {
-    if (!input) {
-        // 抛出错误
-        throw new Error('The input is not correct');
-    }
+    if (!input || input == '')
+        return;
+    let mainPath = join(process.cwd(), input);
     // 路径
-    const mainPath = join(process.cwd(), input);
-    if (!existsSync(mainPath)) {
-        logger.error(`The file ${mainPath} does not exist`);
+    if (!existsSync(input)) {
+        logger.error('未找到主要入口文件', mainPath);
         return;
     }
     // 指定运行的，name识别为 'main:apps:xxx'
@@ -39,7 +37,8 @@ const run = (input) => {
 };
 /**
  * 启动
- * @param input
+ * @param input (可选)main入口地址，默认选择 package.json 中的 main
+ * @param pm (可选)平台名称，默认@alemonjs/gui。
  */
 const start = async (input, pm) => {
     const cfg = getConfig();
@@ -83,14 +82,12 @@ const start = async (input, pm) => {
     }
     // 运行本地模块
     try {
-        const dir = input ?? cfg.argv?.main ?? cfg.value?.main;
-        if (dir) {
-            run(dir);
-        }
+        const dir = input ?? cfg.argv?.main ?? cfg.value?.main ?? getInputExportPath();
+        run(dir);
     }
     catch (e) {
         logger.error(e);
     }
 };
 
-export { getConfig, run, showErrorModule, start };
+export { getConfig, getInputExportPath, run, showErrorModule, start };

package/lib/jsx.js

@@ -8,10 +8,10 @@ import './app/event-utlis.js';
 import { Text as Text$1, ImageURL as ImageURL$1, ImageFile as ImageFile$1, Image as Image$1, Mention as Mention$1 } from './app/hook-message-format.js';
 import { useSend as useSend$1 } from './app/hook-use-api.js';
 import './app/hook-use-state.js';
-import 'crypto';
+import './app/utils.js';
+import './global.js';
 import 'fs';
 import 'path';
-import './global.js';
 import 'yaml';
 
 /**
@@ -99,9 +99,11 @@ function JSX(...arg) {
         }
         else if (dataType === 'Mention') {
             // <@!123456>  文本的显示会被平台显示。不用自己定义显示的文本，此处不使用 children
-            data.push(Mention$1(props.value, props?.belong ? {
-                belong: props?.belong
-            } : null));
+            data.push(Mention$1(props.value, props?.belong
+                ? {
+                    belong: props?.belong
+                }
+                : null));
         }
     }
     if (data.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",