houdini 2.0.0-next.1 → 2.0.0-next.11

package/build/runtime/lib/types.d.ts

@@ -372,8 +372,8 @@ export type ProjectManifest = {
     artifacts: string[];
     /** Whether or not there is a local schema defined */
     local_schema: boolean;
-    /** Whether or not there is a custom instance of yoga defined */
-    local_yoga: boolean;
+    /** Whether or not there is a custom server defined */
+    local_server: boolean;
     /** Information about componentFields defined in the project */
     component_fields: Record<string, {
         filepath: string;

package/build/runtime/public/cache.d.ts

@@ -6,7 +6,6 @@ import type { ArgType, CacheTypeDef, IDFields, QueryInput, QueryList, QueryValue
 export declare class Cache<Def extends CacheTypeDef> {
     _internal_unstable: _Cache;
     constructor(cache: _Cache);
-    validateInstabilityWarning(): void;
     get<T extends TypeNames<Def>>(type: T, data: IDFields<Def, T>): Record<Def, T>;
     get config(): import("../lib").ConfigFile;
     list<Name extends ValidLists<Def>>(name: Name, { parentID, allLists }?: {

package/build/runtime/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/router/server.d.ts

@@ -1,11 +1,11 @@
-import { createServerAdapter as createAdapter } from '@whatwg-node/server';
-import { type GraphQLSchema } from 'graphql';
-import { createYoga } from 'graphql-yoga';
+import { createServerAdapter } from '@whatwg-node/server';
+import type { GraphQLSchema } from 'graphql';
 import type { HoudiniClient } from '../client';
+import { Server } from '../server';
 import type { RouterManifest, RouterPageManifest, YogaServerOptions } from './types';
-export declare function _serverHandler<ComponentType = unknown>({ schema, yoga, client, production, manifest, graphqlEndpoint, on_render, componentCache, }: {
+export declare function _serverHandler<ComponentType = unknown>({ schema, server, client, production, manifest, graphqlEndpoint, on_render, componentCache, }: {
     schema?: GraphQLSchema | null;
-    yoga?: ReturnType<typeof createYoga> | null;
+    server?: Server<any, any>;
     client: HoudiniClient;
     production: boolean;
     manifest: RouterManifest<ComponentType> | null;
@@ -19,6 +19,6 @@ export declare function _serverHandler<ComponentType = unknown>({ schema, yoga,
         session: App.Session;
         componentCache: Record<string, any>;
     }) => Response | Promise<Response | undefined> | undefined;
-} & Omit<YogaServerOptions, 'schema'>): (request: Request) => Promise<Response>;
-export declare const serverAdapterFactory: (args: Parameters<typeof _serverHandler>[0]) => ReturnType<typeof createAdapter>;
+} & Omit<YogaServerOptions, 'schema'>): (request: Request, ...extraContext: Array<any>) => Promise<Response>;
+export declare const serverAdapterFactory: (args: Parameters<typeof _serverHandler>[0]) => ReturnType<typeof createServerAdapter>;
 export type ServerAdapterFactory = typeof serverAdapterFactory;

package/build/runtime/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/server/index.d.ts

@@ -0,0 +1,17 @@
+import type { ServerAdapterRequestHandler } from '@whatwg-node/server';
+import { YogaServer } from 'graphql-yoga';
+import type { YogaSchemaDefinition } from 'graphql-yoga/typings/plugins/use-schema';
+type YogaParams = Required<ConstructorParameters<typeof YogaServer>>[0];
+type ConstructorParams = Omit<YogaParams, 'schema' | 'graphqlEndpoint'>;
+export declare class Server<ServerContext extends Record<string, any>, UserContext extends Record<string, any>> {
+    opts: ConstructorParams | null;
+    _yoga: YogaServer<any, any> | null;
+    constructor(opts?: ConstructorParams);
+    init({ endpoint, schema, getSession, }: {
+        schema: YogaSchemaDefinition<any, any>;
+        endpoint: string;
+        getSession: (request: Request) => Promise<UserContext>;
+    }): import("@whatwg-node/server").ServerAdapter<ServerContext, Server<ServerContext, UserContext>>;
+    handle: ServerAdapterRequestHandler<ServerContext>;
+}
+export {};

package/build/runtime-cjs/cache/cache.js

@@ -414,20 +414,21 @@ class CacheInternal {
       } else if (Array.isArray(value) && // make typescript happy
       (typeof previousValue === "undefined" || previousValue === null || Array.isArray(previousValue))) {
         let oldIDs = [...previousValue || []];
-        const emptyEdges = !updates ? [] : oldIDs.map((id) => {
-          if (!id) {
-            return "";
-          }
-          const { value: cursorField } = this.storage.get(id, "cursor");
-          if (cursorField) {
-            return "";
-          }
-          const { value: node } = this.storage.get(id, "node");
-          if (!node) {
-            return "";
-          }
-          return node;
-        });
+        if (updates?.includes("append") || updates?.includes("prepend")) {
+          oldIDs = oldIDs.filter((id) => {
+            for (const layer2 of this.storage.data) {
+              for (const operation of Object.values(layer2.operations)) {
+                if (operation.fields?.[key])
+                  for (const listOperation of operation.fields[key]) {
+                    if ("id" in listOperation && listOperation.id === id) {
+                      return false;
+                    }
+                  }
+              }
+            }
+            return true;
+          });
+        }
         let linkedIDs = [];
         const { newIDs, nestedIDs } = this.extractNestedListIDs({
           value,
@@ -446,39 +447,45 @@ class CacheInternal {
           layer.writeLink(parent, key, linkedIDs);
         };
         if (applyUpdates && updates) {
-          if (key === "edges") {
-            const newNodeIDs = [];
-            for (const id of newIDs) {
+          const filterIDs = (keep, insert) => {
+            const existingIDs = /* @__PURE__ */ new Set();
+            for (const id of keep) {
               if (!id) {
                 continue;
               }
               const { value: node } = this.storage.get(id, "node");
-              if (typeof node !== "string") {
+              if (!node) {
                 continue;
               }
-              if (!node || !this.storage.get(node, "__typename")) {
+              const nodeID = this.storage.get(node, "id");
+              if (!nodeID) {
                 continue;
               }
-              newNodeIDs.push(node);
+              existingIDs.add(nodeID.value);
             }
-            oldIDs = oldIDs.filter((id) => {
+            return insert.filter((id) => {
               if (!id) {
                 return true;
               }
-              const { value: value2 } = this.storage.get(id, "node");
-              const node = value2;
-              if (newNodeIDs.includes(node) && emptyEdges.includes(node)) {
-                return false;
+              const { value: node } = this.storage.get(id, "node");
+              if (!node) {
+                return true;
+              }
+              const nodeID = this.storage.get(node, "id");
+              if (!nodeID) {
+                return true;
               }
-              return true;
+              return !existingIDs.has(nodeID.value);
             });
-          }
+          };
           for (const update of applyUpdates) {
             if (update !== "replace" && !updates.includes(update)) {
               continue;
             }
             if (update === "prepend") {
-              linkedIDs = newIDs.concat(oldIDs);
+              linkedIDs = newIDs.concat(
+                filterIDs(newIDs, oldIDs)
+              );
               if (layer?.optimistic) {
                 action = () => {
                   for (const id of newIDs) {
@@ -489,7 +496,7 @@ class CacheInternal {
                 };
               }
             } else if (update === "append") {
-              linkedIDs = oldIDs.concat(newIDs);
+              linkedIDs = filterIDs(newIDs, oldIDs).concat(newIDs);
               if (layer?.optimistic) {
                 action = () => {
                   for (const id of newIDs) {

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

@@ -288,9 +288,9 @@ class DocumentStore extends import_store.Writable {
         handlers = {
           ...common,
           value,
-          resolve: (ctx2, data) => {
+          resolve: ((ctx2, data) => {
             return common.resolve(ctx2, data ?? value);
-          }
+          })
         };
       } else if (direction === "error") {
         handlers = {

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/client/plugins/test.js

@@ -100,7 +100,7 @@ function fakeFetch({
     partial: false,
     stale: false
   };
-  return () => ({
+  return (() => ({
     network(ctx, { resolve }) {
       spy?.(ctx);
       if (onRequest) {
@@ -109,7 +109,7 @@ function fakeFetch({
         resolve(ctx, { ...result });
       }
     }
-  });
+  }));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/build/runtime-cjs/lib/types.d.ts

@@ -372,8 +372,8 @@ export type ProjectManifest = {
     artifacts: string[];
     /** Whether or not there is a local schema defined */
     local_schema: boolean;
-    /** Whether or not there is a custom instance of yoga defined */
-    local_yoga: boolean;
+    /** Whether or not there is a custom server defined */
+    local_server: boolean;
     /** Information about componentFields defined in the project */
     component_fields: Record<string, {
         filepath: string;

package/build/runtime-cjs/public/cache.d.ts

@@ -6,7 +6,6 @@ import type { ArgType, CacheTypeDef, IDFields, QueryInput, QueryList, QueryValue
 export declare class Cache<Def extends CacheTypeDef> {
     _internal_unstable: _Cache;
     constructor(cache: _Cache);
-    validateInstabilityWarning(): void;
     get<T extends TypeNames<Def>>(type: T, data: IDFields<Def, T>): Record<Def, T>;
     get config(): import("../lib").ConfigFile;
     list<Name extends ValidLists<Def>>(name: Name, { parentID, allLists }?: {

package/build/runtime-cjs/public/cache.js

@@ -29,19 +29,8 @@ class Cache {
   constructor(cache) {
     this._internal_unstable = cache;
   }
-  // if the user is using the imperative API, we want the ability to break the API
-  // with any minor version. In order to do this, we require them to accept this contract
-  // through their config file
-  validateInstabilityWarning() {
-    if (!this.config.acceptImperativeInstability && !this.config.features?.imperativeCache) {
-      console.warn(`\u26A0\uFE0F  The imperative cache API is considered unstable and will change in any minor version release
-Please acknowledge this by enabling the imperative cache feature flage in your config file.
-For more information: https://houdinigraphql.com/api/cache`);
-    }
-  }
   // return the record proxy for the given type/id combo
   get(type, data) {
-    this.validateInstabilityWarning();
     let recordID = this._internal_unstable._internal_unstable.id(type, data);
     if (!recordID) {
       throw new Error("todo");
@@ -57,7 +46,6 @@ For more information: https://houdinigraphql.com/api/cache`);
     return (0, import_lib.getCurrentConfig)();
   }
   list(name, { parentID, allLists } = {}) {
-    this.validateInstabilityWarning();
     return new import_list.ListCollection({
       cache: this,
       name,
@@ -69,7 +57,6 @@ For more information: https://houdinigraphql.com/api/cache`);
     query,
     variables
   }) {
-    this.validateInstabilityWarning();
     return this._internal_unstable.read({
       selection: query.artifact.selection,
       variables
@@ -80,7 +67,6 @@ For more information: https://houdinigraphql.com/api/cache`);
     variables,
     data
   }) {
-    this.validateInstabilityWarning();
     this._internal_unstable.write({
       selection: query.artifact.selection,
       // @ts-expect-error

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,11 +1,11 @@
-import { createServerAdapter as createAdapter } from '@whatwg-node/server';
-import { type GraphQLSchema } from 'graphql';
-import { createYoga } from 'graphql-yoga';
+import { createServerAdapter } from '@whatwg-node/server';
+import type { GraphQLSchema } from 'graphql';
 import type { HoudiniClient } from '../client';
+import { Server } from '../server';
 import type { RouterManifest, RouterPageManifest, YogaServerOptions } from './types';
-export declare function _serverHandler<ComponentType = unknown>({ schema, yoga, client, production, manifest, graphqlEndpoint, on_render, componentCache, }: {
+export declare function _serverHandler<ComponentType = unknown>({ schema, server, client, production, manifest, graphqlEndpoint, on_render, componentCache, }: {
     schema?: GraphQLSchema | null;
-    yoga?: ReturnType<typeof createYoga> | null;
+    server?: Server<any, any>;
     client: HoudiniClient;
     production: boolean;
     manifest: RouterManifest<ComponentType> | null;
@@ -19,6 +19,6 @@ export declare function _serverHandler<ComponentType = unknown>({ schema, yoga,
         session: App.Session;
         componentCache: Record<string, any>;
     }) => Response | Promise<Response | undefined> | undefined;
-} & Omit<YogaServerOptions, 'schema'>): (request: Request) => Promise<Response>;
-export declare const serverAdapterFactory: (args: Parameters<typeof _serverHandler>[0]) => ReturnType<typeof createAdapter>;
+} & Omit<YogaServerOptions, 'schema'>): (request: Request, ...extraContext: Array<any>) => Promise<Response>;
+export declare const serverAdapterFactory: (args: Parameters<typeof _serverHandler>[0]) => ReturnType<typeof createServerAdapter>;
 export type ServerAdapterFactory = typeof serverAdapterFactory;

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

@@ -23,16 +23,16 @@ __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_server2 = require("../server");
+var import_cookies = require("./cookies");
 var import_match = require("./match");
 var import_session = require("./session");
 const config_file = (0, import_config.getCurrentConfig)();
 const session_keys = (0, import_config.localApiSessionKeys)(config_file);
 function _serverHandler({
   schema,
-  yoga,
+  server,
   client,
   production,
   manifest,
@@ -40,26 +40,41 @@ function _serverHandler({
   on_render,
   componentCache
 }) {
-  if (schema && !yoga) {
-    yoga = (0, import_graphql_yoga.createYoga)({
+  if (schema && !server) {
+    server = new import_server2.Server({
+      landingPage: !production
+    });
+  }
+  let requestHandler = null;
+  if (server && schema) {
+    requestHandler = server.init({
       schema,
-      landingPage: !production,
-      graphqlEndpoint
+      endpoint: graphqlEndpoint,
+      getSession: (request) => (0, import_session.get_session)(request.headers, session_keys)
     });
   }
   client.componentCache = componentCache;
-  if (schema) {
+  if (requestHandler) {
     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 requestHandler(
+        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) => {
+  return async (request, ...extraContext) => {
     if (!manifest) {
       return new Response(
         "Adapter did not provide the project's manifest. Please open an issue on github.",
@@ -67,8 +82,8 @@ function _serverHandler({
       );
     }
     const url = new URL(request.url).pathname;
-    if (yoga && url === (0, import_config.localApiEndpoint)(config_file)) {
-      return yoga(request);
+    if (requestHandler && url === graphqlEndpoint) {
+      return requestHandler(request, ...extraContext);
     }
     const authResponse = await (0, import_session.handle_request)({
       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");
@@ -76,6 +77,9 @@ async function get_session(req, secrets) {
   if (!cookie) {
     return {};
   }
+  if (cookie === "{}") {
+    return {};
+  }
   for (const secret of secrets) {
     if (!await (0, import_jwt.verify)(cookie, secret)) {
       continue;
@@ -91,5 +95,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-cjs/server/index.d.ts

@@ -0,0 +1,17 @@
+import type { ServerAdapterRequestHandler } from '@whatwg-node/server';
+import { YogaServer } from 'graphql-yoga';
+import type { YogaSchemaDefinition } from 'graphql-yoga/typings/plugins/use-schema';
+type YogaParams = Required<ConstructorParameters<typeof YogaServer>>[0];
+type ConstructorParams = Omit<YogaParams, 'schema' | 'graphqlEndpoint'>;
+export declare class Server<ServerContext extends Record<string, any>, UserContext extends Record<string, any>> {
+    opts: ConstructorParams | null;
+    _yoga: YogaServer<any, any> | null;
+    constructor(opts?: ConstructorParams);
+    init({ endpoint, schema, getSession, }: {
+        schema: YogaSchemaDefinition<any, any>;
+        endpoint: string;
+        getSession: (request: Request) => Promise<UserContext>;
+    }): import("@whatwg-node/server").ServerAdapter<ServerContext, Server<ServerContext, UserContext>>;
+    handle: ServerAdapterRequestHandler<ServerContext>;
+}
+export {};

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

@@ -0,0 +1,62 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var server_exports = {};
+__export(server_exports, {
+  Server: () => Server
+});
+module.exports = __toCommonJS(server_exports);
+var import_server = require("@whatwg-node/server");
+var import_graphql_yoga = require("graphql-yoga");
+class Server {
+  opts;
+  _yoga = null;
+  constructor(opts) {
+    this.opts = opts ?? null;
+  }
+  init({
+    endpoint,
+    schema,
+    getSession
+  }) {
+    this._yoga = new import_graphql_yoga.YogaServer({
+      ...this.opts,
+      schema,
+      graphqlEndpoint: endpoint,
+      context: async (ctx) => {
+        const userContext = !this.opts ? {} : typeof this.opts.context === "function" ? await this.opts.context(ctx) : this.opts.context || {};
+        const sessionContext = await getSession(ctx.request) || {};
+        return {
+          ...userContext,
+          session: sessionContext
+        };
+      }
+    });
+    return (0, import_server.createServerAdapter)(this, {
+      fetchAPI: this._yoga.fetchAPI,
+      plugins: this._yoga["plugins"]
+    });
+  }
+  handle = (request, serverContext) => {
+    return this._yoga.handle(request, serverContext);
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Server
+});