atmn 1.1.0 → 1.1.2

package/dist/cli.js

@@ -44671,11 +44671,18 @@ var init_planItem = __esm(() => {
           return;
         return {
           amount: api.price.amount,
-          tiers: api.price.tiers,
+          tiers: api.price.tiers?.map((tier) => {
+            const t = tier;
+            return {
+              to: t.to,
+              amount: t.amount,
+              ...t.flat_amount !== undefined && { flatAmount: t.flat_amount }
+            };
+          }),
           billingUnits: api.price.billing_units,
           maxPurchase: api.price.max_purchase ?? undefined,
           billingMethod: api.price.billing_method,
-          tierBehaviour: api.price.tier_behaviour,
+          tierBehavior: api.price.tier_behavior,
           interval: api.price.interval,
           ...api.price.interval_count !== undefined && {
             intervalCount: api.price.interval_count
@@ -44903,6 +44910,23 @@ function planIdToVarName(id) {
 function featureIdToVarName(id) {
   return idToVarName(id, "feature_");
 }
+function resolveVarNames(featureIds, planIds) {
+  const featureVarMap = new Map;
+  const planVarMap = new Map;
+  for (const id of featureIds) {
+    featureVarMap.set(id, featureIdToVarName(id));
+  }
+  const usedNames = new Set(featureVarMap.values());
+  for (const id of planIds) {
+    let varName = planIdToVarName(id);
+    if (usedNames.has(varName)) {
+      varName = `${varName}_plan`;
+    }
+    planVarMap.set(id, varName);
+    usedNames.add(varName);
+  }
+  return { featureVarMap, planVarMap };
+}
 function escapeString(str) {
   return str.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/"/g, "\\\"").replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t");
 }
@@ -44933,8 +44957,8 @@ function formatValue(value) {
 }
 
 // src/lib/transforms/sdkToCode/feature.ts
-function buildFeatureCode(feature) {
-  const varName = featureIdToVarName(feature.id);
+function buildFeatureCode(feature, varNameOverride) {
+  const varName = varNameOverride ?? featureIdToVarName(feature.id);
   const lines = [];
   lines.push(`export const ${varName} = feature({`);
   lines.push(`	id: '${feature.id}',`);
@@ -45005,8 +45029,8 @@ function buildPlanItemCode(planItem, _features, featureVarMap) {
     if (priceWithBilling.maxPurchase !== undefined) {
       lines.push(`				maxPurchase: ${priceWithBilling.maxPurchase},`);
     }
-    if (priceWithBilling.tierBehaviour !== undefined) {
-      lines.push(`				tierBehaviour: '${priceWithBilling.tierBehaviour}',`);
+    if (priceWithBilling.tierBehavior !== undefined) {
+      lines.push(`				tierBehavior: '${priceWithBilling.tierBehavior}',`);
     }
     const priceWithInterval = planItem.price;
     if (priceWithInterval.interval) {
@@ -45030,8 +45054,8 @@ function buildPlanItemCode(planItem, _features, featureVarMap) {
 var init_planItem2 = () => {};
 
 // src/lib/transforms/sdkToCode/plan.ts
-function buildPlanCode(plan, features, featureVarMap) {
-  const varName = planIdToVarName(plan.id);
+function buildPlanCode(plan, features, featureVarMap, varNameOverride) {
+  const varName = varNameOverride ?? planIdToVarName(plan.id);
   const lines = [];
   lines.push(`export const ${varName} = plan({`);
   lines.push(`	id: '${plan.id}',`);
@@ -45076,18 +45100,10 @@ var init_plan2 = __esm(() => {
 // src/lib/transforms/inPlaceUpdate/updateConfig.ts
 import { existsSync as existsSync4, writeFileSync as writeFileSync2 } from "node:fs";
 function generateFeatureCode(feature, existingVarName) {
-  const code = buildFeatureCode(feature);
-  if (existingVarName) {
-    return code.replace(/export const \w+/, `export const ${existingVarName}`);
-  }
-  return code;
+  return buildFeatureCode(feature, existingVarName);
 }
 function generatePlanCode(plan, features, existingVarName, featureVarMap) {
-  const code = buildPlanCode(plan, features, featureVarMap);
-  if (existingVarName) {
-    return code.replace(/export const \w+/, `export const ${existingVarName}`);
-  }
-  return code;
+  return buildPlanCode(plan, features, featureVarMap, existingVarName);
 }
 async function updateConfigInPlace(features, plans, cwd2 = process.cwd()) {
   const configPath = resolveConfigPath(cwd2);
@@ -45111,6 +45127,30 @@ async function updateConfigInPlace(features, plans, cwd2 = process.cwd()) {
       featureVarMap.set(entity.id, entity.varName);
     }
   }
+  const existingVarNames = new Set(parsed.entities.map((e) => e.varName));
+  const newFeatureIds = features.filter((f) => !featureVarMap.has(f.id)).map((f) => f.id);
+  const newFeatureVarMap = new Map;
+  for (const id of newFeatureIds) {
+    const { featureVarMap: resolved } = resolveVarNames([id], []);
+    let varName = resolved.get(id);
+    if (existingVarNames.has(varName)) {
+      varName = `${varName}_feature`;
+    }
+    newFeatureVarMap.set(id, varName);
+    existingVarNames.add(varName);
+    featureVarMap.set(id, varName);
+  }
+  const existingPlanIds = new Set(parsed.entities.filter((e) => e.type === "plan").map((e) => e.id));
+  const newPlanIds = plans.filter((p) => !existingPlanIds.has(p.id)).map((p) => p.id);
+  const newPlanVarMap = new Map;
+  for (const id of newPlanIds) {
+    let varName = planIdToVarName(id);
+    if (existingVarNames.has(varName)) {
+      varName = `${varName}_plan`;
+    }
+    newPlanVarMap.set(id, varName);
+    existingVarNames.add(varName);
+  }
   const matchedFeatureIds = new Set;
   const matchedPlanIds = new Set;
   const outputBlocks = [];
@@ -45202,7 +45242,7 @@ async function updateConfigInPlace(features, plans, cwd2 = process.cwd()) {
   }
   const newFeatures = features.filter((f) => !matchedFeatureIds.has(f.id));
   if (newFeatures.length > 0) {
-    const newFeatureCode = newFeatures.map((f) => generateFeatureCode(f)).join(`
+    const newFeatureCode = newFeatures.map((f) => generateFeatureCode(f, newFeatureVarMap.get(f.id))).join(`
 
 `);
     if (lastFeatureBlockIndex >= 0) {
@@ -45242,7 +45282,7 @@ ${newFeatureCode}`);
   }
   const newPlans = plans.filter((p) => !matchedPlanIds.has(p.id));
   if (newPlans.length > 0) {
-    const newPlanCode = newPlans.map((p) => generatePlanCode(p, features, undefined, featureVarMap)).join(`
+    const newPlanCode = newPlans.map((p) => generatePlanCode(p, features, featureVarMap, newPlanVarMap.get(p.id))).join(`
 
 `);
     if (lastPlanBlockIndex >= 0) {
@@ -45300,19 +45340,20 @@ var init_inPlaceUpdate = __esm(() => {
 // src/lib/transforms/sdkToCode/configFile.ts
 function buildConfigFile(features, plans) {
   const sections = [];
+  const { featureVarMap, planVarMap } = resolveVarNames(features.map((f) => f.id), plans.map((p) => p.id));
   sections.push(buildImports());
   sections.push("");
   if (features.length > 0) {
     sections.push("// Features");
     for (const feature of features) {
-      sections.push(buildFeatureCode(feature));
+      sections.push(buildFeatureCode(feature, featureVarMap.get(feature.id)));
       sections.push("");
     }
   }
   if (plans.length > 0) {
     sections.push("// Plans");
     for (const plan of plans) {
-      sections.push(buildPlanCode(plan, features));
+      sections.push(buildPlanCode(plan, features, featureVarMap, planVarMap.get(plan.id)));
       sections.push("");
     }
   }
@@ -45512,7 +45553,7 @@ var init_pull = __esm(() => {
 });
 
 // src/lib/version.ts
-var APP_VERSION = "1.1.0";
+var APP_VERSION = "1.1.2";
 
 // ../node_modules/.pnpm/@tanstack+query-core@5.90.17/node_modules/@tanstack/query-core/build/modern/subscribable.js
 var Subscribable = class {
@@ -61961,15 +62002,24 @@ function transformPlanItem(planItem) {
       ...planItem.price.amount !== undefined && {
         amount: planItem.price.amount
       },
-      ...planItem.price.tiers && { tiers: planItem.price.tiers },
+      ...planItem.price.tiers && {
+        tiers: planItem.price.tiers.map((tier) => {
+          const t = tier;
+          return {
+            to: t.to,
+            amount: t.amount,
+            ...t.flatAmount !== undefined && { flat_amount: t.flatAmount }
+          };
+        })
+      },
       ...intervalCount !== undefined && {
         interval_count: intervalCount
       },
       ...priceWithBilling.maxPurchase !== undefined && {
         max_purchase: priceWithBilling.maxPurchase
       },
-      ...priceWithBilling.tierBehaviour !== undefined && {
-        tier_behaviour: priceWithBilling.tierBehaviour
+      ...priceWithBilling.tierBehavior !== undefined && {
+        tier_behavior: priceWithBilling.tierBehavior
       }
     };
   }

package/dist/src/compose/models/planModels.d.ts

@@ -17,7 +17,7 @@ export declare const PlanItemSchema: z.ZodObject<{
             to: z.ZodUnion<readonly [z.ZodNumber, z.ZodLiteral<"inf">]>;
             amount: z.ZodNumber;
         }, z.core.$strip>>>;
-        tier_behaviour: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"graduated">, z.ZodLiteral<"volume">]>>;
+        tier_behavior: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"graduated">, z.ZodLiteral<"volume">]>>;
         interval: z.ZodUnion<readonly [z.ZodLiteral<"week">, z.ZodLiteral<"month">, z.ZodLiteral<"quarter">, z.ZodLiteral<"semi_annual">, z.ZodLiteral<"year">]>;
         interval_count: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
         billing_units: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
@@ -65,7 +65,7 @@ export declare const PlanSchema: z.ZodObject<{
                 to: z.ZodUnion<readonly [z.ZodNumber, z.ZodLiteral<"inf">]>;
                 amount: z.ZodNumber;
             }, z.core.$strip>>>;
-            tier_behaviour: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"graduated">, z.ZodLiteral<"volume">]>>;
+            tier_behavior: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"graduated">, z.ZodLiteral<"volume">]>>;
             interval: z.ZodUnion<readonly [z.ZodLiteral<"week">, z.ZodLiteral<"month">, z.ZodLiteral<"quarter">, z.ZodLiteral<"semi_annual">, z.ZodLiteral<"year">]>;
             interval_count: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
             billing_units: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
@@ -149,17 +149,32 @@ type PriceWithAmount = PriceBaseFields & {
     /** Cannot have tiers when using flat amount */
     tiers?: never;
 };
-type PriceWithTiers = PriceBaseFields & {
+type PriceWithGraduatedTiers = PriceBaseFields & {
     /** Cannot have flat amount when using tiers */
     amount?: never;
-    /** Tiered pricing structure based on usage ranges */
+    /** Graduated tiered pricing: each tier's amount applies only to units within that tier */
     tiers: Array<{
         to: number | "inf";
         amount: number;
     }>;
-    /** Required when tiers is defined: how tiers are applied */
-    tierBehaviour: "graduated" | "volume";
+    /** Graduated: each tier's rate applies only to usage within that tier */
+    tierBehavior: "graduated";
 };
+type PriceWithVolumeTiers = Omit<PriceBaseFields, "billingMethod"> & {
+    /** Volume pricing does not support usage_based billing — use 'prepaid' */
+    billingMethod: Exclude<BillingMethod, "usage_based">;
+    /** Cannot have flat amount when using tiers */
+    amount?: never;
+    /** Volume tiered pricing: the tier the total usage falls into applies to all units */
+    tiers: Array<{
+        to: number | "inf";
+        amount: number;
+        flatAmount?: number;
+    }>;
+    /** Volume: the rate of the tier the total usage falls into applies to all units */
+    tierBehavior: "volume";
+};
+type PriceWithTiers = PriceWithGraduatedTiers | PriceWithVolumeTiers;
 type PriceAmountOrTiers = PriceWithAmount | PriceWithTiers;
 type PriceWithoutInterval = PriceAmountOrTiers & {
     /** Cannot have interval when using top-level reset */

package/package.json

@@ -1,97 +1,102 @@
 {
-  "name": "atmn",
-  "version": "1.1.0",
-  "license": "MIT",
-  "bin": {
-    "atmn": "dist/cli.js"
-  },
-  "main": "dist/compose/index.js",
-  "types": "dist/src/compose/index.d.ts",
-  "type": "module",
-  "engines": {
-    "node": ">=16"
-  },
-  "scripts": {
-    "build": "bun run bun.config.ts",
-    "dev": "nodemon -e ts,tsx --watch src --ignore dist --exec \"bun run bun.config.ts\"",
-    "dev:bun": "bun run dev.ts",
-    "test": "bun test",
-    "test:watch": "bun test --watch",
-    "test2": "prettier --check . && xo && ava",
-    "test-cli": "node --trace-deprecation -- ./dist/cli.js"
-  },
-  "files": [
-    "dist",
-    "package.json",
-    "README.md"
-  ],
-  "dependencies": {
-    "@inkjs/ui": "^2.0.0",
-    "@inquirer/prompts": "^7.6.0",
-    "@mishieck/ink-titled-box": "^0.3.0",
-    "@tanstack/react-query": "^5.90.17",
-    "@types/prettier": "^3.0.0",
-    "arctic": "^3.7.0",
-    "axios": "^1.10.0",
-    "cfonts": "^3.3.1",
-    "chalk": "^5.2.0",
-    "clipboardy": "^5.0.2",
-    "commander": "^14.0.0",
-    "dotenv": "^17.2.0",
-    "ervy": "^1.0.7",
-    "ink": "^6.6.0",
-    "ink-big-text": "^2.0.0",
-    "ink-chart": "^0.1.1",
-    "ink-confirm-input": "^2.0.0",
-    "ink-scroll-list": "^0.4.1",
-    "ink-scroll-view": "^0.3.5",
-    "ink-select-input": "^6.2.0",
-    "ink-spinner": "^5.0.0",
-    "ink-table": "^3.1.0",
-    "ink-text-input": "^6.0.0",
-    "inquirer": "^12.7.0",
-    "jiti": "^2.4.2",
-    "open": "^10.1.2",
-    "prettier": "^3.6.2",
-    "react": "^19.2.3",
-    "yocto-spinner": "^1.0.0",
-    "zod": "^4.0.0",
-    "conf": "^13.0.1"
-  },
-  "devDependencies": {
-    "@sindresorhus/tsconfig": "^3.0.1",
-    "@types/bun": "^1.2.21",
-    "@types/node": "^24.0.10",
-    "@types/react": "^19.0.0",
-    "@vdemedes/prettier-config": "^2.0.1",
-    "ava": "^5.2.0",
-    "cli-testing-library": "^3.0.1",
-    "eslint-config-xo-react": "^0.27.0",
-    "eslint-plugin-react": "^7.32.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "ink-testing-library": "^3.0.0",
-    "nodemon": "^3.1.11",
-    "react-devtools-core": "^6.1.2",
-    "ts-node": "^10.9.1",
-    "tsup": "^8.5.0",
-    "typescript": "^5.0.3",
-    "xo": "^0.53.1"
-  },
-  "ava": {
-    "extensions": {
-      "ts": "module",
-      "tsx": "module"
-    },
-    "nodeArguments": [
-      "--loader=ts-node/esm"
-    ]
-  },
-  "xo": {
-    "extends": "xo-react",
-    "prettier": true,
-    "rules": {
-      "react/prop-types": "off"
-    }
-  },
-  "prettier": "@vdemedes/prettier-config"
+	"name": "atmn",
+	"version": "1.1.2",
+	"license": "MIT",
+	"bin": {
+		"atmn": "dist/cli.js"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/useautumn/typescript"
+	},
+	"homepage": "https://docs.useautumn.com/api-reference/cli/getting-started",
+	"main": "dist/compose/index.js",
+	"types": "dist/src/compose/index.d.ts",
+	"type": "module",
+	"engines": {
+		"node": ">=16"
+	},
+	"scripts": {
+		"build": "bun run bun.config.ts",
+		"dev": "nodemon -e ts,tsx --watch src --ignore dist --exec \"bun run bun.config.ts\"",
+		"dev:bun": "bun run dev.ts",
+		"test": "bun test",
+		"test:watch": "bun test --watch",
+		"test2": "prettier --check . && xo && ava",
+		"test-cli": "node --trace-deprecation -- ./dist/cli.js"
+	},
+	"files": [
+		"dist",
+		"package.json",
+		"README.md"
+	],
+	"dependencies": {
+		"@inkjs/ui": "^2.0.0",
+		"@inquirer/prompts": "^7.6.0",
+		"@mishieck/ink-titled-box": "^0.3.0",
+		"@tanstack/react-query": "^5.90.17",
+		"@types/prettier": "^3.0.0",
+		"arctic": "^3.7.0",
+		"axios": "^1.10.0",
+		"cfonts": "^3.3.1",
+		"chalk": "^5.2.0",
+		"clipboardy": "^5.0.2",
+		"commander": "^14.0.0",
+		"dotenv": "^17.2.0",
+		"ervy": "^1.0.7",
+		"ink": "^6.6.0",
+		"ink-big-text": "^2.0.0",
+		"ink-chart": "^0.1.1",
+		"ink-confirm-input": "^2.0.0",
+		"ink-scroll-list": "^0.4.1",
+		"ink-scroll-view": "^0.3.5",
+		"ink-select-input": "^6.2.0",
+		"ink-spinner": "^5.0.0",
+		"ink-table": "^3.1.0",
+		"ink-text-input": "^6.0.0",
+		"inquirer": "^12.7.0",
+		"jiti": "^2.4.2",
+		"open": "^10.1.2",
+		"prettier": "^3.6.2",
+		"react": "^19.2.3",
+		"yocto-spinner": "^1.0.0",
+		"zod": "^4.0.0",
+		"conf": "^13.0.1"
+	},
+	"devDependencies": {
+		"@sindresorhus/tsconfig": "^3.0.1",
+		"@types/bun": "^1.2.21",
+		"@types/node": "^24.0.10",
+		"@types/react": "^19.0.0",
+		"@vdemedes/prettier-config": "^2.0.1",
+		"ava": "^5.2.0",
+		"cli-testing-library": "^3.0.1",
+		"eslint-config-xo-react": "^0.27.0",
+		"eslint-plugin-react": "^7.32.2",
+		"eslint-plugin-react-hooks": "^4.6.0",
+		"ink-testing-library": "^3.0.0",
+		"nodemon": "^3.1.11",
+		"react-devtools-core": "^6.1.2",
+		"ts-node": "^10.9.1",
+		"tsup": "^8.5.0",
+		"typescript": "^5.0.3",
+		"xo": "^0.53.1"
+	},
+	"ava": {
+		"extensions": {
+			"ts": "module",
+			"tsx": "module"
+		},
+		"nodeArguments": [
+			"--loader=ts-node/esm"
+		]
+	},
+	"xo": {
+		"extends": "xo-react",
+		"prettier": true,
+		"rules": {
+			"react/prop-types": "off"
+		}
+	},
+	"prettier": "@vdemedes/prettier-config"
 }