@awsless/cli 0.0.46-local.48 → 0.0.46-local.49

package/dist/bin.js

@@ -150186,6 +150186,38 @@ var bootstrapAwsless = async (props) => {
 // src/config/load/load.ts
 import { basename as basename2, dirname as dirname5, join as join13 } from "path";
 
+// src/config/schema/local-entry.ts
+import { stat as stat2 } from "fs/promises";
+
+// src/config/schema/relative-path.ts
+import { join as join11 } from "path";
+var basePath;
+var setLocalBasePath = (path2) => {
+  basePath = path2;
+};
+var resolvePath = (path2) => {
+  if (path2.startsWith(".") && basePath) {
+    return join11(basePath, path2);
+  }
+  return path2;
+};
+var RelativePathSchema = exports_external.string().transform((path2) => resolvePath(path2));
+
+// src/config/schema/local-entry.ts
+var LocalEntrySchema = exports_external.union([
+  RelativePathSchema.refine(async (path2) => {
+    try {
+      const s2 = await stat2(path2);
+      return s2.isFile() || s2.isDirectory();
+    } catch (error3) {
+      return false;
+    }
+  }, `File or directory doesn't exist`),
+  exports_external.object({
+    nocheck: RelativePathSchema.describe("Specifies a local file or directory without checking if the file or directory exists.")
+  }).transform((v3) => v3.nocheck)
+]);
+
 // src/config/schema/config-ref.ts
 var ConfigRefSchema = exports_external.string().regex(/^config:[a-z0-9-]+$/, "Invalid config reference");
 var isConfigRef = (value) => {
@@ -150352,27 +150384,11 @@ var parse3 = (value) => {
 };
 
 // src/config/schema/local-file.ts
-import { stat as stat2 } from "fs/promises";
-
-// src/config/schema/relative-path.ts
-import { join as join11 } from "path";
-var basePath;
-var setLocalBasePath = (path2) => {
-  basePath = path2;
-};
-var resolvePath = (path2) => {
-  if (path2.startsWith(".") && basePath) {
-    return join11(basePath, path2);
-  }
-  return path2;
-};
-var RelativePathSchema = exports_external.string().transform((path2) => resolvePath(path2));
-
-// src/config/schema/local-file.ts
+import { stat as stat3 } from "fs/promises";
 var LocalFileSchema = exports_external.union([
   RelativePathSchema.refine(async (path2) => {
     try {
-      const s2 = await stat2(path2);
+      const s2 = await stat3(path2);
       return s2.isFile();
     } catch (error3) {
       return false;
@@ -151222,11 +151238,11 @@ var IndexSchema = exports_external.object({
 var SearchsSchema = exports_external.record(IndexNameSchema, IndexSchema).optional().describe("Define the search indexes in your stack, backed by the one shared OpenSearch domain of your app. The physical index name is prefixed with the stack name.");
 
 // src/config/schema/local-directory.ts
-import { stat as stat3 } from "fs/promises";
+import { stat as stat4 } from "fs/promises";
 var LocalDirectorySchema = exports_external.union([
   RelativePathSchema.refine(async (path2) => {
     try {
-      const s2 = await stat3(path2);
+      const s2 = await stat4(path2);
       return s2.isDirectory();
     } catch (error3) {
       return false;
@@ -151304,6 +151320,7 @@ var AppSchema = exports_external.object({
   profile: exports_external.string().describe("The AWS profile to deploy to."),
   protect: exports_external.boolean().default(false).describe("Protect your app & stacks from being deleted."),
   configs: ConfigsSchema,
+  seed: LocalEntrySchema.optional().describe("The file that seeds your local dev environment with data. It runs with the full local environment on the first dev boot & through the dashboard reseed button. One app wide file, so the seeding order is explicit."),
   removal: exports_external.enum(["remove", "retain"]).default("remove").describe([
     "Configure how your resources are handled when they have to be removed.",
     "",
@@ -151330,22 +151347,6 @@ var AppSchema = exports_external.object({
   test: TestDefaultSchema
 }).strict();
 
-// src/config/schema/local-entry.ts
-import { stat as stat4 } from "fs/promises";
-var LocalEntrySchema = exports_external.union([
-  RelativePathSchema.refine(async (path2) => {
-    try {
-      const s2 = await stat4(path2);
-      return s2.isFile() || s2.isDirectory();
-    } catch (error3) {
-      return false;
-    }
-  }, `File or directory doesn't exist`),
-  exports_external.object({
-    nocheck: RelativePathSchema.describe("Specifies a local file or directory without checking if the file or directory exists.")
-  }).transform((v3) => v3.nocheck)
-]);
-
 // src/feature/cache/schema.ts
 var StorageSchema = SizeSchema.refine(sizeMin(gibibytes(1)), "Minimum storage size is 1 GB").refine(sizeMax(gibibytes(5000)), "Maximum storage size is 5000 GB");
 var MinimumStorageSchema = StorageSchema.describe("The lower limit for data storage the cache is set to use. You can specify a size value from 1 GB to 5000 GB.");
@@ -151668,7 +151669,6 @@ var StackSchema = exports_external.object({
   pubsub: PubSubSchema,
   searchs: SearchsSchema,
   sites: SitesSchema,
-  seed: LocalEntrySchema.optional().describe("The file that seeds your local dev environment with data. It runs with the full local environment on the first dev boot & through the dashboard reseed button."),
   tests: TestsSchema,
   images: ImagesSchema,
   icons: IconsSchema,
@@ -166209,7 +166209,7 @@ var watchConfig = async (options, resolve5, reject) => {
 
 // src/dev/index.ts
 import { loadWorkspace as loadWorkspace3 } from "@awsless/ts-file-cache";
-import { mkdir as mkdir11, rm as rm12, writeFile as writeFile15 } from "fs/promises";
+import { mkdir as mkdir10, rm as rm12, writeFile as writeFile14 } from "fs/promises";
 import { join as join54 } from "path";
 
 // src/dev/context.ts
@@ -166518,88 +166518,50 @@ var createDevContext = (props) => {
 
 // src/dev/seed.ts
 import { spawn as spawn5 } from "child_process";
-import { mkdir as mkdir9, writeFile as writeFile12 } from "fs/promises";
 import { isAbsolute as isAbsolute4, join as join50 } from "path";
-import { pathToFileURL } from "url";
-var MARKER = "__awsless_seed__:";
 var createSeedRunner = (props) => {
-  const seeds = props.stackConfigs.filter((stack) => stack.seed).map((stack) => ({
-    name: stack.name,
-    file: isAbsolute4(stack.seed) ? stack.seed : join50(directories.root, stack.seed)
-  }));
+  const file2 = props.seed && (isAbsolute4(props.seed) ? props.seed : join50(directories.root, props.seed));
   let running;
   const run = () => {
     running ??= (async () => {
       try {
-        const runner = seeds.map((entry) => {
-          return `console.log(${JSON.stringify(MARKER + entry.name)})
-await import(${JSON.stringify(pathToFileURL(entry.file).href)})
-`;
-        }).join("");
-        const runnerDir = join50(directories.output, "local");
-        const runnerFile = join50(runnerDir, "seed-runner.mjs");
-        await mkdir9(runnerDir, { recursive: true });
-        await writeFile12(runnerFile, runner);
-        const timings = [];
+        if (!file2) {
+          return;
+        }
+        debug(`Seeding from ${props.seed}`);
         await new Promise((resolve5, reject) => {
-          const child = spawn5("bun", [runnerFile], {
+          const child = spawn5("bun", [file2], {
             cwd: directories.root,
             stdio: ["ignore", "pipe", "pipe"],
             env: { ...process.env, ...props.env }
           });
-          let current;
-          let started = Date.now();
           const output = [];
-          let buffered = "";
           const capture = (chunk3) => {
-            buffered += chunk3.toString();
-            let index;
-            while ((index = buffered.indexOf(`
-`)) >= 0) {
-              const line = buffered.slice(0, index);
-              buffered = buffered.slice(index + 1);
-              if (line.startsWith(MARKER)) {
-                if (current) {
-                  timings.push([current, Date.now() - started]);
-                }
-                current = line.slice(MARKER.length);
-                started = Date.now();
-                debug(`Seeding the ${current} stack`);
-              } else {
-                output.push(line);
-              }
-            }
+            output.push(chunk3.toString());
           };
           child.stdout?.on("data", capture);
           child.stderr?.on("data", capture);
           child.on("error", reject);
           child.on("exit", (code) => {
-            capture(Buffer.from(`
-`));
-            const logs = output.join(`
-`).trim();
+            const logs = output.join("").trim();
             if (logs) {
               debug(logs);
             }
             if (code === 0) {
-              if (current) {
-                timings.push([current, Date.now() - started]);
-              }
               resolve5();
             } else {
-              reject(new Error(`The seed of the "${current ?? seeds[0]?.name}" stack exited with code ${code}:
+              reject(new Error(`The seed exited with code ${code}:
 ${logs}`));
             }
           });
         });
-        return timings;
       } finally {
         running = undefined;
       }
     })();
     return running;
   };
-  return { count: seeds.length, run };
+  return { count: file2 ? 1 : 0, run };
 };
 
 // src/dev/dashboard/index.ts
@@ -166607,13 +166569,13 @@ var import_ioredis5 = __toESM(require_built3(), 1);
 import { DynamoDBClient as DynamoDBClient5 } from "@aws-sdk/client-dynamodb";
 import { DynamoDBDocumentClient, ScanCommand as ScanCommand2 } from "@aws-sdk/lib-dynamodb";
 import { randomUUID as randomUUID6 } from "crypto";
-import { readdir as readdir9, readFile as readFile22, stat as stat8, writeFile as writeFile14 } from "fs/promises";
+import { readdir as readdir9, readFile as readFile22, stat as stat8, writeFile as writeFile13 } from "fs/promises";
 import { createServer as createServer9 } from "http";
 import { join as join52, relative as relative10, sep as sep5 } from "path";
 
 // src/dev/worker.ts
 import { spawn as spawn6 } from "child_process";
-import { writeFile as writeFile13 } from "fs/promises";
+import { writeFile as writeFile12 } from "fs/promises";
 import { join as join51 } from "path";
 class WorkerError extends Error {
   name;
@@ -166631,18 +166593,16 @@ import { format } from 'node:util'
 let handler
 let getCurrentRoute = () => undefined
 
-// Console output is tagged with the active bundle route (invisible
-// \\x1f markers), so the dev cli can attribute every log line to the
-// function that wrote it - accurate even under concurrent requests,
-// since the route comes from the bundle's async context.
+// Every console call writes ONE framed record: an invisible \\x1f
+// marker with the active bundle route & the json-encoded text, so
+// multi-line output stays a single log entry downstream. The route
+// comes from the bundle's async context, accurate even under
+// concurrent requests.
 const patchConsole = (method, stream) => {
 	console[method] = (...args) => {
 		const route = getCurrentRoute() ?? ''
-		const text = format(...args)
 
-		for (const line of text.split('\\n')) {
-			stream.write('\\x1f' + route + '\\x1f' + line + '\\n')
-		}
+		stream.write('\\x1f' + route + '\\x1f' + JSON.stringify(format(...args)) + '\\n')
 	}
 }
 
@@ -166734,7 +166694,7 @@ var createBundleWorker = (props) => {
   };
   const start = async () => {
     const entry = join51(props.buildDir, "worker.mjs");
-    await writeFile13(entry, WORKER_ENTRY);
+    await writeFile12(entry, WORKER_ENTRY);
     port = await findFreePort();
     child = spawn6("node", ["--enable-source-maps", entry], {
       cwd: props.buildDir,
@@ -166745,24 +166705,32 @@ var createBundleWorker = (props) => {
         AWSLESS_DEV_WORKER_PORT: String(port)
       }
     });
+    const buffers = { stdout: "", stderr: "" };
     const capture = (stream2) => (chunk3) => {
-      for (const raw of chunk3.toString().split(`
-`)) {
+      buffers[stream2] += chunk3.toString();
+      const parts = buffers[stream2].split(`
+`);
+      buffers[stream2] = parts.pop() ?? "";
+      for (const raw of parts) {
         if (raw === "") {
           continue;
         }
-        let line = raw;
+        let text2 = raw;
         let route;
         if (raw.startsWith("\x1F")) {
           const end = raw.indexOf("\x1F", 1);
           if (end > 0) {
             route = raw.slice(1, end) || undefined;
-            line = raw.slice(end + 1);
+            try {
+              text2 = JSON.parse(raw.slice(end + 1));
+            } catch (_4) {
+              text2 = raw.slice(end + 1);
+            }
           }
         }
-        process[stream2].write((route ? `[${route}] ` : "") + line + `
+        process[stream2].write((route ? `[${route}] ` : "") + text2 + `
 `);
-        const clean = stripAnsi2(line);
+        const clean = stripAnsi2(text2);
         if (clean.trim() !== "") {
           props.onOutput?.(clean, stream2, route);
         }
@@ -166875,9 +166843,12 @@ var dashboardHtml = `<!doctype html>
 	}
 	.logs .line { display: flex; gap: 8px; padding: 1px 0; }
 	.logs .time { color: var(--muted); flex-shrink: 0; }
-	.logs .route { color: var(--accent); max-width: 220px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+	.logs .route { color: var(--accent); word-break: break-all; }
 	.logs .text { white-space: pre-wrap; word-break: break-word; }
-	.logs .line.error .text { color: var(--bad); }
+	.logs .line.error .text, .logs .entry.error .text { color: var(--bad); }
+	.logs .entry { padding: 4px 0; }
+	.logs .entry + .entry, .logs .line + .entry, .logs .entry + .line { border-top: 1px solid var(--border); }
+	.logs .entry .meta { display: flex; gap: 8px; margin-bottom: 2px; }
 	.config-form { display: flex; flex-direction: column; gap: 8px; max-width: 520px; }
 	.config-form .field { display: grid; grid-template-columns: 180px 1fr; gap: 12px; align-items: center; }
 	.config-form .name { color: var(--muted); overflow-wrap: anywhere; }
@@ -167431,11 +167402,27 @@ const attachLogFeed = (main, channel, route, title = 'Logs') => {
 		}
 
 		feed.querySelector('.empty')?.remove()
-		feed.append($('div', { className: 'line' + (data.error ? ' error' : '') }, [
-			$('span', { className: 'time' }, new Date(data.date).toLocaleTimeString()),
-			!route && data.route ? $('span', { className: 'route' }, data.route) : '',
-			$('span', { className: 'text' }, data.line),
-		]))
+
+		const error = data.error ? ' error' : ''
+		const showRoute = !route && data.route
+
+		// Tagged or multi-line records render as a block with the
+		// metadata on its own header line, so long route names never
+		// squeeze the text. Plain lines keep the compact row.
+		if (showRoute || data.line.includes('\\n')) {
+			feed.append($('div', { className: 'entry' + error }, [
+				$('div', { className: 'meta' }, [
+					$('span', { className: 'time' }, new Date(data.date).toLocaleTimeString()),
+					showRoute ? $('span', { className: 'route' }, data.route) : '',
+				]),
+				$('div', { className: 'text' }, data.line),
+			]))
+		} else {
+			feed.append($('div', { className: 'line' + error }, [
+				$('span', { className: 'time' }, new Date(data.date).toLocaleTimeString()),
+				$('span', { className: 'text' }, data.line),
+			]))
+		}
 
 		// Only the last 200 lines stay around, pinned to the bottom.
 		while (feed.children.length > 200) {
@@ -168343,7 +168330,7 @@ var createDashboardServer = (props) => {
     if (url.pathname === "/api/config") {
       if (req.method === "PUT") {
         const values2 = JSON.parse((await readBody3(req)).toString() || "{}");
-        await writeFile14(props.configFile, JSON.stringify(values2, null, "\t") + `
+        await writeFile13(props.configFile, JSON.stringify(values2, null, "\t") + `
 `);
         return { status: 200, body: JSON.stringify({ ok: true }) };
       }
@@ -168579,7 +168566,7 @@ var createLambdaServer = (props) => {
 };
 
 // src/dev/sdk.ts
-import { readdir as readdir10, readFile as readFile23, mkdir as mkdir10, rm as rm11, symlink } from "fs/promises";
+import { readdir as readdir10, readFile as readFile23, mkdir as mkdir9, rm as rm11, symlink } from "fs/promises";
 import { createRequire } from "module";
 import { dirname as dirname22, join as join53 } from "path";
 var linkSdkPackages = async (buildDir, onWarn) => {
@@ -168622,7 +168609,7 @@ var linkSdkPackages = async (buildDir, onWarn) => {
       }
     }
     const target2 = join53(buildDir, "node_modules", name);
-    await mkdir10(dirname22(target2), { recursive: true });
+    await mkdir9(dirname22(target2), { recursive: true });
     await rm11(target2, { recursive: true, force: true });
     await symlink(source, target2, "dir");
   }
@@ -168645,7 +168632,7 @@ var startDev = async (props) => {
     dev: true
   });
   ready2();
-  await mkdir11(join54(directories.output, "local"), { recursive: true });
+  await mkdir10(join54(directories.output, "local"), { recursive: true });
   const routerPorts = {};
   Object.keys(appConfig.router ?? {}).forEach((id, index) => {
     routerPorts[id] = props.port + 1 + index;
@@ -168700,7 +168687,7 @@ var startDev = async (props) => {
     for (const [id, port] of Object.entries(routerPorts)) {
       env5[`ROUTER_${constantCase(id)}_ENDPOINT`] = `localhost:${port}`;
     }
-    await writeFile15(join54(directories.output, "local", "env.json"), JSON.stringify(env5, null, "\t") + `
+    await writeFile14(join54(directories.output, "local", "env.json"), JSON.stringify(env5, null, "\t") + `
 `);
     return { env: env5, lambda: lambda2 };
   });
@@ -168715,7 +168702,7 @@ var startDev = async (props) => {
       }
       debug(`Build ${builder.type}:${builder.name}`, meta?.cached ? "cached" : String(meta?.buildTime));
     }
-    await writeFile15(getBuildPath("bundle", bundleName, "files/awsless-env.mjs"), `export default {}
+    await writeFile14(getBuildPath("bundle", bundleName, "files/awsless-env.mjs"), `export default {}
 `);
     await linkSdkPackages(buildDir, log);
     return changed;
@@ -168798,12 +168785,12 @@ var startDev = async (props) => {
       restartNeeded = true;
     }
   });
-  const seeder = createSeedRunner({ stackConfigs, env: env4 });
+  const seeder = createSeedRunner({ seed: appConfig.seed, env: env4 });
   const resetData = createDataReset({ pool: props.pool, appConfig, stackConfigs });
   if (firstBoot && seeder.count > 0 && !dirty) {
     try {
-      await phase({ start: "Seeding the local data...", done: "Seeded the local data" }, async (detail) => {
-        detail(breakdown(await seeder.run()));
+      await phase({ start: "Seeding the local data...", done: "Seeded the local data" }, async () => {
+        await seeder.run();
       });
     } catch (error3) {
       log(`Seeding failed: ${error3 instanceof Error ? error3.message : String(error3)}`);
@@ -168935,7 +168922,7 @@ var createServerPool = () => {
 };
 
 // src/type-gen/generate.ts
-import { mkdir as mkdir12, writeFile as writeFile16 } from "fs/promises";
+import { mkdir as mkdir11, writeFile as writeFile15 } from "fs/promises";
 import { dirname as dirname23, join as join55, relative as relative11 } from "path";
 var generateTypes = async (props) => {
   const files = [];
@@ -168949,8 +168936,8 @@ var generateTypes = async (props) => {
           if (include) {
             files.push(relative11(directories.root, path6));
           }
-          await mkdir12(dirname23(path6), { recursive: true });
-          await writeFile16(path6, code);
+          await mkdir11(dirname23(path6), { recursive: true });
+          await writeFile15(path6, code);
         }
       }
     });
@@ -168958,7 +168945,7 @@ var generateTypes = async (props) => {
   if (files.length) {
     const code = files.map((file2) => `/// <reference path='${file2}' />`).join(`
 `);
-    await writeFile16(join55(directories.root, `awsless.d.ts`), code);
+    await writeFile15(join55(directories.root, `awsless.d.ts`), code);
   }
 };
 
@@ -184587,7 +184574,7 @@ var state = (program3) => {
 };
 
 // src/cli/command/test.ts
-import { mkdir as mkdir13, writeFile as writeFile17 } from "fs/promises";
+import { mkdir as mkdir12, writeFile as writeFile16 } from "fs/promises";
 import { join as join57 } from "path";
 
 // src/test/manifest.ts
@@ -184713,8 +184700,8 @@ var test2 = (program3) => {
         await redis.ping();
         manifest.servers.redis = { host: "127.0.0.1", port: await redis.getPort() };
       }
-      await mkdir13(join57(directories.output, "test"), { recursive: true });
-      await writeFile17(manifestFile, JSON.stringify(manifest));
+      await mkdir12(join57(directories.output, "test"), { recursive: true });
+      await writeFile16(manifestFile, JSON.stringify(manifest));
       process.env.AWSLESS_TEST_MANIFEST = manifestFile;
       let passed = false;
       try {