vitek-plugin 0.1.2-beta.3 → 0.1.2-beta.5

package/dist/core/types/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/core/types/generate.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAiB/C;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CA+FvF;AA4LD;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,WAAW,EAAE,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAUf;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,GAAE,OAAc,GAAG,MAAM,CAuKxH;AA6KD;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,WAAW,EAAE,EACrB,WAAW,EAAE,MAAM,EACnB,YAAY,GAAE,OAAc,GAC3B,OAAO,CAAC,IAAI,CAAC,CAUf"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/core/types/generate.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAyB/C;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CA+FvF;AA4LD;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,WAAW,EAAE,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAUf;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,GAAE,OAAc,GAAG,MAAM,CAuKxH;AAmKD;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,WAAW,EAAE,EACrB,WAAW,EAAE,MAAM,EACnB,YAAY,GAAE,OAAc,GAC3B,OAAO,CAAC,IAAI,CAAC,CAUf"}

package/dist/core/types/generate.js

@@ -18,6 +18,13 @@ function deduplicateRoutesByKey(routes) {
         return true;
     });
 }
+function partToIdentifier(part) {
+    const clean = part.replace(/^[:*]/, '');
+    return clean
+        .split('-')
+        .map(word => capitalize(word))
+        .join('');
+}
 /**
  * Generates the content of the generated types file
  */
@@ -480,13 +487,8 @@ function generateFunctionNameBase(route) {
     const parts = route.pattern
         .split('/')
         .filter(Boolean)
-        .filter(part => part !== 'index') // Remove "index" from function name
-        .map(part => {
-        // Remove : or * from the beginning
-        const clean = part.replace(/^[:*]/, '');
-        // Capitalize
-        return capitalize(clean);
-    });
+        .filter(part => part !== 'index')
+        .map(part => partToIdentifier(part));
     const pathName = parts.join('');
     return `${method}${pathName}`;
 }
@@ -500,12 +502,7 @@ function generateUniqueFunctionName(route, baseName, conflictingRoutes, existing
     // Remove "index" but keep other parts (including params for context)
     const allParts = patternParts
         .filter(part => part !== 'index')
-        .map(part => {
-        // For parameters, include the name as context to differentiate
-        // Example: ":id" becomes "Id", "*ids" becomes "Ids"
-        const clean = part.replace(/^[:*]/, '');
-        return capitalize(clean);
-    });
+        .map(part => partToIdentifier(part));
     // Use all parts of the path to ensure uniqueness from the start
     if (allParts.length > 0) {
         const fullPathName = allParts.join('');

package/dist/core/types/generate.test.js

@@ -211,6 +211,20 @@ describe('generateServicesContent', () => {
             expect(count).toBe(1);
         });
     });
+    it('generates valid identifiers for paths with hyphens (e.g. inter-squad)', () => {
+        const routes = [
+            route('inter-squad/requests', 'post', []),
+            route('inter-squad/requests/:id/status', 'put', ['id']),
+        ];
+        const content = generateServicesContent(routes, API_BASE, true);
+        const names = getExportedFunctionNames(content);
+        expect(names).toHaveLength(2);
+        expect(names).toContain('postInterSquadRequests');
+        expect(names).toContain('putInterSquadRequestsIdStatus');
+        names.forEach((name) => {
+            expect(name).toMatch(/^[a-zA-Z_$][a-zA-Z0-9_$]*$/);
+        });
+    });
     it('regression: flows/id/versions GET and POST each appear once', () => {
         const routes = [
             route('flows/:id/versions', 'get', ['id']),

package/dist/plugin.js

@@ -57,12 +57,12 @@ export function vitek(options = {}) {
         },
         transform(code, id) {
             const idPath = id.startsWith('file:') ? fileURLToPath(id) : id;
-            const fullApiDir = path.resolve(root, apiDirOption);
+            const srcDir = path.resolve(root, 'src');
             const virtualCandidate = idPath.startsWith('/') ? path.join(root, idPath.replace(/^\//, '')) : null;
             const normalizedId = virtualCandidate != null && fs.existsSync(virtualCandidate)
                 ? virtualCandidate
                 : path.resolve(idPath);
-            if (!normalizedId.startsWith(fullApiDir))
+            if (!normalizedId.startsWith(srcDir))
                 return null;
             const dir = path.dirname(normalizedId);
             const rootSlash = path.resolve(root) + path.sep;

package/dist/plugin.test.js

@@ -87,13 +87,32 @@ describe('vitek plugin resolveId and transform', () => {
         });
     });
     describe('transform', () => {
-        const healthGetId = path.join(process.cwd(), 'placeholder'); // will override per platform
-        it('returns null when id is not under apiDir', () => {
+        it('returns null when id is not under src', () => {
             const code = "import x from '../lib/greeting';";
-            const idOutside = pathToFileURL(path.join(rootDir, 'src', 'main.ts')).href;
+            fs.mkdirSync(path.join(rootDir, 'other'), { recursive: true });
+            const idOutside = pathToFileURL(path.join(rootDir, 'other', 'main.ts')).href;
             const result = callTransform(plugin, code, idOutside);
             expect(result).toBeNull();
         });
+        it('rewrites relative import when id is under src/lib (not only api)', () => {
+            fs.writeFileSync(path.join(rootDir, 'src', 'lib', 'executor.ts'), "import { getGreeting } from './greeting';\nexport function run() { return getGreeting(); }\n", 'utf-8');
+            const code = "import { getGreeting } from './greeting';\nexport function run() { return getGreeting(); }\n";
+            const id = pathToFileURL(path.join(rootDir, 'src', 'lib', 'executor.ts')).href;
+            const result = callTransform(plugin, code, id);
+            expect(result).not.toBeNull();
+            expect(result.code).toContain("/src/lib/greeting");
+            expect(result.code).not.toContain("from './greeting'");
+        });
+        it('rewrites relative import in src/lib file that imports from subpath', () => {
+            fs.mkdirSync(path.join(rootDir, 'src', 'lib', 'nested'), { recursive: true });
+            fs.writeFileSync(path.join(rootDir, 'src', 'lib', 'nested', 'helper.ts'), "export function getMessage() { return 'ok'; }\n", 'utf-8');
+            fs.writeFileSync(path.join(rootDir, 'src', 'lib', 'nested', 'index.ts'), "export { getMessage } from './helper';\n", 'utf-8');
+            const code = "export { getMessage } from './helper';\n";
+            const id = pathToFileURL(path.join(rootDir, 'src', 'lib', 'nested', 'index.ts')).href;
+            const result = callTransform(plugin, code, id);
+            expect(result).not.toBeNull();
+            expect(result.code).toContain("/src/lib/nested/helper");
+        });
         it('rewrites relative import to root-relative path when id is under apiDir', () => {
             const code = "import { getGreeting } from '../lib/greeting';\nexport default function handler() {}";
             const id = pathToFileURL(path.join(apiDir, 'health.get.ts')).href;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitek-plugin",
-  "version": "0.1.2-beta.3",
+  "version": "0.1.2-beta.5",
   "description": "Vite plugin for file-based HTTP API generation",
   "type": "module",
   "main": "./dist/index.js",