0 ? dataset[0].bench.unit : "",
+ },
+ beginAtZero: true,
+ },
+ },
+ plugins: {
+ tooltip: {
+ callbacks: {
+ afterTitle: (items) => {
+ const index = items[0].dataIndex;
+ const data = dataset[index];
+ return "\n" + data.commit.message + "\n\n" + data.commit.timestamp + " committed by @" +
+ data.commit.author.username + "\n";
+ },
+ label: (item) => {
+ let label = item.formattedValue;
+ const { range, unit } = dataset[item.datasetIndex].bench;
+ label += " " + unit;
+ if (range) {
+ label += " (" + range + ")";
+ }
+ return label;
+ },
+ afterLabel: (item) => {
+ const { extra } = dataset[item.datasetIndex].bench;
+ return extra ? "\n" + extra : "";
+ },
+ },
+ },
+ },
+ onClick: (_mouseEvent, activeElems) => {
+ if (activeElems.length === 0) {
+ return;
+ }
+ // XXX: Undocumented. How can we know the index?
+ const index = activeElems[0].index;
+ const url = dataset[index].commit.url;
+ window.open(url, "_blank");
+ },
+ }}
+ />
+ );
+};
+
+export default function BenchmarkResultCharts(): JSX.Element {
+ const [data, setData] = useState<{ entries: { Benchmark: [] } }>();
+
+ useEffect(() => {
+ if (!data) {
+ (async () => {
+ setData(
+ JSON.parse(
+ (await (await fetch(
+ "https://raw.githubusercontent.com/discordeno/discordeno/benchies/benchmarksResult/data.js",
+ )).text()).slice(24),
+ ),
+ );
+ })();
+ }
+ }, []);
+
+ function collectBenchesPerTestCase(entries) {
+ const dataMap = new Map();
+ for (const entry of entries) {
+ const { commit, date, tool, benches } = entry;
+ for (const bench of benches) {
+ const result = { commit, date, tool, bench };
+ const arr = dataMap.get(bench.name);
+ if (arr === undefined) {
+ dataMap.set(bench.name, [result]);
+ } else {
+ arr.push(result);
+ }
+ }
+ }
+ return dataMap;
+ }
+
+ return (
+
+ {data
+ ? Array.from(
+ collectBenchesPerTestCase(data.entries.Benchmark),
+ ([key, value]) => ({ benchName: key, benches: value }),
+ ).map((
+ bench,
+ index,
+ ) => (
+
+ ))
+ : <>}
+
+ );
+}
diff --git a/site/src/components/BenchmarkResultCharts.jsx b/site/src/components/BenchmarkResultCharts.jsx
deleted file mode 100644
index ef040f82a..000000000
--- a/site/src/components/BenchmarkResultCharts.jsx
+++ /dev/null
@@ -1,147 +0,0 @@
-import { useColorMode } from "@docusaurus/theme-common";
-import React, { useEffect, useState } from "react";
-import { Line } from "react-chartjs-2";
-// Colors from https://github.com/github/linguist/blob/master/lib/linguist/languages.yml
-const toolColors = {
- cargo: "#dea584",
- go: "#00add8",
- benchmarkjs: "#f1e05a",
- benchmarkluau: "#000080",
- pytest: "#3572a5",
- googlecpp: "#f34b7d",
- catch2: "#f34b7d",
- julia: "#a270ba",
- benchmarkdotnet: "#178600",
- customBiggerIsBetter: "#38ff38",
- customSmallerIsBetter: "#ff3838",
- _: "#333333",
-};
-
-const BenchmarkResultChart = ({ name, dataset, theme }) => {
- const color = toolColors[dataset.length > 0 ? dataset[0].tool : "_"];
- const data = {
- labels: dataset.map((d) => d.commit.id.slice(0, 7)),
- datasets: [
- {
- label: name,
- data: dataset.map((d) => d.bench.value),
- borderColor: color,
- backgroundColor: color + "60", // Add alpha for #rrggbbaa
- },
- ],
- };
- const options = {
- scales: {
- xAxes: [
- {
- scaleLabel: {
- display: true,
- labelString: "commit",
- },
- },
- ],
- yAxes: [
- {
- scaleLabel: {
- display: true,
- labelString: dataset.length > 0 ? dataset[0].bench.unit : "",
- },
- ticks: {
- beginAtZero: true,
- },
- },
- ],
- legend: {
- labels: {
- // This more specific font property overrides the global property
- defaultFontColor: theme === "light" ? "#000000" : "#FFFFFF",
- },
- },
- },
- tooltips: {
- callbacks: {
- afterTitle: (items) => {
- const { index } = items[0];
- const data = dataset[index];
- return "\n" + data.commit.message + "\n\n" + data.commit.timestamp + " committed by @" +
- data.commit.committer.username + "\n";
- },
- label: (item) => {
- let label = item.value;
- const { range, unit } = dataset[item.index].bench;
- label += " " + unit;
- if (range) {
- label += " (" + range + ")";
- }
- return label;
- },
- afterLabel: (item) => {
- const { extra } = dataset[item.index].bench;
- return extra ? "\n" + extra : "";
- },
- },
- },
- onClick: (_mouseEvent, activeElems) => {
- if (activeElems.length === 0) {
- return;
- }
- // XXX: Undocumented. How can we know the index?
- const index = activeElems[0]._index;
- const url = dataset[index].commit.url;
- window.open(url, "_blank");
- },
- };
- // console.log(theme);
- return ;
-};
-
-export default function BenchmarkResultCharts() {
- const { colorMode } = useColorMode();
- const [data, setData] = useState();
-
- useEffect(async () => {
- if (!data) {
- setData(
- JSON.parse(
- (await (await fetch(
- "https://raw.githubusercontent.com/discordeno/discordeno/benchies/benchmarksResult/data.js",
- )).text()).slice(24),
- ),
- );
- }
- }, []);
-
- function collectBenchesPerTestCase(entries) {
- const dataMap = new Map();
- for (const entry of entries) {
- const { commit, date, tool, benches } = entry;
- for (const bench of benches) {
- const result = { commit, date, tool, bench };
- const arr = dataMap.get(bench.name);
- if (arr === undefined) {
- dataMap.set(bench.name, [result]);
- } else {
- arr.push(result);
- }
- }
- }
- return dataMap;
- }
-
- return (data
- ? Array.from(
- collectBenchesPerTestCase(data.entries.Benchmark),
- ([key, value]) => ({ benchName: key, benches: value }),
- ).map((
- bench,
- index,
- ) => (
-
- ))
- : <>);
-}
diff --git a/site/src/components/architecture/BaseFlowChart.tsx b/site/src/components/architecture/BaseFlowChart.tsx
new file mode 100644
index 000000000..bc1117bb2
--- /dev/null
+++ b/site/src/components/architecture/BaseFlowChart.tsx
@@ -0,0 +1,93 @@
+import React, { useEffect, useState } from "react";
+import ReactFlow, { Background, Controls, Edge, Handle, Node, Position, useEdgesState, useNodesState } from "reactflow";
+import "reactflow/dist/style.css";
+
+export const multiplier = 225;
+export const height = 40;
+export const widthMultiplier = 0.75;
+
+export const defaultNodeOptions = {
+ targetPosition: Position.Left,
+ sourcePosition: Position.Right,
+ draggable: false,
+ style: { width: `${multiplier * 0.75}px`, height: `${height}px` },
+};
+
+export const defaultGroupOptions = {
+ draggable: false,
+};
+
+export default function BaseFlowChart(
+ { initialNodes = [], initialEdges = [] }: { initialNodes: Node[]; initialEdges: Edge[] },
+) {
+ function getWindowDimensions() {
+ const { innerWidth: width, innerHeight: height } = window;
+ return {
+ width,
+ height,
+ };
+ }
+
+ const [windowDimensions, setWindowDimensions] = useState(getWindowDimensions());
+
+ useEffect(() => {
+ function handleResize() {
+ setWindowDimensions(getWindowDimensions());
+ }
+
+ window.addEventListener("resize", handleResize);
+ return () => window.removeEventListener("resize", handleResize);
+ }, []);
+
+ const [nodes, setNodes, onNodesChange] = useNodesState(initialNodes);
+ const [edges, setEdges, onEdgesChange] = useEdgesState(initialEdges);
+
+ return (
+ <>
+ = 997
+ ? `${
+ (100 *
+ ((windowDimensions.width - 300 -
+ (windowDimensions.width >= 1620 ? (windowDimensions.width - 1620) * 0.5 : 0)) /
+ windowDimensions.width) - 2) * widthMultiplier
+ }vw`
+ : "95vw",
+ height: "25vh",
+ }}
+ >
+
(
+
+
+
+
+ ),
+ baseLineNodeText: (n) => (
+
+
{n.data.label}
+
+ ),
+ }}
+ fitView
+ >
+
+
+
+
= 997
+ ? `${
+ (100 *
+ ((windowDimensions.width - 300 -
+ (windowDimensions.width >= 1620 ? (windowDimensions.width - 1620) * 0.5 : 0)) /
+ windowDimensions.width) - 2) * widthMultiplier
+ }vw`
+ : "95vw",
+ height: "50vh",
+ }}
+ >
+
{
+ //@ts-ignore
+ if (e.target.className === "react-flow__pane") nodeMouseHandler(e, { id: " - ", data: { label: " - " } });
+ }}
+ nodeTypes={{
+ baseLineNode: () => (
+
+
+
+
+ ),
+ baseLineNodeText: (n) => (
+
+
{n.data.label}
+
+ ),
+ }}
+ fitView
+ >
+
+
+
+
= S extends `${infer P1}_${infer P2}${in
: Lowercase;
export type Camelize = {
[K in keyof T as CamelCase]: T[K] extends Array ? U extends {} ? Array>
- : T[K]
- : T[K] extends {} ? Camelize
- : never;
+ : T[K]
+ : T[K] extends {} ? Camelize
+ : never;
};
/** Non object primitives */
@@ -1484,14 +1485,14 @@ export type AnythingBut = Exclude<
* object identity type
*/
export type Id = T extends infer U ? {
- [K in keyof U]: U[K];
- }
+ [K in keyof U]: U[K];
+}
: never;
export type KeysWithUndefined = {
[K in keyof T]-?: undefined extends T[K] ? K
- : null extends T[K] ? K
- : never;
+ : null extends T[K] ? K
+ : never;
}[keyof T];
type OptionalizeAux = Id<
@@ -1509,8 +1510,8 @@ type OptionalizeAux = Id<
*/
export type Optionalize = T extends object
? T extends Array ? number extends T["length"] ? T[number] extends object ? Array>
- : T
- : Partial
+ : T
+ : Partial
: OptionalizeAux
: T;
From 39939d472d0d250a148066066277976e496d087a Mon Sep 17 00:00:00 2001
From: Matthew Hatcher <3768988+MatthewSH@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:28:21 -0600
Subject: [PATCH 15/16] fix: await importDirectory call (#2770)
await importDirectory to ensure all recursive calls inside the function are completed before calling fileLoader
---
plugins/fileloader/mod.ts | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/plugins/fileloader/mod.ts b/plugins/fileloader/mod.ts
index eef8ad476..8602b878f 100644
--- a/plugins/fileloader/mod.ts
+++ b/plugins/fileloader/mod.ts
@@ -55,12 +55,11 @@ export async function fastFileLoader(
before?: (uniqueFilePathCounter: number, paths: string[]) => void,
) {
await Promise.all(
- [...paths].map((path) => {
+ [...paths].map(async (path) => {
if (between) between(path, uniqueFilePathCounter, paths);
- importDirectory(path);
+ await importDirectory(path);
}),
);
-
if (before) before(uniqueFilePathCounter, paths);
await fileLoader();
From 1a717ddc7d97e31d3775747df9df153729d2925d Mon Sep 17 00:00:00 2001
From: Mohammed Taha <62352949+6km@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:22:05 +0200
Subject: [PATCH 16/16] =?UTF-8?q?[=F0=9F=93=9C=20Docs]=20Fix=20grammar=20i?=
=?UTF-8?q?ssues=20(#2779)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Update getting-started.md
* Update frequently-asked-questions.md
* Update getting-started.md
---
site/docs/frequently-asked-questions.md | 12 +++++-------
site/tutorial/nodejs/getting-started.md | 9 +++------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/site/docs/frequently-asked-questions.md b/site/docs/frequently-asked-questions.md
index b1956207b..2efadcba2 100644
--- a/site/docs/frequently-asked-questions.md
+++ b/site/docs/frequently-asked-questions.md
@@ -21,17 +21,15 @@ No matter how little, a change that impacts the public API qualifies as a breaki
## Why Doesn't Discordeno Use Classes or EventEmitter?
-This is a design decision for the lib itself. You can still use class if you want on your bot. In fact, I hope someone
+This is a design decision for the library itself. You can still use class on your bot if you want. In fact, I hope someone
makes a framework/templates for this lib one day using classes so that devs have a choice on which style they prefer.
-Without trying to write an entire thesis statement on the reasons why I avoided Classes in this lib, I will just link to
-the best resources I believe help explain it.
+Without trying to write an entire thesis statement on the reasons why I avoided Classes in this library, I will just link to
+the best resources that I believe help explain it.
- [Really good article](https://dannyfritz.wordpress.com/2014/10/11/class-free-object-oriented-programming/)
- [Lecture by one of the developers who makes JavaScript](https://www.youtube.com/watch?v=PSGEjv3Tqo0)
-In regards to EventEmitter, I believe a functional event API was a much better choice. EventEmitter at it's core is
-simply just functions that run when a certain event is emitted. In Discordeno, that function is executed instead of
-emitting some event to trigger that function.
+In regards to EventEmitter, I believe a functional event API was a much better choice. EventEmitter at its core, is simply a set of functions that run when a certain event is emitted. In Discordeno, that function is executed instead of emitting some event to trigger it.
```typescript
// EventEmitter Example
@@ -47,7 +45,7 @@ issues I had. It prevents anyone from having this as a potential issue. Another
update the code in those functions without having to deal with headaches left and right of removing and adding
listeners. You don't need to worry about binding or not binding events. They are just pure functions
-In Discordeno, this is extremely simple, you just simply give it the new event handlers. For example:
+In Discordeno, this is extremely simple; you just simply give it the new event handlers. For example:
```typescript
bot.events.guildCreate = newGuildCreateEventHandler;
diff --git a/site/tutorial/nodejs/getting-started.md b/site/tutorial/nodejs/getting-started.md
index 7ec1a58fb..04a65d5d3 100644
--- a/site/tutorial/nodejs/getting-started.md
+++ b/site/tutorial/nodejs/getting-started.md
@@ -4,14 +4,11 @@ sidebar_position: 1
# Getting Started
-If you are reading this, you probably want to create a Discord bot with Discordeno or migrate from popular libraries
-like Discord.js.
+If you are reading this, you probably want to create a Discord bot with Discordeno or migrate from popular libraries like Discord.js.
-If this is going to be your first time making a bot, you should use Deno instead of Node.js. Although in some cases Deno
-might not be suitable for you, because of missing packages or a code base which too large to migrate to a slightly
-different language.
+If this is going to be your first time making a bot, you should use Deno instead of Node.js. Although in some cases, Deno might not be suitable for you because of missing packages or a code base that is too large to migrate to a slightly different language.
-This guide will help you making your first Discord Bot using Node.js or even migrating your Bot from a other Library.
+This guide will help you make your first Discord bot using Node.js or even migrate your bot from another library.
Moreover this guide will utilize two different options. One option to use the Discordeno package without any frameworks
and one, which uses the wrapper called `Discordeno.js`, which aims to achieve a djs-like interface.