alchemy 0.63.0 → 0.64.0

package/src/util/dedent.ts

@@ -1,71 +1,43 @@
+import assert from "node:assert";
+
 /**
- * Removes common indentation from template literals to make them more readable in code.
- * This allows writing multi-line strings with proper indentation in the source code
- * while removing that indentation in the output string.
+ * Tagged template literal for removing indentation from a block of text.
  *
- * @example
- * const message = dedent`
- *   This is a multi-line string
- *   that will have its indentation removed.
- *     This line has extra indentation that will be preserved.
- * `;
- * // Result:
- * // "This is a multi-line string
- * // that will have its indentation removed.
- * //   This line has extra indentation that will be preserved."
+ * If the first line is empty, it will be ignored.
  */
-export function dedent(
-  strings: TemplateStringsArray,
-  ...values: any[]
-): string {
-  // Combine the template strings and values
-  const result = strings.reduce((acc, str, i) => {
-    return acc + str + (values[i] !== undefined ? values[i] : "");
-  }, "");
-
-  // Split into lines
-  const lines = result.split("\n");
-
-  // Remove ALL leading blank/whitespace-only lines
-  while (lines.length > 0 && lines[0].trim() === "") {
-    lines.shift();
-  }
-
-  // Remove ALL trailing blank/whitespace-only lines
-  while (lines.length > 0 && lines[lines.length - 1].trim() === "") {
-    lines.pop();
+export function dedent(strings: TemplateStringsArray, ...values: unknown[]) {
+  // Convert template literal arguments back to a regular string
+  const raw = String.raw({ raw: strings }, ...values);
+  // Split the string by lines
+  let lines = raw.split("\n");
+  assert(lines.length > 0);
+
+  // If the last line is just whitespace, remove it
+  if (lines[lines.length - 1].trim() === "") {
+    lines = lines.slice(0, lines.length - 1);
   }
 
-  // If there are no lines left after trimming, return an empty string
-  if (lines.length === 0) {
-    return "";
+  // Find the minimum-length indent, excluding the first line
+  let minIndent = "";
+  // (Could use `minIndent.length` for this, but then would need to start with
+  // infinitely long string)
+  let minIndentLength = Number.POSITIVE_INFINITY;
+  for (const line of lines.slice(1)) {
+    const indent = line.match(/^[ \t]*/)?.[0];
+    if (indent != null && indent.length < minIndentLength) {
+      minIndent = indent;
+      minIndentLength = indent.length;
+    }
   }
 
-  // Find the minimum indentation level (excluding empty/whitespace lines)
-  const minIndent = lines
-    .filter((line) => line.trim().length > 0) // Only consider non-blank lines for indent calculation
-    .reduce((min, line) => {
-      const indent = line.match(/^[ \t]*/)?.[0].length || 0;
-      // Handle potentially infinite min if all lines are blank (though handled by early return)
-      return indent < min ? indent : min;
-    }, Number.POSITIVE_INFINITY);
-
-  // If minIndent remains Infinity (only blank lines existed), return empty string.
-  // This case should be caught by the lines.length check above, but belt-and-suspenders.
-  if (minIndent === Number.POSITIVE_INFINITY) {
-    return "";
+  // If the first line is just whitespace, remove it
+  if (lines.length > 0 && lines[0].trim() === "") {
+    lines = lines.slice(1);
   }
 
-  // Remove the common indentation from each line
-  const dedented = lines.map((line) => {
-    // Preserve internal blank lines as empty strings, don't try to substring them
-    if (line.trim().length === 0) {
-      return "";
-    }
-    // Apply dedent only to lines with content
-    return line.substring(minIndent);
-  });
-
-  // Join the lines back together
-  return dedented.join("\n");
+  // Remove indent from all lines, and return them all joined together
+  lines = lines.map((line) =>
+    line.startsWith(minIndent) ? line.substring(minIndent.length) : line,
+  );
+  return lines.join("\n");
 }

package/src/util/idempotent-spawn.ts

@@ -134,7 +134,6 @@ export async function idempotentSpawn({
       if (isPidAlive(pid)) return pid;
       if (await isSameProcess?.(pid)) return pid;
       if (processName) {
-        const { default: find } = await import("find-process");
         const processes = await find("pid", pid);
         if (processes.length > 1) {
           console.warn(
@@ -317,7 +316,7 @@ export async function idempotentSpawn({
     // 2. Detect if it's still running.
     // The process appears to remain in the process table even after it's exited, so `isPidAlive` will return true.
     // However, if it's in the table, `find-process` will return it with a name of "<defunct>", so we can detect that instead.
-    const { default: find } = await import("find-process");
+    // const { default: find } = await import("find-process");
     const processes = await find("pid", pid);
     if (processes.some((p) => p.name !== "<defunct>")) {
       // 3. If it's still running, kill with SIGKILL
@@ -327,3 +326,25 @@ export async function idempotentSpawn({
     }
   }
 }
+
+/**
+ * The find-process package is a bit of a mess and has different behavior across runtimes (bun, tsx, node, etc.)
+ *
+ * This wrapper function defensively searches for the find function in the imported module.
+ *
+ * It confirmed to support:
+ * 1. node
+ * 2. bun
+ * 3. tsx
+ *
+ * TODO(sam): check deno?
+ */
+const find: typeof import("find-process").default = async (...args) => {
+  const findProcess = await import("find-process");
+  const find =
+    (findProcess as any).default?.default ??
+    (findProcess as any).default ??
+    (findProcess as any).find ??
+    findProcess;
+  return find(...args);
+};

package/src/util/xml.ts

@@ -2,6 +2,6 @@
  * Extract value from XML string
  */
 export function extractXmlValue(xml: string, tagName: string): string {
-  const match = xml.match(new RegExp(`<${tagName}>(.*?)<\/${tagName}>`));
+  const match = xml.match(new RegExp(`<${tagName}>(.*?)</${tagName}>`));
   return match ? match[1] : "";
 }

package/templates/astro/alchemy.run.ts

@@ -5,9 +5,7 @@ import { Astro } from "alchemy/cloudflare";
 
 const app = await alchemy("{projectName}");
 
-export const worker = await Astro("website", {
-  name: `${app.name}-${app.stage}-website`,
-});
+export const worker = await Astro("website");
 
 console.log({
   url: worker.url,

package/templates/hono/alchemy.run.ts

@@ -10,7 +10,6 @@ const kv = await KVNamespace("kv", {
 });
 
 export const worker = await Worker("worker", {
-  name: `${app.name}-${app.stage}`,
   entrypoint: "src/index.ts",
   bindings: {
     KV: kv,

package/templates/nuxt/alchemy.run.ts

@@ -5,9 +5,7 @@ import { Nuxt } from "alchemy/cloudflare";
 
 const app = await alchemy("{projectName}");
 
-export const worker = await Nuxt("website", {
-  name: `${app.name}-${app.stage}-website`,
-});
+export const worker = await Nuxt("website");
 
 console.log({
   url: worker.url,

package/templates/react-router/alchemy.run.ts

@@ -5,9 +5,7 @@ import { ReactRouter } from "alchemy/cloudflare";
 
 const app = await alchemy("{projectName}");
 
-export const worker = await ReactRouter("website", {
-  name: `${app.name}-${app.stage}-website`,
-});
+export const worker = await ReactRouter("website");
 
 console.log({
   url: worker.url,

package/templates/rwsdk/alchemy.run.ts

@@ -5,12 +5,10 @@ import { D1Database, DurableObjectNamespace, Redwood } from "alchemy/cloudflare"
 const app = await alchemy("{projectName}");
     
 const database = await D1Database("database", {
-  name: `${app.name}-${app.stage}-database`,
   migrationsDir: "migrations",
 });
 
 export const worker = await Redwood("website", {
-  name: `${app.name}-${app.stage}-website`,
   bindings: {
     AUTH_SECRET_KEY: alchemy.secret(process.env.AUTH_SECRET_KEY),
     DB: database,

package/templates/sveltekit/alchemy.run.ts

@@ -5,9 +5,7 @@ import { SvelteKit } from "alchemy/cloudflare";
 
 const app = await alchemy("{projectName}");
 
-export const worker = await SvelteKit("website", {
-  name: `${app.name}-${app.stage}-website`,
-});
+export const worker = await SvelteKit("website");
 
 console.log({
   url: worker.url,

package/templates/tanstack-start/alchemy.run.ts

@@ -5,9 +5,7 @@ import { TanStackStart } from "alchemy/cloudflare";
 
 const app = await alchemy("{projectName}");
 
-export const worker = await TanStackStart("website", {
-  name: `${app.name}-${app.stage}-website`,
-});
+export const worker = await TanStackStart("website");
 
 console.log({
   url: worker.url,

package/templates/typescript/alchemy.run.ts

@@ -6,7 +6,6 @@ import { Worker } from "alchemy/cloudflare";
 const app = await alchemy("{projectName}");
 
 export const worker = await Worker("worker", {
-  name: `${app.name}-${app.stage}-website`,
   entrypoint: "src/worker.ts",
 });
 

package/templates/vite/alchemy.run.ts

@@ -6,7 +6,6 @@ import { Vite } from "alchemy/cloudflare";
 const app = await alchemy("{projectName}");
 
 export const worker = await Vite("website", {
-  name: `${app.name}-${app.stage}-website`,
   entrypoint: "src/worker.ts",
 });