@dxos/plugin-space 0.8.4-main.4a85c3132b → 0.8.4-main.51f1e5ca51

package/src/helpers/query.ts

@@ -1,166 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import * as Array from 'effect/Array';
-import * as Effect from 'effect/Effect';
-import * as EffectFunction from 'effect/Function';
-import * as Match from 'effect/Match';
-import * as Option from 'effect/Option';
-import type * as Schema from 'effect/Schema';
-import * as SchemaAST from 'effect/SchemaAST';
-
-import { DXN, Filter, Key, Query, type QueryAST, type SchemaRegistry } from '@dxos/echo';
-import {
-  ReferenceAnnotationId,
-  type ReferenceAnnotationValue,
-  getTypeAnnotation,
-  unwrapOptional,
-} from '@dxos/echo/internal';
-import { runAndForwardErrors } from '@dxos/effect';
-import { log } from '@dxos/log';
-import { type Space } from '@dxos/react-client/echo';
-import { Person } from '@dxos/types';
-
-// TODO(wittjosiah): Factor out and add tests.
-// TODO(wittjosiah): Support arbitrary type imports.
-export const evalQuery = (queryString: string): Query.Any => {
-  const globals = { Query, Filter, Person };
-  try {
-    // eslint-disable-next-line @typescript-eslint/no-implied-eval
-    return new Function(...Object.keys(globals), `return ${queryString}`)(...Object.values(globals));
-  } catch (err) {
-    log.catch(err);
-    return Query.select(Filter.nothing());
-  }
-};
-
-export const resolveSchemaWithRegistry = (registry: SchemaRegistry.SchemaRegistry, query: QueryAST.Query) => {
-  const resolve = Effect.fn(function* (dxn: string) {
-    const typename = DXN.parse(dxn).asTypeDXN()?.type;
-    if (!typename) {
-      return Option.none();
-    }
-
-    const query = registry.query({ typename, location: ['database', 'runtime'] });
-    const schemas = yield* Effect.promise(() => query.run());
-    return Array.head(schemas);
-  });
-
-  return resolveSchema(query, resolve).pipe(
-    Effect.map((schema) => Option.getOrUndefined(schema)),
-    runAndForwardErrors,
-  );
-};
-
-const resolveSchema = (
-  query: QueryAST.Query,
-  resolve: (dxn: string) => Effect.Effect<Option.Option<Schema.Schema.AnyNoContext>>,
-): Effect.Effect<Option.Option<Schema.Schema.AnyNoContext>> => {
-  return Match.value(query).pipe(
-    Match.withReturnType<Effect.Effect<Option.Option<Schema.Schema.AnyNoContext>>>(),
-    // TODO(wittjosiah): Reconcile with filter match?
-    Match.when({ type: 'select' }, ({ filter }) =>
-      typenameFromFilter(filter).pipe(
-        Option.map((typename) => resolve(typename)),
-        Option.getOrElse(() => Effect.succeed(Option.none<Schema.Schema.AnyNoContext>())),
-      ),
-    ),
-    Match.when({ type: 'filter' }, ({ filter }) =>
-      typenameFromFilter(filter).pipe(
-        Option.map((typename) => resolve(typename)),
-        Option.getOrElse(() => Effect.succeed(Option.none<Schema.Schema.AnyNoContext>())),
-      ),
-    ),
-    Match.when({ type: 'reference-traversal' }, ({ anchor, property }) =>
-      resolveSchema(anchor, resolve).pipe(
-        Effect.map((base) =>
-          base.pipe(
-            Option.map((schema) => SchemaAST.getPropertySignatures(schema.ast)),
-            Option.flatMap((properties) => Array.findFirst(properties, (p) => p.name === property)),
-            Option.flatMap((property) =>
-              SchemaAST.getAnnotation<ReferenceAnnotationValue>(ReferenceAnnotationId)(unwrapOptional(property)),
-            ),
-            Option.map((annotation) => annotation.typename),
-          ),
-        ),
-        Effect.flatMap(
-          Option.match({
-            onNone: () => Effect.succeed(Option.none()),
-            onSome: (typename) => resolve(DXN.fromTypename(typename).toString()),
-          }),
-        ),
-      ),
-    ),
-    Match.when({ type: 'relation', filter: Match.defined }, ({ filter }) =>
-      typenameFromFilter(filter).pipe(
-        Option.map((typename) => resolve(typename)),
-        Option.getOrElse(() => Effect.succeed(Option.none<Schema.Schema.AnyNoContext>())),
-      ),
-    ),
-    Match.when({ type: 'relation-traversal' }, ({ anchor, direction }) =>
-      resolveSchema(anchor, resolve).pipe(
-        Effect.map((base) =>
-          base.pipe(
-            Option.map((schema) => getTypeAnnotation(schema)),
-            Option.flatMap((annotation) =>
-              Option.fromNullable(direction === 'source' ? annotation?.sourceSchema : annotation?.targetSchema),
-            ),
-          ),
-        ),
-        Effect.flatMap(
-          Option.match({
-            onNone: () => Effect.succeed(Option.none()),
-            onSome: (typename) => resolve(typename),
-          }),
-        ),
-      ),
-    ),
-    Match.when({ type: 'options' }, ({ query }) => resolveSchema(query, resolve)),
-    Match.orElse((_q) => {
-      // TODO(wittjosiah): Implement other cases.
-      return Effect.succeed(Option.none());
-    }),
-  );
-};
-
-const typenameFromFilter = (filter: QueryAST.Filter): Option.Option<string> =>
-  Match.value(filter).pipe(
-    Match.withReturnType<Option.Option<string>>(),
-    Match.when({ type: 'object' }, ({ typename }) => Option.fromNullable(typename)),
-    Match.when({ type: 'and' }, ({ filters }) =>
-      EffectFunction.pipe(filters, Array.map(typenameFromFilter), Array.findFirst(Option.isSome), Option.flatten),
-    ),
-    Match.when({ type: 'or' }, ({ filters }) =>
-      EffectFunction.pipe(filters, Array.map(typenameFromFilter), Array.findFirst(Option.isSome), Option.flatten),
-    ),
-    Match.orElse(() => Option.none()),
-  );
-
-// TODO(wittjosiah): Currently assumes from scope is at the top-level of the ast.
-export const getQueryTarget = (query: QueryAST.Query, space?: Space) => {
-  return Match.value(query).pipe(
-    Match.when({ type: 'from' }, ({ from }) => {
-      if (from._tag !== 'scope') {
-        return space?.db;
-      }
-      const result = Option.fromNullable(from.scope.queues).pipe(
-        Option.flatMap((queues) => Array.head(queues)),
-        Option.flatMap((queueDxn) => Option.fromNullable(DXN.tryParse(String(queueDxn)))),
-        Option.flatMap((parsed) => {
-          const q = parsed.asQueueDXN();
-          if (!q || !Key.ObjectId.isValid(q.queueId)) return Option.none();
-          return Option.fromNullable(space?.queues.get(parsed));
-        }),
-      );
-      // Skip query when a requested queue is not found (structurally invalid DXN or valid DXN
-      // referencing a queue not present in space.queues, e.g. not yet synced) to avoid 400 errors.
-      // TODO(wittjosiah): Can we handle this upstream?
-      if (from.scope.queues?.length && Option.isNone(result)) {
-        return undefined;
-      }
-      return Option.getOrElse(result, () => space?.db);
-    }),
-    Match.orElse(() => space?.db),
-  );
-};

package/src/hooks/useActiveSpace.ts

@@ -1,24 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Capabilities, type CapabilityManager } from '@dxos/app-framework';
-import { AppCapabilities } from '@dxos/app-toolkit';
-import { useLayout } from '@dxos/app-toolkit/ui';
-import { ClientCapabilities } from '@dxos/plugin-client';
-import { parseId, useSpace } from '@dxos/react-client/echo';
-
-export const getActiveSpace = (capabilities: CapabilityManager.CapabilityManager) => {
-  const client = capabilities.get(ClientCapabilities.Client);
-  const registry = capabilities.get(Capabilities.AtomRegistry);
-  const layoutAtom = capabilities.get(AppCapabilities.Layout);
-  const layout = registry.get(layoutAtom);
-  const { spaceId } = parseId(layout.workspace);
-  return spaceId ? client.spaces.get(spaceId) : undefined;
-};
-
-export const useActiveSpace = () => {
-  const layout = useLayout();
-  const { spaceId } = parseId(layout.workspace);
-  return useSpace(spaceId);
-};

package/src/hooks/useTypeOptions.ts

@@ -1,25 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useMemo } from 'react';
-
-import { type Space } from '@dxos/react-client/echo';
-import { useTranslation } from '@dxos/react-ui';
-
-import { type TypeInputOptions, getTypenames } from '../types';
-
-export const useTypeOptions = ({ space, annotation }: { space?: Space; annotation: TypeInputOptions }) => {
-  const { t } = useTranslation();
-  const typenames = getTypenames({ annotation, space });
-  return useMemo(
-    () =>
-      typenames
-        .map((typename) => ({
-          value: typename,
-          label: t('typename label', { ns: typename, defaultValue: typename }),
-        }))
-        .toSorted((a, b) => a.label.localeCompare(b.label)),
-    [t, typenames],
-  );
-};