cloudcc-cli 2.1.8 → 2.2.0

package/README.md

@@ -1,3 +1,20 @@
+# ReleaseV2.2.0
+#### Release Date: 2025-11-24
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * Update the packaging and parsing of Vue files
+    * Add upload dependency tree to custom component
+
+
+
+# ReleaseV2.1.9
+#### Release Date: 2025-9-1
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * getBaseUrl change orgId.
+
 # ReleaseV2.1.8
 #### Release Date: 2025-7-30
 #### Release Scope: Full

package/bin/cc.js

@@ -4,6 +4,13 @@ const chalk = require("chalk")
 let argvs = process.argv.splice(2);
 
 let action = argvs[0]
+// 处理版本查询命令
+if (action === '-version' || action === '-v' || action === '--version' || action === '--v') {
+    const version = require("../src/version/index")
+    version('get', argvs);
+    return;
+}
+
 if (!action) {
     console.log()
     console.log(chalk.yellow("Please see the help documentation"));
@@ -43,6 +50,8 @@ cc.object = require("../src/object/index")
 cc.recordType = require("../src/recordType/index")
 
 cc.config = require("../src/config/index")
+
+cc.version = require("../src/version/index")
 try {
     cc[argvs[1]](argvs[0], argvs);
 } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-cli",
-  "version": "2.1.8",
+  "version": "2.2.0",
   "description": "cloudcc-cli",
   "keywords": [
     "cloudcc",
@@ -20,6 +20,8 @@
     "package-jar": "mvn clean && mvn package"
   },
   "dependencies": {
+    "@babel/parser": "^7.28.5",
+    "@babel/traverse": "^7.28.5",
     "axios": "^0.21.4",
     "boxen": "^4.0.0",
     "chalk": "^2.4.2",

package/src/plugin/create.js

@@ -29,7 +29,6 @@ data() {
 .cc-container {
 text-align: center;
 padding: 8px;
-background: goldenrod;
 }
 </style>`
 

package/src/plugin/create1.js

@@ -38,7 +38,6 @@ data() {
 .cc-container {
   text-align: center;
   padding: 8px;
-  background: goldenrod;
 }
 </style>`
 

package/src/plugin/publish1.js

@@ -7,6 +7,7 @@ const { readCache, writeCache } = require("../../utils/cache")
 const { checkUpdate } = require("../../utils/checkVersion")
 const BaseUrl = "https://developer.apis.cloudcc.cn"
 const { getPackageJson } = require("../../utils/config.js")
+const { parseVueDataFunction, collectDependenciesWithTree } = require("../../utils/utils.js")
 
 
 class Builder {
@@ -86,16 +87,10 @@ class Builder {
             console.log(chalk.yellow("Warning: The scoped attribute is missing in style, which may cause global style pollution. It is recommended to fix it。"));
             console.log()
         }
-        vueData = vueData.split(/data\s*\(\s*\)/)[1].split(/isLock\s*:/)[0] + "isLock:false,};}";
-        vueData = "function data()" + vueData;
-        let data = {}
-        try {
-            data = eval(`(${vueData})`)()
-        }
-        catch (e) {
-            console.log()
-            console.log(chalk.red("Error: The data function cannot contain reference variables."));
-            console.log()
+
+        // 提取 data() 函数的返回对象
+        let data = parseVueDataFunction(vueContent);
+        if (!data) {
             return null;
         }
         if (!data.propObj) {
@@ -189,7 +184,50 @@ class Builder {
             belongOrgFlag = this.options.pluginConfig.belongOrgFlag
         }
         vueData = JSON.stringify(data);
-        return { compName, component, vueContent, vueData, bizType, compDesc, category, loadModel, belongOrgFlag }
+
+        // 收集所有依赖文件
+        const baseDir = path.join(process.cwd(), 'plugins');
+        const entryFile = path.join(baseDir, buildFileName);
+        const allDependencies = collectDependenciesWithTree(entryFile, baseDir);
+
+        // 收集根目录下的配置文件
+        const rootDir = process.cwd();
+        const configFiles = ['package.json', 'cloudcc-cli.config.js'];
+
+        for (const configFile of configFiles) {
+            const configPath = path.join(rootDir, configFile);
+            if (fs.existsSync(configPath)) {
+                try {
+                    const content = fs.readFileSync(configPath, 'utf8');
+                    allDependencies[configFile] = content;
+                } catch (err) {
+                    console.log(chalk.yellow(`Warning: Cannot read ${configFile}:`, err.message));
+                }
+            }
+        }
+
+        // 输出依赖信息到文件
+        try {
+            const outputPath = path.join(process.cwd(), 'dependencies-output.json');
+            fs.writeFileSync(outputPath, JSON.stringify(allDependencies, null, 2), 'utf8');
+            console.log(chalk.green(`Dependencies collected and saved to: ${outputPath}`));
+            console.log(chalk.cyan(`Total files: ${Object.keys(allDependencies).length}`));
+        } catch (err) {
+            console.log(chalk.yellow('Warning: Failed to write dependencies output file:', err.message));
+        }
+
+        return {
+            compName,
+            component,
+            vueContent,
+            vueData,
+            bizType,
+            compDesc,
+            category,
+            loadModel,
+            belongOrgFlag,
+            dependencies: allDependencies
+        }
     };
 
     initPluginFile(buildFileName, component, plginTemp) {
@@ -258,13 +296,15 @@ class Builder {
             "compLabel": obj.compName,
             "compUniName": obj.component,
             "compContentJs": jsContent,
-            "compContentVue": obj.vueContent,
+            "compContentVue": JSON.stringify(obj.dependencies || {}),
+            // "compContentVue": obj.vueContent,
             "vueData": obj.vueData,
             "bizType": obj.bizType,
             "compDesc": obj.compDesc,
             "category": obj.category,
             "loadModel": obj.loadModel,
-            "belongOrgFlag": obj.belongOrgFlag
+            "belongOrgFlag": obj.belongOrgFlag,
+            "dependencies": JSON.stringify(obj.dependencies || {})
         }
 
         let devSvcDispatch = this.options.devConsoleConfig.devSvcDispatch || '/devconsole'
@@ -275,7 +315,8 @@ class Builder {
             console.error(chalk.green(`Success！`));
             console.log();
         } else {
-            console.error(chalk.red(`Publish Plugin Fail: ${JSON.stringify(res)}`));
+            console.log("res", res);
+            console.error(chalk.red(`Fail: ${res.returnInfo}`));
             console.log();
         }
         return res;

package/src/version/get.js

@@ -0,0 +1,10 @@
+const chalk = require("chalk")
+const pkg = require("../../package.json")
+
+function get() {
+    console.log()
+    console.log(chalk.green(`cloudcc-cli version: ${pkg.version}`));
+    console.log()
+}
+
+module.exports = get;

package/src/version/index.js

@@ -0,0 +1,8 @@
+const cc = {}
+cc.get = require("./get")
+
+function Version(action, argvs) {
+  cc[action](argvs)
+}
+
+module.exports = Version;

package/template/Appvue

@@ -5,21 +5,21 @@
 </template>
 
 <script>
-export default {
-  name: "App",
-};
+  export default {
+    name: "App",
+  };
 </script>
 
 <style lang="scss" scoped>
-html body {
-  padding: 0;
-  margin: 0;
-  height: 100vh;
-  width: 100%;
-}
-.cc-container {
-  text-align: center;
-  padding: 8px;
-  background: goldenrod;
-}
+  html body {
+    padding: 0;
+    margin: 0;
+    height: 100vh;
+    width: 100%;
+  }
+
+  .cc-container {
+    text-align: center;
+    padding: 8px;
+  }
 </style>

package/template/cloudcc-cli.configjs

@@ -1 +1 @@
-module.exports = { "use": "dev", "dev": { "username": "xxx", "secretKey": "xxx" } }
+module.exports = { "use": "dev", "dev": { "safetyMark": "xxx", "CloudCCDev": "xxx" } }

package/template/indexvue

@@ -25,6 +25,5 @@ export default {
 .cc - container {
   text - align: center;
   padding: 8px;
-  background: goldenrod;
 }
 </style>

package/utils/checkVersion.js

@@ -23,7 +23,6 @@ function checkNpmVersion() {
     });
 
     onlineVersionNum = Number(onlineVersion.replace(/\./g, ""));
-
     console.log('\n');
     console.log(chalk.bold.cyan('  CloudCC CLI Version\n'));
     console.log('  ' + chalk.gray('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
@@ -70,7 +69,6 @@ async function checkUpdate(path = process.cwd()) {
     const cacheKey = 'version_check';
     const now = Date.now();
     const oneHour = 60 * 60 * 1000;
-
     if (cache[cacheKey] &&
         cache[cacheKey].timestamp &&
         (now - cache[cacheKey].timestamp) < oneHour) {

package/utils/config.js

@@ -58,8 +58,7 @@ async function getPackageJson3(projectPath = process.cwd()) {
  */
 async function getPackageJsonCache(projectPath = process.cwd()) {
     let config = require(path.join(projectPath, "cloudcc-cli.config.js"));
-    const cacheData = readCache()[config[config.use].safetyMark || config[config.use].secretKey];
-
+    const cacheData = readCache(projectPath)[config[config.use].safetyMark || config[config.use].secretKey];
     if (cacheData && cacheData.timestamp) {
         const oneHour = 60 * 60 * 1000; // 1小时的毫秒数
         const currentTime = Date.now();

package/utils/utils.js

@@ -24,7 +24,7 @@ async function getBaseUrl(config) {
     if (config.baseUrl) {
         config.apiSvc = config.baseUrl + (config.apiSvcPrefix || "/apisvc")
         config.setupSvc = config.baseUrl + (config.setupSvcPrefix || "/setup")
-    } else {
+    } else if (config.orgId) {
         let u = "https://developer.apis.cloudcc.cn/oauth/apidomain?scope=cloudccCRM&orgId=" + config.orgId
         let res = await axios({
             url: u,
@@ -165,5 +165,408 @@ function decryptCloudCCDevInfo(encryptedData) {
  */
 const javaContentRegular = /\/\/\s*@SOURCE_CONTENT_START\r?\n([\s\S]*?)\r?\n\s*\/\/\s*@SOURCE_CONTENT_END/
 
+// 用于 AST 解析
+let babelParser, babelTraverse;
+try {
+    babelParser = require('@babel/parser');
+    babelTraverse = require('@babel/traverse').default;
+} catch (e) {
+    // 如果没有安装 babel 依赖，将在使用时提示安装
+    babelParser = null;
+    babelTraverse = null;
+}
+
+/**
+ * 使用 AST 解析 Vue 文件中的 data() 函数
+ * @param {string} vueContent - Vue 文件内容
+ * @returns {Object|null} 解析出的 data 对象，失败返回 null
+ */
+function parseVueDataFunction(vueContent) {
+    // if (!babelParser || !babelTraverse) {
+    //     console.log()
+    //     console.log(chalk.yellow("Warning: @babel/parser and @babel/traverse are not installed. Please run:"));
+    //     console.log(chalk.cyan("npm install --save @babel/parser @babel/traverse"));
+    //     console.log()
+    //     console.log(chalk.yellow("Falling back to regex parsing..."));
+    //     return parseVueDataFunctionWithRegex(vueContent);
+    // }
+
+    try {
+        // 提取 <script> 标签中的内容
+        const scriptMatch = vueContent.match(/<script[^>]*>([\s\S]*?)<\/script>/);
+        if (!scriptMatch) {
+            console.log()
+            console.log(chalk.red("Error: Cannot find <script> tag in the vue file."));
+            console.log()
+            return null;
+        }
+
+        const scriptContent = scriptMatch[1];
+
+        // 使用 Babel 解析 JavaScript 代码
+        const ast = babelParser.parse(scriptContent, {
+            sourceType: 'module',
+            plugins: ['jsx', 'typescript']
+        });
+
+        let dataObject = null;
+
+        // 遍历 AST，查找 data() 方法
+        babelTraverse(ast, {
+            ObjectMethod(path) {
+                // 查找名为 data 的方法
+                if (path.node.key.name === 'data' && path.node.params.length === 0) {
+                    // 查找 return 语句
+                    path.traverse({
+                        ReturnStatement(returnPath) {
+                            if (returnPath.node.argument && returnPath.node.argument.type === 'ObjectExpression') {
+                                // 将 AST 对象表达式转换为实际的 JavaScript 对象
+                                dataObject = astToObject(returnPath.node.argument);
+                                returnPath.stop();
+                            }
+                        }
+                    });
+                    path.stop();
+                }
+            },
+            // 也处理 data: function() {} 的形式
+            ObjectProperty(path) {
+                if (path.node.key.name === 'data' &&
+                    (path.node.value.type === 'FunctionExpression' || path.node.value.type === 'ArrowFunctionExpression')) {
+                    // 查找 return 语句
+                    path.traverse({
+                        ReturnStatement(returnPath) {
+                            if (returnPath.node.argument && returnPath.node.argument.type === 'ObjectExpression') {
+                                dataObject = astToObject(returnPath.node.argument);
+                                returnPath.stop();
+                            }
+                        }
+                    });
+                    path.stop();
+                }
+            }
+        });
+
+        if (!dataObject) {
+            console.log()
+            console.log(chalk.red("Error: Cannot find data() function or its return statement in the vue file."));
+            console.log()
+            return null;
+        }
+
+        return dataObject;
+
+    } catch (e) {
+        console.log()
+        console.log(chalk.red("Error: Failed to parse vue file with AST."));
+        console.log(chalk.red("Details: " + e.message));
+        console.log()
+        return null;
+    }
+}
+
+/**
+ * 将 Babel AST 对象表达式转换为 JavaScript 对象
+ * @param {Object} node - AST 节点
+ * @returns {Object} JavaScript 对象
+ */
+function astToObject(node) {
+    if (node.type === 'ObjectExpression') {
+        const obj = {};
+        for (const prop of node.properties) {
+            if (prop.type === 'ObjectProperty') {
+                const key = prop.key.name || prop.key.value;
+                obj[key] = astToValue(prop.value);
+            } else if (prop.type === 'SpreadElement') {
+                // 处理展开运算符 {...obj}
+                console.log(chalk.yellow("Warning: Spread operator is not fully supported in data object."));
+            }
+        }
+        return obj;
+    }
+    return astToValue(node);
+}
+
+/**
+ * 将 AST 值节点转换为 JavaScript 值
+ * @param {Object} node - AST 节点
+ * @returns {*} JavaScript 值
+ */
+function astToValue(node) {
+    switch (node.type) {
+        case 'StringLiteral':
+            return node.value;
+        case 'NumericLiteral':
+            return node.value;
+        case 'BooleanLiteral':
+            return node.value;
+        case 'NullLiteral':
+            return null;
+        case 'ObjectExpression':
+            return astToObject(node);
+        case 'ArrayExpression':
+            return node.elements.map(el => astToValue(el));
+        case 'UnaryExpression':
+            // 处理负数等
+            if (node.operator === '-' && node.argument.type === 'NumericLiteral') {
+                return -node.argument.value;
+            }
+            return undefined;
+        default:
+            // 对于无法静态解析的值（如函数、变量引用等），返回 undefined
+            return undefined;
+    }
+}
+
+/**
+ * 降级方案：使用正则表达式解析 Vue data() 函数
+ * @param {string} vueContent - Vue 文件内容
+ * @returns {Object|null} 解析出的 data 对象，失败返回 null
+ */
+function parseVueDataFunctionWithRegex(vueContent) {
+    try {
+        // 匹配 data() 函数，找到开始位置
+        const dataStartMatch = vueContent.match(/data\s*\(\s*\)\s*\{[\s\S]*?return\s*\{/);
+        if (!dataStartMatch) {
+            console.log()
+            console.log(chalk.red("Error: Cannot find data() function or its return statement in the vue file."));
+            console.log()
+            return null;
+        }
+
+        // 从 return { 后面开始提取，需要匹配嵌套的大括号
+        let startIndex = dataStartMatch.index + dataStartMatch[0].length;
+        let braceCount = 1;
+        let endIndex = startIndex;
+
+        // 逐字符扫描，匹配嵌套的大括号
+        while (endIndex < vueContent.length && braceCount > 0) {
+            const char = vueContent[endIndex];
+            if (char === '{') {
+                braceCount++;
+            } else if (char === '}') {
+                braceCount--;
+            }
+            endIndex++;
+        }
+
+        if (braceCount !== 0) {
+            console.log()
+            console.log(chalk.red("Error: Cannot parse data() function, unmatched braces."));
+            console.log()
+            return null;
+        }
+
+        // 提取返回对象的内容（不包括最外层的大括号）
+        const dataObjectContent = vueContent.substring(startIndex, endIndex - 1);
+
+        // 使用 Function 构造器在独立作用域中执行
+        const evalCode = `return {${dataObjectContent}};`;
+        const dataFunc = new Function(evalCode);
+        return dataFunc();
+
+    } catch (e) {
+        console.log()
+        console.log(chalk.red("Error: Failed to parse data function with regex."));
+        console.log(chalk.red("Details: " + e.message));
+        console.log()
+        return null;
+    }
+}
+
+
+/**
+ * 解析 JS 代码中的依赖（import/require）
+ * @param {string} jsContent - JS 代码内容
+ * @returns {Array<string>} 依赖路径数组
+ */
+function parseJsDependencies(jsContent) {
+    const dependencies = [];
+
+    // 匹配 ES6 import
+    const importRegex = /import\s+(?:(?:\{[^}]*\}|\*\s+as\s+\w+|\w+)\s+from\s+)?['"]([^'"]+)['"]/g;
+    let match;
+    while ((match = importRegex.exec(jsContent)) !== null) {
+        dependencies.push(match[1]);
+    }
+
+    // 匹配 require
+    const requireRegex = /require\s*\(['"]([^'"]+)['"]\)/g;
+    while ((match = requireRegex.exec(jsContent)) !== null) {
+        dependencies.push(match[1]);
+    }
+
+    return dependencies;
+}
+
+/**
+ * 解析 CSS 中的依赖（@import）
+ * @param {string} cssContent - CSS 代码内容
+ * @returns {Array<string>} 依赖路径数组
+ */
+function parseCssDependencies(cssContent) {
+    const dependencies = [];
+
+    // 匹配 @import
+    const importRegex = /@import\s+['"]([^'"]+)['"]/g;
+    let match;
+    while ((match = importRegex.exec(cssContent)) !== null) {
+        dependencies.push(match[1]);
+    }
+
+    return dependencies;
+}
+
+/**
+ * 解析文件中的依赖（import/require）
+ * @param {string} fileContent - 文件内容
+ * @param {string} fileType - 文件类型 ('vue', 'js', 'css')
+ * @returns {Array<string>} 依赖路径数组
+ */
+function parseDependencies(fileContent, fileType) {
+    const dependencies = [];
+
+    if (fileType === 'vue') {
+        // 提取 <script> 部分
+        const scriptMatch = fileContent.match(/<script[^>]*>([\s\S]*?)<\/script>/);
+        if (scriptMatch) {
+            dependencies.push(...parseJsDependencies(scriptMatch[1]));
+        }
+
+        // 提取 <style> 中的 @import
+        const styleMatches = fileContent.matchAll(/<style[^>]*>([\s\S]*?)<\/style>/g);
+        for (const match of styleMatches) {
+            dependencies.push(...parseCssDependencies(match[1]));
+        }
+    } else if (fileType === 'js') {
+        dependencies.push(...parseJsDependencies(fileContent));
+    } else if (fileType === 'css') {
+        dependencies.push(...parseCssDependencies(fileContent));
+    }
+
+    return dependencies;
+}
+
+/**
+ * 解析依赖路径（处理相对路径、扩展名等）
+ * @param {string} depPath - 依赖路径
+ * @param {string} currentFile - 当前文件的绝对路径
+ * @param {string} baseDir - 基础目录
+ * @returns {string|null} 解析后的绝对路径，未找到返回 null
+ */
+function resolveDependencyPath(depPath, currentFile, baseDir) {
+    const fs = require('fs');
+    const path = require('path');
+
+    const currentDir = path.dirname(currentFile);
+    const possibleExtensions = ['', '.vue', '.js', '.jsx', '.ts', '.tsx', '.css', '.scss', '.sass', '.less'];
+
+    // 尝试不同的扩展名
+    for (const ext of possibleExtensions) {
+        const fullPath = path.resolve(currentDir, depPath + ext);
+        if (fs.existsSync(fullPath)) {
+            const stat = fs.statSync(fullPath);
+            if (stat.isFile()) {
+                return fullPath;
+            }
+        }
+    }
+
+    // 如果是目录，尝试 index 文件
+    const dirPath = path.resolve(currentDir, depPath);
+    if (fs.existsSync(dirPath)) {
+        const stat = fs.statSync(dirPath);
+        if (stat.isDirectory()) {
+            for (const ext of ['.vue', '.js', '.jsx', '.ts', '.tsx']) {
+                const indexPath = path.join(dirPath, 'index' + ext);
+                if (fs.existsSync(indexPath)) {
+                    return indexPath;
+                }
+            }
+        }
+    }
+
+    return null;
+}
+
+/**
+ * 递归收集所有依赖文件
+ * @param {string} entryFile - 入口文件路径（绝对路径或相对于 baseDir）
+ * @param {string} baseDir - 基础目录
+ * @param {Set} visited - 已访问的文件集合（用于避免循环依赖）
+ * @returns {Object} { files: { relativePath: fileContent }, tree: dependencyTree }
+ */
+function collectDependencies(entryFile, baseDir, visited = new Set()) {
+    const fs = require('fs');
+    const path = require('path');
+    const dependencies = {};
+
+    // 规范化路径
+    const normalizedPath = path.isAbsolute(entryFile) ? entryFile : path.resolve(baseDir, entryFile);
+
+    // 避免循环依赖
+    if (visited.has(normalizedPath)) {
+        return dependencies;
+    }
+    visited.add(normalizedPath);
+
+    // 读取文件内容
+    let fileContent;
+    try {
+        fileContent = fs.readFileSync(normalizedPath, 'utf8');
+    } catch (error) {
+        console.log(chalk.yellow(`Warning: Cannot read file ${normalizedPath}`));
+        return dependencies;
+    }
+
+    // 保存当前文件（使用相对路径作为键）
+    const relativePath = path.relative(baseDir, normalizedPath);
+    dependencies[relativePath] = fileContent;
+
+    // 确定文件类型
+    const ext = path.extname(normalizedPath).slice(1);
+    const fileType = ext === 'vue' ? 'vue' :
+        (['css', 'scss', 'sass', 'less'].includes(ext)) ? 'css' : 'js';
+
+    // 解析依赖
+    const deps = parseDependencies(fileContent, fileType);
+
+    // 递归处理每个依赖
+    for (const dep of deps) {
+        // 只处理相对路径（跳过 node_modules 和绝对路径的包）
+        if (dep.startsWith('.') || dep.startsWith('/')) {
+            const depPath = resolveDependencyPath(dep, normalizedPath, baseDir);
+            if (depPath) {
+                const subDeps = collectDependencies(depPath, baseDir, visited);
+                Object.assign(dependencies, subDeps);
+            } else {
+                console.log(chalk.yellow(`Warning: Cannot resolve dependency "${dep}" from ${relativePath}`));
+            }
+        }
+    }
+
+    return dependencies;
+}
+
+/**
+ * 收集依赖文件
+ * @param {string} entryFile - 入口文件路径
+ * @param {string} baseDir - 基础目录
+ * @returns {Object} { [relativePath]: fileContent }
+ */
+function collectDependenciesWithTree(entryFile, baseDir) {
+    return collectDependencies(entryFile, baseDir);
+}
 
-module.exports = { getDevConsoleConfig, javaContentRegular, decryptCloudCCDevInfo }
+module.exports = {
+    getDevConsoleConfig,
+    javaContentRegular,
+    decryptCloudCCDevInfo,
+    parseVueDataFunction,
+    parseVueDataFunctionWithRegex,
+    collectDependencies,
+    collectDependenciesWithTree,
+    parseDependencies,
+    parseJsDependencies,
+    parseCssDependencies
+}