@tmagic/editor 1.8.0-beta.4 → 1.8.0-beta.6

package/dist/es/services/codeBlock.js

@@ -1,7 +1,8 @@
 import { CODE_DRAFT_STORAGE_KEY } from "../type.js";
 import BaseService from "./BaseService.js";
-import history_default from "./history.js";
 import { getEditorConfig } from "../utils/config.js";
+import { describeRevertStep, getLastPushedHistoryIds } from "../utils/history.js";
+import history_default from "./history.js";
 import storage_default, { Protocol } from "./storage.js";
 import { COPY_CODE_STORAGE_KEY } from "../utils/editor.js";
 import editor_default from "./editor.js";
@@ -20,17 +21,6 @@ var canUsePluginMethods = {
 	],
 	sync: ["setCodeDslByIdSync"]
 };
-/**
-* 「回滚」生成的新 step 简短描述。仅 service 层使用。
-*/
-var describeRevertCodeBlockStep = (step) => {
-	const { oldContent, newContent, changeRecords, id } = step;
-	if (oldContent === null && newContent) return `撤回新增 ${newContent.name || newContent.id || id}`;
-	if (oldContent && newContent === null) return `还原已删除的 ${oldContent.name || oldContent.id || id}`;
-	const name = newContent?.name || oldContent?.name || `${id}`;
-	const propPath = changeRecords?.[0]?.propPath;
-	return propPath ? `还原 ${name} · ${propPath}` : `还原 ${name}`;
-};
 var CodeBlock = class extends BaseService {
 	state = reactive({
 		codeDsl: null,
@@ -39,6 +29,16 @@ var CodeBlock = class extends BaseService {
 		undeletableList: [],
 		paramsColConfig: void 0
 	});
+	/**
+	* 最近一次写入历史栈的代码块历史记录 uuid（单条写入场景：新增 / 更新）。
+	* 供 setCodeDslById(Sync)AndGetHistoryId 取回，普通方法不读取它。
+	*/
+	lastPushedHistoryId = null;
+	/**
+	* deleteCodeDslByIds 一次删除多个代码块时，按写入顺序收集的历史记录 uuid 列表。
+	* 在 deleteCodeDslByIds 入口处重置，供 deleteCodeDslByIdsAndGetHistoryId 取回。
+	*/
+	lastDeletedHistoryIds = [];
 	constructor() {
 		super([...canUsePluginMethods.async.map((methodName) => ({
 			name: methodName,
@@ -121,13 +121,13 @@ var CodeBlock = class extends BaseService {
 			...codeConfigProcessed
 		};
 		const newContent = cloneDeep$1(codeDsl[id]);
-		if (!doNotPushHistory) history_default.pushCodeBlock(id, {
+		if (!doNotPushHistory) this.lastPushedHistoryId = history_default.pushCodeBlock(id, {
 			oldContent,
 			newContent,
 			changeRecords,
 			historyDescription,
 			source: historySource
-		});
+		})?.uuid ?? null;
 		this.emit("addOrUpdate", id, codeDsl[id]);
 	}
 	/**
@@ -210,18 +210,59 @@ var CodeBlock = class extends BaseService {
 	async deleteCodeDslByIds(codeIds, { doNotPushHistory = false, historyDescription, historySource } = {}) {
 		const currentDsl = await this.getCodeDsl();
 		if (!currentDsl) return;
+		this.lastDeletedHistoryIds = [];
 		codeIds.forEach((id) => {
 			const oldContent = currentDsl[id] ? cloneDeep$1(currentDsl[id]) : null;
 			delete currentDsl[id];
-			if (oldContent && !doNotPushHistory) history_default.pushCodeBlock(id, {
-				oldContent,
-				newContent: null,
-				historyDescription,
-				source: historySource
-			});
+			if (oldContent && !doNotPushHistory) {
+				const uuid = history_default.pushCodeBlock(id, {
+					oldContent,
+					newContent: null,
+					historyDescription,
+					source: historySource
+				})?.uuid;
+				if (uuid) this.lastDeletedHistoryIds.push(uuid);
+			}
 			this.emit("remove", id);
 		});
 	}
+	/**
+	* 下列 *AndGetHistoryId 方法与对应的写入方法行为完全一致，
+	* 返回值在 {@link DslOpWithHistoryIdsResult} 中同时包含原操作结果与本次写入的历史 uuid 列表，
+	* 可用于精确引用 / 定位该条历史记录（埋点、revert、跨端同步等）。
+	*
+	* 当本次操作未写入历史（doNotPushHistory 为 true、或无对应记录）时 historyIds 为 `[]`。
+	*/
+	/** 等价于 {@link setCodeDslById}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
+	async setCodeDslByIdAndGetHistoryId(id, codeConfig, options = {}) {
+		this.lastPushedHistoryId = null;
+		await this.setCodeDslById(id, codeConfig, options);
+		return {
+			result: void 0,
+			historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+		};
+	}
+	/** 等价于 {@link setCodeDslByIdSync}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
+	setCodeDslByIdSyncAndGetHistoryId(id, codeConfig, force = true, options = {}) {
+		this.lastPushedHistoryId = null;
+		this.setCodeDslByIdSync(id, codeConfig, force, options);
+		return {
+			result: void 0,
+			historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+		};
+	}
+	/**
+	* 等价于 {@link deleteCodeDslByIds}，并额外返回本次写入的全部历史记录 uuid（按删除顺序）。
+	* 一次删除多个代码块会产生多条历史记录；未写入任何历史时 historyIds 为 `[]`。
+	*/
+	async deleteCodeDslByIdsAndGetHistoryId(codeIds, options = {}) {
+		this.lastDeletedHistoryIds = [];
+		await this.deleteCodeDslByIds(codeIds, options);
+		return {
+			result: void 0,
+			historyIds: [...this.lastDeletedHistoryIds]
+		};
+	}
 	setParamsColConfig(config) {
 		this.state.paramsColConfig = config;
 	}
@@ -297,11 +338,27 @@ var CodeBlock = class extends BaseService {
 	async revert(id, index) {
 		const entry = history_default.getCodeBlockStepList(id)[index];
 		if (!entry?.applied) return null;
-		if (entry.step.oldContent && entry.step.newContent && !entry.step.changeRecords?.length) return null;
-		const description = `回滚 #${index + 1}: ${describeRevertCodeBlockStep(entry.step)}`;
+		const { oldSchema, newSchema, changeRecords } = entry.step.diff?.[0] ?? {};
+		if (oldSchema && newSchema && !changeRecords?.length) return null;
+		const description = `回滚 #${index + 1}: ${describeRevertStep(entry.step.id, entry.step.diff?.[0], (s) => s.name)}`;
 		return await this.applyRevertStep(entry.step, description);
 	}
 	/**
+	* 通过历史记录 uuid 回滚代码块历史步骤，语义同 {@link revert}，
+	* 仅无需调用方再传 codeBlockId 与 index：内部会按 uuid 在全部代码块栈中定位对应步骤后再回滚。
+	* 按数组顺序依次回滚，返回与入参同序的结果列表（某项失败时为 `null`）。
+	*
+	* @param uuids 目标历史记录的 uuid 列表，通常由 {@link setCodeDslByIdAndGetHistoryId} 等方法返回的 `historyIds`
+	*/
+	async revertById(uuids) {
+		const results = [];
+		for (const uuid of uuids) {
+			const location = history_default.findCodeBlockStepLocationByUuid(uuid);
+			results.push(location ? await this.revert(location.id, location.index) : null);
+		}
+		return results;
+	}
+	/**
 	* 生成代码块唯一id
 	* @returns {Id} 代码块唯一id
 	*/
@@ -366,22 +423,23 @@ var CodeBlock = class extends BaseService {
 	* 差异仅在于通过公开的 setCodeDslByIdSync / deleteCodeDslByIds 触发 push。
 	*/
 	async applyRevertStep(step, historyDescription) {
-		const { id, oldContent, newContent, changeRecords } = step;
-		if (oldContent === null && newContent) {
+		const { id } = step;
+		const { oldSchema, newSchema, changeRecords } = step.diff?.[0] ?? {};
+		if (!oldSchema && newSchema) {
 			await this.deleteCodeDslByIds([id], {
 				historyDescription,
 				historySource: "rollback"
 			});
 			return history_default.getCodeBlockStepList(id).slice(-1)[0]?.step ?? null;
 		}
-		if (oldContent && newContent === null) {
-			this.setCodeDslByIdSync(id, cloneDeep$1(oldContent), true, {
+		if (oldSchema && !newSchema) {
+			this.setCodeDslByIdSync(id, cloneDeep$1(oldSchema), true, {
 				historyDescription,
 				historySource: "rollback"
 			});
 			return history_default.getCodeBlockStepList(id).slice(-1)[0]?.step ?? null;
 		}
-		if (!oldContent || !newContent) return null;
+		if (!oldSchema || !newSchema) return null;
 		if (changeRecords?.length) {
 			const current = this.getCodeContentById(id);
 			if (!current) return null;
@@ -392,17 +450,17 @@ var CodeBlock = class extends BaseService {
 					fallbackToFullReplace = true;
 					break;
 				}
-				const value = cloneDeep$1(getValueByKeyPath(record.propPath, oldContent));
+				const value = cloneDeep$1(getValueByKeyPath(record.propPath, oldSchema));
 				setValueByKeyPath(record.propPath, value, patched);
 			}
-			this.setCodeDslByIdSync(id, fallbackToFullReplace ? cloneDeep$1(oldContent) : patched, true, {
+			this.setCodeDslByIdSync(id, fallbackToFullReplace ? cloneDeep$1(oldSchema) : patched, true, {
 				changeRecords,
 				historyDescription,
 				historySource: "rollback"
 			});
 			return history_default.getCodeBlockStepList(id).slice(-1)[0]?.step ?? null;
 		}
-		this.setCodeDslByIdSync(id, cloneDeep$1(oldContent), true, {
+		this.setCodeDslByIdSync(id, cloneDeep$1(oldSchema), true, {
 			historyDescription,
 			historySource: "rollback"
 		});
@@ -423,19 +481,20 @@ var CodeBlock = class extends BaseService {
 	* @param reverse true=撤销，false=重做
 	*/
 	async applyHistoryStep(step, reverse) {
-		const { id, oldContent, newContent, changeRecords } = step;
-		if (oldContent === null && newContent) {
+		const { id } = step;
+		const { oldSchema, newSchema, changeRecords } = step.diff?.[0] ?? {};
+		if (!oldSchema && newSchema) {
 			if (reverse) await this.deleteCodeDslByIds([id], { doNotPushHistory: true });
-			else this.setCodeDslByIdSync(id, cloneDeep$1(newContent), true, { doNotPushHistory: true });
+			else this.setCodeDslByIdSync(id, cloneDeep$1(newSchema), true, { doNotPushHistory: true });
 			return;
 		}
-		if (oldContent && newContent === null) {
-			if (reverse) this.setCodeDslByIdSync(id, cloneDeep$1(oldContent), true, { doNotPushHistory: true });
+		if (oldSchema && !newSchema) {
+			if (reverse) this.setCodeDslByIdSync(id, cloneDeep$1(oldSchema), true, { doNotPushHistory: true });
 			else await this.deleteCodeDslByIds([id], { doNotPushHistory: true });
 			return;
 		}
-		if (!oldContent || !newContent) return;
-		const sourceForValues = reverse ? oldContent : newContent;
+		if (!oldSchema || !newSchema) return;
+		const sourceForValues = reverse ? oldSchema : newSchema;
 		if (changeRecords?.length) {
 			const current = this.getCodeContentById(id);
 			if (!current) return;

package/dist/es/services/dataSource.js

@@ -1,4 +1,5 @@
 import BaseService from "./BaseService.js";
+import { describeRevertStep, getLastPushedHistoryIds } from "../utils/history.js";
 import history_default from "./history.js";
 import storage_default, { Protocol } from "./storage.js";
 import { COPY_DS_STORAGE_KEY } from "../utils/editor.js";
@@ -26,18 +27,6 @@ var canUsePluginMethods = {
 		"createId"
 	]
 };
-/**
-* 「回滚」生成的新 step 简短描述。
-* 仅在 service 层使用，避免依赖 UI 层 composables。
-*/
-var describeRevertDataSourceStep = (step) => {
-	const { oldSchema, newSchema, changeRecords, id } = step;
-	if (oldSchema === null && newSchema) return `撤回新增 ${newSchema.title || newSchema.id || id}`;
-	if (oldSchema && newSchema === null) return `还原已删除的 ${oldSchema.title || oldSchema.id || id}`;
-	const title = newSchema?.title || oldSchema?.title || `${id}`;
-	const propPath = changeRecords?.[0]?.propPath;
-	return propPath ? `还原 ${title} · ${propPath}` : `还原 ${title}`;
-};
 var DataSource = class extends BaseService {
 	state = reactive({
 		datasourceTypeList: [],
@@ -48,6 +37,12 @@ var DataSource = class extends BaseService {
 		events: {},
 		methods: {}
 	});
+	/**
+	* 最近一次写入历史栈的数据源历史记录 uuid。
+	* 供 *AndGetHistoryId 系列方法在调用 add / update / remove 后取回本次产生的历史记录 id；
+	* 普通方法不读取它，调用前由 *AndGetHistoryId 重置为 null。
+	*/
+	lastPushedHistoryId = null;
 	constructor() {
 		super(canUsePluginMethods.sync.map((methodName) => ({
 			name: methodName,
@@ -97,12 +92,12 @@ var DataSource = class extends BaseService {
 			id: config.id && !this.getDataSourceById(config.id) ? config.id : this.createId()
 		};
 		this.get("dataSources").push(newConfig);
-		if (!doNotPushHistory) history_default.pushDataSource(newConfig.id, {
+		if (!doNotPushHistory) this.lastPushedHistoryId = history_default.pushDataSource(newConfig.id, {
 			oldSchema: null,
 			newSchema: newConfig,
 			historyDescription,
 			source: historySource
-		});
+		})?.uuid ?? null;
 		this.emit("add", newConfig);
 		return newConfig;
 	}
@@ -120,13 +115,13 @@ var DataSource = class extends BaseService {
 		const oldConfig = dataSources[index];
 		const newConfig = cloneDeep$1(config);
 		dataSources[index] = newConfig;
-		if (!doNotPushHistory) history_default.pushDataSource(newConfig.id, {
+		if (!doNotPushHistory) this.lastPushedHistoryId = history_default.pushDataSource(newConfig.id, {
 			oldSchema: oldConfig ? cloneDeep$1(oldConfig) : null,
 			newSchema: newConfig,
 			changeRecords,
 			historyDescription,
 			source: historySource
-		});
+		})?.uuid ?? null;
 		this.emit("update", newConfig, {
 			oldConfig,
 			changeRecords
@@ -145,15 +140,47 @@ var DataSource = class extends BaseService {
 		const index = dataSources.findIndex((ds) => ds.id === id);
 		const oldConfig = index !== -1 ? dataSources[index] : null;
 		dataSources.splice(index, 1);
-		if (oldConfig && !doNotPushHistory) history_default.pushDataSource(id, {
+		if (oldConfig && !doNotPushHistory) this.lastPushedHistoryId = history_default.pushDataSource(id, {
 			oldSchema: cloneDeep$1(oldConfig),
 			newSchema: null,
 			historyDescription,
 			source: historySource
-		});
+		})?.uuid ?? null;
 		this.emit("remove", id);
 	}
 	/**
+	* 下列 *AndGetHistoryId 方法与对应的 add / update / remove 行为完全一致，
+	* 返回值在 {@link DslOpWithHistoryIdsResult} 中同时包含原操作结果与本次写入历史栈的 uuid 列表（{@link DataSourceStepValue.uuid}），
+	* 可用于精确引用 / 定位该条历史记录（埋点、revert、跨端同步等）。
+	*
+	* 当本次操作未写入历史（doNotPushHistory 为 true、或无对应记录）时 historyIds 为 `[]`。
+	*/
+	/** 等价于 {@link add}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
+	addAndGetHistoryId(config, options = {}) {
+		this.lastPushedHistoryId = null;
+		return {
+			result: this.add(config, options),
+			historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+		};
+	}
+	/** 等价于 {@link update}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
+	updateAndGetHistoryId(config, options = {}) {
+		this.lastPushedHistoryId = null;
+		return {
+			result: this.update(config, options),
+			historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+		};
+	}
+	/** 等价于 {@link remove}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
+	removeAndGetHistoryId(id, options = {}) {
+		this.lastPushedHistoryId = null;
+		this.remove(id, options);
+		return {
+			result: void 0,
+			historyIds: getLastPushedHistoryIds(this.lastPushedHistoryId)
+		};
+	}
+	/**
 	* 撤销指定数据源的最近一次变更。
 	*
 	* 内部走 add / update / remove，因此会自动触发 dataSourceService 的事件，
@@ -221,10 +248,25 @@ var DataSource = class extends BaseService {
 	revert(id, index) {
 		const entry = history_default.getDataSourceStepList(id)[index];
 		if (!entry?.applied) return null;
-		if (entry.step.oldSchema && entry.step.newSchema && !entry.step.changeRecords?.length) return null;
-		const description = `回滚 #${index + 1}: ${describeRevertDataSourceStep(entry.step)}`;
+		const { oldSchema, newSchema, changeRecords } = entry.step.diff?.[0] ?? {};
+		if (oldSchema && newSchema && !changeRecords?.length) return null;
+		const description = `回滚 #${index + 1}: ${describeRevertStep(entry.step.id, entry.step.diff?.[0], (s) => s.title)}`;
 		return this.applyRevertStep(entry.step, description);
 	}
+	/**
+	* 通过历史记录 uuid 回滚数据源历史步骤，语义同 {@link revert}，
+	* 仅无需调用方再传 dataSourceId 与 index：内部会按 uuid 在全部数据源栈中定位对应步骤后再回滚。
+	* 按数组顺序依次回滚，返回与入参同序的结果列表（某项失败时为 `null`）。
+	*
+	* @param uuids 目标历史记录的 uuid 列表，通常由 {@link addAndGetHistoryId} 等方法返回的 `historyIds`
+	*/
+	revertById(uuids) {
+		return uuids.map((uuid) => {
+			const location = history_default.findDataSourceStepLocationByUuid(uuid);
+			if (!location) return null;
+			return this.revert(location.id, location.index);
+		});
+	}
 	createId() {
 		return `ds_${guid()}`;
 	}
@@ -283,15 +325,16 @@ var DataSource = class extends BaseService {
 	* 同构，差异仅在于走对应的公共 add / update / remove 而不是带 doNotPushHistory 的版本。
 	*/
 	applyRevertStep(step, historyDescription) {
-		const { id, oldSchema, newSchema, changeRecords } = step;
-		if (oldSchema === null && newSchema) {
+		const { id } = step;
+		const { oldSchema, newSchema, changeRecords } = step.diff?.[0] ?? {};
+		if (!oldSchema && newSchema) {
 			this.remove(`${id}`, {
 				historyDescription,
 				historySource: "rollback"
 			});
 			return history_default.getDataSourceStepList(id).slice(-1)[0]?.step ?? null;
 		}
-		if (oldSchema && newSchema === null) {
+		if (oldSchema && !newSchema) {
 			this.add(cloneDeep$1(oldSchema), {
 				historyDescription,
 				historySource: "rollback"
@@ -340,13 +383,14 @@ var DataSource = class extends BaseService {
 	* @param reverse true=撤销，false=重做
 	*/
 	applyHistoryStep(step, reverse) {
-		const { id, oldSchema, newSchema, changeRecords } = step;
-		if (oldSchema === null && newSchema) {
+		const { id } = step;
+		const { oldSchema, newSchema, changeRecords } = step.diff?.[0] ?? {};
+		if (!oldSchema && newSchema) {
 			if (reverse) this.remove(`${id}`, { doNotPushHistory: true });
 			else this.add(cloneDeep$1(newSchema), { doNotPushHistory: true });
 			return;
 		}
-		if (oldSchema && newSchema === null) {
+		if (oldSchema && !newSchema) {
 			if (reverse) this.add(cloneDeep$1(oldSchema), { doNotPushHistory: true });
 			else this.remove(`${id}`, { doNotPushHistory: true });
 			return;