feat: slugify ids

graphlab-fr · Dec 2, 2024 · ec7c134 · ec7c134
1 parent 21dbcd0
commit ec7c134
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 43 deletions.
diff --git a/core/models/record.js b/core/models/record.js
@@ -69,27 +69,12 @@ export default class Record {
   static recordFromFile(file, config) {
     const { content, head } = readYmlFm(file, { schema: 'failsafe' });
 
-    const links = parseWikilinks(content, config);
-
     const props = {
       ...normalizeInput(head, config),
-      links,
+      links: parseWikilinks(content, config),
       content,
     };
 
-    if (typeof props.types === 'string') {
-      props.types = [props.types];
-    }
-    if (typeof props.tags === 'string') {
-      props.tags = [props.tags];
-    }
-    if (typeof props.begin === 'string') {
-      props.begin = new Date(props.begin).getTime() / 1000;
-    }
-    if (typeof props.end === 'string') {
-      props.end = new Date(props.end).getTime() / 1000;
-    }
-
     const { error } = schema.validate(props);
     if (error) {
       throw new Error(`Record contains error: ${error.message}`);
@@ -100,7 +85,7 @@ export default class Record {
         id: props.id,
         title: props.title,
         content: props.content,
-        links,
+        links: props.links,
         tags: props.tags,
         types: props.types,
         begin: props.begin,
@@ -141,8 +126,6 @@ export default class Record {
       },
       config,
     );
-
-    return undefined;
   }
 
   /**
@@ -154,6 +137,10 @@ export default class Record {
   static recordFromCiteItem(citeItem, config, bibliography) {
     const libraryItem = bibliography.library[citeItem.id];
 
+    if (!libraryItem) {
+      throw new Error(`Library item "${citeItem.id}" is unknown`);
+    }
+
     const props = {
       id: citeItem.id,
       title: libraryItem['title'],
@@ -318,6 +305,9 @@ function normalizeInput(head, config) {
     ...normalizedHead,
   };
 
+  if (!props.id && props.title) {
+    props.id = props.title;
+  }
   if (typeof props.types === 'string') {
     props.types = [props.types];
   }
@@ -331,6 +321,10 @@ function normalizeInput(head, config) {
     props.end = new Date(props.end).getTime() / 1000;
   }
 
+  if (props.id) {
+    props.id = slugify(props.id);
+  }
+
   if (props.types) {
     const knownTypes = config.getTypesRecords();
     props.types = props.types.reduce((acc, curr, i, arr) => {

diff --git a/core/models/record.spec.js b/core/models/record.spec.js
@@ -61,27 +61,6 @@ describe('Record model', () => {
     expect(record.thumbnail).toBeUndefined();
   });
 
-  it('should generate the correct YAML front matter', () => {
-    const record = new Record(props, config);
-
-    const file = record.getFileContent(true);
-
-    expect(file).toEqual(`---
-id: "20200501150208"
-title: Test Record
-types:
-  - type1
-  - type2
-tags:
-  - tag1
-  - tag2
-thumbnail: img.jpg
-author: John Doe
----
-
-This is a test content`);
-  });
-
   it('should generate YAML front matter with id', () => {
     const record = new Record({ ...props, tags: undefined }, config);
 
@@ -164,6 +143,29 @@ File linked to [[20210901132906]]`;
     });
   });
 
+  it('should title became id if no id', () => {
+    const file = `---
+title: Test Record
+---
+
+Content`;
+
+    const result = Record.recordFromFile(file, config);
+    expect(result).toEqual({
+      id: 'test-record',
+      title: 'Test Record',
+      content: '\n\nContent',
+      links: [],
+      types: ['undefined'],
+      tags: [],
+      metas: {},
+      begin: undefined,
+      end: undefined,
+      thumbnail: undefined,
+      config: config,
+    });
+  });
+
   it('should get from citeproc item', () => {
     /** @type {import('../utils/citeExtractor.js'.CiteItem)} */
     const citeItem = {

diff --git a/core/utils/convertWikilinks.js b/core/utils/convertWikilinks.js
@@ -1,3 +1,5 @@
+import slugify from './slugify';
+
 const wikilinkRE = new RegExp(/\[\[((?<type>[^:|\]]+?):)?(?<id>.+?)(\|(?<text>.+?))?\]\]/, 'g');
 
 /**
@@ -12,7 +14,7 @@ const wikilinkRE = new RegExp(/\[\[((?<type>[^:|\]]+?):)?(?<id>.+?)(\|(?<text>.+
 
 function convertWikilinks(markdown, records, opts, idToHighlight) {
   return markdown.replace(wikilinkRE, (match, _, type, targetId, __, text) => {
-    const record = records.get(targetId.toLowerCase());
+    const record = records.get(slugify(targetId));
 
     if (!record) return match;
 

diff --git a/core/utils/parseWikilinks.js b/core/utils/parseWikilinks.js
@@ -1,4 +1,5 @@
 import extractParaphs from './paraphExtractor';
+import slugify from './slugify';
 
 /**
  * @typedef Link
@@ -27,7 +28,7 @@ export default function parseWikilinks(markdown, config) {
 
   for (const match of markdown.matchAll(wikilinkRE) || []) {
     const [full, _, type, id, __, placeholder] = match;
-    const target = id.toLowerCase();
+    const target = slugify(id);
 
     linksDict.set(target, {
       type: type || 'undefined',
@@ -40,7 +41,7 @@ export default function parseWikilinks(markdown, config) {
   extractParaphs(markdown).forEach((paraph) => {
     for (const match of paraph.matchAll(wikilinkRE)) {
       const [full, _, type, id] = match;
-      const target = id.toLowerCase();
+      const target = slugify(id);
 
       linksDict.get(target).contexts.add(paraph);
     }