jcc-express-mvc 1.9.4 → 1.9.5

package/final-documentation/Digging Deeper/Helpers.md

@@ -21,21 +21,22 @@ These helpers are available during request handling and in `tinker` (with contai
 
 ## HTTP context helpers
 
-- `request()` -> current `AppRequest`
-- `response()` -> current `AppResponse`
-- `next()` -> current `next` function
+- `request()` -> current `AppRequest` (returns `{}` outside an HTTP request)
+- `response()` -> current `AppResponse` (returns `{}` outside an HTTP request)
 - `view(view, options?, callback?)`
 - `inertia(component, props?, option?)`
 - `redirect(url, status?)`
 - `back(url?)`
 
-These depend on per-request container bindings, so they are request-lifecycle helpers.
+These depend on per-request container bindings, so they are request-lifecycle helpers. `request()` and `response()` are safe to call from code that may run outside middleware (for example pagination link builders) — they return an empty object when no request is bound.
+
+`next()` is **not** exposed as a global helper. Use the `next` argument in middleware and route handlers directly.
 
 ---
 
 ## Auth and authorization helpers
 
-- `auth()` -> current request user
+- `auth()` -> `Authentication` class (`Auth.attempt`, `Auth.apiAttempt`, `Auth.logout`, etc.)
 - `Gate` -> `GateFacade`
 - `can(user, ability, model?, ...args)`
 - `authorize(user, ability, ...args)`
@@ -98,8 +99,8 @@ Global helper types are declared in `jcc-express-mvc/global.d.ts`, so TypeScript
 
 ## Notes
 
-- `auth` is assigned twice inside `globalHelpers`; the later assignment returns `request().user`.
-- Helpers that rely on request bindings (`request`, `response`, `next`, `validate`, etc.) are not meaningful before HTTP middleware bootstraps those bindings.
+- Helpers that rely on request bindings (`request`, `response`, `validate`, `session`, etc.) are not meaningful before HTTP middleware bootstraps those bindings.
+- `request()` and `response()` catch missing bindings and return `{}` instead of throwing.
 
 ---
 

package/final-documentation/Digging Deeper/Monitor.md

@@ -157,8 +157,14 @@ export const monitor: Partial<MonitorConfig> = {
     },
     system: { enabled: true, intervalMs: 15_000 },
     errors: { enabled: true },
-    database: { enabled: false, slowQueryMs: 200 },
-    queue: { enabled: false },
+    database: { enabled: true, slowQueryMs: 200 },
+    queue: { enabled: true },
+    commands: { enabled: true },
+    schedule: { enabled: true },
+    mail: { enabled: true },
+    cache: { enabled: true },
+    outgoing: { enabled: true },
+    logs: { enabled: true },
   },
 
   exporters: {
@@ -187,6 +193,22 @@ export const monitor: Partial<MonitorConfig> = {
     recentErrors: 100,
     recentJobs: 100,
     recentQueries: 100,
+    recentCommands: 100,
+    recentScheduledTasks: 100,
+    recentNotifications: 100,
+    recentMail: 100,
+    recentCacheOps: 100,
+    recentOutgoingRequests: 100,
+    recentLogs: 100,
+  },
+
+  storage: {
+    driver: config.get("MONITOR_STORAGE", "memory") as
+      | "memory"
+      | "file"
+      | "redis"
+      | "database",
+    file: { path: config.get("MONITOR_STORAGE_PATH", "storage/monitor") },
   },
 
   alerts: {
@@ -258,13 +280,14 @@ The `/_monitor` path is excluded from request metric collection so the dashboard
 | --------------- | ------------------------------------------------------------------- |
 | Requests        | Auto — `MonitorMiddleware` records every request                    |
 | Exceptions      | Auto — `ErrorCollector` + `MonitorErrorMiddleware`                  |
-| Queries         | Manual — call `Monitor.recordQuery({ ... })` from your ORM hook     |
-| Jobs            | Manual — call `Monitor.recordJob({ ... })` or hook `Queue.events`   |
+| Queries         | Auto when `collectors.database.enabled` — ORM query hooks           |
+| Jobs            | Auto when `collectors.queue.enabled` — `Queue` records job events   |
+| Commands        | Auto when `collectors.commands.enabled` — console kernel records runs |
+| Scheduled Tasks | Auto when `collectors.schedule.enabled` — scheduler records runs    |
 | Mail            | Auto when `collectors.mail.enabled` — wraps the `Mail` facade       |
 | Cache           | Auto when `collectors.cache.enabled` — wraps `Cache.get/put/forget` |
-| Outgoing        | Auto when `collectors.outgoing.enabled` — patches global `fetch`    |
-| Commands        | Manual — `Monitor.recordCommand({ ... })` from your console kernel  |
-| Scheduled Tasks | Manual — `Monitor.recordScheduledTask({ ... })` from the runner     |
+| Outgoing        | Auto when `collectors.outgoing.enabled` — axios + `fetch` patch     |
+| Logs            | Auto when `collectors.logs.enabled` — framework logger integration  |
 | Notifications   | Manual — `Monitor.recordNotification({ ... })` after dispatch       |
 
 ---

package/final-documentation/Getting-Started/Frontend.md

@@ -156,11 +156,20 @@ Vite is the default bundler: fast builds and Hot Module Replacement (HMR) during
 
 For Blade tags, `public/hot`, manifest resolution, and troubleshooting, see [Asset-bundling.md](../The Basics/Asset-bundling.md).
 
-Local workflow — start the asset server before the HTTP server:
+Local workflow — use two terminals:
 
 ```bash
-bun run watch   # or: npm run watch  → runs Vite
-bun run dev     # or: npm run dev     → runs the Express app
+# Terminal 1 — backend (recommended: Laravel-style watcher)
+bun artisanNode serve
+
+# Terminal 2 — Vite assets (writes public/hot)
+bun run watch   # or: npm run watch
+```
+
+Alternative backend command:
+
+```bash
+bun run dev     # or: npm run dev  → bun --watch server.ts (simpler, no serve watcher)
 ```
 
 Production-style build:

package/final-documentation/Getting-Started/Installation.md

@@ -224,6 +224,14 @@ This starts Vite in watch mode (React/Vue, Tailwind, hot reload, etc.). Let it k
 
 In a second terminal, from the same project root:
 
+```bash
+bun artisanNode serve
+```
+
+This is the recommended dev server: it watches backend files, reloads silently, keeps the same port, and reacts to `public/hot` when Vite starts.
+
+Alternative (simpler, without the Laravel-style watcher):
+
 ```bash
 bun run dev
 ```
@@ -234,7 +242,7 @@ or:
 npm run dev
 ```
 
-This usually runs `bun --watch server.ts` (when using Bun) or the `dev` script from `package.json`, which boots Express and your bootstrap pipeline.
+This runs `bun --watch server.ts`, which boots Express and your bootstrap pipeline with Bun's built-in file watcher.
 
 ### 7.3 Open the app
 
@@ -267,7 +275,7 @@ Use `bun artisanNode list` or `bun artisanNode help [command]` to see commands (
 - [ ] `.env` exists and is filled in for your machine (starter projects already have the file; cloned repos may need `cp .env.example .env`)
 - [ ] `bun artisanNode key:generate` has set `JWT_SECRET` (required for JWT auth)
 - [ ] `bun artisanNode migrate` completed (or you intentionally skip DB for now)
-- [ ] `watch` then `dev` both run without crashing (`bun run` / `npm run` as you prefer)
+- [ ] `watch` then `serve` (or `dev`) both run without crashing (`bun run` / `npm run` as you prefer)
 - [ ] Browser loads `http://localhost:<PORT>`
 
 ---
@@ -287,7 +295,7 @@ Use `bun artisanNode list` or `bun artisanNode help [command]` to see commands (
 
 - [Configuration.md](./Configuration.md) — `.env`, `app/Config`, and how values are loaded at runtime
 - [Directory-structure.md](./Directory-structure.md) — Project folders and what each is for
-- [Frontend.md](./Frontend.md) — Why `watch` runs before `dev` (Vite + Inertia)
+- [Frontend.md](./Frontend.md) — Why `watch` runs alongside `serve` (Vite + Inertia)
 - [Deployment.md](./Deployment.md) — Production `.env`, builds, migrations, and process management
 - `docs/docs-for-dev.md` — broad framework guide (routing, Eloquent, validation, queues, etc.)
 - `docs/getting-started.md` — shorter orientation

package/final-documentation/JCC-Eloquent/Defining-Model.md

@@ -279,7 +279,7 @@ Route.middleware(["apiAuth"]).get("/me", async (req) => {
 If `hasToken` is not enabled on the model:
 
 ```text
-ModelTokenError: User Missing required token. Please set 'protected hasToken = true' .
+ModelTokenError: User Model Missing required token. Please set 'protected hasToken = true' .
 ```
 
 The global error handler returns `500` with the error message for `ModelTokenError`.

package/final-documentation/JCC-Eloquent/JCC-Eloquent-Introduction.md

@@ -111,7 +111,7 @@ export class User extends Model {
 Model-level pagination helper exists:
 
 ```typescript
-const page = await User.paginate(req, 15);
+const page = await User.paginate(15);
 ```
 
 This returns `data` plus pagination metadata/links.

package/final-documentation/JCC-Eloquent/Pagination.md

@@ -4,16 +4,18 @@
 
 JCC-Eloquent provides pagination at both model and builder level.
 
-Both methods read `request.query.page` and return `data` + pagination metadata.
+Pagination reads the current HTTP request via the global `request()` helper — you do **not** pass `req` as the first argument. Page number comes from `request().query.page` (default `1`). Link URLs use `request().protocol`, host, and path.
+
+Both methods return `data` + pagination metadata.
 
 ---
 
 ## Model pagination
 
-`Model.paginate(request, perPage?)`:
+`Model.paginate(perPage?, page?)`:
 
 ```typescript
-const paginatedUsers = await User.paginate(req, 15);
+const paginatedUsers = await User.paginate(15);
 ```
 
 This returns:
@@ -31,7 +33,7 @@ Builder pagination works on filtered queries:
 ```typescript
 const page = await User.where("active", true)
   .orderBy("created_at", "desc")
-  .paginate(req, 20);
+  .paginate(20);
 ```
 
 Use this when pagination must respect custom constraints.
@@ -43,7 +45,7 @@ Use this when pagination must respect custom constraints.
 `simplePaginate` uses offset pagination without running a `COUNT(*)` query — faster for large tables when you don't need a total count:
 
 ```typescript
-const page = await User.where("active", true).simplePaginate(req, 15);
+const page = await User.where("active", true).simplePaginate(15);
 ```
 
 Response shape:
@@ -70,7 +72,7 @@ No `total` or `total_pages` — just whether there is a next page.
 `cursorPaginate` implements keyset (cursor-based) pagination — stable and O(1) for any page depth, regardless of table size:
 
 ```typescript
-const page = await User.orderBy("id").cursorPaginate(req, 20);
+const page = await User.orderBy("id").cursorPaginate(20);
 ```
 
 Response shape:
@@ -112,7 +114,7 @@ Pass the next page by forwarding `?cursor=<token>` from `meta.next_cursor`.
 For full manual control:
 
 ```typescript
-const currentPage = Number(req.query.page || 1);
+const currentPage = Number(request().query?.page || 1);
 const perPage = 20;
 const offset = (currentPage - 1) * perPage;
 
@@ -131,7 +133,8 @@ const rows = await User.orderBy("id", "desc").offset(offset).limit(perPage).get(
 
 ## Summary
 
-- Use `paginate(req, perPage)` for standard pagination with total counts and page links.
-- Use `simplePaginate(req, perPage)` for large tables where you don't need a total count.
-- Use `cursorPaginate(req, perPage)` for high-performance, stable pagination on large or frequently-updated tables.
+- Use `paginate(perPage)` for standard pagination with total counts and page links.
+- Use `simplePaginate(perPage)` for large tables where you don't need a total count.
+- Use `cursorPaginate(perPage)` for high-performance, stable pagination on large or frequently-updated tables.
+- Pagination uses the global `request()` helper for page number and link generation — call it inside a route handler or middleware context.
 - Use `offset` + `limit` only for fully custom paging flows.

package/final-documentation/JCC-Eloquent/Query-Builder.md

@@ -258,7 +258,7 @@ await User.where("id", 1).updateJson("preferences.notifications.email", false);
 For large datasets where `COUNT(*)` is too slow, use cursor-based (keyset) pagination:
 
 ```typescript
-const page = await User.orderBy("id").cursorPaginate(req, 20);
+const page = await User.orderBy("id").cursorPaginate(20);
 ```
 
 Response shape:
@@ -291,7 +291,7 @@ Pass the next page by forwarding `?cursor=<token>` from `meta.next_cursor`.
 Offset pagination without a `COUNT(*)` query — faster for large tables:
 
 ```typescript
-const page = await User.where("active", true).simplePaginate(req, 15);
+const page = await User.where("active", true).simplePaginate(15);
 ```
 
 Response:

package/final-documentation/Security/Authentication.md

@@ -101,9 +101,43 @@ Route.middleware(["loginThrottle"]).post("/auth/login", async (req, res, next) =
 Route.middleware(["auth"]).get("/home", homeHandler);
 ```
 
-### API token login (model `createToken`)
+### API token login (`apiAttempt`)
 
-For stateless API clients, issue a bearer token from a model instance instead of cookie login:
+For stateless API clients, use `auth().apiAttempt()` to validate credentials and issue a bearer token in one step:
+
+```typescript
+Route.post("/api/login", async () => {
+  const result = await auth().apiAttempt({ field: "email", table: "User" });
+
+  if (!result.success) {
+    return response().status(401).json({ message: result.message });
+  }
+
+  return {
+    token: result.token,
+    user: result.user,
+  };
+});
+
+Route.middleware(["apiAuth"]).get("/api/me", async (req) => {
+  return { user: req.user };
+});
+```
+
+`apiAttempt` options:
+
+| Field | Default | Description |
+|---|---|---|
+| `field` | `"email"` | Request input key to match (`email`, `phone`, `username`, etc.) |
+| `table` | `"User"` | Model name resolved via `getModel()` |
+
+The request body must include the credential field and `password`. On success, returns `{ success: true, token, user, message }`. On failure, returns `{ success: false, token: null, user: null, message: "Invalid credentials" }`.
+
+The model must have `protected hasToken = true`. User lookup and password verification are shared with session login via `findUserForAuth()`.
+
+### Manual token login (`createToken`)
+
+You can also issue a token manually after your own credential check:
 
 ```typescript
 import { User } from "@/Model/User";
@@ -120,13 +154,13 @@ Route.middleware(["apiAuth"]).get("/api/me", async (req) => {
 });
 ```
 
-The model must have `protected hasToken = true`. Full details: [Defining-Model.md](../JCC-Eloquent/Defining-Model.md#api-tokens-createtoken).
+Full `createToken` details: [Defining-Model.md](../JCC-Eloquent/Defining-Model.md#api-tokens-createtoken).
 
 ---
 
 ## Summary
 
 - Authentication uses JWT cookies with rotating refresh tokens.
-- Use `Auth.attempt(next)` for login, `auth`/`apiAuth` middleware for protection.
-- For API bearer tokens, enable `hasToken` on the model and call `createToken()` — `apiAuth` reloads the user from JWT claims.
+- Use `Auth.attempt(next)` for cookie login, `auth().apiAttempt()` for API email/password + bearer token, and `auth`/`apiAuth` middleware for protection.
+- For manual API tokens, enable `hasToken` on the model and call `createToken()` — `apiAuth` reloads the user from JWT claims.
 - `Auth.logout()` clears auth state and redirects to login.

package/final-documentation/The Basics/Artisan-Node.md

@@ -60,12 +60,29 @@ bun artisanNode db:wipe
 ## Dev server
 
 ```bash
-bun artisanNode serve              # start the dev server with a file watcher (entry: server.ts)
+bun artisanNode serve              # Laravel-style dev server with file watcher (entry: server.ts)
 bun artisanNode serve app.ts       # use a different entry file
 bun artisanNode watch              # alias of `serve`
 ```
 
-`serve` (alias `watch`) boots the app under a file watcher and restarts on change — the same thing `npm run dev` runs. It takes an optional entry file argument (defaults to `server.ts`).
+`serve` (alias `watch`) is the recommended backend dev command. It:
+
+- watches backend paths (`app/`, `route/`, `jcc-express-mvc/`, `resources/views/`, etc.)
+- reloads **silently** on code changes (no terminal clear, no restart banner)
+- keeps the same `PORT` from `.env` across restarts
+- watches `public/hot` so the backend picks up Vite when the dev asset server starts
+
+Run Vite separately for frontend assets:
+
+```bash
+# Terminal 1 — backend (file watcher + Express)
+bun artisanNode serve
+
+# Terminal 2 — frontend (Vite HMR, writes public/hot)
+npm run watch
+```
+
+`npm run dev` (`bun --watch server.ts`) is a simpler alternative without the Laravel-style watcher. Prefer `bun artisanNode serve` when you want silent reloads, stable ports, and `public/hot` integration.
 
 ---
 

package/final-documentation/The Basics/Asset-bundling.md

@@ -15,11 +15,12 @@ For Inertia, SSR, and the HTTP kernel’s `inertia()` middleware, see `Getting-S
 Typical `package.json` scripts:
 
 - `watch` — Runs `vite` (dev server, HMR, writes `public/hot`).
-- `dev` — Runs the Node/Bun HTTP app (`server.ts`); use alongside `watch` during local UI work.
+- `dev` — Runs `bun --watch server.ts` (simple backend reload; no Laravel-style watcher).
+- `serve` — Run via `bun artisanNode serve` (recommended backend dev server; see `Artisan-Node.md`).
 - `vite-build` — `vite build` plus `vite build --ssr` when you ship SSR (adjust to your app).
 - `build` — TypeScript compile (`tsc`) for the server codebase; not a substitute for `vite-build`.
 
-Start Vite before hitting pages that use `@vite`, or the template layer will not resolve the dev server URL.
+Start Vite before hitting pages that use `@vite`, or refresh after `public/hot` appears. The template layer reads `public/hot` on each request in development.
 
 ---
 
@@ -41,13 +42,13 @@ Add or change `input` when you create new entrypoints. Tailwind and React (or Vu
 
 ## `public/hot` and the dev server
 
-In non-production, `EngineHelpers` reads `public/hot` (first line is the Vite origin, e.g. `http://127.0.0.1:5173`). That value becomes `viteHost` for:
+In non-production, `EngineHelpers` reads `public/hot` on **each render** (first line is the Vite origin, e.g. `http://127.0.0.1:5173`). That value becomes `viteHost` for:
 
 - Module `<script>` tags pointing at your entries.
 - Optional link to the CSS entry when you pass more than one resource in `@vite` (first entry is treated as CSS in dev in that case).
 - Injection of `/@vite/client` for HMR.
 
-If `hot` is missing, tags may point at an empty base—run `npm run watch` / `bun run watch`.
+If `hot` is missing, tags may point at an empty base — run `npm run watch` / `bun run watch`. After Vite creates `public/hot`, refresh the page (or use `bun artisanNode serve`, which watches `public/hot` and reloads the backend when Vite starts).
 
 ---
 

package/lib/Auth/index.d.ts

@@ -1,5 +1,6 @@
 import { AppRequest, AppResponse, AppNext } from "../Interface";
 import { type IRefreshTokenStore } from "./refreshTokenStore";
+import { ApiAuthResponse, ApiAuthType } from "./type";
 export declare class Authentication {
     private static refreshStore;
     /** Use a shared store (e.g. Redis) when running multiple app instances. */
@@ -12,6 +13,7 @@ export declare class Authentication {
     private static setTokens;
     /** Handle user login attempt */
     static attempt(next: AppNext, redirect?: string): Promise<void>;
+    static apiAttempt(data: ApiAuthType): Promise<ApiAuthResponse>;
     /**
      * After the user is resolved (e.g. OAuth via Socialite), issue JWT cookies
      * and redirect or JSON response like {@link Authentication.attempt}.

package/lib/Auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAgBhE,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,qBAAqB,CAAC;AAsB7B,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAC,YAAY,CAAgD;IAE3E,2EAA2E;IAC3E,MAAM,CAAC,oBAAoB,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAI5D,qDAAqD;IACrD,OAAO,CAAC,MAAM,CAAC,cAAc;IAc7B,0DAA0D;mBACrC,OAAO;IAqB5B,wFAAwF;IACxF,OAAO,CAAC,MAAM,CAAC,SAAS;IA0BxB,gCAAgC;WACnB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,GAAE,MAAgB;IA2B9D;;;OAGG;WACU,aAAa,CACxB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,QAAQ,GAAE,MAAgB,GACzB,OAAO,CAAC,IAAI,CAAC;IA4BhB,+BAA+B;WAClB,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;IAsC1E,qBAAqB;IACrB,MAAM,CAAC,MAAM;IAsBb,4FAA4F;IAC5F,MAAM,CAAC,KAAK,IAAI,OAAO;IAWvB,MAAM,CAAC,IAAI;IAIX,MAAM,CAAC,EAAE;WAII,WAAW,CACtB,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,QAAQ,GAAE,MAAgB;CAI7B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAkBhE,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAsBtD,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAC,YAAY,CAAgD;IAE3E,2EAA2E;IAC3E,MAAM,CAAC,oBAAoB,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAI5D,qDAAqD;IACrD,OAAO,CAAC,MAAM,CAAC,cAAc;IAc7B,0DAA0D;mBACrC,OAAO;IAS5B,wFAAwF;IACxF,OAAO,CAAC,MAAM,CAAC,SAAS;IA0BxB,gCAAgC;WACnB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,GAAE,MAAgB;WA2BjD,UAAU,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC;IAwBpE;;;OAGG;WACU,aAAa,CACxB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,QAAQ,GAAE,MAAgB,GACzB,OAAO,CAAC,IAAI,CAAC;IA4BhB,+BAA+B;WAClB,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;IAsC1E,qBAAqB;IACrB,MAAM,CAAC,MAAM;IAsBb,4FAA4F;IAC5F,MAAM,CAAC,KAAK,IAAI,OAAO;IAWvB,MAAM,CAAC,IAAI;IAIX,MAAM,CAAC,EAAE;WAII,WAAW,CACtB,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,QAAQ,GAAE,MAAgB;CAI7B"}

package/lib/Auth/index.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Authentication = void 0;
 const util_1 = require("../util");
-const Config_1 = require("../Config/Config");
 const ValidationException_v2_1 = require("../Error/ValidationException-v2");
-const Jcc_eloquent_1 = require("../Jcc-eloquent");
 const refreshTokenStore_1 = require("./refreshTokenStore");
 const REFRESH_TTL_MS = 7 * 24 * 60 * 60 * 1000;
 const ACCESS_MAX_AGE_MS = 60 * 60 * 1000;
@@ -47,20 +45,7 @@ class Authentication {
         const field = this.getCredentials(data);
         if (!Object.keys(field).length)
             return { user: null, field: "email" };
-        let user = null;
-        const orm = Config_1.config.get("DB_ORM");
-        if (orm === "mongodb" || orm === "mongoose") {
-            user = await User.findOne(field).select("+password");
-        }
-        else if (orm === "sequelize") {
-            user = await User.findOne({ where: field });
-        }
-        else {
-            // JCC ORM
-            user = await Jcc_eloquent_1.DB.table("users")
-                .where(Object.keys(field)[0], Object.values(field)[0])
-                .first();
-        }
+        let user = await (0, util_1.findUserForAuth)(User, field);
         return { user, field: Object.keys(field)[0] || "email" };
     }
     /** Generate and attach tokens to cookies (refresh is rotated server-side via `jti`). */
@@ -100,6 +85,20 @@ class Authentication {
             next(error);
         }
     }
+    static async apiAttempt(data) {
+        data = data || { field: "email", table: "User" };
+        const input = request().input(data.field || "");
+        const password = request().input("password");
+        const { [data.table]: Model } = (0, util_1.getModel)(data.table);
+        let user = await (0, util_1.findUserForAuth)(Model, { [data.field]: input });
+        if (!user) {
+            return (0, util_1.authResponseMessages)(false, "Invalid credentials", null, null);
+        }
+        if (!(await (0, util_1.verifyHash)(password, user?.password || ""))) {
+            return (0, util_1.authResponseMessages)(false, "Invalid credentials", null, null);
+        }
+        return (0, util_1.authResponseMessages)(true, "Login successful", user?.toJSON(), user.createToken({}));
+    }
     /**
      * After the user is resolved (e.g. OAuth via Socialite), issue JWT cookies
      * and redirect or JSON response like {@link Authentication.attempt}.

package/lib/Auth/type.d.ts

@@ -0,0 +1,11 @@
+export type ApiAuthType = {
+    field?: string;
+    table?: string;
+};
+export type ApiAuthResponse = {
+    success: boolean;
+    user: Record<string, any> | null;
+    token: string | null;
+    message: string;
+};
+//# sourceMappingURL=type.d.ts.map

package/lib/Auth/type.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Auth/type.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACjC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC"}

package/lib/Auth/type.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/Error/public/419.html

@@ -131,7 +131,7 @@
     <div class="card">
       <div class="icon">!</div>
 
-      <h1>419 Security verification failed</h1>
+      <h1>Security verification failed</h1>
 
       <p>
         Your request couldn’t be processed because the security token is invalid

package/lib/Global/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Global/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAqBzD,eAAO,MAAM,aAAa,GAAI,KAAK,WAAW,SA2H7C,CAAC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Global/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAqBzD,eAAO,MAAM,aAAa,GAAI,KAAK,WAAW,SAmI7C,CAAC"}

package/lib/Global/helpers.js

@@ -50,14 +50,24 @@ const globalHelpers = (app) => {
     };
     globalThis.Gate = Authorization_1.GateFacade;
     globalThis.request = () => {
-        return app.resolve("request");
+        try {
+            return app.resolve("request");
+        }
+        catch (err) {
+            return {};
+        }
     };
     globalThis.response = () => {
-        return app.resolve("response");
-    };
-    globalThis.next = () => {
-        return app.resolve("next");
+        try {
+            return app.resolve("response");
+        }
+        catch (err) {
+            return {};
+        }
     };
+    // (globalThis as any).next = () => {
+    //   return app.resolve<AppNext>("next");
+    // };
     globalThis.auth = () => {
         return index_1.Authentication;
     };

package/lib/Jcc-eloquent/lib/Builder.d.ts

@@ -2,7 +2,6 @@ import { Knex } from "knex";
 import { AsyncLocalStorage } from "async_hooks";
 import { AggregateInput, JoinCallback, SubJoinCallback, WhereInput } from "./Types";
 import { type CursorPagination, type SimplePagination } from "./Interfaces";
-import type { Request } from "express";
 import type { Model } from "./Model";
 import { QueryBuilder } from "./QueryBuilder";
 export declare class Builder {
@@ -195,13 +194,13 @@ export declare class Builder {
     /**
      * Paginate without counting total rows (fetch `perPage + 1` to detect `has_more`).
      */
-    simplePaginate(request: Request, perPage?: number | string): Promise<SimplePagination>;
+    simplePaginate(perPage?: number | string, page?: number): Promise<SimplePagination>;
     /**
      * Cursor-based pagination (keyset) on `column` — no `COUNT`, stable for large offsets.
      * Pass the next page via `?cursor=` (from `meta.next_cursor`). Uses `perPage + 1` to detect `has_more`.
      */
-    cursorPaginate(request: Request, perPage?: number | string, column?: string, direction?: "asc" | "desc"): Promise<CursorPagination>;
-    paginate(request: any, perPage?: number | string): Promise<any>;
+    cursorPaginate(perPage?: number | string, column?: string, direction?: "asc" | "desc"): Promise<CursorPagination>;
+    paginate(perPage?: number | string, page?: number): Promise<any>;
     plunk(column: string): this;
     /**
      * Get an array of values for a single column (alias like Laravel pluck).

package/lib/Jcc-eloquent/lib/Builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/Builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/Builder.ts"],"names":[],"mappings":"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"}

package/lib/Jcc-eloquent/lib/Builder.js

@@ -761,37 +761,38 @@ class Builder {
     /**
      * Paginate without counting total rows (fetch `perPage + 1` to detect `has_more`).
      */
-    async simplePaginate(request, perPage = 15) {
-        const page = Math.max(1, Number(request.query.page) || 1);
+    async simplePaginate(perPage = 15, page = 1) {
+        const req = request();
+        const pageNum = Math.max(1, Number(page || 1));
         const perPageNum = Number(perPage);
-        const offset = (page - 1) * perPageNum;
+        const offset = (pageNum - 1) * perPageNum;
         const rows = await this.clone()
             .offset(offset)
             .limit(perPageNum + 1)
             .get();
         const hasMore = rows.length > perPageNum;
         const data = hasMore ? rows.slice(0, perPageNum) : rows;
-        const nextPage = hasMore ? page + 1 : null;
-        const prevPage = page > 1 ? page - 1 : null;
+        const nextPage = hasMore ? pageNum + 1 : null;
+        const prevPage = pageNum > 1 ? pageNum - 1 : null;
         return {
             data,
             meta: {
-                current_page: page,
+                current_page: pageNum,
                 per_page: perPage,
                 has_more: hasMore,
                 next_page: nextPage,
                 prev_page: prevPage,
             },
             links: {
-                first: utils_1.Utils.mergeRequestQuery(request, { page: 1, cursor: null }),
+                first: utils_1.Utils.mergeRequestQuery(req, { page: 1, cursor: null }),
                 next: nextPage
-                    ? utils_1.Utils.mergeRequestQuery(request, {
+                    ? utils_1.Utils.mergeRequestQuery(req, {
                         page: nextPage,
                         cursor: null,
                     })
                     : null,
                 prev: prevPage
-                    ? utils_1.Utils.mergeRequestQuery(request, {
+                    ? utils_1.Utils.mergeRequestQuery(req, {
                         page: prevPage,
                         cursor: null,
                     })
@@ -803,10 +804,11 @@ class Builder {
      * Cursor-based pagination (keyset) on `column` — no `COUNT`, stable for large offsets.
      * Pass the next page via `?cursor=` (from `meta.next_cursor`). Uses `perPage + 1` to detect `has_more`.
      */
-    async cursorPaginate(request, perPage = 15, column, direction = "asc") {
+    async cursorPaginate(perPage = 15, column, direction = "asc") {
+        const req = request();
         const per = Number(perPage);
         const col = column ?? (this.model ? new this.model().primaryKey : "id");
-        const raw = request.query.cursor;
+        const raw = req?.query?.cursor;
         const cursorParam = raw === undefined || raw === null
             ? ""
             : Array.isArray(raw)
@@ -825,7 +827,7 @@ class Builder {
         const rows = await q.limit(per + 1).get();
         const hasMore = rows.length > per;
         const data = hasMore ? rows.slice(0, per) : rows;
-        const path = `${request.protocol}://${request.get("host")}${request.path}`;
+        const path = `${req.protocol}://${req.get("host")}${req.path}`;
         let nextCursor = null;
         if (hasMore && data.length > 0) {
             const last = data[data.length - 1];
@@ -847,37 +849,41 @@ class Builder {
             links: {
                 path,
                 next: nextCursor
-                    ? utils_1.Utils.mergeRequestQuery(request, {
+                    ? utils_1.Utils.mergeRequestQuery(req, {
                         cursor: nextCursor,
                         page: null,
                     })
                     : null,
                 prev: cursorParam !== ""
-                    ? utils_1.Utils.mergeRequestQuery(request, { cursor: null, page: null })
+                    ? utils_1.Utils.mergeRequestQuery(req, { cursor: null, page: null })
                     : null,
             },
         };
     }
-    async paginate(request, perPage = 15) {
-        const page = Math.max(1, Number(request.query.page) || 1);
-        const offset = (page - 1) * Number(perPage);
+    async paginate(perPage = 15, page = 1) {
+        const req = request();
+        const pageNum = Math.max(1, Number(req?.query?.page || page) || 1);
+        const offset = (pageNum - 1) * Number(perPage);
         const perPageNum = Number(perPage);
         // Create one clone for counting (preserves original query state)
         const countQuery = this.clone();
-        const total = await countQuery.count();
+        // const total = await countQuery.count();
         // Reuse the original query builder for data (more efficient)
-        const data = await this.offset(offset).limit(perPageNum).get();
+        const [total, data] = await Promise.all([
+            countQuery.count(),
+            this.offset(offset).limit(perPageNum).get(),
+        ]);
         const totalPages = Math.ceil(total / perPageNum);
-        const path = `${request.protocol}://${request.get("host")}${request.path}`;
+        const path = `${req.protocol}://${req.get("host")}${req.path}`;
         return {
             data: data,
             meta: {
-                current_page: page,
+                current_page: pageNum,
                 per_page: perPage,
                 total: total,
                 total_pages: totalPages,
-                has_more: page < totalPages,
-                links: utils_1.Utils.generatePaginationLinks(path, page, totalPages),
+                has_more: pageNum < totalPages,
+                links: utils_1.Utils.generatePaginationLinks(path, pageNum, totalPages),
             },
             links: {
                 first: `${path}?page=1`,

package/lib/Jcc-eloquent/lib/Model.d.ts

@@ -2,7 +2,6 @@ import { BaseModel } from "./BaseModel";
 import { Builder } from "./Builder";
 import { MorphTo } from "./Relations";
 import type { RelationshipQueryBuilder } from "./Relations/RelationTypes";
-import { Request } from "express";
 import { CursorPagination, Pagination, SimplePagination } from "./Interfaces";
 export declare class Model extends BaseModel {
     relations: Record<string, any>;
@@ -12,17 +11,17 @@ export declare class Model extends BaseModel {
     getKeyName(): string;
     static getPrimaryKey(): string;
     getKey(): any;
-    static paginate<T extends Model>(this: typeof Model & (new (...args: any[]) => T), request: Request, perPage?: number | string): Promise<Pagination<T>>;
+    static paginate<T extends Model>(this: typeof Model & (new (...args: any[]) => T), perPage?: number | string, page?: number): Promise<Pagination<T>>;
     /**
      * Offset pagination without a total `COUNT` (Laravel `simplePaginate`).
      * Uses `page` query param; fetches `perPage + 1` rows to set `has_more`.
      */
-    static simplePaginate<T extends Model>(this: typeof Model & (new (...args: any[]) => T), request: Request, perPage?: number | string): Promise<SimplePagination<T>>;
+    static simplePaginate<T extends Model>(this: typeof Model & (new (...args: any[]) => T), perPage?: number | string, page?: number): Promise<SimplePagination<T>>;
     /**
      * Keyset / cursor pagination (Laravel `cursorPaginate`).
      * Next page: `?cursor=` from `meta.next_cursor`. Default order is `column` asc.
      */
-    static cursorPaginate<T extends Model>(this: typeof Model & (new (...args: any[]) => T), request: Request, perPage?: number | string, column?: string, direction?: "asc" | "desc"): Promise<CursorPagination<T>>;
+    static cursorPaginate<T extends Model>(this: typeof Model & (new (...args: any[]) => T), perPage?: number | string, column?: string, direction?: "asc" | "desc"): Promise<CursorPagination<T>>;
     /**
      * Creates a records in the database.
      */

package/lib/Jcc-eloquent/lib/Model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/Model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/Model.ts"],"names":[],"mappings":"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"}

package/lib/Jcc-eloquent/lib/Model.js

@@ -35,46 +35,47 @@ class Model extends BaseModel_1.BaseModel {
     // -----------------
     // Pagination
     // -----------------
-    static async paginate(request, perPage = 15) {
-        const page = Math.max(1, Number(request.query.page) || 1);
-        const offset = (page - 1) * Number(perPage);
-        const count = await this.clone().count();
-        const total = count;
-        const data = await this.select()
-            .offset(offset)
-            .limit(Number(perPage))
-            .get();
-        const totalPages = Math.ceil(total / Number(perPage));
-        const path = `${request.protocol}://${request.get("host")}${request.path}`;
-        return {
-            data: data,
-            meta: {
-                current_page: page,
-                per_page: perPage,
-                total: total,
-                total_pages: totalPages,
-                has_more: page < totalPages,
-                links: utils_1.Utils.generatePaginationLinks(path, page, totalPages),
-            },
-            links: {
-                first: `${path}?page=1`,
-                last: `${path}?page=${totalPages}`,
-            },
-        };
+    static async paginate(perPage = 15, page = 1) {
+        return this.clone().paginate(perPage, page);
+        // const pageNum = Math.max(1, Number(page || req?.query?.page) || 1);
+        // const offset = (page - 1) * Number(perPage);
+        // const count = await this.clone().count();
+        // const total = count;
+        // const data = await this.select()
+        //   .offset(offset)
+        //   .limit(Number(perPage))
+        //   .get();
+        // const totalPages = Math.ceil(total / Number(perPage));
+        // const path = `${request.protocol}://${request.get("host")}${request.path}`;
+        // return {
+        //   data: data as T[],
+        //   meta: {
+        //     current_page: page,
+        //     per_page: perPage,
+        //     total: total,
+        //     total_pages: totalPages,
+        //     has_more: page < totalPages,
+        //     links: Utils.generatePaginationLinks(path, page, totalPages),
+        //   },
+        //   links: {
+        //     first: `${path}?page=1`,
+        //     last: `${path}?page=${totalPages}`,
+        //   },
+        // };
     }
     /**
      * Offset pagination without a total `COUNT` (Laravel `simplePaginate`).
      * Uses `page` query param; fetches `perPage + 1` rows to set `has_more`.
      */
-    static async simplePaginate(request, perPage = 15) {
-        return this.clone().simplePaginate(request, perPage);
+    static async simplePaginate(perPage = 15, page = 1) {
+        return this.clone().simplePaginate(perPage, page);
     }
     /**
      * Keyset / cursor pagination (Laravel `cursorPaginate`).
      * Next page: `?cursor=` from `meta.next_cursor`. Default order is `column` asc.
      */
-    static async cursorPaginate(request, perPage = 15, column, direction = "asc") {
-        return this.clone().cursorPaginate(request, perPage, column, direction);
+    static async cursorPaginate(perPage = 15, column, direction = "asc") {
+        return this.clone().cursorPaginate(perPage, column, direction);
     }
     /**
      * Creates a records in the database.
@@ -388,7 +389,7 @@ class Model extends BaseModel_1.BaseModel {
     }
     createToken(payload = { id: this.getKey() }) {
         if (!this.hasToken) {
-            throw new ModelTokenError_1.ModelTokenError(`${this.constructor.name} Missing required token. Please set 'protected hasToken = true' .`);
+            throw new ModelTokenError_1.ModelTokenError(`${this.constructor.name} Model Missing required token. Please set 'protected hasToken = true' .`);
         }
         return (0, util_1.jwtSign)(payload, { expiresIn: "22h" });
     }

package/lib/Jcc-eloquent/lib/QueryBuilder.d.ts

@@ -2,7 +2,6 @@ import type { Builder } from "./Builder";
 import { ModelEvent } from "./Event/ModelEvent";
 import { type Knex } from "knex";
 import { AggregateInput, JoinCallback, SubJoinCallback, WhereInput } from "./Types";
-import { Request } from "express";
 export declare class QueryBuilder extends ModelEvent {
     protected data?: Record<string, any> | undefined;
     protected static table: string;
@@ -369,7 +368,7 @@ export declare class QueryBuilder extends ModelEvent {
     static onlyTrashed(): Builder;
     static getRaw(): any;
     static firstRaw(): any;
-    static paginate(req: Request, perPage?: number | string): Promise<any>;
+    static paginate(perPage?: number | string, page?: number): Promise<any>;
     static findOrCreate(where: Record<string, any>, data: Record<string, any>): Promise<any>;
 }
 //# sourceMappingURL=QueryBuilder.d.ts.map

package/lib/Jcc-eloquent/lib/QueryBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/QueryBuilder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EACL,cAAc,EACd,YAAY,EACZ,eAAe,EACf,UAAU,EACX,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,qBAAa,YAAa,SAAQ,UAAU;IAM9B,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IALhD,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,MAAM,CAAC,UAAU,UAAS;IACpC,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,CAAM;IACnC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;gBAErB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAAA;WAIlC,QAAQ,IAAI,MAAM;IAIhC;;OAEG;WACW,KAAK,IAAI,GAAG;WAQZ,GAAG,CACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,MAAa,EACvB,KAAK,GAAE,MAAU,EACjB,OAAO,GAAE,KAAK,GAAG,IAAY,EAC7B,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,GAC9B,OAAO;WAII,QAAQ,CACpB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,EAC/B,QAAQ,GAAE,MAAa,EACvB,KAAK,GAAE,MAAU,GAChB,OAAO;WAII,UAAU,CACtB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,EAC/B,QAAQ,GAAE,MAAa,EACvB,KAAK,GAAE,MAAU,GAChB,OAAO;WAII,KAAK,IAAI,OAAO;IAO9B;;OAEG;WACW,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI9C;;OAEG;WACW,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;WAI/B,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO;IAI7D;;OAEG;WACW,MAAM,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO;IAInD;;OAEG;WACW,KAAK,CACjB,MAAM,EAAE,UAAU,EAClB,QAAQ,CAAC,EAAE,GAAG,EACd,KAAK,CAAC,EAAE,GAAG,GACV,OAAO;IAIV;;OAEG;WACW,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,OAAO;IAI3E;;OAEG;WACW,UAAU,CACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,GAAG,EACb,KAAK,CAAC,EAAE,GAAG,GACV,OAAO;IAIV;;OAEG;WACW,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAInD;;OAEG;WAQW,WAAW,CACvB,QAAQ,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,GAAG,OAAO,YAAY,KAAK,IAAI,GAC9D,OAAO;IAIV;;OAEG;WACW,aAAa,CACzB,QAAQ,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,GAAG,OAAO,YAAY,KAAK,IAAI,GAC9D,OAAO;IAIV;;OAEG;WACW,YAAY,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GACxC,OAAO;IAIV;;OAEG;WACW,cAAc,CAC1B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GACxC,OAAO;IAIV;;OAEG;WACW,eAAe,CAC3B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GACxC,OAAO;IAIV;;OAEG;WACW,iBAAiB,CAC7B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GACxC,OAAO;IAIV;;OAEG;WACW,OAAO,CACnB,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,KAAK,GAAG,MAAc,GAChC,OAAO;IAIV;;OAEG;WACW,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO;IAIlE;;OAEG;WACW,MAAM,CAAC,MAAM,GAAE,MAAa,GAAG,OAAO;IAIpD;;OAEG;WACW,KAAK,CAAC,MAAM,GAAE,MAAa,GAAG,OAAO;IAInD;;OAEG;WACW,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,OAAO;IAI5E;;OAEG;WACW,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO;IAI9D;;OAEG;WACW,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO;IAIjE;;OAEG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIjD;;OAEG;WACW,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIpD;;OAEG;WACW,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO;IAInE;;OAEG;WACW,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO;IAItE;;OAEG;WACW,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO;IAI/D;;OAEG;WACW,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,OAAO;IAI1E;;OAEG;WACW,OAAO,CACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,GAChD,OAAO;IAIV;;OAEG;WACW,SAAS,CACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,GAAG,EACtB,KAAK,CAAC,EAAE,GAAG,GACV,OAAO;IAIV;;OAEG;WACW,UAAU,CACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,GAAG,EACtB,KAAK,CAAC,EAAE,GAAG,GACV,OAAO;IAIV;;OAEG;WACW,QAAQ,CACpB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,GAAG,EACtB,KAAK,CAAC,EAAE,GAAG,GACV,OAAO;IAIV;;OAEG;WACW,SAAS,CACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,GAAG,EACtB,KAAK,CAAC,EAAE,GAAG,GACV,OAAO;IAIV;;OAEG;WACW,SAAS,CACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,GAAG,EACtB,KAAK,CAAC,EAAE,GAAG,GACV,OAAO;IAIV;;OAEG;WACW,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAI/D;;OAEG;WACW,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAIlE;;OAEG;WACW,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAIjE;;;;OAIG;WACW,EAAE,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO;IAI/D;;OAEG;WACW,IAAI,CAChB,KAAK,EAAE,MAAM,GAAG,GAAG,EACnB,gBAAgB,EAAE,YAAY,EAC9B,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO;WAII,KAAK;WAIL,OAAO,CACnB,QAAQ,EAAE,GAAG,EACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,eAAe,GACxB,OAAO;IAIV;;OAEG;WACW,SAAS,CACrB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO;IAIV;;OAEG;WACW,QAAQ,CACpB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,OAAO;IAIV;;OAEG;WACW,SAAS,CACrB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,OAAO;IAIV;;OAEG;WACW,aAAa,CACzB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,OAAO;IAIV;;OAEG;WACW,cAAc,CAC1B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,OAAO;IAIV;;OAEG;WACW,aAAa,CACzB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,OAAO;IAIV;;OAEG;WACW,WAAW,IAAI,OAAO;IAIpC;;OAEG;WACW,UAAU,IAAI,OAAO;IAInC;;OAEG;WACW,WAAW,IAAI,OAAO;IAIpC;;OAEG;WACW,UAAU,IAAI,OAAO;IAInC;;OAEG;WACW,QAAQ,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO;IAIlD;;OAEG;WACW,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO;IAIjD;;OAEG;WACW,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO;IAIlE;;OAEG;IACH;;OAEG;WACiB,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;WAIrB,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAGzC;;OAEG;WAEW,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;WAIlC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAIzC;;OAEG;IAEH;;OAEG;WAEiB,MAAM,CACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GACrD,OAAO,CAAC,GAAG,CAAC;IAIf;;OAEG;WACiB,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAInD;;OAEG;IACH;;OAEG;WACiB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7C;;OAEG;WACW,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,GAAE,GAAG,EAAO,GAAG,GAAG;IAI3D;;OAEG;WACiB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,GAAE,GAAG,EAAO;IAIhE;;OAEG;IACH;;OAEG;WACW,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO;IAIhD;;OAEG;WACW,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAI5C;;OAEG;WACW,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAI3C;;OAEG;WACW,KAAK,CACjB,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,GAChE,OAAO;IAIV;;OAEG;WACW,QAAQ,CACpB,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,GAChE,OAAO;IAIV;;OAEG;WACW,SAAS;IAIvB;;OAEG;WACW,GAAG,CAAC,OAAO,EAAE,cAAc;IAIzC;;OAEG;WACW,KAAK,CAAC,OAAO,GAAE,cAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAIpE;;OAEG;IACH;;OAEG;WACU,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAIvC;;OAEG;WACU,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAI5C;;OAEG;WACU,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIhD;;OAEG;WACW,GAAG,CAAC,OAAO,EAAE,cAAc;IAIzC;;OAEG;WACW,GAAG,CAAC,OAAO,EAAE,cAAc;IAIzC;;OAEG;WACW,GAAG,CAAC,OAAO,EAAE,cAAc;IAIzC;;OAEG;WACW,SAAS,CACrB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,MAAM,CAAC,EAAE,MAAM;IAKjB;;OAEG;WACW,QAAQ;IAItB;;OAEG;WACW,KAAK,CAAC,MAAM,EAAE,MAAM;IAIlC;;OAEG;WACW,SAAS,CACrB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,MAAM,CAAC,EAAE,MAAM;IAKjB;;;OAGG;IACH;;;OAGG;IACH,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO;IAMlD;;OAEG;IACH,MAAM,CAAC,aAAa,IAAI,MAAM,EAAE;IAIhC;;OAEG;IACG,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAU9C;;OAEG;IACH;;OAEG;WACW,WAAW,IAAI,OAAO;WAItB,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO;WAIrC,WAAW,IAAI,OAAO;WAItB,MAAM;WAIN,QAAQ;WAGT,QAAQ,CACnB,GAAG,EAAE,OAAO,EACZ,OAAO,GAAE,MAAM,GAAG,MAAW,GAC5B,OAAO,CAAC,GAAG,CAAC;WAEF,YAAY,CACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACxB,OAAO,CAAC,GAAG,CAAC;CAQhB"}
+{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/QueryBuilder.ts"],"names":[],"mappings":"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"}

package/lib/Jcc-eloquent/lib/QueryBuilder.js

@@ -577,14 +577,14 @@ class QueryBuilder extends ModelEvent_1.ModelEvent {
     static firstRaw() {
         return this.query().firstRaw();
     }
-    static async paginate(req, perPage = 15) { }
+    static async paginate(perPage = 15, page = 1) { }
     static async findOrCreate(where, data) {
         const result = await this.query().where(where).first();
         if (result) {
             return result;
         }
         else {
-            return this.query().insert(data);
+            return this.query().create(data);
         }
     }
 }

package/lib/Middleware/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Middleware/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAyB,EAEvB,cAAc,EACf,MAAM,SAAS,CAAC;AAejB,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,GAAG,CAAc;gBAEb,GAAG,EAAE,WAAW;IAWrB,0BAA0B,CAAC,gBAAgB,EAAE,cAAc,EAAE;IAM7D,eAAe;IAWf,GAAG,CAAC,gBAAgB,EAAE,cAAc,EAAE;IAgC7C,OAAO,CAAC,yBAAyB;IASjC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,UAAU;CAGnB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Middleware/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAyB,EAEvB,cAAc,EACf,MAAM,SAAS,CAAC;AAejB,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,GAAG,CAAc;gBAEb,GAAG,EAAE,WAAW;IAWrB,0BAA0B,CAAC,gBAAgB,EAAE,cAAc,EAAE;IAM7D,eAAe;IAWf,GAAG,CAAC,gBAAgB,EAAE,cAAc,EAAE;IA+B7C,OAAO,CAAC,yBAAyB;IASjC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,UAAU;CAGnB"}

package/lib/Middleware/index.js

@@ -59,7 +59,6 @@ class Middleware {
         this.expressApp.use(((req, res, next) => {
             this.app.instance("request", req);
             this.app.instance("response", res);
-            this.app.instance("next", next);
             res.on("finish", () => {
                 this.app.forgetMany(["request", "response", "next"]);
             });

package/lib/util/index.d.ts

@@ -169,4 +169,11 @@ export declare const JSInBuilTClass: (className: string) => boolean;
  * @param callback
  */
 export declare const defer: (callback: () => any) => void;
+export declare const findUserForAuth: (User: any, input: Record<string, any>) => Promise<any>;
+export declare const authResponseMessages: (success?: boolean, message?: string, user?: Record<string, any> | null, token?: string | null) => {
+    success: boolean;
+    message: string;
+    user: Record<string, any> | null;
+    token: string | null;
+};
 //# sourceMappingURL=index.d.ts.map

package/lib/util/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/util/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/util/index.ts"],"names":[],"mappings":"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"}

package/lib/util/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defer = exports.JSInBuilTClass = exports.extractQuery = exports.isModelInstance = exports.tap = exports.resolveModelBinding = exports.isSequelizeModel = exports.isMongooseModel = exports.findUserById = exports.pluralizeStr = exports.getJobClass = exports.getModelFile = exports.asyncHandler = exports.capitalize = exports.saveImage = exports.jwtSubjectId = exports.jwtVerify = exports.jwtSign = exports.jwtTokenType = exports.verifyHash = exports.bcrypt = exports.getProvider = exports.getProviders = exports.getRoute = exports.getRequest = exports.getMiddleware = exports.getModel = exports.getApiController = exports.getController = exports.loadRoute = exports.loadRoutes = exports.rootPath = void 0;
+exports.authResponseMessages = exports.findUserForAuth = exports.defer = exports.JSInBuilTClass = exports.extractQuery = exports.isModelInstance = exports.tap = exports.resolveModelBinding = exports.isSequelizeModel = exports.isMongooseModel = exports.findUserById = exports.pluralizeStr = exports.getJobClass = exports.getModelFile = exports.asyncHandler = exports.capitalize = exports.saveImage = exports.jwtSubjectId = exports.jwtVerify = exports.jwtSign = exports.jwtTokenType = exports.verifyHash = exports.bcrypt = exports.getProvider = exports.getProviders = exports.getRoute = exports.getRequest = exports.getMiddleware = exports.getModel = exports.getApiController = exports.getController = exports.loadRoute = exports.loadRoutes = exports.rootPath = void 0;
 exports.authSessionCookieOptions = authSessionCookieOptions;
 exports.jwtLegacyAccessTokenRejected = jwtLegacyAccessTokenRejected;
 exports.checkJwtAccessTokenPayload = checkJwtAccessTokenPayload;
@@ -475,3 +475,23 @@ const defer = (callback) => {
     });
 };
 exports.defer = defer;
+const findUserForAuth = async (User, input) => {
+    const orm = Config_1.config.get("DB_ORM");
+    if (orm === "mongodb" || orm === "mongoose") {
+        return await User.findOne({ ...input }).select("+password");
+    }
+    if (orm === "sequelize") {
+        return await User.findOne({ where: { ...input } });
+    }
+    return await User.where({ ...input }).first();
+};
+exports.findUserForAuth = findUserForAuth;
+const authResponseMessages = (success = false, message = "Invalid credentials", user = null, token = null) => {
+    return {
+        success,
+        message,
+        user,
+        token,
+    };
+};
+exports.authResponseMessages = authResponseMessages;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jcc-express-mvc",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "description": "express mvc structure",
   "main": "index.js",
   "types": "index.d.ts",

package/lib/Auth/Auth.d.ts

@@ -1,8 +0,0 @@
-export declare class Auth {
-    id(): any;
-    user(): Record<string, any>;
-    isAuthenticated(): boolean;
-    isGuest(): boolean;
-    check(): boolean;
-}
-//# sourceMappingURL=Auth.d.ts.map

package/lib/Auth/Auth.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Auth/Auth.ts"],"names":[],"mappings":"AAAA,qBAAa,IAAI;IAEf,EAAE;IAIF,IAAI;IAIJ,eAAe;IAIf,OAAO;IAIP,KAAK;CAGN"}

package/lib/Auth/Auth.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Auth = void 0;
-class Auth {
-    //
-    id() {
-        return request().user.id;
-    }
-    user() {
-        return request().user;
-    }
-    isAuthenticated() {
-        return request().user ? true : false;
-    }
-    isGuest() {
-        return request().user ? false : true;
-    }
-    check() {
-        return this.isAuthenticated();
-    }
-}
-exports.Auth = Auth;

package/lib/Inertia/old-index.d.ts

@@ -1,7 +0,0 @@
-import { AppRequest, AppResponse, AppNext } from "../Interface";
-interface InertiaOptions {
-    rootView: string;
-}
-export declare const inertia: (options: InertiaOptions) => (req: AppRequest, res: AppResponse, next: AppNext) => void;
-export {};
-//# sourceMappingURL=old-index.d.ts.map

package/lib/Inertia/old-index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"old-index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Inertia/old-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEhE,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAiED,eAAO,MAAM,OAAO,GAAI,SAAS,cAAc,WAzC9B,UAAU,OAAO,WAAW,QAAQ,OAAO,SA0CxB,CAAC"}

package/lib/Inertia/old-index.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.inertia = void 0;
-class InertiaMiddleware {
-    shareProps(req, res, props) {
-        const errors = {
-            ...res.locals.errors,
-            ...(res.locals.error?.email ? res.locals.error : {}),
-        };
-        const auth = { ...req.user };
-        let getFlash = req.flash() || { type: "" };
-        const type = Object.keys(getFlash).length > 0 ? Object.keys(getFlash)[0] : "";
-        const flash = {
-            message: type ? getFlash[type][0] : "",
-            status: res.statusCode,
-            type,
-        };
-        getFlash = {};
-        return { ...props, auth, flash, errors };
-    }
-    inertia(options) {
-        return (req, res, next) => {
-            res.inertia = (component, props = {}, option = {}) => {
-                const isInertiaRequest = req.header("X-Inertia");
-                const sharedProps = this.shareProps(req, res, props);
-                if (isInertiaRequest) {
-                    res.setHeader("X-Inertia", "true");
-                    return res.json({
-                        component,
-                        props: sharedProps,
-                        url: req.url,
-                    });
-                }
-                res.render(options.rootView, {
-                    inertia: JSON.stringify({
-                        component,
-                        props: sharedProps,
-                        url: req.url,
-                    }),
-                    option,
-                });
-            };
-            res.inertiaRedirect = (url, message, type = "success") => {
-                if (message) {
-                    req.flash(type, message);
-                }
-                return res.redirect(303, url);
-            };
-            next();
-        };
-    }
-}
-const inertiaMiddleware = new InertiaMiddleware();
-const inertia = (options) => inertiaMiddleware.inertia(options);
-exports.inertia = inertia;