[INTERNAL] Add workspace arguments

lib/cli/base.js

@@ -5,6 +5,7 @@ export default function(cli) {
 	cli.usage("Usage: ui5 <command> [options]")
 		.demandCommand(1, "Command required! Please have a look at the help documentation above.")
 		.option("config", {
+			alias: "c",
 			describe: "Path to project configuration file in YAML format",
 			type: "string"
 		})
@@ -13,6 +14,16 @@ export default function(cli) {
 		"This option will disable resolution of node package dependencies.",
 			type: "string"
 		})
+		.option("workspace-config", {
+			describe: "Path to workspace configuration file in YAML format",
+			type: "string"
+		})
+		.option("workspace", {
+			alias: "w",
+			describe: "Name of the workspace configuration to use",
+			default: "default",
+			type: "string"
+		})
 		.option("loglevel", {
 			alias: "log-level",
 			describe: "Set the logging level (silent|error|warn|info|perf|verbose|silly).",
@@ -37,7 +48,7 @@ export default function(cli) {
 		})
 		.coerce([
 			// base.js
-			"config", "dependency-definition", "log-level",
+			"config", "dependency-definition", "workspace-config", "workspace", "log-level",
 
 			// tree.js, build.js & serve.js
 			"framework-version",
@@ -66,10 +77,14 @@ export default function(cli) {
 		.strict(true)
 		.alias("help", "h")
 		.alias("version", "v")
-		.example("ui5 <command> --translator static:/path/to/projectDependencies.yaml",
-			"Execute command using a \"static\" translator with translator parameters")
+		.example("ui5 <command> --dependency-definition /path/to/projectDependencies.yaml",
+			"Execute command using a static dependency tree instead of resolving node package dependencies")
 		.example("ui5 <command> --config /path/to/ui5.yaml",
 			"Execute command using a project configuration from custom path")
+		.example("ui5 <command> --workspace dolphin",
+			"Execute command using the 'dolphin' workspace of a ui5-workspace.yaml")
+		.example("ui5 <command> --log-level silly",
+			"Execute command with the maximum log output")
 		.fail(function(msg, err, yargs) {
 			if (err) {
 				// Exception

lib/cli/commands/build.js

@@ -134,7 +134,9 @@ async function handleBuild(argv) {
 	} else {
 		graph = await graphFromPackageDependencies({
 			rootConfigPath: argv.config,
-			versionOverride: argv.frameworkVersion
+			versionOverride: argv.frameworkVersion,
+			workspaceConfigPath: argv.workspaceConfig,
+			workspaceName: argv.workspace === false ? null : argv.workspace,
 		});
 	}
 	const buildSettings = graph.getRoot().getBuilderSettings() || {};

lib/cli/commands/serve.js

@@ -88,7 +88,9 @@ serve.handler = async function(argv) {
 	} else {
 		graph = await graphFromPackageDependencies({
 			rootConfigPath: argv.config,
-			versionOverride: argv.frameworkVersion
+			versionOverride: argv.frameworkVersion,
+			workspaceConfigPath: argv.workspaceConfig,
+			workspaceName: argv.workspace === false ? null : argv.workspace,
 		});
 	}
 

lib/cli/commands/tree.js

@@ -35,7 +35,9 @@ tree.handler = async function(argv) {
 	} else {
 		graph = await graphFromPackageDependencies({
 			rootConfigPath: argv.config,
-			versionOverride: argv.frameworkVersion
+			versionOverride: argv.frameworkVersion,
+			workspaceConfigPath: argv.workspaceConfig,
+			workspaceName: argv.workspace === false ? null : argv.workspace,
 		});
 	}
 

test/lib/cli/commands/build.js

@@ -1,3 +1,4 @@
+import path from "node:path";
 import test from "ava";
 import sinon from "sinon";
 import esmock from "esmock";
@@ -123,7 +124,9 @@ test.serial("ui5 build --framework-version", async (t) => {
 		graphFromPackageDependenciesStub.getCall(0).args[0],
 		{
 			rootConfigPath: undefined,
-			versionOverride: "1.99.0"
+			versionOverride: "1.99.0",
+			workspaceConfigPath: undefined,
+			workspaceName: undefined,
 		}, "generateProjectGraph.graphFromPackageDependencies got called with expected arguments"
 	);
 });
@@ -139,7 +142,64 @@ test.serial("ui5 build --config", async (t) => {
 		graphFromPackageDependenciesStub.getCall(0).args[0],
 		{
 			rootConfigPath: "ui5-test.yaml",
-			versionOverride: undefined
+			versionOverride: undefined,
+			workspaceConfigPath: undefined,
+			workspaceName: undefined,
+		}, "generateProjectGraph.graphFromPackageDependencies got called with expected arguments"
+	);
+});
+
+test.serial("ui5 build --workspace", async (t) => {
+	const {build, argv, graphFromPackageDependenciesStub} = t.context;
+
+	argv.workspace = "dolphin";
+
+	await build.handler(argv);
+
+	t.deepEqual(
+		graphFromPackageDependenciesStub.getCall(0).args[0],
+		{
+			rootConfigPath: undefined,
+			versionOverride: undefined,
+			workspaceConfigPath: undefined,
+			workspaceName: "dolphin",
+		}, "generateProjectGraph.graphFromPackageDependencies got called with expected arguments"
+	);
+});
+
+test.serial("ui5 build --no-workspace", async (t) => {
+	const {build, argv, graphFromPackageDependenciesStub} = t.context;
+
+	argv.workspace = false;
+
+	await build.handler(argv);
+
+	t.deepEqual(
+		graphFromPackageDependenciesStub.getCall(0).args[0],
+		{
+			rootConfigPath: undefined,
+			versionOverride: undefined,
+			workspaceConfigPath: undefined,
+			workspaceName: null,
+		}, "generateProjectGraph.graphFromPackageDependencies got called with expected arguments"
+	);
+});
+
+test.serial("ui5 build --workspace-config", async (t) => {
+	const {build, argv, graphFromPackageDependenciesStub} = t.context;
+
+	const fakePath = path.join("/", "path", "to", "ui5-workspace.yaml");
+	argv.workspaceConfig = fakePath;
+
+	await build.handler(argv);
+
+	t.deepEqual(
+		graphFromPackageDependenciesStub.getCall(0).args[0],
+		{
+			rootConfigPath: undefined,
+			versionOverride: undefined,
+			workspaceConfigPath: fakePath,
+			workspaceName: undefined,
 		}, "generateProjectGraph.graphFromPackageDependencies got called with expected arguments"
 	);
 });
@@ -156,7 +216,7 @@ test.serial("ui5 build --dependency-definition", async (t) => {
 		{
 			filePath: "dependencies.yaml",
 			rootConfigPath: undefined,
-			versionOverride: undefined
+			versionOverride: undefined,
 		}, "generateProjectGraph.graphFromStaticFile got called with expected arguments"
 	);
 });
@@ -174,7 +234,7 @@ test.serial("ui5 build --dependency-definition --config", async (t) => {
 		{
 			filePath: "dependencies.yaml",
 			rootConfigPath: "ui5-test.yaml",
-			versionOverride: undefined
+			versionOverride: undefined,
 		}, "generateProjectGraph.graphFromStaticFile got called with expected arguments"
 	);
 });
@@ -193,7 +253,7 @@ test.serial("ui5 build --dependency-definition --config --framework-version", as
 		{
 			filePath: "dependencies.yaml",
 			rootConfigPath: "ui5-test.yaml",
-			versionOverride: "1.99.0"
+			versionOverride: "1.99.0",
 		}, "generateProjectGraph.graphFromStaticFile got called with expected arguments"
 	);
 });