@pubtech-ai/core 1.7.2 → 2.0.1

package/lib/cjs/encoder/field/PurposeRestrictionVectorEncoder.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.PurposeRestrictionVectorEncoder=void 0;var BitLength_js_1=require("../BitLength.js"),BooleanEncoder_js_1=require("./BooleanEncoder.js"),index_js_1=require("../../errors/index.js"),IntEncoder_js_1=require("./IntEncoder.js"),index_js_2=require("../../model/index.js"),PurposeRestrictionVectorEncoder=function(){function e(){}return e.encode=function(e){var n=IntEncoder_js_1.IntEncoder.encode(e.numRestrictions,BitLength_js_1.BitLength.numRestrictions);return e.isEmpty()||e.getRestrictions().forEach((function(t){n+=IntEncoder_js_1.IntEncoder.encode(t.purposeId,BitLength_js_1.BitLength.purposeId),n+=IntEncoder_js_1.IntEncoder.encode(t.restrictionType,BitLength_js_1.BitLength.restrictionType);for(var r=e.getVendors(t),o=r.length,i=0,s=0,d="",_=function(n){var t=r[n];0===s&&(i++,s=t);var _=r[o-1],c=e.gvl.vendorIds;if(n===o-1||r[n+1]>function(e){for(;++e<=_&&!c.has(e););return e}(t)){var B=!(t===s);d+=BooleanEncoder_js_1.BooleanEncoder.encode(B),d+=IntEncoder_js_1.IntEncoder.encode(s,BitLength_js_1.BitLength.vendorId),B&&(d+=IntEncoder_js_1.IntEncoder.encode(t,BitLength_js_1.BitLength.vendorId)),s=0}},c=0;c<o;c++)_(c);n+=IntEncoder_js_1.IntEncoder.encode(i,BitLength_js_1.BitLength.numEntries),n+=d})),n},e.decode=function(e){var n=0,t=new index_js_2.PurposeRestrictionVector,r=IntEncoder_js_1.IntEncoder.decode(e.substr(n,BitLength_js_1.BitLength.numRestrictions),BitLength_js_1.BitLength.numRestrictions);n+=BitLength_js_1.BitLength.numRestrictions;for(var o=0;o<r;o++){var i=IntEncoder_js_1.IntEncoder.decode(e.substr(n,BitLength_js_1.BitLength.purposeId),BitLength_js_1.BitLength.purposeId);n+=BitLength_js_1.BitLength.purposeId;var s=IntEncoder_js_1.IntEncoder.decode(e.substr(n,BitLength_js_1.BitLength.restrictionType),BitLength_js_1.BitLength.restrictionType);n+=BitLength_js_1.BitLength.restrictionType;var d=new index_js_2.PurposeRestriction(i,s),_=IntEncoder_js_1.IntEncoder.decode(e.substr(n,BitLength_js_1.BitLength.numEntries),BitLength_js_1.BitLength.numEntries);n+=BitLength_js_1.BitLength.numEntries;for(var c=0;c<_;c++){var B=BooleanEncoder_js_1.BooleanEncoder.decode(e.substr(n,BitLength_js_1.BitLength.anyBoolean));n+=BitLength_js_1.BitLength.anyBoolean;var g=IntEncoder_js_1.IntEncoder.decode(e.substr(n,BitLength_js_1.BitLength.vendorId),BitLength_js_1.BitLength.vendorId);if(n+=BitLength_js_1.BitLength.vendorId,B){var h=IntEncoder_js_1.IntEncoder.decode(e.substr(n,BitLength_js_1.BitLength.vendorId),BitLength_js_1.BitLength.vendorId);if(n+=BitLength_js_1.BitLength.vendorId,h<g)throw new index_js_1.DecodingError("Invalid RangeEntry: endVendorId ".concat(h," is less than ").concat(g));for(var L=g;L<=h;L++)t.add(L,d)}else t.add(g,d)}}return t.bitLength=n,t},e}();exports.PurposeRestrictionVectorEncoder=PurposeRestrictionVectorEncoder;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.PurposeRestrictionVectorEncoder=void 0;var BitLength_js_1=require("../BitLength.js"),BooleanEncoder_js_1=require("./BooleanEncoder.js"),index_js_1=require("../../errors/index.js"),IntEncoder_js_1=require("./IntEncoder.js"),index_js_2=require("../../model/index.js"),PurposeRestrictionVectorEncoder=function(){function e(){}return e.encode=function(e){var n=IntEncoder_js_1.IntEncoder.encode(e.numRestrictions,BitLength_js_1.BitLength.numRestrictions);if(!e.isEmpty()){var t=Array.from(e.gvl.vendorIds),r=function(e,n){var r=t.indexOf(e);return t.indexOf(n)-r>1};e.getRestrictions().forEach((function(t){n+=IntEncoder_js_1.IntEncoder.encode(t.purposeId,BitLength_js_1.BitLength.purposeId),n+=IntEncoder_js_1.IntEncoder.encode(t.restrictionType,BitLength_js_1.BitLength.restrictionType);for(var o=e.getVendors(t),i=o.length,s=0,d=0,_="",c=0;c<i;c++){var g=o[c];if(0===d&&(s++,d=g),c===i-1||r(g,o[c+1])){var B=!(g===d);_+=BooleanEncoder_js_1.BooleanEncoder.encode(B),_+=IntEncoder_js_1.IntEncoder.encode(d,BitLength_js_1.BitLength.vendorId),B&&(_+=IntEncoder_js_1.IntEncoder.encode(g,BitLength_js_1.BitLength.vendorId)),d=0}}n+=IntEncoder_js_1.IntEncoder.encode(s,BitLength_js_1.BitLength.numEntries),n+=_}))}return n},e.decode=function(e){var n=0,t=new index_js_2.PurposeRestrictionVector,r=IntEncoder_js_1.IntEncoder.decode(e.substr(n,BitLength_js_1.BitLength.numRestrictions),BitLength_js_1.BitLength.numRestrictions);n+=BitLength_js_1.BitLength.numRestrictions;for(var o=0;o<r;o++){var i=IntEncoder_js_1.IntEncoder.decode(e.substr(n,BitLength_js_1.BitLength.purposeId),BitLength_js_1.BitLength.purposeId);n+=BitLength_js_1.BitLength.purposeId;var s=IntEncoder_js_1.IntEncoder.decode(e.substr(n,BitLength_js_1.BitLength.restrictionType),BitLength_js_1.BitLength.restrictionType);n+=BitLength_js_1.BitLength.restrictionType;var d=new index_js_2.PurposeRestriction(i,s),_=IntEncoder_js_1.IntEncoder.decode(e.substr(n,BitLength_js_1.BitLength.numEntries),BitLength_js_1.BitLength.numEntries);n+=BitLength_js_1.BitLength.numEntries;for(var c=function(r){var o=BooleanEncoder_js_1.BooleanEncoder.decode(e.substr(n,BitLength_js_1.BitLength.anyBoolean));n+=BitLength_js_1.BitLength.anyBoolean;var i=IntEncoder_js_1.IntEncoder.decode(e.substr(n,BitLength_js_1.BitLength.vendorId),BitLength_js_1.BitLength.vendorId);if(n+=BitLength_js_1.BitLength.vendorId,o){var s=IntEncoder_js_1.IntEncoder.decode(e.substr(n,BitLength_js_1.BitLength.vendorId),BitLength_js_1.BitLength.vendorId);if(n+=BitLength_js_1.BitLength.vendorId,s<i)throw new index_js_1.DecodingError("Invalid RangeEntry: endVendorId ".concat(s," is less than ").concat(i));var _=Array.from({length:s-i+1},(function(e,n){return i+n}));t.restrictPurposeToLegalBasis(d,_)}else t.restrictPurposeToLegalBasis(d,[i])},g=0;g<_;g++)c()}return t.bitLength=n,t},e}();exports.PurposeRestrictionVectorEncoder=PurposeRestrictionVectorEncoder;

package/lib/cjs/model/PurposeRestrictionVector.d.ts

@@ -11,8 +11,6 @@ export declare class PurposeRestrictionVector extends Cloneable<PurposeRestricti
     /**
      * a map indexed by a string which will be a 'hash' of the purpose and
      * restriction type.
-     *
-     * Using a BST to keep vendors in a sorted order for encoding later
      */
     private map;
     private gvl_;
@@ -30,9 +28,10 @@ export declare class PurposeRestrictionVector extends Cloneable<PurposeRestricti
      * restrictPurposeToLegalBasis - adds all Vendors under a given Purpose Restriction
      *
      * @param {PurposeRestriction} purposeRestriction
+     * @param {number[]|null|undefined} vendorsIds
      * @return {void}
      */
-    restrictPurposeToLegalBasis(purposeRestriction: PurposeRestriction): void;
+    restrictPurposeToLegalBasis(purposeRestriction: PurposeRestriction, vendorsIds?: number[]): void;
     /**
      * getVendors - returns array of vendor ids optionally narrowed by a given
      * Purpose Restriction.  If no purpose restriction is passed then all vendor

package/lib/cjs/model/PurposeRestrictionVector.js

@@ -1 +1 @@
-"use strict";var __extends=this&&this.__extends||function(){var e=function(t,r){return(e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r])})(t,r)};return function(t,r){if("function"!=typeof r&&null!==r)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");function o(){this.constructor=t}e(t,r),t.prototype=null===r?Object.create(r):(o.prototype=r.prototype,new o)}}(),__values=this&&this.__values||function(e){var t="function"==typeof Symbol&&Symbol.iterator,r=t&&e[t],o=0;if(r)return r.call(e);if(e&&"number"==typeof e.length)return{next:function(){return e&&o>=e.length&&(e=void 0),{value:e&&e[o++],done:!e}}};throw new TypeError(t?"Object is not iterable.":"Symbol.iterator is not defined.")},__read=this&&this.__read||function(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var o,n,i=r.call(e),s=[];try{for(;(void 0===t||t-- >0)&&!(o=i.next()).done;)s.push(o.value)}catch(e){n={error:e}}finally{try{o&&!o.done&&(r=i.return)&&r.call(i)}finally{if(n)throw n.error}}return s},__spreadArray=this&&this.__spreadArray||function(e,t,r){if(r||2===arguments.length)for(var o,n=0,i=t.length;n<i;n++)!o&&n in t||(o||(o=Array.prototype.slice.call(t,0,n)),o[n]=t[n]);return e.concat(o||Array.prototype.slice.call(t))};Object.defineProperty(exports,"__esModule",{value:!0}),exports.PurposeRestrictionVector=void 0;var PurposeRestriction_js_1=require("./PurposeRestriction.js"),BinarySearchTree_js_1=require("./BinarySearchTree.js"),RestrictionType_js_1=require("./RestrictionType.js"),Cloneable_js_1=require("../Cloneable.js"),PurposeRestrictionVector=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.bitLength=0,t.map=new Map,t}return __extends(t,e),t.prototype.has=function(e){return this.map.has(e)},t.prototype.isOkToHave=function(e,t,r){var o,n=!0;if(null===(o=this.gvl)||void 0===o?void 0:o.vendors){var i=this.gvl.vendors[r];if(i)if(e===RestrictionType_js_1.RestrictionType.NOT_ALLOWED)n=i.legIntPurposes.includes(t)||i.purposes.includes(t);else if(i.flexiblePurposes.length)switch(e){case RestrictionType_js_1.RestrictionType.REQUIRE_CONSENT:n=i.flexiblePurposes.includes(t)&&i.legIntPurposes.includes(t);break;case RestrictionType_js_1.RestrictionType.REQUIRE_LI:n=i.flexiblePurposes.includes(t)&&i.purposes.includes(t)}else n=!1;else n=!1}return n},t.prototype.add=function(e,t){if(this.isOkToHave(t.restrictionType,t.purposeId,e)){var r=t.hash;this.has(r)||(this.map.set(r,new BinarySearchTree_js_1.BinarySearchTree),this.bitLength=0),this.map.get(r).add(e)}},t.prototype.restrictPurposeToLegalBasis=function(e){for(var t=this.gvl.vendorIds,r=e.hash,o=function(){var e,r,o;try{for(var n=__values(t),i=n.next();!i.done;i=n.next())o=i.value}catch(t){e={error:t}}finally{try{i&&!i.done&&(r=n.return)&&r.call(n)}finally{if(e)throw e.error}}return o}(),n=__spreadArray([],__read(Array(o).keys()),!1).map((function(e){return e+1})),i=1;i<=o;i++)this.has(r)||(this.map.set(r,BinarySearchTree_js_1.BinarySearchTree.build(n)),this.bitLength=0),this.map.get(r).add(i)},t.prototype.getVendors=function(e){var t=[];if(e){var r=e.hash;this.has(r)&&(t=this.map.get(r).get())}else{var o=new Set;this.map.forEach((function(e){e.get().forEach((function(e){o.add(e)}))})),t=Array.from(o)}return t},t.prototype.getRestrictionType=function(e,t){var r;return this.getRestrictions(e).forEach((function(e){e.purposeId===t&&(void 0===r||r>e.restrictionType)&&(r=e.restrictionType)})),r},t.prototype.vendorHasRestriction=function(e,t){for(var r=!1,o=this.getRestrictions(e),n=0;n<o.length&&!r;n++)r=t.isSameAs(o[n]);return r},t.prototype.getMaxVendorId=function(){var e=0;return this.map.forEach((function(t){e=Math.max(t.max(),e)})),e},t.prototype.getRestrictions=function(e){var t=[];return this.map.forEach((function(r,o){e?r.contains(e)&&t.push(PurposeRestriction_js_1.PurposeRestriction.unHash(o)):t.push(PurposeRestriction_js_1.PurposeRestriction.unHash(o))})),t},t.prototype.getPurposes=function(){var e=new Set;return this.map.forEach((function(t,r){e.add(PurposeRestriction_js_1.PurposeRestriction.unHash(r).purposeId)})),Array.from(e)},t.prototype.remove=function(e,t){var r=t.hash,o=this.map.get(r);o&&(o.remove(e),o.isEmpty()&&(this.map.delete(r),this.bitLength=0))},Object.defineProperty(t.prototype,"gvl",{get:function(){return this.gvl_},set:function(e){var t=this;this.gvl_||(this.gvl_=e,this.map.forEach((function(e,r){var o=PurposeRestriction_js_1.PurposeRestriction.unHash(r);e.get().forEach((function(r){t.isOkToHave(o.restrictionType,o.purposeId,r)||e.remove(r)}))})))},enumerable:!1,configurable:!0}),t.prototype.isEmpty=function(){return 0===this.map.size},Object.defineProperty(t.prototype,"numRestrictions",{get:function(){return this.map.size},enumerable:!1,configurable:!0}),t}(Cloneable_js_1.Cloneable);exports.PurposeRestrictionVector=PurposeRestrictionVector;
+"use strict";var __extends=this&&this.__extends||function(){var t=function(e,r){return(t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r])})(e,r)};return function(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");function o(){this.constructor=e}t(e,r),e.prototype=null===r?Object.create(r):(o.prototype=r.prototype,new o)}}(),__values=this&&this.__values||function(t){var e="function"==typeof Symbol&&Symbol.iterator,r=e&&t[e],o=0;if(r)return r.call(t);if(t&&"number"==typeof t.length)return{next:function(){return t&&o>=t.length&&(t=void 0),{value:t&&t[o++],done:!t}}};throw new TypeError(e?"Object is not iterable.":"Symbol.iterator is not defined.")};Object.defineProperty(exports,"__esModule",{value:!0}),exports.PurposeRestrictionVector=void 0;var PurposeRestriction_js_1=require("./PurposeRestriction.js"),RestrictionType_js_1=require("./RestrictionType.js"),Cloneable_js_1=require("../Cloneable.js"),PurposeRestrictionVector=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.bitLength=0,e.map=new Map,e}return __extends(e,t),e.prototype.has=function(t){return this.map.has(t)},e.prototype.isOkToHave=function(t,e,r){var o,i=!0;if(null===(o=this.gvl)||void 0===o?void 0:o.vendors){var n=this.gvl.vendors[r];if(n)if(t===RestrictionType_js_1.RestrictionType.NOT_ALLOWED)i=n.legIntPurposes.includes(e)||n.purposes.includes(e);else if(n.flexiblePurposes.length)switch(t){case RestrictionType_js_1.RestrictionType.REQUIRE_CONSENT:i=n.flexiblePurposes.includes(e)&&n.legIntPurposes.includes(e);break;case RestrictionType_js_1.RestrictionType.REQUIRE_LI:i=n.flexiblePurposes.includes(e)&&n.purposes.includes(e)}else i=!1;else i=!1}return i},e.prototype.add=function(t,e){if(this.isOkToHave(e.restrictionType,e.purposeId,t)){var r=e.hash;this.has(r)||(this.map.set(r,new Set),this.bitLength=0),this.map.get(r).add(t)}},e.prototype.restrictPurposeToLegalBasis=function(t,e){var r,o;void 0===e&&(e=Array.from(this.gvl.vendorIds));var i=t.hash;if(this.has(i)){var n=this.map.get(i);try{for(var s=__values(e),a=s.next();!a.done;a=s.next()){var u=a.value;n.add(u)}}catch(t){r={error:t}}finally{try{a&&!a.done&&(o=s.return)&&o.call(s)}finally{if(r)throw r.error}}}else this.map.set(i,new Set(e)),this.bitLength=0},e.prototype.getVendors=function(t){var e=[];if(t){var r=t.hash;this.has(r)&&(e=Array.from(this.map.get(r)))}else{var o=new Set;this.map.forEach((function(t){Array.from(t).forEach((function(t){o.add(t)}))})),e=Array.from(o)}return e.sort((function(t,e){return t-e}))},e.prototype.getRestrictionType=function(t,e){var r;return this.getRestrictions(t).forEach((function(t){t.purposeId===e&&(void 0===r||r>t.restrictionType)&&(r=t.restrictionType)})),r},e.prototype.vendorHasRestriction=function(t,e){for(var r=!1,o=this.getRestrictions(t),i=0;i<o.length&&!r;i++)r=e.isSameAs(o[i]);return r},e.prototype.getMaxVendorId=function(){var t=0;return this.map.forEach((function(e){var r=Array.from(e);t=Math.max(r[r.length-1],t)})),t},e.prototype.getRestrictions=function(t){var e=[];return this.map.forEach((function(r,o){t?r.has(t)&&e.push(PurposeRestriction_js_1.PurposeRestriction.unHash(o)):e.push(PurposeRestriction_js_1.PurposeRestriction.unHash(o))})),e},e.prototype.getPurposes=function(){var t=new Set;return this.map.forEach((function(e,r){t.add(PurposeRestriction_js_1.PurposeRestriction.unHash(r).purposeId)})),Array.from(t)},e.prototype.remove=function(t,e){var r=e.hash,o=this.map.get(r);o&&(o.delete(t),0==o.size&&(this.map.delete(r),this.bitLength=0))},Object.defineProperty(e.prototype,"gvl",{get:function(){return this.gvl_},set:function(t){var e=this;this.gvl_||(this.gvl_=t,this.map.forEach((function(t,r){var o=PurposeRestriction_js_1.PurposeRestriction.unHash(r);Array.from(t).forEach((function(r){e.isOkToHave(o.restrictionType,o.purposeId,r)||t.delete(r)}))})))},enumerable:!1,configurable:!0}),e.prototype.isEmpty=function(){return 0===this.map.size},Object.defineProperty(e.prototype,"numRestrictions",{get:function(){return this.map.size},enumerable:!1,configurable:!0}),e}(Cloneable_js_1.Cloneable);exports.PurposeRestrictionVector=PurposeRestrictionVector;

package/lib/cjs/model/index.d.ts

@@ -1,4 +1,3 @@
-export * from './BinarySearchTree.js';
 export * from './ConsentLanguages.js';
 export * from './Fields.js';
 export * from './IntMap.js';

package/lib/cjs/model/index.js

@@ -1 +1 @@
-"use strict";var __createBinding=this&&this.__createBinding||(Object.create?function(e,r,t,o){void 0===o&&(o=t),Object.defineProperty(e,o,{enumerable:!0,get:function(){return r[t]}})}:function(e,r,t,o){void 0===o&&(o=t),e[o]=r[t]}),__exportStar=this&&this.__exportStar||function(e,r){for(var t in e)"default"===t||Object.prototype.hasOwnProperty.call(r,t)||__createBinding(r,e,t)};Object.defineProperty(exports,"__esModule",{value:!0}),__exportStar(require("./BinarySearchTree.js"),exports),__exportStar(require("./ConsentLanguages.js"),exports),__exportStar(require("./Fields.js"),exports),__exportStar(require("./IntMap.js"),exports),__exportStar(require("./KeyMap.js"),exports),__exportStar(require("./PurposeRestriction.js"),exports),__exportStar(require("./PurposeRestrictionVector.js"),exports),__exportStar(require("./DeviceDisclosureStorageAccessType.js"),exports),__exportStar(require("./DeviceDisclosure.js"),exports),__exportStar(require("./RestrictionType.js"),exports),__exportStar(require("./Segment.js"),exports),__exportStar(require("./SegmentIDs.js"),exports),__exportStar(require("./Vector.js"),exports),__exportStar(require("./gvl/index.js"),exports);
+"use strict";var __createBinding=this&&this.__createBinding||(Object.create?function(e,r,t,o){void 0===o&&(o=t),Object.defineProperty(e,o,{enumerable:!0,get:function(){return r[t]}})}:function(e,r,t,o){void 0===o&&(o=t),e[o]=r[t]}),__exportStar=this&&this.__exportStar||function(e,r){for(var t in e)"default"===t||Object.prototype.hasOwnProperty.call(r,t)||__createBinding(r,e,t)};Object.defineProperty(exports,"__esModule",{value:!0}),__exportStar(require("./ConsentLanguages.js"),exports),__exportStar(require("./Fields.js"),exports),__exportStar(require("./IntMap.js"),exports),__exportStar(require("./KeyMap.js"),exports),__exportStar(require("./PurposeRestriction.js"),exports),__exportStar(require("./PurposeRestrictionVector.js"),exports),__exportStar(require("./DeviceDisclosureStorageAccessType.js"),exports),__exportStar(require("./DeviceDisclosure.js"),exports),__exportStar(require("./RestrictionType.js"),exports),__exportStar(require("./Segment.js"),exports),__exportStar(require("./SegmentIDs.js"),exports),__exportStar(require("./Vector.js"),exports),__exportStar(require("./gvl/index.js"),exports);

package/lib/mjs/encoder/field/PurposeRestrictionVectorEncoder.js

@@ -9,6 +9,13 @@ export class PurposeRestrictionVectorEncoder {
         let bitString = IntEncoder.encode(prVector.numRestrictions, BitLength.numRestrictions);
         // if the vector is empty we'll just return a string with just the numRestricitons being 0
         if (!prVector.isEmpty()) {
+            const gvlVendorIds = Array.from(prVector.gvl.vendorIds);
+            const gvlHasVendorBetween = (vendorId, nextVendorId) => {
+                const firstIndex = gvlVendorIds.indexOf(vendorId);
+                const nextIndex = gvlVendorIds.indexOf(nextVendorId);
+                const res = nextIndex - firstIndex;
+                return res > 1;
+            };
             // create each restriction group
             prVector.getRestrictions().forEach((purpRestriction) => {
                 // every restriction group has the purposeId and the restrictionType;
@@ -30,18 +37,10 @@ export class PurposeRestrictionVectorEncoder {
                         numEntries++;
                         startId = vendorId;
                     }
-                    // we know that `len` is greater than zero because we entered the loop
-                    const lastVendorId = vendors[len - 1];
-                    const gvlVendorIds = prVector.gvl.vendorIds;
-                    const nextGvlVendor = (vendorId) => {
-                        while (++vendorId <= lastVendorId && !gvlVendorIds.has(vendorId)) {
-                        }
-                        return vendorId;
-                    };
                     /**
                      * either end of the loop or there are GVL vendor IDs before the next one
                      */
-                    if (i === len - 1 || vendors[i + 1] > nextGvlVendor(vendorId)) {
+                    if (i === len - 1 || gvlHasVendorBetween(vendorId, vendors[i + 1])) {
                         /**
                          * it's a range entry if we've got something other than the start
                          * ID
@@ -94,12 +93,12 @@ export class PurposeRestrictionVectorEncoder {
                     if (endVendorId < startOrOnlyVendorId) {
                         throw new DecodingError(`Invalid RangeEntry: endVendorId ${endVendorId} is less than ${startOrOnlyVendorId}`);
                     }
-                    for (let k = startOrOnlyVendorId; k <= endVendorId; k++) {
-                        vector.add(k, purposeRestriction);
-                    }
+                    // required to preserve the default behavior (includes also vendors ids that doesn't exist)
+                    const vendorIds = Array.from({ length: endVendorId - startOrOnlyVendorId + 1 }, (_, index) => startOrOnlyVendorId + index);
+                    vector.restrictPurposeToLegalBasis(purposeRestriction, vendorIds);
                 }
                 else {
-                    vector.add(startOrOnlyVendorId, purposeRestriction);
+                    vector.restrictPurposeToLegalBasis(purposeRestriction, [startOrOnlyVendorId]);
                 }
             }
         }

package/lib/mjs/model/PurposeRestrictionVector.d.ts

@@ -11,8 +11,6 @@ export declare class PurposeRestrictionVector extends Cloneable<PurposeRestricti
     /**
      * a map indexed by a string which will be a 'hash' of the purpose and
      * restriction type.
-     *
-     * Using a BST to keep vendors in a sorted order for encoding later
      */
     private map;
     private gvl_;
@@ -30,9 +28,10 @@ export declare class PurposeRestrictionVector extends Cloneable<PurposeRestricti
      * restrictPurposeToLegalBasis - adds all Vendors under a given Purpose Restriction
      *
      * @param {PurposeRestriction} purposeRestriction
+     * @param {number[]|null|undefined} vendorsIds
      * @return {void}
      */
-    restrictPurposeToLegalBasis(purposeRestriction: PurposeRestriction): void;
+    restrictPurposeToLegalBasis(purposeRestriction: PurposeRestriction, vendorsIds?: number[]): void;
     /**
      * getVendors - returns array of vendor ids optionally narrowed by a given
      * Purpose Restriction.  If no purpose restriction is passed then all vendor

package/lib/mjs/model/PurposeRestrictionVector.js

@@ -1,5 +1,4 @@
 import { PurposeRestriction } from './PurposeRestriction.js';
-import { BinarySearchTree } from './BinarySearchTree.js';
 import { RestrictionType } from './RestrictionType.js';
 import { Cloneable } from '../Cloneable.js';
 export class PurposeRestrictionVector extends Cloneable {
@@ -11,8 +10,6 @@ export class PurposeRestrictionVector extends Cloneable {
     /**
      * a map indexed by a string which will be a 'hash' of the purpose and
      * restriction type.
-     *
-     * Using a BST to keep vendors in a sorted order for encoding later
      */
     map = new Map();
     gvl_;
@@ -81,7 +78,7 @@ export class PurposeRestrictionVector extends Cloneable {
         if (this.isOkToHave(purposeRestriction.restrictionType, purposeRestriction.purposeId, vendorId)) {
             const hash = purposeRestriction.hash;
             if (!this.has(hash)) {
-                this.map.set(hash, new BinarySearchTree());
+                this.map.set(hash, new Set());
                 this.bitLength = 0;
             }
             /**
@@ -96,32 +93,25 @@ export class PurposeRestrictionVector extends Cloneable {
      * restrictPurposeToLegalBasis - adds all Vendors under a given Purpose Restriction
      *
      * @param {PurposeRestriction} purposeRestriction
+     * @param {number[]|null|undefined} vendorsIds
      * @return {void}
      */
-    restrictPurposeToLegalBasis(purposeRestriction) {
-        const vendors = this.gvl.vendorIds;
+    restrictPurposeToLegalBasis(purposeRestriction, vendorsIds = Array.from(this.gvl.vendorIds)) {
         const hash = purposeRestriction.hash;
-        const lastEntry = (function () {
-            let value;
-            for (value of vendors)
-                ;
-            return value;
-        })();
-        /**
-         * Create an ordered array of vendor IDs from `1` (the minimum value for Vendor ID) to `lastEntry`
-         */
-        const values = [...Array(lastEntry).keys()].map((i) => i + 1);
-        for (let i = 1; i <= lastEntry; i++) {
-            if (!this.has(hash)) {
-                this.map.set(hash, BinarySearchTree.build(values)); // use static method `build` to create a `BST` from the ordered array of IDs
-                this.bitLength = 0;
+        if (!this.has(hash)) {
+            this.map.set(hash, new Set(vendorsIds));
+            this.bitLength = 0;
+        }
+        else {
+            const currentMap = this.map.get(hash);
+            for (const vendorId of vendorsIds) {
+                /**
+                   * Previously I had a check here to remove a duplicate value, but because
+                   * we're using a tree the value is guaranteed to be unique so there is no
+                   * need to add an additional de-duplication here.
+                   */
+                currentMap.add(vendorId);
             }
-            /**
-             * Previously I had a check here to remove a duplicate value, but because
-             * we're using a tree the value is guaranteed to be unique so there is no
-             * need to add an additional de-duplication here.
-             */
-            this.map.get(hash).add(i);
         }
     }
     /**
@@ -139,19 +129,19 @@ export class PurposeRestrictionVector extends Cloneable {
         if (purposeRestriction) {
             const hash = purposeRestriction.hash;
             if (this.has(hash)) {
-                vendorIds = this.map.get(hash).get();
+                vendorIds = Array.from(this.map.get(hash));
             }
         }
         else {
             const vendorSet = new Set();
-            this.map.forEach((bst) => {
-                bst.get().forEach((vendorId) => {
+            this.map.forEach((vendorIds) => {
+                Array.from(vendorIds).forEach((vendorId) => {
                     vendorSet.add(vendorId);
                 });
             });
             vendorIds = Array.from(vendorSet);
         }
-        return vendorIds;
+        return vendorIds.sort((a, b) => a - b);
     }
     getRestrictionType(vendorId, purposeId) {
         let rType;
@@ -188,29 +178,30 @@ export class PurposeRestrictionVector extends Cloneable {
      * @return {number} - maximum Vendor ID
      */
     getMaxVendorId() {
-        let retr = 0;
-        this.map.forEach((bst) => {
-            retr = Math.max(bst.max(), retr);
+        let result = 0;
+        this.map.forEach((purposeRestrictionVendorIds) => {
+            const vendorIds = Array.from(purposeRestrictionVendorIds);
+            result = Math.max(vendorIds[vendorIds.length - 1], result);
         });
-        return retr;
+        return result;
     }
     getRestrictions(vendorId) {
-        const retr = [];
-        this.map.forEach((bst, hash) => {
+        const result = [];
+        this.map.forEach((vendorIds, hash) => {
             if (vendorId) {
-                if (bst.contains(vendorId)) {
-                    retr.push(PurposeRestriction.unHash(hash));
+                if (vendorIds.has(vendorId)) {
+                    result.push(PurposeRestriction.unHash(hash));
                 }
             }
             else {
-                retr.push(PurposeRestriction.unHash(hash));
+                result.push(PurposeRestriction.unHash(hash));
             }
         });
-        return retr;
+        return result;
     }
     getPurposes() {
         const purposeIds = new Set();
-        this.map.forEach((bst, hash) => {
+        this.map.forEach((vendorIds, hash) => {
             purposeIds.add(PurposeRestriction.unHash(hash).purposeId);
         });
         return Array.from(purposeIds);
@@ -224,11 +215,11 @@ export class PurposeRestrictionVector extends Cloneable {
      */
     remove(vendorId, purposeRestriction) {
         const hash = purposeRestriction.hash;
-        const bst = this.map.get(hash);
-        if (bst) {
-            bst.remove(vendorId);
+        const vendorIds = this.map.get(hash);
+        if (vendorIds) {
+            vendorIds.delete(vendorId);
             // if it's empty let's delete the key so it doesn't show up empty
-            if (bst.isEmpty()) {
+            if (vendorIds.size == 0) {
                 this.map.delete(hash);
                 this.bitLength = 0;
             }
@@ -247,12 +238,12 @@ export class PurposeRestrictionVector extends Cloneable {
              * if we have restrictions set before the gvl is set then we'll have to
              * go through and remove some if they're not valid
              */
-            this.map.forEach((bst, hash) => {
+            this.map.forEach((vendorIds, hash) => {
                 const purposeRestriction = PurposeRestriction.unHash(hash);
-                const vendors = bst.get();
+                const vendors = Array.from(vendorIds);
                 vendors.forEach((vendorId) => {
                     if (!this.isOkToHave(purposeRestriction.restrictionType, purposeRestriction.purposeId, vendorId)) {
-                        bst.remove(vendorId);
+                        vendorIds.delete(vendorId);
                     }
                 });
             });

package/lib/mjs/model/index.d.ts

@@ -1,4 +1,3 @@
-export * from './BinarySearchTree.js';
 export * from './ConsentLanguages.js';
 export * from './Fields.js';
 export * from './IntMap.js';

package/lib/mjs/model/index.js

@@ -1,4 +1,3 @@
-export * from './BinarySearchTree.js';
 export * from './ConsentLanguages.js';
 export * from './Fields.js';
 export * from './IntMap.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pubtech-ai/core",
-  "version": "1.7.2",
+  "version": "2.0.1",
   "description": "Ensures consistent encoding and decoding of TC Signals for the iab. Transparency and Consent Framework (TCF).",
   "author": "Mayank Mishra <mayank@iabtechlab.com>",
   "homepage": "https://iabtcf.com/",
@@ -28,7 +28,7 @@
     "test-cov": "rm -rf coverage; nyc --reporter=html mocha"
   },
   "devDependencies": {
-    "@pubtech-ai/testing": "1.7.2",
+    "@pubtech-ai/testing": "2.0.1",
     "@istanbuljs/nyc-config-typescript": "^0.1.3",
     "@types/sinon": "^10.0.11",
     "@types/sinon-chai": "3.2.8",

package/lib/cjs/model/BinarySearchTree.d.ts

@@ -1,30 +0,0 @@
-import { Cloneable } from '../Cloneable.js';
-interface TreeNode {
-    value: number;
-    right: TreeNode | null;
-    left: TreeNode | null;
-}
-declare type TreeNodeMaybe = TreeNode | null;
-export declare class BinarySearchTree extends Cloneable<BinarySearchTree> {
-    private root;
-    getRoot(): TreeNodeMaybe;
-    isEmpty(): boolean;
-    add(value: number): void;
-    /**
-     * performs Morris in-order traversal
-     * @return {number[]} sorted array
-     */
-    get(): number[];
-    contains(value: number): boolean;
-    min(current?: TreeNodeMaybe): number;
-    max(current?: TreeNodeMaybe): number;
-    remove(value: number, current?: TreeNodeMaybe): void;
-    /**
-     * Build Binary Search Tree from the ordered number array.
-     *  The depth of the tree will be the `log2` of the array length.
-     * @param {number[]} values number array in ascending order
-     * @return {BinarySearchTree} Binary Search Tree
-     */
-    static build(values?: number[]): BinarySearchTree | null;
-}
-export {};

package/lib/cjs/model/BinarySearchTree.js

@@ -1 +0,0 @@
-"use strict";var __extends=this&&this.__extends||function(){var t=function(e,r){return(t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r])})(e,r)};return function(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");function o(){this.constructor=e}t(e,r),e.prototype=null===r?Object.create(r):(o.prototype=r.prototype,new o)}}();Object.defineProperty(exports,"__esModule",{value:!0}),exports.BinarySearchTree=void 0;var Cloneable_js_1=require("../Cloneable.js"),BinarySearchTree=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.root=null,e}return __extends(e,t),e.prototype.getRoot=function(){return this.root},e.prototype.isEmpty=function(){return!this.root},e.prototype.add=function(t){var e,r={value:t,left:null,right:null};if(this.isEmpty())this.root=r;else for(e=this.root;;)if(t<e.value){if(null===e.left){e.left=r;break}e=e.left}else{if(!(t>e.value))break;if(null===e.right){e.right=r;break}e=e.right}},e.prototype.get=function(){for(var t=[],e=this.root;e;)if(e.left){for(var r=e.left;r.right&&r.right!=e;)r=r.right;r.right==e?(r.right=null,t.push(e.value),e=e.right):(r.right=e,e=e.left)}else t.push(e.value),e=e.right;return t},e.prototype.contains=function(t){for(var e=!1,r=this.root;r;){if(r.value===t){e=!0;break}t>r.value?r=r.right:t<r.value&&(r=r.left)}return e},e.prototype.min=function(t){var e;for(void 0===t&&(t=this.root);t;)t.left?t=t.left:(e=t.value,t=null);return e},e.prototype.max=function(t){var e;for(void 0===t&&(t=this.root);t;)t.right?t=t.right:(e=t.value,t=null);return e},e.prototype.remove=function(t,e){void 0===e&&(e=this.root);for(var r=null,o="left";e;)if(t<e.value)r=e,e=e.left,o="left";else if(t>e.value)r=e,e=e.right,o="right";else{if(e.left||e.right)if(e.left)if(e.right){var i=this.min(e.right);this.remove(i,e.right),e.value=i}else r?r[o]=e.left:this.root=e.left;else r?r[o]=e.right:this.root=e.right;else r?r[o]=null:this.root=null;e=null}},e.build=function(t){if(t&&0!==t.length){if(1===t.length)return(r=new e).add(t[0]),r;var r,o=t.length>>1;(r=new e).add(t[o]);var i=r.getRoot();if(i){if(o+1<t.length){var l=e.build(t.slice(o+1));i.right=l?l.getRoot():null}if(o-1>0){var n=e.build(t.slice(0,o-1));i.left=n?n.getRoot():null}}return r}return null},e}(Cloneable_js_1.Cloneable);exports.BinarySearchTree=BinarySearchTree;

package/lib/mjs/model/BinarySearchTree.d.ts

@@ -1,30 +0,0 @@
-import { Cloneable } from '../Cloneable.js';
-interface TreeNode {
-    value: number;
-    right: TreeNode | null;
-    left: TreeNode | null;
-}
-declare type TreeNodeMaybe = TreeNode | null;
-export declare class BinarySearchTree extends Cloneable<BinarySearchTree> {
-    private root;
-    getRoot(): TreeNodeMaybe;
-    isEmpty(): boolean;
-    add(value: number): void;
-    /**
-     * performs Morris in-order traversal
-     * @return {number[]} sorted array
-     */
-    get(): number[];
-    contains(value: number): boolean;
-    min(current?: TreeNodeMaybe): number;
-    max(current?: TreeNodeMaybe): number;
-    remove(value: number, current?: TreeNodeMaybe): void;
-    /**
-     * Build Binary Search Tree from the ordered number array.
-     *  The depth of the tree will be the `log2` of the array length.
-     * @param {number[]} values number array in ascending order
-     * @return {BinarySearchTree} Binary Search Tree
-     */
-    static build(values?: number[]): BinarySearchTree | null;
-}
-export {};

package/lib/mjs/model/BinarySearchTree.js

@@ -1,267 +0,0 @@
-import { Cloneable } from '../Cloneable.js';
-export class BinarySearchTree extends Cloneable {
-    root = null;
-    getRoot() {
-        return this.root;
-    }
-    isEmpty() {
-        // if root is undefined or null then by definition this is empty
-        return !(this.root);
-    }
-    add(value) {
-        // create new node object
-        const node = {
-            value: value,
-            left: null,
-            right: null,
-        };
-        let current;
-        // first item?
-        if (this.isEmpty()) {
-            this.root = node;
-        }
-        else {
-            // start at the root
-            current = this.root;
-            // infinite loop, figure out where to put it
-            while (true) {
-                // if the value is less than current value; go left
-                if (value < current.value) {
-                    // if it's empty, we can insert
-                    if (current.left === null) {
-                        // insert on the left
-                        current.left = node;
-                        // our work is done here
-                        break;
-                    }
-                    else {
-                        /**
-                         * if there's something there already, we'll reset the pointer and
-                         * wait for the next loop to do something ie. keep traversing
-                         */
-                        current = current.left;
-                    }
-                }
-                else if (value > current.value) {
-                    // if the value is greater than our current value; go right
-                    if (current.right === null) {
-                        // there's nothing to the right, so put it here
-                        current.right = node;
-                        break;
-                    }
-                    else {
-                        /**
-                         * if there's something there already, we'll reset the pointer and
-                         * wait for the next loop to do something ie. keep traversing
-                         */
-                        current = current.right;
-                    }
-                }
-                else {
-                    /**
-                     * If it's neither greater than the right or less than the right then
-                     * it is equal to the current nodes value.  In that case we won't do
-                     * anything with it because we will only insert unique values.
-                     */
-                    break;
-                }
-            }
-        }
-    }
-    /**
-     * performs Morris in-order traversal
-     * @return {number[]} sorted array
-     */
-    get() {
-        const retr = [];
-        let current = this.root;
-        while (current) {
-            if (!current.left) {
-                retr.push(current.value); // if there is no left child, visit current node
-                current = current.right; // then we go the right branch
-            }
-            else {
-                // find the right most leaf of root.left node.
-                let pre = current.left;
-                // when pre.right == null, it means we go to the right most leaf
-                // when pre.right == current, it means the right most leaf has been visited in the last round
-                while (pre.right && pre.right != current) {
-                    pre = pre.right;
-                }
-                // this means the pre.right has been set, it's time to go to current node
-                if (pre.right == current) {
-                    pre.right = null;
-                    // means the current node is pointed by left right most child
-                    // the left branch has been visited, it's time to push the current node
-                    retr.push(current.value);
-                    current = current.right;
-                }
-                else {
-                    // the fist time to visit the pre node, make its right child point to current node
-                    pre.right = current;
-                    current = current.left;
-                }
-            }
-        }
-        return retr;
-    }
-    contains(value) {
-        let retr = false;
-        let current = this.root;
-        while (current) {
-            if (current.value === value) {
-                retr = true;
-                break;
-            }
-            else if (value > current.value) {
-                current = current.right;
-            }
-            else if (value < current.value) {
-                current = current.left;
-            }
-        }
-        return retr;
-    }
-    min(current = this.root) {
-        let retr;
-        while (current) {
-            if (current.left) {
-                current = current.left;
-            }
-            else {
-                retr = current.value;
-                current = null;
-            }
-        }
-        return retr;
-    }
-    max(current = this.root) {
-        let retr;
-        while (current) {
-            if (current.right) {
-                current = current.right;
-            }
-            else {
-                retr = current.value;
-                current = null;
-            }
-        }
-        return retr;
-    }
-    remove(value, current = this.root) {
-        // we start at the root, so the parent is null
-        let parent = null;
-        let parentSide = 'left';
-        while (current) {
-            if (value < current.value) {
-                // set our parent to the current value
-                parent = current;
-                // value is less than current value, so go left
-                current = current.left;
-                parentSide = 'left';
-            }
-            else if (value > current.value) {
-                // set our parent to the current value
-                parent = current;
-                // value is greater than current value, so go right
-                current = current.right;
-                parentSide = 'right';
-            }
-            else {
-                /**
-                   * if it's neither greater than or less than, then it's equal so BINGO!
-                   * we've found it
-                   *
-                   * If we have children, we've got to figure out what to do with
-                   * them once we are no longer around...  Woah, code is like real
-                   * life...
-                   *
-                   * There are three cases we care about when it comes to this removal
-                   * process:
-                   *
-                   * 1. No children -- If not children we just delete an do nothing
-                   * else, no harm no foul.
-                   *
-                   * 2. One child -- Just link the parent's link to current to the
-                   * child.
-                   *
-                   * 3. Two children --  Find the minimum value from the right subtree
-                   * replace us with the minimum value and of course remove that
-                   * minimum value from the right stubtree
-                   */
-                if (!current.left && !current.right) {
-                    // case 1 there are no children easy peasy lemon squeezy
-                    if (parent) {
-                        parent[parentSide] = null;
-                    }
-                    else {
-                        this.root = null;
-                    }
-                }
-                else if (!current.left) {
-                    // no left side only right, so link right
-                    if (parent) {
-                        parent[parentSide] = current.right;
-                    }
-                    else {
-                        this.root = current.right;
-                    }
-                }
-                else if (!current.right) {
-                    // no right side only left, so link left
-                    if (parent) {
-                        parent[parentSide] = current.left;
-                    }
-                    else {
-                        this.root = current.left;
-                    }
-                }
-                else {
-                    /**
-                     * case 3 just like real life, if you delete a parent the more kids
-                     * that parent has the more complicated things get... in this case we
-                     * have two children.  We're gonna have to figure out who goes where.
-                     */
-                    const minVal = this.min(current.right);
-                    // little bit of recursion...
-                    this.remove(minVal, current.right);
-                    current.value = minVal;
-                }
-                current = null;
-            }
-        }
-    }
-    /**
-     * Build Binary Search Tree from the ordered number array.
-     *  The depth of the tree will be the `log2` of the array length.
-     * @param {number[]} values number array in ascending order
-     * @return {BinarySearchTree} Binary Search Tree
-     */
-    static build(values) {
-        if (!values || values.length === 0) {
-            return null;
-        }
-        else if (values.length === 1) {
-            const tree = new BinarySearchTree();
-            tree.add(values[0]);
-            return tree;
-        }
-        else {
-            const rootIndex = values.length >> 1;
-            const tree = new BinarySearchTree();
-            tree.add(values[rootIndex]);
-            const root = tree.getRoot();
-            if (root) {
-                if (rootIndex + 1 < values.length) {
-                    const rightTree = BinarySearchTree.build(values.slice(rootIndex + 1));
-                    root.right = rightTree ? rightTree.getRoot() : null;
-                }
-                if (rootIndex - 1 > 0) {
-                    const leftTree = BinarySearchTree.build(values.slice(0, rootIndex - 1));
-                    root.left = leftTree ? leftTree.getRoot() : null;
-                }
-            }
-            return tree;
-        }
-    }
-}