From ec55dd24506e12d08b2b7eb2c5be6393bd949411 Mon Sep 17 00:00:00 2001
From: Jay Pilgreen <jaypilgreen@gmail.com>
Date: Wed, 20 Sep 2023 08:50:33 -0500
Subject: [PATCH] config structure simplification

---
 config/homepage.json     |  33 ++----
 config/section.json      |  12 +--
 config/story.json        | 125 +++++++---------------
 demo/demo.css            |   4 +
 demo/homepage/index.html |  86 +++++++++++++++
 demo/locker.js           |  12 ++-
 demo/section/index.html  |   2 +-
 demo/story/index.html    |   2 +
 index.js                 |   6 +-
 lib/config.js            | 226 ++++++++++++++++++---------------------
 lib/zones.js             | 108 +++++++++++++++----
 11 files changed, 347 insertions(+), 269 deletions(-)
 create mode 100644 demo/homepage/index.html

diff --git a/config/homepage.json b/config/homepage.json
index f4e8757..a63ffec 100644
--- a/config/homepage.json
+++ b/config/homepage.json
@@ -2,42 +2,23 @@
   "zones": [
     {
       "id": "zone-community-events",
+      "vip": "#secondary-story-9",
       "type": "editorial",
-      "filters": [
-        {
-          "type": "config",
-          "name": "zone.communityEvents",
-          "value": true
-        }
-      ],
+      "filters": {
+        "zone.communityEvents": true
+      },
       "zephr": {
         "feature": "zone-community-events",
-        "dataset": [
-          {
-            "type": "config",
-            "name": "market",
-            "value": "marketInfo.domain"
-          }
-        ]
-      },
-      "placement": {
-        "type": "query",
-        "value": "#secondary-story-9"
+        "dataset": ["marketInfo.domain"]
       }
     },
     {
       "id": "zone-el-9",
-      "placement": {
-        "type": "query",
-        "value": "#secondary-story-6"
-      }
+      "vip": "#seconddary-story-6"
     },
     {
       "id": "zone-el-11",
-      "placement": {
-        "type": "query",
-        "value": "#secondary-story-10"
-      }
+      "vip": "#secondary-story-10"
     }
   ]
 }
diff --git a/config/section.json b/config/section.json
index a26a0e1..b706084 100644
--- a/config/section.json
+++ b/config/section.json
@@ -2,15 +2,9 @@
   "zones": [
     {
       "id": "zone-el-9",
-      "filters": [
-        {
-          "type": "subscriber",
-          "value": false
-        }
-      ],
-      "placement": {
-        "type": "query",
-        "value":  ".grid > :nth-child(14)"
+      "vip": ".grid > :nth-child(14)",
+      "filters": {
+        "subscriber": false
       }
     }
   ]
diff --git a/config/story.json b/config/story.json
index d8b87a8..e6a2f7a 100644
--- a/config/story.json
+++ b/config/story.json
@@ -1,5 +1,5 @@
 {
-  "base": ".story-body [id^=zone-el]",
+  "wps": ".story-body [id^=zone-el]",
   "ignore": ["zone-el-16"],
   "cadence": {
     "subscriber": 4,
@@ -7,119 +7,72 @@
     "standard": 2
   },
   "zones": [
+    {
+      "id": "zone-el-1",
+      "vip": ".flag",
+      "position": "afterend",
+      "filters": {
+        "subscriber": false,
+        "zone.sponsoredArticle": false
+      }
+    },
     {
       "id": "zone-taboola-recommendations",
-      "filters": [
-        {
-          "type": "config",
-          "name": "zone.taboolaRecommendations",
-          "value": true
-        }
-      ],
+      "after": "zone-el-101",
+      "tracking": true,
+      "filters": {
+        "zone.taboolaRecommendations": true
+      },
       "zephr": {
         "feature": "zone-taboola-recommendations",
-        "dataset": [
-          {
-            "type": "dma",
-            "name": "dma"
-          }
-        ]
-      },
-      "placement": {
-        "type": "after",
-        "value": "zone-el-101"
-      },
-      "tracking": true
+        "dataset": ["dma"]
+      }
     },
     {
       "id": "zone-si-tickets",
       "cue": 278143207,
-      "filters": [
-        {
-          "type": "config",
-          "name": "zone.siTickets",
-          "value": true
-        }
-      ],
-      "placement": {
-        "type": "after",
-        "value": "zone-el-101"
+      "after": "zone-el-101",
+      "filters": {
+        "zone.siTickets": true
       }
     },
     {
       "id": "zone-gamecocks-nav",
+      "vip": ".story-body",
       "cue": 278142507,
-      "filters": [
-        {
-          "type": "config",
-          "name": "zone.gamecocksNav",
-          "value": true
-        }
-      ],
-      "placement": {
-        "type": "query",
-        "value": ".story-body"
+      "filters": {
+        "zone.gamecocksNav": true
       }
     },
     {
       "id": "zone-sponsored-article",
       "cue": 277282728,
-      "filters": [
-        {
-          "type": "config",
-          "name": "zone.sponsoredArticle",
-          "value": true
-        }
-      ],
-      "placement": {
-        "type": "query",
-        "value": ".story-body > .header"
-      },
-      "classList": ["hidden"]
+      "vip": ".story-body > .header",
+      "classList": ["hidden"],
+      "filters": {
+        "zone.sponsoredArticle": true
+      }
     },
     {
       "id": "zone-local-news-digest",
       "tracking": true,
-      "filters": [
-        {
-          "type": "config",
-          "name": "zone.localNewsDigest",
-          "value": true
-        },
-        {
-          "type": "dma",
-          "value": true
-        }
-      ],
+      "after": "zone-el-101",
+      "classList": ["stn-player"],
+      "filters": {
+        "dma": true,
+        "zone.localNewsDigest": true
+      },
       "zephr": {
         "feature": "zone-local-news-digest",
-        "dataset": [
-          {
-            "type": "config",
-            "name": "domain",
-            "value": "marketInfo.domain"
-          }
-        ]
-      },
-      "placement": {
-        "type": "after",
-        "value": "zone-el-101"
-      },
-      "classList": ["stn-player"]
+        "dataset": ["marketInfo.domain"]
+      }
     },
     {
       "id": "zone-lexgoeat-sponsor",
+      "vip": ".story-body",
       "cue": 266575046,
-      "filters": [
-        {
-          "type": "config",
-          "name": "zone.lexgoEatSponsor",
-          "value": true
-        }
-      ],
-      "placement": {
-        "type": "query",
-        "value": ".story-body" 
+      "filters": {
+        "zone.lexgoEatSponsor": true
       }
     }
   ]
diff --git a/demo/demo.css b/demo/demo.css
index 17ac86a..06ca630 100644
--- a/demo/demo.css
+++ b/demo/demo.css
@@ -6,6 +6,10 @@
   min-height: 300px;
 }
 
+.digest {
+  min-height: 600px;
+}
+
 .lead-item {
   min-height: 600px;
 }
diff --git a/demo/homepage/index.html b/demo/homepage/index.html
new file mode 100644
index 0000000..a5e5b9c
--- /dev/null
+++ b/demo/homepage/index.html
@@ -0,0 +1,86 @@
+<!doctype html>
+<html lang="en" data-pagetype="homepage">
+  <head>
+    <title>Zones homepage demo</title>
+    <link rel="icon" type="image/x-icon" href="https://www.kansascity.com/favicon.ico">
+    
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1, user-scalable=yes">
+
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="mobile-web-app-capable" content="yes">
+
+    <link rel="stylesheet" href="https://storage.googleapis.com/mc-high-impact/saratoga/saratoga-1.16.15.css">
+    <link rel="stylesheet" href="/demo/demo.css">
+
+    <script type="module">
+      import locker from "../locker.js";
+      import distributeZones from "/index.js";
+
+      distributeZones(locker);
+    </script>
+  </head>
+
+  <body>
+    <!-- <div id="zone-el-1"></div> -->
+    <!-- <div id="zone-el-2"></div> -->
+    <div class="card flag"></div>
+
+    <section class="grid">
+      <article class="card lead-item"></article>
+
+      <div id="zone-el-5" class="zone two-rows"></div>
+
+      <div class="digest"></div>
+      <article id="secondary-story-2" class="card"></article>
+      <article id="secondary-story-3" class="card"></article>
+      <div class="digest"></div>
+
+      <article id="secondary-story-4" class="card"></article>
+      <article id="secondary-story-5" class="card"></article>
+      <article id="secondary-story-6" class="card"></article>
+      <article id="secondary-story-7" class="card"></article>
+      <article id="secondary-story-8" class="card"></article>
+      <article id="secondary-story-9" class="card"></article>
+
+      <div id="zone-el-6" class="zone"></div>
+
+      <div class="digest-group">
+        <div class="partner-label">
+          <span>Digest group</span>
+        </div>
+        <div class="digest"></div>
+        <div class="digest"></div>
+        <div class="digest"></div>
+      </div>
+
+      <article id="secondary-story-10" class="card"></article>
+      <article id="secondary-story-11" class="card"></article>
+
+      <div id="zone-el-8" class="zone three-columns"></div>
+
+      <div class="digest-group">
+        <div class="partner-label">
+          <span>Digest group</span>
+        </div>
+        <div class="digest"></div>
+        <div class="digest"></div>
+        <div class="digest"></div>
+      </div>
+
+      <article id="secondary-story-12" class="card"></article>
+      <article id="secondary-story-13" class="card"></article>
+      <article id="secondary-story-13" class="card"></article>
+      <article id="secondary-story-14" class="card"></article>
+      <article id="secondary-story-15" class="card"></article>
+      <article id="secondary-story-16" class="card"></article>
+
+      <div id="zone-el-15" class="zone"></div>
+
+      <article id="secondary-story-17" class="card"></article>
+      <article id="secondary-story-18" class="card"></article>
+      <article id="secondary-story-19" class="card"></article>
+    </section>
+  </body>
+</html>
diff --git a/demo/locker.js b/demo/locker.js
index 30e7861..4386440 100644
--- a/demo/locker.js
+++ b/demo/locker.js
@@ -27,14 +27,16 @@ const locker = {
       case "zone.communityEvents":
         return true;
       case "zone.taboolaRecommendations":
-        return true;
+        return false;
       case "zone.siTickets":
         return false;
       case "zone.gamecocksNav":
         return false;
       case "zone.sponsoredArticle":
-        return true;
+        return false;
       case "zone.lexgoEatSponsor":
+        return false;
+      case "zone.localNewsDigest":
         return true;
       default: 
         return undefined;
@@ -44,7 +46,7 @@ const locker = {
   // user info
   user: {
     isSubscriber() {
-      return true;
+      return false;
     },
 
     isLoggedIn() {
@@ -52,7 +54,7 @@ const locker = {
     },
 
     isInDMA() {
-      return Promise.resolve(false);
+      return Promise.resolve(true);
     }
   },
 
@@ -95,7 +97,7 @@ const locker = {
   // Demo only for now
   config: {
     homepage: "/config/homepage.json",
-    section: "/config/section.json",
+    sectfront: "/config/section.json",
     story: "/config/story.json"
   }
 }
diff --git a/demo/section/index.html b/demo/section/index.html
index 1170cbf..bca06ea 100644
--- a/demo/section/index.html
+++ b/demo/section/index.html
@@ -11,7 +11,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="mobile-web-app-capable" content="yes">
 
-    <link rel="stylesheet" href="https://storage.googleapis.com/mc-high-impact/saratoga/saratoga-1.16.4.css">
+    <link rel="stylesheet" href="https://storage.googleapis.com/mc-high-impact/saratoga/saratoga-1.16.15.css">
     <link rel="stylesheet" href="/demo/demo.css">
 
     <script type="module">
diff --git a/demo/story/index.html b/demo/story/index.html
index 9ba9367..55de812 100644
--- a/demo/story/index.html
+++ b/demo/story/index.html
@@ -39,6 +39,8 @@
   </head>
 
   <body>
+    <!-- <div id="zone-el-1"></div> -->
+
     <div class="card flag"></div>
 
     <article class="paper story-body">
diff --git a/index.js b/index.js
index 6a5ba58..d029b12 100644
--- a/index.js
+++ b/index.js
@@ -6,9 +6,13 @@ import * as zones from "./lib/zones.js";
 import * as config from "./lib/config.js";
 import * as story from "./lib/story.js";
 
-function distributeZones(locker) {
+async function distributeZones(locker) {
+  const subscriber = locker.user.isSubscriber();
+
   // Setup
   zones.setLocker(locker);
+  zones.setConfig("subscriber", subscriber);
+  zones.setConfig("dma", subscriber ? true : await locker.user.isInDMA());
 
   // Config files 
   if(!locker.config) {
diff --git a/lib/config.js b/lib/config.js
index 8e55c40..0597a09 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -2,7 +2,7 @@
  * JSON configuration support
  */
 
-import { locker, Zone, ignore, distribute } from "./zones.js";
+import * as zones from "./zones.js";
 
 /**
  * Loads a configuration file
@@ -11,8 +11,14 @@ import { locker, Zone, ignore, distribute } from "./zones.js";
  */
 
 export function load(url) {
+  const locker = zones.getLocker();
+  const template = zones.getConfig("template");
+  const subscriber = zones.getConfig("subscriber");
+  const dma = zones.getConfig("dma");
+
   return new Promise(async (resolve, reject) => {
-    let data;
+    // Make the request
+    let data = null;
     const res = await fetch(url);
 
     // Reject if file missing
@@ -29,147 +35,121 @@ export function load(url) {
       return;
     }
 
-    // Configs
-    const template = locker.pageType;
-    const subscriber = locker.user.isSubscriber();
-    const dma = subscriber ? true : await locker.user.isInDMA();
-
-    // Load WPS zones
-    if(data.base) {
-      const base = document.querySelectorAll(data.base);
-      base.forEach(ele => new Zone(ele.id));
-    }
-    
-    // Ignore these zones
-    if(data.ignore) {
-      ignore(...data.ignore);
+    // Load WPS zones by query
+    if(data.wps) {
+      let wps = document.querySelectorAll(data.wps);
+      wps.forEach(ele => new zones.Zone(ele.id));
     }
 
-    // Loop through changes
-    const zones = data.zones || [];
-    zones.forEach(config => {
-      let show = true;
-
-      // Filter check
-      if(config.filters) {
-        show = config.filters.every(f => {
-          const { type, name, value, pattern } = f;
-
-          switch(type) {
-            case "subscriber":
-              return subscriber === value;
-            case "dma":
-              return dma === value;
-            case "config":
-              const prop = locker.getConfig(name);
-
-              // Pattern will peform a Regex match on the config value
-              if(pattern) {
-                let rx = new RegExp(pattern);
-                return rx.test(prop) == value;
-              } 
-
-              // Anything else is a straight compare
-              else {
-                return prop === value;
-              } 
-          }
-        });
-      }
+    // Generate story zones
+    if(data.cadence && zones.isStoryPage()) {
+      let cadence;
 
-      // Render 
-      if(show) {
-        const zone = new Zone(config.id);
+      switch(true) {
+        case subscriber:
+          cadence = data.cadence.subscriber;
+          break;
+        case dma:
+          cadence = data.cadence.dma;
+          break
+        default:
+          cadence = data.cadence.standard;
+      }
 
-        // Zephr connection
-        if(config.zephr) {
-          const { feature, dataset } = config.zephr;
+      zones.setCadence(cadence);
+      zones.createStoryZones();
+    }
 
-          if(dataset) {
-            dataset.forEach(d => {
-              const {type, name, value} = d;
-
-              switch(type) {
-                case "subscriber":
-                  zone.dataset[name] = subscriber;
-                  break;
-                case "dma":
-                  zone.dataset[name] = dma;
-                  break;
-                case "config":
-                  zone.dataset[name] = locker.getConfig(value);
-                  break;
-                default:
-                  zone.dataset[name] = value;
-              }
-            });
-          }
+    // Ignore these WPS zones
+    if(Array.isArray(data.ignore)) {
+      zones.ignore(...data.ignore);
+    }
 
-          zone.zephr(feature);
+    // Loop through zones
+    const set = new Set(data.zones);
+
+    set.forEach( config => {
+      const { 
+        id, 
+        filters = [], 
+        vip = undefined, 
+        position = "beforebegin",
+        before = undefined, 
+        after = undefined,
+        classList = [],
+        type = "ad",
+        tracking = false,
+        cue,
+        zephr
+      } = config;
+
+      // Make the zone 
+      if(check(filters)) {
+        const zone = new zones.Zone(id);
+
+        // Placement options
+        if(vip) {
+          zone.vip = document.querySelector(config.vip);
+        } 
+        else if(before) {
+          zone.before(config.before);
         }
+        else if(after) {
+          zone.after(config.after);
+        } 
+
+        // Pass some configs straight through
+        zone.position = position;
+        zone.classList.add(...classList)
+        zone.type = type;
+        zone.tracking = tracking;
 
         // CUE connection
-        if(config.cue) {
+        if(cue) {
           zone.cue(config.cue);
         }
 
-        // Add classes
-        if(config.classList) {
-          zone.classList.add(...config.classList)
-        }
-
-        // Add type
-        if(config.type) {
-          zone.dataset.type = config.type;
-        }
-
-        // Add tracking
-        if(config.tracking) {
-          zone.tracking = true;
-        }
+        // Zephr connection
+        if(zephr) {
+          const { feature, dataset } = config.zephr;
 
-        // Placement
-        if(config.placement) {
-          const {type, value} = config.placement;
-
-          switch(type) {
-            case "query":
-              zone.vip = document.querySelector(value);
-              break
-            case "before":
-              zone.before(value);
-              break;
-            case "after":
-              zone.after(value);
-              break;
-            case "remove":
-              zone.remove();
-              break;
-            default:
-              zone.vip = value;
+          if(Array.isArray(dataset)) {
+            dataset.forEach(c => {
+              zone.dataset[c] = zones.getConfig(c);
+            });
           }
+
+          zone.zephr(feature);
         }
       }
     });
 
-    // Story page cadence distribution
-    if(locker.pageType == "story") {
-      let cadence;
+    resolve();
+  });
+}
 
-      switch(true) {
-        case subscriber:
-          cadence = data.cadence.subscriber;
-          break;
-        case dma:
-          cadence = data.cadence.dma;
-          break
-        default:
-          cadence = data.cadence.standard;
-      }
+/*
+ * Checks configs
+ * @param filters {object} a set of section configs or segments 
+ * @returns {boolean}
+ */
 
-      distribute(cadence);
-    }
+function check(filters) {
+  const keys = Object.keys(filters || []); 
 
-    resolve();
+  if(!keys.length) {
+    return true;
+  }
+
+  return keys.every(key => {
+    let value = filters[key];
+    let config = zones.getConfig(key);
+
+    if(typeof value == "boolean") {
+      return config == value;
+    } else {
+      let rx = new RegExp(value, "i");
+      return rx.test(config);
+    }
   });
 }
diff --git a/lib/zones.js b/lib/zones.js
index 3b1adc4..62ff1fa 100644
--- a/lib/zones.js
+++ b/lib/zones.js
@@ -3,13 +3,12 @@
  */
 
 // Internals
+let locker, cadence;
 let map = new Map();
-let fragment = new DocumentFragment();
-let loadObserver = new IntersectionObserver(handleLoad, { rootMargin: "500px" });
-let trackingObserver = new IntersectionObserver(handleTracking, { threshold: 0.25 });
-
-// Locker
-export let locker;
+const configs = new Map();
+const fragment = new DocumentFragment();
+const loadObserver = new IntersectionObserver(handleLoad, { rootMargin: "500px" });
+const trackingObserver = new IntersectionObserver(handleTracking, { threshold: 0.25 });
 
 // Changes map
 export const changes = new Map();
@@ -24,13 +23,14 @@ export class Zone {
    * Zone constructor
    */
 
-  constructor(id, vip = null) {
+  constructor(id, vip = null, position = "beforebegin") {
     if(!id) {
       throw new Error("zone id is required");
     }
 
     this.id = id;
     this.vip = vip;
+    this.position = position;
   }
 
   /*
@@ -92,7 +92,7 @@ export class Zone {
   async zephr(feature) {
     const market = locker.getConfig("marketInfo.domain");
     const endpoint = `https://mcclatchy-${market}.cdn.zephr.com/zephr/decision-engine`;
-    const body = JSON.stringify({ "sdkFeatureSlug": feature, ...this.element.dataset });
+    const body = JSON.stringify({ "sdkFeatureSlug": feature, ...this.dataset });
 
     const req = await fetch(endpoint, {
       method: "POST",
@@ -138,10 +138,11 @@ export class Zone {
   /*
    * Injects this zone
    * @param ele {element} the injection point
-   * @param loc {string} the placement relative to the injection point
+   * @param position {string} the placement relative to the injection point
+   * @param vip {element} the insertion point for the zone
    */
 
-  inject(loc = "beforebegin") {
+  inject(position = this.position, vip = this.vip) {
     let err = false;
     
     // Error checks
@@ -161,9 +162,9 @@ export class Zone {
       this.remove();
       this.log(err);
     } else {
-      this.element.dataset.distributed = true;
-      this.vip.insertAdjacentElement(loc, this.element);
-      this.log(this.msg || "zone moved into new location");
+      vip.insertAdjacentElement(position, this.element);
+      this.dataset.distributed = true;
+      this.log(this.msg || "zone created");
 
       // Observer for performance team
       loadObserver.observe(this.element);
@@ -184,7 +185,7 @@ export class Zone {
   }
 
   /*
-   * Insert this zone before another
+   * Insert this zone before another (story pages)
    * @param referenceId {string} the id of the reference zone
    */
 
@@ -202,7 +203,7 @@ export class Zone {
   }
 
   /*
-   * Insert this zone after another
+   * Insert this zone after another (story pages)
    * @param referenceId {string} the id of the reference zone
    */
 
@@ -231,6 +232,7 @@ export class Zone {
 
 /*
  * Gets the locker for external use
+ * @returns {object} the locker
  */
 
 export function getLocker() {
@@ -246,9 +248,62 @@ export function setLocker(obj) {
   locker = obj;
 }
 
+/*
+ * Gets a config stored locally
+ * @returns {(boolean|string)} the value of the stored config
+ */
+
+export function getConfig(key) {
+  if(configs.has(key)) {
+    return configs.get(key);
+  } else {
+    const val = locker.getConfig(key);
+    configs.set(key, val);
+    return val;
+  }
+}
+
+/*
+ * Stores a config locally
+ * @param key {string} the key for the config
+ * @apram value {(boolean|string)} the value for the config
+ */
+
+export function setConfig(key, value) {
+  configs.set(key, value);
+}
+
+/*
+ * Checks to see if on a story page
+ * @returns {boolean}
+ */
+
+export function isStoryPage() {
+  return locker.pageType == "story";
+}
+
+/* 
+ * Gets the cadence for story pages
+ * @returns {integer} the cadence
+ */
+
+export function getCadence() {
+  return parseInt(cadence) || 3;
+}
+
+/*
+ * Sets the cadence
+ * @param int {integer} the number to set
+ */
+
+export function setCadence(int) {
+  cadence = parseInt(int);
+}
+
 /*
  * Gets a zone
  * @param id {string} the id for the zone
+ * @returns {object} a zone
  */
 
 export function get(id) {
@@ -327,7 +382,6 @@ export function log(id, msg) {
   changes.set(id, msg);
 }
 
-
 /*
  * Tracks a feature flag in Amplitude
  * @param key {string} the key for the feature
@@ -383,15 +437,29 @@ export function getValidInsertionPoints() {
   });
 }
 
+/*
+ * Creates a dynamic number of story zones
+ * @param cadence {integer} the cadence
+ */
+
+export function createStoryZones() {
+  const vips = getValidInsertionPoints();
+  const total = Math.floor(vips.length / cadence);
+
+  for(let i = 1; i <= total; i++) {
+    new Zone(`zone-el-${100 + i}`);
+  }
+}
+
 /*
  * Distributes zones generically using vips
  * @param map {Map} the map to alter
  * @param tick {integer} the cadence
  */
 
-export function distribute(tick = 4) {
+export function distribute() {
   const vips = getValidInsertionPoints();
-  const cadence = tick;
+  let tick = cadence;
 
   map.forEach(zone => {
     if(!zone.vip) {
@@ -407,6 +475,10 @@ export function distribute(tick = 4) {
  */
 
 export function render() {
+  // Distribute story zones
+  if(isStoryPage()) distribute();
+
+  // Inject
   map.forEach(zone => zone.inject());
   window.dispatchEvent(new Event("zones-loaded"));
 }