vovk-cli 0.0.1-draft.181 → 0.0.1-draft.183

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

@@ -2,7 +2,7 @@
 import type { VovkClientFetcher } from 'vovk';
 import { fetcher } from '<%= t.imports.fetcher %>';
 import { createRPC } from '<%= t.imports.createRPC %>';
-import { schema } from './schema.ts';
+import { schema } from './schema<%= t.nodeNextResolutionTsExt %>';
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
 import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segment.segmentName].segmentImportPath %>";
 <% }) %>

package/dist/generate/index.mjs

@@ -10,6 +10,7 @@ import getTemplateClientImports from './getTemplateClientImports.mjs';
 import mergePackages from './mergePackages.mjs';
 import writeOneClientFile from './writeOneClientFile.mjs';
 import { ROOT_SEGMENT_SCHEMA_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
+import { getTsconfig } from 'get-tsconfig';
 const getIncludedSegmentNames = (config, fullSchema, configKey, cliGenerateOptions) => {
     const segments = Object.values(fullSchema.segments);
     const includeSegments = cliGenerateOptions?.[configKey === 'segmentedClient' ? 'segmentedIncludeSegments' : 'composedIncludeSegments'] ??
@@ -52,9 +53,12 @@ function logClientGenerationResults({ results, log, isEnsuringClient = false, fo
 export default async function generate({ isEnsuringClient = false, projectInfo, forceNothingWrittenLog, fullSchema, locatedSegments, cliGenerateOptions, }) {
     fullSchema = {
         ...fullSchema,
+        // sort segments by name to avoid unnecessary rendering
         segments: Object.fromEntries(Object.entries(fullSchema.segments).sort(([a], [b]) => a.localeCompare(b))),
     };
     const { config, cwd, log } = projectInfo;
+    const tsConfigResult = await getTsconfig(cwd);
+    const isNodeNextResolution = ['node16', 'nodenext'].includes(tsConfigResult?.config?.compilerOptions?.moduleResolution?.toLowerCase() ?? '');
     const isComposedEnabled = cliGenerateOptions?.composedOnly ||
         !!cliGenerateOptions?.composedFrom ||
         !!cliGenerateOptions?.composedOut ||
@@ -105,6 +109,7 @@ export default async function generate({ isEnsuringClient = false, projectInfo,
                 origin: config.origin ?? templateDef?.origin ?? null,
                 templateDef,
                 locatedSegments,
+                isNodeNextResolution,
             });
             const outAbsoluteDir = path.join(cwd, outCwdRelativeDir);
             return {
@@ -174,6 +179,7 @@ export default async function generate({ isEnsuringClient = false, projectInfo,
                     origin: config.origin ?? templateDef?.origin ?? null,
                     templateDef,
                     locatedSegments,
+                    isNodeNextResolution,
                 });
                 return {
                     written,

package/dist/generate/writeOneClientFile.d.mts

@@ -4,7 +4,7 @@ import type { ClientTemplateFile } from './getClientTemplateFiles.mjs';
 import type { ClientImports } from './getTemplateClientImports.mjs';
 import type { PackageJson } from 'type-fest';
 import type { Segment } from '../locateSegments.mjs';
-export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, isEnsuringClient, outCwdRelativeDir, origin, templateDef, locatedSegments, }: {
+export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, isEnsuringClient, outCwdRelativeDir, origin, templateDef, locatedSegments, isNodeNextResolution, }: {
     cwd: string;
     projectInfo: ProjectInfo;
     clientTemplateFile: ClientTemplateFile;
@@ -25,6 +25,7 @@ export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFil
     origin: string | null;
     templateDef: VovkStrictConfig['clientTemplateDefs'][string];
     locatedSegments: Segment[];
+    isNodeNextResolution: boolean;
 }): Promise<{
     written: boolean;
 }>;

package/dist/generate/writeOneClientFile.mjs

@@ -5,7 +5,7 @@ import _ from 'lodash';
 import { VovkSchemaIdEnum } from 'vovk';
 import prettify from '../utils/prettify.mjs';
 import { ROOT_SEGMENT_SCHEMA_NAME, SEGMENTS_SCHEMA_DIR_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
-export default async function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, isEnsuringClient, outCwdRelativeDir, origin, templateDef, locatedSegments, }) {
+export default async function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, isEnsuringClient, outCwdRelativeDir, origin, templateDef, locatedSegments, isNodeNextResolution, }) {
     const { config, apiRoot } = projectInfo;
     const { templateFilePath, relativeDir } = clientTemplateFile;
     const locatedSegmentsByName = _.keyBy(locatedSegments, 'segmentName');
@@ -24,6 +24,7 @@ export default async function writeOneClientFile({ cwd, projectInfo, clientTempl
         imports,
         schema: fullSchema,
         VovkSchemaIdEnum,
+        nodeNextResolutionTsExt: isNodeNextResolution ? '.ts' : '',
         schemaOutDir: typeof segmentName === 'string'
             ? path.relative(path.join(outCwdRelativeDir, segmentName || ROOT_SEGMENT_SCHEMA_NAME), config.schemaOutDir)
             : path.relative(outCwdRelativeDir, config.schemaOutDir),

package/dist/getProjectInfo/getConfig/index.mjs

@@ -61,7 +61,7 @@ export default async function getConfig({ configPath, cwd }) {
         devHttps: (env.VOVK_DEV_HTTPS ? !!env.VOVK_DEV_HTTPS : null) ?? conf.devHttps ?? false,
         moduleTemplates: {
             service: 'vovk-cli/module-templates/service.ts.ejs',
-            controller: 'vovk-cli/module-templates/controller.ts.ejs',
+            controller: 'vovk-cli/module-templates/Controller.ts.ejs',
             ...conf.moduleTemplates,
         },
         libs: conf.libs ?? {},

package/dist/init/createConfig.mjs

@@ -12,7 +12,7 @@ export default async function createConfig({ root, log, options: { validationLib
         .then((content) => JSON.parse(content).type === 'module');
     const configAbsolutePath = path.join(dir, isModule ? 'vovk.config.mjs' : 'vovk.config.js');
     const moduleTemplates = {
-        controller: 'vovk-cli/module-templates/controller.ts.ejs',
+        controller: 'vovk-cli/module-templates/Controller.ts.ejs',
         service: 'vovk-cli/module-templates/service.ts.ejs',
     };
     if (validationLibrary) {

package/dist/new/render.mjs

@@ -30,7 +30,7 @@ export default async function render(codeTemplate, { config, withService, segmen
         config,
         withService,
         segmentName,
-        resolutionExt: isNodeNextResolution ? '.ts' : '',
+        nodeNextResolutionTsExt: isNodeNextResolution ? '.ts' : '',
         defaultDir: getModuleDirName(segmentName, theThing),
         // libraries
         _, // lodash

package/module-templates/{service.ts.ejs → Service.ts.ejs}

@@ -9,7 +9,7 @@ sourceName: <%= vars.ServiceName %>
 ---
 
 import type { VovkBody, VovkQuery } from 'vovk';
-import type <%= vars.rpcModuleName %> from './<%= vars.rpcModuleName %><%= t.resolutionExt %>';
+import type <%= vars.rpcModuleName %> from './<%= vars.rpcModuleName %><%= t.nodeNextResolutionTsExt %>';
 
 export default class <%= vars.ServiceName %> {
   static get<%= t.TheThings %> = (search: VovkQuery<typeof <%= vars.rpcModuleName %>.get<%= t.TheThings %>>['search']) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.181",
+  "version": "0.0.1-draft.183",
   "bin": {
     "vovk": "./dist/index.mjs"
   },