updz

Author: julianbenegas

.changeset/pre.json

@@ -12,6 +12,8 @@
     "dirty-books-pump",
     "early-pots-build",
     "eighty-grapes-sit",
-    "sixty-turtles-roll"
+    "quick-ways-sit",
+    "sixty-turtles-roll",
+    "smooth-garlics-wink"
   ]
 }

.changeset/quick-ways-sit.md

@@ -0,0 +1,5 @@
+---
+"basehub": patch
+---
+
+fixe

.changeset/smooth-garlics-wink.md

@@ -0,0 +1,5 @@
+---
+"basehub": patch
+---
+
+fixes

packages/basehub/CHANGELOG.md

@@ -1,5 +1,17 @@
 # basehub
 
+## 9.0.0-schemaless.6
+
+### Patch Changes
+
+- fixes
+
+## 9.0.0-schemaless.5
+
+### Patch Changes
+
+- fixe
+
 ## 9.0.0-schemaless.4
 
 ### Patch Changes

packages/basehub/package.json

@@ -2,7 +2,7 @@
   "name": "basehub",
   "description": "A very fast Headless CMS.",
   "author": "JB <[email protected]>",
-  "version": "9.0.0-schemaless.4",
+  "version": "9.0.0-schemaless.6",
   "license": "MIT",
   "repository": "basehub-ai/basehub",
   "bugs": "https://github.com/basehub-ai/basehub/issues",

packages/basehub/src/bin/tasks/clientTasks.ts

@@ -9,7 +9,10 @@ import { RenderContext } from "./render/common/RenderContext.js";
 import { renderRequestTypes } from "./render/requestTypes/renderRequestTypes.js";
 import { renderResponseTypes } from "./render/responseTypes/renderResponseTypes.js";
 import { renderSchema } from "./render/schema/renderSchema.js";
-import { renderModuleAugmentation } from "./render/responseTypes/renderModuleAugmentation.js";
+import {
+  renderModuleAugmentation,
+  enhanceMutationGenqlSelection,
+} from "./render/responseTypes/renderModuleAugmentation.js";
 // import { renderTypeGuards } from "./render/typeGuards/renderTypeGuards.js";
 
 export type OutputContextRef = {
@@ -64,7 +67,9 @@ export const clientTasks = (
                 await writeFileToPath(
                   [output],
                   "// @ts-nocheck\n/* istanbul ignore file */\n/* tslint:disable */\n/* eslint-disable */\n\n" +
-                    renderCtx.toCode("typescript")
+                    enhanceMutationGenqlSelection(
+                      await renderCtx.toCode("typescript")
+                    )
                 );
               },
             },

packages/basehub/src/bin/tasks/render/requestTypes/objectType.ts

@@ -82,7 +82,6 @@ export const objectType = (
   }
 
   fieldStrings.push("__typename?: boolean | number");
-  fieldStrings.push("__scalar?: boolean | number");
 
   // add indentation
   fieldStrings = fieldStrings.map((x) =>

packages/basehub/src/bin/tasks/render/responseTypes/renderModuleAugmentation.ts

@@ -28,6 +28,8 @@ declare module "${ctx.config?.packageName || "basehub"}" {
   export interface Scalars extends _Scalars {}
 }
 
+import type { Transaction } from 'basehub/api-transaction'
+
 interface _Query extends Query {}
 interface _QueryGenqlSelection extends QueryGenqlSelection {}
 interface _Mutation extends Mutation {}
@@ -36,3 +38,13 @@ interface _FragmentsMap extends FragmentsMap {}
 interface _Scalars extends Scalars {}`
   );
 };
+
+export const enhanceMutationGenqlSelection = (schemaFileContents: string) => {
+  // edit `MutationGenqlSelection` to receive the Transaction directly instead of a string
+  return schemaFileContents.replace(
+    `      /** Transaction data. */
+      data: Scalars["String"];`,
+    `      /** Transaction data. */
+      data: Transaction | Scalars["String"];`
+  );
+};

packages/basehub/src/genql/runtime/_generate-graphql-operation.ts

@@ -38,13 +38,34 @@ const parseRequest = (
       return parseRequest(fields, ctx, path, options);
     }
 
+    const argsThatShouldNotBeEnums = [
+      // image processing args
+      "format",
+      "anim",
+      "background",
+      "border",
+      "compression",
+      "fit",
+      "gamma",
+      "gravity",
+      "metadata",
+      "rotate",
+      "sharpen",
+      "trim",
+    ];
+
     const argStrings = argNames.map((argName) => {
       let value = args[argName];
       if (typeof value === "object") {
         // stringify the object
         value = JSON.stringify(value);
         // strip quotes except for string values
         value = value.replace(/"([^"]+)":/g, "$1:");
+      } else if (
+        typeof value === "string" &&
+        argsThatShouldNotBeEnums.includes(argName)
+      ) {
+        value = JSON.stringify(value);
       }
 
       return `${argName}:${value}`;

packages/basehub/src/react/pump/server-pump.tsx

@@ -6,6 +6,7 @@ import {
   generateQueryOp,
   type QueryGenqlSelection,
   type QueryResult,
+  type Options,
 } from "../../index.js";
 import { getStuffFromEnv } from "../../bin/util/get-stuff-from-env.js";
 import { replaceSystemAliases } from "../../genql/runtime/_aliasing.js";
@@ -46,7 +47,12 @@ export type PumpProps<
       ) => React.ReactNode | Promise<React.ReactNode>;
   queries: [...Queries]; // Tuple type for better type inference
   bind?: Bind;
-} & Parameters<typeof basehub>[0];
+} & Omit<Options, "ref"> & {
+    /**
+     * same as "ref", but to avoid React complaining about the "ref" prop
+     */
+    _ref?: Options["ref"];
+  };
 
 // Utility type to infer result types from an array of queries
 export type QueryResults<Queries extends Array<PumpQuery>> = {
@@ -60,8 +66,10 @@ export const Pump = async <
   children,
   queries,
   bind,
-  ...basehubProps
+  _ref,
+  ..._basehubProps
 }: PumpProps<Queries, Bind>): Promise<JSX.Element> => {
+  const basehubProps = { ..._basehubProps, ref: _ref };
   // passed to the client to toast
   const errors: Array<ResponseCache["errors"]> = [];
   const responseHashes: Array<ResponseCache["responseHash"]> = [];