Disable `.is(neq(' cypher.null'))` Gremlin token for Cyphter statements that contains `WITH` clause

I have following Cyphter statement:

MATCH (n:`RepositoryArtifactIdGroup`)  
WHERE n.`uuid` = '364be4ec-6d2f-464a-bad0-1e0a65241cd5'  
WITH n 
MATCH (n)-[r_r1:`RepositoryArtifactIdGroupEntity_ArtifactGroupEntity`]->(a1:`ArtifactGroup`) 
WITH n, r_r1, a1 
RETURN n, r_r1, a1

This statement produce following Gremlin query:

g.V()
    .as('n')
    .hasLabel('RepositoryArtifactIdGroup')
    .has('uuid', eq('a707bad0-bb6a-4308-a7aa-f8d7b4f7cf2a'))
    .as('n')
    .is(neq('  cypher.null'))
    .outE('RepositoryArtifactIdGroupEntity_ArtifactGroupEntity')
    .as('r_r1')
    .inV()
    .as('a1')
    .hasLabel('ArtifactGroup')
    .select('n', 'r_r1', 'a1')
    .project('n', 'r_r1', 'a1')
    .by(__.select('n')).by(__.select('r_r1')).by(__.select('a1')).as('  GENERATED4')
    .select('n').as('n').select('  GENERATED4')
    .select('r_r1').as('r_r1')
    .select('  GENERATED4')
    .select('a1').as('a1')
    .select('n', 'r_r1', 'a1')
    .project('n', 'r_r1', 'a1')
    .by(__.select('n').valueMap().with('~tinkerpop.valueMap.tokens'))
    .by(__.select('r_r1')
    .project('  cypher.element', '  cypher.inv', '  cypher.outv')
    .by(__.valueMap()
    .with('~tinkerpop.valueMap.tokens'))
    .by(__.inV().id()
    ).by(__.outV().id()))
    .by(__.select('a1').valueMap().with('~tinkerpop.valueMap.tokens'))

There is also index on uuid property for RepositoryArtifactIdGroup vertex in JanusGraph, so I expect this query should trigger this index.

The problem is that for some reason index not triggered directly this way, but it works fine without .is(neq(' cypher.null')) token. I am not sure does it JanusGrapth issue or not but however it will be good to optionally disable this cypher.null to be generated.

Is it possible to have such option?

[carlspring]

Any updates on this? Please, advise!

[dwitry]

@sbespalov @steve-todorov This change requires either implementing optimization strategy or introduce an inlining option. Both of these changes require significant efforts in development and testing. Currently, all my attention is focused on other areas, and I can not provide any terms when this could be implemented. The best I can do is review and merge PR if there are any volunteers.