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

package/src/modules/localization/test/api/parser.test.js

@@ -1,5 +1,6 @@
-const chai = require('chai');
-const parser = require('../../src/api/parser');
+import chai from 'chai';
+
+import parser from '../../src/api/parser.cjs';
 
 describe('Parser', () => {
 	it('Input parsed successfully "This is a message."', () => {

package/src/modules/localization/test/api/promiseUtils.test.js

@@ -1,6 +1,6 @@
-const chai = require('chai');
+import chai from 'chai';
 
-const promiseUtils = require('../../src/api/promiseUtils');
+import promiseUtils from '../../src/api/promiseUtils.js';
 
 describe('promiseUtils', () => {
 	describe('asPromise()', () => {

package/src/modules/localization/test/api/roundtripThroughJson.js

@@ -1,3 +1,3 @@
-module.exports = function roundtripThroughJson(obj) {
+export default function roundtripThroughJson(obj) {
 	return JSON.parse(JSON.stringify(obj));
-};
+}

package/src/modules/localization/test/api/updateMessagesWithTemplate.test.js

@@ -1,9 +1,8 @@
-const chai = require('chai');
+import chai from 'chai';
 
-const Message = require('../../src/api/Message');
-const updateMessagesWithTemplate = require('../../src/api/updateMessagesWithTemplate');
-
-const roundtripThroughJson = require('./roundtripThroughJson');
+import Message from '../../src/api/Message.js';
+import updateMessagesWithTemplate from '../../src/api/updateMessagesWithTemplate.js';
+import roundtripThroughJson from './roundtripThroughJson.js';
 
 describe('updateMessagesWithTemplate()', () => {
 	it('applies update to matching messages and detects new and removed messages', () => {

package/src/modules/localization/test/command.extract.test.js

@@ -1,12 +1,12 @@
-'use strict';
+import assert from 'assert';
+import fs from 'fs-extra';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const assert = require('assert');
-const fs = require('fs-extra');
-const path = require('path');
+import { App } from '../../../../index.js';
 
-const fontoxmlDevelopmentTools = require('../../../../');
-
-const App = fontoxmlDevelopmentTools.App;
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const defaultStdoutColumns = process.stdout.columns;
 
@@ -14,20 +14,21 @@ let app;
 let oldCwd;
 
 describe('fontoxml-development-tools-module-localization/command.extract', () => {
-	beforeEach(() => {
+	beforeEach(async () => {
 		process.stdout.columns = 150;
 
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app'));
 
-		app = new App({
+		app = new App();
+		await app.init({
 			appName: 'fontoxml-development-tools-module-localization-test',
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			testMode: true,
 		});
 
-		app.enableBuiltInModule(path.join(__dirname, '..'));
+		await app.enableBuiltInModule(path.join(__dirname, '..'));
 	});
 
 	afterEach(() => {

package/src/modules/localization/test/command.merge.test.js

@@ -1,12 +1,12 @@
-'use strict';
+import assert from 'assert';
+import fs from 'fs-extra';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const assert = require('assert');
-const fs = require('fs-extra');
-const path = require('path');
+import { App } from '../../../../index.js';
 
-const fontoxmlDevelopmentTools = require('../../../../');
-
-const App = fontoxmlDevelopmentTools.App;
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const defaultStdoutColumns = process.stdout.columns;
 
@@ -14,20 +14,21 @@ let app;
 let oldCwd;
 
 describe('fontoxml-development-tools-module-localization/command.merge', () => {
-	beforeEach(() => {
+	beforeEach(async () => {
 		process.stdout.columns = 150;
 
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app'));
 
-		app = new App({
+		app = new App();
+		await app.init({
 			appName: 'fontoxml-development-tools-module-localization-test',
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			testMode: true,
 		});
 
-		app.enableBuiltInModule(path.join(__dirname, '..'));
+		await app.enableBuiltInModule(path.join(__dirname, '..'));
 	});
 
 	afterEach(() => {

package/src/modules/localization/test/command.messages.test.js

@@ -1,11 +1,11 @@
-'use strict';
+import assert from 'assert';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const assert = require('assert');
-const path = require('path');
+import { App } from '../../../../index.js';
 
-const fontoxmlDevelopmentTools = require('../../../../');
-
-const App = fontoxmlDevelopmentTools.App;
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const defaultStdoutColumns = process.stdout.columns;
 
@@ -13,7 +13,7 @@ let app;
 let oldCwd;
 
 describe('fontoxml-development-tools-module-localization/command.messages', () => {
-	beforeEach(() => {
+	beforeEach(async () => {
 		// cli-table, the package which outputs the table, uses this value, so make sure we have enough output width to
 		// output the table in unit tests.
 		process.stdout.columns = 150;
@@ -21,14 +21,15 @@ describe('fontoxml-development-tools-module-localization/command.messages', () =
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, './app'));
 
-		app = new App({
+		app = new App();
+		await app.init({
 			appName: 'fontoxml-development-tools-module-localization-test',
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			testMode: true,
 		});
 
-		app.enableBuiltInModule(path.join(__dirname, '..'));
+		await app.enableBuiltInModule(path.join(__dirname, '..'));
 	});
 
 	afterEach(() => {

package/src/modules/localization/test/command.update.test.js

@@ -1,12 +1,12 @@
-'use strict';
+import assert from 'assert';
+import fs from 'fs-extra';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const assert = require('assert');
-const fs = require('fs-extra');
-const path = require('path');
+import { App } from '../../../../index.js';
 
-const fontoxmlDevelopmentTools = require('../../../../');
-
-const App = fontoxmlDevelopmentTools.App;
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const defaultStdoutColumns = process.stdout.columns;
 
@@ -14,20 +14,21 @@ let app;
 let oldCwd;
 
 describe('fontoxml-development-tools-module-localization/command.update', () => {
-	beforeEach(() => {
+	beforeEach(async () => {
 		process.stdout.columns = 150;
 
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app'));
 
-		app = new App({
+		app = new App();
+		await app.init({
 			appName: 'fontoxml-development-tools-module-localization-test',
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			testMode: true,
 		});
 
-		app.enableBuiltInModule(path.join(__dirname, '..'));
+		await app.enableBuiltInModule(path.join(__dirname, '..'));
 	});
 
 	afterEach(() => {

package/src/modules/localization/test/index.test.js

@@ -1,31 +1,31 @@
-'use strict';
+import assert from 'assert';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const assert = require('assert');
-const path = require('path');
+import { App } from '../../../../index.js';
+import localizationModule from '../index.js';
 
-const fontoxmlDevelopmentTools = require('../../../../');
-
-const App = fontoxmlDevelopmentTools.App;
-
-const localizationModule = require('../');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 let app;
 let oldCwd;
 let loadedLocalizationModule;
 
 describe('fontoxml-development-tools-module-localization', () => {
-	beforeEach(() => {
+	beforeEach(async () => {
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app'));
 
-		app = new App({
+		app = new App();
+		await app.init({
 			testMode: true,
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			appName: 'fontoxml-development-tools-module-localization-test',
 		});
 
-		loadedLocalizationModule = app.enableBuiltInModule(
+		loadedLocalizationModule = await app.enableBuiltInModule(
 			path.join(__dirname, '..')
 		);
 	});
@@ -122,10 +122,11 @@ describe('fontoxml-development-tools-module-localization', () => {
 			});
 		});
 
-		it('can handle the absence of an editor repository', () => {
+		it('can handle the absence of an editor repository', async () => {
 			process.chdir(oldCwd);
 
-			const appOutsideEditorRepository = new App({
+			const appOutsideEditorRepository = new App();
+			await appOutsideEditorRepository.init({
 				appName: 'fontoxml-development-tools-module-localization-test',
 				skipAddModules: true,
 				skipWarnIfNotInsideEditorRepository: true,
@@ -133,7 +134,7 @@ describe('fontoxml-development-tools-module-localization', () => {
 			});
 
 			loadedLocalizationModule =
-				appOutsideEditorRepository.enableBuiltInModule(
+				await appOutsideEditorRepository.enableBuiltInModule(
 					path.join(__dirname, '..')
 				);
 

package/src/modules/localization/test/promiseUtils.test.js

@@ -1,8 +1,6 @@
-'use strict';
+import assert from 'assert';
 
-const assert = require('assert');
-
-const promiseUtils = require('../src/api/promiseUtils');
+import promiseUtils from '../src/api/promiseUtils.js';
 
 describe('fontoxml-development-tools-module-localization/promiseUtils', () => {
 	describe('.asPromise()', () => {

package/src/modules/operations/index.js

@@ -1,8 +1,7 @@
-'use strict';
+import commandOperation from './src/command.operation.js';
+import commandOperations from './src/command.operations.js';
 
-module.exports = (moduleRegistration) => {
-	[
-		require('./src/command.operations'),
-		require('./src/command.operation'),
-	].forEach((mod) => mod(moduleRegistration));
+export default (moduleRegistration) => {
+	commandOperations(moduleRegistration);
+	commandOperation(moduleRegistration);
 };

package/src/modules/operations/package.json

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

package/src/modules/operations/src/api/createOperationsTable.js

@@ -1,8 +1,6 @@
-'use strict';
+import FdtTable from '../../../../../src/FdtTable.js';
 
-const FdtTable = require('../../../../../src/FdtTable');
-
-module.exports = function createOperationsTable(moduleRegistration) {
+export default function createOperationsTable(moduleRegistration) {
 	const config = moduleRegistration.getConfiguration('operations');
 
 	const columns = [
@@ -41,4 +39,4 @@ module.exports = function createOperationsTable(moduleRegistration) {
 			})
 		)
 	);
-};
+}

package/src/modules/operations/src/api/getOperation.js

@@ -1,6 +1,4 @@
-'use strict';
-
-const getOperations = require('./getOperations');
+import getOperations from './getOperations.js';
 
 function getOperationRegistry(workingDirectory, roots) {
 	return getOperations(workingDirectory, roots).then((operationList) =>
@@ -43,7 +41,7 @@ function expandOperationDefinition(mapping, operationName) {
 	return operation;
 }
 
-module.exports = function getOperation(
+export default function getOperation(
 	workingDirectory,
 	operationName,
 	roots,
@@ -52,4 +50,4 @@ module.exports = function getOperation(
 	return getOperationRegistry(workingDirectory, roots).then((mapping) =>
 		expandOperationDefinition(mapping, operationName)
 	);
-};
+}

package/src/modules/operations/src/api/getOperations.js

@@ -1,13 +1,8 @@
-'use strict';
+import fs from 'fs';
+import glob from 'globby';
+import path from 'path';
 
-const glob = require('globby');
-const path = require('path');
-
-module.exports = function getOperations(
-	workingDirectory,
-	roots,
-	ignoreSymlinks
-) {
+export default function getOperations(workingDirectory, roots, ignoreSymlinks) {
 	return glob(
 		Array.isArray(roots)
 			? roots.map((root) => path.join(root, '**', 'operations?(-*).json'))
@@ -23,10 +18,13 @@ module.exports = function getOperations(
 		}
 	).then((operationsJsons) => {
 		return operationsJsons.reduce((allOps, operationsJson) => {
-			const operations = require(path.join(
-				workingDirectory,
-				operationsJson
-			));
+			const operations = JSON.parse(
+				fs.readFileSync(
+					path.join(workingDirectory, operationsJson),
+					'utf-8'
+				)
+			);
+
 			return allOps.concat(
 				Object.keys(operations)
 					.filter((operationName) => !!operations[operationName])
@@ -39,4 +37,4 @@ module.exports = function getOperations(
 			);
 		}, []);
 	});
-};
+}

package/src/modules/operations/src/command.operation.controller.js

@@ -1,6 +1,4 @@
-'use strict';
-
-const getOperation = require('./api/getOperation');
+import getOperation from './api/getOperation.js';
 
 function recurseSteps(res, operation, isGetStateSteps) {
 	const prop =
@@ -70,7 +68,7 @@ function echoOperationSummary(_req, res, operationSummary) {
 	}
 }
 
-module.exports = function operationCommand(req, res) {
+export default function operationCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	let destroySpinner = res.spinner('Looking up operation...');
@@ -85,4 +83,4 @@ module.exports = function operationCommand(req, res) {
 		res.break();
 		echoOperationSummary(req, res, operation);
 	});
-};
+}

package/src/modules/operations/src/command.operation.js

@@ -1,8 +1,15 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-module.exports = (moduleRegistration) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration) => {
 	moduleRegistration
-		.registerCommand('operation', './command.operation.controller')
+		.registerCommand(
+			'operation',
+			path.resolve(__dirname, 'command.operation.controller.js')
+		)
 		.setDescription('Output information about a specific operation.')
 
 		.setRequiresEditorRepository()

package/src/modules/operations/src/command.operations.controller.js

@@ -1,9 +1,7 @@
-'use strict';
+import createOperationsTable from './api/createOperationsTable.js';
+import getOperations from './api/getOperations.js';
 
-const createOperationsTable = require('./api/createOperationsTable');
-const getOperations = require('./api/getOperations');
-
-module.exports = function operationsCommand(req, res) {
+export default function operationsCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	let destroySpinner = res.spinner('Looking up operations...');
@@ -26,4 +24,4 @@ module.exports = function operationsCommand(req, res) {
 			req.options.export
 		);
 	});
-};
+}

package/src/modules/operations/src/command.operations.js

@@ -1,8 +1,12 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const createOperationsTable = require('./api/createOperationsTable');
+import createOperationsTable from './api/createOperationsTable.js';
 
-module.exports = (moduleRegistration) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration) => {
 	moduleRegistration.registerConfiguration('operations', {
 		defaultColumns: ['name', 'file', 'label'],
 	});
@@ -10,7 +14,10 @@ module.exports = (moduleRegistration) => {
 	const table = createOperationsTable(moduleRegistration);
 
 	moduleRegistration
-		.registerCommand('operations', './command.operations.controller')
+		.registerCommand(
+			'operations',
+			path.resolve(__dirname, 'command.operations.controller.js')
+		)
 		.addAlias('list-operations')
 		.setDescription(
 			'Output a table with information about all operations defined in a Fonto Editor repository.'

package/src/modules/operations/test/command.operation.test.js

@@ -1,11 +1,11 @@
-'use strict';
+import assert from 'assert';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const assert = require('assert');
-const path = require('path');
+import { App } from '../../../../index.js';
 
-const fontoxmlDevelopmentTools = require('../../../../');
-
-const App = fontoxmlDevelopmentTools.App;
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const defaultStdoutColumns = process.stdout.columns;
 
@@ -13,20 +13,21 @@ let app;
 let oldCwd;
 
 describe('fontoxml-development-tools-module-operations/command.operation', () => {
-	beforeEach(() => {
+	beforeEach(async () => {
 		process.stdout.columns = 150;
 
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app'));
 
-		app = new App({
+		app = new App();
+		await app.init({
 			appName: 'fontoxml-development-tools-module-operations-test',
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			testMode: true,
 		});
 
-		app.enableBuiltInModule(path.join(__dirname, '..'));
+		await app.enableBuiltInModule(path.join(__dirname, '..'));
 	});
 
 	afterEach(() => {

package/src/modules/operations/test/command.operations.test.js

@@ -1,11 +1,11 @@
-'use strict';
+import assert from 'assert';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const assert = require('assert');
-const path = require('path');
+import { App } from '../../../../index.js';
 
-const fontoxmlDevelopmentTools = require('../../../../');
-
-const App = fontoxmlDevelopmentTools.App;
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const defaultStdoutColumns = process.stdout.columns;
 
@@ -13,7 +13,7 @@ let app;
 let oldCwd;
 
 describe('fontoxml-development-tools-module-operations/command.operations', () => {
-	beforeEach(() => {
+	beforeEach(async () => {
 		// cli-table, the package which outputs the table, uses this value, so make sure we have enough output width to
 		// output the table in unit tests.
 		process.stdout.columns = 150;
@@ -21,14 +21,16 @@ describe('fontoxml-development-tools-module-operations/command.operations', () =
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app'));
 
-		app = new App({
+		app = new App();
+
+		await app.init({
 			appName: 'fontoxml-development-tools-module-operations-test',
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			testMode: true,
 		});
 
-		app.enableBuiltInModule(path.join(__dirname, '..'));
+		await app.enableBuiltInModule(path.join(__dirname, '..'));
 	});
 
 	afterEach(() => {

package/src/modules/operations/test/getOperation.test.js

@@ -1,9 +1,11 @@
-'use strict';
+import assert from 'assert';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const assert = require('assert');
-const path = require('path');
+import getOperation from '../src/api/getOperation.js';
 
-const getOperation = require('../src/api/getOperation');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const appPath = path.join(__dirname, 'app');
 

package/src/modules/operations/test/getOperations.test.js

@@ -1,9 +1,11 @@
-'use strict';
+import assert from 'assert';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const assert = require('assert');
-const path = require('path');
+import getOperations from '../src/api/getOperations.js';
 
-const getOperations = require('../src/api/getOperations');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const appPath = path.join(__dirname, 'app');