From 818ba368910429b2a9e530238ce6ea73c4dff64d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=85=B1=E7=89=9B=E8=82=89?= Date: Tue, 11 Aug 2026 11:36:06 +0800 Subject: [PATCH] fix(meta-reme): handle multiline schema exports in bundles --- meta-reme/bundle_builder.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta-reme/bundle_builder.py b/meta-reme/bundle_builder.py index 20ea1314..22dc343b 100644 --- a/meta-reme/bundle_builder.py +++ b/meta-reme/bundle_builder.py @@ -203,10 +203,15 @@ __all__ = ["BaseTokenizer", "RegexTokenizer"] raise BundleBuildError("Could not prune auto-fin schema exports") auto_fin_names = re.findall(r"\b[A-Za-z_][A-Za-z0-9_]*\b", auto_fin_import.group(1)) content = content[: auto_fin_import.start()] + content[auto_fin_import.end() :] - daily_paper_import = re.search(r"from \.daily_paper import ([^\n]+)\n", content) + daily_paper_import = re.search( + r"from \.daily_paper import (?:(?:\((.*?)\)\n)|([^\n]+)\n)", + content, + flags=re.DOTALL, + ) if daily_paper_import is None: raise BundleBuildError("Could not prune daily-paper schema exports") - daily_paper_names = [name.strip() for name in daily_paper_import.group(1).split(",")] + daily_paper_body = daily_paper_import.group(1) or daily_paper_import.group(2) + daily_paper_names = re.findall(r"\b[A-Za-z_][A-Za-z0-9_]*\b", daily_paper_body) content = content[: daily_paper_import.start()] + content[daily_paper_import.end() :] for exported_name in auto_fin_names + daily_paper_names: content = content.replace(f' "{exported_name}",\n', "")