yuque-cli 0.2.0__tar.gz → 1.0.0__tar.gz

yuque_cli-1.0.0/.claude/settings.json

@@ -0,0 +1,15 @@
+{
+  "hooks": {
+    "Stop": [
+      {
+        "matcher": "EDIT|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "if git diff --name-only HEAD 2>/dev/null | grep -q '^src/\\|^pyproject.toml'; then current=$(grep '^version = ' pyproject.toml | head -1 | sed 's/version = \"\\(.*\\)\"/\\1/'); IFS='.' read -r major minor patch <<< \"$current\"; new=\"$major.$minor.$((patch + 1))\"; sed -i '' \"s/^version = \\\".*\\\"/version = \\\"$new\\\"/\" pyproject.toml && echo \"[版本升级] $current → $new (patch)\"; fi"
+          }
+        ]
+      }
+    ]
+  }
+}

{yuque_cli-0.2.0 → yuque_cli-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yuque-cli
-Version: 0.2.0
+Version: 1.0.0
 Summary: 针对语雀的命令行客户端：cookie 认证，驱动内部 web 接口，提供文档与评论的 CRUD
 Requires-Python: >=3.10
 Requires-Dist: httpx>=0.27
@@ -101,12 +101,12 @@ yuque -y doc delete team/handbook/old-draft
 | 命令 | 说明 |
 | --- | --- |
 | `comment list <space>/<repo>/<slug>` | 列出评论 |
-| `comment add <space>/<repo>/<slug> [-b/--body \| -F/--file]` | 添加评论 |
+| `comment create <space>/<repo>/<slug> [-b/--body \| -F/--file]` | 添加评论 |
 | `comment delete <comment_id>` | 删除评论 |
 
 ## 正文输入
 
-`doc create` / `comment add` 正文来源（`--body` 与 `--file` 互斥）：
+`doc create` / `comment create` 正文来源（`--body` 与 `--file` 互斥）：
 
 1. `-b/--body` 内联字符串
 2. `-F/--file` 从文件读（`-F -` 读 stdin）

{yuque_cli-0.2.0 → yuque_cli-1.0.0}/README.md

@@ -91,12 +91,12 @@ yuque -y doc delete team/handbook/old-draft
 | 命令 | 说明 |
 | --- | --- |
 | `comment list <space>/<repo>/<slug>` | 列出评论 |
-| `comment add <space>/<repo>/<slug> [-b/--body \| -F/--file]` | 添加评论 |
+| `comment create <space>/<repo>/<slug> [-b/--body \| -F/--file]` | 添加评论 |
 | `comment delete <comment_id>` | 删除评论 |
 
 ## 正文输入
 
-`doc create` / `comment add` 正文来源（`--body` 与 `--file` 互斥）：
+`doc create` / `comment create` 正文来源（`--body` 与 `--file` 互斥）：
 
 1. `-b/--body` 内联字符串
 2. `-F/--file` 从文件读（`-F -` 读 stdin）

{yuque_cli-0.2.0 → yuque_cli-1.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "yuque-cli"
-version = "0.2.0"
+version = "1.0.0"
 description = "针对语雀的命令行客户端：cookie 认证，驱动内部 web 接口，提供文档与评论的 CRUD"
 readme = "README.md"
 requires-python = ">=3.10"

{yuque_cli-0.2.0 → yuque_cli-1.0.0}/src/yuque_cli/cli.py

@@ -86,7 +86,7 @@ def cli_errors():
         raise typer.Exit(1)
 
 
-def build_client(state: AppState) -> Client:
+def build_client(state: AppState, host_hint: str | None = None) -> Client:
     sess = session.load(config.session_file())
     hooks: dict[str, list[Callable[..., Any]]] = {}
     if state.verbose:
@@ -99,7 +99,8 @@ def build_client(state: AppState) -> Client:
     # trust_env=False：默认直连，绕开 *_proxy 环境变量（如本地 Clash 的 socks5 代理）——
     # 避免请求被本地代理拦截，也免去 SOCKS 需 socksio 的崩溃。如需经代理访问，移除此参数并装 httpx[socks]。
     http = httpx.Client(timeout=30.0, event_hooks=hooks, trust_env=False)
-    return Client(http, sess, base_url=config.base_url(state.host))
+    # --host 显式指定优先；否则从 URL 提取的 host 作为 fallback
+    return Client(http, sess, base_url=config.base_url(state.host or host_hint))
 
 
 def _pager(text: str) -> None:
@@ -320,7 +321,7 @@ def repo_get(
     state: AppState = ctx.obj
     with cli_errors():
         ref = _resolve_repo_ref(url, space, repo)
-        client = build_client(state)
+        client = build_client(state, host_hint=ref.host)
         repo_id = client.resolve_repo_id(ref.space, ref.repo)
         data = client.repo_overview(repo_id)
         docs = client.repo_docs(repo_id)
@@ -351,7 +352,7 @@ def doc_list(ctx: typer.Context, url: UrlArg) -> None:
     with cli_errors():
         assert url is not None
         ref = parse_repo_ref(url)
-        client = build_client(state)
+        client = build_client(state, host_hint=ref.host)
         repo_id = client.resolve_repo_id(ref.space, ref.repo)
         docs = client.repo_docs(repo_id)
         _emit(state, docs, output.render_docs(docs))
@@ -364,7 +365,7 @@ def doc_get(ctx: typer.Context, url: UrlArg) -> None:
     with cli_errors():
         assert url is not None
         ref = parse_doc_ref(url)
-        client = build_client(state)
+        client = build_client(state, host_hint=ref.host)
         if state.json:
             app_data = client.doc_page_app_data(ref.space, ref.repo, ref.slug)
             detail = client.doc_detail(ref.slug, appdata_repo_id(app_data))
@@ -404,13 +405,13 @@ def doc_create(
             raise YuqueError("--title 为必填项")
         ref = _resolve_repo_ref(url, space, repo)
         text = _read_body(body, file)
-        client = build_client(state)
+        client = build_client(state, host_hint=ref.host)
         repo_id = client.resolve_repo_id(ref.space, ref.repo)
         pub = None if public is None else (1 if public else 0)
         created = client.create_doc(
             repo_id=repo_id, title=title, body=text, slug=slug, public=pub
         )
-        url_out = f"{config.base_url(state.host)}/{ref.space}/{ref.repo}/{created.get('slug', '')}"
+        url_out = f"{config.base_url(state.host or ref.host)}/{ref.space}/{ref.repo}/{created.get('slug', '')}"
         _emit(state, created, f"已创建：{url_out}")
 
 
@@ -433,7 +434,7 @@ def doc_update(
                 "没有要更新的字段（至少给 --title / 正文 / --public|--private 之一）"
             )
         ref = _resolve_doc_ref(url, space, repo)
-        client = build_client(state)
+        client = build_client(state, host_hint=ref.host)
         app_data = client.doc_page_app_data(ref.space, ref.repo, ref.slug)
         doc_id = appdata_doc_id(app_data)
         meta = app_data.get("doc", {})
@@ -446,7 +447,7 @@ def doc_update(
         updated = client.update_doc(
             doc_id=doc_id, title=new_title, body=new_body, public=new_public
         )
-        url_out = f"{config.base_url(state.host)}/{ref.space}/{ref.repo}/{ref.slug}"
+        url_out = f"{config.base_url(state.host or ref.host)}/{ref.space}/{ref.repo}/{ref.slug}"
         _emit(state, updated, f"已更新：{url_out}")
 
 
@@ -457,7 +458,7 @@ def doc_delete(ctx: typer.Context, url: UrlArg) -> None:
     with cli_errors():
         assert url is not None
         ref = parse_doc_ref(url)
-        client = build_client(state)
+        client = build_client(state, host_hint=ref.host)
         app_data = client.doc_page_app_data(ref.space, ref.repo, ref.slug)
         doc_id = appdata_doc_id(app_data)
         title = app_data.get("doc", {}).get("title", ref.slug)
@@ -476,7 +477,7 @@ def comment_list(ctx: typer.Context, url: UrlArg) -> None:
     with cli_errors():
         assert url is not None
         ref = parse_doc_ref(url)
-        client = build_client(state)
+        client = build_client(state, host_hint=ref.host)
         _, doc_id = client.resolve_doc_ids(ref.space, ref.repo, ref.slug)
         items = client.comments(doc_id)
         _emit(state, items, output.render_comments(items))
@@ -488,8 +489,8 @@ SelectionOpt = Annotated[
 ]
 
 
-@comment_app.command("add")
-def comment_add(
+@comment_app.command("create")
+def comment_create(
     ctx: typer.Context,
     url: UrlArg,
     body: BodyOpt = None,
@@ -504,7 +505,7 @@ def comment_add(
         text = _read_body(body, file)
         if not text:
             raise YuqueError("评论正文不能为空（用 --body 或 --file/-）")
-        client = build_client(state)
+        client = build_client(state, host_hint=ref.host)
         _, doc_id = client.resolve_doc_ids(ref.space, ref.repo, ref.slug)
         if selection is not None:
             try:

{yuque_cli-0.2.0 → yuque_cli-1.0.0}/src/yuque_cli/urls.py

@@ -12,6 +12,7 @@ class UrlParseError(ValueError):
 class RepoRef:
     space: str
     repo: str
+    host: str | None = None
 
 
 @dataclass(frozen=True)
@@ -19,10 +20,11 @@ class DocRef:
     space: str
     repo: str
     slug: str
+    host: str | None = None
 
     @property
     def repo_ref(self) -> RepoRef:
-        return RepoRef(self.space, self.repo)
+        return RepoRef(self.space, self.repo, host=self.host)
 
 
 def _segments(raw: str) -> list[str]:
@@ -42,14 +44,28 @@ def _segments(raw: str) -> list[str]:
     return [seg for seg in path.split("/") if seg]
 
 
+def extract_host(raw: str) -> str | None:
+    """从完整 URL 或带 host 的路径中提取 host；无法识别时返回 None。"""
+    s = raw.strip()
+    if not s:
+        return None
+    if "://" in s:
+        return urlsplit(s).hostname
+    # 无 scheme：首段含 "." 即视为 host
+    parts = s.split("/")
+    if parts and "." in parts[0]:
+        return parts[0]
+    return None
+
+
 def parse_doc_ref(raw: str) -> DocRef:
     segs = _segments(raw)
-    if len(segs) != 3:
+    if len(segs) < 3:
         raise UrlParseError(
             f"文档地址应形如 {{space}}/{{repo}}/{{slug}}（三段），得到：{raw!r}"
         )
-    space, repo, slug = segs
-    return DocRef(space=space, repo=repo, slug=slug)
+    space, repo, slug = segs[:3]
+    return DocRef(space=space, repo=repo, slug=slug, host=extract_host(raw))
 
 
 def parse_repo_ref(raw: str) -> RepoRef:
@@ -60,4 +76,4 @@ def parse_repo_ref(raw: str) -> RepoRef:
         )
     if len(segs) > 3:
         raise UrlParseError(f"地址段数过多，无法识别为知识库：{raw!r}")
-    return RepoRef(space=segs[0], repo=segs[1])
+    return RepoRef(space=segs[0], repo=segs[1], host=extract_host(raw))

{yuque_cli-0.2.0 → yuque_cli-1.0.0}/test/test_cli.py

@@ -99,7 +99,7 @@ class FakeClient:
 @pytest.fixture
 def fake(monkeypatch):
     fc = FakeClient()
-    monkeypatch.setattr(cli, "build_client", lambda state: fc)
+    monkeypatch.setattr(cli, "build_client", lambda state, host_hint=None: fc)
     return fc
 
 
@@ -374,20 +374,20 @@ class TestComment:
 
     def test_add(self, fake):
         result = runner.invoke(
-            cli.app, ["comment", "add", "lg/bk/sl", "--body", "nice"]
+            cli.app, ["comment", "create", "lg/bk/sl", "--body", "nice"]
         )
         assert "已评论" in result.output
         assert calls(fake, "create_comment")[0][1] == {"doc_id": 88, "body": "nice"}
 
     def test_add_empty_body_errors(self, fake):
-        result = runner.invoke(cli.app, ["comment", "add", "lg/bk/sl"])
+        result = runner.invoke(cli.app, ["comment", "create", "lg/bk/sl"])
         assert result.exit_code == 1
         assert "评论正文不能为空" in result.output
 
     def test_add_with_selection(self, fake):
         sel = '{"paragraph_id":"u-pid","text":"hello","text_offset":0,"selection_range":{"start":{"id":"u-eid","text":"hello","offset":0,"paragraphId":"u-pid","paragraphOffset":0},"end":{"id":"u-eid","text":"hello","offset":3,"paragraphId":"u-pid","paragraphOffset":3}},"doc_version_id":123}'
         result = runner.invoke(
-            cli.app, ["comment", "add", "lg/bk/sl", "--body", "nice", "--selection", sel]
+            cli.app, ["comment", "create", "lg/bk/sl", "--body", "nice", "--selection", sel]
         )
         assert "已评论" in result.output
         kw = calls(fake, "create_comment")[0][1]
@@ -406,7 +406,7 @@ class TestComment:
 
     def test_add_with_selection_invalid_json_errors(self, fake):
         result = runner.invoke(
-            cli.app, ["comment", "add", "lg/bk/sl", "--body", "nice", "--selection", "not json"]
+            cli.app, ["comment", "create", "lg/bk/sl", "--body", "nice", "--selection", "not json"]
         )
         assert result.exit_code == 1
         assert "--selection JSON 解析失败" in result.output

{yuque_cli-0.2.0 → yuque_cli-1.0.0}/test/test_urls.py

@@ -4,6 +4,7 @@ from yuque_cli.urls import (
     RepoRef,
     DocRef,
     UrlParseError,
+    extract_host,
     parse_repo_ref,
     parse_doc_ref,
 )
@@ -12,15 +13,15 @@ from yuque_cli.urls import (
 class TestParseDocRef:
     def test_full_https_url(self):
         ref = parse_doc_ref("https://www.yuque.com/abc/team-book/my-slug")
-        assert ref == DocRef(space="abc", repo="team-book", slug="my-slug")
+        assert ref == DocRef(space="abc", repo="team-book", slug="my-slug", host="www.yuque.com")
 
     def test_http_scheme(self):
         ref = parse_doc_ref("http://www.yuque.com/abc/book/slug")
-        assert ref == DocRef("abc", "book", "slug")
+        assert ref == DocRef("abc", "book", "slug", host="www.yuque.com")
 
     def test_host_without_scheme(self):
         ref = parse_doc_ref("www.yuque.com/abc/book/slug")
-        assert ref == DocRef("abc", "book", "slug")
+        assert ref == DocRef("abc", "book", "slug", host="www.yuque.com")
 
     def test_path_only(self):
         ref = parse_doc_ref("abc/book/slug")
@@ -34,7 +35,7 @@ class TestParseDocRef:
 
     def test_strips_query_and_fragment(self):
         ref = parse_doc_ref("https://www.yuque.com/abc/book/slug?from=x#h1")
-        assert ref == DocRef("abc", "book", "slug")
+        assert ref == DocRef("abc", "book", "slug", host="www.yuque.com")
 
     def test_strips_surrounding_whitespace(self):
         assert parse_doc_ref("  abc/book/slug  ") == DocRef("abc", "book", "slug")
@@ -51,9 +52,12 @@ class TestParseDocRef:
         with pytest.raises(UrlParseError):
             parse_doc_ref("")
 
-    def test_too_many_segments_rejected(self):
-        with pytest.raises(UrlParseError):
-            parse_doc_ref("abc/book/slug/extra")
+    def test_extra_segments_use_first_three(self):
+        """多余的路径段（如 /edit）会被忽略，只取前三段。"""
+        assert parse_doc_ref("abc/book/slug/edit") == DocRef("abc", "book", "slug")
+        assert parse_doc_ref(
+            "https://www.yuque.com/abc/book/slug/edit"
+        ) == DocRef("abc", "book", "slug", host="www.yuque.com")
 
     def test_repo_ref_property(self):
         ref = parse_doc_ref("abc/book/slug")
@@ -63,7 +67,7 @@ class TestParseDocRef:
 class TestParseRepoRef:
     def test_full_https_url(self):
         assert parse_repo_ref("https://www.yuque.com/abc/team-book") == RepoRef(
-            "abc", "team-book"
+            "abc", "team-book", host="www.yuque.com"
         )
 
     def test_path_only(self):
@@ -73,7 +77,7 @@ class TestParseRepoRef:
         assert parse_repo_ref("abc/team-book/some-slug") == RepoRef("abc", "team-book")
 
     def test_host_stripped_and_trailing_slash(self):
-        assert parse_repo_ref("www.yuque.com/abc/book/") == RepoRef("abc", "book")
+        assert parse_repo_ref("www.yuque.com/abc/book/") == RepoRef("abc", "book", host="www.yuque.com")
 
     def test_space_only_is_rejected(self):
         with pytest.raises(UrlParseError):
@@ -82,3 +86,23 @@ class TestParseRepoRef:
     def test_empty_is_rejected(self):
         with pytest.raises(UrlParseError):
             parse_repo_ref("   ")
+
+
+class TestExtractHost:
+    def test_full_url(self):
+        assert extract_host("https://www.yuque.com/abc/book/slug") == "www.yuque.com"
+
+    def test_custom_domain(self):
+        assert extract_host("https://jlpay.yuque.com/pmw77l/iybc48/doc") == "jlpay.yuque.com"
+
+    def test_no_scheme_with_host(self):
+        assert extract_host("jlpay.yuque.com/abc/book/slug") == "jlpay.yuque.com"
+
+    def test_path_only(self):
+        assert extract_host("abc/book/slug") is None
+
+    def test_empty(self):
+        assert extract_host("") is None
+
+    def test_whitespace(self):
+        assert extract_host("  https://foo.com/a/b  ") == "foo.com"

{yuque_cli-0.2.0 → yuque_cli-1.0.0}/uv.lock

@@ -337,7 +337,7 @@ wheels = [
 
 [[package]]
 name = "yuque-cli"
-version = "0.2.0"
+version = "1.0.0"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },