From dd25c7880ea738f6b285d816175c75142200df3b Mon Sep 17 00:00:00 2001 From: Roj Date: Fri, 17 Jan 2025 02:53:31 +0300 Subject: [PATCH] Update API reference generator's dependencies (#1180) Co-authored-by: KnorpelSenf --- site/api/api_gen.tsx | 44 ++++++++++----------- site/api/components/Class.tsx | 2 +- site/api/components/Class/Constructors.tsx | 2 +- site/api/components/Class/Method.tsx | 2 +- site/api/components/Function.tsx | 2 +- site/api/components/Function/Parameters.tsx | 2 +- site/api/components/Function/ReturnType.tsx | 2 +- site/api/components/Interface.tsx | 2 +- site/api/components/Loc.tsx | 2 +- site/api/components/Properties.tsx | 2 +- site/api/components/ToC.tsx | 2 +- site/api/components/TsType.tsx | 2 +- site/api/components/TypeAlias.tsx | 2 +- site/api/components/TypeParams.tsx | 2 +- site/api/components/Variable.tsx | 2 +- site/api/components/util.ts | 2 +- site/api/deno.jsonc | 14 +++---- site/api/types.ts | 2 +- 18 files changed, 45 insertions(+), 45 deletions(-) diff --git a/site/api/api_gen.tsx b/site/api/api_gen.tsx index e6dc26d9e..aa2c0d87a 100644 --- a/site/api/api_gen.tsx +++ b/site/api/api_gen.tsx @@ -1,8 +1,8 @@ -import { createCache } from "deno_cache/mod.ts"; +import { createCache } from "@deno/cache-dir"; import { modules } from "../modules.ts"; -import * as fs from "std/fs/mod.ts"; -import * as path from "std/path/mod.ts"; -import { doc } from "deno_doc/mod.ts"; +import * as fs from "@std/fs"; +import * as path from "@std/path"; +import { doc } from "@deno/doc"; import { renderToString } from "preact-render-to-string"; import { Class } from "./components/Class.tsx"; import { Function } from "./components/Function.tsx"; @@ -11,7 +11,7 @@ import { DocNodeClass, DocNodeFunction, DocNodeNamespace, -} from "deno_doc/types.d.ts"; +} from "@deno/doc/types"; import { ToC } from "./components/ToC.tsx"; import { JSX } from "preact/jsx-runtime"; import { Interface } from "./components/Interface.tsx"; @@ -51,23 +51,23 @@ Deno.stdout.writeSync( ); const cache = createCache({ root: ".cache" }); const dot = enc.encode("."); -const refs: Array = await Promise - .all( - paths.map( - async ([id, path, slug, name, description, shortdescription]) => { - const nodes = await doc(id, { load: cache.load }); - Deno.stdout.writeSync(dot); - return [ - nodes.sort((a, b) => a.name.localeCompare(b.name)), - path, - slug, - name, - description, - shortdescription, - ]; - }, - ), - ); + +const refs = await Promise.all(paths.map( + async ( + [id, path, slug, name, description, shortdescription], + ): Promise => { + const nodes = Object.values(await doc([id], { load: cache.load })).flat(); + Deno.stdout.writeSync(dot); + return [ + nodes.sort((a, b) => a.name.localeCompare(b.name)), + path, + slug, + name, + description, + shortdescription, + ]; + }, +)); Deno.stdout.writeSync(enc.encode("done\n")); function namespaceGetLink( diff --git a/site/api/components/Class.tsx b/site/api/components/Class.tsx index 18e911488..1b65b53dd 100644 --- a/site/api/components/Class.tsx +++ b/site/api/components/Class.tsx @@ -5,7 +5,7 @@ import { type DocNodeClass, type JsDocTag, type ParamIdentifierDef, -} from "deno_doc/types.d.ts"; +} from "@deno/doc/types"; import { Method } from "./Class/Method.tsx"; import { Properties } from "./Properties.tsx"; import { Constructors } from "./Class/Constructors.tsx"; diff --git a/site/api/components/Class/Constructors.tsx b/site/api/components/Class/Constructors.tsx index d74a2935c..9e9946392 100644 --- a/site/api/components/Class/Constructors.tsx +++ b/site/api/components/Class/Constructors.tsx @@ -1,4 +1,4 @@ -import { ClassConstructorDef } from "deno_doc/types.d.ts"; +import { ClassConstructorDef } from "@deno/doc/types"; import { CodeBlock } from "../CodeBlock.tsx"; import { Loc } from "../Loc.tsx"; import { P } from "../P.tsx"; diff --git a/site/api/components/Class/Method.tsx b/site/api/components/Class/Method.tsx index 963614ecc..5cfa59ba9 100644 --- a/site/api/components/Class/Method.tsx +++ b/site/api/components/Class/Method.tsx @@ -3,7 +3,7 @@ import { DocNodeFunction, InterfaceMethodDef, JsDoc, -} from "deno_doc/types.d.ts"; +} from "@deno/doc/types"; import { Params, TsType, TypeParams_ } from "../TsType.tsx"; import { LinkGetter } from "../types.ts"; import { CodeBlock } from "../CodeBlock.tsx"; diff --git a/site/api/components/Function.tsx b/site/api/components/Function.tsx index e4d91741d..3c033ef95 100644 --- a/site/api/components/Function.tsx +++ b/site/api/components/Function.tsx @@ -1,4 +1,4 @@ -import { DocNodeFunction } from "deno_doc/types.d.ts"; +import { DocNodeFunction } from "@deno/doc/types"; import { LinkGetter } from "./types.ts"; import { H1 } from "./H1.tsx"; import { H2 } from "./H2.tsx"; diff --git a/site/api/components/Function/Parameters.tsx b/site/api/components/Function/Parameters.tsx index a7a664488..a690c45d5 100644 --- a/site/api/components/Function/Parameters.tsx +++ b/site/api/components/Function/Parameters.tsx @@ -3,7 +3,7 @@ import { JsDocTagParam, ObjectPatPropDef, ParamDef, -} from "deno_doc/types.d.ts"; +} from "@deno/doc/types"; import { LinkGetter } from "../types.ts"; import { H3 } from "../H3.tsx"; import { CodeBlock } from "../CodeBlock.tsx"; diff --git a/site/api/components/Function/ReturnType.tsx b/site/api/components/Function/ReturnType.tsx index 42df1d06a..75f675522 100644 --- a/site/api/components/Function/ReturnType.tsx +++ b/site/api/components/Function/ReturnType.tsx @@ -1,4 +1,4 @@ -import { JsDoc, JsDocTagReturn, TsTypeDef } from "deno_doc/types.d.ts"; +import { JsDoc, JsDocTagReturn, TsTypeDef } from "@deno/doc/types"; import { LinkGetter } from "../types.ts"; import { CodeBlock } from "../CodeBlock.tsx"; import { TsType } from "../TsType.tsx"; diff --git a/site/api/components/Interface.tsx b/site/api/components/Interface.tsx index 42e1a4b95..4ee6d3783 100644 --- a/site/api/components/Interface.tsx +++ b/site/api/components/Interface.tsx @@ -1,4 +1,4 @@ -import { DocNodeInterface, DocNodeNamespace } from "deno_doc/types.d.ts"; +import { DocNodeInterface, DocNodeNamespace } from "@deno/doc/types"; import { Properties } from "./Properties.tsx"; import { H1 } from "./H1.tsx"; import { P } from "./P.tsx"; diff --git a/site/api/components/Loc.tsx b/site/api/components/Loc.tsx index bc06ca1f1..30741be35 100644 --- a/site/api/components/Loc.tsx +++ b/site/api/components/Loc.tsx @@ -1,4 +1,4 @@ -import { Location } from "deno_doc/types.d.ts"; +import { Location } from "@deno/doc/types"; export function Loc( { children: { location } }: { children: { location: Location } }, diff --git a/site/api/components/Properties.tsx b/site/api/components/Properties.tsx index 122333850..cafc5fe5f 100644 --- a/site/api/components/Properties.tsx +++ b/site/api/components/Properties.tsx @@ -1,4 +1,4 @@ -import { ClassPropertyDef, InterfacePropertyDef } from "deno_doc/types.d.ts"; +import { ClassPropertyDef, InterfacePropertyDef } from "@deno/doc/types"; import { PropertyName } from "./PropertyName.tsx"; import { TsType } from "./TsType.tsx"; import { LinkGetter } from "./types.ts"; diff --git a/site/api/components/ToC.tsx b/site/api/components/ToC.tsx index 10446fa65..cb2ecd292 100644 --- a/site/api/components/ToC.tsx +++ b/site/api/components/ToC.tsx @@ -1,4 +1,4 @@ -import { DocNode, DocNodeKind } from "deno_doc/types.d.ts"; +import { DocNode, DocNodeKind } from "@deno/doc/types"; import { H1 } from "./H1.tsx"; import { P } from "./P.tsx"; import { Sector } from "./Sector.tsx"; diff --git a/site/api/components/TsType.tsx b/site/api/components/TsType.tsx index a1d5b5da3..ec1afc315 100644 --- a/site/api/components/TsType.tsx +++ b/site/api/components/TsType.tsx @@ -25,7 +25,7 @@ import { TsTypeParamDef, TsTypePredicateDef, TsTypeRefDef, -} from "deno_doc/types.d.ts"; +} from "@deno/doc/types"; import { JSX } from "preact/jsx-runtime"; import { PropertyName } from "./PropertyName.tsx"; import { LinkGetter } from "./types.ts"; diff --git a/site/api/components/TypeAlias.tsx b/site/api/components/TypeAlias.tsx index 1bbdea677..e527ad3b7 100644 --- a/site/api/components/TypeAlias.tsx +++ b/site/api/components/TypeAlias.tsx @@ -1,4 +1,4 @@ -import { DocNodeNamespace, DocNodeTypeAlias } from "deno_doc/types.d.ts"; +import { DocNodeNamespace, DocNodeTypeAlias } from "@deno/doc/types"; import { TsType } from "./TsType.tsx"; import { LinkGetter } from "./types.ts"; import { H1 } from "./H1.tsx"; diff --git a/site/api/components/TypeParams.tsx b/site/api/components/TypeParams.tsx index e9aa5d9c3..3535a5a61 100644 --- a/site/api/components/TypeParams.tsx +++ b/site/api/components/TypeParams.tsx @@ -1,4 +1,4 @@ -import { TsTypeParamDef } from "deno_doc/types.d.ts"; +import { TsTypeParamDef } from "@deno/doc/types"; import { LinkGetter } from "./types.ts"; import { H4 } from "./H4.tsx"; import { CodeBlock } from "./CodeBlock.tsx"; diff --git a/site/api/components/Variable.tsx b/site/api/components/Variable.tsx index 946c6e3f6..c9ad5ccfb 100644 --- a/site/api/components/Variable.tsx +++ b/site/api/components/Variable.tsx @@ -1,4 +1,4 @@ -import { DocNodeVariable } from "deno_doc/types.d.ts"; +import { DocNodeVariable } from "@deno/doc/types"; import { H1 } from "./H1.tsx"; import { P } from "./P.tsx"; import { LinkGetter } from "./types.ts"; diff --git a/site/api/components/util.ts b/site/api/components/util.ts index 705384320..3462debe9 100644 --- a/site/api/components/util.ts +++ b/site/api/components/util.ts @@ -1,4 +1,4 @@ -import { TsTypeParamDef } from "deno_doc/types.d.ts"; +import { TsTypeParamDef } from "@deno/doc/types"; export function newGetLink( oldGetLink: (r: string) => string | null, diff --git a/site/api/deno.jsonc b/site/api/deno.jsonc index 912b0fc2f..0c6b1024d 100644 --- a/site/api/deno.jsonc +++ b/site/api/deno.jsonc @@ -5,13 +5,13 @@ "reset": "rm -rf .cache" }, "imports": { - "std/": "https://deno.land/std@0.220.0/", - "preact": "https://esm.sh/preact@10.19.6/", - "preact/": "https://esm.sh/preact@10.19.6/", - "preact-render-to-string": "https://esm.sh/preact-render-to-string@6.4.0/", - "deno_doc/": "https://deno.land/x/deno_doc@0.117.0/", - "deno_cache/": "https://deno.land/x/deno_cache@0.7.1/", - "marked-smartypants": "https://esm.sh/marked-smartypants@1.1.6/" + "@deno/cache-dir": "jsr:@deno/cache-dir@^0.16.0", + "@deno/doc": "jsr:@deno/doc@^0.165.0", + "@std/fs": "jsr:@std/fs@^1.0.9", + "@std/path": "jsr:@std/path@^1.0.8", + "preact": "npm:preact@^10.25.4", + "preact-render-to-string": "npm:preact-render-to-string@^6.5.13", + "marked-smartypants": "npm:marked-smartypants@^1.1.9" }, "exclude": [ ".cache" diff --git a/site/api/types.ts b/site/api/types.ts index 0bfdc1d59..0c55abafe 100644 --- a/site/api/types.ts +++ b/site/api/types.ts @@ -1,4 +1,4 @@ -import { type DocNode } from "deno_doc/types.d.ts"; +import { type DocNode } from "@deno/doc/types"; export type Ref = [ nodes: DocNode[],