@gleanql/codegen 0.1.1 → 0.1.2

package/dist/index.mjs

@@ -168,12 +168,18 @@ function renderInputObject(type, ctx) {
 	const members = (type.inputFields ?? []).map((f) => "  " + renderInputMember(f, ctx));
 	return `export interface ${type.name} {\n${members.join("\n")}\n}`;
 }
-/** A field is callable when it declares arguments; otherwise it is a property. */
+/**
+* A field is callable when it declares arguments; otherwise it is a property.
+* (The runtime proxy makes the same split — args-fields return a function.)
+* The args object itself is optional when every argument is, so the common
+* no-args call reads `image.url()` rather than `image.url({})`.
+*/
 function renderFieldMember(name, args, type, ctx) {
 	const ret = renderTs(type, ctx.scalars);
 	if (args.length > 0) {
 		const argList = args.map((a) => renderInputMember(a, ctx)).join(" ");
-		return `${propKey(name)}(args: { ${argList} }): ${ret};`;
+		const allOptional = args.every((a) => a.type.kind !== "NON_NULL");
+		return `${propKey(name)}(args${allOptional ? "?" : ""}: { ${argList} }): ${ret};`;
 	}
 	return `${propKey(name)}: ${ret};`;
 }
@@ -218,7 +224,8 @@ function generateGraph(schema, options = {}) {
 }
 function renderRoot(field, scalars) {
 	const ret = renderTs(field.type, scalars);
-	const params = field.args.length > 0 ? `args: { ${field.args.map((a) => renderArg(a.name, a.type, scalars)).join(" ")} }` : "";
+	const allOptional = field.args.every((a) => a.type.kind !== "NON_NULL");
+	const params = field.args.length > 0 ? `args${allOptional ? "?" : ""}: { ${field.args.map((a) => renderArg(a.name, a.type, scalars)).join(" ")} }` : "";
 	return [
 		`${propKey(field.name)}(${params}): ${ret} {`,
 		`  return undefined as unknown as ${ret};`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gleanql/codegen",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Glean's schema codegen: introspection to schema model, branded types and graph accessors",
   "license": "MIT",
   "author": "Alexander Liljengard",
@@ -26,7 +26,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@gleanql/core": "0.1.1"
+    "@gleanql/core": "0.1.2"
   },
   "homepage": "https://gleanql.com",
   "bugs": "https://github.com/gleanql/gleanql/issues",

package/src/graph.ts

@@ -64,7 +64,13 @@ export function generateGraph(schema: IntrospectionSchema, options: GenerateGrap
 
 function renderRoot(field: IntrospectionField, scalars: Record<string, string>): string {
   const ret = renderTs(field.type, scalars);
-  const params = field.args.length > 0 ? `args: { ${field.args.map((a) => renderArg(a.name, a.type, scalars)).join(" ")} }` : "";
+  // The args object is optional when every argument is — `glean.productsCount()`
+  // should not demand an empty `{}`.
+  const allOptional = field.args.every((a) => a.type.kind !== "NON_NULL");
+  const params =
+    field.args.length > 0
+      ? `args${allOptional ? "?" : ""}: { ${field.args.map((a) => renderArg(a.name, a.type, scalars)).join(" ")} }`
+      : "";
   return [
     `${propKey(field.name)}(${params}): ${ret} {`,
     `  return undefined as unknown as ${ret};`,

package/src/types.ts

@@ -93,7 +93,12 @@ function renderInputObject(type: IntrospectionType, ctx: Ctx): string {
   return `export interface ${type.name} {\n${members.join("\n")}\n}`;
 }
 
-/** A field is callable when it declares arguments; otherwise it is a property. */
+/**
+ * A field is callable when it declares arguments; otherwise it is a property.
+ * (The runtime proxy makes the same split — args-fields return a function.)
+ * The args object itself is optional when every argument is, so the common
+ * no-args call reads `image.url()` rather than `image.url({})`.
+ */
 function renderFieldMember(
   name: string,
   args: readonly IntrospectionInputValue[],
@@ -103,7 +108,8 @@ function renderFieldMember(
   const ret = renderTs(type, ctx.scalars);
   if (args.length > 0) {
     const argList = args.map((a) => renderInputMember(a, ctx)).join(" ");
-    return `${propKey(name)}(args: { ${argList} }): ${ret};`;
+    const allOptional = args.every((a) => a.type.kind !== "NON_NULL");
+    return `${propKey(name)}(args${allOptional ? "?" : ""}: { ${argList} }): ${ret};`;
   }
   return `${propKey(name)}: ${ret};`;
 }