From 33a3531f1424c1ad3a0ee24fae855ef82d946fdf Mon Sep 17 00:00:00 2001 From: Marco Prontera Date: Fri, 11 Aug 2023 10:57:47 +0200 Subject: [PATCH 1/5] dos: update doc --- modules/cli/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cli/README.md b/modules/cli/README.md index 2f8e3e4c..0f23c03d 100644 --- a/modules/cli/README.md +++ b/modules/cli/README.md @@ -32,7 +32,7 @@ created: Mon Dec 09 2019 00:00:00 GMT lastUpdated: Mon Dec 09 2019 00:00:00 GMT policyVersion: 2 isServiceSpecific: false -useNonStandardStacks: false +useNonStandardTexts: false purposeOneTreatment: false publisherCountryCode: "ES" supportOOB: false From b0d1b67ff27490696e0d6d487c47f643d076279a Mon Sep 17 00:00:00 2001 From: Marco Prontera Date: Fri, 11 Aug 2023 10:58:01 +0200 Subject: [PATCH 2/5] test: update test cmpapi --- modules/cmpapi/test/response/TCData.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cmpapi/test/response/TCData.test.ts b/modules/cmpapi/test/response/TCData.test.ts index 12f1802b..8cf5bfaa 100644 --- a/modules/cmpapi/test/response/TCData.test.ts +++ b/modules/cmpapi/test/response/TCData.test.ts @@ -37,7 +37,7 @@ describe('response->TCData', (): void => { expect(tcData.cmpStatus, 'cmpStatus').to.equal(CmpApiModel.cmpStatus); expect(tcData.isServiceSpecific, 'isServiceSpecific').to.be.undefined; - expect(tcData.useNonStandardStacks, 'useNonStandardStacks').to.be.undefined; + expect(tcData.useNonStandardTexts, 'useNonStandardTexts').to.be.undefined; expect(tcData.purposeOneTreatment, 'purposeOneTreatment').to.be.undefined; expect(tcData.publisherCC, 'publisherCC').to.be.undefined; From 4acf2f859cc3a60c300b96899836b1d1f96844a2 Mon Sep 17 00:00:00 2001 From: Marco Prontera Date: Fri, 11 Aug 2023 10:58:42 +0200 Subject: [PATCH 3/5] test: update cmpapi test --- modules/cmpapi/test/TestUtils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cmpapi/test/TestUtils.ts b/modules/cmpapi/test/TestUtils.ts index 737361a4..973b15ad 100644 --- a/modules/cmpapi/test/TestUtils.ts +++ b/modules/cmpapi/test/TestUtils.ts @@ -68,7 +68,7 @@ export class TestUtils { expect(inAppTCData.tcString, 'tcString').to.equal(TCString.encode(tcModel)); expect(inAppTCData.eventStatus, 'eventStatus').to.equal(CmpApiModel.eventStatus); expect(inAppTCData.isServiceSpecific, 'isServiceSpecific').to.equal(tcModel.isServiceSpecific); - expect(inAppTCData.useNonStandardStacks, 'useNonStandardStacks').to.equal(tcModel.useNonStandardStacks); + expect(inAppTCData.useNonStandardTexts, 'useNonStandardTexts').to.equal(tcModel.useNonStandardTexts); expect(inAppTCData.purposeOneTreatment, 'purposeOneTreatment').to.equal(tcModel.purposeOneTreatment); expect(inAppTCData.publisherCC, 'publisherCC').to.equal(tcModel.publisherCountryCode); expect(inAppTCData.outOfBand, 'outOfBand').to.be.undefined; @@ -141,7 +141,7 @@ export class TestUtils { expect(tcData.eventStatus, 'eventStatus').to.equal(CmpApiModel.eventStatus); expect(tcData.cmpStatus, 'cmpStatus').to.equal(CmpApiModel.cmpStatus); expect(tcData.isServiceSpecific, 'isServiceSpecific').to.equal(tcModel.isServiceSpecific); - expect(tcData.useNonStandardStacks, 'useNonStandardStacks').to.equal(tcModel.useNonStandardStacks); + expect(tcData.useNonStandardTexts, 'useNonStandardTexts').to.equal(tcModel.useNonStandardTexts); expect(tcData.purposeOneTreatment, 'purposeOneTreatment').to.equal(tcModel.purposeOneTreatment); expect(tcData.publisherCC, 'publisherCC').to.equal(tcModel.publisherCountryCode); From 77ffbe12a320c581275ab06ba294e39f8945aaed Mon Sep 17 00:00:00 2001 From: Marco Prontera Date: Fri, 11 Aug 2023 10:58:54 +0200 Subject: [PATCH 4/5] test: update core tests --- modules/core/test/TCModel.test.ts | 2 +- modules/core/test/encoder/BitLength.test.ts | 2 +- modules/core/test/encoder/sequence/FieldSequence.test.ts | 2 +- modules/core/test/model/Fields.test.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/core/test/TCModel.test.ts b/modules/core/test/TCModel.test.ts index 028a7abc..32c2cb18 100644 --- a/modules/core/test/TCModel.test.ts +++ b/modules/core/test/TCModel.test.ts @@ -198,7 +198,7 @@ describe('TCModel', (): void => { testDate('lastUpdated'); testBoolean('isServiceSpecific'); - testBoolean('useNonStandardStacks'); + testBoolean('useNonStandardTexts'); testInstanceOf('purposeConsents', Vector); testInstanceOf('purposeLegitimateInterests', Vector); diff --git a/modules/core/test/encoder/BitLength.test.ts b/modules/core/test/encoder/BitLength.test.ts index 653d77a7..8ca28fd6 100644 --- a/modules/core/test/encoder/BitLength.test.ts +++ b/modules/core/test/encoder/BitLength.test.ts @@ -40,7 +40,7 @@ export function run(): void { expect(BitLength.segmentType, 'segmentType').to.equal(3); expect(BitLength.singleOrRange, 'singleOrRange').to.equal(1); expect(BitLength.specialFeatureOptins, 'specialFeatureOptins').to.equal(12); - expect(BitLength.useNonStandardStacks, 'useNonStandardStacks').to.equal(1); + expect(BitLength.useNonStandardTexts, 'useNonStandardTexts').to.equal(1); expect(BitLength.vendorId, 'vendorId').to.equal(16); expect(BitLength.vendorListVersion, 'vendorListVersion').to.equal(12); expect(BitLength.version, 'version').to.equal(6); diff --git a/modules/core/test/encoder/sequence/FieldSequence.test.ts b/modules/core/test/encoder/sequence/FieldSequence.test.ts index e30996d6..c07ec0db 100644 --- a/modules/core/test/encoder/sequence/FieldSequence.test.ts +++ b/modules/core/test/encoder/sequence/FieldSequence.test.ts @@ -52,7 +52,7 @@ describe('encoder/sequence->FieldSequence', (): void => { Fields.vendorListVersion, Fields.policyVersion, Fields.isServiceSpecific, - Fields.useNonStandardStacks, + Fields.useNonStandardTexts, Fields.specialFeatureOptins, Fields.purposeConsents, Fields.purposeLegitimateInterests, diff --git a/modules/core/test/model/Fields.test.ts b/modules/core/test/model/Fields.test.ts index 5f696614..1560e7e4 100644 --- a/modules/core/test/model/Fields.test.ts +++ b/modules/core/test/model/Fields.test.ts @@ -26,7 +26,7 @@ describe('model->Fields', (): void => { purposeLegitimateInterests: 'purposeLegitimateInterests', purposeOneTreatment: 'purposeOneTreatment', specialFeatureOptins: 'specialFeatureOptins', - useNonStandardStacks: 'useNonStandardStacks', + useNonStandardTexts: 'useNonStandardTexts', vendorConsents: 'vendorConsents', vendorLegitimateInterests: 'vendorLegitimateInterests', vendorListVersion: 'vendorListVersion', From e8ca1ab584e6622223dab51d8e6a16c11507a02e Mon Sep 17 00:00:00 2001 From: Marco Prontera Date: Fri, 11 Aug 2023 10:59:19 +0200 Subject: [PATCH 5/5] feat: replace with useNonStandardTexts --- modules/cli/src/index.ts | 2 +- modules/cmpapi/src/response/TCData.ts | 4 ++-- modules/core/src/TCModel.ts | 10 +++++----- modules/core/src/encoder/BitLength.ts | 2 +- modules/core/src/encoder/field/FieldEncoderMap.ts | 2 +- modules/core/src/encoder/sequence/FieldSequence.ts | 2 +- modules/core/src/model/Fields.ts | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/cli/src/index.ts b/modules/cli/src/index.ts index 9eb3f5d8..cd6e0ae7 100755 --- a/modules/cli/src/index.ts +++ b/modules/cli/src/index.ts @@ -89,7 +89,7 @@ if (encoded) { print('policyVersion', tcModel.policyVersion); print('isServiceSpecific', tcModel.isServiceSpecific); - print('useNonStandardStacks', tcModel.useNonStandardStacks); + print('useNonStandardTexts', tcModel.useNonStandardTexts); print('purposeOneTreatment', tcModel.purposeOneTreatment); print('publisherCountryCode', tcModel.publisherCountryCode); diff --git a/modules/cmpapi/src/response/TCData.ts b/modules/cmpapi/src/response/TCData.ts index 7ddf2ebc..cb12ea9e 100644 --- a/modules/cmpapi/src/response/TCData.ts +++ b/modules/cmpapi/src/response/TCData.ts @@ -14,7 +14,7 @@ export class TCData extends Response { public eventStatus: EventStatus; public cmpStatus: CmpStatus; public isServiceSpecific: Booleany; - public useNonStandardStacks: Booleany; + public useNonStandardTexts: Booleany; public publisherCC: string; public purposeOneTreatment: Booleany; @@ -76,7 +76,7 @@ export class TCData extends Response { this.tcString = CmpApiModel.tcString; this.isServiceSpecific = tcModel.isServiceSpecific; - this.useNonStandardStacks = tcModel.useNonStandardStacks; + this.useNonStandardTexts = tcModel.useNonStandardTexts; this.purposeOneTreatment = tcModel.purposeOneTreatment; this.publisherCC = tcModel.publisherCountryCode; diff --git a/modules/core/src/TCModel.ts b/modules/core/src/TCModel.ts index baf3c496..c0273750 100644 --- a/modules/core/src/TCModel.ts +++ b/modules/core/src/TCModel.ts @@ -16,7 +16,7 @@ export class TCModel extends Cloneable { private isServiceSpecific_ = false; private supportOOB_ = true; - private useNonStandardStacks_ = false; + private useNonStandardTexts_ = false; private purposeOneTreatment_ = false; private publisherCountryCode_ = 'AA'; private version_ = 2; @@ -434,15 +434,15 @@ export class TCModel extends Cloneable { * * @param {boolean} bool - value to set */ - public set useNonStandardStacks(bool: boolean) { + public set useNonStandardTexts(bool: boolean) { - this.useNonStandardStacks_ = bool; + this.useNonStandardTexts_ = bool; } - public get useNonStandardStacks(): boolean { + public get useNonStandardTexts(): boolean { - return this.useNonStandardStacks_; + return this.useNonStandardTexts_; } diff --git a/modules/core/src/encoder/BitLength.ts b/modules/core/src/encoder/BitLength.ts index 254d7055..efd08558 100644 --- a/modules/core/src/encoder/BitLength.ts +++ b/modules/core/src/encoder/BitLength.ts @@ -17,7 +17,7 @@ export class BitLength { public static readonly [Fields.purposeLegitimateInterests]: number = 24; public static readonly [Fields.purposeOneTreatment]: number = 1; public static readonly [Fields.specialFeatureOptins]: number = 12; - public static readonly [Fields.useNonStandardStacks]: number = 1; + public static readonly [Fields.useNonStandardTexts]: number = 1; public static readonly [Fields.vendorListVersion]: number = 12; public static readonly [Fields.version]: number = 6; diff --git a/modules/core/src/encoder/field/FieldEncoderMap.ts b/modules/core/src/encoder/field/FieldEncoderMap.ts index 62fcfd68..4d17f556 100644 --- a/modules/core/src/encoder/field/FieldEncoderMap.ts +++ b/modules/core/src/encoder/field/FieldEncoderMap.ts @@ -20,7 +20,7 @@ export function FieldEncoderMap(): object { [Fields.vendorListVersion]: IntEncoder, [Fields.policyVersion]: IntEncoder, [Fields.isServiceSpecific]: BooleanEncoder, - [Fields.useNonStandardStacks]: BooleanEncoder, + [Fields.useNonStandardTexts]: BooleanEncoder, [Fields.specialFeatureOptins]: FixedVectorEncoder, [Fields.purposeConsents]: FixedVectorEncoder, [Fields.purposeLegitimateInterests]: FixedVectorEncoder, diff --git a/modules/core/src/encoder/sequence/FieldSequence.ts b/modules/core/src/encoder/sequence/FieldSequence.ts index 8e22d585..d731dff6 100644 --- a/modules/core/src/encoder/sequence/FieldSequence.ts +++ b/modules/core/src/encoder/sequence/FieldSequence.ts @@ -29,7 +29,7 @@ export class FieldSequence implements SequenceVersionMap { Fields.vendorListVersion, Fields.policyVersion, Fields.isServiceSpecific, - Fields.useNonStandardStacks, + Fields.useNonStandardTexts, Fields.specialFeatureOptins, Fields.purposeConsents, Fields.purposeLegitimateInterests, diff --git a/modules/core/src/model/Fields.ts b/modules/core/src/model/Fields.ts index c3282bd2..81076d09 100644 --- a/modules/core/src/model/Fields.ts +++ b/modules/core/src/model/Fields.ts @@ -20,7 +20,7 @@ export class Fields { public static readonly purposeLegitimateInterests: 'purposeLegitimateInterests' = 'purposeLegitimateInterests'; public static readonly purposeOneTreatment: 'purposeOneTreatment' = 'purposeOneTreatment'; public static readonly specialFeatureOptins: 'specialFeatureOptins' = 'specialFeatureOptins'; - public static readonly useNonStandardStacks: 'useNonStandardStacks' = 'useNonStandardStacks'; + public static readonly useNonStandardTexts: 'useNonStandardTexts' = 'useNonStandardTexts'; public static readonly vendorConsents: 'vendorConsents' = 'vendorConsents'; public static readonly vendorLegitimateInterests: 'vendorLegitimateInterests' = 'vendorLegitimateInterests'; public static readonly vendorListVersion: 'vendorListVersion' = 'vendorListVersion';