@mohasinac/appkit 2.1.3 → 2.3.0

package/src/providers/auth-firebase/session.ts

@@ -1,111 +0,0 @@
-/**
- * firebaseSessionProvider — ISessionProvider
- *
- * Implements `@mohasinac/contracts` `ISessionProvider` using Firebase Admin SDK
- * session cookies (HTTP-only, 5-day TTL by default).
- *
- * Server-side only.
- */
-
-import type { ISessionProvider, AuthPayload } from "../../contracts";
-import { getAdminAuthLite } from "../db-firebase/admin-auth-lite";
-
-/** Default session duration: 5 days (in milliseconds). */
-const DEFAULT_EXPIRES_IN_MS = 60 * 60 * 24 * 5 * 1000;
-
-const EXPECTED_SESSION_CODES = new Set([
-  "auth/session-cookie-expired",
-  "auth/session-cookie-revoked",
-  "auth/user-disabled",
-  "auth/user-not-found",
-  "auth/argument-error",
-]);
-
-export const firebaseSessionProvider: ISessionProvider = {
-  /**
-   * `payload` must be an `AuthPayload` from a freshly verified ID token.
-   * The underlying Firebase API expects an ID token string, not just a UID.
-   * If you have the raw ID token, use `createSessionCookieFromToken()` instead.
-   *
-   * Here we create a custom token → exchange for an effective session.
-   * In practice, callers should use `createSessionCookieFromToken()`.
-   */
-  async createSession(payload: AuthPayload): Promise<string> {
-    void payload;
-    // Custom tokens cannot be used to mint a session cookie directly —
-    // createSession via ISessionProvider is called at the point where
-    // the caller already has a verified payload.  We delegate to a helper
-    // that is invoked in the auth API route where the raw ID token is available.
-    throw new Error(
-      "Use createSessionCookieFromToken(idToken) instead of createSession(payload). " +
-        "Firebase session cookies must be created from a raw ID token string.",
-    );
-  },
-
-  async verifySession(cookie: string): Promise<AuthPayload> {
-    try {
-      const decoded = await getAdminAuthLite().verifySessionCookie(
-        cookie,
-        true,
-      );
-      return {
-        uid: decoded.uid,
-        email: decoded.email ?? null,
-        role: (decoded.role as string | undefined) ?? "user",
-        emailVerified: decoded.email_verified ?? false,
-        claims: Object.fromEntries(
-          Object.entries(decoded).filter(
-            ([k]) =>
-              ![
-                "uid",
-                "email",
-                "email_verified",
-                "iat",
-                "exp",
-                "aud",
-                "iss",
-                "sub",
-                "auth_time",
-                "firebase",
-              ].includes(k),
-          ),
-        ),
-      };
-    } catch (err) {
-      if (!EXPECTED_SESSION_CODES.has((err as { code?: string }).code ?? "")) {
-        console.error(
-          "[@mohasinac/auth-firebase] Session cookie verification failed:",
-          err,
-        );
-      }
-      throw err;
-    }
-  },
-
-  async destroySession(cookie: string): Promise<void> {
-    try {
-      const decoded = await getAdminAuthLite().verifySessionCookie(
-        cookie,
-        false,
-      );
-      await getAdminAuthLite().revokeRefreshTokens(decoded.uid);
-    } catch {
-      // Best-effort: if cookie is already invalid, treat as already destroyed
-    }
-  },
-};
-
-/**
- * Mint a Firebase session cookie from a raw Firebase ID token string.
- *
- * Use this in your `POST /api/auth/session` route handler.
- *
- * @param idToken   The ID token from `firebase.auth().currentUser.getIdToken()`.
- * @param expiresIn Cookie duration in milliseconds (default: 5 days).
- */
-export async function createSessionCookieFromToken(
-  idToken: string,
-  expiresIn: number = DEFAULT_EXPIRES_IN_MS,
-): Promise<string> {
-  return getAdminAuthLite().createSessionCookie(idToken, { expiresIn });
-}

package/src/providers/db-firebase/admin-app-lite.ts

@@ -1,66 +0,0 @@
-import { initializeApp, getApps, cert, type App } from "firebase-admin/app";
-import * as path from "path";
-import * as fs from "fs";
-
-function parsePrivateKey(raw: string): string {
-  return raw
-    .replace(/^["']|["']$/g, "")
-    .replace(/\\n/g, "\n")
-    .replace(/\r\n/g, "\n")
-    .trim();
-}
-
-declare global {
-  // eslint-disable-next-line no-var
-  var __mohasinac_firebase_admin_app_lite__: App | null | undefined;
-}
-
-export function getAdminAppLite(): App {
-  if (globalThis.__mohasinac_firebase_admin_app_lite__) {
-    return globalThis.__mohasinac_firebase_admin_app_lite__;
-  }
-
-  if (getApps().length) {
-    const existing = getApps()[0];
-    globalThis.__mohasinac_firebase_admin_app_lite__ = existing;
-    return existing;
-  }
-
-  const keyPath = path.join(process.cwd(), "firebase-admin-key.json");
-  let app: App;
-
-  if (fs.existsSync(keyPath)) {
-    const sa = JSON.parse(fs.readFileSync(keyPath, "utf8"));
-    const dbUrl =
-      process.env.NEXT_PUBLIC_FIREBASE_DATABASE_URL ??
-      `https://${sa.project_id}-default-rtdb.firebaseio.com`;
-
-    app = initializeApp({ credential: cert(keyPath), databaseURL: dbUrl });
-  } else if (
-    process.env.FIREBASE_ADMIN_PROJECT_ID &&
-    process.env.FIREBASE_ADMIN_CLIENT_EMAIL &&
-    process.env.FIREBASE_ADMIN_PRIVATE_KEY
-  ) {
-    const projectId = process.env.FIREBASE_ADMIN_PROJECT_ID.trim();
-    const dbUrl =
-      process.env.FIREBASE_ADMIN_DATABASE_URL?.trim() ??
-      process.env.NEXT_PUBLIC_FIREBASE_DATABASE_URL?.trim() ??
-      `https://${projectId}-default-rtdb.firebaseio.com`;
-
-    app = initializeApp({
-      credential: cert({
-        projectId,
-        clientEmail: process.env.FIREBASE_ADMIN_CLIENT_EMAIL.trim(),
-        privateKey: parsePrivateKey(process.env.FIREBASE_ADMIN_PRIVATE_KEY),
-      }),
-      databaseURL: dbUrl,
-    });
-  } else {
-    throw new Error(
-      "@mohasinac/db-firebase: Firebase Admin credentials not found.",
-    );
-  }
-
-  globalThis.__mohasinac_firebase_admin_app_lite__ = app;
-  return app;
-}

package/src/providers/db-firebase/admin-auth-lite.ts

@@ -1,16 +0,0 @@
-import { getAuth, type Auth } from "firebase-admin/auth";
-import { getAdminAppLite } from "./admin-app-lite";
-
-declare global {
-  // eslint-disable-next-line no-var
-  var __mohasinac_firebase_admin_auth_lite__: Auth | null | undefined;
-}
-
-export function getAdminAuthLite(): Auth {
-  if (globalThis.__mohasinac_firebase_admin_auth_lite__) {
-    return globalThis.__mohasinac_firebase_admin_auth_lite__;
-  }
-  const auth = getAuth(getAdminAppLite());
-  globalThis.__mohasinac_firebase_admin_auth_lite__ = auth;
-  return auth;
-}

package/src/providers/db-firebase/admin-storage-lite.ts

@@ -1,19 +0,0 @@
-import {
-  getStorage as getFirebaseStorage,
-  type Storage,
-} from "firebase-admin/storage";
-import { getAdminAppLite } from "./admin-app-lite";
-
-declare global {
-  // eslint-disable-next-line no-var
-  var __mohasinac_firebase_admin_storage_lite__: Storage | null | undefined;
-}
-
-export function getAdminStorageLite(): Storage {
-  if (globalThis.__mohasinac_firebase_admin_storage_lite__) {
-    return globalThis.__mohasinac_firebase_admin_storage_lite__;
-  }
-  const storage = getFirebaseStorage(getAdminAppLite());
-  globalThis.__mohasinac_firebase_admin_storage_lite__ = storage;
-  return storage;
-}

package/src/providers/db-firebase/admin.ts

@@ -1,217 +0,0 @@
-/**
- * Firebase Admin SDK singletons.
- *
- * Supports two init methods (checked in order):
- *   1. `firebase-admin-key.json` in process.cwd() — development
- *   2. FIREBASE_ADMIN_PROJECT_ID / CLIENT_EMAIL / PRIVATE_KEY env vars — production
- *
- * All getters are lazy — the SDK is not touched until first use.
- */
-import "server-only";
-
-import type { App } from "firebase-admin/app";
-import type { Auth } from "firebase-admin/auth";
-import type { Firestore } from "firebase-admin/firestore";
-import type { Storage } from "firebase-admin/storage";
-import type { Database } from "firebase-admin/database";
-import * as path from "path";
-import * as fs from "fs";
-
-// Lazy loaders — prevents webpack from bundling firebase-admin into browser chunks.
-// (module as any).require() is used because webpack's static analysis does NOT trace
-// module.require() calls, unlike calls to the literal `require` or aliased `require`.
-/* eslint-disable @typescript-eslint/no-require-imports */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-function loadApp() {
-  return (module as any).require(
-    "firebase-admin/app",
-  ) as typeof import("firebase-admin/app");
-}
-function loadAuth() {
-  return (module as any).require(
-    "firebase-admin/auth",
-  ) as typeof import("firebase-admin/auth");
-}
-function loadFirestore() {
-  return (module as any).require(
-    "firebase-admin/firestore",
-  ) as typeof import("firebase-admin/firestore");
-}
-function loadStorage() {
-  return (module as any).require(
-    "firebase-admin/storage",
-  ) as typeof import("firebase-admin/storage");
-}
-function loadDatabase() {
-  return (module as any).require(
-    "firebase-admin/database",
-  ) as typeof import("firebase-admin/database");
-}
-/* eslint-enable @typescript-eslint/no-require-imports */
-
-// ─── Private key normalisation ────────────────────────────────────────────────
-//
-// Vercel (and other platforms) can store the private key in several formats:
-//   1. Literal \n sequences  (common — copied from JSON value)
-//   2. Real newlines          (set via CLI / multiline input)
-//   3. Windows \r\n endings   (copied on Windows)
-//   4. Wrapped in double-quotes (pasted with JSON quotes intact)
-//
-// OpenSSL 3 (Node 18+) rejects malformed PEM — ensure the key is normalised
-// before passing it to `cert()`.
-//
-function parsePrivateKey(raw: string): string {
-  return raw
-    .replace(/^["']|["']$/g, "") // strip optional surrounding quotes
-    .replace(/\\n/g, "\n") // literal \n → real newline
-    .replace(/\r\n/g, "\n") // Windows CRLF → LF
-    .trim();
-}
-
-// ─── Global singletons ────────────────────────────────────────────────────────
-// Stored on globalThis so all module instances (package-manager deduplication may create
-// multiple copies of this package in the same process) share one SDK instance.
-
-declare global {
-  // eslint-disable-next-line no-var
-  var __mohasinac_firebase_admin_app__: App | null | undefined;
-  // eslint-disable-next-line no-var
-  var __mohasinac_firebase_admin_auth__: Auth | null | undefined;
-  // eslint-disable-next-line no-var
-  var __mohasinac_firebase_admin_db__: Firestore | null | undefined;
-  // eslint-disable-next-line no-var
-  var __mohasinac_firebase_admin_storage__: Storage | null | undefined;
-  // eslint-disable-next-line no-var
-  var __mohasinac_firebase_admin_rtdb__: Database | null | undefined;
-}
-
-function get<T>(key: keyof typeof globalThis): T | null {
-  return (globalThis[key] as T | null | undefined) ?? null;
-}
-function set<T>(key: keyof typeof globalThis, value: T): void {
-  (globalThis as Record<string, unknown>)[key] = value;
-}
-
-// ─── App ──────────────────────────────────────────────────────────────────────
-
-export function getAdminApp(): App {
-  const cached = get<App>("__mohasinac_firebase_admin_app__");
-  if (cached) return cached;
-
-  const { initializeApp, getApps, cert } = loadApp();
-
-  if (getApps().length) {
-    const existing = getApps()[0];
-    set("__mohasinac_firebase_admin_app__", existing);
-    return existing;
-  }
-
-  const keyPath = path.join(process.cwd(), "firebase-admin-key.json");
-  let app: App;
-
-  try {
-    if (fs.existsSync(keyPath)) {
-      const sa = JSON.parse(fs.readFileSync(keyPath, "utf8"));
-      const dbUrl =
-        process.env.NEXT_PUBLIC_FIREBASE_DATABASE_URL ??
-        `https://${sa.project_id}-default-rtdb.firebaseio.com`;
-
-      app = initializeApp({ credential: cert(keyPath), databaseURL: dbUrl });
-    } else if (
-      process.env.FIREBASE_ADMIN_PROJECT_ID &&
-      process.env.FIREBASE_ADMIN_CLIENT_EMAIL &&
-      process.env.FIREBASE_ADMIN_PRIVATE_KEY
-    ) {
-      const projectId = process.env.FIREBASE_ADMIN_PROJECT_ID.trim();
-      const dbUrl =
-        process.env.FIREBASE_ADMIN_DATABASE_URL?.trim() ??
-        process.env.NEXT_PUBLIC_FIREBASE_DATABASE_URL?.trim() ??
-        `https://${projectId}-default-rtdb.firebaseio.com`;
-
-      app = initializeApp({
-        credential: cert({
-          projectId,
-          clientEmail: process.env.FIREBASE_ADMIN_CLIENT_EMAIL.trim(),
-          privateKey: parsePrivateKey(process.env.FIREBASE_ADMIN_PRIVATE_KEY),
-        }),
-        databaseURL: dbUrl,
-      });
-    } else {
-      throw new Error(
-        "@mohasinac/db-firebase: Firebase Admin credentials not found.\n" +
-          "Add firebase-admin-key.json to project root, or set " +
-          "FIREBASE_ADMIN_PROJECT_ID, FIREBASE_ADMIN_CLIENT_EMAIL, " +
-          "FIREBASE_ADMIN_PRIVATE_KEY environment variables.",
-      );
-    }
-  } catch (err) {
-    console.error(
-      "[@mohasinac/db-firebase] Failed to initialise Admin SDK:",
-      err,
-    );
-    throw err;
-  }
-
-  set("__mohasinac_firebase_admin_app__", app);
-  return app;
-}
-
-// ─── Auth ─────────────────────────────────────────────────────────────────────
-
-export function getAdminAuth(): Auth {
-  const cached = get<Auth>("__mohasinac_firebase_admin_auth__");
-  if (cached) return cached;
-  const { getAuth } = loadAuth();
-  const auth = getAuth(getAdminApp());
-  set("__mohasinac_firebase_admin_auth__", auth);
-  return auth;
-}
-
-// ─── Firestore ────────────────────────────────────────────────────────────────
-
-export function getAdminDb(): Firestore {
-  const cached = get<Firestore>("__mohasinac_firebase_admin_db__");
-  if (cached) return cached;
-  const { getFirestore } = loadFirestore();
-  const db = getFirestore(getAdminApp());
-  try {
-    // settings() can only be called once per Firestore instance — guard for
-    // HMR reloads and duplicate module instances.
-    db.settings({ ignoreUndefinedProperties: true });
-  } catch {
-    // Already configured — safe to ignore.
-  }
-  set("__mohasinac_firebase_admin_db__", db);
-  return db;
-}
-
-// ─── Cloud Storage ────────────────────────────────────────────────────────────
-
-export function getAdminStorage(): Storage {
-  const cached = get<Storage>("__mohasinac_firebase_admin_storage__");
-  if (cached) return cached;
-  const { getStorage: getFirebaseStorage } = loadStorage();
-  const storage = getFirebaseStorage(getAdminApp());
-  set("__mohasinac_firebase_admin_storage__", storage);
-  return storage;
-}
-
-// ─── Realtime DB ──────────────────────────────────────────────────────────────
-
-export function getAdminRealtimeDb(): Database {
-  const cached = get<Database>("__mohasinac_firebase_admin_rtdb__");
-  if (cached) return cached;
-  const { getDatabase } = loadDatabase();
-  const rtdb = getDatabase(getAdminApp());
-  set("__mohasinac_firebase_admin_rtdb__", rtdb);
-  return rtdb;
-}
-
-/** Reset all singletons — useful in tests. */
-export function _resetAdminSingletons(): void {
-  set("__mohasinac_firebase_admin_app__", null);
-  set("__mohasinac_firebase_admin_auth__", null);
-  set("__mohasinac_firebase_admin_db__", null);
-  set("__mohasinac_firebase_admin_storage__", null);
-  set("__mohasinac_firebase_admin_rtdb__", null);
-}

package/src/providers/db-firebase/base.ts

@@ -1,243 +0,0 @@
-/**
- * FirebaseRepository<T>
- *
- * Generic abstract base class implementing `IRepository<T>` from
- * `@mohasinac/contracts` against Firebase Firestore (Admin SDK).
- *
- * Usage:
- * ```ts
- * import { FirebaseRepository } from "@mohasinac/db-firebase";
- * import type { Product } from "@/types";
- *
- * export class ProductRepository extends FirebaseRepository<Product> {
- *   constructor() { super("products"); }
- * }
- * ```
- *
- * `findAll(query?)` maps the provider-agnostic `SieveQuery` from
- * `@mohasinac/contracts` to Firestore native queries (no in-memory fan-out).
- */
-
-import type {
-  CollectionReference,
-  DocumentData,
-  DocumentSnapshot,
-  Firestore,
-  Query,
-  WriteBatch,
-} from "firebase-admin/firestore";
-import type {
-  IRepository,
-  PagedResult,
-  SieveQuery,
-  WhereOp,
-} from "../../contracts";
-import { getAdminDb } from "./admin";
-import { prepareForFirestore, deserializeTimestamps } from "./helpers";
-
-export class FirebaseRepository<
-  T extends DocumentData,
-> implements IRepository<T> {
-  protected readonly collection: string;
-
-  constructor(collectionName: string) {
-    this.collection = collectionName;
-  }
-
-  // ── Internals ──────────────────────────────────────────────────────────────
-
-  protected get db(): Firestore {
-    return getAdminDb();
-  }
-
-  protected getCollection(): CollectionReference {
-    return this.db.collection(this.collection);
-  }
-
-  /** Single adapter boundary: DocumentSnapshot → typed entity. */
-  protected mapDoc<D = T>(snap: DocumentSnapshot): D {
-    return deserializeTimestamps({
-      id: snap.id,
-      ...(snap.data() ?? {}),
-    }) as unknown as D;
-  }
-
-  // ── IReadRepository ────────────────────────────────────────────────────────
-
-  async findById(id: string): Promise<T | null> {
-    const snap = await this.getCollection().doc(id).get();
-    if (!snap.exists) return null;
-    return this.mapDoc(snap);
-  }
-
-  async findAll(query?: SieveQuery): Promise<PagedResult<T>> {
-    const page = Math.max(1, query?.page ?? 1);
-    const perPage = Math.max(1, Math.min(query?.perPage ?? 20, 500));
-
-    let q: Query = this.getCollection();
-
-    // ── Sort ──────────────────────────────────────────────────────────────────
-    // SieveQuery.sort supports a leading "-" prefix for descending order
-    // (e.g. "-createdAt" means ORDER BY createdAt DESC).
-    if (query?.sort) {
-      const rawSort = query.sort;
-      const descPrefix = rawSort.startsWith("-");
-      const sortField = descPrefix ? rawSort.slice(1) : rawSort;
-      const sortDir = descPrefix
-        ? "desc"
-        : query.order === "desc"
-          ? "desc"
-          : "asc";
-      q = q.orderBy(sortField, sortDir);
-    }
-
-    // ── Basic Sieve filter parsing ────────────────────────────────────────────
-    // Supports: ==, !=, <, <=, >, >=, @= (array-contains)
-    if (query?.filters) {
-      const clauses = query.filters
-        .split(",")
-        .map((s) => s.trim())
-        .filter(Boolean);
-      for (const clause of clauses) {
-        const match = clause.match(
-          /^([^<>=!@]+)\s*(==|!=|<=|>=|<|>|@=)\s*(.+)$/,
-        );
-        if (!match) continue;
-        const [, fieldRaw, opToken, valueRaw] = match;
-        const field = fieldRaw.trim();
-        const op = TOKEN_TO_OP[opToken.trim()] ?? "==";
-        const value = coerceValue(valueRaw.trim());
-        q = (q as Query).where(field, op, value);
-      }
-    }
-
-    // ── Count ─────────────────────────────────────────────────────────────────
-    const countSnap = await q.count().get();
-    const total: number = countSnap.data().count;
-
-    // ── Paginate ──────────────────────────────────────────────────────────────
-    const offset = (page - 1) * perPage;
-    const pagedSnap = await q.offset(offset).limit(perPage).get();
-
-    const data = pagedSnap.docs.map((d) => this.mapDoc(d));
-    const totalPages =
-      total === 0 ? 0 : Math.max(1, Math.ceil(total / perPage));
-
-    return { data, total, page, perPage, totalPages };
-  }
-
-  async findWhere(field: keyof T, op: WhereOp, value: unknown): Promise<T[]> {
-    const snap = await (this.getCollection() as Query)
-      .where(field as string, op, value)
-      .get();
-    return snap.docs.map((d) => this.mapDoc(d));
-  }
-
-  // ── IWriteRepository ───────────────────────────────────────────────────────
-
-  async create(data: Omit<T, "id" | "createdAt" | "updatedAt">): Promise<T> {
-    const now = new Date();
-    const payload = prepareForFirestore({
-      ...(data as Record<string, unknown>),
-      createdAt: now,
-      updatedAt: now,
-    });
-    const ref = await this.getCollection().add(payload);
-    const snap = await ref.get();
-    return this.mapDoc(snap);
-  }
-
-  async update(id: string, data: Partial<T>): Promise<T> {
-    const payload = prepareForFirestore({
-      ...(data as Record<string, unknown>),
-      updatedAt: new Date(),
-    });
-    await this.getCollection()
-      .doc(id)
-      .update(payload as Record<string, unknown>);
-    const snap = await this.getCollection().doc(id).get();
-    if (!snap.exists) throw new Error(`Document not found after update: ${id}`);
-    return this.mapDoc(snap);
-  }
-
-  async delete(id: string): Promise<void> {
-    await this.getCollection().doc(id).delete();
-  }
-
-  async batchCreate(
-    items: Array<Omit<T, "id" | "createdAt" | "updatedAt">>,
-  ): Promise<T[]> {
-    const now = new Date();
-    const batch: WriteBatch = this.db.batch();
-    const refs = items.map((item) => {
-      const ref = this.getCollection().doc();
-      const payload = prepareForFirestore({
-        ...(item as Record<string, unknown>),
-        createdAt: now,
-        updatedAt: now,
-      });
-      batch.set(ref, payload);
-      return ref;
-    });
-    await batch.commit();
-
-    // Fetch created docs in one round-trip
-    const snaps = await Promise.all(refs.map((r) => r.get()));
-    return snaps.map((s) => this.mapDoc(s));
-  }
-
-  async batchDelete(ids: string[]): Promise<void> {
-    const batch: WriteBatch = this.db.batch();
-    for (const id of ids) {
-      batch.delete(this.getCollection().doc(id));
-    }
-    await batch.commit();
-  }
-
-  // ── Extended helpers (not in IRepository contract) ────────────────────────
-
-  /** Find by ID or throw `Error` with a descriptive message. */
-  async findByIdOrFail(id: string): Promise<T> {
-    const doc = await this.findById(id);
-    if (!doc) throw new Error(`Document not found: ${this.collection}/${id}`);
-    return doc;
-  }
-
-  /** Find first document where `field == value`. */
-  async findOneBy(field: string, value: unknown): Promise<T | null> {
-    const snap = await this.getCollection()
-      .where(field, "==", value)
-      .limit(1)
-      .get();
-    if (snap.empty) return null;
-    return this.mapDoc(snap.docs[0]);
-  }
-
-  /** Count all documents in the collection. */
-  async count(): Promise<number> {
-    const snap = await this.getCollection().count().get();
-    return snap.data().count;
-  }
-}
-
-// ─── Internal helpers ─────────────────────────────────────────────────────────
-
-const TOKEN_TO_OP: Record<string, FirebaseFirestore.WhereFilterOp> = {
-  "==": "==",
-  "!=": "!=",
-  "<": "<",
-  "<=": "<=",
-  ">": ">",
-  ">=": ">=",
-  "@=": "array-contains",
-};
-
-/** Best-effort scalar coercion for sieve filter values. */
-function coerceValue(raw: string): unknown {
-  if (raw === "true") return true;
-  if (raw === "false") return false;
-  if (raw === "null") return null;
-  const n = Number(raw);
-  if (!Number.isNaN(n) && raw !== "") return n;
-  return raw;
-}