@dxos/app-framework 0.8.2-main.2f9c567 → 0.8.2-main.36232bc

package/src/plugin-intent/actions.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import { Schema as S } from 'effect';
 
 import { Label } from './intent';
 
@@ -13,21 +13,21 @@ export namespace IntentAction {
   /**
    * Log an intent.
    */
-  export class Track extends Schema.TaggedClass<Track>()(`${INTENT_ACTION}/track`, {
-    input: Schema.Struct({
-      intents: Schema.Array(Schema.String),
-      error: Schema.optional(Schema.String),
+  export class Track extends S.TaggedClass<Track>()(`${INTENT_ACTION}/track`, {
+    input: S.Struct({
+      intents: S.Array(S.String),
+      error: S.optional(S.String),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
   /**
    * Fired after an intent is dispatched if the intent is undoable.
    */
-  export class ShowUndo extends Schema.TaggedClass<ShowUndo>()(`${INTENT_ACTION}/show-undo`, {
-    input: Schema.Struct({
+  export class ShowUndo extends S.TaggedClass<ShowUndo>()(`${INTENT_ACTION}/show-undo`, {
+    input: S.Struct({
       message: Label,
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 }

package/src/plugin-intent/intent-dispatcher.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema, Effect, Fiber, pipe } from 'effect';
+import { Schema as S, Effect, Fiber, pipe } from 'effect';
 import { describe, expect, test } from 'vitest';
 
 import { chain, createIntent } from './intent';
@@ -224,12 +224,12 @@ describe('Intent dispatcher', () => {
   test.todo('follow up intents');
 });
 
-class ToString extends Schema.TaggedClass<ToString>()('ToString', {
-  input: Schema.Struct({
-    value: Schema.Number,
+class ToString extends S.TaggedClass<ToString>()('ToString', {
+  input: S.Struct({
+    value: S.Number,
   }),
-  output: Schema.Struct({
-    string: Schema.String,
+  output: S.Struct({
+    string: S.String,
   }),
 }) {}
 
@@ -238,12 +238,12 @@ const toStringResolver = createResolver({
   resolve: async (data) => ({ data: { string: data.value.toString() } }),
 });
 
-class Compute extends Schema.TaggedClass<Compute>()('Compute', {
-  input: Schema.Struct({
-    value: Schema.Number,
+class Compute extends S.TaggedClass<Compute>()('Compute', {
+  input: S.Struct({
+    value: S.Number,
   }),
-  output: Schema.Struct({
-    value: Schema.Number,
+  output: S.Struct({
+    value: S.Number,
   }),
 }) {}
 
@@ -262,13 +262,13 @@ const computeResolver = createResolver({
   },
 });
 
-class Concat extends Schema.TaggedClass<Concat>()('Concat', {
-  input: Schema.Struct({
-    string: Schema.String,
-    plus: Schema.String,
+class Concat extends S.TaggedClass<Concat>()('Concat', {
+  input: S.Struct({
+    string: S.String,
+    plus: S.String,
   }),
-  output: Schema.Struct({
-    string: Schema.String,
+  output: S.Struct({
+    string: S.String,
   }),
 }) {}
 
@@ -277,9 +277,9 @@ const concatResolver = createResolver({
   resolve: async (data) => ({ data: { string: data.string + data.plus } }),
 });
 
-class Add extends Schema.TaggedClass<Add>()('Add', {
-  input: Schema.Tuple(Schema.Number, Schema.Number),
-  output: Schema.Number,
+class Add extends S.TaggedClass<Add>()('Add', {
+  input: S.Tuple(S.Number, S.Number),
+  output: S.Number,
 }) {}
 
 const addResolver = createResolver({
@@ -287,9 +287,9 @@ const addResolver = createResolver({
   resolve: async (data) => ({ data: data[0] + data[1] }),
 });
 
-class SideEffect extends Schema.TaggedClass<SideEffect>()('SideEffect', {
-  input: Schema.Void,
-  output: Schema.Void,
+class SideEffect extends S.TaggedClass<SideEffect>()('SideEffect', {
+  input: S.Void,
+  output: S.Void,
 }) {}
 
 const sideEffectResolver = createResolver({

package/src/plugin-intent/intent.ts

@@ -2,24 +2,20 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema } from 'effect';
+import { Schema as S } from 'effect';
 
 export type IntentParams = {
-  readonly input: Schema.Schema.All;
-  readonly output: Schema.Schema.All;
+  readonly input: S.Schema.All;
+  readonly output: S.Schema.All;
 };
 
 export type IntentData<Fields extends IntentParams> =
-  Schema.Schema.Type<Schema.Struct<Fields>> extends { readonly input: any }
-    ? Schema.Schema.Type<Schema.Struct<Fields>>['input']
-    : any;
+  S.Schema.Type<S.Struct<Fields>> extends { readonly input: any } ? S.Schema.Type<S.Struct<Fields>>['input'] : any;
 
 export type IntentResultData<Fields extends IntentParams> =
-  Schema.Schema.Type<Schema.Struct<Fields>> extends { readonly output: any }
-    ? Schema.Schema.Type<Schema.Struct<Fields>>['output']
-    : any;
+  S.Schema.Type<S.Struct<Fields>> extends { readonly output: any } ? S.Schema.Type<S.Struct<Fields>>['output'] : any;
 
-export type IntentSchema<Tag extends string, Fields extends IntentParams> = Schema.TaggedClass<any, Tag, Fields>;
+export type IntentSchema<Tag extends string, Fields extends IntentParams> = S.TaggedClass<any, Tag, Fields>;
 
 /**
  * An intent is an abstract description of an operation to be performed.
@@ -84,7 +80,7 @@ export const createIntent = <Tag extends string, Fields extends IntentParams>(
 ): IntentChain<Tag, Tag, Fields, Fields> => {
   // The output of validateSync breaks proxy objects so this is just used for validation.
   // TODO(wittjosiah): Is there a better way to make theses types align?
-  const _ = Schema.validateSync(schema.fields.input as Schema.Schema<any, any, unknown>)(data);
+  const _ = S.validateSync(schema.fields.input as S.Schema<any, any, unknown>)(data);
   const intent = {
     ...params,
     _schema: schema,
@@ -143,13 +139,8 @@ export const chain =
 
 // NOTE: Should maintain compatibility with `i18next` (and @dxos/react-ui).
 // TODO(wittjosiah): Making this immutable breaks type compatibility.
-export const Label = Schema.Union(
-  Schema.String,
-  Schema.mutable(
-    Schema.Tuple(
-      Schema.String,
-      Schema.mutable(Schema.Struct({ ns: Schema.String, count: Schema.optional(Schema.Number) })),
-    ),
-  ),
+export const Label = S.Union(
+  S.String,
+  S.mutable(S.Tuple(S.String, S.mutable(S.Struct({ ns: S.String, count: S.optional(S.Number) })))),
 );
-export type Label = Schema.Schema.Type<typeof Label>;
+export type Label = S.Schema.Type<typeof Label>;

package/src/plugin-settings/actions.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema } from 'effect';
+import { Schema as S } from 'effect';
 
 export const SETTINGS_PLUGIN = 'dxos.org/plugin/settings';
 export const SETTINGS_ACTION = `${SETTINGS_PLUGIN}/action`;
@@ -12,18 +12,18 @@ export const SETTINGS_ID = '!dxos:settings';
 export const SETTINGS_KEY = 'settings';
 
 export namespace SettingsAction {
-  export class Open extends Schema.TaggedClass<Open>()(`${SETTINGS_ACTION}/open`, {
-    input: Schema.Struct({
-      plugin: Schema.optional(Schema.String),
+  export class Open extends S.TaggedClass<Open>()(`${SETTINGS_ACTION}/open`, {
+    input: S.Struct({
+      plugin: S.optional(S.String),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class OpenPluginRegistry extends Schema.TaggedClass<OpenPluginRegistry>()(
+  export class OpenPluginRegistry extends S.TaggedClass<OpenPluginRegistry>()(
     `${SETTINGS_ACTION}/open-plugin-registry`,
     {
-      input: Schema.Void,
-      output: Schema.Void,
+      input: S.Void,
+      output: S.Void,
     },
   ) {}
 }