Skip to content

fix: use input file location for compose #2102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Noroth merged 3 commits into from
Aug 4, 2025
Merged

fix: use input file location for compose #2102

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e062e17
fix: use input file location for gRPC subgraphs
Noroth Aug 4, 2025
875bdf3
fix: use input file location for plugin paths
Noroth Aug 4, 2025
9b9e85e
Merge branch 'main' into ludwig/fix-file-location-for-compose
Noroth Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions cli/src/commands/router/commands/compose.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,24 +277,24 @@ function toSubgraphMetadata(
subgraphs: SubgraphMetadata[],
): Promise<SubgraphMetadata> {
if ('plugin' in subgraphConfig) {
return toSubgraphMetadataPlugin(subgraphConfig, subgraphs);
return toSubgraphMetadataPlugin(inputFileLocation, subgraphConfig, subgraphs);
}

if ('grpc' in subgraphConfig) {
return toSubgraphMetadataGRPC(subgraphConfig);
return toSubgraphMetadataGRPC(inputFileLocation, subgraphConfig);
}

return toSubgraphMetadataStandard(inputFileLocation, index, subgraphConfig, subgraphs);
}

async function toSubgraphMetadataGRPC(s: GRPCSubgraphConfig): Promise<GRPCSubgraphMetadata> {
validateGRPCSubgraph(s);
async function toSubgraphMetadataGRPC(inputFileLocation: string, s: GRPCSubgraphConfig): Promise<GRPCSubgraphMetadata> {
validateGRPCSubgraph(inputFileLocation, s);

const mappingFileContent = await readFile(s.grpc.mapping_file, 'utf8');
const mappingFileContent = await readFile(resolve(inputFileLocation, s.grpc.mapping_file), 'utf8');
const mapping = GRPCMapping.fromJsonString(mappingFileContent);

const protoSchemaFileContent = await readFile(s.grpc.proto_file, 'utf8');
const sdl = await readFile(s.grpc.schema_file, 'utf8');
const protoSchemaFileContent = await readFile(resolve(inputFileLocation, s.grpc.proto_file), 'utf8');
const sdl = await readFile(resolve(inputFileLocation, s.grpc.schema_file), 'utf8');

return {
kind: SubgraphKind.GRPC,
Expand All @@ -307,6 +307,7 @@ async function toSubgraphMetadataGRPC(s: GRPCSubgraphConfig): Promise<GRPCSubgra
}

async function toSubgraphMetadataPlugin(
inputFileLocation: string,
s: SubgraphPluginConfig,
subgraphs: SubgraphMetadata[],
): Promise<SubgraphPluginMetadata> {
Expand All @@ -319,14 +320,14 @@ async function toSubgraphMetadataPlugin(
);
}

validateSubgraphPlugin(s);
validateSubgraphPlugin(inputFileLocation, s);

// Check if a plugin with the same name already exists
const mappingFilePath = resolve(s.plugin.path, 'generated', 'mapping.json');
const mappingFilePath = resolve(inputFileLocation, s.plugin.path, 'generated', 'mapping.json');
const mappingFile = await readFile(mappingFilePath, 'utf8');
const schemaFilePath = resolve(s.plugin.path, 'src', 'schema.graphql');
const schemaFilePath = resolve(inputFileLocation, s.plugin.path, 'src', 'schema.graphql');
const sdl = await readFile(schemaFilePath, 'utf8');
const protoSchemaFilePath = resolve(s.plugin.path, 'generated', 'service.proto');
const protoSchemaFilePath = resolve(inputFileLocation, s.plugin.path, 'generated', 'service.proto');
const protoSchema = await readFile(protoSchemaFilePath, 'utf8');

return {
Expand Down Expand Up @@ -405,7 +406,7 @@ async function toSubgraphMetadataStandard(
};
}

function validateGRPCSubgraph(s: GRPCSubgraphConfig) {
function validateGRPCSubgraph(inputFileLocation: string, s: GRPCSubgraphConfig) {
if (!s.name) {
program.error(
pc.red(pc.bold(`The subgraph name is missing in the input file. Please check the name and try again.`)),
Expand Down Expand Up @@ -436,7 +437,7 @@ function validateGRPCSubgraph(s: GRPCSubgraphConfig) {
);
}

if (!existsSync(s.grpc.schema_file)) {
if (!existsSync(resolve(inputFileLocation, s.grpc.schema_file))) {
Comment thread
Noroth marked this conversation as resolved.
program.error(
pc.red(
pc.bold(
Expand All @@ -446,15 +447,15 @@ function validateGRPCSubgraph(s: GRPCSubgraphConfig) {
);
}

if (!existsSync(s.grpc.proto_file)) {
if (!existsSync(resolve(inputFileLocation, s.grpc.proto_file))) {
program.error(
pc.red(
pc.bold(`The proto file '${pc.bold(s.grpc.proto_file)}' does not exist. Please check the path and try again.`),
),
);
}

if (!existsSync(s.grpc.mapping_file)) {
if (!existsSync(resolve(inputFileLocation, s.grpc.mapping_file))) {
program.error(
pc.red(
pc.bold(
Expand All @@ -465,13 +466,13 @@ function validateGRPCSubgraph(s: GRPCSubgraphConfig) {
}
}

function validateSubgraphPlugin(s: SubgraphPluginConfig) {
function validateSubgraphPlugin(inputFileLocation: string, s: SubgraphPluginConfig) {
if (!s.plugin.path) {
program.error(
pc.red(pc.bold(`The plugin path is missing in the input file. Please check the path and try again.`)),
);
}
if (!existsSync(s.plugin.path)) {
if (!existsSync(resolve(inputFileLocation, s.plugin.path))) {
program.error(
pc.red(
pc.bold(`The plugin path '${pc.bold(s.plugin.path)}' does not exist. Please check the path and try again.`),
Expand Down