@batijs/cli 0.0.175 → 0.0.177

package/dist/boilerplates/@batijs/auth0/files/$.env.js

@@ -0,0 +1,19 @@
+// files/$.env.ts
+import { appendToEnv, randomBytes } from "@batijs/core";
+async function getEnv(props) {
+  const auth0ClientId = process.env.TEST_AUTH0_CLIENT_ID;
+  const auth0BaseUrl = process.env.TEST_AUTH0_ISSUER_BASE_URL;
+  let envContent = await props.readfile?.();
+  envContent = appendToEnv(
+    envContent,
+    "SECRET",
+    randomBytes(32).toString("hex"),
+    "Randomly generated by Bati CLI, used by Auth0"
+  );
+  envContent = appendToEnv(envContent, "CLIENT_ID", auth0ClientId ?? "", "Auth0 Client ID");
+  envContent = appendToEnv(envContent, "ISSUER_BASE_URL", auth0BaseUrl ?? "", "Auth0 base URL");
+  return envContent;
+}
+export {
+  getEnv as default
+};

package/dist/boilerplates/@batijs/auth0/files/$README.md.js

@@ -0,0 +1,43 @@
+// files/$README.md.ts
+import { loadReadme } from "@batijs/core";
+async function getReadme(props) {
+  const content = await loadReadme(props);
+  const todo = `
+## *Auth0*
+- Sign up or login to an Auth0 account, then go to [your Dashboard](https://manage.auth0.com/dashboard/)
+- Create Application -> Regular Web Application 
+- What technology are you using for your project? -> Node.js (Express) -> Integrate Now
+- Configure Auth0:
+  - Allowed Callback URL: http://localhost:3000/api/auth/callback
+  - Allowed Logout URLs: http://localhost:3000
+- Save Changes
+- Copy your \`clientID\` and \`issuerBaseURL\` and paste it in \`.env\` file like this:
+
+\`\`\`env
+// .env
+SECRET=<random string>
+CLIENT_ID=<Client ID>
+ISSUER_BASE_URL=https://<your-auth0-domain>.<eu>.auth0.com
+\`\`\`
+
+> [!NOTE]
+> Environment variables that are automatically made available to Auth0 :
+> - \`SECRET\`
+> - \`ISSUER_BASE_URL\`
+> - \`BASE_URL\`
+> - \`CLIENT_ID\`
+> - \`CLIENT_SECRET\`
+
+> [!NOTE]
+> Login route is \`http://localhost:3000/api/auth/login\`.
+> Logout route is \`http://localhost:3000/api/auth/logout\`.
+
+- Read more [Auth0 Express SDK Quickstarts: Login](https://auth0.com/docs/quickstart/webapp/express)
+- Read more [Auth0 Express SDK Quickstarts: Add Login to your Express App](https://auth0.com/docs/quickstart/webapp/express/interactive)
+`;
+  content.addTodo(todo);
+  return content.finalize();
+}
+export {
+  getReadme as default
+};

package/dist/boilerplates/@batijs/auth0/files/vike.d.ts

@@ -0,0 +1,11 @@
+import type { RequestContext } from "express-openid-connect";
+
+declare global {
+  namespace Vike {
+    interface PageContext {
+      user?: RequestContext["user"] | null;
+    }
+  }
+}
+
+export {};

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

@@ -42,11 +42,11 @@ var require_package = __commonJS({
       license: "MIT",
       devDependencies: {
         "@batijs/compile": "workspace:*",
-        "@edgedb/generate": "^0.4.1",
+        "@edgedb/generate": "^0.5.2",
         "@prisma/client": "^5.12.1",
         "@types/node": "^18.19.14",
         colorette: "^2.0.20",
-        edgedb: "^1.4.1"
+        edgedb: "^1.5.0"
       },
       dependencies: {
         "@batijs/core": "workspace:*"

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

@@ -42,8 +42,8 @@ var require_package = __commonJS({
       },
       devDependencies: {
         "@batijs/compile": "workspace:^",
-        "@typescript-eslint/eslint-plugin": "^7.5.0",
-        "@typescript-eslint/parser": "^7.5.0",
+        "@typescript-eslint/eslint-plugin": "^7.6.0",
+        "@typescript-eslint/parser": "^7.6.0",
         eslint: "^8.57.0"
       },
       dependencies: {

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

@@ -41,7 +41,7 @@ var require_package = __commonJS({
       author: "",
       license: "MIT",
       devDependencies: {
-        "@auth/core": "^0.28.2",
+        "@auth/core": "^0.29.0",
         "@batijs/compile": "workspace:*",
         "@batijs/firebase-auth": "workspace:*",
         "@batijs/trpc": "workspace:*",
@@ -51,7 +51,9 @@ var require_package = __commonJS({
         "@types/express": "^4.17.21",
         "@types/node": "^18.19.14",
         "cookie-parser": "^1.4.6",
+        dotenv: "^16.4.5",
         express: "^4.19.2",
+        "express-openid-connect": "^2.17.1",
         "firebase-admin": "^12.0.0",
         telefunc: "^0.1.71",
         tsx: "^4.7.2",
@@ -109,7 +111,8 @@ async function getPackageJson(props) {
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
     devDependencies: [
       "@types/express",
-      ...props.meta.BATI.has("firebase-auth") ? ["@types/cookie-parser"] : []
+      ...props.meta.BATI.has("firebase-auth") ? ["@types/cookie-parser"] : [],
+      ...props.meta.BATI.has("auth0") ? ["dotenv"] : []
     ],
     dependencies: [
       "@hattip/adapter-node",
@@ -118,7 +121,8 @@ async function getPackageJson(props) {
       "vite",
       "vike",
       ...props.meta.BATI.has("authjs") ? ["@auth/core", "vike-authjs"] : [],
-      ...props.meta.BATI.has("firebase-auth") ? ["cookie-parser"] : []
+      ...props.meta.BATI.has("firebase-auth") ? ["cookie-parser"] : [],
+      ...props.meta.BATI.has("auth0") ? ["express-openid-connect"] : []
     ]
   });
 }

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

@@ -1,3 +1,5 @@
+// BATI.has("auth0")
+import "dotenv/config";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import CredentialsProvider from "@auth/core/providers/credentials";
@@ -7,6 +9,7 @@ import { createMiddleware } from "@hattip/adapter-node";
 import * as trpcExpress from "@trpc/server/adapters/express";
 import cookieParser from "cookie-parser";
 import express, { type Request } from "express";
+import { auth, type ConfigParams } from "express-openid-connect";
 import { getAuth } from "firebase-admin/auth";
 import { telefunc } from "telefunc";
 import { VikeAuth } from "vike-authjs";
@@ -16,6 +19,8 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const isProduction = process.env.NODE_ENV === "production";
 const root = __dirname;
+const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 3000;
+const hmrPort = process.env.HMR_PORT ? parseInt(process.env.HMR_PORT, 10) : 24678;
 
 startServer();
 
@@ -32,7 +37,7 @@ async function startServer() {
     const viteDevMiddleware = (
       await vite.createServer({
         root,
-        server: { middlewareMode: true },
+        server: { middlewareMode: true, hmr: { port: hmrPort } },
       })
     ).middlewares;
     app.use(viteDevMiddleware);
@@ -88,7 +93,7 @@ async function startServer() {
         const user = await auth.getUser(decodedIdToken.sub);
         req.user = user;
       } catch (error) {
-        console.error("verifySessionCookie:", error);
+        console.debug("verifySessionCookie:", error);
         req.user = null;
       }
 
@@ -123,6 +128,21 @@ async function startServer() {
     });
   }
 
+  if (BATI.has("auth0")) {
+    const config: ConfigParams = {
+      authRequired: false, // Controls whether authentication is required for all routes
+      auth0Logout: true, // Uses Auth0 logout feature
+      baseURL: process.env.BASE_URL?.startsWith("http") ? process.env.BASE_URL : `http://localhost:${port}`, // The URL where the application is served
+      routes: {
+        login: "/api/auth/login", // Custom login route, default is : "/login"
+        logout: "/api/auth/logout", // Custom logout route, default is : "/logout"
+        callback: "/api/auth/callback", // Custom callback route, default is "/callback"
+      },
+    };
+
+    app.use(auth(config));
+  }
+
   if (BATI.has("trpc")) {
     /**
      * tRPC route
@@ -177,24 +197,26 @@ async function startServer() {
    * @link {@see https://vike.dev}
    **/
   app.all("*", async (req: Request, res, next) => {
-    const pageContextInit = BATI.has("firebase-auth")
-      ? { urlOriginal: req.originalUrl, user: req.user }
-      : { urlOriginal: req.originalUrl };
+    const pageContextInit = BATI.has("auth0")
+      ? { urlOriginal: req.originalUrl, user: req.oidc.user }
+      : BATI.has("firebase-auth")
+        ? { urlOriginal: req.originalUrl, user: req.user }
+        : { urlOriginal: req.originalUrl };
 
     const pageContext = await renderPage(pageContextInit);
-    const { httpResponse } = pageContext
+    const { httpResponse } = pageContext;
 
     if (!httpResponse) {
-      return next()
+      return next();
     } else {
       const { statusCode, headers } = httpResponse;
-      headers.forEach(([name, value]) => res.setHeader(name, value))
-      res.status(statusCode)
+      headers.forEach(([name, value]) => res.setHeader(name, value));
+      res.status(statusCode);
       httpResponse.pipe(res);
     }
   });
 
-  app.listen(process.env.PORT ? parseInt(process.env.PORT) : 3000, () => {
-    console.log("Server listening on http://localhost:3000");
+  app.listen(port, () => {
+    console.log(`Server listening on http://localhost:${port}`);
   });
 }

package/dist/boilerplates/@batijs/express/files/vike.d.ts

@@ -0,0 +1,10 @@
+import type { UserRecord } from "firebase-admin/auth";
+
+//# BATI.has("firebase-auth")
+declare module "express" {
+  interface Request {
+    user?: UserRecord | null;
+  }
+}
+
+export {};

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

@@ -1 +1 @@
-export {};
+import "dotenv/config";

package/dist/boilerplates/@batijs/firebase-auth/files/$package.json.js

@@ -44,7 +44,7 @@ var require_package = __commonJS({
         "@batijs/compile": "workspace:*",
         "@types/node": "^18.19.14",
         dotenv: "^16.4.5",
-        firebase: "^10.10.0",
+        firebase: "^10.11.0",
         "firebase-admin": "^12.0.0",
         firebaseui: "^6.1.0",
         vike: "^0.4.168",
@@ -62,9 +62,6 @@ var require_package = __commonJS({
         }
       },
       exports: {
-        "./types": {
-          types: "./dist/types/types.d.ts"
-        },
         "./libs/firebaseAdmin": {
           types: "./dist/types/libs/firebaseAdmin.d.ts"
         },
@@ -83,9 +80,6 @@ var require_package = __commonJS({
       },
       typesVersions: {
         "*": {
-          types: [
-            "./dist/types/types.d.ts"
-          ],
           "libs/firebaseAdmin": [
             "./dist/types/libs/firebaseAdmin.d.ts"
           ],

package/dist/boilerplates/@batijs/firebase-auth/files/firebase/$service-account.json.js

@@ -0,0 +1,20 @@
+// files/firebase/$service-account.json.ts
+async function getPackageJson() {
+  const firebaseAccountStringified = process.env.TEST_FIREBASE_ACCOUNT;
+  return firebaseAccountStringified ? JSON.parse(firebaseAccountStringified) : {
+    type: "",
+    project_id: "",
+    private_key_id: "",
+    private_key: "",
+    client_email: "",
+    client_id: "",
+    auth_uri: "",
+    token_uri: "",
+    auth_provider_x509_cert_url: "",
+    client_x509_cert_url: "",
+    universe_domain: ""
+  };
+}
+export {
+  getPackageJson as default
+};

package/dist/boilerplates/@batijs/firebase-auth/files/pages/+firebaseApp.ts

@@ -2,7 +2,8 @@
 import { deleteApp, getApp, getApps, initializeApp, type FirebaseApp } from "firebase/app";
 import { getAuth, inMemoryPersistence } from "firebase/auth";
 
-// Your web app's Firebase configuration
+// TODO: Fill your web app's Firebase configuration
+// See https://firebase.google.com/docs/web/learn-more?hl=fr#config-object
 const firebaseConfig = {
   apiKey: "",
   authDomain: "",

package/dist/boilerplates/@batijs/firebase-auth/files/{types.ts → vike.d.ts}

@@ -2,14 +2,6 @@ import type { UserRecord } from "firebase-admin/auth";
 import type { FirebaseApp } from "firebase/app";
 
 declare global {
-  /*{ @if (it.BATI.has("express")) }*/
-  // eslint-disable-next-line
-  namespace Express {
-    interface Request {
-      user?: UserRecord | null;
-    }
-  }
-  /*{ /if }*/
   // eslint-disable-next-line
   namespace Vike {
     interface PageContext {
@@ -21,5 +13,4 @@ declare global {
   }
 }
 
-// Tell TypeScript that this file isn't an ambient module
 export {};

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

@@ -41,14 +41,18 @@ var require_package = __commonJS({
       author: "",
       license: "MIT",
       devDependencies: {
-        "@auth/core": "^0.28.2",
+        "@auth/core": "^0.29.0",
         "@batijs/compile": "workspace:*",
         "@batijs/firebase-auth": "workspace:*",
         "@batijs/trpc": "workspace:^",
         "@hattip/polyfills": "^0.0.45",
         "@trpc/server": "^10.45.2",
+        "@types/express": "^4.17.21",
         "@types/node": "^18.19.14",
         "@types/serve-static": "^1.15.7",
+        dotenv: "^16.4.5",
+        express: "^4.19.2",
+        "express-openid-connect": "^2.17.1",
         "firebase-admin": "^12.0.0",
         h3: "~1.11.1",
         "serve-static": "^1.15.0",
@@ -106,7 +110,10 @@ async function getPackageJson(props) {
     }
   });
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
-    devDependencies: ["@types/serve-static"],
+    devDependencies: [
+      "@types/serve-static",
+      ...props.meta.BATI.has("auth0") ? ["@types/express", "dotenv"] : []
+    ],
     dependencies: [
       "@hattip/polyfills",
       "h3",
@@ -114,7 +121,8 @@ async function getPackageJson(props) {
       "tsx",
       "vike",
       "vite",
-      ...props.meta.BATI.has("authjs") ? ["@auth/core", "vike-authjs"] : []
+      ...props.meta.BATI.has("authjs") ? ["@auth/core", "vike-authjs"] : [],
+      ...props.meta.BATI.has("auth0") ? ["express", "express-openid-connect"] : []
     ]
   });
 }

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

@@ -1,3 +1,5 @@
+// BATI.has("auth0")
+import "dotenv/config";
 import { createServer, type IncomingMessage, type ServerResponse } from "node:http";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -8,7 +10,9 @@ import installCrypto from "@hattip/polyfills/crypto";
 import installGetSetCookie from "@hattip/polyfills/get-set-cookie";
 import installWhatwgNodeFetch from "@hattip/polyfills/whatwg-node";
 import { nodeHTTPRequestHandler, type NodeHTTPCreateContextFnOptions } from "@trpc/server/adapters/node-http";
-import { getAuth, type UserRecord } from "firebase-admin/auth";
+import express from "express";
+import { auth, type ConfigParams } from "express-openid-connect";
+import { getAuth } from "firebase-admin/auth";
 import {
   createApp,
   createRouter,
@@ -38,14 +42,8 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const isProduction = process.env.NODE_ENV === "production";
 const root = __dirname;
-
-/*{ @if (it.BATI.has("firebase-auth")) }*/
-declare module "h3" {
-  interface H3EventContext {
-    user: UserRecord | null;
-  }
-}
-/*{ /if }*/
+const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 3000;
+const hmrPort = process.env.HMR_PORT ? parseInt(process.env.HMR_PORT, 10) : 24678;
 
 startServer();
 
@@ -62,7 +60,7 @@ async function startServer() {
     const viteDevMiddleware = (
       await vite.createServer({
         root,
-        server: { middlewareMode: true },
+        server: { middlewareMode: true, hmr: { port: hmrPort } },
       })
     ).middlewares;
     app.use(fromNodeMiddleware(viteDevMiddleware));
@@ -122,7 +120,7 @@ async function startServer() {
             const user = await auth.getUser(decodedIdToken.sub);
             event.context.user = user;
           } catch (error) {
-            console.error("verifySessionCookie:", error);
+            console.debug("verifySessionCookie:", error);
             event.context.user = null;
           }
         }
@@ -176,6 +174,23 @@ async function startServer() {
     );
   }
 
+  if (BATI.has("auth0")) {
+    const config: ConfigParams = {
+      authRequired: false, // Controls whether authentication is required for all routes
+      auth0Logout: true, // Uses Auth0 logout feature
+      baseURL: process.env.BASE_URL?.startsWith("http") ? process.env.BASE_URL : `http://localhost:${port}`, // The URL where the application is served
+      routes: {
+        login: "/api/auth/login", // Custom login route, default is "/login"
+        logout: "/api/auth/logout", // Custom logout route, default is "/logout"
+        callback: "/api/auth/callback", // Custom callback route, default is "/callback"
+      },
+    };
+
+    const expressApp = express();
+
+    app.use(fromNodeMiddleware(expressApp.use(auth(config))));
+  }
+
   if (BATI.has("trpc")) {
     /**
      * tRPC route
@@ -234,12 +249,18 @@ async function startServer() {
   router.use(
     "/**",
     eventHandler(async (event) => {
-      const pageContextInit = BATI.has("firebase-auth")
+      const pageContextInit = BATI.has("auth0")
         ? {
             urlOriginal: event.node.req.originalUrl || event.node.req.url!,
-            user: event.context.user,
+            user: event.node.req.oidc.user,
           }
-        : { urlOriginal: event.node.req.originalUrl || event.node.req.url! };
+        : BATI.has("firebase-auth")
+          ? {
+              urlOriginal: event.node.req.originalUrl || event.node.req.url!,
+              user: event.context.user,
+            }
+          : { urlOriginal: event.node.req.originalUrl || event.node.req.url! };
+
       const pageContext = await renderPage(pageContextInit);
       const response = pageContext.httpResponse;
 
@@ -252,9 +273,9 @@ async function startServer() {
 
   app.use(router);
 
-  const server = createServer(toNodeListener(app)).listen(process.env.PORT || 3000);
+  const server = createServer(toNodeListener(app)).listen(port);
 
   server.on("listening", () => {
-    console.log(`Server listening on http://localhost:${process.env.PORT || 3000}`);
+    console.log(`Server listening on http://localhost:${port}`);
   });
 }

package/dist/boilerplates/@batijs/h3/files/vike.d.ts

@@ -0,0 +1,22 @@
+import type { RequestContext, ResponseContext } from "express-openid-connect";
+import type { UserRecord } from "firebase-admin/auth";
+
+//# BATI.has("auth0")
+declare module "node:http" {
+  interface IncomingMessage {
+    oidc: RequestContext;
+  }
+
+  interface ServerResponse {
+    oidc: ResponseContext;
+  }
+}
+
+//# BATI.has("firebase-auth")
+declare module "h3" {
+  interface H3EventContext {
+    user: UserRecord | null;
+  }
+}
+
+export {};

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

@@ -1,6 +1 @@
-import { type UserRecord } from "firebase-admin/auth";
-declare module "h3" {
-    interface H3EventContext {
-        user: UserRecord | null;
-    }
-}
+import "dotenv/config";

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

@@ -41,7 +41,7 @@ var require_package = __commonJS({
       author: "",
       license: "MIT",
       devDependencies: {
-        "@auth/core": "^0.28.2",
+        "@auth/core": "^0.29.0",
         "@batijs/compile": "workspace:*",
         "@batijs/trpc": "workspace:^",
         "@hattip/adapter-node": "^0.0.45",

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

@@ -46,15 +46,15 @@ var require_package = __commonJS({
         "@babel/plugin-transform-react-jsx": "^7.23.4",
         "@batijs/compile": "workspace:*",
         "@types/node": "^18.19.14",
-        "@types/react": "^18.2.74",
-        "@types/react-dom": "^18.2.24",
+        "@types/react": "^18.2.78",
+        "@types/react-dom": "^18.2.25",
         "@vitejs/plugin-react": "^4.2.1",
         "cross-fetch": "^4.0.0",
         "eslint-plugin-react": "^7.34.1",
         react: "^18.2.0",
         "react-dom": "^18.2.0",
         tailwindcss: "^3.4.3",
-        typescript: "^5.4.4",
+        typescript: "^5.4.5",
         vike: "^0.4.168",
         "vike-react": "^0.4.6",
         vite: "^5.2.8"

package/dist/boilerplates/@batijs/react/files/pages/+config.ts

@@ -7,7 +7,7 @@ import Layout from "../layouts/LayoutDefault";
 export default {
   Layout,
   Head,
-  /*{ @if (it.BATI.has("firebase-auth")) }*/
+  /*{ @if (it.BATI.has("auth0") || it.BATI.has("firebase-auth")) }*/
   passToClient: ["user"],
   /*{ /if }*/
   // <title>

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

@@ -11,7 +11,7 @@
   "keywords": [],
   "author": "",
   "devDependencies": {
-    "typescript": "^5.4.4",
+    "typescript": "^5.4.5",
     "vike": "^0.4.168",
     "vite": "^5.2.8"
   },

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

@@ -47,7 +47,7 @@ var require_package = __commonJS({
         "eslint-plugin-solid": "^0.13.2",
         "solid-js": "^1.8.16",
         tailwindcss: "^3.4.3",
-        typescript: "^5.4.4",
+        typescript: "^5.4.5",
         vike: "^0.4.168",
         "vike-solid": "^0.4.3",
         vite: "^5.2.8",

package/dist/boilerplates/@batijs/solid/files/pages/+config.ts

@@ -8,7 +8,7 @@ export default {
   Layout,
   Head,
   // <title>
-  /*{ @if (it.BATI.has("firebase-auth")) }*/
+  /*{ @if (it.BATI.has("auth0") || it.BATI.has("firebase-auth")) }*/
   passToClient: ["user"],
   /*{ /if }*/
   title: "My Vike App",

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

@@ -47,10 +47,10 @@ var require_package = __commonJS({
         "@vue/compiler-sfc": "^3.4.21",
         "@vue/server-renderer": "^3.4.21",
         "cross-fetch": "^4.0.0",
-        "eslint-plugin-vue": "^9.24.1",
+        "eslint-plugin-vue": "^9.25.0",
         tailwindcss: "^3.4.3",
-        typescript: "^5.4.4",
-        "unplugin-vue-markdown": "^0.26.0",
+        typescript: "^5.4.5",
+        "unplugin-vue-markdown": "^0.26.1",
         vike: "^0.4.168",
         "vike-vue": "^0.6.3",
         vite: "^5.2.8",

package/dist/boilerplates/@batijs/vue/files/pages/+config.ts

@@ -8,7 +8,7 @@ export default {
   Layout,
   Head,
   // <title>
-  /*{ @if (it.BATI.has("firebase-auth")) }*/
+  /*{ @if (it.BATI.has("auth0") || it.BATI.has("firebase-auth")) }*/
   passToClient: ["user"],
   /*{ /if }*/
   title: "My Vike App",

package/dist/boilerplates/boilerplates.json

@@ -1,4 +1,15 @@
 [
+  {
+    "config": {
+      "if": {
+        "flag": "auth0"
+      }
+    },
+    "folder": "@batijs/auth0",
+    "subfolders": [
+      "files"
+    ]
+  },
   {
     "config": {
       "if": {

package/dist/index.js

@@ -457,9 +457,40 @@ async function runMain(cmd, opts = {}) {
 
 // ../build/dist/index.js
 import { existsSync } from "fs";
-import { mkdir, opendir, readFile, writeFile } from "fs/promises";
+import { mkdir, opendir, readFile as readFile2, writeFile } from "fs/promises";
 import path from "path";
-import { transformAndFormat } from "@batijs/core";
+import { transformAndFormat as transformAndFormat2 } from "@batijs/core";
+import { readFile } from "fs/promises";
+import { parseModule, transformAndFormat } from "@batijs/core";
+async function mergeDts({
+  target,
+  fileContent,
+  filepath,
+  meta
+}) {
+  const previousCode = await readFile(target, { encoding: "utf-8" });
+  const previousAst = parseModule(previousCode);
+  const currentAst = parseModule(fileContent);
+  for (const imp of previousAst.imports.$items) {
+    currentAst.imports[imp.local] = imp;
+  }
+  const index = currentAst.$ast.body.findIndex(
+    (node) => node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration"
+  );
+  for (const node of previousAst.$ast.body) {
+    if (node.type === "ImportDeclaration" || node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration") {
+      continue;
+    }
+    if (index === -1) {
+      currentAst.$ast.body.push(node);
+    } else {
+      currentAst.$ast.body.splice(index, 0, node);
+    }
+  }
+  return transformAndFormat(currentAst.generate().code, meta, {
+    filepath
+  });
+}
 function queue() {
   const tasks = [];
   return {
@@ -535,7 +566,7 @@ async function importTransformer(p) {
 async function main(options, meta) {
   const sources = Array.isArray(options.source) ? options.source : [options.source];
   const targets = /* @__PURE__ */ new Set();
-  const simpleCopyQ = queue();
+  const priorityQ = queue();
   const transformAndWriteQ = queue();
   for (const source of sources) {
     for await (const p of walk(source)) {
@@ -546,13 +577,13 @@ async function main(options, meta) {
       } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.tsx?$/)) {
         throw new Error(
           `Typescript file needs to be compiled before it can be executed: '${p}'.
-Please report this issue to https://github.com/magne4000/bati`
+Please report this issue to https://github.com/batijs/bati`
         );
       } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.jsx?$/)) {
         transformAndWriteQ.add(async () => {
           const transformer = await importTransformer(p);
           const rf = () => {
-            return readFile(target, { encoding: "utf-8" });
+            return readFile2(target, { encoding: "utf-8" });
           };
           const fileContent = transformFileAfterExec(
             target,
@@ -569,27 +600,36 @@ Please report this issue to https://github.com/magne4000/bati`
           }
         });
       } else {
-        transformAndWriteQ.add(async () => {
-          const code = await readFile(p, { encoding: "utf-8" });
-          const fileContent = await transformAndFormat(code, meta, {
-            filepath: path.relative(source, p)
+        priorityQ.add(async () => {
+          const code = await readFile2(p, { encoding: "utf-8" });
+          const filepath = path.relative(source, p);
+          let fileContent = await transformAndFormat2(code, meta, {
+            filepath
           });
+          if (p.endsWith(".d.ts") && targets.has(target)) {
+            fileContent = await mergeDts({
+              fileContent,
+              target,
+              meta,
+              filepath
+            });
+          }
           if (fileContent) {
-            await safeWriteFile(target, fileContent);
+            await safeWriteFile(target, fileContent.trimStart());
             targets.add(target);
           }
         });
       }
     }
   }
-  await simpleCopyQ.run();
+  await priorityQ.run();
   await transformAndWriteQ.run();
 }
 
 // package.json
 var package_default = {
   name: "@batijs/cli",
-  version: "0.0.175",
+  version: "0.0.177",
   type: "module",
   scripts: {
     "check-types": "tsc --noEmit",
@@ -612,9 +652,9 @@ var package_default = {
     esbuild: "^0.20.2",
     execa: "^8.0.1",
     rimraf: "^5.0.5",
-    sift: "^17.1.0",
+    sift: "^17.1.2",
     tsup: "^8.0.2",
-    typescript: "^5.4.4",
+    typescript: "^5.4.5",
     vite: "^5.2.8"
   },
   dependencies: {
@@ -637,7 +677,7 @@ import { execRules } from "@batijs/features/rules";
 import { existsSync as existsSync2 } from "fs";
 import { fileURLToPath } from "url";
 import { dirname, join, parse } from "path";
-import { access, constants, lstat, readdir, readFile as readFile2 } from "fs/promises";
+import { access, constants, lstat, readdir, readFile as readFile3 } from "fs/promises";
 
 // ../../node_modules/.pnpm/colorette@2.0.20/node_modules/colorette/index.js
 import * as tty from "tty";
@@ -780,7 +820,7 @@ var rulesMessages = {
   [RulesMessage.INFO_HATTIP]: info(`${inverse(bold("HatTip"))} is an experimental project`)
 };
 
-// ../../node_modules/.pnpm/sift@17.1.0/node_modules/sift/es5m/index.js
+// ../../node_modules/.pnpm/sift@17.1.2/node_modules/sift/es5m/index.js
 var extendStatics = function(d, b) {
   extendStatics = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
     d2.__proto__ = b2;
@@ -825,6 +865,9 @@ var coercePotentiallyNull = function(value) {
 var isArray = typeChecker("Array");
 var isObject = typeChecker("Object");
 var isFunction = typeChecker("Function");
+var isProperty = function(item, key) {
+  return item.hasOwnProperty(key) && !isFunction(item[key]);
+};
 var isVanillaObject = function(value) {
   return value && (value.constructor === Object || value.constructor === Array || value.constructor.toString() === "function Object() { [native code] }" || value.constructor.toString() === "function Array() { [native code] }") && !value.toJSON;
 };
@@ -861,7 +904,7 @@ var equals = function(a, b) {
 };
 var walkKeyPathValues = function(item, keyPath, next, depth, key, owner) {
   var currentKey = keyPath[depth];
-  if (isArray(item) && isNaN(Number(currentKey))) {
+  if (isArray(item) && isNaN(Number(currentKey)) && !isProperty(item, currentKey)) {
     for (var i = 0, length_1 = item.length; i < length_1; i++) {
       if (!walkKeyPathValues(item[i], keyPath, next, depth, i, item)) {
         return false;
@@ -1042,7 +1085,7 @@ var createNamedOperation = function(name, params, parentQuery, options) {
   return operationCreator(params, parentQuery, options, name);
 };
 var throwUnsupportedOperation = function(name) {
-  throw new Error("Unsupported operation: " + name);
+  throw new Error("Unsupported operation: ".concat(name));
 };
 var containsOperation = function(query, options) {
   for (var key in query) {
@@ -1095,7 +1138,7 @@ var createQueryOperations = function(query, parentKey, options) {
       var op = createNamedOperation(key, query[key], query, options);
       if (op) {
         if (!op.propop && parentKey && !options.operations[parentKey]) {
-          throw new Error("Malformed query. " + key + " cannot be matched against property.");
+          throw new Error("Malformed query. ".concat(key, " cannot be matched against property."));
         }
       }
       if (op != null) {
@@ -1297,7 +1340,7 @@ var $In = (
       var params = Array.isArray(this.params) ? this.params : [this.params];
       this._testers = params.map(function(value) {
         if (containsOperation(value, _this.options)) {
-          throw new Error("cannot nest $ under " + _this.name.toLowerCase());
+          throw new Error("cannot nest $ under ".concat(_this.name.toLowerCase()));
         }
         return createTester(value, _this.options.compare);
       });
@@ -1522,26 +1565,26 @@ var $where = function(params, ownerQuery, options) {
 var defaultOperations = /* @__PURE__ */ Object.freeze({
   __proto__: null,
   $Size,
-  $eq,
-  $ne,
-  $or,
-  $nor,
+  $all,
+  $and,
   $elemMatch,
-  $nin,
+  $eq,
+  $exists,
+  $gt,
+  $gte,
   $in,
   $lt,
   $lte,
-  $gt,
-  $gte,
   $mod,
-  $exists,
-  $regex,
+  $ne,
+  $nin,
+  $nor,
   $not,
-  $type,
-  $and,
-  $all,
-  $size,
   $options,
+  $or,
+  $regex,
+  $size,
+  $type,
   $where
 });
 var createDefaultQueryOperation = function(query, ownerQuery, _a) {
@@ -1572,7 +1615,7 @@ function boilerplatesDir() {
   throw new Error("Missing boilerplates.json file. Run `pnpm run build`");
 }
 async function parseBoilerplates(dir) {
-  return JSON.parse(await readFile2(join(dir, "boilerplates.json"), "utf-8"));
+  return JSON.parse(await readFile3(join(dir, "boilerplates.json"), "utf-8"));
 }
 function toArg(flag, description) {
   if (!flag)
@@ -1799,21 +1842,3 @@ run().then(() => {
 export {
   yn as default
 };
-/*! Bundled license information:
-
-sift/es5m/index.js:
-  (*! *****************************************************************************
-  Copyright (c) Microsoft Corporation.
-  
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted.
-  
-  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  PERFORMANCE OF THIS SOFTWARE.
-  ***************************************************************************** *)
-*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.175",
+  "version": "0.0.177",
   "type": "module",
   "keywords": [],
   "description": "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want",
@@ -15,16 +15,16 @@
     "esbuild": "^0.20.2",
     "execa": "^8.0.1",
     "rimraf": "^5.0.5",
-    "sift": "^17.1.0",
+    "sift": "^17.1.2",
     "tsup": "^8.0.2",
-    "typescript": "^5.4.4",
+    "typescript": "^5.4.5",
     "vite": "^5.2.8",
-    "@batijs/build": "0.0.175",
-    "@batijs/compile": "0.0.175"
+    "@batijs/build": "0.0.177",
+    "@batijs/compile": "0.0.177"
   },
   "dependencies": {
-    "@batijs/core": "0.0.175",
-    "@batijs/features": "0.0.175"
+    "@batijs/core": "0.0.177",
+    "@batijs/features": "0.0.177"
   },
   "bin": "./dist/index.js",
   "exports": {

package/dist/boilerplates/@batijs/firebase-auth/files/firebase/service-account-example.json

@@ -1,13 +0,0 @@
-{
-  "type": "",
-  "project_id": "",
-  "private_key_id": "",
-  "private_key": "",
-  "client_email": "",
-  "client_id": "",
-  "auth_uri": "",
-  "token_uri": "",
-  "auth_provider_x509_cert_url": "",
-  "client_x509_cert_url": "",
-  "universe_domain": ""
-}

package/dist/boilerplates/@batijs/firebase-auth/types/types.d.ts

@@ -1,18 +0,0 @@
-import type { UserRecord } from "firebase-admin/auth";
-import type { FirebaseApp } from "firebase/app";
-declare global {
-    namespace Express {
-        interface Request {
-            user?: UserRecord | null;
-        }
-    }
-    namespace Vike {
-        interface PageContext {
-            user?: UserRecord | null;
-        }
-        interface Config {
-            firebaseApp?: FirebaseApp;
-        }
-    }
-}
-export {};