Properly wrap the data in DB and ServerFunction. Bug not fixed.

This commit is contained in:
2025-04-02 18:05:45 +02:00
parent 9055c9ba6f
commit 3282d3ab17
6 changed files with 438 additions and 305 deletions

View File

@@ -2,11 +2,14 @@
// 🛑 Nothing in here has anything to do with React Router, it's just a fake database
////////////////////////////////////////////////////////////////////////////////
// noinspection UnnecessaryLocalVariableJS,JSUnusedGlobalSymbols
import { matchSorter } from "match-sorter";
// @ts-expect-error - no types, but it's a tiny function
import sortBy from "sort-by";
import invariant from "tiny-invariant";
import { Low } from "lowdb";
import { JSONFile } from "lowdb/node";
import { join } from "node:path";
import { mkdir } from "node:fs/promises";
type ContactMutation = {
id?: string;
@@ -23,42 +26,97 @@ export type ContactRecord = ContactMutation & {
createdAt: string;
};
////////////////////////////////////////////////////////////////////////////////
// This is just a fake DB table. In a real app you'd be talking to a real db or
// fetching from an existing API.
const fakeContacts = {
records: {} as Record<string, ContactRecord>,
// Define the database schema
type Schema = {
records: Record<string, ContactRecord>;
};
// Set up lowdb
const initDb = async (): Promise<Low<Schema>> => {
// Ensure the db directory exists
const dbDir = join(process.cwd(), '.db');
await mkdir(dbDir, { recursive: true });
const file = join(dbDir, 'contacts.json');
const adapter = new JSONFile<Schema>(file);
const defaultData: Schema = { records: {} };
const db = new Low<Schema>(adapter, defaultData);
// Load existing data
await db.read();
// Initialize if needed
if (!db.data) {
db.data = defaultData;
}
return db;
};
// Create a singleton instance of the database
let dbPromise: Promise<Low<Schema>> | null = null;
const getDb = () => {
if (!dbPromise) {
dbPromise = initDb();
}
return dbPromise;
};
////////////////////////////////////////////////////////////////////////////////
// This is a DB wrapper using lowdb for persistence
const fakeContacts = {
async getAll(): Promise<ContactRecord[]> {
return Object.keys(fakeContacts.records)
.map((key) => fakeContacts.records[key])
const db = await getDb();
return Object.keys(db.data.records)
.map((key) => db.data.records[key])
.sort(sortBy("-createdAt", "last"));
},
async get(id: string): Promise<ContactRecord | null> {
return fakeContacts.records[id] || null;
const db = await getDb();
return db.data.records[id] || null;
},
async create(values: ContactMutation): Promise<ContactRecord> {
const db = await getDb();
const id = values.id || Math.random().toString(36).substring(2, 9);
const createdAt = new Date().toISOString();
const newContact = { id, createdAt, ...values };
fakeContacts.records[id] = newContact;
db.data.records[id] = newContact;
await db.write();
return newContact;
},
async set(id: string, values: ContactMutation): Promise<ContactRecord> {
const contact = await fakeContacts.get(id);
const db = await getDb();
const contact = await this.get(id);
invariant(contact, `No contact found for ${id}`);
const updatedContact = { ...contact, ...values };
fakeContacts.records[id] = updatedContact;
db.data.records[id] = updatedContact;
await db.write();
return updatedContact;
},
destroy(id: string): null {
delete fakeContacts.records[id];
async destroy(id: string): Promise<null> {
const db = await getDb();
delete db.data.records[id];
await db.write();
return null;
},
// New reset function to restore the initial data
async reset(): Promise<void> {
const db = await getDb();
db.data.records = {};
await db.write();
// Restore initial data
const initialContacts = getInitialContacts();
for (const contact of initialContacts) {
await this.create(contact);
}
}
};
////////////////////////////////////////////////////////////////////////////////
@@ -93,228 +151,243 @@ export async function updateContact(id: string, updates: ContactMutation) {
}
export async function deleteContact(id: string) {
fakeContacts.destroy(id);
await fakeContacts.destroy(id);
}
[
{
avatar:
"https://sessionize.com/image/124e-400o400o2-wHVdAuNaxi8KJrgtN3ZKci.jpg",
first: "Shruti",
last: "Kapoor",
twitter: "@shrutikapoor08",
},
{
avatar:
"https://sessionize.com/image/1940-400o400o2-Enh9dnYmrLYhJSTTPSw3MH.jpg",
first: "Glenn",
last: "Reyes",
twitter: "@glnnrys",
},
{
avatar:
"https://sessionize.com/image/9273-400o400o2-3tyrUE3HjsCHJLU5aUJCja.jpg",
first: "Ryan",
last: "Florence",
},
{
avatar:
"https://sessionize.com/image/d14d-400o400o2-pyB229HyFPCnUcZhHf3kWS.png",
first: "Oscar",
last: "Newman",
twitter: "@__oscarnewman",
},
{
avatar:
"https://sessionize.com/image/fd45-400o400o2-fw91uCdGU9hFP334dnyVCr.jpg",
first: "Michael",
last: "Jackson",
},
{
avatar:
"https://sessionize.com/image/b07e-400o400o2-KgNRF3S9sD5ZR4UsG7hG4g.jpg",
first: "Christopher",
last: "Chedeau",
twitter: "@Vjeux",
},
{
avatar:
"https://sessionize.com/image/262f-400o400o2-UBPQueK3fayaCmsyUc1Ljf.jpg",
first: "Cameron",
last: "Matheson",
twitter: "@cmatheson",
},
{
avatar:
"https://sessionize.com/image/820b-400o400o2-Ja1KDrBAu5NzYTPLSC3GW8.jpg",
first: "Brooks",
last: "Lybrand",
twitter: "@BrooksLybrand",
},
{
avatar:
"https://sessionize.com/image/df38-400o400o2-JwbChVUj6V7DwZMc9vJEHc.jpg",
first: "Alex",
last: "Anderson",
twitter: "@ralex1993",
},
{
avatar:
"https://sessionize.com/image/5578-400o400o2-BMT43t5kd2U1XstaNnM6Ax.jpg",
first: "Kent C.",
last: "Dodds",
twitter: "@kentcdodds",
},
{
avatar:
"https://sessionize.com/image/c9d5-400o400o2-Sri5qnQmscaJXVB8m3VBgf.jpg",
first: "Nevi",
last: "Shah",
twitter: "@nevikashah",
},
{
avatar:
"https://sessionize.com/image/2694-400o400o2-MYYTsnszbLKTzyqJV17w2q.png",
first: "Andrew",
last: "Petersen",
},
{
avatar:
"https://sessionize.com/image/907a-400o400o2-9TM2CCmvrw6ttmJiTw4Lz8.jpg",
first: "Scott",
last: "Smerchek",
twitter: "@smerchek",
},
{
avatar:
"https://sessionize.com/image/08be-400o400o2-WtYGFFR1ZUJHL9tKyVBNPV.jpg",
first: "Giovanni",
last: "Benussi",
twitter: "@giovannibenussi",
},
{
avatar:
"https://sessionize.com/image/f814-400o400o2-n2ua5nM9qwZA2hiGdr1T7N.jpg",
first: "Igor",
last: "Minar",
twitter: "@IgorMinar",
},
{
avatar:
"https://sessionize.com/image/fb82-400o400o2-LbvwhTVMrYLDdN3z4iEFMp.jpeg",
first: "Brandon",
last: "Kish",
},
{
avatar:
"https://sessionize.com/image/fcda-400o400o2-XiYRtKK5Dvng5AeyC8PiUA.png",
first: "Arisa",
last: "Fukuzaki",
twitter: "@arisa_dev",
},
{
avatar:
"https://sessionize.com/image/c8c3-400o400o2-PR5UsgApAVEADZRixV4H8e.jpeg",
first: "Alexandra",
last: "Spalato",
twitter: "@alexadark",
},
{
avatar:
"https://sessionize.com/image/7594-400o400o2-hWtdCjbdFdLgE2vEXBJtyo.jpg",
first: "Cat",
last: "Johnson",
},
{
avatar:
"https://sessionize.com/image/5636-400o400o2-TWgi8vELMFoB3hB9uPw62d.jpg",
first: "Ashley",
last: "Narcisse",
twitter: "@_darkfadr",
},
{
avatar:
"https://sessionize.com/image/6aeb-400o400o2-Q5tAiuzKGgzSje9ZsK3Yu5.JPG",
first: "Edmund",
last: "Hung",
twitter: "@_edmundhung",
},
{
avatar:
"https://sessionize.com/image/30f1-400o400o2-wJBdJ6sFayjKmJycYKoHSe.jpg",
first: "Clifford",
last: "Fajardo",
twitter: "@cliffordfajard0",
},
{
avatar:
"https://sessionize.com/image/6faa-400o400o2-amseBRDkdg7wSK5tjsFDiG.jpg",
first: "Erick",
last: "Tamayo",
twitter: "@ericktamayo",
},
{
avatar:
"https://sessionize.com/image/feba-400o400o2-R4GE7eqegJNFf3cQ567obs.jpg",
first: "Paul",
last: "Bratslavsky",
twitter: "@codingthirty",
},
{
avatar:
"https://sessionize.com/image/c315-400o400o2-spjM5A6VVfVNnQsuwvX3DY.jpg",
first: "Pedro",
last: "Cattori",
twitter: "@pcattori",
},
{
avatar:
"https://sessionize.com/image/eec1-400o400o2-HkvWKLFqecmFxLwqR9KMRw.jpg",
first: "Andre",
last: "Landgraf",
twitter: "@AndreLandgraf94",
},
{
avatar:
"https://sessionize.com/image/c73a-400o400o2-4MTaTq6ftC15hqwtqUJmTC.jpg",
first: "Monica",
last: "Powell",
twitter: "@indigitalcolor",
},
{
avatar:
"https://sessionize.com/image/cef7-400o400o2-KBZUydbjfkfGACQmjbHEvX.jpeg",
first: "Brian",
last: "Lee",
twitter: "@brian_dlee",
},
{
avatar:
"https://sessionize.com/image/f83b-400o400o2-Pyw3chmeHMxGsNoj3nQmWU.jpg",
first: "Sean",
last: "McQuaid",
twitter: "@SeanMcQuaidCode",
},
{
avatar:
"https://sessionize.com/image/a9fc-400o400o2-JHBnWZRoxp7QX74Hdac7AZ.jpg",
first: "Shane",
last: "Walker",
twitter: "@swalker326",
},
{
avatar:
"https://sessionize.com/image/6644-400o400o2-aHnGHb5Pdu3D32MbfrnQbj.jpg",
first: "Jon",
last: "Jensen",
twitter: "@jenseng",
},
].forEach((contact) => {
fakeContacts.create({
// New function to reset the database to initial state
export async function resetDatabase() {
console.log("RESET DATABASE");
await fakeContacts.reset();
}
// Helper function to get initial contacts data
function getInitialContacts() {
return [
{
avatar:
"https://sessionize.com/image/124e-400o400o2-wHVdAuNaxi8KJrgtN3ZKci.jpg",
first: "Shruti",
last: "Kapoor",
twitter: "@shrutikapoor08",
},
{
avatar:
"https://sessionize.com/image/1940-400o400o2-Enh9dnYmrLYhJSTTPSw3MH.jpg",
first: "Glenn",
last: "Reyes",
twitter: "@glnnrys",
},
{
avatar:
"https://sessionize.com/image/9273-400o400o2-3tyrUE3HjsCHJLU5aUJCja.jpg",
first: "Ryan",
last: "Florence",
},
{
avatar:
"https://sessionize.com/image/d14d-400o400o2-pyB229HyFPCnUcZhHf3kWS.png",
first: "Oscar",
last: "Newman",
twitter: "@__oscarnewman",
},
{
avatar:
"https://sessionize.com/image/fd45-400o400o2-fw91uCdGU9hFP334dnyVCr.jpg",
first: "Michael",
last: "Jackson",
},
{
avatar:
"https://sessionize.com/image/b07e-400o400o2-KgNRF3S9sD5ZR4UsG7hG4g.jpg",
first: "Christopher",
last: "Chedeau",
twitter: "@Vjeux",
},
{
avatar:
"https://sessionize.com/image/262f-400o400o2-UBPQueK3fayaCmsyUc1Ljf.jpg",
first: "Cameron",
last: "Matheson",
twitter: "@cmatheson",
},
{
avatar:
"https://sessionize.com/image/820b-400o400o2-Ja1KDrBAu5NzYTPLSC3GW8.jpg",
first: "Brooks",
last: "Lybrand",
twitter: "@BrooksLybrand",
},
{
avatar:
"https://sessionize.com/image/df38-400o400o2-JwbChVUj6V7DwZMc9vJEHc.jpg",
first: "Alex",
last: "Anderson",
twitter: "@ralex1993",
},
{
avatar:
"https://sessionize.com/image/5578-400o400o2-BMT43t5kd2U1XstaNnM6Ax.jpg",
first: "Kent C.",
last: "Dodds",
twitter: "@kentcdodds",
},
{
avatar:
"https://sessionize.com/image/c9d5-400o400o2-Sri5qnQmscaJXVB8m3VBgf.jpg",
first: "Nevi",
last: "Shah",
twitter: "@nevikashah",
},
{
avatar:
"https://sessionize.com/image/2694-400o400o2-MYYTsnszbLKTzyqJV17w2q.png",
first: "Andrew",
last: "Petersen",
},
{
avatar:
"https://sessionize.com/image/907a-400o400o2-9TM2CCmvrw6ttmJiTw4Lz8.jpg",
first: "Scott",
last: "Smerchek",
twitter: "@smerchek",
},
{
avatar:
"https://sessionize.com/image/08be-400o400o2-WtYGFFR1ZUJHL9tKyVBNPV.jpg",
first: "Giovanni",
last: "Benussi",
twitter: "@giovannibenussi",
},
{
avatar:
"https://sessionize.com/image/f814-400o400o2-n2ua5nM9qwZA2hiGdr1T7N.jpg",
first: "Igor",
last: "Minar",
twitter: "@IgorMinar",
},
{
avatar:
"https://sessionize.com/image/fb82-400o400o2-LbvwhTVMrYLDdN3z4iEFMp.jpeg",
first: "Brandon",
last: "Kish",
},
{
avatar:
"https://sessionize.com/image/fcda-400o400o2-XiYRtKK5Dvng5AeyC8PiUA.png",
first: "Arisa",
last: "Fukuzaki",
twitter: "@arisa_dev",
},
{
avatar:
"https://sessionize.com/image/c8c3-400o400o2-PR5UsgApAVEADZRixV4H8e.jpeg",
first: "Alexandra",
last: "Spalato",
twitter: "@alexadark",
},
{
avatar:
"https://sessionize.com/image/7594-400o400o2-hWtdCjbdFdLgE2vEXBJtyo.jpg",
first: "Cat",
last: "Johnson",
},
{
avatar:
"https://sessionize.com/image/5636-400o400o2-TWgi8vELMFoB3hB9uPw62d.jpg",
first: "Ashley",
last: "Narcisse",
twitter: "@_darkfadr",
},
{
avatar:
"https://sessionize.com/image/6aeb-400o400o2-Q5tAiuzKGgzSje9ZsK3Yu5.JPG",
first: "Edmund",
last: "Hung",
twitter: "@_edmundhung",
},
{
avatar:
"https://sessionize.com/image/30f1-400o400o2-wJBdJ6sFayjKmJycYKoHSe.jpg",
first: "Clifford",
last: "Fajardo",
twitter: "@cliffordfajard0",
},
{
avatar:
"https://sessionize.com/image/6faa-400o400o2-amseBRDkdg7wSK5tjsFDiG.jpg",
first: "Erick",
last: "Tamayo",
twitter: "@ericktamayo",
},
{
avatar:
"https://sessionize.com/image/feba-400o400o2-R4GE7eqegJNFf3cQ567obs.jpg",
first: "Paul",
last: "Bratslavsky",
twitter: "@codingthirty",
},
{
avatar:
"https://sessionize.com/image/c315-400o400o2-spjM5A6VVfVNnQsuwvX3DY.jpg",
first: "Pedro",
last: "Cattori",
twitter: "@pcattori",
},
{
avatar:
"https://sessionize.com/image/eec1-400o400o2-HkvWKLFqecmFxLwqR9KMRw.jpg",
first: "Andre",
last: "Landgraf",
twitter: "@AndreLandgraf94",
},
{
avatar:
"https://sessionize.com/image/c73a-400o400o2-4MTaTq6ftC15hqwtqUJmTC.jpg",
first: "Monica",
last: "Powell",
twitter: "@indigitalcolor",
},
{
avatar:
"https://sessionize.com/image/cef7-400o400o2-KBZUydbjfkfGACQmjbHEvX.jpeg",
first: "Brian",
last: "Lee",
twitter: "@brian_dlee",
},
{
avatar:
"https://sessionize.com/image/f83b-400o400o2-Pyw3chmeHMxGsNoj3nQmWU.jpg",
first: "Sean",
last: "McQuaid",
twitter: "@SeanMcQuaidCode",
},
{
avatar:
"https://sessionize.com/image/a9fc-400o400o2-JHBnWZRoxp7QX74Hdac7AZ.jpg",
first: "Shane",
last: "Walker",
twitter: "@swalker326",
},
{
avatar:
"https://sessionize.com/image/6644-400o400o2-aHnGHb5Pdu3D32MbfrnQbj.jpg",
first: "Jon",
last: "Jensen",
twitter: "@jenseng",
},
].map(contact => ({
...contact,
id: `${contact.first
.toLowerCase()
.split(" ")
.join("_")}-${contact.last.toLocaleLowerCase()}`,
});
});
.join("_")}-${contact.last.toLowerCase()}`,
}));
}
// Initialize with seed data on first load
(async () => {
const db = await getDb();
if (Object.keys(db.data.records).length === 0) {
await resetDatabase();
}
})();

View File

@@ -1,20 +1,16 @@
import { createFileRoute, Link, Outlet } from '@tanstack/react-router';
import { getContacts } from "@/data";
import { fetchContacts } from "@/utils/contacts.tsx";
async function fetchContacts() {
const contacts = await getContacts();
return { contacts };
}
export const Route = createFileRoute('/_sidebar')({
component: Sidebar,
loader: fetchContacts,
loader: async () => fetchContacts(),
notFoundComponent: () => <div>Not Found</div>,
});
function Sidebar() {
const loaderData = Route.useLoaderData();
if (loaderData === undefined) {
const contacts = Route.useLoaderData();
if (contacts === undefined) {
console.log("SIDEBAR ERROR!?");
return (
<>
@@ -25,7 +21,6 @@ function Sidebar() {
</>
);
}
const { contacts } = loaderData;
return (
<>

View File

@@ -1,10 +1,9 @@
import { createFileRoute, notFound } from '@tanstack/react-router';
import { type ContactRecord, getContact } from "@/data.ts";
import { createFileRoute } from '@tanstack/react-router';
import { type ContactRecord, fetchContact } from "@/utils/contacts.tsx";
export const Route = createFileRoute('/_sidebar/contacts/$contactId')({
loader: async ({ params }) => {
const contact = await getContact(params.contactId);
if (contact === null) throw notFound();
const contact = await fetchContact({ data: params.contactId });
return { contact };
},
component: Contact,

20
src/utils/contacts.tsx Normal file
View File

@@ -0,0 +1,20 @@
import { createServerFn } from "@tanstack/react-start";
import { getContact, getContacts } from "@/data.ts";
import { notFound } from "@tanstack/react-router";
export type { ContactRecord } from "@/data.ts";
export const fetchContacts = createServerFn({ method: 'GET' })
.handler(async () => {
console.log("Fetch Contacts");
return await getContacts();
});
export const fetchContact = createServerFn({ method: 'GET' })
.validator((data: string) => data)
.handler(async (ctx) => {
console.log(`Fetch Contact ${ctx.data}`);
const contact = await getContact(ctx.data);
if (contact === null) throw notFound();
return contact;
});