@septkit/ui 0.0.49 → 0.0.50

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.
Files changed (20) hide show
  1. package/dist/dialecte/composables/use-active-document.js +18 -11
  2. package/dist/dialecte/create-document-store.js +3 -3
  3. package/dist/external/.pnpm/{@dialecte_core@0.4.7 → @dialecte_core@0.4.9}/node_modules/@dialecte/core/dist/helpers.js +16 -19
  4. package/dist/external/.pnpm/{@dialecte_core@0.4.7 → @dialecte_core@0.4.9}/node_modules/@dialecte/core/dist/index.js +1 -1
  5. package/dist/external/.pnpm/{@dialecte_core@0.4.7/node_modules/@dialecte/core/dist/project-DxIu-3AU.js → @dialecte_core@0.4.9/node_modules/@dialecte/core/dist/project-D-KS3OPN.js} +1 -1
  6. package/dist/external/.pnpm/{@dialecte_core@0.4.7 → @dialecte_core@0.4.9}/node_modules/@dialecte/core/dist/utils-C5_11hqg.js +1 -1
  7. package/dist/external/.pnpm/{@dialecte_scl@0.3.8/node_modules/@dialecte/scl/dist/hooks-DJJN-WU2.js → @dialecte_scl@0.3.9/node_modules/@dialecte/scl/dist/hooks-DO4gUiix.js} +48 -5277
  8. package/dist/external/.pnpm/@dialecte_scl@0.3.9/node_modules/@dialecte/scl/dist/v2019C1/index.js +3 -0
  9. package/dist/external/.pnpm/@lucide_vue@1.23.0_vue@3.5.39_typescript@5.8.3_/node_modules/@lucide/vue/dist/esm/icons/rotate-ccw.js +11 -0
  10. package/dist/index.d.ts +7 -1
  11. package/dist/merge/build-view-model.js +37 -21
  12. package/dist/merge/element-detail.vue_vue_type_script_setup_true_lang.js +80 -43
  13. package/dist/merge/merge-review.vue_vue_type_script_setup_true_lang.js +156 -151
  14. package/dist/merge/merge-summary.vue_vue_type_script_setup_true_lang.js +47 -25
  15. package/dist/merge/merge-tree.vue_vue_type_script_setup_true_lang.js +11 -9
  16. package/dist/merge/merge.service.js +2 -2
  17. package/dist/merge/use-merge-session.js +4 -1
  18. package/dist/ui.css +1 -1
  19. package/package.json +3 -3
  20. package/dist/external/.pnpm/@dialecte_scl@0.3.8/node_modules/@dialecte/scl/dist/v2019C1/index.js +0 -3
@@ -10,44 +10,48 @@ import te from "../external/.pnpm/@lucide_vue@1.23.0_vue@3.5.39_typescript@5.8.3
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
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
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
+ 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/link.js";
14
+ import oe 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";
15
+ import se from "../code/xml-diff.js";
15
16
  import "../code/index.js";
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";
17
+ import ce from "./element-detail.js";
18
+ import { buildDetail as le, buildSummary as s } from "./build-view-model.js";
19
+ import ue from "./merge-progress.js";
20
+ import de from "./merge-summary.js";
21
+ import fe from "./merge-tree.js";
22
+ import pe from "./type-name-authority.js";
23
+ import { useDocumentProgress as c } from "./use-document-progress.js";
23
24
  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";
25
+ import { Fragment as l, computed as u, createBlock as d, createCommentVNode as f, createElementBlock as p, createElementVNode as m, createTextVNode as h, createVNode as g, defineComponent as _, normalizeClass as v, onMounted as he, openBlock as y, ref as b, renderList as ge, resolveDynamicComponent as _e, toDisplayString as x, unref as S, vShow as ve, watch as ye, withCtx as C, withDirectives as w } from "vue";
25
26
  //#region lib/merge/merge-review.vue?vue&type=script&setup=true&lang.ts
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 = {
27
+ var T = { class: "flex h-full flex-col" }, E = { class: "flex flex-wrap items-center justify-between gap-x-8 gap-y-3 border-b border-base-300 px-4 py-2.5" }, D = {
27
28
  key: 0,
28
29
  class: "flex flex-col items-start gap-x-4 gap-y-1 text-xs md:flex-row md:items-center"
29
- }, D = {
30
+ }, O = {
30
31
  key: 0,
31
32
  class: "flex items-baseline gap-1.5"
32
- }, O = { class: "font-semibold" }, k = { class: "text-base-content/60" }, A = {
33
+ }, k = { class: "font-semibold" }, A = { class: "text-base-content/60" }, j = {
33
34
  key: 0,
34
35
  class: "uppercase"
35
- }, j = { key: 1 }, M = {
36
+ }, M = { key: 1 }, N = {
36
37
  key: 1,
37
38
  class: "flex items-baseline gap-1.5"
38
- }, N = { class: "font-semibold" }, P = { class: "text-base-content/60" }, be = {
39
+ }, P = { class: "font-semibold" }, be = { class: "text-base-content/60" }, xe = {
39
40
  key: 0,
40
41
  class: "uppercase"
41
- }, xe = { key: 1 }, Se = {
42
+ }, Se = { key: 1 }, Ce = {
42
43
  key: 0,
43
44
  class: "border-b border-error/40 bg-error/10 p-2 text-xs whitespace-pre-wrap text-error"
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 = {
45
+ }, we = {
46
+ key: 1,
47
+ class: "flex items-center gap-2 border-b border-info/40 bg-info/10 p-2 text-xs text-info"
48
+ }, Te = { class: "min-h-0 flex-1" }, Ee = { class: "h-full" }, De = { class: "flex shrink-0 items-center gap-3 border-b border-base-300 px-3 py-1.5 text-xs" }, Oe = { class: "flex items-center gap-1" }, ke = ["title"], Ae = { class: "min-h-0 flex-1 overflow-y-auto" }, je = {
45
49
  key: 2,
46
50
  class: "grid h-full place-items-center p-6 text-center"
47
- }, Ae = { class: "flex flex-col items-center gap-1" }, je = {
51
+ }, Me = { class: "flex flex-col items-center gap-1" }, Ne = {
48
52
  key: 0,
49
53
  class: "text-xs opacity-70"
50
- }, Me = { class: "flex items-center justify-end gap-2 border-t border-base-300 p-2" }, F = /*@__PURE__*/ g({
54
+ }, Pe = { class: "flex items-center justify-end gap-2 border-t border-base-300 p-2" }, F = /*@__PURE__*/ _({
51
55
  __name: "merge-review",
52
56
  props: {
53
57
  targetDocument: {},
@@ -62,25 +66,25 @@ var w = { class: "flex h-full flex-col" }, T = { class: "flex flex-wrap items-ce
62
66
  affixMask: { type: Function }
63
67
  },
64
68
  emits: ["applied", "close"],
65
- setup(g, { emit: F }) {
66
- let I = g, L = F, R = me(I), { structuralTree: z, previewXml: B, previewBeforeXml: Ne, previewLoading: Pe } = R, V = l({
69
+ setup(_, { emit: F }) {
70
+ let I = _, L = F, R = me(I), { structuralTree: z, previewXml: Fe, previewBeforeXml: Ie, previewLoading: Le } = R, B = u({
67
71
  get: () => R.keepNameTypesFrom.value,
68
72
  set: (e) => R.setKeepNameTypesFrom(e)
69
- }), { 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 = [
73
+ }), { progress: Re, history: ze, track: V } = c(() => I.targetDocument.state), H = b("review"), U = b(!1), W = b(), G = b(), K = b(), q = b(), J = b(), Y = b(!0), X = b(), Be = [
70
74
  "Review",
71
75
  "Confirm",
72
76
  "Done"
73
- ], Q = l(() => ({
77
+ ], Z = u(() => ({
74
78
  review: 0,
75
79
  confirm: 1,
76
80
  done: 2
77
- })[U.value]), Re = l(() => {
81
+ })[H.value]), Ve = u(() => !!R.report.value && R.report.value.groups.length === 0), He = u(() => {
78
82
  let e = {};
79
83
  for (let t of R.report.value?.groups ?? []) e[t.id] = R.decisionOf(t.id);
80
84
  return e;
81
- }), ze = l(() => {
85
+ }), Q = u(() => {
82
86
  let e = z.value;
83
- if (X.value) return e.items;
87
+ if (Y.value) return e.items;
84
88
  let t = new Set(e.expanded);
85
89
  function n(e) {
86
90
  let r = [];
@@ -95,17 +99,17 @@ var w = { class: "flex h-full flex-col" }, T = { class: "flex flex-wrap items-ce
95
99
  return r;
96
100
  }
97
101
  return n(e.items);
98
- }), Be = l(() => Z.value ?? z.value.expanded);
102
+ }), Ue = u(() => X.value ?? z.value.expanded);
99
103
  ye(z, () => {
100
- Z.value = void 0;
104
+ X.value = void 0;
101
105
  }), he(async () => {
102
- G.value = "Analyzing template…", W.value = !0;
106
+ W.value = "Analyzing template…", U.value = !0;
103
107
  try {
104
- await H(R.load());
108
+ await V(R.load());
105
109
  } catch (e) {
106
- K.value = e instanceof Error ? e.stack ?? e.message : String(e);
110
+ G.value = e instanceof Error ? e.stack ?? e.message : String(e);
107
111
  } finally {
108
- W.value = !1;
112
+ U.value = !1;
109
113
  }
110
114
  });
111
115
  function $() {
@@ -114,7 +118,7 @@ var w = { class: "flex h-full flex-col" }, T = { class: "flex flex-wrap items-ce
114
118
  targetQuery: I.targetDocument.query
115
119
  };
116
120
  }
117
- function Ve() {
121
+ function We() {
118
122
  let e = z.value, t = new Set(e.expanded);
119
123
  function n(r, i) {
120
124
  for (let a of r) {
@@ -122,134 +126,135 @@ var w = { class: "flex h-full flex-col" }, T = { class: "flex flex-wrap items-ce
122
126
  o && a.children?.length && t.add(a.id), a.children && n(a.children, o);
123
127
  }
124
128
  }
125
- n(e.items, !1), Z.value = [...t];
129
+ n(e.items, !1), X.value = [...t];
126
130
  }
127
- async function He(e) {
131
+ async function Ge(e) {
128
132
  let t = z.value.index[e.id];
129
133
  if (!t) return;
130
- R.select(t), J.value = t.role === "primary" ? t.groupId : void 0;
131
- 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;
134
+ R.select(t), q.value = t.role === "primary" ? t.groupId : void 0;
135
+ let n = q.value ? R.report.value?.groups.find((e) => e.id === q.value) : void 0, r = t.node ? await le(t.node, n, $()) : void 0;
132
136
  if (r) {
133
137
  let e = await R.stagedAttributes(t.previewRef);
134
138
  for (let t of r.attributes) t.editable && e[t.name] != null && (t.after = e[t.name]);
135
139
  }
136
- q.value = r;
140
+ K.value = r;
137
141
  }
138
- function Ue(e, t) {
142
+ function Ke(e, t) {
139
143
  R.setDecision(e, t);
140
144
  }
141
- function We(e, t) {
142
- if (!J.value || !q.value) return;
143
- R.setValue(J.value, e, t);
144
- let n = q.value.attributes.find((t) => t.name === e);
145
+ function qe(e, t) {
146
+ if (!q.value || !K.value) return;
147
+ R.setValue(q.value, e, t);
148
+ let n = K.value.attributes.find((t) => t.name === e);
145
149
  n && (n.after = t);
146
150
  }
147
- async function Ge() {
151
+ async function Je() {
148
152
  let e = R.report.value;
149
- e && (Y.value = await s(e, R.decisionOf, R.editedValue, $()), U.value = "confirm");
153
+ e && (J.value = await s(e, R.decisionOf, R.editedValue, $()), H.value = "confirm");
150
154
  }
151
- async function Ke() {
152
- G.value = "Applying changes…", W.value = !0;
155
+ async function Ye() {
156
+ W.value = "Applying changes…", U.value = !0;
153
157
  try {
154
- await H(R.commit()), U.value = "done";
158
+ await V(R.commit()), H.value = "done";
155
159
  } catch (e) {
156
- K.value = e instanceof Error ? e.stack ?? e.message : String(e);
160
+ G.value = e instanceof Error ? e.stack ?? e.message : String(e);
157
161
  } finally {
158
- W.value = !1;
162
+ U.value = !1;
159
163
  }
160
164
  }
161
- return (ce, s) => (v(), f("div", w, [
162
- p("header", T, [h(x(i), {
163
- "model-value": Q.value + 1,
165
+ return (le, s) => (y(), p("div", T, [
166
+ m("header", E, [g(S(i), {
167
+ "model-value": Z.value + 1,
164
168
  class: "flex items-center",
165
169
  "aria-label": "Merge steps"
166
170
  }, {
167
- default: S(() => [(v(), f(c, null, ge(Le, (e, t) => (v(), f(c, { key: e }, [t > 0 ? (v(), f("div", {
171
+ default: C(() => [(y(), p(l, null, ge(Be, (e, t) => (y(), p(l, { key: e }, [t > 0 ? (y(), p("div", {
168
172
  key: 0,
169
- class: _(["mx-3 h-px w-8 transition-colors", t <= Q.value ? "bg-primary" : "bg-base-300"])
170
- }, null, 2)) : d("", !0), h(x(a), {
173
+ class: v(["mx-3 h-px w-8 transition-colors", t <= Z.value ? "bg-primary" : "bg-base-300"])
174
+ }, null, 2)) : f("", !0), g(S(a), {
171
175
  step: t + 1,
172
176
  class: "flex items-center gap-2"
173
177
  }, {
174
- 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"]) }, {
175
- default: S(() => [t < Q.value ? (v(), u(x(ne), {
178
+ default: C(() => [g(S(o), { class: v(["grid size-6 place-items-center rounded-full border text-xs font-semibold transition-colors", t < Z.value ? "border-primary bg-primary text-primary-content" : t === Z.value ? "border-primary text-primary" : "border-base-300 text-base-content/40"]) }, {
179
+ default: C(() => [t < Z.value ? (y(), d(S(ne), {
176
180
  key: 0,
177
181
  class: "size-3.5"
178
- })) : (v(), f(c, { key: 1 }, [m(b(t + 1), 1)], 64))]),
182
+ })) : (y(), p(l, { key: 1 }, [h(x(t + 1), 1)], 64))]),
179
183
  _: 2
180
- }, 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"]) }, {
181
- default: S(() => [m(b(e), 1)]),
184
+ }, 1032, ["class"]), g(S(ee), { class: v(["text-xs font-medium transition-colors", t === Z.value ? "text-base-content" : t < Z.value ? "text-base-content/70" : "text-base-content/40"]) }, {
185
+ default: C(() => [h(x(e), 1)]),
182
186
  _: 2
183
187
  }, 1032, ["class"])]),
184
188
  _: 2
185
189
  }, 1032, ["step"])], 64))), 64))]),
186
190
  _: 1
187
- }, 8, ["model-value"]), g.source || g.target ? (v(), f("div", E, [
188
- g.source ? (v(), f("span", D, [
189
- s[5] ||= p("span", { class: "text-[10px] font-medium uppercase tracking-wide text-base-content/45" }, " Source ", -1),
190
- p("span", O, b(g.source.label), 1),
191
- p("span", k, [
192
- g.source.type ? (v(), f("span", A, b(g.source.type), 1)) : d("", !0),
193
- g.source.type ? (v(), f("span", j, " · ")) : d("", !0),
194
- m("v" + b(g.source.version || "0") + "." + b(g.source.revision || "0"), 1)
191
+ }, 8, ["model-value"]), _.source || _.target ? (y(), p("div", D, [
192
+ _.source ? (y(), p("span", O, [
193
+ s[5] ||= m("span", { class: "text-[10px] font-medium uppercase tracking-wide text-base-content/45" }, " Source ", -1),
194
+ m("span", k, x(_.source.label), 1),
195
+ m("span", A, [
196
+ _.source.type ? (y(), p("span", j, x(_.source.type), 1)) : f("", !0),
197
+ _.source.type ? (y(), p("span", M, " · ")) : f("", !0),
198
+ h("v" + x(_.source.version || "0") + "." + x(_.source.revision || "0"), 1)
195
199
  ])
196
- ])) : d("", !0),
197
- h(x(te), { class: "hidden size-4 shrink-0 text-base-content/40 md:block" }),
198
- g.target ? (v(), f("span", M, [
199
- s[6] ||= p("span", { class: "text-[10px] font-medium uppercase tracking-wide text-base-content/45" }, " Target ", -1),
200
- p("span", N, b(g.target.label), 1),
201
- p("span", P, [
202
- g.target.type ? (v(), f("span", be, b(g.target.type), 1)) : d("", !0),
203
- g.target.type ? (v(), f("span", xe, " · ")) : d("", !0),
204
- m("v" + b(g.target.version || "0") + "." + b(g.target.revision || "0"), 1)
200
+ ])) : f("", !0),
201
+ g(S(te), { class: "hidden size-4 shrink-0 text-base-content/40 md:block" }),
202
+ _.target ? (y(), p("span", N, [
203
+ s[6] ||= m("span", { class: "text-[10px] font-medium uppercase tracking-wide text-base-content/45" }, " Target ", -1),
204
+ m("span", P, x(_.target.label), 1),
205
+ m("span", be, [
206
+ _.target.type ? (y(), p("span", xe, x(_.target.type), 1)) : f("", !0),
207
+ _.target.type ? (y(), p("span", Se, " · ")) : f("", !0),
208
+ h("v" + x(_.target.version || "0") + "." + x(_.target.revision || "0"), 1)
205
209
  ])
206
- ])) : d("", !0)
207
- ])) : d("", !0)]),
208
- K.value ? (v(), f("div", Se, b(K.value), 1)) : d("", !0),
209
- p("div", Ce, [
210
- W.value ? (v(), u(le, {
210
+ ])) : f("", !0)
211
+ ])) : f("", !0)]),
212
+ G.value ? (y(), p("div", Ce, x(G.value), 1)) : f("", !0),
213
+ !U.value && !G.value && H.value === "review" && Ve.value ? (y(), p("div", we, [g(S(ae), { class: "size-4 shrink-0" }), s[7] ||= h(" This instance is already up to date with the template — nothing to apply. ", -1)])) : f("", !0),
214
+ m("div", Te, [
215
+ U.value ? (y(), d(ue, {
211
216
  key: 0,
212
- label: G.value,
213
- progress: x(Fe),
214
- history: x(Ie)
217
+ label: W.value,
218
+ progress: S(Re),
219
+ history: S(ze)
215
220
  }, null, 8, [
216
221
  "label",
217
222
  "progress",
218
223
  "history"
219
- ])) : d("", !0),
220
- C(p("div", we, [h(x(t), {
224
+ ])) : f("", !0),
225
+ w(m("div", Ee, [g(S(t), {
221
226
  direction: "horizontal",
222
227
  class: "h-full min-h-0"
223
228
  }, {
224
- default: S(() => [
225
- h(x(n), {
229
+ default: C(() => [
230
+ g(S(n), {
226
231
  "default-size": 42,
227
232
  class: "flex h-full min-h-0 flex-col"
228
233
  }, {
229
- default: S(() => [p("div", Te, [
230
- h(fe, {
231
- modelValue: V.value,
232
- "onUpdate:modelValue": s[0] ||= (e) => V.value = e
234
+ default: C(() => [m("div", De, [
235
+ g(pe, {
236
+ modelValue: B.value,
237
+ "onUpdate:modelValue": s[0] ||= (e) => B.value = e
233
238
  }, null, 8, ["modelValue"]),
234
- s[7] ||= p("div", { class: "ml-auto h-4 w-px shrink-0 bg-base-300" }, null, -1),
235
- p("div", Ee, [p("button", {
239
+ s[8] ||= m("div", { class: "ml-auto h-4 w-px shrink-0 bg-base-300" }, null, -1),
240
+ m("div", Oe, [m("button", {
236
241
  type: "button",
237
- class: _(["btn btn-ghost btn-xs btn-square", { "text-primary": X.value }]),
238
- title: X.value ? "Hide unchanged elements" : "Show unchanged elements",
239
- onClick: s[1] ||= (e) => X.value = !X.value
240
- }, [(v(), u(_e(X.value ? x(ie) : x(re)), { class: "h-4 w-4" }))], 10, De), p("button", {
242
+ class: v(["btn btn-ghost btn-xs btn-square", { "text-primary": Y.value }]),
243
+ title: Y.value ? "Hide unchanged elements" : "Show unchanged elements",
244
+ onClick: s[1] ||= (e) => Y.value = !Y.value
245
+ }, [(y(), d(_e(Y.value ? S(ie) : S(re)), { class: "h-4 w-4" }))], 10, ke), m("button", {
241
246
  type: "button",
242
247
  class: "btn btn-ghost btn-xs btn-square",
243
248
  title: "Expand all differences",
244
- onClick: Ve
245
- }, [h(x(ae), { class: "h-4 w-4" })])])
246
- ]), p("div", Oe, [h(de, {
247
- items: ze.value,
248
- meta: x(z).meta,
249
- decisions: Re.value,
250
- "expanded-items": Be.value,
251
- onSelect: He,
252
- "onUpdate:decision": Ue
249
+ onClick: We
250
+ }, [g(S(oe), { class: "h-4 w-4" })])])
251
+ ]), m("div", Ae, [g(fe, {
252
+ items: Q.value,
253
+ meta: S(z).meta,
254
+ decisions: He.value,
255
+ "expanded-items": Ue.value,
256
+ onSelect: Ge,
257
+ "onUpdate:decision": Ke
253
258
  }, null, 8, [
254
259
  "items",
255
260
  "meta",
@@ -258,30 +263,30 @@ var w = { class: "flex h-full flex-col" }, T = { class: "flex flex-wrap items-ce
258
263
  ])])]),
259
264
  _: 1
260
265
  }),
261
- h(x(r), { class: "w-px bg-base-300" }),
262
- h(x(n), { class: "h-full border-s border-base-300" }, {
263
- default: S(() => [h(x(t), {
266
+ g(S(r), { class: "w-px bg-base-300" }),
267
+ g(S(n), { class: "h-full border-s border-base-300" }, {
268
+ default: C(() => [g(S(t), {
264
269
  direction: "vertical",
265
270
  class: "h-full"
266
271
  }, {
267
- default: S(() => [
268
- h(x(n), {
272
+ default: C(() => [
273
+ g(S(n), {
269
274
  "default-size": 55,
270
275
  class: "min-h-0 overflow-auto"
271
276
  }, {
272
- default: S(() => [h(se, {
273
- detail: q.value,
274
- "affix-mask": g.affixMask,
275
- onEdit: We
277
+ default: C(() => [g(ce, {
278
+ detail: K.value,
279
+ "affix-mask": _.affixMask,
280
+ onEdit: qe
276
281
  }, null, 8, ["detail", "affix-mask"])]),
277
282
  _: 1
278
283
  }),
279
- h(x(r), { class: "h-px bg-base-300" }),
280
- h(x(n), { class: "min-h-0" }, {
281
- default: S(() => [h(x(oe), {
282
- before: x(Ne),
283
- after: x(B),
284
- loading: x(Pe)
284
+ g(S(r), { class: "h-px bg-base-300" }),
285
+ g(S(n), { class: "min-h-0" }, {
286
+ default: C(() => [g(S(se), {
287
+ before: S(Ie),
288
+ after: S(Fe),
289
+ loading: S(Le)
285
290
  }, null, 8, [
286
291
  "before",
287
292
  "after",
@@ -296,61 +301,61 @@ var w = { class: "flex h-full flex-col" }, T = { class: "flex flex-wrap items-ce
296
301
  })
297
302
  ]),
298
303
  _: 1
299
- })], 512), [[ve, !W.value && U.value === "review"]]),
300
- !W.value && U.value === "confirm" && Y.value ? (v(), u(ue, {
304
+ })], 512), [[ve, !U.value && H.value === "review"]]),
305
+ !U.value && H.value === "confirm" && J.value ? (y(), d(de, {
301
306
  key: 1,
302
- summary: Y.value,
303
- scenario: g.scenario,
304
- verb: g.verb
307
+ summary: J.value,
308
+ scenario: _.scenario,
309
+ verb: _.verb
305
310
  }, null, 8, [
306
311
  "summary",
307
312
  "scenario",
308
313
  "verb"
309
- ])) : d("", !0),
310
- !W.value && U.value === "done" ? (v(), f("div", ke, [p("div", Ae, [
311
- s[8] ||= p("span", { class: "text-3xl text-success" }, "✓", -1),
312
- s[9] ||= p("p", { class: "font-medium" }, "Applied", -1),
313
- 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)
314
- ])])) : d("", !0)
314
+ ])) : f("", !0),
315
+ !U.value && H.value === "done" ? (y(), p("div", je, [m("div", Me, [
316
+ s[9] ||= m("span", { class: "text-3xl text-success" }, "✓", -1),
317
+ s[10] ||= m("p", { class: "font-medium" }, "Applied", -1),
318
+ J.value ? (y(), p("p", Ne, x(J.value.added.length) + " added · " + x(J.value.updated.length) + " updated · " + x(J.value.skipped.length) + " skipped ", 1)) : f("", !0)
319
+ ])])) : f("", !0)
315
320
  ]),
316
- p("footer", Me, [U.value === "review" ? (v(), f(c, { key: 0 }, [h(e, {
321
+ m("footer", Pe, [H.value === "review" ? (y(), p(l, { key: 0 }, [g(e, {
317
322
  variant: "ghost",
318
323
  size: "sm",
319
324
  onClick: s[2] ||= (e) => L("close")
320
325
  }, {
321
- default: S(() => [...s[10] ||= [m("Close", -1)]]),
326
+ default: C(() => [...s[11] ||= [h("Close", -1)]]),
322
327
  _: 1
323
- }), h(e, {
328
+ }), g(e, {
324
329
  color: "primary",
325
330
  size: "sm",
326
- disabled: W.value || !!K.value,
327
- onClick: Ge
331
+ disabled: U.value || !!G.value,
332
+ onClick: Je
328
333
  }, {
329
- default: S(() => [...s[11] ||= [m(" Next: Confirm ", -1)]]),
334
+ default: C(() => [...s[12] ||= [h(" Next: Confirm ", -1)]]),
330
335
  _: 1
331
- }, 8, ["disabled"])], 64)) : U.value === "confirm" ? (v(), f(c, { key: 1 }, [h(e, {
336
+ }, 8, ["disabled"])], 64)) : H.value === "confirm" ? (y(), p(l, { key: 1 }, [g(e, {
332
337
  variant: "ghost",
333
338
  size: "sm",
334
- disabled: W.value,
335
- onClick: s[3] ||= (e) => U.value = "review"
339
+ disabled: U.value,
340
+ onClick: s[3] ||= (e) => H.value = "review"
336
341
  }, {
337
- default: S(() => [...s[12] ||= [m("Back", -1)]]),
342
+ default: C(() => [...s[13] ||= [h("Back", -1)]]),
338
343
  _: 1
339
- }, 8, ["disabled"]), h(e, {
344
+ }, 8, ["disabled"]), g(e, {
340
345
  color: "primary",
341
346
  size: "sm",
342
- disabled: W.value,
343
- onClick: Ke
347
+ disabled: U.value,
348
+ onClick: Ye
344
349
  }, {
345
- default: S(() => [...s[13] ||= [m("Apply", -1)]]),
350
+ default: C(() => [...s[14] ||= [h("Apply", -1)]]),
346
351
  _: 1
347
- }, 8, ["disabled"])], 64)) : (v(), u(e, {
352
+ }, 8, ["disabled"])], 64)) : (y(), d(e, {
348
353
  key: 2,
349
354
  color: "primary",
350
355
  size: "sm",
351
356
  onClick: s[4] ||= (e) => L("applied")
352
357
  }, {
353
- default: S(() => [...s[14] ||= [m("Close", -1)]]),
358
+ default: C(() => [...s[15] ||= [h("Close", -1)]]),
354
359
  _: 1
355
360
  }))])
356
361
  ]));
@@ -1,30 +1,42 @@
1
1
  import { Fragment as e, createCommentVNode as t, createElementBlock as n, createElementVNode as r, createTextVNode as i, defineComponent as a, openBlock as o, renderList as s, toDisplayString as c } from "vue";
2
2
  //#region lib/merge/merge-summary.vue?vue&type=script&setup=true&lang.ts
3
- var l = { class: "h-full overflow-auto p-4 text-sm" }, u = { class: "mb-3 opacity-70" }, d = { class: "capitalize" }, f = { class: "uppercase" }, p = { class: "mb-4 flex flex-wrap gap-2" }, m = { class: "badge badge-success badge-sm" }, h = { class: "badge badge-warning badge-sm" }, g = { class: "badge badge-ghost badge-sm" }, _ = {
3
+ var l = { class: "h-full overflow-auto p-4 text-sm" }, u = { class: "mb-3 opacity-70" }, d = { class: "capitalize" }, f = { class: "uppercase" }, p = { class: "mb-4 flex flex-wrap gap-2" }, m = { class: "badge badge-success badge-sm" }, h = { class: "badge badge-warning badge-sm" }, g = {
4
4
  key: 0,
5
5
  class: "badge badge-info badge-sm"
6
- }, v = {
6
+ }, _ = {
7
+ key: 1,
8
+ class: "badge badge-error badge-sm"
9
+ }, v = { class: "badge badge-ghost badge-sm" }, y = {
10
+ key: 2,
11
+ class: "badge badge-info badge-sm"
12
+ }, b = {
7
13
  key: 0,
8
14
  class: "mb-4"
9
- }, y = { class: "space-y-1" }, b = { class: "badge badge-ghost badge-xs" }, x = {
15
+ }, x = { class: "space-y-1" }, S = { class: "badge badge-ghost badge-xs" }, C = {
10
16
  key: 0,
11
17
  class: "text-xs opacity-60"
12
- }, S = {
18
+ }, w = {
13
19
  key: 1,
14
20
  class: "mb-4"
15
- }, C = { class: "space-y-1" }, w = { class: "badge badge-ghost badge-xs" }, T = {
21
+ }, T = { class: "space-y-1" }, E = { class: "badge badge-ghost badge-xs" }, D = {
16
22
  key: 0,
17
23
  class: "text-xs opacity-60"
18
- }, E = {
24
+ }, O = {
19
25
  key: 2,
20
26
  class: "mb-4"
21
- }, D = { class: "space-y-1" }, O = { class: "text-xs opacity-60" }, k = {
27
+ }, k = { class: "space-y-1" }, A = { class: "text-xs opacity-60" }, j = {
22
28
  key: 3,
23
29
  class: "mb-4"
24
- }, A = { class: "space-y-1" }, j = { class: "badge badge-ghost badge-xs" }, M = {
30
+ }, M = { class: "space-y-1" }, N = { class: "badge badge-ghost badge-xs" }, P = {
25
31
  key: 4,
32
+ class: "mb-4"
33
+ }, F = { class: "space-y-1" }, I = { class: "badge badge-ghost badge-xs" }, L = {
34
+ key: 5,
35
+ class: "mb-4"
36
+ }, R = { class: "space-y-1" }, z = { class: "badge badge-ghost badge-xs" }, B = {
37
+ key: 6,
26
38
  class: "opacity-60"
27
- }, N = /*@__PURE__*/ a({
39
+ }, V = /*@__PURE__*/ a({
28
40
  __name: "merge-summary",
29
41
  props: {
30
42
  summary: {},
@@ -32,45 +44,55 @@ var l = { class: "h-full overflow-auto p-4 text-sm" }, u = { class: "mb-3 opacit
32
44
  verb: {}
33
45
  },
34
46
  setup(a) {
35
- return (N, P) => (o(), n("div", l, [
47
+ return (V, H) => (o(), n("div", l, [
36
48
  r("p", u, [
37
49
  r("span", d, c(a.scenario), 1),
38
50
  r("span", f, " (" + c(a.verb) + ")", 1),
39
- P[0] ||= i(" — review before applying. ", -1)
51
+ H[0] ||= i(" — review before applying. ", -1)
40
52
  ]),
41
53
  r("div", p, [
42
54
  r("span", m, c(a.summary.added.length) + " added", 1),
43
55
  r("span", h, c(a.summary.updated.length) + " updated", 1),
44
- r("span", g, c(a.summary.skipped.length) + " skipped", 1),
45
- a.summary.renamed.length ? (o(), n("span", _, c(a.summary.renamed.length) + " auto-renamed ", 1)) : t("", !0)
56
+ a.summary.preserved.length ? (o(), n("span", g, c(a.summary.preserved.length) + " kept ", 1)) : t("", !0),
57
+ a.summary.removed.length ? (o(), n("span", _, c(a.summary.removed.length) + " removed ", 1)) : t("", !0),
58
+ r("span", v, c(a.summary.skipped.length) + " skipped", 1),
59
+ a.summary.renamed.length ? (o(), n("span", y, c(a.summary.renamed.length) + " auto-renamed ", 1)) : t("", !0)
46
60
  ]),
47
- a.summary.added.length ? (o(), n("section", v, [P[1] ||= r("h3", { class: "mb-1 font-medium text-success" }, "Will be added", -1), r("ul", y, [(o(!0), n(e, null, s(a.summary.added, (e, i) => (o(), n("li", {
61
+ a.summary.added.length ? (o(), n("section", b, [H[1] ||= r("h3", { class: "mb-1 font-medium text-success" }, "Will be added", -1), r("ul", x, [(o(!0), n(e, null, s(a.summary.added, (e, i) => (o(), n("li", {
48
62
  key: `a${i}`,
49
63
  class: "flex items-center gap-2"
50
64
  }, [
51
- r("span", b, c(e.tag), 1),
65
+ r("span", S, c(e.tag), 1),
52
66
  r("span", null, c(e.title), 1),
53
- e.detail ? (o(), n("span", x, c(e.detail), 1)) : t("", !0)
67
+ e.detail ? (o(), n("span", C, c(e.detail), 1)) : t("", !0)
54
68
  ]))), 128))])])) : t("", !0),
55
- a.summary.updated.length ? (o(), n("section", S, [P[2] ||= r("h3", { class: "mb-1 font-medium text-warning" }, "Will be updated", -1), r("ul", C, [(o(!0), n(e, null, s(a.summary.updated, (e, i) => (o(), n("li", {
69
+ a.summary.updated.length ? (o(), n("section", w, [H[2] ||= r("h3", { class: "mb-1 font-medium text-warning" }, "Will be updated", -1), r("ul", T, [(o(!0), n(e, null, s(a.summary.updated, (e, i) => (o(), n("li", {
56
70
  key: `u${i}`,
57
71
  class: "flex items-center gap-2"
58
72
  }, [
59
- r("span", w, c(e.tag), 1),
73
+ r("span", E, c(e.tag), 1),
60
74
  r("span", null, c(e.title), 1),
61
- e.detail ? (o(), n("span", T, c(e.detail), 1)) : t("", !0)
75
+ e.detail ? (o(), n("span", D, c(e.detail), 1)) : t("", !0)
62
76
  ]))), 128))])])) : t("", !0),
63
- a.summary.renamed.length ? (o(), n("section", E, [P[3] ||= r("h3", { class: "mb-1 font-medium text-info" }, "Auto-renamed (naming collisions)", -1), r("ul", D, [(o(!0), n(e, null, s(a.summary.renamed, (e, t) => (o(), n("li", {
77
+ a.summary.renamed.length ? (o(), n("section", O, [H[3] ||= r("h3", { class: "mb-1 font-medium text-info" }, "Auto-renamed (naming collisions)", -1), r("ul", k, [(o(!0), n(e, null, s(a.summary.renamed, (e, t) => (o(), n("li", {
64
78
  key: `r${t}`,
65
79
  class: "flex items-center gap-2"
66
- }, [r("span", null, c(e.title), 1), r("span", O, c(e.field) + " → " + c(e.to), 1)]))), 128))])])) : t("", !0),
67
- a.summary.skipped.length ? (o(), n("section", k, [P[4] ||= r("h3", { class: "mb-1 font-medium opacity-70" }, "Skipped", -1), r("ul", A, [(o(!0), n(e, null, s(a.summary.skipped, (e, t) => (o(), n("li", {
80
+ }, [r("span", null, c(e.title), 1), r("span", A, c(e.field) + " → " + c(e.to), 1)]))), 128))])])) : t("", !0),
81
+ a.summary.removed.length ? (o(), n("section", j, [H[4] ||= r("h3", { class: "mb-1 font-medium text-error" }, "Will be removed (your additions)", -1), r("ul", M, [(o(!0), n(e, null, s(a.summary.removed, (e, t) => (o(), n("li", {
82
+ key: `rm${t}`,
83
+ class: "flex items-center gap-2"
84
+ }, [r("span", N, c(e.tag), 1), r("span", null, c(e.title), 1)]))), 128))])])) : t("", !0),
85
+ a.summary.preserved.length ? (o(), n("section", P, [H[5] ||= r("h3", { class: "mb-1 font-medium text-info" }, "Kept (your additions)", -1), r("ul", F, [(o(!0), n(e, null, s(a.summary.preserved, (e, t) => (o(), n("li", {
86
+ key: `k${t}`,
87
+ class: "flex items-center gap-2"
88
+ }, [r("span", I, c(e.tag), 1), r("span", null, c(e.title), 1)]))), 128))])])) : t("", !0),
89
+ a.summary.skipped.length ? (o(), n("section", L, [H[6] ||= r("h3", { class: "mb-1 font-medium opacity-70" }, "Skipped", -1), r("ul", R, [(o(!0), n(e, null, s(a.summary.skipped, (e, t) => (o(), n("li", {
68
90
  key: `s${t}`,
69
91
  class: "flex items-center gap-2 line-through opacity-50"
70
- }, [r("span", j, c(e.tag), 1), r("span", null, c(e.title), 1)]))), 128))])])) : t("", !0),
71
- !a.summary.added.length && !a.summary.updated.length && !a.summary.skipped.length && !a.summary.renamed.length ? (o(), n("p", M, " Nothing to apply. ")) : t("", !0)
92
+ }, [r("span", z, c(e.tag), 1), r("span", null, c(e.title), 1)]))), 128))])])) : t("", !0),
93
+ !a.summary.added.length && !a.summary.updated.length && !a.summary.skipped.length && !a.summary.preserved.length && !a.summary.removed.length && !a.summary.renamed.length ? (o(), n("p", B, " Nothing to apply. ")) : t("", !0)
72
94
  ]));
73
95
  }
74
96
  });
75
97
  //#endregion
76
- export { N as default };
98
+ export { V as default };