vovk 1.0.0 → 1.0.2

package/README.md

@@ -33,7 +33,8 @@ Misc
 - Update personal README
 
 General:
-- Merge and remove v1 branches
+- Remove v1 branches
+- Update deps of all projects to v1
 */
 
 -->

package/cli/getVars.js

@@ -4,7 +4,7 @@ const path = require('path');
 
 /** @type {import('../src').VovkEnv} */
 let vars;
-/** @type {(rcPath: string, options?: { VOVK_CLIENT_OUT?: string; PORT?: string; }) => import('../src').VovkEnv} */
+/** @type {(configPath: string, options?: { VOVK_CLIENT_OUT?: string; PORT?: string; }) => import('../src').VovkEnv} */
 function getVars(configPath, options = {}) {
   if (vars) return vars;
   /** @type {Required<import('../src').VovkConfig>} */

package/cli/lib/parseCommandLineArgs.js

@@ -7,25 +7,35 @@ function toCamelCase(str) {
 
 /** @typedef {{ config?: string; project?: string; clientOut?: string; noNextDev?: true }} Flags */
 /** @typedef {'dev' | 'build' | 'generate' | 'help'} Command */
+/** @type {() => { command: Command | null; flags: Flags; restArgs: string }} */
 function parseCommandLineArgs() {
   const args = process.argv.slice(2); // Slice off node and script path
-  let command = /** @type {Command} */ null;
+  const unparsedIndex = args.indexOf('--');
+  const commandArgs = unparsedIndex !== -1 ? args.slice(0, unparsedIndex) : args;
+  const restArgs = unparsedIndex !== -1 ? args.slice(unparsedIndex + 1).join(' ') : '';
+
+  let command = /** @type {Command | null} */ (null);
   /** @type {Flags} */
   const flags = {};
-  /** @type {string[]} */
-  const unparsedArgs = [];
-
-  let isUnparsed = false;
-  for (const arg of args) {
-    if (arg === '--') {
-      isUnparsed = true;
-      continue;
-    }
 
-    if (isUnparsed) {
-      unparsedArgs.push(arg);
-    } else if (arg.startsWith('--')) {
-      const [key, value = true] = arg.slice(2).split('=');
+  for (let i = 0; i < commandArgs.length; i++) {
+    const arg = commandArgs[i];
+    if (arg.startsWith('--')) {
+      /** @type {string} */
+      let key = arg.slice(2);
+      /** @type {string | true} */
+      let value; // Assume flag is boolean unless a value is found
+
+      if (arg.includes('=')) {
+        [key, value] = arg.slice(2).split('=');
+      } else if (i + 1 < commandArgs.length && !commandArgs[i + 1].startsWith('--')) {
+        // Look ahead to next arg if it exists and is not a flag
+        value = commandArgs[i + 1];
+        i++; // Skip next arg since it's consumed as a value here
+      } else {
+        value = true;
+      }
+
       const camelKey = /** @type {keyof Flags} */ (toCamelCase(key));
       // @ts-expect-error Type 'string | true | undefined' is not assignable to type 'undefined'. Why?
       flags[camelKey] = /** @type {Flags[keyof Flags]} */ (value);
@@ -34,7 +44,7 @@ function parseCommandLineArgs() {
     }
   }
 
-  const restArgs = unparsedArgs.join(' ');
+  if (!command) throw new Error('No command provided');
 
   return { command, flags, restArgs };
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "vovk",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Structural add-on for Next.js",
   "bin": "./cli/index.js",
   "scripts": {
     "postinstall": "node ./cli/postinstall.js",
     "upgrade": "npx npm-check-updates -u && npm i",
-    "test": "npm run lint-nofix && tsc --noemit && tsc --project tsconfig.cli.json --noemit && npm run unit",
+    "test": "npm --prefix test run generate && npm run lint-nofix && tsc --noemit && tsc --project tsconfig.cli.json --noemit && npm run unit",
     "unit": "PORT=3210 concurrently \"sleep 20 && npm run test:unit\" \"npm run serve:unit\" --kill-others --success first",
     "unit:watch": "PORT=3210 concurrently \"sleep 20 && npm run test:unit:watch\" \"npm run serve:unit\" --kill-others --success first",
     "test:unit": "jest",