@react-router/dev 0.0.0-experimental-2d5e406e4 → 0.0.0-experimental-3bba3331c

package/dist/cli/commands.d.ts

@@ -10,3 +10,4 @@ export declare function generateEntry(entry: string, reactRouterRoot: string, fl
     typescript?: boolean;
     config?: string;
 }): Promise<void>;
+export declare function typegen(root?: string): Promise<void>;

package/dist/cli/commands.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -21,6 +21,7 @@ var format = require('../config/format.js');
 var plugin = require('../vite/plugin.js');
 var useJavascript = require('./useJavascript.js');
 var profiler = require('../vite/profiler.js');
+var typegen$1 = require('../typescript/typegen.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -160,8 +161,18 @@ async function createClientEntry(rootDirectory, appDirectory, inputFile) {
   let contents = await fse__default["default"].readFile(inputFile, "utf-8");
   return contents;
 }
+async function typegen(root) {
+  let ctx = await plugin.loadPluginContext({
+    root
+  });
+  await typegen$1.writeAll({
+    rootDirectory: ctx.rootDirectory,
+    appDirectory: ctx.reactRouterConfig.appDirectory
+  }, ctx.reactRouterConfig.routes);
+}
 
 exports.build = build;
 exports.dev = dev;
 exports.generateEntry = generateEntry;
 exports.routes = routes;
+exports.typegen = typegen;

package/dist/cli/detectPackageManager.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/run.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -86,6 +86,10 @@ ${colors.logoBlue("react-router")}
     $ react-router reveal entry.client --no-typescript
     $ react-router reveal entry.server --no-typescript
     $ react-router reveal entry.server --config vite.react-router.config.ts
+
+  ${colors.heading("Generate types for route modules")}:
+
+   $ react-router typegen
 `;
 /**
  * Programmatic interface for running the react-router CLI with the given command line
@@ -171,6 +175,9 @@ async function run(argv = process.argv.slice(2)) {
     case "dev":
       await commands.dev(input[1], flags);
       break;
+    case "typegen":
+      await commands.typegen(input[1]);
+      break;
     default:
       // `react-router ./my-project` is shorthand for `react-router dev ./my-project`
       await commands.dev(input[0], flags);

package/dist/cli/useJavascript.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/colors.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/format.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/invariant.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/typescript/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,7 +12,6 @@
 
 var Path = require('pathe');
 var typegen = require('./typegen.js');
-var decorate = require('./decorate.js');
 
 function _interopNamespace(e) {
     if (e && e.__esModule) return e;
@@ -42,21 +41,11 @@ function init(modules) {
     } = info.project.projectService;
     logger.info("[react-router] setup");
     const rootDirectory = Path__namespace.normalize(info.project.getCurrentDirectory());
-    const config = {
+    const ctx = {
       rootDirectory,
       appDirectory: Path__namespace.join(rootDirectory, "app")
     };
-    const ctx = {
-      config,
-      routes: {},
-      // will be updated by `Typegen.watch`
-      languageService: info.languageService,
-      languageServiceHost: info.languageServiceHost,
-      ts: modules.typescript,
-      logger
-    };
     typegen.watch(ctx);
-    decorate.decorateLanguageService(ctx);
     return info.languageService;
   }
   return {

package/dist/typescript/typegen.d.ts

@@ -1,5 +1,9 @@
-import { type RouteManifestEntry } from "../config/routes";
-import type { Context } from "./context";
-export declare function getPath(ctx: Context, route: Pick<RouteManifestEntry, "file">): string;
+import { type RouteManifest, type RouteManifestEntry } from "../config/routes";
+type Context = {
+    rootDirectory: string;
+    appDirectory: string;
+};
+export declare function getPath(ctx: Context, route: RouteManifestEntry): string;
 export declare function watch(ctx: Context): Promise<void>;
-export declare function typegenAll(ctx: Context): Promise<void>;
+export declare function writeAll(ctx: Context, routes: RouteManifest): Promise<void>;
+export {};

package/dist/typescript/typegen.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -47,75 +47,75 @@ var Path__namespace = /*#__PURE__*/_interopNamespace(Path);
 var Pathe__namespace = /*#__PURE__*/_interopNamespace(Pathe);
 
 function getDirectory(ctx) {
-  return Path__namespace.join(ctx.config.rootDirectory, ".react-router/types");
+  return Path__namespace.join(ctx.rootDirectory, ".react-router/types");
 }
 function getPath(ctx, route) {
   return Path__namespace.join(getDirectory(ctx), "app", Path__namespace.dirname(route.file), "+types." + Path__namespace.basename(route.file));
 }
 async function watch(ctx) {
-  const appDirectory = Path__namespace.normalize(ctx.config.appDirectory);
+  const appDirectory = Path__namespace.normalize(ctx.appDirectory);
   const routesTsPath = Path__namespace.join(appDirectory, "routes.ts");
   const routesViteNodeContext = await viteNode.createContext();
-  async function updateRoutes() {
+  async function getRoutes() {
     routesViteNodeContext.devServer.moduleGraph.invalidateAll();
     routesViteNodeContext.runner.moduleCache.clear();
     const result = await routesViteNodeContext.runner.executeFile(routesTsPath);
-    ctx.routes = routes.configRoutesToRouteManifest(result.routes);
+    return routes.configRoutesToRouteManifest(result.routes);
   }
-  await updateRoutes();
-  await typegenAll(ctx);
+  const initialRoutes = await getRoutes();
+  await writeAll(ctx, initialRoutes);
   const watcher = Chokidar__default["default"].watch(appDirectory, {
     ignoreInitial: true
   });
   watcher.on("all", async (event, path) => {
     path = Path__namespace.normalize(path);
-    await updateRoutes();
+    const routes = await getRoutes();
     const routeConfigChanged = Boolean(routesViteNodeContext.devServer.moduleGraph.getModuleById(path));
     if (routeConfigChanged) {
-      await typegenAll(ctx);
+      await writeAll(ctx, routes);
       return;
     }
-    const isRoute = Object.values(ctx.routes).find(route => path === Path__namespace.join(ctx.config.appDirectory, route.file));
+    const isRoute = Object.values(routes).find(route => path === Path__namespace.join(ctx.appDirectory, route.file));
     if (isRoute && (event === "add" || event === "unlink")) {
-      await typegenAll(ctx);
+      await writeAll(ctx, routes);
       return;
     }
   });
 }
-async function typegenAll(ctx) {
+async function writeAll(ctx, routes) {
   fs__default["default"].rmSync(getDirectory(ctx), {
     recursive: true,
     force: true
   });
-  Object.values(ctx.routes).forEach(route => {
+  Object.values(routes).forEach(route => {
     const typesPath = getPath(ctx, route);
-    const content = getModule(ctx, route);
+    const content = getModule(routes, route);
     fs__default["default"].mkdirSync(Path__namespace.dirname(typesPath), {
       recursive: true
     });
     fs__default["default"].writeFileSync(typesPath, content);
   });
 }
-function getModule(ctx, route) {
+function getModule(routes, route) {
   return dedent__default["default"]`
     // typegen: ${route.file}
     import * as T from "react-router/types"
 
-    export type Params = {${formattedParamsProperties(ctx.routes, route)}}
+    export type Params = {${formattedParamsProperties(routes, route)}}
 
     type Route = typeof import("./${Pathe__namespace.filename(route.file)}")
 
     export type LoaderData = T.LoaderData<Route>
     export type ActionData = T.ActionData<Route>
 
-    export type serverLoader = T.ServerLoader<Params>
-    export type clientLoader = T.ClientLoader<Params, Route>
-    export type serverAction = T.ServerAction<Params>
-    export type clientAction = T.ClientAction<Params, Route>
+    export type LoaderArgs = T.ServerLoaderArgs<Params>
+    export type ClientLoaderArgs = T.ClientLoaderArgs<Params, Route>
+    export type ActionArgs = T.ServerActionArgs<Params>
+    export type ClientActionArgs = T.ClientActionArgs<Params, Route>
 
-    export type HydrateFallback = T.HydrateFallback<Params>
-    export type Default = T.Default<Params, LoaderData, ActionData>
-    export type ErrorBoundary = T.ErrorBoundary<Params, LoaderData, ActionData>
+    export type HydrateFallbackProps = T.HydrateFallbackProps<Params>
+    export type DefaultProps = T.DefaultProps<Params, LoaderData, ActionData>
+    export type ErrorBoundaryProps = T.ErrorBoundaryProps<Params, LoaderData, ActionData>
   `;
 }
 function formattedParamsProperties(routes, route) {
@@ -161,5 +161,5 @@ function parseParams(urlpath) {
 }
 
 exports.getPath = getPath;
-exports.typegenAll = typegenAll;
 exports.watch = watch;
+exports.writeAll = writeAll;

package/dist/vite/babel.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/build.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare-dev-proxy.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/combine-urls.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/dev.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/import-vite-esm-sync.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/node-adapter.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/profiler.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/remove-exports.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/resolve-file-url.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/styles.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vite-node.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vmod.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/with-props.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
+ * @react-router/dev v0.0.0-experimental-3bba3331c
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-2d5e406e4",
+  "version": "0.0.0-experimental-3bba3331c",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -61,7 +61,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "^1.6.0",
-    "@react-router/node": "0.0.0-experimental-2d5e406e4"
+    "@react-router/node": "0.0.0-experimental-3bba3331c"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -85,18 +85,17 @@
     "fast-glob": "3.2.11",
     "strip-ansi": "^6.0.1",
     "tiny-invariant": "^1.2.0",
-    "typescript": "^5.6.2",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "react-router": "^0.0.0-experimental-2d5e406e4",
-    "@react-router/serve": "0.0.0-experimental-2d5e406e4"
+    "@react-router/serve": "0.0.0-experimental-3bba3331c",
+    "react-router": "^0.0.0-experimental-3bba3331c"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-2d5e406e4",
-    "react-router": "^0.0.0-experimental-2d5e406e4"
+    "@react-router/serve": "^0.0.0-experimental-3bba3331c",
+    "react-router": "^0.0.0-experimental-3bba3331c"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {

package/dist/typescript/ast.d.ts

@@ -1,8 +0,0 @@
-import type ts from "typescript/lib/tsserverlibrary";
-import type { Context } from "./context";
-export declare function generateUniqueIdentifier(): string;
-export declare function findNodeAtPosition(node: ts.Node, pos: number): ts.Node | undefined;
-export declare function getRouteExportName(ctx: Context, node: ts.Node): string | undefined;
-export declare function getExportNames(ts: Context["ts"], sourceFile: ts.SourceFile): Set<string>;
-export declare function exported(ts: Context["ts"], stmt: ts.VariableStatement | ts.FunctionDeclaration): ts.ModifierLike | undefined;
-export declare function defaulted(ts: Context["ts"], stmt: ts.FunctionDeclaration): ts.ModifierLike | undefined;

package/dist/typescript/ast.js

@@ -1,98 +0,0 @@
-/**
- * @react-router/dev v0.0.0-experimental-2d5e406e4
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-function findNodeAtPosition(node, pos) {
-  if (pos < node.getStart() || node.getEnd() < pos) return;
-  for (const child of node.getChildren()) {
-    if (pos < child.getStart()) break;
-    if (pos > child.getEnd()) continue;
-    const found = findNodeAtPosition(child, pos);
-    if (found) return found;
-    return child;
-  }
-  return node;
-}
-function getRouteExportName(ctx, node) {
-  if (node.kind === ctx.ts.SyntaxKind.DefaultKeyword) {
-    return "default";
-  }
-  if (node.kind === ctx.ts.SyntaxKind.FunctionKeyword) {
-    return getRouteExportName(ctx, node.parent);
-  }
-  if (ctx.ts.isIdentifier(node)) {
-    return getRouteExportName(ctx, node.parent);
-  }
-  if (ctx.ts.isExportAssignment(node)) {
-    if (node.isExportEquals) return;
-    if (!ctx.ts.isArrowFunction(node.expression)) return;
-    return "default";
-  }
-  if (ctx.ts.isFunctionDeclaration(node)) {
-    var _node$name;
-    if (!exported(ctx.ts, node)) return;
-    if (defaulted(ctx.ts, node)) return "default";
-    return (_node$name = node.name) === null || _node$name === void 0 ? void 0 : _node$name.text;
-  }
-  if (ctx.ts.isVariableDeclaration(node)) {
-    const varDeclList = node.parent;
-    if (!ctx.ts.isVariableDeclarationList(varDeclList)) return;
-    const varStmt = varDeclList.parent;
-    if (!ctx.ts.isVariableStatement(varStmt)) return;
-    if (!exported(ctx.ts, varStmt)) return;
-    if (!ctx.ts.isIdentifier(node.name)) return;
-    return node.name.text;
-  }
-}
-function getExportNames(ts, sourceFile) {
-  const exports = new Set();
-  sourceFile.statements.forEach(stmt => {
-    if (ts.isExportDeclaration(stmt)) {
-      if (stmt.exportClause && ts.isNamedExports(stmt.exportClause)) {
-        stmt.exportClause.elements.forEach(element => exports.add(element.name.text));
-      }
-    }
-    if (ts.isVariableStatement(stmt) && exported(ts, stmt)) {
-      stmt.declarationList.declarations.forEach(decl => {
-        if (ts.isIdentifier(decl.name)) {
-          exports.add(decl.name.text);
-        }
-      });
-    }
-    if (ts.isFunctionDeclaration(stmt) && exported(ts, stmt)) {
-      if (defaulted(ts, stmt)) {
-        exports.add("default");
-      } else if (stmt.name) {
-        exports.add(stmt.name.text);
-      }
-    }
-    if (ts.isExportAssignment(stmt)) {
-      exports.add("default");
-    }
-  });
-  return exports;
-}
-function exported(ts, stmt) {
-  var _stmt$modifiers;
-  return (_stmt$modifiers = stmt.modifiers) === null || _stmt$modifiers === void 0 ? void 0 : _stmt$modifiers.find(m => m.kind === ts.SyntaxKind.ExportKeyword);
-}
-function defaulted(ts, stmt) {
-  var _stmt$modifiers2;
-  return (_stmt$modifiers2 = stmt.modifiers) === null || _stmt$modifiers2 === void 0 ? void 0 : _stmt$modifiers2.find(m => m.kind === ts.SyntaxKind.DefaultKeyword);
-}
-
-exports.defaulted = defaulted;
-exports.exported = exported;
-exports.findNodeAtPosition = findNodeAtPosition;
-exports.getExportNames = getExportNames;
-exports.getRouteExportName = getRouteExportName;

package/dist/typescript/autotype/api.completions.d.ts

@@ -1,5 +0,0 @@
-import type ts from "typescript/lib/tsserverlibrary";
-import { type Context } from "../context";
-export declare const getCompletionsAtPosition: (ctx: Context) => ts.LanguageService["getCompletionsAtPosition"];
-export declare const getCompletionEntryDetails: (ctx: Context) => ts.LanguageService["getCompletionEntryDetails"];
-export declare const getSignatureHelpItems: (ctx: Context) => ts.LanguageService["getSignatureHelpItems"];