refactor: simplify structure

inline small runtime utils to the same file

Author: pi0

src/index.ts

@@ -1,9 +1,4 @@
-import { Manifest } from './manifest'
-
 export { normalizeViteManifest } from './vite'
 export { normalizeWebpackManifest } from './webpack'
-export type { Manifest, ResourceMeta } from './manifest'
 
-export function defineManifest (manifest: Manifest): Manifest {
-  return manifest
-}
+export * from './types'

src/runtime.ts

@@ -1,6 +1,5 @@
 import { withLeadingSlash } from 'ufo'
-import type { Manifest, ResourceMeta } from './manifest'
-import { LinkAttributes, renderLinkToHeader, renderLinkToString, renderScriptToString } from './runtime/utils'
+import type { Manifest, ResourceMeta } from './types'
 
 export interface ModuleDependencies {
   scripts: Record<string, ResourceMeta>
@@ -267,3 +266,26 @@ export function createRenderer (createApp: any, renderOptions: RenderOptions & {
     }
   }
 }
+
+// --- Internal ---
+
+interface LinkAttributes {
+  rel: string | null
+  href: string
+  as?: string | null
+  type?: string | null
+  crossorigin?: '' | null
+}
+
+// Utilities to render script and link tags, and link headers
+function renderScriptToString (attrs: Record<string, string | null>) {
+  return `<script${Object.entries(attrs).map(([key, value]) => value === null ? '' : value ? ` ${key}="${value}"` : ' ' + key).join('')}></script>`
+}
+
+function renderLinkToString (attrs: LinkAttributes) {
+  return `<link${Object.entries(attrs).map(([key, value]) => value === null ? '' : value ? ` ${key}="${value}"` : ' ' + key).join('')}>`
+}
+
+function renderLinkToHeader (attrs: LinkAttributes) {
+  return `<${attrs.href}>${Object.entries(attrs).map(([key, value]) => key === 'href' || value === null ? '' : value ? `; ${key}="${value}"` : `; ${key}`).join('')}`
+}

src/runtime/utils.ts

@@ -18,3 +18,7 @@ export interface ResourceMeta {
 export interface Manifest {
   [key: string]: ResourceMeta
 }
+
+export function defineManifest (manifest: Manifest): Manifest {
+  return manifest
+}

src/manifest.ts renamed to src/types.ts

@@ -1,4 +1,4 @@
-import type { ResourceMeta } from './manifest'
+import type { ResourceMeta } from './types'
 
 const IS_JS_RE = /\.[cm]?js(\?[^.]+)?$/
 const HAS_EXT_RE = /[^./]+\.[^./]+$/

src/utils.ts

@@ -1,5 +1,5 @@
 import type { Manifest as ViteManifest } from 'vite'
-import type { Manifest } from './manifest'
+import type { Manifest } from './types'
 import { parseResource } from './utils'
 
 export function normalizeViteManifest (manifest: ViteManifest | Manifest): Manifest {

src/vite.ts

@@ -1,4 +1,4 @@
-import type { Manifest } from './manifest'
+import type { Manifest } from './types'
 import { isJS, isCSS, parseResource } from './utils'
 
 // Comment out in dev mode for better type support
@@ -17,12 +17,6 @@ export interface WebpackClientManifest {
   hasNoCssVersion?: { [file: string]: boolean }
 }
 
-function getIdentifier (output: OutputPath): Identifier
-function getIdentifier (output?: undefined): null
-function getIdentifier (output?: OutputPath): null | Identifier {
-  return output ? `_${output}` as Identifier : null
-}
-
 export function normalizeWebpackManifest (manifest: WebpackClientManifest): Manifest {
   // Upgrade webpack manifest
   // https://github.com/nuxt-contrib/vue-bundle-renderer/issues/12
@@ -111,3 +105,9 @@ export function normalizeWebpackManifest (manifest: WebpackClientManifest): Mani
 
   return clientManifest
 }
+
+function getIdentifier (output: OutputPath): Identifier
+function getIdentifier (output?: undefined): null
+function getIdentifier (output?: OutputPath): null | Identifier {
+  return output ? `_${output}` as Identifier : null
+}

src/webpack.ts

@@ -2,7 +2,7 @@ import { expectTypeOf } from 'expect-type'
 import { describe, it } from 'vitest'
 
 import type { Manifest as ViteManifest } from 'vite'
-import type { Manifest, ResourceMeta } from '../src/manifest'
+import type { Manifest, ResourceMeta } from '../src/types'
 
 describe('manifest', () => {
   it('matches vite types', () => {