@dropthis/cli 0.20.0 → 0.22.0

package/node_modules/@dropthis/node/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { O as Transport, v as DropthisResult, E as EmailOtpResponse, M as SessionResponse, C as CreateUploadSessionRequest, e as CreateUploadSessionResponse, W as UploadSessionResponse, t as DropthisClientOptions, d as ApiKeysResource, a as AccountResource, s as DropsResource, H as PublishInput, h as DeploymentsResource, m as DomainsResource, J as PublishOptions, z as PreparedPublishRequest } from './drops-C92Gkuqx.js';
-export { A as AccountLimits, b as AccountResponse, c as ActionResolve, f as CursorPage, D as DeploymentContentFile, g as DeploymentContentManifest, i as DnsRecord, j as DomainDeletedResponse, k as DomainListResponse, l as DomainResponse, n as DropAction, o as DropContentFile, p as DropDeploymentResponse, q as DropOptions, r as DropResponse, u as DropthisErrorResponse, G as GetContentOptions, I as InMemoryPublishInput, L as Limitations, w as ListDeploymentsParams, x as ListDeploymentsResponse, y as ListPage, N as NextHint, P as PrepareOptions, B as PreparedUploadFile, F as PublishFileInput, R as RequestControls, K as RequestOptions, S as SHARED_POOL, T as TierInfo, U as UpdateContentOptions, Q as UploadManifestFile, V as UploadSessionFileResponse, X as UploadTarget } from './drops-C92Gkuqx.js';
+import { O as Transport, v as DropthisResult, E as EmailOtpResponse, M as SessionResponse, C as CreateUploadSessionRequest, e as CreateUploadSessionResponse, W as UploadSessionResponse, t as DropthisClientOptions, d as ApiKeysResource, a as AccountResource, s as DropsResource, H as PublishInput, h as DeploymentsResource, m as DomainsResource, J as PublishOptions, z as PreparedPublishRequest } from './drops-DNwOp7g_.js';
+export { A as AccountLimits, b as AccountResponse, c as ActionResolve, f as CursorPage, D as DeploymentContentFile, g as DeploymentContentManifest, i as DnsRecord, j as DomainDeletedResponse, k as DomainListResponse, l as DomainResponse, n as DropAction, o as DropContentFile, p as DropDeploymentResponse, q as DropOptions, r as DropResponse, u as DropthisErrorResponse, G as GetContentOptions, I as InMemoryPublishInput, L as Limitations, w as ListDeploymentsParams, x as ListDeploymentsResponse, y as ListPage, N as NextHint, P as PrepareOptions, B as PreparedUploadFile, F as PublishFileInput, R as RequestControls, K as RequestOptions, S as SHARED_POOL, T as TierInfo, U as UpdateContentOptions, Q as UploadManifestFile, V as UploadSessionFileResponse, X as UploadTarget } from './drops-DNwOp7g_.js';
 
 declare class AuthResource {
     private readonly transport;

package/node_modules/@dropthis/node/dist/index.mjs

@@ -218,18 +218,34 @@ function updateContentOptions(options) {
   if (options.idempotencyKey !== void 0)
     out.idempotencyKey = options.idempotencyKey;
   if (options.ifRevision !== void 0) out.ifRevision = options.ifRevision;
+  if (options.mode !== void 0) out.mode = options.mode;
+  if (options.deletePaths !== void 0) out.deletePaths = options.deletePaths;
   return out;
 }
 function buildStagedRequest(files, options, entry) {
   assertNonEmptyBundle(files.map((f) => f.path));
   const normalizedPaths = files.map((f) => normalizeManifestPath(f.path));
   assertNoDuplicatePaths(normalizedPaths);
-  const manifestFiles = files.map((file) => ({
-    path: normalizeManifestPath(file.path),
-    contentType: file.contentType,
-    sizeBytes: file.sizeBytes,
-    ...file.checksumSha256 ? { checksumSha256: file.checksumSha256 } : {}
-  }));
+  const manifestFiles = files.map(
+    (file) => file.sourceUrl !== void 0 ? (
+      // Remote entry: the server fetches the bytes on /ingest. Emit sourceUrl
+      // plus optional metadata hints (contentType, sizeBytes, checksumSha256)
+      // when the caller declared them. The transport snake_cases all camelCase
+      // keys to source_url / content_type / size_bytes / checksum_sha256.
+      {
+        path: normalizeManifestPath(file.path),
+        sourceUrl: file.sourceUrl,
+        ...file.contentType ? { contentType: file.contentType } : {},
+        ...file.sizeBytes !== void 0 ? { sizeBytes: file.sizeBytes } : {},
+        ...file.checksumSha256 ? { checksumSha256: file.checksumSha256 } : {}
+      }
+    ) : {
+      path: normalizeManifestPath(file.path),
+      contentType: file.contentType,
+      sizeBytes: file.sizeBytes,
+      ...file.checksumSha256 ? { checksumSha256: file.checksumSha256 } : {}
+    }
+  );
   const resolvedEntry = entry ?? options.entry;
   if (resolvedEntry !== void 0) assertValidManifestPath(resolvedEntry);
   const manifest = {
@@ -275,9 +291,48 @@ function fileBytes(file) {
     "missing_file_bytes",
     `File "${file.path}" is missing content bytes.`,
     file.path,
-    "Provide one of content, contentBase64, or bytes."
+    "Provide one of content, contentBase64, or bytes, or set sourceUrl."
   );
 }
+function hasInlineBytes(file) {
+  return file.content !== void 0 || file.contentBase64 !== void 0 || file.bytes !== void 0;
+}
+function prepareBundleFile(file) {
+  assertValidManifestPath(file.path);
+  if (file.sourceUrl !== void 0) {
+    if (hasInlineBytes(file)) {
+      throw new PublishInputError(
+        "conflicting_file_source",
+        `File "${file.path}" sets both inline content and sourceUrl; pick one.`,
+        file.path,
+        "Drop sourceUrl to upload bytes, or drop content/contentBase64/bytes to fetch by reference."
+      );
+    }
+    if (!isHttpUrl(file.sourceUrl)) {
+      throw new PublishInputError(
+        "invalid_source_url",
+        `File "${file.path}" sourceUrl must be an http(s) URL.`,
+        file.path,
+        "Fetch the bytes first and pass them inline, or use an http(s) URL."
+      );
+    }
+    return {
+      path: file.path,
+      sourceUrl: file.sourceUrl,
+      ...file.contentType ? { contentType: file.contentType } : {},
+      ...file.sizeBytes !== void 0 ? { sizeBytes: file.sizeBytes } : {},
+      ...file.checksumSha256 ? { checksumSha256: file.checksumSha256 } : {}
+    };
+  }
+  const bytes = fileBytes(file);
+  const contentType = file.contentType ?? detectBytesContentType(bytes);
+  return {
+    path: file.path,
+    contentType,
+    sizeBytes: bytes.byteLength,
+    getBody: async () => bytes
+  };
+}
 function singleStagedFile(path, contentType, bytes, options) {
   return buildStagedRequest(
     [
@@ -320,20 +375,17 @@ async function resolveInMemory(input, options = {}) {
   if (input.kind === "source_url") {
     return buildSourceRequest(input.sourceUrl, options);
   }
-  const files = input.files.map((file) => {
-    assertValidManifestPath(file.path);
-    const bytes = fileBytes(file);
-    const contentType = file.contentType ?? detectBytesContentType(bytes);
-    return {
-      path: file.path,
-      contentType,
-      sizeBytes: bytes.byteLength,
-      getBody: async () => bytes
-    };
-  });
+  const files = input.files.map(prepareBundleFile);
   return buildStagedRequest(files, options, input.entry);
 }
+function partialUpdateBody(options) {
+  return {
+    ...options.mode !== void 0 ? { mode: options.mode } : {},
+    ...options.deletePaths !== void 0 ? { deletePaths: options.deletePaths } : {}
+  };
+}
 var UPLOAD_CONCURRENCY = 5;
+var INGEST_TIMEOUT_MS = 12e4;
 function errorResult(result) {
   if (!result.error) throw new Error("Expected an error result");
   return { data: null, error: result.error, headers: result.headers };
@@ -389,6 +441,7 @@ async function publishStaged(transport, prepared, finalPath, options = {}) {
   if (createResult.error) return errorResult(createResult);
   const jobs = [];
   for (const file of prepared.files) {
+    if (file.sourceUrl !== void 0) continue;
     const target = createResult.data.files.find((f) => f.path === file.path);
     if (!target) {
       return createErrorResult(
@@ -408,6 +461,18 @@ async function publishStaged(transport, prepared, finalPath, options = {}) {
   }
   const uploadFailure = await uploadStagedFiles(transport, jobs);
   if (uploadFailure) return uploadFailure;
+  const hasRemote = prepared.files.some((f) => f.sourceUrl !== void 0);
+  if (hasRemote) {
+    const ingestResult = await transport.request(
+      "POST",
+      `/uploads/${encodeURIComponent(createResult.data.uploadId)}/ingest`,
+      {
+        idempotencyKey: `${baseKey}:ingest-upload`,
+        timeoutMs: INGEST_TIMEOUT_MS
+      }
+    );
+    if (ingestResult.error) return errorResult(ingestResult);
+  }
   const completeResult = await transport.request(
     "POST",
     `/uploads/${encodeURIComponent(createResult.data.uploadId)}/complete`,
@@ -420,7 +485,8 @@ async function publishStaged(transport, prepared, finalPath, options = {}) {
     body: {
       uploadId: createResult.data.uploadId,
       ...Object.keys(prepared.options).length > 0 ? { options: prepared.options } : {},
-      ...prepared.metadata ? { metadata: prepared.metadata } : {}
+      ...prepared.metadata ? { metadata: prepared.metadata } : {},
+      ...partialUpdateBody(options)
     },
     idempotencyKey: `${baseKey}:publish`
   };
@@ -434,7 +500,8 @@ async function publishSource(transport, prepared, finalPath, options = {}) {
     body: {
       sourceUrl: prepared.sourceUrl,
       ...Object.keys(prepared.options).length > 0 ? { options: prepared.options } : {},
-      ...prepared.metadata ? { metadata: prepared.metadata } : {}
+      ...prepared.metadata ? { metadata: prepared.metadata } : {},
+      ...partialUpdateBody(options)
     },
     idempotencyKey: `${baseKey}:publish`,
     ...options.ifRevision !== void 0 ? { ifRevision: options.ifRevision } : {}
@@ -1018,7 +1085,7 @@ function toSnakeCase(value) {
 
 // src/transport.ts
 var DEFAULT_BASE_URL = "https://api.dropthis.app";
-var SDK_VERSION = "0.18.0";
+var SDK_VERSION = "0.20.0";
 var Transport = class {
   apiKey;
   baseUrl;