1 files changed, 17 insertions, 11 deletions

diff --git a/sinksh/syntax_modules/sink_count.cpp b/sinksh/syntax_modules/sink_count.cpp
index 04a9550..aaa9c33 100644
--- a/sinksh/syntax_modules/sink_count.cpp
+++ b/sinksh/syntax_modules/sink_count.cpp
@@ -37,12 +37,28 @@
 namespace SinkCount
 {
 
+bool count(const QStringList &args, State &state);
+
+Syntax::List syntax()
+{
+    Syntax count("count", QObject::tr("Returns the number of items of a given type in a resource"), &SinkCount::count, Syntax::EventDriven);
+
+    count.addPositionalArgument({.name = "type", .help = "The entity type to count"});
+    count.addPositionalArgument({.name = "resource", .help = "A resource id where to count", .required = false});
+
+    count.completer = &SinkshUtils::typeCompleter;
+
+    return Syntax::List() << count;
+}
+
+REGISTER_SYNTAX(SinkCount)
+
 bool count(const QStringList &args, State &state)
 {
     Sink::Query query;
     query.setId("count");
     if (!SinkshUtils::applyFilter(query, SyntaxTree::parseOptions(args))) {
-        state.printError(QObject::tr("Options: $type $filter"));
+        state.printError(syntax()[0].usage());
         return false;
     }
 
@@ -61,14 +77,4 @@ bool count(const QStringList &args, State &state)
     return true;
 }
 
-Syntax::List syntax()
-{
-    Syntax count("count", QObject::tr("Returns the number of items of a given type in a resource. Usage: count <type> <resource>"), &SinkCount::count, Syntax::EventDriven);
-    count.completer = &SinkshUtils::typeCompleter;
-
-    return Syntax::List() << count;
-}
-
-REGISTER_SYNTAX(SinkCount)
-
 }