generator-nsis 0.11.2 → 0.11.4

package/generators/app/index.js

@@ -1,12 +1,11 @@
 import { meta as languageData } from '@nsis/language-data';
-
-import { getAllLibraries, getLanguageChoices, licenseChoices } from '../../lib/helpers.js';
-import * as choices from '../../lib/choices.js';
-import Generator from 'yeoman-generator';
-import semver from 'semver';
 import slugify from '@sindresorhus/slugify';
+import semver from 'semver';
 import spdxLicenseList from 'spdx-license-list/full.js';
 import terminalLink from 'terminal-link';
+import Generator from 'yeoman-generator';
+import * as choices from '../../lib/choices.js';
+import { getAllLibraries, getLanguageChoices, licenseChoices } from '../../lib/helpers.js';
 
 export default class extends Generator {
 	constructor(args, opts) {
@@ -17,30 +16,30 @@ export default class extends Generator {
 		this.option('unlock-all', { desc: 'Unlocks all disabled features', default: false });
 		this.option('debug', { desc: 'Prints debug messages', default: false });
 
-		this.looseVersion = this.options.looseVersion ? true : false;
-		this.disabled = this.options.unlockAll ? false : true;
-		this.firstParty = this.options.firstParty ? true : false;
-		this.debug = this.options.debug ? true : false;
+		this.disabled = !this.options.unlockAll;
 
 		globalThis.console.log(/* let it breathe */);
 	}
 
-	inquirer() {
-		return this.prompt([
+	async prompting() {
+		// Pre-load async choices for proper storage support
+		const includeChoices = this.options.firstParty ? choices.includes : await getAllLibraries();
+
+		this.props = await this.prompt([
 			{
 				name: 'name',
-				message: `Application name`,
+				message: 'Application name',
 				default: slugify(this.appname),
 				store: true,
 				validate: (name) => (name.trim().length > 0 ? true : 'Not a valid name'),
 			},
 			{
 				name: 'version',
-				message: `Application version`,
+				message: 'Application version',
 				default: '0.0.0',
 				store: true,
 				validate: (version) =>
-					this.looseVersion === true || semver.valid(version) !== null
+					this.options.looseVersion || semver.valid(version) !== null
 						? true
 						: `Not a valid ${terminalLink('semantic version', 'https://semver.org', {
 								fallback: false,
@@ -85,7 +84,7 @@ export default class extends Generator {
 				type: 'confirm',
 				default: true,
 				store: true,
-				when: (answers) => (answers.pages?.includes('license') ? true : false),
+				when: (answers) => !!answers.pages?.includes('license'),
 			},
 			{
 				name: 'spdxLicense',
@@ -94,7 +93,7 @@ export default class extends Generator {
 				default: 'MIT',
 				choices: licenseChoices,
 				store: true,
-				when: (answers) => (answers.pages?.includes('license') && answers.spdxQuestion ? true : false),
+				when: (answers) => !!(answers.pages?.includes('license') && answers.spdxQuestion),
 			},
 			{
 				name: 'sections',
@@ -102,7 +101,9 @@ export default class extends Generator {
 				default: 1,
 				store: true,
 				validate: (number) =>
-					Number.isInteger(parseInt(number)) && parseInt(number) > 0 ? true : 'Not a valid integer',
+					Number.isInteger(Number.parseInt(number, 10)) && Number.parseInt(number, 10) > 0
+						? true
+						: 'Not a valid integer',
 			},
 			{
 				name: 'lifecycles',
@@ -118,7 +119,7 @@ export default class extends Generator {
 				type: 'checkbox',
 				store: true,
 				default: [],
-				choices: async () => (this.firstParty ? choices.includes : await getAllLibraries()),
+				choices: includeChoices,
 				validate: (lifecycles) =>
 					lifecycles.includes('MUI') && lifecycles.includes('MUI2') ? "Don't mix MUI versions" : true,
 			},
@@ -147,58 +148,62 @@ export default class extends Generator {
 					}
 				},
 			},
-		]).then(async (props) => {
-			if (this.options.debug) {
-				globalThis.console.log(props);
-			}
-
-			if (typeof props.spdxLicense !== 'undefined') {
-				props.licenseText = spdxLicenseList[props.spdxLicense].licenseText
-					// normalize line endings
-					.split('\n')
+		]);
+	}
 
-					// .map(line => line.trim())
-					.join(props.unicode ? '\n' : '\r\n');
-			}
+	async writing() {
+		if (this.options.debug) {
+			globalThis.console.log(this.props);
+		}
 
-			if (props.name.includes('&')) {
-				props.ampersand_name = props.name.replace('&', '&&');
-			}
+		if (typeof this.props.spdxLicense !== 'undefined') {
+			this.props.licenseText = spdxLicenseList[this.props.spdxLicense].licenseText
+				// normalize line endings
+				.split('\n')
 
-			props.outfile = props.version ? `${slugify(props.name)}-${props.version}-setup` : `${slugify(props.name)}-setup`;
+				// .map(line => line.trim())
+				.join(this.props.unicode ? '\n' : '\r\n');
+		}
 
-			if (props.languageDialog) {
-				if (!props.lifecycles.includes('.onInit')) {
-					props.lifecycles.unshift('.onInit');
-				}
-			}
+		if (this.props.name.includes('&')) {
+			this.props.ampersand_name = this.props.name.replace('&', '&&');
+		}
 
-			if (props.includes?.includes('MUI2')) {
-				const includesOnGUIInit = props.lifecycles.indexOf('.onGUIInit');
+		this.props.outfile = this.props.version
+			? `${slugify(this.props.name)}-${this.props.version}-setup`
+			: `${slugify(this.props.name)}-setup`;
 
-				if (includesOnGUIInit !== -1) {
-					props.lifecycles.splice(includesOnGUIInit, 1, 'MUI.onGUIInit');
-				}
+		if (this.props.languageDialog) {
+			if (!this.props.lifecycles.includes('.onInit')) {
+				this.props.lifecycles.unshift('.onInit');
+			}
+		}
 
-				const includesOnUserAbort = props.lifecycles.indexOf('.onUserAbort');
+		if (this.props.includes?.includes('MUI2')) {
+			const includesOnGUIInit = this.props.lifecycles.indexOf('.onGUIInit');
 
-				if (includesOnUserAbort !== -1) {
-					props.lifecycles.splice(includesOnUserAbort, 1, 'MUI.onUserAbort');
-				}
+			if (includesOnGUIInit !== -1) {
+				this.props.lifecycles.splice(includesOnGUIInit, 1, 'MUI.onGUIInit');
 			}
 
-			await this.fs.copyTplAsync(this.templatePath('installer.nsi.ejs'), this.destinationPath('installer.nsi'), {
-				languageData: languageData,
-				pkg: props,
-				unlockAll: this.options['unlock-all'],
-				debug: this.options.debug,
-			});
+			const includesOnUserAbort = this.props.lifecycles.indexOf('.onUserAbort');
 
-			if (typeof props.spdxLicense !== 'undefined') {
-				await this.fs.copyTplAsync(this.templatePath('license.txt.ejs'), this.destinationPath('license.txt'), {
-					licenseText: props.licenseText,
-				});
+			if (includesOnUserAbort !== -1) {
+				this.props.lifecycles.splice(includesOnUserAbort, 1, 'MUI.onUserAbort');
 			}
+		}
+
+		await this.fs.copyTplAsync(this.templatePath('installer.nsi.ejs'), this.destinationPath('installer.nsi'), {
+			languageData: languageData,
+			pkg: this.props,
+			unlockAll: this.options['unlock-all'],
+			debug: this.options.debug,
 		});
+
+		if (typeof this.props.spdxLicense !== 'undefined') {
+			await this.fs.copyTplAsync(this.templatePath('license.txt.ejs'), this.destinationPath('license.txt'), {
+				licenseText: this.props.licenseText,
+			});
+		}
 	}
 }

package/generators/app/templates/installer.nsi.ejs

@@ -2,7 +2,7 @@
 # https://github.com/idleberg/generator-nsis
 
 # Includes ---------------------------------<% pkg.includes?.forEach( include => { %>
-!include "<%= include %>"<% }); %>
+!include "<%= include %>.nsh"<% }); %>
 
 # Settings ---------------------------------
 Name "<%- pkg.name %>"<% if (typeof pkg.ampersand_name !== 'undefined') { %> "<%- pkg.ampersand_name %>"<% } %>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-nsis",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "description": "Yeoman generator for NSIS scripts",
   "author": "Jan T. Sott",
   "license": "MIT",
@@ -12,7 +12,7 @@
     "setup"
   ],
   "type": "module",
-  "exports": "./generators/app",
+  "exports": "./generators/app/index.js",
   "files": [
     "generators",
     "LICENSE",
@@ -20,54 +20,50 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/idleberg/generator-nsis"
+    "url": "git+https://github.com/idleberg/generator-nsis.git"
   },
   "engines": {
     "node": ">=18"
   },
   "dependencies": {
     "@nsis/language-data": "^0.9.3",
-    "@sindresorhus/slugify": "^2.2.1",
-    "glob": "^11.0.3",
-    "makensis": "3.0.0",
-    "semver": "^7.7.2",
+    "@sindresorhus/slugify": "^3.0.0",
+    "glob": "^13.0.0",
+    "makensis": "3.0.3",
+    "semver": "^7.7.3",
     "spdx-license-list": "^6.10.0",
-    "terminal-link": "^4.0.0",
+    "terminal-link": "^5.0.0",
     "yeoman-generator": "^7.5.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.29.0",
+    "@commitlint/cli": "^20.2.0",
+    "@commitlint/config-conventional": "^20.2.0",
+    "@idleberg/configs": "^0.4.1",
     "@lukeed/uuid": "^2.0.1",
-    "@types/node": "^22.15.33",
-    "concurrently": "^9.2.0",
+    "@types/node": "^24.5.2",
+    "concurrently": "^9.2.1",
     "ejs-lint": "^2.0.1",
-    "eslint": "9.29.0",
-    "eslint-plugin-jsonc": "^2.20.1",
-    "eslint-plugin-unicorn": "^59.0.1",
-    "husky": "^9.1.7",
-    "lint-staged": "^16.1.2",
     "mem-fs": "^4.1.2",
     "np": "^10.2.0",
-    "prettier": "^3.6.1",
-    "rimraf": "^6.0.1",
+    "prettier": "^3.7.4",
+    "rimraf": "^6.1.2",
     "tsm": "^2.3.0",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "8.35.0",
+    "typescript": "^5.9.3",
     "uvu": "^0.5.6",
     "yeoman-assert": "^3.1.1",
-    "yeoman-environment": "^4.4.3",
-    "yeoman-test": "^10.1.1"
+    "yeoman-environment": "^5.1.1",
+    "yeoman-test": "^11.2.0"
   },
   "lint-staged": {
     "*.ejs": "ejslint",
     "*.(js|json)": [
-      "eslint --cache --fix",
       "prettier --write"
     ]
   },
   "scripts": {
+    "lint:e18e": "e18e-cli analyze",
     "lint:ejs": "ejslint generators/**/*.ejs",
-    "lint:code": "eslint **/*.json ./generators/**/*.js --no-warn-ignored",
+    "lint:code": "biome check",
     "lint": "concurrently --prefix '{name}' -c 'green,blue' 'npm:lint:*'",
     "publish:npm": "np --any-branch",
     "test": "uvu --ignore tests/__helper.js"