@polintpro/proposit-core 0.6.6 → 0.7.5
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/README.md +201 -0
- package/dist/extensions/basics/schemata.d.ts +7 -0
- package/dist/extensions/basics/schemata.d.ts.map +1 -1
- package/dist/lib/consts.d.ts.map +1 -1
- package/dist/lib/consts.js +34 -2
- package/dist/lib/consts.js.map +1 -1
- package/dist/lib/core/argument-engine.d.ts +38 -2
- package/dist/lib/core/argument-engine.d.ts.map +1 -1
- package/dist/lib/core/argument-engine.js +636 -227
- package/dist/lib/core/argument-engine.js.map +1 -1
- package/dist/lib/core/change-collector.d.ts +1 -0
- package/dist/lib/core/change-collector.d.ts.map +1 -1
- package/dist/lib/core/change-collector.js +3 -0
- package/dist/lib/core/change-collector.js.map +1 -1
- package/dist/lib/core/claim-library.d.ts +4 -0
- package/dist/lib/core/claim-library.d.ts.map +1 -1
- package/dist/lib/core/claim-library.js +126 -59
- package/dist/lib/core/claim-library.js.map +1 -1
- package/dist/lib/core/claim-source-library.d.ts +4 -0
- package/dist/lib/core/claim-source-library.d.ts.map +1 -1
- package/dist/lib/core/claim-source-library.js +114 -38
- package/dist/lib/core/claim-source-library.js.map +1 -1
- package/dist/lib/core/diff.d.ts +10 -0
- package/dist/lib/core/diff.d.ts.map +1 -1
- package/dist/lib/core/diff.js +114 -21
- package/dist/lib/core/diff.js.map +1 -1
- package/dist/lib/core/expression-manager.d.ts +11 -0
- package/dist/lib/core/expression-manager.d.ts.map +1 -1
- package/dist/lib/core/expression-manager.js +379 -20
- package/dist/lib/core/expression-manager.js.map +1 -1
- package/dist/lib/core/fork.d.ts +31 -0
- package/dist/lib/core/fork.d.ts.map +1 -0
- package/dist/lib/core/fork.js +139 -0
- package/dist/lib/core/fork.js.map +1 -0
- package/dist/lib/core/forks-library.d.ts +58 -0
- package/dist/lib/core/forks-library.d.ts.map +1 -0
- package/dist/lib/core/forks-library.js +142 -0
- package/dist/lib/core/forks-library.js.map +1 -0
- package/dist/lib/core/interfaces/argument-engine.interfaces.d.ts +9 -2
- package/dist/lib/core/interfaces/argument-engine.interfaces.d.ts.map +1 -1
- package/dist/lib/core/interfaces/index.d.ts +1 -1
- package/dist/lib/core/interfaces/index.d.ts.map +1 -1
- package/dist/lib/core/interfaces/library.interfaces.d.ts +48 -0
- package/dist/lib/core/interfaces/library.interfaces.d.ts.map +1 -1
- package/dist/lib/core/interfaces/premise-engine.interfaces.d.ts +22 -0
- package/dist/lib/core/interfaces/premise-engine.interfaces.d.ts.map +1 -1
- package/dist/lib/core/invariant-violation-error.d.ts +6 -0
- package/dist/lib/core/invariant-violation-error.d.ts.map +1 -0
- package/dist/lib/core/invariant-violation-error.js +12 -0
- package/dist/lib/core/invariant-violation-error.js.map +1 -0
- package/dist/lib/core/parser/formula.d.ts.map +1 -1
- package/dist/lib/core/parser/formula.js +2 -2
- package/dist/lib/core/parser/formula.js.map +1 -1
- package/dist/lib/core/premise-engine.d.ts +10 -0
- package/dist/lib/core/premise-engine.d.ts.map +1 -1
- package/dist/lib/core/premise-engine.js +699 -536
- package/dist/lib/core/premise-engine.js.map +1 -1
- package/dist/lib/core/source-library.d.ts +4 -0
- package/dist/lib/core/source-library.d.ts.map +1 -1
- package/dist/lib/core/source-library.js +126 -59
- package/dist/lib/core/source-library.js.map +1 -1
- package/dist/lib/core/variable-manager.d.ts +7 -0
- package/dist/lib/core/variable-manager.d.ts.map +1 -1
- package/dist/lib/core/variable-manager.js +65 -1
- package/dist/lib/core/variable-manager.js.map +1 -1
- package/dist/lib/index.d.ts +9 -1
- package/dist/lib/index.d.ts.map +1 -1
- package/dist/lib/index.js +8 -1
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/schemata/argument.d.ts +3 -0
- package/dist/lib/schemata/argument.d.ts.map +1 -1
- package/dist/lib/schemata/argument.js +9 -0
- package/dist/lib/schemata/argument.js.map +1 -1
- package/dist/lib/schemata/fork.d.ts +17 -0
- package/dist/lib/schemata/fork.d.ts.map +1 -0
- package/dist/lib/schemata/fork.js +27 -0
- package/dist/lib/schemata/fork.js.map +1 -0
- package/dist/lib/schemata/index.d.ts +1 -0
- package/dist/lib/schemata/index.d.ts.map +1 -1
- package/dist/lib/schemata/index.js +1 -0
- package/dist/lib/schemata/index.js.map +1 -1
- package/dist/lib/schemata/propositional.d.ts +52 -0
- package/dist/lib/schemata/propositional.d.ts.map +1 -1
- package/dist/lib/schemata/propositional.js +43 -0
- package/dist/lib/schemata/propositional.js.map +1 -1
- package/dist/lib/types/checksum.d.ts +2 -0
- package/dist/lib/types/checksum.d.ts.map +1 -1
- package/dist/lib/types/diff.d.ts +6 -0
- package/dist/lib/types/diff.d.ts.map +1 -1
- package/dist/lib/types/fork.d.ts +25 -0
- package/dist/lib/types/fork.d.ts.map +1 -0
- package/dist/lib/types/fork.js +2 -0
- package/dist/lib/types/fork.js.map +1 -0
- package/dist/lib/types/grammar.d.ts +5 -4
- package/dist/lib/types/grammar.d.ts.map +1 -1
- package/dist/lib/types/grammar.js.map +1 -1
- package/dist/lib/types/validation.d.ts +47 -0
- package/dist/lib/types/validation.d.ts.map +1 -0
- package/dist/lib/types/validation.js +43 -0
- package/dist/lib/types/validation.js.map +1 -0
- package/dist/lib/utils/changeset.d.ts +124 -0
- package/dist/lib/utils/changeset.d.ts.map +1 -0
- package/dist/lib/utils/changeset.js +221 -0
- package/dist/lib/utils/changeset.js.map +1 -0
- package/dist/lib/utils/lookup.d.ts +47 -0
- package/dist/lib/utils/lookup.d.ts.map +1 -0
- package/dist/lib/utils/lookup.js +62 -0
- package/dist/lib/utils/lookup.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,5 +1,9 @@
|
|
|
1
|
+
import { Value } from "typebox/value";
|
|
2
|
+
import { CoreClaimSourceAssociationSchema } from "../schemata/source.js";
|
|
1
3
|
import { DEFAULT_CHECKSUM_CONFIG } from "../consts.js";
|
|
2
4
|
import { entityChecksum } from "./checksum.js";
|
|
5
|
+
import { ASSOC_SCHEMA_INVALID, ASSOC_CLAIM_REF_NOT_FOUND, ASSOC_SOURCE_REF_NOT_FOUND, } from "../types/validation.js";
|
|
6
|
+
import { InvariantViolationError } from "./invariant-violation-error.js";
|
|
3
7
|
export class ClaimSourceLibrary {
|
|
4
8
|
associations;
|
|
5
9
|
claimToAssociations;
|
|
@@ -15,50 +19,92 @@ export class ClaimSourceLibrary {
|
|
|
15
19
|
this.sourceLookup = sourceLookup;
|
|
16
20
|
this.checksumConfig = options?.checksumConfig;
|
|
17
21
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
throw new Error(`Claim "${assoc.claimId}" version ${assoc.claimVersion} not found in claim lookup.`);
|
|
22
|
+
restoreFromSnapshot(snap) {
|
|
23
|
+
this.associations = new Map();
|
|
24
|
+
this.claimToAssociations = new Map();
|
|
25
|
+
this.sourceToAssociations = new Map();
|
|
26
|
+
for (const assoc of snap.claimSourceAssociations) {
|
|
27
|
+
this.associations.set(assoc.id, assoc);
|
|
25
28
|
}
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
|
|
29
|
+
for (const [id, assoc] of this.associations) {
|
|
30
|
+
const claimKey = assoc.claimId;
|
|
31
|
+
if (!this.claimToAssociations.has(claimKey)) {
|
|
32
|
+
this.claimToAssociations.set(claimKey, new Set());
|
|
33
|
+
}
|
|
34
|
+
this.claimToAssociations.get(claimKey).add(id);
|
|
35
|
+
const sourceKey = assoc.sourceId;
|
|
36
|
+
if (!this.sourceToAssociations.has(sourceKey)) {
|
|
37
|
+
this.sourceToAssociations.set(sourceKey, new Set());
|
|
38
|
+
}
|
|
39
|
+
this.sourceToAssociations.get(sourceKey).add(id);
|
|
29
40
|
}
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
this.
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
41
|
+
}
|
|
42
|
+
withValidation(fn) {
|
|
43
|
+
const snap = this.snapshot();
|
|
44
|
+
try {
|
|
45
|
+
const result = fn();
|
|
46
|
+
const validation = this.validate();
|
|
47
|
+
if (!validation.ok) {
|
|
48
|
+
this.restoreFromSnapshot(snap);
|
|
49
|
+
throw new InvariantViolationError(validation.violations);
|
|
50
|
+
}
|
|
51
|
+
return result;
|
|
37
52
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
53
|
+
catch (e) {
|
|
54
|
+
if (!(e instanceof InvariantViolationError)) {
|
|
55
|
+
this.restoreFromSnapshot(snap);
|
|
56
|
+
}
|
|
57
|
+
throw e;
|
|
43
58
|
}
|
|
44
|
-
|
|
45
|
-
|
|
59
|
+
}
|
|
60
|
+
add(assoc) {
|
|
61
|
+
return this.withValidation(() => {
|
|
62
|
+
if (this.associations.has(assoc.id)) {
|
|
63
|
+
throw new Error(`ClaimSourceAssociation with ID "${assoc.id}" already exists.`);
|
|
64
|
+
}
|
|
65
|
+
const claim = this.claimLookup.get(assoc.claimId, assoc.claimVersion);
|
|
66
|
+
if (!claim) {
|
|
67
|
+
throw new Error(`Claim "${assoc.claimId}" version ${assoc.claimVersion} not found in claim lookup.`);
|
|
68
|
+
}
|
|
69
|
+
const source = this.sourceLookup.get(assoc.sourceId, assoc.sourceVersion);
|
|
70
|
+
if (!source) {
|
|
71
|
+
throw new Error(`Source "${assoc.sourceId}" version ${assoc.sourceVersion} not found in source lookup.`);
|
|
72
|
+
}
|
|
73
|
+
const full = { ...assoc, checksum: "" };
|
|
74
|
+
full.checksum = this.computeChecksum(full);
|
|
75
|
+
this.associations.set(full.id, full);
|
|
76
|
+
let claimSet = this.claimToAssociations.get(full.claimId);
|
|
77
|
+
if (!claimSet) {
|
|
78
|
+
claimSet = new Set();
|
|
79
|
+
this.claimToAssociations.set(full.claimId, claimSet);
|
|
80
|
+
}
|
|
81
|
+
claimSet.add(full.id);
|
|
82
|
+
let sourceSet = this.sourceToAssociations.get(full.sourceId);
|
|
83
|
+
if (!sourceSet) {
|
|
84
|
+
sourceSet = new Set();
|
|
85
|
+
this.sourceToAssociations.set(full.sourceId, sourceSet);
|
|
86
|
+
}
|
|
87
|
+
sourceSet.add(full.id);
|
|
88
|
+
return full;
|
|
89
|
+
});
|
|
46
90
|
}
|
|
47
91
|
remove(id) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
claimSet
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
sourceSet
|
|
60
|
-
|
|
61
|
-
|
|
92
|
+
return this.withValidation(() => {
|
|
93
|
+
const assoc = this.associations.get(id);
|
|
94
|
+
if (!assoc) {
|
|
95
|
+
throw new Error(`ClaimSourceAssociation "${id}" not found.`);
|
|
96
|
+
}
|
|
97
|
+
this.associations.delete(id);
|
|
98
|
+
const claimSet = this.claimToAssociations.get(assoc.claimId);
|
|
99
|
+
if (claimSet) {
|
|
100
|
+
claimSet.delete(id);
|
|
101
|
+
}
|
|
102
|
+
const sourceSet = this.sourceToAssociations.get(assoc.sourceId);
|
|
103
|
+
if (sourceSet) {
|
|
104
|
+
sourceSet.delete(id);
|
|
105
|
+
}
|
|
106
|
+
return assoc;
|
|
107
|
+
});
|
|
62
108
|
}
|
|
63
109
|
getForClaim(claimId) {
|
|
64
110
|
const ids = this.claimToAssociations.get(claimId);
|
|
@@ -107,6 +153,36 @@ export class ClaimSourceLibrary {
|
|
|
107
153
|
}
|
|
108
154
|
return lib;
|
|
109
155
|
}
|
|
156
|
+
validate() {
|
|
157
|
+
const violations = [];
|
|
158
|
+
for (const [id, assoc] of this.associations) {
|
|
159
|
+
if (!Value.Check(CoreClaimSourceAssociationSchema, assoc)) {
|
|
160
|
+
violations.push({
|
|
161
|
+
code: ASSOC_SCHEMA_INVALID,
|
|
162
|
+
message: `Association "${id}" does not conform to schema`,
|
|
163
|
+
entityType: "association",
|
|
164
|
+
entityId: id,
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
if (!this.claimLookup.get(assoc.claimId, assoc.claimVersion)) {
|
|
168
|
+
violations.push({
|
|
169
|
+
code: ASSOC_CLAIM_REF_NOT_FOUND,
|
|
170
|
+
message: `Association "${id}" references non-existent claim "${assoc.claimId}" version ${assoc.claimVersion}`,
|
|
171
|
+
entityType: "association",
|
|
172
|
+
entityId: id,
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
if (!this.sourceLookup.get(assoc.sourceId, assoc.sourceVersion)) {
|
|
176
|
+
violations.push({
|
|
177
|
+
code: ASSOC_SOURCE_REF_NOT_FOUND,
|
|
178
|
+
message: `Association "${id}" references non-existent source "${assoc.sourceId}" version ${assoc.sourceVersion}`,
|
|
179
|
+
entityType: "association",
|
|
180
|
+
entityId: id,
|
|
181
|
+
});
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
return { ok: violations.length === 0, violations };
|
|
185
|
+
}
|
|
110
186
|
computeChecksum(assoc) {
|
|
111
187
|
const fields = this.checksumConfig?.claimSourceAssociationFields ??
|
|
112
188
|
DEFAULT_CHECKSUM_CONFIG.claimSourceAssociationFields;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claim-source-library.js","sourceRoot":"","sources":["../../../src/lib/core/claim-source-library.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"claim-source-library.js","sourceRoot":"","sources":["../../../src/lib/core/claim-source-library.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/core/diff.d.ts
CHANGED
|
@@ -17,4 +17,14 @@ export declare function defaultCompareExpression(before: TCorePropositionalExpre
|
|
|
17
17
|
* the `defaultCompare*` functions.
|
|
18
18
|
*/
|
|
19
19
|
export declare function diffArguments<TArg extends TCoreArgument = TCoreArgument, TPremise extends TCorePremise = TCorePremise, TExpr extends TCorePropositionalExpression = TCorePropositionalExpression, TVar extends TCorePropositionalVariable = TCorePropositionalVariable>(engineA: ArgumentEngine<TArg, TPremise, TExpr, TVar>, engineB: ArgumentEngine<TArg, TPremise, TExpr, TVar>, options?: TCoreDiffOptions<TArg, TVar, TPremise, TExpr>): TCoreArgumentDiff<TArg, TVar, TPremise, TExpr>;
|
|
20
|
+
/**
|
|
21
|
+
* Creates entity matchers for fork-aware diffing.
|
|
22
|
+
* Pairs entity A with entity B when B was forked from A
|
|
23
|
+
* (B's forkedFrom*Id matches A's id and argument identity).
|
|
24
|
+
*/
|
|
25
|
+
export declare function createForkedFromMatcher<TPremise extends TCorePremise = TCorePremise, TExpr extends TCorePropositionalExpression = TCorePropositionalExpression, TVar extends TCorePropositionalVariable = TCorePropositionalVariable>(): {
|
|
26
|
+
premiseMatcher: (a: TPremise, b: TPremise) => boolean;
|
|
27
|
+
variableMatcher: (a: TVar, b: TVar) => boolean;
|
|
28
|
+
expressionMatcher: (a: TExpr, b: TExpr) => boolean;
|
|
29
|
+
};
|
|
20
30
|
//# sourceMappingURL=diff.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../src/lib/core/diff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,aAAa,EACb,YAAY,EACZ,4BAA4B,EAC5B,0BAA0B,EAC7B,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EACR,iBAAiB,EACjB,gBAAgB,EAGhB,gBAAgB,EAKnB,MAAM,kBAAkB,CAAA;AACzB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAE1D,kHAAkH;AAClH,wBAAgB,sBAAsB,CAClC,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,aAAa,GACtB,gBAAgB,EAAE,CAEpB;AAED,uGAAuG;AACvG,wBAAgB,sBAAsB,CAClC,IAAI,SAAS,0BAA0B,GAAG,0BAA0B,EACtE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,GAAG,gBAAgB,EAAE,CA4B/C;AAED,kHAAkH;AAClH,wBAAgB,qBAAqB,CACjC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,YAAY,GACrB,gBAAgB,EAAE,CAEpB;AAED,iJAAiJ;AACjJ,wBAAgB,wBAAwB,CACpC,MAAM,EAAE,4BAA4B,EACpC,KAAK,EAAE,4BAA4B,GACpC,gBAAgB,EAAE,CA0CpB;
|
|
1
|
+
{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../src/lib/core/diff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,aAAa,EACb,YAAY,EACZ,4BAA4B,EAC5B,0BAA0B,EAC7B,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EACR,iBAAiB,EACjB,gBAAgB,EAGhB,gBAAgB,EAKnB,MAAM,kBAAkB,CAAA;AACzB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAE1D,kHAAkH;AAClH,wBAAgB,sBAAsB,CAClC,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,aAAa,GACtB,gBAAgB,EAAE,CAEpB;AAED,uGAAuG;AACvG,wBAAgB,sBAAsB,CAClC,IAAI,SAAS,0BAA0B,GAAG,0BAA0B,EACtE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,GAAG,gBAAgB,EAAE,CA4B/C;AAED,kHAAkH;AAClH,wBAAgB,qBAAqB,CACjC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,YAAY,GACrB,gBAAgB,EAAE,CAEpB;AAED,iJAAiJ;AACjJ,wBAAgB,wBAAwB,CACpC,MAAM,EAAE,4BAA4B,EACpC,KAAK,EAAE,4BAA4B,GACpC,gBAAgB,EAAE,CA0CpB;AAkND;;;;;;GAMG;AACH,wBAAgB,aAAa,CACzB,IAAI,SAAS,aAAa,GAAG,aAAa,EAC1C,QAAQ,SAAS,YAAY,GAAG,YAAY,EAC5C,KAAK,SAAS,4BAA4B,GAAG,4BAA4B,EACzE,IAAI,SAAS,0BAA0B,GAAG,0BAA0B,EAEpE,OAAO,EAAE,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,EACpD,OAAO,EAAE,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,EACpD,OAAO,CAAC,EAAE,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,GACxD,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CA0DhD;AAMD;;;;GAIG;AACH,wBAAgB,uBAAuB,CACnC,QAAQ,SAAS,YAAY,GAAG,YAAY,EAC5C,KAAK,SAAS,4BAA4B,GAAG,4BAA4B,EACzE,IAAI,SAAS,0BAA0B,GAAG,0BAA0B,KACnE;IACD,cAAc,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,KAAK,OAAO,CAAA;IACrD,eAAe,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,KAAK,OAAO,CAAA;IAC9C,iBAAiB,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,KAAK,OAAO,CAAA;CACrD,CA4BA"}
|
package/dist/lib/core/diff.js
CHANGED
|
@@ -79,44 +79,106 @@ export function defaultCompareExpression(before, after) {
|
|
|
79
79
|
// ---------------------------------------------------------------------------
|
|
80
80
|
// Entity set diffing helpers
|
|
81
81
|
// ---------------------------------------------------------------------------
|
|
82
|
-
function diffEntitySet(beforeItems, afterItems, compare) {
|
|
83
|
-
|
|
84
|
-
|
|
82
|
+
function diffEntitySet(beforeItems, afterItems, compare, matcher) {
|
|
83
|
+
if (!matcher) {
|
|
84
|
+
const beforeById = new Map(beforeItems.map((item) => [item.id, item]));
|
|
85
|
+
const afterById = new Map(afterItems.map((item) => [item.id, item]));
|
|
86
|
+
const added = [];
|
|
87
|
+
const removed = [];
|
|
88
|
+
const modified = [];
|
|
89
|
+
for (const [id, beforeItem] of beforeById) {
|
|
90
|
+
const afterItem = afterById.get(id);
|
|
91
|
+
if (!afterItem) {
|
|
92
|
+
removed.push(beforeItem);
|
|
93
|
+
continue;
|
|
94
|
+
}
|
|
95
|
+
const changes = compare(beforeItem, afterItem);
|
|
96
|
+
if (changes.length > 0) {
|
|
97
|
+
modified.push({ before: beforeItem, after: afterItem, changes });
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
for (const [id, afterItem] of afterById) {
|
|
101
|
+
if (!beforeById.has(id)) {
|
|
102
|
+
added.push(afterItem);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
return { added, removed, modified };
|
|
106
|
+
}
|
|
107
|
+
// Custom matcher-based pairing
|
|
85
108
|
const added = [];
|
|
86
109
|
const removed = [];
|
|
87
110
|
const modified = [];
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
111
|
+
const matchedAfterIndices = new Set();
|
|
112
|
+
for (const beforeItem of beforeItems) {
|
|
113
|
+
const afterIndex = afterItems.findIndex((afterItem, i) => !matchedAfterIndices.has(i) && matcher(beforeItem, afterItem));
|
|
114
|
+
if (afterIndex === -1) {
|
|
91
115
|
removed.push(beforeItem);
|
|
92
116
|
continue;
|
|
93
117
|
}
|
|
118
|
+
matchedAfterIndices.add(afterIndex);
|
|
119
|
+
const afterItem = afterItems[afterIndex];
|
|
94
120
|
const changes = compare(beforeItem, afterItem);
|
|
95
121
|
if (changes.length > 0) {
|
|
96
122
|
modified.push({ before: beforeItem, after: afterItem, changes });
|
|
97
123
|
}
|
|
98
124
|
}
|
|
99
|
-
for (
|
|
100
|
-
if (!
|
|
101
|
-
added.push(
|
|
125
|
+
for (let i = 0; i < afterItems.length; i++) {
|
|
126
|
+
if (!matchedAfterIndices.has(i)) {
|
|
127
|
+
added.push(afterItems[i]);
|
|
102
128
|
}
|
|
103
129
|
}
|
|
104
130
|
return { added, removed, modified };
|
|
105
131
|
}
|
|
106
|
-
function diffPremiseSet(beforePremises, afterPremises, beforeExpressions, afterExpressions, comparePremise, compareExpression) {
|
|
107
|
-
|
|
108
|
-
|
|
132
|
+
function diffPremiseSet(beforePremises, afterPremises, beforeExpressions, afterExpressions, comparePremise, compareExpression, premiseMatcher, expressionMatcher) {
|
|
133
|
+
if (!premiseMatcher) {
|
|
134
|
+
const beforeById = new Map(beforePremises.map((p) => [p.id, p]));
|
|
135
|
+
const afterById = new Map(afterPremises.map((p) => [p.id, p]));
|
|
136
|
+
const added = [];
|
|
137
|
+
const removed = [];
|
|
138
|
+
const modified = [];
|
|
139
|
+
for (const [id, beforePremise] of beforeById) {
|
|
140
|
+
const afterPremise = afterById.get(id);
|
|
141
|
+
if (!afterPremise) {
|
|
142
|
+
removed.push(beforePremise);
|
|
143
|
+
continue;
|
|
144
|
+
}
|
|
145
|
+
const premiseChanges = comparePremise(beforePremise, afterPremise);
|
|
146
|
+
const expressionsDiff = diffEntitySet(beforeExpressions.get(id) ?? [], afterExpressions.get(id) ?? [], compareExpression, expressionMatcher);
|
|
147
|
+
const hasExpressionChanges = expressionsDiff.added.length > 0 ||
|
|
148
|
+
expressionsDiff.removed.length > 0 ||
|
|
149
|
+
expressionsDiff.modified.length > 0;
|
|
150
|
+
if (premiseChanges.length > 0 || hasExpressionChanges) {
|
|
151
|
+
modified.push({
|
|
152
|
+
before: beforePremise,
|
|
153
|
+
after: afterPremise,
|
|
154
|
+
changes: premiseChanges,
|
|
155
|
+
expressions: expressionsDiff,
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
for (const [id, afterPremise] of afterById) {
|
|
160
|
+
if (!beforeById.has(id)) {
|
|
161
|
+
added.push(afterPremise);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
return { added, removed, modified };
|
|
165
|
+
}
|
|
166
|
+
// Custom matcher-based pairing for premises
|
|
109
167
|
const added = [];
|
|
110
168
|
const removed = [];
|
|
111
169
|
const modified = [];
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
170
|
+
const matchedAfterIndices = new Set();
|
|
171
|
+
for (const beforePremise of beforePremises) {
|
|
172
|
+
const afterIndex = afterPremises.findIndex((afterPremise, i) => !matchedAfterIndices.has(i) &&
|
|
173
|
+
premiseMatcher(beforePremise, afterPremise));
|
|
174
|
+
if (afterIndex === -1) {
|
|
115
175
|
removed.push(beforePremise);
|
|
116
176
|
continue;
|
|
117
177
|
}
|
|
178
|
+
matchedAfterIndices.add(afterIndex);
|
|
179
|
+
const afterPremise = afterPremises[afterIndex];
|
|
118
180
|
const premiseChanges = comparePremise(beforePremise, afterPremise);
|
|
119
|
-
const expressionsDiff = diffEntitySet(beforeExpressions.get(id) ?? [], afterExpressions.get(id) ?? [], compareExpression);
|
|
181
|
+
const expressionsDiff = diffEntitySet(beforeExpressions.get(beforePremise.id) ?? [], afterExpressions.get(afterPremise.id) ?? [], compareExpression, expressionMatcher);
|
|
120
182
|
const hasExpressionChanges = expressionsDiff.added.length > 0 ||
|
|
121
183
|
expressionsDiff.removed.length > 0 ||
|
|
122
184
|
expressionsDiff.modified.length > 0;
|
|
@@ -129,9 +191,9 @@ function diffPremiseSet(beforePremises, afterPremises, beforeExpressions, afterE
|
|
|
129
191
|
});
|
|
130
192
|
}
|
|
131
193
|
}
|
|
132
|
-
for (
|
|
133
|
-
if (!
|
|
134
|
-
added.push(
|
|
194
|
+
for (let i = 0; i < afterPremises.length; i++) {
|
|
195
|
+
if (!matchedAfterIndices.has(i)) {
|
|
196
|
+
added.push(afterPremises[i]);
|
|
135
197
|
}
|
|
136
198
|
}
|
|
137
199
|
return { added, removed, modified };
|
|
@@ -190,9 +252,40 @@ export function diffArguments(engineA, engineB, options) {
|
|
|
190
252
|
after: argB,
|
|
191
253
|
changes: argumentChanges,
|
|
192
254
|
},
|
|
193
|
-
variables: diffEntitySet(collectVariables(engineA), collectVariables(engineB), compareVar),
|
|
194
|
-
premises: diffPremiseSet(premisesA, premisesB, expressionsA, expressionsB, comparePrem, compareExpr),
|
|
255
|
+
variables: diffEntitySet(collectVariables(engineA), collectVariables(engineB), compareVar, options?.variableMatcher),
|
|
256
|
+
premises: diffPremiseSet(premisesA, premisesB, expressionsA, expressionsB, comparePrem, compareExpr, options?.premiseMatcher, options?.expressionMatcher),
|
|
195
257
|
roles: diffRoles(rolesA.conclusionPremiseId, rolesB.conclusionPremiseId),
|
|
196
258
|
};
|
|
197
259
|
}
|
|
260
|
+
// ---------------------------------------------------------------------------
|
|
261
|
+
// Fork-aware matchers
|
|
262
|
+
// ---------------------------------------------------------------------------
|
|
263
|
+
/**
|
|
264
|
+
* Creates entity matchers for fork-aware diffing.
|
|
265
|
+
* Pairs entity A with entity B when B was forked from A
|
|
266
|
+
* (B's forkedFrom*Id matches A's id and argument identity).
|
|
267
|
+
*/
|
|
268
|
+
export function createForkedFromMatcher() {
|
|
269
|
+
return {
|
|
270
|
+
premiseMatcher: (a, b) => {
|
|
271
|
+
const bRec = b;
|
|
272
|
+
return (bRec.forkedFromPremiseId === a.id &&
|
|
273
|
+
bRec.forkedFromArgumentId === a.argumentId &&
|
|
274
|
+
bRec.forkedFromArgumentVersion === a.argumentVersion);
|
|
275
|
+
},
|
|
276
|
+
variableMatcher: (a, b) => {
|
|
277
|
+
const bRec = b;
|
|
278
|
+
return (bRec.forkedFromVariableId === a.id &&
|
|
279
|
+
bRec.forkedFromArgumentId === a.argumentId &&
|
|
280
|
+
bRec.forkedFromArgumentVersion === a.argumentVersion);
|
|
281
|
+
},
|
|
282
|
+
expressionMatcher: (a, b) => {
|
|
283
|
+
const bRec = b;
|
|
284
|
+
return (bRec.forkedFromExpressionId === a.id &&
|
|
285
|
+
bRec.forkedFromPremiseId === a.premiseId &&
|
|
286
|
+
bRec.forkedFromArgumentId === a.argumentId &&
|
|
287
|
+
bRec.forkedFromArgumentVersion === a.argumentVersion);
|
|
288
|
+
},
|
|
289
|
+
};
|
|
290
|
+
}
|
|
198
291
|
//# sourceMappingURL=diff.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../src/lib/core/diff.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../src/lib/core/diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { TCoreLogicalOperatorType, TCorePropositionalExpression } from "../
|
|
|
2
2
|
import type { ChangeCollector } from "./change-collector.js";
|
|
3
3
|
import type { TLogicEngineOptions } from "./argument-engine.js";
|
|
4
4
|
import { type TGrammarConfig } from "../types/grammar.js";
|
|
5
|
+
import type { TInvariantValidationResult } from "../types/validation.js";
|
|
5
6
|
export type TExpressionInput<TExpr extends TCorePropositionalExpression = TCorePropositionalExpression> = TExpr extends infer U ? U extends TCorePropositionalExpression ? Omit<U, "checksum" | "descendantChecksum" | "combinedChecksum"> : never : never;
|
|
6
7
|
export type TExpressionWithoutPosition<TExpr extends TCorePropositionalExpression = TCorePropositionalExpression> = TExpr extends infer U ? U extends TCorePropositionalExpression ? Omit<U, "position" | "checksum" | "descendantChecksum" | "combinedChecksum"> : never : never;
|
|
7
8
|
export type TExpressionManagerSnapshot<TExpr extends TCorePropositionalExpression = TCorePropositionalExpression> = {
|
|
@@ -207,6 +208,16 @@ export declare class ExpressionManager<TExpr extends TCorePropositionalExpressio
|
|
|
207
208
|
* Used by restoration paths (fromData, rollback) that load existing data.
|
|
208
209
|
*/
|
|
209
210
|
loadExpressions(expressions: TExpressionInput<TExpr>[]): void;
|
|
211
|
+
/**
|
|
212
|
+
* Performs a comprehensive validation sweep on all managed expressions.
|
|
213
|
+
*
|
|
214
|
+
* Collects ALL violations rather than failing on the first one. Checks:
|
|
215
|
+
* schema validity, duplicate IDs, self-referential parents, parent
|
|
216
|
+
* existence, parent container type, root-only operators, formula-between-
|
|
217
|
+
* operators (when enabled), child limits, position uniqueness, and
|
|
218
|
+
* checksum integrity.
|
|
219
|
+
*/
|
|
220
|
+
validate(): TInvariantValidationResult;
|
|
210
221
|
/** Returns a serializable snapshot of the current state. */
|
|
211
222
|
snapshot(): TExpressionManagerSnapshot<TExpr>;
|
|
212
223
|
/** Creates a new ExpressionManager from a previously captured snapshot. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression-manager.d.ts","sourceRoot":"","sources":["../../../src/lib/core/expression-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,wBAAwB,EACxB,4BAA4B,EAC/B,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"expression-manager.d.ts","sourceRoot":"","sources":["../../../src/lib/core/expression-manager.ts"],"names":[],"mappings":"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"}
|