houdini 2.0.0-next.27 → 2.0.0-next.28

package/build/cmd/init.js

@@ -72,62 +72,104 @@ async function init(_path, args) {
   let schemaPath = is_remote_endpoint ? "./schema.graphql" : "path/to/src/lib/**/*.graphql";
   let pullSchema_content = null;
   if (is_remote_endpoint && !args.yes) {
-    let number_of_round = 0;
-    let url_and_headers = "";
-    while (pullSchema_content === null && number_of_round < 10) {
-      number_of_round++;
-      const answer = await p.group(
-        {
-          url_and_headers: async () => p.text({
-            message: `What's the URL for your api? ${number_of_round === 1 ? "" : `(attempt ${number_of_round})`}`,
-            placeholder: `http://localhost:4000/graphql ${number_of_round === 1 ? "" : "Authorization=Bearer MyToken"}`,
-            validate: (value) => {
-              if (value === "") {
-                return;
-              }
-              if (!value.startsWith("http")) {
-                return "Please enter a valid URL";
+    const { api_running } = await p.group(
+      {
+        api_running: () => p.confirm({
+          message: "Is your API currently running?",
+          initialValue: true
+        })
+      },
+      { onCancel: () => pCancel() }
+    );
+    if (api_running) {
+      let number_of_round = 0;
+      let url_and_headers = "";
+      while (pullSchema_content === null && number_of_round < 10) {
+        number_of_round++;
+        const answer = await p.group(
+          {
+            url_and_headers: async () => p.text({
+              message: `What's the URL for your api? ${number_of_round === 1 ? "" : `(attempt ${number_of_round})`}`,
+              placeholder: `http://localhost:4000/graphql ${number_of_round === 1 ? "" : "Authorization=Bearer MyToken"}`,
+              validate: (value) => {
+                if (value === "") {
+                  return;
+                }
+                if (!value.startsWith("http")) {
+                  return "Please enter a valid URL";
+                }
               }
-            }
+            })
+          },
+          {
+            onCancel: () => pCancel()
+          }
+        );
+        url_and_headers = answer.url_and_headers;
+        const value_splited = url_and_headers.split(" ");
+        const local_url = value_splited[0];
+        const local_headers = value_splited.length > 1 ? extractHeadersStr(value_splited.slice(1).join(" ")) : headers;
+        const fetchTimeout = 3e4;
+        pullSchema_content = await pull_schema(
+          local_url,
+          fetchTimeout,
+          schemaPath,
+          local_headers,
+          true
+        );
+        if (pullSchema_content === null) {
+          const msg = `If you need to pass headers, add them after the URL (eg: '${green(
+            `http://myurl.com/graphql Authorization=Bearer MyToken`
+          )}')`;
+          p.log.error(msg);
+        }
+        url = url_and_headers === "" ? "http://localhost:4000/graphql" : local_url;
+      }
+      if (pullSchema_content === null) {
+        pCancel("We couldn't pull the schema. Please check your URL/headers and try again.");
+      }
+    } else {
+      const { has_schema_file } = await p.group(
+        {
+          has_schema_file: () => p.confirm({
+            message: "Do you have a schema file on disk we can use?",
+            initialValue: false
           })
         },
-        {
-          onCancel: () => pCancel()
-        }
-      );
-      url_and_headers = answer.url_and_headers;
-      const value_splited = url_and_headers.split(" ");
-      const local_url = value_splited[0];
-      const local_headers = value_splited.length > 1 ? extractHeadersStr(value_splited.slice(1).join(" ")) : headers;
-      const fetchTimeout = 3e4;
-      pullSchema_content = await pull_schema(
-        local_url,
-        fetchTimeout,
-        schemaPath,
-        local_headers,
-        true
+        { onCancel: () => pCancel() }
       );
-      if (pullSchema_content === null) {
-        const msg = `If you need to pass headers, add them after the URL (eg: '${green(
-          `http://myurl.com/graphql Authorization=Bearer MyToken`
-        )}')`;
-        p.log.error(msg);
+      if (has_schema_file) {
+        const { schema_file_path } = await p.group(
+          {
+            schema_file_path: () => p.path({
+              message: "Where is the schema file?",
+              initialValue: "./schema.graphql",
+              validate: (value) => {
+                if (!value)
+                  return "Please enter a valid path";
+                try {
+                  fs.statSync(path.resolve(value));
+                } catch {
+                  return "File not found";
+                }
+              }
+            })
+          },
+          { onCancel: () => pCancel() }
+        );
+        pullSchema_content = await fs.readFile(path.resolve(schema_file_path)) ?? null;
       }
-      url = url_and_headers === "" ? "http://localhost:4000/graphql" : local_url;
-    }
-    if (pullSchema_content === null) {
-      pCancel("We couldn't pull the schema. Please check your URL/headers and try again.");
+      url = "API_URL";
     }
   } else if (!args.yes) {
     const answers = await p.group(
       {
-        schema_path: () => p.text({
+        schema_path: () => p.path({
           message: "Where is your schema located?",
-          placeholder: schemaPath,
+          initialValue: schemaPath,
           validate: (value) => {
-            if (value === "") {
+            if (!value)
               return "Please enter a valid schemaPath";
-            }
           }
         })
       },
@@ -173,17 +215,13 @@ async function init(_path, args) {
     is_remote_endpoint ? url : null,
     runtimeDir
   );
-  await houdiniClient(sourceDir, typescript, frameworkInfo, url);
+  await houdiniClient(sourceDir, typescript, frameworkInfo, is_remote_endpoint ? url : null);
   if (frameworkInfo.framework === "svelte") {
     await svelteKitConfig(targetPath, typescript);
   } else if (frameworkInfo.framework === "kit") {
     await svelteConfig(targetPath, typescript);
   }
-  await gitIgnore({
-    targetPath,
-    runtimeDir,
-    schemaPath: is_remote_endpoint ? schemaPath : void 0
-  });
+  await gitIgnore({ targetPath, runtimeDir });
   await graphqlRC(targetPath, runtimeDir);
   await viteConfig(targetPath, frameworkInfo, typescript);
   await tjsConfig(targetPath, frameworkInfo);
@@ -225,7 +263,7 @@ async function houdiniConfig(configPath, schemaPath, module, frameworkInfo, url,
     };
   }
   config.runtimeDir = runtimeDir;
-  if (schemaPath !== "./schema.graphql") {
+  if (url !== null) {
     config.schemaPath = schemaPath;
   }
   if (module !== "esm") {
@@ -260,11 +298,7 @@ module.exports = config
 async function houdiniClient(targetPath, typescript, _frameworkInfo, url) {
   const houdiniClientExt = typescript ? `ts` : `js`;
   const houdiniClientPath = path.join(targetPath, `client.${houdiniClientExt}`);
-  const content = `import { HoudiniClient } from '$houdini';
-
-export default new HoudiniClient({
-    url: '${url}'
-
+  const comment = `
     // uncomment this to configure the network call (for things like authentication)
     // for more information, please visit here: https://www.houdinigraphql.com/guides/authentication
     // fetchParams({ session }) {
@@ -273,8 +307,14 @@ export default new HoudiniClient({
     //             Authorization: \`Bearer \${session.token}\`,
     //         }
     //     }
-    // }
-})
+    // }`;
+  const urlLine = url ? `{
+    url: '${url}',${comment}
+}` : `{${comment}
+}`;
+  const content = `import { HoudiniClient } from '$houdini';
+
+export default new HoudiniClient(${urlLine})
 `;
   await fs.writeFile(houdiniClientPath, content);
 }
@@ -329,29 +369,15 @@ export default config;
 `;
   await fs.writeFile(svelteConfigPath, typescript ? newContentTs : newContentJs);
 }
-async function gitIgnore({
-  targetPath,
-  runtimeDir,
-  schemaPath
-}) {
+async function gitIgnore({ targetPath, runtimeDir }) {
   const filepath = path.join(targetPath, ".gitignore");
   const existing = await fs.readFile(filepath) || "";
-  let newIgnores = "";
   if (!existing.includes(`
 ${runtimeDir}
 `)) {
-    newIgnores += `${runtimeDir}
-`;
-  }
-  if (schemaPath && !existing.includes(`
-${schemaPath}
-`)) {
-    newIgnores += `${schemaPath}
-`;
-  }
-  if (newIgnores) {
     await fs.writeFile(filepath, `${existing}
-${newIgnores}`);
+${runtimeDir}
+`);
   }
 }
 async function graphqlRC(targetPath, runtimeDir) {
@@ -445,12 +471,12 @@ async function packageJSON(targetPath, frameworkInfo) {
   }
   packageJSON2.devDependencies = {
     ...packageJSON2.devDependencies,
-    houdini: "^2.0.0-next.27"
+    houdini: "^2.0.0-next.28"
   };
   if (frameworkInfo.framework === "svelte" || frameworkInfo.framework === "kit") {
     packageJSON2.devDependencies = {
       ...packageJSON2.devDependencies,
-      "houdini-svelte": "^3.0.0-next.28"
+      "houdini-svelte": "^3.0.0-next.29"
     };
   } else {
     throw new Error(`Unmanaged framework: "${JSON.stringify(frameworkInfo)}"`);

package/build/lib/schema.js

@@ -1,6 +1,5 @@
 import * as graphql from "graphql";
 import colors from "kleur";
-import fetch from "node-fetch";
 import * as fs from "node:fs/promises";
 async function pull_schema(url, fetchTimeout, schemaPath, headers, skipWriting) {
   let content = "";

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "houdini",
-    "version": "2.0.0-next.27",
+    "version": "2.0.0-next.28",
     "description": "The disappearing GraphQL clients",
     "keywords": [
         "typescript",
@@ -36,7 +36,7 @@
     },
     "dependencies": {
         "@babel/parser": "^7.24.6",
-        "@clack/prompts": "^0.6.3",
+        "@clack/prompts": "^1.5.1",
         "@graphql-tools/merge": "^9.0.0",
         "@graphql-tools/schema": "^9.0.4",
         "@types/estree": "^1.0.0",
@@ -56,7 +56,6 @@
         "kleur": "^4.1.5",
         "micromatch": "^4.0.5",
         "minimatch": "^5.1.0",
-        "node-fetch": "^3.2.10",
         "npx-import": "^1.1.3",
         "recast": "^0.23.1",
         "ws": "^8.18.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini",
-  "version": "2.0.0-next.27",
+  "version": "2.0.0-next.28",
   "description": "The disappearing GraphQL clients",
   "keywords": [
     "typescript",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@babel/parser": "^7.24.6",
-    "@clack/prompts": "^0.6.3",
+    "@clack/prompts": "^1.5.1",
     "@graphql-tools/merge": "^9.0.0",
     "@graphql-tools/schema": "^9.0.4",
     "@types/estree": "^1.0.0",
@@ -50,7 +50,6 @@
     "kleur": "^4.1.5",
     "micromatch": "^4.0.5",
     "minimatch": "^5.1.0",
-    "node-fetch": "^3.2.10",
     "npx-import": "^1.1.3",
     "recast": "^0.23.1",
     "ws": "^8.18.0",