dsh-input-traffic 0.7.9 → 0.7.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dsh.plugin.json +1 -1
- package/lib/client.js +30 -16
- package/lib/client.js.map +1 -1
- package/lib/types/client/family-host.d.ts +11 -2
- package/lib/types/client/family-host.d.ts.map +1 -1
- package/lib/types/client/family-host.js +21 -5
- package/lib/types/client/family-host.js.map +1 -1
- package/lib/types/client/index.d.ts.map +1 -1
- package/lib/types/client/index.js +23 -15
- package/lib/types/client/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { JSX } from 'react';
|
|
1
|
+
import type { JSX, ReactNode } from 'react';
|
|
2
2
|
/** 账本条目（id/order/label，label 已解析成字符串）。 */
|
|
3
3
|
export interface FamilyTabEntry {
|
|
4
4
|
id: string;
|
|
@@ -33,6 +33,11 @@ export interface FamilyHostSectionProps {
|
|
|
33
33
|
tabs: HostObservable<readonly FamilyTabEntry[]>;
|
|
34
34
|
};
|
|
35
35
|
renderContributor?: (id: string) => JSX.Element | null;
|
|
36
|
+
/** 接管态内联直挂本插件自己的卡：自宣子槽不触发自身 inject（账本恒无己卡），
|
|
37
|
+
* 故不能靠 renderSlot/renderContributor 取回。缺省（未传）时行为与旧一致。 */
|
|
38
|
+
renderOwn?: () => ReactNode;
|
|
39
|
+
/** 内联 own 行的账本 id（与账本条目去重用）；仅 renderOwn 存在时生效。 */
|
|
40
|
+
ownId?: string;
|
|
36
41
|
}
|
|
37
42
|
/** 通用容器渲染：按 order 依次画出账本里每张贡献卡，不含任何"本插件特例"。 */
|
|
38
43
|
export declare function FamilyHostSection(props: FamilyHostSectionProps): JSX.Element;
|
|
@@ -46,6 +51,10 @@ export declare function projectLedger(slots: FamilyHostSlots): readonly FamilyTa
|
|
|
46
51
|
* @param log - console 前缀（带插件名）。
|
|
47
52
|
* @returns 取消定时器与撤销接管注册的 disposer。
|
|
48
53
|
*/
|
|
49
|
-
export declare function claimFamilyHostIfOrphaned(slots: FamilyHostSlots, isHeld: () => boolean, label: () => string, log: string
|
|
54
|
+
export declare function claimFamilyHostIfOrphaned(slots: FamilyHostSlots, isHeld: () => boolean, label: () => string, log: string, ownTab?: {
|
|
55
|
+
id: string;
|
|
56
|
+
component: unknown;
|
|
57
|
+
inject?: () => Record<string, unknown>;
|
|
58
|
+
}): () => void;
|
|
50
59
|
export {};
|
|
51
60
|
//# sourceMappingURL=family-host.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"family-host.d.ts","sourceRoot":"","sources":["../../../src/client/family-host.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"family-host.d.ts","sourceRoot":"","sources":["../../../src/client/family-host.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAE3C,0CAA0C;AAC1C,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;CACd;AAED,yCAAyC;AACzC,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,OAAO,KAAK,OAAO,CAAA;IACzD,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,EAAE,OAAO,KAAK,OAAO,CAAA;IAC3E,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IAC7D,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAA;CACzD;AAMD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,IAAI,CAAA;AAGlC,8BAA8B;AAC9B,eAAO,MAAM,qBAAqB,QAAkE,CAAA;AAMpG,KAAK,cAAc,CAAC,CAAC,IAAI;IACvB,WAAW,IAAI,CAAC,CAAA;IAChB,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CAC5C,CAAA;AASD,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,gBAAgB,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;IACnI,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,SAAS,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IACrE,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,cAAc,CAAC,SAAS,cAAc,EAAE,CAAC,CAAA;KAAE,CAAA;IAC3D,iBAAiB,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;IACtD;6DACyD;IACzD,SAAS,CAAC,EAAE,MAAM,SAAS,CAAA;IAC3B,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAID,+CAA+C;AAC/C,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,GAAG,CAAC,OAAO,CA8B5E;AAcD,+CAA+C;AAC/C,wBAAgB,aAAa,CAAC,KAAK,EAAE,eAAe,GAAG,SAAS,cAAc,EAAE,CAqB/E;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM,OAAO,EACrB,KAAK,EAAE,MAAM,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAClF,MAAM,IAAI,CAyDZ"}
|
|
@@ -42,9 +42,18 @@ export function FamilyHostSection(props) {
|
|
|
42
42
|
return raw.subscribe(() => setPolled(raw.getSnapshot()));
|
|
43
43
|
});
|
|
44
44
|
const tabs = props.useTabs !== undefined ? props.useTabs(value => value) : polled;
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
45
|
+
// 接管时本插件既是容器 owner 又是成员：自己声明的 dsh-family.tab 不会触发
|
|
46
|
+
// 自身 inject（账本恒无本卡），故把本卡作为 OWN 行内联直挂、其余成员仍走账本；
|
|
47
|
+
// 若本卡已在账本（外部 owner 在场、自身 inject 已触发）则去重不双渲。对齐 thinking-levels OWN_TAB_ID。
|
|
48
|
+
const ownId = props.ownId ?? '__own__';
|
|
49
|
+
const rows = props.renderOwn
|
|
50
|
+
? [{ id: ownId, order: Number.NEGATIVE_INFINITY, label: ownId }, ...tabs.filter(tab => tab.id !== ownId)]
|
|
51
|
+
: tabs;
|
|
52
|
+
return createElement('div', { style: { display: 'grid', gap: '12px' } }, rows.map(row => createElement('div', { key: row.id }, props.renderOwn && row.id === ownId
|
|
53
|
+
? props.renderOwn()
|
|
54
|
+
: props.renderSlot
|
|
55
|
+
? props.renderSlot(FAMILY_CHILD_KEY, {}, { only: row.id, fallback: null })
|
|
56
|
+
: props.renderContributor?.(row.id) ?? null)));
|
|
48
57
|
}
|
|
49
58
|
/** 取条目上的具名面（宿主条目是结构化对象，这里只做安全读取）。 */
|
|
50
59
|
function face(entry, key) {
|
|
@@ -90,7 +99,7 @@ export function projectLedger(slots) {
|
|
|
90
99
|
* @param log - console 前缀（带插件名）。
|
|
91
100
|
* @returns 取消定时器与撤销接管注册的 disposer。
|
|
92
101
|
*/
|
|
93
|
-
export function claimFamilyHostIfOrphaned(slots, isHeld, label, log) {
|
|
102
|
+
export function claimFamilyHostIfOrphaned(slots, isHeld, label, log, ownTab) {
|
|
94
103
|
let disposeClaim;
|
|
95
104
|
let claimed = false;
|
|
96
105
|
const timer = setTimeout(() => {
|
|
@@ -124,7 +133,14 @@ export function claimFamilyHostIfOrphaned(slots, isHeld, label, log) {
|
|
|
124
133
|
order: 40,
|
|
125
134
|
priority: FAMILY_HOST_PRIORITY,
|
|
126
135
|
label,
|
|
127
|
-
inject: () => ({
|
|
136
|
+
inject: () => ({
|
|
137
|
+
hooks: { tabs: ledger },
|
|
138
|
+
renderContributor,
|
|
139
|
+
ownId: ownTab?.id,
|
|
140
|
+
renderOwn: ownTab === undefined
|
|
141
|
+
? undefined
|
|
142
|
+
: () => createElement(ownTab.component, ownTab.inject ? ownTab.inject() : {}),
|
|
143
|
+
}),
|
|
128
144
|
children: { [FAMILY_CHILD_KEY]: { kind: 'list', scope: 'root' } },
|
|
129
145
|
}, FamilyHostSection);
|
|
130
146
|
if (typeof dispose === 'function')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"family-host.js","sourceRoot":"","sources":["../../../src/client/family-host.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAkB1D,oDAAoD;AACpD,MAAM,iBAAiB,GAAG,YAAY,CAAA;AACtC,MAAM,gBAAgB,GAAG,gBAAgB,CAAA;AAEzC;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAA;AAClC,MAAM,oBAAoB,GAAG,GAAG,CAAA;AAChC,MAAM,oBAAoB,GAAG,GAAG,CAAA;AAChC,8BAA8B;AAC9B,MAAM,CAAC,MAAM,qBAAqB,GAAG,oBAAoB,GAAG,iBAAiB,GAAG,oBAAoB,CAAA;AAEpG;gDACgD;AAChD,MAAM,oBAAoB,GAAG,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"family-host.js","sourceRoot":"","sources":["../../../src/client/family-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,OAAO,KAAK,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAqBnE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gBAAgB,OAAO,CAAA;AAkBpC;;;;;;GAMG;AACH,eAAO,MAAM,MAAM,UAAkD,CAAA;AAErE;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,OAAO,KAAK,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAqBnE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gBAAgB,OAAO,CAAA;AAkBpC;;;;;;GAMG;AACH,eAAO,MAAM,MAAM,UAAkD,CAAA;AAErE;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,CA+I9C"}
|
|
@@ -96,23 +96,31 @@ export function apply(ctx) {
|
|
|
96
96
|
console.warn('[dsh-input-traffic] bridge busyEnter pin failed:', e);
|
|
97
97
|
});
|
|
98
98
|
});
|
|
99
|
-
//
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
label: () => tFamily('family.title'),
|
|
109
|
-
locale: NS,
|
|
110
|
-
inject: () => ({ scope: familyScopeRef.scope ?? bridgeScope }),
|
|
111
|
-
}, InputTrafficFamilyCard);
|
|
112
|
-
});
|
|
99
|
+
// 贡献卡注册（apply 顶层无条件执行）：scope 走活引用（回调解到就填，卡 inject 现读）。
|
|
100
|
+
ctx.slots.inject('dsh-family.tab', () => ctx.slots.register({
|
|
101
|
+
name: 'dsh-family.tab',
|
|
102
|
+
id: 'input-traffic',
|
|
103
|
+
order: 50,
|
|
104
|
+
label: () => tFamily('family.title'),
|
|
105
|
+
locale: NS,
|
|
106
|
+
inject: () => ({ scope: familyScopeRef.scope ?? bridgeScope }),
|
|
107
|
+
}, InputTrafficFamilyCard));
|
|
113
108
|
// 家族容器兜底：到分级时刻仍无人声明子席位（owner 全部让位/声明失败）则自己上位，
|
|
114
109
|
// 否则本卡整轮启动不可见且不报错。declare-or-withdraw：声明失败不裸注册。
|
|
115
|
-
ctx.effect(() => claimFamilyHostIfOrphaned(ctx.slots,
|
|
110
|
+
ctx.effect(() => claimFamilyHostIfOrphaned(ctx.slots,
|
|
111
|
+
// 判据：有没有一个实际在位的家族容器（id=dsh-family 的 settings.section），
|
|
112
|
+
// 而非「我的 inject 有没有触发」——后者在自宣子槽时恒 false（本 bug 成因）。
|
|
113
|
+
() => {
|
|
114
|
+
try {
|
|
115
|
+
return ctx.slots.entries('settings.section')
|
|
116
|
+
.some(e => String(((e.options ?? {}).id) ?? '') === 'dsh-family');
|
|
117
|
+
}
|
|
118
|
+
catch {
|
|
119
|
+
return false;
|
|
120
|
+
}
|
|
121
|
+
}, () => '起子插件设置', '[dsh-input-traffic]',
|
|
122
|
+
// 接管态内联直挂本卡：own 卡组件 + 现取 scope（apply 级桥兜底，非空白）。
|
|
123
|
+
{ id: 'input-traffic', component: InputTrafficFamilyCard, inject: () => ({ scope: familyScopeRef.scope ?? bridgeScope }) }), 'dsh-input-traffic: family host backstop');
|
|
116
124
|
registerSettingsFaces(ctx, {
|
|
117
125
|
namespace: CONVERSATION_SETTINGS_NAMESPACE,
|
|
118
126
|
field: BUSY_ENTER_FIELD,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAuCA,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAwB,CAAA;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAqB,CAAA;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAmB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAsB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAA0B,MAAM,aAAa,CAAA;AACxF,OAAO,EAAE,yBAAyB,EAAwB,MAAM,kBAAkB,CAAA;AAElF,wEAAwE;AACxE,MAAM,+BAA+B,GAAG,iBAAiB,CAAA;AAEzD,2EAA2E;AAC3E,MAAM,gBAAgB,GAAG,WAAW,CAAA;AAEpC;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAA;AAEpC;;;;;;;GAOG;AACH,SAAS,WAAW,CAAC,IAAmB,EAAE,IAAY;IACpD,uEAAuE;IACvE,uDAAuD;IACvD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;IAC7C,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC,CAAA;IAClH,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAChC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,cAAc,CAAC,CAAA;AAErE;;;;GAIG;AACH,MAAM,UAAU,KAAK,CAAC,GAAkB;IACtC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC,EAAE,iCAAiC,CAAC,CAAA;IAC1F,6EAA6E;IAC7E,6EAA6E;IAC7E,0EAA0E;IAC1E,4EAA4E;IAC5E,kBAAkB;IAClB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAEnC,yEAAyE;IACzE,4EAA4E;IAC5E,2EAA2E;IAC3E,kEAAkE;IAClE,iEAAiE;IACjE,0EAA0E;IAC1E,8CAA8C;IAC9C,6DAA6D;IAC7D,wDAAwD;IACxD,iDAAiD;IACjD,mDAAmD;IACnD,wBAAwB;IACxB,MAAM,cAAc,GAAkC,EAAE,CAAA;IACxD,4DAA4D;IAC5D,iDAAiD;IACjD,6DAA6D;IAC7D,4CAA4C;IAC5C,mDAAmD;IACnD,qBAAqB;IACrB,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,+BAA+B,CAAC,CAAA;IACxE,IAAI,mBAAmB,GAAG,KAAK,CAAA;IAC/B,IAAI,YAAY,GAAG,KAAK,CAAA;IACxB,WAAW,CAAC,SAAS,CAAC,GAAG,EAAE;QACzB,IAAI,YAAY,IAAI,mBAAmB;YAAE,OAAM;QAC/C,IAAI,WAAW,CAAC,WAAW,EAAE,CAAC,MAAM,KAAK,OAAO;YAAE,OAAM;QACxD,uEAAuE;QACvE,uEAAuE;QACvE,sEAAsE;QACtE,+CAA+C;QAC/C,YAAY,GAAG,IAAI,CAAA;QACnB,KAAK,WAAW,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE;YACnE,OAAO,CAAC,IAAI,CAAC,kDAAkD,EAAE,CAAC,CAAC,CAAA;QACrE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"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"}
|