chore: lint

Author: danielroe

package.json

@@ -38,7 +38,7 @@
     "dev": "vitest",
     "demo": "vite dev playground",
     "demo:dev": "pnpm demo --config test/vite.config.mjs",
-    "lint": "eslint --fix .",
+    "lint": "eslint .",
     "prepare": "simple-git-hooks install && pnpm build",
     "prepublishOnly": "pnpm lint && pnpm test",
     "release": "pnpm test && bumpp && npm publish",

playground/vite.config.mjs

@@ -1,5 +1,5 @@
-import { defineConfig } from 'vite'
 import { FontaineTransform } from 'fontaine'
+import { defineConfig } from 'vite'
 
 export default defineConfig({
   plugins: [

src/css.ts

@@ -1,11 +1,5 @@
 import type { Font } from '@capsizecss/unpack'
-import {
-  charIn,
-  charNotIn,
-  createRegExp,
-  exactly,
-  whitespace,
-} from 'magic-regexp'
+import { charIn, charNotIn, createRegExp, exactly, whitespace } from 'magic-regexp'
 
 // See: https://github.com/seek-oss/capsize/blob/master/packages/core/src/round.ts
 function toPercentage(value: number, fractionDigits = 4) {
@@ -84,7 +78,7 @@ interface FallbackOptions {
    * The fallback font family name.
    */
   font: string
-  
+
   /**
    * Metrics for fallback face calculations.
    * @optional
@@ -109,12 +103,7 @@ export type FontFaceMetrics = Pick<
  * @returns {string} - The full `@font-face` CSS declaration.
  */
 export function generateFontFace(metrics: FontFaceMetrics, fallback: FallbackOptions) {
-  const {
-    name: fallbackName,
-    font: fallbackFontName,
-    metrics: fallbackMetrics,
-    ...properties
-  } = fallback
+  const { name: fallbackName, font: fallbackFontName, metrics: fallbackMetrics, ...properties } = fallback
 
   // Credits to: https://github.com/seek-oss/capsize/blob/master/packages/core/src/createFontStack.ts
 

src/index.ts

@@ -1,5 +1,5 @@
-export { FontaineTransform } from './transform'
 export { generateFallbackName, generateFontFace } from './css'
 export { getMetricsForFamily, readMetrics } from './metrics'
+export { FontaineTransform } from './transform'
 
 export type { FontaineTransformOptions } from './transform'

src/metrics.ts

@@ -1,23 +1,16 @@
-import { fileURLToPath } from 'node:url'
 import type { Font } from '@capsizecss/unpack'
-import { fromFile, fromUrl } from '@capsizecss/unpack'
+import type { FontFaceMetrics } from './css'
+
+import { fileURLToPath } from 'node:url'
 import { fontFamilyToCamelCase } from '@capsizecss/metrics'
+import { fromFile, fromUrl } from '@capsizecss/unpack'
 import { parseURL } from 'ufo'
-import type { FontFaceMetrics } from './css'
+
 import { withoutQuotes } from './css'
 
 const metricCache: Record<string, FontFaceMetrics | null> = {}
 
-function filterRequiredMetrics({
-  ascent,
-  descent,
-  lineGap,
-  unitsPerEm,
-  xWidthAvg,
-}: Pick<
-  Font,
-  'ascent' | 'descent' | 'lineGap' | 'unitsPerEm' | 'xWidthAvg'
->) {
+function filterRequiredMetrics({ ascent, descent, lineGap, unitsPerEm, xWidthAvg }: Pick< Font, 'ascent' | 'descent' | 'lineGap' | 'unitsPerEm' | 'xWidthAvg'>) {
   return {
     ascent,
     descent,
@@ -41,11 +34,8 @@ export async function getMetricsForFamily(family: string) {
 
   try {
     const name = fontFamilyToCamelCase(family)
-    const { entireMetricsCollection } = await import(
-      '@capsizecss/metrics/entireMetricsCollection'
-    )
-    const metrics
-      = entireMetricsCollection[name as keyof typeof entireMetricsCollection]
+    const { entireMetricsCollection } = await import('@capsizecss/metrics/entireMetricsCollection')
+    const metrics = entireMetricsCollection[name as keyof typeof entireMetricsCollection]
 
     const filteredMetrics = filterRequiredMetrics(metrics)
     metricCache[family] = filteredMetrics
@@ -65,8 +55,7 @@ export async function getMetricsForFamily(family: string) {
  * @async
  */
 export async function readMetrics(_source: URL | string) {
-  const source
-    = typeof _source !== 'string' && 'href' in _source ? _source.href : _source
+  const source = typeof _source !== 'string' && 'href' in _source ? _source.href : _source
 
   if (source in metricCache)
     return Promise.resolve(metricCache[source])
@@ -75,13 +64,11 @@ export async function readMetrics(_source: URL | string) {
   if (!protocol)
     return null
 
-  const metrics
-    = protocol === 'file:'
-      ? await fromFile(fileURLToPath(source))
-      : await fromUrl(source)
+  const metrics = protocol === 'file:'
+    ? await fromFile(fileURLToPath(source))
+    : await fromUrl(source)
 
-  const filteredMetrics = filterRequiredMetrics(metrics)
-  metricCache[source] = filteredMetrics
+  metricCache[source] = filterRequiredMetrics(metrics)
 
-  return filteredMetrics
+  return metricCache[source]
 }

src/transform.ts

@@ -1,15 +1,9 @@
-import { createUnplugin } from 'unplugin'
-import {
-  anyOf,
-  charIn,
-  charNotIn,
-  createRegExp,
-  exactly,
-  whitespace,
-} from 'magic-regexp'
+import { anyOf, charIn, charNotIn, createRegExp, exactly, whitespace } from 'magic-regexp'
 import MagicString from 'magic-string'
-import { parseURL } from 'ufo'
 import { isAbsolute, join } from 'pathe'
+import { parseURL } from 'ufo'
+import { createUnplugin } from 'unplugin'
+
 import { generateFallbackName, generateFontFace, parseFontFace } from './css'
 import { getMetricsForFamily, readMetrics } from './metrics'
 
@@ -88,7 +82,7 @@ const CSS_RE = createRegExp(
 
 /**
  * Transforms CSS files to include font fallbacks.
- * 
+ *
  * @param options - The transformation options. See {@link FontaineTransformOptions}.
  * @returns The unplugin instance.
  */
@@ -137,10 +131,7 @@ export const FontaineTransform = createUnplugin(
             if (skipFontFaceGeneration(fallbackName(family)))
               continue
 
-            const metrics
-              = (await getMetricsForFamily(family))
-              || (source
-              && (await readMetricsFromId(source, id).catch(() => null)))
+            const metrics = (await getMetricsForFamily(family)) || (source && (await readMetricsFromId(source, id).catch(() => null)))
 
             if (!metrics)
               continue

test/e2e.spec.ts

@@ -1,8 +1,8 @@
-import { readFile, readdir } from 'node:fs/promises'
+import { readdir, readFile } from 'node:fs/promises'
 import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
 import { execaCommand } from 'execa'
 import { join } from 'pathe'
+import { describe, expect, it } from 'vitest'
 
 describe('fontaine', () => {
   it('e2e', async () => {

test/index.spec.ts

@@ -1,9 +1,9 @@
 import { createServer } from 'node:http'
 import { fileURLToPath } from 'node:url'
+import { getRandomPort } from 'get-port-please'
 import { dirname } from 'pathe'
 import handler from 'serve-handler'
 import { describe, expect, it } from 'vitest'
-import { getRandomPort } from 'get-port-please'
 import {
   generateFallbackName,
   generateFontFace,