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

package/src/modules/schema/src/api/AttributeSummary.js

@@ -1,10 +1,8 @@
-'use strict';
-
 const INDEX = Symbol();
 const SCHEMAFILE = Symbol();
 const SIMPLETYPE_REF = Symbol();
 
-module.exports = class AttributeSummary {
+export default class AttributeSummary {
 	constructor(schemaFile, attributeDefinition) {
 		this[SCHEMAFILE] = schemaFile;
 
@@ -49,4 +47,4 @@ module.exports = class AttributeSummary {
 	getSimpleType() {
 		return this[SCHEMAFILE].getSimpleTypeByIndex(this[SIMPLETYPE_REF]);
 	}
-};
+}

package/src/modules/schema/src/api/ElementSummary.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const ATTRIBUTE_REFS = Symbol();
 const CONTENTMODEL_REF = Symbol();
 const INDEX = Symbol();
@@ -76,7 +74,7 @@ function getElementsReferringToElement(schemaFile, elementSummary) {
 	});
 }
 
-module.exports = class ElementSummary {
+export default class ElementSummary {
 	constructor(schemaFile, elementDefinition) {
 		this[SCHEMAFILE] = schemaFile;
 
@@ -161,4 +159,4 @@ module.exports = class ElementSummary {
 			return this.namespaceURI;
 		}
 	}
-};
+}

package/src/modules/schema/src/api/SchemaSummary.js

@@ -1,11 +1,10 @@
-'use strict';
+import { readFileSync } from 'fs';
+import path from 'path';
+import requireJs from 'requirejs';
 
-const path = require('path');
-const requireJs = require('requirejs');
-
-const AttributeSummary = require('./AttributeSummary');
-const ElementSummary = require('./ElementSummary');
-const SimpleTypeSummary = require('./SimpleTypeSummary');
+import AttributeSummary from './AttributeSummary.js';
+import ElementSummary from './ElementSummary.js';
+import SimpleTypeSummary from './SimpleTypeSummary.js';
 
 function findConfigurationSettings(instance) {
 	const pathPieces = instance.path.split(path.sep);
@@ -70,7 +69,7 @@ const ELEMENTS = Symbol();
 const LOCAL_ELEMENTS = Symbol();
 const SIMPLETYPES = Symbol();
 
-module.exports = class SchemaSummary {
+export default class SchemaSummary {
 	constructor(schemaPathOrData) {
 		const isInitializedWithData = typeof schemaPathOrData === 'object';
 		this.path = !isInitializedWithData ? schemaPathOrData : undefined;
@@ -83,7 +82,9 @@ module.exports = class SchemaSummary {
 			findConfigurationSettings(this);
 
 			try {
-				this[DATA] = require(this.path);
+				this[DATA] = JSON.parse(
+					readFileSync(path.resolve(this.path), 'utf8')
+				);
 			} catch (_error) {
 				throw new Error('Could not read schema file.');
 			}
@@ -264,4 +265,4 @@ module.exports = class SchemaSummary {
 
 		return false;
 	}
-};
+}

package/src/modules/schema/src/api/SimpleTypeSummary.js

@@ -1,6 +1,4 @@
-'use strict';
-
-const restrictionFormatter = require('../helpers/restrictionFormatter');
+import restrictionFormatter from '../helpers/restrictionFormatter.js';
 
 const BASE = Symbol();
 const ITEM_TYPE = Symbol();
@@ -25,7 +23,7 @@ function getSimpleTypeRestrictionsString(simpleType) {
 		.join(', ')} }`;
 }
 
-module.exports = class SimpleTypeSummary {
+export default class SimpleTypeSummary {
 	constructor(schemaFile, simpleTypeDefinition) {
 		this[SCHEMAFILE] = schemaFile;
 
@@ -137,4 +135,4 @@ module.exports = class SimpleTypeSummary {
 			}
 		}
 	}
-};
+}

package/src/modules/schema/src/api/createAttributesTable.js

@@ -1,8 +1,6 @@
-'use strict';
+import FdtTable from '../../../../../src/FdtTable.js';
 
-const FdtTable = require('../../../../../src/FdtTable');
-
-module.exports = function createAttributesTable(moduleRegistration) {
+export default function createAttributesTable(moduleRegistration) {
 	return new FdtTable(moduleRegistration, [
 		{
 			name: 'name',
@@ -53,4 +51,4 @@ module.exports = function createAttributesTable(moduleRegistration) {
 			},
 		},
 	]);
-};
+}

package/src/modules/schema/src/api/createElementsTable.js

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

package/src/modules/schema/src/api/createSchemasTable.js

@@ -1,10 +1,8 @@
-'use strict';
+import path from 'path';
 
-const path = require('path');
+import FdtTable from '../../../../../src/FdtTable.js';
 
-const FdtTable = require('../../../../../src/FdtTable');
-
-module.exports = function createSchemasTable(moduleRegistration) {
+export default function createSchemasTable(moduleRegistration) {
 	return new FdtTable(moduleRegistration, [
 		{
 			name: 'package',
@@ -30,4 +28,4 @@ module.exports = function createSchemasTable(moduleRegistration) {
 			value: (schema) => schema.getSchemaVersionString(),
 		},
 	]);
-};
+}

package/src/modules/schema/src/api/createSimpleTypesTable.js

@@ -1,8 +1,6 @@
-'use strict';
+import FdtTable from '../../../../../src/FdtTable.js';
 
-const FdtTable = require('../../../../../src/FdtTable');
-
-module.exports = function createSimpleTypesTable(moduleRegistration) {
+export default function createSimpleTypesTable(moduleRegistration) {
 	return new FdtTable(moduleRegistration, [
 		{
 			name: 'name',
@@ -23,4 +21,4 @@ module.exports = function createSimpleTypesTable(moduleRegistration) {
 			value: (element) => element.getSimpleTypeString(),
 		},
 	]);
-};
+}

package/src/modules/schema/src/api/getClosestMatchingSchemaSummary.js

@@ -1,13 +1,11 @@
-'use strict';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
 
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
+import getSchemaSummaries from './getSchemaSummaries.js';
+import SchemaSummary from './SchemaSummary.js';
 
-const SchemaSummary = require('./SchemaSummary');
-const getSchemaSummaries = require('./getSchemaSummaries');
-
-module.exports = function getClosestMatchingSchema(p, searchString) {
+export default function getClosestMatchingSchema(p, searchString) {
 	try {
 		fs.statSync(path.resolve(process.cwd(), searchString));
 		return new SchemaSummary(path.resolve(process.cwd(), searchString));
@@ -68,4 +66,4 @@ module.exports = function getClosestMatchingSchema(p, searchString) {
 	}
 
 	return results[0];
-};
+}

package/src/modules/schema/src/api/getSchemaSummaries.js

@@ -1,11 +1,9 @@
-'use strict';
+import glob from 'globby';
+import path from 'path';
 
-const glob = require('globby');
-const path = require('path');
+import SchemaSummary from './SchemaSummary.js';
 
-const SchemaSummary = require('./SchemaSummary');
-
-module.exports = function getSchemaSummaries(p) {
+export default function getSchemaSummaries(p) {
 	const basePath = path.resolve(p);
 
 	return glob
@@ -34,4 +32,4 @@ module.exports = function getSchemaSummaries(p) {
 		.map(
 			(schemaPath) => new SchemaSummary(path.join(basePath, schemaPath))
 		);
-};
+}

package/src/modules/schema/src/command.attribute.controller.js

@@ -1,9 +1,7 @@
-'use strict';
+import getClosestMatchingSchemaSummary from './api/getClosestMatchingSchemaSummary.js';
+import renderSimpleType from './helpers/renderSimpleType.js';
 
-const getClosestMatchingSchemaSummary = require('./api/getClosestMatchingSchemaSummary');
-const renderSimpleType = require('./helpers/renderSimpleType');
-
-module.exports = function attributeCommand(req, res) {
+export default function attributeCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	const destroySpinner = res.spinner('Looking up schemas...');

package/src/modules/schema/src/command.attribute.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('attribute', './command.attribute.controller')
+		.registerCommand(
+			'attribute',
+			path.resolve(__dirname, 'command.attribute.controller.js')
+		)
 		.setDescription(
 			'Output schema information about a specific attribute. An attribute may have different definitions in the same schema, this command summarizes them all.'
 		)

package/src/modules/schema/src/command.attributes.controller.js

@@ -1,9 +1,7 @@
-'use strict';
+import createAttributesTable from './api/createAttributesTable.js';
+import getClosestMatchingSchemaSummary from './api/getClosestMatchingSchemaSummary.js';
 
-const createAttributesTable = require('./api/createAttributesTable');
-const getClosestMatchingSchemaSummary = require('./api/getClosestMatchingSchemaSummary');
-
-module.exports = function attributesCommand(req, res) {
+export default function attributesCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	const destroySpinner = res.spinner('Looking up schemas...');
@@ -36,4 +34,4 @@ module.exports = function attributesCommand(req, res) {
 		req.options.sort,
 		req.options.export
 	);
-};
+}

package/src/modules/schema/src/command.attributes.js

@@ -1,12 +1,19 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const createAttributesTable = require('./api/createAttributesTable');
+import createAttributesTable from './api/createAttributesTable.js';
 
-module.exports = (moduleRegistration) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration) => {
 	const table = createAttributesTable(moduleRegistration);
 
 	moduleRegistration
-		.registerCommand('attributes', './command.attributes.controller')
+		.registerCommand(
+			'attributes',
+			path.resolve(__dirname, 'command.attributes.controller.js')
+		)
 		.addAlias('list-attributes')
 		.setDescription(
 			'Output a table with information about all attributes in a schema.'

package/src/modules/schema/src/command.element.controller.js

@@ -1,7 +1,5 @@
-'use strict';
-
-const getClosestMatchingSchemaSummary = require('./api/getClosestMatchingSchemaSummary');
-const renderSimpleType = require('./helpers/renderSimpleType');
+import getClosestMatchingSchemaSummary from './api/getClosestMatchingSchemaSummary.js';
+import renderSimpleType from './helpers/renderSimpleType.js';
 
 function stringForEmptyOrMixed(empty, mixed) {
 	return mixed
@@ -17,7 +15,7 @@ function percentualize(ratio) {
 	return `${Math.round(ratio * 1000) / 10}%`;
 }
 
-module.exports = function elementCommand(req, res) {
+export default function elementCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	const destroySpinner = res.spinner('Looking up schemas...');
@@ -136,4 +134,4 @@ module.exports = function elementCommand(req, res) {
 
 		res.outdent();
 	});
-};
+}

package/src/modules/schema/src/command.element.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('element', './command.element.controller')
+		.registerCommand(
+			'element',
+			path.resolve(__dirname, 'command.element.controller.js')
+		)
 		.setDescription(
 			'Output schema information about a specific element, including detailed content model info.'
 		)

package/src/modules/schema/src/command.elements.controller.js

@@ -1,9 +1,7 @@
-'use strict';
+import createElementsTable from './api/createElementsTable.js';
+import getClosestMatchingSchemaSummary from './api/getClosestMatchingSchemaSummary.js';
 
-const createElementsTable = require('./api/createElementsTable');
-const getClosestMatchingSchemaSummary = require('./api/getClosestMatchingSchemaSummary');
-
-module.exports = function elementCommand(req, res) {
+export default function elementCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	req.fdt.editorRepository.throwIfNotInsideEditorRepository();
@@ -38,4 +36,4 @@ module.exports = function elementCommand(req, res) {
 		req.options.sort,
 		req.options.export
 	);
-};
+}

package/src/modules/schema/src/command.elements.js

@@ -1,12 +1,19 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const createElementsTable = require('./api/createElementsTable');
+import createElementsTable from './api/createElementsTable.js';
 
-module.exports = (moduleRegistration) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration) => {
 	const table = createElementsTable(moduleRegistration);
 
 	moduleRegistration
-		.registerCommand('elements', './command.elements.controller')
+		.registerCommand(
+			'elements',
+			path.resolve(__dirname, 'command.elements.controller.js')
+		)
 		.addAlias('list-elements')
 		.setDescription(
 			'Output a table with information about all elements in a schema.'

package/src/modules/schema/src/command.schemas.controller.js

@@ -1,9 +1,7 @@
-'use strict';
+import createSchemasTable from './api/createSchemasTable.js';
+import getSchemaSummaries from './api/getSchemaSummaries.js';
 
-const createSchemasTable = require('./api/createSchemasTable');
-const getSchemaSummaries = require('./api/getSchemaSummaries');
-
-module.exports = function schemasCommand(req, res) {
+export default function schemasCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	const destroySpinner = res.spinner('Looking up schemas...');
@@ -21,4 +19,4 @@ module.exports = function schemasCommand(req, res) {
 		req.options.sort,
 		req.options.export
 	);
-};
+}

package/src/modules/schema/src/command.schemas.js

@@ -1,12 +1,19 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const createSchemasTable = require('./api/createSchemasTable');
+import createSchemasTable from './api/createSchemasTable.js';
 
-module.exports = (moduleRegistration) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration) => {
 	const table = createSchemasTable(moduleRegistration);
 
 	moduleRegistration
-		.registerCommand('schemas', './command.schemas.controller')
+		.registerCommand(
+			'schemas',
+			path.resolve(__dirname, 'command.schemas.controller.js')
+		)
 		.addAlias('list-schemas')
 		.setDescription('Output a table with information about all schemas.')
 

package/src/modules/schema/src/command.simpletypes.controller.js

@@ -1,9 +1,7 @@
-'use strict';
+import createSimpleTypesTable from './api/createSimpleTypesTable.js';
+import getClosestMatchingSchemaSummary from './api/getClosestMatchingSchemaSummary.js';
 
-const createSimpleTypesTable = require('./api/createSimpleTypesTable');
-const getClosestMatchingSchemaSummary = require('./api/getClosestMatchingSchemaSummary');
-
-module.exports = function simpleTypesCommand(req, res) {
+export default function simpleTypesCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	const destroySpinner = res.spinner('Looking up schemas...');
@@ -24,4 +22,4 @@ module.exports = function simpleTypesCommand(req, res) {
 		req.options.sort,
 		req.options.export
 	);
-};
+}

package/src/modules/schema/src/command.simpletypes.js

@@ -1,12 +1,19 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const createSimpleTypesTable = require('./api/createSimpleTypesTable');
+import createSimpleTypesTable from './api/createSimpleTypesTable.js';
 
-module.exports = (moduleRegistration) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (moduleRegistration) => {
 	const table = createSimpleTypesTable(moduleRegistration);
 
 	moduleRegistration
-		.registerCommand('simpletypes', './command.simpletypes.controller')
+		.registerCommand(
+			'simpletypes',
+			path.resolve(__dirname, 'command.simpletypes.controller.js')
+		)
 		.addAlias('list-simpletypes')
 		.setDescription(
 			'Output a table with information about all simple types in a schema.'

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

@@ -1,6 +1,4 @@
-'use strict';
-
-const restrictionFormatter = require('./restrictionFormatter');
+import restrictionFormatter from './restrictionFormatter.js';
 
 const keyLength = 14;
 
@@ -22,7 +20,7 @@ function renderRestrictions(res, simpleType) {
 	}
 }
 
-module.exports = function renderSimpleType(res, simpleType) {
+export default function renderSimpleType(res, simpleType) {
 	if (simpleType.isBuiltIn()) {
 		res.property('Built-in:', simpleType.localName || '-', keyLength);
 
@@ -79,4 +77,4 @@ module.exports = function renderSimpleType(res, simpleType) {
 	} else {
 		res.log(`Unknown simple type "${simpleType.variety}"`);
 	}
-};
+}

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

@@ -1,6 +1,4 @@
-'use strict';
-
-const os = require('os');
+import os from 'os';
 
 const formatterPerRestrictionType = {
 	enumeration: (value) => value.join(os.EOL),
@@ -31,7 +29,7 @@ function formatValue(restrictionType, value) {
 		: value;
 }
 
-module.exports = {
+export default {
 	formatType,
 	formatValue,
 };

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

@@ -1,9 +1,7 @@
-'use strict';
+import assert from 'assert';
 
-const assert = require('assert');
-
-const AttributeSummary = require('../src/api/AttributeSummary');
-const SchemaSummary = require('../src/api/SchemaSummary');
+import AttributeSummary from '../src/api/AttributeSummary.js';
+import SchemaSummary from '../src/api/SchemaSummary.js';
 
 function createStubbedAttribute() {
 	return {

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

@@ -1,9 +1,7 @@
-'use strict';
+import assert from 'assert';
 
-const assert = require('assert');
-
-const ElementSummary = require('../src/api/ElementSummary');
-const SchemaSummary = require('../src/api/SchemaSummary');
+import ElementSummary from '../src/api/ElementSummary.js';
+import SchemaSummary from '../src/api/SchemaSummary.js';
 
 function createStubbedData() {
 	return {

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

@@ -1,12 +1,14 @@
-'use strict';
+import assert from 'assert';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const assert = require('assert');
-const path = require('path');
+import AttributeSummary from '../src/api/AttributeSummary.js';
+import ElementSummary from '../src/api/ElementSummary.js';
+import SchemaSummary from '../src/api/SchemaSummary.js';
+import SimpleTypeSummary from '../src/api/SimpleTypeSummary.js';
 
-const AttributeSummary = require('../src/api/AttributeSummary');
-const ElementSummary = require('../src/api/ElementSummary');
-const SchemaSummary = require('../src/api/SchemaSummary');
-const SimpleTypeSummary = require('../src/api/SimpleTypeSummary');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 function createStubbedData(isEmpty) {
 	if (isEmpty) {

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

@@ -1,9 +1,7 @@
-'use strict';
+import assert from 'assert';
 
-const assert = require('assert');
-
-const SimpleTypeSummary = require('../src/api/SimpleTypeSummary');
-const SchemaSummary = require('../src/api/SchemaSummary');
+import SchemaSummary from '../src/api/SchemaSummary.js';
+import SimpleTypeSummary from '../src/api/SimpleTypeSummary.js';
 
 function createStubbedData() {
 	return {