@dintero/sri-to-dist 1.0.7 → 1.0.8

package/dist/lib.d.ts

@@ -27,5 +27,5 @@ declare const readLocalContent: (src: string, baseDir: string, baseUrl: string)
 declare const calculateSha384: (content: Buffer) => string;
 declare const handleUpdatedHtml: (stdout: NodeJS.WriteStream, outputPath?: string, updatedHtml?: string) => void;
 declare const toSriScriptTag: (tag: string, integrity: string) => string;
-declare const ensureCrossoriginAnonymous: (tag: string) => string;
-export { extractLinkRel, isSriTag, toHtmlWithSri, getContent, readLocalContent, fetchRemoteContent, calculateSha384, ensureCrossoriginAnonymous, toSriScriptTag, handleUpdatedHtml, };
+declare const alterTag: (tag: string, param: "crossorigin" | "integrity", value: string) => string;
+export { extractLinkRel, isSriTag, toHtmlWithSri, getContent, readLocalContent, fetchRemoteContent, calculateSha384, toSriScriptTag, handleUpdatedHtml, alterTag };

package/dist/lib.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleUpdatedHtml = exports.toSriScriptTag = exports.ensureCrossoriginAnonymous = exports.calculateSha384 = exports.fetchRemoteContent = exports.readLocalContent = exports.getContent = exports.toHtmlWithSri = exports.isSriTag = exports.extractLinkRel = exports.toSriImportMap = exports.extractImports = exports.parseImportMap = exports.isImportMapTag = void 0;
+exports.alterTag = exports.handleUpdatedHtml = exports.toSriScriptTag = exports.calculateSha384 = exports.fetchRemoteContent = exports.readLocalContent = exports.getContent = exports.toHtmlWithSri = exports.isSriTag = exports.extractLinkRel = exports.toSriImportMap = exports.extractImports = exports.parseImportMap = exports.isImportMapTag = void 0;
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const node_crypto_1 = require("node:crypto");
@@ -298,35 +298,29 @@ const handleUpdatedHtml = (stdout, outputPath, updatedHtml) => {
 exports.handleUpdatedHtml = handleUpdatedHtml;
 const toSriScriptTag = (tag, integrity) => {
     // First handle the integrity attribute
-    let newTag = tag;
-    if (tag.includes("integrity=")) {
-        // Replace existing integrity attribute
-        const reIntegrity = /integrity="[^"]*"/g;
-        newTag = newTag.replace(reIntegrity, `integrity="${integrity}"`);
-    }
-    else {
-        // Add integrity attribute
-        if (tag.endsWith("/>")) {
-            newTag = newTag.replace(/\/>$/, ` integrity="${integrity}"/>`);
-        }
-        else {
-            newTag = newTag.replace(/>$/, ` integrity="${integrity}">`);
-        }
-    }
+    const integrityTag = alterTag(tag, "integrity", integrity);
     // Ensure crossorigin attribute is set
-    return ensureCrossoriginAnonymous(newTag);
+    return alterTag(integrityTag, "crossorigin", "anonymous");
 };
 exports.toSriScriptTag = toSriScriptTag;
-const ensureCrossoriginAnonymous = (tag) => {
-    // Replace if exists
-    if (tag.includes("crossorigin=")) {
-        const reCrossorigin = /crossorigin="[^"]*"/g;
-        return tag.replace(reCrossorigin, 'crossorigin="anonymous"');
+const alterTag = (tag, param, value) => {
+    const hasParamRegex = new RegExp(`^<[^>]*\\s+${param}="[^"]*"`);
+    const keyValue = `${param}="${value}"`;
+    if (hasParamRegex.test(tag)) {
+        // Replace param with new value if existing param is found in tag
+        const replaceParamRegex = new RegExp(`${param}="[^"]*"`);
+        return tag.replace(replaceParamRegex, keyValue);
+    }
+    const hasClosingTag = /<\/script[^>]*>$|<\/link[^>]*>$/.test(tag);
+    if (hasClosingTag) {
+        // Add param and value to the opening tag
+        return tag.replace(/>(?!$)/, ` ${keyValue}>`);
     }
-    // Add crossorigin="anonymous" attribute if missing from tag
     if (tag.endsWith("/>")) {
-        return tag.replace(/\/>$/, ' crossorigin="anonymous"/>');
+        // Add param and value to self closing tag
+        return tag.replace(/\/>$/, ` ${keyValue}/>`);
     }
-    return tag.replace(/>$/, ' crossorigin="anonymous">');
+    // No close tag and no self closing tag, add param and value to end of tag
+    return tag.replace(/>$/, ` ${keyValue}>`);
 };
-exports.ensureCrossoriginAnonymous = ensureCrossoriginAnonymous;
+exports.alterTag = alterTag;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dintero/sri-to-dist",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "description": "HTML tool for adding subresource integrity hashes",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -33,12 +33,12 @@
     "license": "MIT",
     "devDependencies": {
         "@biomejs/biome": "1.9.4",
-        "@types/node": "22.15.2",
+        "@types/node": "22.15.17",
         "@types/temp": "0.9.4",
         "semantic-release": "24.2.3",
         "temp": "0.9.4",
         "typescript": "5.8.3",
-        "vitest": "3.1.2"
+        "vitest": "3.1.3"
     },
     "dependencies": {
         "commander": "13.1.0"