fix: tagPriority number sorting

Author: harlan-zw

package.json

@@ -44,10 +44,10 @@
     "lint": "eslint \"{packages,test}/**/*.{ts,vue,json,yml}\" --fix"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.29.3",
+    "@antfu/eslint-config": "^0.29.4",
     "@types/fs-extra": "^9.0.13",
-    "@types/jsdom": "^20.0.0",
-    "@vitest/ui": "^0.24.5",
+    "@types/jsdom": "^20.0.1",
+    "@vitest/ui": "^0.25.0",
     "@vue/server-renderer": "^3.2.41",
     "bumpp": "^8.2.1",
     "eslint": "^8.27.0",
@@ -56,7 +56,7 @@
     "typescript": "^4.8.4",
     "unbuild": "^0.9.4",
     "utility-types": "^3.10.0",
-    "vitest": "^0.24.5",
+    "vitest": "^0.25.0",
     "vue": "^3.2.41"
   },
   "dependencies": {

packages/dom/package.json

@@ -38,6 +38,6 @@
     "@unhead/schema": "workspace:*"
   },
   "devDependencies": {
-    "zhead": "1.0.0-beta.4"
+    "zhead": "1.0.0-beta.5"
   }
 }

packages/ssr/package.json

@@ -38,6 +38,6 @@
     "@unhead/schema": "workspace:*"
   },
   "devDependencies": {
-    "zhead": "1.0.0-beta.4"
+    "zhead": "1.0.0-beta.5"
   }
 }

packages/unhead/package.json

@@ -39,6 +39,6 @@
     "hookable": "^5.4.1"
   },
   "devDependencies": {
-    "zhead": "1.0.0-beta.4"
+    "zhead": "1.0.0-beta.5"
   }
 }

packages/unhead/src/normalise.ts

@@ -1,49 +1,17 @@
 import type { Head, HeadEntry, HeadTag } from '@unhead/schema'
-import { ValidHeadTags, normaliseTag as normaliseTagBase } from 'zhead'
-import { TagConfigKeys, asArray } from './util'
-
-export function normaliseTag<T>(tagName: HeadTag['tag'], input: HeadTag['props'], entry: HeadEntry<T>): HeadTag | HeadTag[] {
-  const tag = normaliseTagBase(tagName, input, { childrenKeys: ['innerHTML', 'textContent'] }) as HeadTag
-  tag._e = entry._i
-
-  // keys with direct mapping
-  Object.keys(tag.props)
-    .filter(k => TagConfigKeys.includes(k))
-    .forEach((k) => {
-      // @ts-expect-error untyped
-      tag[k] = tag.props[k]
-      delete tag.props[k]
-    })
-  // class object boolean support
-  if (typeof tag.props.class === 'object' && !Array.isArray(tag.props.class)) {
-    tag.props.class = Object.keys(tag.props.class)
-      .filter(k => tag.props.class[k])
-  }
-  // class array support
-  if (Array.isArray(tag.props.class))
-    tag.props.class = tag.props.class.join(' ')
-
-  // allow meta to be resolved into multiple tags if an array is provided on content
-  if (tag.props.content && Array.isArray(tag.props.content)) {
-    return tag.props.content.map((v, i) => {
-      const newTag = { ...tag, props: { ...tag.props } }
-      newTag.props.content = v
-      newTag.key = `${tag.props.name || tag.props.property}:${i}`
-      return newTag
-    })
-  }
-  return tag
-}
+import { ValidHeadTags, normaliseTag } from 'zhead'
+import { asArray } from './util'
 
 export function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>) {
   return Object.entries(e.input)
     .filter(([k, v]) => typeof v !== 'undefined' && ValidHeadTags.includes(k))
     .map(([k, value]) => asArray(value)
     // @ts-expect-error untyped
-      .map(props => asArray(normaliseTag(k as HeadTag['tag'], props, e))),
+      .map(props => asArray(normaliseTag<HeadTag>(k as HeadTag['tag'], props, e))),
     )
     .flat(3)
     .map((t, i) => {
+      t._e = e._i
       // support 256 tags per entry
       t._p = (e._i << 8) + (i++)
       return t

packages/unhead/src/plugin/sortTagsPlugin.ts

@@ -1,24 +1,19 @@
-import { sortCriticalTags } from 'zhead'
+import { sortTags } from 'zhead'
 import { defineHeadPlugin } from '..'
 
 export const SortTagsPlugin = () => {
   return defineHeadPlugin({
     hooks: {
       'tags:resolve': (ctx) => {
         const tagIndexForKey = (key: string) => ctx.tags.find(tag => tag._d === key)?._p
+
         // 2a. Sort based on priority
         // now we need to check render priority for each before: rule and use the dedupe key index
         for (const tag of ctx.tags) {
-          if (!tag?.tagPriority)
-            continue
-
-          if (typeof tag.tagPriority === 'number') {
-            tag._p = tag.tagPriority
+          if (!tag.tagPriority || typeof tag.tagPriority === 'number')
             continue
-          }
-
-          const modifiers = [{ prefix: 'before:', offset: -1 }, { prefix: 'after:', offset: 1 }]
-          for (const { prefix, offset } of modifiers) {
+          const modifiers = [{prefix: 'before:', offset: -1}, {prefix: 'after:', offset: 1}]
+          for (const {prefix, offset} of modifiers) {
             if (tag.tagPriority.startsWith(prefix)) {
               const key = tag.tagPriority.replace(prefix, '')
               const index = tagIndexForKey(key)
@@ -32,7 +27,7 @@ export const SortTagsPlugin = () => {
           // 2b. sort tags in their natural order
           .sort((a, b) => a._p! - b._p!)
           // 2c. sort based on critical tags
-          .sort(sortCriticalTags)
+          .sort(sortTags)
       },
     },
   })

packages/unhead/src/util.ts

@@ -3,5 +3,3 @@ export type Arrayable<T> = T | Array<T>
 export function asArray<T>(value: Arrayable<T>): T[] {
   return Array.isArray(value) ? value : [value]
 }
-
-export const TagConfigKeys = ['tagPosition', 'tagPriority', 'tagDuplicateStrategy']