@nsis/dent-cli 0.1.1 → 0.2.0

package/README.md

@@ -3,7 +3,7 @@
 > An opinionated code formatter for NSIS scripts
 
 [![License](https://img.shields.io/github/license/idleberg/node-dent-cli?color=blue&style=for-the-badge)](https://github.com/idleberg/node-dent-cli/blob/main/LICENSE)
-[![npm](https://img.shields.io/npm/v/@nsis/dent-cli?style=for-the-badge)](https://www.npmjs.org/package/@nsis/dent-cli)
+[![Version](https://img.shields.io/npm/v/@nsis/dent-cli?style=for-the-badge)](https://www.npmjs.org/package/@nsis/dent-cli)
 [![Build](https://img.shields.io/github/actions/workflow/status/idleberg/node-dent-cli/default.yml?style=for-the-badge)](https://github.com/idleberg/node-dent-cli/actions)
 
 ## Prerequisites

package/bin/cli.d.ts

@@ -0,0 +1,2 @@
+
+export {  }

package/bin/cli.js

@@ -0,0 +1,15 @@
+import { Command } from 'commander';
+import { fileURLToPath } from 'node:url';
+import { dirname, resolve } from 'node:path';
+import { promises } from 'node:fs';
+import { createFormatter } from '@nsis/dent';
+import { glob } from 'glob';
+import l from 'log-symbols';
+import r from 'picocolors';
+
+await C();async function C(){let t=new Command,n=await S();t.version(n).description("CLI tool to format NSIS scripts").arguments("<file...>").option('--eol <"crlf"|"lf">',"control how line-breaks are represented",o=>["crlf","lf"].includes(o)).option("-i, --indent-size <number>","number of units per indentation level",o=>parseInt(o,10),2).option("-s, --use-spaces","indent with spaces instead of tabs",!1).option("--trim","trim empty lines",!0).option("--write","edit files in-place",!1).option("--quiet","suppress output",!1).option("--debug","prints additional debug messages",!1).parse(process.argv);let e=t.opts(),i=Array.isArray(t.args)?t.args:[t.args];i.length||t.help(),e.debug&&console.log(`
+CLI parameters:`,{args:i,options:e});let f=createFormatter({endOfLines:e.eol,indentSize:e.indent,trimEmptyLines:e.trim,useTabs:!e.useSpaces}),d=await glob(i),s=e.write&&!e.quiet;s&&!e.debug&&console.log(),console.time(`
+Completed`),await Promise.all(d.map(async o=>{s&&console.time(`${l.success} ${r.blue(o)}`);let p=(await promises.readFile(o)).toString(),a=f(p);if(e.debug&&console.log(`
+Conversion:`,{raw:p,formatted:a}),e.write)try{await promises.writeFile(o,a,{encoding:"utf-8"}),s&&console.timeEnd(`${l.success} ${r.blue(o)}`);}catch(m){s&&console.error(`${l.error} ${r.blue(o)}
+${r.dim(m instanceof Error?m.message:m)}`);}else console.log(a);})),s&&console.timeEnd(`
+Completed`);}async function S(){let t=fileURLToPath(import.meta.url),n=dirname(t),{version:e}=JSON.parse(await promises.readFile(resolve(n,"../package.json"),"utf8"));return e||"dev"}

package/index.mjs

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-import './bin/cli.mjs';
+import './bin/cli.js';

package/package.json

@@ -1,10 +1,10 @@
 {
 	"name": "@nsis/dent-cli",
-	"version": "0.1.1",
+	"version": "0.2.0",
 	"description": "An opinionated code formatter for NSIS scripts",
 	"license": "MIT",
 	"scripts": {
-		"build": "rollup --config",
+		"build": "tsup",
 		"dev": "npm run start",
 		"fix": "eslint --fix ./src",
 		"lint:json": "eslint ./*.json --ignore-path .gitignore",
@@ -21,11 +21,12 @@
 		"README.md"
 	],
 	"type": "module",
+	"typings": "bin/cli.d.ts",
 	"bin": {
 		"dent": "index.mjs"
 	},
 	"engines": {
-		"node": "^14.13.1 || >=16.0.0"
+		"node": ">=18.0.0"
 	},
 	"repository": {
 		"type": "git",
@@ -36,27 +37,24 @@
 		"formatter"
 	],
 	"dependencies": {
-		"@nsis/dent": "^0.2.2",
-		"commander": "^10.0.1",
-		"glob": "^10.2.6",
-		"log-symbols": "^5.1.0",
+		"@nsis/dent": "^0.4.1",
+		"commander": "^11.1.0",
+		"glob": "^10.3.10",
+		"log-symbols": "^6.0.0",
 		"picocolors": "^1.0.0"
 	},
 	"devDependencies": {
-		"@rollup/plugin-commonjs": "^25.0.0",
-		"@rollup/plugin-json": "^6.0.0",
-		"@rollup/plugin-typescript": "^11.1.1",
-		"@types/node": "^20.2.3",
-		"@typescript-eslint/eslint-plugin": "^5.59.6",
-		"@typescript-eslint/parser": "^5.59.6",
-		"eslint": "^8.41.0",
+		"@types/node": "^18.19.3",
+		"@typescript-eslint/eslint-plugin": "^6.16.0",
+		"@typescript-eslint/parser": "^6.16.0",
+		"eslint": "^8.56.0",
 		"eslint-plugin-json": "^3.1.0",
 		"husky": "^8.0.3",
-		"lint-staged": "^13.2.2",
-		"npm-run-all2": "^6.0.5",
-		"rollup": "^3.23.0",
-		"tslib": "^2.5.2",
-		"typescript": "^5.0.4"
+		"lint-staged": "^15.2.0",
+		"npm-run-all2": "^6.1.1",
+		"tslib": "^2.6.2",
+		"tsup": "^8.0.1",
+		"typescript": "^5.3.3"
 	},
 	"lint-staged": {
 		"*.(json|ts)": "eslint --cache --fix"

package/bin/cli.mjs

@@ -1,88 +0,0 @@
-import { Command } from 'commander';
-import { fileURLToPath } from 'node:url';
-import { dirname, resolve } from 'node:path';
-import { promises } from 'node:fs';
-import { Dent } from '@nsis/dent';
-import { glob } from 'glob';
-import logSymbols from 'log-symbols';
-import colors from 'picocolors';
-
-await main();
-async function main() {
-    const program = new Command();
-    const version = await getVersion();
-    program
-        .version(version)
-        .description('CLI tool to format NSIS scripts')
-        .arguments('<file...>')
-        .option('--eol <"crlf"|"lf">', 'control how line-breaks are represented', value => ['crlf', 'lf'].includes(value))
-        .option('-i, --indent-size <number>', 'number of units per indentation level', value => parseInt(value, 10), 2)
-        .option('-s, --use-spaces', 'indent with spaces instead of tabs', false)
-        .option('--trim', 'trim empty lines', true)
-        .option('--write', 'edit files in-place', false)
-        .option('--quiet', 'suppress output', false)
-        .option('--debug', 'prints additional debug messages', false)
-        .parse(process.argv);
-    const options = program.opts();
-    const args = Array.isArray(program.args)
-        ? program.args
-        : [program.args];
-    if (!args.length) {
-        program.help();
-    }
-    if (options.debug) {
-        console.log('\nCLI parameters:', { args, options });
-    }
-    const dent = new Dent({
-        endOfLines: options.eol,
-        indentSize: options.indent,
-        trimEmptyLines: options.trim,
-        useTabs: !options.useSpaces
-    });
-    const files = await glob(args);
-    const isVerbose = options.write && !options.quiet;
-    if (isVerbose && !options.debug) {
-        console.log( /* let it breathe */);
-    }
-    console.time('\nCompleted');
-    await Promise.all(files.map(async (file) => {
-        if (isVerbose) {
-            console.time(`${logSymbols.success} ${colors.blue(file)}`);
-        }
-        const rawContents = (await promises.readFile(file)).toString();
-        const formattedContents = dent.format(rawContents);
-        if (options.debug) {
-            console.log('\nConversion:', {
-                raw: rawContents,
-                formatted: formattedContents
-            });
-        }
-        if (options.write) {
-            try {
-                await promises.writeFile(file, formattedContents, {
-                    encoding: 'utf-8'
-                });
-                if (isVerbose) {
-                    console.timeEnd(`${logSymbols.success} ${colors.blue(file)}`);
-                }
-            }
-            catch (error) {
-                if (isVerbose) {
-                    console.error(`${logSymbols.error} ${colors.blue(file)}\n${colors.dim(error instanceof Error ? error.message : error)}`);
-                }
-            }
-        }
-        else {
-            console.log(formattedContents);
-        }
-    }));
-    if (isVerbose) {
-        console.timeEnd(`\nCompleted`);
-    }
-}
-async function getVersion() {
-    const __filename = fileURLToPath(import.meta.url);
-    const __dirname = dirname(__filename);
-    const { version } = JSON.parse(await promises.readFile(resolve(__dirname, '../package.json'), 'utf8'));
-    return version || 'dev';
-}