@tmagic/utils 1.8.0-beta.3 → 1.8.0-beta.5

package/dist/es/index.js

@@ -20,26 +20,27 @@ var emptyFn = () => void 0;
 * @param {Array} data 要查找的根容器节点
 * @return {Array} 组件在data中的子孙路径
 */
-var getNodePath = (id, data = []) => {
+var getNodePath = (id, data = [], skip) => {
 	const path = [];
-	const get = function(id, data) {
+	const targetId = `${id}`;
+	const get = function(data) {
 		if (!Array.isArray(data)) return null;
 		for (let i = 0, l = data.length; i < l; i++) {
 			const item = data[i];
 			path.push(item);
-			if (`${item.id}` === `${id}`) return item;
-			if (item.items) {
-				const node = get(id, item.items);
+			if (`${item.id}` === targetId) return item;
+			if (item.items && item !== skip) {
+				const node = get(item.items);
 				if (node) return node;
 			}
 			path.pop();
 		}
 		return null;
 	};
-	get(id, data);
+	get(data);
 	return path;
 };
-var getNodeInfo = (id, root) => {
+var getNodeInfo = (id, root, skip) => {
 	const info = {
 		node: null,
 		parent: null,
@@ -50,17 +51,15 @@ var getNodeInfo = (id, root) => {
 		info.node = root;
 		return info;
 	}
-	const path = getNodePath(id, root.items);
+	const path = getNodePath(id, root.items, skip);
 	if (!path.length) return info;
 	path.unshift(root);
 	info.node = path[path.length - 1];
 	info.parent = path[path.length - 2];
-	path.forEach((item) => {
-		if (isPage(item) || isPageFragment(item)) {
-			info.page = item;
-			return;
-		}
-	});
+	for (const item of path) if (isPage(item) || isPageFragment(item)) {
+		info.page = item;
+		break;
+	}
 	return info;
 };
 var filterXSS = (str) => str.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");

package/dist/tmagic-utils.umd.cjs

@@ -2345,26 +2345,27 @@
 	* @param {Array} data 要查找的根容器节点
 	* @return {Array} 组件在data中的子孙路径
 	*/
-	var getNodePath = (id, data = []) => {
+	var getNodePath = (id, data = [], skip) => {
 		const path = [];
-		const get = function(id, data) {
+		const targetId = `${id}`;
+		const get = function(data) {
 			if (!Array.isArray(data)) return null;
 			for (let i = 0, l = data.length; i < l; i++) {
 				const item = data[i];
 				path.push(item);
-				if (`${item.id}` === `${id}`) return item;
-				if (item.items) {
-					const node = get(id, item.items);
+				if (`${item.id}` === targetId) return item;
+				if (item.items && item !== skip) {
+					const node = get(item.items);
 					if (node) return node;
 				}
 				path.pop();
 			}
 			return null;
 		};
-		get(id, data);
+		get(data);
 		return path;
 	};
-	var getNodeInfo = (id, root) => {
+	var getNodeInfo = (id, root, skip) => {
 		const info = {
 			node: null,
 			parent: null,
@@ -2375,17 +2376,15 @@
 			info.node = root;
 			return info;
 		}
-		const path = getNodePath(id, root.items);
+		const path = getNodePath(id, root.items, skip);
 		if (!path.length) return info;
 		path.unshift(root);
 		info.node = path[path.length - 1];
 		info.parent = path[path.length - 2];
-		path.forEach((item) => {
-			if (isPage(item) || isPageFragment(item)) {
-				info.page = item;
-				return;
-			}
-		});
+		for (const item of path) if (isPage(item) || isPageFragment(item)) {
+			info.page = item;
+			break;
+		}
 		return info;
 	};
 	var filterXSS = (str) => str.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.0-beta.3",
+  "version": "1.8.0-beta.5",
   "name": "@tmagic/utils",
   "type": "module",
   "sideEffects": false,
@@ -35,7 +35,7 @@
   },
   "peerDependencies": {
     "typescript": "^6.0.3",
-    "@tmagic/schema": "1.8.0-beta.3"
+    "@tmagic/schema": "1.8.0-beta.5"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/index.ts

@@ -23,7 +23,6 @@ import type {
   DataSchema,
   DataSourceDeps,
   Id,
-  MApp,
   MComponent,
   MContainer,
   MNode,
@@ -80,10 +79,12 @@ export const emptyFn = (): any => undefined;
  * @param {Array} data 要查找的根容器节点
  * @return {Array} 组件在data中的子孙路径
  */
-export const getNodePath = (id: Id, data: MNode[] = []): MNode[] => {
+export const getNodePath = (id: Id, data: MNode[] = [], skip?: MNode | null): MNode[] => {
   const path: MNode[] = [];
+  // 目标 id 字符串只计算一次，避免在递归遍历中对每个节点重复拼接
+  const targetId = `${id}`;
 
-  const get = function (id: number | string, data: MNode[]): MNode | null {
+  const get = function (data: MNode[]): MNode | null {
     if (!Array.isArray(data)) {
       return null;
     }
@@ -92,12 +93,13 @@ export const getNodePath = (id: Id, data: MNode[] = []): MNode[] => {
       const item = data[i];
 
       path.push(item);
-      if (`${item.id}` === `${id}`) {
+      if (`${item.id}` === targetId) {
         return item;
       }
 
-      if (item.items) {
-        const node = get(id, item.items);
+      // skip 用于跳过已经搜索过的子树（如已优先搜索过的当前页面），避免重复遍历
+      if (item.items && item !== skip) {
+        const node = get(item.items);
         if (node) {
           return node;
         }
@@ -109,12 +111,12 @@ export const getNodePath = (id: Id, data: MNode[] = []): MNode[] => {
     return null;
   };
 
-  get(id, data);
+  get(data);
 
   return path;
 };
 
-export const getNodeInfo = (id: Id, root: Pick<MApp, 'id' | 'items'> | null) => {
+export const getNodeInfo = (id: Id, root: { id: Id; items?: MNode[] } | null, skip?: MNode | null) => {
   const info: EditorNodeInfo = {
     node: null,
     parent: null,
@@ -128,7 +130,7 @@ export const getNodeInfo = (id: Id, root: Pick<MApp, 'id' | 'items'> | null) =>
     return info;
   }
 
-  const path = getNodePath(id, root.items);
+  const path = getNodePath(id, root.items, skip);
 
   if (!path.length) return info;
 
@@ -137,12 +139,12 @@ export const getNodeInfo = (id: Id, root: Pick<MApp, 'id' | 'items'> | null) =>
   info.node = path[path.length - 1] as MComponent;
   info.parent = path[path.length - 2] as MContainer;
 
-  path.forEach((item) => {
+  for (const item of path) {
     if (isPage(item) || isPageFragment(item)) {
       info.page = item as MPage | MPageFragment;
-      return;
+      break;
     }
-  });
+  }
 
   return info;
 };

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { DataSchema, DataSourceDeps, Id, MApp, MComponent, MNode, MNodeInstance } from "@tmagic/schema";
+import { DataSchema, DataSourceDeps, Id, MComponent, MNode, MNodeInstance } from "@tmagic/schema";
 import { MContainer, MNode as MNode$1, MPage, MPageFragment } from "@tmagic/core";
 
 //#region temp/packages/editor/src/type.d.ts
@@ -51,8 +51,11 @@ declare const emptyFn: () => any;
  * @param {Array} data 要查找的根容器节点
  * @return {Array} 组件在data中的子孙路径
  */
-declare const getNodePath: (id: Id, data?: MNode[]) => MNode[];
-declare const getNodeInfo: (id: Id, root: Pick<MApp, "id" | "items"> | null) => EditorNodeInfo;
+declare const getNodePath: (id: Id, data?: MNode[], skip?: MNode | null) => MNode[];
+declare const getNodeInfo: (id: Id, root: {
+  id: Id;
+  items?: MNode[];
+} | null, skip?: MNode | null) => EditorNodeInfo;
 declare const filterXSS: (str: string) => string;
 declare const getUrlParam: (param: string, url?: string) => string;
 /**