@gql.tada/cli-utils 1.0.2 → 1.0.3-canary-9338d994bfb4e9a55eed9e2a06fc2a694b04c6ae

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @gql.tada/cli-utils
 
+## 1.0.3-canary-9338d994bfb4e9a55eed9e2a06fc2a694b04c6ae
+
+### Patch Changes
+
+- Add missing argument to `generate-output` command to force output the `.ts` format instead
+  Submitted by [@kitten](https://github.com/kitten) (See [#227](https://github.com/0no-co/gql.tada/pull/227))
+- ⚠️ Fix `generate-output` command outputting the `.d.ts` format when `.ts` extension was specified instead
+  Submitted by [@llllvvuu](https://github.com/llllvvuu) (See [#225](https://github.com/0no-co/gql.tada/pull/225))
+
 ## 1.0.2
 
 ### Patch Changes

package/dist/gql-tada-cli.d.ts

@@ -1,4 +1,5 @@
 interface Options$3 {
+  forceTSFormat?: boolean;
   disablePreprocessing: boolean;
   output: string | undefined;
   tsconfig: string | undefined;

package/dist/gql-tada-cli.js

@@ -30,9 +30,9 @@ var p = require("node:url");
 
 var h = require("node:os");
 
-var g = require("node:fs");
+var m = require("node:fs");
 
-var m = require("node:timers/promises");
+var g = require("node:timers/promises");
 
 var E = require("stream");
 
@@ -383,13 +383,13 @@ function runMachineInternal(e, t, r = !1) {
       var h = Object.prototype.hasOwnProperty.call(p.statics, s);
       if (!r || a < i.length - 1 || h) {
         if (h) {
-          var g = p.statics[s];
-          for (var {to: m, reducer: E} of g) {
+          var m = p.statics[s];
+          for (var {to: g, reducer: E} of m) {
             l.push({
-              node: m,
+              node: g,
               state: void 0 !== E ? execute(Q, E, f, s, c) : f
             });
-            debug(`      Static transition to ${m} found`);
+            debug(`      Static transition to ${g} found`);
           }
         } else {
           debug("      No static transition found");
@@ -1054,21 +1054,21 @@ class CommandBuilder {
         registerStatic(e, D, O.EndOfPartialInput, k.SuccessNode, [ "setSelectedIndex", this.cliIndex ]);
       }
       var h = D;
-      for (var g = 0; g < this.arity.leading.length; ++g) {
-        var m = injectNode(e, {
+      for (var m = 0; m < this.arity.leading.length; ++m) {
+        var g = injectNode(e, {
           dynamics: [],
           shortcuts: [],
           statics: {}
         });
-        if (!this.arity.proxy || g + 1 !== this.arity.leading.length) {
-          this.registerOptions(e, m);
+        if (!this.arity.proxy || m + 1 !== this.arity.leading.length) {
+          this.registerOptions(e, g);
         }
-        if (this.arity.trailing.length > 0 || g + 1 !== this.arity.leading.length) {
-          registerStatic(e, m, O.EndOfInput, k.ErrorNode, [ "setError", "Not enough positional arguments" ]);
-          registerStatic(e, m, O.EndOfPartialInput, k.SuccessNode, [ "setSelectedIndex", this.cliIndex ]);
+        if (this.arity.trailing.length > 0 || m + 1 !== this.arity.leading.length) {
+          registerStatic(e, g, O.EndOfInput, k.ErrorNode, [ "setError", "Not enough positional arguments" ]);
+          registerStatic(e, g, O.EndOfPartialInput, k.SuccessNode, [ "setSelectedIndex", this.cliIndex ]);
         }
-        registerDynamic(e, h, "isNotOptionLike", m, "pushPositional");
-        h = m;
+        registerDynamic(e, h, "isNotOptionLike", g, "pushPositional");
+        h = g;
       }
       var E = h;
       if (this.arity.extra === ee || this.arity.extra.length > 0) {
@@ -1261,8 +1261,8 @@ class CliBuilder {
                 h.push(e);
               }
             };
-            for (var g of p) {
-              _loop(g);
+            for (var m of p) {
+              _loop(m);
             }
           }
           var _loop2 = function(e, t) {
@@ -1270,8 +1270,8 @@ class CliBuilder {
               n.dynamics.push([ e, t ]);
             }
           };
-          for (var [m, E] of d.dynamics) {
-            _loop2(m, E);
+          for (var [g, E] of d.dynamics) {
+            _loop2(g, E);
           }
           for (var w of d.shortcuts) {
             if (!c.has(w.to)) {
@@ -1421,8 +1421,8 @@ class Cli {
       p.tokens = D.tokens;
       p.path = D.path;
       try {
-        for (var [h, {transformer: g}] of f.specs.entries()) {
-          p[h] = g(f.builder, h, D, c);
+        for (var [h, {transformer: m}] of f.specs.entries()) {
+          p[h] = m(f.builder, h, D, c);
         }
         return p;
       } catch (e) {
@@ -1574,16 +1574,16 @@ class Cli {
         if (void 0 === p.usage) {
           continue;
         }
-        var g = void 0 !== p.usage.category ? formatMarkdownish(p.usage.category, {
+        var m = void 0 !== p.usage.category ? formatMarkdownish(p.usage.category, {
           format: this.format(t),
           paragraphs: !1
         }) : null;
-        var m = f.get(g);
-        if (void 0 === m) {
-          f.set(g, m = []);
+        var g = f.get(m);
+        if (void 0 === g) {
+          f.set(m, g = []);
         }
         var {usage: E} = this.getUsageByIndex(h);
-        m.push({
+        g.push({
           commandClass: p,
           usage: E
         });
@@ -2666,9 +2666,9 @@ var ve = function(e) {
   return e;
 }({});
 
-var ge = [ "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏" ];
+var me = [ "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏" ];
 
-var me = [ "◐", "◓", "◑", "◒" ];
+var ge = [ "◐", "◓", "◑", "◒" ];
 
 var Ce = !!process.env.GITHUB_ACTIONS;
 
@@ -2837,7 +2837,8 @@ function initTTY(e = {}) {
 
 function indent(e, t) {
   if (e.includes("\n")) {
-    return e.split("\n").join(text([ pe.Newline, t ]));
+    var r = e.trim().split("\n").join(text([ pe.Newline, t ]));
+    return e.endsWith("\n") ? r + "\n" : r;
   } else {
     return e;
   }
@@ -2933,36 +2934,44 @@ async function* run$6(e, r) {
     throw externalError("Failed to load introspection.", e);
   }
   var D;
-  try {
-    D = t.outputIntrospectionFile(t.minifyIntrospection(s), {
-      fileType: i.tadaOutputLocation || ".d.ts",
-      shouldPreprocess: !r.disablePreprocessing
-    });
-  } catch (e) {
-    throw externalError("Could not generate introspection output", e);
-  }
-  var c;
   if (!r.output && e.pipeTo) {
-    c = e.pipeTo;
+    D = e.pipeTo;
   } else if (r.output) {
-    c = b.resolve(process.cwd(), r.output);
+    D = b.resolve(process.cwd(), r.output);
   } else if (i.tadaOutputLocation) {
-    c = b.resolve(b.dirname(n.configPath), i.tadaOutputLocation);
+    D = b.resolve(b.dirname(n.configPath), i.tadaOutputLocation);
   } else {
     throw errorMessage$1("No output path was specified to write the output file to.\n" + hint(`You have to either set ${code('"tadaOutputLocation"')} in your configuration,\npass an ${code("--output")} argument to this command,\nor pipe this command to an output file.`));
   }
+  var c;
+  try {
+    c = t.outputIntrospectionFile(t.minifyIntrospection(s), {
+      fileType: D && "string" == typeof D ? D : r.forceTSFormat ? ".ts" : ".d.ts",
+      shouldPreprocess: !r.disablePreprocessing
+    });
+  } catch (e) {
+    throw externalError("Could not generate introspection output", e);
+  }
   try {
-    await writeOutput(c, D);
+    await writeOutput(D, c);
   } catch (e) {
     throw externalError("Something went wrong while writing the introspection file", e);
   }
-  yield function summary$1() {
-    return text([ cmd(ae.Style, le.BrightGreen), `${ve.Tick} Introspection output was generated successfully\n` ]);
-  }();
+  yield function summary$1(e) {
+    var t = text([ cmd(ae.Style, le.BrightGreen), `${ve.Tick} Introspection output was generated successfully\n` ]);
+    if (e) {
+      t += hint(`The pipe output was generated in the ${code(".d.ts")} format.\nFor the ${code(".ts")} format, pass the ${code("--force-ts-format")} argument.\n`);
+    }
+    return t;
+  }(!r.forceTSFormat && "string" != typeof D);
 }
 
 class GenerateOutputCommand extends Command {
   static paths=[ [ "generate-output" ], [ "generate", "output" ] ];
+  forceTSFormat=Boolean$1("--force-ts-format", !1, {
+    description: "Forces the `.ts` output format when the output is piped",
+    hidden: !0
+  });
   disablePreprocessing=Boolean$1("--disable-preprocessing", !1, {
     description: "Disables pre-processing, which is an internal introspection format generated ahead of time"
   });
@@ -2975,6 +2984,7 @@ class GenerateOutputCommand extends Command {
   async execute() {
     var e = initTTY();
     var t = await e.start(run$6(e, {
+      forceTSFormat: this.forceTSFormat,
       disablePreprocessing: this.disablePreprocessing,
       output: this.output,
       tsconfig: this.tsconfig
@@ -3015,7 +3025,7 @@ function warningGithub$1(e) {
 
 function runningPersisted(e, t) {
   var r = e ? t ? `(${e}/${t})` : `(${e})` : "";
-  return pipe(interval(150), map((e => text([ cmd(ae.Style, le.Magenta), ge[e % ge.length], " ", cmd(ae.Style, le.Foreground), `Scanning files${pe.Ellipsis} `, cmd(ae.Style, le.BrightBlack), r ]))));
+  return pipe(interval(150), map((e => text([ cmd(ae.Style, le.Magenta), me[e % me.length], " ", cmd(ae.Style, le.Foreground), `Scanning files${pe.Ellipsis} `, cmd(ae.Style, le.BrightBlack), r ]))));
 }
 
 async function* run$5(e, r) {
@@ -3061,9 +3071,9 @@ async function* run$5(e, r) {
       D = Object.assign(D, p.documents);
       if (l += p.warnings.length) {
         var h = warningFile$1(p.filePath);
-        for (var g of p.warnings) {
-          h += (m = g, text([ Ee, cmd(ae.Style, le.BrightBlack), `${m.line}:${m.col}`, pe.Tab, cmd(ae.Style, le.Foreground), indent(m.message.trim(), text([ Ee, pe.Tab ])), pe.Newline ]));
-          warningGithub$1(g);
+        for (var m of p.warnings) {
+          h += (g = m, text([ Ee, cmd(ae.Style, le.BrightBlack), `${g.line}:${g.col}`, pe.Tab, cmd(ae.Style, le.Foreground), indent(g.message.trim(), text([ Ee, pe.Tab ])), pe.Newline ]));
+          warningGithub$1(m);
         }
         yield h + "\n";
       }
@@ -3074,7 +3084,7 @@ async function* run$5(e, r) {
   } catch (e) {
     throw externalError("Could not generate persisted manifest file", e);
   }
-  var m;
+  var g;
   var E = Object.keys(D).length;
   if (l && r.failOnWarn) {
     throw function warningSummary$1(e, t) {
@@ -3614,7 +3624,7 @@ function warningGithub(e) {
 
 function runningTurbo(e, t) {
   var r = e ? t ? `(${e}/${t})` : `(${e})` : "";
-  return pipe(interval(150), map((e => text([ cmd(ae.Style, le.Magenta), ge[e % ge.length], " ", cmd(ae.Style, le.Foreground), `Scanning files${pe.Ellipsis} `, cmd(ae.Style, le.BrightBlack), r ]))));
+  return pipe(interval(150), map((e => text([ cmd(ae.Style, le.Magenta), me[e % me.length], " ", cmd(ae.Style, le.Foreground), `Scanning files${pe.Ellipsis} `, cmd(ae.Style, le.BrightBlack), r ]))));
 }
 
 var $e = [ "/* eslint-disable */", "/* prettier-ignore */" ].join("\n") + "\n";
@@ -3668,9 +3678,9 @@ async function* run$3(e, r) {
       l += p.warnings.length;
       if (p.warnings.length) {
         var h = warningFile(p.filePath);
-        for (var g of p.warnings) {
-          h += (m = g, text([ xe, cmd(ae.Style, le.BrightBlack), `${m.line}:${m.col}`, pe.Tab, cmd(ae.Style, le.Foreground), indent(m.message.trim(), text([ xe, pe.Tab ])), pe.Newline ]));
-          warningGithub(g);
+        for (var m of p.warnings) {
+          h += (g = m, text([ xe, cmd(ae.Style, le.BrightBlack), `${g.line}:${g.col}`, pe.Tab, cmd(ae.Style, le.Foreground), indent(g.message.trim(), text([ xe, pe.Tab ])), pe.Newline ]));
+          warningGithub(m);
         }
         yield h + "\n";
       }
@@ -3681,7 +3691,7 @@ async function* run$3(e, r) {
   } catch (e) {
     throw externalError("Could not build cache", e);
   }
-  var m;
+  var g;
   var E = Object.keys(D).length;
   if (l && r.failOnWarn) {
     throw function warningSummary(e, t) {
@@ -3794,7 +3804,7 @@ function diagnosticMessageGithub(e) {
 
 function runningDiagnostics(e, t) {
   var r = e ? t ? `(${e}/${t})` : `(${e})` : "";
-  return pipe(interval(150), map((e => text([ cmd(ae.Style, le.Magenta), ge[e % ge.length], " ", cmd(ae.Style, le.Foreground), `Checking files${pe.Ellipsis} `, cmd(ae.Style, le.BrightBlack), r ]))));
+  return pipe(interval(150), map((e => text([ cmd(ae.Style, le.Magenta), me[e % me.length], " ", cmd(ae.Style, le.Foreground), `Checking files${pe.Ellipsis} `, cmd(ae.Style, le.BrightBlack), r ]))));
 }
 
 var isMinSeverity = (e, t) => {
@@ -3928,7 +3938,7 @@ function failedTask(e) {
 }
 
 function runningTask(e) {
-  return pipe(interval(150), map((t => text([ emptyLine(), cmd(ae.Style, le.Magenta), me[t % me.length], " ", cmd(ae.Style, le.Foreground), e.trim() ]))));
+  return pipe(interval(150), map((t => text([ emptyLine(), cmd(ae.Style, le.Magenta), ge[t % ge.length], " ", cmd(ae.Style, le.Foreground), e.trim() ]))));
 }
 
 function errorMessage(e) {
@@ -4450,20 +4460,20 @@ var Ke = function tD() {
     return r === t.length ? e : t.slice(0, r).join(" ") + t.slice(r).join("");
   })(e))));
   var p = [ ...D.join("\n") ];
-  for (var [h, g] of p.entries()) {
-    if (a += g, Ye.has(g)) {
-      var {groups: m} = new RegExp(`(?:\\[(?<code>\\d+)m|\\${ze}(?<uri>.*))`).exec(p.slice(h).join("")) || {
+  for (var [h, m] of p.entries()) {
+    if (a += m, Ye.has(m)) {
+      var {groups: g} = new RegExp(`(?:\\[(?<code>\\d+)m|\\${ze}(?<uri>.*))`).exec(p.slice(h).join("")) || {
         groups: {}
       };
-      if (void 0 !== m.code) {
-        var E = Number.parseFloat(m.code);
+      if (void 0 !== g.code) {
+        var E = Number.parseFloat(g.code);
         n = 39 === E ? void 0 : E;
       } else {
-        void 0 !== m.uri && (i = 0 === m.uri.length ? void 0 : m.uri);
+        void 0 !== g.uri && (i = 0 === g.uri.length ? void 0 : g.uri);
       }
     }
     var w = Ke.codes.get(Number(n));
-    "\n" === p[h + 1] ? (i && (a += L("")), n && w && (a += N(w))) : "\n" === g && (n && w && (a += N(n)), 
+    "\n" === p[h + 1] ? (i && (a += L("")), n && w && (a += N(w))) : "\n" === m && (n && w && (a += N(n)), 
     i && (a += L(i)));
   }
   return a;
@@ -4737,16 +4747,16 @@ var ht;
 
 var vt;
 
-var gt;
-
 var mt;
 
+var gt;
+
 if ("win32" === process.platform || global.TESTING_WINDOWS) {
-  mt = function requireWindows() {
-    if (gt) {
+  gt = function requireWindows() {
+    if (mt) {
       return vt;
     }
-    gt = 1;
+    mt = 1;
     vt = isexe;
     isexe.sync = function sync(t, r) {
       return checkStat(e.statSync(t), t, r);
@@ -4781,7 +4791,7 @@ if ("win32" === process.platform || global.TESTING_WINDOWS) {
     return vt;
   }();
 } else {
-  mt = function requireMode() {
+  gt = function requireMode() {
     if (ht) {
       return pt;
     }
@@ -4816,7 +4826,7 @@ var Ct = isexe$1;
 
 isexe$1.sync = function sync(e, t) {
   try {
-    return mt.sync(e, t || {});
+    return gt.sync(e, t || {});
   } catch (e) {
     if (t && t.ignoreErrors || "EACCES" === e.code) {
       return !1;
@@ -4845,7 +4855,7 @@ function isexe$1(e, t, r) {
       }));
     }));
   }
-  mt(e, t || {}, (function(e, n) {
+  gt(e, t || {}, (function(e, n) {
     if (e) {
       if ("EACCES" === e.code || t && t.ignoreErrors) {
         e = null;
@@ -5621,8 +5631,8 @@ var findSignalByNumber = (e, t) => {
 })();
 
 var makeError = ({stdout: e, stderr: t, all: r, error: n, signal: i, exitCode: s, command: D, escapedCommand: c, timedOut: l, isCanceled: d, killed: f, parsed: {options: {timeout: p, cwd: h = a.cwd()}}}) => {
-  var g = void 0 === (i = null === i ? void 0 : i) ? void 0 : Qt[i].description;
-  var m = (({timedOut: e, timeout: t, errorCode: r, signal: n, signalDescription: i, exitCode: a, isCanceled: s}) => {
+  var m = void 0 === (i = null === i ? void 0 : i) ? void 0 : Qt[i].description;
+  var g = (({timedOut: e, timeout: t, errorCode: r, signal: n, signalDescription: i, exitCode: a, isCanceled: s}) => {
     if (e) {
       return `timed out after ${t} milliseconds`;
     }
@@ -5644,11 +5654,11 @@ var makeError = ({stdout: e, stderr: t, all: r, error: n, signal: i, exitCode: s
     timeout: p,
     errorCode: n && n.code,
     signal: i,
-    signalDescription: g,
+    signalDescription: m,
     exitCode: s = null === s ? void 0 : s,
     isCanceled: d
   });
-  var E = `Command ${m}: ${D}`;
+  var E = `Command ${g}: ${D}`;
   var w = "[object Error]" === Object.prototype.toString.call(n);
   var b = w ? `${E}\n${n.message}` : E;
   var B = [ b, t, e ].filter(Boolean).join("\n");
@@ -5663,7 +5673,7 @@ var makeError = ({stdout: e, stderr: t, all: r, error: n, signal: i, exitCode: s
   n.escapedCommand = c;
   n.exitCode = s;
   n.signal = i;
-  n.signalDescription = g;
+  n.signalDescription = m;
   n.stdout = e;
   n.stderr = t;
   n.cwd = h;
@@ -5994,7 +6004,7 @@ function isWritableStream(e) {
 
 var pipeToTarget = (e, t, r) => {
   if ("string" == typeof r) {
-    e[t].pipe(g.createWriteStream(r));
+    e[t].pipe(m.createWriteStream(r));
     return e;
   }
   if (isWritableStream(r)) {
@@ -6278,7 +6288,7 @@ var getInput = ({input: e, inputFile: t}) => {
       throw new TypeError("The `input` and `inputFile` options cannot be both set.");
     }
   })(e);
-  return g.createReadStream(t);
+  return m.createReadStream(t);
 };
 
 var handleInput = (e, t) => {
@@ -6311,7 +6321,7 @@ var getBufferedData = async (e, t) => {
   if (!e || void 0 === t) {
     return;
   }
-  await m.setTimeout(0);
+  await g.setTimeout(0);
   e.destroy();
   try {
     return await t;
@@ -6411,18 +6421,18 @@ var normalizeArgs = (e, t = []) => {
   return [ e, ...t ];
 };
 
-var gr = /^[\w.-]+$/;
+var mr = /^[\w.-]+$/;
 
 var joinCommand = (e, t) => normalizeArgs(e, t).join(" ");
 
 var getEscapedCommand = (e, t) => normalizeArgs(e, t).map((e => (e => {
-  if ("string" != typeof e || gr.test(e)) {
+  if ("string" != typeof e || mr.test(e)) {
     return e;
   }
   return `"${e.replaceAll('"', '\\"')}"`;
 })(e))).join(" ");
 
-var mr = w.debuglog("execa").enabled;
+var gr = w.debuglog("execa").enabled;
 
 var padField = (e, t) => String(e).padStart(t, "0");
 
@@ -6451,7 +6461,7 @@ var handleArguments = (t, r, n = {}) => {
     cleanup: !0,
     all: !1,
     windowsHide: !0,
-    verbose: mr,
+    verbose: gr,
     ...n
   }).env = (({env: e, extendEnv: t, preferLocal: r, localDir: n, execPath: i}) => {
     var s = t ? {
@@ -6536,15 +6546,15 @@ function execa(e, t, r) {
     var [{error: e, exitCode: t, signal: r, timedOut: D}, c, l, d] = await getSpawnedResult(s, n.options, p);
     var f = handleOutput(n.options, c);
     var h = handleOutput(n.options, l);
-    var g = handleOutput(n.options, d);
+    var m = handleOutput(n.options, d);
     if (e || 0 !== t || null !== r) {
-      var m = makeError({
+      var g = makeError({
         error: e,
         exitCode: t,
         signal: r,
         stdout: f,
         stderr: h,
-        all: g,
+        all: m,
         command: i,
         escapedCommand: a,
         parsed: n,
@@ -6553,9 +6563,9 @@ function execa(e, t, r) {
         killed: s.killed
       });
       if (!n.options.reject) {
-        return m;
+        return g;
       }
-      throw m;
+      throw g;
     }
     return {
       command: i,
@@ -6563,7 +6573,7 @@ function execa(e, t, r) {
       exitCode: 0,
       stdout: f,
       stderr: h,
-      all: g,
+      all: m,
       failed: !1,
       timedOut: !1,
       isCanceled: !1,