perf: use hash map for generating short keys

nuxt · pi0 · Jul 7, 2022 · May 12, 2022 · May 12, 2022 · May 12, 2022
commit ae61515cc60ddac3eaf2ad12654a91392219024f
diff --git a/packages/nuxt/src/app/composables/asyncData.ts b/packages/nuxt/src/app/composables/asyncData.ts
@@ -72,9 +72,11 @@ export function useAsyncData<
   // eslint-disable-next-line prefer-const
   let [key, handler, options] = (typeof _key === 'string'
     ? [_key, _handler, _options]
-    : typeof _options === 'string'
-      ? [_options, _key, {}]
-      : [fallback, _key, _options]
+    : typeof _handler === 'string'
+      ? [_handler, _key, {}]
+      : typeof _options === 'string'
+        ? [_options, _key, {}]
+        : [fallback, _key, _options]
   ) as [string, (ctx?: NuxtApp) => Promise<DataT>, AsyncDataOptions<DataT, Transform, PickKeys>]
   // Validate arguments
   if (typeof key !== 'string') {

diff --git a/packages/vite/src/plugins/composable-keys.ts b/packages/vite/src/plugins/composable-keys.ts
@@ -14,10 +14,21 @@ export interface ComposableKeysOptions {
   rootDir?: string
 }
 
+const hashMap: Record<string, string> = {}
+
 function createKey (source: string) {
-  const hash = crypto.createHash('md5')
-  hash.update(source)
-  return hash.digest('base64').toString()
+  let outputLength = 3
+  do {
+    const hash = crypto.createHash('md5')
+    hash.update(source)
+    const key = hash.digest('base64').toString().slice(0, outputLength)
+    if (key in hashMap && hashMap[key] !== source) {
+      outputLength++
+      continue
+    }
+    hashMap[key] = source
+    return key
+  } while (true)
 }
 
 const keyedFunctions = [
@@ -49,7 +60,7 @@ export const composableKeysPlugin = (options: ComposableKeysOptions = {}): Plugi
             const end = (node as any).end
             s.appendLeft(
               codeIndex + end - 1,
-              (node.arguments.length ? ', ' : '') + "'" + createKey(`${relativeID}-${codeIndex + end}`) + "'"
+              (node.arguments.length ? ', ' : '') + "'$" + createKey(`${relativeID}-${codeIndex + end}`) + "'"
             )
           }
         }