@optique/core 1.0.15-dev.2792 → 1.0.15-dev.2812

package/dist/completion.cjs

@@ -913,6 +913,16 @@ complete -c ${programName} -f -a '(${functionName})'
 	}
 };
 /**
+* Quotes a string as a Nushell string literal.  Nushell single-quoted strings
+* have no escape sequences, so a value containing an apostrophe is written as
+* a double-quoted string, in which only backslashes and double quotes need
+* escaping.
+*/
+function quoteNuString(value) {
+	if (!value.includes("'")) return `'${value}'`;
+	return `"${value.replace(/["\\]/g, "\\$&")}"`;
+}
+/**
 * The Nushell completion generator.
 * @since 0.6.0
 */
@@ -920,7 +930,7 @@ const nu = {
 	name: "nu",
 	generateScript(programName, args = []) {
 		validateProgramName(programName);
-		const escapedArgs = args.map((arg) => `'${arg.replace(/'/g, "''")}'`).join(" ");
+		const escapedArgs = args.map(quoteNuString).join(" ");
 		const safeName = programName.replace(/[^a-zA-Z0-9]+/g, "-");
 		const functionName = `nu-complete-${safeName}`;
 		return `
@@ -1269,23 +1279,11 @@ Register-ArgumentCompleter -Native -CommandName ${programName} -ScriptBlock {
     \$arguments = @()
     \$commandElements = \$commandAst.CommandElements
 
-    # Determine the range of elements to extract
-    # Exclude the last element if it matches wordToComplete (partial input case)
-    \$maxIndex = \$commandElements.Count - 1
-    if (\$commandElements.Count -gt 1) {
-        \$lastElement = \$commandElements[\$commandElements.Count - 1]
-        \$lastText = if (\$lastElement -is [System.Management.Automation.Language.StringConstantExpressionAst]) {
-            \$lastElement.Value
-        } else {
-            \$lastElement.Extent.Text
-        }
-        if (\$lastText -eq \$wordToComplete) {
-            \$maxIndex = \$commandElements.Count - 2
-        }
-    }
-
-    for (\$i = 1; \$i -le \$maxIndex; \$i++) {
+    # Keep only complete arguments before the cursor.  The current word
+    # (including a token ending exactly at the cursor) is appended below.
+    for (\$i = 1; \$i -lt \$commandElements.Count; \$i++) {
         \$element = \$commandElements[\$i]
+        if (\$element.Extent.EndOffset -ge \$cursorPosition) { break }
 
         if (\$element -is [System.Management.Automation.Language.StringConstantExpressionAst]) {
             \$arguments += \$element.Value

package/dist/completion.js

@@ -913,6 +913,16 @@ complete -c ${programName} -f -a '(${functionName})'
 	}
 };
 /**
+* Quotes a string as a Nushell string literal.  Nushell single-quoted strings
+* have no escape sequences, so a value containing an apostrophe is written as
+* a double-quoted string, in which only backslashes and double quotes need
+* escaping.
+*/
+function quoteNuString(value) {
+	if (!value.includes("'")) return `'${value}'`;
+	return `"${value.replace(/["\\]/g, "\\$&")}"`;
+}
+/**
 * The Nushell completion generator.
 * @since 0.6.0
 */
@@ -920,7 +930,7 @@ const nu = {
 	name: "nu",
 	generateScript(programName, args = []) {
 		validateProgramName(programName);
-		const escapedArgs = args.map((arg) => `'${arg.replace(/'/g, "''")}'`).join(" ");
+		const escapedArgs = args.map(quoteNuString).join(" ");
 		const safeName = programName.replace(/[^a-zA-Z0-9]+/g, "-");
 		const functionName = `nu-complete-${safeName}`;
 		return `
@@ -1269,23 +1279,11 @@ Register-ArgumentCompleter -Native -CommandName ${programName} -ScriptBlock {
     \$arguments = @()
     \$commandElements = \$commandAst.CommandElements
 
-    # Determine the range of elements to extract
-    # Exclude the last element if it matches wordToComplete (partial input case)
-    \$maxIndex = \$commandElements.Count - 1
-    if (\$commandElements.Count -gt 1) {
-        \$lastElement = \$commandElements[\$commandElements.Count - 1]
-        \$lastText = if (\$lastElement -is [System.Management.Automation.Language.StringConstantExpressionAst]) {
-            \$lastElement.Value
-        } else {
-            \$lastElement.Extent.Text
-        }
-        if (\$lastText -eq \$wordToComplete) {
-            \$maxIndex = \$commandElements.Count - 2
-        }
-    }
-
-    for (\$i = 1; \$i -le \$maxIndex; \$i++) {
+    # Keep only complete arguments before the cursor.  The current word
+    # (including a token ending exactly at the cursor) is appended below.
+    for (\$i = 1; \$i -lt \$commandElements.Count; \$i++) {
         \$element = \$commandElements[\$i]
+        if (\$element.Extent.EndOffset -ge \$cursorPosition) { break }
 
         if (\$element -is [System.Management.Automation.Language.StringConstantExpressionAst]) {
             \$arguments += \$element.Value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.15-dev.2792",
+  "version": "1.0.15-dev.2812",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",