vovk-cli 0.0.1-draft.52 → 0.0.1-draft.54

package/client-templates/module/module.d.ts.ejs

@@ -0,0 +1,15 @@
+
+<%- '// auto-generated\n/* eslint-disable */' %>
+import type { VovkClientFetcher } from 'vovk';
+import type fetcher from '<%= fetcherClientImportPath %>';
+import type createRPC from '<%= createRPCImportPath %>';
+<% segments.forEach((segment, i) => { if(Object.keys(segmentsSchema[segment.segmentName].controllers).length) { %>
+  import type { Controllers as Controllers<%= i %> } from "<%= segment.segmentImportPath %>";
+  <% }}) %>
+type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
+
+<% segments.forEach((segment, i) => { %>
+  <% Object.keys(segmentsSchema[segment.segmentName].controllers).forEach((key) => { %>
+export const <%= key %>: ReturnType<typeof createRPC<Controllers<%= i %>["<%= key %>"], Options>>;
+  <% }) %>
+<% }) %>

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

@@ -0,0 +1,20 @@
+<%- '// auto-generated\n/* eslint-disable */' %>
+import fetcher from '<%= fetcherClientImportPath %>';
+import createRPC from '<%= createRPCImportPath %>';
+import schema from '<%= schemaOutImportPath %>';
+<% if (validateOnClientImportPath) { %>
+import validateOnClient from '<%= validateOnClientImportPath %>';
+<% } else { %>
+const validateOnClient = undefined;
+<% } %>
+const apiRoot = '<%= apiRoot %>';
+
+<% segments.forEach((segment, i) => { %>
+  <% Object.keys(segmentsSchema[segment.segmentName].controllers).forEach((key) => { %>
+export const <%= key %> = createRPC(
+  schema['<%= segment.segmentName %>'].controllers.<%= key %>, 
+  '<%= segment.segmentName %>', 
+  { fetcher, validateOnClient, defaultOptions: { apiRoot } }
+);
+  <% }) %>
+<% }) %>

package/dist/generate/getClientTemplates.mjs

@@ -8,7 +8,8 @@ export default function getClientTemplates({ config, cwd, templateNames = [], })
     });
     const builtInTemplatesMap = {
         ts: ['index.ts.ejs'].map(mapper('ts')),
-        compiled: ['compiled.js.ejs', 'compiled.d.ts.ejs'].map(mapper('compiled')),
+        main: ['main.cjs.ejs', 'main.d.cts.ejs'].map(mapper('main')),
+        module: ['module.mjs.ejs', 'module.d.mts.ejs'].map(mapper('module')),
         python: ['__init__.py'].map(mapper('python')),
     };
     const templateFiles = (templateNames ?? config.experimental_clientGenerateTemplateNames).reduce((acc, template) => {

package/dist/getProjectInfo/getConfig.mjs

@@ -18,7 +18,7 @@ export default async function getConfig({ clientOutDir, cwd }) {
         logLevel: env.VOVK_LOG_LEVEL ?? conf.logLevel ?? 'info',
         prettifyClient: (env.VOVK_PRETTIFY_CLIENT ? !!env.VOVK_PRETTIFY_CLIENT : null) ?? conf.prettifyClient ?? false,
         devHttps: (env.VOVK_DEV_HTTPS ? !!env.VOVK_DEV_HTTPS : null) ?? conf.devHttps ?? false,
-        experimental_clientGenerateTemplateNames: conf.experimental_clientGenerateTemplateNames ?? ['ts', 'compiled'],
+        experimental_clientGenerateTemplateNames: conf.experimental_clientGenerateTemplateNames ?? ['ts', 'module', 'main'],
         templates: {
             service: 'vovk-cli/templates/service.ejs',
             controller: 'vovk-cli/templates/controller.ejs',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.52",
+  "version": "0.0.1-draft.54",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -16,7 +16,7 @@
     "test-only": "npm run pre-test && node --test --test-only test_dist/test/**/*.mjs",
     "test": "npm run pre-test && node --test --test-concurrency=1 test_dist/test/**/*.mjs",
     "tsc": "tsc --noEmit",
-    "ncu": "npm-check-updates -u",
+    "ncu": "npm-check-updates -u -x commander",
     "npm-publish": "npm publish"
   },
   "repository": {
@@ -36,7 +36,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.57"
+    "vovk": "^3.0.0-draft.58"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.3.1",