ebely 0.0.4 → 0.0.6

package/bin/ebely.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { cp, mkdir, readdir, readFile, writeFile } from 'node:fs/promises'
 import { existsSync } from 'node:fs'
-import { basename, dirname, join, resolve, sep } from 'node:path'
+import { basename, dirname, join, relative, resolve, sep } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
@@ -97,9 +97,13 @@ async function createProject({ dir }) {
   }
 
   // Копируем шаблон целиком, кроме node_modules.
+  // Важно: фильтруем по пути ОТНОСИТЕЛЬНО шаблона, а не по абсолютному —
+  // иначе при установке через npx/npm весь путь пакета лежит внутри
+  // node_modules, фильтр отбрасывает корень шаблона и не копируется ничего.
   await cp(templateSrc, target, {
     recursive: true,
-    filter: (src) => !src.split(sep).includes('node_modules'),
+    filter: (src) =>
+      !relative(templateSrc, src).split(sep).includes('node_modules'),
   })
 
   // package.json: имя по папке + реальная версия ebely вместо workspace:*.

package/dist/index.js

@@ -314,8 +314,38 @@ function collectOperations(args) {
       });
     }
   }
+  dedupeNames({ operations });
   return operations;
 }
+function prefixMethod(args) {
+  const { method, name } = args;
+  return method + name.charAt(0).toUpperCase() + name.slice(1);
+}
+function dedupeNames(args) {
+  const { operations } = args;
+  const counts = /* @__PURE__ */ new Map();
+  for (const op of operations) {
+    const byName = counts.get(op.group) ?? /* @__PURE__ */ new Map();
+    byName.set(op.name, (byName.get(op.name) ?? 0) + 1);
+    counts.set(op.group, byName);
+  }
+  const taken = /* @__PURE__ */ new Map();
+  const claim = (group, name) => {
+    const used = taken.get(group) ?? /* @__PURE__ */ new Set();
+    let candidate = name;
+    let i = 2;
+    while (used.has(candidate))
+      candidate = `${name}${i++}`;
+    used.add(candidate);
+    taken.set(group, used);
+    return candidate;
+  };
+  for (const op of operations) {
+    const collides = (counts.get(op.group)?.get(op.name) ?? 0) > 1;
+    const base = collides ? prefixMethod({ method: op.method, name: op.name }) : op.name;
+    op.name = claim(op.group, base);
+  }
+}
 
 // src/generator/render.ts
 function buildInputType(op) {

package/dist/index.mjs

@@ -284,8 +284,38 @@ function collectOperations(args) {
       });
     }
   }
+  dedupeNames({ operations });
   return operations;
 }
+function prefixMethod(args) {
+  const { method, name } = args;
+  return method + name.charAt(0).toUpperCase() + name.slice(1);
+}
+function dedupeNames(args) {
+  const { operations } = args;
+  const counts = /* @__PURE__ */ new Map();
+  for (const op of operations) {
+    const byName = counts.get(op.group) ?? /* @__PURE__ */ new Map();
+    byName.set(op.name, (byName.get(op.name) ?? 0) + 1);
+    counts.set(op.group, byName);
+  }
+  const taken = /* @__PURE__ */ new Map();
+  const claim = (group, name) => {
+    const used = taken.get(group) ?? /* @__PURE__ */ new Set();
+    let candidate = name;
+    let i = 2;
+    while (used.has(candidate))
+      candidate = `${name}${i++}`;
+    used.add(candidate);
+    taken.set(group, used);
+    return candidate;
+  };
+  for (const op of operations) {
+    const collides = (counts.get(op.group)?.get(op.name) ?? 0) > 1;
+    const base = collides ? prefixMethod({ method: op.method, name: op.name }) : op.name;
+    op.name = claim(op.group, base);
+  }
+}
 
 // src/generator/render.ts
 function buildInputType(op) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ebely",
   "license": "MIT",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -35,6 +35,6 @@
     "build": "tsup index.ts --format cjs,esm --dts",
     "release": "pnpm run build && changeset publish",
     "lint": "tsc",
-    "test": "tsx --test src/response.test.ts src/hooks.test.ts src/generator/render.test.ts"
+    "test": "tsx --test src/response.test.ts src/hooks.test.ts src/generator/render.test.ts src/generator/operations.test.ts"
   }
 }