@gutenye/script.js 2.7.1 → 2.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gutenye/script.js",
-  "version": "2.7.1",
+  "version": "2.7.3",
   "description": "Write shell scripts in JavaScript",
   "keywords": [
     "shell",

package/src/Command.ts

@@ -1,6 +1,6 @@
 import { Argument } from './Argument'
-import { Option } from './Option'
 import { installCompletion } from './completion'
+import { Option } from './Option'
 import { parseArgv } from './parseArgv'
 
 export class Command {

package/src/ake/completions/ake.fish

@@ -1,6 +1,10 @@
 function _setup_ake_complete
 	set cmd $argv[1]
-	set suffix $argv[2]
+	if set -q argv[2]
+			set suffix $argv[2]
+	else
+			set suffix ''
+	end
 	complete --erase $cmd$suffix
 	complete --command $cmd$suffix --no-files --arguments "(_ake_complete $suffix)"
 end

package/src/ake/shared.ts

@@ -1,6 +1,6 @@
 import fsSync from 'node:fs'
-import path from 'node:path'
 import os from 'node:os'
+import path from 'node:path'
 import fs from '../utils/fs'
 
 const HOME = os.homedir()

package/src/completion.ts

@@ -2,8 +2,8 @@ import fsSync from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import * as yaml from 'yaml'
-import type { Command } from './Command'
 import { getAkeSuffix, getCompletionName } from './ake/shared'
+import type { Command } from './Command'
 
 export type CompletionValue = string[] | (() => string[])
 
@@ -60,11 +60,12 @@ export function buildSpec(command: Command): CarapaceSpec {
   for (const opt of command.options) {
     spec.flags = spec.flags || {}
     let flag = [opt.short, opt.long].filter(Boolean).join(', ')
+    const values = resolveCompletion(opt.completion)
     if (opt.required) flag += '='
     else if (opt.optional) flag += '=?'
+    else if (values.length > 0) flag += '='
     spec.flags[flag] = opt.description
 
-    const values = resolveCompletion(opt.completion)
     if (values.length > 0) {
       completion.flag = completion.flag || {}
       const key = opt.long?.replace(/^--/, '') || opt.attributeName

package/src/frequent-used-helpers.ts

@@ -1,5 +1,7 @@
-export function exitWithError(message: string, help?: string) {
+export function exitWithError(message: string, help?: string): never {
   console.error(`\nError: ${message}`)
-  if (help) console.log(`\n${help}`)
+  if (help) {
+    console.log(`\n${help}`)
+  }
   process.exit(1)
 }