@soda-gql/tools 0.13.1 → 0.13.2

package/dist/bin.cjs

@@ -37,11 +37,9 @@ let graphql = require("graphql");
 let node_fs = require("node:fs");
 let esbuild = require("esbuild");
 let node_crypto = require("node:crypto");
+let __soda_gql_common = require("@soda-gql/common");
 let fast_glob = require("fast-glob");
 fast_glob = __toESM(fast_glob);
-let __soda_gql_common_template_extraction = require("@soda-gql/common/template-extraction");
-let __swc_core = require("@swc/core");
-let __soda_gql_common = require("@soda-gql/common");
 let zod = require("zod");
 
 //#region packages/tools/src/cli/errors.ts
@@ -3924,7 +3922,7 @@ const collectFragmentDependencies = (selections) => {
 * Map operation kind to root type name.
 * Uses schema.operationTypes if available, falls back to standard names.
 */
-const getRootTypeName$1 = (schema, kind) => {
+const getRootTypeName = (schema, kind) => {
 	if (schema) {
 		switch (kind) {
 			case "query": return schema.operationTypes.query ?? "Query";
@@ -3952,7 +3950,7 @@ const emitOperation = (operation, options) => {
 	if (operation.variables.length > 0) {
 		lines.push(`    variables: { ${emitVariables(operation.variables)} },`);
 	}
-	const rootTypeName = getRootTypeName$1(schema, operation.kind);
+	const rootTypeName = getRootTypeName(schema, operation.kind);
 	lines.push(`    fields: ({ f, $ }) => ({`);
 	const fieldLinesResult = emitSelections(operation.selections, 3, operation.variables, schema, rootTypeName);
 	if (fieldLinesResult.isErr()) {
@@ -5450,313 +5448,6 @@ const formatTypegenError = (error) => {
 	return lines.join("\n");
 };
 
-//#endregion
-//#region packages/tools/src/typegen/template-extractor.ts
-/**
-* Parse TypeScript source with SWC, returning null on failure.
-*/
-const safeParseSync = (source, tsx) => {
-	try {
-		return (0, __swc_core.parseSync)(source, {
-			syntax: "typescript",
-			tsx,
-			decorators: false,
-			dynamicImport: true
-		});
-	} catch {
-		return null;
-	}
-};
-/**
-* Collect gql identifiers from import declarations.
-* Finds imports like `import { gql } from "./graphql-system"`.
-*/
-const collectGqlIdentifiers = (module$1, filePath, helper) => {
-	const identifiers = new Set();
-	for (const item of module$1.body) {
-		let declaration = null;
-		if (item.type === "ImportDeclaration") {
-			declaration = item;
-		} else if ("declaration" in item && item.declaration && item.declaration.type === "ImportDeclaration") {
-			declaration = item.declaration;
-		}
-		if (!declaration) {
-			continue;
-		}
-		if (!helper.isGraphqlSystemImportSpecifier({
-			filePath,
-			specifier: declaration.source.value
-		})) {
-			continue;
-		}
-		for (const specifier of declaration.specifiers ?? []) {
-			if (specifier.type === "ImportSpecifier") {
-				const imported = specifier.imported ? specifier.imported.value : specifier.local.value;
-				if (imported === "gql" && !specifier.imported) {
-					identifiers.add(specifier.local.value);
-				}
-			}
-		}
-	}
-	return identifiers;
-};
-/**
-* Extract all tagged templates from a TypeScript source file.
-*
-* @param filePath - Absolute path to the source file (used for import resolution)
-* @param source - TypeScript source code
-* @param helper - GraphQL system identifier for resolving gql imports
-* @returns Extracted templates and any warnings
-*/
-const extractTemplatesFromSource = (filePath, source, helper) => {
-	const warnings = [];
-	const isTsx = filePath.endsWith(".tsx");
-	const program = safeParseSync(source, isTsx);
-	if (!program || program.type !== "Module") {
-		if (source.includes("gql")) {
-			warnings.push(`[typegen-extract] Failed to parse ${filePath}`);
-		}
-		return {
-			templates: [],
-			warnings
-		};
-	}
-	const gqlIdentifiers = collectGqlIdentifiers(program, filePath, helper);
-	if (gqlIdentifiers.size === 0) {
-		return {
-			templates: [],
-			warnings
-		};
-	}
-	return {
-		templates: (0, __soda_gql_common_template_extraction.walkAndExtract)(program, gqlIdentifiers),
-		warnings
-	};
-};
-
-//#endregion
-//#region packages/tools/src/typegen/template-scanner.ts
-/**
-* Source file scanner for tagged template extraction.
-*
-* Discovers source files from config include/exclude patterns,
-* reads them, and extracts tagged templates using the template extractor.
-*
-* @module
-*/
-/**
-* Scan source files for tagged templates.
-*
-* Uses fast-glob to discover files matching include/exclude patterns,
-* then extracts tagged templates from each file.
-*/
-const scanSourceFiles = (options) => {
-	const { include, exclude, baseDir, helper } = options;
-	const warnings = [];
-	const ignorePatterns = exclude.map((pattern) => pattern.startsWith("!") ? pattern.slice(1) : pattern);
-	const matchedFiles = fast_glob.default.sync(include, {
-		cwd: baseDir,
-		ignore: ignorePatterns,
-		onlyFiles: true,
-		absolute: true
-	});
-	const templates = new Map();
-	for (const filePath of matchedFiles) {
-		const normalizedPath = (0, node_path.normalize)((0, node_path.resolve)(filePath)).replace(/\\/g, "/");
-		try {
-			const source = (0, node_fs.readFileSync)(normalizedPath, "utf-8");
-			const { templates: extracted, warnings: extractionWarnings } = extractTemplatesFromSource(normalizedPath, source, helper);
-			warnings.push(...extractionWarnings);
-			if (extracted.length > 0) {
-				templates.set(normalizedPath, extracted);
-			}
-		} catch (error) {
-			const message = error instanceof Error ? error.message : String(error);
-			warnings.push(`[typegen-scan] Failed to read ${normalizedPath}: ${message}`);
-		}
-	}
-	return {
-		templates,
-		warnings
-	};
-};
-
-//#endregion
-//#region packages/tools/src/typegen/template-to-selections.ts
-/**
-* Convert extracted templates into field selections for the emitter.
-*
-* @param templates - Templates extracted from source files, keyed by file path
-* @param schemas - Loaded schema objects keyed by schema name
-* @returns Map of canonical IDs to field selection data, plus any warnings
-*/
-const convertTemplatesToSelections = (templates, schemas) => {
-	const selections = new Map();
-	const warnings = [];
-	const schemaIndexes = new Map(Object.entries(schemas).map(([name, schema]) => [name, (0, __soda_gql_core.createSchemaIndexFromSchema)(schema)]));
-	for (const [filePath, fileTemplates] of templates) {
-		for (const template of fileTemplates) {
-			const schema = schemas[template.schemaName];
-			if (!schema) {
-				warnings.push(`[typegen-template] Unknown schema "${template.schemaName}" in ${filePath}`);
-				continue;
-			}
-			const schemaIndex = schemaIndexes.get(template.schemaName);
-			if (!schemaIndex) {
-				continue;
-			}
-			try {
-				if (template.kind === "fragment") {
-					const selection = convertFragmentTemplate(template, schema, filePath);
-					if (selection) {
-						selections.set(selection.id, selection.data);
-					}
-				} else {
-					const selection = convertOperationTemplate(template, schema, filePath);
-					if (selection) {
-						selections.set(selection.id, selection.data);
-					}
-				}
-			} catch (error) {
-				const message = error instanceof Error ? error.message : String(error);
-				warnings.push(`[typegen-template] Failed to process ${template.kind} in ${filePath}: ${message}`);
-			}
-		}
-	}
-	return {
-		selections,
-		warnings
-	};
-};
-/**
-* Recursively filter out __FRAG_SPREAD_ placeholder nodes from a selection set.
-* These placeholders are created by template-extractor for interpolated fragment references.
-* buildFieldsFromSelectionSet would throw on them since no interpolationMap is available.
-*/
-const filterPlaceholderSpreads = (selectionSet) => ({
-	...selectionSet,
-	selections: selectionSet.selections.filter((sel) => !(sel.kind === graphql.Kind.FRAGMENT_SPREAD && sel.name.value.startsWith("__FRAG_SPREAD_"))).map((sel) => {
-		if (sel.kind === graphql.Kind.FIELD && sel.selectionSet) {
-			return {
-				...sel,
-				selectionSet: filterPlaceholderSpreads(sel.selectionSet)
-			};
-		}
-		if (sel.kind === graphql.Kind.INLINE_FRAGMENT && sel.selectionSet) {
-			return {
-				...sel,
-				selectionSet: filterPlaceholderSpreads(sel.selectionSet)
-			};
-		}
-		return sel;
-	})
-});
-/** Simple matching-paren finder for template content (no comments/strings to handle). */
-const findClosingParen = (source, openIndex) => {
-	let depth$3 = 0;
-	for (let i = openIndex; i < source.length; i++) {
-		if (source[i] === "(") depth$3++;
-		else if (source[i] === ")") {
-			depth$3--;
-			if (depth$3 === 0) return i;
-		}
-	}
-	return -1;
-};
-/**
-* Reconstruct full GraphQL source from an extracted template.
-* For curried syntax (new), prepends the definition header from tag call arguments.
-* For curried fragments with Fragment Arguments, repositions variable declarations
-* before the on-clause to produce RFC-compliant syntax.
-* For old syntax, returns content as-is.
-*/
-const reconstructGraphql = (template) => {
-	if (template.elementName) {
-		if (template.kind === "fragment" && template.typeName) {
-			const trimmed = template.content.trim();
-			if (trimmed.startsWith("(")) {
-				const closeIdx = findClosingParen(trimmed, 0);
-				if (closeIdx !== -1) {
-					const varDecls = trimmed.slice(0, closeIdx + 1);
-					const selectionSet = trimmed.slice(closeIdx + 1).trim();
-					return `fragment ${template.elementName}${varDecls} on ${template.typeName} ${selectionSet}`;
-				}
-			}
-			return `fragment ${template.elementName} on ${template.typeName} ${trimmed}`;
-		}
-		return `${template.kind} ${template.elementName} ${template.content}`;
-	}
-	return template.content;
-};
-/**
-* Convert a fragment template into FieldSelectionData.
-*/
-const convertFragmentTemplate = (template, schema, filePath) => {
-	const schemaIndex = (0, __soda_gql_core.createSchemaIndexFromSchema)(schema);
-	const graphqlSource = reconstructGraphql(template);
-	const variableDefinitions = (0, __soda_gql_core.extractFragmentVariables)(graphqlSource, schemaIndex);
-	const { preprocessed } = (0, __soda_gql_core.preprocessFragmentArgs)(graphqlSource);
-	const document = (0, graphql.parse)(preprocessed);
-	const fragDef = document.definitions.find((d) => d.kind === graphql.Kind.FRAGMENT_DEFINITION);
-	if (!fragDef || fragDef.kind !== graphql.Kind.FRAGMENT_DEFINITION) {
-		return null;
-	}
-	const fragmentName = fragDef.name.value;
-	const onType = fragDef.typeCondition.name.value;
-	const fields = (0, __soda_gql_core.buildFieldsFromSelectionSet)(filterPlaceholderSpreads(fragDef.selectionSet), schema, onType);
-	const id = `${filePath}::${fragmentName}`;
-	return {
-		id,
-		data: {
-			type: "fragment",
-			schemaLabel: schema.label,
-			key: fragmentName,
-			typename: onType,
-			fields,
-			variableDefinitions
-		}
-	};
-};
-/**
-* Convert an operation template into FieldSelectionData.
-*/
-const convertOperationTemplate = (template, schema, filePath) => {
-	const graphqlSource = reconstructGraphql(template);
-	const document = (0, graphql.parse)(graphqlSource);
-	const opDef = document.definitions.find((d) => d.kind === graphql.Kind.OPERATION_DEFINITION);
-	if (!opDef || opDef.kind !== graphql.Kind.OPERATION_DEFINITION) {
-		return null;
-	}
-	const operationName = opDef.name?.value ?? "Anonymous";
-	const operationType = opDef.operation;
-	const rootTypeName = getRootTypeName(schema, operationType);
-	const fields = (0, __soda_gql_core.buildFieldsFromSelectionSet)(filterPlaceholderSpreads(opDef.selectionSet), schema, rootTypeName);
-	const variableDefinitions = opDef.variableDefinitions ?? [];
-	const id = `${filePath}::${operationName}`;
-	return {
-		id,
-		data: {
-			type: "operation",
-			schemaLabel: schema.label,
-			operationName,
-			operationType,
-			fields,
-			variableDefinitions: [...variableDefinitions]
-		}
-	};
-};
-/**
-* Get the root type name for an operation type from the schema.
-*/
-const getRootTypeName = (schema, operationType) => {
-	switch (operationType) {
-		case "query": return schema.operations.query ?? "Query";
-		case "mutation": return schema.operations.mutation ?? "Mutation";
-		case "subscription": return schema.operations.subscription ?? "Subscription";
-		default: return "Query";
-	}
-};
-
 //#endregion
 //#region packages/tools/src/typegen/runner.ts
 /**
@@ -5766,8 +5457,7 @@ const getRootTypeName = (schema, operationType) => {
 * 1. Load schemas from generated CJS bundle
 * 2. Build artifact to evaluate elements
 * 3. Extract field selections from builder
-* 4. Scan source files for tagged templates and merge selections
-* 5. Emit types.prebuilt.ts
+* 4. Emit types.prebuilt.ts
 *
 * @module
 */
@@ -5815,8 +5505,7 @@ const toImportSpecifier = (fromPath, targetPath, options) => {
 * 1. Loads schemas from the generated CJS bundle
 * 2. Creates a BuilderService and builds the artifact
 * 3. Extracts field selections from the artifact
-* 4. Scans source files for tagged templates and merges selections
-* 5. Emits types.prebuilt.ts using emitPrebuiltTypes
+* 4. Emits types.prebuilt.ts using emitPrebuiltTypes
 *
 * @param options - Typegen options including config
 * @returns Result containing success data or error
@@ -5848,16 +5537,7 @@ const runTypegen = async (options) => {
 	}
 	const fieldSelectionsResult = (0, __soda_gql_builder.extractFieldSelections)(intermediateElements);
 	const { selections: builderSelections, warnings: extractWarnings } = fieldSelectionsResult;
-	const graphqlHelper = (0, __soda_gql_builder.createGraphqlSystemIdentifyHelper)(config);
-	const scanResult = scanSourceFiles({
-		include: [...config.include],
-		exclude: [...config.exclude],
-		baseDir: config.baseDir,
-		helper: graphqlHelper
-	});
-	const templateSelections = convertTemplatesToSelections(scanResult.templates, schemas);
-	const fieldSelections = mergeSelections(builderSelections, templateSelections.selections, config.baseDir);
-	const scanWarnings = [...scanResult.warnings, ...templateSelections.warnings];
+	const fieldSelections = new Map(builderSelections);
 	const emitResult = await emitPrebuiltTypes({
 		schemas,
 		fieldSelections,
@@ -5877,11 +5557,7 @@ const runTypegen = async (options) => {
 			operationCount++;
 		}
 	}
-	const allWarnings = [
-		...extractWarnings,
-		...scanWarnings,
-		...emitWarnings
-	];
+	const allWarnings = [...extractWarnings, ...emitWarnings];
 	return (0, neverthrow.ok)({
 		prebuiltTypesPath,
 		fragmentCount,
@@ -5890,41 +5566,6 @@ const runTypegen = async (options) => {
 		warnings: allWarnings
 	});
 };
-const extractElementName = (data) => data.type === "fragment" ? data.key : data.operationName;
-/**
-* Merge builder and template selections into a combined map.
-*
-* Builder selections are authoritative — VM evaluation correctly resolves
-* fragment spreads that static template analysis cannot handle.
-* Template selections serve as fallback for elements only found by the scanner.
-*
-* Deduplication is per-element (file + GraphQL name), not per-file, so that
-* callback-builder operations in files that also contain tagged templates are preserved.
-*/
-const mergeSelections = (builderSelections, templateSelections, baseDir) => {
-	const extractFilePart = (id) => {
-		const filePart = id.split("::")[0] ?? "";
-		if (filePart.startsWith("/")) {
-			return (0, node_path.relative)(baseDir, filePart);
-		}
-		return filePart;
-	};
-	const builderElements = new Set();
-	for (const [id, data] of builderSelections) {
-		const name = extractElementName(data);
-		if (name) builderElements.add(`${extractFilePart(id)}::${name}`);
-	}
-	const fieldSelections = new Map();
-	for (const [id, data] of builderSelections) {
-		fieldSelections.set(id, data);
-	}
-	for (const [id, data] of templateSelections) {
-		const name = extractElementName(data);
-		if (name && builderElements.has(`${extractFilePart(id)}::${name}`)) continue;
-		fieldSelections.set(id, data);
-	}
-	return fieldSelections;
-};
 
 //#endregion
 //#region packages/tools/src/cli/schemas/args.ts
@@ -7136,7 +6777,7 @@ const doctorCommand = (argv) => {
 //#region packages/tools/src/cli/commands/format.ts
 const loadFormatter = async () => {
 	try {
-		return await Promise.resolve().then(() => require("./formatter-Glj5a663.cjs"));
+		return await Promise.resolve().then(() => require("./formatter-D5rL2R7k.cjs"));
 	} catch {
 		return null;
 	}
@@ -9603,9 +9244,9 @@ var require_readdirp = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		return new ReaddirpStream(options);
 	};
 	const readdirpPromise = (root, options = {}) => {
-		return new Promise((resolve$14, reject) => {
+		return new Promise((resolve$13, reject) => {
 			const files = [];
-			readdirp$1(root, options).on("data", (entry) => files.push(entry)).on("end", () => resolve$14(files)).on("error", (error) => reject(error));
+			readdirp$1(root, options).on("data", (entry) => files.push(entry)).on("end", () => resolve$13(files)).on("error", (error) => reject(error));
 		});
 	};
 	readdirp$1.promise = readdirpPromise;
@@ -13757,13 +13398,13 @@ var require_nodefs_handler = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 					this._addToNodeFs(path$7, initialAdd, wh, depth$3 + 1);
 				}
 			}).on(EV_ERROR$2, this._boundHandleError);
-			return new Promise((resolve$14) => stream.once(STR_END$2, () => {
+			return new Promise((resolve$13) => stream.once(STR_END$2, () => {
 				if (this.fsw.closed) {
 					stream = undefined;
 					return;
 				}
 				const wasThrottled = throttler ? throttler.clear() : false;
-				resolve$14();
+				resolve$13();
 				previous.getChildren().filter((item) => {
 					return item !== directory && !current.has(item) && (!wh.hasGlob || wh.filterPath({ fullPath: sysPath$2.resolve(directory, item) }));
 				}).forEach((item) => {