@base44-preview/cli 0.1.16-pr.626.891bf00 → 0.1.16-pr.626.cb8fa0d

package/dist/cli/index.js

@@ -228657,20 +228657,6 @@ function isCLIError(error) {
 function isUserError(error) {
   return error instanceof UserError;
 }
-var STEP = Symbol.for("base44.commandStep");
-async function tagStep(step, run) {
-  try {
-    return await run();
-  } catch (error) {
-    if (error !== null && typeof error === "object" && !(STEP in error) && Object.isExtensible(error)) {
-      Object.defineProperty(error, STEP, { value: step, enumerable: false });
-    }
-    throw error;
-  }
-}
-function stepOf(error) {
-  return error !== null && typeof error === "object" && STEP in error ? error[STEP] : undefined;
-}
 
 // src/core/utils/fs.ts
 async function pathExists(path) {
@@ -247262,6 +247248,169 @@ async function resolveBranchName(name) {
   return matches[0].id;
 }
 
+// src/core/version/publish.ts
+import { randomUUID as randomUUID4 } from "node:crypto";
+
+// src/core/version/schema.ts
+var DeclareVersionResponseSchema = object({
+  session_id: string2(),
+  uploads: array(object({
+    path: string2(),
+    url: string2(),
+    content_type: string2(),
+    content_length: number2(),
+    checksum_sha256: string2()
+  }))
+}).transform((data) => ({
+  sessionId: data.session_id,
+  uploads: data.uploads.map((upload) => ({
+    path: upload.path,
+    url: upload.url,
+    contentType: upload.content_type,
+    contentLength: upload.content_length,
+    checksumSha256: upload.checksum_sha256
+  }))
+}));
+var CreateVersionResponseSchema = object({
+  version_id: string2(),
+  manifest_hash: string2()
+}).transform((data) => ({
+  versionId: data.version_id,
+  manifestHash: data.manifest_hash
+}));
+var EnvironmentResponseSchema = object({
+  name: string2(),
+  version_id: string2(),
+  manifest_hash: string2(),
+  deployment_id: string2()
+}).transform((data) => ({
+  name: data.name,
+  versionId: data.version_id,
+  manifestHash: data.manifest_hash,
+  deploymentId: data.deployment_id
+}));
+
+// src/core/version/api.ts
+var DEFAULT_VERSION_UPLOAD_CONCURRENCY = 8;
+var MAX_VERSION_UPLOAD_CONCURRENCY = 16;
+function declaredFile({ path, size, digest }) {
+  return { path, size, digest };
+}
+function declaredModule(module) {
+  return { ...declaredFile(module), type: module.type };
+}
+function declaredAssetsConfig(config) {
+  const stated = {
+    html_handling: config?.htmlHandling ?? null,
+    not_found_handling: config?.notFoundHandling ?? null,
+    run_worker_first: config?.runWorkerFirst ?? null,
+    headers: config?.headers ?? null,
+    redirects: config?.redirects ?? null
+  };
+  return Object.values(stated).every((v) => v === null) ? null : stated;
+}
+async function post(path, json, doing) {
+  try {
+    return await getAppClient().post(path, { json, timeout: 180000 });
+  } catch (error) {
+    throw await ApiError.fromHttpError(error, doing);
+  }
+}
+async function patch(path, json, doing) {
+  try {
+    return await getAppClient().patch(path, { json, timeout: 180000 });
+  } catch (error) {
+    throw await ApiError.fromHttpError(error, doing);
+  }
+}
+function parse10(schema, body, what) {
+  const result = schema.safeParse(body);
+  if (!result.success) {
+    throw new SchemaValidationError(`Invalid ${what} response from server`, result.error);
+  }
+  return result.data;
+}
+async function createVersion(artifacts, options = {}) {
+  const declared = parse10(DeclareVersionResponseSchema, await (await post("versions", {
+    static_bundle: artifacts.files.map(declaredFile),
+    ...artifacts.siteWorker ? {
+      site_worker: {
+        main: artifacts.siteWorker.main,
+        modules: artifacts.siteWorker.modules.map(declaredModule),
+        assets: artifacts.siteWorker.assets.map(declaredFile),
+        compatibility_date: artifacts.siteWorker.compatibilityDate,
+        compatibility_flags: artifacts.siteWorker.compatibilityFlags,
+        assets_config: declaredAssetsConfig(artifacts.siteWorker.assetsConfig)
+      }
+    } : {},
+    entities: artifacts.entities,
+    agents: artifacts.agents,
+    source_commit: options.sourceCommit
+  }, "declaring a version")).json(), "declare");
+  const declaredFiles = [
+    ...artifacts.files,
+    ...artifacts.siteWorker?.modules ?? [],
+    ...artifacts.siteWorker?.assets ?? []
+  ];
+  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);
+    uploadedFiles++;
+    options.progress?.onUpload?.({
+      uploadedFiles,
+      totalFiles: declared.uploads.length
+    });
+  }, { concurrency: options.concurrency ?? DEFAULT_VERSION_UPLOAD_CONCURRENCY });
+  return parse10(CreateVersionResponseSchema, await (await post(`versions/${encodeURIComponent(declared.sessionId)}/finalize`, {}, "creating a version")).json(), "create version");
+}
+async function setEnvironmentVersion(environment, versionId, options = {}) {
+  return parse10(EnvironmentResponseSchema, await (await patch(`environments/${encodeURIComponent(environment)}`, {
+    version_id: versionId,
+    ...options.idempotencyKey ? { idempotency_key: options.idempotencyKey } : {}
+  }, "setting the environment's version")).json(), "environment");
+}
+
+// src/core/version/publish.ts
+var STEP = Symbol.for("base44.publishStep");
+var DEFAULT_ENVIRONMENT = "production";
+async function tagStep(step, run) {
+  try {
+    return await run();
+  } catch (error) {
+    if (error !== null && typeof error === "object" && !(STEP in error) && Object.isExtensible(error)) {
+      Object.defineProperty(error, STEP, { value: step, enumerable: false });
+    }
+    throw error;
+  }
+}
+function stepOf(error) {
+  return error !== null && typeof error === "object" && STEP in error ? error[STEP] : undefined;
+}
+async function publishVersion(artifacts, options = {}) {
+  const version = await tagStep("create_version", () => createVersion(artifacts, {
+    sourceCommit: options.sourceCommit,
+    concurrency: options.concurrency,
+    progress: options.progress
+  }));
+  const environment = await tagStep("deploy", () => setEnvironmentVersion(options.target ?? DEFAULT_ENVIRONMENT, version.versionId, {
+    idempotencyKey: randomUUID4()
+  }));
+  return {
+    environment: environment.name,
+    versionId: environment.versionId,
+    manifestHash: environment.manifestHash,
+    deploymentId: environment.deploymentId
+  };
+}
+
 // src/cli/utils/command/Base44Command.ts
 function writeJsonSuccess(result) {
   if (result.stdout) {
@@ -249625,143 +249774,6 @@ async function maybeAskToBuild(isNonInteractive, buildCommand) {
   });
   return !Ct(answer) && answer;
 }
-
-// src/core/version/schema.ts
-var DeclareVersionResponseSchema = object({
-  session_id: string2(),
-  uploads: array(object({
-    path: string2(),
-    url: string2(),
-    content_type: string2(),
-    content_length: number2(),
-    checksum_sha256: string2()
-  }))
-}).transform((data) => ({
-  sessionId: data.session_id,
-  uploads: data.uploads.map((upload) => ({
-    path: upload.path,
-    url: upload.url,
-    contentType: upload.content_type,
-    contentLength: upload.content_length,
-    checksumSha256: upload.checksum_sha256
-  }))
-}));
-var CreateVersionResponseSchema = object({
-  version_id: string2(),
-  manifest_hash: string2()
-}).transform((data) => ({
-  versionId: data.version_id,
-  manifestHash: data.manifest_hash
-}));
-var EnvironmentResponseSchema = object({
-  name: string2(),
-  version_id: string2(),
-  manifest_hash: string2(),
-  deployment_id: string2()
-}).transform((data) => ({
-  name: data.name,
-  versionId: data.version_id,
-  manifestHash: data.manifest_hash,
-  deploymentId: data.deployment_id
-}));
-
-// src/core/version/api.ts
-var DEFAULT_VERSION_UPLOAD_CONCURRENCY = 8;
-var MAX_VERSION_UPLOAD_CONCURRENCY = 16;
-function declaredFile({ path, size, digest }) {
-  return { path, size, digest };
-}
-function declaredModule(module) {
-  return { ...declaredFile(module), type: module.type };
-}
-function declaredAssetsConfig(config) {
-  const stated = {
-    html_handling: config?.htmlHandling ?? null,
-    not_found_handling: config?.notFoundHandling ?? null,
-    run_worker_first: config?.runWorkerFirst ?? null,
-    headers: config?.headers ?? null,
-    redirects: config?.redirects ?? null
-  };
-  return Object.values(stated).every((v) => v === null) ? null : stated;
-}
-async function post(path, json, doing) {
-  try {
-    return await getAppClient().post(path, { json, timeout: 180000 });
-  } catch (error) {
-    throw await ApiError.fromHttpError(error, doing);
-  }
-}
-var KEYED_RETRY = {
-  limit: 3,
-  methods: ["patch"],
-  statusCodes: [408, 500, 502, 503, 504],
-  retryOnTimeout: true
-};
-async function patch(path, json, doing, retry) {
-  try {
-    return await getAppClient().patch(path, {
-      json,
-      timeout: 180000,
-      ...retry ? { retry } : {}
-    });
-  } catch (error) {
-    throw await ApiError.fromHttpError(error, doing);
-  }
-}
-function parse10(schema, body, what) {
-  const result = schema.safeParse(body);
-  if (!result.success) {
-    throw new SchemaValidationError(`Invalid ${what} response from server`, result.error);
-  }
-  return result.data;
-}
-async function createVersion(artifacts, options = {}) {
-  const declared = parse10(DeclareVersionResponseSchema, await (await post("versions", {
-    static_bundle: artifacts.files.map(declaredFile),
-    ...artifacts.siteWorker ? {
-      site_worker: {
-        main: artifacts.siteWorker.main,
-        modules: artifacts.siteWorker.modules.map(declaredModule),
-        assets: artifacts.siteWorker.assets.map(declaredFile),
-        compatibility_date: artifacts.siteWorker.compatibilityDate,
-        compatibility_flags: artifacts.siteWorker.compatibilityFlags,
-        assets_config: declaredAssetsConfig(artifacts.siteWorker.assetsConfig)
-      }
-    } : {},
-    entities: artifacts.entities,
-    agents: artifacts.agents,
-    source_commit: options.sourceCommit
-  }, "declaring a version")).json(), "declare");
-  const declaredFiles = [
-    ...artifacts.files,
-    ...artifacts.siteWorker?.modules ?? [],
-    ...artifacts.siteWorker?.assets ?? []
-  ];
-  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);
-    uploadedFiles++;
-    options.progress?.onUpload?.({
-      uploadedFiles,
-      totalFiles: declared.uploads.length
-    });
-  }, { concurrency: options.concurrency ?? DEFAULT_VERSION_UPLOAD_CONCURRENCY });
-  return parse10(CreateVersionResponseSchema, await (await post(`versions/${encodeURIComponent(declared.sessionId)}/finalize`, {}, "creating a version")).json(), "create version");
-}
-async function setEnvironmentVersion(environment, versionId, options = {}) {
-  return parse10(EnvironmentResponseSchema, await (await patch(`environments/${encodeURIComponent(environment)}`, {
-    version_id: versionId,
-    ...options.idempotencyKey ? { idempotency_key: options.idempotencyKey } : {}
-  }, "setting the environment's version", options.idempotencyKey ? KEYED_RETRY : undefined)).json(), "environment");
-}
 // src/core/version/artifacts.ts
 import { createHash as createHash2 } from "node:crypto";
 import { join as join28, resolve as resolve11 } from "node:path";
@@ -249820,20 +249832,18 @@ async function digestFile(absolutePath) {
 }
 async function collectBuildOutput(outputDir, options = {}) {
   const found = await describeBuildOutput(outputDir);
+  if (found.length === 0) {
+    throw new InvalidInputError(`No files found in ${outputDir}. Build the site before creating a version.`, {
+      hints: [
+        { message: "Run 'base44 build' first", command: "base44 build" }
+      ]
+    });
+  }
   if (found.length > MAX_FILE_COUNT) {
     throw new InvalidInputError(`Too many files: found ${found.length}, the limit is ${MAX_FILE_COUNT}.`);
   }
-  if (options.entryFile) {
-    if (found.length === 0) {
-      throw new InvalidInputError(`No files found in ${outputDir}. Build the site before creating a version.`, {
-        hints: [
-          { message: "Run 'base44 build' first", command: "base44 build" }
-        ]
-      });
-    }
-    if (!found.some((f) => f.path === options.entryFile)) {
-      throw new InvalidInputError(`${outputDir} has no ${options.entryFile}, so nothing could enter the site.`);
-    }
+  if (options.requireEntry !== false && !found.some((f) => f.path === ENTRY2)) {
+    throw new InvalidInputError(`${outputDir} has no ${ENTRY2}, so nothing could enter the site.`);
   }
   return await pMap(found, async (file) => ({ ...file, digest: await digestFile(file.absolutePath) }), { concurrency: HASH_CONCURRENCY });
 }
@@ -249857,7 +249867,7 @@ async function collectSiteWorker(projectRoot) {
       digest: await digestFile(absolutePath),
       type
     }), { concurrency: HASH_CONCURRENCY }),
-    assets: assetsDir ? await collectBuildOutput(assetsDir) : [],
+    assets: assetsDir ? await collectBuildOutput(assetsDir, { requireEntry: false }) : [],
     compatibilityDate: config.compatibilityDate,
     compatibilityFlags: config.compatibilityFlags,
     assetsConfig: config.assetsConfig
@@ -249889,9 +249899,7 @@ async function collectResources(configDir, dirs) {
 async function collectArtifacts(target) {
   const siteWorker = await collectSiteWorker(target.root);
   return {
-    files: siteWorker ? [] : await collectBuildOutput(requireOutputDir(target), {
-      entryFile: ENTRY2
-    }),
+    files: siteWorker ? [] : await collectBuildOutput(requireOutputDir(target)),
     ...siteWorker ? { siteWorker } : {},
     ...await collectResources(target.configDir, target)
   };
@@ -249902,28 +249910,6 @@ function versionsApiEnabled(env = process.env) {
   const value = env[VERSIONS_API_ENV];
   return value === "1" || value === "true";
 }
-// src/core/version/publish.ts
-import { randomUUID as randomUUID4 } from "node:crypto";
-var DEFAULT_ENVIRONMENT = "production";
-async function tagStep2(step, run) {
-  return await tagStep(step, run);
-}
-async function publishVersion(artifacts, options = {}) {
-  const version = await tagStep2("create_version", () => createVersion(artifacts, {
-    sourceCommit: options.sourceCommit,
-    concurrency: options.concurrency,
-    progress: options.progress
-  }));
-  const environment = await tagStep2("deploy", () => setEnvironmentVersion(options.target ?? DEFAULT_ENVIRONMENT, version.versionId, {
-    idempotencyKey: randomUUID4()
-  }));
-  return {
-    environment: environment.name,
-    versionId: environment.versionId,
-    manifestHash: environment.manifestHash,
-    deploymentId: environment.deploymentId
-  };
-}
 // src/cli/commands/project/build.ts
 async function buildAction(ctx) {
   const app = requireApp(ctx);
@@ -250896,9 +250882,9 @@ function concurrencyOption() {
 async function publishAction(ctx, options) {
   const { runTask, log, jsonMode } = ctx;
   const app = requireApp(ctx);
-  const target = await tagStep2("create_version", () => resolvePublishTarget(app.projectRoot, { outputDir: options.outputDir }));
+  const target = await tagStep("create_version", () => resolvePublishTarget(app.projectRoot, { outputDir: options.outputDir }));
   if (options.build !== false) {
-    await tagStep2("build", () => runSiteBuild(ctx, {
+    await tagStep("build", () => runSiteBuild(ctx, {
       root: target.root,
       buildCommand: target.buildCommand,
       appId: app.id
@@ -250906,7 +250892,7 @@ async function publishAction(ctx, options) {
   }
   const gitHash = await resolveProvenanceCommit(target.root, options.gitHash);
   const result = await runTask("Publishing...", async (updateMessage) => {
-    const artifacts = await tagStep2("create_version", () => collectArtifacts(target));
+    const artifacts = await tagStep("create_version", () => collectArtifacts(target));
     return await publishVersion(artifacts, {
       sourceCommit: gitHash,
       target: options.target,
@@ -260406,4 +260392,4 @@ export {
   runCLI
 };
 
-//# debugId=53C2F96B49B467E964756E2164756E21
+//# debugId=45EEED102FF0084464756E2164756E21