fix: address plugin command review findings

t3-code[bot] committed 2 months ago

Commit ceb36401 parent 12b8e9e5 files · +24 −9Browse files

Unified · Split

5 files

 import { ComposerCommandPopover, type ComposerCommandItem } from "./ComposerCommandPopover";
 import {
   buildMobilePluginCommandItems,
+  isCollapsedComposerSelection,
   reconcileComposerSelectionForTextChange,
 } from "./plugin-command-menu";
 import { useMobilePluginCommands } from "./use-mobile-plugin-commands";
     selectedProject?.environmentId ?? null,
   );
   const pluginCommandTrigger = useMemo(() => {
+    if (!isCollapsedComposerSelection(composerSelection)) return null;
     const trigger = detectComposerTrigger(flow.prompt, composerSelection.end);
     return trigger?.kind === "slash-command" ? trigger : null;
-  }, [composerSelection.end, flow.prompt]);
+  }, [composerSelection, flow.prompt]);
   const pluginCommandItems = useMemo<ComposerCommandItem[]>(() => {
     if (pluginCommandTrigger === null) return [];
     return buildMobilePluginCommandItems(pluginCommands, pluginCommandTrigger.query);

 import {
   buildMobilePluginCommandItems,
+  isCollapsedComposerSelection,
   reconcileComposerSelectionForTextChange,
 } from "./plugin-command-menu";
     });
   });
 });
+describe("isCollapsedComposerSelection", () => {
+  it("rejects a highlighted range", () => {
+    expect(isCollapsedComposerSelection({ start: 0, end: 7 })).toBe(false);
+  });
+});

 import type { ComposerCommandItem } from "./ComposerCommandPopover";
+export const isCollapsedComposerSelection = (selection: {
+  readonly start: number;
+  readonly end: number;
+}): boolean => selection.start === selection.end;
 export function reconcileComposerSelectionForTextChange(
   selection: { readonly start: number; readonly end: number },
   previousLength: number,

 export class PluginCommandDefinitionError extends Schema.TaggedErrorClass<PluginCommandDefinitionError>()(
   "PluginCommandDefinitionError",
-  { message: Schema.String },
+  { cause: Schema.Defect(), id: Schema.String },
-) {}
+) {
+  override get message(): string {
+    return `Plugin command ${this.id} has invalid declarative metadata.`;
+  }
+}
 export interface PluginCommandRegistration {
   readonly command: PluginCommand;
   const snapshot = yield* runtime.contributions(COMMAND_SLOT);
   const commands = yield* Effect.forEach(snapshot.entries, (entry) =>
     decodePluginCommandEffect(commandInputFromContribution(entry)).pipe(
-      Effect.mapError(
+      Effect.mapError((cause) => new PluginCommandDefinitionError({ cause, id: entry.id })),
-        () =>
-          new PluginCommandDefinitionError({
-            message: `Plugin command ${entry.id} has invalid declarative metadata.`,
-          }),
-      ),
     ),
   );
   const frozenCommands = commands.map((command) =>
             return new PluginCommandNotFoundError({ id: input.id });
           }
           return new PluginCommandInvocationError({
+            cause: error,
             id: input.id,
             message: "Plugin command failed.",
           });

@@ -58,6 +58,7 @@ export class PluginCommandCatalogChangedError extends Schema.TaggedErrorClass<Pl · 57 unmodified lines
58	export class PluginCommandInvocationError extends Schema.TaggedErrorClass<PluginCommandInvocationError>()(	58	export class PluginCommandInvocationError extends Schema.TaggedErrorClass<PluginCommandInvocationError>()(
59	"PluginCommandInvocationError",	59	"PluginCommandInvocationError",
60	{	60	{
		61	cause: Schema.Defect(),
61	id: PluginCommandId,	62	id: PluginCommandId,
62	message: TrimmedNonEmptyString.check(Schema.isMaxLength(500)),	63	message: TrimmedNonEmptyString.check(Schema.isMaxLength(500)),
63	},	64	},

Keyboard shortcuts