@medplum/agent 2.1.11 → 2.1.12

package/dist/cjs/index.cjs

@@ -3687,10 +3687,10 @@ function Te(r4, e) {
   t.setUTCHours(0, 0, 0, 0);
   let n = e ? new Date(e) : /* @__PURE__ */ new Date();
   n.setUTCHours(0, 0, 0, 0);
-  let i2 = t.getUTCFullYear(), o = t.getUTCMonth(), s = t.getUTCDate(), a = n.getUTCFullYear(), c2 = n.getUTCMonth(), m2 = n.getUTCDate(), p2 = a - i2;
-  (c2 < o || c2 === o && m2 < s) && p2--;
+  let i2 = t.getUTCFullYear(), o = t.getUTCMonth(), s = t.getUTCDate(), a = n.getUTCFullYear(), c2 = n.getUTCMonth(), f = n.getUTCDate(), p2 = a - i2;
+  (c2 < o || c2 === o && f < s) && p2--;
   let q = a * 12 + c2 - (i2 * 12 + o);
-  m2 < s && q--;
+  f < s && q--;
   let fn = Math.floor((n.getTime() - t.getTime()) / (1e3 * 60 * 60 * 24));
   return { years: p2, months: q, days: fn };
 }
@@ -4295,8 +4295,8 @@ function _(r4, e, t, ...n) {
   let [{ value: i2 }] = U(t, 1), o = b(i2), s = o ? i2.value : i2;
   if (typeof s != "number")
     throw new Error("Math function cannot be called with non-number");
-  let a = r4(s, ...n.map((p2) => p2.eval(e, t)[0]?.value)), c2 = o ? u.Quantity : t[0].type, m2 = o ? { ...i2, value: a } : a;
-  return [{ type: c2, value: m2 }];
+  let a = r4(s, ...n.map((p2) => p2.eval(e, t)[0]?.value)), c2 = o ? u.Quantity : t[0].type, f = o ? { ...i2, value: a } : a;
+  return [{ type: c2, value: f }];
 }
 function U(r4, e) {
   if (r4.length !== e)
@@ -4384,7 +4384,7 @@ var R = class extends v {
     let o = this.right.eval(t, n);
     if (o.length !== 1)
       return [];
-    let s = i2[0].value, a = o[0].value, c2 = b(s) ? s.value : s, m2 = b(a) ? a.value : a, p2 = this.impl(c2, m2);
+    let s = i2[0].value, a = o[0].value, c2 = b(s) ? s.value : s, f = b(a) ? a.value : a, p2 = this.impl(c2, f);
     return typeof p2 == "boolean" ? l(p2) : b(s) ? [{ type: u.Quantity, value: { ...s, value: p2 } }] : [T(p2)];
   }
 };
@@ -4554,7 +4554,7 @@ var X = class {
   }
 };
 var le = ["!=", "!~", "<=", ">=", "{}", "->"];
-var f = { FunctionCall: 0, Dot: 1, Indexer: 2, UnaryAdd: 3, UnarySubtract: 3, Multiply: 4, Divide: 4, IntegerDivide: 4, Modulo: 4, Add: 5, Subtract: 5, Ampersand: 5, Is: 6, As: 6, Union: 7, GreaterThan: 8, GreaterThanOrEquals: 8, LessThan: 8, LessThanOrEquals: 8, Equals: 9, Equivalent: 9, NotEquals: 9, NotEquivalent: 9, In: 10, Contains: 10, And: 11, Xor: 12, Or: 12, Implies: 13, Arrow: 100, Semicolon: 200 };
+var m = { FunctionCall: 0, Dot: 1, Indexer: 2, UnaryAdd: 3, UnarySubtract: 3, Multiply: 4, Divide: 4, IntegerDivide: 4, Modulo: 4, Add: 5, Subtract: 5, Ampersand: 5, Is: 6, As: 6, Union: 7, GreaterThan: 8, GreaterThanOrEquals: 8, LessThan: 8, LessThanOrEquals: 8, Equals: 9, Equivalent: 9, NotEquals: 9, NotEquivalent: 9, In: 10, Contains: 10, And: 11, Xor: 12, Or: 12, Implies: 13, Arrow: 100, Semicolon: 200 };
 var ii = { parse(r4) {
   let e = r4.consumeAndParse();
   if (!r4.match(")"))
@@ -4566,7 +4566,7 @@ var oi = { parse(r4, e) {
   if (!r4.match("]"))
     throw new Error("Parse error: expected `]`");
   return new X(e, t);
-}, precedence: f.Indexer };
+}, precedence: m.Indexer };
 var si = { parse(r4, e) {
   if (!(e instanceof M))
     throw new Error("Unexpected parentheses");
@@ -4574,13 +4574,13 @@ var si = { parse(r4, e) {
   for (; !r4.match(")"); )
     t.push(r4.consumeAndParse()), r4.match(",");
   return new B(e.name, t);
-}, precedence: f.FunctionCall };
+}, precedence: m.FunctionCall };
 function ai(r4) {
   let e = r4.split(" "), t = parseFloat(e[0]), n = e[1];
   return n?.startsWith("'") && n.endsWith("'") ? n = n.substring(1, n.length - 1) : n = "{" + n + "}", { value: t, unit: n };
 }
 function de() {
-  return new xe().registerPrefix("String", { parse: (r4, e) => new O({ type: u.string, value: e.value }) }).registerPrefix("DateTime", { parse: (r4, e) => new O({ type: u.dateTime, value: re(e.value) }) }).registerPrefix("Quantity", { parse: (r4, e) => new O({ type: u.Quantity, value: ai(e.value) }) }).registerPrefix("Number", { parse: (r4, e) => new O({ type: u.decimal, value: parseFloat(e.value) }) }).registerPrefix("true", { parse: () => new O({ type: u.boolean, value: true }) }).registerPrefix("false", { parse: () => new O({ type: u.boolean, value: false }) }).registerPrefix("Symbol", { parse: (r4, e) => new M(e.value) }).registerPrefix("{}", { parse: () => new De() }).registerPrefix("(", ii).registerInfix("[", oi).registerInfix("(", si).prefix("+", f.UnaryAdd, (r4, e) => new Ne("+", e, (t) => t)).prefix("-", f.UnarySubtract, (r4, e) => new R("-", e, e, (t, n) => -n)).infixLeft(".", f.Dot, (r4, e, t) => new H(r4, t)).infixLeft("/", f.Divide, (r4, e, t) => new R("/", r4, t, (n, i2) => n / i2)).infixLeft("*", f.Multiply, (r4, e, t) => new R("*", r4, t, (n, i2) => n * i2)).infixLeft("+", f.Add, (r4, e, t) => new R("+", r4, t, (n, i2) => n + i2)).infixLeft("-", f.Subtract, (r4, e, t) => new R("-", r4, t, (n, i2) => n - i2)).infixLeft("|", f.Union, (r4, e, t) => new ne(r4, t)).infixLeft("=", f.Equals, (r4, e, t) => new Le(r4, t)).infixLeft("!=", f.NotEquals, (r4, e, t) => new Me(r4, t)).infixLeft("~", f.Equivalent, (r4, e, t) => new Be(r4, t)).infixLeft("!~", f.NotEquivalent, (r4, e, t) => new qe(r4, t)).infixLeft("<", f.LessThan, (r4, e, t) => new R("<", r4, t, (n, i2) => n < i2)).infixLeft("<=", f.LessThanOrEquals, (r4, e, t) => new R("<=", r4, t, (n, i2) => n <= i2)).infixLeft(">", f.GreaterThan, (r4, e, t) => new R(">", r4, t, (n, i2) => n > i2)).infixLeft(">=", f.GreaterThanOrEquals, (r4, e, t) => new R(">=", r4, t, (n, i2) => n >= i2)).infixLeft("&", f.Ampersand, (r4, e, t) => new Fe(r4, t)).infixLeft("and", f.And, (r4, e, t) => new $e(r4, t)).infixLeft("as", f.As, (r4, e, t) => new J(r4, t)).infixLeft("contains", f.Contains, (r4, e, t) => new _e(r4, t)).infixLeft("div", f.Divide, (r4, e, t) => new R("div", r4, t, (n, i2) => n / i2 | 0)).infixLeft("in", f.In, (r4, e, t) => new Ue(r4, t)).infixLeft("is", f.Is, (r4, e, t) => new Y(r4, t)).infixLeft("mod", f.Modulo, (r4, e, t) => new R("mod", r4, t, (n, i2) => n % i2)).infixLeft("or", f.Or, (r4, e, t) => new je(r4, t)).infixLeft("xor", f.Xor, (r4, e, t) => new Qe(r4, t)).infixLeft("implies", f.Implies, (r4, e, t) => new He(r4, t));
+  return new xe().registerPrefix("String", { parse: (r4, e) => new O({ type: u.string, value: e.value }) }).registerPrefix("DateTime", { parse: (r4, e) => new O({ type: u.dateTime, value: re(e.value) }) }).registerPrefix("Quantity", { parse: (r4, e) => new O({ type: u.Quantity, value: ai(e.value) }) }).registerPrefix("Number", { parse: (r4, e) => new O({ type: u.decimal, value: parseFloat(e.value) }) }).registerPrefix("true", { parse: () => new O({ type: u.boolean, value: true }) }).registerPrefix("false", { parse: () => new O({ type: u.boolean, value: false }) }).registerPrefix("Symbol", { parse: (r4, e) => new M(e.value) }).registerPrefix("{}", { parse: () => new De() }).registerPrefix("(", ii).registerInfix("[", oi).registerInfix("(", si).prefix("+", m.UnaryAdd, (r4, e) => new Ne("+", e, (t) => t)).prefix("-", m.UnarySubtract, (r4, e) => new R("-", e, e, (t, n) => -n)).infixLeft(".", m.Dot, (r4, e, t) => new H(r4, t)).infixLeft("/", m.Divide, (r4, e, t) => new R("/", r4, t, (n, i2) => n / i2)).infixLeft("*", m.Multiply, (r4, e, t) => new R("*", r4, t, (n, i2) => n * i2)).infixLeft("+", m.Add, (r4, e, t) => new R("+", r4, t, (n, i2) => n + i2)).infixLeft("-", m.Subtract, (r4, e, t) => new R("-", r4, t, (n, i2) => n - i2)).infixLeft("|", m.Union, (r4, e, t) => new ne(r4, t)).infixLeft("=", m.Equals, (r4, e, t) => new Le(r4, t)).infixLeft("!=", m.NotEquals, (r4, e, t) => new Me(r4, t)).infixLeft("~", m.Equivalent, (r4, e, t) => new Be(r4, t)).infixLeft("!~", m.NotEquivalent, (r4, e, t) => new qe(r4, t)).infixLeft("<", m.LessThan, (r4, e, t) => new R("<", r4, t, (n, i2) => n < i2)).infixLeft("<=", m.LessThanOrEquals, (r4, e, t) => new R("<=", r4, t, (n, i2) => n <= i2)).infixLeft(">", m.GreaterThan, (r4, e, t) => new R(">", r4, t, (n, i2) => n > i2)).infixLeft(">=", m.GreaterThanOrEquals, (r4, e, t) => new R(">=", r4, t, (n, i2) => n >= i2)).infixLeft("&", m.Ampersand, (r4, e, t) => new Fe(r4, t)).infixLeft("and", m.And, (r4, e, t) => new $e(r4, t)).infixLeft("as", m.As, (r4, e, t) => new J(r4, t)).infixLeft("contains", m.Contains, (r4, e, t) => new _e(r4, t)).infixLeft("div", m.Divide, (r4, e, t) => new R("div", r4, t, (n, i2) => n / i2 | 0)).infixLeft("in", m.In, (r4, e, t) => new Ue(r4, t)).infixLeft("is", m.Is, (r4, e, t) => new Y(r4, t)).infixLeft("mod", m.Modulo, (r4, e, t) => new R("mod", r4, t, (n, i2) => n % i2)).infixLeft("or", m.Or, (r4, e, t) => new je(r4, t)).infixLeft("xor", m.Xor, (r4, e, t) => new Qe(r4, t)).infixLeft("implies", m.Implies, (r4, e, t) => new He(r4, t));
 }
 var ci = de();
 var kr = ((p2) => (p2.BOOLEAN = "BOOLEAN", p2.NUMBER = "NUMBER", p2.QUANTITY = "QUANTITY", p2.TEXT = "TEXT", p2.REFERENCE = "REFERENCE", p2.CANONICAL = "CANONICAL", p2.DATE = "DATE", p2.DATETIME = "DATETIME", p2.PERIOD = "PERIOD", p2.UUID = "UUID", p2))(kr || {});
@@ -4997,9 +4997,9 @@ var en = class extends he {
   signOutWithRedirect() {
     window.location.assign(this.logoutUrl);
   }
-  async signInWithExternalAuth(t, n, i2, o) {
-    let s = await this.ensureCodeChallenge(o);
-    window.location.assign(this.getExternalAuthRedirectUri(t, n, i2, s));
+  async signInWithExternalAuth(t, n, i2, o, s = true) {
+    let a = o;
+    s && (a = await this.ensureCodeChallenge(o)), window.location.assign(this.getExternalAuthRedirectUri(t, n, i2, a, s));
   }
   async exchangeExternalAccessToken(t, n) {
     if (n = n ?? this.clientId, !n)
@@ -5007,14 +5007,17 @@ var en = class extends he {
     let i2 = new URLSearchParams();
     return i2.set("grant_type", "urn:ietf:params:oauth:grant-type:token-exchange"), i2.set("subject_token_type", "urn:ietf:params:oauth:token-type:access_token"), i2.set("client_id", n), i2.set("subject_token", t), this.fetchTokens(i2);
   }
-  getExternalAuthRedirectUri(t, n, i2, o) {
-    let { codeChallenge: s, codeChallengeMethod: a } = o;
-    if (!a)
-      throw new Error("`LoginRequest` for external auth must include a `codeChallengeMethod`.");
-    if (!s)
-      throw new Error("`LoginRequest` for external auth must include a `codeChallenge`.");
-    let c2 = new URL(t);
-    return c2.searchParams.set("response_type", "code"), c2.searchParams.set("client_id", n), c2.searchParams.set("redirect_uri", i2), c2.searchParams.set("scope", "openid profile email"), c2.searchParams.set("state", JSON.stringify(o)), c2.searchParams.set("code_challenge_method", a), c2.searchParams.set("code_challenge", s), c2.toString();
+  getExternalAuthRedirectUri(t, n, i2, o, s = true) {
+    let a = new URL(t);
+    if (a.searchParams.set("response_type", "code"), a.searchParams.set("client_id", n), a.searchParams.set("redirect_uri", i2), a.searchParams.set("scope", "openid profile email"), a.searchParams.set("state", JSON.stringify(o)), s) {
+      let { codeChallenge: c2, codeChallengeMethod: f } = o;
+      if (!f)
+        throw new Error("`LoginRequest` for external auth must include a `codeChallengeMethod`.");
+      if (!c2)
+        throw new Error("`LoginRequest` for external auth must include a `codeChallenge`.");
+      a.searchParams.set("code_challenge_method", f), a.searchParams.set("code_challenge", c2);
+    }
+    return a.toString();
   }
   fhirUrl(...t) {
     return new URL(t.join("/"), this.fhirBaseUrl);
@@ -5028,11 +5031,11 @@ var en = class extends he {
     if (a)
       return a.value;
     let c2 = new w((async () => {
-      let m2 = await this.get(o, i2);
-      if (m2.entry)
-        for (let p2 of m2.entry)
+      let f = await this.get(o, i2);
+      if (f.entry)
+        for (let p2 of f.entry)
           this.cacheResource(p2.resource);
-      return m2;
+      return f;
     })());
     return this.setCacheEntry(s, c2), c2;
   }
@@ -5042,7 +5045,7 @@ var en = class extends he {
     let s = o.toString() + "-searchOne", a = this.getCacheEntry(s, i2);
     if (a)
       return a.value;
-    let c2 = new w(this.search(t, o.searchParams, i2).then((m2) => m2.entry?.[0]?.resource));
+    let c2 = new w(this.search(t, o.searchParams, i2).then((f) => f.entry?.[0]?.resource));
     return this.setCacheEntry(s, c2), c2;
   }
   searchResources(t, n, i2) {
@@ -5055,7 +5058,7 @@ var en = class extends he {
   async *searchResourcePages(t, n, i2) {
     let o = this.fhirSearchUrl(t, n);
     for (; o; ) {
-      let s = new URL(o).searchParams, a = await this.search(t, s, i2), c2 = a.link?.find((m2) => m2.relation === "next");
+      let s = new URL(o).searchParams, a = await this.search(t, s, i2), c2 = a.link?.find((f) => f.relation === "next");
       if (!a.entry?.length && !c2)
         break;
       yield on(a), o = c2?.url ? new URL(c2.url) : void 0;
@@ -5170,7 +5173,7 @@ var en = class extends he {
   uploadwithProgress(t, n, i2, o) {
     return new Promise((s, a) => {
       let c2 = new XMLHttpRequest();
-      c2.responseType = "json", c2.onabort = () => a(new Error("Request aborted")), c2.onerror = () => a(new Error("Request error")), o && (c2.upload.onprogress = (m2) => o(m2), c2.upload.onload = (m2) => o(m2)), c2.onload = () => {
+      c2.responseType = "json", c2.onabort = () => a(new Error("Request aborted")), c2.onerror = () => a(new Error("Request error")), o && (c2.upload.onprogress = (f) => o(f), c2.upload.onload = (f) => o(f)), c2.onload = () => {
         c2.status >= 200 && c2.status < 300 ? s(c2.response) : a(new d(Oe(c2.response || c2.statusText)));
       }, c2.open("POST", t), c2.withCredentials = true, c2.setRequestHeader("Authorization", "Bearer " + this.accessToken), c2.setRequestHeader("Cache-Control", "no-cache, no-store, max-age=0"), c2.setRequestHeader("Content-Type", i2), c2.setRequestHeader("X-Medplum", "extended"), c2.send(n);
     });
@@ -5338,8 +5341,8 @@ var en = class extends he {
     let a = t.headers.get("content-type")?.includes("json");
     if (t.status === 404 && !a)
       throw new d(mr);
-    let c2 = t.headers.get("content-location"), m2 = o.redirect ?? this.options.redirect;
-    if (t.status === 201 && c2 && m2 === "follow")
+    let c2 = t.headers.get("content-location"), f = o.redirect ?? this.options.redirect;
+    if (t.status === 201 && c2 && f === "follow")
       return this.request("GET", c2, { ...o, body: void 0 });
     let p2;
     if (a)
@@ -5570,7 +5573,7 @@ function on(r4) {
   return Object.assign(e, { bundle: r4 });
 }
 var ao = [...le, "->", "<<", ">>"];
-var co = de().registerInfix("->", { precedence: f.Arrow }).registerInfix(";", { precedence: f.Semicolon });
+var co = de().registerInfix("->", { precedence: m.Arrow }).registerInfix(";", { precedence: m.Semicolon });
 var uo = [...le, "eq", "ne", "co"];
 var fo = de();
 var W = class {
@@ -5690,7 +5693,7 @@ var i = class extends EventTarget {
     super.removeEventListener(n, e, t);
   }
 };
-var m = String.fromCharCode(11);
+var m2 = String.fromCharCode(11);
 var p = String.fromCharCode(28);
 var v2 = String.fromCharCode(13);
 var d2 = class extends Event {
@@ -5726,7 +5729,7 @@ var c = class extends i {
     });
   }
   send(e) {
-    this.socket.write(m + e.toString() + p + v2);
+    this.socket.write(m2 + e.toString() + p + v2);
   }
   async sendAndWait(e) {
     let t = new Promise((o) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medplum/agent",
-  "version": "2.1.11",
+  "version": "2.1.12",
   "description": "Medplum Agent",
   "homepage": "https://www.medplum.com/",
   "repository": {