@fontoxml/fontoxml-development-tools 8.8.0 → 8.8.1

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
 	"name": "@fontoxml/fontoxml-development-tools",
-	"version": "8.8.0",
+	"version": "8.8.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@fontoxml/fontoxml-development-tools",
-			"version": "8.8.0",
+			"version": "8.8.1",
 			"license": "MIT",
 			"dependencies": {
 				"@babel/core": "7.23.3",

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@fontoxml/fontoxml-development-tools",
 	"description": "Development tools for Fonto.",
-	"version": "8.8.0",
+	"version": "8.8.1",
 	"author": "The Fonto Team",
 	"license": "MIT",
 	"keywords": [

package/src/modules/editor-pre-7-7-0/src/api/enquirerPrompts.js

@@ -12,7 +12,7 @@ import getAddonLabelsForChanges from './getAddonLabelsForChanges.js';
 
 const DEFAULT_STDOUT_COLUMNS = 30;
 
-async function disableCancelPrompt (input, key) {
+async function disableCancelPrompt(input, key) {
 	if (!key.ctrl || key.name !== 'escape') {
 		return;
 	}
@@ -80,9 +80,7 @@ async function promptSchema({ data }) {
 			cancel: disableCancelPrompt,
 			validate: (fontoJsonPath) => {
 				try {
-					if (
-						fs.statSync(path.resolve(fontoJsonPath)).isDirectory()
-					) {
+					if (fs.statSync(path.resolve(fontoJsonPath)).isDirectory()) {
 						fs.statSync(path.resolve(fontoJsonPath, 'fonto.json'));
 						return true;
 					}
@@ -107,31 +105,34 @@ async function promptSchema({ data }) {
  * @returns {Promise<TData>}
  */
 async function promptAddons({ currentAddons, data, sdkAddons, fdtLicense }) {
-	const width = process.stdout?.columns ? process.stdout?.columns - 2 : DEFAULT_STDOUT_COLUMNS;
-	const checkedAddons = currentAddons || data.addons || [];
+	const width = process.stdout?.columns
+		? process.stdout?.columns - 2
+		: DEFAULT_STDOUT_COLUMNS;
+	const checkedAddons = sdkAddons
+		.filter((sdkAddon) => data.addons.includes(sdkAddon.package))
+		.map((sdkAddon) => sdkAddon.package);
 	const promptAnswers = await enquirer.prompt([
 		{
 			name: 'addons',
 			type: 'multiselect',
 			message: 'Add-ons',
 			emptyError: null,
-			initial: data.addons,
+			initial: checkedAddons,
 			cancel: disableCancelPrompt,
 			columns: width,
 			// Every choice has 4 lines.
 			rows: Math.max(Math.floor((process.stdout.rows - 4) / 4), 5),
 			choices: sdkAddons.reduce((choices, addon) => {
 				// Disabled add-ons for which there is no license.
-				let disabled = false;
-				if (
-					addon.licenses &&
-					!fdtLicense.hasProductLicenses(addon.licenses)
-				) {
-					disabled = `Your license currently does not include the ${addon.package} add-on, and thus cannot be enabled.\n`;
-				}
+				const disabled =
+					!!addon.licenses && !fdtLicense.hasProductLicenses(addon.licenses);
 
 				// Hide preview add-ons, if not explicitly enabled.
-				if (addon.isPreview && !checkedAddons.includes(addon.package)) {
+				if (
+					addon.isPreview &&
+					!data.addons.includes(addon.package) &&
+					!currentAddons.includes(addon.package)
+				) {
 					return choices;
 				}
 
@@ -140,7 +141,9 @@ async function promptAddons({ currentAddons, data, sdkAddons, fdtLicense }) {
 						? `${addon.description.substring(0, width - 3)}...`
 						: addon.description,
 				)}\n`;
-				if (!disabled && addon.dependencies) {
+				if (disabled) {
+					hint += `    Your license currently does not include the ${addon.package} add-on, and thus cannot be enabled.\n`;
+				} else if (addon.dependencies) {
 					hint += `    Depends on: ${chalk.dim(
 						addon.dependencies.join(', '),
 					)}\n`;
@@ -170,7 +173,7 @@ async function promptAddons({ currentAddons, data, sdkAddons, fdtLicense }) {
 function lineBreakAndIndentArray(
 	items,
 	indentationLength,
-	lineLength = process.stdout.columns || DEFAULT_STDOUT_COLUMNS
+	lineLength = process.stdout.columns || DEFAULT_STDOUT_COLUMNS,
 ) {
 	const outputLength = lineLength - indentationLength - 1;
 
@@ -204,16 +207,13 @@ async function promptInitReview(options) {
 				{
 					name: 'schema',
 					message: 'Change fonto.json path',
-					hint: ` ${chalk.green(
-						data.schema || 'not set (required)'
-					)}`,
+					hint: ` ${chalk.green(data.schema || 'not set (required)')}`,
 				},
 				{
 					name: 'addons',
 					message: 'Change add-ons',
 					hint: `         ${chalk.green(
-						lineBreakAndIndentArray(addonLabels, 26) ||
-							'no add-ons selected'
+						lineBreakAndIndentArray(addonLabels, 26) || 'no add-ons selected',
 					)}`,
 				},
 				{ role: 'separator' },
@@ -221,7 +221,7 @@ async function promptInitReview(options) {
 					name: 'create',
 					message: 'Create Fonto Editor instance',
 					hint: `(${chalk.green(
-						sdkVersion.isNightly ? 'nightly' : sdkVersion.format()
+						sdkVersion.isNightly ? 'nightly' : sdkVersion.format(),
 					)})`,
 				},
 				{
@@ -314,16 +314,15 @@ async function promptUpgradeReview(options) {
 					message:
 						versionDifference === 0
 							? `Upgrade the Fonto Editor instance to the same version (${chalk.green(
-									nightlyOrVersion
+									nightlyOrVersion,
 							  )})`
-							: versionDifference === 'unknown' ||
-							  versionDifference > 0
-							? `Upgrade the Fonto Editor instance from ${chalk.green(
-									currentVersion.format()
-							  )} to ${chalk.green(nightlyOrVersion)}`
-							: `Downgrade the Fonto Editor instance from ${chalk.green(
-									currentVersion.format()
-							  )} to ${chalk.green(nightlyOrVersion)}`,
+							: versionDifference === 'unknown' || versionDifference > 0
+							  ? `Upgrade the Fonto Editor instance from ${chalk.green(
+										currentVersion.format(),
+								  )} to ${chalk.green(nightlyOrVersion)}`
+							  : `Downgrade the Fonto Editor instance from ${chalk.green(
+										currentVersion.format(),
+								  )} to ${chalk.green(nightlyOrVersion)}`,
 				},
 				{
 					name: 'quit',
@@ -338,19 +337,19 @@ async function promptUpgradeReview(options) {
 			const didConfirm = await promptConfirm(
 				[
 					chalk.yellow(
-						'Warning: this command will attempt to modify files in the current folder.'
+						'Warning: this command will attempt to modify files in the current folder.',
 					),
 					chalk.yellow(
-						'Please close all applications using these files, make sure they are writable, and consider creating a backup before continuing.'
+						'Please close all applications using these files, make sure they are writable, and consider creating a backup before continuing.',
 					),
 					'Are you sure you want to continue?',
-				].join('\n  ')
+				].join('\n  '),
 			);
 			return didConfirm ? {} : promptUpgradeReview(options);
 		}
 		case 'quit': {
 			const quit = await promptConfirm(
-				'Are you sure you want to quit? All changes will be lost.'
+				'Are you sure you want to quit? All changes will be lost.',
 			);
 			return quit ? false : promptUpgradeReview(options);
 		}
@@ -373,7 +372,7 @@ async function promptChangeAddonsReview(options) {
 	const addonLabels = getAddonLabelsForChanges(
 		currentAddons,
 		data.addons,
-		sdkAddons
+		sdkAddons,
 	);
 	const answers = await enquirer.prompt([
 		{
@@ -396,9 +395,7 @@ async function promptChangeAddonsReview(options) {
 					name: 'apply',
 					message: 'Apply add-on changes to the Fonto Editor instance version',
 					hint: `(${chalk.green(
-						currentVersion.isNightly
-							? 'nightly'
-							: currentVersion.format()
+						currentVersion.isNightly ? 'nightly' : currentVersion.format(),
 					)})`,
 				},
 				{
@@ -412,25 +409,25 @@ async function promptChangeAddonsReview(options) {
 	switch (answers.choice) {
 		case 'addons':
 			return promptAddons(options).then(() =>
-				promptChangeAddonsReview(options)
+				promptChangeAddonsReview(options),
 			);
 		case 'apply': {
 			const didConfirm = await promptConfirm(
 				[
 					chalk.yellow(
-						'Warning: this command will attempt to modify files in the current folder.'
+						'Warning: this command will attempt to modify files in the current folder.',
 					),
 					chalk.yellow(
-						'Please close all applications using these files, make sure they are writable, and consider creating a backup before continuing.'
+						'Please close all applications using these files, make sure they are writable, and consider creating a backup before continuing.',
 					),
 					'Are you sure you want to continue?',
-				].join('\n  ')
+				].join('\n  '),
 			);
 			return didConfirm ? data : promptChangeAddonsReview(options);
 		}
 		case 'quit': {
 			const quit = await promptConfirm(
-				'Are you sure you want to quit? All changes will be lost.'
+				'Are you sure you want to quit? All changes will be lost.',
 			);
 			return quit ? false : promptChangeAddonsReview(options);
 		}

package/src/modules/editor-pre-7-7-0/src/api/updateManifest.js

@@ -14,6 +14,10 @@ export default async (manifestPath, sdkManifest, addons) => {
 	manifest.sdkBuildDate = sdkManifest.buildDate;
 	manifest.sdkVersion = sdkManifest.version.format();
 
+	// Delete old and deprecated 'legacyAddonNames' property if it's still
+	// present.
+	delete manifest.legacyAddonNames;
+
 	// Update the file.
 	await fs.writeJson(manifestPath, manifest, {
 		spaces: '\t',