refactor: 移除 TargetNodeAttribute 全部集成进 NodeAttribute 中

Author: HRan2004

package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-flow-interface",
-  "version": "0.23.25",
+  "version": "0.23.26",
   "description": "Interface package for NEXT FlOW. You can use this package to build your own plugin that can control anything.",
   "type": "module",
   "module": "dist/index.js",

src/hook/use-target-node-attribute.type.ts

@@ -1,8 +1,8 @@
 import { RecursiveCrossRhineVar, RvPath, StoredRhineVar } from 'rhine-var'
 
-import TargetNodeAttribute, {
-  TargetNodeAttributeSubscriber,
-} from '@/service/sync/attribute/target/target-node-attribute.interface'
+import INodeAttribute, {
+  NodeAttributeTargetSubscriber,
+} from '@/service/sync/attribute/instance/node-attribute.interface'
 
 export type UseTargetNodeAttribute = <T extends object = never>(
   path: string | RvPath,
@@ -13,9 +13,9 @@ export type UseTargetNodeAttribute = <T extends object = never>(
   sidList: string[]
   nid: string
   nidList: string[]
-  targetNodeAttribute: TargetNodeAttribute<T>
+  NodeAttribute: INodeAttribute<T>
   initialize(nid?: string): void
-  isInitialize(nid?: string): boolean
+  isInitialized(nid?: string): boolean
   multiInitialize(nidList?: string[]): void
   isAllInitialized(nidList?: string[]): boolean
   mark(path: string | RvPath, sid?: string, nid?: string): void
@@ -28,6 +28,6 @@ export type UseTargetNodeAttribute = <T extends object = never>(
   multiRead(sidList?: string[], nidList?: string[]): Map<string, Map<string, StoredRhineVar<T> | T>>
   edit(path: string | RvPath, value: unknown, sid?: string, nid?: string): void
   multiEdit(path: string | RvPath, value: unknown, sidList?: string[], nidList?: string[]): void
-  subscribe(subscriber: TargetNodeAttributeSubscriber<T>): () => void
-  unsubscribe(subscriber: TargetNodeAttributeSubscriber<T>): void
+  subscribe(subscriber: NodeAttributeTargetSubscriber<T>): () => void
+  unsubscribe(subscriber: NodeAttributeTargetSubscriber<T>): void
 }

src/index.ts

@@ -1,6 +1,8 @@
 import { IAttribute } from '@/service/sync/attribute/instance/attribute.interface'
 import IBaseAttribute from '@/service/sync/attribute/instance/base-attribute.interface'
-import INodeAttribute from '@/service/sync/attribute/instance/node-attribute.interface'
+import INodeAttribute, {
+  NodeAttributeTargetSubscriber,
+} from '@/service/sync/attribute/instance/node-attribute.interface'
 import { TChangeType } from '@/service/sync/attribute/service/dto/t-change-type.enum'
 import RvLoop from '@/service/sync/interface/step/node/animation/loop/rv-loop.interface'
 import RvNative from '@/service/sync/interface/step/node/animation/native/rv-native.interface'
@@ -248,12 +250,6 @@ import TargetNodeServiceApi, {
 import TargetStepServiceApi, {
   TargetStepSubscriber,
 } from './service/sync/attribute/service/target-step-service-api'
-import ITargetNodeAttribute, {
-  TargetNodeAttributeSubscriber,
-} from './service/sync/attribute/target/target-node-attribute.interface'
-import ITargetStepAttribute, {
-  TargetStepAttributeSubscriber,
-} from './service/sync/attribute/target/target-step-attribute.interface'
 import AwarenessServiceApi, {
   AwarenessChanges,
   AwarenessChangeSubscriber,
@@ -350,8 +346,6 @@ export type {
   INodeAttribute,
   IGlobalAttribute,
   IAttribute,
-  TargetStepAttributeSubscriber,
-  ITargetStepAttribute,
   Intl,
   MeetingState,
   PluginState,
@@ -585,8 +579,7 @@ export type {
   StepBlockSelectProps,
   TargetMultiNodeServiceApi,
   UseTargetNodeAttribute,
-  ITargetNodeAttribute,
-  TargetNodeAttributeSubscriber,
+  NodeAttributeTargetSubscriber,
 }
 
 export {

src/service/sync/attribute/instance/base-attribute.interface.ts

@@ -7,9 +7,7 @@ export default interface IBaseAttribute<T extends object = never> {
 
   path: RvPath
 
-  defaultValue?: T
-
-  getPath(): RvPath
+  defaultValue: T
 
   getPathString(): string
 

src/service/sync/attribute/instance/node-attribute.interface.ts

@@ -1,7 +1,17 @@
 import { RvPath, StoredRhineVar } from 'rhine-var'
 
 import IBaseAttribute from '@/service/sync/attribute/instance/base-attribute.interface'
-import { TargetNodeAttributeSubscriber } from '@/service/sync/attribute/target/target-node-attribute.interface'
+import { TChangeType } from '@/service/sync/attribute/service/dto/t-change-type.enum'
+
+export type NodeAttributeTargetSubscriber<T extends object = never> = (
+  type: TChangeType,
+  path: RvPath,
+  value: unknown,
+  oldValue: unknown,
+  sid: string,
+  nid: string,
+  nidList: string[],
+) => void
 
 export default interface INodeAttribute<T extends object = never> extends IBaseAttribute<T> {
   generate(sid?: string, nid?: string): T
@@ -46,7 +56,7 @@ export default interface INodeAttribute<T extends object = never> extends IBaseA
 
   readonly targetNidList: string[]
 
-  subscribe(subscriber: TargetNodeAttributeSubscriber<T>): () => void
+  subscribeTarget(subscriber: NodeAttributeTargetSubscriber<T>): () => void
 
-  unsubscribe(subscriber: TargetNodeAttributeSubscriber<T>): void
+  unsubscribeTarget(subscriber: NodeAttributeTargetSubscriber<T>): void
 }

src/service/sync/attribute/service/attribute-service-api.ts

@@ -6,9 +6,6 @@ import IGlobalAttribute from '@/service/sync/attribute/instance/global-attribute
 import INodeAttribute from '@/service/sync/attribute/instance/node-attribute.interface'
 import IStepAttribute from '@/service/sync/attribute/instance/step-attribute.interface'
 
-import ITargetNodeAttribute from '../target/target-node-attribute.interface'
-import ITargetStepAttribute from '../target/target-step-attribute.interface'
-
 /**
  * 属性服务 API 接口
  *
@@ -59,18 +56,6 @@ export default interface AttributeServiceApi {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   globalAttributes: IGlobalAttribute<any>[]
 
-  /**
-   * 已注册的 TargetNode 类型属性列表
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  targetNodeAttributes: ITargetNodeAttribute<any>[]
-
-  /**
-   * 已注册的 TargetStep 类型属性列表
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  targetStepAttributes: ITargetStepAttribute<any>[]
-
   /**
    * 注册属性
    *
@@ -104,16 +89,6 @@ export default interface AttributeServiceApi {
    */
   getNodeAttribute<T extends object = never>(path: RvPath | string): INodeAttribute<T> | undefined
 
-  /**
-   * 通过路径获取 TargetNodeAttribute
-   *
-   * @param path - 属性路径，支持 RvPath 数组或字符串格式
-   * @returns 匹配的 TargetNodeAttribute 实例，未找到返回 undefined
-   */
-  getTargetNodeAttribute<T extends object = never>(
-    path: RvPath | string,
-  ): ITargetNodeAttribute<T> | undefined
-
   /**
    * 通过路径获取 StepAttribute
    *

src/service/sync/attribute/target/target-node-attribute.interface.ts

@@ -182,7 +182,8 @@ export class RvUtils {
     return targetList.some((target) => RvUtils.checkRvPathSame(fromPath, target))
   }
 
-  static isChangeEventType(type: EventType) {
+  static isChangeEventType(type: EventType | string) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
     return type == EventType.ADD || type == EventType.UPDATE || type == EventType.DELETE
   }
 }