houdini-svelte 2.2.0-next.5 → 3.0.0-next.7

package/build/preprocess-cjs/index.js

@@ -6097,7 +6097,7 @@ var require_esprima5 = __commonJS({
             var jsx_parser_1 = __webpack_require__(3);
             var parser_1 = __webpack_require__(8);
             var tokenizer_1 = __webpack_require__(15);
-            function parse15(code, options, delegate) {
+            function parse13(code, options, delegate) {
               var commentHandler = null;
               var proxyDelegate = function(node, metadata) {
                 if (delegate) {
@@ -6142,17 +6142,17 @@ var require_esprima5 = __commonJS({
               }
               return ast;
             }
-            exports3.parse = parse15;
+            exports3.parse = parse13;
             function parseModule(code, options, delegate) {
               var parsingOptions = options || {};
               parsingOptions.sourceType = "module";
-              return parse15(code, parsingOptions, delegate);
+              return parse13(code, parsingOptions, delegate);
             }
             exports3.parseModule = parseModule;
             function parseScript(code, options, delegate) {
               var parsingOptions = options || {};
               parsingOptions.sourceType = "script";
-              return parse15(code, parsingOptions, delegate);
+              return parse13(code, parsingOptions, delegate);
             }
             exports3.parseScript = parseScript;
             function tokenize(code, options, delegate) {
@@ -12292,7 +12292,7 @@ var require_esprima6 = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parse = void 0;
     var util_1 = require_util4();
-    function parse15(source, options) {
+    function parse13(source, options) {
       var comments = [];
       var ast = require_esprima5().parse(source, {
         loc: true,
@@ -12310,7 +12310,7 @@ var require_esprima6 = __commonJS({
       }
       return ast;
     }
-    exports2.parse = parse15;
+    exports2.parse = parse13;
   }
 });
 
@@ -13448,7 +13448,7 @@ var require_parser2 = __commonJS({
     var lines_1 = require_lines2();
     var comments_1 = require_comments2();
     var util = tslib_1.__importStar(require_util4());
-    function parse15(source, options) {
+    function parse13(source, options) {
       options = (0, options_1.normalize)(options);
       var lines = (0, lines_1.fromString)(source, options);
       var sourceWithoutTabs = lines.toString({
@@ -13520,7 +13520,7 @@ var require_parser2 = __commonJS({
       (0, comments_1.attach)(comments, program.body.length ? file.program : file, lines);
       return new TreeCopier(lines, tokens).copy(file);
     }
-    exports2.parse = parse15;
+    exports2.parse = parse13;
     var TreeCopier = function TreeCopier2(lines, tokens) {
       assert_1.default.ok(this instanceof TreeCopier2);
       this.lines = lines;
@@ -92506,8 +92506,6 @@ function plugin_config(config) {
   return {
     client: "./src/client",
     defaultRouteBlocking: false,
-    pageQueryFilename: "+page.gql",
-    layoutQueryFilename: "+layout.gql",
     static: false,
     forceRunesMode: false,
     ...cfg,
@@ -125080,14 +125078,14 @@ var require_lib62 = __commonJS3({
         super.checkParams(node, false, true);
         this.scope.exit();
       }
-      forwardNoArrowParamsConversionAt(node, parse132) {
+      forwardNoArrowParamsConversionAt(node, parse13) {
         let result;
         if (this.state.noArrowParamsConversionAt.includes(this.offsetToSourcePos(node.start))) {
           this.state.noArrowParamsConversionAt.push(this.state.start);
-          result = parse132();
+          result = parse13();
           this.state.noArrowParamsConversionAt.pop();
         } else {
-          result = parse132();
+          result = parse13();
         }
         return result;
       }
@@ -164424,9 +164422,6 @@ function artifact_import({
 // src/plugin/transforms/componentQuery.ts
 var recast16 = __toESM(require_main4(), 1);
 
-// src/plugin/kit.ts
-var graphql37 = __toESM(require("graphql"), 1);
-
 // src/plugin/extractLoadFunction.ts
 var graphql36 = __toESM(require("graphql"), 1);
 var import_vite = require("vite");
@@ -164557,7 +164552,9 @@ filepath: ${filepath}`
         load.push(element.quasi.quasis[0].value.raw);
       } else if (element.type === "CallExpression") {
         if (element.callee.type !== "Identifier" || element.callee.name !== "graphql" || element.arguments.length !== 1) {
-          throw new Error(`only graphql function can be passed to ${houdini_load_fn}`);
+          throw new Error(
+            `only graphql function can be passed to ${houdini_load_fn}. Filepath: ${filepath}`
+          );
         }
         let documentString;
         const argument = element.arguments[0];
@@ -164662,18 +164659,6 @@ function is_layout3(framework, filename) {
 function is_component(config, framework, filename) {
   return framework === "svelte" || filename.endsWith(".svelte") && !is_route_script(framework, filename) && !is_route(config, framework, filename);
 }
-function page_query_path(config, filename) {
-  return path_exports.join(
-    path_exports.dirname(resolve_relative(config, filename)),
-    plugin_config(config).pageQueryFilename
-  );
-}
-function layout_query_path(config, filename) {
-  return path_exports.join(
-    path_exports.dirname(resolve_relative(config, filename)),
-    plugin_config(config).layoutQueryFilename
-  );
-}
 function resolve_relative(config, filename) {
   const match3 = filename.match("^((../)+)src/routes");
   if (match3) {
@@ -165009,7 +164994,6 @@ async function kit_init(page) {
 }
 
 // src/plugin/transforms/kit/load.ts
-var graphql38 = __toESM(require("graphql"), 1);
 var recast18 = __toESM(require_main4(), 1);
 
 // src/plugin/routing.ts
@@ -165105,9 +165089,7 @@ async function kit_load_generator(page) {
     page,
     artifact: { name }
   }).id;
-  const [page_query, layout_query, inline_queries, page_info] = await Promise.all([
-    find_special_query("Page", page),
-    find_special_query("Layout", page),
+  const [inline_queries, page_info] = await Promise.all([
     find_inline_queries(
       page,
       // if we are currently on the route file, there's nothing to parse
@@ -165126,12 +165108,6 @@ async function kit_load_generator(page) {
   if (script) {
     const queries_that_needs_a_load = [...houdini_load_queries, ...inline_queries];
     const isLayout = is_layout3(page.framework, page.filepath);
-    if (isLayout && layout_query) {
-      queries_that_needs_a_load.push(layout_query);
-    }
-    if (!isLayout && page_query) {
-      queries_that_needs_a_load.push(page_query);
-    }
     add_load({
       page,
       queries: queries_that_needs_a_load,
@@ -165378,22 +165354,6 @@ function add_load({
     );
   }
 }
-async function find_special_query(type, page) {
-  const query_path = type === "Page" ? page_query_path(page.config, page.filepath) : layout_query_path(page.config, page.filepath);
-  const contents = await fs_exports.readFile(query_path);
-  if (!contents) {
-    return null;
-  }
-  const parsed = graphql38.parse(contents);
-  const definition = parsed.definitions.find(
-    (defn) => defn.kind === "OperationDefinition" && defn.operation === "query"
-  );
-  if (!definition) {
-    formatErrors({ message: "gql file must contain a query.", filepath: query_path });
-    return null;
-  }
-  return definition;
-}
 function load_hook_statements(name, request_context, input_id, result_id) {
   return AST19.expressionStatement(
     AST19.awaitExpression(

package/build/preprocess-esm/index.js

@@ -6102,7 +6102,7 @@ var require_esprima5 = __commonJS({
             var jsx_parser_1 = __webpack_require__(3);
             var parser_1 = __webpack_require__(8);
             var tokenizer_1 = __webpack_require__(15);
-            function parse15(code, options, delegate) {
+            function parse13(code, options, delegate) {
               var commentHandler = null;
               var proxyDelegate = function(node, metadata) {
                 if (delegate) {
@@ -6147,17 +6147,17 @@ var require_esprima5 = __commonJS({
               }
               return ast;
             }
-            exports2.parse = parse15;
+            exports2.parse = parse13;
             function parseModule(code, options, delegate) {
               var parsingOptions = options || {};
               parsingOptions.sourceType = "module";
-              return parse15(code, parsingOptions, delegate);
+              return parse13(code, parsingOptions, delegate);
             }
             exports2.parseModule = parseModule;
             function parseScript(code, options, delegate) {
               var parsingOptions = options || {};
               parsingOptions.sourceType = "script";
-              return parse15(code, parsingOptions, delegate);
+              return parse13(code, parsingOptions, delegate);
             }
             exports2.parseScript = parseScript;
             function tokenize(code, options, delegate) {
@@ -12297,7 +12297,7 @@ var require_esprima6 = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.parse = void 0;
     var util_1 = require_util4();
-    function parse15(source, options) {
+    function parse13(source, options) {
       var comments = [];
       var ast = require_esprima5().parse(source, {
         loc: true,
@@ -12315,7 +12315,7 @@ var require_esprima6 = __commonJS({
       }
       return ast;
     }
-    exports.parse = parse15;
+    exports.parse = parse13;
   }
 });
 
@@ -13453,7 +13453,7 @@ var require_parser2 = __commonJS({
     var lines_1 = require_lines2();
     var comments_1 = require_comments2();
     var util = tslib_1.__importStar(require_util4());
-    function parse15(source, options) {
+    function parse13(source, options) {
       options = (0, options_1.normalize)(options);
       var lines = (0, lines_1.fromString)(source, options);
       var sourceWithoutTabs = lines.toString({
@@ -13525,7 +13525,7 @@ var require_parser2 = __commonJS({
       (0, comments_1.attach)(comments, program.body.length ? file.program : file, lines);
       return new TreeCopier(lines, tokens).copy(file);
     }
-    exports.parse = parse15;
+    exports.parse = parse13;
     var TreeCopier = function TreeCopier2(lines, tokens) {
       assert_1.default.ok(this instanceof TreeCopier2);
       this.lines = lines;
@@ -92503,8 +92503,6 @@ function plugin_config(config) {
   return {
     client: "./src/client",
     defaultRouteBlocking: false,
-    pageQueryFilename: "+page.gql",
-    layoutQueryFilename: "+layout.gql",
     static: false,
     forceRunesMode: false,
     ...cfg,
@@ -125076,14 +125074,14 @@ var require_lib62 = __commonJS3({
         super.checkParams(node, false, true);
         this.scope.exit();
       }
-      forwardNoArrowParamsConversionAt(node, parse132) {
+      forwardNoArrowParamsConversionAt(node, parse13) {
         let result;
         if (this.state.noArrowParamsConversionAt.includes(this.offsetToSourcePos(node.start))) {
           this.state.noArrowParamsConversionAt.push(this.state.start);
-          result = parse132();
+          result = parse13();
           this.state.noArrowParamsConversionAt.pop();
         } else {
-          result = parse132();
+          result = parse13();
         }
         return result;
       }
@@ -164420,9 +164418,6 @@ function artifact_import({
 // src/plugin/transforms/componentQuery.ts
 var recast16 = __toESM(require_main4(), 1);
 
-// src/plugin/kit.ts
-import * as graphql37 from "graphql";
-
 // src/plugin/extractLoadFunction.ts
 import * as graphql36 from "graphql";
 import { transformWithEsbuild } from "vite";
@@ -164553,7 +164548,9 @@ filepath: ${filepath}`
         load.push(element.quasi.quasis[0].value.raw);
       } else if (element.type === "CallExpression") {
         if (element.callee.type !== "Identifier" || element.callee.name !== "graphql" || element.arguments.length !== 1) {
-          throw new Error(`only graphql function can be passed to ${houdini_load_fn}`);
+          throw new Error(
+            `only graphql function can be passed to ${houdini_load_fn}. Filepath: ${filepath}`
+          );
         }
         let documentString;
         const argument = element.arguments[0];
@@ -164658,18 +164655,6 @@ function is_layout3(framework, filename) {
 function is_component(config, framework, filename) {
   return framework === "svelte" || filename.endsWith(".svelte") && !is_route_script(framework, filename) && !is_route(config, framework, filename);
 }
-function page_query_path(config, filename) {
-  return path_exports.join(
-    path_exports.dirname(resolve_relative(config, filename)),
-    plugin_config(config).pageQueryFilename
-  );
-}
-function layout_query_path(config, filename) {
-  return path_exports.join(
-    path_exports.dirname(resolve_relative(config, filename)),
-    plugin_config(config).layoutQueryFilename
-  );
-}
 function resolve_relative(config, filename) {
   const match3 = filename.match("^((../)+)src/routes");
   if (match3) {
@@ -165005,7 +164990,6 @@ async function kit_init(page) {
 }
 
 // src/plugin/transforms/kit/load.ts
-import * as graphql38 from "graphql";
 var recast18 = __toESM(require_main4(), 1);
 
 // src/plugin/routing.ts
@@ -165101,9 +165085,7 @@ async function kit_load_generator(page) {
     page,
     artifact: { name }
   }).id;
-  const [page_query, layout_query, inline_queries, page_info] = await Promise.all([
-    find_special_query("Page", page),
-    find_special_query("Layout", page),
+  const [inline_queries, page_info] = await Promise.all([
     find_inline_queries(
       page,
       // if we are currently on the route file, there's nothing to parse
@@ -165122,12 +165104,6 @@ async function kit_load_generator(page) {
   if (script) {
     const queries_that_needs_a_load = [...houdini_load_queries, ...inline_queries];
     const isLayout = is_layout3(page.framework, page.filepath);
-    if (isLayout && layout_query) {
-      queries_that_needs_a_load.push(layout_query);
-    }
-    if (!isLayout && page_query) {
-      queries_that_needs_a_load.push(page_query);
-    }
     add_load({
       page,
       queries: queries_that_needs_a_load,
@@ -165374,22 +165350,6 @@ function add_load({
     );
   }
 }
-async function find_special_query(type, page) {
-  const query_path = type === "Page" ? page_query_path(page.config, page.filepath) : layout_query_path(page.config, page.filepath);
-  const contents = await fs_exports.readFile(query_path);
-  if (!contents) {
-    return null;
-  }
-  const parsed = graphql38.parse(contents);
-  const definition = parsed.definitions.find(
-    (defn) => defn.kind === "OperationDefinition" && defn.operation === "query"
-  );
-  if (!definition) {
-    formatErrors({ message: "gql file must contain a query.", filepath: query_path });
-    return null;
-  }
-  return definition;
-}
 function load_hook_statements(name, request_context, input_id, result_id) {
   return AST19.expressionStatement(
     AST19.awaitExpression(