@lesliechan721/aw 0.1.0-beta.37 → 0.1.0-beta.39

package/dist/src/tui/console-app-v4.js

@@ -2,10 +2,11 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { arrayDraftChanged, arrayDraftValue, createConfigArrayDraft, editConfigArrayDraft } from './config-array-draft.js';
 import { PLUGIN_CONFIG_ARRAY_MAX_ITEMS } from '@lesliechan721/aw-plugin-core';
 import { presentConfigValue, safeConfigText } from './config-value-presentation.js';
+import { ConfigLeafEditor } from './config-leaf-editor.js';
 import { Box, Text, useInput, useWindowSize } from 'ink';
 import { useEffect, useLayoutEffect, useRef, useState } from 'react';
 import path from 'node:path';
-import { validatePluginConfigValue, } from '@lesliechan721/aw-plugin-core/manifest';
+import { resolvePluginConfigObjectProperties, validatePluginConfigValue, } from '@lesliechan721/aw-plugin-core/manifest';
 import { CATALOG_BETA_REF, CATALOG_LATEST_REF, OFFICIAL_CATALOG_SOURCE_SSH_URL, OFFICIAL_CATALOG_SOURCE_URL, } from '../constants.js';
 import { CATALOG_SOURCE_ID_PATTERN } from '../utils/catalog-sources.js';
 import { canonicalizeCatalogGitUrl } from '../utils/catalog-source-identity.js';
@@ -1019,6 +1020,8 @@ export function ConsoleAppV4(props) {
     const [objectDrafts, setObjectDrafts] = useState({});
     const [changedObjectDraftKeys, setChangedObjectDraftKeys] = useState([]);
     const [objectError, setObjectError] = useState();
+    const [nestedPropertyRevision, setNestedPropertyRevision] = useState();
+    const [objectVariantPreview, setObjectVariantPreview] = useState();
     const [inputValue, setInputValue] = useState('');
     const [inputError, setInputError] = useState();
     const [configActionError, setConfigActionError] = useState();
@@ -1064,7 +1067,7 @@ export function ConsoleAppV4(props) {
     const dependencyGraphContexts = useRef(new Map());
     const externalDraftRevision = useRef({ config: 0, source: 0, batch: 0 });
     const previousExternalDraftValues = useRef({
-        configDrafts, configCandidate, arrayDrafts, objectDrafts, changedObjectDraftKeys, sourceDraft, batchDraft,
+        configDrafts, configCandidate, arrayDrafts, objectDrafts, changedObjectDraftKeys, nestedPropertyRevision, objectVariantPreview, sourceDraft, batchDraft,
     });
     const externalDraftFlowIds = useRef(new Map());
     const configOverviewAnchors = useRef(new Map());
@@ -1358,7 +1361,9 @@ export function ConsoleAppV4(props) {
             || previous.configCandidate !== configCandidate
             || previous.arrayDrafts !== arrayDrafts
             || previous.objectDrafts !== objectDrafts
-            || previous.changedObjectDraftKeys !== changedObjectDraftKeys) {
+            || previous.changedObjectDraftKeys !== changedObjectDraftKeys
+            || previous.nestedPropertyRevision !== nestedPropertyRevision
+            || previous.objectVariantPreview !== objectVariantPreview) {
             externalDraftRevision.current.config += 1;
         }
         if (previous.sourceDraft !== sourceDraft)
@@ -1366,7 +1371,7 @@ export function ConsoleAppV4(props) {
         if (previous.batchDraft !== batchDraft)
             externalDraftRevision.current.batch += 1;
         previousExternalDraftValues.current = {
-            configDrafts, configCandidate, arrayDrafts, objectDrafts, changedObjectDraftKeys, sourceDraft, batchDraft,
+            configDrafts, configCandidate, arrayDrafts, objectDrafts, changedObjectDraftKeys, nestedPropertyRevision, objectVariantPreview, sourceDraft, batchDraft,
         };
         const currentFlowId = snapshot.router.currentFlowId;
         if (currentFlowId && configRouteOwner) {
@@ -1375,7 +1380,7 @@ export function ConsoleAppV4(props) {
         if (currentFlowId && sourceDraft)
             externalDraftFlowIds.current.set(sourceDraft.owner, currentFlowId);
         const drafts = [];
-        if ((dirty || configCandidate || Object.values(arrayDrafts).some((draft) => draft.initial === undefined ? draft.rows.length > 0 : arrayDraftChanged(draft)) || changedObjectDraftKeys.length > 0) && draftOwner) {
+        if ((dirty || configCandidate || nestedPropertyRevision || objectVariantPreview || Object.values(arrayDrafts).some((draft) => draft.initial === undefined ? draft.rows.length > 0 : arrayDraftChanged(draft)) || changedObjectDraftKeys.length > 0) && draftOwner) {
             const flowId = externalDraftFlowIds.current.get(draftOwner);
             drafts.push({
                 kind: 'configDraft', owner: draftOwner, revision: externalDraftRevision.current.config,
@@ -1398,7 +1403,7 @@ export function ConsoleAppV4(props) {
         props.controller.setExternalDraftState(drafts);
     }, [
         props.controller, batchDraft, changedObjectDraftKeys, configRouteOwner, dirty, draftOwner,
-        configDrafts, configCandidate, arrayDrafts, objectDrafts, route.name, snapshot.router.currentFlowId, sourceDraft,
+        configDrafts, configCandidate, arrayDrafts, objectDrafts, nestedPropertyRevision, objectVariantPreview, route.name, snapshot.router.currentFlowId, sourceDraft,
     ]);
     useEffect(() => () => props.controller.setExternalDraftState(), [props.controller]);
     const currentConfigPage = configPageMatches(configPage, configRoute) ? configPage : undefined;
@@ -1788,15 +1793,24 @@ export function ConsoleAppV4(props) {
     const activeObjectDraft = activeObjectKey
         ? objectDrafts[activeObjectKey] ?? objectValueFromCandidate ?? objectValueFromUpdate ?? objectValueFromField ?? {}
         : undefined;
+    const activeObjectProperties = activeField?.definition.type === 'object' && activeObjectDraft
+        ? resolvePluginConfigObjectProperties(activeField.definition, activeObjectDraft, activeField.key).properties
+        : undefined;
     const activePropertyDefinition = route.name === 'configObjectPropertyEditor'
         && activeField?.definition.type === 'object' && route.propertyKey !== undefined
-        ? activeField.definition.properties?.[route.propertyKey]
+        ? activeObjectProperties?.[route.propertyKey]
             ?? (activeField.definition.additionalProperties === false
                 ? undefined
                 : activeField.definition.additionalProperties)
         : undefined;
+    const activeVariantPreview = objectVariantPreview?.routeKey === routeKey ? objectVariantPreview : undefined;
+    const nestedPropertyEditor = route.name === 'configObjectPropertyEditor' && route.stage === 'custom'
+        && !activeVariantPreview && (activePropertyDefinition?.type === 'array' || activePropertyDefinition?.type === 'object');
+    useEffect(() => { setObjectVariantPreview(undefined); }, [routeKey]);
     const activePropertySensitive = activeField?.sensitive === true
         || activePropertyDefinition?.sensitive === true;
+    const activeFieldIsConst = activeField && 'const' in activeField.definition && activeField.definition.const !== undefined;
+    const activePropertyIsConst = activePropertyDefinition && 'const' in activePropertyDefinition && activePropertyDefinition.const !== undefined;
     useEffect(() => {
         if (route.name !== 'configFieldEditor' || !activeField)
             return;
@@ -1896,7 +1910,7 @@ export function ConsoleAppV4(props) {
             || Boolean(route.name === 'configUnavailable' && plugin)
             || Boolean(route.name === 'result' && snapshot.result && 'operationKind' in snapshot.result
                 && snapshot.result.operationKind === 'portableInstall'));
-    const characterInput = isCharacterInputMode(route, searchFocus)
+    const characterInput = !activeVariantPreview && !activeFieldIsConst && !activePropertyIsConst && isCharacterInputMode(route, searchFocus)
         || route.name === 'operationReportPreview' && reportSaveMode;
     const canOpenHelp = !tooSmall && !characterInput && !preparationRunning;
     useEffect(() => {
@@ -3079,7 +3093,8 @@ export function ConsoleAppV4(props) {
         const itemDefinition = activeTopField?.definition.type === 'array' ? activeTopField.definition.items : undefined;
         const property = issue.path.property;
         const label = property && itemDefinition?.type === 'object'
-            ? itemDefinition.properties?.[property]?.title ?? property : property ?? activeField?.title ?? issue.path.field;
+            ? activeObjectProperties?.[property]?.title ?? itemDefinition.properties?.[property]?.title ?? property
+            : property ? activeObjectProperties?.[property]?.title ?? property : activeField?.title ?? issue.path.field;
         return `${index === undefined ? '' : `第 ${Number(index) + 1} 项／`}${label}：${issue.message}`;
     };
     const commitObjectDraft = () => {
@@ -3099,11 +3114,11 @@ export function ConsoleAppV4(props) {
     const openObjectProperty = (propertyKey, dynamic) => {
         if (!activeField || activeField.definition.type !== 'object')
             return;
-        const definition = activeField.definition.properties?.[propertyKey]
+        const definition = activeObjectProperties?.[propertyKey]
             ?? (activeField.definition.additionalProperties === false
                 ? undefined
                 : activeField.definition.additionalProperties);
-        if (!definition)
+        if (!definition || 'const' in definition && definition.const !== undefined)
             return;
         const exists = activeObjectDraft && Object.hasOwn(activeObjectDraft, propertyKey);
         go({
@@ -3121,12 +3136,36 @@ export function ConsoleAppV4(props) {
         if (!activeField || activeField.definition.type !== 'object' || !activeObjectDraft)
             return false;
         const candidate = { ...activeObjectDraft, [propertyKey]: value };
+        if (value === undefined)
+            delete candidate[propertyKey];
         const issues = validatePluginConfigValue(activeField.definition, candidate, activeField.key)
             .filter((issue) => issue.path.property === propertyKey);
         if (issues.length > 0) {
             setInputError(issues.slice(0, 2).map(objectIssueText).join('；'));
             return false;
         }
+        const variants = activeField.definition.variants;
+        if (variants?.discriminator === propertyKey && activeObjectDraft[propertyKey] !== value) {
+            const resolved = resolvePluginConfigObjectProperties(activeField.definition, candidate, activeField.key);
+            if (resolved.issues.length) {
+                setInputError(resolved.issues.slice(0, 2).map(objectIssueText).join('；'));
+                return false;
+            }
+            const removed = [];
+            for (const property of Object.keys(candidate)) {
+                const definition = resolved.properties[property];
+                if (activeObjectProperties?.[property] && !definition
+                    || definition && 'const' in definition && definition.const !== undefined
+                        && Object.hasOwn(candidate, property) && candidate[property] !== definition.const) {
+                    removed.push({ property, value: candidate[property] });
+                    delete candidate[property];
+                }
+            }
+            setObjectVariantPreview({ routeKey, value: candidate, removed });
+            setFocus(0);
+            setBatchTargetOffset(0);
+            return false;
+        }
         updateObjectDraft(candidate);
         return true;
     };
@@ -3265,20 +3304,19 @@ export function ConsoleAppV4(props) {
             const updatedValue = draft.updates[key];
             const afterObject = field?.definition.type === 'object'
                 && typeof updatedValue === 'object' && !Array.isArray(updatedValue) ? updatedValue : undefined;
-            const childSummary = (property, value) => {
+            const childSummary = (property, value, object) => {
                 if (value === undefined)
                     return '未设置';
                 if (field.sensitive || field.definition.type !== 'object')
                     return '已设置';
-                const definition = field.definition.properties?.[property]
+                const definition = resolvePluginConfigObjectProperties(field.definition, object).properties[property]
                     ?? (field.definition.additionalProperties === false
                         ? undefined
                         : field.definition.additionalProperties);
                 if (definition?.sensitive)
                     return '已设置';
-                if (typeof value === 'boolean')
-                    return value ? '开启' : '关闭';
-                return value === '' ? '（空字符串）' : safeConfigText(String(value));
+                return definition ? presentConfigValue({ definition, value, full: true }).text
+                    : safeConfigText(JSON.stringify(value));
             };
             const updatedChildren = beforeObject && afterObject
                 ? [...new Set([...Object.keys(beforeObject), ...Object.keys(afterObject)])]
@@ -3296,7 +3334,7 @@ export function ConsoleAppV4(props) {
                     }
                     return left.localeCompare(right, 'en');
                 })
-                    .filter((property) => beforeObject[property] !== afterObject[property])
+                    .filter((property) => !configValuesEqual(beforeObject[property], afterObject[property]))
                     .map((property) => {
                     const definition = field.definition.type === 'object'
                         ? field.definition.properties?.[property]
@@ -3306,8 +3344,8 @@ export function ConsoleAppV4(props) {
                         : undefined;
                     return {
                         property,
-                        before: childSummary(property, beforeObject[property]),
-                        after: childSummary(property, afterObject[property]),
+                        before: childSummary(property, beforeObject[property], beforeObject),
+                        after: childSummary(property, afterObject[property], afterObject),
                         ...(field.sensitive || definition?.sensitive ? { private: true } : {}),
                     };
                 })
@@ -5965,6 +6003,14 @@ export function ConsoleAppV4(props) {
             actions = canUnset ? [{ label: '删除此覆盖并恢复继承', run: () => removeDraft(activeField.key) }] : [];
             content = _jsxs(Box, { flexDirection: "column", children: [_jsx(StatusCard, { status: "warning", title: "\u4EC5\u53EF\u5220\u9664\u65E7\u503C", description: description }), _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: true })] });
         }
+        else if ('const' in activeField.definition && activeField.definition.const !== undefined) {
+            title = activeField.title;
+            description = '这个值由插件固定，不能编辑。';
+            const constant = activeField.definition.const;
+            actions = activeField.definition.required && activeField.value === undefined
+                ? [{ label: '写入此固定值', run: () => updateDraft(activeField.key, constant) }] : [];
+            content = _jsxs(Box, { flexDirection: "column", children: [_jsx(StaticRow, { title: `固定值 · ${presentConfigValue({ definition: activeField.definition, value: constant }).text}`, compact: true }), _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: true })] });
+        }
         else if (showChoices) {
             title = `选择${activeField.title}`;
             description = activeField.type !== 'boolean' && activeField.allowCustom
@@ -6044,12 +6090,16 @@ export function ConsoleAppV4(props) {
             if (objectError)
                 description = objectError;
             help = '↑↓ 移动 · Enter 编辑 · Esc 取消';
-            const fixedEntries = Object.entries(objectDefinition.properties ?? {});
+            const fixedEntries = Object.entries(activeObjectProperties ?? {});
             const fixedKeys = new Set(fixedEntries.map(([property]) => property));
             const dynamicKeys = Object.keys(activeObjectDraft)
                 .filter((property) => !fixedKeys.has(property))
                 .sort((left, right) => left.localeCompare(right, 'en'));
             const propertySummary = (property, definition) => {
+                if ('const' in definition && definition.const !== undefined) {
+                    const text = presentConfigValue({ definition, value: definition.const }).text;
+                    return `${'required' in definition && definition.required && !Object.hasOwn(activeObjectDraft, property) ? '必填 · ' : ''}固定值 · ${text}`;
+                }
                 const presentation = presentConfigValue({ definition,
                     value: activeObjectDraft[property], privateValue: activeField.sensitive,
                     configured: Object.hasOwn(activeObjectDraft, property),
@@ -6062,12 +6112,30 @@ export function ConsoleAppV4(props) {
                     label: definition.title ?? property,
                     description: definition.description,
                     meta: propertySummary(property, definition),
-                    run: () => openObjectProperty(property, false),
+                    disabled: 'const' in definition && definition.const !== undefined
+                        && !(definition.required && !Object.hasOwn(activeObjectDraft, property)) ? '插件固定值，不能编辑' : undefined,
+                    run: () => {
+                        if ('const' in definition && definition.const !== undefined) {
+                            updateObjectDraft({ ...activeObjectDraft, [property]: definition.const });
+                        }
+                        else
+                            openObjectProperty(property, false);
+                    },
                 })),
                 ...dynamicKeys.map((property) => ({
                     label: property,
-                    meta: propertySummary(property, objectDefinition.additionalProperties),
-                    run: () => openObjectProperty(property, true),
+                    meta: objectDefinition.additionalProperties === false
+                        ? `不适用 · ${safeConfigText(JSON.stringify(activeObjectDraft[property]))}`
+                        : propertySummary(property, objectDefinition.additionalProperties),
+                    run: () => {
+                        if (objectDefinition.additionalProperties !== false)
+                            openObjectProperty(property, true);
+                        else {
+                            const next = { ...activeObjectDraft };
+                            delete next[property];
+                            updateObjectDraft(next);
+                        }
+                    },
                 })),
             ];
             const objectOperationActions = [
@@ -6131,7 +6199,31 @@ export function ConsoleAppV4(props) {
         const definition = activePropertyDefinition;
         const propertyTitle = definition && property ? definition.title ?? property : '动态键';
         breadcrumb = `${plugin.displayName} / 设置 / ${activeField.title} / ${propertyTitle}`;
-        if (route.stage === 'key') {
+        if (activeVariantPreview) {
+            title = '确认分支切换';
+            description = '确认后仅更新当前对象草稿；完整设置仍需 Review 后保存。';
+            const candidateIssues = validatePluginConfigValue(activeField.definition, activeVariantPreview.value, activeField.key);
+            readingText = [
+                activeVariantPreview.removed.length ? '将移除这些旧值：' : '没有需要移除的旧值。',
+                ...activeVariantPreview.removed.map((entry) => `${entry.property} = ${safeConfigText(JSON.stringify(entry.value))}`),
+                '切换后的实际配置：', safeConfigText(JSON.stringify(activeVariantPreview.value, null, 2)),
+                ...(candidateIssues.length ? ['需要补充或修正：', ...candidateIssues.map(objectIssueText)] : []),
+            ].join('\n');
+            actions = [{ label: '使用此候选草稿', run: () => {
+                        updateObjectDraft(activeVariantPreview.value);
+                        if (candidateIssues.length)
+                            setObjectError(candidateIssues.slice(0, 2).map(objectIssueText).join('；'));
+                        setObjectVariantPreview(undefined);
+                        back();
+                    } }, { label: '取消切换', run: () => { setObjectVariantPreview(undefined); back(); } }];
+            content = _jsxs(Box, { flexDirection: "column", children: [readingPage(readingText, size.columns - 2, Math.max(1, pageActionBudget(4))), _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: true })] });
+        }
+        else if (property !== undefined && definition && 'const' in definition && definition.const !== undefined) {
+            title = propertyTitle;
+            description = '这个值由插件固定，不能编辑。';
+            content = _jsx(StaticRow, { title: `固定值 · ${presentConfigValue({ definition, value: definition.const }).text}`, compact: true });
+        }
+        else if (route.stage === 'key') {
             title = '输入新键名';
             description = inputError ?? '键名和属性数量会按插件规则检查。';
             help = '输入 · Enter 继续 · Ctrl-U 清空输入 · Esc 取消';
@@ -6156,6 +6248,11 @@ export function ConsoleAppV4(props) {
                     label: route.dynamic ? '删除动态键' : '删除属性',
                     status: 'error',
                     run: () => {
+                        if (activeField.definition.type === 'object' && activeField.definition.variants?.discriminator === property) {
+                            if (updateObjectProperty(property, undefined))
+                                back();
+                            return;
+                        }
                         const next = { ...activeObjectDraft };
                         delete next[property];
                         updateObjectDraft(next);
@@ -6203,7 +6300,7 @@ export function ConsoleAppV4(props) {
                     ...(definition.choices?.presets ?? []).map((preset) => ({
                         label: `${preset.title}${preset.recommended ? '（推荐）' : ''}`,
                         description: preset.description,
-                        selected: !activePropertySensitive && current === preset.value,
+                        selected: !activePropertySensitive && configValuesEqual(current, preset.value),
                         run: () => { if (updateObjectProperty(property, preset.value))
                             back(); },
                     })),
@@ -6217,6 +6314,13 @@ export function ConsoleAppV4(props) {
                 ];
             content = _jsx(SemanticRows, { actions: actions, focus: focus, kind: "choice", compact: policy.mode === 'compact' });
         }
+        else if (property !== undefined && definition && (definition.type === 'array' || definition.type === 'object')) {
+            title = `编辑${propertyTitle}`;
+            description = '确认后更新当前对象草稿；Esc 取消此属性的全部修改。';
+            help = '↑↓ 移动 · Enter 编辑 · a 操作 · c 使用 · Esc 取消';
+            content = _jsx(ConfigLeafEditor, { definition: definition, value: activeObjectDraft[property], propertyKey: property, columns: size.columns, rowBudget: pageActionBudget(1), active: !overlay && !tooSmall && !busy, error: inputError, onDraftChange: setNestedPropertyRevision, onCancel: back, onConfirm: (value) => { if (!updateObjectProperty(property, value))
+                    return false; back(); return true; } }, `${snapshot.router.currentFrameId}:${property}`);
+        }
         else if (property !== undefined && definition) {
             title = activePropertySensitive ? '输入敏感值' : `输入${propertyTitle}`;
             description = inputError ?? (activePropertySensitive ? '输入已隐藏。' : definition.description ?? '按 Enter 使用输入值。');
@@ -9270,6 +9374,11 @@ export function ConsoleAppV4(props) {
             }
             return;
         }
+        if (nestedPropertyEditor && !overlay) {
+            if (key.ctrl && input.toLowerCase() === 'c')
+                requestConfirmedExit();
+            return;
+        }
         if (arrayToolsOpen && activeArrayDraft) {
             if (key.escape)
                 setArrayToolsOpen(false);
@@ -9866,6 +9975,7 @@ export function ConsoleAppV4(props) {
             return;
         }
         if (route.name === 'configFieldEditor'
+            && !activeFieldIsConst
             && (route.editor === 'string' || route.editor === 'number')
             && ((activeField?.choices?.length ?? 0) === 0 || route.mode === 'custom')
             && ['project', 'user'].some((scope) => configLayerPages[scope]?.groups.flatMap((group) => group.fields)
@@ -9912,6 +10022,8 @@ export function ConsoleAppV4(props) {
         }
         if (route.name === 'configObjectPropertyEditor'
             && (route.stage === 'key' || route.stage === 'custom')
+            && !activeVariantPreview
+            && !activePropertyIsConst
             && activeField?.definition.type === 'object'
             && activeObjectDraft) {
             if (key.escape) {