@gql.tada/cli-utils 1.7.0 → 1.7.1-canary-e193732bfa456bacf50b007ae7a2ca1396f62733

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @gql.tada/cli-utils
 
+## 1.7.1-canary-e193732bfa456bacf50b007ae7a2ca1396f62733
+
+### Patch Changes
+
+- ⚠️ Fix external scalars in the `graphql` definition files,
+  we will collect the imports and rewrite them into the
+  cached file
+  Submitted by [@JoviDeCroock](https://github.com/JoviDeCroock) (See [#472](https://github.com/0no-co/gql.tada/pull/472))
+
 ## 1.7.0
 
 ### Minor Changes

package/dist/chunks/index-chunk.js

@@ -3811,118 +3811,141 @@ async function* run$3(e, r) {
   } catch (e) {
     throw externalError("Failed to load configuration.", e);
   }
-  var s = i({
+  var s = O.dirname(n.configPath);
+  var l;
+  if ("schema" in a) {
+    if (!r.output && e.pipeTo) {
+      l = e.pipeTo;
+    } else if (r.output) {
+      l = O.resolve(process.cwd(), r.output);
+    } else if (a.tadaTurboLocation) {
+      l = O.resolve(s, a.tadaTurboLocation);
+    } else if (a.tadaOutputLocation) {
+      l = O.resolve(s, a.tadaOutputLocation, "..", "graphql-cache.d.ts");
+      yield function hintMessage$1(e) {
+        return error([ cmd(De.Style, [ he.Yellow, he.Bold ]), `${ye.Warning} Note: `, cmd(De.Style, he.Reset), `${e.trim()}\n\n` ]);
+      }(`No output location was specified.\nThe turbo cache will by default be saved as ${code('"graphql-cache.d.ts"')}.\n` + hint(`To change this, add a ${code('"tadaTurboLocation"')} in your configuration,\npass an ${code("--output")} argument to this command,\nor pipe this command to an output file.`));
+    } else {
+      throw errorMessage$1("No output path was specified to write the output file to.\n" + hint(`You have to either set ${code('"tadaTurboLocation"')} in your configuration,\npass an ${code("--output")} argument to this command,\nor pipe this command to an output file.`));
+    }
+  }
+  var c = i({
     rootPath: n.rootPath,
     configPath: n.configPath,
-    pluginConfig: a
+    pluginConfig: a,
+    turboOutputPath: "string" == typeof l ? l : void 0
   });
-  var l = [];
-  var c = 0;
-  var D = 0;
-  var d = 0;
+  var D = [];
+  var d = [];
+  var f = 0;
+  var p = 0;
+  var h = 0;
   try {
     if (e.isInteractive) {
       yield runningTurbo();
     }
-    for await (var f of s) {
-      if ("EXTERNAL_WARNING" === f.kind) {
+    for await (var g of c) {
+      if ("EXTERNAL_WARNING" === g.kind) {
         yield experimentMessage(`${code(".vue")} and ${code(".svelte")} file support is experimental.`);
-      } else if ("FILE_COUNT" === f.kind) {
-        D = f.fileCount;
+      } else if ("FILE_COUNT" === g.kind) {
+        p = g.fileCount;
+      } else if ("GRAPHQL_SOURCES" === g.kind) {
+        d = g.sources;
       } else {
-        d++;
-        l.push(...f.documents);
-        c += f.warnings.length;
-        if (f.warnings.length) {
-          var p = warningFile(f.filePath);
-          for (var h of f.warnings) {
-            p += (g = h, text([ ke, cmd(De.Style, he.BrightBlack), `${g.line}:${g.col}`, me.Tab, cmd(De.Style, he.Foreground), indent(g.message.trim(), text([ ke, me.Tab ])), me.Newline ]));
-            warningGithub(h);
+        h++;
+        D.push(...g.documents);
+        f += g.warnings.length;
+        if (g.warnings.length) {
+          var m = warningFile(g.filePath);
+          for (var E of g.warnings) {
+            m += (w = E, text([ ke, cmd(De.Style, he.BrightBlack), `${w.line}:${w.col}`, me.Tab, cmd(De.Style, he.Foreground), indent(w.message.trim(), text([ ke, me.Tab ])), me.Newline ]));
+            warningGithub(E);
           }
-          yield p + "\n";
+          yield m + "\n";
         }
       }
       if (e.isInteractive) {
-        yield runningTurbo(d, D);
+        yield runningTurbo(h, p);
       }
     }
   } catch (e) {
     throw externalError("Could not build cache", e);
   }
-  var g;
-  var m = O.dirname(n.configPath);
+  var w;
   if ("schema" in a) {
-    var E;
-    if (!r.output && e.pipeTo) {
-      E = e.pipeTo;
-    } else if (r.output) {
-      E = O.resolve(process.cwd(), r.output);
-    } else if (a.tadaTurboLocation) {
-      E = O.resolve(m, a.tadaTurboLocation);
-    } else if (a.tadaOutputLocation) {
-      E = O.resolve(m, a.tadaOutputLocation, "..", "graphql-cache.d.ts");
-      yield function hintMessage$1(e) {
-        return error([ cmd(De.Style, [ he.Yellow, he.Bold ]), `${ye.Warning} Note: `, cmd(De.Style, he.Reset), `${e.trim()}\n\n` ]);
-      }(`No output location was specified.\nThe turbo cache will by default be saved as ${code('"graphql-cache.d.ts"')}.\n` + hint(`To change this, add a ${code('"tadaTurboLocation"')} in your configuration,\npass an ${code("--output")} argument to this command,\nor pipe this command to an output file.`));
-    } else {
-      throw errorMessage$1("No output path was specified to write the output file to.\n" + hint(`You have to either set ${code('"tadaTurboLocation"')} in your configuration,\npass an ${code("--output")} argument to this command,\nor pipe this command to an output file.`));
-    }
-    if (c && r.failOnWarn) {
-      throw warningSummary(c);
+    if (f && r.failOnWarn) {
+      throw warningSummary(f);
     }
     try {
-      var w = {};
-      for (var S of l) {
-        w[S.argumentKey] = S.documentType;
+      var S = {};
+      for (var b of D) {
+        S[b.argumentKey] = b.documentType;
       }
-      var b = createCacheContents(w);
-      await writeOutput(E, b);
+      var B = createCacheContents(S, d, l);
+      await writeOutput(l, B);
     } catch (e) {
       throw externalError("Something went wrong while writing the type cache file", e);
     }
-    yield infoSummary$1(c, l.length);
+    yield infoSummary$1(f, D.length);
   } else {
     if (r.output) {
       throw errorMessage$1("Output path was specified, while multiple schemas are configured.\n" + hint(`You can only output all schemas to their ${code('"tadaTurboLocation"')} options\nwhen multiple ${code("schemas")} are set up.`));
     }
-    var B = {};
-    for (var k of a.schemas) {
-      var {name: I, tadaTurboLocation: M} = k;
-      if (!M) {
-        throw errorMessage$1(`No output path was specified to write the '${I}' type cache to.\n` + hint(`You have to set ${code('"tadaTurboLocation"')} in each schema configuration.`));
+    var k = {};
+    for (var I of a.schemas) {
+      var {name: M, tadaTurboLocation: _} = I;
+      if (!_) {
+        throw errorMessage$1(`No output path was specified to write the '${M}' type cache to.\n` + hint(`You have to set ${code('"tadaTurboLocation"')} in each schema configuration.`));
       }
       try {
-        B[I] = 0;
-        var _ = {};
-        for (var U of l) {
-          if (U.schemaName === I) {
-            _[U.argumentKey] = U.documentType;
-            B[I]++;
+        k[M] = 0;
+        var U = {};
+        for (var G of D) {
+          if (G.schemaName === M) {
+            U[G.argumentKey] = G.documentType;
+            k[M]++;
           }
         }
-        var G = createCacheContents(_);
-        await writeOutput(O.resolve(m, M), G);
+        var H = O.resolve(s, _);
+        var V = createCacheContents(U, d, H);
+        await writeOutput(H, V);
       } catch (e) {
-        throw externalError(`Something went wrong while writing the '${I}' schema's type cache file.`, e);
+        throw externalError(`Something went wrong while writing the '${M}' schema's type cache file.`, e);
       }
     }
-    if (c && r.failOnWarn) {
-      throw warningSummary(c);
+    if (f && r.failOnWarn) {
+      throw warningSummary(f);
     } else {
-      yield infoSummary$1(c, B);
+      yield infoSummary$1(f, k);
     }
   }
 }
 
-function createCacheContents(e) {
-  var t = "";
-  for (var r in e) {
-    if (t) {
-      t += "\n";
+function createCacheContents(e, t, r) {
+  var i = "";
+  for (var n in e) {
+    if (i) {
+      i += "\n";
+    }
+    i += `    ${n}:\n      ${e[n]};`;
+  }
+  var a = "import type { TadaDocumentNode, $tada } from 'gql.tada';\n";
+  var s = "string" == typeof r || r && "object" == typeof r && "toString" in r && !("writable" in r);
+  var l = new Set;
+  for (var c of t) {
+    for (var D of c.imports) {
+      if (s) {
+        var d = r.toString();
+        var f = O.dirname(c.absolutePath);
+        if (O.resolve(f, D.specifier) === O.resolve(d) || l.has(D.specifier)) {
+          continue;
+        }
+        l.add(D.specifier);
+      }
+      a += D.importClause + "\n";
     }
-    t += `    ${r}:\n      ${e[r]};`;
   }
-  return Te + "import type { TadaDocumentNode, $tada } from 'gql.tada';\n\ndeclare module 'gql.tada' {\n interface setupCache {\n" + t + "\n  }\n}\n";
+  return Te + a + "\ndeclare module 'gql.tada' {\n interface setupCache {\n" + i + "\n  }\n}\n";
 }
 
 class TurboCommand extends Command {
@@ -5280,6 +5303,29 @@ var programFactory = e => {
       }
       return d;
     },
+    resolveModuleName(e, t, r) {
+      if (!e.startsWith(".")) {
+        return e;
+      }
+      var i = s.resolveModuleName(e, t, c, D.compilerHost);
+      if (i.resolvedModule) {
+        var n = i.resolvedModule.resolvedFileName;
+        var a = O.dirname(r);
+        var l = O.relative(a, n);
+        if (!l.startsWith(".")) {
+          l = "./" + l;
+        }
+        return l.replace(/\\/g, "/");
+      }
+      var d = O.dirname(t);
+      var f = O.dirname(r);
+      var p = O.resolve(d, e);
+      var h = O.relative(f, p);
+      if (!h.startsWith(".")) {
+        h = "./" + h;
+      }
+      return h.replace(/\\/g, "/");
+    },
     build() {
       (() => {
         if ("stackTraceLimit" in Error && Error.stackTraceLimit < 25) {