@fontoxml/fontoxml-development-tools 3.7.0 → 3.8.1

package/src/modules/schema/test/command.attribute.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-schema/command.attribute', () => {
-	beforeEach(() => {
+	beforeEach(async () => {
 		process.stdout.columns = 150;
 
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app-commands'));
 
-		app = new App({
+		app = new App();
+		await app.init({
 			testMode: true,
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			appName: 'fontoxml-development-tools-module-schema-test',
 		});
 
-		app.enableBuiltInModule(path.join(__dirname, '..'));
+		await app.enableBuiltInModule(path.join(__dirname, '..'));
 	});
 
 	afterEach(() => {
@@ -437,19 +438,20 @@ describe('fontoxml-development-tools-module-schema/command.attribute', () => {
 		});
 
 		describe('supports a multi schema app directory', () => {
-			beforeEach(() => {
+			beforeEach(async () => {
 				process.chdir(
 					path.join(__dirname, 'app-commands-multi-schema')
 				);
 
-				app = new App({
+				app = new App();
+				await app.init({
 					appName: 'fontoxml-development-tools-module-schema-test',
 					skipAddModules: true,
 					skipWarnIfNotInsideEditorRepository: true,
 					testMode: true,
 				});
 
-				app.enableBuiltInModule(path.join(__dirname, '..'));
+				await app.enableBuiltInModule(path.join(__dirname, '..'));
 			});
 
 			it('supports the --schema option in a multi schema app directory (schema-1)', () => {

package/src/modules/schema/test/command.attributes.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-schema/command.attributes', () => {
-	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-schema/command.attributes', () => {
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app-commands'));
 
-		app = new App({
+		app = new App();
+		await app.init({
 			testMode: true,
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			appName: 'fontoxml-development-tools-module-schema-test',
 		});
 
-		app.enableBuiltInModule(path.join(__dirname, '..'));
+		await app.enableBuiltInModule(path.join(__dirname, '..'));
 	});
 
 	afterEach(() => {
@@ -356,19 +357,20 @@ describe('fontoxml-development-tools-module-schema/command.attributes', () => {
 		});
 
 		describe('supports a multi schema app directory', () => {
-			beforeEach(() => {
+			beforeEach(async () => {
 				process.chdir(
 					path.join(__dirname, 'app-commands-multi-schema')
 				);
 
-				app = new App({
+				app = new App();
+				await app.init({
 					appName: 'fontoxml-development-tools-module-schema-test',
 					skipAddModules: true,
 					skipWarnIfNotInsideEditorRepository: true,
 					testMode: true,
 				});
 
-				app.enableBuiltInModule(path.join(__dirname, '..'));
+				await app.enableBuiltInModule(path.join(__dirname, '..'));
 			});
 
 			it('supports the --schema option in a multi schema app directory (schema-1)', () => {

package/src/modules/schema/test/command.element.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-schema/command.element', () => {
-	beforeEach(() => {
+	beforeEach(async () => {
 		process.stdout.columns = 150;
 
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app-commands'));
 
-		app = new App({
+		app = new App();
+		await app.init({
 			testMode: true,
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			appName: 'fontoxml-development-tools-module-schema-test',
 		});
 
-		app.enableBuiltInModule(path.join(__dirname, '..'));
+		await app.enableBuiltInModule(path.join(__dirname, '..'));
 	});
 
 	afterEach(() => {
@@ -763,19 +764,20 @@ describe('fontoxml-development-tools-module-schema/command.element', () => {
 		});
 
 		describe('supports a multi schema app directory', () => {
-			beforeEach(() => {
+			beforeEach(async () => {
 				process.chdir(
 					path.join(__dirname, 'app-commands-multi-schema')
 				);
 
-				app = new App({
+				app = new App();
+				await app.init({
 					appName: 'fontoxml-development-tools-module-schema-test',
 					skipAddModules: true,
 					skipWarnIfNotInsideEditorRepository: true,
 					testMode: true,
 				});
 
-				app.enableBuiltInModule(path.join(__dirname, '..'));
+				await app.enableBuiltInModule(path.join(__dirname, '..'));
 			});
 
 			it('supports the --schema option in a multi schema app directory (schema-1)', () => {

package/src/modules/schema/test/command.elements.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-schema/command.elements', () => {
-	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-schema/command.elements', () => {
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app-commands'));
 
-		app = new App({
+		app = new App();
+		await app.init({
 			testMode: true,
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			appName: 'fontoxml-development-tools-module-schema-test',
 		});
 
-		app.enableBuiltInModule(path.join(__dirname, '..'));
+		await app.enableBuiltInModule(path.join(__dirname, '..'));
 	});
 
 	afterEach(() => {
@@ -582,19 +583,20 @@ describe('fontoxml-development-tools-module-schema/command.elements', () => {
 		});
 
 		describe('supports a multi schema app directory', () => {
-			beforeEach(() => {
+			beforeEach(async () => {
 				process.chdir(
 					path.join(__dirname, 'app-commands-multi-schema')
 				);
 
-				app = new App({
+				app = new App();
+				await app.init({
 					appName: 'fontoxml-development-tools-module-schema-test',
 					skipAddModules: true,
 					skipWarnIfNotInsideEditorRepository: true,
 					testMode: true,
 				});
 
-				app.enableBuiltInModule(path.join(__dirname, '..'));
+				await app.enableBuiltInModule(path.join(__dirname, '..'));
 			});
 
 			it('supports the --schema option in a multi schema app directory (schema-1)', () => {

package/src/modules/schema/test/command.schemas.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-schema/command.schemas', () => {
-	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 = 200;
@@ -21,14 +21,15 @@ describe('fontoxml-development-tools-module-schema/command.schemas', () => {
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app'));
 
-		app = new App({
+		app = new App();
+		await app.init({
 			appName: 'fontoxml-development-tools-module-schema-test',
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			testMode: true,
 		});
 
-		app.enableBuiltInModule(path.join(__dirname, '..'));
+		await app.enableBuiltInModule(path.join(__dirname, '..'));
 	});
 
 	afterEach(() => {

package/src/modules/schema/test/command.simpletypes.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-schema/command.simpletypes', () => {
-	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-schema/command.simpletypes', () => {
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app-commands'));
 
-		app = new App({
+		app = new App();
+		await app.init({
 			appName: 'fontoxml-development-tools-module-schema-test',
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			testMode: true,
 		});
 
-		app.enableBuiltInModule(path.join(__dirname, '..'));
+		await app.enableBuiltInModule(path.join(__dirname, '..'));
 	});
 
 	afterEach(() => {

package/src/modules/schema/test/getClosestMatchingSchemaSummary.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 getClosestMatchingSchemaSummary from '../src/api/getClosestMatchingSchemaSummary.js';
 
-const getClosestMatchingSchemaSummary = require('../src/api/getClosestMatchingSchemaSummary');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 function formatPath(p) {
 	return p.split('/').join(path.sep);

package/src/modules/schema/test/getSchemaSummaries.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 getSchemaSummaries from '../src/api/getSchemaSummaries.js';
 
-const getSchemaSummaries = require('../src/api/getSchemaSummaries');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 function formatPath(p) {
 	return p.split('/').join(path.sep);

package/src/modules/schema/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 schemaModule from '../index.js';
 
-const fontoxmlDevelopmentTools = require('../../../../');
-
-const App = fontoxmlDevelopmentTools.App;
-
-const schemaModule = require('../');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 let app;
 let oldCwd;
 let loadedSchemaModule;
 
 describe('fontoxml-development-tools-module-schema', () => {
-	beforeEach(() => {
+	beforeEach(async () => {
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app'));
 
-		app = new App({
+		app = new App();
+		await app.init({
 			appName: 'fontoxml-development-tools-module-schema-test',
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			testMode: true,
 		});
 
-		loadedSchemaModule = app.enableBuiltInModule(
+		loadedSchemaModule = await app.enableBuiltInModule(
 			path.join(__dirname, '..')
 		);
 	});
@@ -120,17 +120,18 @@ describe('fontoxml-development-tools-module-schema', () => {
 			});
 		});
 
-		it('outputs none value when there are no fdt modules configured', () => {
+		it('outputs none value when there are no fdt modules configured', async () => {
 			process.chdir(path.join(__dirname, 'app-empty'));
 
-			const appEmpty = new App({
+			const appEmpty = new App();
+			await appEmpty.init({
 				appName: 'fontoxml-development-tools-module-schema-test',
 				skipAddModules: true,
 				skipWarnIfNotInsideEditorRepository: true,
 				testMode: true,
 			});
 
-			loadedSchemaModule = appEmpty.enableBuiltInModule(
+			loadedSchemaModule = await appEmpty.enableBuiltInModule(
 				path.join(__dirname, '..')
 			);
 
@@ -149,19 +150,21 @@ describe('fontoxml-development-tools-module-schema', () => {
 			});
 		});
 
-		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-schema-test',
 				skipAddModules: true,
 				skipWarnIfNotInsideEditorRepository: true,
 				testMode: true,
 			});
 
-			loadedSchemaModule = appOutsideEditorRepository.enableBuiltInModule(
-				path.join(__dirname, '..')
-			);
+			loadedSchemaModule =
+				await appOutsideEditorRepository.enableBuiltInModule(
+					path.join(__dirname, '..')
+				);
 
 			return appOutsideEditorRepository.run(['who']).then(() => {
 				const startPosition =
@@ -180,35 +183,32 @@ describe('fontoxml-development-tools-module-schema', () => {
 			});
 		});
 
-		it('throws when a schema file is broken', (done) => {
+		it('throws when a schema file is broken', async () => {
 			process.chdir(path.join(__dirname, 'app-broken-schema'));
 
-			const appBrokenSchema = new App({
+			const appBrokenSchema = new App();
+			await appBrokenSchema.init({
 				appName: 'fontoxml-development-tools-module-schema-test',
 				skipAddModules: true,
 				skipWarnIfNotInsideEditorRepository: true,
 				testMode: true,
 			});
 
-			loadedSchemaModule = appBrokenSchema.enableBuiltInModule(
+			loadedSchemaModule = await appBrokenSchema.enableBuiltInModule(
 				path.join(__dirname, '..')
 			);
 
-			appBrokenSchema
-				.run(['who'])
-				.then(() => {
-					done(new Error('Should have thrown'));
-				})
-				.catch((error) => {
-					assert.strictEqual(
-						error.message,
-						'Could not read schema file.'
-					);
-					done();
-				})
-				.catch((assertError) => {
-					done(assertError);
-				});
+			try {
+				await appBrokenSchema.run(['who']);
+			} catch (error) {
+				assert.strictEqual(
+					error.message,
+					'Could not read schema file.'
+				);
+				return;
+			}
+
+			throw new Error('Should have thrown');
 		});
 	});
 });

package/src/modules/schema/test/renderSimpleType.test.js

@@ -1,14 +1,13 @@
-'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 SchemaSummary from '../src/api/SchemaSummary.js';
+import renderSimpleType from '../src/helpers/renderSimpleType.js';
 
-const fontoxmlDevelopmentTools = require('../../../../');
-
-const App = fontoxmlDevelopmentTools.App;
-
-const renderSimpleType = require('../src/helpers/renderSimpleType');
-const SchemaSummary = require('../src/api/SchemaSummary');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 let app;
 let oldCwd;
@@ -77,18 +76,18 @@ function createStubbedData() {
 }
 
 describe('fontoxml-development-tools-module-schema/helpers/renderSimpleType', () => {
-	beforeEach(() => {
+	beforeEach(async () => {
 		oldCwd = process.cwd();
 		process.chdir(path.join(__dirname, 'app'));
-
-		app = new App({
+		app = new App();
+		await app.init({
 			appName: 'fontoxml-development-tools-module-schema-test',
 			skipAddModules: true,
 			skipWarnIfNotInsideEditorRepository: true,
 			testMode: true,
 		});
 
-		app.enableBuiltInModule(path.join(__dirname, '..'));
+		await app.enableBuiltInModule(path.join(__dirname, '..'));
 
 		stubbedData = createStubbedData();
 		schemaSummary = new SchemaSummary(stubbedData);

package/src/modules/schema/test/restrictionFormatter.test.js

@@ -1,9 +1,7 @@
-'use strict';
+import assert from 'assert';
+import os from 'os';
 
-const assert = require('assert');
-const os = require('os');
-
-const restrictionFormatter = require('../src/helpers/restrictionFormatter');
+import restrictionFormatter from '../src/helpers/restrictionFormatter.js';
 
 describe('fontoxml-development-tools-module-schema/helpers/restrictionFormatter', () => {
 	it('exposes the restrictionFormatter helpers', () => {

package/src/modules/schema-compiler/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 (moduleRegistration) => {
 	const schemaCompilerCommand = moduleRegistration
 		.registerHiddenCommand('schema-compiler')
 		.setDescription(
@@ -10,12 +15,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, schemaCompilerCommand));
+	commandBuild(moduleRegistration, schemaCompilerCommand);
+	commandDownloadSelfContained(moduleRegistration, schemaCompilerCommand);
+	commandInit(moduleRegistration, schemaCompilerCommand);
+	commandRun(moduleRegistration, schemaCompilerCommand);
+	commandUpgrade(moduleRegistration, schemaCompilerCommand);
+	commandVersions(moduleRegistration, schemaCompilerCommand);
 };

package/src/modules/schema-compiler/package.json

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