@share-crm/sharedev-cli 0.0.4-rc.28 → 0.0.4-rc.29

package/dist/sharedev.js

@@ -13619,9 +13619,12 @@ function getShareCliCommandPath(namespace, key) {
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SHARE_CLI_BUSINESS_NAME = void 0;
 exports.executeShareCliCommand = executeShareCliCommand;
 const request_ts_1 = __webpack_require__(2088);
 const trace_ts_1 = __webpack_require__(3632);
+/** 操作中心 shareCli/execute 的业务方标识 */
+exports.SHARE_CLI_BUSINESS_NAME = 'sharedev-cli';
 async function executeShareCliCommand(commandPath, data, others) {
     (0, trace_ts_1.traceExecute)(commandPath.join(' '));
     const payload = {
@@ -13631,7 +13634,11 @@ async function executeShareCliCommand(commandPath, data, others) {
     };
     return request_ts_1.requestService.FHH({
         url: '/EM1HActionCentre/shareCli/execute',
-        data: payload
+        data: payload,
+        // 操作中心侧按业务方来源做识别/统计，仅 shareCli/execute 需要携带
+        headers: {
+            'x-fs-business-name': exports.SHARE_CLI_BUSINESS_NAME
+        }
     });
 }
 
@@ -23952,6 +23959,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.convertRulePushService = void 0;
+exports.toConvertRuleExecutePayload = toConvertRuleExecutePayload;
 const normalize_ts_1 = __importDefault(__webpack_require__(9268));
 const request_execute_command_paths_ts_1 = __webpack_require__(2351);
 const index_ts_1 = __webpack_require__(9985);
@@ -23961,6 +23969,23 @@ const request_ts_1 = __webpack_require__(3176);
 const logger_ts_1 = __webpack_require__(3333);
 const xmlMetadataManager = new index_ts_1.XmlMetadataManager();
 const isRecord = normalize_ts_1.default.isRecord;
+/**
+ * 组 CreateConvertRule / UpdateConvertRule 远程 payload。
+ * 请求体必须用 snake_case `rule_list`，对齐：
+ * - Java ConvertRule.Arg @JsonProperty("rule_list")
+ * - 前端 fe-paas/vui convertrule create/update
+ * - object-mapping createRule/updateRule 的请求字段
+ * 本地/pull 内容里可能出现 camelCase `ruleList`（响应侧），push 时归一成 `rule_list`。
+ */
+function toConvertRuleExecutePayload(content) {
+    const ruleListCandidate = content.rule_list ?? content.ruleList;
+    if (!Array.isArray(ruleListCandidate)) {
+        throw new Error('Invalid convert-rule content: rule_list is required and must be an array.');
+    }
+    return {
+        rule_list: ruleListCandidate,
+    };
+}
 const convertRulePushService = async (ruleApiNames, skipOverwriteConfirm = false) => {
     const errorMessages = [];
     const targetRuleApiNames = (ruleApiNames ?? '')
@@ -24026,19 +24051,14 @@ const convertRulePushService = async (ruleApiNames, skipOverwriteConfirm = false
                 ruleMeta = await xmlMetadataManager.readXml('ConvertRule', ruleApiName);
             }
             const isCreate = ruleMeta.status === 'new';
-            const updatedContent = { ...(ruleMeta.content && isRecord(ruleMeta.content)
-                    ? ruleMeta.content
-                    : content) };
-            if ('ruleList' in updatedContent) {
-                if (!updatedContent.rule_list) {
-                    updatedContent.rule_list = updatedContent.ruleList;
-                }
-                delete updatedContent.ruleList;
-            }
+            const sourceContent = ruleMeta.content && isRecord(ruleMeta.content)
+                ? ruleMeta.content
+                : content;
+            const executePayload = toConvertRuleExecutePayload(sourceContent);
             logger_ts_1.loggerService.startLoading('convert-rule push request: ' + ruleApiName + ' (' + (isCreate ? 'create' : 'update') + ')');
             const raw = await (0, request_ts_1.requestObjectDevExecute)(isCreate
                 ? (0, request_execute_command_paths_ts_1.getShareCliCommandPath)('convertRule', 'create-rule')
-                : (0, request_execute_command_paths_ts_1.getShareCliCommandPath)('convertRule', 'update-rule'), updatedContent);
+                : (0, request_execute_command_paths_ts_1.getShareCliCommandPath)('convertRule', 'update-rule'), executePayload);
             const response = raw;
             if (response.success !== true || normalize_ts_1.default.normalizeString(normalize_ts_1.default.asString(response.code)) !== 'OK') {
                 logger_ts_1.loggerService.stopLoading();
@@ -28095,7 +28115,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.scenePushService = void 0;
+exports.scenePushService = exports.buildSceneExecutePayload = void 0;
 const normalize_ts_1 = __importDefault(__webpack_require__(9268));
 const request_execute_command_paths_ts_1 = __webpack_require__(2351);
 const index_ts_1 = __webpack_require__(9985);
@@ -28106,6 +28126,65 @@ const scene_pull_ts_1 = __webpack_require__(272);
 const logger_ts_1 = __webpack_require__(3333);
 const xmlMetadataManager = new index_ts_1.XmlMetadataManager();
 const isRecord = normalize_ts_1.default.isRecord;
+const asString = normalize_ts_1.default.asString;
+const normalizeString = normalize_ts_1.default.normalizeString;
+const SCENE_RUNTIME_FIELDS = [
+    'id',
+    'tenant_id',
+    'created_by',
+    'create_time',
+    'last_modified_by',
+    'last_modified_time'
+];
+/**
+ * 将本地 scene-meta content（扁平场景本体）包装为 create/update 远程契约：
+ * { describe_api_name, extend_attribute, scene, i18nInfoList? }
+ * 与 action-centre / share-cli-curl 的 required 对齐。
+ */
+const buildSceneExecutePayload = (objectApiName, content, options = {}) => {
+    const isCreate = options.isCreate !== false;
+    const scene = { ...content };
+    // i18n 属于远程 data 顶层可选字段，不落在 scene 本体里
+    const i18nInfoList = Array.isArray(scene.i18nInfoList) ? scene.i18nInfoList : undefined;
+    delete scene.i18nInfoList;
+    if (isCreate) {
+        // create：剥离运行时字段，由服务端生成
+        for (const field of SCENE_RUNTIME_FIELDS) {
+            delete scene[field];
+        }
+    }
+    else {
+        // update：远端强依赖 id/tenant_id 等运行时字段；本地草稿常缺失，从 list 结果回填
+        for (const field of SCENE_RUNTIME_FIELDS) {
+            const current = scene[field];
+            const missing = current === undefined || current === null || current === '';
+            if (!missing) {
+                continue;
+            }
+            const remoteValue = options.remoteContent?.[field];
+            if (remoteValue !== undefined && remoteValue !== null && remoteValue !== '') {
+                scene[field] = remoteValue;
+            }
+        }
+    }
+    if (!normalizeString(asString(scene.object_describe_api_name))) {
+        scene.object_describe_api_name = objectApiName;
+    }
+    if (!normalizeString(asString(scene.type))) {
+        scene.type = 'tenant';
+    }
+    const payload = {
+        describe_api_name: objectApiName,
+        // curl 示例显式传空串；action-centre 也可 constant 注入，显式更稳
+        extend_attribute: '',
+        scene
+    };
+    if (i18nInfoList) {
+        payload.i18nInfoList = i18nInfoList;
+    }
+    return payload;
+};
+exports.buildSceneExecutePayload = buildSceneExecutePayload;
 const scenePushService = async (objectApiName, sceneApiNames) => {
     const errorMessages = [];
     // 1) 校验 object 参数并解析待推送 scene 列表
@@ -28188,9 +28267,13 @@ const scenePushService = async (objectApiName, sceneApiNames) => {
             }
             logger_ts_1.loggerService.startLoading(`scene push request: ${checkedObjectApiName}.${sceneApiName}`);
             try {
+                const remoteScene = sceneListResult.scenes.find((item) => item.apiName === sceneApiName);
                 const response = await (0, request_ts_1.requestObjectDevExecute)(isCreate
                     ? (0, request_execute_command_paths_ts_1.getShareCliCommandPath)('objectDev', 'createScene')
-                    : (0, request_execute_command_paths_ts_1.getShareCliCommandPath)('objectDev', 'updateScene'), sceneMeta.content);
+                    : (0, request_execute_command_paths_ts_1.getShareCliCommandPath)('objectDev', 'updateScene'), (0, exports.buildSceneExecutePayload)(checkedObjectApiName, sceneMeta.content, {
+                    isCreate,
+                    remoteContent: remoteScene?.content
+                }));
                 if (response.success !== true || normalize_ts_1.default.normalizeString(normalize_ts_1.default.asString(response.code)) !== 'OK') {
                     throw new Error(normalize_ts_1.default.normalizeText(response.message) || 'Unknown error');
                 }
@@ -46741,7 +46824,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"application/1d-interleaved-parityfec
 /***/ 8330
 (module) {
 
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@share-crm/sharedev-cli","version":"0.0.4-rc.28","private":false,"description":"sharedev command line tool","type":"module","main":"dist/sharedev.js","bin":{"sharedev":"./bin/cli.mjs"},"author":{"name":"sharecrm-npm"},"files":["dist","bin","README.md"],"scripts":{"build":"tsc --noEmit && webpack --config build/webpack/webpack.prod.cjs","build:debug":"tsc --noEmit && webpack --config build/webpack/webpack.debug.cjs","build:bin":"bun build --compile --target=bun-darwin-x64 src/cli.ts --outfile scripts/sharedev-darwin-x64 && bun build --compile --target=bun-darwin-arm64 src/cli.ts --outfile scripts/sharedev-darwin-arm64 && bun build --compile --target=bun-windows-x64 src/cli.ts --outfile scripts/sharedev-windows-x64.exe","build:all":"npm run build && npm run build:bin","dev":"tsc --noEmit --watch & webpack --config build/webpack/webpack.dev.cjs --watch","dev2":"node src/cli.ts","typecheck":"tsc --noEmit","prettier":"prettier --write ./src/**/*.ts","test":"vitest run","test:watch":"vitest","test:coverage":"vitest run --coverage"},"dependencies":{"@clack/prompts":"^1.1.0","@mariozechner/pi-coding-agent":"^0.62.0","axios":"~1.13.0","chalk":"^5.6.2","commander":"^14.0.1","extract-zip":"^2.0.1","fast-xml-parser":"^5.2.5","fs-extra":"^11.3.2","lodash-es":"^4.18.1","ora":"^9.3.0","terser-webpack-plugin":"^5.6.1"},"devDependencies":{"@types/extract-zip":"^2.0.3","@types/fs-extra":"^11.0.4","@types/lodash-es":"^4.17.12","@types/node":"^24.3.0","@vitest/coverage-v8":"^4.1.8","ts-loader":"^9.5.4","typescript":"^5.9.2","vitest":"^3.2.6","webpack":"^5.101.3","webpack-cli":"^6.0.1","webpack-merge":"^6.0.1"},"packageManager":"pnpm@10.17.0"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@share-crm/sharedev-cli","version":"0.0.4-rc.29","private":false,"description":"sharedev command line tool","type":"module","main":"dist/sharedev.js","bin":{"sharedev":"./bin/cli.mjs"},"author":{"name":"sharecrm-npm"},"files":["dist","bin","README.md"],"scripts":{"build":"tsc --noEmit && webpack --config build/webpack/webpack.prod.cjs","build:debug":"tsc --noEmit && webpack --config build/webpack/webpack.debug.cjs","build:bin":"bun build --compile --target=bun-darwin-x64 src/cli.ts --outfile scripts/sharedev-darwin-x64 && bun build --compile --target=bun-darwin-arm64 src/cli.ts --outfile scripts/sharedev-darwin-arm64 && bun build --compile --target=bun-windows-x64 src/cli.ts --outfile scripts/sharedev-windows-x64.exe","build:all":"npm run build && npm run build:bin","dev":"tsc --noEmit --watch & webpack --config build/webpack/webpack.dev.cjs --watch","dev2":"node src/cli.ts","typecheck":"tsc --noEmit","prettier":"prettier --write ./src/**/*.ts","test":"vitest run","test:watch":"vitest","test:coverage":"vitest run --coverage"},"dependencies":{"@clack/prompts":"^1.1.0","@mariozechner/pi-coding-agent":"^0.62.0","axios":"~1.13.0","chalk":"^5.6.2","commander":"^14.0.1","extract-zip":"^2.0.1","fast-xml-parser":"^5.2.5","fs-extra":"^11.3.2","lodash-es":"^4.18.1","ora":"^9.3.0","terser-webpack-plugin":"^5.6.1"},"devDependencies":{"@types/extract-zip":"^2.0.3","@types/fs-extra":"^11.0.4","@types/lodash-es":"^4.17.12","@types/node":"^24.3.0","@vitest/coverage-v8":"^4.1.8","ts-loader":"^9.5.4","typescript":"^5.9.2","vitest":"^3.2.6","webpack":"^5.101.3","webpack-cli":"^6.0.1","webpack-merge":"^6.0.1"},"packageManager":"pnpm@10.17.0"}');
 
 /***/ }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@share-crm/sharedev-cli",
-  "version": "0.0.4-rc.28",
+  "version": "0.0.4-rc.29",
   "private": false,
   "description": "sharedev command line tool",
   "type": "module",