generator-nsis 0.10.0 → 0.10.2

package/generators/app/index.js

@@ -1,4 +1,3 @@
-
 import { meta as languageData } from '@nsis/language-data';
 
 import { getAllLibraries, getLanguageChoices, licenseChoices } from '../lib/helpers.js';
@@ -18,10 +17,10 @@ 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.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;
 	}
 
 	// languageDialog(isUnicode) {
@@ -44,25 +43,28 @@ export default class extends Generator {
 				message: `Application name`,
 				default: slugify(this.appname),
 				store: true,
-				validate: name => (name.trim().length > 0) ? true : 'Not a valid name'
+				validate: name => (name.trim().length > 0 ? true : 'Not a valid name'),
 			},
 			{
 				name: 'version',
 				message: `Application version`,
 				default: '0.0.0',
 				store: true,
-				validate: version => (this.looseVersion === true || semver.valid(version) !== null) ? true : `Not a valid ${terminalLink('semantic version', 'https://semver.org', {
-					fallback() {
-						return 'semantic version';
-					}
-				})}`
+				validate: version =>
+					this.looseVersion === true || semver.valid(version) !== null
+						? true
+						: `Not a valid ${terminalLink('semantic version', 'https://semver.org', {
+								fallback() {
+									return 'semantic version';
+								},
+							})}`,
 			},
 			{
 				name: 'unicode',
 				message: 'Unicode installer',
 				type: 'confirm',
 				default: 'true',
-				store: true
+				store: true,
 			},
 			{
 				name: 'elevation',
@@ -70,35 +72,35 @@ export default class extends Generator {
 				type: 'list',
 				default: 'user',
 				store: true,
-				choices: choices.elevation
+				choices: choices.elevation,
 			},
-		{
+			{
 				name: 'compression',
 				message: 'Set compression',
 				type: 'list',
 				default: 'lzma',
 				store: true,
-				choices: choices.compression
+				choices: choices.compression,
 			},
 			{
 				name: 'pages',
 				message: 'Installer pages',
 				type: 'checkbox',
 				store: true,
-				default: [ 'instfiles' ],
-				choices: choices.pages
+				default: ['instfiles'],
+				choices: choices.pages,
 			},
 			{
 				name: 'spdxQuestion',
 				message: `Choose a license from ${terminalLink('SPDX License List', 'https://spdx.org/licenses/', {
 					fallback() {
-						return 'SPDX License List'
-					}
+						return 'SPDX License List';
+					},
 				})}`,
 				type: 'confirm',
 				default: true,
 				store: true,
-				when: answers => answers.pages?.includes('license') ? true : false
+				when: answers => (answers.pages?.includes('license') ? true : false),
 			},
 			{
 				name: 'spdxLicense',
@@ -107,14 +109,14 @@ 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 ? true : false),
 			},
 			{
 				name: 'sections',
 				message: 'Number of sections',
 				default: 1,
 				store: true,
-				validate: number => (Number.isInteger(parseInt(number)) && parseInt(number) > 0) ? true : 'Not a valid integer'
+				validate: number => (Number.isInteger(parseInt(number)) && parseInt(number) > 0 ? true : 'Not a valid integer'),
 			},
 			{
 				name: 'callbacks',
@@ -122,7 +124,7 @@ export default class extends Generator {
 				type: 'checkbox',
 				store: true,
 				default: [],
-				choices: choices.callbacks
+				choices: choices.callbacks,
 			},
 			{
 				name: 'includes',
@@ -130,16 +132,17 @@ export default class extends Generator {
 				type: 'checkbox',
 				store: true,
 				default: [],
-				choices: async () => this.firstParty ? choices.includes : await getAllLibraries(),
-				validate: callbacks => (callbacks.includes('MUI') && callbacks.includes('MUI2')) ? 'Don\'t mix MUI versions' : true
+				choices: async () => (this.firstParty ? choices.includes : await getAllLibraries()),
+				validate: callbacks =>
+					callbacks.includes('MUI') && callbacks.includes('MUI2') ? "Don't mix MUI versions" : true,
 			},
 			{
 				name: 'languages',
-				message: (this.disabled === true) ? 'Add languages other than English' : 'Add languages',
+				message: this.disabled === true ? 'Add languages other than English' : 'Add languages',
 				type: 'checkbox',
 				store: true,
 				default: [],
-				choices: getLanguageChoices(this.disabled)
+				choices: getLanguageChoices(this.disabled),
 			},
 			{
 				name: 'languageDialog',
@@ -149,14 +152,14 @@ export default class extends Generator {
 				store: true,
 				when: answers => {
 					switch (true) {
-						case (this.options['unlock-all'] === true && answers.languages?.length > 1):
-						case (this.options['unlock-all'] === false && answers.languages?.length > 0):
+						case this.options['unlock-all'] === true && answers.languages?.length > 1:
+						case this.options['unlock-all'] === false && answers.languages?.length > 0:
 							return true;
 
 						default:
 							return false;
 					}
-				}
+				},
 			},
 			{
 				name: 'editInstallerScript',
@@ -165,11 +168,10 @@ export default class extends Generator {
 				default: 'true',
 				store: true,
 				when: () => {
-					return (process.env.EDITOR) ? true : false;
-				}
+					return process.env.EDITOR ? true : false;
+				},
 			},
 		]).then(async props => {
-
 			if (this.options.debug) {
 				console.log(props);
 			}
@@ -204,29 +206,21 @@ export default class extends Generator {
 				}
 			}
 
-			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
-				}
-			);
+			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,
+			});
 
 			if (typeof props.spdxLicense !== 'undefined') {
-				await this.fs.copyTplAsync(
-					this.templatePath('license.txt.ejs'),
-					this.destinationPath('license.txt'),
-					{
-						licenseText: props.licenseText
-					}
-				);
+				await this.fs.copyTplAsync(this.templatePath('license.txt.ejs'), this.destinationPath('license.txt'), {
+					licenseText: props.licenseText,
+				});
 			}
 
 			if (props.editInstallerScript === true) {
-				this.spawnCommand(process.env.EDITOR, [ 'installer.nsi' ]);
+				this.spawnCommand(process.env.EDITOR, ['installer.nsi']);
 			}
 		});
 	}

package/generators/lib/choices.js

@@ -11,81 +11,109 @@ export const callbacks = [
 		name: terminalLink('.onInit', 'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onInit.md', {
 			fallback() {
 				return '.onInit';
-			}
+			},
 		}),
-		value: '.onInit'
+		value: '.onInit',
 	},
 	{
 		name: terminalLink('.onGUIInit', 'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onGUIInit.md', {
 			fallback() {
 				return '.onGUIInit';
-			}
+			},
 		}),
-		value: '.onGUIInit'
+		value: '.onGUIInit',
 	},
 	{
 		name: terminalLink('.onGUIEnd', 'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onGUIEnd.md', {
 			fallback() {
 				return '.onGUIEnd';
-			}
+			},
 		}),
-		value: '.onGUIEnd'
+		value: '.onGUIEnd',
 	},
 	{
-		name: terminalLink('.onInstSuccess', 'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onInstSuccess.md', {
-			fallback() {
-				return '.onInstSuccess';
+		name: terminalLink(
+			'.onInstSuccess',
+			'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onInstSuccess.md',
+			{
+				fallback() {
+					return '.onInstSuccess';
+				},
 			}
-		}),
-		value: '.onInstSuccess'
+		),
+		value: '.onInstSuccess',
 	},
 	{
-		name: terminalLink('.onInstFailed', 'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onInstFailed.md', {
-			fallback() {
-				return '.onInstFailed';
+		name: terminalLink(
+			'.onInstFailed',
+			'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onInstFailed.md',
+			{
+				fallback() {
+					return '.onInstFailed';
+				},
 			}
-		}),
-		value: '.onInstFailed'
+		),
+		value: '.onInstFailed',
 	},
 	{
-		name: terminalLink('.onUserAbort', 'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onUserAbort.md', {
-			fallback() {
-				return '.onUserAbort';
+		name: terminalLink(
+			'.onUserAbort',
+			'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onUserAbort.md',
+			{
+				fallback() {
+					return '.onUserAbort';
+				},
 			}
-		}),
-		value: '.onUserAbort'
+		),
+		value: '.onUserAbort',
 	},
 	{
-		name: terminalLink('.onVerifyInstDir', 'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onVerifyInstDir.md', {
-			fallback() {
-				return '.onVerifyInstDir';
+		name: terminalLink(
+			'.onVerifyInstDir',
+			'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onVerifyInstDir.md',
+			{
+				fallback() {
+					return '.onVerifyInstDir';
+				},
 			}
-		}),
-		value: '.onVerifyInstDir'
+		),
+		value: '.onVerifyInstDir',
 	},
 	{
-		name: terminalLink('.onRebootFailed', 'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onRebootFailed.md', {
-			fallback() {
-				return '.onRebootFailed';
+		name: terminalLink(
+			'.onRebootFailed',
+			'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onRebootFailed.md',
+			{
+				fallback() {
+					return '.onRebootFailed';
+				},
 			}
-		}),
-		value: '.onRebootFailed'
+		),
+		value: '.onRebootFailed',
 	},
 	{
-		name: terminalLink('.onSelChange', 'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onSelChange.md', {
-			fallback() {
-				return '.onSelChange';
+		name: terminalLink(
+			'.onSelChange',
+			'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onSelChange.md',
+			{
+				fallback() {
+					return '.onSelChange';
+				},
 			}
-		}),
-		value: '.onSelChange'
+		),
+		value: '.onSelChange',
 	},
 	{
-		name: terminalLink('.onMouseOverSection', 'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onMouseOverSection.md', {
-			fallback() {
-				return '.onMouseOverSection';
+		name: terminalLink(
+			'.onMouseOverSection',
+			'https://github.com/NSIS-Dev/Documentation/blob/master/Callbacks/onMouseOverSection.md',
+			{
+				fallback() {
+					return '.onMouseOverSection';
+				},
 			}
-		}),
-		value: '.onMouseOverSection'
+		),
+		value: '.onMouseOverSection',
 	},
 ];
 
@@ -93,155 +121,155 @@ export const includes = [
 	{
 		name: 'Colors.nsh',
 		value: 'Colors',
-		checked: false
+		checked: false,
 	},
 	{
 		name: terminalLink('FileFunc.nsh', `${docsURL}/Includes/FileFunc`, {
 			fallback() {
 				return 'FileFunc.nsh';
-			}
+			},
 		}),
 		value: 'FileFunc',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'InstallOptions.nsh',
 		value: 'InstallOptions',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'Integration.nsh',
 		value: 'Integration',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'LangFile.nsh',
 		value: 'LangFile',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'Library.nsh',
 		value: 'Library',
-		checked: false
+		checked: false,
 	},
 	{
 		name: terminalLink('LogicLib.nsh', `${docsURL}/Includes/LogicLib`, {
 			fallback() {
 				return 'LogicLib.nsh';
-			}
+			},
 		}),
 		value: 'LogicLib',
-		checked: false
+		checked: false,
 	},
 	{
 		name: terminalLink('Memento.nsh', `${docsURL}/Includes/Memento`, {
 			fallback() {
 				return 'Memento.nsh';
-			}
+			},
 		}),
 		value: 'Memento',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'MUI.nsh',
 		value: 'MUI',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'MUI2.nsh',
 		value: 'MUI2',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'MultiUser.nsh',
 		value: 'MultiUser',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'nsDialogs.nsh',
 		value: 'nsDialogs',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'Sections.nsh',
 		value: 'Sections',
-		checked: false
+		checked: false,
 	},
 	{
 		name: terminalLink('StrFunc.nsh', `${docsURL}/Includes/StrFunc`, {
 			fallback() {
 				return 'StrFunc.nsh';
-			}
+			},
 		}),
 		value: 'StrFunc',
-		checked: false
+		checked: false,
 	},
 	{
 		name: terminalLink('TextFunc.nsh', `${docsURL}/Includes/TextFunc`, {
 			fallback() {
 				return 'TextFunc.nsh';
-			}
+			},
 		}),
 		value: 'TextFunc',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'UpgradeDLL.nsh',
 		value: 'UpgradeDLL',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'Util.nsh',
 		value: 'Util',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'VB6RunTime.nsh',
 		value: 'VB6RunTime',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'VPatchLib.nsh',
 		value: 'VPatchLib',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'WinCore.nsh',
 		value: 'WinCore',
-		checked: false
+		checked: false,
 	},
 	{
 		name: 'WinMessages.nsh',
 		value: 'WinMessages',
-		checked: false
+		checked: false,
 	},
 	{
 		name: terminalLink('WinVer.nsh', `${docsURL}/Includes/WinVer`, {
 			fallback() {
 				return 'WinVer.nsh';
-			}
+			},
 		}),
 		value: 'WinVer',
-		checked: false
+		checked: false,
 	},
 	{
 		name: terminalLink('WordFunc.nsh', `${docsURL}/Includes/WordFunc`, {
 			fallback() {
 				return 'WordFunc.nsh';
-			}
+			},
 		}),
 		value: 'WordFunc',
-		checked: false
+		checked: false,
 	},
 	{
 		name: terminalLink('x64.nsh', `${docsURL}/Includes/x64`, {
 			fallback() {
 				return 'x64.nsh';
-			}
+			},
 		}),
 		value: 'x64',
-		checked: false
-	}
+		checked: false,
+	},
 ];
 
 export const pages = [
@@ -260,6 +288,6 @@ export const pages = [
 	{
 		name: 'instfiles',
 		value: 'instfiles',
-		checked: true
-	}
+		checked: true,
+	},
 ];

package/generators/lib/helpers.js

@@ -13,7 +13,7 @@ export const licenseChoices = spdxCodes.map(obj => {
 	licenses['name'] = terminalLink(obj, `https://spdx.org/licenses/${obj}.html`, {
 		fallback() {
 			return obj;
-		}
+		},
 	});
 	licenses['value'] = obj;
 
@@ -22,18 +22,18 @@ export const licenseChoices = spdxCodes.map(obj => {
 
 export const getAllLibraries = async () => {
 	const nsisPath = await nsisDir();
-	const includeDir = resolve(nsisPath, 'Include')
+	const includeDir = resolve(nsisPath, 'Include');
 
 	const headerFiles = await glob([`${includeDir}/*.nsh`, `!${includeDir}/MUI.nsh`], {
-		ignore: bundledLibraries.map(excludedFile => `${includeDir}/${excludedFile.value}.nsh`)
+		ignore: bundledLibraries.map(excludedFile => `${includeDir}/${excludedFile.value}.nsh`),
 	});
 
 	const customHeaders = headerFiles.map(headerFile => {
 		return {
 			name: `${basename(headerFile)} [3rd party]`,
 			value: basename(headerFile, extname(headerFile)),
-			checked: false
-		}
+			checked: false,
+		};
 	});
 
 	const allLibraries = [...bundledLibraries, ...customHeaders];
@@ -43,13 +43,13 @@ export const getAllLibraries = async () => {
 
 export function getLanguageChoices(disabled) {
 	const languageChoices = Object.entries(languageData).map(([key, value]) => {
-		const isDisabled = (key === 'English') ? disabled : false;
+		const isDisabled = key === 'English' ? disabled : false;
 
 		// Use long names
 		return {
 			name: value.english || key,
 			value: key,
-			disabled: isDisabled
+			disabled: isDisabled,
 		};
 	});
 

package/package.json

@@ -1,67 +1,73 @@
 {
-  "name": "generator-nsis",
-  "version": "0.10.0",
-  "description": "Yeoman generator for NSIS scripts",
-  "author": "Jan T. Sott",
-  "license": "MIT",
-  "keywords": [
-    "yeoman-generator",
-    "nsis",
-    "nullsoft",
-    "installer",
-    "setup"
-  ],
-  "type": "module",
-  "exports": "./generators/app",
-  "files": [
-    "generators",
-    "LICENSE",
-    "README.md"
-  ],
-  "scripts": {
-    "lint:ejs": "ejslint generators/**/*.ejs",
-    "lint:js": "eslint generators/**/*.js --ignore-path .gitignore",
-    "lint:json": "eslint ./*.json --ignore-path .gitignore",
-    "lint": "npm-run-all --parallel lint:*",
-    "prepare": "husky",
-    "publish": "np --no-yarn",
-    "test": "uvu --ignore test/__helper.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/idleberg/generator-nsis"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "dependencies": {
-    "@nsis/language-data": "^0.9.2",
-    "@sindresorhus/slugify": "^2.2.1",
-    "glob": "^10.3.10",
-    "makensis": "^2.0.8",
-    "semver": "^7.5.4",
-    "spdx-license-list": "^6.8.0",
-    "terminal-link": "^3.0.0",
-    "yeoman-generator": "^7.1.1"
-  },
-  "devDependencies": {
-    "@lukeed/uuid": "^2.0.1",
-    "ejs-lint": "^2.0.0",
-    "eslint": "^8.56.0",
-    "eslint-plugin-json": "^3.1.0",
-    "husky": "^9.0.7",
-    "lint-staged": "^15.2.0",
-    "mem-fs": "^4.0.0",
-    "np": "^9.2.0",
-    "npm-run-all2": "^6.1.1",
-    "tsm": "^2.3.0",
-    "uvu": "^0.5.6",
-    "yeoman-assert": "^3.1.1",
-    "yeoman-environment": "^4.3.0",
-    "yeoman-test": "^8.2.0"
-  },
-  "lint-staged": {
-    "*.ejs": "ejslint",
-    "*.(js|json)": "eslint --cache --fix"
-  }
+	"name": "generator-nsis",
+	"version": "0.10.2",
+	"description": "Yeoman generator for NSIS scripts",
+	"author": "Jan T. Sott",
+	"license": "MIT",
+	"keywords": [
+		"yeoman-generator",
+		"nsis",
+		"nullsoft",
+		"installer",
+		"setup"
+	],
+	"type": "module",
+	"exports": "./generators/app",
+	"files": [
+		"generators",
+		"LICENSE",
+		"README.md"
+	],
+	"scripts": {
+		"lint:ejs": "ejslint generators/**/*.ejs",
+		"lint:js": "eslint generators/**/*.js --ignore-path .gitignore",
+		"lint:json": "eslint ./*.json --ignore-path .gitignore",
+		"lint": "npm-run-all --parallel lint:*",
+		"prepack": "rimraf installer.nsi license.txt",
+		"prepare": "husky",
+		"publish": "np --no-yarn",
+		"test": "uvu --ignore test/__helper.js"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/idleberg/generator-nsis"
+	},
+	"engines": {
+		"node": ">=18"
+	},
+	"dependencies": {
+		"@nsis/language-data": "^0.9.2",
+		"@sindresorhus/slugify": "^2.2.1",
+		"glob": "^10.3.10",
+		"makensis": "^2.0.8",
+		"semver": "^7.5.4",
+		"spdx-license-list": "^6.8.0",
+		"terminal-link": "^3.0.0",
+		"yeoman-generator": "^7.1.1"
+	},
+	"devDependencies": {
+		"@lukeed/uuid": "^2.0.1",
+		"ejs-lint": "^2.0.0",
+		"eslint": "^8.56.0",
+		"eslint-plugin-json": "^3.1.0",
+		"husky": "^9.0.7",
+		"lint-staged": "^15.2.0",
+		"mem-fs": "^4.0.0",
+		"np": "^9.2.0",
+		"npm-run-all2": "^6.1.1",
+		"prettier": "^3.2.4",
+		"rimraf": "^5.0.5",
+		"tsm": "^2.3.0",
+		"uvu": "^0.5.6",
+		"yeoman-assert": "^3.1.1",
+		"yeoman-environment": "^4.3.0",
+		"yeoman-test": "^8.2.0"
+	},
+	"lint-staged": {
+		"*.ejs": "ejslint",
+		"*.(js|json)": [
+			"eslint --cache --fix",
+			"prettier --write"
+		]
+	}
 }

package/license.txt

@@ -1,7 +0,0 @@
-<copyright notice>
-
-By obtaining, using, and/or copying this software and/or its associated documentation, you agree that you have read, understood, and will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and its associated documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies, and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of the copyright holder not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.
-
-THE COPYRIGHT HOLDER DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM THE LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.