@hydranium/protocol 1.0.0-next.12 → 1.0.0-next.123

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 (142) hide show
  1. package/README.md +35 -1
  2. package/lib/client/data-connection.d.ts +114 -0
  3. package/lib/client/data-connection.d.ts.map +1 -0
  4. package/lib/client/data-connection.js +143 -0
  5. package/lib/client/data-connection.js.map +1 -0
  6. package/lib/client/data-events.d.ts +9 -1
  7. package/lib/client/data-events.d.ts.map +1 -1
  8. package/lib/client/data-events.js +14 -0
  9. package/lib/client/data-events.js.map +1 -1
  10. package/lib/client/data-port.d.ts +17 -22
  11. package/lib/client/data-port.d.ts.map +1 -1
  12. package/lib/client/data-session.d.ts +235 -82
  13. package/lib/client/data-session.d.ts.map +1 -1
  14. package/lib/client/data-session.js +337 -108
  15. package/lib/client/data-session.js.map +1 -1
  16. package/lib/client/index.d.ts +10 -7
  17. package/lib/client/index.d.ts.map +1 -1
  18. package/lib/client/index.js +10 -7
  19. package/lib/client/index.js.map +1 -1
  20. package/lib/client/message-relay.d.ts +8 -2
  21. package/lib/client/message-relay.d.ts.map +1 -1
  22. package/lib/client/message-relay.js +10 -4
  23. package/lib/client/message-relay.js.map +1 -1
  24. package/lib/client/rpc-connection.d.ts +143 -0
  25. package/lib/client/rpc-connection.d.ts.map +1 -0
  26. package/lib/client/rpc-connection.js +171 -0
  27. package/lib/client/rpc-connection.js.map +1 -0
  28. package/lib/client-ids.d.ts +41 -0
  29. package/lib/client-ids.d.ts.map +1 -0
  30. package/lib/client-ids.js +44 -0
  31. package/lib/client-ids.js.map +1 -0
  32. package/lib/data/data-protocol-methods.d.ts +4 -4
  33. package/lib/data/data-protocol-methods.d.ts.map +1 -1
  34. package/lib/data/data-protocol-methods.js +10 -1
  35. package/lib/data/data-protocol-methods.js.map +1 -1
  36. package/lib/data/data-server-protocol.d.ts +100 -31
  37. package/lib/data/data-server-protocol.d.ts.map +1 -1
  38. package/lib/data/events.d.ts +70 -3
  39. package/lib/data/events.d.ts.map +1 -1
  40. package/lib/data/requests.d.ts +67 -11
  41. package/lib/data/requests.d.ts.map +1 -1
  42. package/lib/errors.d.ts +91 -12
  43. package/lib/errors.d.ts.map +1 -1
  44. package/lib/errors.js +127 -18
  45. package/lib/errors.js.map +1 -1
  46. package/lib/index.d.ts +2 -0
  47. package/lib/index.d.ts.map +1 -1
  48. package/lib/index.js +5 -0
  49. package/lib/index.js.map +1 -1
  50. package/lib/latency-collector.d.ts +8 -4
  51. package/lib/latency-collector.d.ts.map +1 -1
  52. package/lib/latency-collector.js.map +1 -1
  53. package/lib/messages/index.d.ts +29 -0
  54. package/lib/messages/index.d.ts.map +1 -0
  55. package/lib/messages/index.js +55 -0
  56. package/lib/messages/index.js.map +1 -0
  57. package/lib/messages/primitives.d.ts +188 -0
  58. package/lib/messages/primitives.d.ts.map +1 -0
  59. package/lib/messages/primitives.js +161 -0
  60. package/lib/messages/primitives.js.map +1 -0
  61. package/lib/model-server.d.ts +44 -13
  62. package/lib/model-server.d.ts.map +1 -1
  63. package/lib/model-server.js +4 -2
  64. package/lib/model-server.js.map +1 -1
  65. package/lib/model-service/based-on.d.ts +57 -0
  66. package/lib/model-service/based-on.d.ts.map +1 -0
  67. package/lib/model-service/based-on.js +37 -0
  68. package/lib/model-service/based-on.js.map +1 -0
  69. package/lib/model-service/index.d.ts +1 -1
  70. package/lib/model-service/index.d.ts.map +1 -1
  71. package/lib/model-service/index.js +4 -5
  72. package/lib/model-service/index.js.map +1 -1
  73. package/lib/patch-merge.d.ts +28 -27
  74. package/lib/patch-merge.d.ts.map +1 -1
  75. package/lib/patch-merge.js +66 -22
  76. package/lib/patch-merge.js.map +1 -1
  77. package/lib/profile-session.d.ts +8 -4
  78. package/lib/profile-session.d.ts.map +1 -1
  79. package/lib/profile-session.js.map +1 -1
  80. package/lib/rpc/bind-rpc-methods.d.ts +29 -3
  81. package/lib/rpc/bind-rpc-methods.d.ts.map +1 -1
  82. package/lib/rpc/bind-rpc-methods.js +22 -3
  83. package/lib/rpc/bind-rpc-methods.js.map +1 -1
  84. package/lib/rpc/create-rpc-proxy.d.ts +7 -0
  85. package/lib/rpc/create-rpc-proxy.d.ts.map +1 -1
  86. package/lib/rpc/create-rpc-proxy.js +6 -1
  87. package/lib/rpc/create-rpc-proxy.js.map +1 -1
  88. package/lib/testing/catalogue-audit.d.ts +80 -0
  89. package/lib/testing/catalogue-audit.d.ts.map +1 -0
  90. package/lib/testing/catalogue-audit.js +94 -0
  91. package/lib/testing/catalogue-audit.js.map +1 -0
  92. package/lib/testing/data-doubles.d.ts +11 -12
  93. package/lib/testing/data-doubles.d.ts.map +1 -1
  94. package/lib/testing/data-doubles.js +14 -5
  95. package/lib/testing/data-doubles.js.map +1 -1
  96. package/lib/testing/index.d.ts +1 -0
  97. package/lib/testing/index.d.ts.map +1 -1
  98. package/lib/testing/index.js +4 -1
  99. package/lib/testing/index.js.map +1 -1
  100. package/lib/transfer-diagnostic.d.ts +33 -0
  101. package/lib/transfer-diagnostic.d.ts.map +1 -1
  102. package/lib/transfer-diagnostic.js +23 -0
  103. package/lib/transfer-diagnostic.js.map +1 -1
  104. package/lib/transfer-document.d.ts +14 -5
  105. package/lib/transfer-document.d.ts.map +1 -1
  106. package/lib/transfer-document.js +14 -1
  107. package/lib/transfer-document.js.map +1 -1
  108. package/package.json +11 -2
  109. package/src/client/data-connection.ts +216 -0
  110. package/src/client/data-events.ts +24 -1
  111. package/src/client/data-port.ts +17 -23
  112. package/src/client/data-session.ts +447 -128
  113. package/src/client/index.ts +10 -7
  114. package/src/client/message-relay.ts +28 -6
  115. package/src/client/rpc-connection.ts +235 -0
  116. package/src/client-ids.ts +45 -0
  117. package/src/data/data-protocol-methods.ts +10 -3
  118. package/src/data/data-server-protocol.ts +119 -31
  119. package/src/data/events.ts +74 -3
  120. package/src/data/requests.ts +71 -11
  121. package/src/errors.ts +139 -20
  122. package/src/index.ts +5 -0
  123. package/src/latency-collector.ts +8 -3
  124. package/src/messages/index.ts +36 -0
  125. package/src/messages/primitives.ts +271 -0
  126. package/src/model-server.ts +47 -18
  127. package/src/model-service/based-on.ts +63 -0
  128. package/src/model-service/index.ts +4 -5
  129. package/src/patch-merge.ts +90 -37
  130. package/src/profile-session.ts +9 -4
  131. package/src/rpc/bind-rpc-methods.ts +49 -4
  132. package/src/rpc/create-rpc-proxy.ts +14 -1
  133. package/src/testing/catalogue-audit.ts +111 -0
  134. package/src/testing/data-doubles.ts +33 -17
  135. package/src/testing/index.ts +4 -1
  136. package/src/transfer-diagnostic.ts +40 -0
  137. package/src/transfer-document.ts +21 -6
  138. package/lib/model-service/args.d.ts +0 -64
  139. package/lib/model-service/args.d.ts.map +0 -1
  140. package/lib/model-service/args.js +0 -11
  141. package/lib/model-service/args.js.map +0 -1
  142. package/src/model-service/args.ts +0 -67
@@ -0,0 +1,161 @@
1
+ "use strict";
2
+ /********************************************************************************
3
+ * Copyright (c) 2026 CrossBreeze, EclipseSource and others.
4
+ *
5
+ * This program and the accompanying materials are made available under the
6
+ * terms of the MIT License which is available in the project root.
7
+ *
8
+ * SPDX-License-Identifier: MIT
9
+ ********************************************************************************/
10
+ Object.defineProperty(exports, "__esModule", { value: true });
11
+ exports.MessageCatalogue = void 0;
12
+ exports.defineMessage = defineMessage;
13
+ exports.interpolate = interpolate;
14
+ exports.messageData = messageData;
15
+ exports.resolve = resolve;
16
+ exports.hasMessageIdentity = hasMessageIdentity;
17
+ exports.messageError = messageError;
18
+ exports.renderFrameworkMessage = renderFrameworkMessage;
19
+ exports.resolvedFromResponseError = resolvedFromResponseError;
20
+ exports.describeError = describeError;
21
+ exports.isMessageDeclaration = isMessageDeclaration;
22
+ exports.collectMessages = collectMessages;
23
+ const vscode_jsonrpc_1 = require("vscode-jsonrpc");
24
+ /**
25
+ * Declare a message. Placeholder names are inferred from `text` rather than
26
+ * declared again in a type argument: a second spelling of every name is the
27
+ * repetition that drifts, since adding a placeholder to the sentence and not to
28
+ * the type compiles.
29
+ */
30
+ function defineMessage(code, text) {
31
+ const literal = text;
32
+ return { code, text: literal, format: (...args) => interpolate(literal, args[0] ?? {}) };
33
+ }
34
+ const PLACEHOLDER = /\{([^}]+)\}/g;
35
+ /**
36
+ * Substitute `{name}` tokens, leaving an unfilled token in place.
37
+ *
38
+ * It must not throw. This runs over an adopter's translation as well as our own
39
+ * text, so a typo in a foreign catalogue has to degrade to a slightly wrong
40
+ * sentence rather than raise inside a toast render. Re-scanning the result to
41
+ * detect an unfilled token is what an earlier form did, and it cannot work:
42
+ * `String.replace` does not rescan replacement text, so the check could not tell
43
+ * an unfilled placeholder from user data shaped like one — an element literally
44
+ * named `{separator}` crashed at the authoring site.
45
+ */
46
+ function interpolate(template, params) {
47
+ // Indexed rather than `key in params`: a hand-built or version-skewed
48
+ // identity can arrive with no params at all, and `in` throws on a non-object
49
+ // where a lookup degrades.
50
+ const lookup = params;
51
+ return template.replace(PLACEHOLDER, (match, key) => {
52
+ const value = lookup?.[key];
53
+ return value === undefined ? match : String(value);
54
+ });
55
+ }
56
+ function messageData(message, ...args) {
57
+ return { hydranium: { code: message.code, params: args[0] ?? {} } };
58
+ }
59
+ /**
60
+ * Identity plus resolved English, for a hand-off carrying a value rather than a
61
+ * protocol field. The result is structured-clone safe, so it survives a process
62
+ * hop where one intervenes and costs nothing where none does.
63
+ */
64
+ function resolve(message, ...args) {
65
+ return { code: message.code, text: message.format(...args), params: args[0] ?? {} };
66
+ }
67
+ /**
68
+ * Validates every field {@link MessageIdentity} declares, `params` included.
69
+ * A guard over foreign input that checks only `code` while declaring `params`
70
+ * non-optional hands `undefined` to the renderer, which fails with the worst
71
+ * polarity available: invisible in English, crashing only once a translation is
72
+ * loaded.
73
+ */
74
+ function hasMessageIdentity(data) {
75
+ if (typeof data !== 'object' || data === null || Array.isArray(data) || !('hydranium' in data)) {
76
+ return false;
77
+ }
78
+ const identity = data.hydranium;
79
+ if (typeof identity !== 'object' || identity === null || Array.isArray(identity)) {
80
+ return false;
81
+ }
82
+ const candidate = identity;
83
+ return typeof candidate.code === 'string' && typeof candidate.params === 'object' && candidate.params !== null;
84
+ }
85
+ /**
86
+ * The numeric `code` and the message's catalogue code are unrelated and both are
87
+ * needed: `ResponseError.code` is an `integer`, so it cannot hold a
88
+ * `hydranium/…` key, and it is what a caller switches on after reconstruction.
89
+ */
90
+ function messageError(code, message, ...params) {
91
+ return new vscode_jsonrpc_1.ResponseError(code, message.format(...params), messageData(message, ...params));
92
+ }
93
+ var MessageCatalogue;
94
+ (function (MessageCatalogue) {
95
+ /**
96
+ * One catalogue from several, for a renderer whose override supplies entries
97
+ * over the ones it inherits.
98
+ *
99
+ * **Later wins**, so a caller passes the inherited answer before its own.
100
+ *
101
+ * **No source at all answers `undefined`, not `{}`.** A renderer holds that
102
+ * answer as the locale having no catalogue and renders straight through; an
103
+ * empty object is a catalogue that misses every lookup, so returning one
104
+ * turns the opt-out into a per-message search that yields the same English.
105
+ */
106
+ function merge(...catalogues) {
107
+ const present = catalogues.filter((catalogue) => catalogue !== undefined);
108
+ if (present.length <= 1) {
109
+ return present[0];
110
+ }
111
+ return Object.assign({}, ...present);
112
+ }
113
+ MessageCatalogue.merge = merge;
114
+ })(MessageCatalogue || (exports.MessageCatalogue = MessageCatalogue = {}));
115
+ /**
116
+ * Render on the side that knows the reading user's locale. Omitting
117
+ * `translations` is how an adopter without i18n opts out, and yields the
118
+ * English.
119
+ */
120
+ function renderFrameworkMessage(message, translations) {
121
+ const template = translations?.[message.code];
122
+ return template ? interpolate(template, message.params) : message.text;
123
+ }
124
+ function resolvedFromResponseError(error) {
125
+ return hasMessageIdentity(error.data) ? { ...error.data.hydranium, text: error.message } : undefined;
126
+ }
127
+ /**
128
+ * The detail half of a `{detail}` placeholder. A technical error string is safe
129
+ * to pass as a parameter for the same reason a number is: it is not itself
130
+ * translatable text, so it needs no code of its own. A PROSE fragment is not,
131
+ * and must become one code per value instead.
132
+ */
133
+ function describeError(error) {
134
+ return error instanceof Error ? error.message : String(error);
135
+ }
136
+ /**
137
+ * Recognises a declaration among a barrel's exports. The `format` check is what
138
+ * discriminates: a `code` + `text` pair alone admits any object that happens to
139
+ * carry both.
140
+ */
141
+ function isMessageDeclaration(value) {
142
+ const candidate = value;
143
+ return (typeof candidate === 'object' &&
144
+ candidate !== null &&
145
+ typeof candidate.code === 'string' &&
146
+ typeof candidate.text === 'string' &&
147
+ typeof candidate.format === 'function');
148
+ }
149
+ /**
150
+ * Every declaration a `./messages` barrel exports.
151
+ *
152
+ * A caller cannot get there with `Object.values(barrel).filter(isMessageDeclaration)`:
153
+ * a barrel's value type is a union of its declarations AND its functions, and
154
+ * `filter` will not narrow a function type down to a `MessageDefinition`, so the
155
+ * result stays the union and reading `.code` off it does not compile. Taking the
156
+ * barrel as an opaque object is what makes the one-liner work.
157
+ */
158
+ function collectMessages(barrel) {
159
+ return Object.values(barrel).filter(isMessageDeclaration);
160
+ }
161
+ //# sourceMappingURL=primitives.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"primitives.js","sourceRoot":"","sources":["../../src/messages/primitives.ts"],"names":[],"mappings":"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"}
@@ -12,8 +12,14 @@
12
12
  * language identifier — consumers parameterise the document/root types
13
13
  * over `TRoot`.
14
14
  */
15
- import type { TransferClientArgs } from './model-service/args';
16
15
  import type { ReferenceCandidate } from './model-service/reference-candidate';
16
+ /** Identifies a client-document binding. */
17
+ export interface TransferClientArgs {
18
+ /** Document URI. */
19
+ uri: string;
20
+ /** Stable identifier for the client invoking the operation. */
21
+ clientId: string;
22
+ }
17
23
  /** Open a document on behalf of a client. */
18
24
  export interface OpenModelArgs extends TransferClientArgs {
19
25
  /**
@@ -35,10 +41,18 @@ export interface OpenModelArgs extends TransferClientArgs {
35
41
  * means read from the filesystem, which is the normal case.
36
42
  *
37
43
  * Honoured only on the first open of a URI: opening an already-open document
38
- * is a no-op, so passing `text` for one silently changes nothing. Write
39
- * through the update path instead.
44
+ * attaches the caller to the existing shared entry and does not replace its
45
+ * content with this seed. Write through the update path instead. The open
46
+ * response reads the current shared content after registration; a textual
47
+ * `didOpen` attach may separately refresh the build.
40
48
  */
41
49
  text?: string;
50
+ /**
51
+ * Kept on the server for this client's open until it closes, for the
52
+ * server's own open path to read. Only a client session's open keeps them,
53
+ * and a repeat open keeps the first open's.
54
+ */
55
+ options?: object;
42
56
  }
43
57
  /** Close a previously-opened document for the client. */
44
58
  export interface CloseModelArgs extends TransferClientArgs {
@@ -46,8 +60,8 @@ export interface CloseModelArgs extends TransferClientArgs {
46
60
  export interface TransferUpdatedEvent<TDocument> {
47
61
  document: TDocument;
48
62
  sourceClientId: string;
49
- /** See `ModelDocumentUpdateReason` in `./data/events` for the canonical reason set + semantics. */
50
- reason: 'changed' | 'deleted' | 'rebuilt' | 'saved';
63
+ /** See `TransferDocumentUpdateReason` in `./data/events` for the canonical reason set + semantics. */
64
+ reason: 'changed' | 'rebuilt' | 'saved';
51
65
  }
52
66
  export interface TransferSavedEvent<TDocument> {
53
67
  /** The document as persisted — the state that reached disk, not the state at request time. */
@@ -114,10 +128,10 @@ export declare function isElementSource(object: unknown): object is ElementSourc
114
128
  /** An element of a document that does not yet exist on disk — used during element creation flows. */
115
129
  export interface SyntheticSource {
116
130
  /**
117
- * The document the element would belong to. That document must already be
118
- * LOADED — the default resolution takes its parse root as the synthetic
119
- * node's container and answers `undefined` when it is not, so a URI for a
120
- * file that exists on disk but was never opened resolves to nothing.
131
+ * The document the element would belong to. It need not be loaded, or
132
+ * exist — an unloaded URI materialises a transient empty document, so a
133
+ * folder is a valid anchor. A URI that IS loaded contributes that
134
+ * document's parse root as the container, putting its contents in scope.
121
135
  */
122
136
  uri: string;
123
137
  /**
@@ -126,6 +140,16 @@ export interface SyntheticSource {
126
140
  * it is what scoping filters candidates against.
127
141
  */
128
142
  type: string;
143
+ /**
144
+ * The grammar the element will belong to, as a language id.
145
+ *
146
+ * Optional because `uri` and `type` each answer on their own when
147
+ * unambiguous. Set it when neither is: a URI naming no file carries no
148
+ * extension to route on, and a `type` two grammars can produce identifies
149
+ * neither. Unset, such a source reaches the server's own policy, which
150
+ * answers the same way for every caller.
151
+ */
152
+ language?: string;
129
153
  }
130
154
  export declare function isSyntheticSource(object: unknown): object is SyntheticSource;
131
155
  /**
@@ -135,7 +159,7 @@ export declare function isSyntheticSource(object: unknown): object is SyntheticS
135
159
  export declare namespace ReferenceSource {
136
160
  function document(uri: string): DocumentSource;
137
161
  function element(name: string, type?: string): ElementSource;
138
- function synthetic(uri: string, type: string): SyntheticSource;
162
+ function synthetic(uri: string, type: string, language?: string): SyntheticSource;
139
163
  }
140
164
  /**
141
165
  * One step in a synthetic navigation path from a {@link ReferenceSource}
@@ -329,9 +353,10 @@ export interface FindNextNameArgs {
329
353
  */
330
354
  uri: string;
331
355
  /**
332
- * The AST `$type` of the element being named. Collisions are only looked for
333
- * among elements of that same type, so the returned name may still be taken
334
- * by an element of another type.
356
+ * The AST `$type` of the element being named. Collisions are looked for
357
+ * among elements of that type and of any subtype of it, so a supertype
358
+ * names a uniqueness scope its concrete types share; the returned name may
359
+ * still be taken by an element outside that hierarchy.
335
360
  */
336
361
  type: string;
337
362
  /**
@@ -348,5 +373,11 @@ export interface FindNextNameArgs {
348
373
  * See {@link NameTier} for what each tier covers.
349
374
  */
350
375
  tier?: NameTier;
376
+ /**
377
+ * The grammar to name under, routed as {@link SyntheticSource.language} —
378
+ * this call builds one. A caller that sets it there must set it here, or
379
+ * candidates and the name it proposes come from different grammars.
380
+ */
381
+ language?: string;
351
382
  }
352
383
  //# sourceMappingURL=model-server.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"model-server.d.ts","sourceRoot":"","sources":["../src/model-server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model-server.d.ts","sourceRoot":"","sources":["../src/model-server.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAM9E,4CAA4C;AAC5C,MAAM,WAAW,kBAAkB;IAChC,oBAAoB;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,+DAA+D;IAC/D,QAAQ,EAAE,MAAM,CAAC;CACnB;AAED,6CAA6C;AAC7C,MAAM,WAAW,aAAc,SAAQ,kBAAkB;IACtD;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;;;;OASG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,yDAAyD;AAEzD,MAAM,WAAW,cAAe,SAAQ,kBAAkB;CAAG;AAM7D,MAAM,WAAW,oBAAoB,CAAC,SAAS;IAC5C,QAAQ,EAAE,SAAS,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,sGAAsG;IACtG,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;CAC1C;AAED,MAAM,WAAW,kBAAkB,CAAC,SAAS;IAC1C,8FAA8F;IAC9F,QAAQ,EAAE,SAAS,CAAC;IACpB;;;;;OAKG;IACH,cAAc,EAAE,MAAM,CAAC;CACzB;AAMD;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,eAAe,GAAG,cAAc,GAAG,aAAa,GAAG,eAAe,CAAC;AAE/E,iFAAiF;AACjF,MAAM,WAAW,cAAc;IAC5B,GAAG,EAAE,MAAM,CAAC;CACd;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,cAAc,CAE1E;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,aAAa;IAC3B;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,aAAa,CAExE;AAED,qGAAqG;AACrG,MAAM,WAAW,eAAe;IAC7B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,eAAe,CAS5E;AAED;;;GAGG;AACH,yBAAiB,eAAe,CAAC;IAC9B,SAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAEpD;IACD,SAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,aAAa,CAElE;IACD,SAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,eAAe,CAIvF;CACH;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,aAAa;IAC3B;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;;;;;;;;;OAUG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,aAAa,CASxE;AAED,yBAAiB,aAAa,CAAC;IAC5B;;;;OAIG;IACH,SAAgB,EAAE,CAAC,iBAAiB,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,aAAa,CAEzF;IAED;;;;;OAKG;IACH,SAAgB,KAAK,CAAC,GAAG,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,aAAa,EAAE,CAErF;CACH;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,gBAAgB;IAC9B,sGAAsG;IACtG,MAAM,EAAE,eAAe,CAAC;IACxB;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,aAAa,EAAE,CAAC;IAChC;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;CACnB;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,gBAAgB,CAQ9E;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACvD,4EAA4E;IAC5E,KAAK,EAAE,MAAM,CAAC;CAChB;AAMD;;;;GAIG;AACH,MAAM,WAAW,oBAAoB,CAAC,cAAc;IACjD,mFAAmF;IACnF,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC;IAC1D,mFAAmF;IACnF,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC;IACzE,gFAAgF;IAChF,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC;CAC3E;AAED;;;;GAIG;AACH,MAAM,WAAW,kBAAkB,CAAC,cAAc;IAC/C;;;;;OAKG;IACH,IAAI,CAAC,iBAAiB,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC;IAClG,oDAAoD;IACpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,CAAC;CAC7C;AAED,2EAA2E;AAC3E,MAAM,WAAW,0BAA0B;IACxC,KAAK,IAAI,gBAAgB,CAAC;CAC5B;AAED,oGAAoG;AACpG,MAAM,WAAW,0BAA0B;IACxC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,0BAA0B,CAAC;CACnD;AAED,4CAA4C;AAC5C,MAAM,WAAW,0BAA0B;IACxC,KAAK,IAAI,gBAAgB,CAAC;CAC5B;AA8BD,yBAAiB,gBAAgB,CAAC;IAC/B,oEAAoE;IACpE,SAAgB,OAAO,IAAI,oBAAoB,CAAC,0BAA0B,CAAC,CAE1E;CACH;AAED,yBAAiB,gBAAgB,CAAC;IAC/B,6EAA6E;IAC7E,SAAgB,OAAO,IAAI,oBAAoB,CAAC,0BAA0B,CAAC,CAI1E;IAED;;;;;;OAMG;IACH,SAAgB,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,kBAAkB,GAAG,gBAAgB,CAE/F;CACH;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEtD,6CAA6C;AAC7C,MAAM,WAAW,gBAAgB;IAC9B;;;;OAIG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACpB"}
@@ -47,8 +47,10 @@ var ReferenceSource;
47
47
  return { name, type };
48
48
  }
49
49
  ReferenceSource.element = element;
50
- function synthetic(uri, type) {
51
- return { uri, type };
50
+ function synthetic(uri, type, language) {
51
+ // The key is omitted rather than set to `undefined`, so a source built
52
+ // without a language stays deep-equal to the two-argument form.
53
+ return language === undefined ? { uri, type } : { uri, type, language };
52
54
  }
53
55
  ReferenceSource.synthetic = synthetic;
54
56
  })(ReferenceSource || (exports.ReferenceSource = ReferenceSource = {}));
@@ -1 +1 @@
1
- {"version":3,"file":"model-server.js","sourceRoot":"","sources":["../src/model-server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model-server.js","sourceRoot":"","sources":["../src/model-server.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,57 @@
1
+ /********************************************************************************
2
+ * Copyright (c) 2026 EclipseSource and others.
3
+ *
4
+ * This program and the accompanying materials are made available under the
5
+ * terms of the MIT License which is available in the project root.
6
+ *
7
+ * SPDX-License-Identifier: MIT
8
+ ********************************************************************************/
9
+ declare const snapshotMarker: unique symbol;
10
+ /**
11
+ * A text-document version that came out of a SNAPSHOT read: a document
12
+ * envelope's `version`, which cannot move once the envelope exists.
13
+ *
14
+ * A plain number at runtime, usable anywhere a number is, and it travels the
15
+ * wire as one. The marker exists only so the compiler can tell it apart from a
16
+ * version read off a LIVE document, which is the same number type and is the
17
+ * defect the conflict gate exists to prevent: read at write time it is whatever
18
+ * the server is at now, which is the number the gate is about to compare it
19
+ * against, so the gate passes unconditionally and a concurrent edit is
20
+ * overwritten with nothing logged.
21
+ */
22
+ export type SnapshotVersion = number & {
23
+ readonly [snapshotMarker]: true;
24
+ };
25
+ /**
26
+ * What a write declares it was based on: a version from a snapshot read, or
27
+ * `'anything'`.
28
+ *
29
+ * `'anything'` is a precondition that always holds — the write accepts whatever
30
+ * the server currently has, and therefore overwrites it. It is the honest
31
+ * answer wherever the write was authored against no particular server version,
32
+ * and a lie anywhere a reader handed the writer a document. The field carrying
33
+ * it is required, so an ungated write is a word someone chose rather than a
34
+ * field someone forgot.
35
+ */
36
+ export type BasedOn = SnapshotVersion | 'anything';
37
+ /**
38
+ * Whether `basedOn` names a version, and so arms the gate.
39
+ *
40
+ * Branch on this rather than on `basedOn !== 'anything'`, which reads as "not
41
+ * based on anything" — the opposite of what the branch tests.
42
+ */
43
+ export declare function isSnapshotVersion(basedOn: BasedOn): basedOn is SnapshotVersion;
44
+ /**
45
+ * Mark a version as having come from a snapshot read.
46
+ *
47
+ * **For the envelope constructors, not for callers.** Every door that builds a
48
+ * document envelope applies it on the way in, so anything a read returns
49
+ * already carries it and a writer never needs this. A caller reaching for it is
50
+ * asserting a provenance the compiler was about to deny — the read-late defect
51
+ * written out where a reviewer can see it.
52
+ */
53
+ export declare function asSnapshotVersion(version: number): SnapshotVersion;
54
+ /** A snapshot version no write can match, so a write based on it conflicts. */
55
+ export declare const NO_MATCHING_VERSION: SnapshotVersion;
56
+ export {};
57
+ //# sourceMappingURL=based-on.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"based-on.d.ts","sourceRoot":"","sources":["../../src/model-service/based-on.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,CAAC,MAAM,cAAc,EAAE,OAAO,MAAM,CAAC;AAE5C;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,CAAC,cAAc,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAE3E;;;;;;;;;;GAUG;AACH,MAAM,MAAM,OAAO,GAAG,eAAe,GAAG,UAAU,CAAC;AAEnD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,eAAe,CAE9E;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAElE;AAED,+EAA+E;AAC/E,eAAO,MAAM,mBAAmB,EAAE,eAAuC,CAAC"}
@@ -0,0 +1,37 @@
1
+ "use strict";
2
+ /********************************************************************************
3
+ * Copyright (c) 2026 EclipseSource and others.
4
+ *
5
+ * This program and the accompanying materials are made available under the
6
+ * terms of the MIT License which is available in the project root.
7
+ *
8
+ * SPDX-License-Identifier: MIT
9
+ ********************************************************************************/
10
+ Object.defineProperty(exports, "__esModule", { value: true });
11
+ exports.NO_MATCHING_VERSION = void 0;
12
+ exports.isSnapshotVersion = isSnapshotVersion;
13
+ exports.asSnapshotVersion = asSnapshotVersion;
14
+ /**
15
+ * Whether `basedOn` names a version, and so arms the gate.
16
+ *
17
+ * Branch on this rather than on `basedOn !== 'anything'`, which reads as "not
18
+ * based on anything" — the opposite of what the branch tests.
19
+ */
20
+ function isSnapshotVersion(basedOn) {
21
+ return typeof basedOn === 'number';
22
+ }
23
+ /**
24
+ * Mark a version as having come from a snapshot read.
25
+ *
26
+ * **For the envelope constructors, not for callers.** Every door that builds a
27
+ * document envelope applies it on the way in, so anything a read returns
28
+ * already carries it and a writer never needs this. A caller reaching for it is
29
+ * asserting a provenance the compiler was about to deny — the read-late defect
30
+ * written out where a reviewer can see it.
31
+ */
32
+ function asSnapshotVersion(version) {
33
+ return version;
34
+ }
35
+ /** A snapshot version no write can match, so a write based on it conflicts. */
36
+ exports.NO_MATCHING_VERSION = asSnapshotVersion(-1);
37
+ //# sourceMappingURL=based-on.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"based-on.js","sourceRoot":"","sources":["../../src/model-service/based-on.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAqClF,8CAEC;AAWD,8CAEC;AArBD;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,OAAgB;IAC/C,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC;AACtC,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,iBAAiB,CAAC,OAAe;IAC9C,OAAO,OAA0B,CAAC;AACrC,CAAC;AAED,+EAA+E;AAClE,QAAA,mBAAmB,GAAoB,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC"}
@@ -6,6 +6,6 @@
6
6
  *
7
7
  * SPDX-License-Identifier: MIT
8
8
  ********************************************************************************/
9
- export * from './args';
9
+ export * from './based-on';
10
10
  export * from './reference-candidate';
11
11
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/model-service/index.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAOlF,cAAc,QAAQ,CAAC;AACvB,cAAc,uBAAuB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/model-service/index.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAMlF,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC"}
@@ -22,10 +22,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
22
22
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
23
23
  };
24
24
  Object.defineProperty(exports, "__esModule", { value: true });
25
- // Subpath barrel for the in-process `ModelService` facade contract. The
26
- // implementation lives in `@hydranium/core`; this package owns the
27
- // argument types so both the framework facade and the data-server wire
28
- // protocol can structurally agree on the lifecycle shape.
29
- __exportStar(require("./args"), exports);
25
+ // Generic payload types the data protocol shares with core: the based-on
26
+ // version, which the server's model service checks writes against, and the
27
+ // reference candidates, which core's scope and completion code produce.
28
+ __exportStar(require("./based-on"), exports);
30
29
  __exportStar(require("./reference-candidate"), exports);
31
30
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/model-service/index.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;;AAElF,wEAAwE;AACxE,mEAAmE;AACnE,uEAAuE;AACvE,0DAA0D;AAE1D,yCAAuB;AACvB,wDAAsC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/model-service/index.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;;AAElF,yEAAyE;AACzE,2EAA2E;AAC3E,wEAAwE;AAExE,6CAA2B;AAC3B,wDAAsC"}
@@ -8,58 +8,58 @@
8
8
  ********************************************************************************/
9
9
  import { type Operation as JsonPatchOperation } from 'fast-json-patch';
10
10
  /**
11
- * Augment a user-intent JSON patch (computed `baseline → attempted`) with
11
+ * Augment a user-intent JSON patch (computed `base → ours`) with
12
12
  * `test` ops so a strict `applyPatch` against freshly-fetched server state
13
13
  * fails loudly when a foreign writer changed a path the user also changed.
14
14
  *
15
15
  * `fast-json-patch`'s `validateOperation: true` validates op structure and
16
16
  * path resolvability but NOT the pre-existing value — a plain `replace` /
17
17
  * `remove` silently overwrites whatever the foreign writer put there. For each
18
- * `replace` / `remove` op we prepend a `test` op carrying the baseline value at
18
+ * `replace` / `remove` op we prepend a `test` op carrying the base value at
19
19
  * that path, so a same-path divergence becomes a `TEST_OPERATION_FAILED` throw.
20
20
  * The caller treats that as a real field-level conflict (drop + refetch) rather
21
21
  * than silently clobbering the foreign edit.
22
22
  *
23
- * `add` ops are left unguarded: the path is new, so there is no baseline value
24
- * to test against, and add-vs-add overlaps are out of scope for this floor.
23
+ * `add` ops get no `test` op: the path is new, so there is no base value
24
+ * to test. {@link reconcileByPatchReplay} checks them against theirs
25
+ * instead; a caller applying this patch itself does not get that check.
25
26
  *
26
27
  * Used behind the framework's `ConflictError` contract by every reconcile
27
28
  * path — the GLSP recording command's undo/redo and forward-write, via
28
29
  * {@link ReconcilingConflictResolver}, and an adopter's form-widget save — so
29
30
  * they share one collision-detection rule.
30
31
  */
31
- export declare function augmentWithTestOps(baseline: object, userPatch: ReadonlyArray<JsonPatchOperation>): JsonPatchOperation[];
32
+ export declare function augmentWithTestOps(base: object, userPatch: ReadonlyArray<JsonPatchOperation>): JsonPatchOperation[];
32
33
  /**
33
- * Outcome of {@link reconcileByPatchReplay}. The caller persists / re-baselines
34
- * on `merged`, drops + surfaces the `fresh` root on `conflict`, and decides its
35
- * own fallback (e.g. force-retry) on `no-op` / `unavailable`.
34
+ * Outcome of {@link reconcileByPatchReplay}. The caller persists `merged` and
35
+ * takes it as the new base, drops + surfaces the `theirs` root on `conflict`, and
36
+ * decides its own fallback (e.g. force-retry) on `no-op` / `unavailable`.
36
37
  */
37
38
  export type ReconcileOutcome<T> = {
38
39
  /** The replay succeeded: the foreign writer touched no path the user did. */
39
40
  status: 'merged';
40
41
  /**
41
- * A fresh root built on the refetched server state, carrying both
42
- * intents. It is NOT the caller's `attempted` root — re-baseline on
43
- * this value, or the next write diffs against state the server never
44
- * had.
42
+ * A new root built on theirs, carrying both intents. It is NOT the
43
+ * caller's `ours` root — take this value as the new base, or the next
44
+ * write diffs against state the server never had.
45
45
  */
46
46
  merged: T;
47
47
  } | {
48
48
  /**
49
- * The user's root already equalled the baseline, so the version gate
49
+ * The user's root already equalled the base, so the version gate
50
50
  * fired on drift that changed nothing. No refetch was performed and
51
51
  * there is nothing to persist — retrying the same write reproduces it.
52
52
  */
53
53
  status: 'no-op';
54
54
  } | {
55
- /** A guarded `test` op tripped: user and foreign writer touched one path. */
55
+ /** User and foreign writer changed one path, or both added the same element or key. */
56
56
  status: 'conflict';
57
57
  /**
58
58
  * The server's current root, refetched and unmodified — the user's
59
59
  * intent was NOT applied to it. Surface it and drop the write; treating
60
60
  * it as a merge result silently discards what the user typed.
61
61
  */
62
- fresh: T;
62
+ theirs: T;
63
63
  } | {
64
64
  /**
65
65
  * The refetch produced nothing, so reconciliation could not be
@@ -70,22 +70,23 @@ export type ReconcileOutcome<T> = {
70
70
  };
71
71
  /**
72
72
  * Shared three-way reconcile for a `ConflictError`: diff the user's intent
73
- * (`baseline → attempted`), refetch the server's current root, and replay the
73
+ * (`base → ours`), refetch the server's current root (theirs), and replay the
74
74
  * intent on top under strict, {@link augmentWithTestOps}-guarded `applyPatch`.
75
75
  *
76
- * - `no-op` — the user's root equals the baseline, so the gate fired on a
76
+ * - `no-op` — the user's root equals the base, so the gate fired on a
77
77
  * benign version drift; nothing to replay (refetch is skipped).
78
78
  * - `unavailable` — the refetch produced nothing; caller falls back.
79
79
  * - `merged` — the foreign writer touched only paths the user did not; the
80
80
  * merged root carries both intents.
81
- * - `conflict` — a same-path divergence tripped a `test` op; caller drops the
82
- * write and surfaces `fresh`.
81
+ * - `conflict` — a same-path divergence tripped a `test` op, or an `add`
82
+ * collides with one the foreign writer made; caller drops the write and
83
+ * surfaces `theirs`.
83
84
  *
84
85
  * I/O is the caller's: `refetch` supplies the current root, and applying the
85
- * `merged` result (update vs save, re-baseline, UI refresh) stays at the call
86
+ * `merged` result (update vs save, new base, UI refresh) stays at the call
86
87
  * site so form and GLSP paths keep their own persistence semantics.
87
88
  */
88
- export declare function reconcileByPatchReplay<T extends object>(baseline: T, attempted: T, refetch: () => Promise<T | undefined>): Promise<ReconcileOutcome<T>>;
89
+ export declare function reconcileByPatchReplay<T extends object>(base: T, ours: T, refetch: () => Promise<T | undefined>): Promise<ReconcileOutcome<T>>;
89
90
  /**
90
91
  * Strategy for resolving a write that raced a foreign edit. One declarative
91
92
  * choice covers every conflict site — `execute` forward-write `(before,
@@ -95,12 +96,12 @@ export declare function reconcileByPatchReplay<T extends object>(baseline: T, at
95
96
  */
96
97
  export interface ConflictResolver {
97
98
  /**
98
- * Reconcile the user's `baseline → attempted` intent against the current
99
- * server state (`refetch`), returning a {@link ReconcileOutcome} the caller
99
+ * Reconcile the user's `base → ours` intent against the current
100
+ * server state (theirs, from `refetch`), returning a {@link ReconcileOutcome} the caller
100
101
  * acts on (persist `merged`, drop on `conflict`, fall back on `no-op` /
101
102
  * `unavailable`).
102
103
  */
103
- resolve<T extends object>(baseline: T, attempted: T, refetch: () => Promise<T | undefined>): Promise<ReconcileOutcome<T>>;
104
+ resolve<T extends object>(base: T, ours: T, refetch: () => Promise<T | undefined>): Promise<ReconcileOutcome<T>>;
104
105
  }
105
106
  /**
106
107
  * Default {@link ConflictResolver}: field-level three-way merge via
@@ -109,15 +110,15 @@ export interface ConflictResolver {
109
110
  * clobbered.
110
111
  */
111
112
  export declare class ReconcilingConflictResolver implements ConflictResolver {
112
- resolve<T extends object>(baseline: T, attempted: T, refetch: () => Promise<T | undefined>): Promise<ReconcileOutcome<T>>;
113
+ resolve<T extends object>(base: T, ours: T, refetch: () => Promise<T | undefined>): Promise<ReconcileOutcome<T>>;
113
114
  }
114
115
  /**
115
- * Last-writer-wins {@link ConflictResolver}: always reports the `attempted`
116
+ * Last-writer-wins {@link ConflictResolver}: always reports the `ours`
116
117
  * state as merged, without refetching or guarding. Suitable for single-client
117
118
  * tools or always-regenerated artifacts where a concurrent foreign edit may be
118
119
  * overwritten. A foreign edit to any field is clobbered.
119
120
  */
120
121
  export declare class ForceConflictResolver implements ConflictResolver {
121
- resolve<T extends object>(_baseline: T, attempted: T, _refetch: () => Promise<T | undefined>): Promise<ReconcileOutcome<T>>;
122
+ resolve<T extends object>(_base: T, ours: T, _refetch: () => Promise<T | undefined>): Promise<ReconcileOutcome<T>>;
122
123
  }
123
124
  //# sourceMappingURL=patch-merge.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"patch-merge.d.ts","sourceRoot":"","sources":["../src/patch-merge.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAqD,KAAK,SAAS,IAAI,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAE1H;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,EAAE,CASvH;AAED;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,IACzB;IACG,6EAA6E;IAC7E,MAAM,EAAE,QAAQ,CAAC;IACjB;;;;;OAKG;IACH,MAAM,EAAE,CAAC,CAAC;CACZ,GACD;IACG;;;;OAIG;IACH,MAAM,EAAE,OAAO,CAAC;CAClB,GACD;IACG,6EAA6E;IAC7E,MAAM,EAAE,UAAU,CAAC;IACnB;;;;OAIG;IACH,KAAK,EAAE,CAAC,CAAC;CACX,GACD;IACG;;;;OAIG;IACH,MAAM,EAAE,aAAa,CAAC;CACxB,CAAC;AAEP;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EAC1D,QAAQ,EAAE,CAAC,EACX,SAAS,EAAE,CAAC,EACZ,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GACrC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAe9B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC9B;;;;;OAKG;IACH,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5H;AAED;;;;;GAKG;AACH,qBAAa,2BAA4B,YAAW,gBAAgB;IACjE,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAG3H;AAED;;;;;GAKG;AACH,qBAAa,qBAAsB,YAAW,gBAAgB;IACrD,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAGnI"}
1
+ {"version":3,"file":"patch-merge.d.ts","sourceRoot":"","sources":["../src/patch-merge.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAMJ,KAAK,SAAS,IAAI,kBAAkB,EAEtC,MAAM,iBAAiB,CAAC;AAEzB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,EAAE,CASnH;AAED;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,IACzB;IACG,6EAA6E;IAC7E,MAAM,EAAE,QAAQ,CAAC;IACjB;;;;OAIG;IACH,MAAM,EAAE,CAAC,CAAC;CACZ,GACD;IACG;;;;OAIG;IACH,MAAM,EAAE,OAAO,CAAC;CAClB,GACD;IACG,uFAAuF;IACvF,MAAM,EAAE,UAAU,CAAC;IACnB;;;;OAIG;IACH,MAAM,EAAE,CAAC,CAAC;CACZ,GACD;IACG;;;;OAIG;IACH,MAAM,EAAE,aAAa,CAAC;CACxB,CAAC;AAEP;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EAC1D,IAAI,EAAE,CAAC,EACP,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GACrC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAkB9B;AA2CD;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC9B;;;;;OAKG;IACH,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;CACnH;AAED;;;;;GAKG;AACH,qBAAa,2BAA4B,YAAW,gBAAgB;IACjE,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAGlH;AAED;;;;;GAKG;AACH,qBAAa,qBAAsB,YAAW,gBAAgB;IACrD,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAG1H"}