@soda-gql/core 0.14.4 → 0.15.0

package/dist/index.cjs

@@ -2488,7 +2488,7 @@ const getVarRefValue = (varRef) => {
 const SelectableProxyInnerRegistry = /* @__PURE__ */ new WeakMap();
 const getSelectableProxyInner = (proxy) => {
 	const inner = SelectableProxyInnerRegistry.get(proxy);
-	if (!inner) throw new Error(`Proxy inner not found`);
+	if (!inner) throw new Error("$var selector must return the proxy itself or a field navigated from it (e.g. (p) => p or (p) => p.user.id); it returned a value that is not a selector proxy");
 	return inner;
 };
 const createSelectableProxy = (current) => {
@@ -2503,7 +2503,7 @@ const createSelectableProxy = (current) => {
 			varInner: {
 				type: "virtual",
 				varName: current.varInner.name,
-				varSegments: nextSegments
+				varSegments: current.segments
 			},
 			segments: nextSegments
 		});
@@ -3508,22 +3508,29 @@ const generateInputType = (schema, variableDefinitions, formatters) => {
 * Generate TypeScript type for a single input field from its parsed specifier.
 * Used by generateInputTypeFromSpecifiers.
 */
-const generateInputFieldTypeFromSpecifier = (schema, specifier, options) => {
-	let baseType;
+const resolveInputBaseTypeFromSpecifier = (schema, specifier, options) => {
 	const { formatters } = options;
 	switch (specifier.kind) {
-		case "scalar":
-			baseType = formatters?.scalarInput?.(specifier.name) ?? getScalarInputType(schema, specifier.name);
-			break;
-		case "enum":
-			baseType = getEnumType(schema, specifier.name);
-			break;
-		case "input":
-			baseType = formatters?.inputObject?.(specifier.name) ?? generateInputObjectType(schema, specifier.name, options);
-			break;
-		default: baseType = "unknown";
+		case "scalar": return formatters?.scalarInput?.(specifier.name) ?? getScalarInputType(schema, specifier.name);
+		case "enum": return getEnumType(schema, specifier.name);
+		case "input": return formatters?.inputObject?.(specifier.name) ?? generateInputObjectType(schema, specifier.name, options);
+		default: return "unknown";
 	}
-	return applyTypeModifier(baseType, specifier.modifier);
+};
+const generateInputFieldTypeFromSpecifier = (schema, specifier, options) => {
+	return applyTypeModifier(resolveInputBaseTypeFromSpecifier(schema, specifier, options), specifier.modifier);
+};
+/**
+* Wraps a base type in array brackets for each list level in the modifier. Only the
+* list dimensions are applied here; nullability is layered on by the caller. Matches
+* the operation-side `graphqlTypeToTypeScript`, which also drops inner-list-element
+* nullability (a shared limitation of the generated `input` type).
+*/
+const applyListModifier = (baseType, modifier) => {
+	const listDepth = modifier.split("[]").length - 1;
+	let result = baseType;
+	for (let i = 0; i < listDepth; i++) result = `(${result})[]`;
+	return result;
 };
 /**
 * Generate a TypeScript type string for input variables from InputTypeSpecifiers.
@@ -3568,6 +3575,23 @@ const generateInputTypeFromVarDefs = (schema, varDefs, options = {}) => {
 		return `readonly ${name}${!isOuterRequired || hasDefault ? "?" : ""}: ${baseType}`;
 	}).join("; ")} }`;
 };
+/**
+* Generate the per-variable payload type map for a fragment's variables.
+*
+* Mirrors the operation-side `varTypes` map: the key is always present (`$.<name>` is
+* always a ref) while the value keeps the variable's outer nullability — an optional
+* or nullable variable reads as `| null | undefined`, so downstream consumers see the
+* value that actually arrives at spread time. Backs the VarRef payload types consumed
+* by `$`/`$var` in metadata builders.
+*/
+const generateVarTypesFromVarDefs = (schema, varDefs, options = {}) => {
+	const entries = Object.entries(varDefs);
+	if (entries.length === 0) return "{}";
+	return `{ ${entries.map(([name, varSpec]) => {
+		const listType = applyListModifier(resolveInputBaseTypeFromSpecifier(schema, varSpec, options), varSpec.modifier);
+		return `readonly ${name}: ${varSpec.modifier.endsWith("!") ? listType : `(${listType} | null | undefined)`}`;
+	}).join("; ")} }`;
+};
 
 //#endregion
 exports.Fragment = Fragment;
@@ -3617,6 +3641,7 @@ exports.generateInputObjectType = generateInputObjectType;
 exports.generateInputType = generateInputType;
 exports.generateInputTypeFromSpecifiers = generateInputTypeFromSpecifiers;
 exports.generateInputTypeFromVarDefs = generateInputTypeFromVarDefs;
+exports.generateVarTypesFromVarDefs = generateVarTypesFromVarDefs;
 exports.getArgumentType = getArgumentType;
 exports.getCurrentFieldPath = getCurrentFieldPath;
 exports.getEnumType = getEnumType;