@netacea/netaceaintegrationbase 2.0.28 → 2.0.29

package/dist/index.cjs

@@ -476,27 +476,54 @@ function extractCookieAttr(attributes, attribute) {
         ? extractedAttr?.replace(`${attribute}=`, '')
         : undefined;
 }
+/**
+ * Remove duplicate attributes and return the result joined as a string
+ * Attributes are seperated by a semi-colon and a space: '; '
+ * By default the first attributes found for a given name are retained,
+ * however this can be overrided using the keepLast option.
+ * Attributes are compared for equality in a case-insensitive manner.
+ * @param attributes a string containing the attributes, or and array of strings
+ * containing one or more attributes.
+ * @param keepLast whether to prefer keeping the last value, default false.
+ * @returns
+ */
 function removeDuplicateAttrs(attributes, keepLast = false) {
+    if (typeof attributes !== 'string') {
+        attributes = attributes.join('; ');
+    }
     if (attributes === '') {
         return '';
     }
-    const capitalizeAttrName = (attr) => attr.charAt(0).toUpperCase() + attr.slice(1);
-    return attributes
-        .replace(/ /g, '')
-        .split(';')
-        .map(capitalizeAttrName)
-        .filter(s => s.trim() !== '')
-        .filter((attr, i, attrs) => {
-        const getAttrName = (attr) => attr.split('=')[0];
-        const attrName = getAttrName(attr);
-        const attrNames = attrs.map(getAttrName);
-        if (keepLast) {
-            return i === attrNames.lastIndexOf(attrName);
-        }
-        return i === attrNames.indexOf(attrName);
-    })
+    return removeDuplicateAttributesSplit(attributes.split(';'), keepLast)
         .join('; ');
 }
+/**
+ * PRIVATE method for removing duplicate attributes that have been pre-split
+ * @param attributes
+ * @param keepLast whether to prefer keeping the last value, default false.
+ * @returns An array of attributes.
+ */
+function removeDuplicateAttributesSplit(attributes, keepLast = false) {
+    if (keepLast) {
+        return removeDuplicateAttributesSplit(attributes.reverse()).reverse();
+    }
+    const retainedAttributeNames = new Set();
+    const retainedAttributes = [];
+    for (let attribute of attributes) {
+        // Remove starting whitespace and skip empty strings entirely
+        attribute = attribute.trimStart();
+        if (attribute.trim() === '') {
+            continue;
+        }
+        // Keep non-duplicates
+        const attrNameUpper = attribute.split('=')[0].toUpperCase();
+        if (!retainedAttributeNames.has(attrNameUpper)) {
+            retainedAttributeNames.add(attrNameUpper);
+            retainedAttributes.push(attribute);
+        }
+    }
+    return retainedAttributes;
+}
 
 var cookieAttributes = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -535,8 +562,31 @@ var netaceaSessionCookie = /*#__PURE__*/Object.freeze({
     createSetCookieString: createSetCookieString
 });
 
+function parseSetCookie(setCookie) {
+    const eqIndex = setCookie.indexOf('=');
+    if (eqIndex < 0) {
+        throw new Error('Could not parse the given set-cookie value.');
+    }
+    const name = setCookie.slice(0, eqIndex);
+    const valueWithAttributes = setCookie.slice(eqIndex + 1);
+    const semiIndex = valueWithAttributes.indexOf(';');
+    const value = valueWithAttributes.slice(0, semiIndex);
+    const attributes = valueWithAttributes.slice(semiIndex).trimStart();
+    return {
+        name,
+        value,
+        attributes
+    };
+}
+
+var parse = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    parseSetCookie: parseSetCookie
+});
+
 const lib = {
     cookie: {
+        parse,
         attributes: cookieAttributes,
         netaceaSession: netaceaSessionCookie
     }

package/dist/index.d.ts

@@ -532,7 +532,18 @@ declare namespace dictionary_d {
 declare function configureCookiesDomain(cookieAttr: string | undefined, captchaCookieAttr: string | undefined): CookiesAttributes;
 declare function extractAndRemoveCookieAttr(attributes: string, attribute: string): SlicedCookieAttributes;
 declare function extractCookieAttr(attributes: string, attribute: string): string | undefined;
-declare function removeDuplicateAttrs(attributes: string, keepLast?: boolean): string;
+/**
+ * Remove duplicate attributes and return the result joined as a string
+ * Attributes are seperated by a semi-colon and a space: '; '
+ * By default the first attributes found for a given name are retained,
+ * however this can be overrided using the keepLast option.
+ * Attributes are compared for equality in a case-insensitive manner.
+ * @param attributes a string containing the attributes, or and array of strings
+ * containing one or more attributes.
+ * @param keepLast whether to prefer keeping the last value, default false.
+ * @returns
+ */
+declare function removeDuplicateAttrs(attributes: string | string[], keepLast?: boolean): string;
 
 declare const cookieAttributes_configureCookiesDomain: typeof configureCookiesDomain;
 declare const cookieAttributes_extractAndRemoveCookieAttr: typeof extractAndRemoveCookieAttr;
@@ -562,8 +573,20 @@ declare namespace netaceaSessionCookie {
   export { netaceaSessionCookie_createNetaceaCaptchaSetCookieString as createNetaceaCaptchaSetCookieString, netaceaSessionCookie_createNetaceaSetCookieString as createNetaceaSetCookieString, netaceaSessionCookie_createSetCookieString as createSetCookieString };
 }
 
+declare function parseSetCookie(setCookie: string): {
+    name: string;
+    value: string;
+    attributes: string;
+};
+
+declare const parse_parseSetCookie: typeof parseSetCookie;
+declare namespace parse {
+  export { parse_parseSetCookie as parseSetCookie };
+}
+
 declare const lib: {
     cookie: {
+        parse: typeof parse;
         attributes: typeof cookieAttributes;
         netaceaSession: typeof netaceaSessionCookie;
     };

package/dist/index.mjs

@@ -474,27 +474,54 @@ function extractCookieAttr(attributes, attribute) {
         ? extractedAttr?.replace(`${attribute}=`, '')
         : undefined;
 }
+/**
+ * Remove duplicate attributes and return the result joined as a string
+ * Attributes are seperated by a semi-colon and a space: '; '
+ * By default the first attributes found for a given name are retained,
+ * however this can be overrided using the keepLast option.
+ * Attributes are compared for equality in a case-insensitive manner.
+ * @param attributes a string containing the attributes, or and array of strings
+ * containing one or more attributes.
+ * @param keepLast whether to prefer keeping the last value, default false.
+ * @returns
+ */
 function removeDuplicateAttrs(attributes, keepLast = false) {
+    if (typeof attributes !== 'string') {
+        attributes = attributes.join('; ');
+    }
     if (attributes === '') {
         return '';
     }
-    const capitalizeAttrName = (attr) => attr.charAt(0).toUpperCase() + attr.slice(1);
-    return attributes
-        .replace(/ /g, '')
-        .split(';')
-        .map(capitalizeAttrName)
-        .filter(s => s.trim() !== '')
-        .filter((attr, i, attrs) => {
-        const getAttrName = (attr) => attr.split('=')[0];
-        const attrName = getAttrName(attr);
-        const attrNames = attrs.map(getAttrName);
-        if (keepLast) {
-            return i === attrNames.lastIndexOf(attrName);
-        }
-        return i === attrNames.indexOf(attrName);
-    })
+    return removeDuplicateAttributesSplit(attributes.split(';'), keepLast)
         .join('; ');
 }
+/**
+ * PRIVATE method for removing duplicate attributes that have been pre-split
+ * @param attributes
+ * @param keepLast whether to prefer keeping the last value, default false.
+ * @returns An array of attributes.
+ */
+function removeDuplicateAttributesSplit(attributes, keepLast = false) {
+    if (keepLast) {
+        return removeDuplicateAttributesSplit(attributes.reverse()).reverse();
+    }
+    const retainedAttributeNames = new Set();
+    const retainedAttributes = [];
+    for (let attribute of attributes) {
+        // Remove starting whitespace and skip empty strings entirely
+        attribute = attribute.trimStart();
+        if (attribute.trim() === '') {
+            continue;
+        }
+        // Keep non-duplicates
+        const attrNameUpper = attribute.split('=')[0].toUpperCase();
+        if (!retainedAttributeNames.has(attrNameUpper)) {
+            retainedAttributeNames.add(attrNameUpper);
+            retainedAttributes.push(attribute);
+        }
+    }
+    return retainedAttributes;
+}
 
 var cookieAttributes = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -533,8 +560,31 @@ var netaceaSessionCookie = /*#__PURE__*/Object.freeze({
     createSetCookieString: createSetCookieString
 });
 
+function parseSetCookie(setCookie) {
+    const eqIndex = setCookie.indexOf('=');
+    if (eqIndex < 0) {
+        throw new Error('Could not parse the given set-cookie value.');
+    }
+    const name = setCookie.slice(0, eqIndex);
+    const valueWithAttributes = setCookie.slice(eqIndex + 1);
+    const semiIndex = valueWithAttributes.indexOf(';');
+    const value = valueWithAttributes.slice(0, semiIndex);
+    const attributes = valueWithAttributes.slice(semiIndex).trimStart();
+    return {
+        name,
+        value,
+        attributes
+    };
+}
+
+var parse = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    parseSetCookie: parseSetCookie
+});
+
 const lib = {
     cookie: {
+        parse,
         attributes: cookieAttributes,
         netaceaSession: netaceaSessionCookie
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@netacea/netaceaintegrationbase",
-    "version": "2.0.28",
+    "version": "2.0.29",
     "description": "Base package for Netacea CDN integrations.",
     "type": "module",
     "types": "dist/index.d.ts",
@@ -24,7 +24,7 @@
     },
     "license": "UNLICENSED",
     "dependencies": {
-        "@netacea/kinesisingest": "^1.5.46"
+        "@netacea/kinesisingest": "^1.5.47"
     },
-    "gitHead": "9b917cee8b330d70482637ceb7459f23255347c9"
+    "gitHead": "729446935964643bd7f7e4d8c3016ec561ce39dd"
 }