@eclipse-glsp/cli 2.7.0-next.21 → 2.7.0-next.22

package/dist/cli.js

@@ -15537,25 +15537,38 @@ var DEFAULT_TARGET_DIR = "examples/workflow-test";
 function generatePlaywrightEnvContent(options) {
   const { dir, discoveredRepos } = options;
   const lines = [];
+  const hasServerNode = discoveredRepos.includes("glsp-server-node");
+  const hasServerJava = discoveredRepos.includes("glsp-server");
+  const hasClient = discoveredRepos.includes("glsp-client");
   lines.push("# Generated by: glsp repo playwright env");
   lines.push("# Regenerate this file after workspace changes.");
   lines.push("");
+  lines.push("# General");
+  lines.push("GLSP_SERVER_PORT=8081");
+  lines.push("GLSP_SERVER_DEBUG=true");
+  lines.push("GLSP_WEBSOCKET_PATH=workflow");
+  if (hasServerNode) {
+    lines.push("GLSP_SERVER_TYPE=node");
+    lines.push("GLSP_SERVER_START_CMD=npx glsp repo server-node start");
+  } else if (hasServerJava) {
+    lines.push("GLSP_SERVER_TYPE=java");
+    lines.push("GLSP_SERVER_START_CMD=npx glsp repo server-java start");
+  } else {
+    lines.push("GLSP_SERVER_TYPE=unknown");
+    lines.push("# GLSP_SERVER_START_CMD=npx glsp repo server-node start");
+  }
+  lines.push("");
   lines.push("# Optional port overrides (uncomment to change defaults)");
-  lines.push("# GLSP_SERVER_PORT=8081");
   lines.push("# STANDALONE_PORT=8082");
   lines.push("# STANDALONE_BROWSER_PORT=8083");
   lines.push("# THEIA_PORT=3000");
   lines.push("");
-  const hasServerNode = discoveredRepos.includes("glsp-server-node");
-  const hasClient = discoveredRepos.includes("glsp-client");
   if (hasServerNode && hasClient) {
     lines.push("# Standalone Node (WebSocket)");
-    lines.push("GLSP_SERVER_START_CMD=glsp repo server-node start");
-    lines.push("STANDALONE_START_CMD=glsp repo client start --external-server --no-open");
+    lines.push("STANDALONE_START_CMD=npx glsp repo client start --external-server --no-open");
   } else {
     lines.push("# Standalone Node (WebSocket) \u2014 missing repos, uncomment when available");
-    lines.push("# GLSP_SERVER_START_CMD=glsp repo server-node start");
-    lines.push("# STANDALONE_START_CMD=glsp repo client start --external-server --no-open");
+    lines.push("# STANDALONE_START_CMD=npx glsp repo client start --external-server --no-open");
   }
   lines.push("");
   if (hasServerNode && hasClient) {
@@ -15563,23 +15576,23 @@ function generatePlaywrightEnvContent(options) {
     const bundleExists = fs20.existsSync(bundlePath);
     lines.push("# Standalone Browser (Web Worker)");
     if (bundleExists) {
-      lines.push(`STANDALONE_BROWSER_START_CMD=glsp repo client start --browser --external-server ${bundlePath} --no-open`);
+      lines.push(`STANDALONE_BROWSER_START_CMD=npx glsp repo client start --browser --external-server ${bundlePath} --no-open`);
     } else {
       LOGGER.warn(`Browser bundle not found at ${bundlePath}. Build glsp-server-node first.`);
-      lines.push(`# STANDALONE_BROWSER_START_CMD=glsp repo client start --browser --external-server ${bundlePath} --no-open`);
+      lines.push(`# STANDALONE_BROWSER_START_CMD=npx glsp repo client start --browser --external-server ${bundlePath} --no-open`);
     }
   } else {
     lines.push("# Standalone Browser (Web Worker) \u2014 missing repos, uncomment when available");
-    lines.push("# STANDALONE_BROWSER_START_CMD=glsp repo client start --browser --external-server <bundle-path> --no-open");
+    lines.push("# STANDALONE_BROWSER_START_CMD=npx glsp repo client start --browser --external-server <bundle-path> --no-open");
   }
   lines.push("");
   const hasTheia = discoveredRepos.includes("glsp-theia-integration");
   if (hasTheia) {
     lines.push("# Theia");
-    lines.push("THEIA_START_CMD=glsp repo theia start");
+    lines.push("THEIA_START_CMD=npx glsp repo theia start");
   } else {
     lines.push("# Theia \u2014 repo not found, uncomment when available");
-    lines.push("# THEIA_START_CMD=glsp repo theia start");
+    lines.push("# THEIA_START_CMD=npx glsp repo theia start");
   }
   lines.push("");
   const hasVscode = discoveredRepos.includes("glsp-vscode-integration");
@@ -15598,28 +15611,10 @@ function generatePlaywrightEnvContent(options) {
     } else {
       lines.push("# VSCODE_VSIX_PATH=<path-to-vsix>");
     }
-    lines.push("");
-    lines.push("# VSCode Web Extension");
-    lines.push(`VSCODE_WEB_VSIX_ID=${WEB_VSIX_ID}`);
-    let webVsixPath;
-    try {
-      webVsixPath = discoverWebVsix(vscodeRepoDir);
-    } catch {
-      LOGGER.warn("Web extension VSIX file not found. Build and package the web extension first.");
-    }
-    if (webVsixPath) {
-      lines.push(`VSCODE_WEB_VSIX_PATH=${webVsixPath}`);
-    } else {
-      lines.push("# VSCODE_WEB_VSIX_PATH=<path-to-web-vsix>");
-    }
   } else {
     lines.push("# VSCode \u2014 repo not found, uncomment when available");
     lines.push(`# VSCODE_VSIX_ID=${VSIX_ID}`);
     lines.push("# VSCODE_VSIX_PATH=<path-to-vsix>");
-    lines.push("");
-    lines.push("# VSCode Web Extension \u2014 repo not found, uncomment when available");
-    lines.push(`# VSCODE_WEB_VSIX_ID=${WEB_VSIX_ID}`);
-    lines.push("# VSCODE_WEB_VSIX_PATH=<path-to-web-vsix>");
   }
   lines.push("");
   return lines.join("\n");
@@ -15826,6 +15821,12 @@ function createSubrepoCommand(repo) {
       cmd.addCommand(extraCmd);
     }
   }
+  cmd.hook("preSubcommand", (_, subcommand) => {
+    const parentDir = cmd.getOptionValue("dir");
+    if (parentDir && !subcommand.getOptionValue("dir")) {
+      subcommand.setOptionValue("dir", parentDir);
+    }
+  });
   const alias = SHORT_ALIASES[repo];
   if (alias) {
     cmd.alias(alias);
@@ -15955,7 +15956,13 @@ Run "glsp repo workspace init" first.`);
 var WorkspaceCommand = baseCommand().name("workspace").description("Manage VS Code workspace files for GLSP projects").addCommand(WorkspaceInitCommand).addCommand(WorkspaceOpenCommand);
 
 // src/commands/repo/repo.ts
-var RepoCommand = baseCommand().name("repo").description("Multi-repository management for GLSP projects").addCommand(CloneCommand).addCommand(ForkCommand).addCommand(BuildCommand).addCommand(LinkCommand).addCommand(UnlinkCommand).addCommand(PwdCommand).addCommand(LogCommand).addCommand(WorkspaceCommand);
+var RepoCommand = baseCommand().name("repo").description("Multi-repository management for GLSP projects").option("-d, --dir <path>", "Target directory where repos are cloned (inherited by subcommands)").addCommand(CloneCommand).addCommand(ForkCommand).addCommand(BuildCommand).addCommand(LinkCommand).addCommand(UnlinkCommand).addCommand(PwdCommand).addCommand(LogCommand).addCommand(WorkspaceCommand);
+RepoCommand.hook("preSubcommand", (_, subcommand) => {
+  const parentDir = RepoCommand.opts().dir;
+  if (parentDir && !subcommand.getOptionValue("dir")) {
+    subcommand.setOptionValue("dir", parentDir);
+  }
+});
 for (const repo of GLSPRepo.choices) {
   RepoCommand.addCommand(createSubrepoCommand(repo));
 }