@platforma-sdk/bootstrap 3.1.6 → 3.1.7

package/dist/index.mjs

@@ -89,16 +89,16 @@ const me = {
   storage: v.string({
     description: "specify path on host to be used as storage for all Platforma Backend data"
   })
-}, yr = {
+}, pr = {
   "minio-presign-host": v.boolean({
     description: "use 'minio' host instead of 'localhost' in presign URLs"
   })
-}, ye = {
+}, pe = {
   mount: v.string({
     multiple: !0,
     description: "things to be mounted into platforma docker container. Targets will appear inside the container under the same absolute paths"
   })
-}, pe = {
+}, ye = {
   "pl-log-file": v.file({
     description: "specify path for Platforma Backend log file"
   })
@@ -222,10 +222,10 @@ function Ur(a) {
     if (r.Name === a)
       return r;
 }
-const Oe = ["Python"], pr = ["Tengo", "Python"], Gr = N.union([N.literal("Tengo"), N.literal("Python")]), Jr = N.object({
+const Oe = ["Python"], yr = ["Tengo", "Python"], Gr = N.union([N.literal("Tengo"), N.literal("Python")]), Jr = N.object({
   npmOrgName: N.string().min(1),
-  orgName: N.string().min(1),
-  blockName: N.string().min(1),
+  orgName: N.string().min(1, { message: "Organization name must be provided" }),
+  blockName: N.string().min(1, { message: "Block name must be provided" }),
   softwarePlatforms: N.array(Gr).refine((a) => new Set(a).size === a.length, {
     message: "Must be an array of unique software platforms"
   })
@@ -239,7 +239,7 @@ async function Hr(a) {
     "platforma-block-boilerplate-main",
     s
   );
-  const i = pr.filter((o) => n.indexOf(o) < 0), c = Oe.length == i.length;
+  const i = yr.filter((o) => n.indexOf(o) < 0), c = Oe.length == i.length;
   a.info(`Keep platforms '${n}', remove: '${i}'. Will remove all platforms? ${c}`);
   for (const o of i)
     await zr(s, o);
@@ -260,12 +260,16 @@ function Wr() {
   const e = Z.question('Write an organization name, e.g. "my-org": '), t = Z.question('Write a name of the block, e.g. "hello-world": '), r = Z.keyInYN("Create package for block's software?");
   let n = ["Tengo"];
   if (r)
-    for (; n.length < pr.length; ) {
-      const s = Z.keyInSelect(Oe, "Choose software platform:");
-      if (s < 0) break;
-      n.push(Oe[s]);
+    for (; n.length < yr.length; ) {
+      const i = Z.keyInSelect(Oe, "Choose software platform:");
+      if (i < 0) break;
+      n.push(Oe[i]);
     }
-  return n = Array.from(new Set(n)).sort(), Jr.parse({ npmOrgName: a, orgName: e, blockName: t, softwarePlatforms: n });
+  n = Array.from(new Set(n)).sort();
+  const s = Jr.safeParse({ npmOrgName: a, orgName: e, blockName: t, softwarePlatforms: n });
+  if (!s.success && s.error.issues.length)
+    throw new Error(s.error.issues.map((i) => i.message).join("; "));
+  return s.data;
 }
 async function qr(a, e, t) {
   const n = await (await fetch(a)).blob(), s = await _.mkdtemp(m.join(F.tmpdir(), "create-repo")), i = m.join(s, "packed-repo.zip"), c = Rr.toWeb(Lr(i));
@@ -605,15 +609,15 @@ function X(a, e, t) {
   }
 }
 function et(a, e) {
-  var w, y, P, S, k, p, $, le, Ge, Je, He, We, qe, ze, Ye, Ve, Ke, Qe, Xe, Ze, er, rr, tr, ar, nr, sr, ir, cr, or, lr;
+  var w, p, P, S, k, y, $, le, Ge, Je, He, We, qe, ze, Ye, Ve, Ke, Qe, Xe, Ze, er, rr, tr, ar, nr, sr, ir, cr, or, lr;
   const t = (e == null ? void 0 : e.localRoot) ?? u.instanceDir("default"), r = {
     level: ((w = e == null ? void 0 : e.log) == null ? void 0 : w.level) ?? "info",
-    path: ((y = e == null ? void 0 : e.log) == null ? void 0 : y.path) ?? `${t}/logs/platforma.log`
+    path: ((p = e == null ? void 0 : e.log) == null ? void 0 : p.path) ?? `${t}/logs/platforma.log`
   }, n = {
     listen: ((P = e == null ? void 0 : e.grpc) == null ? void 0 : P.listen) ?? "localhost:6345",
     tls: {
       enable: de((k = (S = e == null ? void 0 : e.grpc) == null ? void 0 : S.tls) == null ? void 0 : k.enable, !1),
-      clientAuthMode: (($ = (p = e == null ? void 0 : e.grpc) == null ? void 0 : p.tls) == null ? void 0 : $.clientAuthMode) ?? "NoAuth",
+      clientAuthMode: (($ = (y = e == null ? void 0 : e.grpc) == null ? void 0 : y.tls) == null ? void 0 : $.clientAuthMode) ?? "NoAuth",
       certFile: ((Ge = (le = e == null ? void 0 : e.grpc) == null ? void 0 : le.tls) == null ? void 0 : Ge.certFile) ?? `${t}/certs/tls.cert`,
       keyFile: ((He = (Je = e == null ? void 0 : e.grpc) == null ? void 0 : Je.tls) == null ? void 0 : He.keyFile) ?? `${t}/certs/tls.key`,
       ...(We = e == null ? void 0 : e.grpc) == null ? void 0 : We.tls
@@ -809,24 +813,24 @@ function st(a, e) {
   return new Promise((o, d) => {
     c.on("response", (g) => {
       if (!g.statusCode) {
-        const y = new Error("failed to download archive: no HTTP status code in response from server");
-        c.destroy(), d(y);
+        const p = new Error("failed to download archive: no HTTP status code in response from server");
+        c.destroy(), d(p);
         return;
       }
       if (g.statusCode !== 200) {
-        const y = new Error(`failed to download archive: ${g.statusCode} ${g.statusMessage}`);
-        c.destroy(), d(y);
+        const p = new Error(`failed to download archive: ${g.statusCode} ${g.statusMessage}`);
+        c.destroy(), d(p);
         return;
       }
       const h = parseInt(g.headers["content-length"] || "0", 10);
       let b = 0;
       const w = f.createWriteStream(i);
-      g.pipe(w), g.on("data", (y) => {
-        b += y.length;
+      g.pipe(w), g.on("data", (p) => {
+        b += p.length;
         const P = b / h * 100;
         r && process.stdout.write(`  downloading: ${P.toFixed(2)}%\r`);
-      }), g.on("error", (y) => {
-        f.unlinkSync(i), a.error(`Failed to download Platforma Binary: ${y.message}`), c.destroy(), d(y);
+      }), g.on("error", (p) => {
+        f.unlinkSync(i), a.error(`Failed to download Platforma Binary: ${p.message}`), c.destroy(), d(p);
       }), w.on("finish", () => {
         w.close(), a.info("  ... download done."), c.destroy(), o(i);
       });
@@ -917,7 +921,7 @@ ${r}`);
     return this.startInstance(e);
   }
   createLocal(e, t) {
-    var o, d, g, h, b, w, y, P, S, k;
+    var o, d, g, h, b, w, p, P, S, k;
     const r = (t == null ? void 0 : t.binaryPath) ?? ct(t == null ? void 0 : t.version, "binaries", "platforma");
     let n = t == null ? void 0 : t.configPath;
     const s = (t == null ? void 0 : t.workdir) ?? (n ? process.cwd() : u.instanceDir(e));
@@ -935,17 +939,17 @@ ${r}`);
       }
     });
     const i = et(this.getLastJwt(), t == null ? void 0 : t.configOptions);
-    this.logger.debug("  checking license..."), this.checkLicense((P = (y = t == null ? void 0 : t.configOptions) == null ? void 0 : y.license) == null ? void 0 : P.value, (k = (S = t == null ? void 0 : t.configOptions) == null ? void 0 : S.license) == null ? void 0 : k.file);
+    this.logger.debug("  checking license..."), this.checkLicense((P = (p = t == null ? void 0 : t.configOptions) == null ? void 0 : p.license) == null ? void 0 : P.value, (k = (S = t == null ? void 0 : t.configOptions) == null ? void 0 : S.license) == null ? void 0 : k.file);
     const c = [
       `${i.localRoot}/packages`,
       `${i.localRoot}/packages-local`,
       `${i.localRoot}/blocks-local`
     ];
     i.storages.primary.type === "FS" && c.push(i.storages.primary.rootPath), i.storages.library.type === "FS" && (c.push(i.storages.library.rootPath), i.hacks.libraryDownloadable = !1), i.storages.work.type === "FS" && c.push(i.storages.work.rootPath), this.logger.debug("  creating pl state directories...");
-    for (const p of c)
-      f.existsSync(p) || (this.logger.debug(`    '${p}'`), f.mkdirSync(p, { recursive: !0 }));
-    for (const p of i.core.auth.drivers)
-      p.driver === "htpasswd" && (f.existsSync(p.path) || (this.logger.debug(`  installing default 'users.htpasswd' to ${p.path}...`), f.copyFileSync(Q("users.htpasswd"), p.path)));
+    for (const y of c)
+      f.existsSync(y) || (this.logger.debug(`    '${y}'`), f.mkdirSync(y, { recursive: !0 }));
+    for (const y of i.core.auth.drivers)
+      y.driver === "htpasswd" && (f.existsSync(y.path) || (this.logger.debug(`  installing default 'users.htpasswd' to ${y.path}...`), f.copyFileSync(Q("users.htpasswd"), y.path)));
     return n || (n = m.join(i.localRoot, "config.yaml"), this.logger.debug(`  rendering configuration '${n}'...`), f.writeFileSync(n, rt(i))), u.setInstanceInfo(e, {
       type: "process",
       upCommands: [
@@ -1054,8 +1058,8 @@ ${r}`);
     this.logger.debug("creating platforma instance in 'docker s3' mode...");
     const n = Q("compose-backend.yaml"), s = (r == null ? void 0 : r.image) ?? gr(r == null ? void 0 : r.version);
     this.checkLicense(r == null ? void 0 : r.license, r == null ? void 0 : r.licenseFile);
-    const i = (...p) => m.join(t, ...p), c = (p) => {
-      const $ = i(p);
+    const i = (...y) => m.join(t, ...y), c = (y) => {
+      const $ = i(y);
       return Se($, { mode: "0775" }), $;
     }, o = i("logs", "platforma.log");
     f.existsSync(o) || (f.mkdirSync(m.dirname(o), { recursive: !0 }), f.writeFileSync(o, ""));
@@ -1067,15 +1071,15 @@ ${r}`);
     if (h.type !== "S3")
       throw new Error(`${h.type} storage type is not supported for library storage`);
     h.presignEndpoint = `http://${d}:9000`;
-    const b = c("db"), w = c("work"), y = i("users.htpasswd");
-    f.existsSync(y) || f.copyFileSync(Q("users.htpasswd"), y);
+    const b = c("db"), w = c("work"), p = i("users.htpasswd");
+    f.existsSync(p) || f.copyFileSync(Q("users.htpasswd"), p);
     const P = i("compose.yaml");
     f.existsSync(P) && this.logger.info(`replacing docker compose file ${P}`);
     const S = [];
-    for (const p of (r == null ? void 0 : r.customMounts) ?? [])
+    for (const y of (r == null ? void 0 : r.customMounts) ?? [])
       S.push({
-        hostPath: p.hostPath,
-        containerPath: p.containerPath ?? p.hostPath
+        hostPath: y.hostPath,
+        containerPath: y.containerPath ?? y.hostPath
       });
     Ae(n, P, `pl-${e}`, /* @__PURE__ */ new Map([
       ["minio", {}],
@@ -1088,7 +1092,7 @@ ${r}`);
       MINIO_IMAGE: "quay.io/minio/minio",
       MINIO_STORAGE: c("minio"),
       PL_IMAGE: s,
-      PL_AUTH_HTPASSWD_PATH: y,
+      PL_AUTH_HTPASSWD_PATH: p,
       PL_LICENSE: r == null ? void 0 : r.license,
       PL_LICENSE_FILE: r == null ? void 0 : r.licenseFile,
       PL_LOG_LEVEL: (r == null ? void 0 : r.logLevel) ?? "info",
@@ -1105,8 +1109,8 @@ ${r}`);
       ...this.configureDockerStorage("library", h)
     };
     if (r != null && r.grpcAddr && (k.PL_GRPC_ADDR = r.grpcAddr), r != null && r.grpcPort && (k.PL_GRPC_PORT = r.grpcPort.toString()), r != null && r.monitoringAddr && (k.PL_MONITORING_ADDR = r.monitoringAddr), r != null && r.monitoringPort && (k.PL_MONITORING_PORT = r.monitoringPort.toString()), r != null && r.debugAddr && (k.PL_DEBUG_ADDR = r.debugAddr), r != null && r.debugPort && (k.PL_DEBUG_PORT = r.debugPort.toString()), r != null && r.auth && (r.auth.enabled && (k.PL_AUTH_ENABLED = "true"), r.auth.drivers)) {
-      for (const p of r.auth.drivers)
-        p.driver === "htpasswd" && (k.PL_AUTH_HTPASSWD_PATH = m.resolve(p.path), p.path = "/etc/platforma/users.htpasswd");
+      for (const y of r.auth.drivers)
+        y.driver === "htpasswd" && (k.PL_AUTH_HTPASSWD_PATH = m.resolve(y.path), y.path = "/etc/platforma/users.htpasswd");
       k.PL_AUTH_DRIVERS = JSON.stringify(r.auth.drivers);
     }
     return u.setInstanceInfo(e, {
@@ -1151,21 +1155,21 @@ ${r}`);
     f.existsSync(o) || (f.mkdirSync(m.dirname(o), { recursive: !0 }), f.writeFileSync(o, ""));
     const d = c("db"), g = c("primary"), h = c("library"), b = c("work"), w = i("users.htpasswd");
     f.existsSync(w) || f.copyFileSync(Q("users.htpasswd"), w);
-    const y = i("compose.yaml");
-    f.existsSync(y) && this.logger.info(`replacing docker compose file ${y}`);
+    const p = i("compose.yaml");
+    f.existsSync(p) && this.logger.info(`replacing docker compose file ${p}`);
     const P = [];
     for (const $ of (r == null ? void 0 : r.customMounts) ?? [])
       P.push({
         hostPath: $.hostPath,
         containerPath: $.containerPath ?? $.hostPath
       });
-    this.logger.debug(`Rendering docker compose file '${y}' using '${n}' as base template`), Ae(n, y, `pl-${e}`, /* @__PURE__ */ new Map([
+    this.logger.debug(`Rendering docker compose file '${p}' using '${n}' as base template`), Ae(n, p, `pl-${e}`, /* @__PURE__ */ new Map([
       ["backend", {
         platform: r == null ? void 0 : r.platformOverride,
         mounts: P
       }]
     ]));
-    const S = X((r == null ? void 0 : r.primaryStorageURL) ?? `file:${g}`, "."), k = X((r == null ? void 0 : r.libraryStorageURL) ?? `file:${h}`, "."), p = {
+    const S = X((r == null ? void 0 : r.primaryStorageURL) ?? `file:${g}`, "."), k = X((r == null ? void 0 : r.libraryStorageURL) ?? `file:${h}`, "."), y = {
       PL_IMAGE: s,
       PL_AUTH_HTPASSWD_PATH: w,
       PL_LICENSE: r == null ? void 0 : r.license,
@@ -1182,29 +1186,29 @@ ${r}`);
       ...this.configureDockerStorage("primary", S),
       ...this.configureDockerStorage("library", k)
     };
-    if (r != null && r.grpcAddr && (p.PL_GRPC_ADDR = r.grpcAddr), r != null && r.grpcPort && (p.PL_GRPC_PORT = r.grpcPort.toString()), r != null && r.monitoringAddr && (p.PL_MONITORING_ADDR = r.monitoringAddr), r != null && r.monitoringPort && (p.PL_MONITORING_PORT = r.monitoringPort.toString()), r != null && r.debugAddr && (p.PL_DEBUG_ADDR = r.debugAddr), r != null && r.debugPort && (p.PL_DEBUG_PORT = r.debugPort.toString()), r != null && r.auth && (r.auth.enabled && (p.PL_AUTH_ENABLED = "true"), r.auth.drivers)) {
+    if (r != null && r.grpcAddr && (y.PL_GRPC_ADDR = r.grpcAddr), r != null && r.grpcPort && (y.PL_GRPC_PORT = r.grpcPort.toString()), r != null && r.monitoringAddr && (y.PL_MONITORING_ADDR = r.monitoringAddr), r != null && r.monitoringPort && (y.PL_MONITORING_PORT = r.monitoringPort.toString()), r != null && r.debugAddr && (y.PL_DEBUG_ADDR = r.debugAddr), r != null && r.debugPort && (y.PL_DEBUG_PORT = r.debugPort.toString()), r != null && r.auth && (r.auth.enabled && (y.PL_AUTH_ENABLED = "true"), r.auth.drivers)) {
       for (const $ of r.auth.drivers)
-        $.driver === "htpasswd" && (p.PL_AUTH_HTPASSWD_PATH = m.resolve($.path), $.path = "/etc/platforma/users.htpasswd");
-      p.PL_AUTH_DRIVERS = JSON.stringify(r.auth.drivers);
+        $.driver === "htpasswd" && (y.PL_AUTH_HTPASSWD_PATH = m.resolve($.path), $.path = "/etc/platforma/users.htpasswd");
+      y.PL_AUTH_DRIVERS = JSON.stringify(r.auth.drivers);
     }
     return u.setInstanceInfo(e, {
       type: "docker",
       upCommands: [{
         cmd: "docker",
-        args: ["compose", `--file=${y}`, "up", "--detach", "--remove-orphans", "--pull=missing"],
-        envs: p,
+        args: ["compose", `--file=${p}`, "up", "--detach", "--remove-orphans", "--pull=missing"],
+        envs: y,
         runOpts: { stdio: "inherit" }
       }],
       downCommands: [{
         cmd: "docker",
-        args: ["compose", `--file=${y}`, "down"],
-        envs: p,
+        args: ["compose", `--file=${p}`, "down"],
+        envs: y,
         runOpts: { stdio: "inherit" }
       }],
       cleanupCommands: [{
         cmd: "docker",
-        args: ["compose", `--file=${y}`, "down", "--volumes", "--remove-orphans"],
-        envs: p,
+        args: ["compose", `--file=${p}`, "down", "--volumes", "--remove-orphans"],
+        envs: y,
         runOpts: { stdio: "inherit" }
       }],
       runInfo: {
@@ -1434,7 +1438,7 @@ let lt = (E = class extends L {
   ...he,
   ...U,
   ...M,
-  ...ye,
+  ...pe,
   ...B,
   ...ce,
   ...ie,
@@ -1454,7 +1458,7 @@ let dt = (T = class extends L {
     e["monitoring-listen"] ? b = e["monitoring-listen"] : e["monitoring-port"] && (b = `127.0.0.1:${e["monitoring-port"]}`);
     let w = "127.0.0.1:9091";
     e["debug-listen"] ? w = e["debug-listen"] : e["debug-port"] && (w = `127.0.0.1:${e["debug-port"]}`);
-    const y = {
+    const p = {
       binaryPath: g,
       version: e.version,
       configPath: e.config,
@@ -1473,8 +1477,8 @@ let dt = (T = class extends L {
           work: { type: "FS", rootPath: e["storage-work"] }
         }
       }
-    }, P = r.createLocal(n, y);
-    y.binaryPath ? r.switchInstance(P) : ke(t, { version: e.version }).then(() => {
+    }, P = r.createLocal(n, p);
+    p.binaryPath ? r.switchInstance(P) : ke(t, { version: e.version }).then(() => {
       const S = r.switchInstance(P);
       setTimeout(() => {
         for (const k of S)
@@ -1496,7 +1500,7 @@ let dt = (T = class extends L {
   ...ce,
   ...ie,
   ...oe,
-  ...pe,
+  ...ye,
   ...be,
   ...U
 }), T);
@@ -1595,9 +1599,9 @@ let gt = (x = class extends L {
   ...he,
   ...U,
   ...M,
-  ...ye,
+  ...pe,
   ...B,
-  ...yr
+  ...pr
 }), x);
 var D;
 let ut = (D = class extends L {
@@ -1613,7 +1617,7 @@ let ut = (D = class extends L {
     e["monitoring-listen"] ? b = e["monitoring-listen"] : e["monitoring-port"] && (b = `127.0.0.1:${e["monitoring-port"]}`);
     let w = "127.0.0.1:9091";
     e["debug-listen"] ? w = e["debug-listen"] : e["debug-port"] && (w = `127.0.0.1:${e["debug-port"]}`);
-    const y = {
+    const p = {
       binaryPath: g,
       version: e.version,
       configPath: e.config,
@@ -1636,8 +1640,8 @@ let ut = (D = class extends L {
           work: { type: "FS", rootPath: e["storage-work"] }
         }
       }
-    }, P = r.createLocalS3(n, y);
-    y.binaryPath ? r.switchInstance(P) : ke(t, { version: e.version }).then(() => {
+    }, P = r.createLocalS3(n, p);
+    p.binaryPath ? r.switchInstance(P) : ke(t, { version: e.version }).then(() => {
       const S = r.switchInstance(P);
       setTimeout(() => {
         for (const k of S)
@@ -1660,7 +1664,7 @@ let ut = (D = class extends L {
   ...ce,
   ...ie,
   ...oe,
-  ...pe,
+  ...ye,
   ...be,
   ...U
 }), D);
@@ -1703,7 +1707,7 @@ l(z, "description", "Run Platforma Backend service as docker container on curren
   ...he,
   ...U,
   ...M,
-  ...ye,
+  ...pe,
   ...B,
   ...ce,
   ...ie,
@@ -1724,8 +1728,8 @@ let ft = (R = class extends L {
     e["grpc-listen"] ? b = e["grpc-listen"] : e["grpc-port"] && (b = `127.0.0.1:${e["grpc-port"]}`);
     let w = "127.0.0.1:9090";
     e["monitoring-listen"] ? w = e["monitoring-listen"] : e["monitoring-port"] && (w = `127.0.0.1:${e["monitoring-port"]}`);
-    let y = "127.0.0.1:9091";
-    e["debug-listen"] ? y = e["debug-listen"] : e["debug-port"] && (y = `127.0.0.1:${e["debug-port"]}`);
+    let p = "127.0.0.1:9091";
+    e["debug-listen"] ? p = e["debug-listen"] : e["debug-port"] && (p = `127.0.0.1:${e["debug-port"]}`);
     const P = {
       binaryPath: h,
       version: e.version,
@@ -1736,7 +1740,7 @@ let ft = (R = class extends L {
       configOptions: {
         grpc: { listen: b },
         monitoring: { listen: w },
-        debug: { listen: y },
+        debug: { listen: p },
         license: { value: e.license, file: e["license-file"] },
         log: { path: o },
         localRoot: c,
@@ -1766,7 +1770,7 @@ let ft = (R = class extends L {
   ...ce,
   ...ie,
   ...oe,
-  ...pe,
+  ...ye,
   ...be,
   ...U
 }), l(R, "args", {
@@ -1809,9 +1813,9 @@ l(Y, "description", "Run Platforma Backend service as docker container on curren
   ...he,
   ...U,
   ...M,
-  ...ye,
+  ...pe,
   ...B,
-  ...yr
+  ...pr
 }), l(Y, "args", {
   name: K.string({ required: !0 })
 });
@@ -1827,8 +1831,8 @@ const V = class V extends L {
     e["grpc-listen"] ? b = e["grpc-listen"] : e["grpc-port"] && (b = `127.0.0.1:${e["grpc-port"]}`);
     let w = "127.0.0.1:9090";
     e["monitoring-listen"] ? w = e["monitoring-listen"] : e["monitoring-port"] && (w = `127.0.0.1:${e["monitoring-port"]}`);
-    let y = "127.0.0.1:9091";
-    e["debug-listen"] ? y = e["debug-listen"] : e["debug-port"] && (y = `127.0.0.1:${e["debug-port"]}`);
+    let p = "127.0.0.1:9091";
+    e["debug-listen"] ? p = e["debug-listen"] : e["debug-port"] && (p = `127.0.0.1:${e["debug-port"]}`);
     const P = {
       binaryPath: h,
       version: e.version,
@@ -1841,7 +1845,7 @@ const V = class V extends L {
       configOptions: {
         grpc: { listen: b },
         monitoring: { listen: w },
-        debug: { listen: y },
+        debug: { listen: p },
         license: { value: e.license, file: e["license-file"] },
         log: { path: o },
         localRoot: c,
@@ -1873,7 +1877,7 @@ l(V, "description", "Run Platforma Backend service as local process on current h
   ...ce,
   ...ie,
   ...oe,
-  ...pe,
+  ...ye,
   ...be,
   ...U
 }), l(V, "args", {