@batijs/cli 0.0.195 → 0.0.196

package/dist/boilerplates/@batijs/hono/files/hono-entry.ts

@@ -1,20 +1,49 @@
-import CredentialsProvider from "@auth/core/providers/credentials";
-import { firebaseAdmin } from "@batijs/firebase-auth/libs/firebaseAdmin";
+// BATI.has("auth0")
+import "dotenv/config";
+import { authjsHandler, authjsSessionMiddleware } from "@batijs/authjs/server/authjs-handler";
+import {
+  firebaseAuthLoginHandler,
+  firebaseAuthLogoutHandler,
+  firebaseAuthMiddleware,
+} from "@batijs/firebase-auth/server/firebase-auth-middleware";
+import { vikeHandler } from "@batijs/shared-server/server/vike-handler";
+import { telefuncHandler } from "@batijs/telefunc/server/telefunc-handler";
 import { appRouter } from "@batijs/trpc/trpc/server";
 import { serve } from "@hono/node-server";
 import { serveStatic } from "@hono/node-server/serve-static";
 import { fetchRequestHandler, type FetchCreateContextFnOptions } from "@trpc/server/adapters/fetch";
-import { getAuth } from "firebase-admin/auth";
 import { Hono } from "hono";
 import { compress } from "hono/compress";
-import { deleteCookie, getCookie, setCookie } from "hono/cookie";
-import { telefunc } from "telefunc";
-import { VikeAuth } from "vike-authjs";
-import { renderPage } from "vike/server";
+import { createMiddleware } from "hono/factory";
 
 const isProduction = process.env.NODE_ENV === "production";
 const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 3000;
 
+interface Middleware<Context extends Record<string | number | symbol, unknown>> {
+  (request: Request, context: Context): Response | void | Promise<Response> | Promise<void>;
+}
+
+export function handlerAdapter<Context extends Record<string | number | symbol, unknown>>(
+  handler: Middleware<Context>,
+) {
+  return createMiddleware(async (context, next) => {
+    let ctx = context.get("context");
+    if (!ctx) {
+      ctx = {};
+      context.set("context", ctx);
+    }
+
+    const res = await handler(context.req.raw, ctx as Context);
+    context.set("context", ctx);
+
+    if (!res) {
+      await next();
+    }
+
+    return res;
+  });
+}
+
 const app = new Hono();
 
 app.use(compress());
@@ -28,86 +57,23 @@ if (isProduction) {
   );
 }
 
-if (BATI.has("authjs")) {
+if (BATI.has("authjs") || BATI.has("auth0")) {
   /**
-   * AuthJS
-   *
-   * TODO: Replace secret {@see https://authjs.dev/reference/core#secret}
-   * TODO: Choose and implement providers
-   *
-   * @link {@see https://authjs.dev/guides/providers/custom-provider}
+   * Append Auth.js session to context
    **/
-  const Auth = VikeAuth({
-    secret: "MY_SECRET",
-    providers: [
-      CredentialsProvider({
-        name: "Credentials",
-        credentials: {
-          username: { label: "Username", type: "text", placeholder: "jsmith" },
-          password: { label: "Password", type: "password" },
-        },
-        async authorize() {
-          // Add logic here to look up the user from the credentials supplied
-          const user = { id: "1", name: "J Smith", email: "jsmith@example.com" };
-
-          // Any object returned will be saved in `user` property of the JWT
-          // If you return null then an error will be displayed advising the user to check their details.
-          // You can also Reject this callback with an Error thus the user will be sent to the error page with the error message as a query parameter
-          return user ?? null;
-        },
-      }),
-    ],
-  });
+  app.use(handlerAdapter(authjsSessionMiddleware));
 
-  app.use("/api/auth/**", (c) =>
-    Auth({
-      request: c.req.raw,
-    }),
-  );
+  /**
+   * Auth.js route
+   * @link {@see https://authjs.dev/getting-started/installation}
+   **/
+  app.use("/api/auth/**", handlerAdapter(authjsHandler));
 }
 
 if (BATI.has("firebase-auth")) {
-  app.use(async (c, next) => {
-    const sessionCookie: string = getCookie(c, "__session") || "";
-    if (sessionCookie) {
-      const auth = getAuth(firebaseAdmin);
-      try {
-        const decodedIdToken = await auth.verifySessionCookie(sessionCookie, true);
-        const user = await auth.getUser(decodedIdToken.sub);
-        c.set("user", user);
-      } catch (error) {
-        console.debug("verifySessionCookie:", error);
-        c.set("user", null);
-      }
-    }
-    await next();
-  });
-
-  app.post("/api/sessionLogin", async (c) => {
-    const body = await c.req.json();
-    const idToken: string = body.idToken || "";
-
-    let expiresIn = 60 * 60 * 24 * 5 * 1000; // 5 days. The auth.createSessionCookie() function of Firebase expects time to be specified in miliseconds.
-
-    const auth = getAuth(firebaseAdmin);
-    try {
-      const sessionCookie = await auth.createSessionCookie(idToken, { expiresIn });
-      const options = { maxAge: expiresIn, httpOnly: true, secure: true };
-
-      expiresIn = 60 * 60 * 24 * 5; // 5 days. The setCookie() function of Hono expects time to be specified in seconds.
-      setCookie(c, "__session", sessionCookie, options);
-
-      return c.json({ status: "success" }, 200);
-    } catch (error) {
-      console.error("createSessionCookie failed :", error);
-      return c.text("Unathorized", 401);
-    }
-  });
-
-  app.post("/api/sessionLogout", (c) => {
-    deleteCookie(c, "__session");
-    return c.text("Logged Out", 200);
-  });
+  app.use(handlerAdapter(firebaseAuthMiddleware));
+  app.post("/api/sessionLogin", handlerAdapter(firebaseAuthLoginHandler));
+  app.post("/api/sessionLogout", handlerAdapter(firebaseAuthLogoutHandler));
 }
 
 if (BATI.has("trpc")) {
@@ -134,43 +100,15 @@ if (BATI.has("telefunc")) {
    *
    * @link {@see https://telefunc.com}
    **/
-  app.post("/_telefunc", async (c) => {
-    const httpResponse = await telefunc({
-      url: c.req.url.toString(),
-      method: c.req.method,
-      body: await c.req.text(),
-      context: c,
-    });
-    const { body, statusCode, contentType } = httpResponse;
-
-    c.status(statusCode);
-    c.header("Content-Type", contentType);
-
-    return c.body(body);
-  });
+  app.post("/_telefunc", handlerAdapter(telefuncHandler));
 }
 
-app.all("*", async (c, next) => {
-  const pageContextInit = BATI.has("firebase-auth")
-    ? {
-        urlOriginal: c.req.url,
-        user: c.get("user"),
-      }
-    : {
-        urlOriginal: c.req.url,
-      };
-  const pageContext = await renderPage(pageContextInit);
-  const { httpResponse } = pageContext;
-  if (!httpResponse) {
-    return next();
-  } else {
-    const { body, statusCode, headers } = httpResponse;
-    headers.forEach(([name, value]) => c.header(name, value));
-    c.status(statusCode);
-
-    return c.body(body);
-  }
-});
+/**
+ * Vike route
+ *
+ * @link {@see https://vike.dev}
+ **/
+app.all("*", handlerAdapter(vikeHandler));
 
 if (isProduction) {
   console.log(`Server listening on http://localhost:${port}`);

package/dist/boilerplates/@batijs/hono/types/hono-entry.d.ts

@@ -1,3 +1,8 @@
+import "dotenv/config";
 import { Hono } from "hono";
+interface Middleware<Context extends Record<string | number | symbol, unknown>> {
+    (request: Request, context: Context): Response | void | Promise<Response> | Promise<void>;
+}
+export declare function handlerAdapter<Context extends Record<string | number | symbol, unknown>>(handler: Middleware<Context>): import("hono").MiddlewareHandler<any, any, {}>;
 declare const app: Hono<import("hono").Env, import("hono/types").BlankSchema, "/">;
 export default app;

package/dist/boilerplates/@batijs/react/files/$.eslintrc.json.js

@@ -3,11 +3,7 @@ import { loadAsJson } from "@batijs/core";
 async function getEslintConfig(props) {
   if (!props.meta.BATI.has("eslint")) return;
   const eslintConfig = await loadAsJson(props);
-  eslintConfig.extends = eslintConfig.extends.filter(
-    (p) => p !== "eslint:recommended" && p !== "plugin:@typescript-eslint/recommended"
-  );
   eslintConfig.extends.push("plugin:react/recommended");
-  eslintConfig.plugins = eslintConfig.plugins.filter((p) => p !== "@typescript-eslint");
   eslintConfig.plugins.push("react");
   eslintConfig.settings ??= {};
   eslintConfig.settings.react = { version: "detect" };

package/dist/boilerplates/@batijs/shared/files/package.json

@@ -11,6 +11,7 @@
   "keywords": [],
   "author": "",
   "devDependencies": {
+    "@auth/core": "^0.31.0",
     "typescript": "^5.4.5",
     "vike": "^0.4.172",
     "vite": "^5.2.11"

package/dist/boilerplates/@batijs/shared-server/files/server/vike-handler.ts

@@ -0,0 +1,15 @@
+import { renderPage } from "vike/server";
+
+export async function vikeHandler<Context extends Record<string | number | symbol, unknown>>(
+  request: Request,
+  context?: Context,
+): Promise<Response> {
+  const pageContextInit = { ...(context ?? {}), urlOriginal: request.url };
+  const pageContext = await renderPage(pageContextInit);
+  const response = pageContext.httpResponse;
+
+  return new Response(response?.getReadableWebStream(), {
+    status: response?.statusCode,
+    headers: response?.headers,
+  });
+}

package/dist/boilerplates/@batijs/shared-server/types/server/vike-handler.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="node" />
+export declare function vikeHandler<Context extends Record<string | number | symbol, unknown>>(request: Request, context?: Context): Promise<Response>;

package/dist/boilerplates/@batijs/telefunc/files/$package.json.js

@@ -57,6 +57,18 @@ var require_package = __commonJS({
         if: {
           flag: "telefunc"
         }
+      },
+      exports: {
+        "./server/telefunc-handler": {
+          types: "./dist/types/server/telefunc-handler.d.ts"
+        }
+      },
+      typesVersions: {
+        "*": {
+          "server/telefunc-handler": [
+            "./dist/types/server/telefunc-handler.d.ts"
+          ]
+        }
       }
     };
   }

package/dist/boilerplates/@batijs/telefunc/files/server/telefunc-handler.ts

@@ -0,0 +1,20 @@
+import { telefunc } from "telefunc";
+
+export async function telefuncHandler<Context extends Record<string | number | symbol, unknown>>(
+  request: Request,
+  context?: Context,
+): Promise<Response> {
+  const httpResponse = await telefunc({
+    url: request.url.toString(),
+    method: request.method,
+    body: await request.text(),
+    context,
+  });
+  const { body, statusCode, contentType } = httpResponse;
+  return new Response(body, {
+    status: statusCode,
+    headers: {
+      "content-type": contentType,
+    },
+  });
+}

package/dist/boilerplates/@batijs/telefunc/types/server/telefunc-handler.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="node" />
+export declare function telefuncHandler<Context extends Record<string | number | symbol, unknown>>(request: Request, context?: Context): Promise<Response>;

package/dist/boilerplates/boilerplates.json

@@ -10,6 +10,22 @@
       "files"
     ]
   },
+  {
+    "config": {
+      "if": {
+        "flag": {
+          "$in": [
+            "authjs",
+            "auth0"
+          ]
+        }
+      }
+    },
+    "folder": "@batijs/authjs",
+    "subfolders": [
+      "files"
+    ]
+  },
   {
     "config": {
       "if": {
@@ -259,6 +275,25 @@
       "files"
     ]
   },
+  {
+    "config": {
+      "if": {
+        "flag": {
+          "$in": [
+            "h3",
+            "hattip",
+            "hono",
+            "express",
+            "fastify"
+          ]
+        }
+      }
+    },
+    "folder": "@batijs/shared-server",
+    "subfolders": [
+      "files"
+    ]
+  },
   {
     "config": {
       "if": {

package/dist/index.js

@@ -1564,7 +1564,7 @@ var import_which_pm_runs = __toESM(require_which_pm_runs(), 1);
 // package.json
 var package_default = {
   name: "@batijs/cli",
-  version: "0.0.195",
+  version: "0.0.196",
   type: "module",
   scripts: {
     "check-types": "tsc --noEmit",
@@ -1630,9 +1630,6 @@ var rulesMessages = {
   [RulesMessage.ERROR_COMPILED_R_REACT]: error(
     `${inverse(bold("React"))} is required when using ${inverse(bold("Compiled"))}.`
   ),
-  [RulesMessage.ERROR_AUTH0_E_HONO]: error(
-    `${inverse(bold("Auth0"))} does not support running on ${inverse(bold("Hono"))} with official plugins. Check https://batijs.dev for details`
-  ),
   [RulesMessage.INFO_HATTIP]: info(`${inverse(bold("HatTip"))} is an experimental project`)
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.195",
+  "version": "0.0.196",
   "type": "module",
   "keywords": [],
   "description": "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want",
@@ -21,12 +21,12 @@
     "typescript": "^5.4.5",
     "vite": "^5.2.11",
     "which-pm-runs": "^1.1.0",
-    "@batijs/build": "0.0.195",
-    "@batijs/compile": "0.0.195"
+    "@batijs/build": "0.0.196",
+    "@batijs/compile": "0.0.196"
   },
   "dependencies": {
-    "@batijs/core": "0.0.195",
-    "@batijs/features": "0.0.195"
+    "@batijs/core": "0.0.196",
+    "@batijs/features": "0.0.196"
   },
   "bin": "./dist/index.js",
   "exports": {