Initial typings fs-router folder

packages/start/fs-router/fileRoutesImport.js → packages/start/fs-router/fileRoutesImport.ts

@@ -1,7 +1,21 @@
-export default function fileRoutesImport({ types: t }) {
+// @ts-ignore
+import type * as BabelTypes from "@babel/types/lib";
+
+type Path = {
+  node: { body: any; source: { value: string; }; specifiers: any[]; };
+  scope: { generateUidIdentifier: (arg0: string) => any; };
+  replaceWith: (arg0: any) => void;
+  insertBefore: (arg0: any) => void;
+}
+
+type State = {
+  namespaceSpec: any[];
+}
+
+export default function fileRoutesImport({ types: t }: { types: typeof BabelTypes }) {
   return {
     visitor: {
-      ImportDeclaration(path, state) {
+      ImportDeclaration(path: Path, state: State) {
         if (path.node.source.value !== "solid-start") {
           return;
         }
@@ -29,12 +43,12 @@ export default function fileRoutesImport({ types: t }) {
         }
       },
       Program: {
-        enter(_path, state) {
+        enter(_path: Path, state: State) {
           state.namespaceSpec = [];
         },
-        exit(path, state) {
+        exit(path: Path, state: State) {
           const body = path.node.body;
-          let lastImportIndex;
+          let lastImportIndex: number;
           if (state.namespaceSpec.length) {
             for (let i = 0; i < body.length; i++) {
               if (body[i].type === "ImportDeclaration") {
@@ -49,7 +63,7 @@ export default function fileRoutesImport({ types: t }) {
               t.stringLiteral("solid-start/root/FileRoutes")
             );
             body.unshift(newImport);
-            lastImportIndex++;
+            lastImportIndex!++;
             const namespaceId = path.scope.generateUidIdentifier(specifier.local.name);
             const namespaceFix = t.variableDeclaration("const", [
               t.variableDeclarator(
@@ -60,7 +74,7 @@ export default function fileRoutesImport({ types: t }) {
                 ])
               )
             ]);
-            body.splice(lastImportIndex + 1, 0, namespaceFix);
+            body.splice(lastImportIndex! + 1, 0, namespaceFix);
             specifier.local.name = namespaceId.name;
           }
         }

packages/start/fs-router/manifest.js

@@ -1,6 +1,6 @@
 // make asset lookup
 import { posix } from "path";
-import { toPath } from "./path-utils.js";
+import { toPath } from "./path-utils.ts";
 
 /**
  * Output:

packages/start/fs-router/path-utils.js → packages/start/fs-router/path-utils.ts

@@ -3,11 +3,11 @@
  * @param removePathlessLayouts
  * @returns
  */
-export function toPath(id, removePathlessLayouts = true) {
+export function toPath(id: string, removePathlessLayouts = true): string {
   const idWithoutIndex = id.endsWith("/index") ? id.slice(0, -"index".length) : id;
   return (
     removePathlessLayouts ? idWithoutIndex.replace(/\/\([^)/]+\)/g, "") : idWithoutIndex
-  ).replace(/\[([^\/]+)\]/g, (_, m) => {
+  ).replace(/\[([^\/]+)\]/g, (_, m: string) => {
     if (m.length > 3 && m.startsWith("...")) {
       return `*${m.slice(3)}`;
     }

packages/start/fs-router/router.js

@@ -6,7 +6,7 @@ import esbuild from "esbuild";
 import fg from "fast-glob";
 import fs from "fs";
 import path, { join } from "path";
-import { toPath } from "./path-utils.js";
+import { toPath } from "./path-utils.ts";
 
 const log = debug("solid-start");
 const ROUTE_KEYS = ["component", "path", "data", "children"];

packages/start/package.json

@@ -109,6 +109,7 @@
     "wait-on": "^6.0.1"
   },
   "devDependencies": {
+    "@babel/types": "^7.20.7",
     "@cloudflare/workers-types": "^3.19.0",
     "@solidjs/meta": "^0.28.2",
     "@solidjs/router": "^0.7.0",

packages/start/vite/plugin.js

@@ -11,7 +11,7 @@ import { loadEnv, normalizePath } from "vite";
 import inspect from "vite-plugin-inspect";
 import solid from "vite-plugin-solid";
 import printUrls from "../dev/print-routes.js";
-import fileRoutesImport from "../fs-router/fileRoutesImport.js";
+import fileRoutesImport from "../fs-router/fileRoutesImport.ts";
 import { Router, stringifyApiRoutes, stringifyPageRoutes } from "../fs-router/router.js";
 import routeData from "../server/routeData.js";
 import routeDataHmr from "../server/routeDataHmr.js";