@lark-apaas/coding-steering 0.1.18-dev.e6a2787 → 0.1.18-dev.ee5404f

package/steering/design-html/skills/pptx-style-extract/scripts/package.py

@@ -98,7 +98,8 @@ L 层判断单 schema（<l-out-dir> 四个文件，这段就是填写说明书
         role: cover
         background: bg-cover
         slots:
-          - {role: title, box: [<x>, <y>, <w>, <h>], type: title}
+          - {role: title, box: [<x>, <y>, <w>, <h>], type: title,
+             css: "<由源模板转译出的 CSS 声明串>"}
         confidence: high
 
   可选 `body:` 块标量 —— 追加到 layouts.md frontmatter 之后作为说明正文。
@@ -507,7 +508,7 @@ def render_assets_block(consumer):
 
 # ------------------------------------------------- 数值可追溯机检（抄错即 FAIL）
 HEX_RE = re.compile(r'#([0-9A-Fa-f]{6})\b')
-FONTSIZE_RE = re.compile(r'\bfontSize:\s*([\d.]+)px')
+FONTSIZE_RE = re.compile(r'\b(?:fontSize|font-size):\s*([\d.]+)px')
 BOX_RE = re.compile(r'\bbox:\s*\[\s*(-?[\d.]+)\s*,\s*(-?[\d.]+)\s*,'
                     r'\s*(-?[\d.]+)\s*,\s*(-?[\d.]+)\s*\]')
 KEYLINE_RE = re.compile(r'^(\s*)-?\s*([A-Za-z_][\w-]*):\s*(.*)$')
@@ -960,8 +961,8 @@ def build_layouts_md(layouts_blocks, canvas):
         raise Fail('layouts.yaml 不要写 canvas —— 脚本从 extract.json 取')
     if 'layouts' not in blocks:
         raise Fail('layouts.yaml 缺顶层键 `layouts:`')
-    # `names:` / `bg_rules:` 是给 L 层集中填判断的两块扁平区——在这里并回各
-    # archetype，本身不进产物。让 L 层只改扁平键值，别去动 layouts 里的
+    # `names:` / `roles:` / `text_roles:` / `bg_rules:` 是给 L 层集中填判断的
+    # 扁平区——在这里并回各 archetype，本身不进产物。让 L 层只改扁平键值，别去动 layouts 里的
     # slots/confidence 结构（嵌套结构手改极易破坏缩进，进而静默改变语义）。
     names, roles = {}, {}
     for key, sink in (('names', names), ('roles', roles)):
@@ -969,6 +970,17 @@ def build_layouts_md(layouts_blocks, canvas):
             m = re.match(r'^\s{2}([\w-]+):\s*(.+?)\s*$', line)
             if m:
                 sink[m.group(1)] = unquote(m.group(2))
+    text_roles = {}
+    allowed_text_roles = {'title', 'subtitle', 'header', 'footer', 'body'}
+    for line in blocks.get('text_roles', ('', []))[1]:
+        m = re.match(r'^\s{2}([\w-]+):\s*([A-Za-z-]+)(?:\s+#.*)?$', line)
+        if not m:
+            continue
+        role_id, role = m.groups()
+        if role not in allowed_text_roles:
+            raise Fail('text_roles.%s 取值 %s 非法；应为 %s'
+                       % (role_id, role, '|'.join(sorted(allowed_text_roles))))
+        text_roles[role_id] = role
     bg_rules, cur = {}, None
     for line in blocks.get('bg_rules', ('', []))[1]:
         # 键后面允许行内注释（草案会标「用它的页型：…」）
@@ -991,11 +1003,29 @@ def build_layouts_md(layouts_blocks, canvas):
             out.append('  %s:' % bg)
             out += lines
     out.append('layouts:')
+    pending_text_role = None
+    used_text_roles = set()
     for line in blocks['layouts'][1]:
         # 判断单里的结构事实（栅格、间距序列、样张字数、命中配方）是给 L 层判断用的，
         # 不进产物——消费端要的是结论，不是推导过程。
         if line.lstrip().startswith('#'):
+            marker = re.match(r'^\s*#\s*text-role:\s*([\w-]+)\s*$', line)
+            if marker:
+                pending_text_role = marker.group(1)
             continue
+        if pending_text_role:
+            if pending_text_role not in text_roles:
+                raise Fail('text_roles 缺少 %s 的判断' % pending_text_role)
+            role = text_roles[pending_text_role]
+            slot_type = role if role in ('title', 'subtitle', 'footer') else 'body'
+            line, role_n = re.subn(r'(\{\s*role:\s*)[\w-]+',
+                                   r'\g<1>%s' % role, line, count=1)
+            line, type_n = re.subn(r'(\btype:\s*)[\w-]+',
+                                   r'\g<1>%s' % slot_type, line, count=1)
+            if role_n != 1 or type_n != 1:
+                raise Fail('text_roles.%s 没有命中一个文本槽' % pending_text_role)
+            used_text_roles.add(pending_text_role)
+            pending_text_role = None
         out.append(line)
         m = re.match(r'^  ([\w-]+):\s*$', line)
         if m and m.group(1) in names:
@@ -1006,6 +1036,10 @@ def build_layouts_md(layouts_blocks, canvas):
         raise Fail('names 里这些页型在 layouts 下找不到：%s' % ', '.join(sorted(names)))
     if roles:
         raise Fail('roles 里这些页型在 layouts 下找不到：%s' % ', '.join(sorted(roles)))
+    unused_text_roles = set(text_roles) - used_text_roles
+    if unused_text_roles:
+        raise Fail('text_roles 里这些判断没有命中文本槽：%s'
+                   % ', '.join(sorted(unused_text_roles)))
     missing_role = [k for k in re.findall(r'^  ([\w-]+):\s*$', '\n'.join(blocks['layouts'][1]), re.M)
                     if not re.search(r'^  %s:\s*$(?:\n(?!  \S).*)*?\n    role:' % re.escape(k),
                                      '\n'.join(out), re.M)]

package/steering/design-html/skills/pptx-style-extract/scripts/query.py

@@ -244,14 +244,10 @@ def _recipe_css(fill, line, radii, effects):
             dash = (line or {}).get('dash')
             style = 'dashed' if dash and 'dash' in dash else 'solid'
             out.append('border: %dpx %s %s' % (w, style, lc))
-    if radii:
+    if radii and all(r >= 1 for r in radii):
         lo, hi = min(radii), max(radii)
         if abs(hi - lo) <= 0.5:
             out.append('border-radius: %gpx' % round(lo, 1))
-        else:
-            out.append('border-radius: %gpx\x00/* 源内 %g~%gpx 共 %d 档，归一档位由 L11 定 */'
-                       % (round(sum(radii) / len(radii), 1), round(lo, 1), round(hi, 1),
-                          len(set(round(r, 1) for r in radii))))
     for e in effects or []:
         if e.get('type') == 'outerShdw':
             col = _css_color(e.get('color')) or 'rgba(0,0,0,0.25)'
@@ -267,7 +263,7 @@ def _recipe_css(fill, line, radii, effects):
 def _sig(fill, line, effects):
     """分组键 = 填充 + 描边 + 效果。**不含圆角**——OOXML 圆角是 min(w,h) 的百分比，
     同一配方在不同尺寸的卡上绝对 px 必然不同，把它计入键会把一个配方拆成多组；
-    归一到哪一档是判断，脚本只报区间。"""
+    只有组内每个形状都明确共享同一绝对半径时才输出组级圆角，否则留给逐形状 CSS。"""
     f = 'none'
     if isinstance(fill, dict):
         if fill.get('type') == 'solid':
@@ -305,8 +301,7 @@ def cmd_recipes(a, outdir):
         g = groups.setdefault(k, {'n': 0, 'parts': Counter(), 'sizes': [], 'radii': [],
                                   'fill': fill, 'line': line, 'fx': fx})
         g['n'] += 1
-        if radius:
-            g['radii'].append(radius)
+        g['radii'].append(radius or 0)
         g['parts'][short(s['part'])] += 1
         b = s.get('box') or {}
         if b.get('w'):

package/steering/design-html/skills/pptx-style-extract/scripts/test_color_contract.py

@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+"""Regression test for the generated consumer-facing color contract."""
+import os
+import tempfile
+import unittest
+
+from draft import emit_body
+
+
+class ColorContractTest(unittest.TestCase):
+    def test_body_allows_supporting_colors_without_a_second_accent_system(self):
+        data = {
+            'canvas': {'px': [1920, 1080]},
+            'counts': {'slides': 1},
+            'form_hint': {'form': 3},
+        }
+        tokens = [
+            ('primary', {'hex': '#123456'}),
+            ('surface', {'hex': '#FFFFFF'}),
+        ]
+        fonts = [
+            {
+                'names': ['Example Sans'],
+                'stack': ['Example Sans', 'Noto Sans SC'],
+            },
+        ]
+        roles = {'body': {'sz_px': 36}}
+        archetypes = [
+            {
+                'name': 'content',
+                'slots': [],
+            },
+        ]
+
+        with tempfile.TemporaryDirectory() as output_dir:
+            emit_body(
+                data,
+                tokens,
+                fonts,
+                roles,
+                [],
+                archetypes,
+                [],
+                {},
+                output_dir,
+            )
+            with open(os.path.join(output_dir, 'body.md'), encoding='utf-8') as stream:
+                body = stream.read()
+
+        self.assertIn('允许新增中性色、低彩度辅助色或局部语义色', body)
+        self.assertRegex(body, r'正负.*风险.*警告.*状态.*图表序列')
+        self.assertIn('不得自行新增第二强调色', body)
+        self.assertIn('高饱和、高对比、大面积或跨页重复', body)
+        self.assertIn('标题、关键数字、图表主序列、卡片底色或渐变', body)
+
+
+if __name__ == '__main__':
+    unittest.main()

package/steering/design-html/skills/pptx-style-extract/scripts/test_design_consumer_contract.py

@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+"""Regression tests for consumer rules emitted into design.md."""
+import os
+import tempfile
+import unittest
+
+from draft import emit_body
+
+
+class DesignConsumerContractTest(unittest.TestCase):
+    def test_generated_design_owns_template_consumption_rules(self):
+        data = {
+            'canvas': {'px': [1920, 1080]},
+            'counts': {'slides': 1},
+            'form_hint': {'form': 3},
+        }
+        tokens = [('primary', {'hex': '#123456'})]
+        fonts = [
+            {
+                'names': ['Example Sans'],
+                'stack': ['Example Sans', 'Noto Sans SC'],
+            },
+        ]
+        roles = {'body': {'sz_px': 36}}
+        assets = [
+            {
+                'id': 'bg-content',
+                'kind': 'background',
+                'role': 'content',
+            },
+        ]
+        archetypes = [{'name': 'content', 'slots': []}]
+
+        with tempfile.TemporaryDirectory() as output_dir:
+            emit_body(
+                data,
+                tokens,
+                fonts,
+                roles,
+                assets,
+                archetypes,
+                [],
+                {},
+                output_dir,
+            )
+            with open(os.path.join(output_dir, 'body.md'), encoding='utf-8') as stream:
+                body = stream.read()
+
+        self.assertIn('是全局 token', body)
+        self.assertIn('局部 slot / decor 的 `css` 优先', body)
+        self.assertIn('字体使用 Typography 的完整栈与降级', body)
+        self.assertIn('将包内 `assets/` 复制到项目内相对目录', body)
+        self.assertIn('本机绝对路径', body)
+        self.assertIn('背景、资产和本段规则均来自本风格包', body)
+        self.assertIn('页面无资源加载失败、内容溢出或画幅裁切', body)
+        self.assertIn('沿用该页型已有的标题层级与局部 `css`', body)
+        self.assertIn('背景中已经可见的固定标题不再创建文本', body)
+        self.assertIn('没有 `subtitle` 槽就不新增副标题', body)
+
+
+if __name__ == '__main__':
+    unittest.main()

package/steering/design-html/skills/pptx-style-extract/scripts/test_layout_css.py

@@ -0,0 +1,98 @@
+#!/usr/bin/env python3
+"""Regression tests for the consumer-facing layout slot CSS contract."""
+import os
+import sys
+import tempfile
+import unittest
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+from check_v2 import Pack, rule_v2_16  # noqa: E402
+from draft import emit_layouts, slot_style  # noqa: E402
+from package import FONTSIZE_RE, build_layouts_md, split_top_blocks  # noqa: E402
+
+
+class LayoutCssTest(unittest.TestCase):
+    def test_text_slot_emits_rendering_style_as_css_only(self):
+        shape = {
+            'text': {
+                'bodyPr': {
+                    'anchor': 'ctr',
+                    'insets_px': {'lIns': 12, 'tIns': 8, 'rIns': 10, 'bIns': 6},
+                    'rot': '900000',
+                },
+                'lstStyle': {
+                    'lvl1pPr': {
+                        'sz_px': 48,
+                        'weight': 600,
+                        'italic': True,
+                        'underline': 'sng',
+                        'strike': 'sngStrike',
+                        'spc_px': 1.5,
+                        'color': {'resolved': '#123456'},
+                        'algn': 'ctr',
+                        'lnSpc': {'mult': 1.0},
+                    },
+                },
+                'paragraphs': [],
+            },
+        }
+        slot = {
+            'role': 'title',
+            'type': 'title',
+            'box': [100, 80, 800, 160],
+            'sz': 48,
+            'txt': '标题',
+        }
+        slot.update(slot_style(shape))
+        archetype = {
+            'name': 'layout-1',
+            'zh': '标题页',
+            'role': 'content',
+            'bg': None,
+            'slots': [slot],
+            'decor': [],
+            'pages': [1],
+            'rep': 1,
+            'pic_n': 0,
+            'confidence': 'high',
+        }
+
+        with tempfile.TemporaryDirectory() as output_dir:
+            emit_layouts([archetype], output_dir)
+            with open(os.path.join(output_dir, 'layouts.yaml'), encoding='utf-8') as stream:
+                layouts_yaml = stream.read()
+            layouts_md = build_layouts_md(split_top_blocks(layouts_yaml), (1920, 1080))
+
+        self.assertIn(
+            'css: "box-sizing: border-box; padding: 8px 10px 6px 12px; '
+            'font-size: 48px; font-weight: 600; font-style: italic; '
+            'text-decoration: underline line-through; letter-spacing: 1.5px; color: #123456; '
+            'text-align: center; line-height: 1.2; display: flex; '
+            'flex-direction: column; justify-content: center; rotate: 15deg"',
+            layouts_md,
+        )
+        for legacy_key in ('size', 'weight', 'color', 'align', 'valign', 'insets_px'):
+            self.assertNotRegex(layouts_md, rf'[,{{]\s*{legacy_key}:')
+        self.assertEqual(FONTSIZE_RE.findall(layouts_md), ['48'])
+
+    def test_layout_gate_rejects_legacy_slot_style_keys(self):
+        with tempfile.TemporaryDirectory() as pack_dir:
+            with open(os.path.join(pack_dir, 'design.md'), 'w', encoding='utf-8') as stream:
+                stream.write('---\nversion: alpha\nlayouts: layouts.md\n---\n\nRead layouts.md.\n')
+            with open(os.path.join(pack_dir, 'layouts.md'), 'w', encoding='utf-8') as stream:
+                stream.write(
+                    '---\ncanvas: 1920x1080\nlayouts:\n  cover:\n    role: cover\n'
+                    '    slots:\n      - {role: title, type: title, box: [0, 0, 800, 100], '
+                    'size: 48, align: center}\n    confidence: high\n---\n'
+                )
+
+            result = rule_v2_16(Pack(pack_dir))
+
+        self.assertEqual(result.level, 'FAIL')
+        self.assertEqual(len(result.fails), 1)
+        self.assertIn('旧样式键 align/size', result.fails[0])
+
+
+if __name__ == '__main__':
+    unittest.main()

package/steering/design-html/skills/pptx-style-extract/scripts/test_rounded_contract.py

@@ -0,0 +1,112 @@
+#!/usr/bin/env python3
+"""Regression tests for preserving per-container radii."""
+import os
+import tempfile
+import unittest
+
+from draft import emit_body, emit_frontmatter
+from query import _recipe_css
+
+
+def render_frontmatter(radii):
+    data = {
+        'radii_census': radii,
+        'spacing_candidates': {},
+    }
+    tokens = [('surface', {'hex': '#FFFFFF'})]
+
+    with tempfile.TemporaryDirectory() as output_dir:
+        emit_frontmatter(
+            data,
+            tokens,
+            [],
+            {},
+            [],
+            [],
+            output_dir,
+        )
+        with open(os.path.join(output_dir, 'frontmatter.yaml'), encoding='utf-8') as stream:
+            return stream.read()
+
+
+def render_body():
+    data = {
+        'canvas': {'px': [1920, 1080]},
+        'form_hint': {'form': 2},
+        'counts': {'slides': 1},
+    }
+
+    with tempfile.TemporaryDirectory() as output_dir:
+        emit_body(
+            data,
+            [],
+            [],
+            {},
+            [],
+            [],
+            [],
+            {},
+            output_dir,
+        )
+        with open(os.path.join(output_dir, 'body.md'), encoding='utf-8') as stream:
+            return stream.read()
+
+
+class RoundedContractTest(unittest.TestCase):
+    def test_multiple_radius_tiers_are_not_collapsed_into_one_card_token(self):
+        frontmatter = render_frontmatter(
+            [
+                {'px': 6.9, 'n': 2},
+                {'px': 11.9, 'n': 2},
+                {'px': 14.4, 'n': 3},
+            ]
+        )
+
+        self.assertNotIn('rounded:', frontmatter)
+
+    def test_single_radius_tier_can_remain_a_global_token(self):
+        frontmatter = render_frontmatter([{'px': 12, 'n': 9}])
+
+        self.assertIn('rounded:\n  card: 12px', frontmatter)
+
+    def test_rare_rounded_exceptions_do_not_override_a_zero_radius_majority(self):
+        frontmatter = render_frontmatter(
+            [
+                {'px': 0, 'n': 241},
+                {'px': 3.4, 'n': 4},
+                {'px': 6.9, 'n': 3},
+                {'px': 50.5, 'n': 1},
+            ]
+        )
+
+        self.assertNotIn('rounded:', frontmatter)
+
+    def test_generated_usage_defaults_unspecified_container_radius_to_zero(self):
+        body = render_body()
+
+        self.assertIn('没有 `border-radius` 就按 `0`', body)
+        self.assertIn('不得自行补圆角', body)
+
+    def test_recipe_does_not_promote_one_rounded_exception_to_the_whole_group(self):
+        css = _recipe_css(
+            {'type': 'solid', 'color': {'hex': '#FFFFFF'}},
+            None,
+            [0] * 70 + [50.5],
+            None,
+        )
+
+        self.assertFalse(any('border-radius' in declaration for declaration in css))
+
+    def test_recipe_keeps_a_radius_shared_by_the_whole_group(self):
+        css = _recipe_css(
+            {'type': 'solid', 'color': {'hex': '#FFFFFF'}},
+            None,
+            [6.9] * 17,
+            None,
+        )
+
+        self.assertIn('border-radius: 6.9px', css)
+
+
+if __name__ == '__main__':
+    unittest.main()

package/steering/design-html/skills/pptx-style-extract/scripts/test_text_role_contract.py

@@ -0,0 +1,168 @@
+#!/usr/bin/env python3
+"""Regression tests for inherited layout text and model-decided text roles."""
+import json
+import os
+import sys
+import tempfile
+import unittest
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+from draft import draft_layouts, emit_layouts, inherited_text_shapes
+from package import build_layouts_md, split_top_blocks
+
+
+def text_shape(part, layer, shape_id, box, text, placeholder):
+    return {
+        'part': part,
+        'layer': layer,
+        'id': shape_id,
+        'kind': 'sp',
+        'name': 'Text Placeholder',
+        'ph': placeholder,
+        'box': box,
+        'text': {
+            'bodyPr': {},
+            'lstStyle': {
+                'lvl1pPr': {
+                    'sz_px': 48,
+                    'weight': 600,
+                    'color': {'resolved': '#C41230'},
+                },
+            },
+            'paragraphs': [
+                {
+                    'runs': [{'text': text}],
+                },
+            ] if text else [],
+        },
+    }
+
+
+class TextRoleContractTest(unittest.TestCase):
+    def test_empty_non_placeholder_layout_shape_is_not_a_text_slot(self):
+        layout_part = 'ppt/slideLayouts/slideLayout2.xml'
+        decorative_shape = text_shape(
+            layout_part,
+            'layout',
+            '9',
+            {'x': 0, 'y': 0, 'w': 1920, 'h': 24},
+            '',
+            None,
+        )
+        decorative_shape['name'] = 'Decorative bar'
+
+        self.assertEqual(inherited_text_shapes([decorative_shape], []), [])
+
+    def test_empty_slide_inherits_text_slot_and_css_from_its_layout(self):
+        layout_part = 'ppt/slideLayouts/slideLayout2.xml'
+        slide_part = 'ppt/slides/slide1.xml'
+        shapes = [
+            text_shape(
+                layout_part,
+                'layout',
+                '10',
+                {'x': 120, 'y': 80, 'w': 840, 'h': 120},
+                'Example heading',
+                {'type': 'body', 'idx': '10'},
+            ),
+            text_shape(
+                slide_part,
+                'slide',
+                '2',
+                None,
+                '',
+                {'type': 'body', 'idx': '10'},
+            ),
+        ]
+        data = {
+            'canvas': {'px': [1920, 1080]},
+            'form_hint': {'form': 0},
+            'slides': [
+                {
+                    'part': slide_part,
+                    'layout': layout_part,
+                    'background': None,
+                },
+            ],
+            'background_composites': {},
+        }
+
+        with tempfile.TemporaryDirectory() as output_dir:
+            os.makedirs(os.path.join(output_dir, 'ref'))
+            with open(
+                os.path.join(output_dir, 'ref', 'shapes.json'),
+                'w',
+                encoding='utf-8',
+            ) as stream:
+                json.dump({'shapes': shapes}, stream)
+            archetypes, _, _ = draft_layouts(data, output_dir)
+
+        self.assertEqual(len(archetypes), 1)
+        self.assertEqual(len(archetypes[0]['slots']), 1)
+        slot = archetypes[0]['slots'][0]
+        self.assertEqual(slot['box'], [120, 80, 840, 120])
+        self.assertEqual(slot['txt'], 'Example heading')
+        self.assertEqual(slot['role'], 'body')
+        self.assertEqual(slot['type'], 'body')
+        self.assertTrue(slot['_needs_role'])
+        self.assertIn('font-size: 48px', slot['css'])
+        self.assertIn('font-weight: 600', slot['css'])
+        self.assertIn('color: #C41230', slot['css'])
+
+    def test_text_role_judgement_changes_semantics_without_dropping_slot(self):
+        archetype = {
+            'name': 'layout-1',
+            'zh': None,
+            'role': 'content',
+            'bg': None,
+            'slots': [
+                {
+                    'role': 'body',
+                    'type': 'body',
+                    'box': [120, 80, 840, 120],
+                    'sz': 48,
+                    'txt': 'Example heading',
+                    'css': 'font-size: 48px; color: #C41230',
+                    '_needs_role': True,
+                    '_source_layer': 'layout',
+                    '_placeholder': 'body/10',
+                },
+            ],
+            'decor': [],
+            'pages': [1],
+            'rep': 1,
+            'pic_n': 0,
+            'confidence': 'low',
+        }
+
+        with tempfile.TemporaryDirectory() as output_dir:
+            emit_layouts([archetype], output_dir)
+            path = os.path.join(output_dir, 'layouts.yaml')
+            with open(path, encoding='utf-8') as stream:
+                draft = stream.read()
+
+        self.assertIn('text_roles:', draft)
+        self.assertIn(
+            'layout-1-text-1: TODO文本角色',
+            draft,
+        )
+        self.assertEqual(draft.count('box: [120, 80, 840, 120]'), 1)
+
+        decided = draft.replace(
+            'layout-1-text-1: TODO文本角色',
+            'layout-1-text-1: title',
+        )
+        layouts_md = build_layouts_md(split_top_blocks(decided), (1920, 1080))
+
+        self.assertNotIn('text_roles:', layouts_md)
+        self.assertEqual(layouts_md.count('box: [120, 80, 840, 120]'), 1)
+        self.assertIn(
+            'role: title, box: [120, 80, 840, 120], type: title',
+            layouts_md,
+        )
+        self.assertIn('css: "font-size: 48px; color: #C41230"', layouts_md)
+
+
+if __name__ == '__main__':
+    unittest.main()