vovk-cli 0.0.1-draft.388 → 0.0.1-draft.390

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/client-templates/cjs/index.cjs.ejs +3 -2
  2. package/client-templates/mjs/index.mjs.ejs +3 -2
  3. package/client-templates/ts/index.ts.ejs +3 -2
  4. package/package.json +1 -1
package/client-templates/cjs/index.cjs.ejs CHANGED
@@ -8,10 +8,11 @@ exports['<%= reExportWhat.split(/\s+as\s+/)[1] ?? reExportWhat %>'] = require('<
8
8
  <% })
9
9
  }) %>
10
10
  <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment) => { %>
11
- <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
11
+ <% Object.keys(segment.controllers).forEach((rpcModuleName) => {
12
+ const apiRoot = t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot; %>
12
13
  exports.<%= rpcModuleName %> = createRPC(
13
14
  schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', require('<%= t.segmentImports[segment.segmentName].fetcher %>').fetcher,
14
- { validateOnClient: <%- t.segmentImports[segment.segmentName].validateOnClient ? `require('${t.segmentImports[segment.segmentName].validateOnClient}').validateOnClient` : 'undefined' %>, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot ?? ''}'` %> }
15
+ { validateOnClient: <%- t.segmentImports[segment.segmentName].validateOnClient ? `require('${t.segmentImports[segment.segmentName].validateOnClient}').validateOnClient` : 'undefined' %>, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : apiRoot ? `apiRoot: '${apiRoot}'` : '' %> }
15
16
  );
16
17
  <% })
17
18
  }) %>
package/client-templates/mjs/index.mjs.ejs CHANGED
@@ -6,10 +6,11 @@ import { openapi } from './openapi.cjs';
6
6
  export { <%= reExportWhat %> } from '<%= reExportFrom %>';
7
7
  <% }) %>
8
8
  <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
9
- <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
9
+ <% Object.keys(segment.controllers).forEach((rpcModuleName) => {
10
+ const apiRoot = t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot; %>
10
11
  export const <%= rpcModuleName %> = createRPC(
11
12
  schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', import('<%- t.segmentImports[segment.segmentName].module.fetcher %>'),
12
- { validateOnClient: <%- t.segmentImports[segment.segmentName].module.validateOnClient ? `import('${t.segmentImports[segment.segmentName].validateOnClient}')` : 'undefined' %>, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot ?? ''}'` %> }
13
+ { validateOnClient: <%- t.segmentImports[segment.segmentName].module.validateOnClient ? `import('${t.segmentImports[segment.segmentName].validateOnClient}')` : 'undefined' %>, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : apiRoot ? `apiRoot: '${apiRoot}'` : '' %> }
13
14
  );
14
15
  <%
15
16
  });
package/client-templates/ts/index.ts.ejs CHANGED
@@ -19,10 +19,11 @@ import type { Controllers as MixinControllers, Mixins } from "./mixins.d.ts";
19
19
  export { <%= reExportWhat %> } from '<%= reExportFrom %>';
20
20
  <% }) %>
21
21
  <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => {
22
- Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
22
+ Object.keys(segment.controllers).forEach((rpcModuleName) => {
23
+ const apiRoot = t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot; %>
23
24
  export const <%= rpcModuleName %> = createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], typeof import('<%- t.segmentImports[segment.segmentName].module.fetcher %>').fetcher extends VovkFetcher<infer U> ? U : never>(
24
25
  schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', import('<%- t.segmentImports[segment.segmentName].module.fetcher %>'),
25
- { validateOnClient: <%- t.segmentImports[segment.segmentName].module.validateOnClient ? `import('${t.segmentImports[segment.segmentName].validateOnClient}')` : 'undefined' %>, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot ?? ''}'` %> }
26
+ { validateOnClient: <%- t.segmentImports[segment.segmentName].module.validateOnClient ? `import('${t.segmentImports[segment.segmentName].validateOnClient}')` : 'undefined' %>, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : apiRoot ? `apiRoot: '${apiRoot}'` : '' %> }
26
27
  );
27
28
  <% })
28
29
  }) %>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vovk-cli",
3
- "version": "0.0.1-draft.388",
3
+ "version": "0.0.1-draft.390",
4
4
  "bin": {
5
5
  "vovk": "./dist/index.mjs"
6
6
  },