Skip to content

Commit 928344e

Browse files
committed
refactor: 重构当前状态相关服务 TStepService TNodeService useTStep useTNode
1 parent dc9994b commit 928344e

File tree

10 files changed

+50
-51
lines changed

10 files changed

+50
-51
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "next-flow-interface",
3-
"version": "0.23.4",
3+
"version": "0.23.5",
44
"description": "Interface package for NEXT FlOW. You can use this package to build your own plugin that can control anything.",
55
"type": "module",
66
"module": "dist/index.js",

src/api/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import { UseLastSelectedInfo } from '@/hook/use-last-selected-info.type'
3838
import { UseSelectedInfo } from '@/hook/use-selected-info.type'
3939
import { UseSelectedMaterialInfo } from '@/hook/use-selected-material-info.type'
4040
import { UseStepOptions } from '@/hook/use-step-options.type'
41-
import { UseTAttributes } from '@/hook/use-t-attributes.type'
41+
import { UseTNode } from '@/hook/use-t-node.type'
4242
import { UseTStep } from '@/hook/use-t-step.type'
4343
import RvLoopAttributeApi from '@/service/attributes/animation/loop/rv-loop-attribute-api'
4444
import RvNativeAttributeApi from '@/service/attributes/animation/native/rv-native-attribute-api'
@@ -100,8 +100,8 @@ import RvSceneServiceApi from '@/service/sync/scene/rv-scene-service-api'
100100
import RvNodeServiceApi from '@/service/sync/step/node/rv-node-service-api'
101101
import RvStepServiceApi from '@/service/sync/step/rv-step-service-api'
102102
import SyncServiceApi from '@/service/sync/sync-service-api'
103-
import TAttributesServiceApi from '@/service/target/attribute/t-attributes-service-api'
104-
import TStepServiceApi from '@/service/target/step/t-step-service-api'
103+
import TNodeServiceApi from '@/service/target/t-node-service-api'
104+
import TStepServiceApi from '@/service/target/t-step-service-api'
105105
import { MaterialSymbolOptions } from '@/utils/material-symbol-utils'
106106

107107
import type { FunctionComponent } from 'react'
@@ -177,7 +177,7 @@ export let rvNodeService: RvNodeServiceApi
177177
export let rvNodeMaterialAnalyzer: RvNodeMaterialAnalyzerApi
178178

179179
export let tStepService: TStepServiceApi
180-
export let tAttributesService: TAttributesServiceApi
180+
export let tNodeService: TNodeServiceApi
181181

182182
export let showAttributeContextMenu: ShowAttributeContextMenu<unknown>
183183

@@ -187,7 +187,7 @@ export let useLastSelectedInfo: UseLastSelectedInfo
187187
export let useSelectedInfo: UseSelectedInfo
188188
export let useSelectedMaterialInfo: UseSelectedMaterialInfo
189189
export let useTStep: UseTStep
190-
export let useTAttributes: UseTAttributes
190+
export let useTNode: UseTNode
191191
export let useStepOptions: UseStepOptions
192192

193193
export let ThemeProvider: FunctionComponent<ThemeProviderProps>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { RvPath } from 'rhine-var'
22

3-
export type UseTAttributes = <T = unknown>(
4-
path?: string,
3+
export type UseTNode = <T = unknown>(
4+
path?: string | RvPath,
55
) => {
66
sid: string
77
nid: string

src/hook/use-t-step.type.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { RvPath } from 'rhine-var'
22

33
export type UseTStep = <T = unknown>(
4-
path?: string,
4+
path?: string | RvPath,
55
) => {
66
sid: string
77
state: T

src/index.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import { UseLastSelectedInfo } from './hook/use-last-selected-info.type'
4848
import { UseSelectedInfo } from './hook/use-selected-info.type'
4949
import { UseSelectedMaterialInfo } from './hook/use-selected-material-info.type'
5050
import { UseStepOptions } from './hook/use-step-options.type'
51-
import { UseTAttributes } from './hook/use-t-attributes.type'
51+
import { UseTNode } from './hook/use-t-node.type'
5252
import { UseTStep } from './hook/use-t-step.type'
5353
import BasePlugin from './plugin/base-plugin'
5454
import DialogPlugin from './plugin/dialog-plugin'
@@ -300,11 +300,11 @@ import RvSceneServiceApi, {
300300
import { StepOptions } from './service/sync/step/dto/step-options.type'
301301
import RvStepServiceApi from './service/sync/step/rv-step-service-api'
302302
import SyncServiceApi from './service/sync/sync-service-api'
303-
import TAttributesServiceApi from './service/target/attribute/t-attributes-service-api'
304-
import { TAttributesSubscriber } from './service/target/dto/t-attributes-subscriber.type'
303+
import { TNodeSubscriber } from './service/target/dto/t-attributes-subscriber.type'
305304
import { TChangeType } from './service/target/dto/t-change-type.enum'
306-
import { TSubscriber } from './service/target/dto/t-subscriber.type'
307-
import TStepServiceApi from './service/target/step/t-step-service-api'
305+
import { TStepSubscriber } from './service/target/dto/t-step-subscriber.type'
306+
import TNodeServiceApi from './service/target/t-node-service-api'
307+
import TStepServiceApi from './service/target/t-step-service-api'
308308
import { C3, C4 } from './type/general/color.type'
309309
import { V2, V3, V4 } from './type/general/vector.type'
310310
import { MixView } from './type/view/mix-view'
@@ -395,10 +395,10 @@ export type {
395395
RvVersion,
396396
RvStepServiceApi,
397397
RvModel,
398+
TStepSubscriber,
399+
TNodeSubscriber,
398400
TStepServiceApi,
399-
TSubscriber,
400-
TAttributesSubscriber,
401-
TAttributesServiceApi,
401+
TNodeServiceApi,
402402
StepOptions,
403403
PluginViewProps,
404404
MessageServiceApi,
@@ -469,7 +469,7 @@ export type {
469469
RsSelectionState,
470470
UseBase,
471471
UseTStep,
472-
UseTAttributes,
472+
UseTNode,
473473
UseStepOptions,
474474
V2,
475475
V3,

src/service/target/dto/t-attributes-subscriber.type.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import RvNode from '@/service/sync/interface/step/attributes/rv-node.interface'
44

55
import { TChangeType } from './t-change-type.enum'
66

7-
export type TAttributesSubscriber = (
7+
export type TNodeSubscriber = (
88
type: TChangeType,
99
path: RvPath,
1010
value: unknown,
1111
oldValue: unknown,
1212
sid: string,
1313
nid: string,
14-
nodeAttributes: StoredRhineVar<RvNode> | null,
14+
rvNode: StoredRhineVar<RvNode> | null,
1515
) => void

src/service/target/dto/t-subscriber.type.ts renamed to src/service/target/dto/t-step-subscriber.type.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { RvPath } from 'rhine-var'
22

33
import { TChangeType } from './t-change-type.enum'
44

5-
export type TSubscriber = (
5+
export type TStepSubscriber = (
66
type: TChangeType,
77
path: RvPath,
88
value: unknown,

src/service/target/step/t-step-service-api.ts

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
import { RvPath, StoredRhineVar } from 'rhine-var'
22

33
import RvNode from '@/service/sync/interface/step/attributes/rv-node.interface'
4-
import { TAttributesSubscriber } from '@/service/target/dto/t-attributes-subscriber.type'
4+
import { TNodeSubscriber } from '@/service/target/dto/t-attributes-subscriber.type'
55

6-
export default interface TAttributesServiceApi {
6+
export default interface TNodeServiceApi {
77
sid: string
88

99
nid: string
1010

1111
state: StoredRhineVar<RvNode> | null
1212

13-
subscribe(subscriber: TAttributesSubscriber): () => void
14-
15-
unsubscribe(subscriber: TAttributesSubscriber): void
13+
get<T>(path: string | RvPath): T | null
1614

1715
set<T>(path: string | RvPath, value: T): void
1816

@@ -22,5 +20,7 @@ export default interface TAttributesServiceApi {
2220

2321
multiCheck<T>(path: string | RvPath): void
2422

25-
get<T>(path: string | RvPath): T | null
23+
subscribe(subscriber: TNodeSubscriber): () => void
24+
25+
unsubscribe(subscriber: TNodeSubscriber): void
2626
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { RvPath, StoredRhineVar } from 'rhine-var'
2+
3+
import RvStep from '@/service/sync/interface/step/rv-step.interface'
4+
import { TNodeSubscriber } from '@/service/target/dto/t-attributes-subscriber.type'
5+
import { TStepSubscriber } from '@/service/target/dto/t-step-subscriber.type'
6+
7+
export default interface TStepServiceApi {
8+
sid: string
9+
10+
state: StoredRhineVar<RvStep>
11+
12+
get(path: string | RvPath): unknown
13+
14+
set(path: string | RvPath, value: unknown): void
15+
16+
subscribe(subscriber: TStepSubscriber): () => void
17+
18+
unsubscribe(subscriber: TStepSubscriber): void
19+
20+
subscribeNode(subscriber: TNodeSubscriber): () => void
21+
22+
unsubscribeNode(subscriber: TNodeSubscriber): void
23+
}

0 commit comments

Comments
 (0)