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

package/src/modules/editor-pre-7-7-0/test/api/schema/testHelpers.js

@@ -1,6 +1,4 @@
-'use strict';
-
-const ElementSummary = require('../../../../schema/src/api/ElementSummary');
+import ElementSummary from '../../../../schema/src/api/ElementSummary.js';
 
 class MockElementSummary extends ElementSummary {
 	constructor(elementDefinition, parentElements = [], childElements = []) {
@@ -27,7 +25,7 @@ class MockElementSummary extends ElementSummary {
 	}
 }
 
-function createMockCompiledSchema(elements = []) {
+export function createMockCompiledSchema(elements = []) {
 	return {
 		attributes: [],
 		contentModels: [],
@@ -38,7 +36,7 @@ function createMockCompiledSchema(elements = []) {
 	};
 }
 
-function createMockElementSummary(
+export function createMockElementSummary(
 	elementDefinition,
 	parentElements,
 	childElements
@@ -50,7 +48,7 @@ function createMockElementSummary(
 	);
 }
 
-function createMockCompiledSchemaResultsByXsdPath(schemasWithElements) {
+export function createMockCompiledSchemaResultsByXsdPath(schemasWithElements) {
 	const compiledSchemaResultsByXsdPath = {};
 	schemasWithElements.forEach(
 		(elements, index) =>
@@ -70,7 +68,7 @@ function createMockCompiledSchemaResultsByXsdPath(schemasWithElements) {
 	return compiledSchemaResultsByXsdPath;
 }
 
-function createMockElementInformation(
+export function createMockElementInformation(
 	localName,
 	namespacePrefix = null,
 	namespaceUri = null,
@@ -100,10 +98,3 @@ function createMockElementInformation(
 
 	return elementInformation;
 }
-
-module.exports = {
-	createMockCompiledSchema,
-	createMockCompiledSchemaResultsByXsdPath,
-	createMockElementInformation,
-	createMockElementSummary,
-};

package/src/modules/editor-pre-7-7-0/test/api/schema/zipSchemaSource.test.js

@@ -1,12 +1,14 @@
-'use strict';
+import assert from 'assert';
+import fs from 'fs-extra';
+import path from 'path';
+import unzipper from 'unzipper';
+import { fileURLToPath } from 'url';
 
-const assert = require('assert');
-const fs = require('fs-extra');
-const path = require('path');
-const unzipper = require('unzipper');
+import createTempDirectory from '../../../../editor/test/helpers/createTempDirectory.js';
+import schemaZipHelpers from '../../../src/api/schema/zipHelpers.js';
 
-const createTempDirectory = require('../../../../editor/test/helpers/createTempDirectory');
-const schemaZipHelpers = require('../../../src/api/schema/zipHelpers');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 describe('api/schema/schemaZipHelpers', () => {
 	describe('zipSchemaSource', () => {

package/src/modules/localization/index.js

@@ -1,12 +1,14 @@
-'use strict';
+import fs from 'fs';
+import glob from 'globby';
+import path from 'path';
 
-module.exports = (moduleRegistration) => {
-	moduleRegistration.registerContextInformer((req, res) => {
-		// Lazy require
-		const fs = require('fs');
-		const glob = require('globby');
-		const path = require('path');
+import commandExtract from './src/command.extract.js';
+import commandMerge from './src/command.merge.js';
+import commandMessages from './src/command.messages.js';
+import commandUpdate from './src/command.update.js';
 
+export default (moduleRegistration) => {
+	moduleRegistration.registerContextInformer((req, res) => {
 		res.caption('Localization');
 
 		let messageBundles;
@@ -62,10 +64,8 @@ module.exports = (moduleRegistration) => {
 		.setDescription('Tools for localizing Fonto Editor.')
 		.setAsHelpCommand();
 
-	[
-		require('./src/command.extract.js'),
-		require('./src/command.merge.js'),
-		require('./src/command.messages.js'),
-		require('./src/command.update.js'),
-	].forEach((mod) => mod(moduleRegistration, localizationCommand));
+	commandExtract(moduleRegistration, localizationCommand);
+	commandMerge(moduleRegistration, localizationCommand);
+	commandMessages(moduleRegistration, localizationCommand);
+	commandUpdate(moduleRegistration, localizationCommand);
 };

package/src/modules/localization/package.json

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

package/src/modules/localization/src/api/Message.js

@@ -1,4 +1,4 @@
-const parser = require('./parser');
+import parser from './parser.cjs';
 
 function adaptMetadata(meta) {
 	if (!meta) {
@@ -31,7 +31,7 @@ function mergeConflicts(conflicts1, conflicts2) {
 	return conflicts1.concat(conflicts2.filter((c) => !conflicts1.includes(c)));
 }
 
-module.exports = class Message {
+export default class Message {
 	/**
 	 * @param  {Object}           props
 	 * @param  {string}           props.original
@@ -158,4 +158,4 @@ module.exports = class Message {
 
 		this._metadata = mergeMetadata(this._metadata, message._metadata);
 	}
-};
+}

package/src/modules/localization/src/api/createMessagesTable.js

@@ -1,8 +1,6 @@
-'use strict';
+import FdtTable from '../../../../../src/FdtTable.js';
 
-const FdtTable = require('../../../../../src/FdtTable');
-
-module.exports = function createMessagesTable(moduleRegistration) {
+export default function createMessagesTable(moduleRegistration) {
 	return new FdtTable(moduleRegistration, [
 		{
 			name: 'in',
@@ -35,4 +33,4 @@ module.exports = function createMessagesTable(moduleRegistration) {
 							.join('\n'),
 		},
 	]);
-};
+}

package/src/modules/localization/src/api/deduplicateMessages.js

@@ -3,7 +3,7 @@
  *
  * @return  {Message[]}  messages with duplicates merged
  */
-module.exports = function deduplicateMessages(messages) {
+export default function deduplicateMessages(messages) {
 	const byOriginal = Object.create(null);
 	return messages.reduce((deduped, msg) => {
 		const other = byOriginal[msg.original];
@@ -15,4 +15,4 @@ module.exports = function deduplicateMessages(messages) {
 		byOriginal[msg.original] = msg;
 		return deduped.concat([msg]);
 	}, []);
-};
+}

package/src/modules/localization/src/api/extractMessages.js

@@ -1,6 +1,6 @@
-const getOperationMessages = require('./getOperationMessages');
-const getSourceMessages = require('./getSourceMessages');
-const promiseUtils = require('./promiseUtils');
+import getOperationMessages from './getOperationMessages.js';
+import getSourceMessages from './getSourceMessages.js';
+import promiseUtils from './promiseUtils.js';
 
 const DEFAULT_OPTIONS = {
 	includeLineAndColumn: true,
@@ -20,8 +20,8 @@ function getMessagesForPackage(pkg, options) {
  *
  * @return  {Promise.<Message[]>}
  */
-module.exports = function extractMessages(packages, options) {
+export default function extractMessages(packages, options) {
 	return promiseUtils.flatMap(packages, (pkg) =>
 		getMessagesForPackage(pkg, { ...DEFAULT_OPTIONS, ...options })
 	);
-};
+}

package/src/modules/localization/src/api/getMessagesFromOperation.js

@@ -1,4 +1,4 @@
-const Message = require('./Message');
+import Message from './Message.js';
 
 const TRANSLATEABLE_STRING_PREFIX = 't__';
 
@@ -9,7 +9,7 @@ const TRANSLATEABLE_STRING_PREFIX = 't__';
  *
  * @return  {Message[]}
  */
-module.exports = function getMessagesFromOperation(
+export default function getMessagesFromOperation(
 	operation,
 	packageName,
 	fileName
@@ -44,4 +44,4 @@ module.exports = function getMessagesFromOperation(
 	})(operation);
 
 	return messages;
-};
+}

package/src/modules/localization/src/api/getMessagesFromSource.js

@@ -1,6 +1,11 @@
-const babel = require('@babel/core');
+import babel from '@babel/core';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const Message = require('./Message');
+import Message from './Message.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 function getDefineImportSourcePath(ancestry) {
 	if (
@@ -77,7 +82,7 @@ function getMessageString(message, fileName) {
  *
  * @return  {Message[]}
  */
-module.exports = function getMessagesFromSource(
+export default function getMessagesFromSource(
 	source,
 	packageName,
 	fileName,
@@ -162,4 +167,4 @@ module.exports = function getMessagesFromSource(
 	});
 
 	return messages;
-};
+}

package/src/modules/localization/src/api/getOperationMessages.js

@@ -1,11 +1,11 @@
-const fs = require('fs-extra');
-const path = require('path');
+import fs from 'fs-extra';
+import glob from 'glob';
+import path from 'path';
 
-const getMessagesFromOperation = require('./getMessagesFromOperation');
-const promiseUtils = require('./promiseUtils');
-
-const glob = promiseUtils.asPromise(require('glob'));
+import getMessagesFromOperation from './getMessagesFromOperation.js';
+import promiseUtils from './promiseUtils.js';
 
+const pGlob = promiseUtils.asPromise(glob);
 const readJson = promiseUtils.asPromise(fs.readJson);
 
 function readOperationsFromJson(path) {
@@ -19,12 +19,12 @@ function readOperationsFromJson(path) {
  *
  * @return  {Promise.<Message[]>}
  */
-module.exports = function getOperationMessages(pkg) {
+export default function getOperationMessages(pkg) {
 	const pattern =
 		pkg.name === 'config'
 			? 'operations?(-*).json'
 			: 'src/operations?(-*).json';
-	return glob(pattern, { cwd: pkg.path }).then((operationsFiles) =>
+	return pGlob(pattern, { cwd: pkg.path }).then((operationsFiles) =>
 		promiseUtils.flatMap(operationsFiles, (jsonFile) => {
 			return promiseUtils.flatMap(
 				readOperationsFromJson(path.join(pkg.path, jsonFile)),
@@ -32,4 +32,4 @@ module.exports = function getOperationMessages(pkg) {
 			);
 		})
 	);
-};
+}

package/src/modules/localization/src/api/getSourceMessages.js

@@ -1,10 +1,11 @@
-const fs = require('fs');
-const path = require('path');
+import fs from 'fs';
+import glob from 'glob';
+import path from 'path';
 
-const getMessagesFromSource = require('./getMessagesFromSource');
-const promiseUtils = require('./promiseUtils');
-const glob = promiseUtils.asPromise(require('glob'));
+import getMessagesFromSource from './getMessagesFromSource.js';
+import promiseUtils from './promiseUtils.js';
 
+const pGlob = promiseUtils.asPromise(glob);
 const readFile = promiseUtils.asPromise(fs.readFile);
 
 const sourceFilesGlob = '*.@(js|jsx|ts|tsx)';
@@ -15,13 +16,13 @@ const sourceFilesGlob = '*.@(js|jsx|ts|tsx)';
  *
  * @return  {Promise.<Message[]>}
  */
-module.exports = function getSourceMessages(pkg, options) {
+export default function getSourceMessages(pkg, options) {
 	const pattern =
 		pkg.name === 'config'
 			? `**/${sourceFilesGlob}`
 			: `src/**/${sourceFilesGlob}`;
 
-	return glob(pattern, { cwd: pkg.path }).then((sourceFiles) =>
+	return pGlob(pattern, { cwd: pkg.path }).then((sourceFiles) =>
 		promiseUtils.flatMap(sourceFiles, (sourceFile) => {
 			return readFile(path.join(pkg.path, sourceFile), 'utf8').then(
 				(source) =>
@@ -34,4 +35,4 @@ module.exports = function getSourceMessages(pkg, options) {
 			);
 		})
 	);
-};
+}

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

@@ -1,6 +1,11 @@
-module.exports = {
-	deduplicateMessages: require('./deduplicateMessages'),
-	extractMessages: require('./extractMessages'),
-	loadMessageBundle: require('./loadMessageBundle'),
-	updateMessagesWithTemplate: require('./updateMessagesWithTemplate'),
+import deduplicateMessages from './deduplicateMessages.js';
+import extractMessages from './extractMessages.js';
+import loadMessageBundle from './loadMessageBundle.js';
+import updateMessagesWithTemplate from './updateMessagesWithTemplate.js';
+
+export default {
+	deduplicateMessages,
+	extractMessages,
+	loadMessageBundle,
+	updateMessagesWithTemplate,
 };

package/src/modules/localization/src/api/loadMessageBundle.js

@@ -1,6 +1,7 @@
-const fs = require('fs-extra');
-const Message = require('./Message');
-const promiseUtils = require('./promiseUtils');
+import fs from 'fs-extra';
+
+import Message from './Message.js';
+import promiseUtils from './promiseUtils.js';
 
 const readJson = promiseUtils.asPromise(fs.readJson);
 
@@ -9,8 +10,8 @@ const readJson = promiseUtils.asPromise(fs.readJson);
  *
  * @return  {Promise.<Message[]>}
  */
-module.exports = function loadMessageBundle(path) {
+export default function loadMessageBundle(path) {
 	return readJson(path).then((messages) =>
 		messages.map((msg) => Message.fromJSON(msg))
 	);
-};
+}

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

@@ -52,7 +52,7 @@ function flatMap(valuesOrPromises, cb) {
 	);
 }
 
-module.exports = {
+export default {
 	asPromise,
 	flatten,
 	flatMap,

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

@@ -4,7 +4,7 @@
  *
  * @return  {{messages: Message[], added: Message[], removed: Message[]}}
  */
-module.exports = function updateMessagesWithTemplate(
+export default function updateMessagesWithTemplate(
 	oldMessages,
 	templateMessages
 ) {
@@ -28,4 +28,4 @@ module.exports = function updateMessagesWithTemplate(
 	);
 
 	return { messages, added, removed };
-};
+}

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

@@ -1,15 +1,13 @@
-'use strict';
+import fs from 'fs';
+import path from 'path';
 
-const fs = require('fs');
-const path = require('path');
-
-const deduplicateMessages = require('./api/deduplicateMessages');
-const extractMessages = require('./api/extractMessages');
-const promiseUtils = require('./api/promiseUtils');
+import deduplicateMessages from './api/deduplicateMessages.js';
+import extractMessages from './api/extractMessages.js';
+import promiseUtils from './api/promiseUtils.js';
 
 const writeFile = promiseUtils.asPromise(fs.writeFile);
 
-module.exports = function localizationExtractCommand(req, res) {
+export default function localizationExtractCommand(req, res) {
 	if (req.parameters.output) {
 		res.caption(req.command.getLongName());
 	}
@@ -58,4 +56,4 @@ module.exports = function localizationExtractCommand(req, res) {
 				);
 			}
 		});
-};
+}

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

@@ -1,8 +1,15 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-module.exports = (moduleRegistration, localizationCommand) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration, localizationCommand) => {
 	localizationCommand
-		.addCommand('extract', './command.extract.controller')
+		.addCommand(
+			'extract',
+			path.resolve(__dirname, 'command.extract.controller.js')
+		)
 		.setDescription(
 			'Extract messages from packages and save them in a message bundle template.'
 		)

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

@@ -1,11 +1,9 @@
-'use strict';
+import fs from 'fs';
+import path from 'path';
 
-const fs = require('fs');
-const path = require('path');
-
-const deduplicateMessages = require('./api/deduplicateMessages');
-const loadMessageBundle = require('./api/loadMessageBundle');
-const promiseUtils = require('./api/promiseUtils');
+import deduplicateMessages from './api/deduplicateMessages.js';
+import loadMessageBundle from './api/loadMessageBundle.js';
+import promiseUtils from './api/promiseUtils.js';
 
 const writeFile = promiseUtils.asPromise(fs.writeFile);
 
@@ -22,7 +20,7 @@ function outputPropertiesWithFormatter(res, properties, formatter) {
 	res.properties(formattedProperties);
 }
 
-module.exports = function localizationMergeCommand(req, res) {
+export default function localizationMergeCommand(req, res) {
 	if (req.parameters.output) {
 		res.caption(req.command.getLongName());
 	}
@@ -78,4 +76,4 @@ module.exports = function localizationMergeCommand(req, res) {
 				res.debug(`Exported ${messages.length} messages to bundle.`);
 			}
 		});
-};
+}

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

@@ -1,8 +1,15 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-module.exports = (moduleRegistration, localizationCommand) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration, localizationCommand) => {
 	localizationCommand
-		.addCommand('merge', './command.merge.controller')
+		.addCommand(
+			'merge',
+			path.resolve(__dirname, 'command.merge.controller.js')
+		)
 		.setDescription('Merge multiple message bundles into a single bundle.')
 
 		// Set to raw output when the output parameter is not set.

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

@@ -1,11 +1,9 @@
-'use strict';
+import path from 'path';
 
-const path = require('path');
+import createMessagesTable from './api/createMessagesTable.js';
+import loadMessageBundle from './api/loadMessageBundle.js';
 
-const createMessagesTable = require('./api/createMessagesTable');
-const loadMessageBundle = require('./api/loadMessageBundle');
-
-module.exports = function messagesCommand(req, res) {
+export default function messagesCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	const destroySpinner = res.spinner('Looking up messages...');
@@ -150,4 +148,4 @@ module.exports = function messagesCommand(req, res) {
 			);
 		}
 	);
-};
+}

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

@@ -1,12 +1,19 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const createMessagesTable = require('./api/createMessagesTable');
+import createMessagesTable from './api/createMessagesTable.js';
 
-module.exports = (moduleRegistration, localizationCommand) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration, localizationCommand) => {
 	const table = createMessagesTable(moduleRegistration);
 
 	localizationCommand
-		.addCommand('messages', './command.messages.controller')
+		.addCommand(
+			'messages',
+			path.resolve(__dirname, 'command.messages.controller.js')
+		)
 		.setDescription(
 			'Output a table with information about all messages in a message (template) bundle.'
 		)

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

@@ -1,16 +1,14 @@
-'use strict';
+import fs from 'fs';
+import path from 'path';
 
-const fs = require('fs');
-const path = require('path');
-
-const deduplicateMessages = require('./api/deduplicateMessages');
-const loadMessageBundle = require('./api/loadMessageBundle');
-const promiseUtils = require('./api/promiseUtils');
-const updateMessagesWithTemplate = require('./api/updateMessagesWithTemplate');
+import deduplicateMessages from './api/deduplicateMessages.js';
+import loadMessageBundle from './api/loadMessageBundle.js';
+import promiseUtils from './api/promiseUtils.js';
+import updateMessagesWithTemplate from './api/updateMessagesWithTemplate.js';
 
 const writeFile = promiseUtils.asPromise(fs.writeFile);
 
-module.exports = function localizationUpdateCommand(req, res) {
+export default function localizationUpdateCommand(req, res) {
 	if (!req.options['output-to-stdout']) {
 		res.caption(req.command.getLongName());
 	}
@@ -52,4 +50,4 @@ module.exports = function localizationUpdateCommand(req, res) {
 				});
 			}
 		});
-};
+}

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

@@ -1,8 +1,15 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-module.exports = (moduleRegistration, localizationCommand) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration, localizationCommand) => {
 	localizationCommand
-		.addCommand('update', './command.update.controller')
+		.addCommand(
+			'update',
+			path.resolve(__dirname, 'command.update.controller.js')
+		)
 		.setDescription('Update message bundle with a new template bundle.')
 		// TODO: does this keep the local messages?
 

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

@@ -1,7 +1,7 @@
-const chai = require('chai');
+import chai from 'chai';
 
-const Message = require('../../src/api/Message');
-const roundtripThroughJson = require('./roundtripThroughJson');
+import Message from '../../src/api/Message.js';
+import roundtripThroughJson from './roundtripThroughJson.js';
 
 describe('Message', () => {
 	describe('fromSource()', () => {

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

@@ -1,9 +1,8 @@
-const chai = require('chai');
+import chai from 'chai';
 
-const deduplicateMessages = require('../../src/api/deduplicateMessages');
-const Message = require('../../src/api/Message');
-
-const roundtripThroughJson = require('./roundtripThroughJson');
+import deduplicateMessages from '../../src/api/deduplicateMessages.js';
+import Message from '../../src/api/Message.js';
+import roundtripThroughJson from './roundtripThroughJson.js';
 
 describe('deduplicateMessages()', () => {
 	it('merges messages with the same original, preserving the first occurence', () => {

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

@@ -1,8 +1,7 @@
-const chai = require('chai');
+import chai from 'chai';
 
-const getMessagesFromOperation = require('../../src/api/getMessagesFromOperation');
-
-const roundtripThroughJson = require('./roundtripThroughJson');
+import getMessagesFromOperation from '../../src/api/getMessagesFromOperation.js';
+import roundtripThroughJson from './roundtripThroughJson.js';
 
 describe('getMessagesFromOperation()', () => {
 	it('returns messages for all strings with the t__ prefix', () => {

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

@@ -1,8 +1,7 @@
-const chai = require('chai');
+import chai from 'chai';
 
-const getMessagesFromSource = require('../../src/api/getMessagesFromSource');
-
-const roundtripThroughJson = require('./roundtripThroughJson');
+import getMessagesFromSource from '../../src/api/getMessagesFromSource.js';
+import roundtripThroughJson from './roundtripThroughJson.js';
 
 function expectedMeta(line, column) {
 	return [