fix: Improve fig spec with better generators

[miguelmig]

Also prevents some issues that might trigger the autocomplete's linter. This, together with the changes on usage-cli 1.7.3 version, should get the automated PR to pass the linter checks on the autocomplete repo