@dxos/cli-util 0.9.1-main.c7dcc2e112 → 0.9.1-staging.ee54ba693a

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 (9) hide show
  1. package/dist/lib/node-esm/index.mjs +4 -12
  2. package/dist/lib/node-esm/index.mjs.map +3 -3
  3. package/dist/lib/node-esm/meta.json +1 -1
  4. package/dist/types/src/util/space.d.ts +2 -2
  5. package/dist/types/src/util/space.d.ts.map +1 -1
  6. package/dist/types/tsconfig.tsbuildinfo +1 -1
  7. package/package.json +17 -17
  8. package/src/oauth/recovery.ts +1 -1
  9. package/src/util/space.ts +3 -14
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/cli-util",
3
- "version": "0.9.1-main.c7dcc2e112",
3
+ "version": "0.9.1-staging.ee54ba693a",
4
4
  "description": "Shared CLI utilities for DXOS CLI commands and plugins",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -31,32 +31,32 @@
31
31
  ],
32
32
  "dependencies": {
33
33
  "@effect/cli": "0.75.2",
34
- "@effect/platform": "0.96.1",
34
+ "@effect/platform": "0.96.2",
35
35
  "@effect/platform-bun": "0.90.0",
36
36
  "@effect/printer": "0.49.0",
37
37
  "@effect/printer-ansi": "0.49.0",
38
38
  "get-port-please": "^3.1.1",
39
- "@dxos/app-toolkit": "0.9.1-main.c7dcc2e112",
40
- "@dxos/client": "0.9.1-main.c7dcc2e112",
41
- "@dxos/echo": "0.9.1-main.c7dcc2e112",
42
- "@dxos/echo-client": "0.9.1-main.c7dcc2e112",
43
- "@dxos/compute": "0.9.1-main.c7dcc2e112",
44
- "@dxos/effect": "0.9.1-main.c7dcc2e112",
45
- "@dxos/functions": "0.9.1-main.c7dcc2e112",
46
- "@dxos/keys": "0.9.1-main.c7dcc2e112",
47
- "@dxos/errors": "0.9.1-main.c7dcc2e112",
48
- "@dxos/log": "0.9.1-main.c7dcc2e112",
49
- "@dxos/protocols": "0.9.1-main.c7dcc2e112",
50
- "@dxos/util": "0.9.1-main.c7dcc2e112",
51
- "@dxos/debug": "0.9.1-main.c7dcc2e112"
39
+ "@dxos/app-toolkit": "0.9.1-staging.ee54ba693a",
40
+ "@dxos/compute": "0.9.1-staging.ee54ba693a",
41
+ "@dxos/echo": "0.9.1-staging.ee54ba693a",
42
+ "@dxos/effect": "0.9.1-staging.ee54ba693a",
43
+ "@dxos/debug": "0.9.1-staging.ee54ba693a",
44
+ "@dxos/errors": "0.9.1-staging.ee54ba693a",
45
+ "@dxos/echo-client": "0.9.1-staging.ee54ba693a",
46
+ "@dxos/functions": "0.9.1-staging.ee54ba693a",
47
+ "@dxos/keys": "0.9.1-staging.ee54ba693a",
48
+ "@dxos/log": "0.9.1-staging.ee54ba693a",
49
+ "@dxos/protocols": "0.9.1-staging.ee54ba693a",
50
+ "@dxos/client": "0.9.1-staging.ee54ba693a",
51
+ "@dxos/util": "0.9.1-staging.ee54ba693a"
52
52
  },
53
53
  "devDependencies": {
54
- "effect": "3.21.3",
54
+ "effect": "3.21.4",
55
55
  "typescript": "^6.0.3",
56
56
  "vitest": "4.1.8"
57
57
  },
58
58
  "peerDependencies": {
59
- "effect": "3.21.3"
59
+ "effect": "3.21.4"
60
60
  },
61
61
  "publishConfig": {
62
62
  "access": "public"
package/src/oauth/recovery.ts CHANGED
@@ -43,7 +43,7 @@ export const performRecoveryOAuthFlow = Effect.fn(function* (params: RecoveryOAu
43
43
  try: () =>
44
44
  fetch(initiateUrl, {
45
45
  method: 'POST',
46
- headers: { 'Content-Type': 'application/json', Origin: server.origin },
46
+ headers: { 'Content-Type': 'application/json', 'Origin': server.origin },
47
47
  body: JSON.stringify({
48
48
  provider: params.provider,
49
49
  scopes: params.scopes,
package/src/util/space.ts CHANGED
@@ -10,8 +10,7 @@ import * as Option from 'effect/Option';
10
10
  import { AppSpace } from '@dxos/app-toolkit';
11
11
  import { ClientService } from '@dxos/client';
12
12
  import { type Space } from '@dxos/client/echo';
13
- import { Database, Feed, type Key } from '@dxos/echo';
14
- import { createFeedServiceLayer } from '@dxos/echo-client';
13
+ import { Database, type Key } from '@dxos/echo';
15
14
  import { BaseError, type BaseErrorOptions } from '@dxos/errors';
16
15
  import { log } from '@dxos/log';
17
16
  import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
@@ -39,7 +38,7 @@ export const spaceIdWithDefault = (spaceId: Option.Option<Key.SpaceId>) =>
39
38
  export const spaceLayer = (
40
39
  spaceId$: Option.Option<Key.SpaceId>,
41
40
  fallbackToPersonalSpace = false,
42
- ): Layer.Layer<Database.Service | Feed.FeedService, never, ClientService> => {
41
+ ): Layer.Layer<Database.Service, never, ClientService> => {
43
42
  const getSpace = Effect.fn(function* () {
44
43
  const client = yield* ClientService;
45
44
 
@@ -93,17 +92,7 @@ export const spaceLayer = (
93
92
  ),
94
93
  );
95
94
 
96
- const feed = Layer.unwrapEffect(
97
- Effect.gen(function* () {
98
- const space = yield* getSpace();
99
- if (!space) {
100
- return Feed.notAvailable;
101
- }
102
- return createFeedServiceLayer(space.internal.db);
103
- }),
104
- );
105
-
106
- return Layer.merge(db, feed);
95
+ return db;
107
96
  };
108
97
 
109
98
  // TODO(dmaretskyi): There a race condition with edge connection not showing up.