@m1212e/rumble 0.12.19 → 0.12.21

package/out/index.cjs

@@ -48,27 +48,25 @@ __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, schema }) {
+function generateClient({ apiUrl, rumbleImportPath, useExternalUrqlClient, availableSubscriptions, schemaPath }) {
 	const imports = [];
 	let code = "";
 	if (typeof useExternalUrqlClient === "string") imports.push(`import { urqlClient } from "${useExternalUrqlClient}";`);
 	imports.push(`import { Client, fetchExchange } from '@urql/core';`);
 	imports.push(`import { cacheExchange } from '@urql/exchange-graphcache';`);
 	imports.push(`import { nativeDateExchange } from '${rumbleImportPath}';`);
+	imports.push(`import { schema } from '${schemaPath}';`);
 	imports.push(`import { makeLiveQuery, makeMutation, makeSubscription, makeQuery } from '${rumbleImportPath}';`);
 	code += `
 export const defaultOptions: ConstructorParameters<Client>[0] = {
   url: "${apiUrl ?? "PLEASE PROVIDE A URL WHEN GENERATING OR IMPORT AN EXTERNAL URQL CLIENT"}",
   fetchSubscriptions: true,
-  exchanges: [cacheExchange({
-     // @ts-ignore
-     schema: ${schema ? (0, devalue.uneval)((0, __urql_introspection.minifyIntrospectionQuery)((0, __urql_introspection.getIntrospectedSchema)(schema))) : "undefined"}
-   }), nativeDateExchange, fetchExchange],
+  exchanges: [cacheExchange({ schema }), nativeDateExchange, fetchExchange],
   fetchOptions: {
     credentials: "include",
   },
   requestPolicy: "cache-and-network",
-}  
+}
 `;
 	if (!useExternalUrqlClient) code += `
 const urqlClient = new Client(defaultOptions);
@@ -208,8 +206,8 @@ function makeStringLiteralUnionFromEnum(enumType) {
 
 //#endregion
 //#region lib/client/generate/generate.ts
-async function generateFromSchema({ outputPath, schema, rumbleImportPath = "@m1212e/rumble", apiUrl, useExternalUrqlClient = false }) {
-	try {
+async function generateFromSchema({ outputPath, schema, rumbleImportPath = "@m1212e/rumble", apiUrl, useExternalUrqlClient = false, removeExisting = true }) {
+	if (removeExisting) try {
 		await (0, node_fs_promises.access)(outputPath);
 		await (0, node_fs_promises.rm)(outputPath, {
 			recursive: true,
@@ -232,16 +230,18 @@ async function generateFromSchema({ outputPath, schema, rumbleImportPath = "@m12
 export type ${key} = ${rep};
 		`;
 	}
+	const schemaFileName = "schema";
 	const c = generateClient({
 		apiUrl,
-		schema,
+		schemaPath: `./${schemaFileName}`,
 		useExternalUrqlClient,
 		rumbleImportPath,
 		availableSubscriptions: new Set(Object.keys(schema.getSubscriptionType()?.getFields() || {}))
 	});
 	imports.push(...c.imports);
 	code += c.code;
-	await (0, node_fs_promises.writeFile)((0, node_path.join)(outputPath, "client.ts"), `${imports.join("\n")}\n${code}`);
+	await Promise.all([(0, node_fs_promises.writeFile)((0, node_path.join)(outputPath, "client.ts"), `${imports.join("\n")}\n${code}`), (0, node_fs_promises.writeFile)((0, node_path.join)(outputPath, `${schemaFileName}.ts`), `// @ts-ignore
+export const schema = ${(0, devalue.uneval)((0, __urql_introspection.minifyIntrospectionQuery)((0, __urql_introspection.getIntrospectedSchema)(schema)))}`)]);
 }
 
 //#endregion
@@ -251,21 +251,23 @@ function makeGraphQLQuery({ queryName, input, client, enableSubscription = false
 	const otwQueryName = `${(0, es_toolkit.capitalize)(queryName)}Query`;
 	const argsString = stringifyArgumentObjectToGraphqlList(input?.[argsKey] ?? {});
 	const operationString = (operationVerb) => `${operationVerb} ${otwQueryName} { ${queryName}${argsString} ${input ? `{ ${stringifySelection(input)} }` : ""}}`;
-	let awaitedReturnValueReference;
-	const observable = (0, wonka.pipe)((0, wonka.merge)([client.query(operationString("query"), {}), enableSubscription ? client.subscription(operationString("subscription"), {}) : wonka.empty]), (0, wonka.map)((v) => {
+	const awaitedReturnValueReference = {};
+	const source = (0, wonka.pipe)((0, wonka.merge)([client.query(operationString("query"), {}), enableSubscription ? client.subscription(operationString("subscription"), {}) : wonka.empty]), wonka.share, (0, wonka.map)((v) => {
 		const data = v.data?.[queryName];
 		if (!data && v.error) throw v.error;
 		return data;
 	}), (0, wonka.onPush)((data) => {
-		if (awaitedReturnValueReference) Object.assign(awaitedReturnValueReference, data);
-	}), wonka.toObservable);
-	const promise = new Promise((resolve) => {
-		const unsub = observable.subscribe((v) => {
-			unsub();
-			awaitedReturnValueReference = Object.assign(v, observable);
-			resolve(awaitedReturnValueReference);
-		}).unsubscribe;
-	});
+		if (typeof data === "object" && data !== null) 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, data);
+			Object.assign(awaitedReturnValueReference, observable);
+			return awaitedReturnValueReference;
+		}
+		return data;
+	})));
 	Object.assign(promise, observable);
 	return promise;
 }
@@ -278,10 +280,7 @@ function makeGraphQLMutation({ mutationName, input, client }) {
 		return data;
 	}));
 	const observable = (0, wonka.toObservable)(response);
-	const promise = (0, wonka.toPromise)(response).then((res) => {
-		Object.assign(res, observable);
-		return res;
-	});
+	const promise = (0, wonka.toPromise)((0, wonka.pipe)(response, (0, wonka.take)(1)));
 	Object.assign(promise, observable);
 	return promise;
 }
@@ -316,6 +315,7 @@ function stringifyArgumentObjectToGraphqlList(args) {
 	return `(${entries.map(([key, value]) => `${key}: ${stringifyArgumentValue(value)}`).join(", ")})`;
 }
 function stringifyArgumentValue(arg) {
+	if (arg === null) return "null";
 	switch (typeof arg) {
 		case "string": return `"${arg}"`;
 		case "number": return `${arg}`;
@@ -1136,14 +1136,15 @@ const createWhereArgImplementer = ({ db, schemaBuilder, enumImplementer }) => {
 //#region lib/client/client.ts
 const clientCreatorImplementer = ({ builtSchema }) => {
 	if (process.env.NODE_ENV !== "development") console.warn("Running rumble client generation in non development mode. Are you sure this is correct?");
-	const clientCreator = async ({ apiUrl, outputPath, rumbleImportPath, useExternalUrqlClient }) => {
+	const clientCreator = async ({ apiUrl, outputPath, rumbleImportPath, useExternalUrqlClient, removeExisting }) => {
 		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(),
 			outputPath,
 			rumbleImportPath,
 			apiUrl,
-			useExternalUrqlClient
+			useExternalUrqlClient,
+			removeExisting
 		});
 	};
 	return clientCreator;