@tenjuu99/blog 0.2.40 → 0.2.42

package/lib/contentTypes.js

@@ -0,0 +1,33 @@
+import helper from './helper.js'
+
+const contentTypes = {
+  'text': 'text/plain',
+  'html': 'text/html',
+  'css': 'text/css',
+  'js': 'text/javascript',
+  'jpg': 'image/jpeg',
+  'jpeg': 'image/jpeg',
+  'png': 'image/png',
+  'webp': 'image/webp',
+  'avif': 'image/avif',
+  'svg': 'image/svg+xml',
+  'json': 'application/json',
+  'xml': 'application/xml',
+  'rdf': 'application/rdf+xml',
+  'rss': 'application/rss+xml',
+}
+
+const contentType = (ext) => {
+  if (helper['contentTypes']) {
+    const additionalContentTypes = helper['contentTypes']
+    if (additionalContentTypes[ext]) {
+      return additionalContentTypes[ext]
+    }
+  }
+  if (contentTypes[ext]) {
+    return contentTypes[ext]
+  }
+  return 'application/octet-stream'
+}
+
+export default contentType

package/lib/pageData.js

@@ -10,6 +10,15 @@ const parse = (content, name, ext) => {
   const regexp = new RegExp(/^(<!|-)--(?<variables>[\s\S]*?)--(-|>)/)
   const matched = content.match(regexp)
   const markdownReplaced = content.replace(regexp, '')
+  const fullUrl = (data) => {
+    const base = data.url_base + (data.relative_path ?? '')
+    let url = data.url
+    url = url.replace(/\/index$/, '/')
+    if (data.ext !== 'html') {
+      url = url + '.' + data.ext
+    }
+    return base + encodeURI(url)
+  }
   const metaDataDefault = Object.assign({
     name,
     title: name,
@@ -32,6 +41,7 @@ const parse = (content, name, ext) => {
     __filetype: ext,
   }, config)
   if (!matched) {
+    metaDataDefault.full_url = fullUrl(metaDataDefault)
     return metaDataDefault
   }
   const metaData = Object.fromEntries(
@@ -52,6 +62,7 @@ const parse = (content, name, ext) => {
     })
   )
   const metaDataMerged = Object.assign(metaDataDefault, metaData)
+  metaDataMerged.full_url = fullUrl(metaDataMerged)
   metaDataMerged['__output'] = name === 'index' ? '/index.html' : `${metaDataMerged.url}.${metaDataMerged.ext}`
 
   return metaDataMerged

package/lib/server.js

@@ -4,34 +4,7 @@ import fs from 'node:fs'
 import { distDir, serverDir } from './dir.js'
 import { styleText } from 'node:util'
 import handle from './tryServer.js'
-
-const contentType = (ext) => {
-    switch (ext) {
-      case 'txt':
-        return 'text/plain'
-      case 'html':
-      case 'css':
-        return `text/${ext}`
-      case 'js':
-        return 'text/javascript'
-      case 'jpeg':
-      case 'png':
-      case 'webp':
-      case 'avif':
-        return `image/${ext}`
-      case 'jpg':
-        return 'image/jpeg'
-      case 'svg':
-        return 'image/svg+xml'
-      case 'xml':
-      case 'json':
-        return `application/${ext}`
-      case 'rdf':
-        return 'application/rdf+xml.rdf'
-      default:
-        return 'application/octet-stream'
-    }
-}
+import contentType from './contentType.js'
 
 const server = () => {
   return http.createServer(async (request, response) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tenjuu99/blog",
-  "version": "0.2.40",
+  "version": "0.2.42",
   "description": "blog template",
   "main": "index.js",
   "scripts": {

package/src-sample/template/csstest.html

@@ -7,7 +7,7 @@
   {if noindex}
   <meta name="robots" content="noindex" />
   {/if}
-  <meta property="og:url" content="{{URL_BASE}}{{URL}}">
+  <meta property="og:url" content="{{FULL_URL}}">
   <meta property="og:title" content="{{TITLE}}">
   {if og_image}
   <meta property="og:image" content="{{OG_IMAGE}}">

package/src-sample/template/default.html

@@ -7,7 +7,7 @@
   {if noindex}
   <meta name="robots" content="noindex" />
   {/if}
-  <meta property="og:url" content="{{URL_BASE}}{{URL}}">
+  <meta property="og:url" content="{{FULL_URL}}">
   <meta property="og:title" content="{{TITLE}}">
   {if og_image}
   <meta property="og:image" content="{{OG_IMAGE}}">