vovk-cli 0.0.1-draft.355 → 0.0.1-draft.358

package/dist/index.mjs

@@ -94,7 +94,7 @@ program
     .option('--schema, --schema-path <path>', 'path to schema folder (default: ./.vovk-schema)')
     .option('--config, --config-path <config>', 'path to config file')
     .option('--origin <url>', 'set the origin URL for the generated client')
-    .option('--watch <s>', 'watch for changes in schema or openapi spec and regenerate client; accepts a number in seconds to throttle the watcher or make an HTTP request to the OpenAPI spec URL', false)
+    .option('--watch [s]', 'watch for changes in schema or openapi spec and regenerate client; accepts a number in seconds to throttle the watcher or make an HTTP request to the OpenAPI spec URL')
     .option('--openapi, --openapi-spec <openapi_path_or_urls...>', 'use OpenAPI schema for client generation')
     .option('--openapi-module-name, --openapi-get-module-name <names...>', 'module names corresponding to the index of --openapi option')
     .option('--openapi-method-name, --openapi-get-method-name <names...>', 'method names corresponding to the index of --openapi option')

package/dist/init/index.mjs

@@ -20,7 +20,7 @@ export class Init {
     log;
     async #init({ configPaths, pkgJson, }, { useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, lang, dryRun, channel, }) {
         const { log, root } = this;
-        const dependencies = ['vovk', 'vovk-client', 'openapi3-ts', 'vovk-ajv', 'ajv'];
+        const dependencies = ['vovk', 'vovk-client', 'vovk-ajv'];
         const devDependencies = ['vovk-cli'];
         if (lang?.includes('py')) {
             devDependencies.push('vovk-python');
@@ -50,7 +50,7 @@ export class Init {
         }
         if (updateScripts) {
             try {
-                if (!dryRun)
+                if (!dryRun && pkgJson)
                     await updateNPMScripts(pkgJson, root, updateScripts);
                 log.info('Updated scripts at package.json');
             }
@@ -79,7 +79,7 @@ export class Init {
                 log.error(`Failed to update tsconfig.json: ${error.message}`);
             }
         }
-        if (!dryRun) {
+        if (!dryRun && pkgJson) {
             let depsUpdated = false;
             try {
                 await updateDependenciesWithoutInstalling({
@@ -152,7 +152,7 @@ export class Init {
         const cwd = process.cwd();
         const root = path.resolve(cwd, prefix ?? '.');
         const log = getLogger(logLevel ?? 'info');
-        const pkgJson = await NPMCliPackageJson.load(root);
+        const pkgJson = await NPMCliPackageJson.load(root).catch(() => null);
         this.root = root;
         this.log = log;
         const configPaths = await getConfigPaths({ cwd, relativePath: prefix });
@@ -215,28 +215,30 @@ export class Init {
                             { name: 'None', value: null, description: 'Install validation library later' },
                         ],
                     })));
-        updateScripts ??= await select({
-            message: 'Do you want to update "dev" and add "prebuild" NPM scripts at package.json?',
-            default: 'implicit',
-            choices: [
-                {
-                    name: 'Yes, use "concurrently" implicitly',
-                    value: 'implicit',
-                    description: `The "dev" script will use "concurrently" API to run "next dev" and "vovk dev" commands together and automatically find an available port ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'implicit')}"`)} and the "prebuild" script will run "vovk generate"`,
-                },
-                {
-                    name: 'Yes, use "concurrently" explicitly',
-                    value: 'explicit',
-                    description: `The "dev" script will use pre-defined PORT variable and run "next dev" and "vovk dev" as "concurrently" CLI arguments ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'explicit')}"`)} and the "prebuild" script will run "vovk generate"`,
-                },
-                {
-                    name: 'No',
-                    value: undefined,
-                    description: 'Add the NPM scripts manually',
-                },
-            ],
-        });
-        if (typeof updateTsConfig === 'undefined') {
+        updateScripts ??= !pkgJson
+            ? undefined
+            : await select({
+                message: 'Do you want to update "dev" and add "prebuild" NPM scripts at package.json?',
+                default: 'implicit',
+                choices: [
+                    {
+                        name: 'Yes, use "concurrently" implicitly',
+                        value: 'implicit',
+                        description: `The "dev" script will use "concurrently" API to run "next dev" and "vovk dev" commands together and automatically find an available port ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'implicit')}"`)} and the "prebuild" script will run "vovk generate"`,
+                    },
+                    {
+                        name: 'Yes, use "concurrently" explicitly',
+                        value: 'explicit',
+                        description: `The "dev" script will use pre-defined PORT variable and run "next dev" and "vovk dev" as "concurrently" CLI arguments ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'explicit')}"`)} and the "prebuild" script will run "vovk generate"`,
+                    },
+                    {
+                        name: 'No',
+                        value: undefined,
+                        description: 'Add the NPM scripts manually',
+                    },
+                ],
+            });
+        if (typeof updateTsConfig === 'undefined' && pkgJson) {
             let shouldAsk = false;
             try {
                 shouldAsk = !(await checkTSConfigForExperimentalDecorators(root)); // TODO also check for emitDecoratorMetadata when vovk-dto is used

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.355",
+  "version": "0.0.1-draft.358",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,9 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.415"
+    "vovk": "^3.0.0-draft.419",
+    "vovk-ajv": "^0.0.0-draft.101",
+    "vovk-client": "^0.0.4-draft.129"
   },
   "optionalDependencies": {
     "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.36"