@ifc-lite/mcp 0.17.0 → 0.20.2

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 (119) hide show
  1. package/dist/authored-attribute-value.d.ts +3 -0
  2. package/dist/authored-attribute-value.d.ts.map +1 -0
  3. package/dist/authored-attribute-value.js +34 -0
  4. package/dist/authored-attribute-value.js.map +1 -0
  5. package/dist/backend-query-relationships.d.ts +5 -0
  6. package/dist/backend-query-relationships.d.ts.map +1 -0
  7. package/dist/backend-query-relationships.js +55 -0
  8. package/dist/backend-query-relationships.js.map +1 -0
  9. package/dist/backend-query.d.ts +5 -6
  10. package/dist/backend-query.d.ts.map +1 -1
  11. package/dist/backend-query.js +81 -140
  12. package/dist/backend-query.js.map +1 -1
  13. package/dist/context.d.ts +8 -0
  14. package/dist/context.d.ts.map +1 -1
  15. package/dist/context.js.map +1 -1
  16. package/dist/effective-entity-membership.d.ts +8 -0
  17. package/dist/effective-entity-membership.d.ts.map +1 -0
  18. package/dist/effective-entity-membership.js +23 -0
  19. package/dist/effective-entity-membership.js.map +1 -0
  20. package/dist/headless-backend-cost-store.d.ts +14 -0
  21. package/dist/headless-backend-cost-store.d.ts.map +1 -0
  22. package/dist/headless-backend-cost-store.js +20 -0
  23. package/dist/headless-backend-cost-store.js.map +1 -0
  24. package/dist/headless-backend-store-stubs.d.ts +12 -0
  25. package/dist/headless-backend-store-stubs.d.ts.map +1 -0
  26. package/dist/headless-backend-store-stubs.js +9 -0
  27. package/dist/headless-backend-store-stubs.js.map +1 -0
  28. package/dist/headless-backend-structural-store.d.ts +21 -0
  29. package/dist/headless-backend-structural-store.d.ts.map +1 -0
  30. package/dist/headless-backend-structural-store.js +20 -0
  31. package/dist/headless-backend-structural-store.js.map +1 -0
  32. package/dist/headless-backend.d.ts +2 -1
  33. package/dist/headless-backend.d.ts.map +1 -1
  34. package/dist/headless-backend.js +9 -9
  35. package/dist/headless-backend.js.map +1 -1
  36. package/dist/index.d.ts +9 -1
  37. package/dist/index.d.ts.map +1 -1
  38. package/dist/index.js +12 -1
  39. package/dist/index.js.map +1 -1
  40. package/dist/loader.d.ts.map +1 -1
  41. package/dist/loader.js +4 -0
  42. package/dist/loader.js.map +1 -1
  43. package/dist/overlay.d.ts +23 -28
  44. package/dist/overlay.d.ts.map +1 -1
  45. package/dist/overlay.js +84 -99
  46. package/dist/overlay.js.map +1 -1
  47. package/dist/protocol/types.d.ts +0 -1
  48. package/dist/protocol/types.d.ts.map +1 -1
  49. package/dist/schema-tables.d.ts.map +1 -1
  50. package/dist/schema-tables.js +4 -2
  51. package/dist/schema-tables.js.map +1 -1
  52. package/dist/server.js +2 -2
  53. package/dist/server.js.map +1 -1
  54. package/dist/spatial-tree.d.ts.map +1 -1
  55. package/dist/spatial-tree.js +3 -9
  56. package/dist/spatial-tree.js.map +1 -1
  57. package/dist/tools/check-rules.d.ts +3 -0
  58. package/dist/tools/check-rules.d.ts.map +1 -0
  59. package/dist/tools/check-rules.js +75 -0
  60. package/dist/tools/check-rules.js.map +1 -0
  61. package/dist/tools/diff-authored-keys.d.ts +68 -0
  62. package/dist/tools/diff-authored-keys.d.ts.map +1 -0
  63. package/dist/tools/diff-authored-keys.js +166 -0
  64. package/dist/tools/diff-authored-keys.js.map +1 -0
  65. package/dist/tools/diff-content.d.ts +33 -0
  66. package/dist/tools/diff-content.d.ts.map +1 -0
  67. package/dist/tools/diff-content.js +158 -0
  68. package/dist/tools/diff-content.js.map +1 -0
  69. package/dist/tools/diff-entity-scope.d.ts +53 -0
  70. package/dist/tools/diff-entity-scope.d.ts.map +1 -0
  71. package/dist/tools/diff-entity-scope.js +94 -0
  72. package/dist/tools/diff-entity-scope.js.map +1 -0
  73. package/dist/tools/diff-fingerprints.d.ts +4 -2
  74. package/dist/tools/diff-fingerprints.d.ts.map +1 -1
  75. package/dist/tools/diff-fingerprints.js +69 -153
  76. package/dist/tools/diff-fingerprints.js.map +1 -1
  77. package/dist/tools/diff.d.ts.map +1 -1
  78. package/dist/tools/diff.js +40 -117
  79. package/dist/tools/diff.js.map +1 -1
  80. package/dist/tools/entity-target-schema.d.ts +16 -0
  81. package/dist/tools/entity-target-schema.d.ts.map +1 -0
  82. package/dist/tools/entity-target-schema.js +32 -0
  83. package/dist/tools/entity-target-schema.js.map +1 -0
  84. package/dist/tools/flow.d.ts +3 -0
  85. package/dist/tools/flow.d.ts.map +1 -0
  86. package/dist/tools/flow.js +239 -0
  87. package/dist/tools/flow.js.map +1 -0
  88. package/dist/tools/ids-accessor.d.ts +9 -1
  89. package/dist/tools/ids-accessor.d.ts.map +1 -1
  90. package/dist/tools/ids-accessor.js +9 -2
  91. package/dist/tools/ids-accessor.js.map +1 -1
  92. package/dist/tools/index.d.ts +4 -1
  93. package/dist/tools/index.d.ts.map +1 -1
  94. package/dist/tools/index.js +7 -1
  95. package/dist/tools/index.js.map +1 -1
  96. package/dist/tools/mutate.d.ts.map +1 -1
  97. package/dist/tools/mutate.js +15 -46
  98. package/dist/tools/mutate.js.map +1 -1
  99. package/dist/tools/structural.d.ts +11 -0
  100. package/dist/tools/structural.d.ts.map +1 -0
  101. package/dist/tools/structural.js +23 -0
  102. package/dist/tools/structural.js.map +1 -0
  103. package/dist/tools/util.d.ts.map +1 -1
  104. package/dist/tools/util.js +15 -18
  105. package/dist/tools/util.js.map +1 -1
  106. package/dist/tools/validation.d.ts.map +1 -1
  107. package/dist/tools/validation.js +40 -41
  108. package/dist/tools/validation.js.map +1 -1
  109. package/dist/tools/viewer.d.ts.map +1 -1
  110. package/dist/tools/viewer.js +10 -29
  111. package/dist/tools/viewer.js.map +1 -1
  112. package/dist/validate.d.ts +22 -1
  113. package/dist/validate.d.ts.map +1 -1
  114. package/dist/validate.js +45 -10
  115. package/dist/validate.js.map +1 -1
  116. package/dist/viewer-manager.d.ts.map +1 -1
  117. package/dist/viewer-manager.js +1 -0
  118. package/dist/viewer-manager.js.map +1 -1
  119. package/package.json +24 -20
@@ -1 +1 @@
1
- {"version":3,"file":"diff-fingerprints.d.ts","sourceRoot":"","sources":["../../src/tools/diff-fingerprints.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmFG;AAEH,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAaL,KAAK,YAAY,EAClB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAiB,cAAc,EAAE,MAAM,eAAe,CAAC;AAEnE,yEAAyE;AACzE,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC;AAwE7B;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,YAAY,EACnB,OAAO,CAAC,EAAE,cAAc,GAAG,IAAI,GAC9B,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAyD9B"}
1
+ {"version":3,"file":"diff-fingerprints.d.ts","sourceRoot":"","sources":["../../src/tools/diff-fingerprints.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmFG;AAEH,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAaL,KAAK,YAAY,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAyD,KAAK,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAGhI,OAAO,EAAE,mBAAmB,EAAE,KAAK,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC9F,OAAO,EAAgC,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAElF,yEAAyE;AACzE,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC;AAM7B;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,YAAY,EACnB,OAAO,CAAC,EAAE,cAAc,GAAG,IAAI,EAC/B,OAAO,GAAE,yBAA8B,GACtC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAsD9B"}
@@ -86,62 +86,13 @@
86
86
  * fingerprints, which the paired tests check.
87
87
  */
88
88
  import { buildComponentFingerprints, buildDataFingerprint, } from '@ifc-lite/diff';
89
- import { RelationshipType } from '@ifc-lite/data';
90
- import { EntityExtractor, extractAllEntityAttributes, extractClassificationsOnDemand, extractProjectUnits, extractPropertiesOnDemand, extractQuantitiesOnDemand, extractRootAttributesFromEntity, getAttributeNamesAcrossSchemas, getInheritanceChainAcrossSchemas, quantitySiScale, roundToScale, scaledPropertyValue, } from '@ifc-lite/parser';
89
+ import { RelationshipType, resolvedTypeName } from '@ifc-lite/data';
90
+ import { EntityExtractor, extractAllEntityAttributes, extractClassificationsOnDemand, extractProjectUnits, extractPropertiesOnDemand, extractQuantitiesOnDemand, extractRootAttributesFromEntity, spatialContainerPath, getAttributeNamesAcrossSchemas, quantitySiScale, roundToScale, scaledPropertyValue, } from '@ifc-lite/parser';
91
+ import { attributeAcrossSchemas, authoredKeyResolver, override } from './diff-authored-keys.js';
91
92
  import { classificationLabel } from './diff-classification-label.js';
92
- /**
93
- * Classify one STEP type against the three `IfcRoot` branches.
94
- *
95
- * The chain has to come from **every bundled schema**, not from the parser's
96
- * IFC4 codegen pin. `getInheritanceChainForEntity` answers an empty chain for
97
- * any class the pin does not carry, and that is not a rare corner: IFC2X3 alone
98
- * puts 23 `IfcObjectDefinition` classes there (`IfcMove`, `IfcOrderAction`,
99
- * `IfcScheduleTimeControl`, `IfcSpaceProgram`, `IfcServiceLife`, …) and IFC4X3
100
- * another 77. Judging those as `unknown` dropped the ones the `EntityTable`
101
- * does not hold — real objects with real GlobalIds — and let through the
102
- * IFC2X3-only *resource* classes it does hold under a `…STYLE` name, keyed on
103
- * the Name in slot 0. Both are wrong answers about an IFC2X3 file, which is
104
- * still most of what is in the wild.
105
- *
106
- * `unknown` is still not `dependent`: a vendor extension no schema declares has
107
- * no chain to judge, so it keeps exactly the reach the `EntityTable` already
108
- * gave it — which for a `…TYPE` class is a genuine GlobalId, since the parser's
109
- * type-object branch is name-based and takes those in. Guessing that an
110
- * unrecognised class is an `IfcObject` and reading its source record instead
111
- * would cost one STEP extraction per row of every unrecognised bucket in the
112
- * model, on every call, to reach entities almost no file has. The price of that
113
- * choice is that a vendor `IfcRoot` subtype whose name does not end in `TYPE`
114
- * stays uncompared.
115
- *
116
- * The one name the chain is not needed for is `IFCREL…`: that prefix is the
117
- * parser's own rule for taking an unrecognised relationship into the table, and
118
- * a relationship is excluded here whether any schema can confirm it or not.
119
- * Without this, an unrecognised `IfcRelXxx` would be the single class of entity
120
- * that got in through the relationship branch the comparison deliberately shuts.
121
- */
122
- function classifyType(typeKey) {
123
- const upper = typeKey.toUpperCase();
124
- const chain = getInheritanceChainAcrossSchemas(upper);
125
- if (chain.length === 0) {
126
- return {
127
- role: upper.startsWith('IFCREL') ? 'dependent' : 'unknown',
128
- name: typeKey,
129
- typeObject: false,
130
- };
131
- }
132
- // The chain holds the class itself plus its supertypes; which end the leaf
133
- // sits at is the schema source's business — the union walk answers leaf→root
134
- // and the IFC4 pin it falls back to answers root→leaf — so find it by name.
135
- const name = chain.find((ancestor) => ancestor.toUpperCase() === upper) ?? typeKey;
136
- const typeObject = chain.includes('IfcTypeObject');
137
- if (!chain.includes('IfcRoot'))
138
- return { role: 'dependent', name, typeObject };
139
- return {
140
- role: chain.includes('IfcObjectDefinition') ? 'independent' : 'dependent',
141
- name,
142
- typeObject,
143
- };
144
- }
93
+ import { classifyType, comparableEntities } from './diff-entity-scope.js';
94
+ export { AUTHORED_KEY_PREFIX } from './diff-authored-keys.js';
95
+ import { stepText } from '../overlay.js';
145
96
  /**
146
97
  * Build one {@link EntityFingerprint} per `IfcObjectDefinition` in a store.
147
98
  *
@@ -157,60 +108,59 @@ function classifyType(typeKey) {
157
108
  * values. Omitting it (the CLI twin has no session to overlay) is the original
158
109
  * store-only behaviour exactly.
159
110
  */
160
- export function buildModelFingerprints(store, overlay) {
111
+ export function buildModelFingerprints(store, overlay, options = {}) {
161
112
  const fingerprints = [];
162
113
  const seen = new Set();
163
114
  // One extractor for the whole model: the source read below only fires for
164
115
  // the (small) set of object types the EntityTable declines to hold.
165
116
  const extractor = new EntityExtractor(store.source);
166
117
  const units = extractProjectUnits(store.source, store.entityIndex); // for quantitySiScale/scaledPropertyValue
167
- for (const [typeKey, ids] of store.entityIndex.byType) {
168
- // Classified once per type rather than once per entity — the geometry
169
- // buckets (IfcCartesianPoint, IfcPolyLoop, …) are the bulk of a real model
170
- // and are dismissed here without touching a single row.
118
+ const entities = comparableEntities(store, overlay);
119
+ const keyOf = authoredKeyResolver(store, overlay, options, extractor, entities);
120
+ for (const { expressId, type: typeKey, overlayCreated } of entities) {
121
+ if (overlayCreated) {
122
+ const created = overlay?.createdEntity(expressId);
123
+ if (created && overlay) {
124
+ const fingerprint = createdFingerprint(created, overlay, units, keyOf(expressId, created.globalId));
125
+ if (fingerprint)
126
+ fingerprints.push(fingerprint);
127
+ }
128
+ continue;
129
+ }
171
130
  const type = classifyType(typeKey);
172
- if (type.role === 'dependent')
131
+ if (seen.has(expressId))
173
132
  continue;
174
- for (const expressId of ids) {
175
- if (seen.has(expressId))
176
- continue;
177
- seen.add(expressId);
178
- // Queued for deletion: the session no longer has this entity, so the
179
- // comparison must not keep reporting it as present and unchanged.
180
- if (overlay?.deleted.has(expressId))
181
- continue;
182
- let globalId = store.entities.getGlobalId(expressId);
183
- let source;
184
- if (!globalId && type.role === 'independent') {
185
- // In the model but not in the table: a schedule task, an actor, a work
186
- // plan. Its GlobalId is in the STEP record, so read it there.
187
- source = readRootAttributes(extractor, store, expressId);
188
- globalId = source?.globalId ?? '';
189
- }
190
- // Still nothing: the entity is not an IfcRoot at all (a placement, a
191
- // profile, a representation item), so it has no cross-model identity.
192
- if (!globalId)
193
- continue;
194
- const tableType = store.entities.getTypeName(expressId);
195
- // `getTypeName` answers 'Unknown' for a row the table never took in. The
196
- // registry's own spelling is the honest answer, and it has to be a real
197
- // type name: `ifcType` is hashed into the fingerprint and cross-checked
198
- // on every content match, so 'Unknown' would pair a task with an actor.
199
- const ifcType = source && (!tableType || tableType === 'Unknown') ? type.name : tableType;
200
- const input = buildDataInput(store, expressId, ifcType, source, type.typeObject, overlay, units);
201
- fingerprints.push({
202
- key: globalId,
203
- ifcType,
204
- dataHash: buildDataFingerprint(input),
205
- components: buildComponentFingerprints(input),
206
- ref: expressId,
207
- });
133
+ seen.add(expressId);
134
+ const named = overlay?.attributes(expressId);
135
+ const positional = overlay?.positionalAttributes?.(expressId);
136
+ const editedGlobalId = named?.has('GlobalId') ? named.get('GlobalId')
137
+ : positional?.has(0) ? stepText(positional.get(0)) ?? '' : undefined;
138
+ let globalId = editedGlobalId ?? store.entities.getGlobalId(expressId);
139
+ let source;
140
+ if (!globalId && editedGlobalId === undefined && type.role === 'independent') {
141
+ // In the model but not in the table: a schedule task, an actor, a work
142
+ // plan. Its GlobalId is in the STEP record, so read it there.
143
+ source = readRootAttributes(extractor, store, expressId);
144
+ globalId = source?.globalId ?? '';
208
145
  }
209
- }
210
- for (const entity of overlay?.created ?? []) {
211
- const fingerprint = createdFingerprint(entity, overlay, units);
212
- if (fingerprint)
213
- fingerprints.push(fingerprint);
146
+ // Still nothing: the entity is not an IfcRoot at all (a placement, a
147
+ // profile, a representation item), so it has no cross-model identity.
148
+ if (!globalId)
149
+ continue;
150
+ // The effective class wins over the immutable table's source class.
151
+ const ifcType = type.name;
152
+ const input = buildDataInput(store, expressId, ifcType, source, type.typeObject, overlay, units);
153
+ const fingerprint = {
154
+ key: keyOf(expressId, globalId),
155
+ ifcType,
156
+ dataHash: buildDataFingerprint(input),
157
+ components: buildComponentFingerprints(input),
158
+ ref: expressId,
159
+ };
160
+ const container = spatialContainerPath(store, expressId);
161
+ if (container !== undefined)
162
+ fingerprint.container = container;
163
+ fingerprints.push(fingerprint);
214
164
  }
215
165
  return fingerprints;
216
166
  }
@@ -233,10 +183,12 @@ export function buildModelFingerprints(store, overlay) {
233
183
  * hashed IfcRoot attributes: `Name` and `Description` have a payload behind them
234
184
  * (STEP slots 0/2/3 are fixed across `IfcRoot` subtypes), `ObjectType` has none
235
185
  * (slot 4 is `ApplicableOccurrence` on an `IfcTypeObject`) and so exists only as
236
- * an override, and `Tag` is the same — an override only, and hashed only when
237
- * the created class is an `IfcTypeObject` (issue #2021), matching the stored
238
- * path exactly. Property sets and quantities never had the asymmetry — both
239
- * were already read through the overlay.
186
+ * an override. `Tag` is read from its class-specific authored slot or override,
187
+ * and hashed only for `IfcTypeObject` (issue #2021). Property sets and
188
+ * quantities are read through the overlay.
189
+ *
190
+ * An authored key is resolved from its effective attributes or property sets,
191
+ * alongside source entities, so a duplicate is treated as a collision.
240
192
  *
241
193
  * `predefinedType` and `typeAssignments` are necessarily absent: both are read
242
194
  * through the store, which has no row for an entity that exists only in the
@@ -244,17 +196,19 @@ export function buildModelFingerprints(store, overlay) {
244
196
  * entity that would have matched on those alone therefore reports as added
245
197
  * rather than matched, which is the safe direction.
246
198
  */
247
- function createdFingerprint(entity, overlay, units) {
199
+ function createdFingerprint(entity, overlay, units, // scales Qto_ quantities and measure-typed Pset properties to base SI
200
+ key) {
248
201
  const type = classifyType(entity.ifcType);
249
202
  if (type.role === 'dependent')
250
203
  return null;
251
204
  const edited = overlay.attributes(entity.expressId);
205
+ const tagIndex = getAttributeNamesAcrossSchemas(entity.ifcType).indexOf('Tag');
252
206
  const input = {
253
207
  ifcType: type.name,
254
208
  name: override(edited.get('Name'), entity.name),
255
209
  description: override(edited.get('Description'), entity.description),
256
210
  objectType: override(edited.get('ObjectType'), undefined),
257
- tag: type.typeObject ? override(edited.get('Tag'), undefined) : undefined,
211
+ tag: type.typeObject ? override(edited.get('Tag'), tagIndex < 0 ? undefined : stepText(entity.attributes[tagIndex])) : undefined,
258
212
  propertySets: overlay.propertySets(entity.expressId).map((set) => ({
259
213
  name: set.name,
260
214
  properties: set.properties.map((property) => ({ name: property.name, value: scaledPropertyValue(property.value, property.dataType, units) })),
@@ -269,7 +223,7 @@ function createdFingerprint(entity, overlay, units) {
269
223
  typeAssignments: [],
270
224
  };
271
225
  return {
272
- key: entity.globalId,
226
+ key,
273
227
  ifcType: type.name,
274
228
  dataHash: buildDataFingerprint(input),
275
229
  components: buildComponentFingerprints(input),
@@ -279,6 +233,7 @@ function createdFingerprint(entity, overlay, units) {
279
233
  /** IfcRoot attributes straight from the entity's STEP record, for the rows the
280
234
  * columnar `EntityTable` never took in. */
281
235
  function readRootAttributes(extractor, store, expressId) {
236
+ // @raw-entity-enumeration-ok one source record supplies missing table GlobalId; caller applies overlay identity and membership
282
237
  const ref = store.entityIndex.byId.get(expressId);
283
238
  if (!ref)
284
239
  return undefined;
@@ -314,6 +269,11 @@ overlay, units) {
314
269
  ? attributeAcrossSchemas(store, expressId, ifcType, 'Tag')
315
270
  : undefined;
316
271
  const edited = overlay?.attributes(expressId);
272
+ const tagIndex = isTypeObject ? getAttributeNamesAcrossSchemas(ifcType).indexOf('Tag') : -1;
273
+ const positional = tagIndex >= 0 ? overlay?.positionalAttributes?.(expressId) : undefined;
274
+ const effectiveTag = tagIndex >= 0 && positional?.has(tagIndex)
275
+ ? stepText(positional.get(tagIndex))
276
+ : override(edited?.get('Tag'), storedTag != null ? String(storedTag) : undefined);
317
277
  const propertySets = (overlay
318
278
  ? overlay.propertySets(expressId)
319
279
  : extractPropertiesOnDemand(store, expressId)).map((set) => ({
@@ -333,7 +293,7 @@ overlay, units) {
333
293
  .map((typeId) => ({
334
294
  globalId: store.entities.getGlobalId(typeId) || undefined,
335
295
  name: store.entities.getName(typeId) || undefined,
336
- type: store.entities.getTypeName(typeId) || undefined,
296
+ type: resolvedTypeName(store.entities, typeId),
337
297
  }));
338
298
  const classifications = extractClassificationsOnDemand(store, expressId).map(classificationLabel);
339
299
  return {
@@ -349,54 +309,10 @@ overlay, units) {
349
309
  description: override(edited?.get('Description'), store.entities.getDescription(expressId) || source?.description),
350
310
  objectType: override(edited?.get('ObjectType'), store.entities.getObjectType(expressId) || source?.objectType),
351
311
  predefinedType: predefinedType != null ? String(predefinedType) : undefined,
352
- tag: isTypeObject
353
- ? override(edited?.get('Tag'), storedTag != null ? String(storedTag) : undefined)
354
- : undefined,
312
+ tag: isTypeObject ? effectiveTag : undefined,
355
313
  propertySets,
356
314
  quantitySets,
357
315
  typeAssignments,
358
316
  };
359
317
  }
360
- /**
361
- * One named attribute, read positionally through the **cross-schema** attribute
362
- * list (issue #2021). The CLI's twin, and it must stay one.
363
- *
364
- * `extractAllEntityAttributes` names attributes through the parser's IFC4
365
- * codegen pin, which answers an EMPTY list for a class the pin does not carry —
366
- * so a `.find(name === 'Tag')` over it silently finds nothing on every
367
- * IFC4X3-only type object (`IfcRailType`, `IfcTrackElementType`,
368
- * `IfcSignalType`, …) while working perfectly on IFC2X3 and IFC4. That is a
369
- * no-op nobody would notice: the entity is in scope, its class name is right,
370
- * `isTypeObject` is right, and only the evidence is missing.
371
- *
372
- * This is the same pinned-registry family as the membership defect `#2001`
373
- * fixed, and it has to be answered from the same place: the inheritance chain
374
- * decides *whether* to read a `Tag`, so the attribute list that decides *where*
375
- * it sits must span the same schemas. `getAttributeNamesAcrossSchemas` returns
376
- * the pinned result unchanged for every class the pin does know, so this is
377
- * additive — no IFC2X3 or IFC4 entity's hash moves because of it.
378
- *
379
- * Reads the raw STEP slot rather than reusing `extractAllEntityAttributes`'
380
- * display normalization: this value is hashed, not shown, so `$` (absent) is
381
- * the only case that needs interpreting and it arrives as null.
382
- */
383
- function attributeAcrossSchemas(store, expressId, ifcType, attributeName) {
384
- const index = getAttributeNamesAcrossSchemas(ifcType).indexOf(attributeName);
385
- if (index < 0)
386
- return undefined;
387
- const ref = store.entityIndex.byId.get(expressId);
388
- if (!ref)
389
- return undefined;
390
- const raw = new EntityExtractor(store.source).extractEntity(ref)?.attributes?.[index];
391
- return typeof raw === 'string' || typeof raw === 'number' ? String(raw) : undefined;
392
- }
393
- /**
394
- * An overlay override wins whenever one exists, including when it is empty —
395
- * `entity_set_attribute` with `''` clears the attribute, and falling back to
396
- * the stored value there would hash the edit away.
397
- */
398
- function override(edited, stored) {
399
- const value = edited !== undefined ? edited : stored;
400
- return value ? value : undefined;
401
- }
402
318
  //# sourceMappingURL=diff-fingerprints.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"diff-fingerprints.js","sourceRoot":"","sources":["../../src/tools/diff-fingerprints.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"diff-fingerprints.js","sourceRoot":"","sources":["../../src/tools/diff-fingerprints.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/tools/diff.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAgWvC,eAAO,MAAM,SAAS,EAAE,IAAI,EAA8B,CAAC"}
1
+ {"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/tools/diff.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAsQvC,eAAO,MAAM,SAAS,EAAE,IAAI,EAA8B,CAAC"}
@@ -8,10 +8,11 @@
8
8
  * on-disk file, call `model_load` first.
9
9
  */
10
10
  import { EntityNode } from '@ifc-lite/query';
11
+ import { iterateEffectiveEntityIds } from '@ifc-lite/mutations';
11
12
  import { IFC_ENTITY_NAMES } from '@ifc-lite/data';
12
- import { diffModels } from '@ifc-lite/diff';
13
13
  import { okResult, assertModelAccess } from './util.js';
14
- import { buildModelFingerprints } from './diff-fingerprints.js';
14
+ import { parseAuthoredKeySpec } from '@ifc-lite/parser';
15
+ import { contentDiff, describeCounts, DEFAULT_MAX_GROUP_MEMBERS, DEFAULT_MAX_MATCHES, } from './diff-content.js';
15
16
  import { foldedTypeCounts, pendingMutationsField, pendingOverlay } from '../overlay.js';
16
17
  import { ToolErrorCode, ToolExecutionError } from '../errors.js';
17
18
  import { firstNonBlank } from '../material-naming.js';
@@ -30,102 +31,6 @@ function resolveTwo(ctx, a, b) {
30
31
  assertModelAccess(ctx, right);
31
32
  return { left, right };
32
33
  }
33
- /** Default cap on the listed `contentMatches`. Per-kind totals are reported
34
- * whole, so the cap bounds the payload without hiding anything. */
35
- const DEFAULT_MAX_MATCHES = 200;
36
- /**
37
- * Default cap on the GlobalIds listed per side of one match.
38
- *
39
- * `max_matches` bounds how many groups come back, not how big one is, and a
40
- * `duplicated` / `deduplicated` / `ambiguous` group is a set of candidates that
41
- * in a repetitive model can run to thousands of entities on each side. Without
42
- * this, `max_matches: 1` could still return a model-sized payload and overflow
43
- * the context window the cap exists to protect.
44
- *
45
- * 20 is chosen against what the list is *for*. A group is the engine declining
46
- * to guess, so its members are a hand-off to the caller; twenty candidates on a
47
- * side is already past what anyone resolves by reading a list rather than by
48
- * querying the two models. The overwhelmingly common match is a 1:1 `renamed`
49
- * pair, which this never touches. Every group still reports `baseCount` and
50
- * `headCount` whole, computed before the cap for the same reason
51
- * `contentMatchCounts` is: truncation must never be what makes a model look
52
- * cleanly matched.
53
- */
54
- const DEFAULT_MAX_GROUP_MEMBERS = 20;
55
- /**
56
- * Kinds an agent has to resolve itself, listed before the ones the engine
57
- * already retired. Truncating the list must never be what drops the
58
- * "we could not tell" groups.
59
- */
60
- const UNRESOLVED_FIRST = [
61
- 'ambiguous',
62
- 'duplicated',
63
- 'deduplicated',
64
- 'moved',
65
- 'reshaped',
66
- 'renamed',
67
- ];
68
- /**
69
- * Run the real `@ifc-lite/diff` engine over two loaded models (issue #1891).
70
- *
71
- * **Data scope only.** This server has no geometry pipeline, so there is no
72
- * world geometry hash and no bounding box; `scope: 'data'` is the honest
73
- * description of what it can see, and every unambiguous 1:1 content match is
74
- * therefore reported as `renamed` rather than `moved`/`reshaped`. See
75
- * `diff-fingerprints.ts`.
76
- */
77
- function contentDiff(left, right, overlays, maxMatches, maxGroupMembers) {
78
- const diff = diffModels(buildModelFingerprints(left.store, overlays.left), buildModelFingerprints(right.store, overlays.right), { scope: 'data', matchUnpairedByContent: true });
79
- const matches = [...(diff.contentMatches ?? [])].sort((a, b) => UNRESOLVED_FIRST.indexOf(a.kind) - UNRESOLVED_FIRST.indexOf(b.kind));
80
- const byKind = {};
81
- for (const match of matches)
82
- byKind[match.kind] = (byKind[match.kind] ?? 0) + 1;
83
- return {
84
- scope: diff.scope,
85
- counts: diff.counts,
86
- // Whole totals, computed before the cap: an agent reading `contentMatches`
87
- // can always tell whether the list it got is the whole story.
88
- contentMatchCounts: byKind,
89
- contentMatches: matches.slice(0, maxMatches).map((match) => ({
90
- kind: match.kind,
91
- ifcType: match.base[0]?.ifcType ?? match.head[0]?.ifcType,
92
- // Groups are reported as groups. Collapsing a `duplicated` or
93
- // `ambiguous` set to a single pair would be the engine guessing, which
94
- // is exactly what it refuses to do (#1923). Long groups are cut to
95
- // `maxGroupMembers` per side and say so, whole size included, so a cut
96
- // group still reads as a group of that size.
97
- ...listSide('base', match.base, maxGroupMembers),
98
- ...listSide('head', match.head, maxGroupMembers),
99
- ...(match.distance !== undefined ? { distance: match.distance } : {}),
100
- })),
101
- truncatedMatches: Math.max(0, matches.length - maxMatches),
102
- // Uncommitted edits are folded into the comparison; saying how many there
103
- // are is what separates "the two files differ" from "this session has
104
- // edits it has not written yet". Absent when neither model has any.
105
- //
106
- // `pendingMutations` is the scalar every other payload carries; the split a
107
- // two-model comparison can additionally give lives under its own name rather
108
- // than overloading that one.
109
- ...pendingMutationsField(overlays.left, overlays.right),
110
- ...(overlays.left || overlays.right
111
- ? {
112
- pendingMutationsBySide: {
113
- base: overlays.left?.pendingMutations ?? 0,
114
- head: overlays.right?.pendingMutations ?? 0,
115
- },
116
- }
117
- : {}),
118
- };
119
- }
120
- /** One side of a match: the (capped) keys, the whole count, and whether the
121
- * list was cut. Emits `base`/`baseCount`/`baseTruncated` (or `head…`). */
122
- function listSide(side, entities, maxGroupMembers) {
123
- return {
124
- [side]: entities.slice(0, maxGroupMembers).map((entity) => entity.key),
125
- [`${side}Count`]: entities.length,
126
- [`${side}Truncated`]: entities.length > maxGroupMembers,
127
- };
128
- }
129
34
  const modelDiff = {
130
35
  name: 'model_diff',
131
36
  description: 'Compare two loaded models. Reports added/removed entities by GlobalId and per-type count deltas. '
@@ -144,7 +49,7 @@ const modelDiff = {
144
49
  default: false,
145
50
  description: 'Run the @ifc-lite/diff engine with content-keyed matching over every IfcObjectDefinition. '
146
51
  + 'Adds `contentDiff` with added/modified/deleted/unchanged counts and the content matches '
147
- + '(renamed / moved / reshaped are resolved; duplicated / deduplicated / ambiguous are listed '
52
+ + '(renamed / moved / reshaped / respecified are resolved; duplicated / deduplicated / ambiguous are listed '
148
53
  + 'as groups for you to resolve). Data scope only — this server has no geometry pipeline.',
149
54
  },
150
55
  max_matches: {
@@ -154,6 +59,13 @@ const modelDiff = {
154
59
  description: 'Cap on the listed content matches (by_content only). Unresolved groups are listed first and '
155
60
  + '`contentMatchCounts` always reports whole per-kind totals.',
156
61
  },
62
+ key_from: {
63
+ type: 'string',
64
+ description: 'Compare on an authored identifier instead of GlobalId (by_content only): "Tag", or '
65
+ + '"<PsetName>.<PropertyName>" such as "Pset_Asset.AssetId". An entity carrying a non-empty, '
66
+ + 'unique value is keyed on it; the rest keep their GlobalId. Values shared by several entities '
67
+ + 'are listed in duplicateAuthoredKeys.',
68
+ },
157
69
  max_group_members: {
158
70
  type: 'integer',
159
71
  default: DEFAULT_MAX_GROUP_MEMBERS,
@@ -162,6 +74,21 @@ const modelDiff = {
162
74
  + 'deduplicated / ambiguous group can hold thousands. `baseCount` / `headCount` always report '
163
75
  + 'the whole size and `baseTruncated` / `headTruncated` say whether the list was cut.',
164
76
  },
77
+ split_merge: {
78
+ type: 'boolean',
79
+ default: false,
80
+ description: 'Opt in to the split/merge detector (by_content only, issue #4956). Geometry-only stage: '
81
+ + 'this server has no geometry pipeline yet, so `contentDiff.splitMerges` currently stays '
82
+ + 'absent regardless of this flag — wired through so it starts producing claims the moment '
83
+ + 'one lands, with no client-side change.',
84
+ },
85
+ successors: {
86
+ type: 'boolean',
87
+ default: false,
88
+ description: 'Opt in to the successor-match detector: suggestions that one deleted entity was replaced '
89
+ + 'in place by one added entity (by_content only, issue #4956). Same geometry-only caveat as '
90
+ + '`split_merge` — `contentDiff.successors` currently stays absent on this server.',
91
+ },
165
92
  },
166
93
  required: ['a', 'b'],
167
94
  additionalProperties: false,
@@ -203,8 +130,15 @@ const modelDiff = {
203
130
  // Opt-in, and deliberately so. An `ambiguous` group has no honest scalar
204
131
  // form, so turning this on by default would change what `counts` means
205
132
  // under agent scripts that already read this tool.
133
+ const keyFrom = typeof input.key_from === 'string' && input.key_from.trim() ? input.key_from.trim() : undefined;
134
+ if (keyFrom !== undefined && !parseAuthoredKeySpec(keyFrom)) {
135
+ throw new ToolExecutionError({
136
+ code: ToolErrorCode.INVALID_INPUT,
137
+ message: 'key_from must be "Tag" or "<PsetName>.<PropertyName>", got "' + keyFrom + '"',
138
+ });
139
+ }
206
140
  const content = input.by_content ?? false
207
- ? contentDiff(left, right, { left: leftOverlay, right: rightOverlay }, input.max_matches ?? DEFAULT_MAX_MATCHES, input.max_group_members ?? DEFAULT_MAX_GROUP_MEMBERS)
141
+ ? contentDiff(left, right, { left: leftOverlay, right: rightOverlay }, input.max_matches ?? DEFAULT_MAX_MATCHES, input.max_group_members ?? DEFAULT_MAX_GROUP_MEMBERS, keyFrom, input.split_merge ?? false, input.successors ?? false)
208
142
  : null;
209
143
  const pendingField = pendingMutationsField(leftOverlay, rightOverlay);
210
144
  const pending = pendingField.pendingMutations ?? 0;
@@ -232,28 +166,17 @@ const modelDiff = {
232
166
  /** Every GlobalId the session has, queued creates and deletes applied. */
233
167
  function collectGlobalIds(model, overlay) {
234
168
  const gids = new Set();
235
- for (const [, ids] of model.store.entityIndex.byType) {
236
- for (const id of ids) {
237
- if (overlay?.deleted.has(id))
238
- continue;
239
- const node = new EntityNode(model.store, id);
240
- if (node.globalId)
241
- gids.add(node.globalId);
242
- }
169
+ for (const { expressId, overlayCreated } of iterateEffectiveEntityIds(model.store, model.backend.getMutationView())) {
170
+ if (overlayCreated)
171
+ continue; // The identified queued set is folded below.
172
+ const node = new EntityNode(model.store, expressId);
173
+ if (node.globalId)
174
+ gids.add(node.globalId);
243
175
  }
244
176
  for (const entity of overlay?.created ?? [])
245
177
  gids.add(entity.globalId);
246
178
  return gids;
247
179
  }
248
- /** One-line human summary of the engine result, for the text block. */
249
- function describeCounts(content) {
250
- const counts = content.counts;
251
- const byKind = content.contentMatchCounts;
252
- const kinds = Object.entries(byKind).map(([kind, n]) => `${n} ${kind}`).join(', ');
253
- return `${counts.added} added, ${counts.modified} modified, ${counts.deleted} deleted, `
254
- + `${counts.unchanged} unchanged`
255
- + (kinds ? `; content matches: ${kinds}` : '; no content matches');
256
- }
257
180
  const quantityDiff = {
258
181
  name: 'quantity_diff',
259
182
  description: 'Per-entity-type quantity comparison between two models, optionally grouped by storey.',
@@ -1 +1 @@
1
- {"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/tools/diff.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/tools/diff.ts"],"names":[],"mappings":"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"}