@bagelink/workspace 1.8.26 → 1.8.28

package/dist/bin/bgl.cjs

@@ -4,419 +4,15 @@
 const node_path = require('node:path');
 const process = require('node:process');
 const node_child_process = require('node:child_process');
+const netlify = require('../shared/workspace.CuE882NE.cjs');
 const node_fs = require('node:fs');
 const prompts = require('prompts');
-const netlify = require('../shared/workspace.Dx9_TIij.cjs');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const process__default = /*#__PURE__*/_interopDefaultCompat(process);
 const prompts__default = /*#__PURE__*/_interopDefaultCompat(prompts);
 
-async function initWorkspace(root = process__default.cwd()) {
-  console.log("\n\u{1F680} Creating Bagel workspace...\n");
-  const response = await prompts__default([
-    {
-      type: "text",
-      name: "workspaceName",
-      message: "Workspace name:",
-      initial: "my-workspace"
-    },
-    {
-      type: "text",
-      name: "projectId",
-      message: "Bagel project ID:",
-      initial: "my-project"
-    },
-    {
-      type: "confirm",
-      name: "createFirstProject",
-      message: "Create first project?",
-      initial: true
-    },
-    {
-      type: (prev) => prev ? "text" : null,
-      name: "firstProjectName",
-      message: "First project name:",
-      initial: "web"
-    }
-  ]);
-  if (!response || !response.workspaceName) {
-    console.log("\n\u274C Workspace creation cancelled.\n");
-    process__default.exit(1);
-  }
-  const { workspaceName, projectId, createFirstProject, firstProjectName } = response;
-  const workspaceDir = node_path.resolve(root, workspaceName);
-  createWorkspaceRoot(root, workspaceName, projectId);
-  createSharedPackage(workspaceDir);
-  if (createFirstProject && firstProjectName) {
-    await addProject(firstProjectName, workspaceDir);
-  }
-  console.log("\n\u2705 Workspace created successfully!");
-  console.log("\nNext steps:");
-  console.log(`  cd ${workspaceName}`);
-  console.log("  bun install");
-  if (createFirstProject) {
-    console.log(`  bun run dev:${firstProjectName}`);
-  } else {
-    console.log("  bgl add <project-name>  # Add a project");
-  }
-  console.log("");
-}
-function createWorkspaceRoot(root, name, projectId) {
-  const workspaceDir = node_path.resolve(root, name);
-  if (node_fs.existsSync(workspaceDir)) {
-    console.error(`\u274C Directory ${name} already exists`);
-    process__default.exit(1);
-  }
-  node_fs.mkdirSync(workspaceDir, { recursive: true });
-  const packageJson = {
-    name,
-    private: true,
-    workspaces: ["*", "!node_modules"],
-    scripts: {
-      "dev": "bgl dev",
-      "dev:local": "bgl dev --mode localhost",
-      "dev:verbose": "bun run --filter './!shared*' dev",
-      "build": "bgl build",
-      "typecheck": "tsc --noEmit",
-      "lint": "eslint . --cache",
-      "lint:fix": "eslint . --cache --fix"
-    },
-    dependencies: {
-      "@bagelink/auth": "latest",
-      "@bagelink/sdk": "latest",
-      "@bagelink/vue": "latest",
-      "pinia": "latest",
-      "vue": "latest",
-      "vue-router": "latest"
-    },
-    devDependencies: {
-      "@bagelink/lint-config": "latest",
-      "@bagelink/workspace": "latest",
-      "@vitejs/plugin-vue": "latest",
-      "eslint": "latest",
-      "typescript": "^5.0.0",
-      "vite": "latest"
-    }
-  };
-  node_fs.writeFileSync(
-    node_path.resolve(workspaceDir, "package.json"),
-    `${JSON.stringify(packageJson, null, 2)}
-`
-  );
-  const bglConfig = `import { defineWorkspace } from '@bagelink/workspace'
-
-export default defineWorkspace({
-	localhost: {
-		host: 'http://localhost:8000',
-		proxy: '/api',
-		openapi_url: 'http://localhost:8000/openapi.json',
-	},
-	development: {
-		host: 'https://${projectId}.bagel.to',
-		proxy: '/api',
-		openapi_url: 'https://${projectId}.bagel.to/openapi.json',
-	},
-	production: {
-		host: 'https://${projectId}.bagel.to',
-		proxy: '/api',
-		openapi_url: 'https://${projectId}.bagel.to/openapi.json',
-	},
-})
-`;
-  node_fs.writeFileSync(node_path.resolve(workspaceDir, "bgl.config.ts"), bglConfig);
-  const tsConfig = {
-    compilerOptions: {
-      target: "ES2020",
-      useDefineForClassFields: true,
-      module: "ESNext",
-      lib: ["ES2020", "DOM", "DOM.Iterable"],
-      skipLibCheck: true,
-      moduleResolution: "bundler",
-      allowImportingTsExtensions: true,
-      resolveJsonModule: true,
-      isolatedModules: true,
-      noEmit: true,
-      jsx: "preserve",
-      strict: true,
-      noUnusedLocals: true,
-      noUnusedParameters: true,
-      noFallthroughCasesInSwitch: true,
-      baseUrl: ".",
-      paths: {
-        "shared/*": ["./shared/*"]
-      }
-    }
-  };
-  node_fs.writeFileSync(
-    node_path.resolve(workspaceDir, "tsconfig.json"),
-    `${JSON.stringify(tsConfig, null, 2)}
-`
-  );
-  const gitignore = `node_modules
-dist
-.DS_Store
-*.local
-.env.local
-.vite
-`;
-  node_fs.writeFileSync(node_path.resolve(workspaceDir, ".gitignore"), gitignore);
-  const scriptsDir = node_path.resolve(workspaceDir, "scripts");
-  node_fs.mkdirSync(scriptsDir, { recursive: true });
-  const devRunnerContent = `#!/usr/bin/env bun
-import { spawn } from 'bun'
-import { readdir } from 'fs/promises'
-import { resolve } from 'path'
-
-const projectsRoot = process.cwd()
-const projects = (await readdir(projectsRoot, { withFileTypes: true }))
-	.filter(
-		item =>
-			item.isDirectory()
-			&& item.name !== 'node_modules'
-			&& item.name !== 'shared'
-			&& item.name !== 'scripts'
-			&& item.name !== '.git'
-			&& !item.name.startsWith('.'),
-	)
-	.map(item => item.name)
-
-console.log(\`\\n\u{1F680} Starting \${projects.length} project\${projects.length > 1 ? 's' : ''}...\\n\`)
-
-const urlPattern = /Local:\\s+(http:\\/\\/localhost:\\d+)/
-
-projects.forEach((project) => {
-	const proc = spawn({
-		cmd: ['bun', 'run', 'dev'],
-		cwd: resolve(projectsRoot, project),
-		stdout: 'pipe',
-		stderr: 'pipe',
-	})
-
-	const decoder = new TextDecoder()
-
-	proc.stdout.pipeTo(
-		new WritableStream({
-			write(chunk) {
-				const text = decoder.decode(chunk)
-				const match = text.match(urlPattern)
-				if (match) {
-					console.log(\`  \u2713 \${project.padEnd(15)} \u2192 \${match[1]}\`)
-				}
-			},
-		}),
-	)
-
-	proc.stderr.pipeTo(
-		new WritableStream({
-			write(chunk) {
-				const text = decoder.decode(chunk)
-				if (text.includes('error') || text.includes('Error')) {
-					console.error(\`  \u2717 \${project}: \${text.trim()}\`)
-				}
-			},
-		}),
-	)
-})
-
-console.log('\\n\u{1F4A1} Press Ctrl+C to stop all servers\\n')
-
-process.on('SIGINT', () => {
-	console.log('\\n\\n\u{1F44B} Stopping all servers...\\n')
-	process.exit()
-})
-`;
-  node_fs.writeFileSync(node_path.resolve(scriptsDir, "dev.ts"), devRunnerContent);
-  console.log(`\u2705 Created workspace: ${name}`);
-}
-function createSharedPackage(root) {
-  const sharedDir = node_path.resolve(root, "shared");
-  node_fs.mkdirSync(sharedDir, { recursive: true });
-  const packageJson = {
-    name: "shared",
-    version: "1.0.0",
-    type: "module",
-    exports: {
-      ".": "./index.ts",
-      "./utils": "./utils/index.ts",
-      "./types": "./types/index.ts"
-    }
-  };
-  node_fs.writeFileSync(
-    node_path.resolve(sharedDir, "package.json"),
-    `${JSON.stringify(packageJson, null, 2)}
-`
-  );
-  node_fs.writeFileSync(
-    node_path.resolve(sharedDir, "index.ts"),
-    "// Shared utilities and exports\nexport * from './utils'\n"
-  );
-  node_fs.mkdirSync(node_path.resolve(sharedDir, "utils"), { recursive: true });
-  node_fs.writeFileSync(
-    node_path.resolve(sharedDir, "utils", "index.ts"),
-    "// Shared utility functions\nexport function formatDate(date: Date): string {\n  return date.toISOString()\n}\n"
-  );
-  node_fs.mkdirSync(node_path.resolve(sharedDir, "types"), { recursive: true });
-  node_fs.writeFileSync(
-    node_path.resolve(sharedDir, "types", "index.ts"),
-    "// Shared types\nexport interface User {\n  id: string\n  name: string\n}\n"
-  );
-  console.log("\u2705 Created shared package");
-}
-async function addProject(name, root = process__default.cwd()) {
-  const projectDir = node_path.resolve(root, name);
-  if (node_fs.existsSync(projectDir)) {
-    console.error(`\u274C Project ${name} already exists`);
-    process__default.exit(1);
-  }
-  console.log(`
-\u{1F4E6} Creating project: ${name}
-`);
-  node_fs.mkdirSync(projectDir, { recursive: true });
-  const isWorkspace = node_fs.existsSync(node_path.resolve(root, "bgl.config.ts"));
-  const packageJson = {
-    name,
-    type: "module",
-    scripts: {
-      dev: "vite",
-      build: "vite build",
-      preview: "vite preview"
-    },
-    dependencies: {},
-    devDependencies: {
-      "@vitejs/plugin-vue": "latest",
-      "vite": "latest",
-      "vue": "latest"
-    }
-  };
-  if (isWorkspace) {
-    packageJson.dependencies.shared = "workspace:*";
-  }
-  node_fs.writeFileSync(
-    node_path.resolve(projectDir, "package.json"),
-    `${JSON.stringify(packageJson, null, 2)}
-`
-  );
-  const bglConfigContent = isWorkspace ? `import { defineWorkspace } from '@bagelink/workspace'
-import rootWorkspace from '../bgl.config'
-
-export default defineWorkspace({
-	localhost: rootWorkspace('localhost'),
-	development: rootWorkspace('development'),
-	production: rootWorkspace('production'),
-})
-` : `import { defineWorkspace } from '@bagelink/workspace'
-
-export default defineWorkspace({
-	localhost: {
-		host: 'http://localhost:8000',
-		proxy: '/api',
-	},
-	development: {
-		host: 'https://my-project.bagel.to',
-		proxy: '/api',
-	},
-	production: {
-		host: 'https://my-project.bagel.to',
-		proxy: '/api',
-	},
-})
-`;
-  node_fs.writeFileSync(node_path.resolve(projectDir, "bgl.config.ts"), bglConfigContent);
-  const viteConfig = `import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
-import { bagelink } from '@bagelink/workspace/vite'
-import workspace from './bgl.config'
-
-export default defineConfig({
-	plugins: [
-		vue(),
-		bagelink({ workspace }),
-	],
-})
-`;
-  node_fs.writeFileSync(node_path.resolve(projectDir, "vite.config.ts"), viteConfig);
-  const srcDir = node_path.resolve(projectDir, "src");
-  node_fs.mkdirSync(srcDir, { recursive: true });
-  const indexHtml = `<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title>${name}</title>
-</head>
-<body>
-	<div id="app"></div>
-	<script type="module" src="/src/main.ts"><\/script>
-</body>
-</html>
-`;
-  node_fs.writeFileSync(node_path.resolve(projectDir, "index.html"), indexHtml);
-  const mainTs = `import { createApp } from 'vue'
-import App from './App.vue'
-
-createApp(App).mount('#app')
-`;
-  node_fs.writeFileSync(node_path.resolve(srcDir, "main.ts"), mainTs);
-  const appVue = `<script setup lang="ts">
-import { ref } from 'vue'
-${isWorkspace ? "import { formatDate } from 'shared/utils'\n" : ""}
-const count = ref(0)
-<\/script>
-
-<template>
-	<div>
-		<h1>${name}</h1>
-		<button @click="count++">Count: {{ count }}</button>
-		${isWorkspace ? "<p>{{ formatDate(new Date()) }}</p>" : ""}
-	</div>
-</template>
-`;
-  node_fs.writeFileSync(node_path.resolve(srcDir, "App.vue"), appVue);
-  console.log(`\u2705 Created project: ${name}`);
-  if (isWorkspace) {
-    updateWorkspaceScripts(root, name);
-  }
-  console.log("\nNext steps:");
-  console.log(`  cd ${name}`);
-  console.log("  bun install");
-  console.log("  bun run dev");
-  console.log("");
-}
-function updateWorkspaceScripts(root, projectName) {
-  const packageJsonPath = node_path.resolve(root, "package.json");
-  if (!node_fs.existsSync(packageJsonPath)) return;
-  try {
-    const packageJson = JSON.parse(
-      node_fs.readFileSync(packageJsonPath, "utf-8")
-    );
-    if (!packageJson.scripts) {
-      packageJson.scripts = {};
-    }
-    packageJson.scripts[`dev:${projectName}`] = `bun --filter ${projectName} dev`;
-    packageJson.scripts[`build:${projectName}`] = `bun --filter ${projectName} build`;
-    node_fs.writeFileSync(
-      packageJsonPath,
-      `${JSON.stringify(packageJson, null, 2)}
-`
-    );
-    console.log(`\u2705 Added scripts: dev:${projectName}, build:${projectName}`);
-  } catch (error) {
-    console.warn("\u26A0\uFE0F  Could not update workspace scripts");
-  }
-}
-function listProjects(root = process__default.cwd()) {
-  try {
-    const items = node_fs.readdirSync(root, { withFileTypes: true });
-    return items.filter(
-      (item) => item.isDirectory() && item.name !== "node_modules" && item.name !== "shared" && item.name !== "scripts" && item.name !== ".git" && !item.name.startsWith(".")
-    ).map((item) => item.name);
-  } catch {
-    return [];
-  }
-}
-
 async function runBuild(filter, additionalArgs = []) {
   const argsStr = additionalArgs.length > 0 ? ` -- ${additionalArgs.join(" ")}` : "";
   const resolvedFilters = resolveFilters$1(filter);
@@ -440,7 +36,7 @@ async function runBuild(filter, additionalArgs = []) {
 }
 function resolveFilters$1(filter) {
   if (filter) return [filter];
-  const projects = listProjects();
+  const projects = netlify.listProjects();
   if (projects.length === 0) {
     console.error("No projects found");
     return null;
@@ -471,7 +67,9 @@ function isWorkspace(root = process__default.cwd()) {
 }
 
 const servers = /* @__PURE__ */ new Map();
+const projectToPort = /* @__PURE__ */ new Map();
 const seenLines = /* @__PURE__ */ new Set();
+const START_PORT = 5173;
 const colors = {
   reset: "\x1B[0m",
   cyan: "\x1B[36m",
@@ -486,12 +84,13 @@ function clearAndPrintServers() {
   }
   console.log(`${colors.cyan}\u{1F680} Development Servers${colors.reset}
 `);
-  for (const [name, info] of servers.entries()) {
-    if (info.status === "ready" && info.port) {
-      const url = `http://localhost:${info.port}`;
+  const sortedServers = Array.from(servers.entries()).sort((a, b) => a[1].order - b[1].order);
+  for (const [name, info] of sortedServers) {
+    const url = `http://localhost:${info.assignedPort}`;
+    if (info.status === "ready") {
       console.log(`${colors.green}\u25CF${colors.reset} ${colors.cyan}${name}${colors.reset} ${colors.dim}\u2192${colors.reset} ${url}`);
     } else {
-      console.log(`${colors.yellow}\u25CB${colors.reset} ${colors.dim}${name} (starting...)${colors.reset}`);
+      console.log(`${colors.yellow}\u25CB${colors.reset} ${colors.dim}${name} (starting...)${colors.reset} ${colors.dim}${url}${colors.reset}`);
     }
   }
   console.log("");
@@ -500,10 +99,20 @@ async function runDev(filter, additionalArgs = []) {
   const argsStr = additionalArgs.length > 0 ? ` -- ${additionalArgs.join(" ")}` : "";
   const resolvedFilters = resolveFilters(filter);
   if (!resolvedFilters || resolvedFilters.length === 0) return 1;
+  const projectNames = resolvedFilters.map((f) => f.replace("./", "")).sort();
+  projectNames.forEach((name, index) => {
+    const assignedPort = START_PORT + index;
+    servers.set(name, {
+      name,
+      assignedPort,
+      status: "starting",
+      order: index
+    });
+    projectToPort.set(name, assignedPort);
+  });
+  clearAndPrintServers();
   const filterArgs = resolvedFilters.map((f) => `--filter '${f}'`).join(" ");
-  const projectNames = resolvedFilters.map((f) => f.replace("./", "")).join(", ");
-  console.log(`${colors.dim}Starting dev servers: ${projectNames}${argsStr}${colors.reset}
-`);
+  projectNames.join(", ");
   const command = `bun run ${filterArgs} dev${argsStr}`;
   const proc = node_child_process.spawn(command, {
     cwd: process__default.cwd(),
@@ -516,15 +125,6 @@ async function runDev(filter, additionalArgs = []) {
     if (!line.trim()) return;
     if (seenLines.has(line)) return;
     seenLines.add(line);
-    const projectMatch = line.match(/^(\w+)\s+dev:/);
-    if (projectMatch) {
-      const name = projectMatch[1];
-      if (!servers.has(name)) {
-        console.log(`${colors.dim}[DEBUG] Detected project: ${name}${colors.reset}`);
-        servers.set(name, { name, status: "starting" });
-        clearAndPrintServers();
-      }
-    }
     const portMatch = line.match(/Local:\s+http:\/\/localhost:(\d+)/);
     if (portMatch) {
       const port = Number.parseInt(portMatch[1], 10);
@@ -532,9 +132,8 @@ async function runDev(filter, additionalArgs = []) {
       if (projectInLine) {
         const name = projectInLine[1];
         const info = servers.get(name);
-        console.log(`${colors.dim}[DEBUG] Port ${port} for project: ${name}, exists: ${!!info}, hasPort: ${info?.port}${colors.reset}`);
-        if (info && !info.port) {
-          info.port = port;
+        if (info && info.assignedPort === port && !info.actualPort) {
+          info.actualPort = port;
           info.status = "ready";
           clearAndPrintServers();
         }
@@ -578,7 +177,7 @@ async function runDev(filter, additionalArgs = []) {
 }
 function resolveFilters(filter) {
   if (filter) return [filter];
-  const projects = listProjects();
+  const projects = netlify.listProjects();
   if (projects.length === 0) {
     console.error("No projects found");
     return null;
@@ -1199,7 +798,7 @@ async function main() {
       targetPath = subcommand === "." ? process__default.cwd() : node_path.resolve(process__default.cwd(), subcommand);
     }
     if (createWorkspace) {
-      await initWorkspace();
+      await netlify.initWorkspace();
     } else {
       await generateWorkspaceConfig(targetPath);
     }
@@ -1210,9 +809,9 @@ async function main() {
       console.log("Usage: bgl add <project-name>");
       process__default.exit(1);
     }
-    await addProject(projectName);
+    await netlify.addProject(projectName);
   } else if (command === "list") {
-    const projects = listProjects();
+    const projects = netlify.listProjects();
     if (projects.length === 0) {
       console.log("No projects found");
     } else {