@ui5/builder 3.0.0-alpha.11 → 3.0.0-alpha.12

package/lib/processors/jsdoc/jsdocGenerator.js

@@ -1,15 +1,27 @@
-const spawn = require("child_process").spawn;
-const fs = require("graceful-fs");
-const path = require("path");
-const {promisify} = require("util");
+import {spawn} from "node:child_process";
+import fs from "graceful-fs";
+import path from "node:path";
+import {promisify} from "node:util";
 const writeFile = promisify(fs.writeFile);
-const {resourceFactory} = require("@ui5/fs");
+import {createAdapter} from "@ui5/fs/resourceFactory";
+import {createRequire} from "node:module";
+import {fileURLToPath} from "node:url";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
+
+/**
+ * @public
+ * @module @ui5/builder/processors/jsdocGenerator
+ */
 
 /**
  * JSDoc generator
  *
  * @public
- * @alias module:@ui5/builder.processors.jsdocGenerator
+ * @function default
+ * @static
+ *
  * @param {object} parameters Parameters
  * @param {string} parameters.sourcePath Path of the source files to be processed
  * @param {string} parameters.targetPath Path to write any output files
@@ -19,9 +31,9 @@ const {resourceFactory} = require("@ui5/fs");
  * @param {string} parameters.options.namespace Namespace to build (e.g. <code>some/project/name</code>)
  * @param {string} parameters.options.version Project version
  * @param {Array} [parameters.options.variants=["apijson"]] JSDoc variants to be built
- * @returns {Promise<module:@ui5/fs.Resource[]>} Promise resolving with newly created resources
+ * @returns {Promise<@ui5/fs/Resource[]>} Promise resolving with newly created resources
  */
-const jsdocGenerator = async function(
+export default async function jsdocGenerator(
 	{sourcePath, targetPath, tmpPath, options: {projectName, namespace, version, variants}} = {}
 ) {
 	if (!sourcePath || !targetPath || !tmpPath || !projectName || !namespace || !version) {
@@ -48,7 +60,7 @@ const jsdocGenerator = async function(
 		configPath
 	});
 
-	const fsTarget = resourceFactory.createAdapter({
+	const fsTarget = createAdapter({
 		fsBasePath: targetPath,
 		virBasePath: "/"
 	});
@@ -58,7 +70,7 @@ const jsdocGenerator = async function(
 		fsTarget.byPath(`/test-resources/${namespace}/designtime/api.json`)
 		// fsTarget.byPath(`/libraries/${options.projectName}.js`)
 	]).then((res) => res.filter(($)=>$));
-};
+}
 
 
 /**
@@ -82,8 +94,11 @@ async function generateJsdocConfig({targetPath, tmpPath, namespace, projectName,
 
 	// Resolve path to this script to get the path to the JSDoc extensions folder
 	const jsdocPath = path.normalize(__dirname);
-	const pluginPath = path.join(jsdocPath, "lib", "ui5", "plugin.js").replace(backslashRegex, "\\\\");
-	const templatePath = path.join(jsdocPath, "lib", "ui5", "template").replace(backslashRegex, "\\\\");
+	const pluginPath = path.join(jsdocPath, "lib", "ui5", "plugin.cjs").replace(backslashRegex, "\\\\");
+	// Using export via package.json to allow loading the CJS template.
+	// jsdoc appends /publish to the provided path but doesn't allow to
+	// add the .cjs extension, so loading won't work otherwise.
+	const templatePath = "@ui5/builder/internal/jsdoc/template";
 	const destinationPath = path.normalize(tmpPath).replace(backslashRegex, "\\\\");
 	const jsapiFilePath = path.join(targetPath, "libraries", projectName + ".js").replace(backslashRegex, "\\\\");
 	const apiJsonFolderPath = path.join(tmpPath, "dependency-apis").replace(backslashRegex, "\\\\");
@@ -157,7 +172,7 @@ async function buildJsdoc({sourcePath, configPath}) {
 	];
 	return new Promise((resolve, reject) => {
 		const child = spawn("node", args, {
-			stdio: ["ignore", "ignore", process.stderr]
+			stdio: ["ignore", "ignore", "inherit"]
 		});
 		child.on("close", function(code) {
 			if (code === 0 || code === 1) {
@@ -169,7 +184,6 @@ async function buildJsdoc({sourcePath, configPath}) {
 	});
 }
 
-module.exports = jsdocGenerator;
-module.exports._generateJsdocConfig = generateJsdocConfig;
-module.exports._writeJsdocConfig = writeJsdocConfig;
-module.exports._buildJsdoc = buildJsdoc;
+jsdocGenerator._generateJsdocConfig = generateJsdocConfig;
+jsdocGenerator._writeJsdocConfig = writeJsdocConfig;
+jsdocGenerator._buildJsdoc = buildJsdoc;

package/lib/processors/jsdoc/lib/ui5/template/{publish.js → publish.cjs}

@@ -27,7 +27,7 @@ const info = logger.info.bind(logger);
 const warning = logger.warn.bind(logger);
 const error = logger.error.bind(logger);
 
-const {extractVersion, extractSince} = require("./utils/versionUtil");
+const {extractVersion, extractSince} = require("./utils/versionUtil.cjs");
 
 /* errors that might fail the build in future */
 function future(msg) {

package/lib/processors/jsdoc/sdkTransformer.js

@@ -1,23 +1,30 @@
-const resourceFactory = require("@ui5/fs").resourceFactory;
-const transformer = require("./lib/transformApiJson");
+import {createResource} from "@ui5/fs/resourceFactory";
+import transformer from "./lib/transformApiJson.cjs";
 
 /**
- * Transform api.json as created by [jsdocGenerator]{@link module:@ui5/builder.processors.jsdocGenerator}
+ * @public
+ * @module @ui5/builder/processors/sdkTransformer
+ */
+
+/**
+ * Transform api.json as created by [jsdocGenerator]{@link @ui5/builder/processors/jsdocGenerator}
  * for usage in a UI5 SDK
  *
  * @public
- * @alias module:@ui5/builder.processors.sdkTransformer
+ * @function default
+ * @static
+ *
  * @param {object} parameters Parameters
  * @param {string} parameters.apiJsonPath Path to the projects api.json file as created by
- *				[jsdocGenerator]{@link module:@ui5/builder.processors.jsdoc.jsdocGenerator}
+ *				[jsdocGenerator]{@link @ui5/builder/processors/jsdoc/jsdocGenerator}
  * @param {string} parameters.dotLibraryPath Path to the projects .library file
  * @param {string[]} parameters.dependencyApiJsonPaths List of paths to the api.json files of all dependencies of
- *				the project as created by [jsdocGenerator]{@link module:@ui5/builder.processors.jsdoc.jsdocGenerator}
+ *				the project as created by [jsdocGenerator]{@link @ui5/builder/processors/jsdoc/jsdocGenerator}
  * @param {string} parameters.targetApiJsonPath Path to create the new, transformed api.json resource for
- * @param {fs|module:@ui5/fs.fsInterface} parameters.fs Node fs or
- * 				custom [fs interface]{@link module:resources/module:@ui5/fs.fsInterface} to use
+ * @param {fs|module:@ui5/fs/fsInterface} parameters.fs Node fs or
+ * 				custom [fs interface]{@link module:@ui5/fs/fsInterface} to use
  *
- * @returns {Promise<module:@ui5/fs.Resource[]>} Promise resolving with created resources
+ * @returns {Promise<@ui5/fs/Resource[]>} Promise resolving with created resources
  */
 const sdkTransformer = async function({
 	apiJsonPath, dotLibraryPath, dependencyApiJsonPaths, targetApiJsonPath, fs} = {}
@@ -30,10 +37,10 @@ const sdkTransformer = async function({
 		fs,
 		returnOutputFiles: true
 	});
-	return [resourceFactory.createResource({
+	return [createResource({
 		path: targetApiJsonPath,
 		string: apiJsonContent
 	})];
 };
 
-module.exports = sdkTransformer;
+export default sdkTransformer;

package/lib/processors/libraryLessGenerator.js

@@ -1,8 +1,9 @@
-const log = require("@ui5/logger").getLogger("builder:processors:libraryLessGenerator");
+import logger from "@ui5/logger";
+const log = logger.getLogger("builder:processors:libraryLessGenerator");
 
-const {promisify} = require("util");
-const posixPath = require("path").posix;
-const Resource = require("@ui5/fs").Resource;
+import {promisify} from "node:util";
+import posixPath from "node:path/posix";
+import Resource from "@ui5/fs/Resource";
 
 const IMPORT_PATTERN = /@import .*"(.*)";/g;
 const BASE_LESS_PATTERN = /^\/resources\/sap\/ui\/core\/themes\/([^/]+)\/base\.less$/;
@@ -24,10 +25,10 @@ class LibraryLessGenerator {
 	async generate({filePath, fileContent}) {
 		return `/* NOTE: This file was generated as an optimized version of ` +
 			`"library.source.less" for the Theme Designer. */\n\n` +
-			await this.resolveLessImports({
+			(await this.resolveLessImports({
 				filePath,
 				fileContent
-			});
+			}));
 	}
 	static getPathToRoot(baseDir) {
 		return posixPath.relative(baseDir, "/") + "/";
@@ -132,10 +133,10 @@ class LibraryLessGenerator {
 			}
 		}
 		return `/* START "${originalFilePath}" */\n` +
-			await this.resolveLessImports({
+			(await this.resolveLessImports({
 				filePath: resolvedFilePath,
 				fileContent: importedFileContent
-			}) +
+			})) +
 			`\n/* END "${originalFilePath}" */\n`;
 	}
 	findLessImports(fileContent) {
@@ -153,6 +154,11 @@ class LibraryLessGenerator {
 	}
 }
 
+/**
+ * @public
+ * @module @ui5/builder/processors/libraryLessGenerator
+ */
+
 /**
  * Creates a "library.less" file for the SAP Theme Designer based on a "library.source.less" file.
  *
@@ -165,15 +171,17 @@ class LibraryLessGenerator {
  * </ul>
  *
  * @public
- * @alias module:@ui5/builder.processors.libraryLessGenerator
+ * @function default
+ * @static
+ *
  * @param {object} parameters Parameters
- * @param {module:@ui5/fs.Resource[]} parameters.resources List of <code>library.source.less</code>
+ * @param {@ui5/fs/Resource[]} parameters.resources List of <code>library.source.less</code>
  * resources
- * @param {fs|module:@ui5/fs.fsInterface} parameters.fs Node fs or custom
- * [fs interface]{@link module:resources/module:@ui5/fs.fsInterface}
- * @returns {Promise<module:@ui5/fs.Resource[]>} Promise resolving with library.less resources
+ * @param {fs|module:@ui5/fs/fsInterface} parameters.fs Node fs or custom
+ * [fs interface]{@link module:resources/module:@ui5/fs/fsInterface}
+ * @returns {Promise<@ui5/fs/Resource[]>} Promise resolving with library.less resources
  */
-module.exports = async function({resources, fs}) {
+async function createLibraryLess({resources, fs}) {
 	const generator = new LibraryLessGenerator({fs});
 	return Promise.all(resources.map(async (librarySourceLessResource) => {
 		const filePath = librarySourceLessResource.getPath();
@@ -189,10 +197,14 @@ module.exports = async function({resources, fs}) {
 			string: libraryLessFileContent
 		});
 	}));
-};
+}
+
+export default createLibraryLess;
 
+let myLibraryLessGenerator;
 // Export class for testing only
 /* istanbul ignore else */
 if (process.env.NODE_ENV === "test") {
-	module.exports._LibraryLessGenerator = LibraryLessGenerator;
+	myLibraryLessGenerator = LibraryLessGenerator;
 }
+export const _LibraryLessGenerator = myLibraryLessGenerator;

package/lib/processors/manifestCreator.js

@@ -1,11 +1,12 @@
-"use strict";
 
-const posixPath = require("path").posix;
-const {SemVer: Version} = require("semver");
-const log = require("@ui5/logger").getLogger("builder:processors:manifestCreator");
-const EvoResource = require("@ui5/fs").Resource;
-const xml2js = require("xml2js");
-const analyzeLibraryJS = require("../lbt/analyzer/analyzeLibraryJS");
+import posixPath from "node:path/posix";
+import semver from "semver";
+const {SemVer: Version} = semver;
+import logger from "@ui5/logger";
+const log = logger.getLogger("builder:processors:manifestCreator");
+import Resource from "@ui5/fs/Resource";
+import xml2js from "xml2js";
+import analyzeLibraryJS from "../lbt/analyzer/analyzeLibraryJS.js";
 
 /*
  * A single parse instance to be used by all invocations (TODO check reentrance capa of xml2js)
@@ -128,7 +129,7 @@ class LibraryBundle {
 	/**
 	 *
 	 * @param {string} prefix
-	 * @param {module:@ui5/fs.Resource[]} resources
+	 * @param {@ui5/fs/Resource[]} resources
 	 */
 	constructor(prefix, resources) {
 		this.prefix = prefix;
@@ -138,7 +139,7 @@ class LibraryBundle {
 	/**
 	 *
 	 * @param {string} name
-	 * @returns {module:@ui5/fs.Resource}
+	 * @returns {@ui5/fs/Resource}
 	 */
 	findResource(name) {
 		return this.resources.find((res) => res.getPath() === this.prefix + name);
@@ -147,7 +148,7 @@ class LibraryBundle {
 	/**
 	 *
 	 * @param {RegExp} pattern
-	 * @returns {module:@ui5/fs.Resource[]}
+	 * @returns {@ui5/fs/Resource[]}
 	 */
 	getResources(pattern) {
 		return this.resources.filter((res) => pattern == null || pattern.test(res.getPath()));
@@ -620,7 +621,7 @@ async function createManifest(
 	};
 }
 
-module.exports = function({libraryResource, resources, getProjectVersion, options}) {
+export default function({libraryResource, resources, getProjectVersion, options}) {
 	// merge options with defaults
 	options = Object.assign({
 		descriptorVersion: APP_DESCRIPTOR_V22, // TODO 3.0: change this to type string instead of a semver object
@@ -642,9 +643,9 @@ module.exports = function({libraryResource, resources, getProjectVersion, option
 	return createManifest(libraryResource, libBundle, options.descriptorVersion, options.include3rdParty,
 		options.omitMinVersions, getProjectVersion)
 		.then((manifest) => {
-			return new EvoResource({
+			return new Resource({
 				path: resourcePathPrefix + "manifest.json",
 				string: JSON.stringify(manifest, null, options.prettyPrint ? "  " : undefined)
 			});
 		});
-};
+}

package/lib/processors/minifier.js

@@ -1,6 +1,7 @@
-const path = require("path");
-const terser = require("terser");
-const Resource = require("@ui5/fs").Resource;
+import posixPath from "node:path/posix";
+import {minify} from "terser";
+import Resource from "@ui5/fs/Resource";
+
 /**
  * Preserve comments which contain:
  * <ul>
@@ -15,38 +16,43 @@ const Resource = require("@ui5/fs").Resource;
 const copyrightCommentsAndBundleCommentPattern = /copyright|\(c\)(?:[0-9]+|\s+[0-9A-za-z])|released under|license|\u00a9|^@ui5-bundle-raw-include |^@ui5-bundle /i;
 const debugFileRegex = /((?:\.view|\.fragment|\.controller|\.designtime|\.support)?\.js)$/;
 
+/**
+ * @public
+ * @module @ui5/builder/processors/minifier
+ */
 
 /**
  * Result set
  *
  * @public
  * @typedef {object} MinifierResult
- * @property {module:@ui5/fs.Resource} resource Minified resource
- * @property {module:@ui5/fs.Resource} dbgResource Debug (non-minified) variant
- * @property {module:@ui5/fs.Resource} sourceMap Source Map
- * @memberof module:@ui5/builder.processors
+ * @property {@ui5/fs/Resource} resource Minified resource
+ * @property {@ui5/fs/Resource} dbgResource Debug (non-minified) variant
+ * @property {@ui5/fs/Resource} sourceMap Source Map
  */
 
 /**
  * Minifies the supplied resources.
  *
  * @public
- * @alias module:@ui5/builder.processors.minifier
+ * @function default
+ * @static
+ *
  * @param {object} parameters Parameters
- * @param {module:@ui5/fs.Resource[]} parameters.resources List of resources to be processed
+ * @param {@ui5/fs/Resource[]} parameters.resources List of resources to be processed
  * @param {object} [parameters.options] Options
  * @param {boolean} [parameters.options.addSourceMappingUrl=true]
  * 				Whether to add a sourceMappingURL reference to the end of the minified resource
- * @returns {Promise<module:@ui5/builder.processors.MinifierResult[]>}
+ * @returns {Promise<module:@ui5/builder/processors/minifier~MinifierResult[]>}
  * 				Promise resolving with object of resource, dbgResource and sourceMap
  */
-module.exports = async function({resources, options: {addSourceMappingUrl = true} = {}}) {
+export default async function({resources, options: {addSourceMappingUrl = true} = {}}) {
 	return Promise.all(resources.map(async (resource) => {
 		const dbgPath = resource.getPath().replace(debugFileRegex, "-dbg$1");
 		const dbgResource = await resource.clone();
 		dbgResource.setPath(dbgPath);
 
-		const filename = path.posix.basename(resource.getPath());
+		const filename = posixPath.basename(resource.getPath());
 		const code = await resource.getString();
 		try {
 			const sourceMapOptions = {
@@ -55,8 +61,8 @@ module.exports = async function({resources, options: {addSourceMappingUrl = true
 			if (addSourceMappingUrl) {
 				sourceMapOptions.url = filename + ".map";
 			}
-			const dbgFilename = path.posix.basename(dbgPath);
-			const result = await terser.minify({
+			const dbgFilename = posixPath.basename(dbgPath);
+			const result = await minify({
 				// Use debug-name since this will be referenced in the source map "sources"
 				[dbgFilename]: code
 			}, {
@@ -87,4 +93,4 @@ module.exports = async function({resources, options: {addSourceMappingUrl = true
 				`(line ${err.line}, col ${err.col}, pos ${err.pos})`);
 		}
 	}));
-};
+}

package/lib/processors/nonAsciiEscaper.js

@@ -1,4 +1,9 @@
-const escapeUnicode = require("escape-unicode");
+import escapeUnicode from "escape-unicode";
+
+/**
+ * @public
+ * @module @ui5/builder/processors/nonAsciiEscaper
+ */
 
 /**
  * @see https://en.wikipedia.org/wiki/ASCII
@@ -58,14 +63,16 @@ const escapeNonAscii = function(string) {
  *
  *
  * @public
- * @alias module:@ui5/builder.processors.nonAsciiEscaper
+ * @function default
+ * @static
+ *
  * @param {object} parameters Parameters
- * @param {module:@ui5/fs.Resource[]} parameters.resources List of resources to be processed
+ * @param {@ui5/fs/Resource[]} parameters.resources List of resources to be processed
  * @param {object} [parameters.options] Options
  * @param {string} [parameters.options.encoding="utf8"] resource file encoding
  *   ({@link https://nodejs.org/api/buffer.html#buffer_buffers_and_character_encodings Node.js character encodings}).
  *   Use #getEncodingFromAlias to get the encoding string
- * @returns {Promise<module:@ui5/fs.Resource[]>} Promise resolving with the processed resources
+ * @returns {Promise<@ui5/fs/Resource[]>} Promise resolving with the processed resources
  */
 async function nonAsciiEscaper({resources, options: {encoding}}) {
 	encoding = encoding || "utf8";
@@ -94,7 +101,10 @@ const encodingMap = {
  * such that it can be used standalone without the respective task (e.g. in Splitter, Bundler and related projects).
  *
  * @public
- * @alias module:@ui5/builder.processors.nonAsciiEscaper․getEncodingFromAlias
+ * @function getEncodingFromAlias
+ * @alias @ui5/builder/processors/nonAsciiEscaper․getEncodingFromAlias
+ * @static
+ *
  * @param {string} encoding encoding labels: "UTF-8" and "ISO-8859-1"
  * @returns {string} node.js character encoding string, e.g. utf8 and latin1
  */
@@ -106,4 +116,4 @@ nonAsciiEscaper.getEncodingFromAlias = function(encoding) {
 	return encodingMap[encoding];
 };
 
-module.exports = nonAsciiEscaper;
+export default nonAsciiEscaper;

package/lib/processors/resourceListCreator.js

@@ -1,11 +1,11 @@
-"use strict";
 
-const log = require("@ui5/logger").getLogger("builder:processors:resourceListCreator");
-const ResourceCollector = require("../lbt/resources/ResourceCollector");
-const LocatorResourcePool = require("../lbt/resources/LocatorResourcePool");
-const ResourceInfo = require("../lbt/resources/ResourceInfo");
+import logger from "@ui5/logger";
+const log = logger.getLogger("builder:processors:resourceListCreator");
+import ResourceCollector from "../lbt/resources/ResourceCollector.js";
+import LocatorResourcePool from "../lbt/resources/LocatorResourcePool.js";
+import ResourceInfo from "../lbt/resources/ResourceInfo.js";
+import Resource from "@ui5/fs/Resource";
 
-const EvoResource = require("@ui5/fs").Resource;
 
 /**
  * List of resource patterns that describe all debug resources.
@@ -115,12 +115,12 @@ function makeResourcesJSON(list, prefix) {
  *
  * @private
  * @param {object} parameters Parameters
- * @param {module:@ui5/fs.Resource[]} parameters.resources List of resources
- * @param {module:@ui5/fs.Resource[]} [parameters.dependencyResources=[]] List of dependency resources
+ * @param {@ui5/fs/Resource[]} parameters.resources List of resources
+ * @param {@ui5/fs/Resource[]} [parameters.dependencyResources=[]] List of dependency resources
  * @param {object} [parameters.options] Options
- * @returns {Promise<module:@ui5/fs.Resource[]>} Promise resolving with the resources.json resources
+ * @returns {Promise<@ui5/fs/Resource[]>} Promise resolving with the resources.json resources
  */
-module.exports = async function({resources, dependencyResources = [], options}) {
+export default async function({resources, dependencyResources = [], options}) {
 	options = Object.assign({
 		failOnOrphans: false,
 		externalResources: undefined,
@@ -163,7 +163,7 @@ module.exports = async function({resources, dependencyResources = [], options})
 
 		const contentString = makeResourcesJSON(list, prefix);
 
-		resourceLists.push(new EvoResource({
+		resourceLists.push(new Resource({
 			path: `/resources/${prefix}resources.json`,
 			string: contentString
 		}));
@@ -173,7 +173,7 @@ module.exports = async function({resources, dependencyResources = [], options})
 
 		const contentString = makeResourcesJSON(list, prefix);
 
-		resourceLists.push(new EvoResource({
+		resourceLists.push(new Resource({
 			path: `/resources/${prefix}resources.json`,
 			string: contentString
 		}));
@@ -187,4 +187,4 @@ module.exports = async function({resources, dependencyResources = [], options})
 	}
 
 	return resourceLists;
-};
+}

package/lib/processors/stringReplacer.js

@@ -1,18 +1,25 @@
-const replaceStream = require("replacestream");
+import replaceStream from "replacestream";
+
+/**
+ * @public
+ * @module @ui5/builder/processors/stringReplacer
+ */
 
 /**
  * Replaces placeholders with corresponding values.
  *
  * @public
- * @alias module:@ui5/builder.processors.stringReplacer
+ * @function default
+ * @static
+ *
  * @param {object} parameters Parameters
- * @param {module:@ui5/fs.Resource[]} parameters.resources List of resources to be processed
+ * @param {@ui5/fs/Resource[]} parameters.resources List of resources to be processed
  * @param {object} parameters.options Options
  * @param {string} parameters.options.pattern Pattern of placeholders
  * @param {string} parameters.options.replacement Replacement for placeholders
- * @returns {Promise<module:@ui5/fs.Resource[]>} Promise resolving with modified resources
+ * @returns {Promise<@ui5/fs/Resource[]>} Promise resolving with modified resources
  */
-module.exports = function({resources, options: {pattern, replacement}}) {
+export default function({resources, options: {pattern, replacement}}) {
 	return Promise.all(resources.map((resource) => {
 		let stream = resource.getStream();
 		stream.setEncoding("utf8");
@@ -21,4 +28,4 @@ module.exports = function({resources, options: {pattern, replacement}}) {
 		resource.setStream(stream);
 		return resource;
 	}));
-};
+}

package/lib/processors/themeBuilder.js

@@ -1,23 +1,29 @@
-const log = require("@ui5/logger").getLogger("builder:processors:themeBuilder");
-const path = require("path");
-const less = require("less-openui5");
-const Resource = require("@ui5/fs").Resource;
+import logger from "@ui5/logger";
+const log = logger.getLogger("builder:processors:themeBuilder");
+import posixPath from "node:path/posix";
+import less from "less-openui5";
+import Resource from "@ui5/fs/Resource";
 
 const libraryMatchPattern = /^\/resources\/(.*)\/themes\/[^/]*\/library\.source\.less$/i;
 
+/**
+ * @public
+ * @module @ui5/builder/processors/ThemeBuilder
+ */
+
 /**
  * Builds a library theme
  *
  * @public
- * @memberof module:@ui5/builder.processors
+ * @class
  */
-class ThemeBuilder {
+export class ThemeBuilder {
 	/**
 	 * Constructor
 	 *
 	 * @public
-	 * @param {fs|module:@ui5/fs.fsInterface} fs Node fs or custom
-	 * 		[fs interface]{@link module:resources/module:@ui5/fs.fsInterface}
+	 * @param {fs|module:@ui5/fs/fsInterface} fs Node fs or custom
+	 * 		[fs interface]{@link module:@ui5/fs/fsInterface}
 	 */
 	constructor({fs}) {
 		this.builder = new less.Builder({fs});
@@ -27,13 +33,13 @@ class ThemeBuilder {
 	 * Starts the theme build
 	 *
 	 * @public
-	 * @param {module:@ui5/fs.Resource[]} resources Library files
+	 * @param {@ui5/fs/Resource[]} resources Library files
 	 * @param {object} [options] Build options
 	 * @param {boolean} [options.compress=false] Compress build output (CSS / JSON)
 	 * @param {boolean} [options.cssVariables=false] Generates the CSS variables
 	 *   (css-variables.css, css-variables.source.less) and the skeleton for a theme
 	 *   (library-skeleton.css, [library-skeleton-RTL.css])
-	 * @returns {Promise<module:@ui5/fs.Resource[]>} Resolving with array of created files
+	 * @returns {Promise<@ui5/fs/Resource[]>} Resolving with array of created files
 	 */
 	build(resources, {compress = false, cssVariables = false} = {}) {
 		const files = [];
@@ -57,7 +63,7 @@ class ThemeBuilder {
 				},
 				cssVariables
 			}).then((result) => {
-				const themeDir = path.dirname(resource.getPath());
+				const themeDir = posixPath.dirname(resource.getPath());
 
 				const libCss = new Resource({
 					path: themeDir + "/library.css",
@@ -132,21 +138,25 @@ class ThemeBuilder {
  * Builds a library theme.
  *
  * @public
- * @alias module:@ui5/builder.processors.themeBuilder
+ * @function default
+ * @static
+ *
+ * @alias @ui5/builder/processors/themeBuilder
  * @param {object} parameters Parameters
- * @param {module:@ui5/fs.Resource[]} parameters.resources List of <code>library.source.less</code>
+ * @param {@ui5/fs/Resource[]} parameters.resources List of <code>library.source.less</code>
  *   resources to be processed
- * @param {fs|module:@ui5/fs.fsInterface} parameters.fs Node fs or custom
- *   [fs interface]{@link module:resources/module:@ui5/fs.fsInterface}
- * @param {ThemeBuilderOptions} [parameters.options] Options
- * @returns {Promise<module:@ui5/fs.Resource[]>} Promise resolving with theme resources
+ * @param {fs|module:@ui5/fs/fsInterface} parameters.fs Node fs or custom
+ *   [fs interface]{@link module:@ui5/fs/fsInterface}
+ * @param {module:@ui5/builder/processors/ThemeBuilder~ThemeBuilderOptions} [parameters.options] Options
+ * @returns {Promise<@ui5/fs/Resource[]>} Promise resolving with theme resources
  */
-module.exports = async function({
+export default async function({
 	resources,
 	fs,
 	options = {}
 }) {
-	const {compress, cssVariables} = /** @type {ThemeBuilderOptions} */ (options);
+	const {compress, cssVariables} =
+	/** @type {module:@ui5/builder/processors/ThemeBuilder~ThemeBuilderOptions} */ (options);
 	const themeBuilder = new ThemeBuilder({fs});
 	return themeBuilder.build(resources, {
 		compress,
@@ -155,6 +165,4 @@ module.exports = async function({
 		themeBuilder.clearCache();
 		return files;
 	});
-};
-
-module.exports.ThemeBuilder = ThemeBuilder;
+}