@m1212e/rumble 0.15.2 → 0.15.4

package/out/index.cjs

@@ -48,7 +48,7 @@ __pothos_plugin_smart_subscriptions = __toESM(__pothos_plugin_smart_subscription
 let graphql_scalars = require("graphql-scalars");
 
 //#region lib/client/generate/client.ts
-function generateClient({ apiUrl, rumbleImportPath, useExternalUrqlClient, availableSubscriptions, schemaPath }) {
+function generateClient({ apiUrl, rumbleImportPath, useExternalUrqlClient, availableSubscriptions, schemaPath, forceReactivity }) {
 	const imports = [];
 	let code = "";
 	if (typeof useExternalUrqlClient === "string") imports.push(`import { urqlClient } from "${useExternalUrqlClient}";`);
@@ -57,6 +57,8 @@ function generateClient({ apiUrl, rumbleImportPath, useExternalUrqlClient, avail
 	imports.push(`import { nativeDateExchange } from '${rumbleImportPath}';`);
 	imports.push(`import { schema } from '${schemaPath}';`);
 	imports.push(`import { makeLiveQuery, makeMutation, makeSubscription, makeQuery } from '${rumbleImportPath}';`);
+	const forceReactivityValueString = typeof forceReactivity === "boolean" && forceReactivity ? "true" : "";
+	const forceReactivityFieldString = forceReactivityValueString !== "" ? `forceReactivity: ${forceReactivityValueString}` : "";
 	code += `
 export const defaultOptions: ConstructorParameters<Client>[0] = {
   url: "${apiUrl ?? "PLEASE PROVIDE A URL WHEN GENERATING OR IMPORT AN EXTERNAL URQL CLIENT"}",
@@ -79,27 +81,31 @@ export const client = {
    * Assumes that the query and subscription return the same fields as per default when using the rumble query helpers.
    * If no subscription with the same name exists, this will just be a query.
    */
-  liveQuery: makeLiveQuery<Query>({
+  liveQuery: makeLiveQuery<Query${`, ${forceReactivityValueString}`}>({
 	  urqlClient,
 	  availableSubscriptions: new Set([${availableSubscriptions.values().toArray().map((value) => `"${value}"`).join(", ")}]),
+		${forceReactivityFieldString}
   }),
   /**
    * A mutation that can be used to e.g. create, update or delete data.
    */
-  mutate: makeMutation<Mutation>({
+  mutate: makeMutation<Mutation${`, ${forceReactivityValueString}`}>({
 	  urqlClient,
+		${forceReactivityFieldString}
   }),
   /**
    * A continuous stream of results that updates when the server sends new data.
    */
-  subscribe: makeSubscription<Subscription>({
+  subscribe: makeSubscription<Subscription${`, ${forceReactivityValueString}`}>({
 	  urqlClient,
+		${forceReactivityFieldString}
   }),
   /**
    * A one-time fetch of data.
    */
-  query: makeQuery<Query>({
+  query: makeQuery<Query${`, ${forceReactivityValueString}`}>({
 	  urqlClient,
+		${forceReactivityValueString !== "" ? `forceReactivity: ${forceReactivityValueString}` : ""}
   }),
 }`;
 	return {
@@ -206,7 +212,7 @@ function makeStringLiteralUnionFromEnum(enumType) {
 
 //#endregion
 //#region lib/client/generate/generate.ts
-async function generateFromSchema({ outputPath, schema, rumbleImportPath = "@m1212e/rumble", apiUrl, useExternalUrqlClient = false, removeExisting = true }) {
+async function generateFromSchema({ outputPath, schema, rumbleImportPath = "@m1212e/rumble", apiUrl, useExternalUrqlClient = false, removeExisting = true, forceReactivity }) {
 	if (removeExisting) try {
 		await (0, node_fs_promises.access)(outputPath);
 		await (0, node_fs_promises.rm)(outputPath, {
@@ -236,7 +242,8 @@ export type ${key} = ${rep};
 		schemaPath: `./${schemaFileName}`,
 		useExternalUrqlClient,
 		rumbleImportPath,
-		availableSubscriptions: new Set(Object.keys(schema.getSubscriptionType()?.getFields() || {}))
+		availableSubscriptions: new Set(Object.keys(schema.getSubscriptionType()?.getFields() || {})),
+		forceReactivity
 	});
 	imports.push(...c.imports);
 	code += c.code;
@@ -247,7 +254,7 @@ export const schema = ${(0, devalue.uneval)((0, __urql_introspection.minifyIntro
 //#endregion
 //#region lib/client/request.ts
 const argsKey = "__args";
-function makeGraphQLQueryRequest({ queryName, input, client, enableSubscription = false }) {
+function makeGraphQLQueryRequest({ queryName, input, client, enableSubscription = false, forceReactivity }) {
 	const otwQueryName = `${(0, es_toolkit.capitalize)(queryName)}Query`;
 	const argsString = stringifyArgumentObjectToGraphqlList(input?.[argsKey] ?? {});
 	const operationString = (operationVerb) => `${operationVerb} ${otwQueryName} { ${queryName}${argsString} ${input ? `{ ${stringifySelection(input)} }` : ""}}`;
@@ -257,13 +264,13 @@ function makeGraphQLQueryRequest({ queryName, input, client, enableSubscription
 		if (!data && v.error) throw v.error;
 		return data;
 	}), (0, wonka.onPush)((data) => {
-		if (typeof data === "object" && data !== null) Object.assign(awaitedReturnValueReference, data);
+		if (typeof data === "object" && data !== null && typeof forceReactivity === "boolean" && forceReactivity) Object.assign(awaitedReturnValueReference, data);
 	}));
 	const observable = (0, wonka.toObservable)(source);
 	const promise = (0, wonka.toPromise)((0, wonka.pipe)(source, (0, wonka.take)(1), (0, wonka.map)((data) => {
-		if (typeof data === "object" && data !== null) {
+		Object.assign(awaitedReturnValueReference, observable);
+		if (typeof data === "object" && data !== null && typeof forceReactivity === "boolean" && forceReactivity) {
 			Object.assign(awaitedReturnValueReference, data);
-			Object.assign(awaitedReturnValueReference, observable);
 			return awaitedReturnValueReference;
 		}
 		return data;
@@ -271,10 +278,9 @@ function makeGraphQLQueryRequest({ queryName, input, client, enableSubscription
 	Object.assign(promise, observable);
 	return promise;
 }
-function makeGraphQLMutationRequest({ mutationName, input, client }) {
-	const otwMutationName = `${(0, es_toolkit.capitalize)(mutationName)}Mutation`;
-	const argsString = stringifyArgumentObjectToGraphqlList(input[argsKey] ?? {});
-	const response = (0, wonka.pipe)(client.mutation(`mutation ${otwMutationName} { ${mutationName}${argsString} { ${stringifySelection(input)} }}`, {}), (0, wonka.map)((v) => {
+function makeGraphQLMutationRequest({ mutationName, input, client, forceReactivity }) {
+	const operationString = `mutation ${`${(0, es_toolkit.capitalize)(mutationName)}Mutation`} { ${mutationName}${stringifyArgumentObjectToGraphqlList(input[argsKey] ?? {})} { ${stringifySelection(input)} }}`;
+	const response = (0, wonka.pipe)(client.mutation(operationString, {}), (0, wonka.map)((v) => {
 		const data = v.data?.[mutationName];
 		if (!data && v.error) throw v.error;
 		return data;
@@ -284,10 +290,9 @@ function makeGraphQLMutationRequest({ mutationName, input, client }) {
 	Object.assign(promise, observable);
 	return promise;
 }
-function makeGraphQLSubscriptionRequest({ subscriptionName, input, client }) {
-	const otwSubscriptionName = `${(0, es_toolkit.capitalize)(subscriptionName)}Subscription`;
-	const argsString = stringifyArgumentObjectToGraphqlList(input[argsKey] ?? {});
-	return (0, wonka.pipe)(client.subscription(`subscription ${otwSubscriptionName} { ${subscriptionName}${argsString} { ${stringifySelection(input)} }}`, {}), (0, wonka.map)((v) => {
+function makeGraphQLSubscriptionRequest({ subscriptionName, input, client, forceReactivity }) {
+	const operationString = `subscription ${`${(0, es_toolkit.capitalize)(subscriptionName)}Subscription`} { ${subscriptionName}${stringifyArgumentObjectToGraphqlList(input[argsKey] ?? {})} { ${stringifySelection(input)} }}`;
+	return (0, wonka.pipe)(client.subscription(operationString, {}), (0, wonka.map)((v) => {
 		const data = v.data?.[subscriptionName];
 		if (!data && v.error) throw v.error;
 		return data;
@@ -302,7 +307,8 @@ function stringifySelection(selection) {
 `;
 				return acc;
 			}
-			acc += `${key} { ${stringifySelection(value)} }
+			acc += `${key} {
+${stringifySelection(value)} }
 `;
 		} else acc += `${key}
 `;
@@ -311,11 +317,13 @@ function stringifySelection(selection) {
 }
 function stringifyArgumentObjectToGraphqlList(args) {
 	const entries = Object.entries(args);
-	if (entries.length === 0) return "";
-	return `(${entries.map(([key, value]) => `${key}: ${stringifyArgumentValue(value)}`).join(", ")})`;
+	if (Array.isArray(args)) return `(${stringifyArgumentValue(args)})`;
+	if (entries.length > 0) return `(${entries.map(([key, value]) => `${key}: ${stringifyArgumentValue(value)}`).join(", ")})`;
+	return "";
 }
 function stringifyArgumentValue(arg) {
 	if (arg === null) return "null";
+	if (Array.isArray(arg)) return `[${arg.map(stringifyArgumentValue).join(", ")}]`;
 	switch (typeof arg) {
 		case "string": return `"${arg}"`;
 		case "number": return `${arg}`;
@@ -330,14 +338,15 @@ function stringifyArgumentValue(arg) {
 
 //#endregion
 //#region lib/client/liveQuery.ts
-function makeLiveQuery({ urqlClient, availableSubscriptions }) {
+function makeLiveQuery({ urqlClient, availableSubscriptions, forceReactivity }) {
 	return new Proxy({}, { get: (_target, prop) => {
 		return (input) => {
 			return makeGraphQLQueryRequest({
 				queryName: prop,
 				input,
 				client: urqlClient,
-				enableSubscription: availableSubscriptions.has(prop)
+				enableSubscription: availableSubscriptions.has(prop),
+				forceReactivity
 			});
 		};
 	} });
@@ -345,13 +354,14 @@ function makeLiveQuery({ urqlClient, availableSubscriptions }) {
 
 //#endregion
 //#region lib/client/mutation.ts
-function makeMutation({ urqlClient }) {
+function makeMutation({ urqlClient, forceReactivity }) {
 	return new Proxy({}, { get: (_target, prop) => {
 		return (input) => {
 			return makeGraphQLMutationRequest({
 				mutationName: prop,
 				input,
-				client: urqlClient
+				client: urqlClient,
+				forceReactivity
 			});
 		};
 	} });
@@ -426,14 +436,15 @@ const nativeDateExchange = ({ client, forward }) => {
 
 //#endregion
 //#region lib/client/query.ts
-function makeQuery({ urqlClient }) {
+function makeQuery({ urqlClient, forceReactivity }) {
 	return new Proxy({}, { get: (_target, prop) => {
 		return (input) => {
 			return makeGraphQLQueryRequest({
 				queryName: prop,
 				input,
 				client: urqlClient,
-				enableSubscription: false
+				enableSubscription: false,
+				forceReactivity
 			});
 		};
 	} });
@@ -441,13 +452,14 @@ function makeQuery({ urqlClient }) {
 
 //#endregion
 //#region lib/client/subscription.ts
-function makeSubscription({ urqlClient }) {
+function makeSubscription({ urqlClient, forceReactivity }) {
 	return new Proxy({}, { get: (_target, prop) => {
 		return (input) => {
 			return makeGraphQLSubscriptionRequest({
 				subscriptionName: prop,
 				input,
-				client: urqlClient
+				client: urqlClient,
+				forceReactivity
 			});
 		};
 	} });
@@ -1143,7 +1155,7 @@ const createWhereArgImplementer = ({ db, schemaBuilder, enumImplementer }) => {
 //#endregion
 //#region lib/client/client.ts
 const clientCreatorImplementer = ({ builtSchema }) => {
-	const clientCreator = async ({ apiUrl, outputPath, rumbleImportPath, useExternalUrqlClient, removeExisting }) => {
+	const clientCreator = async ({ apiUrl, outputPath, rumbleImportPath, useExternalUrqlClient, removeExisting, forceReactivity }) => {
 		if (process.env.NODE_ENV !== "development") console.warn("Running rumble client generation in non development mode. Are you sure this is correct?");
 		await generateFromSchema({
 			schema: builtSchema(),
@@ -1151,7 +1163,8 @@ const clientCreatorImplementer = ({ builtSchema }) => {
 			rumbleImportPath,
 			apiUrl,
 			useExternalUrqlClient,
-			removeExisting
+			removeExisting,
+			forceReactivity
 		});
 	};
 	return clientCreator;