reorganized lib lgtm

fart_server/bonus_features/shortlinks/shortlinks.json

@@ -1,5 +1,5 @@
 {
   "/design": "https://docs.google.com/document/d/1pGNLsDr-WysIIqB4nc1pTCL8FMmPxkJMNoGsRMkA0TY/edit",
-  "/github": "https://github.com/EthanThatOneKid/fart/",
-  "/author": "https://etok.codes/"
+  "/github": "https://github.com/EthanThatOneKid/fart",
+  "/author": "https://etok.codes"
 }

fart_server/bonus_features/shortlinks/shortlinks.test.ts

@@ -1,4 +1,36 @@
 import { assertEquals } from "../../../deps/std/testing.ts";
 import { redirectIfShortlink } from "./shortlinks.ts";
+import shortlinks from "./shortlinks.json" assert { type: "json" };
 
-// TODO(@ethanthatonekid): write tests for shortlinks.ts
+Deno.test("shortlink redirects to GitHub repository", () => {
+  const request = new Request("http://localhost:8080/github");
+  const response = redirectIfShortlink(request);
+  assertEquals(response?.status, 302);
+  assertEquals(response?.headers.get("location"), shortlinks["/github"] + "/");
+});
+
+Deno.test("shortlink redirects to GitHub repository and preserves path", () => {
+  const request = new Request(
+    "http://localhost:8080/github/milestone/1?closed=1",
+  );
+  const response = redirectIfShortlink(request);
+  assertEquals(response?.status, 302);
+  assertEquals(
+    response?.headers.get("location"),
+    shortlinks["/github"] +
+      "/milestone/1?closed=1",
+  );
+});
+
+Object.entries(shortlinks)
+  .forEach(([shortlink, destination]) => {
+    // add a slash if the destination doesn't end with one
+    if (!destination.endsWith("/")) destination += "/";
+
+    Deno.test(`shortlink ${shortlink} redirects to ${destination}`, () => {
+      const request = new Request("http://localhost:8080" + shortlink);
+      const response = redirectIfShortlink(request);
+      assertEquals(response?.status, 302);
+      assertEquals(response?.headers.get("location"), destination);
+    });
+  });

fart_server/bonus_features/shortlinks/shortlinks.ts

@@ -1,4 +1,3 @@
-// TODO(@ethanthatonekid): write implementation for shortlinks.test.ts
 import shortlinks from "./shortlinks.json" assert { type: "json" };
 
 const map = Object.entries(shortlinks)
@@ -8,13 +7,15 @@ const map = Object.entries(shortlinks)
   }, new Map<string, string>());
 
 export const redirectIfShortlink = (request: Request): Response | null => {
-  const { pathname } = new URL(request.url);
-  if (pathname.includes("?")) {
-    const query = pathname.slice(pathname.indexOf("?"));
-    const shortlink = map.get(pathname.slice(0, pathname.indexOf("?")));
-    if (shortlink !== undefined) return Response.redirect(shortlink + query);
+  const { pathname, searchParams } = new URL(request.url);
+  for (const [shortlink, target] of map) {
+    if (pathname.startsWith(shortlink)) {
+      let destination = target + pathname.slice(shortlink.length);
+      if (searchParams.toString()) destination += "?" + searchParams;
+      // add a slash if the destination doesn't end with one
+      else if (!destination.endsWith("/")) destination += "/";
+      return Response.redirect(destination, 302);
+    }
   }
-  const shortlink = map.get(pathname.replace(/([^:]\/)\/+/g, "/"));
-  if (shortlink !== undefined) return Response.redirect(shortlink);
   return null;
 };

fart_server/bonus_features/versions/deno_redirect.ts → fart_server/bonus_features/versions/deno_deploy_redirect.ts

@@ -1,8 +1,9 @@
 import { Time } from "../../../lib/constants/time.ts";
 
 const deployments = new Map<string, string>();
-const projectName = Deno.env.get("DENO_DEPLOY_PROJECT_NAME");
-const token = Deno.env.get("DENO_DEPLOY_ACCESS_TOKEN");
+const projectName = Deno.env.get("DENO_DEPLOY_PROJECT_NAME") ?? "fart";
+const token = Deno.env.get("DENO_DEPLOY_ACCESS_TOKEN") ??
+  "ddp_10rd56LtEpRv33U37xJQK7Jdl5g0KC3EoB2p";
 const refreshRate = 10 * Time.Minute;
 let lastFetch = -1;
 

fart_server/bonus_features/versions/mod.ts

@@ -1 +1 @@
-export { redirectToDenoDeployPreviewUrl } from "./deno_redirect.ts";
+export { redirectToDenoDeployPreviewUrl } from "./deno_deploy_redirect.ts";

fart_server/serve.ts

@@ -1,21 +1,21 @@
 import { redirectToDenoDeployPreviewUrl } from "./bonus_features/versions/mod.ts";
 import { redirectIfShortlink } from "./bonus_features/shortlinks/mod.ts";
-import { getSize, inject, register } from "./utils.ts";
+import { clear, getSize, inject, register } from "./utils.ts";
 
 const middleware = [
   // redirect to another server running a different version of the Fart library
   redirectToDenoDeployPreviewUrl,
   // redirect to an external URL
   redirectIfShortlink,
   // show how many handlers are registered
-  (request) => {
+  (request: Request) => {
     if (new URL(request.url).pathname === "/debug/size") {
       return new Response(String(getSize()));
     }
     return null;
   },
   // show deployment ID if running on Deno Deploy
-  (request) => {
+  (request: Request) => {
     if (new URL(request.url).pathname === "/debug/deployment") {
       return new Response(String(Deno.env.get("DENO_DEPLOYMENT_ID")));
     }
@@ -24,7 +24,7 @@ const middleware = [
 ];
 
 export const setup = () => {
-  if (getSize() === middlware.length) return;
+  if (getSize() === middleware.length) return;
   clear();
   register(...middleware);
 };
@@ -36,11 +36,12 @@ export const handleRequest = async (event: Deno.RequestEvent) => {
 
 export const serve = async () => {
   const port = parseInt(Deno.env.get("PORT") || "8080");
-  console.log(`Access HTTP webserver at: http://localhost:${port}/`);
+  console.info(`Access HTTP webserver at: http://localhost:${port}/`);
   for await (const connection of Deno.listen({ port })) {
     for await (const event of Deno.serveHttp(connection)) {
       await handleRequest(event);
     }
+    connection.close();
   }
 };
 

lib/cartridge/cartridge.test.ts → lib/transpile/cartridge/cartridge.test.ts

@@ -1,7 +1,6 @@
-import { assertEquals } from "../../deps/std/testing.ts";
+import { assertEquals } from "../../../deps/std/testing.ts";
 import { Cartridge, CartridgeEvent } from "./cartridge.ts";
 import { CodeBlock } from "../code_block/mod.ts";
-// import { Lexicon, T } from "../tokenize/mod.ts";
 
 Deno.test("event 'file_start' makes a successful dispatch", async () => {
   const cartridge = new Cartridge();

lib/code_block/code_block.test.ts → lib/transpile/code_block/code_block.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "../../deps/std/testing.ts";
+import { assertEquals } from "../../../deps/std/testing.ts";
 import { CodeBlock } from "./code_block.ts";
 
 Deno.test("new code block is empty", () => {

lib/indent/indent.test.ts → lib/transpile/indent/indent.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "../../deps/std/testing.ts";
+import { assertEquals } from "../../../deps/std/testing.ts";
 import { INDENT, Indent } from "./indent.ts";
 
 Deno.test("cache of Indent.Tab1 equals 1 tab", () => {

lib/indent/utils.test.ts → lib/transpile/indent/utils.test.ts

@@ -2,7 +2,7 @@ import {
   bench,
   BenchmarkTimer,
   runBenchmarks,
-} from "../../deps/std/testing.ts";
+} from "../../../deps/std/testing.ts";
 import { INDENT, Indent } from "./indent.ts";
 import { getCachedIndent } from "./utils.ts";
 

lib/text_builder/text_builder.test.ts → lib/transpile/text_builder/text_builder.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "../../deps/std/testing.ts";
+import { assertEquals } from "../../../deps/std/testing.ts";
 import { TextBuilder } from "./text_builder.ts";
 import { Cartridge } from "../cartridge/mod.ts";
 

lib/text_builder/utils.test.ts → lib/transpile/text_builder/utils.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "../../deps/std/testing.ts";
+import { assertEquals } from "../../../deps/std/testing.ts";
 import { T, Token } from "../tokenize/mod.ts";
 import { CodeBlock } from "../code_block/mod.ts";
 import {

lib/tokenize/lexicon.test.ts → lib/transpile/tokenize/lexicon.test.ts

@@ -1,4 +1,4 @@
-import { assertThrows } from "../../deps/std/testing.ts";
+import { assertThrows } from "../../../deps/std/testing.ts";
 
 import { LEXICON } from "./lexicon.ts";
 

lib/tokenize/t.test.ts → lib/transpile/tokenize/t.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "../../deps/std/testing.ts";
+import { assertEquals } from "../../../deps/std/testing.ts";
 
 import { T } from "./t.ts";
 

lib/tokenize/token.test.ts → lib/transpile/tokenize/token.test.ts

@@ -1,4 +1,4 @@
-import { assert, assertEquals } from "../../deps/std/testing.ts";
+import { assert, assertEquals } from "../../../deps/std/testing.ts";
 import { Token } from "./token.ts";
 import { Lexicon } from "./lexicon.ts";
 

lib/tokenize/tokenize.test.ts → lib/transpile/tokenize/tokenize.test.ts

@@ -1,7 +1,7 @@
 import { T } from "./t.ts";
 import { Token } from "./token.ts";
 import { tokenize } from "./tokenize.ts";
-import { assertEquals } from "../../deps/std/testing.ts";
+import { assertEquals } from "../../../deps/std/testing.ts";
 
 Deno.test("yields no tokens given an empty string", () => {
   const input = "";

lib/tokenize/utils.test.ts → lib/transpile/tokenize/utils.test.ts

@@ -1,4 +1,4 @@
-import { assert, assertEquals } from "../../deps/std/testing.ts";
+import { assert, assertEquals } from "../../../deps/std/testing.ts";
 import {
   checkIsIdentifier,
   checkIsInlineComment,

lib/transpile/transpile.ts

@@ -1,7 +1,7 @@
-import { Token, tokenize } from "../tokenize/mod.ts";
-import { Cartridge } from "../cartridge/mod.ts";
-import { TextBuilder } from "../text_builder/mod.ts";
-import type { FartTokenGenerator } from "../tokenize/mod.ts";
+import { Token, tokenize } from "./tokenize/mod.ts";
+import { Cartridge } from "./cartridge/mod.ts";
+import { TextBuilder } from "./text_builder/mod.ts";
+import type { FartTokenGenerator } from "./tokenize/mod.ts";
 
 export interface FartOptions {
   targetLanguage: string; // "ts" | "go"
@@ -11,47 +11,52 @@ export interface FartOptions {
   preserveComments: boolean;
 }
 
-interface TranspilationContext {
-  tokenizer: FartTokenGenerator | null;
-  builder: TextBuilder | null;
-  prevTokens: Token[];
-  currentToken: Token | null;
-  nextToken: () => Token | undefined;
-  nextStruct: () => Promise<void>;
-  nextTuple: () => Promise<void>;
-}
+class TranspilationContext {
+  constructor(
+    public tokenizer?: FartTokenGenerator,
+    public builder?: TextBuilder,
+    public currentToken: Token | null = null,
+    public prevTokens: Token[] = [],
+  ) {}
 
-const INITIAL_TRANSPILATION_CONTEXT: TranspilationContext = {
-  tokenizer: null,
-  builder: null,
-  prevTokens: [],
-  currentToken: null,
-  nextToken() {
-    if (this.tokenizer !== null) {
-      if (this.currentToken !== null) {
+  public nextToken(): Token | null {
+    if (this.tokenizer !== undefined) {
+      if (
+        this.currentToken !== null &&
+        this.prevTokens !== undefined &&
+        this.currentToken !== undefined
+      ) {
         this.prevTokens.push(this.currentToken);
       }
-      return this.tokenizer.next().value;
+      const token = this.tokenizer.next().value;
+      if (token !== undefined) {
+        return this.currentToken = token;
+      }
     }
-  },
-  async nextStruct() {
-    // TODO: handle struct
-  },
-  async nextTuple() {
-    // TODO: handle tuple
-  },
-};
+    return null;
+  }
 
-const initializeTranspilationContext = () => ({
-  ...INITIAL_TRANSPILATION_CONTEXT,
-});
+  /**
+   * @todo implement
+   */
+  public async nextStruct(): Promise<void> {
+  }
+
+  /**
+   * @todo implement
+   */
+  public async nextTuple(): Promise<void> {
+  }
+}
 
 export const transpile = (
   code: string,
   // options: FartOptions,
 ): string => {
-  const ctx = initializeTranspilationContext();
-  ctx.tokenizer = tokenize(code);
-
+  const ctx = new TranspilationContext(
+    tokenize(code),
+    new TextBuilder(new Cartridge()),
+  );
+  console.log({ ctx });
   return "";
 };