houdini 2.0.0-next.4 → 2.0.0-next.6

package/build/runtime-cjs/client/index.js

@@ -76,7 +76,7 @@ class HoudiniClient {
     }
     this.throwOnError_operations = throwOnError?.operations ?? [];
     let serverPort = globalThis.process?.env?.HOUDINI_PORT ?? "5173";
-    this.url = url ?? (globalThis.window ? "" : `https://localhost:${serverPort}`) + (0, import_lib.localApiEndpoint)((0, import_lib.getCurrentConfig)());
+    this.url = url ?? (globalThis.window ? "" : `http://localhost:${serverPort}`) + (0, import_lib.localApiEndpoint)((0, import_lib.getCurrentConfig)());
     this.throwOnError = throwOnError;
     this.fetchParams = fetchParams;
     this.pipeline = pipeline;

package/build/runtime-cjs/router/cookies.d.ts

@@ -29,13 +29,13 @@ export declare function parse(str: string, options?: {
  *
  */
 export declare function serialize(name: string, val: string, options: {
-    encode: boolean;
-    maxAge: number;
-    domain: string;
-    path: string;
-    expires: Date;
-    httpOnly: boolean;
-    priority: string | number;
-    secure: boolean;
-    sameSite: string | boolean;
+    encode?: boolean;
+    maxAge?: number;
+    domain?: string;
+    path?: string;
+    expires?: Date;
+    httpOnly?: boolean;
+    priority?: string | number;
+    secure?: boolean;
+    sameSite?: string | boolean;
 }): string;

package/build/runtime-cjs/router/cookies.js

@@ -76,7 +76,7 @@ function serialize(name, val, options) {
     throw new TypeError("argument val is invalid");
   }
   let str = name + "=" + value;
-  if (opt.maxAge !== null) {
+  if (opt.maxAge) {
     let maxAge = opt.maxAge - 0;
     if (Number.isNaN(maxAge) || !isFinite(maxAge)) {
       throw new TypeError("option maxAge is invalid");

package/build/runtime-cjs/router/server.d.ts

@@ -1,5 +1,5 @@
 import { createServerAdapter as createAdapter } from '@whatwg-node/server';
-import { type GraphQLSchema } from 'graphql';
+import type { GraphQLSchema } from 'graphql';
 import { createYoga } from 'graphql-yoga';
 import type { HoudiniClient } from '../client';
 import type { RouterManifest, RouterPageManifest, YogaServerOptions } from './types';

package/build/runtime-cjs/router/server.js

@@ -23,9 +23,9 @@ __export(server_exports, {
 });
 module.exports = __toCommonJS(server_exports);
 var import_server = require("@whatwg-node/server");
-var import_graphql = require("graphql");
 var import_graphql_yoga = require("graphql-yoga");
 var import_config = require("../lib/config");
+var import_cookies = require("./cookies");
 var import_match = require("./match");
 var import_session = require("./session");
 const config_file = (0, import_config.getCurrentConfig)();
@@ -44,19 +44,29 @@ function _serverHandler({
     yoga = (0, import_graphql_yoga.createYoga)({
       schema,
       landingPage: !production,
-      graphqlEndpoint
+      graphqlEndpoint,
+      context: async (request) => await (0, import_session.get_session)(request.headers, session_keys)
     });
   }
   client.componentCache = componentCache;
   if (schema) {
     client.registerProxy(graphqlEndpoint, async ({ query, variables, session }) => {
-      const parsed = (0, import_graphql.parse)(query);
-      return await (0, import_graphql.execute)({
-        schema,
-        document: parsed,
-        contextValue: session,
-        variableValues: variables
-      });
+      const response = await yoga(
+        new Request(`http://localhost/${graphqlEndpoint}`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Cookie: (0, import_cookies.serialize)(import_session.session_cookie_name, JSON.stringify(session ?? {}), {
+              httpOnly: true
+            })
+          },
+          body: JSON.stringify({
+            query,
+            variables
+          })
+        })
+      );
+      return await response.json();
     });
   }
   return async (request) => {

package/build/runtime-cjs/router/session.d.ts

@@ -17,5 +17,6 @@ export type ServerResponse = {
     redirect(url: string, status?: number): void;
     set_header(name: string, value: string): void;
 };
+export declare const session_cookie_name = "__houdini__";
 export declare function get_session(req: Headers, secrets: string[]): Promise<App.Session>;
 export {};

package/build/runtime-cjs/router/session.js

@@ -19,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var session_exports = {};
 __export(session_exports, {
   get_session: () => get_session,
-  handle_request: () => handle_request
+  handle_request: () => handle_request,
+  session_cookie_name: () => session_cookie_name
 });
 module.exports = __toCommonJS(session_exports);
 var import_cookies = require("./cookies");
@@ -91,5 +92,6 @@ async function get_session(req, secrets) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   get_session,
-  handle_request
+  handle_request,
+  session_cookie_name
 });

package/build/runtime-esm/client/index.js

@@ -45,7 +45,7 @@ class HoudiniClient {
     }
     this.throwOnError_operations = throwOnError?.operations ?? [];
     let serverPort = globalThis.process?.env?.HOUDINI_PORT ?? "5173";
-    this.url = url ?? (globalThis.window ? "" : `https://localhost:${serverPort}`) + localApiEndpoint(getCurrentConfig());
+    this.url = url ?? (globalThis.window ? "" : `http://localhost:${serverPort}`) + localApiEndpoint(getCurrentConfig());
     this.throwOnError = throwOnError;
     this.fetchParams = fetchParams;
     this.pipeline = pipeline;

package/build/runtime-esm/router/cookies.d.ts

@@ -29,13 +29,13 @@ export declare function parse(str: string, options?: {
  *
  */
 export declare function serialize(name: string, val: string, options: {
-    encode: boolean;
-    maxAge: number;
-    domain: string;
-    path: string;
-    expires: Date;
-    httpOnly: boolean;
-    priority: string | number;
-    secure: boolean;
-    sameSite: string | boolean;
+    encode?: boolean;
+    maxAge?: number;
+    domain?: string;
+    path?: string;
+    expires?: Date;
+    httpOnly?: boolean;
+    priority?: string | number;
+    secure?: boolean;
+    sameSite?: string | boolean;
 }): string;

package/build/runtime-esm/router/cookies.js

@@ -52,7 +52,7 @@ function serialize(name, val, options) {
     throw new TypeError("argument val is invalid");
   }
   let str = name + "=" + value;
-  if (opt.maxAge !== null) {
+  if (opt.maxAge) {
     let maxAge = opt.maxAge - 0;
     if (Number.isNaN(maxAge) || !isFinite(maxAge)) {
       throw new TypeError("option maxAge is invalid");

package/build/runtime-esm/router/server.d.ts

@@ -1,5 +1,5 @@
 import { createServerAdapter as createAdapter } from '@whatwg-node/server';
-import { type GraphQLSchema } from 'graphql';
+import type { GraphQLSchema } from 'graphql';
 import { createYoga } from 'graphql-yoga';
 import type { HoudiniClient } from '../client';
 import type { RouterManifest, RouterPageManifest, YogaServerOptions } from './types';

package/build/runtime-esm/router/server.js

@@ -1,9 +1,9 @@
 import { createServerAdapter as createAdapter } from "@whatwg-node/server";
-import { parse, execute } from "graphql";
 import { createYoga } from "graphql-yoga";
 import { localApiSessionKeys, localApiEndpoint, getCurrentConfig } from "../lib/config";
+import { serialize as encodeCookie } from "./cookies";
 import { find_match } from "./match";
-import { get_session, handle_request } from "./session";
+import { get_session, handle_request, session_cookie_name } from "./session";
 const config_file = getCurrentConfig();
 const session_keys = localApiSessionKeys(config_file);
 function _serverHandler({
@@ -20,19 +20,29 @@ function _serverHandler({
     yoga = createYoga({
       schema,
       landingPage: !production,
-      graphqlEndpoint
+      graphqlEndpoint,
+      context: async (request) => await get_session(request.headers, session_keys)
     });
   }
   client.componentCache = componentCache;
   if (schema) {
     client.registerProxy(graphqlEndpoint, async ({ query, variables, session }) => {
-      const parsed = parse(query);
-      return await execute({
-        schema,
-        document: parsed,
-        contextValue: session,
-        variableValues: variables
-      });
+      const response = await yoga(
+        new Request(`http://localhost/${graphqlEndpoint}`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Cookie: encodeCookie(session_cookie_name, JSON.stringify(session ?? {}), {
+              httpOnly: true
+            })
+          },
+          body: JSON.stringify({
+            query,
+            variables
+          })
+        })
+      );
+      return await response.json();
     });
   }
   return async (request) => {

package/build/runtime-esm/router/session.d.ts

@@ -17,5 +17,6 @@ export type ServerResponse = {
     redirect(url: string, status?: number): void;
     set_header(name: string, value: string): void;
 };
+export declare const session_cookie_name = "__houdini__";
 export declare function get_session(req: Headers, secrets: string[]): Promise<App.Session>;
 export {};

package/build/runtime-esm/router/session.js

@@ -66,5 +66,6 @@ async function get_session(req, secrets) {
 }
 export {
   get_session,
-  handle_request
+  handle_request,
+  session_cookie_name
 };

package/build/test-cjs/index.js

@@ -66403,10 +66403,10 @@ var AST3 = recast2.types.builders;
 function unwrappedTsTypeReference(config, filepath, missingScalars, {
   type,
   wrappers
-}, body) {
+}, body, input) {
   let result;
   if (graphql6.isScalarType(type)) {
-    result = scalarPropertyValue(config, filepath, missingScalars, type, body, null);
+    result = scalarPropertyValue(config, filepath, missingScalars, type, body, null, input);
   } else if (graphql6.isEnumType(type)) {
     result = enumReference(config, body, type.name);
   } else {
@@ -66423,14 +66423,15 @@ function unwrappedTsTypeReference(config, filepath, missingScalars, {
   }
   return result;
 }
-function tsTypeReference(config, filepath, missingScalars, definition, body) {
+function tsTypeReference(config, filepath, missingScalars, definition, body, input) {
   const { type, wrappers } = unwrapType(config, definition.type);
   return unwrappedTsTypeReference(
     config,
     filepath,
     missingScalars,
     { type, wrappers },
-    body
+    body,
+    input
   );
 }
 function enumReference(config, body, name) {
@@ -66459,7 +66460,7 @@ function nullableField(inner, input = false) {
   }
   return AST3.tsUnionType(members);
 }
-function scalarPropertyValue(config, filepath, missingScalars, target, body, field) {
+function scalarPropertyValue(config, filepath, missingScalars, target, body, field, input) {
   if (config.configFile.features?.componentFields && target.name === config.componentScalar) {
     if (!field) {
       return AST3.tsNeverKeyword();
@@ -66518,6 +66519,9 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
       return AST3.tsBooleanKeyword();
     }
     case "ID": {
+      if (input) {
+        return AST3.tsUnionType([AST3.tsStringKeyword(), AST3.tsNumberKeyword()]);
+      }
       return AST3.tsStringKeyword();
     }
     default: {
@@ -66528,7 +66532,8 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
           missingScalars,
           target.ofType,
           body,
-          field
+          field,
+          input
         );
       }
       if (config.scalars?.[target.name]) {
@@ -69245,7 +69250,7 @@ var recast11 = __toESM(require_main2(), 1);
 var graphql19 = __toESM(require("graphql"), 1);
 var recast7 = __toESM(require_main2(), 1);
 var AST8 = recast7.types.builders;
-function addReferencedInputTypes(config, filepath, body, visitedTypes, missingScalars, rootType) {
+function addReferencedInputTypes(config, filepath, body, visitedTypes, missingScalars, rootType, input) {
   const { type } = unwrapType(config, rootType);
   if (graphql19.isScalarType(type)) {
     return;
@@ -69270,12 +69275,20 @@ function addReferencedInputTypes(config, filepath, body, visitedTypes, missingSc
   }
   const members = [];
   for (const field of Object.values(type.getFields())) {
-    addReferencedInputTypes(config, filepath, body, visitedTypes, missingScalars, field.type);
+    addReferencedInputTypes(
+      config,
+      filepath,
+      body,
+      visitedTypes,
+      missingScalars,
+      field.type,
+      input
+    );
     members.push(
       AST8.tsPropertySignature(
         AST8.identifier(field.name),
         AST8.tsTypeAnnotation(
-          tsTypeReference(config, filepath, missingScalars, field, body)
+          tsTypeReference(config, filepath, missingScalars, field, body, input)
         ),
         graphql19.isNullableType(field.type)
       )
@@ -69318,7 +69331,8 @@ function inlineType({
   includeFragments,
   allOptional,
   forceNonNull,
-  field
+  field,
+  input
 }) {
   const { type, wrappers } = unwrapType(config, rootType);
   let result;
@@ -69330,7 +69344,8 @@ function inlineType({
       missingScalars,
       type,
       body,
-      field
+      field,
+      input
     );
   } else if (graphql20.isEnumType(type)) {
     ensureImports({
@@ -69438,7 +69453,8 @@ function inlineType({
           field: {
             field: attributeName,
             parent: type.name
-          }
+          },
+          input
         });
         const hasIncludeOrSkipDirective = selection.directives && selection.directives.filter(
           (directive) => directive.name.value === "include" || directive.name.value === "skip"
@@ -69502,7 +69518,8 @@ function inlineType({
         missingScalars,
         includeFragments,
         allOptional,
-        field: null
+        field: null,
+        input: false
       });
       let objectType = fragmentType;
       if (fragmentType.type === "TSUnionType") {
@@ -69967,7 +69984,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
     body,
     missingScalars,
     includeFragments: true,
-    field: null
+    field: null,
+    input: false
   });
   if (artifact.kind === "HoudiniQuery") {
     resultType = withLoadingState({
@@ -70016,7 +70034,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
         body,
         visitedTypes,
         missingScalars,
-        variableDefinition.type
+        variableDefinition.type,
+        true
       );
     }
     body.push(
@@ -70034,7 +70053,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
                       filepath,
                       missingScalars,
                       definition2,
-                      body
+                      body,
+                      true
                     )
                   ),
                   definition2.type.kind !== "NonNullType"
@@ -70069,7 +70089,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
             missingScalars,
             includeFragments: false,
             allOptional: true,
-            field: null
+            field: null,
+            input: false
           })
         )
       )
@@ -70102,7 +70123,8 @@ async function generateFragmentTypeDefs(config, filepath, body, selections, defi
                 filepath,
                 missingScalars,
                 definition2,
-                body
+                body,
+                false
               )
             ),
             definition2.type.kind !== "NonNullType"
@@ -70165,7 +70187,8 @@ async function generateFragmentTypeDefs(config, filepath, body, selections, defi
               visitedTypes,
               missingScalars,
               includeFragments: true,
-              field: null
+              field: null,
+              input: false
             })
           })
         )
@@ -70261,7 +70284,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                   {
                     field: key,
                     parent: type.name
-                  }
+                  },
+                  false
                 )
               )
             );
@@ -70288,7 +70312,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                     {
                       field: key,
                       parent: type.name
-                    }
+                    },
+                    false
                   )
                 );
               } else if (graphql21.isEnumType(unwrapped.type)) {
@@ -70326,7 +70351,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                       body,
                       visitedTypes,
                       /* @__PURE__ */ new Set(),
-                      arg.type
+                      arg.type,
+                      true
                     );
                     const prop = AST13.tsPropertySignature(
                       AST13.identifier(arg.name),
@@ -70336,7 +70362,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                           filepath,
                           /* @__PURE__ */ new Set(),
                           arg,
-                          body
+                          body,
+                          graphql21.isInputType(arg.type)
                         )
                       )
                     );
@@ -70448,7 +70475,8 @@ function listDefinitions(config, filepath, body, docs) {
                               filepath,
                               /* @__PURE__ */ new Set(),
                               arg,
-                              body
+                              body,
+                              graphql21.isInputType(arg.type)
                             )
                           )
                         );