vovk-cli 0.1.3 → 0.2.0

package/dist/new/{newModule.d.mts → new-module.d.mts}

@@ -1,4 +1,4 @@
-import type { ProjectInfo } from '../getProjectInfo/index.mjs';
+import type { ProjectInfo } from '../get-project-info/index.mjs';
 export declare function newModule({ projectInfo, what, moduleNameWithOptionalSegment, dryRun, outDir: outDirFlag, templates: templatesFlag, noSegmentUpdate, overwrite, empty, }: {
     projectInfo: ProjectInfo;
     what: string[];

package/dist/new/{newModule.mjs → new-module.mjs}

@@ -1,15 +1,16 @@
 import path from 'node:path';
 import fs from 'node:fs/promises';
 import chalk from 'chalk';
+import _ from 'lodash';
 import { getTsconfig } from 'get-tsconfig';
 import { render } from './render.mjs';
-import { addClassToSegmentCode } from './addClassToSegmentCode.mjs';
-import { chalkHighlightThing } from '../utils/chalkHighlightThing.mjs';
-import { formatLoggedSegmentName } from '../utils/formatLoggedSegmentName.mjs';
-import { getFileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
+import { addClassToSegmentCode } from './add-class-to-segment-code.mjs';
+import { chalkHighlightThing } from '../utils/chalk-highlight-thing.mjs';
+import { formatLoggedSegmentName } from '../utils/format-logged-segment-name.mjs';
+import { getFileSystemEntryType } from '../utils/get-file-system-entry-type.mjs';
 import { prettify } from '../utils/prettify.mjs';
-import { resolveAbsoluteModulePath } from '../utils/resolveAbsoluteModulePath.mjs';
-import { locateSegments } from '../utils/locateSegments.mjs';
+import { resolveAbsoluteModulePath } from '../utils/resolve-absolute-module-path.mjs';
+import { locateSegments } from '../utils/locate-segments.mjs';
 function splitByLast(str, delimiter = '/') {
     const index = str.lastIndexOf(delimiter);
     if (index === -1) {
@@ -81,6 +82,16 @@ export async function newModule({ projectInfo, what, moduleNameWithOptionalSegme
         }
         const absoluteModuleDir = path.join(cwd, outDir);
         const absoluteModulePath = path.join(absoluteModuleDir, fileName);
+        // Pre-kebab-case projects keep modules at e.g. userProfile/UserProfileController.ts; scaffolding
+        // user-profile/user-profile-controller.ts next to it would register a duplicate class in the segment.
+        const legacySuffix = type === 'controller' ? 'Controller' : type === 'service' ? 'Service' : null;
+        if (!outDirFlag && legacySuffix && path.basename(absoluteModuleDir) === _.kebabCase(moduleName)) {
+            const legacyModulePath = path.join(path.dirname(absoluteModuleDir), _.camelCase(moduleName), `${_.upperFirst(_.camelCase(moduleName))}${legacySuffix}.ts`);
+            if (await getFileSystemEntryType(legacyModulePath)) {
+                log.error(`Found ${chalkHighlightThing(legacyModulePath)} created with the pre-kebab-case naming convention. Rename it to ${chalkHighlightThing(absoluteModulePath)} manually or pass --out-dir to scaffold elsewhere.`);
+                return process.exit(1);
+            }
+        }
         const prettiedCode = await prettify(code, absoluteModulePath);
         if (!dryRun) {
             if (!overwrite && (await getFileSystemEntryType(absoluteModulePath))) {

package/dist/new/{newSegment.d.mts → new-segment.d.mts}

@@ -1,4 +1,4 @@
-import type { ProjectInfo } from '../getProjectInfo/index.mjs';
+import type { ProjectInfo } from '../get-project-info/index.mjs';
 export declare function newSegment({ projectInfo, segmentName, isStaticSegment, overwrite, dryRun, }: {
     projectInfo: ProjectInfo;
     segmentName: string;

package/dist/new/{newSegment.mjs → new-segment.mjs}

@@ -1,8 +1,8 @@
 import path from 'node:path';
 import fs from 'node:fs/promises';
-import { getFileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
-import { chalkHighlightThing } from '../utils/chalkHighlightThing.mjs';
-import { formatLoggedSegmentName } from '../utils/formatLoggedSegmentName.mjs';
+import { getFileSystemEntryType } from '../utils/get-file-system-entry-type.mjs';
+import { chalkHighlightThing } from '../utils/chalk-highlight-thing.mjs';
+import { formatLoggedSegmentName } from '../utils/format-logged-segment-name.mjs';
 import { prettify } from '../utils/prettify.mjs';
 import chalk from 'chalk';
 export async function newSegment({ projectInfo, segmentName, isStaticSegment, overwrite, dryRun, }) {

package/dist/new/render.mjs

@@ -2,11 +2,11 @@ import ejs from 'ejs';
 import matter from 'gray-matter';
 import _ from 'lodash';
 import pluralize from 'pluralize';
-import { addCommonTerms } from './addCommonTerms.mjs';
+import { addCommonTerms } from './add-common-terms.mjs';
 import path from 'node:path';
 addCommonTerms();
 export async function render(codeTemplate, { cwd, config, withService, segmentName, moduleName, empty, templateFileName, isNodeNextResolution, srcRoot, }) {
-    const defaultOutDir = [config.modulesDir, segmentName || config.rootSegmentModulesDirName, _.camelCase(moduleName)]
+    const defaultOutDir = [config.modulesDir, segmentName || config.rootSegmentModulesDirName, _.kebabCase(moduleName)]
         .filter(Boolean)
         .join('/');
     const relativePathToSourceRoot = path.relative(path.resolve(cwd, defaultOutDir), path.join(cwd, srcRoot ?? '.')) || '.';

package/dist/utils/{compileJSONSchemaToTypeScriptType.mjs → compile-json-schema-to-typescript-type.mjs}

@@ -1,4 +1,4 @@
-import { compileTs } from './compileTs.mjs';
+import { compileTs } from './compile-ts.mjs';
 export function compileJSONSchemaToTypeScriptType(schema, typeName, components = {}, options = {}) {
     if (!schema)
         return '';

package/dist/utils/{formatLoggedSegmentName.mjs → format-logged-segment-name.mjs}

@@ -1,5 +1,5 @@
 import upperFirstLodash from 'lodash/upperFirst.js';
-import { chalkHighlightThing } from './chalkHighlightThing.mjs';
+import { chalkHighlightThing } from './chalk-highlight-thing.mjs';
 export function formatLoggedSegmentName(segmentName, { withChalk = true, upperFirst = false, isStatic = false, segmentType = 'segment', // TODO: Apply to all formatLoggedSegmentName invocations
  } = {}) {
     let text = segmentName ? `${isStatic ? 'static ' : ''}${segmentType} "${segmentName}"` : 'the root segment';

package/dist/utils/{getPackageJson.d.mts → get-package-json.d.mts}

@@ -1,3 +1,3 @@
 import type { PackageJson } from 'type-fest';
-import type { ProjectInfo } from '../getProjectInfo/index.mjs';
+import type { ProjectInfo } from '../get-project-info/index.mjs';
 export declare function getPackageJson(cwd: string, log: ProjectInfo['log']): Promise<PackageJson>;

package/dist/utils/{getPackageJson.mjs → get-package-json.mjs}

@@ -1,6 +1,6 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { chalkHighlightThing } from './chalkHighlightThing.mjs';
+import { chalkHighlightThing } from './chalk-highlight-thing.mjs';
 let cachedPromise;
 export function getPackageJson(cwd, log) {
     const pkgPath = path.join(cwd, 'package.json');

package/dist/utils/{locateSegments.d.mts → locate-segments.d.mts}

@@ -1,5 +1,5 @@
 import type { VovkStrictConfig } from 'vovk/internal';
-import type { ProjectInfo } from '../getProjectInfo/index.mjs';
+import type { ProjectInfo } from '../get-project-info/index.mjs';
 export type Segment = {
     routeFilePath: string;
     segmentName: string;

package/dist/utils/{locateSegments.mjs → locate-segments.mjs}

@@ -1,6 +1,6 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { getFileSystemEntryType } from './getFileSystemEntryType.mjs';
+import { getFileSystemEntryType } from './get-file-system-entry-type.mjs';
 export async function locateSegments({ dir, rootDir, config, log, }) {
     let results = [];
     if (!dir)

package/dist/utils/{normalizeOpenAPIMixin.d.mts → normalize-openapi-mixin.d.mts}

@@ -1,7 +1,7 @@
 import type { HttpMethod, VovkConfig } from 'vovk';
 import type { VovkOperationObject, VovkStrictConfig } from 'vovk/internal';
 import type { OpenAPIObject } from 'openapi3-ts/oas31';
-import type { ProjectInfo } from '../getProjectInfo/index.mjs';
+import type { ProjectInfo } from '../get-project-info/index.mjs';
 export type GetOpenAPINameFn = (config: {
     operationObject: VovkOperationObject;
     method: HttpMethod;

package/dist/utils/{normalizeOpenAPIMixin.mjs → normalize-openapi-mixin.mjs}

@@ -1,9 +1,9 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import * as YAML from 'yaml';
-import { chalkHighlightThing } from './chalkHighlightThing.mjs';
+import { chalkHighlightThing } from './chalk-highlight-thing.mjs';
 import camelCase from 'lodash/camelCase.js';
-import { generateFnName } from './generateFnName.mjs';
+import { generateFnName } from './generate-fn-name.mjs';
 const normalizeGetModuleName = (getModuleName) => {
     if (typeof getModuleName === 'string') {
         const moduleName = getModuleName;

package/dist/utils/{removeUnlistedDirectories.mjs → remove-unlisted-directories.mjs}

@@ -1,6 +1,6 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { getFileSystemEntryType, FileSystemEntryType } from './getFileSystemEntryType.mjs';
+import { getFileSystemEntryType, FileSystemEntryType } from './get-file-system-entry-type.mjs';
 /**
  * Removes all directories in a folder that aren't in the provided allowlist
  * Supports nested directory paths like 'foo/bar/baz'

package/dist/utils/{resolveAbsoluteModulePath.mjs → resolve-absolute-module-path.mjs}

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { createRequire } from 'node:module';
-import { getPublicModuleNameFromPath } from './getPublicModuleNameFromPath.mjs';
+import { getPublicModuleNameFromPath } from './get-public-module-name-from-path.mjs';
 // Returns the path up to and including the last occurrence of the given module name
 export function getPathUpToModule(moduleName, fullPath) {
     const idx = fullPath.lastIndexOf(moduleName);

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

@@ -4,7 +4,7 @@
 }; %>
 ---
 outDir: <%= t.defaultOutDir %>
-fileName: <%= vars.ModuleName + '.ts' %>
+fileName: <%= t['the-thing'] + '-controller.ts' %>
 sourceName: <%= vars.ModuleName %>
 compiledName: <%= t.TheThing + 'RPC' %>
 ---
@@ -12,7 +12,7 @@ compiledName: <%= t.TheThing + 'RPC' %>
 import { procedure, prefix, get, put, post, del, operation } from 'vovk';
 import { type } from 'arktype';
 <% if(t.withService) { %>
-import <%= vars.ServiceName %> from './<%= vars.ServiceName %><%= t.nodeNextResolutionExt.ts %>';
+import <%= vars.ServiceName %> from './<%= t['the-thing'] %>-service<%= t.nodeNextResolutionExt.ts %>';
 <% } %>
 
 @prefix('<%= t['the-things'] %>')

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

@@ -4,14 +4,14 @@
 }; %>
 ---
 outDir: <%= t.defaultOutDir %>
-fileName: <%= vars.ControllerName + '.ts' %>
+fileName: <%= t['the-thing'] + '-controller.ts' %>
 sourceName: <%= vars.ControllerName %>
 compiledName: <%= t.TheThing + 'RPC' %>
 ---
 
 import { prefix, get, put, post, del, operation, type VovkRequest } from 'vovk';
 <% if(t.withService) { %>
-import <%= vars.ServiceName %> from './<%= vars.ServiceName %><%= t.nodeNextResolutionExt.ts %>';
+import <%= vars.ServiceName %> from './<%= t['the-thing'] %>-service<%= t.nodeNextResolutionExt.ts %>';
 <% } %>
 
 @prefix('<%= t['the-things'] %>')

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

@@ -4,12 +4,12 @@
 }; %>
 ---
 outDir: <%= t.defaultOutDir %>
-fileName: <%= vars.ServiceName + '.ts' %>
+fileName: <%= t['the-thing'] + '-service.ts' %>
 sourceName: <%= vars.ServiceName %>
 ---
 
 import type { VovkBody, VovkParams } from 'vovk';
-import type <%= vars.ControllerName %> from './<%= vars.ControllerName %><%= t.nodeNextResolutionExt.ts %>';
+import type <%= vars.ControllerName %> from './<%= t['the-thing'] %>-controller<%= t.nodeNextResolutionExt.ts %>';
 
 export default class <%= vars.ServiceName %> {
   static get<%= t.TheThings %> = () => {

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

@@ -4,7 +4,7 @@
 }; %>
 ---
 outDir: <%= t.defaultOutDir %>
-fileName: <%= vars.ModuleName + '.ts' %>
+fileName: <%= t['the-thing'] + '-controller.ts' %>
 sourceName: <%= vars.ModuleName %>
 compiledName: <%= t.TheThing + 'RPC' %>
 ---
@@ -13,7 +13,7 @@ import { procedure, prefix, get, put, post, del, operation } from 'vovk';
 import * as v from 'valibot';
 import { toStandardJsonSchema } from '@valibot/to-json-schema';
 <% if(t.withService) { %>
-import <%= vars.ServiceName %> from './<%= vars.ServiceName %><%= t.nodeNextResolutionExt.ts %>';
+import <%= vars.ServiceName %> from './<%= t['the-thing'] %>-service<%= t.nodeNextResolutionExt.ts %>';
 <% } %>
 
 @prefix('<%= t['the-things'] %>')

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

@@ -4,7 +4,7 @@
 }; %>
 ---
 outDir: <%= t.defaultOutDir %>
-fileName: <%= vars.ModuleName + '.ts' %>
+fileName: <%= t['the-thing'] + '-controller.ts' %>
 sourceName: <%= vars.ModuleName %>
 compiledName: <%= t.TheThing + 'RPC' %>
 ---
@@ -12,7 +12,7 @@ compiledName: <%= t.TheThing + 'RPC' %>
 import { procedure, prefix, get, put, post, del, operation } from 'vovk';
 import { z } from 'zod';
 <% if(t.withService) { %>
-import <%= vars.ServiceName %> from './<%= vars.ServiceName %><%= t.nodeNextResolutionExt.ts %>';
+import <%= vars.ServiceName %> from './<%= t['the-thing'] %>-service<%= t.nodeNextResolutionExt.ts %>';
 <% } %>
 
 @prefix('<%= t['the-things'] %>')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "CLI tool for managing Vovk.ts projects",
   "files": [
     "dist",

package/dist/dev/logDiffResult.d.mts

@@ -1,3 +0,0 @@
-import type { DiffResult } from './diffSegmentSchema.mjs';
-import type { ProjectInfo } from '../getProjectInfo/index.mjs';
-export declare function logDiffResult(segmentName: string, diffResult: DiffResult, projectInfo: ProjectInfo): void;

package/dist/generate/ensureClient.d.mts

@@ -1,3 +0,0 @@
-import type { ProjectInfo } from '../getProjectInfo/index.mjs';
-import type { Segment } from '../utils/locateSegments.mjs';
-export declare function ensureClient(projectInfo: ProjectInfo, locatedSegments: Segment[]): Promise<void>;