Merge branch 'main' into conversations-2.0

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<Ref> = 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<Ref> => {
+    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(

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";

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";

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";

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";

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";

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";

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";

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 } },

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";

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";

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";

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";

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";

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";

site/api/components/util.ts

@@ -1,4 +1,4 @@
-import { TsTypeParamDef } from "deno_doc/types.d.ts";
+import { TsTypeParamDef } from "@deno/doc/types";
 import { LinkGetter } from "./types.ts";
 
 export function newGetLink(

site/api/deno.jsonc

@@ -5,13 +5,13 @@
     "reset": "rm -rf .cache"
   },
   "imports": {
-    "std/": "https://deno.land/[email protected]/",
-    "preact": "https://esm.sh/[email protected]/",
-    "preact/": "https://esm.sh/[email protected]/",
-    "preact-render-to-string": "https://esm.sh/[email protected]/",
-    "deno_doc/": "https://deno.land/x/[email protected]/",
-    "deno_cache/": "https://deno.land/x/[email protected]/",
-    "marked-smartypants": "https://esm.sh/[email protected].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"

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[],

site/docs/.vitepress/configs/locales/en.ts

@@ -267,6 +267,10 @@ const pluginThirdparty = {
       text: "Autoquote",
       link: "/plugins/autoquote",
     },
+    {
+      text: "Entity Parser",
+      link: "/plugins/entity-parser",
+    },
     {
       text: "[Submit your PR!]",
       link: "/plugins/#create-your-own-plugins",

site/docs/.vitepress/configs/locales/es.ts

@@ -234,6 +234,10 @@ const pluginThirdparty = {
       text: "Citar automáticamente",
       link: "/es/plugins/autoquote",
     },
+    {
+      text: "Analizador de entidades",
+      link: "/es/plugins/entity-parser",
+    },
     {
       text: "[¡Envíe su PR!]",
       link: "/es/plugins/#crear-tus-propios-plugins",

site/docs/.vitepress/configs/locales/id.ts

@@ -230,6 +230,10 @@ const pluginThirdparty = {
       text: "Autoquote",
       link: "/id/plugins/autoquote",
     },
+    {
+      text: "Entity Parser",
+      link: "/id/plugins/entity-parser",
+    },
     {
       text: "[Kirim PR-mu!]",
       link: "/id/plugins/#buat-plugin-mu-sendiri",

site/docs/.vitepress/configs/locales/ru.ts

@@ -234,6 +234,10 @@ const pluginThirdparty = {
       text: "Автоцитата",
       link: "/ru/plugins/autoquote",
     },
+    {
+      text: "Парсер сущностей",
+      link: "/ru/plugins/entity-parser",
+    },
     {
       text: "[Создайте свой PR!]",
       link: "/ru/plugins/#create-your-own-plugins",

site/docs/.vitepress/configs/locales/uk.ts

@@ -234,6 +234,10 @@ const pluginThirdparty = {
       text: "Автоматичне встановлення відповіді",
       link: "/uk/plugins/autoquote",
     },
+    {
+      text: "Парсер сутностей",
+      link: "/uk/plugins/entity-parser",
+    },
     {
       text: "[Відправте свій PR!]",
       link: "/uk/plugins/#створюите-власні-плагіни",

site/docs/.vitepress/configs/locales/zh.ts

@@ -234,6 +234,10 @@ const pluginThirdparty = {
       text: "自动引用",
       link: "/zh/plugins/autoquote",
     },
+    {
+      text: "实体解析器 (Entity Parser)",
+      link: "/zh/plugins/entity-parser",
+    },
     {
       text: "[提交你的 PR!]",
       link: "/zh/plugins/#创建你自己的插件",