atmn 1.1.1 → 1.1.2

package/dist/cli.js

@@ -44910,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");
 }
@@ -44940,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}',`);
@@ -45037,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}',`);
@@ -45083,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);
@@ -45118,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 = [];
@@ -45209,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) {
@@ -45249,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) {
@@ -45307,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("");
     }
   }
@@ -45519,7 +45553,7 @@ var init_pull = __esm(() => {
 });
 
 // src/lib/version.ts
-var APP_VERSION = "1.1.1";
+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 {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "atmn",
-	"version": "1.1.1",
+	"version": "1.1.2",
 	"license": "MIT",
 	"bin": {
 		"atmn": "dist/cli.js"