hap-cli 0.8.7__tar.gz → 0.8.8__tar.gz

{hap_cli-0.8.7 → hap_cli-0.8.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.8.7
+Version: 0.8.8
 Summary: CLI harness for MingDAO HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0

{hap_cli-0.8.7 → hap_cli-0.8.8}/hap_cli/__init__.py

@@ -1,3 +1,3 @@
 """CLI harness for MingDAO HAP (hap-cli)."""
 
-__version__ = "0.8.7"
+__version__ = "0.8.8"

{hap_cli-0.8.7 → hap_cli-0.8.8}/hap_cli/commands/icon_cmd.py

@@ -31,9 +31,10 @@ def _icon_table(rows):
 @click.option(
     "--limit",
     type=int,
-    default=20,
-    show_default=True,
-    help="Maximum number of icons to return.",
+    default=None,
+    help="Maximum number of icons to return. Caps the result exactly — "
+    "--limit 5 returns at most 5. Defaults to 20 for a keyword search, "
+    "or the whole catalogue when browsing with no keyword.",
 )
 @pass_context
 def icon_search(ctx, query, limit):
@@ -41,19 +42,24 @@ def icon_search(ctx, query, limit):
 
     Pass one or more keywords; an icon must relate to every keyword to
     match. With no keyword, lists the whole catalogue. When fewer than
-    10 icons match, random suggestions top the list up to 10 so you
-    always have something to pick from. Use the returned icon name with
-    the --icon option of app/worksheet creation.
+    10 icons match, random suggestions top the list up to 10 (never more
+    than --limit) so you always have something to pick from. Use the
+    returned icon name with the --icon option of app/worksheet creation.
     """
     try:
-        # With no keyword the command acts as "browse all"; the limit
-        # only narrows an actual keyword search.
-        effective_limit = limit if query else None
-        rows = ic_mod.search_icons(list(query), limit=effective_limit)
         if query:
+            # Keyword search: default to 20 matches; an explicit --limit
+            # is the exact upper bound, and the random-suggestion floor
+            # never exceeds it either.
+            effective_limit = limit if limit is not None else 20
+            rows = ic_mod.search_icons(list(query), limit=effective_limit)
             rows = ic_mod.pad_with_random_icons(
-                rows, target=min(10, max(0, limit))
+                rows, target=min(10, max(0, effective_limit))
             )
+        else:
+            # Browse all by default; honor an explicit --limit if given.
+            # search_icons treats None as "no truncation".
+            rows = ic_mod.search_icons(list(query), limit=limit)
         ctx.output(rows, _icon_table)
     except Exception as e:
         ctx.handle_error(e)

{hap_cli-0.8.7 → hap_cli-0.8.8}/hap_cli/core/worksheet_templates.py

@@ -407,8 +407,14 @@ def build_control(
                 spec = dict(spec)
                 child_type = spec.pop("type")
                 child_name = spec.pop("name")
+                # row/col default to the child's position in the list, but a
+                # child spec may pin its own grid coordinates (the skill emits
+                # row/size per child). Seed defaults then let the spec win, so
+                # an explicit `row`/`col` in spec does not collide with a
+                # positional kwarg ("multiple values for 'row'").
+                child_kwargs = {"row": i, "col": 0, **spec}
                 built.append(build_control(
-                    child_type, child_name, row=i, col=0, **spec,
+                    child_type, child_name, **child_kwargs,
                 ))
             relation_controls = built
 

{hap_cli-0.8.7 → hap_cli-0.8.8}/hap_cli/tests/test_core.py

@@ -6911,6 +6911,25 @@ class TestBuildControlAcceptsBuilderCode:
         )
         assert ctrl["type"] == 19  # AREA_PROVINCE
 
+    def test_sublist_child_fields_carry_row_col_size(self):
+        """A SUB_LIST child spec may carry its own grid keys (row/col/size).
+        The inline-child loop pre-seeds row=i/col=0 as defaults, so passing
+        a child whose spec also has `row` must NOT raise "multiple values
+        for keyword argument 'row'" — the spec value wins."""
+        from hap_cli.core import worksheet_templates as wt
+        ctrl = wt.build_control(
+            "SUB_LIST", "明细",
+            child_fields=[
+                {"type": "Text", "name": "产品名称", "row": 0, "size": 6},
+                {"type": "Currency", "name": "单价",
+                 "row": 1, "col": 1, "size": 6, "extra": {"dot": 2}},
+            ],
+        )
+        children = ctrl["relationControls"]
+        assert [c["controlName"] for c in children] == ["产品名称", "单价"]
+        # spec-provided row/col take precedence over the loop's defaults.
+        assert (children[1]["row"], children[1]["col"]) == (1, 1)
+
 
 class TestCreateWorksheetWithFields:
     """`worksheet create --fields JSON` aggregates AddWorkSheet +
@@ -9293,6 +9312,34 @@ class TestIconIndex:
         data = json.loads(result.output)
         assert len(data) == 3
 
+    def test_cli_icon_search_small_limit_returns_exact_count(self):
+        """An explicit --limit below the default returns exactly that many
+        rows for a keyword with plenty of real matches."""
+        runner = CliRunner()
+        for limit in (1, 5):
+            result = runner.invoke(
+                cli, ["--json", "icon", "search", "统计", "--limit", str(limit)]
+            )
+            assert result.exit_code == 0, result.output
+            data = json.loads(result.output)
+            assert len(data) == limit
+
+    def test_cli_icon_search_no_keyword_honors_limit(self):
+        """Browsing with no keyword still caps the result at --limit."""
+        runner = CliRunner()
+        result = runner.invoke(cli, ["--json", "icon", "search", "--limit", "5"])
+        assert result.exit_code == 0, result.output
+        data = json.loads(result.output)
+        assert len(data) == 5
+
+    def test_cli_icon_search_no_keyword_no_limit_browses_all(self):
+        """No keyword and no --limit still lists the whole catalogue."""
+        runner = CliRunner()
+        result = runner.invoke(cli, ["--json", "icon", "search"])
+        assert result.exit_code == 0, result.output
+        data = json.loads(result.output)
+        assert len(data) >= 400
+
     def test_cli_icon_list_default_page(self):
         runner = CliRunner()
         result = runner.invoke(cli, ["--json", "icon", "list"])

{hap_cli-0.8.7 → hap_cli-0.8.8}/hap_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.8.7
+Version: 0.8.8
 Summary: CLI harness for MingDAO HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0