6a-spec-install 1.0.3 → 1.0.5

package/.6aspec/script/create_entities_from_markdown.py

@@ -48,13 +48,13 @@ def extract_default_value(description: str) -> Optional[Any]:
     """从字段说明中提取默认值"""
     if not description:
         return None
-    
+
     patterns = [
         r'默认[为值]?[：:]\s*(\d+)',
         r'默认[为值]?(\d+)',
         r'，默认[为值]?[：:]?\s*(\d+)',
     ]
-    
+
     for pattern in patterns:
         match = re.search(pattern, description)
         if match:
@@ -62,43 +62,44 @@ def extract_default_value(description: str) -> Optional[Any]:
                 return int(match.group(1))
             except ValueError:
                 return match.group(1)
-    
+
     return None
 
 
 def parse_table_section(content: str) -> List[Dict[str, Any]]:
-    """解析第三步：数据库物理设计部分的所有表结构"""
-    
-    step3_pattern = r'###\s*第三步[：:]\s*数据库物理设计.*?\n'
-    match = re.search(step3_pattern, content, re.IGNORECASE)
+    """解析数据库物理设计部分的所有表结构"""
+
+    # 只匹配「数据库物理设计」章节，不要求「第三步」等前缀（文档格式可能不同）
+    section_pattern = r'###\s*[^#\n]*数据库物理设计[^\n]*\n'
+    match = re.search(section_pattern, content)
     if not match:
-        raise ValueError("未找到'第三步：数据库物理设计'章节")
-    
+        raise ValueError("未找到'数据库物理设计'章节")
+
     start_pos = match.end()
     next_section = re.search(r'\n###\s+', content[start_pos:])
     if next_section:
         section_content = content[start_pos:start_pos + next_section.start()]
     else:
         section_content = content[start_pos:]
-    
+
     tables = []
     table_pattern = r'#####\s+\d+\.\s+([^(]+)\s*\(([^)]+)\)'
     table_matches = list(re.finditer(table_pattern, section_content))
-    
+
     for i, table_match in enumerate(table_matches):
         table_name_cn = table_match.group(1).strip()
         table_name = table_match.group(2).strip()
-        
+
         if i + 1 < len(table_matches):
             table_end = table_matches[i + 1].start()
         else:
             table_end = len(section_content)
-        
+
         table_section = section_content[table_match.end():table_end]
-        
+
         table_info_pattern = r'\|\s*表中文名称\s*\|\s*([^|]+)\s*\|\s*\n\|\s*[：:]\s*---\s*\|\s*[：:]\s*---\s*\|\s*\n\|\s*表英文名称\s*\|\s*([^|]+)\s*\|\s*\n\|\s*说明\s*\|\s*([^|]+)\s*\|'
         table_info_match = re.search(table_info_pattern, table_section)
-        
+
         if table_info_match:
             table_name_cn = table_info_match.group(1).strip()
             table_name = table_info_match.group(2).strip()
@@ -108,11 +109,11 @@ def parse_table_section(content: str) -> List[Dict[str, Any]]:
             desc_match = re.search(r'\|\s*说明\s*\|\s*([^|]+)\s*\|', table_section)
             if desc_match:
                 description = desc_match.group(1).strip()
-        
+
         fields = []
         field_table_pattern = r'\|\s*字段中文名称\s*\|\s*字段英文名称\s*\|\s*字段类型\s*\|\s*长度\s*\|\s*是否必填\s*\|\s*字段说明\s*\|'
         field_table_match = re.search(field_table_pattern, table_section)
-        
+
         if field_table_match:
             table_start = field_table_match.end()
             table_end_match = re.search(r'\n\n|\n---|\n#####', table_section[table_start:])
@@ -120,13 +121,13 @@ def parse_table_section(content: str) -> List[Dict[str, Any]]:
                 table_content = table_section[table_start:table_start + table_end_match.start()]
             else:
                 table_content = table_section[table_start:]
-            
+
             field_lines = [line.strip() for line in table_content.split('\n') if line.strip() and line.strip().startswith('|')]
-            
+
             for line in field_lines:
                 if re.match(r'^\|\s*[：:]\s*---', line):
                     continue
-                
+
                 parts = [p.strip() for p in line.split('|') if p.strip()]
                 if len(parts) >= 6:
                     field_name_cn = parts[0]
@@ -135,10 +136,10 @@ def parse_table_section(content: str) -> List[Dict[str, Any]]:
                     length = parse_length(parts[3])
                     required = parse_required(parts[4])
                     field_description = parts[5]
-                    
+
                     is_pk = is_primary_key(field_description) or 'GUID' in field_name.upper()
                     default_value = extract_default_value(field_description)
-                    
+
                     field = {
                         "fieldName": field_name,
                         "fieldNameCN": field_name_cn,
@@ -148,21 +149,21 @@ def parse_table_section(content: str) -> List[Dict[str, Any]]:
                         "description": field_description,
                         "isPrimaryKey": is_pk
                     }
-                    
+
                     if default_value is not None:
                         field["defaultValue"] = default_value
-                    
+
                     fields.append(field)
-        
+
         table = {
             "tableName": table_name,
             "tableNameCN": table_name_cn,
             "description": description,
             "fields": fields
         }
-        
+
         tables.append(table)
-    
+
     return tables
 
 
@@ -171,7 +172,7 @@ def parse_table_section(content: str) -> List[Dict[str, Any]]:
 def map_field_type_to_db_type(field_type: str, length: Optional[int]) -> Dict[str, Any]:
     """将字段类型映射为数据库类型和字段类型"""
     field_type_lower = field_type.lower()
-    
+
     if "唯一标识" in field_type or "guid" in field_type_lower:
         return {
             "dbType": "uniqueidentifier",
@@ -180,7 +181,7 @@ def map_field_type_to_db_type(field_type: str, length: Optional[int]) -> Dict[st
             "length": None,
             "decimalPrecision": 0
         }
-    
+
     if "单行文本" in field_type:
         db_length = length if length and length > 0 else 512
         return {
@@ -190,7 +191,7 @@ def map_field_type_to_db_type(field_type: str, length: Optional[int]) -> Dict[st
             "length": db_length,
             "decimalPrecision": 0
         }
-    
+
     if "多行文本" in field_type:
         db_length = length if length and length > 0 else -1
         if db_length > 0 and db_length <= 512:
@@ -209,7 +210,7 @@ def map_field_type_to_db_type(field_type: str, length: Optional[int]) -> Dict[st
                 "length": -1,
                 "decimalPrecision": 0
             }
-    
+
     if "日期时间" in field_type or "日期" in field_type or "时间" in field_type:
         return {
             "dbType": "datetime",
@@ -218,7 +219,7 @@ def map_field_type_to_db_type(field_type: str, length: Optional[int]) -> Dict[st
             "length": None,
             "decimalPrecision": 0
         }
-    
+
     if "整数" in field_type:
         return {
             "dbType": "int",
@@ -227,7 +228,7 @@ def map_field_type_to_db_type(field_type: str, length: Optional[int]) -> Dict[st
             "length": None,
             "decimalPrecision": 0
         }
-    
+
     if "图片" in field_type:
         return {
             "dbType": "nvarchar",
@@ -236,7 +237,7 @@ def map_field_type_to_db_type(field_type: str, length: Optional[int]) -> Dict[st
             "length": -1,
             "decimalPrecision": 0
         }
-    
+
     db_length = length if length and length > 0 else 512
     return {
         "dbType": "nvarchar",
@@ -247,10 +248,10 @@ def map_field_type_to_db_type(field_type: str, length: Optional[int]) -> Dict[st
     }
 
 
-def create_control_config(field_type: str, db_type: str, field_type_name: str, 
-                         display_name: str, is_required: bool, length: Optional[int]) -> Dict[str, Any]:
+def create_control_config(field_type: str, db_type: str, field_type_name: str,
+                          display_name: str, is_required: bool, length: Optional[int]) -> Dict[str, Any]:
     """创建控件配置对象"""
-    
+
     if field_type_name == "guid":
         return {
             "$type": "Mysoft.Map6.Metadata.Models.Entity.GuidField, Mysoft.Map6.Metadata.Models",
@@ -303,7 +304,7 @@ def create_control_config(field_type: str, db_type: str, field_type_name: str,
             "limitType": "*.*",
             "fillExample": ""
         }
-    
+
     return {
         "$type": "Mysoft.Map6.Metadata.Models.Entity.SingleLineText, Mysoft.Map6.Metadata.Models",
         "isRequired": is_required,
@@ -315,7 +316,7 @@ def create_control_config(field_type: str, db_type: str, field_type_name: str,
 
 def convert_field_to_attribute(field: Dict[str, Any], is_primary: bool) -> Dict[str, Any]:
     """将字段转换为属性格式"""
-    
+
     field_type = field.get("fieldType", "")
     length = field.get("length")
     field_name = field.get("fieldName", "")
@@ -323,25 +324,25 @@ def convert_field_to_attribute(field: Dict[str, Any], is_primary: bool) -> Dict[
     description = field.get("description", "")
     required = field.get("required", False)
     default_value = field.get("defaultValue")
-    
+
     type_info = map_field_type_to_db_type(field_type, length)
-    
+
     if is_primary and type_info["fieldType"] == "guid":
         attr_default_value = "newid()"
     elif default_value is not None:
         attr_default_value = str(default_value)
     else:
         attr_default_value = ""
-    
+
     control = create_control_config(
-        field_type, 
-        type_info["dbType"], 
+        field_type,
+        type_info["dbType"],
         type_info["fieldType"],
         field_name_cn,
         required,
         type_info["length"]
     )
-    
+
     attribute = {
         "attributeType": type_info["attributeType"],
         "defaultValue": attr_default_value,
@@ -357,21 +358,21 @@ def convert_field_to_attribute(field: Dict[str, Any], is_primary: bool) -> Dict[
         "curEntityState": "modify",
         "entityState": "Created"
     }
-    
+
     if type_info["length"] is not None:
         attribute["length"] = type_info["length"]
-    
+
     return attribute
 
 
 def convert_table_to_entity(table: Dict[str, Any], application: str, function_guid: str) -> Dict[str, Any]:
     """将表转换为实体格式"""
-    
+
     table_name = table.get("tableName", "")
     table_name_cn = table.get("tableNameCN", "")
     description = table.get("description", "")
     fields = table.get("fields", [])
-    
+
     primary_key_field = None
     primary_key_name = None
     for field in fields:
@@ -379,7 +380,7 @@ def convert_table_to_entity(table: Dict[str, Any], application: str, function_gu
             primary_key_field = field
             primary_key_name = field.get("fieldName", "")
             break
-    
+
     if not primary_key_name:
         for field in fields:
             if "GUID" in field.get("fieldName", "").upper() or "唯一标识" in field.get("fieldType", ""):
@@ -389,7 +390,7 @@ def convert_table_to_entity(table: Dict[str, Any], application: str, function_gu
         if not primary_key_name and fields:
             primary_key_name = fields[0].get("fieldName", "")
             primary_key_field = fields[0]
-    
+
     attributes = []
     for field in fields:
         field_name = field.get("fieldName", "")
@@ -398,11 +399,11 @@ def convert_table_to_entity(table: Dict[str, Any], application: str, function_gu
         is_primary = False
         attribute = convert_field_to_attribute(field, is_primary)
         attributes.append(attribute)
-    
+
     primary_key_display_name = ""
     if primary_key_field:
         primary_key_display_name = primary_key_field.get("fieldNameCN", "")
-    
+
     entity = {
         "entity": {
             "application": application,
@@ -420,7 +421,7 @@ def convert_table_to_entity(table: Dict[str, Any], application: str, function_gu
         "primaryKeyDisplayName": primary_key_display_name + " ",
         "primaryKeyRemark": ""
     }
-    
+
     return entity
 
 
@@ -435,7 +436,7 @@ def load_config_from_file() -> Dict[str, str]:
     """从用户目录下的.6aspec/modeling_env文件读取配置"""
     config = {}
     config_file = Path.home() / '.6aspec' / 'modeling_env'
-    
+
     if config_file.exists():
         try:
             with open(config_file, 'r', encoding='utf-8') as f:
@@ -453,7 +454,7 @@ def load_config_from_file() -> Dict[str, str]:
         except Exception:
             # 读取配置文件失败，忽略错误，继续使用环境变量
             pass
-    
+
     return config
 
 
@@ -463,13 +464,13 @@ def get_host() -> str:
     host = os.environ.get('MODELING_HOST')
     if host:
         return host
-    
+
     # 如果环境变量没有，尝试从配置文件读取
     config = load_config_from_file()
     host = config.get('MODELING_HOST')
     if host:
         return host
-    
+
     # 都没有则返回默认值
     return 'localhost'
 
@@ -480,13 +481,13 @@ def get_cookie() -> str:
     cookie = os.environ.get('MODELING_COOKIE')
     if cookie:
         return cookie
-    
+
     # 如果环境变量没有，尝试从配置文件读取
     config = load_config_from_file()
     cookie = config.get('MODELING_COOKIE')
     if cookie:
         return cookie
-    
+
     # 都没有则抛出异常
     raise ValueError(
         "错误：未配置Cookie\n"
@@ -499,20 +500,20 @@ def get_cookie() -> str:
 
 
 def send_create_entity_request(
-    design_data: str,
-    host: Optional[str] = None,
-    port: int = 9300,
-    cookie: Optional[str] = None
+        design_data: str,
+        host: Optional[str] = None,
+        port: int = 9300,
+        cookie: Optional[str] = None
 ) -> requests.Response:
     """发送创建实体请求"""
     if host is None:
         host = get_host()
-    
+
     if cookie is None:
         cookie = get_cookie()
-    
+
     url = f"http://{host}:{port}/ajax/Mysoft.Map6.Modeling.Handlers.EntityHandler/CreateEntity"
-    
+
     headers = {
         'Accept': 'application/json, text/plain, */*',
         'Accept-Language': 'zh-CN,zh;q=0.9',
@@ -527,11 +528,11 @@ def send_create_entity_request(
         'work-mode': 'design',
         'Cookie': cookie
     }
-    
+
     data = {
         'designData': design_data
     }
-    
+
     response = requests.post(url, headers=headers, data=data)
     return response
 
@@ -547,26 +548,26 @@ def main():
     parser.add_argument('-p', '--port', type=int, default=9300, help='服务器端口（默认：9300）')
     parser.add_argument('-c', '--cookie', type=str, help='Cookie值（默认从环境变量MODELING_COOKIE获取）')
     parser.add_argument('-v', '--verbose', action='store_true', help='显示详细响应信息')
-    
+
     args = parser.parse_args()
-    
+
     # 步骤1：读取并解析Markdown文档
     print("=" * 60)
     print("步骤1：解析Markdown文档...")
     print("=" * 60)
-    
+
     md_path = Path(args.markdown_file)
     if not md_path.exists():
         print(f"错误：文件不存在: {args.markdown_file}")
         return 1
-    
+
     try:
         with open(md_path, 'r', encoding='utf-8') as f:
             content = f.read()
     except Exception as e:
         print(f"错误：读取文件失败: {e}")
         return 1
-    
+
     try:
         tables = parse_table_section(content)
         print(f"✓ 成功解析 {len(tables)} 个表")
@@ -575,12 +576,12 @@ def main():
     except Exception as e:
         print(f"错误：解析失败: {e}")
         return 1
-    
+
     # 步骤2：转换为实体JSON
     print("\n" + "=" * 60)
     print("步骤2：转换为实体JSON格式...")
     print("=" * 60)
-    
+
     try:
         entities = convert_tables_to_entities(tables, args.application, args.function_guid)
         print(f"✓ 成功转换 {len(entities)} 个实体")
@@ -589,32 +590,32 @@ def main():
         import traceback
         traceback.print_exc()
         return 1
-    
+
     # 步骤3：批量发送HTTP请求创建表
     print("\n" + "=" * 60)
     print("步骤3：批量创建实体表...")
     print("=" * 60)
-    
+
     total = len(entities)
     success_count = 0
     fail_count = 0
-    
+
     print(f"检测到 {total} 个实体，开始批量发送...\n")
-    
+
     for index, entity in enumerate(entities, 1):
         try:
             entity_name = entity.get('entity', {}).get('name', f'实体#{index}')
             print(f"[{index}/{total}] 处理实体: {entity_name}")
-            
+
             design_data = json.dumps(entity, ensure_ascii=False)
-            
+
             response = send_create_entity_request(
                 design_data=design_data,
                 host=args.host,
                 port=args.port,
                 cookie=args.cookie
             )
-            
+
             if response.status_code == 200:
                 try:
                     response_json = response.json()
@@ -656,7 +657,7 @@ def main():
                         print(f"  响应: {json.dumps(response_json, ensure_ascii=False, indent=2)}")
                     except json.JSONDecodeError:
                         print(f"  响应: {response.text[:200]}")
-            
+
         except ValueError as e:
             print(f"  ✗ 错误: {str(e)}")
             return 1
@@ -669,9 +670,9 @@ def main():
             if args.verbose:
                 import traceback
                 traceback.print_exc()
-        
+
         print()
-    
+
     # 输出最终结果
     print("=" * 60)
     print("批量处理完成:")
@@ -679,10 +680,9 @@ def main():
     print(f"  成功: {success_count}")
     print(f"  失败: {fail_count}")
     print("=" * 60)
-    
+
     return 0 if fail_count == 0 else 1
 
 
 if __name__ == '__main__':
-    exit(main())
-
+    exit(main())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "6a-spec-install",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "6A-spec 驱动开发提示词安装工具，支持 Cursor 和 Claude",
   "main": "lib/installer.js",
   "bin": {