cloudcc-cli 2.4.1 → 2.4.2

package/src/version/doctor.js

@@ -11,12 +11,19 @@ function doctor() {
   console.error(chalk.green("✓") + " cloudcc-cli v" + pkg.version)
 
   const cwd = process.cwd()
-  const configPath = path.join(cwd, "cloudcc-cli.config.js")
-  if (fs.existsSync(configPath)) {
-    console.error(chalk.green("✓") + " 当前目录存在 cloudcc-cli.config.js")
+  const jsonPath = path.join(cwd, "cloudcc-cli.config.json")
+  const jsPath = path.join(cwd, "cloudcc-cli.config.js")
+  const hasJson = fs.existsSync(jsonPath)
+  const hasJs = fs.existsSync(jsPath)
+  if (hasJson || hasJs) {
+    const parts = []
+    if (hasJson) parts.push("cloudcc-cli.config.json")
+    if (hasJs) parts.push("cloudcc-cli.config.js")
+    console.error(chalk.green("✓") + " 当前目录存在 " + parts.join("、"))
   } else {
     console.error(
-      chalk.yellow("○") + " 当前目录未找到 cloudcc-cli.config.js（若在本目录开发 CloudCC 项目，请先初始化或放入配置）"
+      chalk.yellow("○") +
+        " 当前目录未找到 cloudcc-cli.config.json / cloudcc-cli.config.js（若在本目录开发 CloudCC 项目，请先初始化或放入配置）"
     )
   }
   console.error()

package/src/version/listModuleCommands.js

@@ -18,6 +18,8 @@ const MODULE_KEYS_ORDER = [
   "triggers",
   "timer",
   "script",
+  "html",
+  "site",
   "jsp",
   "token",
   "object",
@@ -36,7 +38,10 @@ const MODULE_KEYS_ORDER = [
   "singleSignOn",
   "pagelayout",
   "validationRule",
+  "dupeCatcher",
+  "sharingRule",
   "permission",
+  "openapi",
 ]
 
 /**
@@ -54,6 +59,8 @@ const MODULE_HINT = {
   schedule: "定时类（Scheduled Class）：与平台同步 Java 与配置（resource 亦可用 timer）。",
   triggers: "触发器：本地 Java 与平台同步。",
   script: "客户端脚本：创建、发布、拉取等。",
+  html: "自定义 HTML 组件文档。",
+  site: "Site 开发规范文档。",
   jsp: "JSP 迁移：规则查看、分析与拆分生成。",
   token: "访问令牌/凭证。",
   object: "标准对象与自定义对象。",
@@ -72,7 +79,10 @@ const MODULE_HINT = {
   singleSignOn: "单点登录（SSO）配置。",
   pagelayout: "页面布局。",
   validationRule: "验证规则。",
+  dupeCatcher: "查重过滤器（Dupe Catcher）：过滤器与规则管理。",
+  sharingRule: "共享规则：按对象查询规则。",
   permission: "权限：分配、查询、增删等。",
+  openapi: "OpenAPI 浏览器端 SDK：复制到站点并按文档集成调用。",
 }
 
 const MODULE_FOLDER = {
@@ -88,6 +98,8 @@ const MODULE_FOLDER = {
   triggers: "triggers",
   timer: "timer",
   script: "script",
+  html: "html",
+  site: "site",
   jsp: "jsp",
   token: "token",
   object: "object",
@@ -106,7 +118,10 @@ const MODULE_FOLDER = {
   singleSignOn: "singleSignOn",
   pagelayout: "pagelayout",
   validationRule: "validationRule",
+  dupeCatcher: "dupeCatcher",
+  sharingRule: "sharingRule",
   permission: "permission",
+  openapi: "openapi",
 }
 
 function extractActions(indexFilePath) {
@@ -163,6 +178,8 @@ const RESOURCE_CN = {
   timer: "定时类",
   triggers: "触发器",
   script: "客户端脚本",
+  html: "自定义 HTML 组件",
+  site: "Site",
   jsp: "JSP 迁移",
   token: "访问令牌",
   object: "对象",
@@ -181,7 +198,10 @@ const RESOURCE_CN = {
   singleSignOn: "单点登录",
   pagelayout: "页面布局",
   validationRule: "验证规则",
+  dupeCatcher: "查重过滤器",
+  sharingRule: "共享规则",
   permission: "权限",
+  openapi: "OpenAPI SDK",
 }
 
 /**

package/template/index.js

@@ -57,7 +57,7 @@ module.exports = function (creator, options, callback) {
         console.error(`${chalk.grey(`Copy lib folder to ${displayPath}`)} ${chalk.green('✔ ')}`);
     }
 
-    creator.copyTpl('cloudcc-cli.configjs', path.join(projectPath, "cloudcc-cli.config.js"))
+    creator.copyTpl('cloudcc-cli.config.json', path.join(projectPath, "cloudcc-cli.config.json"))
 
     creator.copyTpl('gitignore', path.join(projectPath, ".gitignore"))
 
@@ -96,7 +96,7 @@ module.exports = function (creator, options, callback) {
         console.error(`${chalk.grey(`Create file: ${prefix}babel.config.js`)} ${chalk.green('✔ ')}`);
         console.error(`${chalk.grey(`Create file: ${prefix}package.json`)} ${chalk.green('✔ ')}`);
         console.error(`${chalk.grey(`Create file: ${prefix}vue.config.js`)} ${chalk.green('✔ ')}`);
-        console.error(`${chalk.grey(`Create file: ${prefix}cloudcc-cli.config.js`)} ${chalk.green('✔ ')}`);
+        console.error(`${chalk.grey(`Create file: ${prefix}cloudcc-cli.config.json`)} ${chalk.green('✔ ')}`);
         callback();
     });
 }

package/utils/config.js

@@ -3,21 +3,72 @@ const path = require("path");
 const chalk = require("chalk");
 // 引入解密函数
 const { getDevConsoleConfig, decryptCloudCCDevInfo } = require("./utils");
-const { readCache } = require("./cache")
+const { readCache } = require("./cache");
+
+/**
+ * 优先读取 JSON（与 package.json 的 "type":"module" 兼容），否则读取 JS。
+ * @param {string} projectPath
+ * @returns {object|null} 根配置（含 use 与各环境块）
+ */
+function loadCloudccConfigRootSync(projectPath = process.cwd()) {
+    const jsonPath = path.resolve(projectPath, "cloudcc-cli.config.json");
+    const jsPath = path.resolve(projectPath, "cloudcc-cli.config.js");
+    if (fs.existsSync(jsonPath)) {
+        try {
+            return JSON.parse(fs.readFileSync(jsonPath, "utf8"));
+        } catch (_err) {
+            return null;
+        }
+    }
+    if (fs.existsSync(jsPath)) {
+        try {
+            return require(jsPath);
+        } catch (_err) {
+            return null;
+        }
+    }
+    return null;
+}
+
+/**
+ * 解析项目根目录下实际使用的配置文件路径（JSON 优先于 JS）。
+ * @param {string} projectPath
+ * @returns {{ kind: "json"|"js", filePath: string }|null}
+ */
+function resolveCloudccConfigFile(projectPath = process.cwd()) {
+    const jsonPath = path.resolve(projectPath, "cloudcc-cli.config.json");
+    const jsPath = path.resolve(projectPath, "cloudcc-cli.config.js");
+    if (fs.existsSync(jsonPath)) {
+        return { kind: "json", filePath: jsonPath };
+    }
+    if (fs.existsSync(jsPath)) {
+        return { kind: "js", filePath: jsPath };
+    }
+    return null;
+}
+
 /**
  * 1.0版本的配置文件
  * @param {string} projectPath baseUrl
- * @returns 
+ * @returns
  */
 function getPackageJson_old(projectPath = process.cwd()) {
-    const packageJson = JSON.parse(fs.readFileSync(path.join(projectPath, "package.json")), 'utf8');
-    return packageJson.devConsoleConfig;
+    const packageJsonPath = path.join(projectPath, "package.json");
+    if (!fs.existsSync(packageJsonPath)) {
+        return null;
+    }
+    try {
+        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+        return packageJson.devConsoleConfig || null;
+    } catch (err) {
+        return null;
+    }
 }
 /**
  * 2.0版本的配置文件
  * 配置参数移入cloudcc-cli.config.js,最多需要配置9个参数
  * @param {string} projectPath baseUrl
- * @returns 
+ * @returns
  */
 async function getPackageJson2(projectPath = process.cwd()) {
     let config;
@@ -26,16 +77,16 @@ async function getPackageJson2(projectPath = process.cwd()) {
     } catch (err) {
         return null;
     }
-    config = config[config.use]
+    config = config[config.use];
     config.CloudCCDev = "";
-    config = await getDevConsoleConfig(projectPath, config)
-    return config
+    config = await getDevConsoleConfig(projectPath, config);
+    return config;
 }
 /**
  * 3.0版本的配置文件
  * 将多个参数压缩到一个参数重，方便配置
  * @param {string} projectPath baseUrl
- * @returns 
+ * @returns
  */
 async function getPackageJson3(projectPath = process.cwd()) {
     let config;
@@ -44,17 +95,17 @@ async function getPackageJson3(projectPath = process.cwd()) {
     } catch (err) {
         return null;
     }
-    config = config[config.use]
+    config = config[config.use];
     // 检查并解密CloudCCDev信息
     if (config && config.CloudCCDev) {
         const decryptedInfo = decryptCloudCCDevInfo(config.CloudCCDev);
         if (decryptedInfo) {
             if (decryptedInfo.baseUrl && !decryptedInfo.baseUrl.includes("ccdomaingateway")) {
-                decryptedInfo.baseUrl = decryptedInfo.baseUrl + "/ccdomaingateway"
+                decryptedInfo.baseUrl = decryptedInfo.baseUrl + "/ccdomaingateway";
             }
-            config = { ...decryptedInfo, ...config }
+            config = { ...decryptedInfo, ...config };
             config.CloudCCDev = "";
-            config = await getDevConsoleConfig(projectPath, config)
+            config = await getDevConsoleConfig(projectPath, config);
         } else {
             console.error(
                 chalk.yellow(
@@ -70,19 +121,68 @@ async function getPackageJson3(projectPath = process.cwd()) {
     return config;
 }
 
+/**
+ * 4.0：cloudcc-cli.config.json（纯 JSON，不受 package.json "type":"module" 影响）
+ * 支持 CloudCCDev 解密分支与显式字段（等同 v3 + v2）在同一文件内解析。
+ * @param {string} projectPath
+ * @returns {Promise<object|null>}
+ */
+async function getPackageJson4(projectPath = process.cwd()) {
+    const jsonPath = path.resolve(projectPath, "cloudcc-cli.config.json");
+    if (!fs.existsSync(jsonPath)) {
+        return null;
+    }
+    let root;
+    try {
+        root = JSON.parse(fs.readFileSync(jsonPath, "utf8"));
+    } catch (_err) {
+        return null;
+    }
+    if (!root || typeof root !== "object" || typeof root.use !== "string") {
+        return null;
+    }
+    let config = root[root.use];
+    if (!config || typeof config !== "object") {
+        return null;
+    }
+
+    if (config.CloudCCDev) {
+        const decryptedInfo = decryptCloudCCDevInfo(config.CloudCCDev);
+        if (decryptedInfo) {
+            if (decryptedInfo.baseUrl && !decryptedInfo.baseUrl.includes("ccdomaingateway")) {
+                decryptedInfo.baseUrl = decryptedInfo.baseUrl + "/ccdomaingateway";
+            }
+            config = { ...decryptedInfo, ...config };
+            config.CloudCCDev = "";
+            return await getDevConsoleConfig(projectPath, config);
+        }
+        console.error(
+            chalk.yellow(
+                "cloudcc-cli: CloudCCDev could not be decrypted or is empty (invalid base64/JSON). " +
+                    "Fix cloudcc-cli.config.json or use explicit fields / v2-style config; falling back to other config sources."
+            )
+        );
+        return null;
+    }
+
+    config = { ...config, CloudCCDev: "" };
+    return await getDevConsoleConfig(projectPath, config);
+}
 
 /**
  * 从缓存读取
  * @returns 配置参数
  */
 async function getPackageJsonCache(projectPath = process.cwd()) {
-    let config;
-    try {
-        config = require(path.resolve(projectPath, "cloudcc-cli.config.js"));
-    } catch (err) {
+    const configRoot = loadCloudccConfigRootSync(projectPath);
+    if (!configRoot || typeof configRoot.use !== "string") {
+        return null;
+    }
+    const active = configRoot[configRoot.use];
+    if (!active || typeof active !== "object") {
         return null;
     }
-    const cacheData = readCache(projectPath)[config[config.use].safetyMark || config[config.use].secretKey];
+    const cacheData = readCache(projectPath)[active.safetyMark || active.secretKey];
     if (cacheData && cacheData.timestamp) {
         const oneHour = 60 * 60 * 1000; // 1小时的毫秒数
         const currentTime = Date.now();
@@ -94,10 +194,18 @@ async function getPackageJsonCache(projectPath = process.cwd()) {
 }
 
 async function getPackageJson(projectPath = process.cwd()) {
-    return getPackageJson_old(projectPath) || await getPackageJsonCache(projectPath) || await getPackageJson3(projectPath) || await getPackageJson2(projectPath)
+    return (
+        getPackageJson_old(projectPath) ||
+        (await getPackageJsonCache(projectPath)) ||
+        (await getPackageJson4(projectPath)) ||
+        (await getPackageJson3(projectPath)) ||
+        (await getPackageJson2(projectPath))
+    );
 }
 
-
 module.exports = {
     getPackageJson,
-}
+    getPackageJson4,
+    resolveCloudccConfigFile,
+    loadCloudccConfigRootSync,
+};

package/cloudcc-dev-skill/cloudcc-dev-html.md

@@ -1,42 +0,0 @@
----
-name: cloudcc-dev-html
-description: 指导在 CloudCC 相关仓库中编写单个 HTML 入口页：推荐 Tailwind（tailwindcss-browser）、Alpine.js、ECharts（BootCDN）、可使用 window.$CCDK。用户提到单页 HTML、html/index、BootCDN、Tailwind、Alpine、ECharts、CCDK、$CCDK 时使用。
----
-
-# CloudCC 单 HTML 页面开发规范
-
-版本信息见同目录 [config.json](config.json)。
-
-## 1. 技能用途：创建单个 HTML 页面
-
-- 本技能用于在项目中编写**单个 HTML 入口文件**（通常为 **`html/index.html`**），在 CloudCC 内嵌或单独打开，与 `plugins/` 等业务源码区分存放。
-- 静态依赖（样式、脚本、字体等）**优先使用线上绝对地址**（`https://...`）引入；**公有云**推荐 [BootCDN](https://www.bootcdn.cn/) 等中国大陆可稳定访问的源；**私有云 / 内网**可将所需文件下载后上传到组织静态资源，再改为静态资源 URL。
-- 平台业务接口与模块说明以 **cloudcc-dev-skill**（`cloudcc doc <module>`）为准；本技能不替代平台开发指南。
-
-## 2. 页面推荐的样式与交互库
-
-以下为独立页**推荐**组合（通过 BootCDN 固定版本，升级时改 URL 中版本号；私有云按上一节改链）。
-
-**样式：Tailwind CSS（tailwindcss-browser，浏览器端编译）**
-
-```html
-<script src="https://cdn.bootcdn.net/ajax/libs/tailwindcss-browser/4.1.13/index.global.min.js"></script>
-```
-
-**交互：Alpine.js v3（CDN 构建，使用 `defer`，放在 `head`；与 Tailwind 同页时 Tailwind 在前、Alpine 在后）**
-
-```html
-<script defer src="https://cdn.bootcdn.net/ajax/libs/alpinejs/3.15.0/cdn.min.js"></script>
-```
-
-**图表：ECharts（按需引入；与 Tailwind、Alpine 同页时，建议放在二者之后，在初始化图表的脚本之前加载）**
-
-```html
-<script src="https://cdn.bootcdn.net/ajax/libs/echarts/6.0.0/echarts.min.js"></script>
-```
-
-## 3. 页面可使用 CCDK
-
-- 在 CloudCC 运行环境（自定义页面、内嵌 HTML 等）中，可通过 **`window.$CCDK`** 使用平台提供的 **CCDK** 能力；脚本应通过该入口调用，不依赖未文档化的其它全局名。
-- 在浏览器中直接打开本地文件时通常**没有** `$CCDK`，须做存在性判断或区分环境，避免报错。
-- CCDK 具体 API 以平台文档及 **cloudcc-dev-skill** 中相关说明为准。

package/template/cloudcc-cli.configjs

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