vovk-cli 0.0.1-draft.106 → 0.0.1-draft.108

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023-present Andrii Gubanov
+Copyright (c) 2023-present Andrey Gubanov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/client-templates/main/main.d.cts.ejs

@@ -4,7 +4,7 @@ import type { VovkClientFetcher } from 'vovk';
 import type fetcher from '<%= t.imports.fetcher %>';
 import type createRPC from '<%= t.imports.createRPC %>';
 <% Object.values(t.fullSchema.segments).forEach((segment, i) => { if(Object.keys(segment.controllers).length) { %>
-import type { Controllers as Controllers<%= i %> } from "<%= segment.segmentImportPath %>";
+import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segment.segmentName].segmentImportPath %>";
 <% }}) %>
 type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
 <% Object.values(t.fullSchema.segments).forEach((segment, i) => {

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

@@ -4,7 +4,7 @@ import type { VovkClientFetcher } from 'vovk';
 import type fetcher from '<%= t.imports.module.fetcher %>';
 import type createRPC from '<%= t.imports.module.createRPC %>';
 <% Object.values(t.fullSchema.segments).forEach((segment, i) => { if(Object.keys(segment.controllers).length) { %>
-import type { Controllers as Controllers<%= i %> } from "<%= segment.segmentImportPath %>";
+import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segment.segmentName].segmentImportPath %>";
 <% }}) %>
 type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
 <% Object.values(t.fullSchema.segments).forEach((segment, i) => { 

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

@@ -4,7 +4,7 @@ import fetcher from '<%= t.imports.fetcher %>';
 import createRPC from '<%= t.imports.createRPC %>';
 import fullSchema from '<%= t.imports.fullSchema %>';
 <% Object.values(t.fullSchema.segments).forEach((segment, i) => { if(Object.keys(segment.controllers).length) { %>
-import type { Controllers as Controllers<%= i %> } from "<%= segment.segmentImportPath %>";
+import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segment.segmentName].segmentImportPath %>";
 <% }}) %>
 <% if (t.imports.validateOnClient) { %>
 import validateOnClient from '<%= t.imports.validateOnClient %>';

package/dist/dev/writeConfigJson.mjs

@@ -7,9 +7,9 @@ export default async function writeConfigJson(schemaOutAbsolutePath, projectInfo
     const existingStr = await fs.readFile(configJsonPath, 'utf-8').catch(() => null);
     if (existingStr !== configStr) {
         await fs.writeFile(configJsonPath, configStr);
-        projectInfo?.log.info(`config.json written to ${configJsonPath}`);
+        projectInfo?.log.info(`Config JSON written to ${configJsonPath}`);
     }
     else {
-        projectInfo?.log.debug(`config.json is up to date at ${configJsonPath}`);
+        projectInfo?.log.debug(`Config JSON is up to date at ${configJsonPath}`);
     }
 }

package/dist/generate/index.mjs

@@ -28,6 +28,7 @@ export default async function generate({ projectInfo, segments, forceNothingWrit
         apiRoot,
         imports: clientImports,
         fullSchema,
+        segmentMeta: Object.fromEntries(segments.map(({ segmentName, ...s }) => [segmentName, s])),
     };
     // Process each template in parallel
     const processedTemplates = noClient

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.106",
+  "version": "0.0.1-draft.108",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -29,14 +29,14 @@
     "cli",
     "vovk"
   ],
-  "author": "Andrii Gubanov",
+  "author": "Andrey Gubanov",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/finom/vovk/issues"
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.90"
+    "vovk": "^3.0.0-draft.91"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.3.1",