tristonarmstrong/XeNote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(debugging) nested links not working properly

Browse Source
This commit is contained in:
Triston Armstrong 2024-02-03 23:09:41 -06:00
parent dc0ec48db4
commit b1f55fd898
3 changed files with 245 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
components/FolderTree.js
View File

@ -1,34 +1,33 @@
import * as React from 'react'; import * as React from "react";
import { TreeView, TreeItem } from '@mui/x-tree-view'; import { TreeView, TreeItem } from "@mui/x-tree-view";
import { useRouter } from 'next/router' import { useRouter } from "next/router";
import { styled } from '@mui/material/styles'; import { styled } from "@mui/material/styles";
const TCTreeItem = styled(TreeItem)(({ theme }) => ({ const TCTreeItem = styled(TreeItem)(({ theme }) => ({
'& .MuiTreeItem-content': { "& .MuiTreeItem-content": {
borderRadius: '10px', borderRadius: "10px",
'&:hover': { "&:hover": {
backgroundColor: 'rgba(25, 118, 210, 0.59)' backgroundColor: "rgba(25, 118, 210, 0.59)",
}, },
'& .MuiTreeItem-label': { "& .MuiTreeItem-label": {
fontSize: '1rem', fontSize: "1rem",
paddingLeft: '6px', paddingLeft: "6px",
fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif,', fontFamily:
'-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif,',
lineHeight: 2.0, lineHeight: 2.0,
}, },
}, },
})) }));
export default function FolderTree(props) { export default function FolderTree(props) {
const router = useRouter() const router = useRouter();
const memoTree = React.useMemo(() => renderTree(props.tree), [props.tree]) const memoTree = React.useMemo(() => renderTree(props.tree), [props.tree]);
const expandedNodes = [props.tree.id] const expandedNodes = [props.tree.id];
return ( return (
<> <>
<a href="http://localhost:3000" className="">{"<-"} Back To Portfolio</a> <a href="http://localhost:3000">{"<-"} Back To Portfolio</a>
<TreeView <TreeView
aria-label="rich object" aria-label="rich object"
@ -36,14 +35,16 @@ export default function FolderTree(props) {
defaultExpanded={expandedNodes} defaultExpanded={expandedNodes}
defaultExpandIcon={<ChevronRightIcon />} defaultExpandIcon={<ChevronRightIcon />}
onNodeSelect={(event, nodIds) => { onNodeSelect={(event, nodIds) => {
const currentNode = props.flattenNodes.find(aNode => { // TODO: already sorted, impliment binary search
return aNode.id === nodIds const currentNode = props.flattenNodes.find((aNode) => {
}) return aNode.id === nodIds;
});
console.log({ currentNode });
if (currentNode != null && currentNode.routePath != null) { if (currentNode != null && currentNode.routePath != null) {
router.push(currentNode.routePath) router.push(currentNode.routePath);
} }
}} }}
sx={{ overflowY: 'scroll' }} sx={{ overflowY: "scroll" }}
> >
{memoTree} {memoTree}
</TreeView> </TreeView>
@ -53,26 +54,55 @@ export default function FolderTree(props) {
function ChevronRightIcon() { function ChevronRightIcon() {
return ( return (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6"> <svg
<path strokeLinecap="round" strokeLinejoin="round" d="m8.25 4.5 7.5 7.5-7.5 7.5" /> xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
strokeWidth={1.5}
stroke="currentColor"
height={10}
width={10}
>
<path
strokeLinecap="round"
strokeLinejoin="round"
d="m8.25 4.5 7.5 7.5-7.5 7.5"
/>
</svg> </svg>
) );
} }
function ChevronDownIcon() { function ChevronDownIcon() {
return ( return (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6"> <svg
<path strokeLinecap="round" strokeLinejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5" /> xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
strokeWidth={1.5}
stroke="currentColor"
height={10}
width={10}
>
<path
strokeLinecap="round"
strokeLinejoin="round"
d="m19.5 8.25-7.5 7.5-7.5-7.5"
/>
</svg> </svg>
) );
} }
function renderTree(nodes, layer) { function renderTree(nodes, layer = 0) {
return ( return (
<TCTreeItem key={nodes.id} nodeId={nodes.id} label={nodes.name} sx={{ marginLeft: 1 * layer }}> <TCTreeItem
key={nodes.id}
nodeId={nodes.id}
label={nodes.name}
sx={{ marginLeft: 1 * layer }}
>
{Array.isArray(nodes.children) {Array.isArray(nodes.children)
? nodes.children.map((node) => renderTree(node, layer + 1)) ? nodes.children.map((node) => renderTree(node, layer + 1))
: null} : null}
</TCTreeItem> </TCTreeItem>
) );
} }

292
lib/utils.js
View File

@ -1,21 +1,21 @@
import { default as Node } from './node' import { default as Node } from "./node";
import { Transformer } from './transformer' import { Transformer } from "./transformer";
import { unified } from 'unified' import { unified } from "unified";
import markdown from 'remark-parse' import markdown from "remark-parse";
import { toString } from 'mdast-util-to-string' import { toString } from "mdast-util-to-string";
import path from 'path' import path from "path";
import fs from 'fs' import fs from "fs";
const dirTree = require("directory-tree"); const dirTree = require("directory-tree");
class Util { class Util {
_counter _counter;
_cachedSlugMap _cachedSlugMap;
_directoryData _directoryData;
constructor() { constructor() {
this._counter = 0 this._counter = 0;
this._cachedSlugMap = this.getSlugHashMap() this._cachedSlugMap = this.getSlugHashMap();
} }
/** /**
@ -23,48 +23,47 @@ class Util {
* */ * */
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
getContent(slug) { getContent(slug) {
const currentFilePath = this.toFilePath(slug) const currentFilePath = this.toFilePath(slug);
if (currentFilePath === undefined || currentFilePath == null) return null if (currentFilePath === undefined || currentFilePath == null) return null;
return Node.readFileSync(currentFilePath) return Node.readFileSync(currentFilePath);
} }
getShortSummary(slug) { getShortSummary(slug) {
const content = this.getContent(slug) const content = this.getContent(slug);
if (content === undefined || content === null) { if (content === undefined || content === null) {
return return;
} }
const tree = unified().use(markdown) const tree = unified().use(markdown).parse(content);
.parse(content) const plainText = toString(tree);
const plainText = toString(tree) return plainText.split(" ").splice(0, 40).join(" ");
return plainText.split(' ').splice(0, 40).join(' ')
} }
getAllMarkdownFiles() { getAllMarkdownFiles() {
return Node.getFiles(Node.getMarkdownFolder()) return Node.getFiles(Node.getMarkdownFolder());
} }
getSinglePost(slug) { getSinglePost(slug) {
// List of filenames that will provide existing links to wikilink // List of filenames that will provide existing links to wikilink
const currentFilePath = this.toFilePath(slug) const currentFilePath = this.toFilePath(slug);
// console.log("currentFilePath: ", currentFilePath) // console.log("currentFilePath: ", currentFilePath)
const fileContent = Node.readFileSync(currentFilePath) const fileContent = Node.readFileSync(currentFilePath);
// const currentFileFrontMatter = Transformer.getFrontMatterData(fileContent) // const currentFileFrontMatter = Transformer.getFrontMatterData(fileContent)
// console.log("===============\n\nFile is scanning: ", slug) // console.log("===============\n\nFile is scanning: ", slug)
const [htmlContent] = Transformer.getHtmlContent(fileContent) const [htmlContent] = Transformer.getHtmlContent(fileContent);
// console.log("==================================") // console.log("==================================")
// console.log("hrmlcontents and backlinks") // console.log("hrmlcontents and backlinks")
return { return {
id: slug, id: slug,
// ...currentFileFrontMatter, // ...currentFileFrontMatter,
data: htmlContent data: htmlContent,
} };
} }
toFilePath(slug) { toFilePath(slug) {
return this._cachedSlugMap[slug] return this._cachedSlugMap[slug];
} }
getSlugHashMap() { getSlugHashMap() {
@ -74,211 +73,234 @@ class Util {
// and not conflict-free, other solution was considered (hash file name into a hash, but this // and not conflict-free, other solution was considered (hash file name into a hash, but this
// is not SEO-friendly and make url look ugly ==> I chose this // is not SEO-friendly and make url look ugly ==> I chose this
const slugMap = new Map() const slugMap = new Map();
this.getAllMarkdownFiles().forEach(aFile => { this.getAllMarkdownFiles().forEach((aFile) => {
const aSlug = this.toSlug(aFile) const aSlug = this.toSlug(aFile);
// if (slugMap.has(aSlug)) { // if (slugMap.has(aSlug)) {
// slugMap[aSlug].push(aFile) // slugMap[aSlug].push(aFile)
// } else { // } else {
// slugMap[aSlug] = [aFile] // slugMap[aSlug] = [aFile]
// } // }
// Note: [Future improvement] Resolve conflict // Note: [Future improvement] Resolve conflict
slugMap[aSlug] = aFile slugMap[aSlug] = aFile;
}) });
const indexFile = '/🌎 Home.md' const indexFile = "/🌎 Home.md";
slugMap.index = Node.getMarkdownFolder() + indexFile slugMap.index = Node.getMarkdownFolder() + indexFile;
slugMap['/'] = Node.getMarkdownFolder() + indexFile slugMap["/"] = Node.getMarkdownFolder() + indexFile;
return slugMap return slugMap;
} }
toSlug(filePath) { toSlug(filePath) {
const markdownFolder = Node.getMarkdownFolder() const markdownFolder = Node.getMarkdownFolder();
const isFile = Node.isFile(filePath) const isFile = Node.isFile(filePath);
const isMarkdownFolder = filePath.includes(markdownFolder) const isMarkdownFolder = filePath.includes(markdownFolder);
if (isFile && Boolean(isMarkdownFolder)) { if (isFile && Boolean(isMarkdownFolder)) {
return filePath.replace(markdownFolder, '') return filePath
.replaceAll('/', '_') .replace(markdownFolder, "")
.replaceAll(' ', '+') .replaceAll("/", "_")
.replaceAll('&', '-') .replaceAll(" ", "+")
.replace('.md', '') .replaceAll("&", "-")
.replace(".md", "");
} else { } else {
// TODO handle this properly // TODO handle this properly
return '/' return "/";
} }
} }
constructGraphData() { constructGraphData() {
const filepath = path.join(process.cwd(), 'graph-data.json') const filepath = path.join(process.cwd(), "graph-data.json");
if (Node.isFile(filepath)) { if (Node.isFile(filepath)) {
const data = fs.readFileSync(filepath) const data = fs.readFileSync(filepath);
return JSON.parse(String(data)) return JSON.parse(String(data));
} else { } else {
const filePaths = this.getAllMarkdownFiles() const filePaths = this.getAllMarkdownFiles();
const edges = [] const edges = [];
const nodes = [] const nodes = [];
filePaths filePaths.forEach((aFilePath) => {
.forEach(aFilePath => {
// const {currentFilePath} = getFileNames(filename) // const {currentFilePath} = getFileNames(filename)
const aNode = { const aNode = {
title: Transformer.parseFileNameFromPath(aFilePath), title: Transformer.parseFileNameFromPath(aFilePath),
slug: this.toSlug(aFilePath), slug: this.toSlug(aFilePath),
shortSummary: this.getShortSummary(this.toSlug(aFilePath)) shortSummary: this.getShortSummary(this.toSlug(aFilePath)),
} };
nodes.push(aNode) nodes.push(aNode);
// console.log("Constructing graph for node: " + aFilePath ) // console.log("Constructing graph for node: " + aFilePath )
const internalLinks = Transformer.getInternalLinks(aFilePath) const internalLinks = Transformer.getInternalLinks(aFilePath);
internalLinks.forEach(aLink => { internalLinks.forEach((aLink) => {
if (aLink.slug === null || aLink.slug.length === 0) return if (aLink.slug === null || aLink.slug.length === 0) return;
const anEdge = { const anEdge = {
source: this.toSlug(aFilePath), source: this.toSlug(aFilePath),
target: aLink.slug target: aLink.slug,
} };
edges.push(anEdge) edges.push(anEdge);
// console.log("Source: " + anEdge.source) // console.log("Source: " + anEdge.source)
// console.log("Target: " + anEdge.target) // console.log("Target: " + anEdge.target)
}) });
// console.log("==============Constructing graph" ) // console.log("==============Constructing graph" )
} });
) const data = { nodes, edges };
const data = { nodes, edges } fs.writeFileSync(filepath, JSON.stringify(data), "utf-8");
fs.writeFileSync(filepath, JSON.stringify(data), 'utf-8') return data;
return data
} }
} }
getLocalGraphData(currentNodeId) { getLocalGraphData(currentNodeId) {
const { nodes, edges } = constructGraphData() const { nodes, edges } = constructGraphData();
const newNodes = nodes.map(aNode => ( const newNodes = nodes.map((aNode) => ({
{
data: { data: {
id: aNode.slug.toString(), id: aNode.slug.toString(),
label: Transformer.parseFileNameFromPath(this.toFilePath(aNode.slug)) label: Transformer.parseFileNameFromPath(this.toFilePath(aNode.slug)),
} },
} }));
))
const newEdges = edges.map(anEdge => ({ const newEdges = edges.map((anEdge) => ({
data: { data: {
source: anEdge.source, source: anEdge.source,
target: anEdge.target target: anEdge.target,
} },
})) }));
const existingNodeIDs = newNodes.map(aNode => aNode.data.id) const existingNodeIDs = newNodes.map((aNode) => aNode.data.id);
currentNodeId = currentNodeId === 'index' ? '__index' : currentNodeId currentNodeId = currentNodeId === "index" ? "__index" : currentNodeId;
if (currentNodeId != null && Boolean(existingNodeIDs.includes(currentNodeId))) { if (
currentNodeId != null &&
Boolean(existingNodeIDs.includes(currentNodeId))
) {
const outGoingNodeIds = newEdges const outGoingNodeIds = newEdges
.filter(anEdge => anEdge.data.source === currentNodeId) .filter((anEdge) => anEdge.data.source === currentNodeId)
.map(anEdge => anEdge.data.target) .map((anEdge) => anEdge.data.target);
const incomingNodeIds = newEdges const incomingNodeIds = newEdges
.filter(anEdge => anEdge.data.target === currentNodeId) .filter((anEdge) => anEdge.data.target === currentNodeId)
.map(anEdge => anEdge.data.source) .map((anEdge) => anEdge.data.source);
outGoingNodeIds.push(currentNodeId) outGoingNodeIds.push(currentNodeId);
const localNodeIds = incomingNodeIds.concat(outGoingNodeIds.filter(item => incomingNodeIds.indexOf(item) < 0)) const localNodeIds = incomingNodeIds.concat(
outGoingNodeIds.filter((item) => incomingNodeIds.indexOf(item) < 0),
);
if (localNodeIds.indexOf(currentNodeId) < 0) { if (localNodeIds.indexOf(currentNodeId) < 0) {
localNodeIds.push(currentNodeId) localNodeIds.push(currentNodeId);
} }
const localNodes = newNodes.filter(aNode => localNodeIds.includes(aNode.data.id)) const localNodes = newNodes.filter((aNode) =>
let localEdges = newEdges.filter(edge => localNodeIds.includes(edge.data.source)).filter(edge => localNodeIds.includes(edge.data.target)) localNodeIds.includes(aNode.data.id),
);
let localEdges = newEdges
.filter((edge) => localNodeIds.includes(edge.data.source))
.filter((edge) => localNodeIds.includes(edge.data.target));
// Filter self-reference edges // Filter self-reference edges
localEdges = localEdges.filter(edge => edge.data.source !== edge.data.target) localEdges = localEdges.filter(
(edge) => edge.data.source !== edge.data.target,
);
// TODO: Find out why target ==='/' in some case // TODO: Find out why target ==='/' in some case
localEdges = localEdges.filter(edge => edge.data.target !== '/') localEdges = localEdges.filter((edge) => edge.data.target !== "/");
return { return {
nodes: localNodes, nodes: localNodes,
edges: localEdges edges: localEdges,
} };
} else { } else {
const filteredEdges = newEdges const filteredEdges = newEdges
.filter(edge => existingNodeIDs.includes(edge.data.source)) .filter((edge) => existingNodeIDs.includes(edge.data.source))
.filter(edge => existingNodeIDs.includes(edge.data.target)) .filter((edge) => existingNodeIDs.includes(edge.data.target));
return { return {
nodes: newNodes, nodes: newNodes,
edges: filteredEdges edges: filteredEdges,
} };
} }
} }
getAllSlugs() { getAllSlugs() {
// console.log("\n\nAll Posts are scanning") // console.log("\n\nAll Posts are scanning")
// Get file names under /posts // Get file names under /posts
const markdownFolder = Node.getMarkdownFolder() const markdownFolder = Node.getMarkdownFolder();
const markdownFiles = Node.getFiles(markdownFolder) const markdownFiles = Node.getFiles(markdownFolder);
const filePaths = markdownFiles.filter(file => !(Boolean(file.endsWith('index')) || Boolean(file.endsWith('sidebar')))) const filePaths = markdownFiles.filter(
return filePaths.map(f => this.toSlug(f)) (file) =>
!(Boolean(file.endsWith("index")) || Boolean(file.endsWith("sidebar"))),
);
return filePaths.map((f) => this.toSlug(f));
} }
/** Gets all directories - if cached already, gets cached */ /** Gets all directories - if cached already, gets cached */
getDirectoryData() { getDirectoryData() {
if (this._directoryData) return this._directoryData if (this._directoryData) return this._directoryData;
const filteredDirectory = dirTree(Node.getMarkdownFolder(), { extensions: /\.md/, exclude: [/\.git/, /\.obsidian/] }) const filteredDirectory = dirTree(Node.getMarkdownFolder(), {
const convertedDirectoryData = this.convertObject(filteredDirectory) extensions: /\.md/,
this._directoryData = convertedDirectoryData exclude: [/\.git/, /\.obsidian/],
return this._directoryData });
const convertedDirectoryData = this.convertObject(filteredDirectory);
this._directoryData = convertedDirectoryData;
return this._directoryData;
} }
convertObject(thisObject) { convertObject(thisObject) {
const children = [] const children = [];
const slugs = this.getAllSlugs() const slugs = this.getAllSlugs();
function findFunc(_this, slug) { function findFunc(_this, slug) {
const fileName = Transformer.parseFileNameFromPath(_this.toFilePath(slug)) const fileName = Transformer.parseFileNameFromPath(
return Transformer.normalizeFileName(fileName) === Transformer.normalizeFileName(thisObject.name) _this.toFilePath(slug),
);
return (
Transformer.normalizeFileName(fileName) ===
Transformer.normalizeFileName(thisObject.name)
);
} }
const foundSlugs = slugs.find(slug => findFunc(this, slug)) const foundSlugs = slugs.find((slug) => findFunc(this, slug));
const blacklist = [null, undefined];
let routerPath = foundSlugs !== (null | undefined) ? foundSlugs : null let routerPath = !blacklist.includes(foundSlugs) ? foundSlugs : null;
routerPath = !blacklist.includes(routerPath)
? "/notes/" + routerPath
: null;
routerPath = routerPath !== (null | undefined) ? '/notes/' + routerPath : null
const newObject = { const newObject = {
name: thisObject.name, name: thisObject.name,
children, children,
id: (this._counter++).toString(), id: (this._counter++).toString(),
routePath: routerPath !== (null | undefined) ? routerPath : null routePath: !blacklist.includes(routerPath) ? routerPath : null,
} };
if (thisObject.children != null && thisObject.children.length > 0) { if (thisObject.children != null && thisObject.children.length > 0) {
thisObject.children.forEach(aChild => { thisObject.children.forEach((aChild) => {
const newChild = this.convertObject(aChild) const newChild = this.convertObject(aChild);
children.push(newChild) children.push(newChild);
}) });
return newObject return newObject;
} else { } else {
return newObject return newObject;
} }
} }
flat = (array) => { flat = (array) => {
let result = [] let result = [];
const outerThis = this const outerThis = this;
// eslint-disable-next-line @typescript-eslint/space-before-function-paren // eslint-disable-next-line @typescript-eslint/space-before-function-paren
array.forEach(function(a) { array.forEach(function (a) {
result.push(a) result.push(a);
if (Array.isArray(a.children)) { if (Array.isArray(a.children)) {
result = result.concat(outerThis.flat(a.children)) result = result.concat(outerThis.flat(a.children));
}
})
return result
} }
});
return result;
};
getFlattenArray(thisObject) { getFlattenArray(thisObject) {
return this.flat(thisObject.children) return this.flat(thisObject.children);
} }
} }
const util = new Util() const util = new Util();
export default util export default util;

26
pages/notes/index.tsx
View File

@ -28,25 +28,25 @@ export function getStaticProps() {
const tree = Util.convertObject(Util.getDirectoryData()) const tree = Util.convertObject(Util.getDirectoryData())
const contentData = Util.getSinglePost('index') const contentData = Util.getSinglePost('index')
const flattenNodes = Util.getFlattenArray(tree) const flattenNodes = Util.getFlattenArray(tree)
const listOfEdges = edges // const listOfEdges = edges
.filter((anEdge) => ( // .filter((anEdge) => (
anEdge as { target: string }).target === 'index' // anEdge as { target: string }).target === 'index'
) // )
const internalLinks = listOfEdges.map( // const internalLinks = listOfEdges.map(
anEdge => nodes // anEdge => nodes
.find( // .find(
aNode => ( // aNode => (
aNode as { slug: string }).slug === (anEdge as { source: string }).source)) // aNode as { slug: string }).slug === (anEdge as { source: string }).source))
.filter( // .filter(
element => element !== undefined) // element => element !== undefined)
const backLinks = [...new Set(internalLinks)] //const backLinks = [...new Set(internalLinks)]
return { return {
props: { props: {
content: contentData.data, content: contentData.data,
tree, tree,
flattenNodes, flattenNodes,
backLinks, // backLinks,
body_class_name: 'm-0 p-0' body_class_name: 'm-0 p-0'
} }
} }