styimat 8.2.0 → 8.4.0

package/bin/cli.js

@@ -20,6 +20,7 @@ async function main() {
             watchMode = true;
         } else if (arg === '--interactive' || arg === '-i') {
             interactiveMode();
+            return; // 交互模式会自己处理退出
         } else if (arg === '--help' || arg === '-h') {
             showHelp();
             process.exit(0);
@@ -108,7 +109,7 @@ async function main() {
         
         // 处理进程终止
         process.on('SIGINT', () => {
-            console.log('停止监控...\n');
+            console.log('停止监控...');
             watcher.close();
             process.exit(0);
         });
@@ -132,28 +133,86 @@ async function convertFile(inputFilePath, outputFilePath) {
 }
 
 async function interactiveMode() {
-    console.log('提示: 在这个模式下，您需要一次性输入所有 CSS 代码');
-    console.log('输入完成后按 Ctrl+D (Unix) 或 Ctrl+Z (Windows)\n');
-
-    console.log('请输入 CSS 代码:');
-    console.log('='.repeat(50));
-
-    try {
-        // 读取 stdin
-        const inputData = fs.readFileSync(0, 'utf8').trim();
+    console.log('styimat 交互模式');
+    console.log('请输入 CSS 代码，按 Ctrl+D (Unix) 或 Ctrl+Z (Windows) 提交转换');
+    console.log('按 Ctrl+C 退出交互模式');
+    
+    let sessionCount = 0;
+    
+    while (true) {
+        sessionCount++;
+        process.stderr.write('styimat>');
         
-        if (!inputData) {
-            console.log('没有输入内容');
-            return;
+        try {
+            // 使用 fs.createReadStream 读取输入
+            const input = await readFromStdin();
+            
+            if (input === null) {
+                break;
+            }
+            
+            if (input.trim() === '') {
+                continue;
+            }
+            
+            const output = await convertStyimat(input);
+            
+            console.log('\n转换结果:');
+            console.log(output);
+            
+        } catch (error) {
+            console.error('转换错误:', error.message);
+            console.log('请重试...');
         }
+    }
+    
+    console.log('\n再见！');
+}
 
-        const output = await convertStyimat(inputData);
-        console.log('\n转换结果:');
-        console.log(output);
+// 使用 fs.createReadStream 读取 stdin
+function readFromStdin() {
+    return new Promise((resolve, reject) => {
+        const chunks = [];
+        let totalBytes = 0;
         
-    } catch (error) {
-        console.error('错误:', error.message);
-    }
+        // 创建 stdin 流
+        const stream = fs.createReadStream("/dev/stdin", {
+            encoding: 'utf8',
+            highWaterMark: 1024 // 每次读取 1KB
+        });
+        
+        stream.on('data', (chunk) => {
+            chunks.push(chunk);
+            totalBytes += chunk.length;
+            process.stderr.write('........'); // 显示正在读取的指示
+        });
+        
+        stream.on('end', () => {
+            process.stderr.write('\n'); // 换行
+            
+            if (chunks.length === 0) {
+                resolve(null); // 没有输入
+            } else {
+                const input = chunks.join('');
+                resolve(input);
+            }
+        });
+        
+        stream.on('error', (err) => {
+            reject(err);
+        });
+        
+        // 设置超时（30秒无输入）
+        const timeout = setTimeout(() => {
+            stream.destroy();
+            console.log('\n读取超时');
+            resolve(null);
+        }, 30000);
+        
+        stream.on('end', () => {
+            clearTimeout(timeout);
+        });
+    });
 }
 
 async function convertAndOutput(inputContent, outputFile) {

package/bin/cli.min.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+const fs=require("fs"),path=require("path"),chokidar=require("chokidar");async function main(){const s=process.argv.slice(2);let e="",t=null,i=!1,o=null;for(let r=0;r<s.length;r++){const n=s[r];if(n==="--watch"||n==="-w")i=!0;else if(n==="--interactive"||n==="-i"){interactiveMode();return}else n==="--help"||n==="-h"?(c(),process.exit(0)):n.startsWith("-")?(console.error(`\u9519\u8BEF: \u672A\u77E5\u9009\u9879 ${n}`),c(),process.exit(1)):o?t?(console.error("\u9519\u8BEF: \u53C2\u6570\u8FC7\u591A"),c(),process.exit(1)):t=n:o=n}function c(){console.log(`
+\u7528\u6CD5: styimat [\u9009\u9879] [\u8F93\u5165\u6587\u4EF6] [\u8F93\u51FA\u6587\u4EF6]
+
+\u9009\u9879:
+  -w, --watch        \u76D1\u63A7\u8F93\u5165\u6587\u4EF6\u53D8\u5316\u5E76\u81EA\u52A8\u8F6C\u6362
+  -h, --help         \u663E\u793A\u5E2E\u52A9\u4FE1\u606F
+  -i, --interactive  \u8FDB\u5165\u4EA4\u4E92\u6A21\u5F0F
+
+\u793A\u4F8B:
+  styimat                         # \u4ECE stdin \u8BFB\u53D6\uFF0C\u8F93\u51FA\u5230 stdout
+  styimat input.css               # \u4ECE\u6587\u4EF6\u8BFB\u53D6\uFF0C\u8F93\u51FA\u5230 stdout
+  styimat input.css output.css    # \u4ECE\u6587\u4EF6\u8BFB\u53D6\uFF0C\u8F93\u51FA\u5230\u6587\u4EF6
+  styimat -w input.css output.css # \u76D1\u63A7\u5E76\u81EA\u52A8\u8F6C\u6362
+  styimat -i                      # \u8FDB\u5165\u4EA4\u4E92\u6A21\u5F0F
+`)}if(!o){i&&(console.error("\u9519\u8BEF: \u76D1\u63A7\u6A21\u5F0F\u9700\u8981\u6307\u5B9A\u8F93\u5165\u6587\u4EF6"),process.exit(1)),e=fs.readFileSync(0,"utf8"),await convertAndOutput(e,null);return}if(fs.existsSync(o)||(console.error(`\u9519\u8BEF: \u8F93\u5165\u6587\u4EF6 "${o}" \u4E0D\u5B58\u5728`),process.exit(1)),i){t||(console.error("\u9519\u8BEF: \u76D1\u63A7\u6A21\u5F0F\u9700\u8981\u6307\u5B9A\u8F93\u51FA\u6587\u4EF6"),process.exit(1)),console.log(`\u76D1\u63A7\u6A21\u5F0F\u5DF2\u542F\u52A8: ${o} -> ${t}`),console.log("\u6309 Ctrl+C \u9000\u51FA"),await convertFile(o,t);const r=chokidar.watch(o,{persistent:!0,ignoreInitial:!0,awaitWriteFinish:{stabilityThreshold:200,pollInterval:100}});r.on("change",async n=>{console.log(`${new Date().toLocaleTimeString()} - \u68C0\u6D4B\u5230\u53D8\u5316: ${n}`),await convertFile(n,t)}).on("error",n=>{console.error(`\u76D1\u63A7\u9519\u8BEF: ${n.message}`)}),process.on("SIGINT",()=>{console.log("\u505C\u6B62\u76D1\u63A7..."),r.close(),process.exit(0)})}else e=fs.readFileSync(o,"utf8"),await convertAndOutput(e,t)}async function convertFile(s,e){try{const t=fs.readFileSync(s,"utf8"),i=await convertStyimat(t);fs.writeFileSync(e,i,"utf8"),console.log(`${new Date().toLocaleTimeString()} - \u8F6C\u6362\u5B8C\u6210: ${s} -> ${e}`)}catch(t){console.error(`${new Date().toLocaleTimeString()} - \u8F6C\u6362\u9519\u8BEF: ${t.message}`)}}async function interactiveMode(){console.log("styimat \u4EA4\u4E92\u6A21\u5F0F"),console.log("\u8BF7\u8F93\u5165 CSS \u4EE3\u7801\uFF0C\u6309 Ctrl+D (Unix) \u6216 Ctrl+Z (Windows) \u63D0\u4EA4\u8F6C\u6362"),console.log("\u6309 Ctrl+C \u9000\u51FA\u4EA4\u4E92\u6A21\u5F0F");let s=0;for(;;){s++,process.stderr.write("styimat>");try{const e=await readFromStdin();if(e===null)break;if(e.trim()==="")continue;const t=await convertStyimat(e);console.log(`
+\u8F6C\u6362\u7ED3\u679C:`),console.log(t)}catch(e){console.error("\u8F6C\u6362\u9519\u8BEF:",e.message),console.log("\u8BF7\u91CD\u8BD5...")}}console.log(`
+\u518D\u89C1\uFF01`)}function readFromStdin(){return new Promise((s,e)=>{const t=[];let i=0;const o=fs.createReadStream("/dev/stdin",{encoding:"utf8",highWaterMark:1024});o.on("data",r=>{t.push(r),i+=r.length,process.stderr.write("........")}),o.on("end",()=>{if(process.stderr.write(`
+`),t.length===0)s(null);else{const r=t.join("");s(r)}}),o.on("error",r=>{e(r)});const c=setTimeout(()=>{o.destroy(),console.log(`
+\u8BFB\u53D6\u8D85\u65F6`),s(null)},3e4);o.on("end",()=>{clearTimeout(c)})})}async function convertAndOutput(s,e){try{const t=await convertStyimat(s);e?fs.writeFileSync(e,t,"utf8"):process.stdout.write(t)}catch(t){console.error("\u8F6C\u6362\u9519\u8BEF:",t.message),process.exit(1)}}async function convertStyimat(s){const e=[path.join(path.dirname(__dirname),"dist","styimat.js"),path.join(process.cwd(),"dist","styimat.js"),path.join(process.cwd(),"node_modules","styimat","dist","styimat.js")];let t=null;for(const o of e)try{if(fs.existsSync(o)){t=require(o);break}}catch{}if(!t)throw new Error("\u627E\u4E0D\u5230 styimat.js \u6A21\u5757");const i=t.styimat||t;if(typeof i.convert!="function")throw new Error("styimat.convert \u4E0D\u662F\u51FD\u6570");return await i.convert(s)}main().catch(s=>{console.error("\u7A0B\u5E8F\u9519\u8BEF:",s.message),process.exit(1)});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "styimat",
-  "version": "8.2.0",
+  "version": "8.4.0",
   "description": "一个高效的CSS变量预处理库，支持Lab/LCH颜色空间自动转换、嵌套选择器和Display P3广色域，让现代CSS开发更简洁强大。",
   "keywords": [
     "css",
@@ -43,10 +43,11 @@
     "dist/styimat.min.mjs",
     "LICENSE",
     "README.md",
-    "bin/cli.js"
+    "bin/cli.js",
+    "bin/cli.min.js"
   ],
   "bin": {
-    "styimat": "bin/cli.js"
+    "styimat": "bin/cli.min.js"
   },
   "repository": {
     "type": "git",
@@ -58,7 +59,7 @@
   "homepage": "https://gitee.com/wxy6987/styimat#readme",
   "scripts": {
     "test": "echo \"No tests yet\" && exit 0",
-    "build:min": "npx esbuild dist/styimat.js --minify --outfile=dist/styimat.min.js && node build.js && npx esbuild dist/styimat.mjs --minify --outfile=dist/styimat.min.mjs",
+    "build:min": "npx esbuild dist/styimat.js --minify --outfile=dist/styimat.min.js && node build.js && npx esbuild dist/styimat.mjs --minify --outfile=dist/styimat.min.mjs && npx esbuild bin/cli.js --minify --outfile=bin/cli.min.js",
     "prepare": "npm run build:min",
     "prepublishOnly": "npm run build:min",
     "postpublish": "npm run git:auto-commit && npm run git:auto-tag",