single-file-core 1.6.1 → 1.6.2

package/core/helper.js

@@ -123,6 +123,9 @@ export {
 	getDataURI,
 	digest,
 	getValidFilename,
+	DEFAULT_REPLACED_CHARACTERS,
+	DEFAULT_REPLACEMENT_CHARACTER,
+	DEFAULT_REPLACEMENT_CHARACTERS,
 	parseDocContent,
 	markInvalidNesting,
 	fixInvalidNesting,
@@ -926,14 +929,14 @@ function getComputedStyle(win, element, pseudoElement) {
 
 function getValidFilename(filename, replacedCharacters = DEFAULT_REPLACED_CHARACTERS, replacementCharacter = DEFAULT_REPLACEMENT_CHARACTER, replacementCharacters = DEFAULT_REPLACEMENT_CHARACTERS) {
 	replacementCharacters.forEach((indexReplacementCharacter, index) => {
-		if (replacedCharacters[index] !== undefined && indexReplacementCharacter != replacedCharacters[index]) {
+		if (indexReplacementCharacter && replacedCharacters[index] !== undefined && indexReplacementCharacter != replacedCharacters[index]) {
 			// no "+" here, unlike the fallback below: a lookalike replaces its character one for
 			// one, so collapsing a run would drop characters the name needs ("C++" -> "C＋")
 			filename = filename.replace(new RegExp("[" + getCharacterClassContent(replacedCharacters[index]) + "]", "g"), indexReplacementCharacter);
 		}
 	});
 	replacedCharacters.forEach((replacedCharacter, index) => {
-		if (replacementCharacters[index] === undefined) {
+		if (!replacementCharacters[index]) {
 			filename = filename.replace(new RegExp("[" + getCharacterClassContent(replacedCharacter) + "]+", "g"), replacementCharacter);
 		}
 	});

package/modules/css-fonts-minifier.js

@@ -38,6 +38,9 @@ const helper = {
 };
 
 const REGEXP_COMMA = /\s*,\s*/;
+const REGEXP_SPACES = /\s+/g;
+const REGEXP_FONT_STYLE_ANGLE = /-?\d*\.?\d+/g;
+const DEFAULT_OBLIQUE_ANGLE = 14;
 const REGEXP_DASH = /-/;
 const REGEXP_QUESTION_MARK = /\?/g;
 const REGEXP_STARTS_U_PLUS = /^U\+/i;
@@ -323,11 +326,11 @@ function testUsedFont(ruleData, familyName, declaredFonts, filteredUsedFonts) {
 	let test;
 	const optionalUsedFonts = filteredUsedFonts && filteredUsedFonts.get(familyName);
 	if (optionalUsedFonts && optionalUsedFonts.length) {
-		let fontStyle = getDeclarationValue(ruleData.block.children, "font-style") || "normal";
+		const fontStyle = getDeclarationValue(ruleData.block.children, "font-style") || "normal";
 		if (VALID_FONT_STYLES.find(rule => fontStyle.trim().match(rule))) {
 			const fontWeight = helper.getFontWeight(getDeclarationValue(ruleData.block.children, "font-weight") || "400");
 			const declaredFontsWeights = declaredFonts
-				.filter(fontInfo => fontInfo.fontFamily == familyName && fontInfo.fontStyle == fontStyle)
+				.filter(fontInfo => fontInfo.fontFamily == familyName && testFontStyle(fontInfo.fontStyle, fontStyle))
 				.map(fontInfo => fontInfo.fontWeight.split(" "))
 				.sort((weight1, weight2) => Number.parseInt(weight1[0], 10) - Number.parseInt(weight2[0], 10));
 			let usedFontWeights = optionalUsedFonts
@@ -343,16 +346,6 @@ function testUsedFont(ruleData, familyName, declaredFonts, filteredUsedFonts) {
 					})
 					.filter(fontWeight => fontWeight);
 				test = testFontweight(fontWeight, usedFontWeights);
-				if (!test) {
-					usedFontWeights = optionalUsedFonts
-						.map(fontInfo => {
-							fontInfo = Array.from(fontInfo);
-							fontInfo[2] = fontStyle = "normal";
-							return getUsedFontWeight(fontInfo, fontStyle, declaredFontsWeights);
-						})
-						.filter(fontWeight => fontWeight);
-					test = testFontweight(fontWeight, usedFontWeights);
-				}
 			}
 		} else {
 			test = true;
@@ -363,6 +356,34 @@ function testUsedFont(ruleData, familyName, declaredFonts, filteredUsedFonts) {
 	return test;
 }
 
+function testFontStyle(fontStyle, otherFontStyle) {
+	const angles = getFontStyleAngles(fontStyle);
+	const otherAngles = getFontStyleAngles(otherFontStyle);
+	if (angles && otherAngles) {
+		return angles[0] <= otherAngles[1] && otherAngles[0] <= angles[1];
+	} else {
+		return normalizeFontStyle(fontStyle) == normalizeFontStyle(otherFontStyle);
+	}
+}
+
+function getFontStyleAngles(fontStyle) {
+	fontStyle = normalizeFontStyle(fontStyle);
+	if (fontStyle == "normal") {
+		return [0, 0];
+	} else if (fontStyle == "italic") {
+		return [DEFAULT_OBLIQUE_ANGLE, DEFAULT_OBLIQUE_ANGLE];
+	} else if (fontStyle == "oblique" || fontStyle.startsWith("oblique ")) {
+		const angles = (fontStyle.match(REGEXP_FONT_STYLE_ANGLE) || [])
+			.map(angle => Number.parseFloat(angle))
+			.filter(angle => !Number.isNaN(angle));
+		return angles.length ? [Math.min(...angles), Math.max(...angles)] : [DEFAULT_OBLIQUE_ANGLE, DEFAULT_OBLIQUE_ANGLE];
+	}
+}
+
+function normalizeFontStyle(fontStyle) {
+	return String(fontStyle || "normal").trim().toLowerCase().replace(REGEXP_SPACES, " ");
+}
+
 function testFontweight(fontWeight, usedFontWeights) {
 	let test;
 	for (const fontWeightValue of fontWeight.split(",")) {
@@ -503,7 +524,7 @@ function parseFamilyNames(fontFamilyNameTokenData, fontFamilyNames) {
 function getUsedFontWeight(fontInfo, fontStyle, fontWeights) {
 	let foundWeight;
 	fontWeights = fontWeights.map(weights => weights.map(value => String(Number.parseInt(value, 10))));
-	if (fontInfo[2] == fontStyle) {
+	if (testFontStyle(fontInfo[2], fontStyle)) {
 		let fontWeight = Number(fontInfo[1]);
 		if (fontWeights.length > 1) {
 			if (fontWeight >= 400 && fontWeight <= 500) {

package/modules/template-formatter.js

@@ -16881,8 +16881,14 @@ async function formatFilename(content, doc, options) {
 		filename = filename.replace(/\//g, filenameReplacementCharacter);
 	}
 	if (!options.keepFilename && ((options.filenameMaxLengthUnit == "bytes" && getContentSize(filename) > options.filenameMaxLength) || filename.length > options.filenameMaxLength)) {
-		const extensionMatch = filename.match(/(\.[^.]{3,4})$/);
-		const extension = extensionMatch && extensionMatch[0] && extensionMatch[0].length > 1 ? extensionMatch[0] : "";
+		const filenameExtension = "." + getFilenameExtension(options);
+		let extension;
+		if (filename.endsWith(filenameExtension)) {
+			extension = filenameExtension;
+		} else {
+			const extensionMatch = filename.match(/(\.[^.]{3,4})$/);
+			extension = extensionMatch && extensionMatch[0] && extensionMatch[0].length > 1 ? extensionMatch[0] : "";
+		}
 		const suffix = "…" + extension;
 		const maxLength = Math.max(options.filenameMaxLength - (options.filenameMaxLengthUnit == "bytes" ? getContentSize(suffix) : suffix.length), 0);
 		filename = options.filenameMaxLengthUnit == "bytes" ? await truncateText(filename, maxLength) : filename.substring(0, maxLength);

package/package.json

@@ -1,9 +1,16 @@
 {
 	"name": "single-file-core",
-	"version": "1.6.1",
+	"version": "1.6.2",
 	"description": "SingleFile Core",
 	"author": "Gildas Lormeau",
 	"license": "AGPL-3.0-or-later",
+	"files": [
+		"*.js",
+		"core/",
+		"modules/",
+		"processors/",
+		"vendor/"
+	],
 	"scripts": {
 		"test": "deno run --allow-read --allow-run test/run.js",
 		"bump-patch": "npm version patch --no-git-tag-version && npm run bump-commit",
@@ -21,6 +28,7 @@
 	"homepage": "https://github.com/gildas-lormeau/single-file-core#readme",
 	"devDependencies": {
 		"@eslint/js": "^9.39.5",
-		"eslint": "^10.9.1"
+		"eslint": "^10.9.1",
+		"happy-dom": "^20.14.5"
 	}
 }

package/.github/workflows/publish.yml

@@ -1,88 +0,0 @@
-# .github/workflows/publish.yml
-
-name: Publish
-
-on:
-  release:
-    types: [published]
-
-permissions:
-  id-token: write
-  contents: read
-
-jobs:
-  # nothing else guarantees that the released commit was verified: the vendor workflow runs on push,
-  # so this waits for its run on that exact commit and refuses to publish unless it succeeded
-  check_vendor:
-    name: 'Check vendor rebuild'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      actions: read
-    steps:
-      # only used to resolve the tag to a commit, so it runs no code from the repository and keeps no
-      # git credentials behind
-      - uses: actions/checkout@v5
-        with:
-          ref: ${{ github.event.release.tag_name }}
-          persist-credentials: false
-      # the tag is typed in the release UI, so nothing ties it to the version that is about to be
-      # published: a mistyped tag, or a bump that was never pushed, publishes a version nobody asked for
-      - name: Verify the tag matches the declared version
-        env:
-          TAG_NAME: ${{ github.event.release.tag_name }}
-        run: |
-          version=$(jq -r .version package.json)
-          if [ "$TAG_NAME" != "v$version" ]; then
-            echo "::error::release $TAG_NAME but package.json declares $version"
-            exit 1
-          fi
-      - name: Wait for the vendor rebuild check of the released commit
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          sha=$(git rev-parse HEAD)
-          echo "released commit: $sha"
-          missing=0
-          for attempt in $(seq 1 60); do
-            run=$(gh api "repos/$GITHUB_REPOSITORY/actions/workflows/vendor.yml/runs?head_sha=$sha&per_page=1" \
-              --jq 'if (.workflow_runs | length) == 0 then "none none none"
-                    else (.workflow_runs[0] | "\(.status) \(.conclusion) \(.html_url)") end')
-            run_status=$(echo "$run" | cut -d' ' -f1)
-            conclusion=$(echo "$run" | cut -d' ' -f2)
-            url=$(echo "$run" | cut -d' ' -f3)
-            if [ "$run_status" = "none" ]; then
-              missing=$((missing + 1))
-              if [ "$missing" -ge 10 ]; then
-                echo "::error::no vendor run for $sha, run the vendor workflow on this commit and publish again"
-                exit 1
-              fi
-              echo "no vendor run found yet for $sha"
-            else
-              echo "vendor run: status=$run_status conclusion=$conclusion $url"
-              if [ "$run_status" = "completed" ]; then
-                if [ "$conclusion" = "success" ]; then
-                  exit 0
-                fi
-                echo "::error::the vendor rebuild concluded $conclusion for $sha, see $url"
-                exit 1
-              fi
-            fi
-            sleep 30
-          done
-          echo "::error::timed out waiting for the vendor rebuild of $sha"
-          exit 1
-
-  publish_npm:
-    needs: check_vendor
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          ref: ${{ github.event.release.tag_name }}
-      # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@v5
-        with:
-          node-version: '24'
-          registry-url: 'https://registry.npmjs.org'
-      - run: npm publish

package/.github/workflows/test.yml

@@ -1,31 +0,0 @@
-# .github/workflows/test.yml
-
-name: Test
-
-# tag pushes are excluded: creating a release would otherwise re-run the check already done on the branch
-on:
-  push:
-    branches: ['**']
-  pull_request:
-
-jobs:
-  sfz-harness:
-    name: 'SFZ format rules'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: denoland/setup-deno@v2
-        with:
-          deno-version: v2.x
-      # the suites drive the writer directly, with no browser and no network
-      - run: npm test
-  lint:
-    name: 'Lint'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-node@v5
-        with:
-          node-version: '24'
-      - run: npm ci
-      - run: npx eslint .

package/.github/workflows/vendor.yml

@@ -1,39 +0,0 @@
-# .github/workflows/vendor.yml
-
-name: Vendor
-
-# tag pushes are excluded: creating a release would otherwise re-run the check already done on the branch
-on:
-  push:
-    branches: ['**']
-  pull_request:
-
-jobs:
-  rebuild:
-    name: 'Rebuild vendor/zip'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-node@v5
-        with:
-          node-version: '24'
-      - run: npm ci
-        working-directory: zip-build
-      - run: npm run build
-        working-directory: zip-build
-      # the checked-in files in vendor/zip must be exactly what the sources in zip-build produce
-      - run: git diff --exit-code vendor/zip
-  rebuild-css-tree:
-    name: 'Rebuild vendor/css-tree.js'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-node@v5
-        with:
-          node-version: '24'
-      - run: npm ci
-        working-directory: css-tree-build
-      - run: npm run build
-        working-directory: css-tree-build
-      # the checked-in file must be exactly what the sources in css-tree-build produce
-      - run: git diff --exit-code vendor/css-tree.js

package/css-tree-build/README.md

@@ -1,39 +0,0 @@
-# Rebuilding `vendor/css-tree.js`
-
-[`../vendor/css-tree.js`](../vendor/css-tree.js) is a custom build of
-[css-tree](https://www.npmjs.com/package/css-tree) with one patch applied to
-`lib/tokenizer/TokenStream.js`: the token offset field is widened from 24 to
-27 bits (`OFFSET_MASK`/`TYPE_SHIFT`, with unsigned shifts for the token type).
-Upstream css-tree packs each token as `type << 24 | offset`, so any stylesheet
-larger than 16MB (2^24 bytes) silently corrupts the token stream and parsing
-never terminates. Real pages ship such stylesheets (see
-https://github.com/gildas-lormeau/SingleFile/issues/1962, a 23.5MB stylesheet
-on brookings.edu). With 27 bits the limit becomes 128MB.
-
-This directory rebuilds the file deterministically. All dependencies are
-pinned to exact versions by `package.json` and `package-lock.json`:
-
-```sh
-cd css-tree-build
-npm ci
-npm run build
-git diff --exit-code ../vendor/css-tree.js
-```
-
-An empty diff means the checked-in file matches what the sources produce. The
-GitHub Actions workflow `.github/workflows/vendor.yml` runs the same steps on
-every push.
-
-The patch is applied to the readable npm sources by an esbuild plugin in
-`build.js`, guarded by exact occurrence counts: if a css-tree update changes
-`TokenStream.js`, the build fails loudly instead of silently dropping the
-patch.
-
-## Updating css-tree
-
-1. Bump `css-tree` in `package.json` and run `npm install`.
-2. Run `npm run build`. If the build fails because `TokenStream.js` changed,
-   review the patch in `build.js` against the new sources (or drop it once
-   upstream stores offsets wider than 24 bits).
-3. Commit the regenerated `../vendor/css-tree.js` together with the changes in
-   this directory.

package/css-tree-build/build.js

@@ -1,66 +0,0 @@
-import { readFileSync } from "node:fs";
-import { createRequire } from "node:module";
-import { build } from "esbuild";
-
-const require = createRequire(import.meta.url);
-const packagePath = require.resolve("css-tree/package.json");
-const licensePath = packagePath.replace(/package\.json$/, "LICENSE");
-const { version } = JSON.parse(readFileSync(packagePath));
-
-const PATCHES = [
-	["const OFFSET_MASK = 0x00FFFFFF;", "const OFFSET_MASK = 0x07FFFFFF;", 1],
-	["const TYPE_SHIFT = 24;", "const TYPE_SHIFT = 27;", 1],
-	[">> TYPE_SHIFT", ">>> TYPE_SHIFT", 8]
-];
-
-function patchTokenStream(source) {
-	for (const [pattern, replacement, expectedCount] of PATCHES) {
-		const count = source.split(pattern).length - 1;
-		if (count != expectedCount) {
-			throw new Error(`css-tree update changed TokenStream.js: found ${count} occurrence(s) of ${JSON.stringify(pattern)}, expected ${expectedCount} — review the 16MB token-offset patch`);
-		}
-		source = source.replaceAll(pattern, replacement);
-	}
-	return source;
-}
-
-const patchPlugin = {
-	name: "patch-token-stream",
-	setup(build) {
-		let patched = false;
-		build.onLoad({ filter: /[/\\]css-tree[/\\].*[/\\]TokenStream\.js$/ }, args => {
-			patched = true;
-			return { contents: patchTokenStream(readFileSync(args.path, "utf8")), loader: "js" };
-		});
-		build.onEnd(() => {
-			if (!patched) {
-				throw new Error("TokenStream.js was not loaded — the 16MB token-offset patch was not applied");
-			}
-		});
-	}
-};
-
-const banner = [
-	`// css-tree ${version} (https://github.com/csstree/csstree), bundled by css-tree-build/build.js`,
-	"// with the token offset field widened from 24 to 27 bits so stylesheets larger",
-	"// than 16MB do not corrupt the token stream (parsing never terminated on them)",
-	"",
-	"/*",
-	readFileSync(licensePath, "utf8").trim().split("\n").map(line => (" * " + line).trimEnd()).join("\n"),
-	" */"
-].join("\n");
-
-await build({
-	stdin: {
-		contents: "export * from \"css-tree\";",
-		resolveDir: import.meta.dirname
-	},
-	bundle: true,
-	minify: true,
-	format: "esm",
-	platform: "browser",
-	legalComments: "none",
-	banner: { js: banner },
-	plugins: [patchPlugin],
-	outfile: "../vendor/css-tree.js"
-});