refactor: utilize knitwork to generate safe variable names (nitrojs#447)

package.json

@@ -73,6 +73,7 @@
     "is-primitive": "^3.0.1",
     "jiti": "^1.14.0",
     "klona": "^2.0.5",
+    "knitwork": "^0.1.2",
     "listhen": "^0.2.15",
     "mime": "^3.0.0",
     "mlly": "^0.5.14",

src/rollup/plugins/dynamic-require.ts

@@ -2,7 +2,7 @@ import { pathToFileURL } from 'url'
 import { resolve } from 'pathe'
 import { globby } from 'globby'
 import type { Plugin } from 'rollup'
-import { serializeImportName } from '../../utils'
+import { genSafeVariableName } from 'knitwork'
 
 const PLUGIN_NAME = 'dynamic-require'
 const HELPER_DYNAMIC = `\0${PLUGIN_NAME}.mjs`
@@ -66,7 +66,7 @@ export function dynamicRequire ({ dir, ignore, inline }: Options): Plugin {
       const chunks = (await Promise.all(files.map(async id => ({
         id,
         src: resolve(dir, id).replace(/\\/g, '/'),
-        name: serializeImportName(id),
+        name: genSafeVariableName(id),
         meta: await getWebpackChunkMeta(resolve(dir, id))
       })))).filter(chunk => chunk.meta)
 

src/rollup/plugins/storage.ts

@@ -1,5 +1,5 @@
 import { builtinDrivers } from 'unstorage'
-import { serializeImportName } from '../../utils'
+import { genImport, genSafeVariableName } from 'knitwork'
 import type { Nitro } from '../../types'
 import { virtual } from './virtual'
 
@@ -44,15 +44,15 @@ for (const base of bundledStorage) {
 import { createStorage } from 'unstorage'
 import { assets } from '#internal/nitro/virtual/server-assets'
 
-${driverImports.map(i => `import ${serializeImportName(i)} from '${i}'`).join('\n')}
+${driverImports.map(i => genImport(i, genSafeVariableName(i))).join('\n')}
 
 const storage = createStorage({})
 
 export const useStorage = () => storage
 
 storage.mount('/assets', assets)
 
-${mounts.map(m => `storage.mount('${m.path}', ${serializeImportName(m.driver)}(${JSON.stringify(m.opts)}))`).join('\n')}
+${mounts.map(m => `storage.mount('${m.path}', ${genSafeVariableName(m.driver)}(${JSON.stringify(m.opts)}))`).join('\n')}
 
 ${(!isDevOrPrerender && nitro.options.bundledStorage.length) ? bundledStorageCode : ''}
 `

src/utils/index.ts

@@ -105,11 +105,6 @@ export function getDependencies (dir: string, mode: keyof typeof _getDependencie
   return dependencies
 }
 
-// TODO: Refactor to scule (https://github.com/unjs/scule/issues/6)
-export function serializeImportName (id: string) {
-  return '_' + id.replace(/[^a-zA-Z0-9_$]/g, '_')
-}
-
 export function readPackageJson (
   packageName: string,
   _require: NodeRequire = createRequire(import.meta.url)