cocos2d-cli 1.2.1 → 1.4.0

package/src/commands/prefab-create.js

@@ -1,411 +1,140 @@
 /**
  * prefab-create 命令 - 从 JSON 结构创建预制体文件
- * 
- * JSON 格式示例：
- * {
- *   "name": "Panel",
- *   "width": 400,
- *   "height": 300,
- *   "color": "#ffffff",
- *   "components": [
- *     { "type": "sprite", "sizeMode": 1 },
- *     { "type": "widget", "top": 0, "bottom": 0 }
- *   ],
- *   "children": [...]
- * }
- * 
- * 节点属性：name, width, height, x, y, color, opacity, anchorX, anchorY, rotation, scaleX, scaleY, active
- * 组件属性：type + 各组件特有属性
  */
 
 const fs = require('fs');
 const path = require('path');
-const { Components, generateId } = require('../lib/components');
-const { createPrefab, generateFileId } = require('../lib/fire-utils');
-
-// 支持的组件类型
-const COMPONENT_TYPES = {
-    'sprite': 'sprite',
-    'label': 'label',
-    'button': 'button',
-    'layout': 'layout',
-    'widget': 'widget',
-    'camera': 'camera',
-    'canvas': 'canvas',
-    'particle': 'particleSystem',
-    'particlesystem': 'particleSystem'
-};
+const { outputError, outputSuccess } = require('../lib/utils');
+const { createNodeData } = require('../lib/node-utils');
+const { parseComponent, createComponent, applyComponentProps } = require('../lib/components');
+const { createPrefab, generateFileId } = require('../lib/templates');
 
 /**
- * 解析颜色字符串 #RRGGBB 或 #RRGGBBAA
+ * 从 JSON 定义创建预制体数据
  */
-function parseColor(colorStr) {
-    if (!colorStr || typeof colorStr !== 'string') return null;
+function createPrefabData(nodeDef) {
+    const data = createPrefab(nodeDef.name || 'Node');
     
-    let hex = colorStr.replace('#', '');
-    if (hex.length === 6) {
-        return {
-            r: parseInt(hex.substring(0, 2), 16),
-            g: parseInt(hex.substring(2, 4), 16),
-            b: parseInt(hex.substring(4, 6), 16),
-            a: 255
-        };
-    } else if (hex.length === 8) {
-        return {
-            r: parseInt(hex.substring(0, 2), 16),
-            g: parseInt(hex.substring(2, 4), 16),
-            b: parseInt(hex.substring(4, 6), 16),
-            a: parseInt(hex.substring(6, 8), 16)
-        };
+    // 更新根节点
+    const root = data[1];
+    applyNodeDefToNode(root, nodeDef, null);
+    
+    // 递归添加子节点
+    if (nodeDef.children && nodeDef.children.length > 0) {
+        for (const childDef of nodeDef.children) {
+            addChildNode(data, childDef, 1);
+        }
     }
-    return null;
-}
-
-/**
- * 生成 UUID
- */
-function generateUUID() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-        const r = Math.random() * 16 | 0;
-        const v = c === 'x' ? r : (r & 0x3 | 0x8);
-        return v.toString(16);
-    });
+    
+    return data;
 }
 
 /**
- * 解析组件定义
- * 支持两种格式：
- * 1. 字符串: "sprite"
- * 2. 对象: { "type": "sprite", "sizeMode": 1 }
+ * 应用 JSON 定义到节点
  */
-function parseComponent(compDef) {
-    if (typeof compDef === 'string') {
-        const type = COMPONENT_TYPES[compDef.toLowerCase()];
-        return type ? { type, props: {} } : null;
+function applyNodeDefToNode(node, def, parentId) {
+    if (def.name) node._name = def.name;
+    if (def.active !== undefined) node._active = def.active;
+    if (def.opacity !== undefined) node._opacity = def.opacity;
+    if (def.width !== undefined) node._contentSize.width = def.width;
+    if (def.height !== undefined) node._contentSize.height = def.height;
+    if (def.x !== undefined) node._trs.array[0] = def.x;
+    if (def.y !== undefined) node._trs.array[1] = def.y;
+    if (def.rotation !== undefined) {
+        node._trs.array[5] = def.rotation * Math.PI / 180;
+        node._eulerAngles.z = def.rotation;
     }
-    
-    if (typeof compDef === 'object' && compDef.type) {
-        const type = COMPONENT_TYPES[compDef.type.toLowerCase()];
-        if (!type) return null;
-        
-        const props = { ...compDef };
-        delete props.type;
-        return { type, props };
+    if (def.scaleX !== undefined) node._trs.array[7] = def.scaleX;
+    if (def.scaleY !== undefined) node._trs.array[8] = def.scaleY;
+    if (def.anchorX !== undefined) node._anchorPoint.x = def.anchorX;
+    if (def.anchorY !== undefined) node._anchorPoint.y = def.anchorY;
+    if (def.color) {
+        const { parseColor } = require('../lib/utils');
+        const parsed = parseColor(def.color);
+        if (parsed) {
+            node._color = { "__type__": "cc.Color", ...parsed };
+        }
+    }
+    if (parentId !== null) {
+        node._parent = { "__id__": parentId };
     }
-    
-    return null;
 }
 
 /**
- * 应用组件属性
- * @param comp 组件对象
- * @param props 属性对象
- * @param node 节点对象（可选，用于 label 的 color 设置到节点）
+ * 添加子节点
  */
-function applyComponentProps(comp, props, node) {
-    if (!props || !comp) return;
+function addChildNode(data, def, parentIndex) {
+    const nodeIndex = data.length;
+    const node = createNodeData(def.name || 'Node', parentIndex, def);
     
-    const type = comp.__type__;
+    // 设置 _prefab 为 null，后面会添加 PrefabInfo
+    node._prefab = null;
     
-    // Label 的 color 属性应该设置到节点上
-    if (type === 'cc.Label' && props.color && node) {
-        const parsed = parseColor(props.color);
-        if (parsed) {
-            node._color = { "__type__": "cc.Color", ...parsed };
-        }
-        delete props.color; // 不再在组件中处理
-    }
+    data.push(node);
     
-    // Widget 特殊处理：根据设置的方向计算 alignFlags
-    // 位掩码定义 (来自 Cocos Creator 源码)
-    // TOP=1, MID(verticalCenter)=2, BOT=4, LEFT=8, CENTER(horizontalCenter)=16, RIGHT=32
-    if (type === 'cc.Widget') {
-        const ALIGN = { 
-            top: 1, 
-            verticalCenter: 2, 
-            bottom: 4, 
-            left: 8, 
-            horizontalCenter: 16, 
-            right: 32 
-        };
-        let alignFlags = 0;
-        
-        for (const dir of ['top', 'bottom', 'left', 'right', 'horizontalCenter', 'verticalCenter']) {
-            if (props[dir] !== undefined && props[dir] !== null) {
-                alignFlags |= ALIGN[dir];
+    // 添加组件
+    if (def.components) {
+        for (const compDef of def.components) {
+            const parsed = parseComponent(compDef);
+            if (parsed) {
+                const comp = createComponent(parsed.type, nodeIndex);
+                if (comp) {
+                    applyComponentProps(comp, parsed.props, node);
+                    data.push(comp);
+                    node._components.push({ "__id__": data.length - 1 });
+                }
             }
         }
-        
-        if (alignFlags > 0) {
-            comp._alignFlags = alignFlags;
-        }
     }
     
-    // 通用属性映射
-    const propMap = {
-        // Sprite
-        'sizeMode': '_sizeMode',
-        'fillType': '_fillType',
-        'fillCenter': '_fillCenter',
-        'fillStart': '_fillStart',
-        'fillRange': '_fillRange',
-        'trim': '_isTrimmedMode',
-        
-        // Label
-        'string': '_string',
-        'fontSize': '_fontSize',
-        'lineHeight': '_lineHeight',
-        'horizontalAlign': '_N$horizontalAlign',
-        'verticalAlign': '_N$verticalAlign',
-        'overflow': '_N$overflow',
-        'fontFamily': '_N$fontFamily',
-        'wrap': '_enableWrapText',
-        
-        // Widget
-        'alignFlags': '_alignFlags',
-        'left': '_left',
-        'right': '_right',
-        'top': '_top',
-        'bottom': '_bottom',
-        'horizontalCenter': '_horizontalCenter',
-        'verticalCenter': '_verticalCenter',
-        'isAbsLeft': '_isAbsLeft',
-        'isAbsRight': '_isAbsRight',
-        'isAbsTop': '_isAbsTop',
-        'isAbsBottom': '_isAbsBottom',
-        
-        // Button
-        'interactable': '_N$interactable',
-        'transition': '_N$transition',
-        'zoomScale': 'zoomScale',
-        'duration': 'duration',
-        
-        // Layout
-        'layoutType': '_N$layoutType',
-        'cellSize': '_N$cellSize',
-        'startAxis': '_N$startAxis',
-        'paddingLeft': '_N$paddingLeft',
-        'paddingRight': '_N$paddingRight',
-        'paddingTop': '_N$paddingTop',
-        'paddingBottom': '_N$paddingBottom',
-        'spacingX': '_N$spacingX',
-        'spacingY': '_N$spacingY',
-        'resize': '_resize',
-        
-        // Canvas
-        'designResolution': '_designResolution',
-        'fitWidth': '_fitWidth',
-        'fitHeight': '_fitHeight',
-        
-        // Camera
-        'orthoSize': '_orthoSize',
-        'backgroundColor': '_backgroundColor',
-        'cullingMask': '_cullingMask',
-        'zoomRatio': '_zoomRatio'
+    // 添加 PrefabInfo
+    const prefabInfo = {
+        "__type__": "cc.PrefabInfo",
+        "root": { "__id__": 1 },
+        "asset": { "__id__": 0 },
+        "fileId": generateFileId(),
+        "sync": false
     };
+    data.push(prefabInfo);
+    node._prefab = { "__id__": data.length - 1 };
     
-    // 特殊处理：label 的 string 属性需要同时设置 _N$string
-    if (type === 'cc.Label' && props.string !== undefined) {
-        comp._N$string = props.string;
-    }
-    
-    // 应用属性
-    for (const [key, value] of Object.entries(props)) {
-        const compKey = propMap[key];
-        if (compKey) {
-            // 处理特殊类型
-            if (key === 'fillCenter' && Array.isArray(value)) {
-                comp[compKey] = { "__type__": "cc.Vec2", "x": value[0], "y": value[1] };
-            } else if (key === 'cellSize' && Array.isArray(value)) {
-                comp[compKey] = { "__type__": "cc.Size", "width": value[0], "height": value[1] };
-            } else if (key === 'designResolution' && Array.isArray(value)) {
-                comp[compKey] = { "__type__": "cc.Size", "width": value[0], "height": value[1] };
-            } else if ((key === 'backgroundColor' || key === 'color') && typeof value === 'string') {
-                const color = parseColor(value);
-                if (color) {
-                    comp[compKey] = { "__type__": "cc.Color", ...color };
-                }
-            } else {
-                comp[compKey] = value;
-            }
-        }
-    }
-}
-
-/**
- * 从 JSON 定义创建预制体数据
- */
-function createPrefabData(nodeDef) {
-    const data = [];
+    // 更新父节点
+    data[parentIndex]._children.push({ "__id__": nodeIndex });
     
-    // 索引 0: cc.Prefab
-    data.push({
-        "__type__": "cc.Prefab",
-        "_name": "",
-        "_objFlags": 0,
-        "_native": "",
-        "data": { "__id__": 1 },
-        "optimizationPolicy": 0,
-        "asyncLoadAssets": false,
-        "readonly": false
-    });
-
-    const prefabInfoList = [];
-
-    function addNode(def, parentIndex) {
-        const nodeIndex = data.length;
-        const uuid = generateUUID();
-        const fileId = generateFileId();
-
-        // 解析组件
-        const compList = (def.components || [])
-            .map(parseComponent)
-            .filter(Boolean);
-
-        // 解析颜色
-        let color = { "__type__": "cc.Color", "r": 255, "g": 255, "b": 255, "a": 255 };
-        if (def.color) {
-            const parsed = parseColor(def.color);
-            if (parsed) {
-                color = { "__type__": "cc.Color", ...parsed };
-            }
-        }
-
-        // 解析尺寸
-        const width = def.width || 0;
-        const height = def.height || 0;
-
-        // 解析锚点
-        const anchorX = def.anchorX !== undefined ? def.anchorX : 0.5;
-        const anchorY = def.anchorY !== undefined ? def.anchorY : 0.5;
-
-        // 解析旋转和缩放
-        const rotation = def.rotation || 0;
-        const scaleX = def.scaleX !== undefined ? def.scaleX : 1;
-        const scaleY = def.scaleY !== undefined ? def.scaleY : 1;
-
-        // 创建节点
-        const node = {
-            "__type__": "cc.Node",
-            "_name": def.name || 'Node',
-            "_objFlags": 0,
-            "_parent": parentIndex === null ? null : { "__id__": parentIndex },
-            "_children": [],
-            "_active": def.active !== false,
-            "_components": [],
-            "_prefab": null,
-            "_opacity": def.opacity !== undefined ? def.opacity : 255,
-            "_color": color,
-            "_contentSize": {
-                "__type__": "cc.Size",
-                width,
-                height
-            },
-            "_anchorPoint": { "__type__": "cc.Vec2", "x": anchorX, "y": anchorY },
-            "_trs": {
-                "__type__": "TypedArray",
-                "ctor": "Float64Array",
-                "array": [
-                    def.x || 0,
-                    def.y || 0,
-                    0,                      // z
-                    0,                      // quat x
-                    0,                      // quat y
-                    rotation * Math.PI / 180, // quat z (rotation in radians)
-                    1,                      // quat w
-                    scaleX,
-                    scaleY,
-                    1                      // scale z
-                ]
-            },
-            "_eulerAngles": { "__type__": "cc.Vec3", "x": 0, "y": 0, "z": rotation },
-            "_skewX": 0,
-            "_skewY": 0,
-            "_is3DNode": false,
-            "_groupIndex": 0,
-            "groupIndex": 0,
-            "_id": uuid
-        };
-
-        data.push(node);
-
-        // 记录 PrefabInfo
-        prefabInfoList.push({
-            nodeIndex,
-            prefabInfo: {
-                "__type__": "cc.PrefabInfo",
-                "root": { "__id__": 1 },
-                "asset": { "__id__": 0 },
-                "fileId": fileId,
-                "sync": false
-            }
-        });
-
-        // 添加组件
-        for (const { type, props } of compList) {
-            if (Components[type]) {
-                const comp = Components[type](nodeIndex);
-                // 应用组件属性
-                applyComponentProps(comp, props, node);
-                const compIndex = data.length;
-                data.push(comp);
-                node._components.push({ "__id__": compIndex });
-            }
-        }
-
-        // 更新父节点
-        if (parentIndex !== null) {
-            data[parentIndex]._children.push({ "__id__": nodeIndex });
-        }
-
-        // 递归处理子节点
-        if (def.children && def.children.length > 0) {
-            for (const child of def.children) {
-                addNode(child, nodeIndex);
-            }
+    // 递归处理子节点
+    if (def.children && def.children.length > 0) {
+        for (const childDef of def.children) {
+            addChildNode(data, childDef, nodeIndex);
         }
-
-        return nodeIndex;
-    }
-
-    // 添加根节点
-    addNode(nodeDef, null);
-
-    // 添加所有 PrefabInfo
-    for (const { nodeIndex, prefabInfo } of prefabInfoList) {
-        data.push(prefabInfo);
-        data[nodeIndex]._prefab = { "__id__": data.length - 1 };
     }
-
-    return data;
 }
 
 function run(args) {
     if (args.length < 1) {
-        console.log(JSON.stringify({ 
-            error: '用法: cocos2d-cli create-prefab <输出路径.prefab>',
-            hint: '从 stdin 读取 JSON 结构生成预制体',
-            example: 'type panel.json | cocos2d-cli create-prefab assets/panel.prefab'
-        }));
+        outputError({ 
+            message: '用法: cocos2d-cli create-prefab [JSON文件路径] <输出路径.prefab>',
+            hint: '不传 JSON 则创建默认预制体'
+        });
         return;
     }
 
-    const outputPath = args[0];
+    let jsonPath = null;
+    let outputPath;
 
-    // 从 stdin 读取 JSON
-    let input = '';
-    
-    if (!process.stdin.isTTY) {
-        input = fs.readFileSync(0, 'utf8');
+    if (args.length === 1) {
+        outputPath = args[0];
+    } else {
+        jsonPath = args[0];
+        outputPath = args[1];
     }
 
-    // 没有 stdin 输入时创建空预制体
-    if (!input.trim()) {
+    // 没有传 JSON，创建默认预制体
+    if (!jsonPath) {
         const prefabName = path.basename(outputPath, '.prefab');
         
         try {
             if (fs.existsSync(outputPath)) {
-                console.log(JSON.stringify({ error: `文件已存在: ${outputPath}` }));
+                outputError(`文件已存在: ${outputPath}`);
                 return;
             }
             
@@ -417,39 +146,39 @@ function run(args) {
             const data = createPrefab(prefabName);
             fs.writeFileSync(outputPath, JSON.stringify(data, null, 2), 'utf8');
             
-            console.log(JSON.stringify({ 
-                success: true, 
+            outputSuccess({ 
                 path: outputPath,
-                rootName: prefabName
-            }));
+                rootName: prefabName,
+                nodes: 1,
+                components: 0
+            });
             return;
         } catch (err) {
-            console.log(JSON.stringify({ error: err.message }));
+            outputError(err.message);
             return;
         }
     }
 
+    if (!fs.existsSync(jsonPath)) {
+        outputError(`JSON 文件不存在: ${jsonPath}`);
+        return;
+    }
+
     try {
-        // 移除 BOM 并解析 JSON
-        input = input.replace(/^\uFEFF/, '').trim();
-        const nodeDef = JSON.parse(input);
+        const input = fs.readFileSync(jsonPath, 'utf8');
+        const cleanInput = input.replace(/^\uFEFF/, '').trim();
+        const nodeDef = JSON.parse(cleanInput);
 
-        // 支持数组格式（第一个作为根节点）
         const rootNode = Array.isArray(nodeDef) ? nodeDef[0] : nodeDef;
-
-        // 生成预制体
         const prefabData = createPrefabData(rootNode);
 
-        // 确保目录存在
         const outputDir = path.dirname(outputPath);
         if (!fs.existsSync(outputDir)) {
             fs.mkdirSync(outputDir, { recursive: true });
         }
 
-        // 保存
         fs.writeFileSync(outputPath, JSON.stringify(prefabData, null, 2), 'utf8');
 
-        // 统计
         let nodeCount = 0, compCount = 0;
         for (const item of prefabData) {
             if (item.__type__ === 'cc.Node') nodeCount++;
@@ -458,15 +187,14 @@ function run(args) {
             }
         }
 
-        console.log(JSON.stringify({
-            success: true,
+        outputSuccess({
             path: outputPath,
             nodes: nodeCount,
             components: compCount
-        }));
+        });
 
     } catch (err) {
-        console.log(JSON.stringify({ error: err.message }));
+        outputError(err.message);
     }
 }