@nsis/dent 0.3.1 → 0.4.1

package/README.md

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

package/dist/dent.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Formats the given file contents using the Dent formatting style.
+ *
+ * @param {NsisDent.Options} options - The options for the Dent formatter.
+ * @returns {function(string): string} The formatting function.
+ * @throws {Error} Throws an error if the options are invalid.
+ */
+declare function createFormatter(options?: NsisDent.Options): (fileContents: string) => string;
+
+export { createFormatter };

package/dist/dent.js

@@ -0,0 +1,10 @@
+import { detectNewline } from 'detect-newline';
+import { platform } from 'node:os';
+
+var d={indenters:["!if","!ifdef","!ifmacrodef","!ifmacrondef","!ifndef","!macro","${Case}","${Case2}","${Case3}","${Case4}","${Case5}","${CaseElse}","${Default}","${Do}","${DoUntil}","${DoWhile}","${For}","${ForEach}","${If}","${IfNot}","${MementoSection}","${MementoUnselectedSection}","${Select}","${Switch}","${Unless}","Function","PageEx","Section","SectionGroup"].map(s=>s.toLowerCase()),dedenters:["!endif","!macroend","${EndIf}","${EndSelect}","${EndSwitch}","${EndWhile}","${Loop}","${LoopUntil}","${LoopWhile}","${MementoSectionEnd}","${Next}","${While}","FunctionEnd","PageExEnd","SectionEnd","SectionGroupEnd"].map(s=>s.toLowerCase()),specialIndenters:["!else","!elseif","${Else}","${ElseIf}","${ElseIfNot}","${ElseUnless}","${AndIf}","${AndIfNot}","${AndUnless}","${OrIf}","${OrIfNot}","${OrUnless}"].map(s=>s.toLowerCase()),specialDedenters:["${Break}"].map(s=>s.toLowerCase())};var f=2;function C(s={}){let n={endOfLines:platform()==="win32"?"crlf":"lf",indentSize:f,trimEmptyLines:!0,useTabs:!0,...s};if(n.useTabs===!1&&n.indentSize&&(isNaN(n.indentSize)||n.indentSize<=0))throw Error("The indentSize option expects a positive integer");function p(t){let e=0,l=0,c=u(t),i=[];return (n.trimEmptyLines===!0?t.trim().replaceAll(/^(\s*\r?\n){2,}/gm,c).split(c):t.split(c)).forEach(r=>{let a=r.trim().split(" ").at(0)??"";switch(a.toLowerCase()==="${Switch}"&&(l=e),!0){case a.toLowerCase()==="${EndSwitch}":e=l,i.push(o(r,e)),e=e===0?0:e-1;break;case d.specialIndenters.includes(a.toLowerCase()):i.push(o(r,e-1));break;case d.specialDedenters.includes(a.toLowerCase()):i.push(o(r,e)),e--;break;case d.indenters.includes(a.toLowerCase()):i.push(o(r,e)),e++;break;case d.dedenters.includes(a.toLowerCase()):e=e===0?0:e-1,i.push(o(r,e));break;default:i.push(o(r,e));break}}),i.join(c)}function o(t,e){return t.length?`${m(e)}${t.trim()}`:""}function u(t){if(n.endOfLines)return n.endOfLines==="crlf"?`\r
+`:`
+`;let e=detectNewline(t);return e!==void 0?e:platform()==="win32"?`\r
+`:`
+`}function m(t){return (n.useTabs?"	".repeat(n.indentSize||f):" ".repeat(n.indentSize||f)).repeat(t)}return p}
+
+export { C as createFormatter };

package/package.json

@@ -1,10 +1,10 @@
 {
 	"name": "@nsis/dent",
-	"version": "0.3.1",
+	"version": "0.4.1",
 	"description": "An opinionated code formatter for NSIS scripts",
 	"license": "MIT",
 	"scripts": {
-		"build": "esbuild src/main.ts --bundle --platform=node --outfile=dist/index.mjs --format=esm --external:detect-newline --external:globby",
+		"build": "tsup",
 		"dev": "npm run start",
 		"fix": "eslint --fix ./src",
 		"lint:json": "eslint ./*.json --ignore-path .gitignore",
@@ -23,10 +23,10 @@
 		"README.md"
 	],
 	"type": "module",
-	"typings": "types/",
-	"exports": "./dist/index.mjs",
+	"typings": "dist/dent.d.ts",
+	"exports": "./dist/dent.js",
 	"engines": {
-		"node": "^14.13.1 || >=16.0.0"
+		"node": ">=18.0.0"
 	},
 	"repository": {
 		"type": "git",
@@ -37,21 +37,21 @@
 		"formatter"
 	],
 	"dependencies": {
-		"detect-newline": "^4.0.0"
+		"detect-newline": "^4.0.1"
 	},
 	"devDependencies": {
-		"@types/node": "^20.2.1",
-		"@typescript-eslint/eslint-plugin": "^6.0.0",
-		"@typescript-eslint/parser": "^6.0.0",
-		"esbuild": "^0.18.13",
-		"eslint": "^8.45.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.3",
-		"npm-run-all2": "^6.0.6",
-		"tslib": "^2.6.0",
+		"lint-staged": "^15.2.0",
+		"npm-run-all2": "^6.1.1",
+		"tslib": "^2.6.2",
 		"tsm": "^2.3.0",
-		"typescript": "^5.1.6",
+		"tsup": "^8.0.1",
+		"typescript": "^5.3.3",
 		"uvu": "^0.5.6"
 	},
 	"lint-staged": {

package/types/index.d.ts

@@ -11,4 +11,3 @@ declare namespace NsisDent {
 
 export = NsisDent;
 export as namespace NsisDent;
-

package/dist/index.mjs

@@ -1,151 +0,0 @@
-// src/main.ts
-import { detectNewline } from "detect-newline";
-import { platform } from "node:os";
-
-// src/rules.ts
-var rules = {
-  indenters: [
-    "!if",
-    "!ifdef",
-    "!ifmacrodef",
-    "!ifmacrondef",
-    "!ifndef",
-    "!macro",
-    "${Case}",
-    "${Case2}",
-    "${Case3}",
-    "${Case4}",
-    "${Case5}",
-    "${CaseElse}",
-    "${Default}",
-    "${Do}",
-    "${DoUntil}",
-    "${DoWhile}",
-    "${For}",
-    "${ForEach}",
-    "${If}",
-    "${IfNot}",
-    "${MementoSection}",
-    "${MementoUnselectedSection}",
-    "${Select}",
-    "${Switch}",
-    "${Unless}",
-    "Function",
-    "PageEx",
-    "Section",
-    "SectionGroup"
-  ].map((i) => i.toLowerCase()),
-  dedenters: [
-    "!endif",
-    "!macroend",
-    "${EndIf}",
-    "${EndSelect}",
-    "${EndSwitch}",
-    "${EndWhile}",
-    "${Loop}",
-    "${LoopUntil}",
-    "${LoopWhile}",
-    "${MementoSectionEnd}",
-    "${Next}",
-    "${While}",
-    "FunctionEnd",
-    "PageExEnd",
-    "SectionEnd",
-    "SectionGroupEnd"
-  ].map((i) => i.toLowerCase()),
-  // These follow indenters, but aren't indented themselves
-  specialIndenters: [
-    "!else",
-    "!elseif",
-    "${Else}",
-    "${ElseIf}",
-    "${ElseIfNot}",
-    "${ElseUnless}",
-    "${AndIf}",
-    "${AndIfNot}",
-    "${AndUnless}",
-    "${OrIf}",
-    "${OrIfNot}",
-    "${OrUnless}"
-  ].map((i) => i.toLowerCase()),
-  specialDedenters: [
-    "${Break}"
-  ].map((i) => i.toLowerCase())
-};
-
-// src/main.ts
-var defaultIndentation = 2;
-function createFormatter(options = {}) {
-  const mergedOptions = {
-    endOfLines: platform() === "win32" ? "crlf" : "lf",
-    indentSize: defaultIndentation,
-    trimEmptyLines: true,
-    useTabs: true,
-    ...options
-  };
-  if (mergedOptions.useTabs === false && mergedOptions.indentSize) {
-    if (isNaN(mergedOptions.indentSize) || mergedOptions.indentSize <= 0) {
-      throw Error("The indentSize option expects a positive integer");
-    }
-  }
-  function format(fileContents) {
-    let indentationLevel = 0;
-    let switchIndentationLevel = 0;
-    const lineEndings = detectEOL(fileContents);
-    const formattedLines = [];
-    const lines = mergedOptions.trimEmptyLines === true ? fileContents.trim().replaceAll(/^(\s*\r?\n){2,}/gm, lineEndings).split(lineEndings) : fileContents.split(lineEndings);
-    lines.forEach((line) => {
-      const keyword = line.trim().split(" ").at(0) ?? "";
-      if (keyword.toLowerCase() === "${Switch}") {
-        switchIndentationLevel = indentationLevel;
-      }
-      switch (true) {
-        case keyword.toLowerCase() === "${EndSwitch}":
-          indentationLevel = switchIndentationLevel;
-          formattedLines.push(appendLine(line, indentationLevel));
-          indentationLevel = indentationLevel === 0 ? 0 : indentationLevel - 1;
-          break;
-        case rules.specialIndenters.includes(keyword.toLowerCase()):
-          formattedLines.push(appendLine(line, indentationLevel - 1));
-          break;
-        case rules.specialDedenters.includes(keyword.toLowerCase()):
-          formattedLines.push(appendLine(line, indentationLevel));
-          indentationLevel--;
-          break;
-        case rules.indenters.includes(keyword.toLowerCase()):
-          formattedLines.push(appendLine(line, indentationLevel));
-          indentationLevel++;
-          break;
-        case rules.dedenters.includes(keyword.toLowerCase()):
-          indentationLevel = indentationLevel === 0 ? 0 : indentationLevel - 1;
-          formattedLines.push(appendLine(line, indentationLevel));
-          break;
-        default:
-          formattedLines.push(appendLine(line, indentationLevel));
-          break;
-      }
-    });
-    return formattedLines.join(lineEndings);
-  }
-  function appendLine(line, level) {
-    return line.length ? `${getIndentChar(level)}${line.trim()}` : "";
-  }
-  function detectEOL(input) {
-    if (mergedOptions.endOfLines) {
-      return mergedOptions.endOfLines === "crlf" ? "\r\n" : "\n";
-    }
-    const newLine = detectNewline(input);
-    if (newLine !== void 0) {
-      return newLine;
-    } else {
-      return platform() === "win32" ? "\r\n" : "\n";
-    }
-  }
-  function getIndentChar(level) {
-    return (mergedOptions.useTabs ? "	".repeat(mergedOptions.indentSize || defaultIndentation) : " ".repeat(mergedOptions.indentSize || defaultIndentation)).repeat(level);
-  }
-  return format;
-}
-export {
-  createFormatter
-};