atmn 2.0.32 → 2.0.34

package/dist/index.js

@@ -16,6 +16,59 @@ var featureGrant = (input) => ({
 });
 // src/generated/variants.ts
 var variant = (input) => input;
+// src/generated/webhooks.ts
+var webhook = (input) => input;
+// src/generated/isLocalWebhookUrl.ts
+var PRIVATE_IPV4_RANGES = [
+  [0, 32],
+  [2130706432, 8],
+  [167772160, 8],
+  [2886729728, 12],
+  [3232235520, 16],
+  [2851995648, 16]
+];
+var parseIpv4 = (host) => {
+  const parts = host.split(".");
+  if (parts.length !== 4)
+    return null;
+  if (parts.some((part) => !/^\d+$/.test(part) || Number(part) > 255)) {
+    return null;
+  }
+  return parts.reduce((acc, part) => acc * 256 + Number(part), 0);
+};
+var isPrivateIpv4 = (address) => PRIVATE_IPV4_RANGES.some(([base, prefixBits]) => {
+  const mask = prefixBits === 0 ? 0 : 4294967295 << 32 - prefixBits >>> 0;
+  return (address & mask) >>> 0 === base;
+});
+var isLocalIpv6 = (host) => {
+  if (host === "::1" || host === "::")
+    return true;
+  if (/^fe[89ab][0-9a-f]:/.test(host))
+    return true;
+  if (/^f[cd][0-9a-f]{0,2}:/.test(host))
+    return true;
+  const [, high, low] = host.match(/^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/) ?? [];
+  if (!high || !low)
+    return false;
+  return isPrivateIpv4(Number.parseInt(high, 16) * 65536 + Number.parseInt(low, 16));
+};
+var isLocalWebhookUrl = (url) => {
+  let hostname;
+  try {
+    hostname = new URL(url).hostname.toLowerCase().replace(/\.$/, "");
+  } catch {
+    return false;
+  }
+  if (hostname.startsWith("[") && hostname.endsWith("]")) {
+    return isLocalIpv6(hostname.slice(1, -1));
+  }
+  if (hostname === "localhost" || hostname.endsWith(".localhost") || hostname.endsWith(".local")) {
+    return true;
+  }
+  const ipv4 = parseIpv4(hostname);
+  return ipv4 !== null && isPrivateIpv4(ipv4);
+};
+
 // src/generated/lintRules.ts
 var LINT_RULES = {
   features: {
@@ -319,6 +372,10 @@ var LINT_RULES = {
     keys: {
       minLength: 1,
       maxLength: 64
+    },
+    values: {
+      minLength: 1,
+      maxLength: 128
     }
   },
   "plans.billingControls.usageLimits": {
@@ -342,6 +399,10 @@ var LINT_RULES = {
     keys: {
       minLength: 1,
       maxLength: 64
+    },
+    values: {
+      minLength: 1,
+      maxLength: 128
     }
   },
   "plans.freeTrial": {
@@ -1312,6 +1373,10 @@ var LINT_RULES = {
     keys: {
       minLength: 1,
       maxLength: 64
+    },
+    values: {
+      minLength: 1,
+      maxLength: 128
     }
   },
   "plans.variants.customize.billingControls.usageLimits": {
@@ -1335,6 +1400,10 @@ var LINT_RULES = {
     keys: {
       minLength: 1,
       maxLength: 64
+    },
+    values: {
+      minLength: 1,
+      maxLength: 128
     }
   },
   "plans.variants.customize.freeTrial": {
@@ -2161,6 +2230,80 @@ var LINT_RULES = {
         exclusiveMinimum: 0
       }
     }
+  },
+  webhooks: {
+    label: "webhook",
+    idField: "id",
+    required: ["events", "id", "url"],
+    fields: {
+      id: {
+        minLength: 1,
+        maxLength: 256,
+        pattern: "^[a-zA-Z0-9_-]+$"
+      },
+      events: {
+        minItems: 1
+      }
+    },
+    rules: [
+      {
+        kind: "unique",
+        field: "id",
+        because: "Two webhooks claiming one id race to define the same endpoint."
+      },
+      {
+        kind: "unique",
+        field: "id",
+        asEnvName: true,
+        because: "Each webhook's signing secret is saved as AUTUMN_WEBHOOK_<ID>_SECRET, so these two would overwrite each other's secret. Rename one."
+      },
+      {
+        kind: "rejects",
+        field: "url",
+        check: "isLocalWebhookUrl",
+        because: "Autumn delivers from the internet, so localhost and private-network addresses can never be reached. Use a public URL or a tunnel (e.g. ngrok)."
+      },
+      {
+        kind: "uniformPrefix",
+        field: "events",
+        prefix: "vercel.",
+        because: "vercel.* events can't be mixed with other events in one webhook: they're delivered from a separate app. Make one webhook for each."
+      },
+      {
+        kind: "nonEmpty",
+        field: "url",
+        warning: true,
+        because: "With no environment key the webhook is registered nowhere. Add `live`, `sandbox` or a sandbox's slug."
+      },
+      {
+        kind: "knownValues",
+        field: "events",
+        values: [
+          "customer.products.updated",
+          "customer.threshold_reached",
+          "balances.usage_alert_triggered",
+          "balances.limit_reached",
+          "billing.auto_topup_failed",
+          "billing.auto_topup_succeeded",
+          "billing.updated",
+          "invoice.finalized",
+          "vercel.resources.deleted",
+          "vercel.resources.provisioned",
+          "vercel.resources.rotate_secrets",
+          "vercel.webhooks.event"
+        ],
+        warning: true,
+        because: "isn't known to this atmn version; the server will check it."
+      }
+    ]
+  },
+  "webhooks.url": {
+    keys: {
+      pattern: "^[a-z0-9_-]+$"
+    },
+    values: {
+      pattern: "^[Hh][Tt][Tt][Pp][Ss]:\\/\\/"
+    }
   }
 };
 
@@ -2331,7 +2474,8 @@ var entryRuleFailures = ({
   entry,
   rule,
   document,
-  parent
+  parent,
+  checks
 }) => {
   switch (rule.kind) {
     case "requiredWhen": {
@@ -2371,9 +2515,29 @@ var entryRuleFailures = ({
     }
     case "nonEmpty": {
       const value = entry[rule.field];
-      if (!Array.isArray(value) || value.length > 0)
+      const empty = Array.isArray(value) ? value.length === 0 : isEntry(value) && Object.keys(value).length === 0;
+      return empty ? [`${rule.field} is empty. ${rule.because}`] : [];
+    }
+    case "knownValues": {
+      const value = entry[rule.field];
+      if (!Array.isArray(value))
+        return [];
+      return value.filter((item) => typeof item === "string" && !rule.values.includes(item)).map((item) => `\`${item}\` ${rule.because}`);
+    }
+    case "uniformPrefix": {
+      const value = entry[rule.field];
+      if (!Array.isArray(value))
+        return [];
+      const prefixed = value.filter((item) => typeof item === "string" && item.startsWith(rule.prefix)).length;
+      return prefixed === 0 || prefixed === value.length ? [] : [rule.because];
+    }
+    case "rejects": {
+      const value = entry[rule.field];
+      const check = checks[rule.check];
+      if (check === undefined)
         return [];
-      return [`${rule.field} is empty. ${rule.because}`];
+      const stated = typeof value === "string" ? [value] : isEntry(value) ? Object.values(value).filter((item) => typeof item === "string") : [];
+      return stated.filter((item) => check(item)).map((item) => `${rule.field} ${show(item)} is refused. ${rule.because}`);
     }
     case "compare": {
       const a = entry[rule.field];
@@ -2435,7 +2599,7 @@ var checkUnique = ({
   trail,
   issues
 }) => {
-  const seen = new Set;
+  const seen = new Map;
   for (const [index, entry] of entries.entries()) {
     if (!isEntry(entry))
       continue;
@@ -2446,15 +2610,25 @@ var checkUnique = ({
     const pair = rule.alongside === undefined ? undefined : entry[rule.alongside];
     if (rule.alongside !== undefined && typeof pair !== "string")
       continue;
-    const composite = rule.alongside === undefined ? value : `${value}@${pair}`;
-    if (seen.has(composite)) {
+    const normalized = rule.asEnvName ? value.toUpperCase().replace(/-/g, "_") : value;
+    const composite = rule.alongside === undefined ? normalized : `${normalized}@${pair}`;
+    const first = seen.get(composite);
+    if (rule.asEnvName && first !== undefined) {
+      if (first !== value)
+        issues.push({
+          path: render([...trail, crumbFor({ node, key, entry, index })]),
+          message: `${fieldName} ${show(value)} and ${show(first)} both read as ${normalized} in an env var name. ${rule.because}`
+        });
+      continue;
+    }
+    if (first !== undefined) {
       const label = rule.alongside === undefined ? `${fieldName} ${show(value)}` : `${fieldName} ${show(value)} with ${rule.alongside} ${show(pair)}`;
       issues.push({
         path: render([...trail, crumbFor({ node, key, entry, index })]),
         message: `${label} is used more than once. ${rule.because}`
       });
     }
-    seen.add(composite);
+    seen.set(composite, value);
   }
 };
 var pinOf = ({
@@ -2595,13 +2769,15 @@ var checkEntry = ({
     checkVariants({ entry, variants: node.variants, at, issues: walk.issues });
   }
   for (const rule of node.rules ?? []) {
+    const warning = "warning" in rule && rule.warning === true;
     for (const message of entryRuleFailures({
       entry,
       rule,
       document: walk.document,
-      parent
+      parent,
+      checks: walk.checks
     })) {
-      walk.issues.push({ path: at, message });
+      walk.issues.push({ path: at, message, ...warning ? { warning } : {} });
     }
   }
 };
@@ -2664,7 +2840,17 @@ var walkValue = ({
     return;
   if (walk.hints.recordPaths.has(path)) {
     const keys = walk.rules[path]?.keys;
+    const values = walk.rules[path]?.values;
     for (const [recordKey, child] of Object.entries(value)) {
+      if (values && !isEntry(child) && !Array.isArray(child)) {
+        for (const message of constraintFailures({
+          name: `${key}.${recordKey}`,
+          value: child,
+          constraints: values
+        })) {
+          walk.issues.push({ path: render(trail), message });
+        }
+      }
       if (keys) {
         for (const message of constraintFailures({
           name: `${key} key ${show(recordKey)}`,
@@ -2690,9 +2876,10 @@ var walkValue = ({
 var lintDocument = ({
   document,
   rules,
-  hints
+  hints,
+  checks = {}
 }) => {
-  const walk = { document, rules, hints, issues: [] };
+  const walk = { document, rules, hints, checks, issues: [] };
   walkEntry({ entry: document, path: "", trail: [], walk });
   return walk.issues;
 };
@@ -2827,7 +3014,8 @@ var CATALOG_HINTS = hintsOf({
     "plans.variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.multipliers",
     "plans.variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.multipliers.*.match",
     "plans.variants.customize.upsertLicenses.customize.addItems.featureOverride.markups.modelMarkups",
-    "plans.variants.customize.upsertLicenses.customize.addItems.featureOverride.markups.providerMarkups"
+    "plans.variants.customize.upsertLicenses.customize.addItems.featureOverride.markups.providerMarkups",
+    "webhooks.url"
   ],
   frozenPaths: [
     "plans.licenses.metadata",
@@ -2844,15 +3032,19 @@ var stated = (config) => ({
   } : {},
   ...config.rewards !== undefined ? { rewards: config.rewards } : {},
   ...config.referralPrograms !== undefined ? { referralPrograms: config.referralPrograms } : {},
-  ...config.settings !== undefined ? { settings: config.settings } : {}
+  ...config.settings !== undefined ? { settings: config.settings } : {},
+  ...config.webhooks !== undefined ? { webhooks: config.webhooks } : {}
 });
 var SINGLETON_KEYS = ["settings"];
+var LIST_KEYS = ["webhooks"];
+var WARNINGS_KEY = "lint_warnings";
 var CONFIG_KEYS = [
   "features",
   "plans",
   "rewards",
   "referralPrograms",
-  "settings"
+  "settings",
+  "webhooks"
 ];
 var unknownKeyIssue = (key) => key === "planVersions" ? {
   path: key,
@@ -2862,10 +3054,14 @@ var unknownKeyIssue = (key) => key === "planVersions" ? {
   message: `${key} is not a config field. The fields are ${CONFIG_KEYS.join(", ")}.`
 };
 var splitWire = (document) => ({
-  catalog: Object.fromEntries(Object.entries(document).filter(([key]) => !SINGLETON_KEYS.includes(key))),
+  catalog: Object.fromEntries(Object.entries(document).filter(([key]) => !SINGLETON_KEYS.includes(key) && !LIST_KEYS.includes(key) && key !== WARNINGS_KEY)),
   singletons: {
     settings: document.settings === undefined ? undefined : { config: document.settings }
-  }
+  },
+  lists: {
+    webhooks: document.webhooks
+  },
+  warnings: document[WARNINGS_KEY] ?? []
 });
 var atmn = (config) => {
   const unknownKeys = Object.keys(config).filter((key) => !CONFIG_KEYS.includes(key));
@@ -2875,21 +3071,26 @@ var atmn = (config) => {
   const issues = lintDocument({
     document,
     rules: LINT_RULES,
-    hints: CATALOG_HINTS
+    hints: CATALOG_HINTS,
+    checks: { isLocalWebhookUrl }
   });
-  if (issues.length > 0)
-    throw new ConfigError(issues);
+  const errors = issues.filter((issue) => issue.warning !== true);
+  if (errors.length > 0)
+    throw new ConfigError(errors);
+  const warnings = issues.filter((issue) => issue.warning === true);
   return {
     ...toWire({
       value: document,
       path: "",
       hints: CATALOG_HINTS
     }),
+    ...warnings.length > 0 ? { [WARNINGS_KEY]: warnings } : {},
     skip_deletions: false,
     migration: { draft: true }
   };
 };
 export {
+  webhook,
   variant,
   referralProgram,
   plan,

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"7.0.0-dev.20260511.1","root":["../src/bin.ts","../src/cli.ts","../src/index.ts","../src/version.ts","../src/actions/env.ts","../src/actions/login.ts","../src/actions/pull.ts","../src/actions/push.ts","../src/actions/api/callApi.ts","../src/actions/api/registerApiCommands.ts","../src/actions/env/fetchOrgInfo.ts","../src/actions/env/types/orgInfo.ts","../src/actions/init/runInit.ts","../src/actions/login/keyless.ts","../src/actions/pull/appendPlanVersionFixture.ts","../src/actions/pull/applyMappings.ts","../src/actions/pull/applyPreview.ts","../src/actions/pull/applySettingsPreview.ts","../src/actions/pull/changedFixtureKeys.ts","../src/actions/pull/elementStatesPlanId.ts","../src/actions/pull/listSourceFiles.ts","../src/actions/pull/locateFixture.ts","../src/actions/pull/pruneUnpulledPlanIds.ts","../src/actions/pull/resolveCollectionTarget.ts","../src/actions/pull/rewriteConfig.ts","../src/actions/pull/scaffoldConfig.ts","../src/actions/push/backfillInternalIds.ts","../src/actions/push/deprecatedFields.ts","../src/actions/reset/runReset.ts","../src/actions/sandbox/createSandbox.ts","../src/actions/sandbox/deleteSandbox.ts","../src/actions/sandbox/listSandboxes.ts","../src/actions/sandbox/useSandbox.ts","../src/actions/sandbox/withSandboxScopeHint.ts","../src/actions/sandbox/types/sandboxClient.ts","../src/actions/skills/ignoreBundledSkills.ts","../src/actions/skills/skills.ts","../src/auth/announceAuthorizationUrl.ts","../src/auth/buildAuthorizationUrl.ts","../src/auth/callbackPages.ts","../src/auth/createOrgApiKeys.ts","../src/auth/keyless.ts","../src/auth/oauthConfig.ts","../src/auth/runOAuthFlow.ts","../src/auth/browser/openSystemBrowser.ts","../src/auth/browser/tryOpenBrowser.ts","../src/auth/browser/watchLauncher.ts","../src/auth/types/browserOpener.ts","../src/auth/types/impersonationTokens.ts","../src/auth/types/oauthTokens.ts","../src/auth/types/orgApiKeys.ts","../src/config/configPackageName.ts","../src/config/legacyConfig.ts","../src/config/loadConfig.ts","../src/env/assertSandboxTarget.ts","../src/env/loadEnv.ts","../src/env/resolveTarget.ts","../src/env/sandboxKeyName.ts","../src/generated/apiRoutes.ts","../src/generated/client.ts","../src/generated/emit.ts","../src/generated/emitRuntime.ts","../src/generated/features.ts","../src/generated/labels.ts","../src/generated/licenses.ts","../src/generated/lintRules.ts","../src/generated/lintRuntime.ts","../src/generated/mappingAssignments.ts","../src/generated/plans.ts","../src/generated/referralPrograms.ts","../src/generated/rewards.ts","../src/generated/settings.ts","../src/generated/skills.ts","../src/generated/variants.ts","../src/generated/wire.ts","../src/http/autumnFetch.ts","../src/project/chooseConfigDir.ts","../src/project/resolveProject.ts","../src/project/rootMarker.ts","../src/prompt/prompt.ts","../src/prompt/select.ts","../src/render/renderEnv.ts","../src/render/renderPreview.ts","../src/render/renderSandboxes.ts","../src/render/stripTerminalControls.ts","../src/repo/findRepoRoot.ts","../src/surgery/appendPropertyEdit.ts","../src/surgery/appendToArray.ts","../src/surgery/appendToBinding.ts","../src/surgery/appendToCollection.ts","../src/surgery/appendToFixtureArray.ts","../src/surgery/arrayBinding.ts","../src/surgery/deleteFixtureLiteral.ts","../src/surgery/deleteReference.ts","../src/surgery/ensureBuilderImport.ts","../src/surgery/findFixture.ts","../src/surgery/fixtureEdit.ts","../src/surgery/fixtureLocation.ts","../src/surgery/insertCollection.ts","../src/surgery/insertFirstProperty.ts","../src/surgery/patchFixturePaths.ts","../src/surgery/patchFixtureProperty.ts","../src/surgery/patchSingletonProperty.ts","../src/surgery/readFixtureValue.ts","../src/surgery/replaceFixture.ts","../src/surgery/setFixtureProperty.ts","../src/surgery/staticFixtureRule.ts","../test/apiCommand.test.ts","../test/authorizationUrl.test.ts","../test/autumnFetch.test.ts","../test/backfill.test.ts","../test/backfillInlineVariants.test.ts","../test/backfillSlug.test.ts","../test/backfillVariants.test.ts","../test/chooseConfigDir.test.ts","../test/cliTargetFlags.test.ts","../test/client.test.ts","../test/configPackageName.test.ts","../test/emitFixture.test.ts","../test/env.test.ts","../test/envWriter.test.ts","../test/ignoreBundledSkills.test.ts","../test/init.test.ts","../test/keyless.test.ts","../test/legacyConfig.test.ts","../test/lintDocument.test.ts","../test/loadConfigNode.test.ts","../test/loadConfigV2.test.ts","../test/locateFixtureUnique.test.ts","../test/login.test.ts","../test/nodeNextTypes.test.ts","../test/patchFixturePaths.test.ts","../test/plans.test.ts","../test/previewIsEmpty.test.ts","../test/prompt.test.ts","../test/pull.test.ts","../test/pullByReference.test.ts","../test/pullFieldLevel.test.ts","../test/pullMappings.test.ts","../test/pullOmitDefaults.test.ts","../test/pullPlans.test.ts","../test/pullStatesSlugs.test.ts","../test/pullTwoCollections.test.ts","../test/readFixtureValue.test.ts","../test/renameHint.test.ts","../test/renderPreview.test.ts","../test/renderSandboxes.test.ts","../test/renderSettings.test.ts","../test/reset.test.ts","../test/resolveCollectionTarget.test.ts","../test/resolveProject.test.ts","../test/resolveTarget.test.ts","../test/sandboxActions.test.ts","../test/sandboxKeyName.test.ts","../test/sandboxUse.test.ts","../test/settingsActions.test.ts","../test/settingsWire.test.ts","../test/skills.test.ts","../test/watchLauncher.test.ts","../test/wireDocument.test.ts","../test/helpers/targetFor.ts","../test/surgery/appendToCollection.test.ts","../test/surgery/deleteFixtureLiteral.test.ts","../test/surgery/deleteReference.test.ts","../test/surgery/findFixture.test.ts","../test/surgery/fixtureLocation.test.ts","../test/surgery/insertCollection.test.ts","../test/surgery/insertFirstProperty.test.ts","../test/surgery/patchFixtureProperty.test.ts","../test/surgery/patchSingletonProperty.test.ts","../test/surgery/replaceFixture.test.ts","../test/surgery/staticFixtureRule.test.ts"]}
+{"version":"7.0.0-dev.20260511.1","root":["../src/bin.ts","../src/cli.ts","../src/index.ts","../src/version.ts","../src/actions/env.ts","../src/actions/login.ts","../src/actions/pull.ts","../src/actions/push.ts","../src/actions/api/callApi.ts","../src/actions/api/registerApiCommands.ts","../src/actions/env/fetchOrgInfo.ts","../src/actions/env/types/orgInfo.ts","../src/actions/init/runInit.ts","../src/actions/login/keyless.ts","../src/actions/pull/appendPlanVersionFixture.ts","../src/actions/pull/applyMappings.ts","../src/actions/pull/applyPreview.ts","../src/actions/pull/applySettingsPreview.ts","../src/actions/pull/changedFixtureKeys.ts","../src/actions/pull/elementStatesPlanId.ts","../src/actions/pull/listSourceFiles.ts","../src/actions/pull/locateFixture.ts","../src/actions/pull/pruneUnpulledPlanIds.ts","../src/actions/pull/resolveCollectionTarget.ts","../src/actions/pull/rewriteConfig.ts","../src/actions/pull/scaffoldConfig.ts","../src/actions/pull/webhooks/appendWebhook.ts","../src/actions/pull/webhooks/applyWebhooksPull.ts","../src/actions/pull/webhooks/locateWebhook.ts","../src/actions/pull/webhooks/removeWebhookEnv.ts","../src/actions/pull/webhooks/types.ts","../src/actions/pull/webhooks/updateWebhook.ts","../src/actions/push/backfillInternalIds.ts","../src/actions/push/deprecatedFields.ts","../src/actions/push/pushLanesError.ts","../src/actions/reset/runReset.ts","../src/actions/sandbox/createSandbox.ts","../src/actions/sandbox/deleteSandbox.ts","../src/actions/sandbox/listSandboxes.ts","../src/actions/sandbox/useSandbox.ts","../src/actions/sandbox/withSandboxScopeHint.ts","../src/actions/sandbox/types/sandboxClient.ts","../src/actions/skills/ignoreBundledSkills.ts","../src/actions/skills/skills.ts","../src/actions/webhooks/applyWebhooks.ts","../src/actions/webhooks/isDashboardWebhook.ts","../src/actions/webhooks/newWebhookId.ts","../src/actions/webhooks/previewWebhooks.ts","../src/actions/webhooks/resolveWebhookEnv.ts","../src/actions/webhooks/resolveWebhooksForEnv.ts","../src/actions/webhooks/webhookSecretName.ts","../src/actions/webhooks/writeWebhookSecrets.ts","../src/actions/webhooks/types/webhookEnv.ts","../src/auth/announceAuthorizationUrl.ts","../src/auth/buildAuthorizationUrl.ts","../src/auth/callbackPages.ts","../src/auth/createOrgApiKeys.ts","../src/auth/keyless.ts","../src/auth/oauthConfig.ts","../src/auth/runOAuthFlow.ts","../src/auth/browser/openSystemBrowser.ts","../src/auth/browser/tryOpenBrowser.ts","../src/auth/browser/watchLauncher.ts","../src/auth/types/browserOpener.ts","../src/auth/types/impersonationTokens.ts","../src/auth/types/oauthTokens.ts","../src/auth/types/orgApiKeys.ts","../src/config/configPackageName.ts","../src/config/legacyConfig.ts","../src/config/loadConfig.ts","../src/env/assertSandboxTarget.ts","../src/env/loadEnv.ts","../src/env/resolveTarget.ts","../src/env/sandboxKeyName.ts","../src/generated/apiRoutes.ts","../src/generated/client.ts","../src/generated/emit.ts","../src/generated/emitRuntime.ts","../src/generated/features.ts","../src/generated/isLocalWebhookUrl.ts","../src/generated/labels.ts","../src/generated/licenses.ts","../src/generated/lintRules.ts","../src/generated/lintRuntime.ts","../src/generated/mappingAssignments.ts","../src/generated/plans.ts","../src/generated/referralPrograms.ts","../src/generated/rewards.ts","../src/generated/sandboxName.ts","../src/generated/settings.ts","../src/generated/skills.ts","../src/generated/variants.ts","../src/generated/webhooks.ts","../src/generated/wire.ts","../src/http/autumnFetch.ts","../src/project/chooseConfigDir.ts","../src/project/resolveProject.ts","../src/project/rootMarker.ts","../src/prompt/prompt.ts","../src/prompt/select.ts","../src/render/renderEnv.ts","../src/render/renderPreview.ts","../src/render/renderSandboxes.ts","../src/render/renderWebhooks.ts","../src/render/stripTerminalControls.ts","../src/repo/findRepoRoot.ts","../src/surgery/appendPropertyEdit.ts","../src/surgery/appendToArray.ts","../src/surgery/appendToBinding.ts","../src/surgery/appendToCollection.ts","../src/surgery/appendToFixtureArray.ts","../src/surgery/arrayBinding.ts","../src/surgery/deleteFixtureLiteral.ts","../src/surgery/deleteReference.ts","../src/surgery/ensureBuilderImport.ts","../src/surgery/findFixture.ts","../src/surgery/fixtureEdit.ts","../src/surgery/fixtureLocation.ts","../src/surgery/insertCollection.ts","../src/surgery/insertFirstProperty.ts","../src/surgery/patchFixturePaths.ts","../src/surgery/patchFixtureProperty.ts","../src/surgery/patchSingletonProperty.ts","../src/surgery/readFixtureValue.ts","../src/surgery/replaceFixture.ts","../src/surgery/setFixtureProperty.ts","../src/surgery/staticFixtureRule.ts","../test/apiCommand.test.ts","../test/authorizationUrl.test.ts","../test/autumnFetch.test.ts","../test/backfill.test.ts","../test/backfillInlineVariants.test.ts","../test/backfillSlug.test.ts","../test/backfillVariants.test.ts","../test/chooseConfigDir.test.ts","../test/cliTargetFlags.test.ts","../test/client.test.ts","../test/configPackageName.test.ts","../test/emitFixture.test.ts","../test/env.test.ts","../test/envWriter.test.ts","../test/ignoreBundledSkills.test.ts","../test/init.test.ts","../test/keyless.test.ts","../test/legacyConfig.test.ts","../test/lintDocument.test.ts","../test/loadConfigNode.test.ts","../test/loadConfigV2.test.ts","../test/locateFixtureUnique.test.ts","../test/login.test.ts","../test/nodeNextTypes.test.ts","../test/patchFixturePaths.test.ts","../test/plans.test.ts","../test/previewIsEmpty.test.ts","../test/prompt.test.ts","../test/pull.test.ts","../test/pullByReference.test.ts","../test/pullFieldLevel.test.ts","../test/pullMappings.test.ts","../test/pullOmitDefaults.test.ts","../test/pullPlans.test.ts","../test/pullStatesSlugs.test.ts","../test/pullTwoCollections.test.ts","../test/readFixtureValue.test.ts","../test/renameHint.test.ts","../test/renderPreview.test.ts","../test/renderSandboxes.test.ts","../test/renderSettings.test.ts","../test/reset.test.ts","../test/resolveCollectionTarget.test.ts","../test/resolveProject.test.ts","../test/resolveTarget.test.ts","../test/sandboxActions.test.ts","../test/sandboxKeyName.test.ts","../test/sandboxUse.test.ts","../test/settingsActions.test.ts","../test/settingsWire.test.ts","../test/skills.test.ts","../test/watchLauncher.test.ts","../test/wireDocument.test.ts","../test/helpers/targetFor.ts","../test/surgery/appendToCollection.test.ts","../test/surgery/deleteFixtureLiteral.test.ts","../test/surgery/deleteReference.test.ts","../test/surgery/findFixture.test.ts","../test/surgery/fixtureLocation.test.ts","../test/surgery/insertCollection.test.ts","../test/surgery/insertFirstProperty.test.ts","../test/surgery/patchFixtureProperty.test.ts","../test/surgery/patchSingletonProperty.test.ts","../test/surgery/replaceFixture.test.ts","../test/surgery/staticFixtureRule.test.ts","../test/webhooks/webhooksEnv.test.ts","../test/webhooks/webhooksLint.test.ts","../test/webhooks/webhooksPull.test.ts","../test/webhooks/webhooksPush.test.ts"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atmn",
-  "version": "2.0.32",
+  "version": "2.0.34",
   "license": "MIT",
   "description": "The CLI for Autumn — define your pricing in code, sync it to Autumn, and keep everything in version control.",
   "bin": {
@@ -49,5 +49,5 @@
     "open": "10.2.0",
     "yaml": "2.9.0"
   },
-  "gitHead": "5fcd03a1c30d352578bb087458d1548951c6fdb0"
+  "gitHead": "c29d787ec5b5f0c7414a3dca13b36fdcb40b6579"
 }

package/src/actions/pull/webhooks/appendWebhook.ts

@@ -0,0 +1,84 @@
+import { SYNCED_LISTS } from "../../../generated/emit";
+import { emitFixture } from "../../../generated/emitRuntime";
+import { appendToBinding } from "../../../surgery/appendToBinding";
+import { appendToCollection } from "../../../surgery/appendToCollection";
+import { ensureBuilderImport } from "../../../surgery/ensureBuilderImport";
+import {
+	insertCollection,
+	rootSpreadNames,
+} from "../../../surgery/insertCollection";
+import { resolveCollectionTarget } from "../resolveCollectionTarget";
+import type { PullFiles, RemoteWebhook } from "./types";
+
+const SPEC = SYNCED_LISTS.webhooks;
+const COLLECTION = "webhooks";
+
+/** The fixture a remote webhook reads as from one env: its url under that env alone. */
+const fixtureRowOf = ({
+	webhook,
+	envKey,
+}: {
+	webhook: RemoteWebhook;
+	envKey: string;
+}): Record<string, unknown> => ({
+	id: webhook.id,
+	url: { [envKey]: webhook.url },
+	events: webhook.events,
+	...(webhook.description ? { description: webhook.description } : {}),
+	...(webhook.disabled ? { disabled: true } : {}),
+});
+
+/** Rule 1: a remote webhook the config never names is appended for this env. */
+export const appendWebhook = ({
+	pull,
+	webhook,
+	envKey,
+}: {
+	pull: PullFiles;
+	webhook: RemoteWebhook;
+	envKey: string;
+}): string | null => {
+	const { configPath, files } = pull;
+	const configSource = files.get(configPath) ?? "";
+	const withKey = insertCollection({
+		source: configSource,
+		collection: COLLECTION,
+	});
+	if (withKey === null)
+		return "append to `webhooks` by hand: no atmn({...}) call";
+	// A spread may already hold `webhooks`; a second key after it would override it.
+	const spreads = rootSpreadNames({ source: configSource });
+	if (withKey !== configSource && spreads.length > 0)
+		return `append to \`webhooks\` by hand: atmn() spreads \`${spreads.join("`, `")}\`, which may already hold it`;
+	files.set(configPath, withKey);
+	const target = resolveCollectionTarget({
+		configPath,
+		files,
+		collection: COLLECTION,
+	});
+	if (target === null)
+		return "append to `webhooks` by hand: it is not an array literal";
+	const text = (indent: string) =>
+		emitFixture({
+			spec: SPEC,
+			row: fixtureRowOf({ webhook, envKey }),
+			includeMappings: false,
+			indent,
+		});
+	const source = files.get(target.file) ?? "";
+	const updated =
+		target.kind === "inline"
+			? appendToCollection({ source, collection: COLLECTION, text })
+			: appendToBinding({ source, name: target.name, text });
+	if (updated === null)
+		return "append to `webhooks` by hand: it is not an array literal";
+	files.set(
+		target.file,
+		ensureBuilderImport({
+			source: updated,
+			builder: SPEC.builder,
+			collection: COLLECTION,
+		}),
+	);
+	return null;
+};

package/src/actions/pull/webhooks/applyWebhooksPull.ts

@@ -0,0 +1,100 @@
+import { isDashboardWebhook } from "../../webhooks/isDashboardWebhook";
+import { newWebhookId } from "../../webhooks/newWebhookId";
+import { appendWebhook } from "./appendWebhook";
+import { removeWebhookEnv } from "./removeWebhookEnv";
+import type {
+	PullFiles,
+	RemoteWebhook,
+	StatedWebhook,
+	WebhookEditResult,
+} from "./types";
+import { updateWebhook } from "./updateWebhook";
+
+const merge = (target: WebhookEditResult, source: WebhookEditResult): void => {
+	target.lines.push(...source.lines);
+	target.warnings.push(...source.warnings);
+	target.unlocated.push(...source.unlocated);
+};
+
+/**
+ * One env's webhooks written back into the config. Only `url[envKey]` is
+ * touched on the url map; every other env's key, comment and ordering stays.
+ * A dashboard webhook is matched to the config by URL, never duplicated: the
+ * next push adopts it by that URL, keeping its signing secret.
+ */
+export const applyWebhooksPull = ({
+	pull,
+	remote,
+	stated,
+	envKey,
+	newId = newWebhookId,
+}: {
+	pull: PullFiles;
+	remote: RemoteWebhook[];
+	/** The config's webhooks as evaluated; absent when it states none. */
+	stated: StatedWebhook[] | undefined;
+	envKey: string;
+	/** Mints the id a dashboard webhook is written under. */
+	newId?: () => string;
+}): WebhookEditResult => {
+	const result: WebhookEditResult = { lines: [], warnings: [], unlocated: [] };
+	const statedById = new Map((stated ?? []).map((row) => [row.id, row]));
+	// An id the config states is the config's, whatever its shape.
+	const fromDashboard = (webhook: RemoteWebhook): boolean =>
+		!statedById.has(webhook.id) && isDashboardWebhook(webhook);
+	const present = new Set<string>();
+
+	for (const webhook of remote) {
+		if (fromDashboard(webhook)) {
+			const represented = (stated ?? []).find(
+				(row) => row.url?.[envKey] === webhook.url,
+			);
+			if (represented !== undefined) {
+				present.add(represented.id);
+				merge(
+					result,
+					updateWebhook({
+						pull,
+						webhook: { ...webhook, id: represented.id },
+						stated: represented,
+						envKey,
+					}),
+				);
+				continue;
+			}
+			if (webhook.events.length === 0) {
+				result.lines.push(
+					`· webhook ${webhook.id} receives every event; give it an event list in the dashboard, or add it to your config, to manage it here`,
+				);
+				continue;
+			}
+			const id = newId();
+			const failure = appendWebhook({
+				pull,
+				webhook: { ...webhook, id },
+				envKey,
+			});
+			if (failure === null)
+				result.lines.push(
+					`+ webhook ${id} (made in the dashboard; push adopts it by URL)`,
+				);
+			else result.unlocated.push({ id, action: failure });
+			continue;
+		}
+		present.add(webhook.id);
+		const row = statedById.get(webhook.id);
+		if (row !== undefined) {
+			merge(result, updateWebhook({ pull, webhook, stated: row, envKey }));
+			continue;
+		}
+		const failure = appendWebhook({ pull, webhook, envKey });
+		if (failure === null) result.lines.push(`+ webhook ${webhook.id}`);
+		else result.unlocated.push({ id: webhook.id, action: failure });
+	}
+
+	for (const row of stated ?? []) {
+		if (present.has(row.id) || row.url?.[envKey] === undefined) continue;
+		merge(result, removeWebhookEnv({ pull, stated: row, envKey }));
+	}
+	return result;
+};

package/src/actions/pull/webhooks/locateWebhook.ts

@@ -0,0 +1,22 @@
+import { SYNCED_LISTS } from "../../../generated/emit";
+import { type LocatedFixture, locateFixture } from "../locateFixture";
+import type { PullFiles } from "./types";
+
+const SPEC = SYNCED_LISTS.webhooks;
+
+/** A `webhook({...})` call with this id, even when some values are code. */
+export const locateWebhook = ({
+	pull,
+	id,
+}: {
+	pull: PullFiles;
+	id: string;
+}): LocatedFixture | null =>
+	locateFixture({
+		configPath: pull.configPath,
+		files: pull.files,
+		builder: SPEC.builder,
+		idField: SPEC.idField,
+		id,
+		allowDynamic: true,
+	});