vovk-cli 0.0.1-draft.393 → 0.0.1-draft.394

package/README.md

@@ -7,7 +7,7 @@
     </picture>
   </a>
   <br>
-  <strong>Back-end for <a href="https://nextjs.org/">Next.js</a></strong>
+  <strong>Back-end for Next.js</strong>
 </p>
 
 ---

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

@@ -5,7 +5,8 @@ import { schema } from './schema<%= t.nodeNextResolutionExt.ts %>';
 <% if(t.isBundle) { %>
 import { openapi } from './openapi<%= t.nodeNextResolutionExt.ts %>';
 <% } else { %>
-// TODO: This is a temporary fix https://github.com/rolldown/tsdown/issues/528#issuecomment-3476284358
+// import { openapi } from './openapi<%= t.nodeNextResolutionExt.ts %>';
+// TODO: This is a temporary fix for https://github.com/rolldown/tsdown/issues/528#issuecomment-3476284358
 import openapi from './openapi.json' with { type: "json" };
 <% } %>
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { if(segment.segmentType !== 'mixin') { %>
@@ -17,7 +18,7 @@ import type { Controllers as MixinControllers, Mixins } from "./mixins.d.ts";
 <% } %>
 <% Object.entries(t.reExports).forEach(([reExportWhat, reExportFrom]) => { %>
 export { <%= reExportWhat %> } from '<%= reExportFrom %>';
-<% }) %>   
+<% }) %>
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => {  
   Object.keys(segment.controllers).forEach((rpcModuleName) => { 
     const apiRoot = t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot; %>

package/dist/dev/index.mjs

@@ -285,7 +285,7 @@ export class VovkDev {
             segments: this.#schemaSegments,
             meta: getMetaSchema({
                 config: this.#projectInfo.config,
-                useEmitConfig: false,
+                useexposeConfigKeys: false,
             }),
         };
         return generate({

package/dist/dev/writeMetaJson.mjs

@@ -7,7 +7,7 @@ export default async function writeMetaJson(schemaOutAbsolutePath, projectInfo)
     const metaJsonPath = path.join(schemaOutAbsolutePath, META_FILE_NAME + '.json');
     const metaStr = JSON.stringify(getMetaSchema({
         config: projectInfo.config,
-        useEmitConfig: true,
+        useexposeConfigKeys: true,
     }), null, 2);
     const existingStr = await fs.readFile(metaJsonPath, 'utf-8').catch(() => null);
     if (existingStr !== metaStr) {

package/dist/generate/ensureClient.mjs

@@ -21,7 +21,7 @@ export default async function ensureClient(projectInfo, locatedSegments) {
         fullSchema: {
             $schema: VovkSchemaIdEnum.SCHEMA,
             segments: getEmptySegmentRecordSchema(locatedSegments.map(({ segmentName }) => segmentName)),
-            meta: getMetaSchema({ config: projectInfo.config, useEmitConfig: false }),
+            meta: getMetaSchema({ config: projectInfo.config, useexposeConfigKeys: false }),
         },
         locatedSegments,
     });

package/dist/generate/getProjectFullSchema.mjs

@@ -11,7 +11,7 @@ export async function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstal
         segments: {},
         meta: getMetaSchema({
             config,
-            useEmitConfig: false,
+            useexposeConfigKeys: false,
         }),
     };
     const isEmptyLogOrWarn = isNextInstalled ? log.warn : log.debug;

package/dist/generate/getTemplateClientImports.mjs

@@ -4,7 +4,6 @@ import { ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
 export default function getTemplateClientImports({ config, fullSchema, outCwdRelativeDir, segmentName, isBundle, outputConfigs, }) {
     const { imports: configImports } = resolveGeneratorConfigValues({
         config,
-        schema: fullSchema,
         segmentName,
         isBundle,
         projectPackageJson: undefined,

package/dist/generate/writeOneClientFile.mjs

@@ -61,7 +61,7 @@ templateContent, matterResult: { data, content }, openAPIObject, package: packag
         YAML,
         TOML,
         getFirstLineBanner,
-        publicMeta: getMetaSchema({ config: projectConfig, useEmitConfig: true }),
+        publicMeta: getMetaSchema({ config: projectConfig, useexposeConfigKeys: true }),
         nodeNextResolutionExt: {
             ts: isNodeNextResolution ? '.ts' : '',
             js: isNodeNextResolution ? '.js' : '',

package/dist/getProjectInfo/getConfig/index.d.mts

@@ -10,13 +10,13 @@ export default function getConfig({ configPath, cwd, logLevel, }: {
     configAbsolutePaths: string[];
     userConfig: {
         $schema?: typeof VovkSchemaIdEnum.CONFIG | (string & {});
-        emitConfig?: boolean | (keyof VovkStrictConfig | (string & {}))[];
+        exposeConfigKeys?: boolean | (keyof VovkStrictConfig | (string & {}))[];
         schemaOutDir?: string;
         modulesDir?: string;
         rootEntry?: string;
         logLevel?: "error" | "trace" | "debug" | "info" | "warn" | (string & {});
         libs?: {
-            ajv: import("vovk").KnownAny;
+            ajv?: import("vovk").KnownAny;
             [key: string]: import("vovk").KnownAny;
         };
         devHttps?: boolean;

package/dist/getProjectInfo/getConfig/index.mjs

@@ -20,7 +20,7 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
     const config = {
         $schema: VovkSchemaIdEnum.CONFIG,
         clientTemplateDefs,
-        emitConfig: [],
+        exposeConfigKeys: [],
         composedClient: {
             ...conf.composedClient,
             enabled: conf.composedClient?.enabled ?? true,
@@ -76,15 +76,15 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
             ]))),
         },
     };
-    if (typeof conf.emitConfig === 'undefined') {
-        config.emitConfig = ['libs'];
+    if (typeof conf.exposeConfigKeys === 'undefined') {
+        config.exposeConfigKeys = ['libs'];
     }
-    else if (conf.emitConfig === true) {
-        config.emitConfig = Object.keys(config);
+    else if (conf.exposeConfigKeys === true) {
+        config.exposeConfigKeys = Object.keys(config);
     }
-    else if (Array.isArray(conf.emitConfig)) {
-        config.emitConfig = conf.emitConfig;
-    } // else it's false and emitConfig already is []
+    else if (Array.isArray(conf.exposeConfigKeys)) {
+        config.exposeConfigKeys = conf.exposeConfigKeys;
+    } // else it's false and exposeConfigKeys already is []
     if (!userConfig) {
         log.warn(`Unable to load config at ${chalkHighlightThing(cwd)}. Using default values. ${error ?? ''}`);
     }

package/dist/getProjectInfo/getMetaSchema.d.mts

@@ -1,7 +1,7 @@
 import { VovkSchemaIdEnum, type VovkStrictConfig } from 'vovk';
-export default function getMetaSchema({ config, useEmitConfig }: {
+export default function getMetaSchema({ config, useexposeConfigKeys, }: {
     config: VovkStrictConfig;
-    useEmitConfig: boolean;
+    useexposeConfigKeys: boolean;
 }): {
     config: VovkStrictConfig;
     $schema: VovkSchemaIdEnum;

package/dist/getProjectInfo/getMetaSchema.mjs

@@ -2,11 +2,11 @@ import { VovkSchemaIdEnum } from 'vovk';
 import pick from 'lodash/pick.js';
 import mapValues from 'lodash/mapValues.js';
 import omit from 'lodash/omit.js';
-export default function getMetaSchema({ config, useEmitConfig }) {
+export default function getMetaSchema({ config, useexposeConfigKeys, }) {
     return {
         $schema: VovkSchemaIdEnum.META,
         ...{
-            config: useEmitConfig
+            config: useexposeConfigKeys
                 ? (config
                     ? pick({
                         ...config,
@@ -19,7 +19,7 @@ export default function getMetaSchema({ config, useEmitConfig }) {
                                     : undefined,
                             }
                             : undefined,
-                    }, [...config.emitConfig, '$schema'])
+                    }, [...config.exposeConfigKeys, '$schema'])
                     : {})
                 : config,
         },

package/dist/index.mjs

@@ -139,7 +139,7 @@ program
     });
     const { cwd, config, log, isNextInstalled } = projectInfo;
     const fullSchema = await getProjectFullSchema({
-        schemaOutAbsolutePath: path.resolve(cwd, cliBundleOptions?.schema ?? config.schemaOutDir),
+        schemaOutAbsolutePath: path.resolve(cwd, cliBundleOptions?.schemaPath ?? config.schemaOutDir),
         log,
         isNextInstalled,
         config,

package/dist/init/index.mjs

@@ -81,6 +81,7 @@ export class Init {
         }
         if (!dryRun && pkgJson) {
             let depsUpdated = false;
+            const packageManager = getPackageManager({ useNpm, useYarn, usePnpm, useBun, pkgJson });
             try {
                 await updateDependenciesWithoutInstalling({
                     log,
@@ -96,17 +97,13 @@ export class Init {
                 logUpdateDependenciesError({
                     log,
                     error,
-                    useNpm,
-                    useYarn,
-                    usePnpm,
-                    useBun,
+                    packageManager,
                     dependencies,
                     devDependencies,
                     channel,
                 });
             }
             if (depsUpdated) {
-                const packageManager = getPackageManager({ useNpm, useYarn, usePnpm, useBun });
                 if (skipInstall) {
                     log.info(`Installation skipped. Please, install them manually with ${chalkHighlightThing(packageManager + ' install')}`);
                 }
@@ -115,12 +112,7 @@ export class Init {
                         await installDependencies({
                             log,
                             cwd: root,
-                            options: {
-                                useNpm,
-                                useYarn,
-                                usePnpm,
-                                useBun,
-                            },
+                            packageManager,
                         });
                         log.info('Dependencies installed successfully');
                     }

package/dist/init/installDependencies.d.mts

@@ -1,10 +1,12 @@
+import NPMCliPackageJson from '@npmcli/package-json';
 import getLogger from '../utils/getLogger.mjs';
 import type { InitOptions } from '../types.mjs';
-type PackageManager = 'npm' | 'yarn' | 'pnpm' | 'bun';
-export declare function getPackageManager(options: Pick<InitOptions, 'useNpm' | 'useYarn' | 'usePnpm' | 'useBun'>): PackageManager;
-export default function installDependencies({ log, cwd, options, }: {
+export type PackageManager = 'npm' | 'yarn' | 'pnpm' | 'bun';
+export declare function getPackageManager(options: Pick<InitOptions, 'useNpm' | 'useYarn' | 'usePnpm' | 'useBun'> & {
+    pkgJson: NPMCliPackageJson;
+}): PackageManager;
+export default function installDependencies({ log, cwd, packageManager, }: {
     log: ReturnType<typeof getLogger>;
     cwd: string;
-    options: Pick<InitOptions, 'useNpm' | 'useYarn' | 'usePnpm' | 'useBun'>;
+    packageManager: PackageManager;
 }): Promise<void>;
-export {};

package/dist/init/installDependencies.mjs

@@ -9,10 +9,10 @@ export function getPackageManager(options) {
         return 'pnpm';
     if (options.useBun)
         return 'bun';
-    return 'npm'; // Default to npm if no options are true
+    const packageManager = options.pkgJson.content?.['packageManager'];
+    return packageManager ? packageManager.split('@')[0] : 'npm'; // Default to npm if no options are true
 }
-export default async function installDependencies({ log, cwd, options, }) {
-    const packageManager = getPackageManager(options);
+export default async function installDependencies({ log, cwd, packageManager, }) {
     log.info(`Installing dependencies at ${chalkHighlightThing(cwd)} using ${chalkHighlightThing(packageManager)}...`);
     await new Promise((resolve, reject) => {
         const args = packageManager === 'yarn' ? ['install', '--non-interactive'] : ['install'];

package/dist/init/logUpdateDependenciesError.d.mts

@@ -1,10 +1,8 @@
 import type { InitOptions } from '../types.mjs';
 import type getLogger from '../utils/getLogger.mjs';
-export default function logUpdateDependenciesError({ useNpm, useYarn, usePnpm, useBun, log, dependencies, devDependencies, error, channel, }: {
-    useNpm?: boolean;
-    useYarn?: boolean;
-    usePnpm?: boolean;
-    useBun?: boolean;
+import type { PackageManager } from './installDependencies.mjs';
+export default function logUpdateDependenciesError({ packageManager, log, dependencies, devDependencies, error, channel, }: {
+    packageManager: PackageManager;
     log: ReturnType<typeof getLogger>;
     dependencies: string[];
     devDependencies: string[];

package/dist/init/logUpdateDependenciesError.mjs

@@ -1,7 +1,5 @@
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
-import { getPackageManager } from './installDependencies.mjs';
-export default function logUpdateDependenciesError({ useNpm, useYarn, usePnpm, useBun, log, dependencies, devDependencies, error, channel, }) {
-    const packageManager = getPackageManager({ useNpm, useYarn, usePnpm, useBun });
+export default function logUpdateDependenciesError({ packageManager, log, dependencies, devDependencies, error, channel, }) {
     const installCommands = [];
     const addChannel = (packageName) => {
         const isVovk = packageName.startsWith('vovk') && packageName !== 'dto-mapped-types';

package/dist/new/newModule.mjs

@@ -21,7 +21,7 @@ function splitByLast(str, delimiter = '/') {
     return [before, after];
 }
 export default async function newModule({ projectInfo, what, moduleNameWithOptionalSegment, dryRun, outDir: outDirFlag, templates: templatesFlag, noSegmentUpdate, overwrite, empty, }) {
-    const { config, log, cwd, apiDirAbsolutePath } = projectInfo;
+    const { config, log, cwd, apiDirAbsolutePath, srcRoot } = projectInfo;
     const segments = await locateSegments({ dir: apiDirAbsolutePath, config, log });
     const isNodeNextResolution = ['node16', 'nodenext'].includes((await getTsconfig(cwd)?.config?.compilerOptions?.moduleResolution?.toLowerCase()) ?? '');
     let templates = config.moduleTemplates;
@@ -61,6 +61,7 @@ export default async function newModule({ projectInfo, what, moduleNameWithOptio
         const templateCode = await fs.readFile(templateAbsolutePath, 'utf-8');
         const { outDir: renderedOutDir, fileName, sourceName, compiledName, code, } = await render(templateCode, {
             cwd,
+            srcRoot,
             config,
             withService: what.includes('service'),
             segmentName,

package/dist/new/render.d.mts

@@ -1,6 +1,6 @@
 import type { VovkStrictConfig } from 'vovk';
 import type { VovkModuleRenderResult } from '../types.mjs';
-export default function render(codeTemplate: string, { config, withService, segmentName, moduleName, empty, templateFileName, isNodeNextResolution, }: {
+export default function render(codeTemplate: string, { cwd, config, withService, segmentName, moduleName, empty, templateFileName, isNodeNextResolution, srcRoot, }: {
     cwd: string;
     config: VovkStrictConfig;
     withService: boolean;
@@ -9,4 +9,5 @@ export default function render(codeTemplate: string, { config, withService, segm
     empty?: boolean;
     templateFileName: string;
     isNodeNextResolution: boolean;
+    srcRoot: string | null;
 }): Promise<VovkModuleRenderResult>;

package/dist/new/render.mjs

@@ -3,11 +3,13 @@ import matter from 'gray-matter';
 import _ from 'lodash';
 import pluralize from 'pluralize';
 import addCommonTerms from './addCommonTerms.mjs';
+import path from 'node:path';
 addCommonTerms();
-export default async function render(codeTemplate, { config, withService, segmentName, moduleName, empty, templateFileName, isNodeNextResolution, }) {
-    const getModuleDirName = (givenSegmentName, givenModuleName) => [config.modulesDir, givenSegmentName || config.rootSegmentModulesDirName, _.camelCase(givenModuleName)]
+export default async function render(codeTemplate, { cwd, config, withService, segmentName, moduleName, empty, templateFileName, isNodeNextResolution, srcRoot, }) {
+    const defaultOutDir = [config.modulesDir, segmentName || config.rootSegmentModulesDirName, _.camelCase(moduleName)]
         .filter(Boolean)
         .join('/');
+    const relativePathToSourceRoot = path.relative(path.resolve(cwd, defaultOutDir), path.join(cwd, srcRoot ?? '.')) || '.';
     const theThing = _.camelCase(moduleName);
     const TheThing = _.upperFirst(theThing);
     const the_thing = _.snakeCase(moduleName);
@@ -36,7 +38,8 @@ export default async function render(codeTemplate, { config, withService, segmen
             cjs: isNodeNextResolution ? '.cjs' : '',
             mjs: isNodeNextResolution ? '.mjs' : '',
         },
-        defaultOutDir: getModuleDirName(segmentName, theThing),
+        defaultOutDir,
+        relativePathToSourceRoot,
         // libraries
         _, // lodash
         pluralize,

package/dist/types.d.mts

@@ -43,7 +43,6 @@ export interface BundleOptions extends Partial<Pick<VovkStrictConfig['bundle'],
     bundler?: 'tsdown' | 'ncc';
     configPath?: string;
     schemaPath?: string;
-    schema?: string;
     outDir?: string;
     origin?: string;
     openapiSpec?: string[];

package/module-templates/arktype/controller.ts.ejs

@@ -11,7 +11,7 @@ compiledName: <%= t.TheThing + 'RPC' %>
 
 import { prefix, get, put, post, del, operation } from 'vovk';
 import { type } from 'arktype';
-import withArk from '@/lib/withArk<%= t.nodeNextResolutionExt.ts %>';
+import withArk from '<%= t.relativePathToSourceRoot %>/lib/withArk<%= t.nodeNextResolutionExt.ts %>';
 <% if(t.withService) { %>
 import <%= vars.ServiceName %> from './<%= vars.ServiceName %><%= t.nodeNextResolutionExt.ts %>';
 <% } %>
@@ -32,6 +32,21 @@ export default class <%= vars.ModuleName %> {
         }
     });
 
+    @operation({
+      summary: 'Get single <%= t.TheThing %>',
+    })
+    @get('{id}')
+    static getSingle<%= t.TheThing %> = withArk({
+        params: type({ id: type('string') }),
+        handle(_req, { id }) {
+            <% if(t.withService) { %>
+            return <%= vars.ServiceName %>.getSingle<%= t.TheThing %>(id);
+            <% } else { %>
+            return { message: 'TODO: get single <%= t.theThing %>', id };
+            <% } %>
+        }
+    });
+
     @operation({
         summary: 'Update <%= t.TheThing %>',
     })
@@ -39,8 +54,7 @@ export default class <%= vars.ModuleName %> {
     static update<%= t.TheThing %> = withArk({
         body: type({ todo: type('true') }),
         params: type({ id: type('string') }),
-        async handle(req, params) {
-            const { id } = params;
+        async handle(req, { id }) {
             const body = await req.json();
             <% if(t.withService) { %>
             return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, body);

package/module-templates/type/controller.ts.ejs

@@ -26,7 +26,19 @@ export default class <%= vars.ControllerName %> {
         <% } else { %>
         return { message: 'TODO: get <%= t.theThings %>' };
         <% } %>
-    }
+    };
+
+    @operation({
+        summary: 'Get single <%= t.TheThing %>',
+    })
+    @get('{id}')
+    static getSingle<%= t.TheThing %> = (_req: VovkRequest, { id }: { id: string }) => {
+        <% if(t.withService) { %>
+        return <%= vars.ServiceName %>.getSingle<%= t.TheThing %>(id);
+        <% } else { %>
+        return { message: 'TODO: get single <%= t.theThing %>', id };
+        <% } %>
+    };
 
     @operation({
         summary: 'Update <%= t.TheThing %>',

package/module-templates/type/service.ts.ejs

@@ -16,6 +16,12 @@ export default class <%= vars.ServiceName %> {
     return { message: 'TODO: get <%= t.theThings %>' };
   };
 
+  static getSingle<%= t.TheThing %> = (
+    id: VovkParams<typeof <%= vars.ControllerName %>.getSingle<%= t.TheThing %>>['id']
+  ) => {
+    return { message: 'TODO: get single <%= t.theThing %>', id };
+  }
+
   static update<%= t.TheThing %> = (
     id: VovkParams<typeof <%= vars.ControllerName %>.update<%= t.TheThing %>>['id'],
     body: VovkBody<typeof <%= vars.ControllerName %>.update<%= t.TheThing %>>

package/module-templates/valibot/controller.ts.ejs

@@ -11,7 +11,7 @@ compiledName: <%= t.TheThing + 'RPC' %>
 
 import { prefix, get, put, post, del, operation } from 'vovk';
 import * as v from 'valibot';
-import withValibot from '@/lib/withValibot<%= t.nodeNextResolutionExt.ts %>';
+import withValibot from '<%= t.relativePathToSourceRoot %>/lib/withValibot<%= t.nodeNextResolutionExt.ts %>';
 <% if(t.withService) { %>
 import <%= vars.ServiceName %> from './<%= vars.ServiceName %><%= t.nodeNextResolutionExt.ts %>';
 <% } %>
@@ -32,6 +32,21 @@ export default class <%= vars.ModuleName %> {
         }
     });
 
+    @operation({
+        summary: 'Get single <%= t.TheThing %>',
+    })
+    @get('{id}')
+    static getSingle<%= t.TheThing %> = withValibot({
+        params: v.object({ id: v.string() }),
+        handle(_req, { id }) {
+            <% if(t.withService) { %>
+            return <%= vars.ServiceName %>.getSingle<%= t.TheThing %>(id);
+            <% } else { %>
+            return { message: `TODO: get single <%= t.theThing %>`, id };
+            <% } %>
+        }
+    });
+
     @operation({
         summary: 'Update <%= t.TheThing %>',
     })
@@ -39,8 +54,7 @@ export default class <%= vars.ModuleName %> {
     static update<%= t.TheThing %> = withValibot({
         body: v.object({ todo: v.literal(true) }),
         params: v.object({ id: v.string() }),
-        async handle(req, params) {
-            const { id } = params;
+        async handle(req, { id }) {
             const body = await req.json();
             <% if(t.withService) { %>
             return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, body);
@@ -66,8 +80,7 @@ export default class <%= vars.ModuleName %> {
     @del('{id}')
     static delete<%= t.TheThing %> = withValibot({
         params: v.object({ id: v.string() }),
-        handle(_req, params) {
-            const { id } = params;
+        handle(_req, { id }) {
             <% if(t.withService) { %>
             return <%= vars.ServiceName %>.delete<%= t.TheThing %>(id);
             <% } else { %>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.393",
+  "version": "0.0.1-draft.394",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.469",
+    "vovk": "^3.0.0-draft.470",
     "vovk-ajv": "^0.0.0-draft.112",
     "vovk-client": "^0.0.4-draft.139",
     "vovk-python": "^0.0.1-draft.81",
@@ -83,7 +83,10 @@
     "create-next-app": "^15.5.4",
     "http-server": "^14.1.1",
     "node-pty": "^1.0.0",
-    "tsdown": "^0.15.9",
+    "tsdown": "^0.15.12",
     "zod": "^4.1.11"
+  },
+  "overrides": {
+    "rolldown-plugin-dts": "0.17.3"
   }
 }