vowel 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vowel",
-	"version": "0.1.5",
+	"version": "0.1.7",
 	"bin": "./bin.js",
 	"scripts": {
 		"dev": "vite dev",

package/server.js

@@ -58,8 +58,9 @@ async function buildProject() {
 
 		const jsonData = JSON.stringify(vercelDefaults, null, 2);
 
-		await writeFile(vercelConfigPath, jsonData, 'utf-8');
-		await writeFile(join($home[0], '.output', 'vercel.json'), jsonData, 'utf-8');
+		const path = join($home, 'vercel.json');
+		await writeFile(path, jsonData, 'utf-8');
+		// await writeFile(vercelConfigPath, jsonData, 'utf-8');
 		console.log('Build completed successfully.');
 	} catch (err) {
 		console.error('Build failed:', err);

package/src/lib/components/DefaultStyles.svelte

@@ -352,7 +352,7 @@
 			padding-right: 0;
 		}
 
-		:where(pre, blockquote, dl, figure, table, p, ul, ol, form, article):not(:last-child) {
+		:where(pre, blockquote, dl, figure, table, p, ul, ol, form, article, section):not(:last-child) {
 			margin-bottom: 2.5rem;
 		}
 
@@ -365,10 +365,14 @@
 
 		/* Header */
 
+		header {
+			margin-top: 4rem;
+		}
+
 		nav.top-bar {
 			border: 1px solid var(--border-color);
 			padding: 6px 10px;
-			margin-inline: -10px;
+			margin-inline: -3px;
 			border-radius: 5px;
 			display: flex;
 			column-gap: 2rem;
@@ -422,6 +426,10 @@
 			cursor: default;
 		}
 
+		header .breadcrumbs > a:only-child {
+			display: none;
+		}
+
 		header .breadcrumbs {
 			margin-block: 4rem 1rem;
 		}
@@ -455,5 +463,55 @@
 		.page.home > main > h1 {
 			display: none;
 		}
+
+		.page.home .content p:first-child {
+			font-size: 1.2em;
+		}
+
+		section[class*='$'] {
+			display: grid;
+			grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+			grid-auto-rows: auto;
+			grid-gap: 2rem;
+
+			& article {
+				margin: 0;
+			}
+		}
+
+		article.item {
+			display: grid;
+			flex-direction: column;
+			grid-template-areas:
+				'title icon'
+				'description description';
+			align-content: start;
+		}
+
+		article.item h1 {
+			grid-area: title;
+			font-size: 1.6rem;
+		}
+
+		article.item dl.icon {
+			grid-area: icon;
+			font-size: 1.5em;
+		}
+
+		article.item dl.icon dd {
+			text-align: right;
+		}
+
+		article.item .description {
+			grid-area: description;
+		}
+
+		article.item dt {
+			display: none;
+		}
+
+		article.item dl.icon {
+			order: -1;
+		}
 	}
 </style>

package/src/lib/components/Markdown/validators.js

@@ -1,4 +1,4 @@
-const pathRegex = /^\/[\/\w\d=-_\.\?&-]*$/;
+const pathRegex = /^\/[\/\$\w\d=-_\.\?&-]*$/;
 
 export function getFolderAndCount(node) {
 	if (

package/src/lib/components/Nav.svelte

@@ -3,11 +3,13 @@
 
 	let { folder, segments, child } = $props();
 
+	console.log({ folder });
+
 	// There's definitely a better way to filter this
 	function filterFolder(folder) {
 		const filteredFolder = {};
 		for (let key in folder) {
-			if (!folder[key]['$']?.date) {
+			if ((!folder[key]['$']?.date && !key.startsWith('$')) || key.length === 1) {
 				filteredFolder[key] = folder[key];
 			}
 		}
@@ -18,16 +20,17 @@
 </script>
 
 {#if Object.keys(evergreen).some((key) => key !== '$' && key !== '_')}
+	{@const dummy = console.log({ evergreen })}
 	<nav class="top-bar">
-		{#if !child && evergreen['$']?.url !== '/'}
-			<a aria-current={isActiveLink(segments)} href={evergreen['$']?.url}
+		{#if !child}
+			<a aria-current={isActiveLink(segments)} href={evergreen?.url || evergreen['$']?.url}
 				>{getFolderLabel(evergreen)}</a
 			>
 		{/if}
 		{#each Object.keys(evergreen) as key}
 			{#if !key.match(/^[$_]$/) && key !== '.obsidian'}
 				<a
-					href={evergreen[key]['_']?.url || evergreen[key]['$']?.url}
+					href={evergreen?.url || evergreen[key]['_']?.url || evergreen[key]['$']?.url}
 					aria-current={isActiveLink(segments, key)}>{getFolderLabel(evergreen[key]) || key}</a
 				>
 			{/if}

package/src/lib/components/Page.svelte

@@ -22,7 +22,7 @@
 
 <!-- Title -->
 {#if title}
-	{#if link}
+	{#if link && page.url}
 		<h1>
 			<a href={page.url}>
 				{page.imputedProperties.title || title || page.imputedProperties?.fileName}

package/src/lib/components/Sitemap.svelte

@@ -19,13 +19,13 @@
 			</li>
 		{/if}
 		{#each Object.keys(section) as key}
-			{#if Object.keys(section[key]).length === 1 && section[key].$ && !section[key].$.date}
+			{#if Object.keys(section[key]).length === 1 && section[key].$ && !section[key].$.date && !key.startsWith('$')}
 				<li class={key}>
 					<a aria-current={isActiveLink(segments, key)} href={section[key].$.url}>
 						{getFileLabel(section[key]['$'], true) || getFolderLabel(section[key], true)}
 					</a>
 				</li>
-			{:else if section[key].$ && !section[key].$.date}
+			{:else if section[key].$ && !section[key].$.date && !key.startsWith('$')}
 				<li class={key}>
 					<a aria-current={isActiveLink(segments, key)} href={section[key].$.url}>
 						{getFileLabel(section[key]['$']) || getFolderLabel(section[key])}

package/src/lib/utilities/createPageClass.js

@@ -1,4 +1,5 @@
 export default function createPageClass(url, type = 'page') {
+	if (!url) return 'item';
 	if (url === '/') return 'page home';
 	return type + url.split('/').join(' ');
 }

package/src/lib/utilities/getPage.js

@@ -17,6 +17,7 @@ export default function getPage(website, path) {
 		.split('/');
 
 	segments.forEach((segment) => {
+		if (segment === '_') return page[segment];
 		if (typeof page === 'object' && page !== null) page = page[segment];
 	});
 

package/src/lib/utilities/getPagesByFolder.js

@@ -17,30 +17,32 @@ function traverseFolder(folder, root = false, property = '.') {
 	let pages = [];
 
 	for (let key in folder) {
-		if (key === '$') {
-			if (!root) {
-				if (propertyKey) {
-					if (
-						folder[key].hasOwnProperty(propertyKey) &&
-						folder[key][propertyKey] === propertyValue
-					) {
+		if (!key.startsWith('$') || key.length === 1) {
+			if (key === '$') {
+				if (!root) {
+					if (propertyKey) {
+						if (
+							folder[key].hasOwnProperty(propertyKey) &&
+							folder[key][propertyKey] === propertyValue
+						) {
+							pages.push(folder[key]);
+						}
+					} else {
 						pages.push(folder[key]);
 					}
-				} else {
-					pages.push(folder[key]);
 				}
-			}
-			// if (
-			// 	!root &&
-			// 	folder[key].$?.hasOwnProperty(propertyKey) &&
-			// 	folder[key][propertyKey] === propertyValue
-			// )
-			// 	pages.push(folder[key]);
-		} else if (key !== '_') {
-			const child = folder[key];
+				// if (
+				// 	!root &&
+				// 	folder[key].$?.hasOwnProperty(propertyKey) &&
+				// 	folder[key][propertyKey] === propertyValue
+				// )
+				// 	pages.push(folder[key]);
+			} else if (key !== '_') {
+				const child = folder[key];
 
-			// @ts-ignore
-			pages.push(...traverseFolder(child, false, property));
+				// @ts-ignore
+				pages.push(...traverseFolder(child, false, property));
+			}
 		}
 	}
 

package/src/lib/utilities/processMarkdownFiles.js

@@ -90,7 +90,7 @@ function DefaultDirectory(path) {
  * @param {import('./loadCache').Cache} cache
  * @returns {Promise<Directory>}
  */
-async function readFolder(folderPath, parents, cache) {
+async function readFolder(folderPath, parents, cache, hidden) {
 	function filterFiles(file) {
 		if (file.name.startsWith('.')) return false;
 		if (file.name.startsWith('README')) return false;
@@ -105,7 +105,9 @@ async function readFolder(folderPath, parents, cache) {
 
 	console.log(`filesfound:${files.length}`);
 
-	const promises = files.map(async (file) => await readFile(file, parents, cache, folderPath));
+	const promises = files.map(
+		async (file) => await readFile(file, parents, cache, folderPath, hidden)
+	);
 
 	const folder = (await Promise.all(promises)).reduce((acc, obj) => ({ ...acc, ...obj }), {});
 
@@ -123,13 +125,15 @@ async function readFolder(folderPath, parents, cache) {
 	return folder;
 }
 
-async function readFile(file, parents, cache, folderPath) {
+async function readFile(file, parents, cache, folderPath, hidden) {
 	const route = path.parse(file.name).name;
 	const url = buildURL(parents, route);
 	const filePath = path.join(folderPath, file.name);
 
 	const extension = path.extname(file.name);
 
+	const hide = (file.name.startsWith('$') && file.name.length > 1) || hidden;
+
 	if (file.isFile() && extension === '.md') {
 		const startLoad = performance.now();
 		const shortPath = parents + '/' + file.name;
@@ -150,13 +154,15 @@ async function readFile(file, parents, cache, folderPath) {
 				}
 			};
 		}
+
 		return {
 			[route]: {
 				$: {
 					...frontmatter,
 					imputedProperties,
 					ast,
-					url
+					// url,
+					url: hide ? false : url
 				}
 			}
 		};
@@ -173,7 +179,7 @@ async function readFile(file, parents, cache, folderPath) {
 		const shortPath = parents + '/' + file.name;
 
 		const startLoad = performance.now();
-		const folder = await readFolder(path.join(folderPath, file.name), url, cache);
+		const folder = await readFolder(path.join(folderPath, file.name), url, cache, hide);
 
 		const loadTime = (performance.now() - startLoad).toFixed(2);
 		// console.log(`📁 ${shortPath} (${loadTime}ms)`);

package/src/routes/[...path]/+page.svelte

@@ -60,10 +60,10 @@
 		// Update website on file change
 		if (import.meta.hot) {
 			import.meta.hot.on('vowel:update', ({ path, file }) => {
-				let page = getPage(website, path);
+				let updatedPage = getPage(website, path);
 
 				for (const key in file) {
-					page[key] = file[key];
+					updatedPage[key] = file[key];
 				}
 			});
 		}

package/vite.config.js

@@ -32,7 +32,8 @@ export default defineConfig({
 						const relativePath = path
 							.relative(homeDir, homePath)
 							.slice(0, -3)
-							.replace(/\/?(home|settings)$/, '');
+							.replace(/\/?(home)$/, '')
+							.replace(/\/?(settings)$/, '_');
 						server.ws.send('vowel:update', {
 							path: relativePath,
 							stats,