@base44-preview/cli 0.1.15-pr.626.454d562 → 0.1.15-pr.626.6dabe64

package/dist/cli/index.js

@@ -247338,13 +247338,14 @@ async function createVersion(artifacts, options = {}) {
     ...artifacts.siteWorker?.modules ?? [],
     ...artifacts.siteWorker?.assets ?? []
   ];
-  options.progress?.onDeclared?.({
-    fileCount: declaredFiles.length,
-    owedFiles: declared.uploads.length
-  });
+  options.progress?.onDeclared?.({ fileCount: declaredFiles.length });
   if (declared.uploads.length !== declaredFiles.length) {
     throw new InternalError(`Declared ${declaredFiles.length} files but the server signed ${declared.uploads.length} upload URLs.`);
   }
+  const drifted = declared.uploads.findIndex((upload, index) => upload.path !== declaredFiles[index].path);
+  if (drifted !== -1) {
+    throw new InternalError(`Upload ${drifted} is signed for ${declared.uploads[drifted].path}, but that slot declared ${declaredFiles[drifted].path}.`);
+  }
   let uploadedFiles = 0;
   await pMap(declared.uploads, async (upload, index) => {
     await putPresigned(upload, declaredFiles[index].absolutePath);
@@ -247370,7 +247371,7 @@ async function tagStep(step, run) {
   try {
     return await run();
   } catch (error) {
-    if (error !== null && typeof error === "object" && !(STEP in error)) {
+    if (error !== null && typeof error === "object" && !(STEP in error) && Object.isExtensible(error)) {
       Object.defineProperty(error, STEP, { value: step, enumerable: false });
     }
     throw error;
@@ -249761,7 +249762,53 @@ async function maybeAskToBuild(isNonInteractive, buildCommand) {
 }
 // src/core/version/artifacts.ts
 import { createHash as createHash2 } from "node:crypto";
-import { join as join27, resolve as resolve10 } from "node:path";
+import { join as join28, resolve as resolve11 } from "node:path";
+
+// src/core/version/project.ts
+import { dirname as dirname21, join as join27, resolve as resolve10 } from "node:path";
+var DEFAULT_BUILD_COMMAND = "npm run build";
+var DEFAULT_OUTPUT_DIRECTORY = "dist";
+async function resolvePublishTarget(projectRoot, overrides = {}) {
+  const project = await readSettingsIfPresent(projectRoot);
+  const root = project?.root ?? projectRoot ?? process.cwd();
+  return {
+    root,
+    configDir: project ? dirname21(project.configPath) : join27(root, PROJECT_SUBDIR),
+    buildCommand: project ? project.site?.buildCommand : DEFAULT_BUILD_COMMAND,
+    outputDir: outputDirectory(project, root, overrides.outputDir),
+    entitiesDir: project?.entitiesDir ?? "entities",
+    agentsDir: project?.agentsDir ?? "agents"
+  };
+}
+function outputDirectory(project, root, override) {
+  const configured = override ?? (project ? project.site?.outputDirectory : DEFAULT_OUTPUT_DIRECTORY);
+  return configured ? resolve10(root, configured) : null;
+}
+function requireOutputDir(target) {
+  if (target.outputDir === null) {
+    throw new ConfigNotFoundError("No site configuration found.", {
+      hints: [
+        {
+          message: `Add 'site.outputDirectory' to your config.jsonc (e.g., "site": { "outputDirectory": "dist" })`
+        },
+        { message: `Or pass --output-dir <dir>, relative to ${target.root}` }
+      ]
+    });
+  }
+  return target.outputDir;
+}
+async function readSettingsIfPresent(projectRoot) {
+  try {
+    return await readProjectSettings(projectRoot);
+  } catch (error) {
+    if (error instanceof ConfigNotFoundError) {
+      return null;
+    }
+    throw error;
+  }
+}
+
+// src/core/version/artifacts.ts
 var MAX_FILE_COUNT = 50000;
 var HASH_CONCURRENCY = 32;
 var ENTRY2 = "index.html";
@@ -249792,7 +249839,7 @@ async function collectSiteWorker(projectRoot) {
     return null;
   }
   const { config, modules, assetsDir } = built;
-  const entry = resolve10(config.configDir, config.main);
+  const entry = resolve11(config.configDir, config.main);
   const main = modules.find((m) => m.absolutePath === entry)?.name;
   if (!main) {
     throw new InvalidInputError(`The Worker's entry module ${config.main} is not among the ${modules.length} modules collected from ${config.configDir}.`);
@@ -249822,66 +249869,31 @@ async function readRawResources(dir) {
   const payloads = {};
   for (const relativePath of files.sort()) {
     const name = relativePath.replace(/\.jsonc?$/, "");
-    payloads[name] = await readJsonFile(join27(dir, ...relativePath.split("/")));
+    payloads[name] = await readJsonFile(join28(dir, ...relativePath.split("/")));
   }
   return payloads;
 }
 async function collectResources(configDir, dirs) {
   const [entities, agents] = await Promise.all([
-    readRawResources(join27(configDir, dirs.entitiesDir)),
-    readRawResources(join27(configDir, dirs.agentsDir))
+    readRawResources(join28(configDir, dirs.entitiesDir)),
+    readRawResources(join28(configDir, dirs.agentsDir))
   ]);
   return { entities, agents };
 }
+async function collectArtifacts(target) {
+  const siteWorker = await collectSiteWorker(target.root);
+  return {
+    files: siteWorker ? [] : await collectBuildOutput(requireOutputDir(target)),
+    ...siteWorker ? { siteWorker } : {},
+    ...await collectResources(target.configDir, target)
+  };
+}
 // src/core/version/gate.ts
 var VERSIONS_API_ENV = "BASE44_VERSIONS_API";
 function versionsApiEnabled(env = process.env) {
   const value = env[VERSIONS_API_ENV];
   return value === "1" || value === "true";
 }
-// src/core/version/project.ts
-import { dirname as dirname21, join as join28, resolve as resolve11 } from "node:path";
-var DEFAULT_BUILD_COMMAND = "npm run build";
-var DEFAULT_OUTPUT_DIRECTORY = "dist";
-async function resolvePublishTarget(projectRoot, overrides = {}) {
-  const project = await readSettingsIfPresent(projectRoot);
-  const root = project?.root ?? projectRoot ?? process.cwd();
-  return {
-    root,
-    configDir: project ? dirname21(project.configPath) : join28(root, PROJECT_SUBDIR),
-    buildCommand: project ? project.site?.buildCommand : DEFAULT_BUILD_COMMAND,
-    outputDir: outputDirectory(project, root, overrides.outputDir),
-    entitiesDir: project?.entitiesDir ?? "entities",
-    agentsDir: project?.agentsDir ?? "agents"
-  };
-}
-function outputDirectory(project, root, override) {
-  const configured = override ?? (project ? project.site?.outputDirectory : DEFAULT_OUTPUT_DIRECTORY);
-  return configured ? resolve11(root, configured) : null;
-}
-function requireOutputDir(target) {
-  if (target.outputDir === null) {
-    throw new ConfigNotFoundError("No site configuration found.", {
-      hints: [
-        {
-          message: `Add 'site.outputDirectory' to your config.jsonc (e.g., "site": { "outputDirectory": "dist" })`
-        },
-        { message: `Or pass --output-dir <dir>, relative to ${target.root}` }
-      ]
-    });
-  }
-  return target.outputDir;
-}
-async function readSettingsIfPresent(projectRoot) {
-  try {
-    return await readProjectSettings(projectRoot);
-  } catch (error) {
-    if (error instanceof ConfigNotFoundError) {
-      return null;
-    }
-    throw error;
-  }
-}
 // src/cli/commands/project/build.ts
 async function buildAction(ctx) {
   const app = requireApp(ctx);
@@ -250854,9 +250866,7 @@ function concurrencyOption() {
 async function publishAction(ctx, options) {
   const { runTask, log, jsonMode } = ctx;
   const app = requireApp(ctx);
-  const target = await resolvePublishTarget(app.projectRoot, {
-    outputDir: options.outputDir
-  });
+  const target = await tagStep("create_version", () => resolvePublishTarget(app.projectRoot, { outputDir: options.outputDir }));
   if (options.build !== false) {
     await tagStep("build", () => runSiteBuild(ctx, {
       root: target.root,
@@ -250866,20 +250876,13 @@ async function publishAction(ctx, options) {
   }
   const gitHash = await resolveProvenanceCommit(target.root, options.gitHash);
   const result = await runTask("Publishing...", async (updateMessage) => {
-    const artifacts = await tagStep("create_version", async () => {
-      const siteWorker = await collectSiteWorker(target.root);
-      return {
-        files: siteWorker ? [] : await collectBuildOutput(requireOutputDir(target)),
-        ...siteWorker ? { siteWorker } : {},
-        ...await collectResources(target.configDir, target)
-      };
-    });
+    const artifacts = await tagStep("create_version", () => collectArtifacts(target));
     return await publishVersion(artifacts, {
       sourceCommit: gitHash,
       target: options.target,
       concurrency: options.concurrency,
       progress: {
-        onDeclared: ({ fileCount, owedFiles }) => updateMessage(`Uploading ${owedFiles} of ${fileCount} files`),
+        onDeclared: ({ fileCount }) => updateMessage(`Uploading ${fileCount} files`),
         onUpload: ({ uploadedFiles, totalFiles }) => updateMessage(`Uploaded ${uploadedFiles} of ${totalFiles} files`)
       }
     });
@@ -251589,19 +251592,17 @@ function getTypesCommand() {
 }
 
 // src/cli/commands/versions/create.ts
-async function createAction2({ runTask, jsonMode, app }, options) {
-  const target = await resolvePublishTarget(app?.projectRoot, {
+async function createAction2(ctx, options) {
+  const { runTask, jsonMode } = ctx;
+  const target = await resolvePublishTarget(requireApp(ctx).projectRoot, {
     outputDir: options.outputDir
   });
   const gitHash = await resolveProvenanceCommit(target.root, options.gitHash);
-  const version = await runTask("Creating version...", async (updateMessage) => await createVersion({
-    files: await collectBuildOutput(requireOutputDir(target)),
-    ...await collectResources(target.configDir, target)
-  }, {
+  const version = await runTask("Creating version...", async (updateMessage) => await createVersion(await collectArtifacts(target), {
     sourceCommit: gitHash,
     concurrency: options.concurrency,
     progress: {
-      onDeclared: ({ fileCount, owedFiles }) => updateMessage(`Uploading ${owedFiles} of ${fileCount} files`),
+      onDeclared: ({ fileCount }) => updateMessage(`Uploading ${fileCount} files`),
       onUpload: ({ uploadedFiles, totalFiles }) => updateMessage(`Uploaded ${uploadedFiles} of ${totalFiles} files`)
     }
   }), {
@@ -251635,7 +251636,7 @@ async function deployAction3({ runTask, jsonMode }, versionId, options) {
   };
 }
 function getVersionDeployCommand() {
-  return new Base44Command("deploy").description("Point an environment at an already-recorded version (also the rollback)").argument("<version-id>", "The version to serve").option("--target <name>", "Environment to point at it").action(deployAction3);
+  return new Base44Command("deploy").description("Point an environment at an already-recorded version (also the rollback)").argument("<version-id>", "The version to serve").addOption(targetOption()).action(deployAction3);
 }
 
 // src/cli/commands/versions/index.ts
@@ -260359,4 +260360,4 @@ export {
   runCLI
 };
 
-//# debugId=A3CC3878ECA39CF664756E2164756E21
+//# debugId=7059640A5E6CFF9564756E2164756E21