vovk-cli 0.0.1-draft.46 → 0.0.1-draft.47

package/README.md

@@ -1 +1,29 @@
-Description is coming soon.
+<p align="center"> 
+  <picture>
+    <source width="300" media="(prefers-color-scheme: dark)" srcset="https://vovk.dev/vovk-logo-white.svg">
+    <source width="300" media="(prefers-color-scheme: light)" srcset="https://vovk.dev/vovk-logo.svg">
+    <img width="300" alt="vovk" src="https://vovk.dev/vovk-logo.svg">
+  </picture><br>
+  <strong>REST + RPC = ♥️</strong>
+</p>
+
+<p align="center">
+  Back-end meta-framework for <a href="https://nextjs.org/docs/app">Next.js</a>
+</p>
+
+---
+
+## vovk-cli [![npm version](https://badge.fury.io/js/vovk-cli.svg)](https://www.npmjs.com/package/vovk-cli)
+
+The Vovk.ts CLI that generates schema and client but also provides some useful utilities for the development process.
+
+```sh
+npm install -D vovk-cli
+```
+
+- [vovk dev](https://vovk.dev/cli/vovk-dev) - starts the development script that watches the changes in controllers and regenerates the schema and client.
+- [vovk generate](https://vovk.dev/cli/vovk-generate) - generates the client based on the schema.
+- [vovk init](https://vovk.dev/cli/vovk-init) - initializes the Vovk.ts project.
+- [vovk new](https://vovk.dev/cli/vovk-new) - generates a new controller, service, worker or a custom module.
+
+For more information, please visit the [CLI documentation](https://vovk.dev/cli) or use `npx vovk-cli --help` to get the list of available commands and options.

package/client-templates/compiled/compiled.js.ejs

@@ -20,6 +20,6 @@ exports.<%= key %> = createRPC(
 );
   <% }) %>
   <% workers.forEach((key) => { %>
-exports.<%= key %> = createWPC(null, schema['<%= segment.segmentName %>'].workers.<%= key %>);
+exports.<%= key %> = createWPC(schema['<%= segment.segmentName %>'].workers.<%= key %>);
   <% }) %>
 <% }) %>

package/client-templates/ts/index.ts.ejs

@@ -2,6 +2,11 @@
 import { createRPC, createWPC, type VovkClientFetcher } from 'vovk';
 import fetcher from '<%= fetcherClientImportPath %>';
 import schema from '<%= schemaOutImportPath %>';
+<% segments.forEach((segment, i) => { 
+  const hasWorkers = !!Object.keys(segmentsSchema[segment.segmentName].workers).length;
+%>
+import type { Controllers as Controllers<%= i %><% if(hasWorkers) { %>, Workers as Workers<%= i %> <% } %> } from "<%= segment.segmentImportPath %>";
+<% }) %>
 <% if (validateOnClientImportPath) { %>
 import validateOnClient from '<%= validateOnClientImportPath %>';
 <% } else { %>
@@ -15,8 +20,6 @@ const apiRoot = '<%= apiRoot %>';
     if (!segSchema || !segSchema.emitSchema) return;
     const hasWorkers = !!Object.keys(segmentsSchema[segment.segmentName].workers).length;
 %>
-import type { Controllers as Controllers<%= i %><% if(hasWorkers) { %>, Workers as Workers<%= i %> <% } %>} from "<%= segment.segmentImportPath %>";
-
   <% Object.keys(segSchema.controllers).forEach((key) => { %>
 export const <%= key %> = createRPC<Controllers<%= i %>["<%= key %>"], Options>(
   schema['<%= segment.segmentName %>'].controllers.<%= key %>, 
@@ -27,7 +30,6 @@ export const <%= key %> = createRPC<Controllers<%= i %>["<%= key %>"], Options>(
 
   <% Object.keys(segSchema.workers).forEach((key) => { %>
 export const <%= key %> = createWPC<Workers<%= i %>["<%= key %>"]>(
-  null, 
   schema['<%= segment.segmentName %>'].workers.<%= key %>
 );
   <% }) %>

package/dist/generate/getClientTemplates.mjs

@@ -1,7 +1,6 @@
 import path from 'node:path';
 export default function getClientTemplates({ config, cwd, templateNames = [], }) {
-    const __dirname = path.dirname(new URL(import.meta.url).pathname);
-    const templatesDir = path.join(__dirname, '../..', 'client-templates');
+    const templatesDir = path.join(import.meta.dirname, '../..', 'client-templates');
     const clientOutDirAbsolutePath = path.resolve(cwd, config.clientOutDir);
     const mapper = (dir) => (name) => ({
         templatePath: path.resolve(templatesDir, dir, name),

package/dist/index.mjs

@@ -18,6 +18,7 @@ program.name('vovk').description('Vovk CLI').version(packageJSON.version);
 initProgram(program.command('init'));
 program
     .command('dev')
+    .alias('d')
     .description('Start schema watcher (optional flag --next-dev to start it with Next.js)')
     .option('--next-dev', 'Start schema watcher and Next.js with automatic port allocation')
     .option('--exit', 'Kill the processe when schema and client is generated')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.46",
+  "version": "0.0.1-draft.47",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -36,7 +36,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.52"
+    "vovk": "^3.0.0-draft.53"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.2.3",