hexo-swpp 2.1.0 → 2.2.0

package/index.js

@@ -25,6 +25,41 @@ const {
 } = pluginConfig?.enable ? require(findScript()) : {}
 
 if (pluginConfig?.enable) {
+    // 排序
+    (() => {
+        const compare = (a, b) => {
+            const result = a.length === b.length ? a < b : a.length < b.length
+            return result ? -1 : 1
+        }
+        const sort = (obj, value) => {
+            if (!obj) return
+            const target = obj.data ?? obj
+            if (!target.sort) return
+            if (value !== false) target.sort((a, b) => compare(a[value], b[value]))
+            else target.sort(compare)
+        }
+        const list = {
+            posts: 'title',
+            pages: 'title',
+            tags: 'name',
+            categories: 'name'
+        }
+        Object.assign(list, pluginConfig.sort)
+        const Locals = require(`${nodePath.resolve('./', 'node_modules/hexo/lib/hexo/locals')}`).prototype
+        const get = Locals.get
+        Locals.get = function(name) {
+            const result = get.call(this, name)
+            if (name in list) sort(result, list[name])
+            if ('forEach' in result) {
+                result.forEach(it => {
+                    for (let tag in list)
+                        sort(it[tag], list[tag])
+                })
+            }
+            return result
+        }
+    })()
+
     // 生成 update.json
     hexo.extend.console.register('swpp', '生成前端更新需要的 json 文件以及相关缓存', {}, async () => {
         if (!fs.existsSync(config.public_dir))
@@ -128,6 +163,7 @@ if (pluginConfig?.enable) {
           </script>`
     }, "default")
 
+    // 插入 sw-dom.js
     if (!pluginConfig.dom?.custom) {
         hexo.extend.injector.register('body_begin', () => {
             // noinspection HtmlUnknownTarget
@@ -159,7 +195,7 @@ const eachAllFile = (root, cb) => {
 
 /** 判断指定文件是否需要排除 */
 const isExclude = pathname => {
-    for (let reg of pluginConfig.exclude) {
+    for (let reg of pluginConfig.json.exclude) {
         if (pathname.match(new RegExp(reg, 'i'))) return true
     }
     return false
@@ -361,26 +397,26 @@ const compare = (oldCache, newCache) => {
 
 /** 判断指定资源是否需要合并 */
 const isMerge = (pathname, tidied) => {
-    const optional = pluginConfig.merge
+    const optional = pluginConfig.json.merge
+    if (!optional) return false
     if (pathname.includes(`/${config.tag_dir}/`)) {
-        if (optional.tags ?? true) {
-            tidied.tags = true
-            return true
-        }
+        if (optional.tags ?? true)
+            return tidied.tags = true
     } else if (pathname.includes(`/${config.archive_dir}/`)) {
-        if (optional.archives ?? true) {
-            tidied.archives = true
-            return true
-        }
+        if (optional.archives ?? true)
+            return tidied.archives = true
     } else if (pathname.includes(`/${config.category_dir}/`)) {
-        if (optional.categories ?? true) {
-            tidied.categories = true
-            return true
-        }
+        if (optional.categories ?? true)
+            return tidied.categories = true
     } else if (pathname.startsWith('/page/') || pathname.length <= 1) {
-        if (optional.index ?? true) {
-            tidied.index = true
-            return true
+        if (optional.index ?? true)
+            return tidied.index = true
+    } else {
+        const list = optional.custom
+        if (!list) return false
+        for (let reg of list) {
+            if (pathname.startsWith(`/${reg}/`))
+                return tidied.custom[reg] = true
         }
     }
 }
@@ -446,7 +482,7 @@ const mergeUpdateWithOld = (newInfo, oldUpdate, tidied) => {
         global: (oldUpdate?.global ?? 0) + (tidied.updateGlobal ? 1 : 0),
         info: [newInfo]
     }
-    const charLimit = pluginConfig.charLimit ?? 1024
+    const charLimit = pluginConfig.json.charLimit ?? 1024
     if (JSON.stringify(result).length > charLimit) {
         return {
             global: result.global,
@@ -498,13 +534,13 @@ const zipInfo = (newInfo, oldInfo) => {
 
 // 将更新推送到 info
 const pushUpdateToInfo = (info, tidied) => {
+    const merges = []       // 要合并的更新
     // 推送页面更新
-    if (tidied.page.size > (pluginConfig.maxHtml ?? 15)) {
+    if (tidied.page.size > (pluginConfig.json.maxHtml ?? 15)) {
         // 如果 html 数量超过阈值就直接清掉所有 html
         info.change.push({flag: 'html'})
     } else {
         const pages = []        // 独立更新
-        const merges = []       // 要合并的更新
         tidied.page.forEach(it => pages.push(it))
         if (tidied.tags) merges.push(config.tag_dir)
         if (tidied.archives) merges.push(config.archive_dir)
@@ -513,11 +549,12 @@ const pushUpdateToInfo = (info, tidied) => {
             pages.push(clipPageName(root, false))
             merges.push('page')
         }
-        if (merges.length > 0)
-            info.change.push({flag: 'str', value: merges.map(it => `/${it}/`)})
         if (pages.length > 0)
             info.change.push({flag: 'page', value: pages})
     }
+    for (let key in tidied.custom) merges.push(key)
+    if (merges.length > 0)
+        info.change.push({flag: 'str', value: merges.map(it => `/${it}/`)})
     // 推送文件更新
     if (tidied.file.size > 0) {
         const list = []
@@ -526,7 +563,7 @@ const pushUpdateToInfo = (info, tidied) => {
     }
 }
 
-// 将 diff 整理分类，并将 expand 整合到
+// 将 diff 整理分类，并将 expand 整合到结果中
 const tidyDiff = (dif, expand) => {
     const tidied = {
         /** 所有 HTML 页面 */
@@ -541,10 +578,12 @@ const tidyDiff = (dif, expand) => {
         categories: false,
         /** 标记 index 是否更新 */
         index: false,
+        /** 自定义配置项 */
+        custom: {},
         /** 标记是否更新 global 版本号 */
         updateGlobal: expand?.global
     }
-    const mode = pluginConfig.precisionMode
+    const mode = pluginConfig.json.precisionMode
     for (let it of dif) {
         const url = new URL(nodePath.join(root, it))  // 当前文件的 URL
         const cache = findCache(url)    // 查询缓存
@@ -553,8 +592,8 @@ const tidyDiff = (dif, expand) => {
             continue
         }
         if (!cache.clean) tidied.updateGlobal = true
+        if (isMerge(url.pathname, tidied)) continue
         if (it.match(/(\/|\.html)$/)) { // 判断缓存是否是 html
-            if (isMerge(it, tidied)) continue
             if (mode.html ?? false) tidied.page.add(url.pathname)
             else tidied.page.add(clipPageName(url.href, !it.endsWith('/')))
         } else {
@@ -598,22 +637,4 @@ function replaceDevRequest(url) {
         }
     }
     return url
-}
-
-/** 对 hexo 的全局变量进行排序，以保证每次生成的结果一致 */
-(() => {
-    const locals = hexo.locals
-    const compare = (a, b) => a < b ? -1 : 1
-    const sort = (name, value) => locals.get(name).data.sort((a, b) => compare(a[value], b[value]))
-    const list = {
-        posts: 'title',
-        pages: 'title',
-        tags: 'name',
-        categories: 'name'
-    }
-    for (let key in list) sort(key, list[key])
-    locals.get('posts').forEach(it => {
-        it.tags.data.sort((a, b) => compare(a.name, b.name))
-        it.categories.data.sort((a, b) => compare(a.name, b.name))
-    })
-})()
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-swpp",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "main": "index.js",
   "dependencies": {
     "hexo-log": "^3.0.0",