vowel 0.1.43 → 0.1.45

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [0.1.45](https://github.com/samlfair/vowel/compare/v0.1.44...v0.1.45) (2024-10-21)
+
+
+### Features
+
+* add h-name to h1 ([ae5cc82](https://github.com/samlfair/vowel/commit/ae5cc82bf260605b49d7f0bd29762358b89f0aa4))
+
+## [0.1.44](https://github.com/samlfair/vowel/compare/v0.1.43...v0.1.44) (2024-10-21)
+
+
+### Bug Fixes
+
+* metadata retrieval bug ([566f7cf](https://github.com/samlfair/vowel/commit/566f7cf64be2749e30cddcb474f6385638c408a9))
+* webmentions bug ([2215ff5](https://github.com/samlfair/vowel/commit/2215ff5f5668d140535f6df3d30754fd685f22ae))
+
 ## [0.1.43](https://github.com/samlfair/vowel/compare/v0.1.42...v0.1.43) (2024-10-18)
 
 ## [0.1.42](https://github.com/samlfair/vowel/compare/v0.1.41...v0.1.42) (2024-10-18)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vowel",
-	"version": "0.1.43",
+	"version": "0.1.45",
 	"homepage": "https://vowel.cc",
 	"author": "Sam Littlefair (https://littlefair.ca)",
 	"repository": {
@@ -27,9 +27,9 @@
 	"dependencies": {
 		"@picocss/pico": "^1.5.10",
 		"@sveltejs/adapter-auto": "^3.0.0",
-		"@sveltejs/adapter-static": "^3.0.1",
-		"@sveltejs/kit": "^2.5.28",
-		"@sveltejs/vite-plugin-svelte": "^4.0.0-next.7",
+		"@sveltejs/adapter-static": "^3.0.5",
+		"@sveltejs/kit": "^2.7.2",
+		"@sveltejs/vite-plugin-svelte": "^4.0.0",
 		"any-date-parser": "^1.5.4",
 		"change-case": "^5.4.1",
 		"commit-and-tag-version": "^12.4.4",
@@ -54,7 +54,7 @@
 		"remark-parse": "^11.0.0",
 		"remark-rehype": "^11.1.0",
 		"spectre.css": "^0.5.9",
-		"svelte": "^5.0.0-next.251",
+		"svelte": "^5.0.4",
 		"typescript": "^5.0.0",
 		"unified": "^11.0.4",
 		"url-metadata": "^3.4.9",

package/src/lib/components/Page.svelte

@@ -29,13 +29,13 @@
 <!-- Title -->
 {#if title}
 	{#if link && page.url}
-		<h1 class="p-name">
+		<h1>
 			<a href={page.url}>
 				{page.imputedProperties.title || title || page.imputedProperties?.fileName}
 			</a>
 		</h1>
 	{:else}
-		<h1>{page.imputedProperties.title || title || page.imputedProperties?.fileName}</h1>
+		<h1 class="p-name">{page.imputedProperties.title || title || page.imputedProperties?.fileName}</h1>
 	{/if}
 {/if}
 

package/src/lib/utilities/getMetadata.js

@@ -18,7 +18,7 @@ export default async function getMetadata({ cache, url }) {
 				htmlEntities: true
 			})
 	
-			let parsedData = parser.parse(allMetadata.body)
+			let parsedData = parser.parse(allMetadata.responseBody)
 			const webmentionEndpoint = parsedData?.html?.head?.link?.find(link => {
 				return link["@_rel"] === "webmention"
 			})?.["@_href"]

package/src/lib/utilities/mutateMarkdownAST.js

@@ -26,14 +26,8 @@ export default async function mutateMarkdownAST(ast, cache, webmentions, pageURL
 				const { url } = node.children[0];
 				node.url = url
 
-				console.log("It's a URL")
-
 				const { metadata } = await getMetadata({ cache, url })
 
-				console.log({metadata})
-				console.log("Hey there!")
-				console.log({webmentions})
-
 				node.metadata = metadata;
 				node.value = url;
 				delete node.children;

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, hidden, publishedData) {
+async function readFolder(folderPath, parents, cache, hidden, publishedData, domain) {
 	function filterFiles(file) {
 		if (file.name.startsWith('.')) return false;
 		if (file.name.startsWith('README')) return false;
@@ -106,7 +106,7 @@ async function readFolder(folderPath, parents, cache, hidden, publishedData) {
 	console.log(`filesfound:${files.length}`);
 
 	const promises = files.map(
-		async (file) => await readFile(file, parents, cache, folderPath, hidden, publishedData)
+		async (file) => await readFile(file, parents, cache, folderPath, hidden, publishedData, domain)
 	);
 
 	const folder = (await Promise.all(promises)).reduce((acc, obj) => ({ ...acc, ...obj }), {});
@@ -125,16 +125,28 @@ async function readFolder(folderPath, parents, cache, hidden, publishedData) {
 	return folder;
 }
 
-async function readFile(file, parents, cache, folderPath, hidden, publishedData) {
+function buildHREF(url, domain) {
+	try {
+		const urlObj = new URL(domain)
+		urlObj.pathname = url
+		return urlObj.href
+	} catch (e) {
+		return undefined
+	
+	}
+}
+
+async function readFile(file, parents, cache, folderPath, hidden, publishedData, domain) {
 	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 href = buildHREF(url, domain)
 		const startLoad = performance.now();
 		const shortPath = parents + '/' + file.name;
 
@@ -147,7 +159,7 @@ async function readFile(file, parents, cache, folderPath, hidden, publishedData)
 			filePublishedData = publishedData.at(-1)
 		}
 		
-		const { ast, frontmatter, imputedProperties } = await readMarkdownFile(filePath, cache, filePublishedData, url);
+		const { ast, frontmatter, imputedProperties } = await readMarkdownFile(filePath, cache, filePublishedData, href);
 
 		const loadTime = (performance.now() - startLoad).toFixed(2);
 		// console.log(`📄 ${shortPath} (${loadTime}ms)`);
@@ -189,7 +201,7 @@ async function readFile(file, parents, cache, folderPath, hidden, publishedData)
 		const shortPath = parents + '/' + file.name;
 
 		const startLoad = performance.now();
-		const folder = await readFolder(path.join(folderPath, file.name), url, cache, hide, publishedData);
+		const folder = await readFolder(path.join(folderPath, file.name), url, cache, hide, publishedData, domain);
 
 		const loadTime = (performance.now() - startLoad).toFixed(2);
 		// console.log(`📁 ${shortPath} (${loadTime}ms)`);
@@ -221,11 +233,11 @@ async function readFile(file, parents, cache, folderPath, hidden, publishedData)
  * @param {import('./loadCache').Cache} cache
  * @returns {Promise<ProcessedFiles>}
  */
-export default async function processMarkdownFiles(cache, publishedData) {
+export default async function processMarkdownFiles(cache, publishedData, domain) {
 	/** @type {Array<string>} */
 	// @ts-ignore
 	const [homeDir] = $home;
-	const folder = await readFolder(homeDir, '', cache, null, publishedData);
+	const folder = await readFolder(homeDir, '', cache, null, publishedData, domain);
 
 	return { folder, finalCache: cache };
 }

package/src/lib/utilities/sendWebmention.js

@@ -5,7 +5,6 @@ export default async function sendWebmention({ endpoint, source, target }) {
             params.append('source', source)
             params.append('target', target)
 
-
             const response = await fetch(endpoint, {
                 method: "POST",
                 body: params,
@@ -15,6 +14,7 @@ export default async function sendWebmention({ endpoint, source, target }) {
             })
 
             console.log({
+                source, target,
                 webmentionResponse: await response.json()
             })
 

package/src/routes/$vowel/published.json/+server.js

@@ -25,22 +25,21 @@ export async function GET() {
 	// everything.request.url
 
 	let settings
-	
+
 	const settingsPath = join($home[0], "/settings.md")
 	const settingsExists = await checkFileExists(settingsPath);
-	if(settingsExists) {
+	if (settingsExists) {
 		settings = await readMarkdownFile(settingsPath)
 	}
 
 	// Get published articles from live site
 	const publishedData = await getPublishedData(settings.frontmatter.domain)
 
-	console.log({publish: $publish[0]})
-
 	if($publish[0]) {
 		const initialCache = await loadCache($home[0]);
-		
-		const { folder: website } = await processMarkdownFiles(initialCache, publishedData);
+
+
+		const { folder: website } = await processMarkdownFiles(initialCache, publishedData, settings.frontmatter.domain);
 	}
 
 	const headers = {
@@ -48,8 +47,6 @@ export async function GET() {
 		'Content-Type': 'text/plain'
 	};
 
-	console.log({ publishedData })
-
 	const response = new Response(JSON.stringify(publishedData), {
 		headers
 	});