@cloudflare/deploy-helpers 0.1.3 → 0.2.1

package/dist/{context-CUxVlvJf.d.mts → context-CRT2xLqo.d.mts}

@@ -1,4 +1,4 @@
-import { FetchResultFetcher, FetchListResultFetcher, FetchPagedListResultFetcher, FetchKVGetValueFetcher, Logger, Entry, AssetsOptions, EphemeralDirectory, LegacyAssetPaths, Route, CfModule, CfModuleType, Config } from '@cloudflare/workers-utils';
+import { FetchResultFetcher, FetchListResultFetcher, FetchPagedListResultFetcher, FetchKVGetValueFetcher, Logger, Entry, ValidatedAssetsOptions, LegacyAssetPaths, Route, CfModule, CfWorkerSourceMap, CfModuleType, Config } from '@cloudflare/workers-utils';
 
 /**
  * client needs to handle logger and fetch/auth implementation
@@ -36,41 +36,30 @@ type SharedDeployVersionsProps = {
     compatibilityDate: string | undefined;
     /** Merged: --compatibility-flags arg ?? config.compatibility_flags. */
     compatibilityFlags: string[];
-    /** Merged from --assets arg and config.assets. */
-    assetsOptions: AssetsOptions | undefined;
-    /** Merged: --jsx-factory arg || config.jsx_factory. */
-    jsxFactory: string;
-    /** Merged: --jsx-fragment arg || config.jsx_fragment. */
-    jsxFragment: string;
-    /** Merged: --tsconfig arg ?? config.tsconfig. */
-    tsconfig: string | undefined;
-    /** Merged: --minify arg ?? config.minify. */
-    minify: boolean | undefined;
-    /** Merged: !(--bundle arg ?? !config.no_bundle). */
-    noBundle: boolean;
-    /** Merged: --upload-source-maps arg ?? config.upload_source_maps. */
-    uploadSourceMaps: boolean | undefined;
+    /**
+     * Validated/resolved assets directory, merged from --assets arg and
+     * config.assets. The full AssetsOptions are resolved later via
+     * `resolveAssetOptions`.
+     */
+    assetsDir: ValidatedAssetsOptions | undefined;
+    /**
+     * The user Worker entry, merged: --script arg ?? config.main. Undefined for
+     * assets-only Workers. Drives `has_user_worker` when resolving assets.
+     */
+    main: string | undefined;
     /** Merged: --keep-vars arg || config.keep_vars. */
     keepVars: boolean;
     /** Merged from --site arg and config.site. */
     isWorkersSite: boolean;
-    /** Merged: { ...config.define, ...--define arg }. CLI overrides config. */
-    defines: Record<string, string>;
-    /** Merged: { ...config.alias, ...--alias arg }. CLI overrides config. */
-    alias: Record<string, string>;
     /**
      * Whether to use the deprecated service environments API path.
      * True only when config opts in (legacy_env: false) AND --env is specified.
      */
     useServiceEnvApiPath: boolean;
-    /** Output directory for the bundled Worker. From --outdir arg or a temp directory. */
-    destination: string | EphemeralDirectory;
     /** From --dry-run arg. */
     dryRun: boolean;
     /** From --env arg. */
     env: string | undefined;
-    /** From --outdir arg. Already used to derive `destination`, but also needed for outdir README and noBundleWorker. */
-    outdir: string | undefined;
     /** From --outfile arg. */
     outfile: string | undefined;
     /** From --tag arg. */
@@ -89,6 +78,8 @@ type SharedDeployVersionsProps = {
     sendMetrics: boolean;
     /** Resolved from getFlag("RESOURCES_PROVISION"). Controls whether bindings are auto-provisioned before upload. */
     resourcesProvision: boolean;
+    /** temporary hack - cf is not yet a recognised deploy source, so any deploys from cf comes back normalised to 'api'*/
+    skipLastDeployedFromApiCheck: boolean;
 };
 type DeployProps = SharedDeployVersionsProps & {
     /** Discriminant for DeployProps vs VersionsUploadProps */
@@ -105,8 +96,6 @@ type DeployProps = SharedDeployVersionsProps & {
     dispatchNamespace: string | undefined;
     /** From --strict arg. Deploy-only. */
     strict: boolean;
-    /** From --metafile arg. Deploy-only. */
-    metafile: string | boolean | undefined;
     /** From --old-asset-ttl arg. Deploy-only. */
     oldAssetTtl: number | undefined;
     /** From --containers-rollout arg. Deploy-only. */
@@ -118,22 +107,15 @@ type VersionsUploadProps = SharedDeployVersionsProps & {
     /** CLI-only (--preview-alias), or auto-generated from CI branch name. */
     previewAlias: string | undefined;
 };
-type BuildBundleInfo = {
-    sourceMapPath?: string | undefined;
-    sourceMapMetadata?: {
-        tmpDir: string;
-        entryDirectory: string;
-    } | undefined;
-};
 type WorkerBuildResult = {
     modules: CfModule[];
+    sourceMaps: CfWorkerSourceMap[] | undefined;
     dependencies: Record<string, {
         bytesInOutput: number;
     }>;
     resolvedEntryPointPath: string;
     bundleType: CfModuleType;
     content: string;
-    bundle: BuildBundleInfo;
 };
 interface TriggerDeployment {
     targets: string[];
@@ -176,4 +158,4 @@ declare let isNonInteractiveOrCI: () => boolean;
  */
 declare function initDeployHelpersContext(ctx: DeployHelpersContext): void;
 
-export { type BuildBundleInfo as B, type DeployProps as D, type SharedDeployVersionsProps as S, type TriggerProps as T, type VersionsUploadProps as V, type WorkerBuildResult as W, type TriggerDeployment as a, type DeployHelpersContext as b, fetchListResult as c, fetchPagedListResult as d, fetchKVGetValue as e, fetchResult as f, confirm as g, isNonInteractiveOrCI as h, initDeployHelpersContext as i, logger as l, prompt as p };
+export { type DeployProps as D, type SharedDeployVersionsProps as S, type TriggerProps as T, type VersionsUploadProps as V, type WorkerBuildResult as W, type TriggerDeployment as a, type DeployHelpersContext as b, fetchListResult as c, fetchPagedListResult as d, fetchKVGetValue as e, fetchResult as f, confirm as g, isNonInteractiveOrCI as h, initDeployHelpersContext as i, logger as l, prompt as p };

package/dist/context.d.mts

@@ -1,2 +1,2 @@
-export { g as confirm, e as fetchKVGetValue, c as fetchListResult, d as fetchPagedListResult, f as fetchResult, i as initDeployHelpersContext, h as isNonInteractiveOrCI, l as logger, p as prompt } from './context-CUxVlvJf.mjs';
+export { g as confirm, e as fetchKVGetValue, c as fetchListResult, d as fetchPagedListResult, f as fetchResult, i as initDeployHelpersContext, h as isNonInteractiveOrCI, l as logger, p as prompt } from './context-CRT2xLqo.mjs';
 import '@cloudflare/workers-utils';

package/dist/index.d.mts

@@ -1,8 +1,9 @@
-import { D as DeployProps, W as WorkerBuildResult, V as VersionsUploadProps, T as TriggerProps, a as TriggerDeployment } from './context-CUxVlvJf.mjs';
-export { B as BuildBundleInfo, b as DeployHelpersContext, S as SharedDeployVersionsProps, i as initDeployHelpersContext } from './context-CUxVlvJf.mjs';
+import { D as DeployProps, W as WorkerBuildResult, V as VersionsUploadProps, T as TriggerProps, a as TriggerDeployment, S as SharedDeployVersionsProps } from './context-CRT2xLqo.mjs';
+export { b as DeployHelpersContext, i as initDeployHelpersContext } from './context-CRT2xLqo.mjs';
+export { InputWorkerSchema, ModuleType, OutputWorkerSchema, ParsedInputWorkerConfig, ParsedOutputWorkerConfig, convertToWranglerConfig } from '@cloudflare/config';
 import { ContainerNormalizedConfig, ImageURIConfig } from '@cloudflare/containers-shared';
 import * as _cloudflare_workers_utils from '@cloudflare/workers-utils';
-import { Config, ComplianceConfig, LegacyAssetPaths, Binding, Route, ZoneIdRoute, ZoneNameRoute, CustomDomainRoute, CfPlacement, CfModule, CfWorkerSourceMap, RawConfig, ConfigBindingFieldName, CfCapnp, CfModuleType, CfWorkerInit, CfScriptFormat, AssetsOptions, ParseError, WorkerMetadataBinding, CfUserLimits, TailConsumer, StreamingTailConsumer, Observability, StartDevWorkerInput, CfTailConsumer, ContainerApp } from '@cloudflare/workers-utils';
+import { Config, ComplianceConfig, LegacyAssetPaths, Binding, Route, ZoneIdRoute, ZoneNameRoute, CustomDomainRoute, CfPlacement, RawConfig, ConfigBindingFieldName, CfCapnp, CfModuleType, CfWorkerInit, CfScriptFormat, CfModule, AssetsOptions, ParseError, WorkerMetadataBinding, CfUserLimits, TailConsumer, StreamingTailConsumer, Observability, StartDevWorkerInput, CfTailConsumer, ContainerApp } from '@cloudflare/workers-utils';
 import { FormData } from 'undici';
 import { Options } from '@cspotcode/source-map-support';
 import Protocol from 'devtools-protocol';
@@ -271,24 +272,6 @@ declare function addRequiredSecretsInheritBindings(config: Config, bindings: Rec
  */
 declare function handleMissingSecretsError(err: unknown, config: Config, options: SecretsValidationOptions): void;
 
-interface SourceMapMetadata {
-    tmpDir: string;
-    entryDirectory: string;
-}
-interface SourceMapBundle {
-    sourceMapPath?: string | undefined;
-    sourceMapMetadata?: SourceMapMetadata | undefined;
-    [key: string]: unknown;
-}
-/**
- * Loads source maps that appear in the given build output.
- */
-declare function loadSourceMaps(main: CfModule, modules: CfModule[], bundle: SourceMapBundle): CfWorkerSourceMap[];
-/**
- * Attaches a sourcemap, if found, to a JavaScript module.
- */
-declare function tryAttachSourcemapToModule(module: CfModule): void;
-
 type JsonLike = string | number | boolean | null | JsonLike[] | undefined | {
     [id: string]: JsonLike;
 };
@@ -750,9 +733,10 @@ type AssetManifest = {
 };
 declare const syncAssets: (complianceConfig: ComplianceConfig, accountId: string | undefined, assetDirectory: string, scriptName: string, dispatchNamespace?: string) => Promise<string>;
 declare const buildAssetManifest: (dir: string) => Promise<AssetManifest>;
+declare function resolveAssetOptions({ assetsDir, main }: Pick<SharedDeployVersionsProps, "assetsDir" | "main">, config: Config): AssetsOptions | undefined;
 
 declare const hashFile: (filepath: string) => string;
 
 declare const isJwtExpired: (token: string) => boolean | undefined;
 
-export { type ApiDeployment, type ApiVersion, type AssetManifest, type BulkInputNullableResult, type BulkInputResult, type Consumer, type ConsumerSettings, type CustomDomain, type CustomDomainChangeset, type DeployCallbacks, DeployProps, INVALID_INHERIT_BINDING_CODE, type JsonLike, NoInputError, type NonVersionedScriptSettings, type Percentage, type PostQueueBody, type PostQueueResponse, type PostTypedConsumerBody, type Producer, type PurgeQueueBody, type PurgeQueueResponse, type QueueResponse, type QueueSettings, type RetrieveSourceMapFunction, type RouteObject, type ScriptReference, type SourceMapBundle, TriggerDeployment, TriggerProps, type TypedConsumerResponse, type VersionCache, type VersionId, type VersionsUploadCallbacks, VersionsUploadProps, WORKER_LEGACY_ENVIRONMENT_NOT_FOUND_ERR_CODE, WORKER_NOT_FOUND_ERR_CODE, WORKFLOW_NOT_FOUND_CODE, WorkerBuildResult, type Workflow, type WorkflowConflict, type Zone, type ZoneIdCache, addRequiredSecretsInheritBindings, addWorkersSitesBindings, applyServiceAndEnvironmentTags, buildAssetManifest, checkRemoteSecretsOverride, checkWorkflowConflicts, confirmLatestDeploymentOverwrite, convertConfigToBindings, createDeployment, createTruncatedAlias, createWorkerUploadForm, deletePullConsumer, deleteWorkerConsumer, deploy, deployWfpUserWorker, diagnoseScriptSizeError, diagnoseStartupError, diffJsonObjects, downloadWorkerConfig, ensureQueuesExistByConfig, extractBindingsOfType, fetchDeployableVersions, fetchDeploymentVersions, fetchLatestDeployment, fetchLatestDeployments, fetchSecrets, fetchVersion, fetchVersions, fetchWorkerConfig, fromMimeType, generatePreviewAlias, getBindings, getBranchName, getConfigPatch, getDeployConfirmFunction, getMigrationsToUpload, getQueue, getRemoteConfigDiff, getSourceMappedStack, getSourceMappedString, getSubdomainValues, getSubdomainValuesAPIMock, getWorkersDevSubdomain, getZoneForRoute, getZoneIdFromHost, handleMissingSecretsError, handleUnsafeCapnp, hasDefinedEnvironments, hashFile, helpIfErrorIsSizeOrScriptStartup, isJwtExpired, isModifiedDiffValue, isNonDestructive, isUnsafeBindingType, isWorkerNotFoundError, listConsumers, listQueues, loadSourceMaps, maybeRetrieveFileSourceMap, moduleTypeMimeType, parseBulkInputToObject, parseConfigPlacement, patchNonVersionedScriptSettings, postConsumer, printBindings, printBundleSize, printVersions, publishCustomDomains, publishRoutes, putConsumer, putConsumerById, renderRoute, sanitizeBranchName, syncAssets, tagsAreEqual, triggersDeploy, tryAttachSourcemapToModule, updateQueueConsumers, useServiceEnvironments, validateFileSecrets, validateNodeCompatMode, validateRoutes, verifyWorkerMatchesCITag, versionsUpload, warnOnErrorUpdatingServiceAndEnvironmentTags, warnOrError, workerNotFoundErrorMessage };
+export { type ApiDeployment, type ApiVersion, type AssetManifest, type BulkInputNullableResult, type BulkInputResult, type Consumer, type ConsumerSettings, type CustomDomain, type CustomDomainChangeset, type DeployCallbacks, DeployProps, INVALID_INHERIT_BINDING_CODE, type JsonLike, NoInputError, type NonVersionedScriptSettings, type Percentage, type PostQueueBody, type PostQueueResponse, type PostTypedConsumerBody, type Producer, type PurgeQueueBody, type PurgeQueueResponse, type QueueResponse, type QueueSettings, type RetrieveSourceMapFunction, type RouteObject, type ScriptReference, SharedDeployVersionsProps, TriggerDeployment, TriggerProps, type TypedConsumerResponse, type VersionCache, type VersionId, type VersionsUploadCallbacks, VersionsUploadProps, WORKER_LEGACY_ENVIRONMENT_NOT_FOUND_ERR_CODE, WORKER_NOT_FOUND_ERR_CODE, WORKFLOW_NOT_FOUND_CODE, WorkerBuildResult, type Workflow, type WorkflowConflict, type Zone, type ZoneIdCache, addRequiredSecretsInheritBindings, addWorkersSitesBindings, applyServiceAndEnvironmentTags, buildAssetManifest, checkRemoteSecretsOverride, checkWorkflowConflicts, confirmLatestDeploymentOverwrite, convertConfigToBindings, createDeployment, createTruncatedAlias, createWorkerUploadForm, deletePullConsumer, deleteWorkerConsumer, deploy, deployWfpUserWorker, diagnoseScriptSizeError, diagnoseStartupError, diffJsonObjects, downloadWorkerConfig, ensureQueuesExistByConfig, extractBindingsOfType, fetchDeployableVersions, fetchDeploymentVersions, fetchLatestDeployment, fetchLatestDeployments, fetchSecrets, fetchVersion, fetchVersions, fetchWorkerConfig, fromMimeType, generatePreviewAlias, getBindings, getBranchName, getConfigPatch, getDeployConfirmFunction, getMigrationsToUpload, getQueue, getRemoteConfigDiff, getSourceMappedStack, getSourceMappedString, getSubdomainValues, getSubdomainValuesAPIMock, getWorkersDevSubdomain, getZoneForRoute, getZoneIdFromHost, handleMissingSecretsError, handleUnsafeCapnp, hasDefinedEnvironments, hashFile, helpIfErrorIsSizeOrScriptStartup, isJwtExpired, isModifiedDiffValue, isNonDestructive, isUnsafeBindingType, isWorkerNotFoundError, listConsumers, listQueues, maybeRetrieveFileSourceMap, moduleTypeMimeType, parseBulkInputToObject, parseConfigPlacement, patchNonVersionedScriptSettings, postConsumer, printBindings, printBundleSize, printVersions, publishCustomDomains, publishRoutes, putConsumer, putConsumerById, renderRoute, resolveAssetOptions, sanitizeBranchName, syncAssets, tagsAreEqual, triggersDeploy, updateQueueConsumers, useServiceEnvironments, validateFileSecrets, validateNodeCompatMode, validateRoutes, verifyWorkerMatchesCITag, versionsUpload, warnOnErrorUpdatingServiceAndEnvironmentTags, warnOrError, workerNotFoundErrorMessage };