@treeseed/sdk 0.4.13 → 0.5.1

package/dist/platform/deploy-config.js

@@ -18,8 +18,19 @@ const hostingFieldAliases = {
   teamId: { key: "teamId", aliases: ["team_id"] },
   projectId: { key: "projectId", aliases: ["project_id"] }
 };
+const hubFieldAliases = {
+  mode: { key: "mode", aliases: ["mode"] }
+};
+const runtimeFieldAliases = {
+  mode: { key: "mode", aliases: ["mode"] },
+  registration: { key: "registration", aliases: ["registration"] },
+  marketBaseUrl: { key: "marketBaseUrl", aliases: ["market_base_url"] },
+  teamId: { key: "teamId", aliases: ["team_id"] },
+  projectId: { key: "projectId", aliases: ["project_id"] }
+};
 const cloudflareFieldAliases = {
   accountId: { key: "accountId", aliases: ["account_id"] },
+  zoneId: { key: "zoneId", aliases: ["zone_id"] },
   workerName: { key: "workerName", aliases: ["worker_name"] },
   queueName: { key: "queueName", aliases: ["queue_name"] },
   dlqName: { key: "dlqName", aliases: ["dlq_name"] },
@@ -41,7 +52,26 @@ const cloudflareR2FieldAliases = {
   previewRootTemplate: { key: "previewRootTemplate", aliases: ["preview_root_template", "preview_root"] },
   previewTtlHours: { key: "previewTtlHours", aliases: ["preview_ttl_hours"] }
 };
+const webSurfaceCacheFieldAliases = {
+  sourcePages: { key: "sourcePages", aliases: ["source_pages"] },
+  contentPages: { key: "contentPages", aliases: ["content_pages"] },
+  r2PublishedObjects: { key: "r2PublishedObjects", aliases: ["r2_published_objects"] }
+};
+const webCachePolicyFieldAliases = {
+  browserTtlSeconds: { key: "browserTtlSeconds", aliases: ["browser_ttl_seconds"] },
+  edgeTtlSeconds: { key: "edgeTtlSeconds", aliases: ["edge_ttl_seconds"] },
+  staleWhileRevalidateSeconds: { key: "staleWhileRevalidateSeconds", aliases: ["stale_while_revalidate_seconds"] },
+  staleIfErrorSeconds: { key: "staleIfErrorSeconds", aliases: ["stale_if_error_seconds"] },
+  paths: { key: "paths", aliases: ["paths"] }
+};
 const CLOUDFLARE_ACCOUNT_ID_PLACEHOLDER = "replace-with-cloudflare-account-id";
+const TREESEED_DEFAULT_SOURCE_PAGE_PURGE_PATHS = ["/", "/contact", "/404"];
+const TREESEED_DEFAULT_LONG_LIVED_CACHE_POLICY = {
+  browserTtlSeconds: 0,
+  edgeTtlSeconds: 31536e3,
+  staleWhileRevalidateSeconds: 86400,
+  staleIfErrorSeconds: 86400
+};
 function expectString(value, label) {
   if (typeof value !== "string" || !value.trim()) {
     throw new Error(`Invalid deploy config: expected ${label} to be a non-empty string.`);
@@ -67,6 +97,15 @@ function optionalPositiveNumber(value, label) {
   }
   return value;
 }
+function optionalNonNegativeNumber(value, label) {
+  if (value === void 0) {
+    return void 0;
+  }
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
+    throw new Error(`Invalid deploy config: expected ${label} to be a non-negative number when provided.`);
+  }
+  return value;
+}
 function optionalEnum(value, label, allowed) {
   if (value === void 0) {
     return void 0;
@@ -138,9 +177,85 @@ function parseHostingConfig(value) {
       "self_hosted_project"
     ]) ?? "self_hosted_project",
     registration: optionalEnum(record.registration, "hosting.registration", ["optional", "none"]) ?? "none",
-    marketBaseUrl: optionalString(record.marketBaseUrl),
-    teamId: optionalString(record.teamId),
-    projectId: optionalString(record.projectId)
+    marketBaseUrl: optionalString(process.env.TREESEED_MARKET_API_BASE_URL) ?? optionalString(record.marketBaseUrl),
+    teamId: optionalString(process.env.TREESEED_HOSTING_TEAM_ID) ?? optionalString(record.teamId),
+    projectId: optionalString(process.env.TREESEED_PROJECT_ID) ?? optionalString(record.projectId)
+  };
+}
+function normalizePlanesFromLegacyHosting(hosting) {
+  if (!hosting) {
+    return {
+      hub: { mode: "treeseed_hosted" },
+      runtime: { mode: "none", registration: "none" }
+    };
+  }
+  if (hosting.kind === "market_control_plane" || hosting.kind === "hosted_project") {
+    return {
+      hub: { mode: "treeseed_hosted" },
+      runtime: {
+        mode: "treeseed_managed",
+        registration: hosting.kind === "market_control_plane" ? "none" : hosting.registration ?? "none",
+        marketBaseUrl: hosting.marketBaseUrl,
+        teamId: hosting.teamId,
+        projectId: hosting.projectId
+      }
+    };
+  }
+  return {
+    hub: { mode: "customer_hosted" },
+    runtime: {
+      mode: "byo_attached",
+      registration: hosting.registration ?? "none",
+      marketBaseUrl: hosting.marketBaseUrl,
+      teamId: hosting.teamId,
+      projectId: hosting.projectId
+    }
+  };
+}
+function normalizeLegacyHostingFromPlanes(hub, runtime) {
+  if (runtime.mode === "treeseed_managed" && hub.mode === "treeseed_hosted") {
+    return {
+      kind: "hosted_project",
+      registration: runtime.registration === "required" ? "optional" : runtime.registration ?? "none",
+      marketBaseUrl: runtime.marketBaseUrl,
+      teamId: runtime.teamId,
+      projectId: runtime.projectId
+    };
+  }
+  return {
+    kind: "self_hosted_project",
+    registration: runtime.registration === "required" ? "optional" : runtime.registration ?? "none",
+    marketBaseUrl: runtime.marketBaseUrl,
+    teamId: runtime.teamId,
+    projectId: runtime.projectId
+  };
+}
+function parseHubConfig(value, fallback) {
+  const record = normalizeAliasedRecord(
+    hubFieldAliases,
+    optionalRecord(value, "hub") ?? {}
+  );
+  if (!value || Object.keys(record).length === 0) {
+    return fallback;
+  }
+  return {
+    mode: optionalEnum(record.mode, "hub.mode", ["treeseed_hosted", "customer_hosted"]) ?? fallback.mode
+  };
+}
+function parseRuntimeConfig(value, fallback) {
+  const record = normalizeAliasedRecord(
+    runtimeFieldAliases,
+    optionalRecord(value, "runtime") ?? {}
+  );
+  if (!value || Object.keys(record).length === 0) {
+    return fallback;
+  }
+  return {
+    mode: optionalEnum(record.mode, "runtime.mode", ["none", "byo_attached", "treeseed_managed"]) ?? fallback.mode,
+    registration: optionalEnum(record.registration, "runtime.registration", ["optional", "required", "none"]) ?? fallback.registration ?? "none",
+    marketBaseUrl: optionalString(process.env.TREESEED_MARKET_API_BASE_URL) ?? fallback.marketBaseUrl,
+    teamId: optionalString(process.env.TREESEED_HOSTING_TEAM_ID) ?? fallback.teamId,
+    projectId: optionalString(process.env.TREESEED_PROJECT_ID) ?? fallback.projectId
   };
 }
 function parseProviderSelections(value) {
@@ -192,7 +307,12 @@ function parseProviderSelections(value) {
       docs: expectString(
         contentProviders.docs ?? contentProviders.runtime ?? TREESEED_DEFAULT_PROVIDER_SELECTIONS.content.docs ?? TREESEED_DEFAULT_PROVIDER_SELECTIONS.content.runtime,
         "providers.content.docs"
-      )
+      ),
+      serving: optionalEnum(
+        contentProviders.serving,
+        "providers.content.serving",
+        ["local_collections", "published_runtime"]
+      ) ?? TREESEED_DEFAULT_PROVIDER_SELECTIONS.content.serving
     },
     site: expectString(record.site ?? TREESEED_DEFAULT_PROVIDER_SELECTIONS.site, "providers.site")
   };
@@ -246,6 +366,11 @@ function parseManagedServicesConfig(value) {
     ])
   );
 }
+function inferManagedRuntimeFromServices(services) {
+  return Object.values(services ?? {}).some(
+    (service) => service && service.enabled !== false && (service.provider ?? "railway") === "railway"
+  );
+}
 function parsePlatformSurfaceConfig(value, label) {
   const record = optionalRecord(value, label);
   if (!record) {
@@ -256,8 +381,47 @@ function parsePlatformSurfaceConfig(value, label) {
     provider: optionalString(record.provider),
     rootDir: optionalString(record.rootDir),
     publicBaseUrl: optionalString(record.publicBaseUrl),
-    localBaseUrl: optionalString(record.localBaseUrl)
+    localBaseUrl: optionalString(record.localBaseUrl),
+    cache: parseWebSurfaceCacheConfig(record.cache, `${label}.cache`)
+  };
+}
+function parseWebSurfaceCacheConfig(value, label) {
+  const record = normalizeAliasedRecord(
+    webSurfaceCacheFieldAliases,
+    optionalRecord(value, label) ?? {}
+  );
+  if (!value || Object.keys(record).length === 0) {
+    return void 0;
+  }
+  return {
+    sourcePages: parseWebCachePolicyRecord(record.sourcePages, `${label}.sourcePages`, {
+      paths: TREESEED_DEFAULT_SOURCE_PAGE_PURGE_PATHS
+    }),
+    contentPages: parseWebCachePolicyRecord(record.contentPages, `${label}.contentPages`),
+    r2PublishedObjects: parseWebCachePolicyRecord(record.r2PublishedObjects, `${label}.r2PublishedObjects`)
+  };
+}
+function parseWebCachePolicyRecord(value, label, options = {}) {
+  const record = normalizeAliasedRecord(
+    webCachePolicyFieldAliases,
+    optionalRecord(value, label) ?? {}
+  );
+  if (!value || Object.keys(record).length === 0) {
+    return options.paths ? { paths: [...options.paths] } : void 0;
+  }
+  const parsed = {
+    browserTtlSeconds: optionalNonNegativeNumber(record.browserTtlSeconds, `${label}.browserTtlSeconds`),
+    edgeTtlSeconds: optionalNonNegativeNumber(record.edgeTtlSeconds, `${label}.edgeTtlSeconds`),
+    staleWhileRevalidateSeconds: optionalNonNegativeNumber(
+      record.staleWhileRevalidateSeconds,
+      `${label}.staleWhileRevalidateSeconds`
+    ),
+    staleIfErrorSeconds: optionalNonNegativeNumber(record.staleIfErrorSeconds, `${label}.staleIfErrorSeconds`)
   };
+  if (options.paths) {
+    parsed.paths = [...new Set(optionalStringArray(record.paths, `${label}.paths`) ?? options.paths)];
+  }
+  return parsed;
 }
 function parsePlatformSurfacesConfig(value) {
   const record = optionalRecord(value, "surfaces");
@@ -298,33 +462,47 @@ function parseDeployConfig(raw) {
     cloudflareR2FieldAliases,
     optionalRecord(cloudflare.r2, "cloudflare.r2") ?? {}
   );
+  const hosting = parseHostingConfig(parsed.hosting);
+  const services = parseManagedServicesConfig(parsed.services);
+  const normalizedPlanes = normalizePlanesFromLegacyHosting(hosting);
+  const inferredPlanes = !hosting && !parsed.hub && !parsed.runtime && inferManagedRuntimeFromServices(services) ? {
+    hub: { mode: "customer_hosted" },
+    runtime: { mode: "treeseed_managed", registration: "none" }
+  } : normalizedPlanes;
+  const hub = parseHubConfig(parsed.hub, inferredPlanes.hub);
+  const runtime = parseRuntimeConfig(parsed.runtime, inferredPlanes.runtime);
   const smtp = optionalRecord(parsed.smtp, "smtp") ?? {};
   const turnstile = optionalRecord(parsed.turnstile, "turnstile") ?? {};
   optionalBoolean(turnstile.enabled, "turnstile.enabled");
+  const normalizedHosting = normalizeLegacyHostingFromPlanes(hub, runtime);
+  const compatibilityHosting = hosting && !parsed.hub && !parsed.runtime ? hosting : normalizedHosting;
   return {
     name: expectString(parsed.name, "name"),
     slug: expectString(parsed.slug, "slug"),
     siteUrl: expectString(parsed.siteUrl, "siteUrl"),
     contactEmail: expectString(parsed.contactEmail, "contactEmail"),
-    hosting: parseHostingConfig(parsed.hosting),
+    hosting: compatibilityHosting,
+    hub,
+    runtime,
     cloudflare: {
-      accountId: optionalCloudflareAccountId(cloudflare.accountId) ?? optionalCloudflareAccountId(process.env.CLOUDFLARE_ACCOUNT_ID) ?? CLOUDFLARE_ACCOUNT_ID_PLACEHOLDER,
+      accountId: optionalCloudflareAccountId(process.env.CLOUDFLARE_ACCOUNT_ID) ?? CLOUDFLARE_ACCOUNT_ID_PLACEHOLDER,
+      zoneId: optionalString(cloudflare.zoneId),
       workerName: optionalString(cloudflare.workerName),
       queueName: optionalString(cloudflare.queueName),
       dlqName: optionalString(cloudflare.dlqName),
       d1Binding: optionalString(cloudflare.d1Binding),
       queueBinding: optionalString(cloudflare.queueBinding),
       pages: cloudflare.pages === void 0 ? void 0 : {
-        projectName: optionalString(cloudflarePages.projectName) ?? optionalString(process.env.TREESEED_CLOUDFLARE_PAGES_PROJECT_NAME),
-        previewProjectName: optionalString(cloudflarePages.previewProjectName) ?? optionalString(process.env.TREESEED_CLOUDFLARE_PAGES_PREVIEW_PROJECT_NAME),
+        projectName: optionalString(process.env.TREESEED_CLOUDFLARE_PAGES_PROJECT_NAME) ?? optionalString(cloudflarePages.projectName),
+        previewProjectName: optionalString(process.env.TREESEED_CLOUDFLARE_PAGES_PREVIEW_PROJECT_NAME) ?? optionalString(cloudflarePages.previewProjectName),
         productionBranch: optionalString(cloudflarePages.productionBranch) ?? "main",
         stagingBranch: optionalString(cloudflarePages.stagingBranch) ?? "staging",
         buildOutputDir: optionalString(cloudflarePages.buildOutputDir)
       },
       r2: cloudflare.r2 === void 0 ? void 0 : {
-        binding: optionalString(cloudflareR2.binding) ?? optionalString(process.env.TREESEED_CONTENT_BUCKET_BINDING),
-        bucketName: optionalString(cloudflareR2.bucketName) ?? optionalString(process.env.TREESEED_CONTENT_BUCKET_NAME),
-        publicBaseUrl: optionalString(cloudflareR2.publicBaseUrl) ?? optionalString(process.env.TREESEED_CONTENT_PUBLIC_BASE_URL),
+        binding: optionalString(process.env.TREESEED_CONTENT_BUCKET_BINDING) ?? optionalString(cloudflareR2.binding),
+        bucketName: optionalString(process.env.TREESEED_CONTENT_BUCKET_NAME) ?? optionalString(cloudflareR2.bucketName),
+        publicBaseUrl: optionalString(process.env.TREESEED_CONTENT_PUBLIC_BASE_URL) ?? optionalString(cloudflareR2.publicBaseUrl),
         manifestKeyTemplate: optionalString(cloudflareR2.manifestKeyTemplate) ?? "teams/{teamId}/published/common.json",
         previewRootTemplate: optionalString(cloudflareR2.previewRootTemplate) ?? "teams/{teamId}/previews",
         previewTtlHours: optionalPositiveNumber(cloudflareR2.previewTtlHours, "cloudflare.r2.previewTtlHours") ?? 168
@@ -333,12 +511,12 @@ function parseDeployConfig(raw) {
     plugins: parsePluginReferences(parsed.plugins),
     providers: parseProviderSelections(parsed.providers),
     surfaces: parsePlatformSurfacesConfig(parsed.surfaces),
-    services: parseManagedServicesConfig(parsed.services),
+    services,
     smtp: {
       enabled: optionalBoolean(smtp.enabled, "smtp.enabled")
     },
     turnstile: {
-      enabled: true
+      enabled: optionalBoolean(turnstile.enabled, "turnstile.enabled") ?? false
     },
     export: parseExportConfig(parsed.export)
   };
@@ -357,6 +535,26 @@ function resolveTreeseedDeployConfigPathFromRoot(tenantRoot, configPath = "trees
 function deriveCloudflareWorkerName(config) {
   return config.cloudflare.workerName?.trim() || config.slug;
 }
+function resolveLongLivedCachePolicy(configured) {
+  return {
+    browserTtlSeconds: configured?.browserTtlSeconds ?? TREESEED_DEFAULT_LONG_LIVED_CACHE_POLICY.browserTtlSeconds,
+    edgeTtlSeconds: configured?.edgeTtlSeconds ?? TREESEED_DEFAULT_LONG_LIVED_CACHE_POLICY.edgeTtlSeconds,
+    staleWhileRevalidateSeconds: configured?.staleWhileRevalidateSeconds ?? TREESEED_DEFAULT_LONG_LIVED_CACHE_POLICY.staleWhileRevalidateSeconds,
+    staleIfErrorSeconds: configured?.staleIfErrorSeconds ?? TREESEED_DEFAULT_LONG_LIVED_CACHE_POLICY.staleIfErrorSeconds
+  };
+}
+function resolveTreeseedWebCachePolicy(config) {
+  const cache = config.surfaces?.web?.cache ?? {};
+  const sourcePages = cache.sourcePages;
+  return {
+    sourcePages: {
+      ...resolveLongLivedCachePolicy(sourcePages),
+      paths: [...new Set(sourcePages?.paths ?? TREESEED_DEFAULT_SOURCE_PAGE_PURGE_PATHS)]
+    },
+    contentPages: resolveLongLivedCachePolicy(cache.contentPages),
+    r2PublishedObjects: resolveLongLivedCachePolicy(cache.r2PublishedObjects)
+  };
+}
 function loadTreeseedDeployConfig(configPath = "treeseed.site.yaml") {
   const resolvedConfigPath = resolveTreeseedDeployConfigPath(configPath);
   return loadTreeseedDeployConfigFromPath(resolvedConfigPath);
@@ -379,5 +577,6 @@ export {
   loadTreeseedDeployConfig,
   loadTreeseedDeployConfigFromPath,
   resolveTreeseedDeployConfigPath,
-  resolveTreeseedDeployConfigPathFromRoot
+  resolveTreeseedDeployConfigPathFromRoot,
+  resolveTreeseedWebCachePolicy
 };

package/dist/platform/deploy-runtime.d.ts

@@ -14,6 +14,7 @@ export declare function getTreeseedAgentProviderSelections(): {
 export declare function getTreeseedDeployProvider(): string;
 export declare function getTreeseedContentRuntimeProvider(): string;
 export declare function getTreeseedContentPublishProvider(): string;
+export declare function getTreeseedContentServingMode(): string;
 export declare function getTreeseedDocsProvider(): string;
 export declare function getTreeseedSiteProvider(): string;
 export declare function isTreeseedSmtpEnabled(): boolean;

package/dist/platform/deploy-runtime.js

@@ -17,7 +17,7 @@ function defaultDeployConfig() {
       enabled: false
     },
     turnstile: {
-      enabled: true
+      enabled: false
     }
   };
 }
@@ -58,6 +58,13 @@ function getTreeseedContentRuntimeProvider() {
 function getTreeseedContentPublishProvider() {
   return getTreeseedDeployConfig().providers?.content?.publish ?? TREESEED_DEFAULT_PROVIDER_SELECTIONS.content.publish;
 }
+function getTreeseedContentServingMode() {
+  const override = process.env.TREESEED_CONTENT_SERVING_MODE?.trim();
+  if (override === "local_collections" || override === "published_runtime") {
+    return override;
+  }
+  return getTreeseedDeployConfig().providers?.content?.serving ?? TREESEED_DEFAULT_PROVIDER_SELECTIONS.content.serving;
+}
 function getTreeseedDocsProvider() {
   return getTreeseedDeployConfig().providers?.content?.docs ?? getTreeseedDeployConfig().providers?.content?.runtime ?? TREESEED_DEFAULT_PROVIDER_SELECTIONS.content.docs ?? TREESEED_DEFAULT_PROVIDER_SELECTIONS.content.runtime;
 }
@@ -68,12 +75,13 @@ function isTreeseedSmtpEnabled() {
   return getTreeseedDeployConfig().smtp?.enabled ?? false;
 }
 function isTreeseedTurnstileEnabled() {
-  return getTreeseedDeployConfig().turnstile?.enabled ?? true;
+  return getTreeseedDeployConfig().turnstile?.enabled ?? false;
 }
 export {
   getTreeseedAgentProviderSelections,
   getTreeseedContentPublishProvider,
   getTreeseedContentRuntimeProvider,
+  getTreeseedContentServingMode,
   getTreeseedDeployConfig,
   getTreeseedDeployProvider,
   getTreeseedDocsProvider,