Merge pull request #12 from yassun7010/fix-select-schema

Fix: select argument schema.

Author: ya7010

.vscode/settings.json

@@ -19,7 +19,7 @@
     "python.globalModuleInstallation": true,
     "python.testing.pytestEnabled": true,
     "yaml.schemas": {
-        "docs/config.schema.json": "samples/**/*.yaml",
+        "docs/config.schema.json": ["samples/**/*.yaml", "tests/data/config/*.yaml"],
     },
     "[python]": {
         "editor.codeActionsOnSave": {

cmdcomp/v2/command/argument/select_argument.py

@@ -1,12 +1,9 @@
-from collections import OrderedDict
 from functools import cached_property
 from typing import Annotated, Literal
 
 from pydantic import Field
 
-from cmdcomp.exception import NeverReach
 from cmdcomp.model import Model
-from cmdcomp.v2.command.argument.value_argument import V2ValueArgument
 from cmdcomp.v2.mixin.has_alias import HasAlias
 
 
@@ -24,30 +21,18 @@ class V2SelectArgument(HasAlias, Model):
     )
 
     raw_values: Annotated[
-        list[str | V2ValueArgument] | OrderedDict[str, str | V2ValueArgument],
+        str | list[str],
         Field(
             title="candidate selection.",
             alias="values",
         ),
     ]
 
     @cached_property
-    def values(self) -> list[V2ValueArgument]:
+    def values(self) -> list[str]:
         match self.raw_values:
             case str():
-                return [V2ValueArgument(value=self.raw_values)]
+                return [self.raw_values]
 
             case list():
-                return [
-                    v if isinstance(v, V2ValueArgument) else V2ValueArgument(value=v)
-                    for v in self.raw_values
-                ]
-
-            case OrderedDict():
-                return [
-                    V2ValueArgument(value=v) if isinstance(v, str) else v
-                    for v in self.raw_values.values()
-                ]
-
-            case _:
-                raise NeverReach(self.raw_values)
+                return self.raw_values

cmdcomp/v2/command/argument/value_argument.py

@@ -5,7 +5,7 @@
 {%- macro argument_completion(argument) -%}
 {% if argument.type == "select" -%}
 if [ $cur -eq $COMP_CWORD ] ; then
-  COMPREPLY=( $(compgen -W "{{ argument.values|map(attribute='value')|join(" ") }}" -- "$cur") )
+  COMPREPLY=( $(compgen -W "{{ argument.values|join(" ") }}" -- "$cur") )
 
   return 0
 else

cmdcomp/v2/templates/bash.sh.jinja

@@ -18,7 +18,7 @@
 {#- macro def -#}
 {%- macro contents(arg_name, argument) -%}
   {%- if argument.type == 'select' -%}
-          :values:{{ "(" + argument.values|map(attribute='value')|join(" ") + ")" }}
+          :values:{{ "(" + argument.values|join(" ") + ")" }}
   {%- elif argument.type == 'file' -%}
           :file:_files{%- if argument.base_path is not none %} -W "{{ argument.base_path }}"{%- endif -%}
   {%- elif argument.type == 'command' -%}