gatsby-source-graphql without fieldName namespace

[rootkowsky]

I would like to omit fieldName wrapping in gatsby-source-graphql, because of Collection routes, which require fields with specific names (all prefix) and access from root level.

What I have done:

const { wrapSchema, RenameTypes } = require(`@graphql-tools/wrap`);
const { linkToExecutor } = require(`@graphql-tools/links`);
const { StripNonQueryTransform } = require('gatsby-source-graphql/transforms');
// ...
{
      resolve: 'gatsby-source-graphql',
      options: {
        typeName: 'WP',
        fieldName: 'wp', // required by plugin but ignored due to changes
        url: url,
        transformSchema: (args) => {
          const {schema, link, resolver, defaultTransforms, options } = args;
          const {typeName} = options;

          return wrapSchema({
            schema: schema,
            executor: linkToExecutor(link),
            transforms: [
              new StripNonQueryTransform(),
              new RenameTypes(name => `${typeName}_${name}`),
            ]
          })
        },
      },
    },

And it seems to be working, but only on gatsby develop. On gatsby build there are some warns/errors, i.e:

warn The GraphQL query in the non-page component "/Users/a/dev/collection-routes-test/src/pages/{Posts.slug}.js" will not be run.

Also, the {Posts.slug}.js component does not receive data field in props

export default function Component(props) {
  const { data } = props; // undefined
  return <div>{/* ... */}</div>;
}
export const query = graphql`
    query PostsQuery($id: ID!) {
        post(id: $id) {
            title
            slug
        }
    }
`;

I would be grateful for any hint.

[rootkowsky]

I've done some investigations, and realized that createPagesStatefully does not wait for createPagesFromCollectionBuilder function to complete!

excerpt from gatsby build --verbose --log-pages:

    success building schema - 0.618s
    success createPages - 0.000s
    success createPagesStatefully - 0.122s
    info Total nodes: 31, SitePage nodes: 3 (use --verbose for breakdown)
    verbose Number of node types: 9. Nodes per type: SitePlugin: 20, Site: 1, SiteBuildMetadata: 1, SiteFunction: 1, Directory: 1, File: 2, GraphQLSource: 1, TestNode:
    1, SitePage: 3
    verbose Checking for deleted pages
    verbose Deleted 0 pages
    verbose Found 3 changed pages
    success Checking for changed pages - 0.001s
    success update schema - 0.098s
    success onPreExtractQueries - 0.000s
    success extract queries from components - 0.290s
    warn The GraphQL query in the non-page component "/Users/a/dev/collection-routes-test/src/pages/{Pages.link}.js" will not be run.
    Exported queries are only executed for Page components. It's possible you're
    trying to create pages in your gatsby-node.js and that's failing for some
    reason.

I have an ugly walkaround for that :|

    // gatsby-node.js
    exports.createPagesStatefully = async () => {
        await sleep(1000);
    }
    
    // gatsby-config.js
    plugins: [
        {
           resolve: 'gatsby-plugin-page-creator',
           options: {
              path: `${__dirname}/src/pages`,
           },
        }
    ]

and a little bit better solution:
#31384