flatten lib and update imports

sransara · Jul 13, 2024 · 1646c46 · 1646c46
1 parent 627c679
commit 1646c46
Show file tree

Hide file tree

Showing 22 changed files with 18 additions and 21 deletions.
diff --git a/adocx/nodeConverters/inline_quoted.ts b/adocx/nodeConverters/inline_quoted.ts
@@ -6,7 +6,7 @@ import { type AdocNodeConverter } from '#adocx/nodeConvertingConverter';
 export const convert: AdocNodeConverter<Inline> = (node: Inline, _opts?: any) => {
   const nodeType = node.getType();
   if (['asciimath', 'latexmath'].includes(nodeType)) {
-    addOnceToAstroFence(node, "import Mathtex from '@/src/lib/astro/mathtex/Mathtex.astro';");
+    addOnceToAstroFence(node, "import Mathtex from '@/src/astro/mathtex/Mathtex.astro';");
     return `<Mathtex block={false} lang="${nodeType}" is:raw={true}>${node.getText()}</Mathtex>`;
   }
   return null;

diff --git a/adocx/nodeConverters/listing.ts b/adocx/nodeConverters/listing.ts
@@ -14,10 +14,7 @@ export const convert: AdocNodeConverter<Block> = (node: Block, _opts?: any) => {
   const content = node.getContent();
   const lang = node.getAttribute('language');
 
-  addOnceToAstroFence(
-    node,
-    "import CodeListing from '@/src/lib/astro/codeListing/CodeListing.astro';",
-  );
+  addOnceToAstroFence(node, "import CodeListing from '@/src/astro/codeListing/CodeListing.astro';");
   return atag('div', {
     id,
     class: ['listingblock', ...roles].join(' '),

diff --git a/adocx/nodeConverters/stem.ts b/adocx/nodeConverters/stem.ts
@@ -13,7 +13,7 @@ export const convert: AdocNodeConverter<Block> = (node: Block, _opts?: any) => {
   const roles = node.getRoles().join(' ');
   const content = node.getContent();
   const style = node.getStyle();
-  addOnceToAstroFence(node, "import Mathtex from '@/src/lib/astro/mathtex/Mathtex.astro';");
+  addOnceToAstroFence(node, "import Mathtex from '@/src/astro/mathtex/Mathtex.astro';");
   return atag('div', {
     id,
     class: `mathblock ${roles}`,

diff --git a/src/lib/astro/asciidoc/Asciidoc.astro → src/astro/asciidoc/Asciidoc.astro b/src/lib/astro/asciidoc/Asciidoc.astro → src/astro/asciidoc/Asciidoc.astro
diff --git a/src/lib/astro/asciidoc/asciidoc.css → src/astro/asciidoc/asciidoc.css b/src/lib/astro/asciidoc/asciidoc.css → src/astro/asciidoc/asciidoc.css
diff --git a/src/lib/astro/codeListing/CodeListing.astro → src/astro/codeListing/CodeListing.astro b/src/lib/astro/codeListing/CodeListing.astro → src/astro/codeListing/CodeListing.astro
diff --git a/src/lib/astro/mathtex/Mathtex.astro → src/astro/mathtex/Mathtex.astro b/src/lib/astro/mathtex/Mathtex.astro → src/astro/mathtex/Mathtex.astro
diff --git a/src/lib/astro/navBar/NavBar.astro → src/astro/navBar/NavBar.astro b/src/lib/astro/navBar/NavBar.astro → src/astro/navBar/NavBar.astro
diff --git a/src/layouts/adocNoteLayout/AdocNoteLayout.astro b/src/layouts/adocNoteLayout/AdocNoteLayout.astro
@@ -2,9 +2,9 @@
 import type { ImageMetadata } from 'astro';
 import type { Outline } from '@sransara/astro-adocx/utils/outline';
 
-import type { Metadata } from '@/src/lib/types/notes';
+import type { Metadata } from '@/src/types/notes';
 import NoteLayout from '@/src/layouts/noteLayout/NoteLayout.astro';
-import Asciidoc from '@/src/lib/astro/asciidoc/Asciidoc.astro';
+import Asciidoc from '@/src/astro/asciidoc/Asciidoc.astro';
 
 interface Props {
   metadata: Metadata;

diff --git a/src/layouts/noteLayout/NoteLayout.astro b/src/layouts/noteLayout/NoteLayout.astro
@@ -4,9 +4,9 @@ import type { ImageMetadata } from 'astro';
 import type { Outline } from '@sransara/astro-adocx/utils/outline';
 
 import siteValues from '@/site.values.js';
-import type { Metadata } from '@/src/lib/types/notes';
+import type { Metadata } from '@/src/types/notes';
 import BaseLayout from '@/src/layouts/baseLayout/BaseLayout.astro';
-import NavBar from '@/src/lib/astro/navBar/NavBar.astro';
+import NavBar from '@/src/astro/navBar/NavBar.astro';
 
 interface Props {
   metadata: Metadata;

diff --git a/src/lib/utils.ts → src/lib/array.ts b/src/lib/utils.ts → src/lib/array.ts
diff --git a/src/pages/_metas.ts b/src/pages/_metas.ts
@@ -1,4 +1,4 @@
-import type { Metadata } from '@/src/lib/types/notes';
+import type { Metadata } from '@/src/types/notes';
 
 type Metas = Record<string, { metadata: Metadata }>;
 const metas = import.meta.glob('./**/_meta/metadata.ts', { eager: true }) as Metas;

diff --git a/src/pages/about/index.astro b/src/pages/about/index.astro
@@ -1,6 +1,6 @@
 ---
 import BaseLayout from '@/src/layouts/baseLayout/BaseLayout.astro';
-import NavBar from '@/src/lib/astro/navBar/NavBar.astro';
+import NavBar from '@/src/astro/navBar/NavBar.astro';
 ---
 
 <style>

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -1,6 +1,6 @@
 ---
 import BaseLayout from '@/src/layouts/baseLayout/BaseLayout.astro';
-import NavBar from '@/src/lib/astro/navBar/NavBar.astro';
+import NavBar from '@/src/astro/navBar/NavBar.astro';
 ---
 
 <BaseLayout>

diff --git a/src/pages/notes/2019/build-yourself-a-git/_meta/metadata.ts b/src/pages/notes/2019/build-yourself-a-git/_meta/metadata.ts
@@ -1,4 +1,4 @@
-import type { Metadata } from '@/src/lib/types/notes';
+import type { Metadata } from '@/src/types/notes';
 
 export const metadata: Metadata = {
   title: 'Build yourself a Git',

diff --git a/src/pages/notes/2019/hello-world/_meta/metadata.ts b/src/pages/notes/2019/hello-world/_meta/metadata.ts
@@ -1,4 +1,4 @@
-import type { Metadata } from '@/src/lib/types/notes';
+import type { Metadata } from '@/src/types/notes';
 
 export const metadata: Metadata = {
   title: 'Hello world',

diff --git a/src/pages/notes/2023/bazel-python-venv/_meta/metadata.ts b/src/pages/notes/2023/bazel-python-venv/_meta/metadata.ts
@@ -1,4 +1,4 @@
-import type { Metadata } from '@/src/lib/types/notes';
+import type { Metadata } from '@/src/types/notes';
 
 export const metadata: Metadata = {
   title: 'Quick guide: Bazel Python virtual environment',

diff --git a/src/pages/notes/2023/power-to-tail-recursion/_meta/metadata.ts b/src/pages/notes/2023/power-to-tail-recursion/_meta/metadata.ts
@@ -1,4 +1,4 @@
-import type { Metadata } from '@/src/lib/types/notes';
+import type { Metadata } from '@/src/types/notes';
 
 export const metadata: Metadata = {
   title: 'Power to tail recursion',

diff --git a/src/pages/notes/[year]/index.astro b/src/pages/notes/[year]/index.astro
@@ -2,7 +2,7 @@
 import { format, parseISO } from 'date-fns';
 
 import BaseLayout from '@/src/layouts/baseLayout/BaseLayout.astro';
-import NavBar from '@/src/lib/astro/navBar/NavBar.astro';
+import NavBar from '@/src/astro/navBar/NavBar.astro';
 import { routes } from '@/src/pages/_metas.ts';
 
 export function getStaticPaths() {

diff --git a/src/pages/notes/index.astro b/src/pages/notes/index.astro
@@ -2,9 +2,9 @@
 import { format, parseISO } from 'date-fns';
 
 import BaseLayout from '@/src/layouts/baseLayout/BaseLayout.astro';
-import NavBar from '@/src/lib/astro/navBar/NavBar.astro';
+import NavBar from '@/src/astro/navBar/NavBar.astro';
 import { routes } from '@/src/pages/_metas.ts';
-import { groupBy } from '@/src/lib/utils.ts';
+import { groupBy } from '@/src/lib/array';
 
 const notesGroupedByYear = groupBy(
   routes('/notes'),

diff --git a/src/pages/projects/index.astro b/src/pages/projects/index.astro
@@ -1,6 +1,6 @@
 ---
 import BaseLayout from '@/src/layouts/baseLayout/BaseLayout.astro';
-import NavBar from '@/src/lib/astro/navBar/NavBar.astro';
+import NavBar from '@/src/astro/navBar/NavBar.astro';
 ---
 
 <BaseLayout title="Projects">

diff --git a/src/lib/types/notes.ts → src/types/notes.ts b/src/lib/types/notes.ts → src/types/notes.ts