hexo-swpp 3.3.2 → 3.3.4

package/README.md

@@ -75,6 +75,8 @@ module.exports.config = {
   1. 版本检查改为仅在执行 `hexo server` 时执行 \[3.3.0]
   2. 支持自定义版本更新检查的 URL \[3.3.0]
   3. 修复有时更新代码不执行的问题 \[3.3.1]
+  4. 修改 DOM JS 的插入位置（从 body 中移动到 head 中） \[3.3.2]
+  5. 修复 hexo7 中无法排序 tags 的问题 \[3.3.3]
 
 + 3.2+
 

package/dist/index.js

@@ -178,18 +178,41 @@ function sort(hexo) {
         const result = a.length === b.length ? a < b : a.length < b.length;
         return result ? -1 : 1;
     };
-    const sort = (obj, value) => {
+    const sort = (obj, value, keyName) => {
         if (!obj)
             return;
         const target = obj.data ?? obj;
-        if (!target.sort)
-            return;
-        if (typeof value === 'boolean') {
-            if (value)
-                target.sort(compare);
+        if ('sort' in target) {
+            if (typeof value === 'boolean') {
+                if (value)
+                    target.sort(compare);
+            }
+            else {
+                target.sort((a, b) => compare(a[value], b[value]));
+            }
+        }
+        else if (typeof value !== 'boolean') {
+            const keyList = Object.getOwnPropertyNames(target);
+            if (keyList.length === 0)
+                return;
+            if (!(value in target[keyList[0]])) {
+                console.warn(`排序时出现问题，某个键（该键的 key 为“${keyName}”）的排序规则存在问题`);
+                return;
+            }
+            const result = [];
+            for (let key of keyList) {
+                result.push(target[key]);
+                console.assert(!target[key]._id || target[key]._id == key, `排序是出现问题，_id 值异常：${target[key]._id} with ${key}`);
+                target[key]._id = key;
+                delete target[key];
+            }
+            result.sort((a, b) => compare(a[value], b[value]));
+            for (let item of result) {
+                target[item._id] = item[value];
+            }
         }
         else {
-            target.sort((a, b) => compare(a[value], b[value]));
+            console.warn(`排序时出现问题，某个键（该键的 key 为“${keyName}”）的排序规则存在问题`);
         }
     };
     const list = {
@@ -203,11 +226,11 @@ function sort(hexo) {
     Locals.get = function (name) {
         const result = getter.call(this, name);
         if (name in list)
-            sort(result, list[name]);
+            sort(result, list[name], name);
         if ('forEach' in result) {
             result.forEach((it) => {
                 for (let tag in list)
-                    sort(it[tag], list[tag]);
+                    sort(it[tag], list[tag], tag);
             });
         }
         return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-swpp",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
   "files": [
@@ -24,7 +24,7 @@
   "devDependencies": {
     "@types/node": "^20.4.7",
     "@types/node-fetch": "^2.6.4",
-    "hexo": "7.0.0-rc2",
+    "hexo": "7.0.0",
     "typescript": "^5.1.6"
   },
   "dependencies": {