jsir 2.2.8 → 2.2.9

package/cmd/oaa.js

@@ -11,7 +11,7 @@ const {
     createConsole, setTips, delTips,
     getEditor, errorStr, getConfigDir,
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
-    getOr, getAlias
+    getOr, getAlias, wrapperJsirText
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -1179,18 +1179,17 @@ const keywordDef = {
                     let text = removeComment(String(fs.readFileSync(path)))
                     let [space] = parseUniqueName(uniqueName)
 
+                    text = wrapperJsirText(text)
+
                     await preLoad(text, "[\\s=;]require", requireG, packages, space)
                     await preLoad(text, "^require", requireG, packages, space)
                     await preLoad(text, "\\$import", importG, packages, space)
-                    await preLoad(text, "[\\s=;]import", importG, packages, space)
-                    await preLoad(text, "^import", importG, packages, space)
                 }
                 Object.keys(packages).forEach(key => {
                     let info = packages[key];
                     info.version = getPackageVersion(info.space, info.name)
-                    let loadedSpace = global.$packages[info.name]
-                    if (loadedSpace) {
-                        info.loaded = loadedSpace
+                    if (global.$packages.hasOwnProperty(info.name)) {
+                        info.loaded = global.$packages[info.name]
                     }
                     if (info.loaded && info.loaded !== info.space) {
                         let version = getPackageVersion(info.loaded, info.name)
@@ -1364,7 +1363,9 @@ const keywordDef = {
             let type = '';
             for (let arg of args) {
                 if (_cmdMap[arg]) {
-                    path = `${getLibDataDir()}/log/${md5(_cmdMap[trim(arg)])}`
+                    let pair = parseUniqueName(_cmdMap[arg])
+                    let fileName = pair[0] + '/' +  pair[1].split(".")[0]
+                    path = `${getLibDataDir()}/log/${fileName}`
                 } else {
                     type = arg;
                 }
@@ -1382,7 +1383,7 @@ const keywordDef = {
                 console.warn('log file not found')
                 return;
             }
-            ei(cmdStr, [path], true)
+            ei(cmdStr, [`"${path}"`], true)
         },
         short: 'l'
     },
@@ -1508,6 +1509,9 @@ function removeComment(text) {
 function _getScriptRequires(uniqueName, cmds, links) {
     let path = getFullPath(uniqueName);
     let text = removeComment(String(fs.readFileSync(path)))
+
+    text = wrapperJsirText(text);
+
     let temp = []
     regEach(text, /\$require\s*\(([^()]+)\)/g, r=> {
         if (r[1]) {

package/deps/evalCode.js

@@ -19,9 +19,7 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
     };
 
     // 兼容
-    $text = $text.replace(/^module\.exports\s*=\s*/m, 'return ');
-    $text = $text.replace(/([\s=;])import\s*\(/g, '$1$import(');
-    $text = $text.replace(/^import\s*\(/mg, '$import(');
+    $text = $lib.wrapperJsirText($text)
 
     const $setTips = $lib.setTips;
     const $delTips = $lib.delTips;

package/deps/example.js

@@ -7,11 +7,14 @@ let {
     arg, // required argument
     _arg // optional argument
 } = $defArgs()
+
 `,
     initFile: `/*
 An init script
  */
 
-return {}
+module.exports = {
+
+}
 `
 }

package/deps/util.js

@@ -11,13 +11,14 @@ const crypto = require('crypto');
 const dayJs = require('dayjs')
 const table = require('console.table')
 const initModulePaths = Object.assign([], module.paths)
+const path = require('path')
 
 global.$newInput = false
 global.$workspaceMap = {}
 global.$defaultSpace = 'local'
 global.$newError = false
 global.$tips = {}
-global.$packages = Object.create(null)
+global.$packages = {}
 
 let libDataDir;
 let lockDir;
@@ -198,10 +199,12 @@ function createConsole(uniqueName) {
     result.$error = $error;
     result.$draft = draftLog;
     if (uniqueName) {
-        result.$log = createLimitLogger(md5(uniqueName) + '.log', {
+        let pair = parseUniqueName(uniqueName)
+        let fileName = pair[0] + '/' +  pair[1].split(".")[0]
+        result.$log = createLimitLogger(fileName + '.log', {
             logInfo: false
         });
-        result.$error = createLimitLogger(md5(uniqueName) + '.error', {
+        result.$error = createLimitLogger(fileName + '.error', {
             logInfo: false,
             error: true
         });
@@ -297,7 +300,7 @@ function toJsirFileName(name) {
 }
 
 function isJsirFileName(name) {
-    return /^[^./]*[^./\s]\.[^./\s]+$/.test(name)
+    return /^[^./]*[^./\s]\.[^./\s]+$/.test(name) && name.indexOf(".") > 1
 }
 
 function isMatch(text,
@@ -604,6 +607,20 @@ function getLogDir() {
     return logDir;
 }
 
+/**
+ * 根据文件完整路径，检查并创建其父级目录
+ * 示例：/a/b/c/d.txt -> 检查并创建 /a/b/c
+ * @param {string} filePath 文件的完整路径
+ */
+function createDirs(filePath) {
+    // 1. 获取父目录，比如 '/a/b/c'
+    const dirPath = path.dirname(filePath);
+
+    // 2. 使用 mkdirSync + { recursive: true } 来递归创建目录
+    // 如果目录已存在，则不会报错
+    fs.mkdirSync(dirPath, { recursive: true });
+}
+
 function createLimitLogger(fileName, {
     maxChars = 49 * 1024 * 1024,
     logInfo = true,
@@ -616,6 +633,7 @@ function createLimitLogger(fileName, {
     }
     let logDir = getLogDir()
     let logPath = logDir + "/" + fileName
+    createDirs(logPath)
     if (logInfo) {
         console.info(`log: ${logPath}`)
     }
@@ -766,7 +784,7 @@ function setModulePaths(space) {
 }
 
 function enrichPackages(moduleName, space) {
-    if (!global.$packages[moduleName]) {
+    if (!global.$packages.hasOwnProperty(moduleName)) {
         global.$packages[moduleName] = space
     }
 }
@@ -1778,7 +1796,18 @@ function getTextComments(text) {
     return results.map(i => i.replace(/\s+$/, ''))
 }
 
+function wrapperJsirText(text) {
+    return text
+        .replace(/^require\s*\(\s*(["'`][ei]\s+)/mg, 'await $require($2')
+        .replace(/([\s=;])require\s*\(\s*(["'`][ei]\s+)/g, '$1await $require($2')
+        .replace(/([\s=;])import\s*\(/g, '$1$import(')
+        .replace(/^import\s*\(/mg, '$import(')
+        .replace(/^module\.exports\s*=\s*/m, 'return ')
+        ;
+}
+
 module.exports = {
+    wrapperJsirText,
     run,
     reget,
     trim,
@@ -1873,5 +1902,6 @@ module.exports = {
     toJsirFileName,
     fileJson,
     debugStr,
-    getAlias
+    getAlias,
+    createDirs
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.2.8",
+  "version": "2.2.9",
   "description": "JavaScript Script Management Tool",
   "main": "index.js",
   "scripts": {