vovk-cli 0.0.1-draft.293 → 0.0.1-draft.296

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 (10) hide show
  1. package/client-templates/cjs/index.cjs.ejs +5 -2
  2. package/client-templates/cjs/index.d.cts.ejs +5 -2
  3. package/client-templates/mjs/index.d.mts.ejs +5 -2
  4. package/client-templates/mjs/index.mjs.ejs +5 -2
  5. package/client-templates/ts/index.ts.ejs +5 -2
  6. package/dist/generate/generate.mjs +5 -5
  7. package/dist/generate/writeOneClientFile.mjs +4 -1
  8. package/dist/getProjectInfo/getConfig/index.d.mts +1 -0
  9. package/dist/init/index.mjs +1 -1
  10. package/package.json +3 -3
package/client-templates/cjs/index.cjs.ejs CHANGED
@@ -3,8 +3,11 @@ const { fetcher } = require('<%= t.imports.fetcher %>');
3
3
  const { createRPC } = require('<%= t.imports.createRPC %>');
4
4
  const { schema } = require('./schema.cjs');
5
5
  const { validateOnClient = null } = <%- t.imports.validateOnClient ? `require('${t.imports.validateOnClient}')` : '{}'%>;
6
- <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment) => {
7
- Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
6
+ <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment) => { %>
7
+ <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
8
+ exports[<%= reExportWhat.split(/\s+as\s+/)[1] ?? reExportWhat %>] = require('<%= reExportFrom %>')[<%= reExportWhat.split(/\s+as\s+/)[0] %>];
9
+ <% }) %>
10
+ <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
8
11
  exports.<%= rpcModuleName %> = createRPC(
9
12
  schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', fetcher,
10
13
  { validateOnClient, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot}'` %> }
package/client-templates/cjs/index.d.cts.ejs CHANGED
@@ -11,8 +11,11 @@ import type { Controllers as MixinControllers, Mixins } from "./mixins";
11
11
  <% } %>
12
12
 
13
13
  type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
14
- <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => {
15
- Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
14
+ <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
15
+ <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
16
+ export { <%= reExportWhat %> } from '<%= reExportFrom %>';
17
+ <% }) %>
18
+ <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
16
19
  export const <%= rpcModuleName %>: ReturnType<typeof createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], Options>>;
17
20
  <% })
18
21
  }) %>
package/client-templates/mjs/index.d.mts.ejs CHANGED
@@ -11,8 +11,11 @@ import type { Controllers as MixinControllers, Mixins } from "./mixins";
11
11
  <% } %>
12
12
 
13
13
  type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
14
- <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => {
15
- Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
14
+ <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
15
+ <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
16
+ export { <%= reExportWhat %> } from '<%= reExportFrom %>';
17
+ <% }) %>
18
+ <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
16
19
  export const <%= rpcModuleName %>: ReturnType<typeof createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], Options>>;
17
20
  <% })
18
21
  }) %>
package/client-templates/mjs/index.mjs.ejs CHANGED
@@ -7,8 +7,11 @@ import { validateOnClient } from '<%= t.imports.module.validateOnClient %>';
7
7
  <% } else { %>
8
8
  const validateOnClient = undefined;
9
9
  <% }
10
- Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => {
11
- Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
10
+ Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
11
+ <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
12
+ export { <%= reExportWhat %> } from '<%= reExportFrom %>';
13
+ <% }) %>
14
+ <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
12
15
  export const <%= rpcModuleName %> = createRPC(
13
16
  schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', fetcher,
14
17
  { validateOnClient, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot}'` %> }
package/client-templates/ts/index.ts.ejs CHANGED
@@ -16,8 +16,11 @@ import { validateOnClient } from '<%= t.imports.validateOnClient %>';
16
16
  const validateOnClient = undefined;
17
17
  <% } %>
18
18
  type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
19
- <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => {
20
- Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
19
+ <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
20
+ <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
21
+ export { <%= reExportWhat %> } from '<%= reExportFrom %>';
22
+ <% }) %>
23
+ <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
21
24
  export const <%= rpcModuleName %> = createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], Options>(
22
25
  schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', fetcher,
23
26
  { validateOnClient, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot}'` %> }
package/dist/generate/generate.mjs CHANGED
@@ -211,12 +211,12 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
211
211
  const matterResult = templateFilePath.endsWith('.ejs')
212
212
  ? matter(templateContent)
213
213
  : { data: { imports: [] }, content: templateContent };
214
+ const clientImports = await getTemplateClientImports({
215
+ config,
216
+ fullSchema,
217
+ outCwdRelativeDir,
218
+ });
214
219
  const results = await Promise.all(segmentNames.map(async (segmentName) => {
215
- const clientImports = await getTemplateClientImports({
216
- config,
217
- fullSchema,
218
- outCwdRelativeDir,
219
- });
220
220
  const packageJson = await mergePackages({
221
221
  log,
222
222
  rootPackageJson,
package/dist/generate/writeOneClientFile.mjs CHANGED
@@ -62,7 +62,7 @@ export default async function writeOneClientFile({ cwd, projectInfo, clientTempl
62
62
  const segmentImportPath = routeFilePath
63
63
  ? path.relative(path.resolve(cwd, outCwdRelativeDir, typeof segmentName === 'string' ? segmentName || ROOT_SEGMENT_FILE_NAME : '.'), path.resolve(cwd, routeFilePath))
64
64
  : null;
65
- const { origin: segmentConfigOrigin, rootEntry: segmentConfigRootEntry, segmentNameOverride, } = {
65
+ const { origin: segmentConfigOrigin, rootEntry: segmentConfigRootEntry, segmentNameOverride, reExports, } = {
66
66
  ...(config.segmentConfig ? config.segmentConfig[sName] : {}),
67
67
  ...(templateDef.segmentConfig ? templateDef.segmentConfig[sName] : {}),
68
68
  };
@@ -76,6 +76,9 @@ export default async function writeOneClientFile({ cwd, projectInfo, clientTempl
76
76
  routeFilePath,
77
77
  segmentImportPath,
78
78
  segmentNameOverride,
79
+ reExports: _.mapValues(reExports ?? {}, (p) => p.startsWith('.')
80
+ ? path.relative(path.join(outCwdRelativeDir, segmentName || ROOT_SEGMENT_FILE_NAME), cwd)
81
+ : p),
79
82
  },
80
83
  ];
81
84
  })),
package/dist/getProjectInfo/getConfig/index.d.mts CHANGED
@@ -86,6 +86,7 @@ export default function getConfig({ configPath, cwd }: {
86
86
  origin?: string;
87
87
  rootEntry?: string;
88
88
  segmentNameOverride?: string;
89
+ reExports?: Record<string, string>;
89
90
  };
90
91
  };
91
92
  openApiMixins?: {
package/dist/init/index.mjs CHANGED
@@ -231,7 +231,7 @@ export class Init {
231
231
  keys.push('emitDecoratorMetadata');
232
232
  }
233
233
  updateTsConfig = await confirm({
234
- message: `Do you want to add ${keys.map((k) => `"${k}"`).join(' and ')} to tsconfig.json?`,
234
+ message: `Do you want to add ${keys.map((k) => `"${k}"`).join(' and ')} to tsconfig.json? (recommended)`,
235
235
  });
236
236
  }
237
237
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vovk-cli",
3
- "version": "0.0.1-draft.293",
3
+ "version": "0.0.1-draft.296",
4
4
  "bin": {
5
5
  "vovk": "./dist/index.mjs"
6
6
  },
@@ -35,10 +35,10 @@
35
35
  },
36
36
  "homepage": "https://vovk.dev",
37
37
  "peerDependencies": {
38
- "vovk": "^3.0.0-draft.321"
38
+ "vovk": "^3.0.0-draft.323"
39
39
  },
40
40
  "optionalDependencies": {
41
- "vovk-python": "^0.0.1-draft.49"
41
+ "vovk-python": "^0.0.1-draft.53"
42
42
  },
43
43
  "dependencies": {
44
44
  "@iarna/toml": "^2.2.5",