WIP

metalsmith · Jan 19, 2024 · 0cbaaf1 · 0cbaaf1
1 parent 4b60c50
commit 0cbaaf1
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 21 deletions.
diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -58,6 +58,12 @@ export type Linkset = {
     pattern?: string;
     /**
      * [Slugify options](https://github.com/simov/slugify) or a custom slug function of the form `(pathpart) => string`
+     * @default 
+     * {
+     *   lower: true, 
+     *   remove: /[^\\w\\s$_+~.()!\\-@/]|[<>:"|?*]/g,
+     *   extend: {':': '-', '|': '-', '<': '', '>': ''}
+     * }
      */
     slug?: SlugifyOptions | slugFunction;
     /**

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/index.js b/src/index.js
@@ -76,7 +76,7 @@ const dupeHandlers = {
 // These are the invalid path chars on Windows, on *nix systems all are valid except forward slash.
 // However, it is highly unlikely that anyone would want these to appear in a file path and they can still be overridden if necessary
 const invalidPathChars = '[<>:"|?*]'
-const defaultSlugifyRemoveChars = '[^\\w\\s$_+~.()!\\-@\\/]+'
+const defaultSlugifyRemoveChars = `[^\\w\\s$_+~.()!\\-@/]+`
 const emptyStr = ''
 const dash = '-'
 
@@ -94,7 +94,6 @@ const defaultLinkset = {
       // by default slugify strips these, resulting in word concatenation. Map these chars to dash to force a word break
       ':': dash,
       '|': dash,
-      '/': dash,
       // by default slugify translates these to "smaller" & "greater", unwanted when a <html> tag is in the permalink
       '<': emptyStr,
       '>': emptyStr
@@ -203,7 +202,6 @@ const replace = ({ pattern, ...options }, data) => {
       ret[key] = options.slug(val.toString())
     }
   }
-
   let transformed = route.inject(remapped, ret)
   if (path.basename(transformed) === path.basename(options.directoryIndex, path.extname(options.directoryIndex)))
     transformed = path.dirname(transformed)

diff --git a/test/fixtures/no-pattern/expected/two/levels/deep/index.html b/test/fixtures/no-pattern/expected/two/levels/deep/index.html
@@ -0,0 +1 @@
+nested
diff --git a/test/fixtures/no-pattern/src/two/levels/deep.html b/test/fixtures/no-pattern/src/two/levels/deep.html
@@ -0,0 +1 @@
+nested
diff --git a/...head-essential-tags-meta-title/index.html → ...head-essential-tags-meta/title/index.html b/...head-essential-tags-meta-title/index.html → ...head-essential-tags-meta/title/index.html
diff --git a/...ial-chars-in-html-f-ward-slash/index.html → ...ial-chars-in-html-f-ward/slash/index.html b/...ial-chars-in-html-f-ward-slash/index.html → ...ial-chars-in-html-f-ward/slash/index.html