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

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*(.*)$')
@@ -902,6 +903,64 @@ def build_design(manifest, l_frontmatter, consumer, body, has_sidecar, canvas):
     return text
 
 
+def layout_forms(lines):
+    """每个页型草案里实际给了哪几种形态（flow / slots）。"""
+    out, cur = {}, None
+    for line in lines:
+        m = re.match(r'^  ([\w-]+):\s*$', line)
+        if m:
+            cur = m.group(1)
+            out[cur] = set()
+            continue
+        m = re.match(r'^    (flow|slots):\s*$', line)
+        if m and cur:
+            out[cur].add(m.group(1))
+    return out
+
+
+def layout_modes(lines):
+    """读取扁平 `layout_modes:` 判断区。"""
+    out = {}
+    for line in lines:
+        m = re.match(r'^\s{2}([\w-]+):\s*([^\s#]+)', line)
+        if m:
+            out[m.group(1)] = m.group(2).strip()
+    return out
+
+
+def text_role_boxes(lines):
+    """从 slots 里的同名标记取回文本槽坐标，供 flow 固定锚点复用。"""
+    out, pending = {}, None
+    for line in lines:
+        marker = re.match(r'^\s*#\s*text-role:\s*([\w-]+)\s*$', line)
+        if marker:
+            pending = marker.group(1)
+            continue
+        if pending:
+            box = re.search(r'\bbox:\s*(\[[^\]]+\])', line)
+            if box:
+                out[pending] = box.group(1)
+                pending = None
+    return out
+
+
+def select_layout_forms(lines, modes):
+    """按 `layout_modes` 只保留每个页型选中的 flow 或 slots。"""
+    out, layout, drop = [], None, False
+    for line in lines:
+        layout_match = re.match(r'^  ([\w-]+):\s*$', line)
+        form_match = re.match(r'^    (flow|slots):\s*$', line)
+        if layout_match:
+            layout, drop = layout_match.group(1), False
+        elif form_match:
+            drop = modes.get(layout) not in (None, form_match.group(1))
+        elif drop and re.match(r'^    \S', line):
+            drop = False
+        if not drop:
+            out.append(line)
+    return out
+
+
 def shrink_safe_area(lines):
     """text_safe 与 avoid 相交时把安全区收掉重叠的那部分。
 
@@ -960,8 +1019,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:` / `layout_modes:` / `bg_rules:` 是给 L 层集中填判断的
+    # 扁平区——在这里并回各 archetype，本身不进产物。让 L 层只改扁平键值，别去动 layouts 里的
     # slots/confidence 结构（嵌套结构手改极易破坏缩进，进而静默改变语义）。
     names, roles = {}, {}
     for key, sink in (('names', names), ('roles', roles)):
@@ -969,6 +1028,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]:
         # 键后面允许行内注释（草案会标「用它的页型：…」）
@@ -990,44 +1060,96 @@ def build_layouts_md(layouts_blocks, canvas):
                 raise Fail('%s: %s' % (bg, err))
             out.append('  %s:' % bg)
             out += lines
+    modes = layout_modes(blocks.get('layout_modes', ('', []))[1])
     out.append('layouts:')
-    for line in blocks['layouts'][1]:
+    pending_text_role = None
+    used_text_roles = set()
+    source_layout_lines = blocks['layouts'][1]
+    role_boxes = text_role_boxes(source_layout_lines)
+    layout_lines = select_layout_forms(source_layout_lines, modes)
+    cur, fixed_items = None, []
+
+    def flush_fixed_items():
+        if not fixed_items:
+            return
+        out.append('        - kind: free')
+        out.append('          items:')
+        out.extend(fixed_items)
+        fixed_items.clear()
+
+    for line in layout_lines:
+        m = re.match(r'^  ([\w-]+):\s*$', line)
+        if m:
+            flush_fixed_items()
+            cur = m.group(1)
+        elif fixed_items and re.match(r'^    \S', line):
+            flush_fixed_items()
         # 判断单里的结构事实（栅格、间距序列、样张字数、命中配方）是给 L 层判断用的，
-        # 不进产物——消费端要的是结论，不是推导过程。
+        # 不进产物——消费端要的是结论，不是推导过程。layout_mode 同理，它是判断的载体。
         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', 'header', '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)
+            if (modes.get(cur) == 'flow' and role in ('header', 'footer')
+                    and re.match(r'^\s{12}-\s*\{', line) and 'box:' not in line):
+                box = role_boxes.get(pending_text_role)
+                if not box:
+                    raise Fail('text_roles.%s 识别为 %s，但 slots 中没有坐标'
+                               % (pending_text_role, role))
+                line = re.sub(r',\s*type:', ', box: %s, type:' % box, line, count=1)
+                fixed_items.append(line)
+                used_text_roles.add(pending_text_role)
+                pending_text_role = None
+                continue
+            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:
             out.append('    name: "%s"' % names.pop(m.group(1)))
         if m and m.group(1) in roles:
             out.append('    role: %s' % roles.pop(m.group(1)))
+    flush_fixed_items()
     if names:
         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)]
     if missing_role:
         raise Fail('这些页型没有 role（在 layouts.yaml 的 roles 段填）：%s' % ', '.join(missing_role))
-    # flow 与 slots 二选一：两份都留下，消费端不知道该听哪份坐标——design.md 正文与
-    # layouts.md 打架就是这么来的，别重演。
-    both, cur, has = [], None, {}
-    for line in blocks['layouts'][1]:
-        m = re.match(r'^  ([\w-]+):\s*$', line)
-        if m:
-            if cur and has.get('flow') and has.get('slots'):
-                both.append(cur)
-            cur, has = m.group(1), {}
-            continue
-        m = re.match(r'^    (flow|slots):\s*$', line)
-        if m:
-            has[m.group(1)] = True
-    if cur and has.get('flow') and has.get('slots'):
-        both.append(cur)
-    if both:
-        raise Fail('这些页型同时留了 flow 和 slots，二选一删掉另一个：%s' % ', '.join(both))
+    # `layout_modes.*: TODO` 由上面那道通用 TODO 扫描报（它连行内提示一起打出来），
+    # 这里只管它管不到的两种：整行被删、以及填了 flow/slots 之外的值。
+    forms = layout_forms(blocks['layouts'][1])
+    bad = []
+    for k, v in sorted(modes.items()):
+        if len(forms.get(k) or ()) < 2:
+            continue                          # 只有一份形态，无从选择
+        if v not in ('flow', 'slots'):
+            bad.append('%s 的 layout_modes 判断是 %r' % (k, v))
+        elif v not in forms[k]:
+            bad.append('%s 选了 %s 但该页型没有这一份' % (k, v))
+    for k, forms_for_layout in sorted(forms.items()):
+        if len(forms_for_layout) >= 2 and k not in modes:
+            bad.append('%s 缺 layout_modes 判断' % k)
+    if bad:
+        raise Fail('layout_modes 只能填 flow 或 slots，一个页型一个词：%s' % '；'.join(bad))
     declared = set(re.findall(r'^    background:\s*(\S+)\s*$',
                               '\n'.join(blocks['layouts'][1]), re.M))
     stray = set(bg_rules) - declared

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,60 @@
+#!/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('必要时可以使用 Colors 之外的颜色', body)
+        self.assertIn('不能形成与模板主色竞争的第二强调色', body)
+        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,63 @@
+#!/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)
+        self.assertIn('区带自带 `margin: [左, 右]` 时用它的', body)
+
+
+if __name__ == '__main__':
+    unittest.main()