From f331ec792784423686237a45c1780cdf211dec63 Mon Sep 17 00:00:00 2001 From: Konrad Szwarc Date: Fri, 20 Jan 2023 17:21:10 +0100 Subject: [PATCH] Move some data-related utils to the internals directory --- src/{utils => data/_internals}/create-link-factory.ts | 0 src/{utils => data/_internals}/create-skill-factory.ts | 0 src/data/{cv.ts => _internals/get-cv-data.ts} | 10 ++++++---- .../{transformers => _internals}/transform-data.ts | 2 +- src/data/{transformers => _internals}/transformers.ts | 2 +- src/data/helpers/links.ts | 4 ++-- src/data/helpers/skills.ts | 2 +- src/data/index.ts | 2 ++ src/data/transformers/index.ts | 1 - src/pages/index.astro | 2 +- src/pages/pdf.astro | 3 +-- 11 files changed, 15 insertions(+), 13 deletions(-) rename src/{utils => data/_internals}/create-link-factory.ts (100%) rename src/{utils => data/_internals}/create-skill-factory.ts (100%) rename src/data/{cv.ts => _internals/get-cv-data.ts} (55%) rename src/data/{transformers => _internals}/transform-data.ts (89%) rename src/data/{transformers => _internals}/transformers.ts (98%) create mode 100644 src/data/index.ts delete mode 100644 src/data/transformers/index.ts diff --git a/src/utils/create-link-factory.ts b/src/data/_internals/create-link-factory.ts similarity index 100% rename from src/utils/create-link-factory.ts rename to src/data/_internals/create-link-factory.ts diff --git a/src/utils/create-skill-factory.ts b/src/data/_internals/create-skill-factory.ts similarity index 100% rename from src/utils/create-skill-factory.ts rename to src/data/_internals/create-skill-factory.ts diff --git a/src/data/cv.ts b/src/data/_internals/get-cv-data.ts similarity index 55% rename from src/data/cv.ts rename to src/data/_internals/get-cv-data.ts index 997a3db..7fddec6 100644 --- a/src/data/cv.ts +++ b/src/data/_internals/get-cv-data.ts @@ -1,11 +1,13 @@ import type { ReadonlyDeep } from 'type-fest'; import type { Data } from '@/types/data'; -import transformData from './transformers/transform-data'; -import configData from './config'; -import sectionsData from './sections'; +import transformData from './transform-data'; +import configData from '../config'; +import sectionsData from '../sections'; const data = { config: configData, sections: sectionsData } as const satisfies ReadonlyDeep; export type PreciseData = typeof data; -export const cv = transformData(data); +const getCvData = transformData(data); + +export default getCvData; diff --git a/src/data/transformers/transform-data.ts b/src/data/_internals/transform-data.ts similarity index 89% rename from src/data/transformers/transform-data.ts rename to src/data/_internals/transform-data.ts index 2b10336..3591d61 100644 --- a/src/data/transformers/transform-data.ts +++ b/src/data/_internals/transform-data.ts @@ -1,6 +1,6 @@ import type { Data } from '@/types/data'; import produce from 'immer'; -import type { PreciseData } from '../cv'; +import type { PreciseData } from './get-cv-data'; import type { DataTransformer } from './transformers'; const transformData = diff --git a/src/data/transformers/transformers.ts b/src/data/_internals/transformers.ts similarity index 98% rename from src/data/transformers/transformers.ts rename to src/data/_internals/transformers.ts index 44b7ecf..823bd92 100644 --- a/src/data/transformers/transformers.ts +++ b/src/data/_internals/transformers.ts @@ -1,6 +1,6 @@ import type { Data } from '@/types/data'; import type { Draft } from 'immer'; -import type { PreciseData } from '../cv'; +import type { PreciseData } from './get-cv-data'; export type DraftData = Draft; diff --git a/src/data/helpers/links.ts b/src/data/helpers/links.ts index 2b2380e..60c34e3 100644 --- a/src/data/helpers/links.ts +++ b/src/data/helpers/links.ts @@ -1,6 +1,6 @@ -// GENERAL +import createLinkFactory from '@/data/_internals/create-link-factory'; -import createLinkFactory from '@/utils/create-link-factory'; +// GENERAL export const facebook = createLinkFactory({ name: 'Facebook', diff --git a/src/data/helpers/skills.ts b/src/data/helpers/skills.ts index 26c3126..ac757d7 100644 --- a/src/data/helpers/skills.ts +++ b/src/data/helpers/skills.ts @@ -1,4 +1,4 @@ -import createSkillFactory from '@/utils/create-skill-factory'; +import createSkillFactory from '@/data/_internals/create-skill-factory'; export const apolloGraphql = createSkillFactory({ name: 'Apollo GraphQL', diff --git a/src/data/index.ts b/src/data/index.ts new file mode 100644 index 0000000..4bc878f --- /dev/null +++ b/src/data/index.ts @@ -0,0 +1,2 @@ +export * from './_internals/transformers'; +export { default } from './_internals/get-cv-data'; diff --git a/src/data/transformers/index.ts b/src/data/transformers/index.ts deleted file mode 100644 index 845cc62..0000000 --- a/src/data/transformers/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './transformers'; diff --git a/src/pages/index.astro b/src/pages/index.astro index ce2707f..941b1e9 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -9,7 +9,7 @@ import PortfolioSection from '@/web/sections/portfolio/portfolio-section.web.ast import EducationSection from '@/web/sections/education/education-section.web.astro'; import TestimonialsSection from '@/web/sections/testimonials/testimonials-section.web.astro'; import FavoritesSection from '@/web/sections/favorites/favorites-section.web.astro'; -import { cv } from '@/data/cv'; +import cv from '@/data'; const { config, sections } = cv(); --- diff --git a/src/pages/pdf.astro b/src/pages/pdf.astro index 0d9e112..2e30076 100644 --- a/src/pages/pdf.astro +++ b/src/pages/pdf.astro @@ -6,8 +6,7 @@ import MainSection from '@/pdf/sections/main-section.pdf.astro'; import PortfolioSection from '@/pdf/sections/portfolio-section.pdf.astro'; import SkillsSection from '@/pdf/sections/skills-section.pdf.astro'; -import { cv } from '@/data/cv'; -import { hideProject, hideSkillSet, renameSkillSet } from '@/data/transformers'; +import cv, { hideProject, hideSkillSet, renameSkillSet } from '@/data'; const { config, sections } = cv( hideSkillSet('I want to learn'),