@septkit/ui 0.0.45 → 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/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 +26 -0
- package/dist/index.d.ts +21 -0
- package/dist/index.js +4 -3
- package/dist/merge/build-view-model.js +14 -0
- package/dist/merge/element-detail.vue_vue_type_script_setup_true_lang.js +15 -16
- package/dist/merge/index.js +4 -3
- package/dist/merge/merge-review.vue_vue_type_script_setup_true_lang.js +202 -149
- 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 };
|
|
@@ -0,0 +1,26 @@
|
|
|
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/list-tree.mjs
|
|
3
|
+
var t = [
|
|
4
|
+
["path", {
|
|
5
|
+
d: "M8 5h13",
|
|
6
|
+
key: "1pao27"
|
|
7
|
+
}],
|
|
8
|
+
["path", {
|
|
9
|
+
d: "M13 12h8",
|
|
10
|
+
key: "h98zly"
|
|
11
|
+
}],
|
|
12
|
+
["path", {
|
|
13
|
+
d: "M13 19h8",
|
|
14
|
+
key: "c3s6r1"
|
|
15
|
+
}],
|
|
16
|
+
["path", {
|
|
17
|
+
d: "M3 10a2 2 0 0 0 2 2h3",
|
|
18
|
+
key: "1npucw"
|
|
19
|
+
}],
|
|
20
|
+
["path", {
|
|
21
|
+
d: "M3 5v12a2 2 0 0 0 2 2h3",
|
|
22
|
+
key: "x1gjn2"
|
|
23
|
+
}]
|
|
24
|
+
], n = e("list-tree", t);
|
|
25
|
+
//#endregion
|
|
26
|
+
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 };
|
|
@@ -92,6 +92,13 @@ async function i(e, n, r) {
|
|
|
92
92
|
conflict: n?.conflict
|
|
93
93
|
});
|
|
94
94
|
}
|
|
95
|
+
for (let [e, t] of i) a.some((t) => t.name === e) || a.push({
|
|
96
|
+
name: e,
|
|
97
|
+
status: "added",
|
|
98
|
+
after: t.conflict ? t.suggestedValue ?? "" : "",
|
|
99
|
+
editable: t.mode,
|
|
100
|
+
conflict: t.conflict
|
|
101
|
+
});
|
|
95
102
|
} else if (e.change === "removed" && e.instanceRef) {
|
|
96
103
|
let n = await t(r.targetQuery, e.instanceRef);
|
|
97
104
|
for (let [e, t] of Object.entries(n)) t != null && a.push({
|
|
@@ -114,6 +121,13 @@ async function i(e, n, r) {
|
|
|
114
121
|
after: t.after,
|
|
115
122
|
editable: i.get(t.name)?.mode
|
|
116
123
|
});
|
|
124
|
+
for (let [e, t] of i) c.has(e) || c.set(e, {
|
|
125
|
+
name: e,
|
|
126
|
+
status: "unchanged",
|
|
127
|
+
after: t.conflict ? t.suggestedValue ?? "" : "",
|
|
128
|
+
editable: t.mode,
|
|
129
|
+
conflict: t.conflict
|
|
130
|
+
});
|
|
117
131
|
a.push(...c.values());
|
|
118
132
|
}
|
|
119
133
|
return {
|
|
@@ -10,31 +10,31 @@ var u = {
|
|
|
10
10
|
key: 0,
|
|
11
11
|
class: "badge badge-warning badge-xs shrink-0",
|
|
12
12
|
title: "Auto-resolved to avoid a naming collision — edit to override"
|
|
13
|
-
}, v = {
|
|
13
|
+
}, v = {
|
|
14
14
|
key: 1,
|
|
15
15
|
class: "text-xs opacity-60"
|
|
16
|
-
},
|
|
16
|
+
}, y = {
|
|
17
17
|
key: 1,
|
|
18
18
|
class: "grid h-full place-items-center p-4 text-sm opacity-60"
|
|
19
|
-
},
|
|
19
|
+
}, b = /*@__PURE__*/ a({
|
|
20
20
|
__name: "element-detail",
|
|
21
21
|
props: { detail: {} },
|
|
22
22
|
emits: ["edit"],
|
|
23
|
-
setup(a, { emit:
|
|
24
|
-
let
|
|
23
|
+
setup(a, { emit: b }) {
|
|
24
|
+
let x = a, S = b, C = t(() => ({
|
|
25
25
|
added: "badge-success",
|
|
26
26
|
removed: "badge-error",
|
|
27
27
|
modified: "badge-warning",
|
|
28
28
|
unchanged: "badge-ghost"
|
|
29
|
-
})[
|
|
30
|
-
function
|
|
31
|
-
|
|
29
|
+
})[x.detail?.change ?? "unchanged"]), w = t(() => x.detail?.attributes.filter((e) => e.editable));
|
|
30
|
+
function T(e, t) {
|
|
31
|
+
S("edit", e.name, t.target.value);
|
|
32
32
|
}
|
|
33
|
-
return (t,
|
|
33
|
+
return (t, b) => a.detail ? (s(), r("div", u, [i("header", d, [
|
|
34
34
|
i("span", f, l(a.detail.title), 1),
|
|
35
35
|
i("span", p, l(a.detail.tag), 1),
|
|
36
|
-
i("span", { class: o(["badge badge-sm",
|
|
37
|
-
]),
|
|
36
|
+
i("span", { class: o(["badge badge-sm", C.value]) }, l(a.detail.change), 3)
|
|
37
|
+
]), w.value?.length ? (s(), r("div", m, [(s(!0), r(e, null, c(w.value, (e) => (s(), r("label", {
|
|
38
38
|
key: e.name,
|
|
39
39
|
class: "flex items-center gap-2"
|
|
40
40
|
}, [
|
|
@@ -42,12 +42,11 @@ var u = {
|
|
|
42
42
|
i("input", {
|
|
43
43
|
class: o(["input input-xs input-bordered w-full font-mono", { "input-warning": e.conflict }]),
|
|
44
44
|
value: e.after ?? "",
|
|
45
|
-
onInput: (t) =>
|
|
45
|
+
onInput: (t) => T(e, t)
|
|
46
46
|
}, null, 42, g),
|
|
47
|
-
e.conflict ? (s(), r("span", _, " conflict ")) : n("", !0)
|
|
48
|
-
|
|
49
|
-
]))), 128))])) : (s(), r("div", y, "No editable fields. See the diff below."))])) : (s(), r("div", b, " Select an element to see its changes. "));
|
|
47
|
+
e.conflict ? (s(), r("span", _, " conflict ")) : n("", !0)
|
|
48
|
+
]))), 128))])) : (s(), r("div", v, "No editable fields. See the diff below."))])) : (s(), r("div", y, " Select an element to see its changes. "));
|
|
50
49
|
}
|
|
51
50
|
});
|
|
52
51
|
//#endregion
|
|
53
|
-
export {
|
|
52
|
+
export { b as default };
|
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 };
|