diff --git a/deno.jsonc b/deno.jsonc index e523f26..ed1ef5e 100644 --- a/deno.jsonc +++ b/deno.jsonc @@ -1,5 +1,7 @@ { "name": "denops-ollama.vim", + "version": "0.0.0", + "exports": {}, "description": "A set of denops utils just for me", "tasks": { "test": "deno test --allow-env=DENOPS_TEST_CONNECT_TIMEOUT,DENOPS_TEST_DENOPS_PATH,DENOPS_TEST_VERBOSE,DENOPS_TEST_VIM_EXECUTABLE,DENOPS_TEST_NVIM_EXECUTABLE --allow-run=vim,nvim --allow-net=127.0.0.1:0 --allow-read", diff --git a/denops/ollama/api/base.ts b/denops/ollama/api/base.ts index e7a5c38..4cb2112 100644 --- a/denops/ollama/api/base.ts +++ b/denops/ollama/api/base.ts @@ -1,12 +1,9 @@ -import { - ensure, - Predicate, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { ensure, type Predicate } from "jsr:@core/unknownutil@3.18.1"; import { JSONLinesParseStream, type JSONValue, } from "https://deno.land/x/jsonlines@v1.2.2/mod.ts"; -import { ReqInit } from "./types.ts"; +import type { ReqInit } from "./types.ts"; const defaultBaseUrl = "http://localhost:11434"; diff --git a/denops/ollama/api/copy_model.ts b/denops/ollama/api/copy_model.ts index 71b18af..e01b24c 100644 --- a/denops/ollama/api/copy_model.ts +++ b/denops/ollama/api/copy_model.ts @@ -1,9 +1,6 @@ import type { ReqInit, Result } from "./types.ts"; import { doPost } from "./base.ts"; -import { - is, - PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; // Definitions for the endpoint to "Copy a model" // Method: POST diff --git a/denops/ollama/api/copy_model_test.ts b/denops/ollama/api/copy_model_test.ts index ff78e77..bc37ea0 100644 --- a/denops/ollama/api/copy_model_test.ts +++ b/denops/ollama/api/copy_model_test.ts @@ -1,9 +1,9 @@ -import { assertEquals } from "https://deno.land/std@0.224.0/assert/mod.ts"; +import { assertEquals } from "jsr:@std/assert@1.0.1"; import { assertSpyCallArgs, assertSpyCalls, stub, -} from "https://deno.land/std@0.224.0/testing/mock.ts"; +} from "jsr:@std/testing@0.225.3/mock"; import { copyModel } from "./copy_model.ts"; Deno.test("copyModel", async (t) => { diff --git a/denops/ollama/api/create_model.ts b/denops/ollama/api/create_model.ts index 7921de5..f098b2d 100644 --- a/denops/ollama/api/create_model.ts +++ b/denops/ollama/api/create_model.ts @@ -1,7 +1,4 @@ -import { - is, - type PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; import { isErrorResponse, type ReqInit } from "./types.ts"; import { parseJSONStream } from "./base.ts"; import { doPost } from "./base.ts"; diff --git a/denops/ollama/api/delete_model.ts b/denops/ollama/api/delete_model.ts index cb28b15..f48dda6 100644 --- a/denops/ollama/api/delete_model.ts +++ b/denops/ollama/api/delete_model.ts @@ -1,9 +1,6 @@ import type { ReqInit, Result } from "./types.ts"; import { doDelete } from "./base.ts"; -import { - is, - PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; // Definitions for the endpoint to "Delete a model" // Method: DELETE diff --git a/denops/ollama/api/generate_chat_completion.ts b/denops/ollama/api/generate_chat_completion.ts index 60c2345..ab9203b 100644 --- a/denops/ollama/api/generate_chat_completion.ts +++ b/denops/ollama/api/generate_chat_completion.ts @@ -1,7 +1,4 @@ -import { - is, - type PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; import { isErrorResponse, isFormat, type ReqInit } from "./types.ts"; import { parseJSONStream } from "./base.ts"; import { doPost } from "./base.ts"; diff --git a/denops/ollama/api/generate_completion.ts b/denops/ollama/api/generate_completion.ts index cc71b2c..c5c9840 100644 --- a/denops/ollama/api/generate_completion.ts +++ b/denops/ollama/api/generate_completion.ts @@ -1,8 +1,4 @@ -import { - ensure, - is, - type PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { ensure, is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; import { isErrorResponse, isFormat, type ReqInit } from "./types.ts"; import { parseJSONStream } from "./base.ts"; import { doPost } from "./base.ts"; diff --git a/denops/ollama/api/generate_completion_test.ts b/denops/ollama/api/generate_completion_test.ts index 1b0bd83..4096948 100644 --- a/denops/ollama/api/generate_completion_test.ts +++ b/denops/ollama/api/generate_completion_test.ts @@ -1,12 +1,12 @@ -import { assertEquals } from "https://deno.land/std@0.224.0/assert/mod.ts"; +import { assertEquals } from "jsr:@std/assert@1.0.1"; import { assertSpyCallArgs, assertSpyCalls, stub, -} from "https://deno.land/std@0.224.0/testing/mock.ts"; +} from "jsr:@std/testing@0.225.3/mock"; import { generateCompletion, - GenerateCompletionResponse, + type GenerateCompletionResponse, } from "./generate_completion.ts"; Deno.test("generateCompletion", async (t) => { diff --git a/denops/ollama/api/generate_embeddings.ts b/denops/ollama/api/generate_embeddings.ts index d4e36aa..0999255 100644 --- a/denops/ollama/api/generate_embeddings.ts +++ b/denops/ollama/api/generate_embeddings.ts @@ -1,8 +1,4 @@ -import { - ensure, - is, - type PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { ensure, is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; import { isErrorResponse, type ReqInit, type Result } from "./types.ts"; import { doPost } from "./base.ts"; diff --git a/denops/ollama/api/list_local_models.ts b/denops/ollama/api/list_local_models.ts index e27b0d5..e3b5dc6 100644 --- a/denops/ollama/api/list_local_models.ts +++ b/denops/ollama/api/list_local_models.ts @@ -1,8 +1,4 @@ -import { - ensure, - is, - type PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { ensure, is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; import { isErrorResponse, type ReqInit, type Result } from "./types.ts"; import { doGet } from "./base.ts"; diff --git a/denops/ollama/api/pull_model.ts b/denops/ollama/api/pull_model.ts index 3e1b5ea..460edd5 100644 --- a/denops/ollama/api/pull_model.ts +++ b/denops/ollama/api/pull_model.ts @@ -1,7 +1,4 @@ -import { - is, - type PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; import { isErrorResponse, type ReqInit } from "./types.ts"; import { doPost } from "./base.ts"; import { parseJSONStream } from "./base.ts"; diff --git a/denops/ollama/api/push_model.ts b/denops/ollama/api/push_model.ts index a3e4330..17ec04e 100644 --- a/denops/ollama/api/push_model.ts +++ b/denops/ollama/api/push_model.ts @@ -1,7 +1,4 @@ -import { - is, - type PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; import { isErrorResponse, type ReqInit } from "./types.ts"; import { parseJSONStream } from "./base.ts"; import { doPost } from "./base.ts"; diff --git a/denops/ollama/api/show_model_information.ts b/denops/ollama/api/show_model_information.ts index 98963a1..deb2e4a 100644 --- a/denops/ollama/api/show_model_information.ts +++ b/denops/ollama/api/show_model_information.ts @@ -1,8 +1,4 @@ -import { - ensure, - is, - type PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { ensure, is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; import { doPost } from "./base.ts"; import { isErrorResponse, type ReqInit, type Result } from "./types.ts"; diff --git a/denops/ollama/api/types.ts b/denops/ollama/api/types.ts index 29df233..cc12aeb 100644 --- a/denops/ollama/api/types.ts +++ b/denops/ollama/api/types.ts @@ -1,7 +1,4 @@ -import { - is, - type PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; // The format to return a response in. Currently the only accepted value is json export const isFormat = is.OptionalOf(is.LiteralOf("json")); diff --git a/denops/ollama/dispatch/complete.ts b/denops/ollama/dispatch/complete.ts index d11ce44..8a2e198 100644 --- a/denops/ollama/dispatch/complete.ts +++ b/denops/ollama/dispatch/complete.ts @@ -1,8 +1,5 @@ -import { Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; -import { - is, - PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import type { Denops } from "jsr:@denops/std@7.0.0"; +import { is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; import { generateCompletion } from "../api.ts"; import { isReqArgs } from "./types.ts"; import { getPrefix, getSuffix } from "../util/context.ts"; diff --git a/denops/ollama/dispatch/complete_test.ts b/denops/ollama/dispatch/complete_test.ts index 18a9a75..30d36a9 100644 --- a/denops/ollama/dispatch/complete_test.ts +++ b/denops/ollama/dispatch/complete_test.ts @@ -1,7 +1,7 @@ -import { assert } from "https://deno.land/std@0.224.0/assert/mod.ts"; +import { assert } from "jsr:@std/assert@1.0.1"; import { complete } from "./complete.ts"; -import { test } from "https://deno.land/x/denops_test@v1.8.0/mod.ts"; +import { test } from "jsr:@denops/test@3.0.1"; export type Extends = A extends E ? true : false; export type NotExtends = A extends E ? false : true; export type Exact = Extends extends true diff --git a/denops/ollama/dispatch/delete_model.ts b/denops/ollama/dispatch/delete_model.ts index 91983ba..7d1480f 100644 --- a/denops/ollama/dispatch/delete_model.ts +++ b/denops/ollama/dispatch/delete_model.ts @@ -1,10 +1,7 @@ -import { type Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; -import { getLogger } from "https://deno.land/std@0.224.0/log/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.5.1/helper/mod.ts"; -import { - is, - PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import type { Denops } from "jsr:@denops/std@7.0.0"; +import { getLogger } from "jsr:@std/log@0.224.5"; +import * as helper from "jsr:@denops/std@7.0.0/helper"; +import { is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; import { deleteModel as deleteModelAPI } from "../api.ts"; import { canceller } from "../util/cancellable.ts"; diff --git a/denops/ollama/dispatch/init.ts b/denops/ollama/dispatch/init.ts index 0dde6ef..e326cdc 100644 --- a/denops/ollama/dispatch/init.ts +++ b/denops/ollama/dispatch/init.ts @@ -1,11 +1,8 @@ -import { Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; -import { - ConsoleHandler, - setup as setupLog, -} from "https://deno.land/std@0.224.0/log/mod.ts"; +import type { Denops } from "jsr:@denops/std@7.0.0"; +import { ConsoleHandler, setup as setupLog } from "jsr:@std/log@0.224.5"; import xdg from "https://deno.land/x/xdg@v10.6.0/src/mod.deno.ts"; -import { ensureFile } from "https://deno.land/std@0.224.0/fs/ensure_file.ts"; -import { join } from "https://deno.land/std@0.224.0/path/join.ts"; +import { ensureFile } from "jsr:@std/fs@1.0.0"; +import { join } from "jsr:@std/path@1.0.2/join"; import { setup as setupHighlight } from "../ui/highlight_prefix.ts"; import { mapCancel } from "../util/cancellable.ts"; diff --git a/denops/ollama/dispatch/list_models.ts b/denops/ollama/dispatch/list_models.ts index 7626f9f..bd47061 100644 --- a/denops/ollama/dispatch/list_models.ts +++ b/denops/ollama/dispatch/list_models.ts @@ -1,11 +1,11 @@ -import * as datetime from "https://deno.land/std@0.224.0/datetime/mod.ts"; -import * as bytes from "https://deno.land/std@0.224.0/fmt/bytes.ts"; -import { Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.5.1/helper/mod.ts"; +import * as datetime from "jsr:@std/datetime@0.224.3"; +import * as bytes from "jsr:@std/fmt@0.225.6/bytes"; +import type { Denops } from "jsr:@denops/std@7.0.0"; +import * as helper from "jsr:@denops/std@7.0.0/helper"; import { Table } from "https://deno.land/x/cliffy@v1.0.0-rc.4/table/mod.ts"; import { listLocalModels } from "../api.ts"; -import { isReqArgs, ReqArgs } from "./types.ts"; +import { isReqArgs, type ReqArgs } from "./types.ts"; import { canceller } from "../util/cancellable.ts"; export const isListModelsArgs = isReqArgs; diff --git a/denops/ollama/dispatch/open_log.ts b/denops/ollama/dispatch/open_log.ts index 943d8fa..97b0d9a 100644 --- a/denops/ollama/dispatch/open_log.ts +++ b/denops/ollama/dispatch/open_log.ts @@ -1,9 +1,6 @@ -import { Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; +import type { Denops } from "jsr:@denops/std@7.0.0"; -import { - is, - PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; import { isOpener } from "../ui/open.ts"; export const isOpenLogArgs = is.ObjectOf({ diff --git a/denops/ollama/dispatch/pull_model.ts b/denops/ollama/dispatch/pull_model.ts index 01e1c0a..584d3e8 100644 --- a/denops/ollama/dispatch/pull_model.ts +++ b/denops/ollama/dispatch/pull_model.ts @@ -1,15 +1,12 @@ -import { Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; -import * as bytes from "https://deno.land/std@0.224.0/fmt/bytes.ts"; +import type { Denops } from "jsr:@denops/std@7.0.0"; +import * as bytes from "jsr:@std/fmt@0.225.6/bytes"; import { pullModel as pullModelAPI } from "../api.ts"; -import { getLogger } from "https://deno.land/std@0.224.0/log/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.5.1/helper/mod.ts"; +import { getLogger } from "jsr:@std/log@0.224.5"; +import * as helper from "jsr:@denops/std@7.0.0/helper"; import { canceller } from "../util/cancellable.ts"; -import { abortableAsyncIterable } from "https://deno.land/std@0.224.0/async/mod.ts"; +import { abortableAsyncIterable } from "jsr:@std/async@0.224.2"; import { isReqArgs } from "./types.ts"; -import { - is, - PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; export const isPullModelArgs = is.AllOf([ is.ObjectOf({ diff --git a/denops/ollama/dispatch/start_chat.ts b/denops/ollama/dispatch/start_chat.ts index f490fd5..c937fda 100644 --- a/denops/ollama/dispatch/start_chat.ts +++ b/denops/ollama/dispatch/start_chat.ts @@ -1,10 +1,6 @@ -import { abortableAsyncIterable } from "https://deno.land/std@0.224.0/async/mod.ts"; -import { Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; -import { - is, - maybe, - PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { abortableAsyncIterable } from "jsr:@std/async@0.224.2"; +import type { Denops } from "jsr:@denops/std@7.0.0"; +import { is, maybe, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; import { isOpener } from "../ui/open.ts"; import { ChatBase } from "../ui/chat.ts"; diff --git a/denops/ollama/dispatch/start_chat_in_ctx.ts b/denops/ollama/dispatch/start_chat_in_ctx.ts index 5f7e9f4..6c8485d 100644 --- a/denops/ollama/dispatch/start_chat_in_ctx.ts +++ b/denops/ollama/dispatch/start_chat_in_ctx.ts @@ -1,10 +1,6 @@ -import { abortableAsyncIterable } from "https://deno.land/std@0.224.0/async/mod.ts"; -import { type Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; -import { - is, - maybe, - type PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { abortableAsyncIterable } from "jsr:@std/async@0.224.2"; +import type { Denops } from "jsr:@denops/std@7.0.0"; +import { is, maybe, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; import { generateChatCompletion, diff --git a/denops/ollama/dispatch/types.ts b/denops/ollama/dispatch/types.ts index cdbc54f..7ef1cc3 100644 --- a/denops/ollama/dispatch/types.ts +++ b/denops/ollama/dispatch/types.ts @@ -1,7 +1,4 @@ -import { - is, - PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; export const isReqArgs = is.ObjectOf({ timeout: is.OptionalOf(is.Number), diff --git a/denops/ollama/main.ts b/denops/ollama/main.ts index b64af89..1414858 100644 --- a/denops/ollama/main.ts +++ b/denops/ollama/main.ts @@ -1,10 +1,5 @@ -import { Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; -import { - ensure, - is, - maybe, - Predicate, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import type { Denops } from "jsr:@denops/std@7.0.0"; +import { ensure, is, maybe, type Predicate } from "jsr:@core/unknownutil@3.18.1"; import { init } from "./dispatch/init.ts"; import { isStartChatArgs, startChat } from "./dispatch/start_chat.ts"; diff --git a/denops/ollama/ui/chat.ts b/denops/ollama/ui/chat.ts index d8eed60..69d77d9 100644 --- a/denops/ollama/ui/chat.ts +++ b/denops/ollama/ui/chat.ts @@ -1,15 +1,15 @@ -import { getLogger } from "https://deno.land/std@0.224.0/log/mod.ts"; -import * as datetime from "https://deno.land/std@0.224.0/datetime/mod.ts"; -import { Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; -import { ulid } from "https://deno.land/std@0.224.0/ulid/mod.ts"; -import * as autocmd from "https://deno.land/x/denops_std@v6.5.1/autocmd/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.5.1/function/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.5.1/batch/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.5.1/option/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.5.1/helper/mod.ts"; -import * as lambda from "https://deno.land/x/denops_std@v6.5.1/lambda/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; -import { Notify, Queue } from "https://deno.land/x/async@v2.1.0/mod.ts"; +import { getLogger } from "jsr:@std/log@0.224.5"; +import * as datetime from "jsr:@std/datetime@0.224.3"; +import type { Denops } from "jsr:@denops/std@7.0.0"; +import { ulid } from "jsr:@std/ulid@1.0.0"; +import * as autocmd from "jsr:@denops/std@7.0.0/autocmd"; +import * as fn from "jsr:@denops/std@7.0.0/function"; +import * as batch from "jsr:@denops/std@7.0.0/batch"; +import * as option from "jsr:@denops/std@7.0.0/option"; +import * as helper from "jsr:@denops/std@7.0.0/helper"; +import * as lambda from "jsr:@denops/std@7.0.0/lambda"; +import { ensure, is } from "jsr:@core/unknownutil@3.18.1"; +import { Notify, Queue } from "jsr:@lambdalisue/async@2.1.1"; import { type HighlightPrefix, @@ -17,7 +17,7 @@ import { } from "./highlight_prefix.ts"; import { canceller } from "../util/cancellable.ts"; import * as spinner from "./spinner.ts"; -import { Opener } from "./open.ts"; +import type { Opener } from "./open.ts"; export abstract class ChatBase { abstract parseContext(context: unknown): TContext | undefined; diff --git a/denops/ollama/ui/highlight_prefix.ts b/denops/ollama/ui/highlight_prefix.ts index e41c0d3..843ec6a 100644 --- a/denops/ollama/ui/highlight_prefix.ts +++ b/denops/ollama/ui/highlight_prefix.ts @@ -1,4 +1,4 @@ -import { type Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; +import type { Denops } from "jsr:@denops/std@7.0.0"; export async function setup(denops: Denops) { await denops.cmd("highlight default link OllamaPrompt Question"); diff --git a/denops/ollama/ui/open.ts b/denops/ollama/ui/open.ts index 8885dd0..07d0f4e 100644 --- a/denops/ollama/ui/open.ts +++ b/denops/ollama/ui/open.ts @@ -1,7 +1,4 @@ -import { - is, - PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import { is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; export const isOpener = is.OneOf([ is.LiteralOf("split"), diff --git a/denops/ollama/ui/spinner.ts b/denops/ollama/ui/spinner.ts index 64277f2..f871c4c 100644 --- a/denops/ollama/ui/spinner.ts +++ b/denops/ollama/ui/spinner.ts @@ -1,9 +1,9 @@ import spinners from "npm:cli-spinners@3.1.0"; -import { type SpinnerName as Kind } from "npm:cli-spinners@3.0.0"; -import { type Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.5.1/batch/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.5.1/function/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import type { SpinnerName as Kind } from "npm:cli-spinners@3.0.0"; +import type { Denops } from "jsr:@denops/std@7.0.0"; +import * as batch from "jsr:@denops/std@7.0.0/batch"; +import * as fn from "jsr:@denops/std@7.0.0/function"; +import { ensure, is } from "jsr:@core/unknownutil@3.18.1"; const varPrefix = "ollama_ui_spinner"; const signGroup = "ollama_ui_spinner_group"; diff --git a/denops/ollama/ui/spinner_test.ts b/denops/ollama/ui/spinner_test.ts index bc46588..10c0f7e 100644 --- a/denops/ollama/ui/spinner_test.ts +++ b/denops/ollama/ui/spinner_test.ts @@ -1,5 +1,5 @@ -import { test } from "https://deno.land/x/denops_test@v1.8.0/mod.ts"; -import { bufnr } from "https://deno.land/x/denops_std@v6.5.1/function/mod.ts"; +import { test } from "jsr:@denops/test@3.0.1"; +import { bufnr } from "jsr:@denops/std@7.0.0/function"; import * as target from "./spinner.ts"; import { default as sp, type SpinnerName } from "npm:cli-spinners@3.1.0"; diff --git a/denops/ollama/util/cancellable.ts b/denops/ollama/util/cancellable.ts index ee506f5..33a2dcb 100644 --- a/denops/ollama/util/cancellable.ts +++ b/denops/ollama/util/cancellable.ts @@ -1,8 +1,8 @@ -import { map } from "https://deno.land/x/denops_std@v6.5.1/mapping/mod.ts"; -import * as lambda from "https://deno.land/x/denops_std@v6.5.1/lambda/mod.ts"; -import { ulid } from "https://deno.land/std@0.224.0/ulid/mod.ts"; -import * as autocmd from "https://deno.land/x/denops_std@v6.5.1/autocmd/mod.ts"; -import { Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; +import { map } from "jsr:@denops/std@7.0.0/mapping"; +import * as lambda from "jsr:@denops/std@7.0.0/lambda"; +import { ulid } from "jsr:@std/ulid@1.0.0"; +import * as autocmd from "jsr:@denops/std@7.0.0/autocmd"; +import type { Denops } from "jsr:@denops/std@7.0.0"; export async function mapCancel(denops: Denops) { // See ../../../autoload/ollama/internal.vim diff --git a/denops/ollama/util/context.ts b/denops/ollama/util/context.ts index 193f226..c0a727a 100644 --- a/denops/ollama/util/context.ts +++ b/denops/ollama/util/context.ts @@ -1,14 +1,10 @@ // Functions to get context -import { type Denops } from "https://deno.land/x/denops_std@v6.5.1/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.5.1/function/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.5.1/option/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.5.1/batch/mod.ts"; -import { - ensure, - is, - PredicateType, -} from "https://deno.land/x/unknownutil@v3.18.1/mod.ts"; +import type { Denops } from "jsr:@denops/std@7.0.0"; +import * as fn from "jsr:@denops/std@7.0.0/function"; +import * as option from "jsr:@denops/std@7.0.0/option"; +import * as batch from "jsr:@denops/std@7.0.0/batch"; +import { ensure, is, type PredicateType } from "jsr:@core/unknownutil@3.18.1"; export const isBufferInfo = is.OneOf([ is.String, diff --git a/denops/ollama/util/context_test.ts b/denops/ollama/util/context_test.ts index 0ca09a3..ae4d8f5 100644 --- a/denops/ollama/util/context_test.ts +++ b/denops/ollama/util/context_test.ts @@ -1,11 +1,7 @@ -import { - assert, - assertEquals, - assertFalse, -} from "https://deno.land/std@0.224.0/assert/mod.ts"; -import { test } from "https://deno.land/x/denops_test@v1.8.0/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.5.1/function/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.5.1/option/mod.ts"; +import { assert, assertEquals, assertFalse } from "jsr:@std/assert@1.0.1"; +import { test } from "jsr:@denops/test@3.0.1"; +import * as fn from "jsr:@denops/std@7.0.0/function"; +import * as option from "jsr:@denops/std@7.0.0/option"; import * as testtarget from "./context.ts"; test({ diff --git a/denops/ollama/util/trim_test.ts b/denops/ollama/util/trim_test.ts index adb530f..7b08434 100644 --- a/denops/ollama/util/trim_test.ts +++ b/denops/ollama/util/trim_test.ts @@ -1,6 +1,6 @@ -import { test } from "https://deno.land/x/denops_test@v1.8.0/mod.ts"; +import { test } from "jsr:@denops/test@3.0.1"; import * as target from "./trim.ts"; -import { assertEquals } from "https://deno.land/std@0.224.0/assert/mod.ts"; +import { assertEquals } from "jsr:@std/assert@1.0.1"; test({ mode: "all",