diff --git a/package.json b/package.json index 5a86b17..18dea06 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,8 @@ "rate-limiter-flexible": "^10.0.1", "react": "19.2.3", "react-dom": "19.2.3", - "sass": "^1.98.0" + "sass": "^1.98.0", + "zod": "^4.3.6" }, "devDependencies": { "@faker-js/faker": "^10.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 95dd817..bb41e90 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,6 +29,9 @@ importers: sass: specifier: ^1.98.0 version: 1.98.0 + zod: + specifier: ^4.3.6 + version: 4.3.6 devDependencies: '@faker-js/faker': specifier: ^10.3.0 @@ -227,89 +230,105 @@ packages: resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==} cpu: [arm64] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-arm@1.2.4': resolution: {integrity: sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==} cpu: [arm] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-ppc64@1.2.4': resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==} cpu: [ppc64] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-riscv64@1.2.4': resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==} cpu: [riscv64] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-s390x@1.2.4': resolution: {integrity: sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==} cpu: [s390x] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-x64@1.2.4': resolution: {integrity: sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==} cpu: [x64] os: [linux] + libc: [glibc] '@img/sharp-libvips-linuxmusl-arm64@1.2.4': resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==} cpu: [arm64] os: [linux] + libc: [musl] '@img/sharp-libvips-linuxmusl-x64@1.2.4': resolution: {integrity: sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==} cpu: [x64] os: [linux] + libc: [musl] '@img/sharp-linux-arm64@0.34.5': resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [arm64] os: [linux] + libc: [glibc] '@img/sharp-linux-arm@0.34.5': resolution: {integrity: sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [arm] os: [linux] + libc: [glibc] '@img/sharp-linux-ppc64@0.34.5': resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [ppc64] os: [linux] + libc: [glibc] '@img/sharp-linux-riscv64@0.34.5': resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [riscv64] os: [linux] + libc: [glibc] '@img/sharp-linux-s390x@0.34.5': resolution: {integrity: sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [s390x] os: [linux] + libc: [glibc] '@img/sharp-linux-x64@0.34.5': resolution: {integrity: sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [x64] os: [linux] + libc: [glibc] '@img/sharp-linuxmusl-arm64@0.34.5': resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [arm64] os: [linux] + libc: [musl] '@img/sharp-linuxmusl-x64@0.34.5': resolution: {integrity: sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [x64] os: [linux] + libc: [musl] '@img/sharp-wasm32@0.34.5': resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==} @@ -376,24 +395,28 @@ packages: engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [glibc] '@next/swc-linux-arm64-musl@16.1.6': resolution: {integrity: sha512-S4J2v+8tT3NIO9u2q+S0G5KdvNDjXfAv06OhfOzNDaBn5rw84DGXWndOEB7d5/x852A20sW1M56vhC/tRVbccQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [musl] '@next/swc-linux-x64-gnu@16.1.6': resolution: {integrity: sha512-2eEBDkFlMMNQnkTyPBhQOAyn2qMxyG2eE7GPH2WIDGEpEILcBPI/jdSv4t6xupSP+ot/jkfrCShLAa7+ZUPcJQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [glibc] '@next/swc-linux-x64-musl@16.1.6': resolution: {integrity: sha512-oicJwRlyOoZXVlxmIMaTq7f8pN9QNbdes0q2FXfRsPhfCi8n8JmOZJm5oo1pwDaFbnnD421rVU409M3evFbIqg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [musl] '@next/swc-win32-arm64-msvc@16.1.6': resolution: {integrity: sha512-gQmm8izDTPgs+DCWH22kcDmuUp7NyiJgEl18bcr8irXA5N2m2O+JQIr6f3ct42GOs9c0h8QF3L5SzIxcYAAXXw==} @@ -452,36 +475,42 @@ packages: engines: {node: '>= 10.0.0'} cpu: [arm] os: [linux] + libc: [glibc] '@parcel/watcher-linux-arm-musl@2.5.6': resolution: {integrity: sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==} engines: {node: '>= 10.0.0'} cpu: [arm] os: [linux] + libc: [musl] '@parcel/watcher-linux-arm64-glibc@2.5.6': resolution: {integrity: sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==} engines: {node: '>= 10.0.0'} cpu: [arm64] os: [linux] + libc: [glibc] '@parcel/watcher-linux-arm64-musl@2.5.6': resolution: {integrity: sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==} engines: {node: '>= 10.0.0'} cpu: [arm64] os: [linux] + libc: [musl] '@parcel/watcher-linux-x64-glibc@2.5.6': resolution: {integrity: sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==} engines: {node: '>= 10.0.0'} cpu: [x64] os: [linux] + libc: [glibc] '@parcel/watcher-linux-x64-musl@2.5.6': resolution: {integrity: sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==} engines: {node: '>= 10.0.0'} cpu: [x64] os: [linux] + libc: [musl] '@parcel/watcher-win32-arm64@2.5.6': resolution: {integrity: sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==} @@ -635,41 +664,49 @@ packages: resolution: {integrity: sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==} cpu: [arm64] os: [linux] + libc: [glibc] '@unrs/resolver-binding-linux-arm64-musl@1.11.1': resolution: {integrity: sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==} cpu: [arm64] os: [linux] + libc: [musl] '@unrs/resolver-binding-linux-ppc64-gnu@1.11.1': resolution: {integrity: sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==} cpu: [ppc64] os: [linux] + libc: [glibc] '@unrs/resolver-binding-linux-riscv64-gnu@1.11.1': resolution: {integrity: sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==} cpu: [riscv64] os: [linux] + libc: [glibc] '@unrs/resolver-binding-linux-riscv64-musl@1.11.1': resolution: {integrity: sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==} cpu: [riscv64] os: [linux] + libc: [musl] '@unrs/resolver-binding-linux-s390x-gnu@1.11.1': resolution: {integrity: sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==} cpu: [s390x] os: [linux] + libc: [glibc] '@unrs/resolver-binding-linux-x64-gnu@1.11.1': resolution: {integrity: sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==} cpu: [x64] os: [linux] + libc: [glibc] '@unrs/resolver-binding-linux-x64-musl@1.11.1': resolution: {integrity: sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==} cpu: [x64] os: [linux] + libc: [musl] '@unrs/resolver-binding-wasm32-wasi@1.11.1': resolution: {integrity: sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==} diff --git a/src/app/users-generator/page.tsx b/src/app/users-generator/page.tsx index 82452dd..307c8cf 100644 --- a/src/app/users-generator/page.tsx +++ b/src/app/users-generator/page.tsx @@ -82,7 +82,7 @@ export default function UsersGeneratorPage() { setTimeout(() => { setIsCopied(false); }, 2000); - } catch {} + } catch { } }; const copySql = async () => { @@ -92,7 +92,7 @@ export default function UsersGeneratorPage() { setTimeout(() => { setIsCopied(false); }, 2000); - } catch {} + } catch { } }; return ( diff --git a/src/app/users-generator/template.tsx b/src/app/users-generator/template.tsx index 9baf45c..f4dbfec 100644 --- a/src/app/users-generator/template.tsx +++ b/src/app/users-generator/template.tsx @@ -12,18 +12,17 @@ export const UsersGeneratorContext = createContext({ isSeedEnabled: false, }); -export const columnsTable = [ - "name", - "surname", - "username", - "avatar", - "email", - "password", - "title", - "body", - "date", - "phrase", -]; +const columnsTable = { + "name": "firstName", + "surname": "lastName", + "full name": "fullName", + "username": "username", + "avatar": "avatar", + "email": "email", + "password": "password", + "date": "anytime", + "phrase": "phrase", +}; export default function UsersGeneratorTemplate({ children }: { children: ReactNode }) { const [count, setCount] = useState("10"); @@ -64,7 +63,7 @@ export default function UsersGeneratorTemplate({ children }: { children: ReactNo }; const handleAddColumn = () => { - setColumns([...columns, { colName: "", colValue: columnsTable[0] }]); + setColumns([...columns, { colName: "", colValue: Object.values(columnsTable)[0] }]); }; const changeColumnValue = (e: React.ChangeEvent, i: number) => { @@ -104,10 +103,10 @@ export default function UsersGeneratorTemplate({ children }: { children: ReactNo onChange={(e) => changeColumnValue(e, i)} disabled={!el.colName} > - {columnsTable.map((element, i) => { + {Object.entries(columnsTable).map(([key, value], i) => { return ( - ); })} diff --git a/src/utilities/generator/dataGenerator.ts b/src/utilities/generator/dataGenerator.ts index 0ca36ed..e07d6b6 100644 --- a/src/utilities/generator/dataGenerator.ts +++ b/src/utilities/generator/dataGenerator.ts @@ -1,7 +1,47 @@ import { UserArgs, GeneratorResponse } from "../../types/generator"; -import { generators } from "./generators"; +import { FieldCategory } from "./generatorFields"; +import { faker } from "@faker-js/faker"; +import { z } from "zod"; + +const schema = z.object({ + count: z.number().int().min(1).max(300), + seed: z.number().int().min(1).optional() +}); export function generateData({ count, fields, seed }: UserArgs): GeneratorResponse { + const result = schema.safeParse({ count, seed }); + if (!result.success) { + return { + ok: false, + error: result.error.message, + }; + } + + faker.seed(seed); + + const data: Record[] = []; + + fields.forEach(field => { + const category = FieldCategory[field]; + if (!category) { + return; + } + + for (let i = 0; i < count; i++) { + if (!data[i]) { + data[i] = {}; + } + data[i][field] = (faker as unknown as Record string>>)[category][field](); + } + }); + + return { + ok: true, + value: data, + }; +} + +/*export function generateData({ count, fields, seed }: UserArgs): GeneratorResponse { if (!/^\d+$/.test(count.toString()) || count > 300 || count < 1) { // console.error("Count is invalid: ", count); // dev return { @@ -42,4 +82,4 @@ export function generateData({ count, fields, seed }: UserArgs): GeneratorRespon ok: true, value: data, }; -} +}*/ diff --git a/src/utilities/generator/generatorFields.ts b/src/utilities/generator/generatorFields.ts new file mode 100644 index 0000000..7f22ef6 --- /dev/null +++ b/src/utilities/generator/generatorFields.ts @@ -0,0 +1,28 @@ +const fakerFields: Record = { + "person": [ + "firstName", + "lastName", + "fullName" + ], + "internet": [ + "email", + "username", + "password", + ], + "image": [ + "avatar" + ], + "hacker": [ + "phrase", + ], + "date": [ + "anytime" + ] +} + +export const FieldCategory: Record = Object.entries(fakerFields).reduce((acc, [key, value]) => { + value.forEach((field) => { + acc[field] = key; + }); + return acc; +}, {} as Record); diff --git a/src/utilities/generator/generators.ts b/src/utilities/generator/generators.ts deleted file mode 100644 index 57f946a..0000000 --- a/src/utilities/generator/generators.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { faker } from "@faker-js/faker"; - -export const generators = [ - { - key: "name", - generator: () => faker.person.firstName(), - }, - { - key: "surname", - generator: () => faker.person.lastName(), - }, - { - key: "username", - generator: () => faker.internet.username(), - }, - { - key: "avatar", - generator: () => faker.image.avatar(), - }, - { - key: "email", - generator: () => faker.internet.email(), - }, - { - key: "password", - generator: () => faker.internet.password(), - }, - { - key: "title", - generator: () => faker.lorem.sentence(), - }, - { - key: "body", - generator: () => faker.lorem.paragraphs(), - }, - { - key: "date", - generator: () => faker.date.past().toISOString(), - }, - { - key: "phrase", - generator: () => faker.hacker.phrase(), - }, -];