liquidsoap-prettier 1.5.2 → 1.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "liquidsoap-prettier",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "Liquidsoap language prettier CLI and plugin",
   "type": "module",
   "main": "src/index.js",
@@ -10,6 +10,7 @@
   "scripts": {
     "build:web": "webpack --config webpack.web.cjs",
     "release": "dune build && npm run build:web && npm publish",
+    "dev:prepare": "node ./scripts/download-parser.js",
     "liquidsoap-prettier": "node ./src/cli.js"
   },
   "prettier": {
@@ -23,9 +24,13 @@
     "bluebird": "^3.7.2",
     "glob": "^10.3.10",
     "minimist": "^1.2.8",
-    "prettier": "^3.0.0"
+    "prettier": "^3.0.0",
+    "tmp": "^0.2.3"
   },
   "devDependencies": {
+    "gunzip-maybe": "^1.4.2",
+    "nodejs-file-downloader": "^4.13.0",
+    "tar-fs": "^3.0.6",
     "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4"
   }

package/scripts/download-parser.js

@@ -0,0 +1,46 @@
+#!/usr/bin/env node
+
+import { Downloader } from "nodejs-file-downloader";
+import { exec } from "node:child_process";
+import { finished } from "node:stream/promises";
+import path from "node:path";
+import fs from "node:fs";
+import tmp from "tmp";
+import gunzip from "gunzip-maybe";
+import tar from "tar-fs";
+
+tmp.setGracefulCleanup();
+
+const archive = "archive.tgz";
+
+const liqFile = "dist/liquidsoap.cjs";
+
+const destFile = path.resolve(path.dirname(process.argv[1]), "..", liqFile);
+
+if (fs.existsSync(destFile)) {
+  console.log("Liquidsoap parser file present!");
+  process.exit();
+}
+
+exec("npm view liquidsoap-prettier dist.tarball", async (_, stdout) => {
+  console.log("Downloading liquidsoap parser file..");
+
+  const { name: tmpdir } = tmp.dirSync();
+
+  const downloader = new Downloader({
+    url: stdout.trim(),
+    directory: tmpdir,
+    fileName: archive,
+    cloneFiles: false,
+  });
+
+  await downloader.download();
+
+  await finished(
+    fs
+      .createReadStream(path.join(tmpdir, archive))
+      .pipe(gunzip())
+      .pipe(tar.extract(tmpdir)),
+  );
+  await fs.promises.rename(path.join(tmpdir, "package", liqFile), destFile);
+});

package/src/cli.js

@@ -13,7 +13,11 @@ const run = async () => {
       _: [filename],
       write,
       w,
-    } = parseArgs(process.argv.slice(2), { boolean: ["w", "write"] });
+      check,
+      c,
+    } = parseArgs(process.argv.slice(2), {
+      boolean: ["w", "write", "c", "check"],
+    });
 
     if (!filename) {
       console.error("No filename passed!");
@@ -24,7 +28,7 @@ const run = async () => {
 
     if (files.length > 1 && !w && !write) {
       console.error(
-        "-w or --write must be used when formatting more than one file at a time!",
+        "-w|--write must be used when formatting more than one file at a time!",
       );
       process.exit(1);
     }
@@ -45,16 +49,24 @@ const run = async () => {
       const code = "" + fs.readFileSync(file);
 
       try {
-        const formattedCode = await prettier.format(code, {
-          parser: "liquidsoap",
-          plugins: [prettierPluginLiquidsoap],
-        });
-
-        if (write || w) {
-          console.log(`Writting formatted ${file}`);
-          fs.writeFileSync(file, formattedCode);
+        if (check || c) {
+          const isFormatted = await prettier.check(code, {
+            parser: "liquidsoap",
+            plugins: [prettierPluginLiquidsoap],
+          });
+          exitCode = isFormatted ? 0 : 2;
         } else {
-          process.stdout.write(formattedCode);
+          const formattedCode = await prettier.format(code, {
+            parser: "liquidsoap",
+            plugins: [prettierPluginLiquidsoap],
+          });
+
+          if (write || w) {
+            console.log(`Writting formatted ${file}`);
+            fs.writeFileSync(file, formattedCode);
+          } else {
+            process.stdout.write(formattedCode);
+          }
         }
       } catch (err) {
         console.error(`Error while processing file ${file}: ${err}`);