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

package/build/plugin-cjs/index.js

@@ -85495,7 +85495,7 @@ async function load_manifest(args) {
       layout_queries: {},
       artifacts: [],
       local_schema: false,
-      local_yoga: false
+      local_server: false
     },
     queries: [],
     layouts: [],
@@ -85518,8 +85518,9 @@ async function load_manifest(args) {
       const name = child.isDirectory() ? child.name : parse32(child.name).name;
       if (name === "+schema") {
         manifest2.local_schema = true;
-      } else if (name === "+yoga") {
-        manifest2.local_yoga = true;
+      }
+      if (name === "+server") {
+        manifest2.local_server = true;
       }
     }
   } catch {
@@ -87469,20 +87470,21 @@ var CacheInternal = class {
       } 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,
@@ -87501,39 +87503,45 @@ var CacheInternal = class {
           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;
               }
-              return true;
+              const nodeID = this.storage.get(node, "id");
+              if (!nodeID) {
+                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) {
@@ -87544,7 +87552,7 @@ var CacheInternal = class {
                 };
               }
             } else if (update === "append") {
-              linkedIDs = oldIDs.concat(newIDs);
+              linkedIDs = filterIDs(newIDs, oldIDs).concat(newIDs);
               if (layer?.optimistic) {
                 action = () => {
                   for (const id of newIDs) {
@@ -88183,10 +88191,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 {
@@ -88223,7 +88231,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();
@@ -88282,6 +88290,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: {
@@ -88292,7 +88303,8 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
           missingScalars,
           target.ofType,
           body,
-          field
+          field,
+          input
         );
       }
       if (config.scalars?.[target.name]) {
@@ -89027,7 +89039,7 @@ export default (props) => (
 `;
   let renderer = `
 	import { Cache } from '$houdini/runtime/cache/cache'
-import { serverAdapterFactory, _serverHandler } from '$houdini/runtime/router/server'
+import { serverAdapterFactory } from '$houdini/runtime/router/server'
 import { HoudiniClient } from '$houdini/runtime/client'
 import { renderToStream } from 'houdini-react/server'
 import React from 'react'
@@ -89127,7 +89139,7 @@ export function createServerAdapter(options) {
   }).join("\n")}
 
 		${manifest2.local_schema ? `import schema from '../../../../../src/api/+schema'` : " const schema = null"}
-		${manifest2.local_yoga ? `import yoga from '.../../../../../src/api/+yoga'` : " const yoga = null"}
+		${manifest2.local_server ? `import server from '../../../../../src/api/+server'` : " const server = null"}
 
 		export const endpoint = ${JSON.stringify(localApiEndpoint(config.configFile))}
 
@@ -89141,7 +89153,7 @@ export function createServerAdapter(options) {
 		export function createServerAdapter(options) {
 			return createAdapter({
 				schema,
-				yoga,
+				server,
 				componentCache,
 				graphqlEndpoint: endpoint,
 				...options,
@@ -89245,7 +89257,8 @@ function paramsType(config, params) {
             type: config.schema.getType(typeInfo.type),
             wrappers: typeInfo.wrappers
           },
-          []
+          [],
+          false
         )
       ).code;
     }
@@ -89447,7 +89460,10 @@ async function transformFile(page) {
         ensureImports({
           config: page.config,
           body: script.body,
-          sourceModule: path_exports.relative(page.config.projectRoot, entryPointPath),
+          sourceModule: `$houdini/${path_exports.relative(
+            page.config.runtimeDir,
+            entryPointPath
+          )}`,
           // we just want the side effects of the import so we don't need to assign it to a variable
           import: null
         });
@@ -89481,7 +89497,7 @@ var vite_default = {
         layout_queries: {},
         artifacts: [],
         local_schema: false,
-        local_yoga: false,
+        local_server: false,
         component_fields: {}
       };
     }
@@ -89543,11 +89559,11 @@ var vite_default = {
     }
     return id.substring(id.indexOf("virtual:houdini"));
   },
-  async closeBundle(config) {
+  async buildEnd(_, config) {
     if (isSecondaryBuild() || viteEnv.mode !== "production" || devServer) {
       return;
     }
-    if (config.adapter?.disableServer) {
+    if (!config || config.adapter?.disableServer) {
       return;
     }
     console.log("\u{1F3A9} Generating Server Assets...");
@@ -90006,7 +90022,7 @@ export function useFragmentHandle(reference: { readonly "${fragmentKey}": { ${do
       const variableName = `${doc.name}$artifact`;
       ensure_import({
         identifier: variableName,
-        module: config.artifactImportPath(doc.name).replace(/\$houdini/g, "..")
+        module: config.artifactImportPath(doc.name)
       });
       return `{ artifact: ${variableName} }`;
     }
@@ -90041,13 +90057,7 @@ function addOverload({
   }
   const docImports = documents.filter((doc) => doc.generateStore).map(
     (doc) => `
-import type { ${importIdentifiers(doc).join(", ")} } from '${import_node_path3.default.relative(
-      import_node_path3.default.relative(
-        config.projectRoot,
-        import_node_path3.default.join(config.pluginRuntimeDirectory("houdini-react"), "hooks")
-      ),
-      config.artifactImportPath(doc.name)
-    )}'
+import type { ${importIdentifiers(doc).join(", ")} } from '$houdini/artifacts/${doc.name}'
 	`
   ).join("\n");
   return `${docImports}

package/build/plugin-esm/index.js

@@ -85491,7 +85491,7 @@ async function load_manifest(args) {
       layout_queries: {},
       artifacts: [],
       local_schema: false,
-      local_yoga: false
+      local_server: false
     },
     queries: [],
     layouts: [],
@@ -85514,8 +85514,9 @@ async function load_manifest(args) {
       const name = child.isDirectory() ? child.name : parse32(child.name).name;
       if (name === "+schema") {
         manifest2.local_schema = true;
-      } else if (name === "+yoga") {
-        manifest2.local_yoga = true;
+      }
+      if (name === "+server") {
+        manifest2.local_server = true;
       }
     }
   } catch {
@@ -87465,20 +87466,21 @@ var CacheInternal = class {
       } 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,
@@ -87497,39 +87499,45 @@ var CacheInternal = class {
           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;
               }
-              return true;
+              const nodeID = this.storage.get(node, "id");
+              if (!nodeID) {
+                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) {
@@ -87540,7 +87548,7 @@ var CacheInternal = class {
                 };
               }
             } else if (update === "append") {
-              linkedIDs = oldIDs.concat(newIDs);
+              linkedIDs = filterIDs(newIDs, oldIDs).concat(newIDs);
               if (layer?.optimistic) {
                 action = () => {
                   for (const id of newIDs) {
@@ -88179,10 +88187,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 {
@@ -88219,7 +88227,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();
@@ -88278,6 +88286,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: {
@@ -88288,7 +88299,8 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
           missingScalars,
           target.ofType,
           body,
-          field
+          field,
+          input
         );
       }
       if (config.scalars?.[target.name]) {
@@ -89023,7 +89035,7 @@ export default (props) => (
 `;
   let renderer = `
 	import { Cache } from '$houdini/runtime/cache/cache'
-import { serverAdapterFactory, _serverHandler } from '$houdini/runtime/router/server'
+import { serverAdapterFactory } from '$houdini/runtime/router/server'
 import { HoudiniClient } from '$houdini/runtime/client'
 import { renderToStream } from 'houdini-react/server'
 import React from 'react'
@@ -89123,7 +89135,7 @@ export function createServerAdapter(options) {
   }).join("\n")}
 
 		${manifest2.local_schema ? `import schema from '../../../../../src/api/+schema'` : " const schema = null"}
-		${manifest2.local_yoga ? `import yoga from '.../../../../../src/api/+yoga'` : " const yoga = null"}
+		${manifest2.local_server ? `import server from '../../../../../src/api/+server'` : " const server = null"}
 
 		export const endpoint = ${JSON.stringify(localApiEndpoint(config.configFile))}
 
@@ -89137,7 +89149,7 @@ export function createServerAdapter(options) {
 		export function createServerAdapter(options) {
 			return createAdapter({
 				schema,
-				yoga,
+				server,
 				componentCache,
 				graphqlEndpoint: endpoint,
 				...options,
@@ -89241,7 +89253,8 @@ function paramsType(config, params) {
             type: config.schema.getType(typeInfo.type),
             wrappers: typeInfo.wrappers
           },
-          []
+          [],
+          false
         )
       ).code;
     }
@@ -89443,7 +89456,10 @@ async function transformFile(page) {
         ensureImports({
           config: page.config,
           body: script.body,
-          sourceModule: path_exports.relative(page.config.projectRoot, entryPointPath),
+          sourceModule: `$houdini/${path_exports.relative(
+            page.config.runtimeDir,
+            entryPointPath
+          )}`,
           // we just want the side effects of the import so we don't need to assign it to a variable
           import: null
         });
@@ -89477,7 +89493,7 @@ var vite_default = {
         layout_queries: {},
         artifacts: [],
         local_schema: false,
-        local_yoga: false,
+        local_server: false,
         component_fields: {}
       };
     }
@@ -89539,11 +89555,11 @@ var vite_default = {
     }
     return id.substring(id.indexOf("virtual:houdini"));
   },
-  async closeBundle(config) {
+  async buildEnd(_, config) {
     if (isSecondaryBuild() || viteEnv.mode !== "production" || devServer) {
       return;
     }
-    if (config.adapter?.disableServer) {
+    if (!config || config.adapter?.disableServer) {
       return;
     }
     console.log("\u{1F3A9} Generating Server Assets...");
@@ -90002,7 +90018,7 @@ export function useFragmentHandle(reference: { readonly "${fragmentKey}": { ${do
       const variableName = `${doc.name}$artifact`;
       ensure_import({
         identifier: variableName,
-        module: config.artifactImportPath(doc.name).replace(/\$houdini/g, "..")
+        module: config.artifactImportPath(doc.name)
       });
       return `{ artifact: ${variableName} }`;
     }
@@ -90037,13 +90053,7 @@ function addOverload({
   }
   const docImports = documents.filter((doc) => doc.generateStore).map(
     (doc) => `
-import type { ${importIdentifiers(doc).join(", ")} } from '${path3.relative(
-      path3.relative(
-        config.projectRoot,
-        path3.join(config.pluginRuntimeDirectory("houdini-react"), "hooks")
-      ),
-      config.artifactImportPath(doc.name)
-    )}'
+import type { ${importIdentifiers(doc).join(", ")} } from '$houdini/artifacts/${doc.name}'
 	`
   ).join("\n");
   return `${docImports}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-react",
-  "version": "2.0.0-next.1",
+  "version": "2.0.0-next.11",
   "description": "The React plugin for houdini",
   "keywords": [
     "typescript",
@@ -42,7 +42,7 @@
     "recast": "^0.23.1",
     "rollup": "^4.39.0",
     "use-deep-compare-effect": "^1.8.1",
-    "houdini": "^2.0.0-next.1"
+    "houdini": "^2.0.0-next.9"
   },
   "files": [
     "build"