@septkit/ui 0.0.46 → 0.0.47
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/dist/external/.pnpm/{@dialecte_scl@0.3.5/node_modules/@dialecte/scl/dist/hooks-abaf9148.js → @dialecte_scl@0.3.7/node_modules/@dialecte/scl/dist/hooks-ByGralT8.js} +3 -6
- package/dist/external/.pnpm/{@dialecte_scl@0.3.5 → @dialecte_scl@0.3.7}/node_modules/@dialecte/scl/dist/v2019C1/index.js +1 -1
- package/dist/external/.pnpm/@lucide_vue@1.23.0_vue@3.5.39_typescript@5.8.3_/node_modules/@lucide/vue/dist/esm/icons/eye-off.js +22 -0
- package/dist/external/.pnpm/@lucide_vue@1.23.0_vue@3.5.39_typescript@5.8.3_/node_modules/@lucide/vue/dist/esm/icons/eye.js +13 -0
- package/dist/index.d.ts +21 -0
- package/dist/index.js +4 -3
- package/dist/merge/index.js +4 -3
- package/dist/merge/merge-review.vue_vue_type_script_setup_true_lang.js +141 -127
- package/dist/merge/merge.service.js +14 -12
- package/dist/merge/type-name-authority.js +5 -0
- package/dist/merge/type-name-authority.vue_vue_type_script_setup_true_lang.js +46 -0
- package/dist/merge/use-merge-session.js +82 -63
- package/dist/ui.css +1 -1
- package/package.json +2 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import "../../../../../@dialecte_core@0.4.6/node_modules/@dialecte/core/dist/utils-C5_11hqg.js";
|
|
2
2
|
import { XSI_NAMESPACE as e, toRawRecord as t } from "../../../../../@dialecte_core@0.4.6/node_modules/@dialecte/core/dist/helpers.js";
|
|
3
|
-
//#region node_modules/.pnpm/@dialecte+scl@0.3.
|
|
3
|
+
//#region node_modules/.pnpm/@dialecte+scl@0.3.7/node_modules/@dialecte/scl/dist/hooks-ByGralT8.js
|
|
4
4
|
var n = /* @__PURE__ */ "AccessControl.AccessPoint.Address.AllocationRole.AllocationRoleRef.AnalogueWiringParameters.AnalogueWiringParametersRef.Application.ApplicationSclRef.Association.Authentication.BDA.Bay.BayType.BehaviorDescription.BehaviorDescriptionRef.BehaviorReference.BinaryWiringParameters.BinaryWiringParametersRef.BitRate.CheckoutID.ClientLN.ClientServices.CommProt.Communication.CommunicationServiceSpecifications.ConductingEquipment.ConfDataSet.ConfLNs.ConfLdName.ConfLogControl.ConfReportControl.ConfSG.ConfSigRef.ConnectedAP.ConnectivityNode.ControlRef.ControllingLNode.DA.DAI.DAS.DAType.DO.DOI.DOS.DOType.DataObjectDirectory.DataSet.DataSetDirectory.DataTypeTemplates.DynAssociation.DynDataSet.EnumType.EnumVal.EqFunction.EqSubFunction.ExtCtrl.ExtRef.FCDA.FileHandling.Function.FunctionCatRef.FunctionCategory.FunctionCategoryRef.FunctionRef.FunctionRole.FunctionRoleContent.FunctionSclRef.FunctionTemplate.FunctionalSubVariant.FunctionalVariant.FunctionalVariantGroup.FunctionalVariantRef.GOOSE.GOOSEMcSecurity.GOOSESecurity.GSE.GSEControl.GSEDir.GSESettings.GSSE.GeneralEquipment.GetCBValues.GetDataObjectDefinition.GetDataSetValue.GetDirectory.GooseParameters.GooseParametersRef.Header.History.Hitem.IED.IEDName.IEDSourceFiles.InputVar.InputVarRef.Inputs.IssuerName.KDC.L2CommParameters.L3IPv4CommParameters.L3IPv6CommParameters.LDevice.LN.LN0.LNode.LNodeDataRef.LNodeInputRef.LNodeInputs.LNodeOutputRef.LNodeOutputs.LNodeSpecNaming.LNodeType.Label.Labels.Line.Log.LogControl.LogParameters.LogParametersRef.LogSettings.MaxTime.McSecurity.MinRequestedSCDFile.MinRequestedSCDFiles.MinTime.MultiAPPerSubNet.NeutralPoint.OptFields.OutputVar.OutputVarRef.Outputs.P.PhysConn.PowerSystemRelation.PowerSystemRelationRef.PowerSystemRelations.PowerTransformer.Private.Process.ProcessEcho.ProcessResource.ProcessResourceRef.ProcessResources.Project.ProjectProcessReference.ProtNs.Protocol.ReadWrite.RedProt.ReportControl.ReportParameters.ReportParametersRef.ReportSettings.Resource.RptEnabled.SCL.SCSM.SDI.SDO.SDS.SGEdit.SMV.SMVParameters.SMVParametersRef.SMVSecurity.SMVSettings.SMVsc.SVMcSecurity.SampledValueControl.SamplesPerSec.SclFileReference.SecPerSamples.Security.Server.ServerAt.ServiceSpecifications.Services.SetDataSetValue.SettingControl.SettingGroups.SignalRole.SmpRate.SmvOpts.SourceFiles.SourceRef.SubCategory.SubCheckoutID.SubEquipment.SubFunction.SubFunctionTemplate.SubNetwork.Subject.SubscriberLNode.Substation.SupSubscription.TapChanger.Terminal.Text.TimeSyncProt.TimerActivatedControl.TransformerWinding.TrgOps.Val.ValueHandling.Variable.VariableApplyTo.VariableRef.Voltage.VoltageLevel".split("."), r = {
|
|
5
5
|
AccessControl: [],
|
|
6
6
|
AccessPoint: [
|
|
@@ -25236,11 +25236,8 @@ function z(e) {
|
|
|
25236
25236
|
case "fsd":
|
|
25237
25237
|
case "asd": return {
|
|
25238
25238
|
rootTag: "Substation",
|
|
25239
|
-
omit: [
|
|
25240
|
-
|
|
25241
|
-
"Communication",
|
|
25242
|
-
"IED"
|
|
25243
|
-
]
|
|
25239
|
+
omit: ["Communication", "IED"],
|
|
25240
|
+
include: ["DataTypeTemplates"]
|
|
25244
25241
|
};
|
|
25245
25242
|
}
|
|
25246
25243
|
}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import e from "../createLucideIcon.js";
|
|
2
|
+
//#region node_modules/.pnpm/@lucide+vue@1.23.0_vue@3.5.39_typescript@5.8.3_/node_modules/@lucide/vue/dist/esm/icons/eye-off.mjs
|
|
3
|
+
var t = [
|
|
4
|
+
["path", {
|
|
5
|
+
d: "M10.733 5.076a10.744 10.744 0 0 1 11.205 6.575 1 1 0 0 1 0 .696 10.747 10.747 0 0 1-1.444 2.49",
|
|
6
|
+
key: "ct8e1f"
|
|
7
|
+
}],
|
|
8
|
+
["path", {
|
|
9
|
+
d: "M14.084 14.158a3 3 0 0 1-4.242-4.242",
|
|
10
|
+
key: "151rxh"
|
|
11
|
+
}],
|
|
12
|
+
["path", {
|
|
13
|
+
d: "M17.479 17.499a10.75 10.75 0 0 1-15.417-5.151 1 1 0 0 1 0-.696 10.75 10.75 0 0 1 4.446-5.143",
|
|
14
|
+
key: "13bj9a"
|
|
15
|
+
}],
|
|
16
|
+
["path", {
|
|
17
|
+
d: "m2 2 20 20",
|
|
18
|
+
key: "1ooewy"
|
|
19
|
+
}]
|
|
20
|
+
], n = e("eye-off", t);
|
|
21
|
+
//#endregion
|
|
22
|
+
export { t as __iconNode, n as default };
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import e from "../createLucideIcon.js";
|
|
2
|
+
//#region node_modules/.pnpm/@lucide+vue@1.23.0_vue@3.5.39_typescript@5.8.3_/node_modules/@lucide/vue/dist/esm/icons/eye.mjs
|
|
3
|
+
var t = [["path", {
|
|
4
|
+
d: "M2.062 12.348a1 1 0 0 1 0-.696 10.75 10.75 0 0 1 19.876 0 1 1 0 0 1 0 .696 10.75 10.75 0 0 1-19.876 0",
|
|
5
|
+
key: "1nclc0"
|
|
6
|
+
}], ["circle", {
|
|
7
|
+
cx: "12",
|
|
8
|
+
cy: "12",
|
|
9
|
+
r: "3",
|
|
10
|
+
key: "1v7zrd"
|
|
11
|
+
}]], n = e("eye", t);
|
|
12
|
+
//#endregion
|
|
13
|
+
export { t as __iconNode, n as default };
|
package/dist/index.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ import { DiffReport } from '@dialecte/scl/v2019C1';
|
|
|
10
10
|
import { ExtensionModule } from '@dialecte/core';
|
|
11
11
|
import { GroupDecision } from '@dialecte/scl/v2019C1';
|
|
12
12
|
import { InjectionKey } from 'vue';
|
|
13
|
+
import { KeepNameTypesFrom } from '@dialecte/scl/v2019C1';
|
|
13
14
|
import { LifecycleScenario } from '@dialecte/scl/v2019C1';
|
|
14
15
|
import { LifecycleTarget } from '@dialecte/scl/v2019C1';
|
|
15
16
|
import { LifecycleVerb } from '@dialecte/scl/v2019C1';
|
|
@@ -114,6 +115,13 @@ declare type __VLS_Props_13 = {
|
|
|
114
115
|
expandedItems?: string[];
|
|
115
116
|
};
|
|
116
117
|
|
|
118
|
+
declare type __VLS_Props_14 = {
|
|
119
|
+
size?: 'xs' | 'sm' | 'md';
|
|
120
|
+
disabled?: boolean;
|
|
121
|
+
/** Render the segmented control only, without the leading label. */
|
|
122
|
+
hideLabel?: boolean;
|
|
123
|
+
};
|
|
124
|
+
|
|
117
125
|
declare type __VLS_Props_2 = {
|
|
118
126
|
/** Trigger color */
|
|
119
127
|
color?: 'neutral' | 'primary' | 'secondary' | 'accent' | 'info' | 'success' | 'warning' | 'error';
|
|
@@ -207,6 +215,10 @@ declare type __VLS_PublicProps_2 = {
|
|
|
207
215
|
modelValue: DecisionAction;
|
|
208
216
|
} & __VLS_Props_10;
|
|
209
217
|
|
|
218
|
+
declare type __VLS_PublicProps_3 = {
|
|
219
|
+
modelValue: KeepNameTypesFrom;
|
|
220
|
+
} & __VLS_Props_14;
|
|
221
|
+
|
|
210
222
|
declare function __VLS_template(): {
|
|
211
223
|
attrs: Partial<{}>;
|
|
212
224
|
slots: {
|
|
@@ -636,6 +648,7 @@ onClose?: (() => any) | undefined;
|
|
|
636
648
|
onApplied?: (() => any) | undefined;
|
|
637
649
|
}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, HTMLDivElement>;
|
|
638
650
|
|
|
651
|
+
/** Inputs for `useMergeSession`. */
|
|
639
652
|
export declare type MergeSessionParams = {
|
|
640
653
|
targetDocument: Scl.Document;
|
|
641
654
|
sourceQuery: Scl.Query;
|
|
@@ -690,6 +703,12 @@ declare type StructuralTree = {
|
|
|
690
703
|
expanded: string[];
|
|
691
704
|
};
|
|
692
705
|
|
|
706
|
+
export declare const TypeNameAuthority: DefineComponent<__VLS_PublicProps_3, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
|
|
707
|
+
"update:modelValue": (value: KeepNameTypesFrom) => any;
|
|
708
|
+
}, string, PublicProps, Readonly<__VLS_PublicProps_3> & Readonly<{
|
|
709
|
+
"onUpdate:modelValue"?: ((value: KeepNameTypesFrom) => any) | undefined;
|
|
710
|
+
}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, HTMLDivElement>;
|
|
711
|
+
|
|
693
712
|
export declare type UnifiedDiff = {
|
|
694
713
|
/** Every line (removed + added + unchanged), joined for a single highlight pass. */
|
|
695
714
|
code: string;
|
|
@@ -771,6 +790,7 @@ export declare function useLiveData<T>(params: {
|
|
|
771
790
|
export declare function useMergeSession(params: MergeSessionParams): {
|
|
772
791
|
report: ShallowRef<DiffReport | undefined, DiffReport | undefined>;
|
|
773
792
|
decisions: Reactive<Map<string, GroupDecision>>;
|
|
793
|
+
keepNameTypesFrom: ShallowRef<KeepNameTypesFrom, KeepNameTypesFrom>;
|
|
774
794
|
structuralTree: ShallowRef<StructuralTree, StructuralTree>;
|
|
775
795
|
previewXml: ShallowRef<string | undefined, string | undefined>;
|
|
776
796
|
previewBeforeXml: ShallowRef<string | undefined, string | undefined>;
|
|
@@ -782,6 +802,7 @@ export declare function useMergeSession(params: MergeSessionParams): {
|
|
|
782
802
|
editedValue: (groupId: string, attr: string) => string | undefined;
|
|
783
803
|
select: (sel: StructuralNodeInfo | undefined) => void;
|
|
784
804
|
stagedAttributes: (ref: Scl.Ref<Scl.ElementsOf>) => Promise<Record<string, string | undefined>>;
|
|
805
|
+
setKeepNameTypesFrom: (value: KeepNameTypesFrom) => void;
|
|
785
806
|
commit: () => Promise<void>;
|
|
786
807
|
};
|
|
787
808
|
|
package/dist/index.js
CHANGED
|
@@ -25,7 +25,8 @@ import "./code/index.js";
|
|
|
25
25
|
import w from "./merge/decision-toggle.js";
|
|
26
26
|
import T from "./merge/element-detail.js";
|
|
27
27
|
import E from "./merge/merge-tree.js";
|
|
28
|
-
import
|
|
29
|
-
import O from "./merge/merge-
|
|
28
|
+
import D from "./merge/type-name-authority.js";
|
|
29
|
+
import { useMergeSession as O } from "./merge/use-merge-session.js";
|
|
30
|
+
import k from "./merge/merge-review.js";
|
|
30
31
|
import "./merge/index.js";
|
|
31
|
-
export { a as Button, h as CATEGORY_ELEMENTS, x as CodeBlock, s as Combobox, w as DecisionToggle, c as Dialog, m as DialogHost, o as Dropdown, g as ELEMENT_TO_COLOR, _ as ELEMENT_TO_ICON, T as ElementDetail, l as FeedbackDialog,
|
|
32
|
+
export { a as Button, h as CATEGORY_ELEMENTS, x as CodeBlock, s as Combobox, w as DecisionToggle, c as Dialog, m as DialogHost, o as Dropdown, g as ELEMENT_TO_COLOR, _ as ELEMENT_TO_ICON, T as ElementDetail, l as FeedbackDialog, k as MergeReview, E as MergeTree, y as SclExplorer, D as TypeNameAuthority, C as XmlDiff, v as collectExpandableNodeIds, u as createDialogHost, e as createDocumentStore, d as dialogHostKey, S as diffLines, b as highlightCode, f as provideDialogHost, i as useActiveDocument, t as useDialecteChannel, p as useDialog, n as useLiveData, O as useMergeSession, r as useProjectLiveData };
|
package/dist/merge/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import e from "./decision-toggle.js";
|
|
2
2
|
import t from "./element-detail.js";
|
|
3
3
|
import n from "./merge-tree.js";
|
|
4
|
-
import
|
|
5
|
-
import i from "./merge-
|
|
6
|
-
|
|
4
|
+
import r from "./type-name-authority.js";
|
|
5
|
+
import { useMergeSession as i } from "./use-merge-session.js";
|
|
6
|
+
import a from "./merge-review.js";
|
|
7
|
+
export { e as DecisionToggle, t as ElementDetail, a as MergeReview, n as MergeTree, r as TypeNameAuthority, i as useMergeSession };
|
|
@@ -8,43 +8,46 @@ import { StepperIndicator_default as o } from "../external/.pnpm/reka-ui@2.10.1_
|
|
|
8
8
|
import { StepperTitle_default as ee } from "../external/.pnpm/reka-ui@2.10.1_vue@3.5.39_typescript@5.8.3_/node_modules/reka-ui/dist/Stepper/StepperTitle.js";
|
|
9
9
|
import te from "../external/.pnpm/@lucide_vue@1.23.0_vue@3.5.39_typescript@5.8.3_/node_modules/@lucide/vue/dist/esm/icons/arrow-right.js";
|
|
10
10
|
import ne from "../external/.pnpm/@lucide_vue@1.23.0_vue@3.5.39_typescript@5.8.3_/node_modules/@lucide/vue/dist/esm/icons/check.js";
|
|
11
|
-
import re from "../external/.pnpm/@lucide_vue@1.23.0_vue@3.5.39_typescript@5.8.3_/node_modules/@lucide/vue/dist/esm/icons/
|
|
12
|
-
import ie from "../
|
|
11
|
+
import re from "../external/.pnpm/@lucide_vue@1.23.0_vue@3.5.39_typescript@5.8.3_/node_modules/@lucide/vue/dist/esm/icons/eye-off.js";
|
|
12
|
+
import ie from "../external/.pnpm/@lucide_vue@1.23.0_vue@3.5.39_typescript@5.8.3_/node_modules/@lucide/vue/dist/esm/icons/eye.js";
|
|
13
|
+
import ae from "../external/.pnpm/@lucide_vue@1.23.0_vue@3.5.39_typescript@5.8.3_/node_modules/@lucide/vue/dist/esm/icons/list-tree.js";
|
|
14
|
+
import oe from "../code/xml-diff.js";
|
|
13
15
|
import "../code/index.js";
|
|
14
|
-
import
|
|
15
|
-
import { buildDetail as
|
|
16
|
-
import
|
|
17
|
-
import
|
|
18
|
-
import
|
|
19
|
-
import
|
|
20
|
-
import {
|
|
21
|
-
import {
|
|
16
|
+
import se from "./element-detail.js";
|
|
17
|
+
import { buildDetail as ce, buildSummary as s } from "./build-view-model.js";
|
|
18
|
+
import le from "./merge-progress.js";
|
|
19
|
+
import ue from "./merge-summary.js";
|
|
20
|
+
import de from "./merge-tree.js";
|
|
21
|
+
import fe from "./type-name-authority.js";
|
|
22
|
+
import { useDocumentProgress as pe } from "./use-document-progress.js";
|
|
23
|
+
import { useMergeSession as me } from "./use-merge-session.js";
|
|
24
|
+
import { Fragment as c, computed as l, createBlock as u, createCommentVNode as d, createElementBlock as f, createElementVNode as p, createTextVNode as m, createVNode as h, defineComponent as g, normalizeClass as _, onMounted as he, openBlock as v, ref as y, renderList as ge, resolveDynamicComponent as _e, toDisplayString as b, unref as x, vShow as ve, watch as ye, withCtx as S, withDirectives as C } from "vue";
|
|
22
25
|
//#region lib/merge/merge-review.vue?vue&type=script&setup=true&lang.ts
|
|
23
|
-
var
|
|
26
|
+
var w = { class: "flex h-full flex-col" }, T = { class: "flex flex-wrap items-center justify-between gap-x-8 gap-y-3 border-b border-base-300 px-4 py-2.5" }, E = {
|
|
24
27
|
key: 0,
|
|
25
28
|
class: "flex flex-col items-start gap-x-4 gap-y-1 text-xs md:flex-row md:items-center"
|
|
26
|
-
},
|
|
29
|
+
}, D = {
|
|
27
30
|
key: 0,
|
|
28
31
|
class: "flex items-baseline gap-1.5"
|
|
29
|
-
},
|
|
32
|
+
}, O = { class: "font-semibold" }, k = { class: "text-base-content/60" }, A = {
|
|
30
33
|
key: 0,
|
|
31
34
|
class: "uppercase"
|
|
32
|
-
},
|
|
35
|
+
}, j = { key: 1 }, M = {
|
|
33
36
|
key: 1,
|
|
34
37
|
class: "flex items-baseline gap-1.5"
|
|
35
|
-
},
|
|
38
|
+
}, N = { class: "font-semibold" }, P = { class: "text-base-content/60" }, be = {
|
|
36
39
|
key: 0,
|
|
37
40
|
class: "uppercase"
|
|
38
|
-
},
|
|
41
|
+
}, xe = { key: 1 }, Se = {
|
|
39
42
|
key: 0,
|
|
40
43
|
class: "border-b border-error/40 bg-error/10 p-2 text-xs whitespace-pre-wrap text-error"
|
|
41
|
-
},
|
|
44
|
+
}, Ce = { class: "min-h-0 flex-1" }, we = { class: "h-full" }, Te = { class: "flex shrink-0 items-center gap-3 border-b border-base-300 px-3 py-1.5 text-xs" }, Ee = { class: "flex items-center gap-1" }, De = ["title"], Oe = { class: "min-h-0 flex-1 overflow-y-auto" }, ke = {
|
|
42
45
|
key: 2,
|
|
43
46
|
class: "grid h-full place-items-center p-6 text-center"
|
|
44
|
-
},
|
|
47
|
+
}, Ae = { class: "flex flex-col items-center gap-1" }, je = {
|
|
45
48
|
key: 0,
|
|
46
49
|
class: "text-xs opacity-70"
|
|
47
|
-
},
|
|
50
|
+
}, Me = { class: "flex items-center justify-end gap-2 border-t border-base-300 p-2" }, F = /*@__PURE__*/ g({
|
|
48
51
|
__name: "merge-review",
|
|
49
52
|
props: {
|
|
50
53
|
targetDocument: {},
|
|
@@ -58,22 +61,25 @@ var _e = { class: "flex h-full flex-col" }, ve = { class: "flex flex-wrap items-
|
|
|
58
61
|
target: {}
|
|
59
62
|
},
|
|
60
63
|
emits: ["applied", "close"],
|
|
61
|
-
setup(g, { emit:
|
|
62
|
-
let
|
|
64
|
+
setup(g, { emit: F }) {
|
|
65
|
+
let I = g, L = F, R = me(I), { structuralTree: z, previewXml: B, previewBeforeXml: Ne, previewLoading: Pe } = R, V = l({
|
|
66
|
+
get: () => R.keepNameTypesFrom.value,
|
|
67
|
+
set: (e) => R.setKeepNameTypesFrom(e)
|
|
68
|
+
}), { progress: Fe, history: Ie, track: H } = pe(() => I.targetDocument.state), U = y("review"), W = y(!1), G = y(), K = y(), q = y(), J = y(), Y = y(), X = y(!0), Z = y(), Le = [
|
|
63
69
|
"Review",
|
|
64
70
|
"Confirm",
|
|
65
71
|
"Done"
|
|
66
|
-
],
|
|
72
|
+
], Q = l(() => ({
|
|
67
73
|
review: 0,
|
|
68
74
|
confirm: 1,
|
|
69
75
|
done: 2
|
|
70
|
-
})[
|
|
76
|
+
})[U.value]), Re = l(() => {
|
|
71
77
|
let e = {};
|
|
72
|
-
for (let t of
|
|
78
|
+
for (let t of R.report.value?.groups ?? []) e[t.id] = R.decisionOf(t.id);
|
|
73
79
|
return e;
|
|
74
|
-
}),
|
|
75
|
-
let e =
|
|
76
|
-
if (
|
|
80
|
+
}), ze = l(() => {
|
|
81
|
+
let e = z.value;
|
|
82
|
+
if (X.value) return e.items;
|
|
77
83
|
let t = new Set(e.expanded);
|
|
78
84
|
function n(e) {
|
|
79
85
|
let r = [];
|
|
@@ -88,129 +94,129 @@ var _e = { class: "flex h-full flex-col" }, ve = { class: "flex flex-wrap items-
|
|
|
88
94
|
return r;
|
|
89
95
|
}
|
|
90
96
|
return n(e.items);
|
|
91
|
-
}),
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
}),
|
|
95
|
-
|
|
97
|
+
}), Be = l(() => Z.value ?? z.value.expanded);
|
|
98
|
+
ye(z, () => {
|
|
99
|
+
Z.value = void 0;
|
|
100
|
+
}), he(async () => {
|
|
101
|
+
G.value = "Analyzing template…", W.value = !0;
|
|
96
102
|
try {
|
|
97
|
-
await
|
|
103
|
+
await H(R.load());
|
|
98
104
|
} catch (e) {
|
|
99
|
-
|
|
105
|
+
K.value = e instanceof Error ? e.stack ?? e.message : String(e);
|
|
100
106
|
} finally {
|
|
101
|
-
|
|
107
|
+
W.value = !1;
|
|
102
108
|
}
|
|
103
109
|
});
|
|
104
110
|
function $() {
|
|
105
111
|
return {
|
|
106
|
-
sourceQuery:
|
|
107
|
-
targetQuery:
|
|
112
|
+
sourceQuery: I.sourceQuery,
|
|
113
|
+
targetQuery: I.targetDocument.query
|
|
108
114
|
};
|
|
109
115
|
}
|
|
110
|
-
function
|
|
111
|
-
let e =
|
|
116
|
+
function Ve() {
|
|
117
|
+
let e = z.value, t = new Set(e.expanded);
|
|
112
118
|
function n(r, i) {
|
|
113
119
|
for (let a of r) {
|
|
114
120
|
let r = (e.meta[a.id]?.change ?? "unchanged") !== "unchanged", o = i || r;
|
|
115
121
|
o && a.children?.length && t.add(a.id), a.children && n(a.children, o);
|
|
116
122
|
}
|
|
117
123
|
}
|
|
118
|
-
n(e.items, !1),
|
|
124
|
+
n(e.items, !1), Z.value = [...t];
|
|
119
125
|
}
|
|
120
|
-
async function
|
|
121
|
-
let t =
|
|
126
|
+
async function He(e) {
|
|
127
|
+
let t = z.value.index[e.id];
|
|
122
128
|
if (!t) return;
|
|
123
|
-
|
|
124
|
-
let n =
|
|
129
|
+
R.select(t), J.value = t.role === "primary" ? t.groupId : void 0;
|
|
130
|
+
let n = J.value ? R.report.value?.groups.find((e) => e.id === J.value) : void 0, r = t.node ? await ce(t.node, n, $()) : void 0;
|
|
125
131
|
if (r) {
|
|
126
|
-
let e = await
|
|
132
|
+
let e = await R.stagedAttributes(t.previewRef);
|
|
127
133
|
for (let t of r.attributes) t.editable && e[t.name] != null && (t.after = e[t.name]);
|
|
128
134
|
}
|
|
129
|
-
|
|
135
|
+
q.value = r;
|
|
130
136
|
}
|
|
131
|
-
function
|
|
132
|
-
|
|
137
|
+
function Ue(e, t) {
|
|
138
|
+
R.setDecision(e, t);
|
|
133
139
|
}
|
|
134
|
-
function
|
|
135
|
-
if (!
|
|
136
|
-
|
|
137
|
-
let n =
|
|
140
|
+
function We(e, t) {
|
|
141
|
+
if (!J.value || !q.value) return;
|
|
142
|
+
R.setValue(J.value, e, t);
|
|
143
|
+
let n = q.value.attributes.find((t) => t.name === e);
|
|
138
144
|
n && (n.after = t);
|
|
139
145
|
}
|
|
140
|
-
async function
|
|
141
|
-
let e =
|
|
142
|
-
e && (
|
|
146
|
+
async function Ge() {
|
|
147
|
+
let e = R.report.value;
|
|
148
|
+
e && (Y.value = await s(e, R.decisionOf, R.editedValue, $()), U.value = "confirm");
|
|
143
149
|
}
|
|
144
|
-
async function
|
|
145
|
-
|
|
150
|
+
async function Ke() {
|
|
151
|
+
G.value = "Applying changes…", W.value = !0;
|
|
146
152
|
try {
|
|
147
|
-
await
|
|
153
|
+
await H(R.commit()), U.value = "done";
|
|
148
154
|
} catch (e) {
|
|
149
|
-
|
|
155
|
+
K.value = e instanceof Error ? e.stack ?? e.message : String(e);
|
|
150
156
|
} finally {
|
|
151
|
-
|
|
157
|
+
W.value = !1;
|
|
152
158
|
}
|
|
153
159
|
}
|
|
154
|
-
return (
|
|
155
|
-
p("header",
|
|
156
|
-
"model-value":
|
|
160
|
+
return (ce, s) => (v(), f("div", w, [
|
|
161
|
+
p("header", T, [h(x(i), {
|
|
162
|
+
"model-value": Q.value + 1,
|
|
157
163
|
class: "flex items-center",
|
|
158
164
|
"aria-label": "Merge steps"
|
|
159
165
|
}, {
|
|
160
|
-
default: S(() => [(v(), f(c, null,
|
|
166
|
+
default: S(() => [(v(), f(c, null, ge(Le, (e, t) => (v(), f(c, { key: e }, [t > 0 ? (v(), f("div", {
|
|
161
167
|
key: 0,
|
|
162
|
-
class: _(["mx-3 h-px w-8 transition-colors", t <=
|
|
168
|
+
class: _(["mx-3 h-px w-8 transition-colors", t <= Q.value ? "bg-primary" : "bg-base-300"])
|
|
163
169
|
}, null, 2)) : d("", !0), h(x(a), {
|
|
164
170
|
step: t + 1,
|
|
165
171
|
class: "flex items-center gap-2"
|
|
166
172
|
}, {
|
|
167
|
-
default: S(() => [h(x(o), { class: _(["grid size-6 place-items-center rounded-full border text-xs font-semibold transition-colors", t <
|
|
168
|
-
default: S(() => [t <
|
|
173
|
+
default: S(() => [h(x(o), { class: _(["grid size-6 place-items-center rounded-full border text-xs font-semibold transition-colors", t < Q.value ? "border-primary bg-primary text-primary-content" : t === Q.value ? "border-primary text-primary" : "border-base-300 text-base-content/40"]) }, {
|
|
174
|
+
default: S(() => [t < Q.value ? (v(), u(x(ne), {
|
|
169
175
|
key: 0,
|
|
170
176
|
class: "size-3.5"
|
|
171
177
|
})) : (v(), f(c, { key: 1 }, [m(b(t + 1), 1)], 64))]),
|
|
172
178
|
_: 2
|
|
173
|
-
}, 1032, ["class"]), h(x(ee), { class: _(["text-xs font-medium transition-colors", t ===
|
|
179
|
+
}, 1032, ["class"]), h(x(ee), { class: _(["text-xs font-medium transition-colors", t === Q.value ? "text-base-content" : t < Q.value ? "text-base-content/70" : "text-base-content/40"]) }, {
|
|
174
180
|
default: S(() => [m(b(e), 1)]),
|
|
175
181
|
_: 2
|
|
176
182
|
}, 1032, ["class"])]),
|
|
177
183
|
_: 2
|
|
178
184
|
}, 1032, ["step"])], 64))), 64))]),
|
|
179
185
|
_: 1
|
|
180
|
-
}, 8, ["model-value"]), g.source || g.target ? (v(), f("div",
|
|
181
|
-
g.source ? (v(), f("span",
|
|
182
|
-
s[
|
|
183
|
-
p("span",
|
|
184
|
-
p("span",
|
|
185
|
-
g.source.type ? (v(), f("span",
|
|
186
|
-
g.source.type ? (v(), f("span",
|
|
186
|
+
}, 8, ["model-value"]), g.source || g.target ? (v(), f("div", E, [
|
|
187
|
+
g.source ? (v(), f("span", D, [
|
|
188
|
+
s[5] ||= p("span", { class: "text-[10px] font-medium uppercase tracking-wide text-base-content/45" }, " Source ", -1),
|
|
189
|
+
p("span", O, b(g.source.label), 1),
|
|
190
|
+
p("span", k, [
|
|
191
|
+
g.source.type ? (v(), f("span", A, b(g.source.type), 1)) : d("", !0),
|
|
192
|
+
g.source.type ? (v(), f("span", j, " · ")) : d("", !0),
|
|
187
193
|
m("v" + b(g.source.version || "0") + "." + b(g.source.revision || "0"), 1)
|
|
188
194
|
])
|
|
189
195
|
])) : d("", !0),
|
|
190
196
|
h(x(te), { class: "hidden size-4 shrink-0 text-base-content/40 md:block" }),
|
|
191
|
-
g.target ? (v(), f("span",
|
|
192
|
-
s[
|
|
193
|
-
p("span",
|
|
194
|
-
p("span",
|
|
195
|
-
g.target.type ? (v(), f("span",
|
|
196
|
-
g.target.type ? (v(), f("span",
|
|
197
|
+
g.target ? (v(), f("span", M, [
|
|
198
|
+
s[6] ||= p("span", { class: "text-[10px] font-medium uppercase tracking-wide text-base-content/45" }, " Target ", -1),
|
|
199
|
+
p("span", N, b(g.target.label), 1),
|
|
200
|
+
p("span", P, [
|
|
201
|
+
g.target.type ? (v(), f("span", be, b(g.target.type), 1)) : d("", !0),
|
|
202
|
+
g.target.type ? (v(), f("span", xe, " · ")) : d("", !0),
|
|
197
203
|
m("v" + b(g.target.version || "0") + "." + b(g.target.revision || "0"), 1)
|
|
198
204
|
])
|
|
199
205
|
])) : d("", !0)
|
|
200
206
|
])) : d("", !0)]),
|
|
201
|
-
|
|
202
|
-
p("div",
|
|
203
|
-
|
|
207
|
+
K.value ? (v(), f("div", Se, b(K.value), 1)) : d("", !0),
|
|
208
|
+
p("div", Ce, [
|
|
209
|
+
W.value ? (v(), u(le, {
|
|
204
210
|
key: 0,
|
|
205
|
-
label:
|
|
206
|
-
progress: x(
|
|
207
|
-
history: x(
|
|
211
|
+
label: G.value,
|
|
212
|
+
progress: x(Fe),
|
|
213
|
+
history: x(Ie)
|
|
208
214
|
}, null, 8, [
|
|
209
215
|
"label",
|
|
210
216
|
"progress",
|
|
211
217
|
"history"
|
|
212
218
|
])) : d("", !0),
|
|
213
|
-
C(p("div",
|
|
219
|
+
C(p("div", we, [h(x(t), {
|
|
214
220
|
direction: "horizontal",
|
|
215
221
|
class: "h-full min-h-0"
|
|
216
222
|
}, {
|
|
@@ -219,22 +225,30 @@ var _e = { class: "flex h-full flex-col" }, ve = { class: "flex flex-wrap items-
|
|
|
219
225
|
"default-size": 42,
|
|
220
226
|
class: "flex h-full min-h-0 flex-col"
|
|
221
227
|
}, {
|
|
222
|
-
default: S(() => [p("div",
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
"
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
228
|
+
default: S(() => [p("div", Te, [
|
|
229
|
+
h(fe, {
|
|
230
|
+
modelValue: V.value,
|
|
231
|
+
"onUpdate:modelValue": s[0] ||= (e) => V.value = e
|
|
232
|
+
}, null, 8, ["modelValue"]),
|
|
233
|
+
s[7] ||= p("div", { class: "ml-auto h-4 w-px shrink-0 bg-base-300" }, null, -1),
|
|
234
|
+
p("div", Ee, [p("button", {
|
|
235
|
+
type: "button",
|
|
236
|
+
class: _(["btn btn-ghost btn-xs btn-square", { "text-primary": X.value }]),
|
|
237
|
+
title: X.value ? "Hide unchanged elements" : "Show unchanged elements",
|
|
238
|
+
onClick: s[1] ||= (e) => X.value = !X.value
|
|
239
|
+
}, [(v(), u(_e(X.value ? x(ie) : x(re)), { class: "h-4 w-4" }))], 10, De), p("button", {
|
|
240
|
+
type: "button",
|
|
241
|
+
class: "btn btn-ghost btn-xs btn-square",
|
|
242
|
+
title: "Expand all differences",
|
|
243
|
+
onClick: Ve
|
|
244
|
+
}, [h(x(ae), { class: "h-4 w-4" })])])
|
|
245
|
+
]), p("div", Oe, [h(de, {
|
|
246
|
+
items: ze.value,
|
|
247
|
+
meta: x(z).meta,
|
|
248
|
+
decisions: Re.value,
|
|
249
|
+
"expanded-items": Be.value,
|
|
250
|
+
onSelect: He,
|
|
251
|
+
"onUpdate:decision": Ue
|
|
238
252
|
}, null, 8, [
|
|
239
253
|
"items",
|
|
240
254
|
"meta",
|
|
@@ -254,18 +268,18 @@ var _e = { class: "flex h-full flex-col" }, ve = { class: "flex flex-wrap items-
|
|
|
254
268
|
"default-size": 55,
|
|
255
269
|
class: "min-h-0 overflow-auto"
|
|
256
270
|
}, {
|
|
257
|
-
default: S(() => [h(
|
|
258
|
-
detail:
|
|
259
|
-
onEdit:
|
|
271
|
+
default: S(() => [h(se, {
|
|
272
|
+
detail: q.value,
|
|
273
|
+
onEdit: We
|
|
260
274
|
}, null, 8, ["detail"])]),
|
|
261
275
|
_: 1
|
|
262
276
|
}),
|
|
263
277
|
h(x(r), { class: "h-px bg-base-300" }),
|
|
264
278
|
h(x(n), { class: "min-h-0" }, {
|
|
265
|
-
default: S(() => [h(x(
|
|
266
|
-
before: x(
|
|
267
|
-
after: x(
|
|
268
|
-
loading: x(
|
|
279
|
+
default: S(() => [h(x(oe), {
|
|
280
|
+
before: x(Ne),
|
|
281
|
+
after: x(B),
|
|
282
|
+
loading: x(Pe)
|
|
269
283
|
}, null, 8, [
|
|
270
284
|
"before",
|
|
271
285
|
"after",
|
|
@@ -280,10 +294,10 @@ var _e = { class: "flex h-full flex-col" }, ve = { class: "flex flex-wrap items-
|
|
|
280
294
|
})
|
|
281
295
|
]),
|
|
282
296
|
_: 1
|
|
283
|
-
})], 512), [[
|
|
284
|
-
!
|
|
297
|
+
})], 512), [[ve, !W.value && U.value === "review"]]),
|
|
298
|
+
!W.value && U.value === "confirm" && Y.value ? (v(), u(ue, {
|
|
285
299
|
key: 1,
|
|
286
|
-
summary:
|
|
300
|
+
summary: Y.value,
|
|
287
301
|
scenario: g.scenario,
|
|
288
302
|
verb: g.verb
|
|
289
303
|
}, null, 8, [
|
|
@@ -291,40 +305,40 @@ var _e = { class: "flex h-full flex-col" }, ve = { class: "flex flex-wrap items-
|
|
|
291
305
|
"scenario",
|
|
292
306
|
"verb"
|
|
293
307
|
])) : d("", !0),
|
|
294
|
-
!
|
|
308
|
+
!W.value && U.value === "done" ? (v(), f("div", ke, [p("div", Ae, [
|
|
295
309
|
s[8] ||= p("span", { class: "text-3xl text-success" }, "✓", -1),
|
|
296
310
|
s[9] ||= p("p", { class: "font-medium" }, "Applied", -1),
|
|
297
|
-
|
|
311
|
+
Y.value ? (v(), f("p", je, b(Y.value.added.length) + " added · " + b(Y.value.updated.length) + " updated · " + b(Y.value.skipped.length) + " skipped ", 1)) : d("", !0)
|
|
298
312
|
])])) : d("", !0)
|
|
299
313
|
]),
|
|
300
|
-
p("footer",
|
|
314
|
+
p("footer", Me, [U.value === "review" ? (v(), f(c, { key: 0 }, [h(e, {
|
|
301
315
|
variant: "ghost",
|
|
302
316
|
size: "sm",
|
|
303
|
-
onClick: s[
|
|
317
|
+
onClick: s[2] ||= (e) => L("close")
|
|
304
318
|
}, {
|
|
305
319
|
default: S(() => [...s[10] ||= [m("Close", -1)]]),
|
|
306
320
|
_: 1
|
|
307
321
|
}), h(e, {
|
|
308
322
|
color: "primary",
|
|
309
323
|
size: "sm",
|
|
310
|
-
disabled:
|
|
311
|
-
onClick:
|
|
324
|
+
disabled: W.value || !!K.value,
|
|
325
|
+
onClick: Ge
|
|
312
326
|
}, {
|
|
313
327
|
default: S(() => [...s[11] ||= [m(" Next: Confirm ", -1)]]),
|
|
314
328
|
_: 1
|
|
315
|
-
}, 8, ["disabled"])], 64)) :
|
|
329
|
+
}, 8, ["disabled"])], 64)) : U.value === "confirm" ? (v(), f(c, { key: 1 }, [h(e, {
|
|
316
330
|
variant: "ghost",
|
|
317
331
|
size: "sm",
|
|
318
|
-
disabled:
|
|
319
|
-
onClick: s[
|
|
332
|
+
disabled: W.value,
|
|
333
|
+
onClick: s[3] ||= (e) => U.value = "review"
|
|
320
334
|
}, {
|
|
321
335
|
default: S(() => [...s[12] ||= [m("Back", -1)]]),
|
|
322
336
|
_: 1
|
|
323
337
|
}, 8, ["disabled"]), h(e, {
|
|
324
338
|
color: "primary",
|
|
325
339
|
size: "sm",
|
|
326
|
-
disabled:
|
|
327
|
-
onClick:
|
|
340
|
+
disabled: W.value,
|
|
341
|
+
onClick: Ke
|
|
328
342
|
}, {
|
|
329
343
|
default: S(() => [...s[13] ||= [m("Apply", -1)]]),
|
|
330
344
|
_: 1
|
|
@@ -332,7 +346,7 @@ var _e = { class: "flex h-full flex-col" }, ve = { class: "flex flex-wrap items-
|
|
|
332
346
|
key: 2,
|
|
333
347
|
color: "primary",
|
|
334
348
|
size: "sm",
|
|
335
|
-
onClick: s[
|
|
349
|
+
onClick: s[4] ||= (e) => L("applied")
|
|
336
350
|
}, {
|
|
337
351
|
default: S(() => [...s[14] ||= [m("Close", -1)]]),
|
|
338
352
|
_: 1
|
|
@@ -341,4 +355,4 @@ var _e = { class: "flex h-full flex-col" }, ve = { class: "flex flex-wrap items-
|
|
|
341
355
|
}
|
|
342
356
|
});
|
|
343
357
|
//#endregion
|
|
344
|
-
export {
|
|
358
|
+
export { F as default };
|