@fontoxml/fontoxml-development-tools 3.7.0-beta.6 → 3.8.0-beta.2

package/src/editorVersions.js

@@ -1,12 +1,12 @@
-const compareVersions = require('compare-versions');
+import compareVersions from 'compare-versions';
 
-function isNightly(version) {
+export function isNightly(version) {
 	return (
 		String(version).startsWith('Nightlies for ') || version === 'nightly'
 	);
 }
 
-function isPre770Editor(version) {
+export function isPre770Editor(version) {
 	if (!version) {
 		return false;
 	}
@@ -26,7 +26,7 @@ function isPre770Editor(version) {
 	}
 }
 
-function isPre782Editor(version) {
+export function isPre782Editor(version) {
 	if (!version) {
 		return false;
 	}
@@ -44,9 +44,3 @@ function isPre782Editor(version) {
 		return false;
 	}
 }
-
-module.exports = {
-	isNightly,
-	isPre770Editor,
-	isPre782Editor,
-};

package/src/enrichRequestObject.js

@@ -1,11 +1,15 @@
-'use strict';
+import EditorRepository from './EditorRepository.js';
+import FdtLicense from './FdtLicense.js';
 
-const EditorRepository = require('./EditorRepository');
-const FdtLicense = require('./FdtLicense');
+export default async function enrichRequestObject(app) {
+	const editorRepository = new EditorRepository();
+	await editorRepository.init(app);
+
+	const license = new FdtLicense(app);
 
-module.exports = function enrichRequestObject(app) {
 	app.request.fdt = {
-		editorRepository: new EditorRepository(app),
-		license: new FdtLicense(app),
+		editorRepository,
+		getPathToModule: app.getPathToModule.bind(app),
+		license,
 	};
-};
+}

package/src/getParentDirectoryContainingFileSync.js

@@ -1,7 +1,5 @@
-'use strict';
-
-const fs = require('fs');
-const nodePathModule = require('path');
+import fs from 'fs';
+import nodePathModule from 'path';
 
 function getStatForPath(path, indiscriminateOfSymlinks) {
 	/* istanbul ignore next: No symlinks in this package, so we won't test this for now */
@@ -40,7 +38,7 @@ function getAllStatsInPath(dir, indiscriminateOfSymlinks) {
 		.filter((result) => !!result);
 }
 
-module.exports = function getParentDirectoryContainingFileSync(
+export default function getParentDirectoryContainingFileSync(
 	cwd,
 	configFileName
 ) {
@@ -59,4 +57,4 @@ module.exports = function getParentDirectoryContainingFileSync(
 				nodePathModule.dirname(cwd),
 				configFileName
 		  );
-};
+}

package/src/modules/connectors/index.js

@@ -1,6 +1,11 @@
-'use strict';
+import commandBuild from './src/command.build.js';
+import commandDownloadSelfContained from './src/command.download-self-contained.js';
+import commandInit from './src/command.init.js';
+import commandRun from './src/command.run.js';
+import commandUpgrade from './src/command.upgrade.js';
+import commandVersions from './src/command.versions.js';
 
-module.exports = (moduleRegistration) => {
+export default async (moduleRegistration) => {
 	const connectorsCommand = moduleRegistration
 		.registerCommand('connectors')
 		.setDescription('Provides tools for working with Fonto Connectors.')
@@ -9,12 +14,10 @@ module.exports = (moduleRegistration) => {
 		.setHideIfMissingRequiredProductLicenses()
 		.setAsHelpCommand();
 
-	[
-		require('./src/command.build.js'),
-		require('./src/command.download-self-contained.js'),
-		require('./src/command.init.js'),
-		require('./src/command.run.js'),
-		require('./src/command.upgrade.js'),
-		require('./src/command.versions.js'),
-	].forEach((mod) => mod(moduleRegistration, connectorsCommand));
+	commandBuild(moduleRegistration, connectorsCommand);
+	commandDownloadSelfContained(moduleRegistration, connectorsCommand);
+	commandInit(moduleRegistration, connectorsCommand);
+	commandRun(moduleRegistration, connectorsCommand);
+	commandUpgrade(moduleRegistration, connectorsCommand);
+	commandVersions(moduleRegistration, connectorsCommand);
 };

package/src/modules/connectors/package.json

@@ -9,5 +9,6 @@
 		"fonto",
 		"fontoxml"
 	],
-	"main": "index.js"
+	"main": "index.js",
+	"type": "module"
 }

package/src/modules/connectors/src/command.build.controller.js

@@ -1,19 +1,17 @@
-'use strict';
+import fs from 'fs-extra';
+import path from 'path';
 
-const fs = require('fs-extra');
-const path = require('path');
+import cleanup from './utilities/cleanup.js';
+import constants from './utilities/constants.js';
+import copyWhitelistedFiles from './utilities/copyWhitelistedFiles.js';
+import executeAndLog from './utilities/executeAndLog.js';
+import FontoxmlConnectorsManifest from './utilities/FontoxmlConnectorsManifest.js';
+import getVerbosityLevel from './utilities/getVerbosityLevel.js';
+import getWhitelist from './utilities/getWhitelist.js';
+import setEntryVisibility from './utilities/setEntryVisibility.js';
+import validateInstance from './utilities/validateInstance.js';
 
-const FontoxmlConnectorsManifest = require('./utilities/FontoxmlConnectorsManifest');
-const cleanup = require('./utilities/cleanup');
-const constants = require('./utilities/constants');
-const copyWhitelistedFiles = require('./utilities/copyWhitelistedFiles');
-const executeAndLog = require('./utilities/executeAndLog');
-const getVerbosityLevel = require('./utilities/getVerbosityLevel');
-const getWhitelist = require('./utilities/getWhitelist');
-const setEntryVisibility = require('./utilities/setEntryVisibility');
-const validateInstance = require('./utilities/validateInstance');
-
-module.exports = function buildCommand(req, res) {
+export default function buildCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	const directoryPath = path.resolve(
@@ -255,4 +253,4 @@ module.exports = function buildCommand(req, res) {
 					});
 			})
 	);
-};
+}

package/src/modules/connectors/src/command.build.js

@@ -1,10 +1,17 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const constants = require('./utilities/constants');
+import constants from './utilities/constants.js';
 
-module.exports = (moduleRegistration, connectorsCommand) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration, connectorsCommand) => {
 	connectorsCommand
-		.addCommand('build', './command.build.controller')
+		.addCommand(
+			'build',
+			path.resolve(__dirname, 'command.build.controller.js')
+		)
 		.setDescription(
 			'Build a Fonto Connectors Docker image for production use. Requires Docker to be installed.'
 		)

package/src/modules/connectors/src/command.download-self-contained.controller.js

@@ -1,11 +1,9 @@
-'use strict';
+import fs from 'fs-extra';
+import path from 'path';
+import requestPromise from 'request-promise-native';
+import url from 'url';
 
-const fs = require('fs-extra');
-const path = require('path');
-const requestPromise = require('request-promise-native');
-const url = require('url');
-
-module.exports = function buildCommand(req, res) {
+export default function buildCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	const directoryPath = path.resolve(
@@ -109,4 +107,4 @@ module.exports = function buildCommand(req, res) {
 					);
 				});
 		});
-};
+}

package/src/modules/connectors/src/command.download-self-contained.js

@@ -1,10 +1,17 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-module.exports = (moduleRegistration, connectorsCommand) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration, connectorsCommand) => {
 	connectorsCommand
 		.addCommand(
 			'download-self-contained',
-			'./command.download-self-contained.controller'
+			path.resolve(
+				__dirname,
+				'command.download-self-contained.controller.js'
+			)
 		)
 		.addAlias('dsc')
 		.setDescription('Downloads a self-contained build.')

package/src/modules/connectors/src/command.init.controller.js

@@ -1,13 +1,11 @@
-'use strict';
+import fs from 'fs-extra';
+import path from 'path';
 
-const fs = require('fs-extra');
-const path = require('path');
+import constants from './utilities/constants.js';
+import FontoxmlConnectorsManifest from './utilities/FontoxmlConnectorsManifest.js';
+import setEntryVisibility from './utilities/setEntryVisibility.js';
 
-const constants = require('./utilities/constants');
-const FontoxmlConnectorsManifest = require('./utilities/FontoxmlConnectorsManifest');
-const setEntryVisibility = require('./utilities/setEntryVisibility');
-
-module.exports = async function initCommand(req, res) {
+export default async function initCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	// Check if the version exists.
@@ -90,4 +88,4 @@ module.exports = async function initCommand(req, res) {
 				`See ${constants.DOCUMENTATION_GETTING_STARTED_GUIDE} for more information.`
 			);
 		});
-};
+}

package/src/modules/connectors/src/command.init.js

@@ -1,8 +1,15 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-module.exports = (moduleRegistration, connectorsCommand) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration, connectorsCommand) => {
 	connectorsCommand
-		.addCommand('init', './command.init.controller')
+		.addCommand(
+			'init',
+			path.resolve(__dirname, 'command.init.controller.js')
+		)
 		.setDescription(
 			'Initialize a Fonto Connectors instance in an empty or nonexistent directory.'
 		)

package/src/modules/connectors/src/command.run.controller.js

@@ -1,18 +1,16 @@
-'use strict';
+import fs from 'fs-extra';
+import os from 'os';
+import path from 'path';
 
-const fs = require('fs-extra');
-const os = require('os');
-const path = require('path');
-
-const FontoxmlConnectorsManifest = require('./utilities/FontoxmlConnectorsManifest');
-const cleanup = require('./utilities/cleanup');
-const constants = require('./utilities/constants');
-const copyWhitelistedFiles = require('./utilities/copyWhitelistedFiles');
-const executeAndLog = require('./utilities/executeAndLog');
-const getVerbosityLevel = require('./utilities/getVerbosityLevel');
-const getWhitelist = require('./utilities/getWhitelist');
-const setEntryVisibility = require('./utilities/setEntryVisibility');
-const validateInstance = require('./utilities/validateInstance');
+import cleanup from './utilities/cleanup.js';
+import constants from './utilities/constants.js';
+import copyWhitelistedFiles from './utilities/copyWhitelistedFiles.js';
+import executeAndLog from './utilities/executeAndLog.js';
+import FontoxmlConnectorsManifest from './utilities/FontoxmlConnectorsManifest.js';
+import getVerbosityLevel from './utilities/getVerbosityLevel.js';
+import getWhitelist from './utilities/getWhitelist.js';
+import setEntryVisibility from './utilities/setEntryVisibility.js';
+import validateInstance from './utilities/validateInstance.js';
 
 const verboseConnectorsConfigurationEntries = {
 	fc__logging__logLevel: 'Trace',
@@ -99,7 +97,7 @@ function copyConnectorsConfiguration(
 	});
 }
 
-module.exports = function runCommand(req, res) {
+export default function runCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	const directoryPath = path.resolve(
@@ -461,4 +459,4 @@ module.exports = function runCommand(req, res) {
 					});
 			})
 	);
-};
+}

package/src/modules/connectors/src/command.run.js

@@ -1,10 +1,14 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const constants = require('./utilities/constants');
+import constants from './utilities/constants.js';
 
-module.exports = (moduleRegistration, connectorsCommand) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration, connectorsCommand) => {
 	connectorsCommand
-		.addCommand('run', './command.run.controller')
+		.addCommand('run', path.resolve(__dirname, 'command.run.controller.js'))
 		.setDescription(
 			'Run a Fonto Connectors instance with a self-signed certificate for development purposes. Requires Docker to be installed.'
 		)

package/src/modules/connectors/src/command.upgrade.controller.js

@@ -1,13 +1,11 @@
-'use strict';
+import fs from 'fs-extra';
+import path from 'path';
 
-const fs = require('fs-extra');
-const path = require('path');
+import constants from './utilities/constants.js';
+import FontoxmlConnectorsManifest from './utilities/FontoxmlConnectorsManifest.js';
+import setEntryVisibility from './utilities/setEntryVisibility.js';
 
-const constants = require('./utilities/constants');
-const FontoxmlConnectorsManifest = require('./utilities/FontoxmlConnectorsManifest');
-const setEntryVisibility = require('./utilities/setEntryVisibility');
-
-module.exports = async function upgradeCommand(req, res) {
+export default async function upgradeCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	// Check if the given version exist.
@@ -51,4 +49,4 @@ module.exports = async function upgradeCommand(req, res) {
 			})
 		)
 		.then(() => destroySpinner());
-};
+}

package/src/modules/connectors/src/command.upgrade.js

@@ -1,8 +1,15 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-module.exports = (moduleRegistration, connectorsCommand) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration, connectorsCommand) => {
 	connectorsCommand
-		.addCommand('upgrade', './command.upgrade.controller')
+		.addCommand(
+			'upgrade',
+			path.resolve(__dirname, 'command.upgrade.controller.js')
+		)
 		.setDescription(
 			'Upgrade an existing Fonto Connectors instance to the specified version.'
 		)

package/src/modules/connectors/src/command.versions.controller.js

@@ -1,6 +1,4 @@
-'use strict';
-
-module.exports = async function versionsCommand(req, res) {
+export default async function versionsCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	const all = req.options.all;
@@ -13,4 +11,4 @@ module.exports = async function versionsCommand(req, res) {
 	destroySpinner();
 	res.caption('Fonto Connectors versions');
 	res.list(all ? sdkVersions.getAll() : sdkVersions.getAllStable(), '-');
-};
+}

package/src/modules/connectors/src/command.versions.js

@@ -1,8 +1,15 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-module.exports = (moduleRegistration, connectorsCommand) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration, connectorsCommand) => {
 	connectorsCommand
-		.addCommand('versions', './command.versions.controller')
+		.addCommand(
+			'versions',
+			path.resolve(__dirname, 'command.versions.controller.js')
+		)
 		.setDescription('List the available Fonto Connectors versions.')
 
 		.addHiddenOption(

package/src/modules/connectors/src/utilities/FontoxmlConnectorsManifest.js

@@ -1,8 +1,6 @@
-'use strict';
+import fs from 'fs-extra';
 
-const fs = require('fs-extra');
-
-class FontoxmlConnectorsManifest {
+export default class FontoxmlConnectorsManifest {
 	constructor(connectorsVersion) {
 		this.connectorsVersion = connectorsVersion;
 	}
@@ -32,5 +30,3 @@ class FontoxmlConnectorsManifest {
 		}
 	}
 }
-
-module.exports = FontoxmlConnectorsManifest;

package/src/modules/connectors/src/utilities/cleanup.js

@@ -1,12 +1,10 @@
-'use strict';
+import fs from 'fs-extra';
+import path from 'path';
 
-const fs = require('fs-extra');
-const path = require('path');
+import constants from './constants.js';
+import executeAndLog from './executeAndLog.js';
 
-const constants = require('./constants');
-const executeAndLog = require('./executeAndLog');
-
-module.exports = async function cleanup(
+export default async function cleanup(
 	temporaryDirectoryPath,
 	projectName,
 	res,
@@ -69,4 +67,4 @@ module.exports = async function cleanup(
 	} finally {
 		destroySpinner();
 	}
-};
+}

package/src/modules/connectors/src/utilities/constants.js

@@ -1,8 +1,10 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const path = require('path');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
-module.exports = {
+export default {
 	DEFAULT_IMAGE_NAME: 'fonto-connectors',
 	DEFAULT_IMAGE_TAG: 'latest',
 	VERBOSITY_LEVEL_DEBUG: 'debug',

package/src/modules/connectors/src/utilities/copyWhitelistedFiles.js

@@ -1,9 +1,7 @@
-'use strict';
+import fs from 'fs-extra';
+import path from 'path';
 
-const fs = require('fs-extra');
-const path = require('path');
-
-module.exports = function copyWhitelistedFiles(
+export default function copyWhitelistedFiles(
 	whitelistedFiles,
 	sourceDirectory,
 	destinationDirectory
@@ -21,4 +19,4 @@ module.exports = function copyWhitelistedFiles(
 			});
 		})
 	);
-};
+}

package/src/modules/connectors/src/utilities/executeAndLog.js

@@ -1,9 +1,8 @@
-'use strict';
+import cp from 'child_process';
 
-const cp = require('child_process');
-const constants = require('./constants');
+import constants from './constants.js';
 
-module.exports = function executeAndLog(
+export default function executeAndLog(
 	res,
 	command,
 	args,
@@ -61,4 +60,4 @@ module.exports = function executeAndLog(
 			}
 		});
 	});
-};
+}

package/src/modules/connectors/src/utilities/getVerbosityLevel.js

@@ -1,8 +1,6 @@
-'use strict';
+import constants from './constants.js';
 
-const constants = require('./constants');
-
-module.exports = function getVerbosityLevel(verbose, debug) {
+export default function getVerbosityLevel(verbose, debug) {
 	if (debug) {
 		return constants.VERBOSITY_LEVEL_DEBUG;
 	}
@@ -10,4 +8,4 @@ module.exports = function getVerbosityLevel(verbose, debug) {
 		return constants.VERBOSITY_LEVEL_VERBOSE;
 	}
 	return constants.VERBOSITY_LEVEL_NORMAL;
-};
+}

package/src/modules/connectors/src/utilities/getWhitelist.js

@@ -1,11 +1,9 @@
-'use strict';
+import fs from 'fs-extra';
+import path from 'path';
 
-const fs = require('fs-extra');
-const path = require('path');
+import constants from './constants.js';
 
-const constants = require('./constants');
-
-module.exports = function getWhitelist() {
+export default function getWhitelist() {
 	return fs
 		.readdir(constants.INSTANCE_TEMPLATE_DIRECTORY_PATH)
 		.then((entries) => {
@@ -15,4 +13,4 @@ module.exports = function getWhitelist() {
 			whitelist.push(...constants.WHITELIST);
 			return whitelist;
 		});
-};
+}

package/src/modules/connectors/src/utilities/setEntryVisibility.js

@@ -1,17 +1,6 @@
-'use strict';
+import fswin from 'fswin';
 
-let fswin;
-// We replace the stdout.write with nothing to prevent fswin to output the Node.js version.
-const originalStdOutWrite = process.stdout.write;
-process.stdout.write = () => {};
-try {
-	fswin = require('fswin');
-} catch (_e) {
-	// Exception will be thrown on linux but fswin is not required on linux.
-}
-process.stdout.write = originalStdOutWrite;
-
-module.exports = function setEntryVisibility(entryPath, isVisible) {
+export default function setEntryVisibility(entryPath, isVisible) {
 	return new Promise((resolve, reject) => {
 		if (fswin) {
 			fswin.setAttributes(
@@ -30,4 +19,4 @@ module.exports = function setEntryVisibility(entryPath, isVisible) {
 
 		resolve();
 	});
-};
+}

package/src/modules/connectors/src/utilities/validateInstance.js

@@ -1,11 +1,9 @@
-'use strict';
+import fs from 'fs-extra';
+import path from 'path';
 
-const fs = require('fs-extra');
-const path = require('path');
+import constants from './constants.js';
 
-const constants = require('./constants');
-
-module.exports = function validateInstance(directoryPath) {
+export default function validateInstance(directoryPath) {
 	return fs
 		.exists(directoryPath)
 		.then((exists) => {
@@ -28,4 +26,4 @@ module.exports = function validateInstance(directoryPath) {
 				})
 			);
 		});
-};
+}

package/src/modules/content-quality/index.js

@@ -1,7 +1,12 @@
-'use strict';
-const constants = require('./src/utilities/constants');
+import commandBuild from './src/command.build.js';
+import commandDownloadSelfContained from './src/command.download-self-contained.js';
+import commandInit from './src/command.init.js';
+import commandRun from './src/command.run.js';
+import commandUpgrade from './src/command.upgrade.js';
+import commandVersions from './src/command.versions.js';
+import constants from './src/utilities/constants.js';
 
-module.exports = (moduleRegistration) => {
+export default (moduleRegistration) => {
 	const fcqCommand = moduleRegistration
 		.registerCommand(constants.COMMAND_PREFIX)
 		.setDescription(
@@ -13,12 +18,10 @@ module.exports = (moduleRegistration) => {
 		.setHideIfMissingRequiredProductLicenses()
 		.setAsHelpCommand();
 
-	[
-		require('./src/command.build.js'),
-		require('./src/command.download-self-contained.js'),
-		require('./src/command.init.js'),
-		require('./src/command.run.js'),
-		require('./src/command.upgrade.js'),
-		require('./src/command.versions.js'),
-	].forEach((mod) => mod(moduleRegistration, fcqCommand));
+	commandBuild(moduleRegistration, fcqCommand);
+	commandDownloadSelfContained(moduleRegistration, fcqCommand);
+	commandInit(moduleRegistration, fcqCommand);
+	commandRun(moduleRegistration, fcqCommand);
+	commandUpgrade(moduleRegistration, fcqCommand);
+	commandVersions(moduleRegistration, fcqCommand);
 };