@dxos/client-services 0.5.3-main.f9b873d → 0.5.3-next.57eca40
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/lib/browser/{chunk-ZGHJHSHA.mjs → chunk-RQNS7EAS.mjs} +93 -59
- package/dist/lib/browser/{chunk-ZGHJHSHA.mjs.map → chunk-RQNS7EAS.mjs.map} +3 -3
- package/dist/lib/browser/index.mjs +3 -1
- package/dist/lib/browser/index.mjs.map +1 -1
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/packlets/testing/index.mjs +1 -1
- package/dist/lib/node/{chunk-VYXGTUEI.cjs → chunk-GVGQ4FCH.cjs} +127 -92
- package/dist/lib/node/chunk-GVGQ4FCH.cjs.map +7 -0
- package/dist/lib/node/index.cjs +45 -43
- package/dist/lib/node/index.cjs.map +1 -1
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node/packlets/testing/index.cjs +8 -8
- package/dist/types/src/packlets/spaces/data-space-manager.d.ts.map +1 -1
- package/dist/types/src/packlets/spaces/data-space.d.ts +6 -1
- package/dist/types/src/packlets/spaces/data-space.d.ts.map +1 -1
- package/dist/types/src/version.d.ts +1 -1
- package/package.json +36 -36
- package/src/packlets/spaces/data-space-manager.ts +33 -4
- package/src/packlets/spaces/data-space.ts +25 -8
- package/src/version.ts +1 -1
- package/dist/lib/node/chunk-VYXGTUEI.cjs.map +0 -7
|
@@ -30,7 +30,7 @@ __export(testing_exports, {
|
|
|
30
30
|
sanitizeInvitation: () => sanitizeInvitation
|
|
31
31
|
});
|
|
32
32
|
module.exports = __toCommonJS(testing_exports);
|
|
33
|
-
var
|
|
33
|
+
var import_chunk_GVGQ4FCH = require("../../chunk-GVGQ4FCH.cjs");
|
|
34
34
|
var import_credentials = require("@dxos/credentials");
|
|
35
35
|
var import_keys = require("@dxos/keys");
|
|
36
36
|
var import_async = require("@dxos/async");
|
|
@@ -227,7 +227,7 @@ var createInvitation = async (host, options) => {
|
|
|
227
227
|
authMethod: import_services.Invitation.AuthMethod.NONE,
|
|
228
228
|
...options ?? {}
|
|
229
229
|
};
|
|
230
|
-
if (host instanceof
|
|
230
|
+
if (host instanceof import_chunk_GVGQ4FCH.ServiceContext) {
|
|
231
231
|
return host.invitationsManager.createInvitation({
|
|
232
232
|
kind: import_services.Invitation.Kind.SPACE,
|
|
233
233
|
...options
|
|
@@ -237,7 +237,7 @@ var createInvitation = async (host, options) => {
|
|
|
237
237
|
};
|
|
238
238
|
var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
|
|
239
239
|
invitation = sanitizeInvitation(invitation);
|
|
240
|
-
if (guest instanceof
|
|
240
|
+
if (guest instanceof import_chunk_GVGQ4FCH.ServiceContext) {
|
|
241
241
|
return guest.invitationsManager.acceptInvitation({
|
|
242
242
|
invitation,
|
|
243
243
|
deviceProfile: guestDeviceProfile
|
|
@@ -246,7 +246,7 @@ var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
|
|
|
246
246
|
return guest.join(invitation, guestDeviceProfile);
|
|
247
247
|
};
|
|
248
248
|
var createServiceHost = (config, signalManagerContext) => {
|
|
249
|
-
return new
|
|
249
|
+
return new import_chunk_GVGQ4FCH.ClientServicesHost({
|
|
250
250
|
config,
|
|
251
251
|
signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
|
|
252
252
|
transportFactory: import_network_manager.MemoryTransportFactory
|
|
@@ -262,7 +262,7 @@ var createServiceContext = async ({ signalContext = new import_messaging.MemoryS
|
|
|
262
262
|
});
|
|
263
263
|
const level = (0, import_testing.createTestLevel)();
|
|
264
264
|
await level.open();
|
|
265
|
-
return new
|
|
265
|
+
return new import_chunk_GVGQ4FCH.ServiceContext(storage, level, networkManager, signalManager, {
|
|
266
266
|
invitationConnectionDefaultParams: {
|
|
267
267
|
controlHeartbeatInterval: 200
|
|
268
268
|
}
|
|
@@ -363,12 +363,12 @@ var TestPeer = class {
|
|
|
363
363
|
});
|
|
364
364
|
}
|
|
365
365
|
get dataSpaceManager() {
|
|
366
|
-
return this._props.dataSpaceManager ??= new
|
|
366
|
+
return this._props.dataSpaceManager ??= new import_chunk_GVGQ4FCH.DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, this.identity, this.feedStore, this.echoHost, this.invitationsManager);
|
|
367
367
|
}
|
|
368
368
|
get invitationsManager() {
|
|
369
|
-
return this._props.invitationsManager ??= new
|
|
369
|
+
return this._props.invitationsManager ??= new import_chunk_GVGQ4FCH.InvitationsManager(new import_chunk_GVGQ4FCH.InvitationsHandler(this.networkManager), (invitation) => {
|
|
370
370
|
if (invitation.kind === import_services2.Invitation.Kind.SPACE) {
|
|
371
|
-
return new
|
|
371
|
+
return new import_chunk_GVGQ4FCH.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
|
|
372
372
|
} else {
|
|
373
373
|
throw new Error("not implemented");
|
|
374
374
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-space-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAA4B,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"data-space-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Event } from '@dxos/async';
|
|
2
2
|
import { type EchoHost } from '@dxos/echo-db';
|
|
3
3
|
import { type MetadataStore, type Space } from '@dxos/echo-pipeline';
|
|
4
|
+
import { type ObjectStructure, type SpaceDoc } from '@dxos/echo-protocol';
|
|
4
5
|
import { type FeedStore } from '@dxos/feed-store';
|
|
5
6
|
import { type Keyring } from '@dxos/keyring';
|
|
6
7
|
import { PublicKey } from '@dxos/keys';
|
|
7
|
-
import { SpaceState, type Space as SpaceProto
|
|
8
|
+
import { CreateEpochRequest, SpaceState, type Space as SpaceProto } from '@dxos/protocols/proto/dxos/client/services';
|
|
8
9
|
import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
|
|
9
10
|
import { type SpaceCache } from '@dxos/protocols/proto/dxos/echo/metadata';
|
|
10
11
|
import { type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
@@ -97,4 +98,8 @@ export declare class DataSpace {
|
|
|
97
98
|
activate(): Promise<void>;
|
|
98
99
|
deactivate(): Promise<void>;
|
|
99
100
|
}
|
|
101
|
+
/**
|
|
102
|
+
* Assumes properties are at root.
|
|
103
|
+
*/
|
|
104
|
+
export declare const findPropertiesObject: (spaceDoc: SpaceDoc) => [string, ObjectStructure] | undefined;
|
|
100
105
|
//# sourceMappingURL=data-space.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-space.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAA+D,MAAM,aAAa,CAAC;AAIjG,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"data-space.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const DXOS_VERSION = "0.5.3-
|
|
1
|
+
export declare const DXOS_VERSION = "0.5.3-next.57eca40";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/client-services",
|
|
3
|
-
"version": "0.5.3-
|
|
3
|
+
"version": "0.5.3-next.57eca40",
|
|
4
4
|
"description": "DXOS client services implementation",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -23,45 +23,45 @@
|
|
|
23
23
|
],
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"platform": "^1.3.6",
|
|
26
|
-
"@dxos/async": "0.5.3-
|
|
27
|
-
"@dxos/automerge": "0.5.3-
|
|
28
|
-
"@dxos/
|
|
29
|
-
"@dxos/
|
|
30
|
-
"@dxos/
|
|
31
|
-
"@dxos/
|
|
32
|
-
"@dxos/credentials": "0.5.3-
|
|
33
|
-
"@dxos/crypto": "0.5.3-
|
|
34
|
-
"@dxos/
|
|
35
|
-
"@dxos/echo-
|
|
36
|
-
"@dxos/echo-
|
|
37
|
-
"@dxos/
|
|
38
|
-
"@dxos/echo-schema": "0.5.3-
|
|
39
|
-
"@dxos/feed-store": "0.5.3-
|
|
40
|
-
"@dxos/
|
|
41
|
-
"@dxos/
|
|
42
|
-
"@dxos/
|
|
43
|
-
"@dxos/
|
|
44
|
-
"@dxos/
|
|
45
|
-
"@dxos/log": "0.5.3-
|
|
46
|
-
"@dxos/
|
|
47
|
-
"@dxos/messaging": "0.5.3-
|
|
48
|
-
"@dxos/
|
|
49
|
-
"@dxos/
|
|
50
|
-
"@dxos/protocols": "0.5.3-
|
|
51
|
-
"@dxos/random-access-storage": "0.5.3-
|
|
52
|
-
"@dxos/rpc": "0.5.3-
|
|
53
|
-
"@dxos/teleport
|
|
54
|
-
"@dxos/teleport": "0.5.3-
|
|
55
|
-
"@dxos/
|
|
56
|
-
"@dxos/
|
|
57
|
-
"@dxos/
|
|
58
|
-
"@dxos/
|
|
59
|
-
"@dxos/
|
|
26
|
+
"@dxos/async": "0.5.3-next.57eca40",
|
|
27
|
+
"@dxos/automerge": "0.5.3-next.57eca40",
|
|
28
|
+
"@dxos/codec-protobuf": "0.5.3-next.57eca40",
|
|
29
|
+
"@dxos/client-protocol": "0.5.3-next.57eca40",
|
|
30
|
+
"@dxos/config": "0.5.3-next.57eca40",
|
|
31
|
+
"@dxos/context": "0.5.3-next.57eca40",
|
|
32
|
+
"@dxos/credentials": "0.5.3-next.57eca40",
|
|
33
|
+
"@dxos/crypto": "0.5.3-next.57eca40",
|
|
34
|
+
"@dxos/debug": "0.5.3-next.57eca40",
|
|
35
|
+
"@dxos/echo-protocol": "0.5.3-next.57eca40",
|
|
36
|
+
"@dxos/echo-db": "0.5.3-next.57eca40",
|
|
37
|
+
"@dxos/echo-pipeline": "0.5.3-next.57eca40",
|
|
38
|
+
"@dxos/echo-schema": "0.5.3-next.57eca40",
|
|
39
|
+
"@dxos/feed-store": "0.5.3-next.57eca40",
|
|
40
|
+
"@dxos/indexing": "0.5.3-next.57eca40",
|
|
41
|
+
"@dxos/invariant": "0.5.3-next.57eca40",
|
|
42
|
+
"@dxos/keys": "0.5.3-next.57eca40",
|
|
43
|
+
"@dxos/kv-store": "0.5.3-next.57eca40",
|
|
44
|
+
"@dxos/keyring": "0.5.3-next.57eca40",
|
|
45
|
+
"@dxos/log": "0.5.3-next.57eca40",
|
|
46
|
+
"@dxos/lock-file": "0.5.3-next.57eca40",
|
|
47
|
+
"@dxos/messaging": "0.5.3-next.57eca40",
|
|
48
|
+
"@dxos/network-manager": "0.5.3-next.57eca40",
|
|
49
|
+
"@dxos/node-std": "0.5.3-next.57eca40",
|
|
50
|
+
"@dxos/protocols": "0.5.3-next.57eca40",
|
|
51
|
+
"@dxos/random-access-storage": "0.5.3-next.57eca40",
|
|
52
|
+
"@dxos/rpc": "0.5.3-next.57eca40",
|
|
53
|
+
"@dxos/teleport": "0.5.3-next.57eca40",
|
|
54
|
+
"@dxos/teleport-extension-gossip": "0.5.3-next.57eca40",
|
|
55
|
+
"@dxos/teleport-extension-object-sync": "0.5.3-next.57eca40",
|
|
56
|
+
"@dxos/timeframe": "0.5.3-next.57eca40",
|
|
57
|
+
"@dxos/util": "0.5.3-next.57eca40",
|
|
58
|
+
"@dxos/websocket-rpc": "0.5.3-next.57eca40",
|
|
59
|
+
"@dxos/tracing": "0.5.3-next.57eca40"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
62
62
|
"@types/platform": "^1.3.4",
|
|
63
63
|
"@types/readable-stream": "^2.3.9",
|
|
64
|
-
"@dxos/signal": "0.5.3-
|
|
64
|
+
"@dxos/signal": "0.5.3-next.57eca40"
|
|
65
65
|
},
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public"
|
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
//
|
|
4
4
|
|
|
5
5
|
import { Event, synchronized, trackLeaks } from '@dxos/async';
|
|
6
|
+
import { type Doc } from '@dxos/automerge/automerge';
|
|
7
|
+
import { type AutomergeUrl } from '@dxos/automerge/automerge-repo';
|
|
6
8
|
import { cancelWithContext, Context } from '@dxos/context';
|
|
7
9
|
import {
|
|
8
10
|
type CredentialSigner,
|
|
@@ -19,12 +21,13 @@ import {
|
|
|
19
21
|
type SpaceProtocol,
|
|
20
22
|
type SpaceProtocolSession,
|
|
21
23
|
} from '@dxos/echo-pipeline';
|
|
24
|
+
import { type SpaceDoc } from '@dxos/echo-protocol';
|
|
22
25
|
import { type FeedStore } from '@dxos/feed-store';
|
|
23
26
|
import { invariant } from '@dxos/invariant';
|
|
24
27
|
import { type Keyring } from '@dxos/keyring';
|
|
25
28
|
import { PublicKey } from '@dxos/keys';
|
|
26
29
|
import { log } from '@dxos/log';
|
|
27
|
-
import { trace } from '@dxos/protocols';
|
|
30
|
+
import { trace as Trace } from '@dxos/protocols';
|
|
28
31
|
import { Invitation, SpaceState } from '@dxos/protocols/proto/dxos/client/services';
|
|
29
32
|
import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
|
|
30
33
|
import { type SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
|
|
@@ -33,9 +36,10 @@ import { type DelegateSpaceInvitation } from '@dxos/protocols/proto/dxos/halo/in
|
|
|
33
36
|
import { type PeerState } from '@dxos/protocols/proto/dxos/mesh/presence';
|
|
34
37
|
import { Gossip, Presence } from '@dxos/teleport-extension-gossip';
|
|
35
38
|
import { type Timeframe } from '@dxos/timeframe';
|
|
39
|
+
import { trace } from '@dxos/tracing';
|
|
36
40
|
import { ComplexMap, deferFunction, forEachAsync } from '@dxos/util';
|
|
37
41
|
|
|
38
|
-
import { DataSpace } from './data-space';
|
|
42
|
+
import { DataSpace, findPropertiesObject } from './data-space';
|
|
39
43
|
import { spaceGenesis } from './genesis';
|
|
40
44
|
import { createAuthProvider } from '../identity';
|
|
41
45
|
import { type InvitationsManager } from '../invitations';
|
|
@@ -103,6 +107,31 @@ export class DataSpaceManager {
|
|
|
103
107
|
} = params ?? {};
|
|
104
108
|
this._spaceMemberPresenceAnnounceInterval = spaceMemberPresenceAnnounceInterval;
|
|
105
109
|
this._spaceMemberPresenceOfflineTimeout = spaceMemberPresenceOfflineTimeout;
|
|
110
|
+
|
|
111
|
+
trace.diagnostic({
|
|
112
|
+
id: 'spaces',
|
|
113
|
+
name: 'Spaces',
|
|
114
|
+
fetch: async () => {
|
|
115
|
+
return Array.from(this._spaces.values()).map((space) => {
|
|
116
|
+
const rootUrl = space.automergeSpaceState.rootUrl;
|
|
117
|
+
const rootHandle = rootUrl ? this._echoHost.automergeRepo.find(rootUrl as AutomergeUrl) : undefined;
|
|
118
|
+
const rootDoc = rootHandle?.docSync() as Doc<SpaceDoc> | undefined;
|
|
119
|
+
|
|
120
|
+
const properties = rootDoc && findPropertiesObject(rootDoc);
|
|
121
|
+
|
|
122
|
+
return {
|
|
123
|
+
key: space.key.toHex(),
|
|
124
|
+
state: SpaceState[space.state],
|
|
125
|
+
name: properties?.[1].data.name ?? null,
|
|
126
|
+
inlineObjects: rootDoc ? Object.keys(rootDoc.objects ?? {}).length : null,
|
|
127
|
+
linkedObjects: rootDoc ? Object.keys(rootDoc.links ?? {}).length : null,
|
|
128
|
+
credentials: space.inner.spaceState.credentials.length,
|
|
129
|
+
members: space.inner.spaceState.members.size,
|
|
130
|
+
rootUrl,
|
|
131
|
+
};
|
|
132
|
+
});
|
|
133
|
+
},
|
|
134
|
+
});
|
|
106
135
|
}
|
|
107
136
|
|
|
108
137
|
// TODO(burdon): Remove.
|
|
@@ -113,7 +142,7 @@ export class DataSpaceManager {
|
|
|
113
142
|
@synchronized
|
|
114
143
|
async open() {
|
|
115
144
|
log('open');
|
|
116
|
-
log.trace('dxos.echo.data-space-manager.open',
|
|
145
|
+
log.trace('dxos.echo.data-space-manager.open', Trace.begin({ id: this._instanceId }));
|
|
117
146
|
log('metadata loaded', { spaces: this._metadataStore.spaces.length });
|
|
118
147
|
|
|
119
148
|
await forEachAsync(this._metadataStore.spaces, async (spaceMetadata) => {
|
|
@@ -134,7 +163,7 @@ export class DataSpaceManager {
|
|
|
134
163
|
}
|
|
135
164
|
}
|
|
136
165
|
|
|
137
|
-
log.trace('dxos.echo.data-space-manager.open',
|
|
166
|
+
log.trace('dxos.echo.data-space-manager.open', Trace.end({ id: this._instanceId }));
|
|
138
167
|
}
|
|
139
168
|
|
|
140
169
|
@synchronized
|
|
@@ -4,12 +4,16 @@
|
|
|
4
4
|
|
|
5
5
|
import { Event, asyncTimeout, scheduleTask, sleep, synchronized, trackLeaks } from '@dxos/async';
|
|
6
6
|
import { AUTH_TIMEOUT } from '@dxos/client-protocol';
|
|
7
|
-
import {
|
|
7
|
+
import { Context, ContextDisposedError, cancelWithContext } from '@dxos/context';
|
|
8
8
|
import { timed, warnAfterTimeout } from '@dxos/debug';
|
|
9
9
|
import { type EchoHost } from '@dxos/echo-db';
|
|
10
|
-
import {
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
import {
|
|
11
|
+
AutomergeDocumentLoaderImpl,
|
|
12
|
+
createMappedFeedWriter,
|
|
13
|
+
type MetadataStore,
|
|
14
|
+
type Space,
|
|
15
|
+
} from '@dxos/echo-pipeline';
|
|
16
|
+
import { type ObjectStructure, type SpaceDoc } from '@dxos/echo-protocol';
|
|
13
17
|
import { TYPE_PROPERTIES } from '@dxos/echo-schema';
|
|
14
18
|
import { type FeedStore } from '@dxos/feed-store';
|
|
15
19
|
import { failedInvariant, invariant } from '@dxos/invariant';
|
|
@@ -17,15 +21,15 @@ import { type Keyring } from '@dxos/keyring';
|
|
|
17
21
|
import { PublicKey } from '@dxos/keys';
|
|
18
22
|
import { log } from '@dxos/log';
|
|
19
23
|
import { CancelledError, SystemError } from '@dxos/protocols';
|
|
20
|
-
import { SpaceState, type Space as SpaceProto
|
|
24
|
+
import { CreateEpochRequest, SpaceState, type Space as SpaceProto } from '@dxos/protocols/proto/dxos/client/services';
|
|
21
25
|
import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
|
|
22
26
|
import { type SpaceCache } from '@dxos/protocols/proto/dxos/echo/metadata';
|
|
23
|
-
import { SpaceMember } from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
24
27
|
import {
|
|
25
28
|
AdmittedFeed,
|
|
26
|
-
|
|
29
|
+
SpaceMember,
|
|
27
30
|
type Credential,
|
|
28
31
|
type Epoch,
|
|
32
|
+
type ProfileDocument,
|
|
29
33
|
} from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
30
34
|
import { type GossipMessage } from '@dxos/protocols/proto/dxos/mesh/teleport/gossip';
|
|
31
35
|
import { type Gossip, type Presence } from '@dxos/teleport-extension-gossip';
|
|
@@ -454,7 +458,7 @@ export class DataSpace {
|
|
|
454
458
|
|
|
455
459
|
// Find properties object.
|
|
456
460
|
const objects = Object.entries((rootHandle.docSync() as SpaceDoc).objects!);
|
|
457
|
-
const properties =
|
|
461
|
+
const properties = findPropertiesObject(rootHandle.docSync() as SpaceDoc);
|
|
458
462
|
const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
|
|
459
463
|
invariant(properties, 'Properties not found');
|
|
460
464
|
|
|
@@ -531,3 +535,16 @@ export class DataSpace {
|
|
|
531
535
|
this.stateUpdate.emit();
|
|
532
536
|
}
|
|
533
537
|
}
|
|
538
|
+
|
|
539
|
+
/**
|
|
540
|
+
* Assumes properties are at root.
|
|
541
|
+
*/
|
|
542
|
+
export const findPropertiesObject = (spaceDoc: SpaceDoc): [string, ObjectStructure] | undefined => {
|
|
543
|
+
for (const id in spaceDoc.objects ?? {}) {
|
|
544
|
+
const obj = spaceDoc.objects![id];
|
|
545
|
+
if (obj.system.type?.itemId === TYPE_PROPERTIES) {
|
|
546
|
+
return [id, obj];
|
|
547
|
+
}
|
|
548
|
+
}
|
|
549
|
+
return undefined;
|
|
550
|
+
};
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const DXOS_VERSION = "0.5.3-
|
|
1
|
+
export const DXOS_VERSION = "0.5.3-next.57eca40";
|