vovk-cli 0.0.1-draft.5 → 0.0.1-draft.52

package/dist/utils/debounceWithArgs.mjs

@@ -1,14 +1,29 @@
-import debounce from 'lodash/debounce.js';
-export default function debounceWithArgs(fn, wait) {
-    const debouncedFunctions = new Map();
+export default function debounceWithArgs(callback, wait) {
+    // Stores timeouts keyed by the stringified arguments
+    const timeouts = new Map();
     return (...args) => {
+        // Convert arguments to a JSON string (or any other stable key generation)
         const key = JSON.stringify(args);
-        if (!debouncedFunctions.has(key)) {
-            debouncedFunctions.set(key, debounce(fn, wait));
-        }
-        const debouncedFn = debouncedFunctions.get(key);
-        if (debouncedFn) {
-            debouncedFn(...args);
+        // Clear any existing timer for this specific key
+        if (timeouts.has(key)) {
+            clearTimeout(timeouts.get(key));
         }
+        // Return a promise that resolves/rejects after the debounce delay
+        return new Promise((resolve, reject) => {
+            const timeoutId = setTimeout(async () => {
+                try {
+                    const result = await callback(...args);
+                    resolve(result);
+                }
+                catch (error) {
+                    reject(error);
+                }
+                finally {
+                    // Remove the entry once the callback is invoked
+                    timeouts.delete(key);
+                }
+            }, wait);
+            timeouts.set(key, timeoutId);
+        });
     };
 }

package/dist/utils/formatLoggedSegmentName.mjs

@@ -1,5 +1,5 @@
-import chalkHighlightThing from './chalkHighlightThing.mjs';
 import upperFirstLodash from 'lodash/upperFirst.js';
+import chalkHighlightThing from './chalkHighlightThing.mjs';
 export default function formatLoggedSegmentName(segmentName, { withChalk = true, upperFirst = false } = {}) {
     let text = segmentName ? `segment "${segmentName}"` : 'the root segment';
     text = upperFirst ? upperFirstLodash(text) : text;

package/dist/utils/getAvailablePort.mjs

@@ -1,4 +1,5 @@
-import net from 'net';
+import net from 'node:net';
+// Created with AI
 /**
  * Checks if a port is available.
  * @param {number} port - The port to check.
@@ -34,7 +35,7 @@ function getAvailablePort(startPort, maxAttempts, attempt, onWarning) {
                 getAvailablePort(startPort + 1, maxAttempts, attempt + 1, onWarning).then(resolve, reject);
             }
             else {
-                reject('No available ports found');
+                reject(new Error('No available ports found'));
             }
         });
     });

package/dist/utils/getFileSystemEntryType.mjs

@@ -1,4 +1,4 @@
-import fs from 'fs/promises';
+import fs from 'node:fs/promises';
 export var FileSystemEntryType;
 (function (FileSystemEntryType) {
     FileSystemEntryType["FILE"] = "FILE";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.5",
+  "version": "0.0.1-draft.52",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -10,9 +10,12 @@
   "prefix": ".",
   "scripts": {
     "build": "rm -rf dist tsconfig.build.tsbuildinfo && tsc -P tsconfig.build.json",
+    "postbuild": "chmod +x ./dist/index.mjs",
     "build-test": "rm -rf test_dist && tsc -P tsconfig.test.json",
-    "test": "npm run build && chmod +x ./dist/index.mjs && npm run build-test && node --test --test-only test_dist/test/**/*.mjs",
-    "test_": "npm run build && chmod +x ./dist/index.mjs && NODE_OPTIONS=\"--loader ts-node/esm\" TS_NODE_PROJECT=./tsconfig.test.json node --test --test-only test/**.mts",
+    "pre-test": "npm run build && npm run build-test",
+    "test-only": "npm run pre-test && node --test --test-only test_dist/test/**/*.mjs",
+    "test": "npm run pre-test && node --test --test-concurrency=1 test_dist/test/**/*.mjs",
+    "tsc": "tsc --noEmit",
     "ncu": "npm-check-updates -u",
     "npm-publish": "npm publish"
   },
@@ -33,27 +36,27 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.4"
+    "vovk": "^3.0.0-draft.57"
   },
   "dependencies": {
-    "@inquirer/prompts": "^7.0.1",
-    "@npmcli/package-json": "^6.0.1",
-    "chalk": "^5.3.0",
-    "chokidar": "^4.0.1",
+    "@inquirer/prompts": "^7.3.1",
+    "@npmcli/package-json": "^6.1.1",
+    "chalk": "^5.4.1",
+    "chokidar": "^4.0.3",
     "commander": "^12.1.0",
-    "concurrently": "^9.0.1",
-    "dotenv": "^16.4.5",
+    "concurrently": "^9.1.2",
+    "dotenv": "^16.4.7",
     "ejs": "^3.1.10",
     "gray-matter": "^4.0.3",
-    "inflection": "^3.0.0",
+    "inflection": "^3.0.2",
     "jsonc-parser": "^3.3.1",
     "lodash": "^4.17.21",
     "loglevel": "^1.9.2",
     "pluralize": "^8.0.0",
-    "prettier": "^3.3.3",
+    "prettier": "^3.4.2",
     "tar-stream": "^3.1.7",
-    "ts-morph": "^24.0.0",
-    "undici": "^6.20.1"
+    "ts-morph": "^25.0.0",
+    "undici": "^7.3.0"
   },
   "devDependencies": {
     "@types/concat-stream": "^2.0.3",
@@ -62,8 +65,8 @@
     "@types/pluralize": "^0.0.33",
     "@types/tar-stream": "^3.1.3",
     "concat-stream": "^2.0.0",
-    "create-next-app": "^15.0.1",
+    "create-next-app": "^15.1.6",
     "node-pty": "^1.0.0",
-    "type-fest": "^4.26.1"
+    "type-fest": "^4.33.0"
   }
 }

package/templates/controller.ejs

@@ -3,11 +3,12 @@
 <% var controllerName = modulePascalName + 'Controller'; %>
 <% var compiledName = modulePascalName + 'RPC'; %>
 <% var serviceName = modulePascalName + 'Service'; %>
+<% var prefix = pluralize(_.kebabCase(moduleName).toLowerCase()); %>
 ---
-dirName: <%= getModuleDirName(segmentName, moduleName) %> # Relative to the root dir
+dir: <%= getModuleDirName(segmentName, moduleName) %>
 fileName: <%= controllerName + '.ts' %>
-sourceName: <%= controllerName %> # Used to define import declaration in a segment route file for the given class
-compiledName: <%= compiledName %> # Used to define a compiled object name
+sourceName: <%= controllerName %>
+compiledName: <%= compiledName %>
 ---
 
 import { prefix, get, put, post, del, type VovkRequest } from 'vovk';
@@ -15,15 +16,15 @@ import { prefix, get, put, post, del, type VovkRequest } from 'vovk';
 import <%= serviceName %> from './<%= serviceName %>';
 <% } %>
 
-@prefix('<%= _.kebabCase(moduleName).toLowerCase() %>')
+@prefix('<%= prefix %>')
 export default class <%= controllerName %> {
     @get()
-    static get<%= modulePascalNamePlural %> = async (req: VovkRequest<null, { q: string }>) => {
-        const q = req.nextUrl.searchParams.get('q');
+    static get<%= modulePascalNamePlural %> = async (req: VovkRequest<null, { search: string }>) => {
+        const search = req.nextUrl.searchParams.get('search');
         <% if(withService) { %>
-        return <%= serviceName %>.get<%= modulePascalNamePlural %>(q);
+        return <%= serviceName %>.get<%= modulePascalNamePlural %>(search);
         <% } else { %>
-        return { q };
+        return { results: [], search };
         <% } %>
     }
 
@@ -33,19 +34,19 @@ export default class <%= controllerName %> {
         const body = await req.json();
         const q = req.nextUrl.searchParams.get('q');
         <% if(withService) { %>
-        return MyThingService.update<%= modulePascalName %>(id, q, body);
+        return <%= serviceName %>.update<%= modulePascalName %>(id, q, body);
         <% } else { %>
         return { id, body, q };
         <% } %>
     };
 
     @post()
-    static create<%= modulePascalNamePlural %> = () => {
+    static create<%= modulePascalName %> = () => {
         // ...
     };
 
     @del(':id')
-    static delete<%= modulePascalNamePlural %> = () => {
+    static delete<%= modulePascalName %> = () => {
         // ...
     };
 }

package/templates/service.ejs

@@ -3,22 +3,22 @@
 <% var serviceName = modulePascalName + 'Service'; %>
 <% var controllerName = modulePascalName + 'Controller'; %>
 ---
-dirName: <%= getModuleDirName(segmentName, moduleName) %> # Relative to the root dir
+dir: <%= getModuleDirName(segmentName, moduleName) %>
 fileName: <%= serviceName + '.ts' %>
 ---
 
 import type { VovkControllerBody, VovkControllerQuery } from 'vovk';
-import <%= controllerName %> from './<%= controllerName %>';
+import type <%= controllerName %> from './<%= controllerName %>';
 
 export default class <%= serviceName %> {
-  static get<%= modulePascalNamePlural %> = (q: VovkControllerQuery<typeof <%= controllerName %>.get<%= modulePascalNamePlural %>>['q']) => {
-    return [];
+  static get<%= modulePascalNamePlural %> = (search: VovkControllerQuery<typeof <%= controllerName %>.get<%= modulePascalNamePlural %>>['search']) => {
+    return { results: [], search };
   };
 
   static update<%= modulePascalName %> = (
     id: string,
-    q: VovkControllerQuery<typeof <%= controllerName %>.get<%= modulePascalNamePlural %>>['q'],
-    body: VovkControllerBody<typeof <%= controllerName %>.get<%= modulePascalNamePlural %>>
+    q: VovkControllerQuery<typeof <%= controllerName %>.update<%= modulePascalName %>>['q'],
+    body: VovkControllerBody<typeof <%= controllerName %>.update<%= modulePascalName %>>
   ) => {
     return { id, q, body };
   };

package/dist/generateClient.d.mts

@@ -1,7 +0,0 @@
-import type { ProjectInfo } from './getProjectInfo/index.mjs';
-import type { Segment } from './locateSegments.mjs';
-import type { VovkSchema } from 'vovk';
-export default function generateClient(projectInfo: ProjectInfo, segments: Segment[], segmentsSchema: Record<string, VovkSchema>): Promise<{
-    written: boolean;
-    path: string;
-}>;

package/dist/generateClient.mjs

@@ -1,97 +0,0 @@
-import path from 'path';
-import fs from 'fs/promises';
-import formatLoggedSegmentName from './utils/formatLoggedSegmentName.mjs';
-import prettify from './utils/prettify.mjs';
-export default async function generateClient(projectInfo, segments, segmentsSchema) {
-    const { config, cwd, log, validateOnClientImportPath, apiEntryPoint, fetcherClientImportPath, schemaOutImportPath } = projectInfo;
-    const now = Date.now();
-    const clientoOutDirAbsolutePath = path.join(cwd, config.clientOutDir);
-    let dts = `// auto-generated
-/* eslint-disable */
-import type { clientizeController } from 'vovk/client';
-import type { promisifyWorker } from 'vovk/worker';
-import type { VovkClientFetcher } from 'vovk/client';
-import type fetcher from '${fetcherClientImportPath}';
-
-`;
-    let js = `// auto-generated
-/* eslint-disable */
-const { clientizeController } = require('vovk/client');
-const { promisifyWorker } = require('vovk/worker');
-const { default: fetcher } = require('${fetcherClientImportPath}');
-const schema = require('${schemaOutImportPath}');
-`;
-    let ts = `// auto-generated
-/* eslint-disable */
-import { clientizeController } from 'vovk/client';
-import { promisifyWorker } from 'vovk/worker';
-import type { VovkClientFetcher } from 'vovk/client';
-import fetcher from '${fetcherClientImportPath}';
-import schema from '${schemaOutImportPath}';
-
-`;
-    for (let i = 0; i < segments.length; i++) {
-        const { routeFilePath, segmentName } = segments[i];
-        const schema = segmentsSchema[segmentName];
-        if (!schema) {
-            throw new Error(`Unable to generate client. No schema found for ${formatLoggedSegmentName(segmentName)}`);
-        }
-        if (!schema.emitSchema)
-            continue;
-        const importRouteFilePath = path.relative(config.clientOutDir, routeFilePath);
-        dts += `import type { Controllers as Controllers${i}, Workers as Workers${i} } from "${importRouteFilePath}";\n`;
-        ts += `import type { Controllers as Controllers${i}, Workers as Workers${i} } from "${importRouteFilePath}";\n`;
-    }
-    dts += `
-type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
-`;
-    ts += `
-${validateOnClientImportPath ? `import validateOnClient from '${validateOnClientImportPath}';\n` : '\nconst validateOnClient = undefined;'}
-type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
-const prefix = '${apiEntryPoint}';
-`;
-    js += `
-const { default: validateOnClient = null } = ${validateOnClientImportPath ? `require('${validateOnClientImportPath}')` : '{}'};
-const prefix = '${apiEntryPoint}';
-`;
-    for (let i = 0; i < segments.length; i++) {
-        const { segmentName } = segments[i];
-        const schema = segmentsSchema[segmentName];
-        if (!schema) {
-            throw new Error(`Unable to generate client. No schema found for ${formatLoggedSegmentName(segmentName)}`);
-        }
-        if (!schema.emitSchema)
-            continue;
-        for (const key of Object.keys(schema.controllers)) {
-            dts += `export const ${key}: ReturnType<typeof clientizeController<Controllers${i}["${key}"], Options>>;\n`;
-            js += `exports.${key} = clientizeController(schema['${segmentName}'].controllers.${key}, '${segmentName}', { fetcher, validateOnClient, defaultOptions: { prefix } });\n`;
-            ts += `export const ${key} = clientizeController<Controllers${i}["${key}"], Options>(schema['${segmentName}'].controllers.${key}, '${segmentName}', { fetcher, validateOnClient, defaultOptions: { prefix } });\n`;
-        }
-        for (const key of Object.keys(schema.workers)) {
-            dts += `export const ${key}: ReturnType<typeof promisifyWorker<Workers${i}["${key}"]>>;\n`;
-            js += `exports.${key} = promisifyWorker(null, schema['${segmentName}'].workers.${key});\n`;
-            ts += `export const ${key} = promisifyWorker<Workers${i}["${key}"]>(null, schema['${segmentName}'].workers.${key});\n`;
-        }
-    }
-    const localJsAbsolutePath = path.join(clientoOutDirAbsolutePath, 'client.js');
-    const localDtsAbsolutePath = path.join(clientoOutDirAbsolutePath, 'client.d.ts');
-    const localTsAbsolutePath = path.join(clientoOutDirAbsolutePath, 'index.ts');
-    const existingJs = await fs.readFile(localJsAbsolutePath, 'utf-8').catch(() => '');
-    const existingDts = await fs.readFile(localDtsAbsolutePath, 'utf-8').catch(() => '');
-    const existingTs = await fs.readFile(localTsAbsolutePath, 'utf-8').catch(() => '');
-    if (config.prettifyClient) {
-        js = await prettify(js, localJsAbsolutePath);
-        dts = await prettify(dts, localDtsAbsolutePath);
-        ts = await prettify(ts, localTsAbsolutePath);
-    }
-    if (existingJs === js && existingDts === dts && existingTs === ts) {
-        log.debug(`Client is up to date and doesn't need to be regenerated (${Date.now() - now}ms)`);
-        return { written: false, path: clientoOutDirAbsolutePath };
-    }
-    await fs.mkdir(clientoOutDirAbsolutePath, { recursive: true });
-    await fs.writeFile(localJsAbsolutePath, js);
-    await fs.writeFile(localDtsAbsolutePath, dts);
-    await fs.writeFile(localTsAbsolutePath, ts);
-    log.info(`Client generated in ${Date.now() - now}ms`);
-    return { written: true, path: clientoOutDirAbsolutePath };
-}

package/dist/watcher/diffSchema.d.mts

@@ -1,43 +0,0 @@
-import type { VovkSchema } from 'vovk';
-import { _VovkControllerSchema, _VovkWorkerSchema } from 'vovk/types';
-interface HandlersDiff {
-    nameOfClass: string;
-    added: string[];
-    removed: string[];
-    changed: string[];
-}
-interface WorkersOrControllersDiff {
-    added: string[];
-    removed: string[];
-    handlers: HandlersDiff[];
-}
-export interface DiffResult {
-    workers: WorkersOrControllersDiff;
-    controllers: WorkersOrControllersDiff;
-}
-export declare function diffHandlers<T extends _VovkWorkerSchema['_handlers'] | _VovkControllerSchema['_handlers']>(oldHandlers: T, newHandlers: T, nameOfClass: string): HandlersDiff;
-export declare function diffWorkersOrControllers<T extends VovkSchema['controllers'] | VovkSchema['workers']>(oldItems: T, newItems: T): WorkersOrControllersDiff;
-/**
-example output:
-{
-  workers: {
-    added: ["WorkerC"],
-    removed: ["WorkerA"],
-    handlers: []
-  },
-  controllers: {
-    added: ["ControllerC"],
-    removed: ["ControllerB"],
-    handlers: [
-      {
-        nameOfClass: "ControllerA",
-        added: ["handlerF"],
-        removed: [],
-        changed: ["handlerD"]
-      }
-    ]
-  }
-}
-*/
-export default function diffSchema(oldJson: VovkSchema, newJson: VovkSchema): DiffResult;
-export {};

package/dist/watcher/index.d.mts

@@ -1,6 +0,0 @@
-export declare class VovkCLIWatcher {
-    #private;
-    start({ clientOutDir }?: {
-        clientOutDir?: string;
-    }): Promise<void>;
-}

package/dist/watcher/logDiffResult.mjs

@@ -1,90 +0,0 @@
-import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
-import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
-export default function logDiffResult(segmentName, diffResult, projectInfo) {
-    const diffNormalized = [];
-    diffResult.workers.added.forEach((name) => {
-        diffNormalized.push({ what: 'worker', type: 'added', name });
-    });
-    diffResult.workers.removed.forEach((name) => {
-        diffNormalized.push({ what: 'worker', type: 'removed', name });
-    });
-    diffResult.workers.handlers.forEach((handler) => {
-        handler.added.forEach((name) => {
-            diffNormalized.push({ what: 'workerHandler', type: 'added', name: `${handler.nameOfClass}.${name}` });
-        });
-        handler.removed.forEach((name) => {
-            diffNormalized.push({ what: 'workerHandler', type: 'removed', name: `${handler.nameOfClass}.${name}` });
-        });
-        handler.changed.forEach((name) => {
-            diffNormalized.push({ what: 'workerHandler', type: 'changed', name: `${handler.nameOfClass}.${name}` });
-        });
-    });
-    diffResult.controllers.added.forEach((name) => {
-        diffNormalized.push({ what: 'controller', type: 'added', name });
-    });
-    diffResult.controllers.removed.forEach((name) => {
-        diffNormalized.push({ what: 'controller', type: 'removed', name });
-    });
-    diffResult.controllers.handlers.forEach((handler) => {
-        handler.added.forEach((name) => {
-            diffNormalized.push({ what: 'controllerHandler', type: 'added', name: `${handler.nameOfClass}.${name}` });
-        });
-        handler.removed.forEach((name) => {
-            diffNormalized.push({ what: 'controllerHandler', type: 'removed', name: `${handler.nameOfClass}.${name}` });
-        });
-        handler.changed.forEach((name) => {
-            diffNormalized.push({ what: 'controllerHandler', type: 'changed', name: `${handler.nameOfClass}.${name}` });
-        });
-    });
-    const LIMIT = diffNormalized.length < 12 ? diffNormalized.length : 10;
-    for (const diffNormalizedItem of diffNormalized.slice(0, LIMIT)) {
-        switch (diffNormalizedItem.what) {
-            case 'worker':
-                switch (diffNormalizedItem.type) {
-                    case 'added':
-                        projectInfo.log.info(`Schema for worker ${chalkHighlightThing(diffNormalizedItem.name)} has been added at ${formatLoggedSegmentName(segmentName)}`);
-                        break;
-                    case 'removed':
-                        projectInfo.log.info(`Schema for worker ${chalkHighlightThing(diffNormalizedItem.name)} has been removed from ${formatLoggedSegmentName(segmentName)}`);
-                        break;
-                }
-                break;
-            case 'controller':
-                switch (diffNormalizedItem.type) {
-                    case 'added':
-                        projectInfo.log.info(`Schema for controller ${chalkHighlightThing(diffNormalizedItem.name)} has been added at ${formatLoggedSegmentName(segmentName)}`);
-                        break;
-                    case 'removed':
-                        projectInfo.log.info(`Schema for controller ${chalkHighlightThing(diffNormalizedItem.name)} has been removed from ${formatLoggedSegmentName(segmentName)}`);
-                        break;
-                }
-                break;
-            case 'workerHandler':
-                switch (diffNormalizedItem.type) {
-                    case 'added':
-                        projectInfo.log.info(`Schema for worker method ${chalkHighlightThing(diffNormalizedItem.name)} has been added at ${formatLoggedSegmentName(segmentName)}`);
-                        break;
-                    case 'removed':
-                        projectInfo.log.info(`Schema for worker method ${chalkHighlightThing(diffNormalizedItem.name)} has been removed from ${formatLoggedSegmentName(segmentName)}`);
-                        break;
-                }
-                break;
-            case 'controllerHandler':
-                switch (diffNormalizedItem.type) {
-                    case 'added':
-                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been added at ${formatLoggedSegmentName(segmentName)}`);
-                        break;
-                    case 'removed':
-                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been removed from ${formatLoggedSegmentName(segmentName)}`);
-                        break;
-                    case 'changed':
-                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been changed at ${formatLoggedSegmentName(segmentName)}`);
-                        break;
-                }
-                break;
-        }
-    }
-    if (diffNormalized.length > LIMIT) {
-        projectInfo.log.info(`... and ${diffNormalized.length - LIMIT} more changes`);
-    }
-}

package/templates/worker.ejs

@@ -1 +0,0 @@
-// TODO