vovk-cli 0.0.1-draft.29 → 0.0.1-draft.30

package/dist/dev/index.d.mts

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

package/dist/dev/index.mjs

@@ -181,8 +181,8 @@ export class VovkDev {
                 const schema = this.#schemas[s.segmentName];
                 if (!schema)
                     return false;
-                const controllersByOriginalName = keyBy(schema.controllers, '_originalControllerName');
-                const workersByOriginalName = keyBy(schema.workers, '_originalWorkerName');
+                const controllersByOriginalName = keyBy(schema.controllers, 'originalControllerName');
+                const workersByOriginalName = keyBy(schema.workers, 'originalWorkerName');
                 return namesOfClasses.some((name) => schema.controllers[name] ||
                     schema.workers[name] ||
                     controllersByOriginalName[name] ||
@@ -194,6 +194,9 @@ export class VovkDev {
                     await this.#requestSchema(segment.segmentName);
                 }
             }
+            else {
+                log.debug(`The class ${namesOfClasses.join(', ')} does not belong to any segment`);
+            }
         }
         else {
             log.debug(`The file does not contain any controller or worker`);
@@ -256,8 +259,8 @@ export class VovkDev {
             await generateClient(this.#projectInfo, this.#segments, this.#schemas);
         }
     }
-    async start({ clientOutDir } = {}) {
-        this.#projectInfo = await getProjectInfo({ clientOutDir });
+    async start() {
+        this.#projectInfo = await getProjectInfo();
         const { log, config, cwd, apiDir } = this.#projectInfo;
         if (config.devHttps) {
             const agent = new Agent({

package/dist/index.mjs

@@ -18,7 +18,6 @@ initProgram(program.command('init'));
 program
     .command('dev')
     .description('Start schema watcher (optional flag --next-dev to start it with Next.js)')
-    .option('--client-out <path>', 'Path to client output directory')
     .option('--next-dev', 'Start schema watcher and Next.js with automatic port allocation', false)
     .allowUnknownOption(true)
     .action(async (options, command) => {
@@ -36,16 +35,16 @@ program
     }
     if (options.nextDev) {
         const { result } = concurrently([
-            {
-                command: `node ${import.meta.dirname}/dev/index.mjs`,
-                name: 'Vovk Dev Command',
-                env: Object.assign({ PORT, __VOVK_START_WATCHER_IN_STANDALONE_MODE__: 'true' }, options.clientOut ? { VOVK_CLIENT_OUT_DIR: options.clientOut } : {}),
-            },
             {
                 command: `npx next dev ${command.args.join(' ')}`,
                 name: 'Next.js Development Server',
                 env: { PORT },
             },
+            {
+                command: `node ${import.meta.dirname}/dev/index.mjs`,
+                name: 'Vovk Dev Command',
+                env: { PORT, __VOVK_START_WATCHER_IN_STANDALONE_MODE__: 'true' },
+            },
         ], {
             killOthers: ['failure', 'success'],
             prefix: 'none',
@@ -58,7 +57,7 @@ program
         }
     }
     else {
-        void new VovkDev().start({ clientOutDir: options.clientOut });
+        void new VovkDev().start();
     }
 });
 program

package/dist/init/updateNPMScripts.mjs

@@ -3,6 +3,7 @@ export default async function updateNPMScripts(root, updateScriptsMode) {
     const pkgJson = await NPMCliPackageJson.load(root);
     pkgJson.update({
         scripts: {
+            ...pkgJson.content.scripts,
             generate: 'vovk generate',
             dev: updateScriptsMode === 'explicit'
                 ? "PORT=3000 concurrently 'next dev' 'vovk dev' --kill-others"

package/dist/types.d.mts

@@ -45,7 +45,6 @@ export type VovkModuleRenderResult = {
     code: string;
 };
 export interface DevOptions {
-    clientOut?: string;
     nextDev?: boolean;
 }
 export interface GenerateOptions {

package/dist/utils/debounceWithArgs.mjs

@@ -6,9 +6,6 @@ export default function debounceWithArgs(fn, wait) {
         if (!debouncedFunctions.has(key)) {
             debouncedFunctions.set(key, debounce(fn, wait));
         }
-        const debouncedFn = debouncedFunctions.get(key);
-        if (debouncedFn) {
-            debouncedFn(...args);
-        }
+        return debouncedFunctions.get(key)(...args);
     };
 }

package/package.json

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