@epam/statgpt-sdmx-toolkit 0.2.0-rc.7 → 0.2.0-rc.8

package/index.mjs

@@ -5,43 +5,38 @@ const I = (e) => {
   }
 }, p = (e) => {
   var r;
-  if (e == null)
-    return {};
-  const t = I(e), n = {
+  const t = {
     agency: "",
     id: "",
     version: ""
-  }, s = (o) => typeof o == "string" && /^[a-zA-Z0-9_.-]+$/.test(o);
-  if (t) {
-    if (t.includes(":")) {
-      const o = t.split(":")[0], i = t.split(":")[1].split("(")[0];
-      n.agency = s(o) ? o : "", n.id = s(i) ? i : "";
-    }
-    if (t.includes("(") && t.includes(")")) {
-      const o = (r = t.split("(")[1]) == null ? void 0 : r.split(")")[0];
-      n.version = s(o) ? o : "";
-    }
+  };
+  if (e == null)
+    return t;
+  const n = I(e);
+  if (n && (n.includes(":") && (t.agency = n.split(":")[0], t.id = n.split(":")[1].split("(")[0]), n.includes("("))) {
+    const s = n.split("(");
+    t.version = (r = s[1]) == null ? void 0 : r.split(")")[0], t.id || (t.id = s[0]);
   }
-  return n;
+  return t;
 }, Pe = (e) => {
-  const [t, n] = e.split(")."), { agency: s, id: r, version: o } = p(t + ")");
-  return { childId: n, agency: s, id: r, version: o };
+  const [t, n] = e.split(")."), { agency: r, id: s, version: o } = p(t + ")");
+  return { childId: n, agency: r, id: s, version: o };
 }, Sn = (e, t, n) => {
-  const s = t === "" ? "" : `(${t})`;
-  return `${n}:${e}${s}`;
+  const r = t === "" ? "" : `(${t})`;
+  return `${n}:${e}${r}`;
 };
-var k = /* @__PURE__ */ ((e) => (e.DESCENDANTS = "descendants", e.NONE = "none", e.ALL = "all", e))(k || {}), De = /* @__PURE__ */ ((e) => (e.EXACT = "exact", e.AVAILABLE = "available", e))(De || {});
+var q = /* @__PURE__ */ ((e) => (e.DESCENDANTS = "descendants", e.NONE = "none", e.ALL = "all", e))(q || {}), De = /* @__PURE__ */ ((e) => (e.EXACT = "exact", e.AVAILABLE = "available", e))(De || {});
 const Oe = (e = "", t = "", n = "") => `sdmx/3.0/availability/dataflow/${e}/${t}/${n}`;
 class Tn {
   constructor(t) {
     this.client = t;
   }
   async getConstraints(t, n) {
-    const { agency: s, id: r, version: o } = p(t), i = {
+    const { agency: r, id: s, version: o } = p(t), i = {
       filters: n || [],
       mode: De.AVAILABLE,
-      references: k.NONE
-    }, c = Oe(s, r, o);
+      references: q.NONE
+    }, c = Oe(r, s, o);
     return await this.client.postRequest(c, { body: i });
   }
 }
@@ -68,55 +63,55 @@ const Ue = (e, t) => {
   }
 }, m = (e, t) => `${e}; labels=${t}`;
 var ye = /* @__PURE__ */ ((e) => (e.REFERENCE_PARTIAL = "referencepartial", e.FULL = "full", e))(ye || {});
-const xe = "all", Ye = "sdmx/3.0/data/dataflow", Se = "&", se = ":", Ce = "=", We = "+", Rn = ",", ke = "*", re = (e, t, n) => {
-  const { filterKey: s, timeFilter: r } = n, { agency: o, id: i, version: c } = p(e), a = [r || "", t].filter((l) => !!l).join(Se);
-  return `${`${Ye}/${o}/${i}/${c}`}/${s || ke}?${a}`;
-}, qe = (e = "", t = "", n = "", s = k.DESCENDANTS) => `sdmx/3.0/structure/dataflow/${e}/${t}/${n}?references=${s}&detail=${ye.REFERENCE_PARTIAL}`;
+const xe = "all", Ye = "sdmx/3.0/data/dataflow", Se = "&", re = ":", Ce = "=", We = "+", Rn = ",", qe = "*", se = (e, t, n) => {
+  const { filterKey: r, timeFilter: s } = n, { agency: o, id: i, version: c } = p(e), a = [s || "", t].filter((l) => !!l).join(Se);
+  return `${`${Ye}/${o}/${i}/${c}`}/${r || qe}?${a}`;
+}, Me = (e = "", t = "", n = "", r = q.DESCENDANTS) => `sdmx/3.0/structure/dataflow/${e}/${t}/${n}?references=${r}&detail=${ye.REFERENCE_PARTIAL}`;
 class wn {
   constructor(t) {
     this.client = t;
   }
   async getDataSet(t, n) {
-    const { agency: s, id: r, version: o } = p(t);
+    const { agency: r, id: s, version: o } = p(t);
     return await this.client.getRequest(
-      qe(s, r, o, n)
+      Me(r, s, o, n)
     );
   }
   async getDatasetData(t, n) {
-    const s = new URLSearchParams({
+    const r = new URLSearchParams({
       includeHistory: "false",
       limit: "1000",
       attributes: xe,
       dimensionAtObservation: "TIME_PERIOD"
       // TODO: use time dimensions
-    }).toString(), r = re(t, s, n);
-    return await this.client.getRequest(r);
+    }).toString(), s = se(t, r, n);
+    return await this.client.getRequest(s);
   }
-  async downloadDataSet(t, n, s, r, o, i, c = !1) {
+  async downloadDataSet(t, n, r, s, o, i, c = !1) {
     const a = new URLSearchParams({
       format: n,
       compress: "false",
       attributes: c ? "all" : "none",
       limit: "1000"
-    }).toString(), u = re(t, a, o);
+    }).toString(), u = se(t, a, o);
     return this.client.streamRequest(
       u,
       {
         method: "GET",
         headers: {
-          Accept: Ue(n, r),
-          "Accept-language": s
+          Accept: Ue(n, s),
+          "Accept-language": r
         }
       },
       i
     );
   }
 }
-const Me = (e, t) => e.error || e.message || `${t.status} ${t.statusText}`, Qe = "application/json", Be = "Content-Type", x = "Api-Key", Ve = "X-CONVERSATION-ID", N = "Ocp-Apim-Subscription-Key", v = (e) => isNaN(Date.parse(e)) ? null : new Date(e), Y = (e, t, n) => {
-  const s = {
+const ke = (e, t) => e.error || e.message || `${t.status} ${t.statusText}`, Qe = "application/json", Be = "Content-Type", x = "Api-Key", Ve = "X-CONVERSATION-ID", N = "Ocp-Apim-Subscription-Key", v = (e) => isNaN(Date.parse(e)) ? null : new Date(e), Y = (e, t, n) => {
+  const r = {
     [Be]: (t == null ? void 0 : t.contentType) || Qe
   };
-  return t != null && t.jwt && (s.Authorization = `Bearer ${t.jwt}`), t != null && t.chatReference && (s[Ve] = t.chatReference), { ...s, ...n };
+  return t != null && t.jwt && (r.Authorization = `Bearer ${t.jwt}`), t != null && t.chatReference && (r[Ve] = t.chatReference), { ...r, ...n };
 }, Fe = (e) => {
   const t = { ...e };
   return t[x] && (t[x] = t[x].substring(0, 8) + "...[REDACTED]"), t.Authorization && (t.Authorization = "Bearer [REDACTED]"), t[N] && (t[N] = t[N].substring(0, 8) + "...[REDACTED]"), t;
@@ -124,34 +119,34 @@ const Me = (e, t) => e.error || e.message || `${t.status} ${t.statusText}`, Qe =
   method: n.method || "GET",
   headers: t,
   body: n.body ? JSON.stringify(n.body) : void 0
-}), Ge = async (e, t, n) => await fetch(e, {
+}), Ke = async (e, t, n) => await fetch(e, {
   method: n.method,
   headers: t,
   body: n != null && n.isFormData && typeof (n == null ? void 0 : n.body) == "string" ? n.body : JSON.stringify(n.body),
   signal: n == null ? void 0 : n.signal
 });
-class Ke {
+class Ge {
   constructor() {
     this.decoder = new TextDecoder();
   }
-  async streamChat(t, n, s = {}, r) {
-    const { onMessage: o, onError: i, onComplete: c, signal: a } = s;
+  async streamChat(t, n, r = {}, s) {
+    const { onMessage: o, onError: i, onComplete: c, signal: a } = r;
     try {
       const u = await this.initializeStreamRequest(
         t,
         n,
         a,
-        r
+        s
       );
       await this.processStreamData(u, o), c == null || c();
     } catch (u) {
       this.handleStreamError(u, i);
     }
   }
-  async initializeStreamRequest(t, n, s, r) {
+  async initializeStreamRequest(t, n, r, s) {
     const o = Y(void 0, {
-      jwt: r
-    }), i = await Ge(
+      jwt: s
+    }), i = await Ke(
       t,
       {
         Accept: "text/event-stream",
@@ -160,7 +155,7 @@ class Ke {
       {
         method: "POST",
         body: n,
-        signal: s
+        signal: r
       }
     );
     if (!i.ok) {
@@ -174,19 +169,19 @@ class Ke {
     return i.body.getReader();
   }
   async processStreamData(t, n) {
-    let s = "";
+    let r = "";
     try {
       for (; ; ) {
-        const { done: r, value: o } = await t.read();
-        if (r) {
-          s.trim() && this.parseSSEDataLine(s, n);
+        const { done: s, value: o } = await t.read();
+        if (s) {
+          r.trim() && this.parseSSEDataLine(r, n);
           break;
         }
         const i = this.decoder.decode(o, { stream: !0 });
-        s += i;
-        const c = s.split(`
+        r += i;
+        const c = r.split(`
 `);
-        s = c.pop() || "";
+        r = c.pop() || "";
         for (const a of c)
           this.parseSSEDataLine(a, n);
       }
@@ -195,27 +190,27 @@ class Ke {
     }
   }
   handleStreamError(t, n) {
-    const s = t instanceof Error ? t : new Error(String(t));
-    throw n == null || n(s), s;
+    const r = t instanceof Error ? t : new Error(String(t));
+    throw n == null || n(r), r;
   }
   parseSSEDataLine(t, n) {
-    const s = t.trim();
-    if (!(!s || s.startsWith(":")) && s.startsWith("data: ")) {
-      const r = s.slice(6);
-      if (r === "[DONE]") {
+    const r = t.trim();
+    if (!(!r || r.startsWith(":")) && r.startsWith("data: ")) {
+      const s = r.slice(6);
+      if (s === "[DONE]") {
         console.info("SSE: Stream completed");
         return;
       }
       try {
-        const o = JSON.parse(r);
+        const o = JSON.parse(s);
         n == null || n(o);
       } catch (o) {
-        console.error(`Failed to parse SSE data: ${r} ${o}`);
+        console.error(`Failed to parse SSE data: ${s} ${o}`);
       }
     }
   }
 }
-new Ke();
+new Ge();
 class pn {
   constructor(t) {
     this.config = t, console.info("SdmxApiClient initialized", {
@@ -228,8 +223,8 @@ class pn {
   async postRequest(t, n) {
     return this.request(t, { ...n, method: "POST" });
   }
-  async streamRequest(t, n, s) {
-    const r = `${this.config.apiUrl}/${t}`, o = {
+  async streamRequest(t, n, r) {
+    const s = `${this.config.apiUrl}/${t}`, o = {
       ...Y(void 0, {
         jwt: this.config.jwt
       }),
@@ -240,7 +235,7 @@ class pn {
       async start(a) {
         var u;
         try {
-          const l = await oe(r, o, n);
+          const l = await oe(s, o, n);
           if (!l.ok) {
             const g = await l.text();
             throw console.error(
@@ -261,27 +256,27 @@ class pn {
         }
       }
     }), c = new Headers({
-      "Content-Disposition": `attachment; filename=${encodeURIComponent(s)}`
+      "Content-Disposition": `attachment; filename=${encodeURIComponent(r)}`
     });
     return new Response(i, { headers: c });
   }
   async request(t, n) {
-    const s = Date.now(), r = t.includes("availability") && this.config.constrainsApiUrl ? `${this.config.constrainsApiUrl}/${t}` : `${this.config.apiUrl}/${t}`, o = {
+    const r = Date.now(), s = t.includes("availability") && this.config.constrainsApiUrl ? `${this.config.constrainsApiUrl}/${t}` : `${this.config.apiUrl}/${t}`, o = {
       ...Y(void 0, {
         jwt: this.config.jwt
       }),
       ...n.headers
     };
-    this.config.apiKey != null && (o["Ocp-Apim-Subscription-Key"] = this.config.apiKey), this.addInfoRequestLog("API Request", r, n, o);
+    this.config.apiKey != null && (o["Ocp-Apim-Subscription-Key"] = this.config.apiKey), this.addInfoRequestLog("API Request", s, n, o);
     try {
-      const i = await oe(r, o, n), c = Date.now() - s;
+      const i = await oe(s, o, n), c = Date.now() - r;
       let a;
       const u = await i.text();
       try {
         a = u ? JSON.parse(u) : {};
       } catch {
         if (this.addErrorRequestParsing(
-          r,
+          s,
           n,
           i,
           c,
@@ -293,57 +288,57 @@ class pn {
         a = { data: u };
       }
       if (!i.ok) {
-        this.addErrorRequestLog(r, n, i, c, a);
-        const l = Me(a, i);
+        this.addErrorRequestLog(s, n, i, c, a);
+        const l = ke(a, i);
         throw new Error(`API request failed: ${l}`);
       }
       return a;
     } catch (i) {
-      const c = Date.now() - s;
+      const c = Date.now() - r;
       throw console.error("API Request Exception", {
         method: n.method,
-        url: r,
+        url: s,
         duration: `${c}ms`,
         error: i instanceof Error ? i.message : String(i)
       }), i;
     }
   }
-  addInfoRequestLog(t, n, s, r) {
+  addInfoRequestLog(t, n, r, s) {
     const o = {
-      method: s.method || "GET",
+      method: r.method || "GET",
       url: n,
-      headers: Fe(r)
+      headers: Fe(s)
     };
-    s.body && (o.body = s.body), console.info(t, o);
+    r.body && (o.body = r.body), console.info(t, o);
   }
-  addErrorRequestLog(t, n, s, r, o) {
+  addErrorRequestLog(t, n, r, s, o) {
     console.error("API Request Failed", {
       method: n.method,
       url: t,
-      status: s.status,
-      statusText: s.statusText,
-      duration: `${r}ms`,
+      status: r.status,
+      statusText: r.statusText,
+      duration: `${s}ms`,
       response: o
     });
   }
-  addErrorRequestParsing(t, n, s, r, o) {
+  addErrorRequestParsing(t, n, r, s, o) {
     console.error("API Response Parse Error", {
       method: n.method,
       url: t,
-      status: s.status,
-      statusText: s.statusText,
-      duration: `${r}ms`,
+      status: r.status,
+      statusText: r.statusText,
+      duration: `${s}ms`,
       responseText: o.substring(0, 200),
       error: "Response is not valid JSON"
     });
   }
 }
 const mn = ["FREQ", "FREQUENCY"];
-var je = /* @__PURE__ */ ((e) => (e.CONDITIONAL = "Conditional", e.MANDATORY = "Mandatory", e))(je || {}), q = /* @__PURE__ */ ((e) => (e.DIMENSION = "Dimension", e.MEASURE_DIMENSION = "MeasureDimension", e.TIME_DIMENSION = "TimeDimension", e))(q || {}), ze = /* @__PURE__ */ ((e) => (e.UNBOUNDED = "unbounded", e))(ze || {});
+var je = /* @__PURE__ */ ((e) => (e.CONDITIONAL = "Conditional", e.MANDATORY = "Mandatory", e))(je || {}), M = /* @__PURE__ */ ((e) => (e.DIMENSION = "Dimension", e.MEASURE_DIMENSION = "MeasureDimension", e.TIME_DIMENSION = "TimeDimension", e))(M || {}), ze = /* @__PURE__ */ ((e) => (e.UNBOUNDED = "unbounded", e))(ze || {});
 const He = (e, t) => {
   var c, a, u, l, f;
-  const n = (a = (c = e == null ? void 0 : e.data) == null ? void 0 : c.dataSets) == null ? void 0 : a[0], s = (l = (u = e == null ? void 0 : e.data) == null ? void 0 : u.structures) == null ? void 0 : l[0], r = ((f = s == null ? void 0 : s.attributes) == null ? void 0 : f.dimensionGroup) || [], o = n == null ? void 0 : n.dimensionGroupAttributes, i = {};
-  for (const E of r) {
+  const n = (a = (c = e == null ? void 0 : e.data) == null ? void 0 : c.dataSets) == null ? void 0 : a[0], r = (l = (u = e == null ? void 0 : e.data) == null ? void 0 : u.structures) == null ? void 0 : l[0], s = ((f = r == null ? void 0 : r.attributes) == null ? void 0 : f.dimensionGroup) || [], o = n == null ? void 0 : n.dimensionGroupAttributes, i = {};
+  for (const E of s) {
     const d = E.relationship.dimensions, { codedSeriesKey: g, decodedSeriesKey: h } = Te(
       e,
       t,
@@ -358,12 +353,12 @@ const He = (e, t) => {
   return i;
 }, Te = (e, t, n) => {
   var c, a;
-  const s = (a = (c = e == null ? void 0 : e.data) == null ? void 0 : c.structures) == null ? void 0 : a[0], r = [
-    ...(s == null ? void 0 : s.dimensions.series) || [],
-    ...(s == null ? void 0 : s.dimensions.observation) || []
-  ], o = new Array(r == null ? void 0 : r.length), i = new Array(r == null ? void 0 : r.length);
+  const r = (a = (c = e == null ? void 0 : e.data) == null ? void 0 : c.structures) == null ? void 0 : a[0], s = [
+    ...(r == null ? void 0 : r.dimensions.series) || [],
+    ...(r == null ? void 0 : r.dimensions.observation) || []
+  ], o = new Array(s == null ? void 0 : s.length), i = new Array(s == null ? void 0 : s.length);
   return n == null || n.forEach((u) => {
-    const l = (r == null ? void 0 : r.findIndex((d) => d.id === u)) || 0, f = t[l], E = r[l].values.findIndex(
+    const l = (s == null ? void 0 : s.findIndex((d) => d.id === u)) || 0, f = t[l], E = s[l].values.findIndex(
       (d) => d.id === f || d.value === f
     ) || 0;
     o[l] = E >= 0 ? E : f, i[l] = f;
@@ -373,14 +368,14 @@ const He = (e, t) => {
   };
 }, vn = (e, t, n) => {
   var f, E, d, g, h;
-  const s = (E = (f = e == null ? void 0 : e.data) == null ? void 0 : f.dataSets) == null ? void 0 : E[0], r = (g = (d = e == null ? void 0 : e.data) == null ? void 0 : d.structures) == null ? void 0 : g[0], o = (((h = r == null ? void 0 : r.attributes) == null ? void 0 : h.dimensionGroup) || []).filter(
+  const r = (E = (f = e == null ? void 0 : e.data) == null ? void 0 : f.dataSets) == null ? void 0 : E[0], s = (g = (d = e == null ? void 0 : e.data) == null ? void 0 : d.structures) == null ? void 0 : g[0], o = (((h = s == null ? void 0 : s.attributes) == null ? void 0 : h.dimensionGroup) || []).filter(
     (D) => {
       var A;
       return ((A = D.relationship.dimensions) == null ? void 0 : A.length) === 1 && D.relationship.dimensions.includes(t || "");
     }
-  ), i = s == null ? void 0 : s.dimensionGroupAttributes, c = [
-    ...(r == null ? void 0 : r.dimensions.series) || [],
-    ...(r == null ? void 0 : r.dimensions.observation) || []
+  ), i = r == null ? void 0 : r.dimensionGroupAttributes, c = [
+    ...(s == null ? void 0 : s.dimensions.series) || [],
+    ...(s == null ? void 0 : s.dimensions.observation) || []
   ], a = c == null ? void 0 : c.findIndex((D) => D.id === t), u = new Array(c == null ? void 0 : c.length);
   u[a] = n || "";
   const l = {};
@@ -398,17 +393,17 @@ const He = (e, t) => {
   }
   return l;
 }, Je = (e, t) => {
-  var s;
+  var r;
   if (t == null)
     return;
-  const n = (s = e.values) == null ? void 0 : s[t];
+  const n = (r = e.values) == null ? void 0 : r[t];
   return n ?? (t instanceof Array ? { values: t } : { value: t.toString() });
 }, Xe = "Observation", $n = (e) => {
   var u, l, f, E, d, g;
   const t = (u = e == null ? void 0 : e.data) == null ? void 0 : u.dataSets, n = (f = (l = e == null ? void 0 : e.data) == null ? void 0 : l.structures) == null ? void 0 : f[0];
   if (!t || !n)
     return [];
-  const s = n.attributes, r = n.dimensions, o = (s == null ? void 0 : s.dimensionGroup) || [], i = t[0].series || t[0].observations, c = (E = r.series) != null && E.length ? r.series : r.observation, a = [];
+  const r = n.attributes, s = n.dimensions, o = (r == null ? void 0 : r.dimensionGroup) || [], i = t[0].series || t[0].observations, c = (E = s.series) != null && E.length ? s.series : s.observation, a = [];
   for (const h in i) {
     const D = [], { name: A, parsedTimeSeriesValue: y } = Ze(
       h,
@@ -425,12 +420,12 @@ const He = (e, t) => {
       continue;
     }
     D.push(
-      ...st(S, n)
+      ...rt(S, n)
     );
     const O = C(
-      (s == null ? void 0 : s.series) || [],
+      (r == null ? void 0 : r.series) || [],
       (T) => P[T]
-    ), L = rt(
+    ), L = st(
       ((d = n.attributes) == null ? void 0 : d.dataSet) || [],
       ((g = t[0].attributes) == null ? void 0 : g.filter((T) => T != null)) || []
     ), b = He(
@@ -458,28 +453,28 @@ const He = (e, t) => {
   }
   return a;
 }, Ze = (e, t) => {
-  const n = e.split(new RegExp("(?<!\\|):(?!\\||$)")), s = [];
-  for (let r = 0; r < n.length; r++) {
-    const o = t == null ? void 0 : t[r], i = Number(n[r]);
+  const n = e.split(new RegExp("(?<!\\|):(?!\\||$)")), r = [];
+  for (let s = 0; s < n.length; s++) {
+    const o = t == null ? void 0 : t[s], i = Number(n[s]);
     if (i < 0 || o == null)
       continue;
     const c = o.values[i];
     if (c == null) {
-      s.push(n[r].replace("|:", ":"));
+      r.push(n[s].replace("|:", ":"));
       continue;
     }
-    s.push((c == null ? void 0 : c.id) || (c == null ? void 0 : c.value) || "");
+    r.push((c == null ? void 0 : c.id) || (c == null ? void 0 : c.value) || "");
   }
   return {
-    name: tt(s),
-    parsedTimeSeriesValue: s
+    name: tt(r),
+    parsedTimeSeriesValue: r
   };
 }, C = (e, t) => {
   const n = [];
-  for (let s = 0; s < e.length; s++) {
-    const r = e[s], o = t(s), i = o != null && r.values != null ? et(o, r) : void 0;
+  for (let r = 0; r < e.length; r++) {
+    const s = e[r], o = t(r), i = o != null && s.values != null ? et(o, s) : void 0;
     n.push({
-      name: r.id,
+      name: s.id,
       value: i
     });
   }
@@ -487,7 +482,7 @@ const He = (e, t) => {
 }, et = (e, t) => {
   const n = t.values[e];
   return n == null ? typeof e == "object" ? e : e.toString() : (n == null ? void 0 : n.id) || (n == null ? void 0 : n.value) || (n == null ? void 0 : n.ids) || (n == null ? void 0 : n.values);
-}, tt = (e) => e.map((t) => t ? nt(t) : "").join("."), nt = (e) => e.replace(/\./g, "|.").replace(/:/g, "|:"), st = (e, t) => {
+}, tt = (e) => e.map((t) => t ? nt(t) : "").join("."), nt = (e) => e.replace(/\./g, "|.").replace(/:/g, "|:"), rt = (e, t) => {
   var i, c, a, u, l;
   const n = (c = (i = t.measures) == null ? void 0 : i.observation) == null ? void 0 : c.length;
   if (e.observations == null)
@@ -501,92 +496,92 @@ const He = (e, t) => {
         dimensionAtObservation: Xe
       }
     ];
-  const s = e.observations, r = (u = t.dimensions.observation) == null ? void 0 : u[0], o = [];
-  for (const f in s) {
-    const E = r == null ? void 0 : r.values[f];
+  const r = e.observations, s = (u = t.dimensions.observation) == null ? void 0 : u[0], o = [];
+  for (const f in r) {
+    const E = s == null ? void 0 : s.values[f];
     o.push({
       dimensionAtObservation: (E == null ? void 0 : E.value) || (E == null ? void 0 : E.id),
       values: ie(
-        s[f],
+        r[f],
         t.measures
       ),
       obsAttributes: C(
         ((l = t.attributes) == null ? void 0 : l.observation) || [],
-        (d) => s[f][d + n]
+        (d) => r[f][d + n]
       )
     });
   }
   return o;
 }, ie = (e, t) => {
   var n;
-  return ((n = t == null ? void 0 : t.observation) == null ? void 0 : n.map((s, r) => ({ name: s.id, value: e[r] }))) || [];
-}, rt = (e, t) => e.reduce(
-  (n, s, r) => {
-    const o = t[r];
-    return ot(n, s, o, ""), n;
+  return ((n = t == null ? void 0 : t.observation) == null ? void 0 : n.map((r, s) => ({ name: r.id, value: e[s] }))) || [];
+}, st = (e, t) => e.reduce(
+  (n, r, s) => {
+    const o = t[s];
+    return ot(n, r, o, ""), n;
   },
   []
-), ot = (e, t, n, s) => {
+), ot = (e, t, n, r) => {
   var o, i, c;
-  const r = n != null ? ((o = t == null ? void 0 : t.values) == null ? void 0 : o.length) > 0 ? ((i = t.values[n]) == null ? void 0 : i.id) || ((c = t.values[n]) == null ? void 0 : c.value) : String(n) : s;
+  const s = n != null ? ((o = t == null ? void 0 : t.values) == null ? void 0 : o.length) > 0 ? ((i = t.values[n]) == null ? void 0 : i.id) || ((c = t.values[n]) == null ? void 0 : c.value) : String(n) : r;
   e.push({
     name: t.id,
-    value: r || ""
+    value: s || ""
   });
-}, it = /^[0-9][0-9][0-9][0-9]-Q[1-4]$/, ct = /^[0-9][0-9][0-9][0-9]-W[0-9][0-9]?$/, at = /^[0-9][0-9][0-9][0-9]-S[1-2]$/, ut = /^[0-9][0-9][0-9][0-9]$/, lt = /^[0-9][0-9][0-9][0-9]-(0[1-9]|1[0-2])-[0-9][0-9]$/, dt = /^[0-9][0-9][0-9][0-9]-M(0[1-9]|(1[0-2]))$/, M = (e) => ut.exec(e), Q = (e) => !!M(e), ft = (e) => at.exec(e), B = (e) => !!ft(e), V = (e) => dt.exec(e), F = (e) => !!V(e), G = (e) => it.exec(e), K = (e) => !!G(e), gt = (e) => lt.exec(e), Et = (e) => !!gt(e), ht = (e) => ct.exec(e), j = (e) => !!ht(e), z = 1440 * 60 * 1e3, H = 7 * z;
+}, it = /^[0-9][0-9][0-9][0-9]-Q[1-4]$/, ct = /^[0-9][0-9][0-9][0-9]-W[0-9][0-9]?$/, at = /^[0-9][0-9][0-9][0-9]-S[1-2]$/, ut = /^[0-9][0-9][0-9][0-9]$/, lt = /^[0-9][0-9][0-9][0-9]-(0[1-9]|1[0-2])-[0-9][0-9]$/, dt = /^[0-9][0-9][0-9][0-9]-M(0[1-9]|(1[0-2]))$/, k = (e) => ut.exec(e), Q = (e) => !!k(e), ft = (e) => at.exec(e), B = (e) => !!ft(e), V = (e) => dt.exec(e), F = (e) => !!V(e), K = (e) => it.exec(e), G = (e) => !!K(e), gt = (e) => lt.exec(e), Et = (e) => !!gt(e), ht = (e) => ct.exec(e), j = (e) => !!ht(e), z = 1440 * 60 * 1e3, H = 7 * z;
 function J(e) {
   const t = `${e}-01-01`, n = new Date(t);
   if (n.getDay() !== 4) {
-    const r = 1 + (4 - n.getDay() + 7) % 7;
-    n.setMonth(0, r);
+    const s = 1 + (4 - n.getDay() + 7) % 7;
+    n.setMonth(0, s);
   }
   return n;
 }
 function At(e) {
-  const t = new Date(e), s = -((t.getDay() + 6) % 7) + 3;
-  return t.setDate(t.getDate() + s), new Date(t.valueOf());
+  const t = new Date(e), r = -((t.getDay() + 6) % 7) + 3;
+  return t.setDate(t.getDate() + r), new Date(t.valueOf());
 }
 function ce(e, t = "W") {
-  const n = `${e}-12-31`, s = _(new Date(n), t);
-  if (s.weekYear === e)
-    return s.weekNumber;
-  const r = `${e}-12-24`;
-  return _(new Date(r), t).weekNumber;
+  const n = `${e}-12-31`, r = _(new Date(n), t);
+  if (r.weekYear === e)
+    return r.weekNumber;
+  const s = `${e}-12-24`;
+  return _(new Date(s), t).weekNumber;
 }
 function Re(e, t, n = "W") {
   return `${e}-${n}${t < 10 ? "0" + t : t}`;
 }
 function _(e, t = "W") {
-  const n = At(e), s = n.getFullYear(), r = J(s), o = 1 + Math.ceil(
-    (n.getTime() - r.getTime()) / H
+  const n = At(e), r = n.getFullYear(), s = J(r), o = 1 + Math.ceil(
+    (n.getTime() - s.getTime()) / H
   );
   return {
-    code: Re(s, o, t),
+    code: Re(r, o, t),
     weekNumber: o,
-    weekYear: s
+    weekYear: r
   };
 }
 function Dt(e) {
-  const [t, n] = e.split("-W"), r = J(+t).getTime() + (+n - 1) * H - 3 * z;
-  return new Date(r);
+  const [t, n] = e.split("-W"), s = J(+t).getTime() + (+n - 1) * H - 3 * z;
+  return new Date(s);
 }
 function yt(e) {
-  const [t, n] = e.split("-W"), r = J(+t).getTime() + (+n - 1) * H + 3 * z;
-  return new Date(r);
+  const [t, n] = e.split("-W"), s = J(+t).getTime() + (+n - 1) * H + 3 * z;
+  return new Date(s);
 }
 function we(e) {
-  return Q(e) ? St(e) : B(e) ? Rt(e) : K(e) ? pt(e) : F(e) ? vt(e) : j(e) ? Dt(e) : Nt(e);
+  return Q(e) ? St(e) : B(e) ? Rt(e) : G(e) ? pt(e) : F(e) ? vt(e) : j(e) ? Dt(e) : Nt(e);
 }
 function pe(e) {
-  return Q(e) ? Tt(e) : B(e) ? wt(e) : K(e) ? mt(e) : F(e) ? $t(e) : j(e) ? yt(e) : It(e);
+  return Q(e) ? Tt(e) : B(e) ? wt(e) : G(e) ? mt(e) : F(e) ? $t(e) : j(e) ? yt(e) : It(e);
 }
 function St(e) {
-  const t = M(e);
+  const t = k(e);
   if (t)
     return new Date(Number(t[0]), 0, 1);
 }
 function Tt(e) {
-  const t = M(e);
+  const t = k(e);
   if (t)
     return new Date(Number(t[0]) + 1, 0, 1);
 }
@@ -609,11 +604,11 @@ function wt(e) {
   }
 }
 function pt(e) {
-  const t = G(e);
+  const t = K(e);
   if (!t)
     return;
-  const [n, s] = t[0].split("-Q");
-  switch (+s) {
+  const [n, r] = t[0].split("-Q");
+  switch (+r) {
     case 1:
       return new Date(+n, 0, 1);
     case 2:
@@ -625,11 +620,11 @@ function pt(e) {
   }
 }
 function mt(e) {
-  const t = G(e);
+  const t = K(e);
   if (!t)
     return;
-  const [n, s] = t[0].split("-Q");
-  switch (+s) {
+  const [n, r] = t[0].split("-Q");
+  switch (+r) {
     case 1:
       return new Date(+n, 3, 1);
     case 2:
@@ -644,40 +639,40 @@ function vt(e) {
   const t = V(e);
   if (!t)
     return;
-  const [n, s] = t[0].split("-M");
-  return new Date(+n, +s - 1, 1);
+  const [n, r] = t[0].split("-M");
+  return new Date(+n, +r - 1, 1);
 }
 function $t(e) {
   const t = V(e);
   if (!t)
     return;
-  const [n, s] = t[0].split("-M");
-  return new Date(+n, +s, 1);
+  const [n, r] = t[0].split("-M");
+  return new Date(+n, +r, 1);
 }
 const Nt = (e) => /* @__PURE__ */ new Date(`${e}T00:00:00`), It = (e) => {
   const t = /* @__PURE__ */ new Date(`${e}T23:59:00`);
   return t.setMinutes(t.getMinutes() + 1), t;
-}, _t = 1, Pt = (e, t, n, s = !0, r = "Q") => {
-  const o = [], i = t && t > 3 ? Ct(t, s) : 1, c = n ? Math.floor((n - 1) / 3) : 4;
+}, _t = 1, Pt = (e, t, n, r = !0, s = "Q") => {
+  const o = [], i = t && t > 3 ? Ct(t, r) : 1, c = n ? Math.floor((n - 1) / 3) : 4;
   for (let a = i; a <= c; a++)
-    o.push(`${e}-${r}${a}`);
+    o.push(`${e}-${s}${a}`);
   return o;
-}, Ot = (e, t, n, s = "S") => {
-  const r = [];
-  return (t || 1) < 7 && (n || 12) > 6 && r.push(`${e}-${s}1`), n == null && r.push(`${e}-${s}2`), r;
-}, Nn = (e) => Math.ceil(e / 3), me = (e, t, n = "M") => `${e}-${n}${t.toString().padStart(2, "0")}`, Lt = (e, t, n = "M") => {
+}, Ot = (e, t, n, r = "S") => {
   const s = [];
-  for (let r = t; r <= 12; r++)
-    s.push(me(e, r, n));
-  return s;
-}, bt = (e, t, n, s = "M") => {
+  return (t || 1) < 7 && (n || 12) > 6 && s.push(`${e}-${r}1`), n == null && s.push(`${e}-${r}2`), s;
+}, Nn = (e) => Math.ceil(e / 3), me = (e, t, n = "M") => `${e}-${n}${t.toString().padStart(2, "0")}`, Lt = (e, t, n = "M") => {
   const r = [];
-  for (let o = t; o < n; o++)
-    r.push(me(e, o, s));
+  for (let s = t; s <= 12; s++)
+    r.push(me(e, s, n));
   return r;
-}, Ut = (e, t, n, s = "M") => {
-  const r = t || 1, o = n == null, i = n || 12;
-  return o ? Lt(e, r, s) : bt(e, r, i, s);
+}, bt = (e, t, n, r = "M") => {
+  const s = [];
+  for (let o = t; o < n; o++)
+    s.push(me(e, o, r));
+  return s;
+}, Ut = (e, t, n, r = "M") => {
+  const s = t || 1, o = n == null, i = n || 12;
+  return o ? Lt(e, s, r) : bt(e, s, i, r);
 }, In = (e, t, n = "M") => {
   switch (t) {
     case 0:
@@ -708,8 +703,8 @@ const Nt = (e) => /* @__PURE__ */ new Date(`${e}T00:00:00`), It = (e) => {
       return [];
   }
 }, xt = (e, t) => {
-  const n = R(t, !0), s = R(e), r = n.getFullYear(), o = s.getFullYear(), i = n.getTime() <= s.getTime() ? o + _t - r : 0;
-  return Array.from({ length: i }, (a, u) => r + u);
+  const n = R(t, !0), r = R(e), s = n.getFullYear(), o = r.getFullYear(), i = n.getTime() <= r.getTime() ? o + _t - s : 0;
+  return Array.from({ length: i }, (a, u) => s + u);
 }, R = (e, t = !1) => {
   const n = Yt(e, t);
   return n ? (n.getTimezoneOffset() > 0 && n.setMinutes(n.getMinutes() + n.getTimezoneOffset()), n) : /* @__PURE__ */ new Date();
@@ -719,58 +714,58 @@ const Nt = (e) => /* @__PURE__ */ new Date(`${e}T00:00:00`), It = (e) => {
 }, Ct = (e, t) => t ? Math.floor((e + 1) / 3) : Math.ceil((e + 1) / 3), _n = (e, t) => {
   const n = ue(e) - ue(t);
   if (n === 0 && e !== t) {
-    const s = ae(e), r = ae(t);
-    return s - r;
+    const r = ae(e), s = ae(t);
+    return r - s;
   }
   return n;
-}, ae = (e) => Q(e) ? 6 : B(e) ? 5 : K(e) ? 4 : F(e) ? 3 : j(e) ? 2 : Et(e) ? 1 : 0, ue = (e, t = !1) => {
+}, ae = (e) => Q(e) ? 6 : B(e) ? 5 : G(e) ? 4 : F(e) ? 3 : j(e) ? 2 : Et(e) ? 1 : 0, ue = (e, t = !1) => {
   const n = t ? we(e) : pe(e);
   return (n == null ? void 0 : n.getTime()) || 0;
 };
-var X = /* @__PURE__ */ ((e) => (e.LAST_UPDATE_AT = "lastUpdatedAt", e.SERIES_COUNT = "series_count", e))(X || {}), Wt = /* @__PURE__ */ ((e) => (e.C = "c", e))(Wt || {}), w = /* @__PURE__ */ ((e) => (e.EQUALS = "eq", e.NOT_EQUALS = "ne", e.LESS = "lt", e.LESS_OR_EQUAL = "le", e.GREATER = "gt", e.GREATER_OR_EQUAL = "ge", e.CONTAINS = "co", e.NOT_CONTAINS = "nc", e.STARTS = "sw", e.ENDS = "ew", e))(w || {}), kt = /* @__PURE__ */ ((e) => (e.BOOLEAN = "Boolean", e.DATE_TIME = "DateTime", e.DECIMAL = "Decimal", e.INTEGER = "Integer", e.OBSERVATION_TIME_PERIOD = "ObservationalTimePeriod", e.STRING = "String", e.TIME = "Time", e.TIME_RANGE = "TimeRange", e.URI = "URI", e))(kt || {}), qt = /* @__PURE__ */ ((e) => (e.ANNUAL = "A", e.QUARTERLY = "Q", e.MONTHLY = "M", e))(qt || {});
+var X = /* @__PURE__ */ ((e) => (e.LAST_UPDATE_AT = "lastUpdatedAt", e.SERIES_COUNT = "series_count", e))(X || {}), Wt = /* @__PURE__ */ ((e) => (e.C = "c", e))(Wt || {}), w = /* @__PURE__ */ ((e) => (e.EQUALS = "eq", e.NOT_EQUALS = "ne", e.LESS = "lt", e.LESS_OR_EQUAL = "le", e.GREATER = "gt", e.GREATER_OR_EQUAL = "ge", e.CONTAINS = "co", e.NOT_CONTAINS = "nc", e.STARTS = "sw", e.ENDS = "ew", e))(w || {}), qt = /* @__PURE__ */ ((e) => (e.BOOLEAN = "Boolean", e.DATE_TIME = "DateTime", e.DECIMAL = "Decimal", e.INTEGER = "Integer", e.OBSERVATION_TIME_PERIOD = "ObservationalTimePeriod", e.STRING = "String", e.TIME = "Time", e.TIME_RANGE = "TimeRange", e.URI = "URI", e))(qt || {}), Mt = /* @__PURE__ */ ((e) => (e.ANNUAL = "A", e.QUARTERLY = "Q", e.MONTHLY = "M", e))(Mt || {});
 function Pn(e) {
   var t, n;
-  return (n = (t = e == null ? void 0 : e.annotations) == null ? void 0 : t.find((s) => {
-    if (s.id === X.LAST_UPDATE_AT)
-      return s;
+  return (n = (t = e == null ? void 0 : e.annotations) == null ? void 0 : t.find((r) => {
+    if (r.id === X.LAST_UPDATE_AT)
+      return r;
   })) == null ? void 0 : n.value;
 }
 const Z = (e, t) => (e == null ? void 0 : e.names) && (e == null ? void 0 : e.names[t]) || (e == null ? void 0 : e.name), ve = (e, t, n) => {
   if (!(!e || t != null && t.has(e == null ? void 0 : e.id)) && (t == null || t.set(e == null ? void 0 : e.id, e), e != null && e.parent)) {
-    const s = n == null ? void 0 : n.get(e == null ? void 0 : e.parent);
-    ve(s, t, n);
+    const r = n == null ? void 0 : n.get(e == null ? void 0 : e.parent);
+    ve(r, t, n);
   }
-}, Mt = (e, t) => {
-  const n = /* @__PURE__ */ new Map(), s = new Map(e == null ? void 0 : e.map((r) => [r.id, r]));
-  return t == null || t.forEach((r) => {
-    ve(r, n, s);
+}, kt = (e, t) => {
+  const n = /* @__PURE__ */ new Map(), r = new Map(e == null ? void 0 : e.map((s) => [s.id, s]));
+  return t == null || t.forEach((s) => {
+    ve(s, n, r);
   }), Array.from(n == null ? void 0 : n.values());
 }, Qt = "time_period_end", Bt = "time_period_start", Vt = "TIME_PERIOD", On = (e) => {
   const t = e == null ? void 0 : e.find(
     (o) => o.id === Bt
   ), n = e == null ? void 0 : e.find(
     (o) => o.id === Qt
-  ), s = n != null && n.title ? new Date(n == null ? void 0 : n.title) : null;
+  ), r = n != null && n.title ? new Date(n == null ? void 0 : n.title) : null;
   return {
     startPeriod: t != null && t.title ? new Date(t == null ? void 0 : t.title) : null,
-    endPeriod: s
+    endPeriod: r
   };
-}, Ft = (e, t) => e.id.localeCompare(t.id), Gt = (e, t) => e.memberValue.localeCompare(t.memberValue), Kt = (e, t) => {
-  const n = new Array(e.length), s = e.map((i, c) => [i, c]);
-  s.sort(
+}, Ft = (e, t) => e.id.localeCompare(t.id), Kt = (e, t) => e.memberValue.localeCompare(t.memberValue), Gt = (e, t) => {
+  const n = new Array(e.length), r = e.map((i, c) => [i, c]);
+  r.sort(
     (i, c) => Ft(i[0], c[0])
   );
-  const r = [...t];
-  r.sort(Gt);
+  const s = [...t];
+  s.sort(Kt);
   let o = 0;
-  for (const i of s) {
+  for (const i of r) {
     const c = i[0];
-    for (; o < r.length && r[o].memberValue.localeCompare(c.id) < 0; )
+    for (; o < s.length && s[o].memberValue.localeCompare(c.id) < 0; )
       o += 1;
-    o < r.length && r[o].memberValue === c.id && (n[i[1]] = i[0]);
+    o < s.length && s[o].memberValue === c.id && (n[i[1]] = i[0]);
   }
   return n.filter((i) => i != null);
-}, jt = (e) => !!(e != null && e.some((t) => t.parent)), Ln = (e, t, n, s, r = []) => {
+}, jt = (e) => !!(e != null && e.some((t) => t.parent)), Ln = (e, t, n, r, s = []) => {
   var i, c;
   let o = e || [];
   if (zt(n || [], t || "")) {
@@ -784,21 +779,21 @@ const Z = (e, t) => (e == null ? void 0 : e.names) && (e == null ? void 0 : e.na
       u ? o = o.length === 0 ? (u.selectionValues || []).map(({ memberValue: l }) => ({
         id: l,
         name: l
-      })) : Kt(o, u.selectionValues) : o = [];
+      })) : Gt(o, u.selectionValues) : o = [];
     }
-  } else r.length !== 0 && (o = o.filter(({ id: a }) => r.includes(a)));
-  return jt(e) && (o = Mt(e, o)), o == null ? void 0 : o.map((a) => ({
+  } else s.length !== 0 && (o = o.filter(({ id: a }) => s.includes(a)));
+  return jt(e) && (o = kt(e, o)), o == null ? void 0 : o.map((a) => ({
     ...a,
-    name: s ? Z(a, s) : a == null ? void 0 : a.name
+    name: r ? Z(a, r) : a == null ? void 0 : a.name
   }));
 }, zt = (e, t) => e != null && e.length > 0 && t != null, bn = (e) => {
   var n;
   const t = [];
-  return (n = e == null ? void 0 : e.filters) == null || n.forEach((s) => {
-    s.componentCode !== Vt && t.push({
-      componentCode: s.componentCode,
+  return (n = e == null ? void 0 : e.filters) == null || n.forEach((r) => {
+    r.componentCode !== Vt && t.push({
+      componentCode: r.componentCode,
       operator: w.EQUALS,
-      value: s.values.join(",")
+      value: r.values.join(",")
     });
   }), t;
 }, Ht = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([\da-z\-]+(?:\.[\da-z\-]+)*))?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?)?)?$/i, le = (e) => {
@@ -814,22 +809,22 @@ const Z = (e, t) => (e == null ? void 0 : e.names) && (e == null ? void 0 : e.na
 }, Jt = (e, t) => typeof e != typeof t ? [String(e), String(t)] : [e, t], Xt = (e, t) => {
   if (de(e) || de(t))
     return 0;
-  const [n, s] = Jt(fe(e), fe(t));
-  return n > s ? 1 : n < s ? -1 : 0;
+  const [n, r] = Jt(fe(e), fe(t));
+  return n > r ? 1 : n < r ? -1 : 0;
 }, ge = (e, t) => {
   for (let n = 0; n < Math.max(e.length, t.length); n++) {
-    const s = Xt(e[n] || "0", t[n] || "0");
-    if (s !== 0)
-      return s;
+    const r = Xt(e[n] || "0", t[n] || "0");
+    if (r !== 0)
+      return r;
   }
   return 0;
 }, Zt = (e, t) => {
-  const n = le(e), s = le(t), r = n.pop(), o = s.pop(), i = ge(n, s);
-  return i !== 0 ? i : r && o ? ge(r.split("."), o.split(".")) : r || o ? r ? -1 : 1 : 0;
+  const n = le(e), r = le(t), s = n.pop(), o = r.pop(), i = ge(n, r);
+  return i !== 0 ? i : s && o ? ge(s.split("."), o.split(".")) : s || o ? s ? -1 : 1 : 0;
 }, en = (e, t, n) => {
   tn(n);
-  const s = Zt(e, t);
-  return $e[n].includes(s);
+  const r = Zt(e, t);
+  return $e[n].includes(r);
 }, $e = {
   ">": [1],
   ">=": [0, 1],
@@ -841,36 +836,36 @@ const Z = (e, t) => (e == null ? void 0 : e.names) && (e == null ? void 0 : e.na
   if (Ee.indexOf(e) === -1)
     throw new Error(`Invalid operator, expected one of ${Ee.join("|")}`);
 }, W = "+", ee = (e, t) => {
-  const { agency: n, id: s, version: r } = p(e), o = t.filter(
+  const { agency: n, id: r, version: s } = p(e), o = t.filter(
     (a) => {
       var u;
-      return a.agencyID === n && a.id === s && !((u = a == null ? void 0 : a.version) != null && u.includes(W));
+      return a.agencyID === n && a.id === r && !((u = a == null ? void 0 : a.version) != null && u.includes(W));
     }
   );
   if (o.length === 1)
     return o[0];
-  if (!(r != null && r.includes(W)))
-    return o.find((a) => a.version === r);
+  if (!(s != null && s.includes(W)))
+    return o.find((a) => a.version === s);
   const i = o.map(
     (a) => a.version
-  ), c = nn(r, i);
+  ), c = nn(s, i);
   return o.find(
     (a) => a.version === c[0]
   );
 }, nn = (e, t) => {
-  const n = sn(e, t);
+  const n = rn(e, t);
   return n.length > 0 ? [n[0]] : [];
-}, sn = (e, t) => {
+}, rn = (e, t) => {
   const n = [];
-  return t.forEach((s) => {
-    on(e, s) && n.push(s);
+  return t.forEach((r) => {
+    on(e, r) && n.push(r);
   }), n;
-}, rn = (e) => {
+}, sn = (e) => {
   const t = e.trim().replace(/\d+\+/, "*"), [n] = t.split("*");
   return new RegExp(`^${n}`);
 }, on = (e, t) => {
   const n = e.trim().replace(/\+/, "");
-  return rn(e).test(t) && en(t, n, ">=");
+  return sn(e).test(t) && en(t, n, ">=");
 }, te = (e, t) => {
   const { concept: n } = cn(e, t);
   return n;
@@ -880,7 +875,7 @@ const Z = (e, t) => (e == null ? void 0 : e.names) && (e == null ? void 0 : e.na
       concept: void 0,
       scheme: void 0
     };
-  const { childId: n, agency: s, id: r, version: o } = Pe(e);
+  const { childId: n, agency: r, id: s, version: o } = Pe(e);
   if (o != null && o.includes(W)) {
     const i = ee(
       e,
@@ -892,7 +887,7 @@ const Z = (e, t) => (e == null ? void 0 : e.names) && (e == null ? void 0 : e.na
     };
   }
   for (const i of t)
-    if (an(i, r, s, o))
+    if (an(i, s, r, o))
       return {
         concept: he((i == null ? void 0 : i.concepts) || [], n),
         scheme: i
@@ -901,30 +896,30 @@ const Z = (e, t) => (e == null ? void 0 : e.names) && (e == null ? void 0 : e.na
     concept: void 0,
     scheme: void 0
   };
-}, he = (e, t) => e == null ? void 0 : e.find((n) => n.id === t), an = (e, t, n, s) => e.id === t && e.agencyID === n && e.version === s, Un = (e = [], t = [], n) => {
+}, he = (e, t) => e == null ? void 0 : e.find((n) => n.id === t), an = (e, t, n, r) => e.id === t && e.agencyID === n && e.version === r, Un = (e = [], t = [], n) => {
   var a, u;
-  const s = (n == null ? void 0 : n.conceptIdentity) || "", r = te(s, t), o = I(
+  const r = (n == null ? void 0 : n.conceptIdentity) || "", s = te(r, t), o = I(
     (a = n == null ? void 0 : n.localRepresentation) == null ? void 0 : a.enumeration
   ), i = I(
-    (u = r == null ? void 0 : r.coreRepresentation) == null ? void 0 : u.enumeration
+    (u = s == null ? void 0 : s.coreRepresentation) == null ? void 0 : u.enumeration
   ), c = o || i;
   if (c != null)
     return ee(c, e);
-}, xn = (e, t, n, s) => {
+}, xn = (e, t, n, r) => {
   var o, i;
-  const r = (o = t == null ? void 0 : t.find(
+  const s = (o = t == null ? void 0 : t.find(
     (c) => (c == null ? void 0 : c.id) === (e == null ? void 0 : e.id)
   )) == null ? void 0 : o.values;
-  return ((i = n == null ? void 0 : n.filter((c) => r == null ? void 0 : r.some((a) => a.id === c.id))) == null ? void 0 : i.map((c) => ({
+  return ((i = n == null ? void 0 : n.filter((c) => s == null ? void 0 : s.some((a) => a.id === c.id))) == null ? void 0 : i.map((c) => ({
     ...c,
-    name: s ? Z(c, s) : c == null ? void 0 : c.name
+    name: r ? Z(c, r) : c == null ? void 0 : c.name
   }))) || [];
 }, un = (e, t) => {
-  var r, o, i;
-  const n = (r = t == null ? void 0 : t.dataStructureComponents) == null ? void 0 : r.attributeList, s = (o = e == null ? void 0 : e.metadataStructureComponents) == null ? void 0 : o.metadataAttributeList;
+  var s, o, i;
+  const n = (s = t == null ? void 0 : t.dataStructureComponents) == null ? void 0 : s.attributeList, r = (o = e == null ? void 0 : e.metadataStructureComponents) == null ? void 0 : o.metadataAttributeList;
   return (i = n == null ? void 0 : n.metadataAttributeUsages) == null ? void 0 : i.map((c) => {
     var u;
-    const a = (u = s == null ? void 0 : s.metadataAttributes) == null ? void 0 : u.find(
+    const a = (u = r == null ? void 0 : r.metadataAttributes) == null ? void 0 : u.find(
       (l) => (l == null ? void 0 : l.id) === (c == null ? void 0 : c.metadataAttributeReference)
     );
     return {
@@ -934,40 +929,40 @@ const Z = (e, t) => (e == null ? void 0 : e.names) && (e == null ? void 0 : e.na
     };
   });
 }, Yn = (e = [], t, n) => {
-  const s = I(t == null ? void 0 : t.conceptIdentity) || "", r = te(s, e);
-  return n ? Z(r, n) : (r == null ? void 0 : r.name) ?? (r == null ? void 0 : r.id) ?? (t == null ? void 0 : t.id);
+  const r = I(t == null ? void 0 : t.conceptIdentity) || "", s = te(r, e);
+  return n ? Z(s, n) : (s == null ? void 0 : s.name) ?? (s == null ? void 0 : s.id) ?? (t == null ? void 0 : t.id);
 };
 function Ae(e) {
-  var t, n, s;
-  return (s = (n = (t = e == null ? void 0 : e.dataStructures) == null ? void 0 : t[0]) == null ? void 0 : n.dataStructureComponents) == null ? void 0 : s.dimensionList;
+  var t, n, r;
+  return (r = (n = (t = e == null ? void 0 : e.dataStructures) == null ? void 0 : t[0]) == null ? void 0 : n.dataStructureComponents) == null ? void 0 : r.dimensionList;
 }
 function Cn(e) {
-  var t, n, s, r;
-  return ((r = (s = (n = (t = e == null ? void 0 : e.data) == null ? void 0 : t.structures) == null ? void 0 : n[0]) == null ? void 0 : s.dimensions) == null ? void 0 : r.series) || [];
+  var t, n, r, s;
+  return ((s = (r = (n = (t = e == null ? void 0 : e.data) == null ? void 0 : t.structures) == null ? void 0 : n[0]) == null ? void 0 : r.dimensions) == null ? void 0 : s.series) || [];
 }
 function Wn(e) {
-  var t, n, s, r, o;
-  return ((o = (r = (s = (n = (t = e == null ? void 0 : e.data) == null ? void 0 : t.structures) == null ? void 0 : n[0]) == null ? void 0 : s.dimensions) == null ? void 0 : r.observation) == null ? void 0 : o[0].values.map((i) => i.value).filter((i) => i != null)) || [];
+  var t, n, r, s, o;
+  return ((o = (s = (r = (n = (t = e == null ? void 0 : e.data) == null ? void 0 : t.structures) == null ? void 0 : n[0]) == null ? void 0 : r.dimensions) == null ? void 0 : s.observation) == null ? void 0 : o[0].values.map((i) => i.value).filter((i) => i != null)) || [];
 }
-function kn(e) {
+function qn(e) {
   return e.find(
-    (t) => t.type === q.TIME_DIMENSION
+    (t) => t.type === M.TIME_DIMENSION
   );
 }
-const qn = (e) => {
+const Mn = (e) => {
   var i, c, a, u, l, f;
-  const t = /* @__PURE__ */ new Map(), n = (i = e == null ? void 0 : e.dataStructures) == null ? void 0 : i[0], s = (c = e == null ? void 0 : e.metadataStructures) == null ? void 0 : c[0], r = (e == null ? void 0 : e.conceptSchemes) || [], o = (e == null ? void 0 : e.codelists) || [];
+  const t = /* @__PURE__ */ new Map(), n = (i = e == null ? void 0 : e.dataStructures) == null ? void 0 : i[0], r = (c = e == null ? void 0 : e.metadataStructures) == null ? void 0 : c[0], s = (e == null ? void 0 : e.conceptSchemes) || [], o = (e == null ? void 0 : e.codelists) || [];
   return e && [
     ...((a = Ae(e)) == null ? void 0 : a.dimensions) || [],
     ...((u = Ae(e)) == null ? void 0 : u.timeDimensions) || [],
-    ...un(s, n),
+    ...un(r, n),
     ...((f = (l = n == null ? void 0 : n.dataStructureComponents) == null ? void 0 : l.attributeList) == null ? void 0 : f.attributes) || []
   ].forEach(
     (d) => {
       var A, y;
       const g = te(
         d == null ? void 0 : d.conceptIdentity,
-        r
+        s
       ), h = ((A = d == null ? void 0 : d.localRepresentation) == null ? void 0 : A.enumeration) || ((y = g == null ? void 0 : g.coreRepresentation) == null ? void 0 : y.enumeration), D = ee(
         h,
         o
@@ -983,41 +978,41 @@ const qn = (e) => {
       }));
     }
   ), t;
-}, Mn = (e) => {
+}, kn = (e) => {
   var t;
   return ((t = e == null ? void 0 : e.find(
     (n) => n.id === X.SERIES_COUNT
   )) == null ? void 0 : t.title) || "";
-}, ln = "/api/download", Qn = (e, t, n, s, r, o, i) => {
+}, ln = "/api/download", Qn = (e, t, n, r, s, o, i) => {
   const c = new URLSearchParams({
     urn: e,
     format: t,
     compress: "false",
     filename: o,
-    filters: JSON.stringify(r),
-    attribute: s,
+    filters: JSON.stringify(s),
+    attribute: r,
     language: n,
     isMetadata: i ? "true" : "none"
   }).toString(), a = `${ln}?${c}`;
   window.open(a, "_blank");
 }, Bn = (e, t) => {
-  var s, r;
+  var r, s;
   const n = [];
   for (const o of e) {
-    if (o.type !== q.DIMENSION)
+    if (o.type !== M.DIMENSION)
       continue;
     const i = t.find((c) => c.componentCode === o.id);
-    i != null && ((s = i.values) == null ? void 0 : s.length) > 0 ? n.push((r = i.values) == null ? void 0 : r.join(We)) : n.push("*");
+    i != null && ((r = i.values) == null ? void 0 : r.length) > 0 ? n.push((s = i.values) == null ? void 0 : s.join(We)) : n.push("*");
   }
   return n.join(".");
 }, dn = (e, t) => {
   if (!e || !e.startPeriod && !e.endPeriod)
     return null;
-  const n = [], { startPeriod: s, endPeriod: r } = e;
-  if (s && n.push(
-    `${w.GREATER_OR_EQUAL}${se}${s.toISOString().split("T")[0]}`
-  ), r && n.push(
-    `${w.LESS_OR_EQUAL}${se}${r.toISOString().split("T")[0]}`
+  const n = [], { startPeriod: r, endPeriod: s } = e;
+  if (r && n.push(
+    `${w.GREATER_OR_EQUAL}${re}${r.toISOString().split("T")[0]}`
+  ), s && n.push(
+    `${w.LESS_OR_EQUAL}${re}${s.toISOString().split("T")[0]}`
   ), n.length === 0)
     return null;
   const o = t;
@@ -1029,48 +1024,48 @@ const qn = (e) => {
   return n ? dn(n, t == null ? void 0 : t.id) : null;
 }, fn = (e, t) => {
   var a, u;
-  const n = t.id, s = (a = e == null ? void 0 : e.filters) == null ? void 0 : a.find(
+  const n = t.id, r = (a = e == null ? void 0 : e.filters) == null ? void 0 : a.find(
     (l) => l.componentCode === n
   );
-  if (!s || !s.values)
+  if (!r || !r.values)
     return null;
-  const r = (u = s.values) == null ? void 0 : u.filter((l) => !!l);
-  if (!r.length)
+  const s = (u = r.values) == null ? void 0 : u.filter((l) => !!l);
+  if (!s.length)
     return null;
-  const o = s.operator;
+  const o = r.operator;
   if (o === w.LESS_OR_EQUAL || o === w.LESS)
-    return { startPeriod: null, endPeriod: v(r[0]) };
+    return { startPeriod: null, endPeriod: v(s[0]) };
   if (o === w.GREATER_OR_EQUAL || o === w.GREATER)
-    return { startPeriod: v(r[0]), endPeriod: null };
-  const i = v(r[0]), c = v(r[1]);
+    return { startPeriod: v(s[0]), endPeriod: null };
+  const i = v(s[0]), c = v(s[1]);
   return { startPeriod: i, endPeriod: c };
 }, Ne = (e, t, n) => {
-  const s = R(t, !0), r = R(n), o = R(e, !0), i = R(e), c = s.getTime() > o.getTime() ? s : o, a = r.getTime() < i.getTime() ? r : i;
+  const r = R(t, !0), s = R(n), o = R(e, !0), i = R(e), c = r.getTime() > o.getTime() ? r : o, a = s.getTime() < i.getTime() ? s : i;
   return {
     start: c,
     end: a
   };
-}, gn = (e, t, n, s = "W") => {
-  const r = +e, { start: o, end: i } = Ne(e, t, n);
+}, gn = (e, t, n, r = "W") => {
+  const s = +e, { start: o, end: i } = Ne(e, t, n);
   if (o.getTime() > i.getTime())
     return [];
-  const c = _(o, s), a = c.weekYear === r ? c.weekNumber : c.weekYear < r ? 1 : ce(r, s), u = _(i, s), l = u.weekYear === r ? u.weekNumber : u.weekYear > r ? ce(r, s) : 1, f = [];
+  const c = _(o, r), a = c.weekYear === s ? c.weekNumber : c.weekYear < s ? 1 : ce(s, r), u = _(i, r), l = u.weekYear === s ? u.weekNumber : u.weekYear > s ? ce(s, r) : 1, f = [];
   if (a < l)
     for (let E = a; E <= l; E++)
-      f.push(Re(r, E, s));
+      f.push(Re(s, E, r));
   return f;
 }, En = (e) => {
   const t = new Date(e);
   return t.setMinutes(t.getMinutes() - t.getTimezoneOffset()), t.toISOString().slice(0, 10);
 }, hn = (e, t, n) => {
-  const { start: s, end: r } = Ne(e, t, n);
-  if (s.getTime() > r.getTime())
+  const { start: r, end: s } = Ne(e, t, n);
+  if (r.getTime() > s.getTime())
     return [];
   const o = [], i = new Date(
-    s.getFullYear(),
-    s.getMonth(),
-    s.getDate()
-  ), c = new Date(r.getFullYear(), r.getMonth(), r.getDate());
+    r.getFullYear(),
+    r.getMonth(),
+    r.getDate()
+  ), c = new Date(s.getFullYear(), s.getMonth(), s.getDate());
   for (; i.getTime() < c.getTime(); ) {
     const a = En(i);
     o.push(a), i.setDate(i.getDate() + 1);
@@ -1085,19 +1080,19 @@ const qn = (e) => {
   isYearlyExist: !!(e != null && e.some(
     ({ memberValue: t }) => t === "A" || t === "Y"
   ))
-}), Dn = (e, t, n, s) => {
+}), Dn = (e, t, n, r) => {
   var i, c;
-  const r = s === 0 ? ((i = R(t.toString(), !0)) == null ? void 0 : i.getMonth()) + 1 : void 0, o = s === e.length - 1 ? ((c = R(n.toString())) == null ? void 0 : c.getMonth()) + 1 || 1 : void 0;
-  return { startMonth: r, endMonth: o };
+  const s = r === 0 ? ((i = R(t.toString(), !0)) == null ? void 0 : i.getMonth()) + 1 : void 0, o = r === e.length - 1 ? ((c = R(n.toString())) == null ? void 0 : c.getMonth()) + 1 || 1 : void 0;
+  return { startMonth: s, endMonth: o };
 }, yn = ["FREQUENCY", "FREQ"], Fn = (e, t) => {
   var a, u, l, f, E, d, g;
   const n = (E = (f = (l = (u = (a = e == null ? void 0 : e[0]) == null ? void 0 : a.cubeRegions) == null ? void 0 : u[0]) == null ? void 0 : l.memberSelection) == null ? void 0 : f.find(
     (h) => yn.includes(h.componentId)
-  )) == null ? void 0 : E.selectionValues, s = An(n || []), r = ((d = t == null ? void 0 : t.startPeriod) == null ? void 0 : d.getTime()) || 1, o = ((g = t == null ? void 0 : t.endPeriod) == null ? void 0 : g.getTime()) || 1, i = xt(o, r), c = [];
+  )) == null ? void 0 : E.selectionValues, r = An(n || []), s = ((d = t == null ? void 0 : t.startPeriod) == null ? void 0 : d.getTime()) || 1, o = ((g = t == null ? void 0 : t.endPeriod) == null ? void 0 : g.getTime()) || 1, i = xt(o, s), c = [];
   return i.forEach((h, D) => {
     const A = [], { startMonth: y, endMonth: S } = Dn(
       i,
-      new Date(r),
+      new Date(s),
       new Date(o),
       D
     ), {
@@ -1107,13 +1102,13 @@ const qn = (e) => {
       isQuarterlyExist: b,
       isSemiAnnualExist: U,
       isYearlyExist: T
-    } = s;
+    } = r;
     T && A.push(h.toString()), U && A.push(...Ot(h, y, S)), b && A.push(
       ...Pt(h, y, S, !1)
     ), L && A.push(...Ut(h, y, S)), O && A.push(
-      ...gn(h, r.toString(), o.toString())
+      ...gn(h, s.toString(), o.toString())
     ), P && A.push(
-      ...hn(h, r.toString(), o.toString())
+      ...hn(h, s.toString(), o.toString())
     ), c.push(...A);
   }), c;
 };
@@ -1123,25 +1118,25 @@ export {
   Tn as AvailabilityApi,
   Ye as DATASET_DATA_URL,
   wn as DatasetApi,
-  q as DimensionType,
+  M as DimensionType,
   be as DownloadType,
   mn as FREQUENCY_DIMENSION_ID,
   yn as FREQUENCY_DIM_ID,
   Le as FileColumnsAttribute,
-  ke as GET_v3_FILTER_ALL,
+  qe as GET_v3_FILTER_ALL,
   Rn as GET_v3_FILTER_AND,
   We as GET_v3_FILTER_OR,
   Xe as OBSERVATION_KEY,
   ze as OccurrenceType,
-  qt as Periods,
-  kt as RepresentationTextType,
+  Mt as Periods,
+  qt as RepresentationTextType,
   Wt as SDMX_DATA_QUERY_PARAMS,
   W as SINGLE_WILDCARD_SYMBOL,
   pn as SdmxApiClient,
   De as SdmxAvailabilityMode,
   $ as SdmxDataFormat,
   ye as SdmxDetails,
-  k as SdmxReferences,
+  q as SdmxReferences,
   w as SeriesFilterOperator,
   Vt as TIME_PERIOD,
   Qt as TIME_PERIOD_END,
@@ -1149,7 +1144,7 @@ export {
   lt as dailyPattern,
   nt as decodeDimensionId,
   Un as findCodelistByDimension,
-  re as generateDatasetDataRequest,
+  se as generateDatasetDataRequest,
   Sn as generateShortUrn,
   Fn as getAdditionalColumns,
   On as getAnnotationPeriod,
@@ -1169,7 +1164,7 @@ export {
   hn as getDaysColumns,
   Yn as getDimensionTitle,
   Ae as getDimensions,
-  Mt as getFilteredItemsWithParents,
+  kt as getFilteredItemsWithParents,
   bn as getFiltersDtoFromDataQuery,
   _ as getISOWeek,
   I as getKeyFromUrn,
@@ -1185,7 +1180,7 @@ export {
   R as getPeriodDate,
   An as getPeriods,
   Nn as getQuarterByMonth,
-  G as getQuarterlyRegExp,
+  K as getQuarterlyRegExp,
   Pt as getQuartersData,
   dn as getQueryTimePeriodFilters,
   Ue as getRequestAcceptHeader,
@@ -1194,13 +1189,13 @@ export {
   ft as getSemiAnnuallyRegExp,
   C as getSeriesAttributes,
   Ze as getSeriesName,
-  qn as getStructureComponentsMap,
+  Mn as getStructureComponentsMap,
   Cn as getStructureDimensions,
-  kn as getTimeDimension,
+  qn as getTimeDimension,
   Wn as getTimePeriods,
   Vn as getTimeQueryFilter,
   fn as getTimeRangeFromAttachment,
-  Mn as getTimeSeriesCount,
+  kn as getTimeSeriesCount,
   Bn as getTimeSeriesFilterKey,
   tt as getTimeSeriesId,
   Re as getWeekCode,
@@ -1208,13 +1203,13 @@ export {
   Dt as getWeeklyPeriodStartDate,
   ht as getWeeklyRegExp,
   gn as getWeeksColumns,
-  rn as getWildCardRegexp,
+  sn as getWildCardRegexp,
   Ne as getYearPeriod,
-  M as getYearlyRegExp,
+  k as getYearlyRegExp,
   xt as getYears,
   Et as isDaily,
   F as isMonthly,
-  K as isQuarterly,
+  G as isQuarterly,
   B as isSemiAnnually,
   j as isWeekly,
   on as isWildCardVersionCorrect,