vovk-cli 0.0.1-draft.33 → 0.0.1-draft.35

package/dist/getProjectInfo/getUserConfig.mjs

@@ -1,3 +1,4 @@
+import { pathToFileURL } from 'node:url';
 import getConfigAbsolutePaths from './getConfigAbsolutePaths.mjs';
 import importUncachedModule from './importUncachedModule.mjs';
 async function getUserConfig({ cwd, }) {
@@ -14,7 +15,8 @@ async function getUserConfig({ cwd, }) {
     catch {
         try {
             const cacheBuster = Date.now();
-            ({ default: userConfig } = (await import(`${configPath}?cache=${cacheBuster}`)));
+            const configPathUrl = pathToFileURL(configPath).href;
+            ({ default: userConfig } = (await import(`${configPathUrl}?cache=${cacheBuster}`)));
         }
         catch (e) {
             return { userConfig: null, configAbsolutePaths, error: e };

package/dist/getProjectInfo/index.mjs

@@ -8,7 +8,7 @@ export default async function getProjectInfo({ port: givenPort, clientOutDir, cw
     const { config, srcRoot, configAbsolutePaths, userConfig, error } = await getConfig({ clientOutDir, cwd });
     const apiEntryPoint = `${config.origin ?? ''}/${config.rootEntry}`;
     const apiDir = path.join(srcRoot, 'app', config.rootEntry);
-    const schemaOutImportPath = path.relative(config.clientOutDir, config.schemaOutDir);
+    const schemaOutImportPath = path.relative(config.clientOutDir, config.schemaOutDir).replace(/\\/g, '/'); // windows fix
     const fetcherClientImportPath = config.fetcher.startsWith('.')
         ? path.relative(config.clientOutDir, config.fetcher)
         : config.fetcher;

package/dist/index.mjs

@@ -11,6 +11,7 @@ import { VovkDev } from './dev/index.mjs';
 import newComponents from './new/index.mjs';
 import 'dotenv/config';
 import initProgram from './initProgram.mjs';
+import { pathToFileURL } from 'node:url';
 const program = new Command();
 const packageJSON = JSON.parse(readFileSync(path.join(import.meta.dirname, '../package.json'), 'utf-8'));
 program.name('vovk').description('Vovk CLI').version(packageJSON.version);
@@ -69,7 +70,8 @@ program
     const { cwd, config, apiDir } = projectInfo;
     const segments = await locateSegments(apiDir);
     const schemaOutAbsolutePath = path.join(cwd, config.schemaOutDir);
-    const schema = (await import(path.join(schemaOutAbsolutePath, 'index.js')));
+    const schemaImportUrl = pathToFileURL(path.join(schemaOutAbsolutePath, 'index.js')).href;
+    const schema = await import(schemaImportUrl);
     await generateClient(projectInfo, segments, schema.default);
 });
 program

package/dist/locateSegments.mjs

@@ -16,7 +16,7 @@ export default async function locateSegments(dir, rootDir = dir) {
                 const routeFilePath = path.join(filePath, 'route.ts');
                 if (await getFileSystemEntryType(routeFilePath)) {
                     // Calculate the basePath relative to the root directory
-                    const segmentName = path.relative(rootDir, dir);
+                    const segmentName = path.relative(rootDir, dir).replace(/\\/g, '/'); // windows fix
                     results.push({ routeFilePath, segmentName });
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.33",
+  "version": "0.0.1-draft.35",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -36,7 +36,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.26"
+    "vovk": "^3.0.0-draft.31"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.1.0",

package/templates/controller.ejs

@@ -3,6 +3,7 @@
 <% var controllerName = modulePascalName + 'Controller'; %>
 <% var compiledName = modulePascalName + 'RPC'; %>
 <% var serviceName = modulePascalName + 'Service'; %>
+<% var prefix = pluralize(_.kebabCase(moduleName).toLowerCase()); %>
 ---
 dir: <%= getModuleDirName(segmentName, moduleName) %>
 fileName: <%= controllerName + '.ts' %>
@@ -15,7 +16,7 @@ import { prefix, get, put, post, del, type VovkRequest } from 'vovk';
 import <%= serviceName %> from './<%= serviceName %>';
 <% } %>
 
-@prefix('<%= _.kebabCase(moduleName).toLowerCase() %>')
+@prefix('<%= prefix %>')
 export default class <%= controllerName %> {
     @get()
     static get<%= modulePascalNamePlural %> = async (req: VovkRequest<null, { search: string }>) => {