@bleedingdev/modern-js-plugin-tanstack 3.2.0-ultramodern.120 → 3.2.0-ultramodern.121

package/tests/router/tanstackTypes.test.ts

@@ -62,15 +62,109 @@ describe('tanstack router type generation', () => {
     );
     expect(routerGenTs).toContain('modernRouteLoader: loader_0');
     expect(routerGenTs).toContain('modernRouteAction: action_0');
-    expect(routerGenTs).toContain('modernRouteId?: string;');
-    expect(routerGenTs).not.toContain(
-      'return Object.keys(staticData).length > 0 ? staticData : undefined;',
-    );
     expect(routerGenTs).toContain(
       "} from '@modern-js/plugin-tanstack/runtime';",
     );
     expect(routerGenTs).toContain('modernTanstackRouterFastDefaults,');
     expect(routerGenTs).toContain('...modernTanstackRouterFastDefaults,');
+
+    // The loader-bridge helpers are imported from the package runtime instead
+    // of being inlined into every generated file (bugfixes ship via package
+    // update, and the broken inline absolute-redirect handler is gone).
+    expect(routerGenTs).toContain('createRouteStaticData,');
+    expect(routerGenTs).toContain('modernLoaderToTanstack,');
+    expect(routerGenTs).toContain('type ModernRouterContext,');
+    expect(routerGenTs).not.toContain('function modernLoaderToTanstack');
+    expect(routerGenTs).not.toContain('function createRouteStaticData');
+    expect(routerGenTs).not.toContain('function throwTanstackRedirect');
+  });
+
+  test('emits resolvable relative component imports for routes carrying _component', async () => {
+    tempDir = await mkdtemp(path.join(tmpdir(), 'modern-tanstack-types-'));
+    const srcDirectory = path.join(tempDir, 'src');
+    for (const componentFile of [
+      'routes/layout.tsx',
+      'routes/page.tsx',
+      'routes/about/page.tsx',
+    ]) {
+      const componentPath = path.join(srcDirectory, componentFile);
+      await mkdir(path.dirname(componentPath), { recursive: true });
+      await writeFile(componentPath, 'export default () => null;');
+    }
+
+    const { routerGenTs } = await generateTanstackRouterTypesSourceForEntry({
+      appContext: {
+        srcDirectory,
+        internalSrcAlias: '@/_',
+      } as any,
+      entryName: 'index',
+      routes: [
+        {
+          type: 'nested',
+          id: 'layout',
+          isRoot: true,
+          _component: '@/_/routes/layout',
+          children: [
+            {
+              type: 'nested',
+              id: 'page',
+              index: true,
+              _component: '@/_/routes/page',
+            },
+            {
+              type: 'nested',
+              id: 'about/page',
+              path: 'about',
+              _component: '@/_/routes/about/page',
+            },
+            {
+              // Shares the page component module: the import must be reused.
+              type: 'nested',
+              id: 'about-alias/page',
+              path: 'about-alias',
+              _component: '@/_/routes/about/page',
+            },
+            {
+              // No _component: no component option may be emitted.
+              type: 'nested',
+              id: 'data-only/page',
+              path: 'data-only',
+            },
+          ],
+        },
+      ] as any,
+    });
+
+    // Children are emitted first, the root route component import last.
+    // Imports are relative (resolved like loader modules) — the raw
+    // `@/_` internal alias is not mapped by app tsconfigs.
+    expect(routerGenTs).toContain(
+      'import component_0 from "../../routes/page";',
+    );
+    expect(routerGenTs).toContain(
+      'import component_1 from "../../routes/about/page";',
+    );
+    expect(routerGenTs).toContain(
+      'import component_2 from "../../routes/layout";',
+    );
+    expect(routerGenTs).not.toContain('@/_/routes');
+    // The shared module is imported exactly once.
+    expect(routerGenTs).not.toContain('component_3');
+    expect(
+      routerGenTs.match(/from "\.\.\/\.\.\/routes\/about\/page";/g),
+    ).toHaveLength(1);
+
+    expect(routerGenTs).toContain('component: component_0,');
+    // The shared component import is referenced by both aliased routes.
+    expect(routerGenTs.match(/component: component_1,/g)).toHaveLength(2);
+    // The root route gets its component option.
+    expect(routerGenTs).toContain('component: component_2,');
+
+    const dataOnlyRoute = routerGenTs
+      .split('const ')
+      .find(block => block.includes('path: "data-only",'));
+    expect(dataOnlyRoute).toBeDefined();
+    expect(dataOnlyRoute).not.toContain('component:');
   });
 
   test('typechecks generated TanStack search contracts', async () => {
@@ -132,13 +226,17 @@ describe('tanstack router type generation', () => {
         '    options: TOptions;',
         '    addChildren<TChildren extends readonly unknown[]>(children: TChildren): Route<TOptions> & { children: TChildren };',
         '  };',
+        '  export type ModernRouterContext = {',
+        '    request?: Request;',
+        '    requestContext?: unknown;',
+        '  };',
         '  export function createMemoryHistory(options: unknown): unknown;',
         '  export const modernTanstackRouterFastDefaults: Record<string, unknown>;',
         '  export function createRootRouteWithContext<TContext>(): <TOptions extends RouteOptions>(options: TOptions) => Route<TOptions>;',
         '  export function createRoute<TOptions extends RouteOptions>(options: TOptions): Route<TOptions>;',
         '  export function createRouter<TOptions extends Record<string, unknown>>(options: TOptions): TOptions;',
-        '  export function notFound(): never;',
-        '  export function redirect(options: unknown): never;',
+        '  export function createRouteStaticData(opts: { modernRouteId?: string; modernRouteAction?: unknown; modernRouteLoader?: unknown }): Record<string, unknown>;',
+        '  export function modernLoaderToTanstack<TLoader extends (args: never) => unknown>(opts: { hasSplat: boolean }, modernLoader: TLoader): (ctx: unknown) => Promise<Awaited<ReturnType<TLoader>>>;',
         '}',
       ].join('\n'),
     );
@@ -273,6 +371,66 @@ describe('collectCanonicalRoutesForEntry', () => {
     expect(result).toBeNull();
   });
 
+  test('ignores a leading :lang param when the locale-param heuristic is disabled (no plugin-i18n)', () => {
+    const routes = [
+      {
+        type: 'nested',
+        id: 'layout',
+        isRoot: true,
+        children: [
+          {
+            type: 'nested',
+            id: '(lang)/layout',
+            path: ':lang',
+            children: [
+              {
+                type: 'nested',
+                id: '(lang)/about/page',
+                path: 'about',
+              },
+            ],
+          },
+        ],
+      },
+    ] as any;
+
+    // Without plugin-i18n, a hand-rolled `/:lang/` param must NOT trigger the
+    // i18n surface (the emitted module augmentation would break typechecking).
+    expect(
+      collectCanonicalRoutesForEntry(routes, { localeParamHeuristic: false }),
+    ).toBeNull();
+    // With plugin-i18n installed the heuristic strips the locale prefix.
+    expect(
+      collectCanonicalRoutesForEntry(routes, { localeParamHeuristic: true }),
+    ).toEqual({
+      '/about': 'Record<string, never>',
+    });
+  });
+
+  test('still honors modernCanonicalPath metadata when the heuristic is disabled', () => {
+    const result = collectCanonicalRoutesForEntry(
+      [
+        {
+          type: 'nested',
+          id: 'layout',
+          isRoot: true,
+          children: [
+            {
+              type: 'nested',
+              id: '(lang)/products/(slug)/page',
+              path: 'products/:slug',
+              modernCanonicalPath: '/products/:slug',
+            },
+          ],
+        },
+      ] as any,
+      { localeParamHeuristic: false },
+    );
+
+    expect(result).not.toBeNull();
+    expect(result!['/products/$slug']).toBe('{ "slug": string }');
+  });
+
   test('strips leading :lang param and maps index under :lang to "/"', () => {
     const result = collectCanonicalRoutesForEntry([
       {

package/dist/esm/runtime/DefaultNotFound.mjs

@@ -1,13 +0,0 @@
-import { jsx } from "react/jsx-runtime";
-import "react";
-const DefaultNotFound = ()=>/*#__PURE__*/ jsx("div", {
-        style: {
-            margin: '150px auto',
-            textAlign: 'center',
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center'
-        },
-        children: "404"
-    });
-export { DefaultNotFound };

package/dist/esm-node/runtime/DefaultNotFound.mjs

@@ -1,14 +0,0 @@
-import "node:module";
-import { jsx } from "react/jsx-runtime";
-import "react";
-const DefaultNotFound = ()=>/*#__PURE__*/ jsx("div", {
-        style: {
-            margin: '150px auto',
-            textAlign: 'center',
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center'
-        },
-        children: "404"
-    });
-export { DefaultNotFound };

package/dist/types/runtime/DefaultNotFound.d.ts

@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const DefaultNotFound: () => React.JSX.Element;

package/src/runtime/DefaultNotFound.tsx

@@ -1,15 +0,0 @@
-import React from 'react';
-
-export const DefaultNotFound = () => (
-  <div
-    style={{
-      margin: '150px auto',
-      textAlign: 'center',
-      display: 'flex',
-      alignItems: 'center',
-      justifyContent: 'center',
-    }}
-  >
-    404
-  </div>
-);