Update: support v2.

Author: ya7010

.vscode/settings.json

@@ -37,8 +37,7 @@
     "python.linting.pylintEnabled": false,
     "python.testing.pytestEnabled": true,
     "yaml.schemas": {
-        "docs/config.schema.json": "samples/v1/**/*.yaml",
-        "docs/v2_config.schema.json": "samples/v2/**/*.yaml",
+        "docs/config.schema.json": "samples/**/*.yaml",
     },
     "[python]": {
         "editor.codeActionsOnSave": {

cmdcomp/completion.py

@@ -3,17 +3,17 @@
 from cmdcomp.shell import ShellType
 from cmdcomp.v1.completion import generate_v1
 from cmdcomp.v1.config import V1Config
+from cmdcomp.v2.completion import generate_v2
+from cmdcomp.v2.config import V2Config
 
 
 def generate(shell: ShellType, config: Config) -> str:
     match config.root:
         case V1Config():
             return generate_v1(shell, config.root)
 
-        # TODO: V2Config is still in draft.
-        #
-        # case V2Config():
-        #     return generate_v2(shell, config.root)
+        case V2Config():
+            return generate_v2(shell, config.root)
 
         case _:
             raise NeverReach(config.root)

cmdcomp/config.py

@@ -7,12 +7,13 @@
 from pydantic import RootModel
 
 from cmdcomp.v1.config import V1Config
+from cmdcomp.v2.config import V2Config
 
 
 class Config(RootModel):
     """cmdcomp config."""
 
-    root: V1Config
+    root: V1Config | V2Config
 
 
 def load(file: BinaryIO) -> Config:

cmdcomp/v2/__init__.py

@@ -1,10 +0,0 @@
-"""
-Version 2 of the config module.
-
-It's a draft.
-
-Upgrade Plan.
-
-- Support Keywords and positional arguments.
-
-"""