cloudcc-cli 2.2.7 → 2.2.9

package/src/plugin/publish1.js

@@ -19,6 +19,7 @@ class Builder {
 
             }
         }
+        this.pluginConfigPath = ""
         this.plugin = process.argv.splice(2)[0]
     }
     async publish(argvs) {
@@ -27,7 +28,8 @@ class Builder {
         if (!res) {
             this.options.devConsoleConfig = await getPackageJson();
             this.options.devConsoleConfig.CloudCCDev = "";
-            this.options.pluginConfig = JSON.parse(fs.readFileSync(path.join(process.cwd(), `plugins/${name}/config.json`), 'utf8'));
+            this.pluginConfigPath = path.join(process.cwd(), `plugins/${name}/config.json`);
+            this.options.pluginConfig = JSON.parse(fs.readFileSync(this.pluginConfigPath, 'utf8'));
             let config = this.options.devConsoleConfig
             if ("private" != this.options.devConsoleConfig.version) {
                 config = { "accessToken": this.options.devConsoleConfig.pluginToken || await this.getToken(config) };
@@ -42,14 +44,14 @@ class Builder {
                     let obj = this.getVueValue(item);
                     if (obj) {
                         this.initPluginFile(item, obj, "plginTemp" + i);
-                        this.build(obj, config, "plginTemp" + i)
+                        await this.build(obj, config, "plginTemp" + i)
                     }
                 }
             } else {
                 let obj = this.getVueValue(answers.buildFileName);
                 if (obj) {
                     this.initPluginFile(answers.buildFileName, obj, "plginTemp");
-                    this.build(obj, config, "plginTemp")
+                    await this.build(obj, config, "plginTemp")
                 }
             }
         }
@@ -188,13 +190,12 @@ class Builder {
         }
         vueData = JSON.stringify(data);
 
-        // 收集所有依赖文件
-        const baseDir = path.join(process.cwd(), 'plugins');
-        const entryFile = path.join(baseDir, buildFileName);
-        const allDependencies = collectDependenciesWithTree(entryFile, baseDir);
+        // 收集所有依赖文件（相对路径以项目根为基准，便于线上还原为 plugins/...、utils/...）
+        const rootDir = process.cwd();
+        const entryFile = path.join(rootDir, 'plugins', buildFileName);
+        const allDependencies = collectDependenciesWithTree(entryFile, rootDir);
 
         // 收集根目录下的配置文件
-        const rootDir = process.cwd();
         const configFiles = ['package.json', 'cloudcc-cli.config.js'];
 
         for (const configFile of configFiles) {
@@ -277,18 +278,26 @@ class Builder {
 
     build(obj, config, plginTemp) {
         console.error(chalk.green('Compiling, Please Wait...'));
-        exec('npx vue-cli-service build --target lib --name ' + obj.component + `  --dest build plugins/${plginTemp}.js`, async (error, stdout, stderr) => {
-            if (error) {
-                console.error('Compilation Failed：', error);
-                console.error(chalk.red('Compilation Failed：' + stdout));
-                return;
-            } else {
-                console.error(chalk.green('Compilation Successful！'));
-                console.error();
-                await this.upload(obj, config)
-                fs.unlinkSync(`plugins/${plginTemp}.js`);
-            }
-        })
+        return new Promise((resolve, reject) => {
+            exec('npx vue-cli-service build --target lib --name ' + obj.component + `  --dest build plugins/${plginTemp}.js`, async (error, stdout) => {
+                if (error) {
+                    console.error('Compilation Failed：', error);
+                    console.error(chalk.red('Compilation Failed：' + stdout));
+                    reject(error);
+                    return;
+                }
+
+                try {
+                    console.error(chalk.green('Compilation Successful！'));
+                    console.error();
+                    await this.upload(obj, config)
+                    fs.unlinkSync(`plugins/${plginTemp}.js`);
+                    resolve();
+                } catch (uploadError) {
+                    reject(uploadError);
+                }
+            })
+        });
     }
 
     async upload(obj, header) {
@@ -323,6 +332,11 @@ class Builder {
         let res = await post(`${this.options.devConsoleConfig.baseUrl || BaseUrl}${devSvcDispatch}/custom/pc/1.0/post/insertCustomComp`,
             body, header);
         if (res.returnCode == 200) {
+            const returnedId = res?.data?.id || res?.data;
+            if (!this.options.pluginConfig.id && returnedId && this.pluginConfigPath) {
+                this.options.pluginConfig.id = returnedId;
+                fs.writeFileSync(this.pluginConfigPath, JSON.stringify(this.options.pluginConfig, null, 2), 'utf8');
+            }
             console.error(chalk.green(`Success！`));
             console.error();
         } else {

package/src/plugin/pull.js

@@ -5,6 +5,66 @@ const { getPackageJson } = require("../../utils/config");
 const { post } = require("../../utils/http");
 const BaseUrl = "https://developer.apis.cloudcc.cn";
 
+/**
+ * 反复去掉路径开头的插件目录名，避免 plugins/foo/foo/foo.vue 这类重复嵌套
+ */
+function stripLeadingPluginSegments(rest, pluginNames) {
+    const names = [...new Set(pluginNames.filter(Boolean))];
+    let guard = 0;
+    while (guard++ < 64) {
+        let stripped = false;
+        for (const n of names) {
+            const p = n + '/';
+            if (rest.startsWith(p)) {
+                rest = rest.slice(p.length);
+                stripped = true;
+                break;
+            }
+        }
+        if (!stripped) break;
+    }
+    return rest;
+}
+
+/**
+ * 根据服务端键解析本地绝对路径（与 publish 侧「项目根相对路径」一致）
+ */
+function resolvePullFileFullPath(filePath, projectPath, pluginPath, normalizedPluginName, pluginName) {
+    const normalized = filePath.replace(/\\/g, '/').replace(/^\.\//, '');
+    const pluginNames = [normalizedPluginName, pluginName].filter(Boolean);
+
+    // 旧版发布：依赖键相对 plugins 目录为 ../utils/...
+    if (normalized.startsWith('../')) {
+        const trimmed = normalized.replace(/^\.\.\/+/, '');
+        return path.join(projectPath, trimmed);
+    }
+
+    // 键本身就在项目根下（无 plugins/ 前缀），如 utils/http.js
+    if (!normalized.startsWith('plugins/')) {
+        if (normalized.startsWith('utils/') || normalized.startsWith('src/') || normalized.startsWith('lib/')) {
+            return path.join(projectPath, normalized);
+        }
+    }
+
+    let rest = normalized;
+    if (rest.startsWith('plugins/')) {
+        rest = rest.slice('plugins/'.length);
+    }
+
+    rest = stripLeadingPluginSegments(rest, pluginNames);
+
+    // 仅文件名 http.js 落在插件根时，按工程惯例放到 utils/http.js（对应 import ../../utils/http）
+    if (rest === 'http.js') {
+        return path.join(projectPath, 'utils', 'http.js');
+    }
+
+    if (!rest || rest === '.') {
+        return pluginPath;
+    }
+
+    return path.join(pluginPath, rest);
+}
+
 /**
  * 从服务器拉取自定义组件到本地
  * 支持通过组件名或ID拉取：
@@ -100,45 +160,23 @@ async function pullById(pluginId, projectPath) {
 
             // 遍历所有文件并保存
             Object.entries(contentMap).forEach(([filePath, content]) => {
-                // 统一路径分隔符（服务端可能返回 Windows 风格的反斜杠）
-                filePath = filePath.replace(/\\/g, '/');
+                const normalizedPath = filePath.replace(/\\/g, '/');
 
                 // 获取文件名（不包含路径）
-                const fileName = path.basename(filePath);
+                const fileName = path.basename(normalizedPath);
 
                 // 跳过排除的文件
                 if (excludedFiles.includes(fileName)) {
                     return;
                 }
 
-                // 处理文件路径：去掉组件名称前缀
-                // 例如：cc-ttt/cc-ttt.vue -> cc-ttt.vue
-                //      cc-ttt/components/HelloWorld.vue -> components/HelloWorld.vue
-                //      cc-demo/cc-demo.vue -> cc-demo.vue (当组件名是 component-cc-demo-cc 时)
-                let relativePath = filePath;
-
-                // 提取文件路径的第一个目录名
-                const firstDir = filePath.split('/')[0];
-
-                // 尝试匹配并移除前缀
-                // 优先级：1. normalizedPluginName 2. pluginName 3. 第一个目录名（如果路径包含多个部分）
-                let prefixToRemove = '';
-                if (filePath.startsWith(`${normalizedPluginName}/`)) {
-                    prefixToRemove = `${normalizedPluginName}/`;
-                } else if (filePath.startsWith(`${pluginName}/`)) {
-                    prefixToRemove = `${pluginName}/`;
-                } else if (firstDir && filePath.includes('/')) {
-                    // 如果路径包含斜杠，说明有目录结构，移除第一个目录
-                    // 例如：cc-demo/cc-demo.vue -> cc-demo.vue
-                    prefixToRemove = `${firstDir}/`;
-                }
-
-                if (prefixToRemove) {
-                    relativePath = filePath.substring(prefixToRemove.length);
-                }
-
-                // 构建完整路径并写入文件
-                const fullPath = path.join(pluginPath, relativePath);
+                const fullPath = resolvePullFileFullPath(
+                    normalizedPath,
+                    projectPath,
+                    pluginPath,
+                    normalizedPluginName,
+                    pluginName
+                );
                 const dir = path.dirname(fullPath);
 
                 // 确保目录存在（recursive: true 会自动处理已存在的情况）