Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Fix reference command passing; Fix reference insertion focus and replacement; Add filtering [WIP]

Tomas Valentabefe44973c48
diff --git a/components/Editor/RouteEditor/PromptEditor/Autocomplete/ListWrapper.tsx b/components/Editor/RouteEditor/PromptEditor/Autocomplete/ListWrapper.tsx
index 76c19ce62..30c165df2 100644
--- a/components/Editor/RouteEditor/PromptEditor/Autocomplete/ListWrapper.tsx
+++ b/components/Editor/RouteEditor/PromptEditor/Autocomplete/ListWrapper.tsx
@@ -11,13 +11,14 @@ import {
SuggestionProps,
SuggestionKeyDownProps,
} from 'editor/extensions/autocomplete/suggestion'
+import { Reference } from 'editor/referenceType'
type AutocompleteListRef = Partial<HTMLDivElement> & { onKeyDown: (props: SuggestionKeyDownProps) => boolean }
-export interface AutocompleteListProps extends SuggestionProps { }
+export interface AutocompleteListProps extends SuggestionProps<Reference> { }
export type AutocompleteList = ForwardRefExoticComponent<AutocompleteListProps & RefAttributes<AutocompleteListRef>>
-export interface AutocompleteListWrapperProps extends SuggestionProps {
+export interface AutocompleteListWrapperProps extends SuggestionProps<Reference> {
list: AutocompleteList
}
@@ -39,4 +40,4 @@ class AutocompleteListWrapper extends Component<AutocompleteListWrapperProps, {}
}
}
-export default AutocompleteListWrapper
\ No newline at end of file
+export default AutocompleteListWrapper
diff --git a/components/Editor/RouteEditor/PromptEditor/Autocomplete/index.tsx b/components/Editor/RouteEditor/PromptEditor/Autocomplete/index.tsx
index a5cfa2237..4ef30b446 100644
--- a/components/Editor/RouteEditor/PromptEditor/Autocomplete/index.tsx
+++ b/components/Editor/RouteEditor/PromptEditor/Autocomplete/index.tsx
@@ -4,43 +4,14 @@ import {
forwardRef,
useCallback,
} from 'react'
-import { ChainedCommands } from '@tiptap/core'
-
-import { Reference, ReferenceType } from 'editor/referenceType'
-
import Item from './Item'
import { AutocompleteList } from './ListWrapper'
-interface AutocompleteItem {
- title: string
- extendCommand: (cmd: ChainedCommands) => ChainedCommands
-}
-
-function createAutocompleteItem(reference: Reference): AutocompleteItem {
- return {
- title: reference.value,
- extendCommand: (cmd) => cmd.setReference(reference)
- }
-}
-
-export const referenceItems: Reference[] = [
- {
- type: ReferenceType.NPMPackage,
- value: '@slack/web-api',
- },
- {
- type: ReferenceType.DEPLOYMENT,
- value: 'AWS Lambda',
- },
-]
-
-const items: AutocompleteItem[] = [
- ...referenceItems.map(createAutocompleteItem),
-]
-
const Autocomplete: AutocompleteList = forwardRef(({
editor,
range,
+ items,
+ command,
}, ref) => {
const [selectedIndex, setSelectedIndex] = useState(0)
@@ -49,14 +20,18 @@ const Autocomplete: AutocompleteList = forwardRef(({
.chain()
.deleteRange(range)
- items[index]
- .extendCommand(cmd)
- .setTextSelection(0)
- .run()
+ command(items[index])
+
+ // items[index]
+ // .extendCommand(cmd)
+ // .setTextSelection(0)
+ // .run()
}, [
range,
+ command,
editor,
+ items,
])
useImperativeHandle(ref, () => ({
@@ -78,6 +53,7 @@ const Autocomplete: AutocompleteList = forwardRef(({
}), [
selectedIndex,
selectItem,
+ items.length,
])
return (
@@ -101,8 +77,8 @@ const Autocomplete: AutocompleteList = forwardRef(({
>
{items.map((item, index) => (
<Item
- key={item.title}
- title={item.title}
+ key={item.value}
+ title={item.value}
isSelected={index === selectedIndex}
selectItem={() => selectItem(index)}
/>
diff --git a/editor/extensions/autocomplete/index.ts b/editor/extensions/autocomplete/index.ts
index dc05e5895..44da1fc22 100644
--- a/editor/extensions/autocomplete/index.ts
+++ b/editor/extensions/autocomplete/index.ts
@@ -14,6 +14,7 @@ import AutocompleteListWrapper, { AutocompleteList } from 'components/Editor/Rou
import { Suggestion, SuggestionOptions } from './suggestion'
import Autocomplete from 'components/Editor/RouteEditor/PromptEditor/Autocomplete'
+import reference from '../reference'
export * from './suggestion'
@@ -101,6 +102,7 @@ export default Node.create<AutocompleteOptions>({
Suggestion({
editor: this.editor,
startOfLine: false,
+ ...reference.options.suggestion,
...this.options.suggestion,
}),
]
diff --git a/editor/extensions/autocomplete/suggestion.ts b/editor/extensions/autocomplete/suggestion.ts
index e61c5f164..730caa013 100644
--- a/editor/extensions/autocomplete/suggestion.ts
+++ b/editor/extensions/autocomplete/suggestion.ts
@@ -2,9 +2,11 @@ import { Editor, Range } from '@tiptap/core'
import { Plugin, PluginKey } from 'prosemirror-state'
import { Decoration, DecorationSet, EditorView } from 'prosemirror-view'
+import type { Reference } from 'editor/referenceType'
+
import { findSuggestionMatch } from './findSuggestionMatch'
-export interface SuggestionOptions<Item = unknown> {
+export interface SuggestionOptions<Item = Reference> {
editor: Editor,
char?: string,
startOfLine?: boolean,
@@ -28,7 +30,7 @@ export interface SuggestionOptions<Item = unknown> {
}) => boolean,
}
-export interface SuggestionProps<Item = unknown> {
+export interface SuggestionProps<Item = Reference> {
editor: Editor,
range: Range,
query: string,
@@ -57,7 +59,7 @@ interface SuggestionPluginState {
wasCharTyped: boolean
}
-export function Suggestion<Item = unknown>({
+export function Suggestion<Item = Reference>({
editor,
char = '/',
startOfLine = false,
@@ -107,13 +109,11 @@ export function Suggestion<Item = unknown>({
items: (handleChange || handleStart)
? await items(state.query)
: [],
- command: commandProps => {
- command({
- editor,
- range: state.range,
- props: commandProps,
- })
- },
+ command: commandProps => command({
+ editor,
+ range: state.range,
+ props: commandProps,
+ }),
decorationNode,
// virtual node for popper.js or tippy.js
// this can be used for building popups without a DOM node
@@ -153,7 +153,6 @@ export function Suggestion<Item = unknown>({
const { selection } = transaction
const next = { ...prev }
- console.log('apply--', prev.wasCharTyped)
// We can only be suggesting if there is no selection
if (!prev.wasCharTyped) {
@@ -164,6 +163,11 @@ export function Suggestion<Item = unknown>({
next.active = false
}
+ console.log('apply', {
+ position: selection.$from,
+
+ })
+
// Try to match against where our cursor currently is
const match = findSuggestionMatch({
char,
@@ -209,7 +213,6 @@ export function Suggestion<Item = unknown>({
if (text) {
state.wasCharTyped = true
- console.log('char yes')
}
// if (text === char && (preceedingChar === ' ' || !preceedingChar)) {
diff --git a/editor/extensions/reference.ts b/editor/extensions/reference.ts
index e820abfca..73dd68da2 100644
--- a/editor/extensions/reference.ts
+++ b/editor/extensions/reference.ts
@@ -41,7 +41,6 @@ export default Node.create<ReferenceOptions>({
suggestion: {
pluginKey: ReferencePluginKey,
command: ({ editor, range, props }) => {
- console.log('Command >>>')
// increase range.to by one when the next node is of type "text"
// and starts with a space character
const nodeAfter = editor.view.state.selection.$to.nodeAfter
@@ -57,7 +56,10 @@ export default Node.create<ReferenceOptions>({
.insertContentAt(range, [
{
type: this.name,
- attrs: props,
+ attrs: {
+ [REFERENCE_VALUE_ATTRIBUTE_NAME]: props.value,
+ [REFERENCE_TYPE_ATTRIBUTE_NAME]: props.type,
+ },
},
{
type: 'text',
diff --git a/editor/schema.ts b/editor/schema.ts
index 371ba66fc..0627e7a05 100644
--- a/editor/schema.ts
+++ b/editor/schema.ts
@@ -5,8 +5,12 @@ import BulletList from '@tiptap/extension-bullet-list'
import ListItem from '@tiptap/extension-list-item'
import OrderedList from '@tiptap/extension-ordered-list'
import CodeBlock from '@tiptap/extension-code-block'
+import Fuse from 'fuse.js'
-import ReferenceExtension, { REFERENCE_TYPE_ATTRIBUTE_NAME, REFERENCE_VALUE_ATTRIBUTE_NAME } from 'editor/extensions/reference'
+import ReferenceExtension, {
+ REFERENCE_TYPE_ATTRIBUTE_NAME,
+ REFERENCE_VALUE_ATTRIBUTE_NAME,
+} from 'editor/extensions/reference'
import AutocompleteExtension from 'editor/extensions/autocomplete'
export enum ReferenceType {
@@ -19,6 +23,19 @@ export interface Reference {
value: string
}
+export const referenceItems: Reference[] = [
+ {
+ type: ReferenceType.NPMPackage,
+ value: '@slack/web-api',
+ },
+ {
+ type: ReferenceType.DEPLOYMENT,
+ value: 'AWS Lambda',
+ },
+]
+
+const searchEngine = new Fuse(referenceItems, { keys: ['value'] })
+
export const extensions = [
StarterKit.configure({
blockquote: false,
@@ -42,7 +59,13 @@ export const extensions = [
OrderedList,
ListItem,
BulletList,
- AutocompleteExtension,
+ AutocompleteExtension.configure({
+ suggestion: {
+ items: (query) => {
+ return searchEngine.search(query).map(q => q.item)
+ },
+ },
+ }),
ReferenceExtension,
]
diff --git a/package.json b/package.json
index 382937598..42e5a4e60 100644
--- a/package.json
+++ b/package.json
@@ -24,16 +24,17 @@
"@supabase/auth-helpers-nextjs": "^0.5.5",
"@supabase/auth-helpers-react": "^0.3.1",
"@supabase/supabase-js": "^2.10.0",
+ "@tiptap/core": "^2.0.0-beta.220",
"@tiptap/extension-bullet-list": "^2.0.0-beta.220",
"@tiptap/extension-code-block": "^2.0.0-beta.220",
"@tiptap/extension-list-item": "^2.0.0-beta.220",
"@tiptap/extension-ordered-list": "^2.0.0-beta.220",
- "@tiptap/core": "^2.0.0-beta.220",
"@tiptap/extension-placeholder": "^2.0.0-beta.220",
"@tiptap/pm": "^2.0.0-beta.220",
"@tiptap/react": "^2.0.0-beta.220",
"@tiptap/starter-kit": "^2.0.0-beta.220",
"clsx": "^1.2.1",
+ "fuse.js": "^6.6.2",
"highlight.js": "^11.7.0",
"human-id": "^4.0.0",
"immer": "^9.0.19",
diff --git a/styles/prosemirror.css b/styles/prosemirror.css
index c42a501ec..8ec3201e1 100644
--- a/styles/prosemirror.css
+++ b/styles/prosemirror.css
@@ -39,6 +39,6 @@
}
.reference {
- @apply text-indigo-400 font-semibold font-mono;
+ @apply text-slate-600 font-semibold font-mono;
box-decoration-break: clone;
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index 424c261d0..db8797c7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1827,6 +1827,11 @@ functions-have-names@^1.2.2:
resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
+fuse.js@^6.6.2:
+ version "6.6.2"
+ resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.6.2.tgz#fe463fed4b98c0226ac3da2856a415576dc9a111"
+ integrity sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==
+
get-caller-file@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"