@ifc-lite/collab 0.7.0 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/doc/entity.js +4 -4
- package/dist/doc/entity.js.map +1 -1
- package/dist/doc/model-slot.d.ts +98 -0
- package/dist/doc/model-slot.d.ts.map +1 -0
- package/dist/doc/model-slot.js +124 -0
- package/dist/doc/model-slot.js.map +1 -0
- package/dist/doc/schema.d.ts +10 -0
- package/dist/doc/schema.d.ts.map +1 -1
- package/dist/doc/schema.js +13 -0
- package/dist/doc/schema.js.map +1 -1
- package/dist/geometry/blob-store.d.ts +5 -0
- package/dist/geometry/blob-store.d.ts.map +1 -1
- package/dist/geometry/blob-store.js +18 -0
- package/dist/geometry/blob-store.js.map +1 -1
- package/dist/geometry/gc.d.ts +8 -8
- package/dist/geometry/gc.d.ts.map +1 -1
- package/dist/geometry/gc.js +16 -6
- package/dist/geometry/gc.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/providers/relay-state.d.ts +29 -0
- package/dist/providers/relay-state.d.ts.map +1 -0
- package/dist/providers/relay-state.js +95 -0
- package/dist/providers/relay-state.js.map +1 -0
- package/dist/snapshot/from-ifcx.d.ts +9 -0
- package/dist/snapshot/from-ifcx.d.ts.map +1 -1
- package/dist/snapshot/from-ifcx.js +5 -8
- package/dist/snapshot/from-ifcx.js.map +1 -1
- package/dist/snapshot/from-step.d.ts +18 -3
- package/dist/snapshot/from-step.d.ts.map +1 -1
- package/dist/snapshot/from-step.js +20 -5
- package/dist/snapshot/from-step.js.map +1 -1
- package/dist/snapshot/slot-ifcx.d.ts +52 -0
- package/dist/snapshot/slot-ifcx.d.ts.map +1 -0
- package/dist/snapshot/slot-ifcx.js +114 -0
- package/dist/snapshot/slot-ifcx.js.map +1 -0
- package/dist/snapshot/structured-attrs.js +6 -6
- package/dist/snapshot/structured-attrs.js.map +1 -1
- package/dist/snapshot/to-ifcx.d.ts +9 -0
- package/dist/snapshot/to-ifcx.d.ts.map +1 -1
- package/dist/snapshot/to-ifcx.js +8 -4
- package/dist/snapshot/to-ifcx.js.map +1 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gc.d.ts","sourceRoot":"","sources":["../../src/geometry/gc.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"gc.d.ts","sourceRoot":"","sources":["../../src/geometry/gc.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAQzB,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAErE;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,CAyCrE;AAgBD,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mDAAmD;IACnD,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,mHAAmH;IACnH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,eAAe,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;CAC3C;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAChB,UAAU,EAAE,GAAG,CAAC,QAAQ,CAAC,EACzB,OAAO,GAAE,YAAY,GAAG;IACtB,2EAA2E;IAC3E,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;CACxD,GACL,OAAO,CAAC,aAAa,CAAC,CA+BxB;AAoBD;;;;;;;;GAQG;AACH,wBAAsB,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAO3F"}
|
package/dist/geometry/gc.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
2
2
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
3
3
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
4
|
-
import { ENTITY_KEY, GEOMETRY_KEY, entitiesMap, geometryMap, } from '../doc/schema.js';
|
|
4
|
+
import { ENTITY_KEY, GEOMETRY_KEY, entitiesMap, geometryMap, modelsMap, } from '../doc/schema.js';
|
|
5
5
|
/**
|
|
6
6
|
* Collect every blob hash currently referenced from a Y.Doc.
|
|
7
7
|
*
|
|
8
|
-
* An entity's `geometryRef.geomId` points at a `geometry` top-level
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
* gc.
|
|
8
|
+
* An entity's `geometryRef.geomId` points at a `geometry` top-level entry
|
|
9
|
+
* whose `blobHash` (if any) we want to keep. Model slots can independently
|
|
10
|
+
* own a portable STEP/IFCZIP sidecar. We also include any `blobHash` that
|
|
11
|
+
* appears directly in `geometry.params.<*>` so apps that store auxiliary
|
|
12
|
+
* blob refs in params (e.g. textures) survive gc.
|
|
13
13
|
*/
|
|
14
14
|
export function collectReferencedBlobHashes(doc) {
|
|
15
15
|
const referenced = new Set();
|
|
@@ -40,6 +40,16 @@ export function collectReferencedBlobHashes(doc) {
|
|
|
40
40
|
geom.forEach((nodeUntyped) => {
|
|
41
41
|
addBlobHashesFromGeometry(nodeUntyped, referenced);
|
|
42
42
|
});
|
|
43
|
+
// 3. Portable STEP/IFCZIP sidecars are model-slot roots, independent of
|
|
44
|
+
// geometry records. They are required for native annotation/texture
|
|
45
|
+
// reconstruction and must remain live for the lifetime of the room.
|
|
46
|
+
modelsMap(doc).forEach((slotUntyped) => {
|
|
47
|
+
if (!slotUntyped || typeof slotUntyped !== 'object' || Array.isArray(slotUntyped))
|
|
48
|
+
return;
|
|
49
|
+
const hash = slotUntyped.stepSourceBlobHash;
|
|
50
|
+
if (typeof hash === 'string' && /^[a-f0-9]{32}$/.test(hash))
|
|
51
|
+
referenced.add(hash);
|
|
52
|
+
});
|
|
43
53
|
return referenced;
|
|
44
54
|
}
|
|
45
55
|
function addBlobHashesFromGeometry(node, out) {
|
package/dist/geometry/gc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gc.js","sourceRoot":"","sources":["../../src/geometry/gc.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AA4B/D,OAAO,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EACX,WAAW,
|
|
1
|
+
{"version":3,"file":"gc.js","sourceRoot":"","sources":["../../src/geometry/gc.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -9,9 +9,11 @@ export * from './doc/placement.js';
|
|
|
9
9
|
export * from './doc/relationship.js';
|
|
10
10
|
export * from './doc/geometry.js';
|
|
11
11
|
export * from './doc/annotation.js';
|
|
12
|
+
export * from './doc/model-slot.js';
|
|
12
13
|
export * from './snapshot/index.js';
|
|
13
14
|
export { createIndexedDbProvider, createMemoryProvider, type IndexedDbProvider, type IndexedDbOptions, } from './providers/indexeddb.js';
|
|
14
15
|
export { createWebSocketProvider, type WebSocketProvider, type WebSocketProviderOptions, type WebSocketStatus, } from './providers/websocket.js';
|
|
16
|
+
export { fetchRoomStateVector, roomSocketUrl, stateVectorCovers, type RelayStateVectorOptions, } from './providers/relay-state.js';
|
|
15
17
|
export { createWebRtcProvider, type WebRtcProvider, type WebRtcProviderOptions, type WebRtcStatus, } from './providers/webrtc.js';
|
|
16
18
|
export * from './sync/room.js';
|
|
17
19
|
export * from './awareness/index.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AAGH,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AAGpC,cAAc,qBAAqB,CAAC;AAGpC,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,GACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,uBAAuB,EACvB,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAC7B,KAAK,eAAe,GACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,oBAAoB,EACpB,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,YAAY,GAClB,MAAM,uBAAuB,CAAC;AAG/B,cAAc,gBAAgB,CAAC;AAG/B,cAAc,sBAAsB,CAAC;AAGrC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,KAAK,WAAW,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAGlG,cAAc,sBAAsB,CAAC;AAGrC,cAAc,qBAAqB,CAAC;AAGpC,cAAc,uBAAuB,CAAC;AAGtC,cAAc,mBAAmB,CAAC;AAGlC,cAAc,sBAAsB,CAAC;AAGrC,cAAc,oBAAoB,CAAC;AAGnC,cAAc,cAAc,CAAC;AAG7B,cAAc,qBAAqB,CAAC;AAGpC,cAAc,iBAAiB,CAAC;AAGhC,OAAO,EACL,mBAAmB,EACnB,KAAK,aAAa,EAClB,KAAK,oBAAoB,EACzB,KAAK,YAAY,GAClB,MAAM,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AAGH,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AAGpC,cAAc,qBAAqB,CAAC;AAGpC,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,GACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,uBAAuB,EACvB,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAC7B,KAAK,eAAe,GACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,iBAAiB,EACjB,KAAK,uBAAuB,GAC7B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,oBAAoB,EACpB,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,YAAY,GAClB,MAAM,uBAAuB,CAAC;AAG/B,cAAc,gBAAgB,CAAC;AAG/B,cAAc,sBAAsB,CAAC;AAGrC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,KAAK,WAAW,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAGlG,cAAc,sBAAsB,CAAC;AAGrC,cAAc,qBAAqB,CAAC;AAGpC,cAAc,uBAAuB,CAAC;AAGtC,cAAc,mBAAmB,CAAC;AAGlC,cAAc,sBAAsB,CAAC;AAGrC,cAAc,oBAAoB,CAAC;AAGnC,cAAc,cAAc,CAAC;AAG7B,cAAc,qBAAqB,CAAC;AAGpC,cAAc,iBAAiB,CAAC;AAGhC,OAAO,EACL,mBAAmB,EACnB,KAAK,aAAa,EAClB,KAAK,oBAAoB,EACzB,KAAK,YAAY,GAClB,MAAM,cAAc,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -13,11 +13,13 @@ export * from './doc/placement.js';
|
|
|
13
13
|
export * from './doc/relationship.js';
|
|
14
14
|
export * from './doc/geometry.js';
|
|
15
15
|
export * from './doc/annotation.js';
|
|
16
|
+
export * from './doc/model-slot.js';
|
|
16
17
|
// Snapshot / IFCX bridge
|
|
17
18
|
export * from './snapshot/index.js';
|
|
18
19
|
// Providers
|
|
19
20
|
export { createIndexedDbProvider, createMemoryProvider, } from './providers/indexeddb.js';
|
|
20
21
|
export { createWebSocketProvider, } from './providers/websocket.js';
|
|
22
|
+
export { fetchRoomStateVector, roomSocketUrl, stateVectorCovers, } from './providers/relay-state.js';
|
|
21
23
|
export { createWebRtcProvider, } from './providers/webrtc.js';
|
|
22
24
|
// Sync helpers
|
|
23
25
|
export * from './sync/room.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D;;;;GAIG;AAEH,YAAY;AACZ,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AAEpC,yBAAyB;AACzB,cAAc,qBAAqB,CAAC;AAEpC,YAAY;AACZ,OAAO,EACL,uBAAuB,EACvB,oBAAoB,GAGrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,uBAAuB,GAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,oBAAoB,GAIrB,MAAM,uBAAuB,CAAC;AAE/B,eAAe;AACf,cAAc,gBAAgB,CAAC;AAE/B,uBAAuB;AACvB,cAAc,sBAAsB,CAAC;AAErC,cAAc;AACd,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAyC,MAAM,WAAW,CAAC;AAElG,qBAAqB;AACrB,cAAc,sBAAsB,CAAC;AAErC,uCAAuC;AACvC,cAAc,qBAAqB,CAAC;AAEpC,aAAa;AACb,cAAc,uBAAuB,CAAC;AAEtC,2BAA2B;AAC3B,cAAc,mBAAmB,CAAC;AAElC,gCAAgC;AAChC,cAAc,sBAAsB,CAAC;AAErC,0CAA0C;AAC1C,cAAc,oBAAoB,CAAC;AAEnC,gCAAgC;AAChC,cAAc,cAAc,CAAC;AAE7B,0CAA0C;AAC1C,cAAc,qBAAqB,CAAC;AAEpC,kCAAkC;AAClC,cAAc,iBAAiB,CAAC;AAEhC,2BAA2B;AAC3B,OAAO,EACL,mBAAmB,GAIpB,MAAM,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D;;;;GAIG;AAEH,YAAY;AACZ,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AAEpC,yBAAyB;AACzB,cAAc,qBAAqB,CAAC;AAEpC,YAAY;AACZ,OAAO,EACL,uBAAuB,EACvB,oBAAoB,GAGrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,uBAAuB,GAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,iBAAiB,GAElB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,oBAAoB,GAIrB,MAAM,uBAAuB,CAAC;AAE/B,eAAe;AACf,cAAc,gBAAgB,CAAC;AAE/B,uBAAuB;AACvB,cAAc,sBAAsB,CAAC;AAErC,cAAc;AACd,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAyC,MAAM,WAAW,CAAC;AAElG,qBAAqB;AACrB,cAAc,sBAAsB,CAAC;AAErC,uCAAuC;AACvC,cAAc,qBAAqB,CAAC;AAEpC,aAAa;AACb,cAAc,uBAAuB,CAAC;AAEtC,2BAA2B;AAC3B,cAAc,mBAAmB,CAAC;AAElC,gCAAgC;AAChC,cAAc,sBAAsB,CAAC;AAErC,0CAA0C;AAC1C,cAAc,oBAAoB,CAAC;AAEnC,gCAAgC;AAChC,cAAc,cAAc,CAAC;AAE7B,0CAA0C;AAC1C,cAAc,qBAAqB,CAAC;AAEpC,kCAAkC;AAClC,cAAc,iBAAiB,CAAC;AAEhC,2BAA2B;AAC3B,OAAO,EACL,mBAAmB,GAIpB,MAAM,cAAc,CAAC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
export interface RelayStateVectorOptions {
|
|
2
|
+
/** Bearer token attached as `?token=` (the same one the live provider uses). */
|
|
3
|
+
token?: string;
|
|
4
|
+
/** Custom WebSocket implementation (e.g. `ws` in Node). */
|
|
5
|
+
WebSocketPolyfill?: unknown;
|
|
6
|
+
/** Give up after this long (default 10 s). */
|
|
7
|
+
timeoutMs?: number;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* The same URL y-websocket dials for `(serverUrl, roomId, token)`: trailing
|
|
11
|
+
* slashes trimmed, the room name appended RAW (a `project/model` room id
|
|
12
|
+
* stays a path, exactly as the live provider sends it — encoding it would
|
|
13
|
+
* let a proxy that normalises `%2F` route the probe to a different room),
|
|
14
|
+
* only the token query encoded.
|
|
15
|
+
*/
|
|
16
|
+
export declare function roomSocketUrl(serverUrl: string, roomId: string, token?: string): string;
|
|
17
|
+
/**
|
|
18
|
+
* Read the relay's state vector for `roomId` from the sync handshake of a
|
|
19
|
+
* fresh connection, then close it. Rejects when the socket errors, closes
|
|
20
|
+
* before the handshake, or `timeoutMs` passes.
|
|
21
|
+
*/
|
|
22
|
+
export declare function fetchRoomStateVector(serverUrl: string, roomId: string, options?: RelayStateVectorOptions): Promise<Map<number, number>>;
|
|
23
|
+
/**
|
|
24
|
+
* Whether `held` (a relay's state vector) contains every write in `target`
|
|
25
|
+
* (an owner's `Y.encodeStateVector(doc)`): for each client the relay's clock
|
|
26
|
+
* must have reached ours.
|
|
27
|
+
*/
|
|
28
|
+
export declare function stateVectorCovers(target: Uint8Array | Map<number, number>, held: Map<number, number>): boolean;
|
|
29
|
+
//# sourceMappingURL=relay-state.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"relay-state.d.ts","sourceRoot":"","sources":["../../src/providers/relay-state.ts"],"names":[],"mappings":"AA6BA,MAAM,WAAW,uBAAuB;IACtC,gFAAgF;IAChF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,8CAA8C;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAUD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAIvF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsC9B;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,UAAU,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAM9G"}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
2
|
+
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
3
|
+
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
4
|
+
/**
|
|
5
|
+
* "Does the relay hold what I wrote?" (#4446)
|
|
6
|
+
*
|
|
7
|
+
* A local `doc.transact` resolves the moment the update is in the owner's
|
|
8
|
+
* own Y.Doc; y-websocket then hands the bytes to the browser's socket, where
|
|
9
|
+
* they sit in renderer-side send quota until the network stack drains them.
|
|
10
|
+
* A tab closed in that window loses them — the relay never saw the seed,
|
|
11
|
+
* and the next joiner reconstructs an empty room. No y-websocket event says
|
|
12
|
+
* "the server has applied your update": the server forwards updates to the
|
|
13
|
+
* OTHER peers and stays silent towards the origin.
|
|
14
|
+
*
|
|
15
|
+
* What the server does say, on every new connection, is its state vector —
|
|
16
|
+
* step 1 of the y-protocols sync handshake. So a throw-away connection to
|
|
17
|
+
* the room reads exactly "what the relay holds", a few dozen bytes, and
|
|
18
|
+
* `stateVectorCovers` compares it with the owner's own state vector. The
|
|
19
|
+
* probe sends nothing (no awareness, no updates), so peers never see it.
|
|
20
|
+
*/
|
|
21
|
+
import * as Y from 'yjs';
|
|
22
|
+
import * as decoding from 'lib0/decoding';
|
|
23
|
+
/** y-websocket message tag for sync frames; y-protocols sync sub-tag for step 1. */
|
|
24
|
+
const MESSAGE_SYNC = 0;
|
|
25
|
+
const SYNC_STEP1 = 0;
|
|
26
|
+
/**
|
|
27
|
+
* The same URL y-websocket dials for `(serverUrl, roomId, token)`: trailing
|
|
28
|
+
* slashes trimmed, the room name appended RAW (a `project/model` room id
|
|
29
|
+
* stays a path, exactly as the live provider sends it — encoding it would
|
|
30
|
+
* let a proxy that normalises `%2F` route the probe to a different room),
|
|
31
|
+
* only the token query encoded.
|
|
32
|
+
*/
|
|
33
|
+
export function roomSocketUrl(serverUrl, roomId, token) {
|
|
34
|
+
const base = serverUrl.replace(/\/+$/, '');
|
|
35
|
+
const query = token ? `?token=${encodeURIComponent(token)}` : '';
|
|
36
|
+
return `${base}/${roomId}${query}`;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Read the relay's state vector for `roomId` from the sync handshake of a
|
|
40
|
+
* fresh connection, then close it. Rejects when the socket errors, closes
|
|
41
|
+
* before the handshake, or `timeoutMs` passes.
|
|
42
|
+
*/
|
|
43
|
+
export function fetchRoomStateVector(serverUrl, roomId, options = {}) {
|
|
44
|
+
const Ctor = (options.WebSocketPolyfill ?? globalThis.WebSocket);
|
|
45
|
+
if (!Ctor)
|
|
46
|
+
return Promise.reject(new Error('@ifc-lite/collab: no WebSocket implementation available'));
|
|
47
|
+
return new Promise((resolve, reject) => {
|
|
48
|
+
const ws = new Ctor(roomSocketUrl(serverUrl, roomId, options.token));
|
|
49
|
+
ws.binaryType = 'arraybuffer';
|
|
50
|
+
let settled = false;
|
|
51
|
+
const finish = (fn) => {
|
|
52
|
+
if (settled)
|
|
53
|
+
return;
|
|
54
|
+
settled = true;
|
|
55
|
+
clearTimeout(timer);
|
|
56
|
+
try {
|
|
57
|
+
ws.close();
|
|
58
|
+
}
|
|
59
|
+
catch {
|
|
60
|
+
// already closed
|
|
61
|
+
}
|
|
62
|
+
fn();
|
|
63
|
+
};
|
|
64
|
+
const timer = setTimeout(() => finish(() => reject(new Error('@ifc-lite/collab: relay did not send its state vector in time'))), options.timeoutMs ?? 10_000);
|
|
65
|
+
ws.onerror = () => finish(() => reject(new Error('@ifc-lite/collab: relay probe socket failed')));
|
|
66
|
+
ws.onclose = (ev) => finish(() => reject(new Error(`@ifc-lite/collab: relay probe closed before the handshake (${ev.code ?? '?'} ${ev.reason ?? ''})`)));
|
|
67
|
+
ws.onmessage = (ev) => {
|
|
68
|
+
const data = ev.data;
|
|
69
|
+
const bytes = data instanceof ArrayBuffer ? new Uint8Array(data) : data instanceof Uint8Array ? data : null;
|
|
70
|
+
if (!bytes)
|
|
71
|
+
return;
|
|
72
|
+
const decoder = decoding.createDecoder(bytes);
|
|
73
|
+
if (decoding.readVarUint(decoder) !== MESSAGE_SYNC)
|
|
74
|
+
return; // awareness, keepalive, …
|
|
75
|
+
if (decoding.readVarUint(decoder) !== SYNC_STEP1)
|
|
76
|
+
return;
|
|
77
|
+
const sv = decoding.readVarUint8Array(decoder);
|
|
78
|
+
finish(() => resolve(Y.decodeStateVector(sv)));
|
|
79
|
+
};
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* Whether `held` (a relay's state vector) contains every write in `target`
|
|
84
|
+
* (an owner's `Y.encodeStateVector(doc)`): for each client the relay's clock
|
|
85
|
+
* must have reached ours.
|
|
86
|
+
*/
|
|
87
|
+
export function stateVectorCovers(target, held) {
|
|
88
|
+
const want = target instanceof Map ? target : Y.decodeStateVector(target);
|
|
89
|
+
for (const [client, clock] of want) {
|
|
90
|
+
if ((held.get(client) ?? 0) < clock)
|
|
91
|
+
return false;
|
|
92
|
+
}
|
|
93
|
+
return true;
|
|
94
|
+
}
|
|
95
|
+
//# sourceMappingURL=relay-state.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"relay-state.js","sourceRoot":"","sources":["../../src/providers/relay-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,20 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import type { IfcxFile } from '@ifc-lite/ifcx';
|
|
9
9
|
import * as Y from 'yjs';
|
|
10
|
+
import type { ModelSlotRef } from '../doc/model-slot.js';
|
|
10
11
|
export interface SeedOptions {
|
|
11
12
|
/** Origin tag for the seeding transaction. Defaults to SEED_ORIGIN. */
|
|
12
13
|
origin?: unknown;
|
|
13
14
|
/** If true, clear any existing top-level state before seeding. */
|
|
14
15
|
reset?: boolean;
|
|
16
|
+
/**
|
|
17
|
+
* The model slot the file's nodes belong to (#4444). Every node path, and
|
|
18
|
+
* every `children` / `inherits` reference, is qualified with the slot's
|
|
19
|
+
* prefix, and the file's header / imports / schemas are recorded for that
|
|
20
|
+
* slot (see slot-ifcx.ts). Omitted: the implicit legacy slot (paths and
|
|
21
|
+
* room-wide metadata untouched).
|
|
22
|
+
*/
|
|
23
|
+
slot?: ModelSlotRef;
|
|
15
24
|
}
|
|
16
25
|
export type IfcxInput = ArrayBuffer | Uint8Array | string | IfcxFile;
|
|
17
26
|
/** Decode whatever the caller hands us into a parsed IfcxFile. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"from-ifcx.d.ts","sourceRoot":"","sources":["../../src/snapshot/from-ifcx.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,gBAAgB,CAAC;AAEzD,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"from-ifcx.d.ts","sourceRoot":"","sources":["../../src/snapshot/from-ifcx.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,gBAAgB,CAAC;AAEzD,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAwBzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAKzD,MAAM,WAAW,WAAW;IAC1B,uEAAuE;IACvE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kEAAkE;IAClE,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;CACrB;AAED,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,CAAC;AAErE,kEAAkE;AAClE,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,QAAQ,CAazD;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,GAAE,WAAgB,GAAG,QAAQ,CAgC3F;AA2ID,MAAM,WAAW,cAAc;IAC7B,uEAAuE;IACvE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,CAAC,CAAC,GAAG,EACV,KAAK,EAAE,SAAS,EAChB,IAAI,GAAE,cAAmB,GACxB,QAAQ,CAsCV"}
|
|
@@ -7,6 +7,7 @@ import { createGeometry, upsertGeometry } from '../doc/geometry.js';
|
|
|
7
7
|
import { ENTITY_KEY, SEED_ORIGIN, assertSchemaInvariants, metaMap, } from '../doc/schema.js';
|
|
8
8
|
import { inflateStructuredAttributes } from './structured-attrs.js';
|
|
9
9
|
import { clearOverlayTombstones, readOverlayTombstones, resolveTombstoneOpinion, resurrectionBlocked, writeOverlayTombstones } from './overlay-tombstones.js';
|
|
10
|
+
import { qualifyNode, writeIfcxFileMeta } from './slot-ifcx.js';
|
|
10
11
|
import { setClassifications, setMaterials, readIfcClass } from './overlay-entity-attrs.js';
|
|
11
12
|
/** Decode whatever the caller hands us into a parsed IfcxFile. */
|
|
12
13
|
export function parseIfcxInput(input) {
|
|
@@ -44,15 +45,11 @@ export function seedFromIfcx(doc, input, opts = {}) {
|
|
|
44
45
|
// freshly seeded snapshot.
|
|
45
46
|
clearOverlayTombstones(meta);
|
|
46
47
|
}
|
|
47
|
-
// Stash file-level metadata so we can re-emit it during snapshotting
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
if (file.imports)
|
|
51
|
-
meta.set('imports', file.imports);
|
|
52
|
-
if (file.schemas)
|
|
53
|
-
meta.set('schemas', file.schemas);
|
|
48
|
+
// Stash file-level metadata so we can re-emit it during snapshotting —
|
|
49
|
+
// per slot, so a second IFC5 model does not overwrite the first's.
|
|
50
|
+
writeIfcxFileMeta(meta, opts.slot, file);
|
|
54
51
|
for (const node of file.data ?? []) {
|
|
55
|
-
const decoded = decodeNode(node, false);
|
|
52
|
+
const decoded = decodeNode(opts.slot ? qualifyNode(opts.slot, node) : node, false);
|
|
56
53
|
if (!decoded)
|
|
57
54
|
continue;
|
|
58
55
|
restoreGeometryCarriers(doc, decoded, createGeometry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"from-ifcx.js","sourceRoot":"","sources":["../../src/snapshot/from-ifcx.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAW/D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EACL,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,SAAS,EACT,SAAS,EACT,WAAW,EACX,aAAa,EACb,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,UAAU,EACV,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,cAAc,EAAqB,MAAM,oBAAoB,CAAC;AACvF,OAAO,EACL,UAAU,EACV,WAAW,EACX,sBAAsB,EACtB,OAAO,GACR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"from-ifcx.js","sourceRoot":"","sources":["../../src/snapshot/from-ifcx.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
*/
|
|
17
17
|
import type * as Y from 'yjs';
|
|
18
18
|
import type { PropertyValue } from '../doc/schema.js';
|
|
19
|
+
import { type ModelSlotRef } from '../doc/model-slot.js';
|
|
19
20
|
/** Schema versions the CRDT entity meta accepts (see `EntityMeta`). */
|
|
20
21
|
export type CollabSchemaVersion = 'ifc4' | 'ifc4x3' | 'ifc5';
|
|
21
22
|
/** A single STEP entity reduced to what the CRDT needs. */
|
|
@@ -32,12 +33,16 @@ export interface StepSeedEntity {
|
|
|
32
33
|
attributes?: Record<string, unknown>;
|
|
33
34
|
/**
|
|
34
35
|
* Spatial containment + decomposition as IFCX children: a unique key → the
|
|
35
|
-
* child entity's path (
|
|
36
|
-
*
|
|
36
|
+
* child entity's path (`slotPath(slot, guid)`, i.e. `/<guid>` in a
|
|
37
|
+
* single-model room). Lets the recipient rebuild the spatial tree
|
|
38
|
+
* (Project → Site → Building → Storey → elements). The adapter that builds
|
|
39
|
+
* these must use the same slot the seeder is given (#4444).
|
|
37
40
|
*/
|
|
38
41
|
children?: Record<string, string>;
|
|
39
42
|
/** Property sets: psetName → propName → value. */
|
|
40
43
|
psets?: Record<string, Record<string, PropertyValue>>;
|
|
44
|
+
/** Quantity sets: qsetName → quantityName → numeric value. */
|
|
45
|
+
quantities?: Record<string, Record<string, number>>;
|
|
41
46
|
}
|
|
42
47
|
/** Minimal model view the seeder consumes (the viewer adapts its store to this). */
|
|
43
48
|
export interface StepSeedSource {
|
|
@@ -58,6 +63,12 @@ export interface SeedFromStepOptions {
|
|
|
58
63
|
* the entity `schemaVersion`. Defaults to {@link defaultSchemaVersion}.
|
|
59
64
|
*/
|
|
60
65
|
schemaVersionFor?: (schema: string | undefined) => CollabSchemaVersion;
|
|
66
|
+
/**
|
|
67
|
+
* The model slot the entities belong to (#4444). Entity paths become
|
|
68
|
+
* `slotPath(slot, guid)`. Defaults to the implicit legacy slot, i.e. the
|
|
69
|
+
* unqualified `/<guid>` scheme of a single-model room.
|
|
70
|
+
*/
|
|
71
|
+
slot?: ModelSlotRef;
|
|
61
72
|
}
|
|
62
73
|
export interface SeedFromStepResult {
|
|
63
74
|
/** Number of entities seeded (those with a GUID). */
|
|
@@ -65,7 +76,11 @@ export interface SeedFromStepResult {
|
|
|
65
76
|
/** Number of source entities skipped (no GUID). */
|
|
66
77
|
skipped: number;
|
|
67
78
|
}
|
|
68
|
-
/**
|
|
79
|
+
/**
|
|
80
|
+
* Path key for a STEP entity in a single-model (legacy-slot) room. Exported
|
|
81
|
+
* so the viewer's `resolveEntity` matches; slot-qualified rooms use
|
|
82
|
+
* `slotPath(slot, guid)` from `doc/model-slot.ts`.
|
|
83
|
+
*/
|
|
69
84
|
export declare function guidToPath(guid: string): string;
|
|
70
85
|
/**
|
|
71
86
|
* Seed `doc` from a legacy STEP model. Idempotent: re-seeding the same source
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"from-step.d.ts","sourceRoot":"","sources":["../../src/snapshot/from-step.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,KAAK,CAAC,MAAM,KAAK,CAAC;AAG9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"from-step.d.ts","sourceRoot":"","sources":["../../src/snapshot/from-step.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,KAAK,CAAC,MAAM,KAAK,CAAC;AAG9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAA6B,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpF,uEAAuE;AACvE,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;AAkB7D,2DAA2D;AAC3D,MAAM,WAAW,cAAc;IAC7B,uEAAuE;IACvE,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;IACtD,8DAA8D;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACrD;AAED,oFAAoF;AACpF,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;IACnC,mEAAmE;IACnE,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,yEAAyE;IACzE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,KAAK,mBAAmB,CAAC;IACvE;;;;OAIG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;CACrB;AAED,MAAM,WAAW,kBAAkB;IACjC,qDAAqD;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,mDAAmD;IACnD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,CAAC,CAAC,GAAG,EACV,MAAM,EAAE,cAAc,EACtB,IAAI,GAAE,mBAAwB,GAC7B,kBAAkB,CA0DpB"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
2
2
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
3
3
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
4
|
-
import { createEntity, setPropertyValue } from '../doc/entity.js';
|
|
4
|
+
import { createEntity, setPropertyValue, setQuantityValue } from '../doc/entity.js';
|
|
5
5
|
import { SEED_ORIGIN, assertSchemaInvariants, metaMap } from '../doc/schema.js';
|
|
6
|
+
import { legacyModelSlot, slotPath } from '../doc/model-slot.js';
|
|
6
7
|
/**
|
|
7
8
|
* Map a raw STEP schema string to the CRDT's supported set. Legacy IFC2X3 and
|
|
8
9
|
* IFC4 both map to `ifc4` (the spec's editing baseline); IFC4X3 → `ifc4x3`;
|
|
@@ -18,9 +19,13 @@ function defaultSchemaVersion(schema) {
|
|
|
18
19
|
return 'ifc4';
|
|
19
20
|
}
|
|
20
21
|
}
|
|
21
|
-
/**
|
|
22
|
+
/**
|
|
23
|
+
* Path key for a STEP entity in a single-model (legacy-slot) room. Exported
|
|
24
|
+
* so the viewer's `resolveEntity` matches; slot-qualified rooms use
|
|
25
|
+
* `slotPath(slot, guid)` from `doc/model-slot.ts`.
|
|
26
|
+
*/
|
|
22
27
|
export function guidToPath(guid) {
|
|
23
|
-
return
|
|
28
|
+
return slotPath(legacyModelSlot(), guid);
|
|
24
29
|
}
|
|
25
30
|
/**
|
|
26
31
|
* Seed `doc` from a legacy STEP model. Idempotent: re-seeding the same source
|
|
@@ -31,18 +36,21 @@ export function seedFromStep(doc, source, opts = {}) {
|
|
|
31
36
|
assertSchemaInvariants(doc);
|
|
32
37
|
const schemaVersionFor = opts.schemaVersionFor ?? defaultSchemaVersion;
|
|
33
38
|
const schemaVersion = schemaVersionFor(source.header?.schema);
|
|
39
|
+
const slot = opts.slot ?? legacyModelSlot();
|
|
34
40
|
let seeded = 0;
|
|
35
41
|
let skipped = 0;
|
|
36
42
|
doc.transact(() => {
|
|
37
43
|
const meta = metaMap(doc);
|
|
38
|
-
|
|
44
|
+
// One file-level header per room: the first seeded model's. A slot-aware
|
|
45
|
+
// room records per-model headers on its slot records instead.
|
|
46
|
+
if (source.header && !meta.has('stepHeader'))
|
|
39
47
|
meta.set('stepHeader', source.header);
|
|
40
48
|
for (const ent of source.entities) {
|
|
41
49
|
if (!ent.guid) {
|
|
42
50
|
skipped++;
|
|
43
51
|
continue;
|
|
44
52
|
}
|
|
45
|
-
const path =
|
|
53
|
+
const path = slotPath(slot, ent.guid);
|
|
46
54
|
createEntity(doc, path, {
|
|
47
55
|
ifcClass: ent.ifcClass,
|
|
48
56
|
attributes: ent.attributes ?? {},
|
|
@@ -67,6 +75,13 @@ export function seedFromStep(doc, source, opts = {}) {
|
|
|
67
75
|
}
|
|
68
76
|
}
|
|
69
77
|
}
|
|
78
|
+
if (ent.quantities) {
|
|
79
|
+
for (const [qsetName, quantities] of Object.entries(ent.quantities)) {
|
|
80
|
+
for (const [quantityName, value] of Object.entries(quantities)) {
|
|
81
|
+
setQuantityValue(doc, path, qsetName, quantityName, value);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
70
85
|
seeded++;
|
|
71
86
|
}
|
|
72
87
|
}, opts.origin ?? SEED_ORIGIN);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"from-step.js","sourceRoot":"","sources":["../../src/snapshot/from-step.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAoB/D,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"from-step.js","sourceRoot":"","sources":["../../src/snapshot/from-step.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* How an IFCX file is re-homed under a model slot (#4444): its nodes and its
|
|
3
|
+
* file-level metadata.
|
|
4
|
+
*
|
|
5
|
+
* Nodes: `qualifyNode` prefixes a node's path and every path-valued
|
|
6
|
+
* `children` / `inherits` reference with the slot (`/<slotId>` + the file's
|
|
7
|
+
* own path), so the file's path scheme survives verbatim underneath it.
|
|
8
|
+
*
|
|
9
|
+
* Metadata: a room used to hold one file, so `seedFromIfcx` stashed its
|
|
10
|
+
* header / imports / schemas under the room-wide `meta.header` /
|
|
11
|
+
* `meta.imports` / `meta.schemas` and the snapshot re-emitted them. With one
|
|
12
|
+
* file per slot that is a race: the second IFC5 model's seed overwrote the
|
|
13
|
+
* first's, and a per-slot snapshot handed slot m0's recipient slot m1's
|
|
14
|
+
* schemas. Each real slot therefore records its file metadata under its own
|
|
15
|
+
* key, `ifcxFile:<slotId>`; the implicit legacy slot (and a slot-less seed)
|
|
16
|
+
* keeps the room-wide keys so rooms shared before slots existed read exactly
|
|
17
|
+
* as they did. A whole-room snapshot of a multi-slot room merges: imports
|
|
18
|
+
* concatenated in slot order, schemas spread in slot order (a later slot's
|
|
19
|
+
* same-named schema wins — two copies of one file carry identical
|
|
20
|
+
* definitions), header from the first slot that recorded one.
|
|
21
|
+
*/
|
|
22
|
+
import type * as Y from 'yjs';
|
|
23
|
+
import type { IfcxFile, IfcxHeader, IfcxNode, ImportNode } from '@ifc-lite/ifcx';
|
|
24
|
+
import { type ModelSlotRef } from '../doc/model-slot.js';
|
|
25
|
+
/**
|
|
26
|
+
* Re-home a node under a slot: its own path plus every path-valued
|
|
27
|
+
* `children` / `inherits` reference (a `null` removal opinion stays `null`).
|
|
28
|
+
*
|
|
29
|
+
* Attribute values are opaque here: the runtime does not know which
|
|
30
|
+
* attributes of a custom schema are path-typed, so an attribute whose VALUE
|
|
31
|
+
* names another node's path is stored verbatim and dangles on a recipient
|
|
32
|
+
* (it points at the unqualified path, which no slot holds). `children` and
|
|
33
|
+
* `inherits` are the only references IFCX composition itself resolves, and
|
|
34
|
+
* the only ones the viewer's ingest follows. Geometry carriers are
|
|
35
|
+
* content-hash keyed and slot-independent.
|
|
36
|
+
*/
|
|
37
|
+
export declare function qualifyNode(slot: ModelSlotRef, node: IfcxNode): IfcxNode;
|
|
38
|
+
/** The file-level fields a snapshot re-emits. */
|
|
39
|
+
export interface IfcxFileMeta {
|
|
40
|
+
header?: IfcxHeader;
|
|
41
|
+
imports?: ImportNode[];
|
|
42
|
+
schemas?: Record<string, unknown>;
|
|
43
|
+
}
|
|
44
|
+
/** Record `file`'s header / imports / schemas for `slot` (room-wide when no real slot). */
|
|
45
|
+
export declare function writeIfcxFileMeta(meta: Y.Map<unknown>, slot: ModelSlotRef | undefined, file: IfcxFile): void;
|
|
46
|
+
/**
|
|
47
|
+
* The file metadata a snapshot of `slot` re-emits; of the whole room when no
|
|
48
|
+
* slot is named. Falls back to the room-wide keys where nothing per-slot was
|
|
49
|
+
* recorded (a legacy room, or a slot seeded from STEP, which has no IFCX file).
|
|
50
|
+
*/
|
|
51
|
+
export declare function readIfcxFileMeta(meta: Y.Map<unknown>, slot: ModelSlotRef | undefined): IfcxFileMeta;
|
|
52
|
+
//# sourceMappingURL=slot-ifcx.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"slot-ifcx.d.ts","sourceRoot":"","sources":["../../src/snapshot/slot-ifcx.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,KAAK,CAAC,MAAM,KAAK,CAAC;AAC9B,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjF,OAAO,EAAqB,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE5E;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAiBxE;AAED,iDAAiD;AACjD,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAsBD,2FAA2F;AAC3F,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,YAAY,GAAG,SAAS,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAY5G;AAYD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,YAAY,GAAG,SAAS,GAAG,YAAY,CAkBnG"}
|