bun-workspaces 1.5.1 → 1.6.0

package/src/runScript/scriptRuntimeMetadata.mjs

@@ -1,61 +1,43 @@
-import { IS_WINDOWS } from "../internal/core/index.mjs"; // CONCATENATED MODULE: external "../internal/core/index.mjs"
-// CONCATENATED MODULE: ./src/runScript/scriptRuntimeMetadata.ts
+import { IS_WINDOWS } from "../internal/core/index.mjs";
+import { getScriptRuntimeMetadataConfig } from "../1108.mjs";
 
-const SCRIPT_RUNTIME_METADATA_CONFIG = {
-  projectPath: {
-    inlineName: "<projectPath>",
-    envVarName: "BW_PROJECT_PATH",
-  },
-  projectName: {
-    inlineName: "<projectName>",
-    envVarName: "BW_PROJECT_NAME",
-  },
-  workspacePath: {
-    inlineName: "<workspacePath>",
-    envVarName: "BW_WORKSPACE_PATH",
-  },
-  workspaceRelativePath: {
-    inlineName: "<workspaceRelativePath>",
-    envVarName: "BW_WORKSPACE_RELATIVE_PATH",
-  },
-  scriptName: {
-    inlineName: "<scriptName>",
-    envVarName: "BW_SCRIPT_NAME",
-  },
-  workspaceName: {
-    inlineName: "<workspaceName>",
-    envVarName: "BW_WORKSPACE_NAME",
-  },
-};
-const getScriptRuntimeMetadataConfig = (key) =>
-  SCRIPT_RUNTIME_METADATA_CONFIG[key];
-const createScriptRuntimeEnvVars = (metadata) =>
-  Object.entries(SCRIPT_RUNTIME_METADATA_CONFIG).reduce((acc, [key, value]) => {
-    acc[value.envVarName] = metadata[key];
+const createScriptRuntimeEnvVars = (metadata) => {
+  const keys = [
+    "projectPath",
+    "projectName",
+    "workspacePath",
+    "workspaceRelativePath",
+    "scriptName",
+    "workspaceName",
+  ];
+  return keys.reduce((acc, key) => {
+    const { envVarName } = getScriptRuntimeMetadataConfig(key);
+    acc[envVarName] = metadata[key];
     return acc;
   }, {});
-const interpolateScriptRuntimeMetadata = (text, metadata, shell) =>
-  text.replace(
-    new RegExp(
-      Object.values(SCRIPT_RUNTIME_METADATA_CONFIG)
-        .flatMap((value) => value.inlineName)
-        .join("|"),
-      "g",
-    ),
-    (match) => {
-      const key = Object.entries(SCRIPT_RUNTIME_METADATA_CONFIG).find(
-        ([_, value]) => value.inlineName === match,
-      )?.[0];
-      const value = metadata[key];
-      if (IS_WINDOWS && shell === "bun") {
-        return value.replace(/\\/g, "\\\\");
-      }
-      return value;
-    },
+};
+const interpolateScriptRuntimeMetadata = (text, metadata, shell) => {
+  const keys = [
+    "projectPath",
+    "projectName",
+    "workspacePath",
+    "workspaceRelativePath",
+    "scriptName",
+    "workspaceName",
+  ];
+  const inlineNames = keys.map(
+    (key) => getScriptRuntimeMetadataConfig(key).inlineName,
   );
-
-export {
-  createScriptRuntimeEnvVars,
-  getScriptRuntimeMetadataConfig,
-  interpolateScriptRuntimeMetadata,
+  return text.replace(new RegExp(inlineNames.join("|"), "g"), (match) => {
+    const key = keys.find(
+      (k) => getScriptRuntimeMetadataConfig(k).inlineName === match,
+    );
+    const value = metadata[key];
+    if (IS_WINDOWS && shell === "bun") {
+      return value.replace(/\\/g, "\\\\");
+    }
+    return value;
+  });
 };
+
+export { createScriptRuntimeEnvVars, interpolateScriptRuntimeMetadata };

package/src/runScript/scriptShellOption.mjs

@@ -1,12 +1,8 @@
-import {
-  getUserEnvVar,
-  getUserEnvVarName,
-} from "../config/userEnvVars/index.mjs";
-import { BunWorkspacesError } from "../internal/core/error/index.mjs"; // CONCATENATED MODULE: external "../config/userEnvVars/index.mjs"
-// CONCATENATED MODULE: external "../internal/core/error/index.mjs"
-// CONCATENATED MODULE: ./src/runScript/scriptShellOption.ts
+import { getUserEnvVar } from "../config/userEnvVars/index.mjs";
+import { BunWorkspacesError } from "../internal/core/error/index.mjs";
+import { SCRIPT_SHELL_OPTIONS } from "../4427.mjs";
+import { getUserEnvVarName } from "../5166.mjs";
 
-const SCRIPT_SHELL_OPTIONS = ["bun", "system"];
 const validateScriptShellOption = (shell, fromEnvVar = false) => {
   if (!SCRIPT_SHELL_OPTIONS.includes(shell)) {
     throw new BunWorkspacesError(
@@ -31,9 +27,4 @@ const resolveScriptShell = (shell) => {
   return validateScriptShellOption(shell);
 };
 
-export {
-  SCRIPT_SHELL_OPTIONS,
-  getScriptShellDefault,
-  resolveScriptShell,
-  validateScriptShellOption,
-};
+export { getScriptShellDefault, resolveScriptShell, validateScriptShellOption };

package/src/runScript/subprocesses.mjs

@@ -1,7 +1,5 @@
 import { IS_WINDOWS, runOnExit } from "../internal/core/index.mjs";
-import { logger } from "../internal/logger/index.mjs"; // CONCATENATED MODULE: external "../internal/core/index.mjs"
-// CONCATENATED MODULE: external "../internal/logger/index.mjs"
-// CONCATENATED MODULE: ./src/runScript/subprocesses.ts
+import { logger } from "../internal/logger/index.mjs";
 
 const SUBPROCESS_REGISTRY = {};
 runOnExit((codeOrSignal) => {

package/src/workspaces/applyWorkspacePatternConfigs.mjs

@@ -0,0 +1,58 @@
+import {
+  mergeWorkspaceConfig,
+  resolveWorkspaceConfig,
+} from "../config/index.mjs";
+import { matchWorkspacesByPatterns } from "./workspacePattern.mjs";
+
+const resolvedToWorkspaceConfig = ({ aliases, tags, scripts, rules }) => ({
+  alias: aliases,
+  tags,
+  scripts,
+  rules,
+});
+const makeContext = (workspace) => ({
+  name: workspace.name,
+  isRoot: workspace.isRoot,
+  path: workspace.path,
+  matchPattern: workspace.matchPattern,
+  scripts: workspace.scripts,
+  dependencies: workspace.dependencies,
+  dependents: workspace.dependents,
+});
+const applyWorkspacePatternConfigs = (
+  workspaces,
+  workspaceMap,
+  workspaceAliases,
+  patternConfigs,
+) => {
+  for (const entry of patternConfigs) {
+    const matched = matchWorkspacesByPatterns(entry.patterns, workspaces);
+    for (const workspace of matched) {
+      const mapEntry = workspaceMap[workspace.name];
+      const prevConfig = mapEntry.config;
+      const configToMerge =
+        typeof entry.config === "function"
+          ? entry.config(makeContext(workspace), prevConfig)
+          : entry.config;
+      const resolved = resolveWorkspaceConfig(
+        mergeWorkspaceConfig(
+          resolvedToWorkspaceConfig(prevConfig),
+          configToMerge,
+        ),
+      );
+      // Register any new aliases for validation
+      const previousAliases = new Set(workspace.aliases);
+      for (const alias of resolved.aliases) {
+        if (!previousAliases.has(alias)) {
+          workspaceAliases[alias] = workspace.name;
+        }
+      }
+      // Update workspace object so subsequent pattern entries see accumulated aliases/tags
+      workspace.aliases = resolved.aliases;
+      workspace.tags = resolved.tags;
+      mapEntry.config = resolved;
+    }
+  }
+};
+
+export { applyWorkspacePatternConfigs };

package/src/workspaces/dependencyGraph/cycles.mjs

@@ -1,4 +1,3 @@
-// CONCATENATED MODULE: ./src/workspaces/dependencyGraph/cycles.ts
 const preventDependencyCycles = (workspaces) => {
   const byName = new Map(workspaces.map((n) => [n.name, n]));
   // memo: name -> chains that end at `name`

package/src/workspaces/dependencyGraph/index.mjs

@@ -1,3 +1,5 @@
 export * from "./cycles.mjs";
 export * from "./resolveDependencies.mjs";
-export * from "./validateDependencyRules.mjs"; // CONCATENATED MODULE: ./src/workspaces/dependencyGraph/index.ts
+export * from "./validateDependencyRules.mjs";
+
+export {};

package/src/workspaces/dependencyGraph/resolveDependencies.mjs

@@ -1,5 +1,4 @@
-import { resolveCatalogDependencyVersion } from "../packageJson.mjs"; // CONCATENATED MODULE: external "../packageJson.mjs"
-// CONCATENATED MODULE: ./src/workspaces/dependencyGraph/resolveDependencies.ts
+import { resolveCatalogDependencyVersion } from "../packageJson.mjs";
 
 const resolveWorkspaceDependencies = (
   workspaceMap,

package/src/workspaces/dependencyGraph/validateDependencyRules.mjs

@@ -1,7 +1,5 @@
 import { WORKSPACE_ERRORS } from "../errors.mjs";
-import { matchWorkspacesByPatterns } from "../workspacePattern.mjs"; // CONCATENATED MODULE: external "../errors.mjs"
-// CONCATENATED MODULE: external "../workspacePattern.mjs"
-// CONCATENATED MODULE: ./src/workspaces/dependencyGraph/validateDependencyRules.ts
+import { matchWorkspacesByPatterns } from "../workspacePattern.mjs";
 
 const getTransitiveDeps = (workspaceName, workspaceMap, chain, visited) => {
   const entry = workspaceMap[workspaceName];
@@ -34,16 +32,6 @@ const validateWorkspaceDependencyRules = ({ workspaceMap }) => {
       const depWorkspace = workspaceMap[depName]?.workspace;
       if (!depWorkspace) continue;
       const chainStr = chain.join(" -> ");
-      if (rule.denyPatterns) {
-        const isDenied =
-          matchWorkspacesByPatterns(rule.denyPatterns, [depWorkspace]).length >
-          0;
-        if (isDenied) {
-          violations.push(
-            `"${workspaceName}" violates workspaceDependencies rule: workspace "${depName}" is denied by denyPatterns (dependency chain: ${chainStr})`,
-          );
-        }
-      }
       if (rule.allowPatterns) {
         const isAllowed =
           matchWorkspacesByPatterns(rule.allowPatterns, [depWorkspace]).length >
@@ -52,6 +40,17 @@ const validateWorkspaceDependencyRules = ({ workspaceMap }) => {
           violations.push(
             `"${workspaceName}" violates workspaceDependencies rule: workspace "${depName}" is not permitted by allowPatterns (dependency chain: ${chainStr})`,
           );
+          continue;
+        }
+      }
+      if (rule.denyPatterns) {
+        const isDenied =
+          matchWorkspacesByPatterns(rule.denyPatterns, [depWorkspace]).length >
+          0;
+        if (isDenied) {
+          violations.push(
+            `"${workspaceName}" violates workspaceDependencies rule: workspace "${depName}" is denied by denyPatterns (dependency chain: ${chainStr})`,
+          );
         }
       }
     }

package/src/workspaces/errors.mjs

@@ -1,5 +1,4 @@
-import { defineErrors } from "../internal/core/index.mjs"; // CONCATENATED MODULE: external "../internal/core/index.mjs"
-// CONCATENATED MODULE: ./src/workspaces/errors.ts
+import { defineErrors } from "../internal/core/index.mjs";
 
 const WORKSPACE_ERRORS = defineErrors(
   "PackageNotFound",

package/src/workspaces/findWorkspaces.mjs

@@ -8,6 +8,7 @@ import {
 import { BUN_LOCK_ERRORS, readBunLockfile } from "../internal/bun/index.mjs";
 import { BunWorkspacesError } from "../internal/core/index.mjs";
 import { logger } from "../internal/logger/logger.mjs";
+import { applyWorkspacePatternConfigs } from "./applyWorkspacePatternConfigs.mjs";
 import {
   resolveWorkspaceDependencies,
   validateWorkspaceDependencyRules,
@@ -16,17 +17,7 @@ import { WORKSPACE_ERRORS } from "./errors.mjs";
 import {
   resolvePackageJsonContent,
   resolvePackageJsonPath,
-} from "./packageJson.mjs"; // CONCATENATED MODULE: external "fs"
-// CONCATENATED MODULE: external "path"
-// CONCATENATED MODULE: external "bun"
-// CONCATENATED MODULE: external "../config/index.mjs"
-// CONCATENATED MODULE: external "../internal/bun/index.mjs"
-// CONCATENATED MODULE: external "../internal/core/index.mjs"
-// CONCATENATED MODULE: external "../internal/logger/logger.mjs"
-// CONCATENATED MODULE: external "./dependencyGraph/index.mjs"
-// CONCATENATED MODULE: external "./errors.mjs"
-// CONCATENATED MODULE: external "./packageJson.mjs"
-// CONCATENATED MODULE: ./src/workspaces/findWorkspaces.ts
+} from "./packageJson.mjs";
 
 const sortWorkspaces = (workspaces) =>
   [...workspaces]
@@ -75,6 +66,7 @@ const findWorkspaces = ({
   rootDirectory,
   workspaceGlobs: _workspaceGlobs,
   includeRootWorkspace = false,
+  workspacePatternConfigs,
 }) => {
   rootDirectory = path.resolve(rootDirectory);
   logger.debug(`Finding workspaces in ${rootDirectory}`);
@@ -179,6 +171,14 @@ const findWorkspaces = ({
       bunCatalogs,
     ),
   );
+  if (workspacePatternConfigs?.length) {
+    applyWorkspacePatternConfigs(
+      workspaces,
+      workspaceMap,
+      workspaceAliases,
+      workspacePatternConfigs,
+    );
+  }
   validateWorkspaceDependencyRules({
     workspaceMap,
   });

package/src/workspaces/index.mjs

@@ -1,3 +1,5 @@
 export * from "./findWorkspaces.mjs";
 export * from "./packageJson.mjs";
-export * from "./errors.mjs"; // CONCATENATED MODULE: ./src/workspaces/index.ts
+export * from "./errors.mjs";
+
+export {};

package/src/workspaces/packageJson.mjs

@@ -1,13 +1,8 @@
 import fs from "fs";
 import path from "path";
-import { isJSONObject } from "../internal/core/index.mjs";
 import { logger } from "../internal/logger/index.mjs";
-import { WORKSPACE_ERRORS } from "./errors.mjs"; // CONCATENATED MODULE: external "fs"
-// CONCATENATED MODULE: external "path"
-// CONCATENATED MODULE: external "../internal/core/index.mjs"
-// CONCATENATED MODULE: external "../internal/logger/index.mjs"
-// CONCATENATED MODULE: external "./errors.mjs"
-// CONCATENATED MODULE: ./src/workspaces/packageJson.ts
+import { WORKSPACE_ERRORS } from "./errors.mjs";
+import { isJSONObject } from "../8257.mjs";
 
 const resolvePackageJsonPath = (directoryItem) => {
   if (path.basename(directoryItem) === "package.json") {

package/src/workspaces/workspace.mjs

@@ -1,2 +1,3 @@
-// CONCATENATED MODULE: ./src/workspaces/workspace.ts
 /** Metadata about a nested package within a Bun monorepo */
+
+export {};

package/src/workspaces/workspacePattern.mjs

@@ -1,9 +1,9 @@
 import bun from "bun";
-import { createWildcardRegex, defineErrors } from "../internal/core/index.mjs"; // CONCATENATED MODULE: external "bun"
-// CONCATENATED MODULE: external "../internal/core/index.mjs"
-// CONCATENATED MODULE: ./src/workspaces/workspacePattern.ts
+import { createWildcardRegex, defineErrors } from "../internal/core/index.mjs";
 
-const TARGETS = ["path", "alias", "name", "tag"];
+const WORKSPACE_PATTERN_TARGETS = ["path", "alias", "name", "tag"];
+
+const TARGETS = WORKSPACE_PATTERN_TARGETS;
 const WORKSPACE_PATTERN_ERRORS = defineErrors("InvalidWorkspacePattern");
 const WORKSPACE_PATTERN_NEGATION_PREFIX = "not:";
 const WORKSPACE_PATTERN_SEPARATOR = ":";

package/src/ai/mcp/bwMcpServer.d.ts

@@ -1,4 +0,0 @@
-import type { FileSystemProject } from "../../project/implementations/fileSystemProject";
-export declare const startBwMcpServer: (
-  project: FileSystemProject,
-) => Promise<void>;

package/src/ai/mcp/core/index.d.ts

@@ -1,3 +0,0 @@
-export * from "./types";
-export * from "./transport";
-export * from "./server";

package/src/ai/mcp/core/server.d.ts

@@ -1,14 +0,0 @@
-import { type McpTransport } from "./transport";
-import {
-  type McpServerInfo,
-  type Resource,
-  type ResourceHandler,
-  type Tool,
-  type ToolHandler,
-} from "./types";
-export type McpServer = {
-  registerTool: (tool: Tool, handler: ToolHandler) => void;
-  registerResource: (resource: Resource, handler: ResourceHandler) => void;
-  start: (transport?: McpTransport) => Promise<void>;
-};
-export declare const createMcpServer: (info: McpServerInfo) => McpServer;

package/src/ai/mcp/core/transport.d.ts

@@ -1,12 +0,0 @@
-export type RawMessage = Record<string, unknown>;
-export type McpTransport = {
-  receive: () => AsyncGenerator<RawMessage>;
-  send: (message: RawMessage) => void;
-};
-export type MemoryTransport = McpTransport & {
-  sent: RawMessage[];
-};
-export declare const createMemoryTransport: (
-  messages: RawMessage[],
-) => MemoryTransport;
-export declare const createStdioTransport: () => McpTransport;

package/src/ai/mcp/core/types.d.ts

@@ -1,104 +0,0 @@
-export type JsonRpcId = string | number;
-export type JsonRpcSuccessResponse = {
-  jsonrpc: "2.0";
-  id: JsonRpcId;
-  result: unknown;
-};
-export type JsonRpcErrorResponse = {
-  jsonrpc: "2.0";
-  id: JsonRpcId;
-  error: {
-    code: number;
-    message: string;
-    data?: unknown;
-  };
-};
-export declare const JSON_RPC_ERROR_CODES: {
-  readonly parseError: -32700;
-  readonly invalidRequest: -32600;
-  readonly methodNotFound: -32601;
-  readonly invalidParams: -32602;
-  readonly internalError: -32603;
-};
-export declare const MCP_PROTOCOL_VERSION = "2024-11-05";
-export type ServerCapabilities = {
-  tools?: Record<string, never>;
-  resources?: Record<string, never>;
-};
-export type McpServerInfo = {
-  name: string;
-  version: string;
-  instructions?: string;
-};
-export type InitializeResult = {
-  protocolVersion: string;
-  capabilities: ServerCapabilities;
-  serverInfo: {
-    name: string;
-    version: string;
-  };
-  instructions?: string;
-};
-export type JsonSchemaProperty =
-  | {
-      type: "string";
-      description?: string;
-      enum?: string[];
-    }
-  | {
-      type: "number";
-      description?: string;
-    }
-  | {
-      type: "boolean";
-      description?: string;
-    }
-  | {
-      type: "array";
-      items: JsonSchemaProperty;
-      description?: string;
-    }
-  | {
-      type: "object";
-      properties?: Record<string, JsonSchemaProperty>;
-      required?: string[];
-      description?: string;
-    };
-export type ToolInputSchema = {
-  type: "object";
-  properties?: Record<string, JsonSchemaProperty>;
-  required?: string[];
-};
-export type Tool = {
-  name: string;
-  description: string;
-  inputSchema: ToolInputSchema;
-};
-export type TextContent = {
-  type: "text";
-  text: string;
-};
-export type CallToolResult = {
-  content: TextContent[];
-  isError?: boolean;
-};
-export type Resource = {
-  uri: string;
-  name: string;
-  description?: string;
-  mimeType?: string;
-};
-export type ResourceContent = {
-  uri: string;
-  mimeType: string;
-  text: string;
-};
-export type ReadResourceResult = {
-  contents: ResourceContent[];
-};
-export type ToolHandler = (
-  args: Record<string, unknown>,
-) => Promise<CallToolResult> | CallToolResult;
-export type ResourceHandler = (
-  uri: string,
-) => Promise<ReadResourceResult> | ReadResourceResult;

package/src/ai/mcp/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./core";
-export * from "./bwMcpServer";

package/src/ai/mcp/resources.d.ts

@@ -1,6 +0,0 @@
-import type { FileSystemProject } from "../../project/implementations/fileSystemProject";
-import type { McpServer } from "./core";
-export declare const registerBwResources: (
-  server: McpServer,
-  project: FileSystemProject,
-) => void;

package/src/ai/mcp/tools.d.ts

@@ -1,6 +0,0 @@
-import type { FileSystemProject } from "../../project/implementations/fileSystemProject";
-import type { McpServer } from "./core";
-export declare const registerBwTools: (
-  server: McpServer,
-  project: FileSystemProject,
-) => void;

package/src/cli/commands/commandHandlerUtils.d.ts

@@ -1,51 +0,0 @@
-import { type Command } from "commander";
-import type { FileSystemProject } from "../../project/implementations/fileSystemProject";
-import type { Workspace } from "../../workspaces";
-import type { WriteOutputOptions } from "../createCli";
-import type { CliMiddleware } from "../middleware";
-import {
-  type CliGlobalCommandName,
-  type CliProjectCommandName,
-} from "./commandsConfig";
-/** @todo DRY use of output text in cases such as having no workspaces/scripts */
-export type GlobalCommandContext = {
-  program: Command;
-  postTerminatorArgs: string[];
-  middleware: CliMiddleware;
-  outputWriters: Required<WriteOutputOptions>;
-  terminalWidth: number;
-  terminalHeight: number;
-};
-export type ProjectCommandContext = GlobalCommandContext & {
-  project: FileSystemProject;
-  projectError: Error | null;
-};
-/** Splits workspace patterns by whitespace, but allows escaping spaces via backslash */
-export declare const splitWorkspacePatterns: (
-  workspacePatterns: string,
-) => string[];
-export declare const createWorkspaceInfoLines: (
-  workspace: Workspace,
-) => string[];
-export declare const createScriptInfoLines: (
-  script: string,
-  workspaces: Workspace[],
-) => string[];
-export declare const createJsonLines: (
-  data: unknown,
-  options: {
-    pretty: boolean;
-  },
-) => string[];
-export declare const commandOutputLogger: import("../../internal/logger").Logger;
-export declare const handleGlobalCommand: <ActionArgs extends unknown[]>(
-  commandName: CliGlobalCommandName,
-  handler: (context: GlobalCommandContext, ...actionArgs: ActionArgs) => void,
-) => (context: GlobalCommandContext) => Command;
-export declare const handleProjectCommand: <ActionArgs extends unknown[]>(
-  commandName: CliProjectCommandName,
-  handler: (
-    context: Omit<ProjectCommandContext, "projectError">,
-    ...actionArgs: ActionArgs
-  ) => void,
-) => (context: ProjectCommandContext) => Command;

package/src/cli/commands/commands.d.ts

@@ -1,10 +0,0 @@
-import type {
-  GlobalCommandContext,
-  ProjectCommandContext,
-} from "./commandHandlerUtils";
-export declare const defineGlobalCommands: (
-  context: GlobalCommandContext,
-) => void;
-export declare const defineProjectCommands: (
-  context: ProjectCommandContext,
-) => void;