Missing ShapeDecl wrapper

[melonora]

Currently, when generating the pyjsg objects, the ShapeDecl is missing. Currently it is not known why this is not getting parsed. Testing with pyjsg 0.11.10 does not make a difference and the problem seems to be in the codebase of grammar-python-antlr itself.

[melonora]

So trying to narrow down and looking into both shexj and shexc my understanding is that shexc simply does not know ShapeDecl as a keyword so when converting shexc back to shexj in the tests, the representation is collapsed, e.g. ShapeDecl just becomes Shape.

This causes the tests to fail, but it is uncertain whether this should be treated as a bug that has any effect that should be corrected.

[matentzn]

Thanks @melonora; valid concern - lets punt this until we see failures in linkml CI/CD.

[melonora]

For now what I did is write a basic wrapper to make the tests pass when you do the conversion from Shexc back to Shexj (

grammar-python-antlr-linkml/tests/utils/shape_decl_wrapper.py

Lines 1 to 35 in 597befb

	def strip_shape_expr_id(shape_expr):
	if not hasattr(shape_expr, "id"):
	return shape_expr
	# only remove id, DO NOT reconstruct full object
	shape_expr.id = None
	return shape_expr
	def rewrap_shape_decls(schema):
	from ShExJSG.ShExJ import ShapeDecl
	new_shapes = []
	for shape in schema.shapes:
	if isinstance(shape, ShapeDecl):
	new_shapes.append(shape)
	continue
	context = getattr(schema, "_context", None) or getattr(shape, "_context", None)
	shape_decl_id = shape.id
	shape_expr = shape
	shape_expr = strip_shape_expr_id(shape_expr)
	decl = ShapeDecl(
	id=shape_decl_id,
	abstract=getattr(shape, "abstract", None),
	restricts=getattr(shape, "restricts", None),
	shapeExpr=shape_expr,
	_context=context
	)
	new_shapes.append(decl)
	schema.shapes = new_shapes
	return schema

).

It would be good to know from the community if this is a usecase that should be supported in general or not, but for now it makes the tests pass.