@guardian/commercial-core 0.34.0 → 0.34.1

package/dist/cjs/targeting/pick-targeting-values.d.ts

@@ -1,8 +1,5 @@
-declare type ValidTargeting<T, K> = '' extends T ? never : [] extends T ? never : [''] extends T ? never : T extends boolean ? never : T extends NonNullable<T> ? K : never;
-declare type DefinedKeys<T> = {
-    [K in keyof T]-?: ValidTargeting<T[K], K>;
-}[keyof T];
-declare type ObjectWithDefinedValues<T> = Pick<T, DefinedKeys<T>>;
+import type { ConditionalExcept } from 'type-fest';
+declare type ValidTargetingObject<Base> = ConditionalExcept<Base, null | undefined | '' | readonly [] | readonly [''] | boolean | number>;
 /**
  * Picks only keys with targeting values from an object.
  * A targeting values is defined as either:
@@ -24,5 +21,5 @@ declare type ObjectWithDefinedValues<T> = Pick<T, DefinedKeys<T>>;
  * clean.invalid
  * ```
  */
-export declare const pickTargetingValues: <T extends Record<string, string | readonly string[] | undefined>>(obj: T) => ObjectWithDefinedValues<T>;
+export declare const pickTargetingValues: <T extends Record<string, string | readonly string[] | undefined>>(obj: T) => import("type-fest").Except<T, NonNullable<{ [Key in keyof T]: T[Key] extends number | boolean | "" | readonly [] | readonly [""] | null | undefined ? Key : never; }[keyof T]>>;
 export {};

package/dist/cjs/targeting/pick-targeting-values.js

@@ -37,7 +37,9 @@ const pickTargetingValues = (obj) => {
     return Object.entries(obj).reduce((valid, [key, value]) => {
         if (isValidTargeting(value)) {
             // @ts-expect-error -- isValidTargeting checks this
-            valid[key] = value;
+            valid[key] = Array.isArray(value)
+                ? value.filter(isTargetingString)
+                : value;
         }
         return valid;
     }, initialValue);

package/dist/esm/targeting/pick-targeting-values.d.ts

@@ -1,8 +1,5 @@
-declare type ValidTargeting<T, K> = '' extends T ? never : [] extends T ? never : [''] extends T ? never : T extends boolean ? never : T extends NonNullable<T> ? K : never;
-declare type DefinedKeys<T> = {
-    [K in keyof T]-?: ValidTargeting<T[K], K>;
-}[keyof T];
-declare type ObjectWithDefinedValues<T> = Pick<T, DefinedKeys<T>>;
+import type { ConditionalExcept } from 'type-fest';
+declare type ValidTargetingObject<Base> = ConditionalExcept<Base, null | undefined | '' | readonly [] | readonly [''] | boolean | number>;
 /**
  * Picks only keys with targeting values from an object.
  * A targeting values is defined as either:
@@ -24,5 +21,5 @@ declare type ObjectWithDefinedValues<T> = Pick<T, DefinedKeys<T>>;
  * clean.invalid
  * ```
  */
-export declare const pickTargetingValues: <T extends Record<string, string | readonly string[] | undefined>>(obj: T) => ObjectWithDefinedValues<T>;
+export declare const pickTargetingValues: <T extends Record<string, string | readonly string[] | undefined>>(obj: T) => import("type-fest").Except<T, NonNullable<{ [Key in keyof T]: T[Key] extends number | boolean | "" | readonly [] | readonly [""] | null | undefined ? Key : never; }[keyof T]>>;
 export {};

package/dist/esm/targeting/pick-targeting-values.js

@@ -34,7 +34,9 @@ export const pickTargetingValues = (obj) => {
     return Object.entries(obj).reduce((valid, [key, value]) => {
         if (isValidTargeting(value)) {
             // @ts-expect-error -- isValidTargeting checks this
-            valid[key] = value;
+            valid[key] = Array.isArray(value)
+                ? value.filter(isTargetingString)
+                : value;
         }
         return valid;
     }, initialValue);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guardian/commercial-core",
-  "version": "0.34.0",
+  "version": "0.34.1",
   "description": "Guardian advertising business logic",
   "homepage": "https://github.com/guardian/commercial-core#readme",
   "bugs": {
@@ -71,6 +71,7 @@
     "prettier": "^2.5.0",
     "semantic-release": "^18.0.1",
     "ts-jest": "^27.0.7",
+    "type-fest": "^2.8.0",
     "typescript": "^4.5.2",
     "web-vitals": "^2.1.2"
   },