vowel 0.1.1 → 0.1.3

package/.cache.json

@@ -0,0 +1 @@
+{}

package/bin.js

@@ -3,6 +3,14 @@
 import { execSync, spawn } from 'child_process';
 import path from 'node:path';
 import url from 'node:url';
+import pc from 'picocolors';
+import mri from 'mri';
+import filterConsole from 'filter-console';
+import process from 'process';
+import readline from 'readline';
+import logUpdate from 'log-update';
+
+const args = mri(process.argv);
 
 // Directory where the module is
 const binURL = import.meta.url;
@@ -12,17 +20,54 @@ const binDirName = path.dirname(binFilePath);
 // Directory where the command was called
 const homeDir = process.cwd();
 
+const spawnArgs = ['./server.js', '--directory', homeDir];
+if (args.build) spawnArgs.push('--build');
+
+if (!args.verbose) {
+	filterConsole(['jsconfig', 'vite', 'Vite', 'tsconfig', `--host`]);
+	console.log(`\n\n`);
+}
+
 // Args: File to run, home directory,
-const child = spawn('node', ['./server.js', homeDir, process.argv[2] === 'build'], {
+const child = spawn('node', spawnArgs, {
 	cwd: binDirName
 });
 
+let processedFiles = 0;
+let foundFiles = 0;
+const std = process.stdout;
+
 child.stdout.on('data', (data) => {
-	console.log(`${data}`);
+	const message = data.toString();
+	if (message.match('fileread')) {
+		processedFiles++;
+		logUpdate(pc.green(`    Files read: ${processedFiles}/${foundFiles}`));
+	} else if (message.startsWith('filesfound')) {
+		const count = Number(message.split(':').at(-1).slice(0, -1));
+		foundFiles += count;
+	} else if (message.startsWith('loaded')) {
+		logUpdate(pc.green(`    Files read: ${foundFiles}/${foundFiles}`));
+		console.log(`\n\n`);
+		processedFiles = 0;
+		foundFiles = 0;
+	} else if (message.match('http://localhost:')) {
+		const url = message.match(/http:\/\/localhost:\S+/);
+		console.log(
+			pc.bgCyan(
+				pc.bold(`
+
+    Website: ${url}
+`)
+			)
+		);
+		console.log(`\n`);
+	} else {
+		console.log(pc.blue(data));
+	}
 });
 
 child.stderr.on('data', (data) => {
-	console.error(`${data}`);
+	console.error(pc.red(data));
 });
 
 child.on('close', (code) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vowel",
-	"version": "0.1.1",
+	"version": "0.1.3",
 	"bin": "./bin.js",
 	"scripts": {
 		"dev": "vite dev",
@@ -20,10 +20,14 @@
 		"@sveltejs/vite-plugin-svelte": "^4.0.0-next.3",
 		"any-date-parser": "^1.5.4",
 		"change-case": "^5.4.1",
+		"filter-console": "^1.0.0",
 		"js-yaml": "^4.1.0",
+		"loading-cli": "^1.1.2",
+		"log-update": "^6.0.0",
 		"milligram": "^1.4.1",
 		"object-path": "^0.11.8",
 		"open-props": "^1.6.13",
+		"picocolors": "^1.0.1",
 		"prettier": "^3.0.0",
 		"prettier-plugin-svelte": "^3.0.0",
 		"remark": "^15.0.1",

package/server.js

@@ -3,17 +3,18 @@ import { createServer, build } from 'vite';
 import { writeFile, mkdir, readFile } from 'fs/promises';
 import { existsSync } from 'fs';
 import { dirname, join } from 'path';
+import mri from 'mri';
 
-const __dirname = fileURLToPath(new URL('.', import.meta.url));
+const args = mri(process.argv);
+const { build: isBuild, directory } = args;
 
-// Check if this is a package build
-const isBuild = process.argv[2] === 'build';
+const __dirname = fileURLToPath(new URL('.', import.meta.url));
 
 // If this is not a build, read the process argument
 const arg = !isBuild ? process.argv[2] : false;
 
 // Check if this is a user (process argument) or package dev (cwd)
-const $home = [arg || join(process.cwd(), 'content')];
+const $home = isBuild ? join(process.cwd(), 'content') : directory;
 
 const define = {
 	$home
@@ -73,7 +74,7 @@ async function runServer() {
 }
 
 // If build mode
-if (isBuild || process.argv[3] === 'true') {
+if (isBuild) {
 	buildProject();
 } else {
 	runServer();

package/src/lib/components/Frontmatter.svelte

@@ -10,7 +10,7 @@
 	 */
 	let { props } = $props();
 	// TODO: Normalize frontmatter props
-	let { properties, website } = $derived(props);
+	let { properties, website, format } = $derived(props);
 
 	const excludedProperties = [
 		'title',
@@ -47,7 +47,7 @@
 			{#if website.hasOwnProperty(key)}
 				<FrontmatterTaxonomy {property} {key} {website} />
 			{:else}
-				<FrontmatterProperty {property} {key} />
+				<FrontmatterProperty {property} {key} {format} />
 			{/if}
 		{/if}
 	{/each}

package/src/lib/components/FrontmatterProperty.svelte

@@ -4,7 +4,7 @@
 	import Image from './Markdown/Image.svelte';
 
 	/** @type {{ property: any, key: string }}*/
-	let { property, key } = $props();
+	let { property, key, format } = $props();
 </script>
 
 {#if property}
@@ -30,7 +30,7 @@
 	{#if value.type === 'array'}
 		{@render array(value.output)}
 	{:else if value.type === 'object'}
-		<Frontmatter props={{ properties: value.output }} />
+		<Frontmatter props={{ properties: value.output, format }} />
 	{:else if value.type === 'image'}
 		{@render image(value.output)}
 	{:else if value.type === 'date'}
@@ -52,19 +52,25 @@
 {/snippet}
 
 {#snippet url(value)}
-	<article>
+	{#if format === 'rss'}
 		<a href={value.url}>
-			{#if value['og:image']}
-				<img src={value['og:image']} alt="" />
-			{/if}
-			<h2>
-				{value['og:title'] || value.title}
-			</h2>
-			<p>
-				{value['og:description']}
-			</p>
+			{value.title || value['og:title']}
 		</a>
-	</article>
+	{:else}
+		<article>
+			<a href={value.url}>
+				{#if value['og:image']}
+					<img src={value['og:image']} alt="" />
+				{/if}
+				<h2>
+					{value.title || value['og:title']}
+				</h2>
+				<p>
+					{value['og:description']}
+				</p>
+			</a>
+		</article>
+	{/if}
 {/snippet}
 
 {#snippet pdf(value)}

package/src/lib/components/Markdown/Image.svelte

@@ -11,8 +11,8 @@
 		try {
 			return new URL(url);
 		} catch (e) {
-			console.error(`Error on image ${url}:`);
-			console.error(e);
+			// console.error(`Error on image ${url}:`);
+			// console.error(e);
 		}
 	}
 

package/src/lib/components/Markdown/LinkPreview.svelte

@@ -1,5 +1,5 @@
 <script>
-	let { metadata, url } = $props();
+	let { metadata, url, format } = $props();
 	let { image, description, author } = $derived(metadata || {});
 
 	const href = $derived(metadata?.ogURL || metadata?.canonicalURL || url || '');
@@ -10,24 +10,30 @@
 </script>
 
 {#if metadata}
-	<article class="link-preview">
-		<a {href}>
-			{#if image}
-				<img src={image} alt="" />
-			{/if}
-			<h2>{title ? title + ' - ' : ''}<span class="host">{urlObject.host}</span></h2>
-			{#if author}
-				<p>
-					By {author}
-				</p>
-			{/if}
-			{#if description}
-				<p>
-					{description}
-				</p>
-			{/if}
-		</a>
-	</article>
+	{#if format === 'rss'}
+		<p><a {href}>{title ? title + ' - ' : ''}{urlObject.host}</a></p>
+	{:else}
+		<article class="link-preview">
+			<a {href}>
+				{#if image}
+					<img src={image} alt="" />
+				{/if}
+				<h2>{title ? title + ' - ' : ''}<span class="host">{urlObject.host}</span></h2>
+				{#if author}
+					<p>
+						By {author}
+					</p>
+				{/if}
+				{#if description}
+					<p>
+						{description}
+					</p>
+				{/if}
+			</a>
+		</article>
+	{/if}
+{:else if format === 'rss'}
+	<p><a {href}>{urlObject.host}</a></p>
 {:else}
 	<article class="link-preview">
 		<a {href}>

package/src/lib/components/Markdown/index.svelte

@@ -11,7 +11,7 @@
 
 	let { props } = $props();
 
-	let { ast, level, website } = $derived(props);
+	let { ast, level, website, format } = $derived(props);
 
 	function getElement(node) {
 		if (node.type === 'heading') {
@@ -43,7 +43,7 @@
 			<section class={createFolderClass(path)}>
 				{#each pages as page}
 					<article class={createPageClass(page.url, 'thumbnail')}>
-						<Page link={true} {content} {page} level={level + 1} {website} />
+						<Page link={true} {content} {page} level={level + 1} {website} {format} />
 					</article>
 				{/each}
 			</section>
@@ -55,6 +55,7 @@
 					level={level + 1}
 					{website}
 					content={false}
+					{format}
 				/>
 			</article>
 		{:else if node.type === 'heading'}
@@ -62,16 +63,16 @@
 				<svelte:self props={{ ast: node.children, level }} />
 			</svelte:element>
 		{:else if node.type === 'link' && node.children}
-			<Link {node} {level} {website} />
+			<Link {node} {level} {website} {format} />
 		{:else if node.type === 'thematicBreak'}
 			<hr />
 		{:else if node.type === 'image'}
 			<Image {node} />
 		{:else if node.type === 'url'}
-			<LinkPreview url={node.value} metadata={node.metadata} />
+			<LinkPreview url={node.value} metadata={node.metadata} {format} />
 		{:else if node.children}
 			<svelte:element this={getElement(node)}>
-				<svelte:self props={{ ast: node.children, level }} />
+				<svelte:self props={{ ast: node.children, level, format }} />
 			</svelte:element>
 		{:else if node.type === 'text'}
 			<Text {node} />

package/src/lib/components/Page.svelte

@@ -46,7 +46,7 @@
 	<time datetime={dateObject.toISOString()}>{dateObject.toLocaleDateString()}</time>
 {/if}
 
-<Frontmatter props={{ properties: page, website }} />
+<Frontmatter props={{ properties: page, website, format }} />
 
 {#if page?.description || (!content && page?.imputedProperties?.description)}
 	<p class="description">{page?.description || page?.imputedProperties.description}</p>
@@ -54,6 +54,6 @@
 
 {#if level < 2 && content}
 	<div class="content">
-		<Markdown props={{ ast, level, website }} />
+		<Markdown props={{ ast, level, website, format }} />
 	</div>
 {/if}

package/src/lib/utilities/mutateMarkdownAST.js

@@ -37,7 +37,7 @@ export default async function mutateMarkdownAST(ast, cache) {
 						delete node.children;
 					} catch (error) {
 						node.value = url;
-						console.log(`Error on URL in content: ${url}`);
+						// console.log(`Error on URL in content: ${url}`);
 					}
 				} else {
 					node.metadata = cache[node.value];

package/src/lib/utilities/mutateMarkdownFrontmatter.js

@@ -89,7 +89,7 @@ export default async function mutateMarkdownFrontmatter(frontmatter, cache) {
 							input
 						};
 					} catch (e) {
-						console.error(`Error on URL in frontmatter: ${frontmatter[key]}`);
+						// console.error(`Error on URL in frontmatter: ${frontmatter[key]}`);
 						frontmatter[key] = {
 							type: 'string',
 							output: input,

package/src/lib/utilities/processMarkdownFiles.js

@@ -103,6 +103,8 @@ async function readFolder(folderPath, parents, cache) {
 
 	let files = (await fs.readdir(folderPath, { withFileTypes: true })).filter(filterFiles);
 
+	console.log(`filesfound:${files.length}`);
+
 	const promises = files.map(async (file) => await readFile(file, parents, cache, folderPath));
 
 	const folder = (await Promise.all(promises)).reduce((acc, obj) => ({ ...acc, ...obj }), {});
@@ -134,7 +136,8 @@ async function readFile(file, parents, cache, folderPath) {
 
 		const { ast, frontmatter, imputedProperties } = await readMarkdownFile(filePath, cache);
 		const loadTime = (performance.now() - startLoad).toFixed(2);
-		console.log(`📄 ${shortPath} (${loadTime}ms)`);
+		// console.log(`📄 ${shortPath} (${loadTime}ms)`);
+		console.log('fileread');
 		if (frontmatter.published == false) return;
 		if (file.name === 'home.md' || file.name === 'settings.md') {
 			const key = file.name === 'home.md' ? '$' : '_';
@@ -173,7 +176,7 @@ async function readFile(file, parents, cache, folderPath) {
 		const folder = await readFolder(path.join(folderPath, file.name), url, cache);
 
 		const loadTime = (performance.now() - startLoad).toFixed(2);
-		console.log(`📁 ${shortPath} (${loadTime}ms)`);
+		// console.log(`📁 ${shortPath} (${loadTime}ms)`);
 
 		if (!folder.hasOwnProperty('$')) {
 			const $ = DefaultFile(url);
@@ -208,5 +211,7 @@ export default async function processMarkdownFiles(cache) {
 	const [homeDir] = $home;
 	const folder = await readFolder(homeDir, '', cache);
 
+	console.log('loaded');
+
 	return { folder, finalCache: cache };
 }

package/src/routes/[...path]/+layout.server.js

@@ -22,15 +22,15 @@ async function checkFileExists(filePath, homeDir) {
 
 /** @type {import('./$types').PageLoad} */
 export async function load() {
-	const startLoad = performance.now();
+	// const startLoad = performance.now();
 	const now = Date.now();
 	const contentCacheDuration = 60000; // Cache for  1 minute
 	const initialURLCache = await loadCache($home[0]);
 
 	const cssExists = await checkFileExists(normalize('/assets/styles.css'), $home[0]);
 
-	if (cssExists) console.log('Found CSS file at /assets/styles.css');
-	else console.log('No CSS file found as /assets/styles.css');
+	// if (cssExists) console.log('Found CSS file at /assets/styles.css');
+	// else console.log('No CSS file found as /assets/styles.css');
 
 	const faviconExists = await checkFileExists(normalize('/assets/favicon.png'), $home[0]);
 
@@ -51,7 +51,7 @@ export async function load() {
 		console.log('Using content cache');
 		data = contentCache;
 	} else {
-		console.log('Not using content cache');
+		// console.log('Not using content cache');
 		data = await processMarkdownFiles(initialURLCache);
 		contentCache = data;
 		contentCacheTime = now;
@@ -64,7 +64,7 @@ export async function load() {
 		writeCache(finalCache, $home[0]);
 	}
 
-	console.log(`Load time: ${(performance.now() - startLoad).toFixed(2)} ms`);
+	// console.log(`Load time: ${(performance.now() - startLoad).toFixed(2)} ms`);
 
 	const folderName = basename($home[0]);
 

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

@@ -42,8 +42,8 @@
 		}
 
 		const breadcrumbs = getBreadcrumbs().slice(1, -1).reverse();
-		const breadcrumbSegment = breadcrumbs.length ? `${breadcrumbs.join(' - ')}` : '';
-		return `${pageMetaTitle} - ${breadcrumbSegment} - ${siteTitle}`;
+		const breadcrumbSegment = breadcrumbs.length ? ` - ${breadcrumbs.join(' - ')} - ` : '';
+		return `${pageMetaTitle}${breadcrumbSegment}${siteTitle}`;
 	}
 
 	function getFavicon() {

package/src/routes/feed.xml/+server.js

@@ -98,7 +98,7 @@ export async function GET({}) {
 			entry.push({
 				content: [
 					{ _attr: { type: 'html' } },
-					render(Page, { props: { page, level: 0, format: 'xml' } }).html
+					render(Page, { props: { page, level: 0, format: 'rss' } }).html
 				]
 			});
 

package/svelte.config.js

@@ -1,10 +1,15 @@
 import adapter from '@sveltejs/adapter-static';
 import path, { join } from 'path';
+import mri from 'mri';
+
+const args = mri(process.argv);
+
+const isDev = args._.includes('dev');
 
 const demoDir = process.cwd() + '/content';
-const NPMRunDev = process.argv[2] === 'dev';
-const isBuild = process.argv[2] === 'build';
-const receivedHomePath = NPMRunDev || isBuild ? false : process.argv[2];
+// const NPMRunDev = process.argv[2] === 'dev';
+// const isBuild = process.argv[2] === 'build';
+const receivedHomePath = isDev || args.build ? false : args.directory;
 const homeDir = receivedHomePath || demoDir;
 const relativePathToHome = path.relative(process.cwd(), homeDir);
 

package/vite.config.js

@@ -2,11 +2,14 @@ import { sveltekit } from '@sveltejs/kit/vite';
 import { defineConfig } from 'vite';
 import path from 'path';
 import { readMarkdownFile, loadCache } from './src/lib/utilities/index';
+import mri from 'mri';
+
+const args = mri(process.argv);
 
 const demoDir = process.cwd() + '/content';
 const NPMRunDev = process.argv[2] === 'dev';
 const isBuild = process.argv[2] === 'build';
-const receivedHomePath = NPMRunDev || isBuild ? false : process.argv[2];
+const receivedHomePath = NPMRunDev || isBuild ? false : args.directory;
 
 const homeDir = receivedHomePath || demoDir;
 
@@ -19,7 +22,6 @@ export default defineConfig({
 			// Hot reload markdown
 			name: 'markdown:watch',
 			configureServer(server) {
-				console.log(`Root directory: ${homeDir}`);
 				server.watcher.add(homeDir);
 				server.watcher.on('change', async (homePath, stats) => {
 					if (homePath.endsWith('.md')) {