@soda-gql/builder 0.11.9 → 0.11.11

package/dist/{service-CKlB44r5.cjs → service-BCL5TzS7.cjs}

@@ -1509,35 +1509,66 @@ const createGraphqlSystemIdentifyHelper = (config) => {
 	};
 };
 
+//#endregion
+//#region packages/builder/src/artifact/canonical-id-utils.ts
+/**
+* Parse a canonical ID with validation.
+* Returns a Result with parsed components or a BuilderError.
+*
+* @param canonicalId - The canonical ID to parse
+* @returns Result with {filePath, astPath} or BuilderError
+*/
+const parseCanonicalIdSafe = (canonicalId) => {
+	const validation = (0, __soda_gql_common.validateCanonicalId)(canonicalId);
+	if (!validation.isValid) {
+		return (0, neverthrow.err)(builderErrors.canonicalPathInvalid(canonicalId, validation.reason));
+	}
+	return (0, neverthrow.ok)((0, __soda_gql_common.parseCanonicalId)(canonicalId));
+};
+/**
+* Extract file path from canonical ID with validation.
+* Returns a Result with the file path or a BuilderError.
+*
+* @param canonicalId - The canonical ID to extract from
+* @returns Result with filePath or BuilderError
+*/
+const extractFilePathSafe = (canonicalId) => {
+	return parseCanonicalIdSafe(canonicalId).map(({ filePath }) => filePath);
+};
+
 //#endregion
 //#region packages/builder/src/artifact/aggregate.ts
-const canonicalToFilePath$1 = (canonicalId) => canonicalId.split("::")[0] ?? canonicalId;
 const computeContentHash = (prebuild) => {
 	const hash = (0, node_crypto.createHash)("sha1");
 	hash.update(JSON.stringify(prebuild));
 	return hash.digest("hex");
 };
-const emitRegistrationError = (definition, message) => ({
+const emitRegistrationError = (filePath, astPath, message) => ({
 	code: "RUNTIME_MODULE_LOAD_FAILED",
-	filePath: canonicalToFilePath$1(definition.canonicalId),
-	astPath: definition.astPath,
+	filePath,
+	astPath,
 	message
 });
 const aggregate = ({ analyses, elements }) => {
 	const registry = new Map();
 	for (const analysis of analyses.values()) {
 		for (const definition of analysis.definitions) {
+			const parsedResult = parseCanonicalIdSafe(definition.canonicalId);
+			if (parsedResult.isErr()) {
+				return (0, neverthrow.err)(parsedResult.error);
+			}
+			const { filePath, astPath } = parsedResult.value;
 			const element = elements[definition.canonicalId];
 			if (!element) {
 				const availableIds = Object.keys(elements).join(", ");
 				const message = `ARTIFACT_NOT_FOUND_IN_RUNTIME_MODULE: ${definition.canonicalId}\nAvailable: ${availableIds}`;
-				return (0, neverthrow.err)(emitRegistrationError(definition, message));
+				return (0, neverthrow.err)(emitRegistrationError(filePath, astPath, message));
 			}
 			if (registry.has(definition.canonicalId)) {
-				return (0, neverthrow.err)(emitRegistrationError(definition, `ARTIFACT_ALREADY_REGISTERED`));
+				return (0, neverthrow.err)(emitRegistrationError(filePath, astPath, `ARTIFACT_ALREADY_REGISTERED`));
 			}
 			const metadata = {
-				sourcePath: analysis.filePath ?? canonicalToFilePath$1(definition.canonicalId),
+				sourcePath: filePath,
 				contentHash: ""
 			};
 			if (element.type === "fragment") {
@@ -1577,7 +1608,7 @@ const aggregate = ({ analyses, elements }) => {
 				});
 				continue;
 			}
-			return (0, neverthrow.err)(emitRegistrationError(definition, "UNKNOWN_ARTIFACT_KIND"));
+			return (0, neverthrow.err)(emitRegistrationError(filePath, astPath, "UNKNOWN_ARTIFACT_KIND"));
 		}
 	}
 	return (0, neverthrow.ok)(registry);
@@ -1585,7 +1616,6 @@ const aggregate = ({ analyses, elements }) => {
 
 //#endregion
 //#region packages/builder/src/artifact/issue-handler.ts
-const canonicalToFilePath = (canonicalId) => canonicalId.split("::")[0] ?? canonicalId;
 const checkIssues = ({ elements }) => {
 	const operationNames = new Set();
 	for (const [canonicalId, { type, element }] of Object.entries(elements)) {
@@ -1593,7 +1623,11 @@ const checkIssues = ({ elements }) => {
 			continue;
 		}
 		if (operationNames.has(element.operationName)) {
-			const sources = [canonicalToFilePath(canonicalId)];
+			const filePathResult = extractFilePathSafe(canonicalId);
+			if (filePathResult.isErr()) {
+				return (0, neverthrow.err)(filePathResult.error);
+			}
+			const sources = [filePathResult.value];
 			return (0, neverthrow.err)({
 				code: "DOC_DUPLICATE",
 				message: `Duplicate document name: ${element.operationName}`,
@@ -1879,7 +1913,7 @@ const unwrapMethodChains$1 = (identifiers, node) => {
 	}
 	return unwrapMethodChains$1(identifiers, callee.object);
 };
-const collectAllDefinitions$1 = ({ module: module$1, gqlIdentifiers, imports: _imports, exports: exports$1, source }) => {
+const collectAllDefinitions$1 = ({ module: module$1, gqlIdentifiers, imports: _imports, exports: exports$1, source, baseDir }) => {
 	const getPropertyName$1 = (property) => {
 		if (!property) {
 			return null;
@@ -1897,6 +1931,7 @@ const collectAllDefinitions$1 = ({ module: module$1, gqlIdentifiers, imports: _i
 	const exportBindings = createExportBindingsMap(exports$1);
 	const tracker = (0, __soda_gql_common.createCanonicalTracker)({
 		filePath: module$1.__filePath,
+		baseDir,
 		getExportName: (localName) => exportBindings.get(localName)
 	});
 	const anonymousCounters = new Map();
@@ -2071,7 +2106,7 @@ const collectAllDefinitions$1 = ({ module: module$1, gqlIdentifiers, imports: _i
 		visit(statement, []);
 	});
 	const definitions = pending.map((item) => ({
-		canonicalId: (0, __soda_gql_common.createCanonicalId)(module$1.__filePath, item.astPath),
+		canonicalId: (0, __soda_gql_common.createCanonicalId)(module$1.__filePath, item.astPath, { baseDir }),
 		astPath: item.astPath,
 		isTopLevel: item.isTopLevel,
 		isExported: item.isExported,
@@ -2333,7 +2368,8 @@ const swcAdapter = { analyze(input, helper) {
 		gqlIdentifiers,
 		imports,
 		exports: exports$1,
-		source: input.source
+		source: input.source,
+		baseDir: input.baseDir
 	});
 	const diagnostics = [
 		...collectImportDiagnostics$1(swcModule, helper),
@@ -2546,12 +2582,13 @@ const getPropertyName = (name) => {
 /**
 * Collect all gql definitions (exported, non-exported, top-level, nested)
 */
-const collectAllDefinitions = ({ sourceFile, identifiers, exports: exports$1 }) => {
+const collectAllDefinitions = ({ sourceFile, identifiers, exports: exports$1, baseDir }) => {
 	const pending = [];
 	const handledCalls = [];
 	const exportBindings = createExportBindingsMap(exports$1);
 	const tracker = (0, __soda_gql_common.createCanonicalTracker)({
 		filePath: sourceFile.fileName,
+		baseDir,
 		getExportName: (localName) => exportBindings.get(localName)
 	});
 	const anonymousCounters = new Map();
@@ -2695,7 +2732,7 @@ const collectAllDefinitions = ({ sourceFile, identifiers, exports: exports$1 })
 		visit(statement, []);
 	});
 	const definitions = pending.map((item) => ({
-		canonicalId: (0, __soda_gql_common.createCanonicalId)(sourceFile.fileName, item.astPath),
+		canonicalId: (0, __soda_gql_common.createCanonicalId)(sourceFile.fileName, item.astPath, { baseDir }),
 		astPath: item.astPath,
 		isTopLevel: item.isTopLevel,
 		isExported: item.isExported,
@@ -2899,7 +2936,8 @@ const typescriptAdapter = { analyze(input, helper) {
 	const { definitions } = collectAllDefinitions({
 		sourceFile,
 		identifiers: gqlIdentifiers,
-		exports: exports$1
+		exports: exports$1,
+		baseDir: input.baseDir
 	});
 	const diagnostics = [
 		...collectImportDiagnostics(sourceFile, helper),
@@ -2950,13 +2988,17 @@ const analyzeModuleCore = (input, adapter, graphqlHelper) => {
 
 //#endregion
 //#region packages/builder/src/ast/index.ts
-const createAstAnalyzer = ({ analyzer, graphqlHelper }) => {
+const createAstAnalyzer = ({ analyzer, graphqlHelper, baseDir }) => {
 	const analyze = (input) => {
+		const inputWithBaseDir = {
+			...input,
+			baseDir
+		};
 		if (analyzer === "ts") {
-			return analyzeModuleCore(input, typescriptAdapter, graphqlHelper);
+			return analyzeModuleCore(inputWithBaseDir, typescriptAdapter, graphqlHelper);
 		}
 		if (analyzer === "swc") {
-			return analyzeModuleCore(input, swcAdapter, graphqlHelper);
+			return analyzeModuleCore(inputWithBaseDir, swcAdapter, graphqlHelper);
 		}
 		return assertUnreachable(analyzer, "createAstAnalyzer");
 	};
@@ -3361,22 +3403,45 @@ const createDiscoveryCache = (options) => new JsonDiscoveryCache(options);
 /**
 * Extract all unique dependencies (relative + external) from the analysis.
 * Resolves local specifiers immediately so discovery only traverses once.
+*
+* Resolution order:
+* 1. Relative imports → resolveRelativeImportWithExistenceCheck
+* 2. Alias imports (if aliasResolver provided) → aliasResolver.resolve
+* 3. Otherwise → mark as external
 */
-const extractModuleDependencies = (analysis) => {
+const extractModuleDependencies = ({ analysis, aliasResolver }) => {
 	const dependencies = new Map();
 	const addDependency = (specifier) => {
 		if (dependencies.has(specifier)) {
 			return;
 		}
-		const isExternal = (0, __soda_gql_common.isExternalSpecifier)(specifier);
-		const resolvedPath = isExternal ? null : (0, __soda_gql_common.resolveRelativeImportWithExistenceCheck)({
-			filePath: analysis.filePath,
-			specifier
-		});
+		if (!(0, __soda_gql_common.isExternalSpecifier)(specifier)) {
+			const resolvedPath = (0, __soda_gql_common.resolveRelativeImportWithExistenceCheck)({
+				filePath: analysis.filePath,
+				specifier
+			});
+			dependencies.set(specifier, {
+				specifier,
+				resolvedPath,
+				isExternal: false
+			});
+			return;
+		}
+		if (aliasResolver) {
+			const resolvedPath = aliasResolver.resolve(specifier);
+			if (resolvedPath) {
+				dependencies.set(specifier, {
+					specifier,
+					resolvedPath,
+					isExternal: false
+				});
+				return;
+			}
+		}
 		dependencies.set(specifier, {
 			specifier,
-			resolvedPath,
-			isExternal
+			resolvedPath: null,
+			isExternal: true
 		});
 	};
 	for (const imp of analysis.imports) {
@@ -3530,10 +3595,28 @@ function clearFingerprintCache() {
 //#endregion
 //#region packages/builder/src/discovery/discoverer.ts
 /**
+* JavaScript file extensions that should be treated as empty modules.
+* These files are included in the dependency graph but not parsed for definitions.
+*/
+const JS_FILE_EXTENSIONS = [
+	".js",
+	".mjs",
+	".cjs",
+	".jsx"
+];
+/**
+* Check if a file path is a JavaScript file (not TypeScript).
+* Used to skip AST analysis for JS files that are resolved as fallbacks.
+*/
+const isJsFile = (filePath) => {
+	const ext = (0, node_path.extname)(filePath).toLowerCase();
+	return JS_FILE_EXTENSIONS.includes(ext);
+};
+/**
 * Generator-based module discovery that yields effects for file I/O.
 * This allows the discovery process to be executed with either sync or async schedulers.
 */
-function* discoverModulesGen({ entryPaths, astAnalyzer, incremental }) {
+function* discoverModulesGen({ entryPaths, astAnalyzer, aliasResolver, incremental }) {
 	const snapshots = new Map();
 	const stack = [...entryPaths];
 	const changedFiles = incremental?.changedFiles ?? new Set();
@@ -3596,12 +3679,27 @@ function* discoverModulesGen({ entryPaths, astAnalyzer, incremental }) {
 			continue;
 		}
 		const signature = createSourceHash(source);
-		const analysis = astAnalyzer.analyze({
-			filePath,
-			source
-		});
+		let analysis;
+		if (isJsFile(filePath)) {
+			analysis = {
+				filePath,
+				signature,
+				definitions: [],
+				imports: [],
+				exports: [],
+				diagnostics: []
+			};
+		} else {
+			analysis = astAnalyzer.analyze({
+				filePath,
+				source
+			});
+		}
 		cacheMisses++;
-		const dependencies = extractModuleDependencies(analysis);
+		const dependencies = extractModuleDependencies({
+			analysis,
+			aliasResolver
+		});
 		for (const dep of dependencies) {
 			if (!dep.isExternal && dep.resolvedPath && !snapshots.has(dep.resolvedPath)) {
 				stack.push(dep.resolvedPath);
@@ -3667,12 +3765,11 @@ const discoverModulesAsync = async (options) => {
 //#endregion
 //#region packages/builder/src/utils/glob.ts
 /**
-* Cross-runtime glob pattern matching abstraction
-* Provides a unified interface for glob operations across Bun and Node.js
+* Glob pattern matching using fast-glob
 */
 /**
 * Scan files matching glob patterns from the given directory.
-* Supports negation patterns (e.g., "!**\/excluded.ts") when using fast-glob.
+* Supports negation patterns (e.g., "!**\/excluded.ts").
 *
 * @param patterns - Glob pattern(s). Can be a single pattern or array of patterns.
 * @param cwd - Working directory (defaults to process.cwd())
@@ -3680,18 +3777,6 @@ const discoverModulesAsync = async (options) => {
 */
 const scanGlob = (patterns, cwd = process.cwd()) => {
 	const patternArray = Array.isArray(patterns) ? patterns : [patterns];
-	const hasNegation = patternArray.some((p) => p.startsWith("!"));
-	if (typeof Bun !== "undefined" && Bun.Glob && !hasNegation) {
-		const { Glob } = Bun;
-		const results = new Set();
-		for (const pattern of patternArray) {
-			const glob = new Glob(pattern);
-			for (const match of glob.scanSync(cwd)) {
-				results.add(match);
-			}
-		}
-		return Array.from(results);
-	}
 	return fast_glob.default.sync(patternArray, {
 		cwd,
 		dot: true,
@@ -3986,7 +4071,8 @@ const createBuilderSession = (options) => {
 	const graphqlHelper = createGraphqlSystemIdentifyHelper(config);
 	const ensureAstAnalyzer = (0, __soda_gql_common.cachedFn)(() => createAstAnalyzer({
 		analyzer: config.analyzer,
-		graphqlHelper
+		graphqlHelper,
+		baseDir: config.baseDir
 	}));
 	const ensureDiscoveryCache = (0, __soda_gql_common.cachedFn)(() => createDiscoveryCache({
 		factory: cacheFactory,
@@ -4033,6 +4119,7 @@ const createBuilderSession = (options) => {
 			input: {
 				entryPaths,
 				astAnalyzer: ensureAstAnalyzer(),
+				aliasResolver: config.tsconfigPaths ? (0, __soda_gql_common.createAliasResolver)(config.tsconfigPaths) : undefined,
 				discoveryCache: ensureDiscoveryCache(),
 				changedFiles,
 				removedFiles,
@@ -4155,7 +4242,7 @@ const prepare = (input) => {
 * This enables single scheduler control at the root level for both sync and async execution.
 */
 function* buildGen(input) {
-	const { entryPaths, astAnalyzer, discoveryCache, changedFiles, removedFiles, previousModuleAdjacency, previousIntermediateModules, graphqlSystemPath, graphqlHelper } = input;
+	const { entryPaths, astAnalyzer, aliasResolver, discoveryCache, changedFiles, removedFiles, previousModuleAdjacency, previousIntermediateModules, graphqlSystemPath, graphqlHelper } = input;
 	const affectedFiles = collectAffectedFiles({
 		changedFiles,
 		removedFiles,
@@ -4164,6 +4251,7 @@ function* buildGen(input) {
 	const discoveryResult = yield* discoverModulesGen({
 		entryPaths,
 		astAnalyzer,
+		aliasResolver,
 		incremental: {
 			cache: discoveryCache,
 			changedFiles,
@@ -4392,4 +4480,4 @@ Object.defineProperty(exports, 'loadArtifactSync', {
     return loadArtifactSync;
   }
 });
-//# sourceMappingURL=service-CKlB44r5.cjs.map
+//# sourceMappingURL=service-BCL5TzS7.cjs.map