nextlua 1.0.0 → 2.0.0

package/index.js

@@ -1,6 +1,8 @@
+#!/usr/bin/env node
+
 const fs = require("fs");
 const path = require("path");
-const beautify = require("./src/main");
+const { beautify, minify } = require("./src/main");
 
 const commandId = "nextlua.beautifyDocument";
 
@@ -67,9 +69,37 @@ function readStdin() {
     });
 }
 
+function parseFlags(argv) {
+    const flags = { minify: false, beautify: false };
+    const positional = [];
+
+    for (let i = 2; i < argv.length; i++) {
+        if (argv[i] === "--minify") {
+            flags.minify = true;
+        } else if (argv[i] === "--beautify") {
+            flags.beautify = true;
+        } else {
+            positional.push(argv[i]);
+        }
+    }
+
+    return { flags, positional };
+}
+
 async function runCli(argv) {
-    const inputPath = argv[2];
-    const outputPath = argv[3];
+    const { flags, positional } = parseFlags(argv);
+
+    if (flags.minify && flags.beautify) {
+        throw new Error("Cannot specify both --minify and --beautify.");
+    }
+
+    if (!flags.minify && !flags.beautify) {
+        throw new Error("Usage: nextlua --minify|--beautify [input.lua] [output.lua]\n\nPipe Lua code through stdin or specify input/output files.");
+    }
+
+    const processFn = flags.minify ? minify : beautify;
+    const inputPath = positional[0];
+    const outputPath = positional[1];
     let input;
 
     if (inputPath) {
@@ -79,10 +109,10 @@ async function runCli(argv) {
     } else if (!process.stdin.isTTY) {
         input = await readStdin();
     } else {
-        throw new Error("Usage: node index.js [input.lua] [output.lua] or pipe Lua code through stdin.");
+        throw new Error("Usage: nextlua --minify|--beautify [input.lua] [output.lua]\n\nPipe Lua code through stdin or specify input/output files.");
     }
 
-    const output = beautifyText(input);
+    const output = processFn(input);
 
     if (outputPath) {
         fs.writeFileSync(path.resolve(outputPath), output, "utf8");
@@ -106,5 +136,7 @@ if (require.main === module) {
 module.exports = {
     activate,
     deactivate,
-    beautifyText
+    beautifyText,
+    minify,
+    beautify
 };

package/package.json

@@ -1,8 +1,15 @@
 {
   "name": "nextlua",
-  "version": "1.0.0",
-  "description": "",
+  "version": "2.0.0",
+  "description": "A luau beautifier and minifier.",
   "main": "index.js",
+  "bin": {
+    "nextlua": "./index.js"
+  },
+  "files": [
+    "index.js",
+    "src"
+  ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },

package/src/main.js

@@ -563,4 +563,22 @@ function beautify(input) {
         .join("\n");
 }
 
-module.exports = beautify;
+function minify(input) {
+    const tokens = tokenize(input);
+    const filtered = tokens.filter(t => !isComment(t));
+
+    let text = "";
+    let prev = null;
+
+    for (const token of filtered) {
+        if (needsSpace(prev, token)) {
+            text += " ";
+        }
+        text += token;
+        prev = token;
+    }
+
+    return text;
+}
+
+module.exports = { beautify, minify };