From 185dac7f4c3772d5c056fc4724b4296e97d74ee0 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 11 Feb 2025 14:48:49 +0100 Subject: [PATCH] Move and use existing types --- .../builder/src/components/common/CodeEditor/index.ts | 9 ++------- .../src/components/common/bindings/BindingPanel.svelte | 3 +-- packages/builder/src/types/bindings.ts | 7 ++++--- packages/types/src/ui/bindings/binding.ts | 10 ---------- 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/packages/builder/src/components/common/CodeEditor/index.ts b/packages/builder/src/components/common/CodeEditor/index.ts index 3a05c74143..3ddae61449 100644 --- a/packages/builder/src/components/common/CodeEditor/index.ts +++ b/packages/builder/src/components/common/CodeEditor/index.ts @@ -1,15 +1,10 @@ import { getManifest } from "@budibase/string-templates" import sanitizeHtml from "sanitize-html" import { groupBy } from "lodash" -import { - BindingCompletionOption, - EditorModesMap, - Helper, - Snippet, -} from "@budibase/types" +import { EditorModesMap, Helper, Snippet } from "@budibase/types" import { CompletionContext } from "@codemirror/autocomplete" import { EditorView } from "@codemirror/view" -import { BindingCompletion } from "@/types" +import { BindingCompletion, BindingCompletionOption } from "@/types" export const EditorModes: EditorModesMap = { JS: { diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index f444e217c7..c0548b6292 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -35,7 +35,6 @@ import { BindingMode, SidePanel } from "@budibase/types" import type { EnrichedBinding, - BindingCompletionOption, Snippet, Helper, CaretPositionFn, @@ -43,7 +42,7 @@ JSONValue, } from "@budibase/types" import type { Log } from "@budibase/string-templates" - import type { BindingCompletion } from "@/types" + import type { BindingCompletion, BindingCompletionOption } from "@/types" const dispatch = createEventDispatcher() diff --git a/packages/builder/src/types/bindings.ts b/packages/builder/src/types/bindings.ts index 5772513d01..00571f1d8b 100644 --- a/packages/builder/src/types/bindings.ts +++ b/packages/builder/src/types/bindings.ts @@ -1,7 +1,8 @@ -import { BindingCompletionOption } from "@budibase/types" -import { CompletionContext } from "@codemirror/autocomplete" +import { CompletionContext, Completion } from "@codemirror/autocomplete" export type BindingCompletion = (context: CompletionContext) => { from: number - options: BindingCompletionOption[] + options: Completion[] } | null + +export type BindingCompletionOption = Completion diff --git a/packages/types/src/ui/bindings/binding.ts b/packages/types/src/ui/bindings/binding.ts index 1be18b6542..fdeb4a6c13 100644 --- a/packages/types/src/ui/bindings/binding.ts +++ b/packages/types/src/ui/bindings/binding.ts @@ -1,13 +1,3 @@ -export interface BindingCompletionOption { - section?: { - name: string - } - label: string - text?: string - simple?: boolean - apply?: any // TODO -} - export interface EnrichedBinding { runtimeBinding: string readableBinding: string