@sentio/cli 3.6.0-rc.3 → 3.6.0-rc.4

package/lib/index.js

@@ -141137,6 +141137,59 @@ function formatDebugBody(body) {
 
 // src/commands/data.ts
 var DEFAULT_RANGE_STEP = 3600;
+var VALID_METRIC_FUNCTIONS = /* @__PURE__ */ new Set([
+  // Math
+  "abs",
+  "ceil",
+  "floor",
+  "round",
+  "log2",
+  "log10",
+  "ln",
+  // Rollup
+  "rollup_avg",
+  "rollup_count",
+  "rollup_last",
+  "rollup_max",
+  "rollup_min",
+  "rollup_sum",
+  "rollup_delta",
+  // Aggregate Over Time
+  "avg_over_time",
+  "count_over_time",
+  "last_over_time",
+  "max_over_time",
+  "min_over_time",
+  "sum_over_time",
+  "delta_over_time",
+  // Rate
+  "rate",
+  "irate",
+  "delta",
+  "moving_delta",
+  // Rank
+  "topk",
+  "bottomk",
+  // Time
+  "timestamp",
+  "day_of_year",
+  "day_of_month",
+  "day_of_week",
+  "year",
+  "month",
+  "hour",
+  "minute",
+  // TimeShift
+  "before",
+  "after"
+]);
+var VALID_EVENT_FUNCTIONS = /* @__PURE__ */ new Set([
+  // Rank
+  "topk",
+  "bottomk",
+  // Delta
+  "delta"
+]);
 function createDataCommand() {
   const dataCommand = new Command("data").description("Retrieve data from Sentio");
   dataCommand.addCommand(createDataQueryCommand());
@@ -141173,7 +141226,7 @@ function buildEventsInsightQueryBody(search, options) {
           aggregation: buildEventAggregation(options.aggr),
           selectorExpr: buildSelectorExpr(options.filter),
           groupBy: normalizeListOption(options.groupBy),
-          functions: buildFunctions(options.func),
+          functions: buildFunctions(options.func, VALID_EVENT_FUNCTIONS),
           disabled: false
         }
       }
@@ -141197,7 +141250,7 @@ function buildMetricsInsightQueryBody(query, options) {
           query,
           labelSelector: buildMetricLabelSelector(options.filter),
           aggregate: buildMetricAggregate(options.aggr, options.groupBy),
-          functions: buildFunctions(options.func),
+          functions: buildFunctions(options.func, VALID_METRIC_FUNCTIONS),
           disabled: false
         }
       }
@@ -141504,7 +141557,7 @@ function handleDataCommandError(error, command) {
 function shouldShowHelpForDataCommandError(error) {
   return error.message.startsWith("Project is required.") || error.message.startsWith(
     "Provide --file, --stdin, or exactly one of --event, --metric, or --price for data query"
-  ) || error.message.startsWith("Use exactly one of --event, --metric, or --price for data query.") || error.message.startsWith("Price queries only support --price") || error.message.startsWith("Provide --query, --result, --file, or --stdin.") || error.message.startsWith("Use only one of --query or --result.") || error.message.startsWith("--async only works with --query.") || error.message.startsWith("Execution id is required.");
+  ) || error.message.startsWith("Use exactly one of --event, --metric, or --price for data query.") || error.message.startsWith("Price queries only support --price") || error.message.startsWith("Provide --query, --result, --file, or --stdin.") || error.message.startsWith("Use only one of --query or --result.") || error.message.startsWith("--async only works with --query.") || error.message.startsWith("Execution id is required.") || error.message.startsWith('Unknown function "');
 }
 function buildEventAggregation(aggregationName = "total") {
   switch (aggregationName.toUpperCase()) {
@@ -141633,8 +141686,14 @@ function parseAnyValue(rawValue) {
   }
   return { stringValue: unquotedValue };
 }
-function buildFunctions(functions) {
-  return normalizeListOption(functions).map(parseFunctionCall);
+function buildFunctions(functions, validNames) {
+  return normalizeListOption(functions).map((f14) => {
+    const parsed = parseFunctionCall(f14);
+    if (validNames && !validNames.has(parsed.name)) {
+      throw new CliError(`Unknown function "${parsed.name}". Valid functions: ${[...validNames].sort().join(", ")}.`);
+    }
+    return parsed;
+  });
 }
 function parseFunctionCall(value) {
   const trimmed = value.trim();
@@ -142476,7 +142535,11 @@ function createProcessorCommand() {
 function createProcessorStatusCommand() {
   return withOutputOptions3(
     withSharedProjectOptions3(withAuthOptions3(new Command("status").description("Get processor status")))
-  ).showHelpAfterError().option("--version <selector>", "Version selector: active, pending, or all").action(async (options, command) => {
+  ).showHelpAfterError().option(
+    "--version <selector>",
+    "Version selector: active, pending, all, or a numeric version number",
+    parseVersionSelector
+  ).action(async (options, command) => {
     try {
       await runProcessorStatus(options);
     } catch (error) {
@@ -142556,22 +142619,19 @@ async function runProcessorStatus(options) {
   const context = createApiContext(options);
   const project = await resolveProjectRef(options, context, { ownerSlug: true });
   const requestedVersion = normalizeVersionSelector(options.version);
+  const apiVersion = typeof requestedVersion === "number" ? "ALL" : requestedVersion ?? "ALL";
   const response = await import_api5.ProcessorService.getProcessorStatusV2({
     path: {
       owner: project.owner,
       slug: project.slug
     },
     query: {
-      version: requestedVersion ?? "ALL"
+      version: apiVersion
     },
     headers: context.headers
   });
   const data4 = unwrapApiResult(response);
-  if (!options.json) {
-    printOutput3(options, shapeProcessorStatusOutput(data4, requestedVersion));
-    return;
-  }
-  printOutput3(options, data4);
+  printOutput3(options, shapeProcessorStatusOutput(data4, requestedVersion));
 }
 async function runProcessorSource(options) {
   const context = createApiContext(options);
@@ -142810,7 +142870,7 @@ function withOutputOptions3(command) {
   return command.option("--json", "Print raw JSON response").option("--yaml", "Print raw YAML response");
 }
 function handleProcessorCommandError(error, command) {
-  if (error instanceof CliError && (error.message.startsWith("Project is required.") || error.message.startsWith("Invalid project ") || error.message.startsWith("Invalid version selector ") || error.message.startsWith("Source file not found:"))) {
+  if (error instanceof CliError && (error.message.startsWith("Project is required.") || error.message.startsWith("Invalid project ") || error.message.startsWith("Invalid version selector") || error.message.startsWith("Source file not found:"))) {
     console.error(error.message);
     if (command) {
       console.error();
@@ -142904,14 +142964,24 @@ function formatOutput2(data4) {
   return JSON.stringify(data4, null, 2);
 }
 function normalizeVersionSelector(value) {
-  if (!value) {
+  if (value === void 0) {
     return void 0;
   }
+  if (typeof value === "number") {
+    return value;
+  }
   const normalized = value.toUpperCase();
   if (normalized === "ACTIVE" || normalized === "PENDING" || normalized === "ALL") {
     return normalized;
   }
-  throw new CliError(`Invalid version selector "${value}". Use active, pending, or all.`);
+  throw new CliError(`Invalid version selector "${value}". Use active, pending, all, or a version number.`);
+}
+function parseVersionSelector(value) {
+  const num = Number.parseInt(value, 10);
+  if (!Number.isNaN(num) && String(num) === value) {
+    return num;
+  }
+  return value;
 }
 function parseInteger2(value) {
   const parsedValue = Number.parseInt(value, 10);
@@ -142937,6 +143007,12 @@ function shapeProcessorStatusOutput(data4, versionSelector) {
       processors: processors.filter((processor) => asString3(processor.versionState) === versionSelector)
     };
   }
+  if (typeof versionSelector === "number") {
+    return {
+      ...data4,
+      processors: processors.filter((processor) => asNumber(processor.version) === versionSelector)
+    };
+  }
   return {
     ...data4,
     processors: processors.filter((processor) => {
@@ -145201,7 +145277,7 @@ function withOutputOptions8(command) {
   return command.option("--json", "Print raw JSON response").option("--yaml", "Print raw YAML response");
 }
 function handleDashboardCommandError(error, command) {
-  if (error instanceof CliError && (error.message.startsWith("Project is required.") || error.message.startsWith("Invalid project ") || error.message.startsWith("Dashboard ") || error.message.startsWith("Provide --file or --stdin") || error.message.startsWith("Use either --file or --stdin") || error.message.startsWith("Expected JSON or YAML") || error.message.startsWith("Invalid JSON or YAML") || error.message.startsWith("Dashboard initialization data") || error.message.startsWith("Provide exactly one data source") || error.message.startsWith("Use exactly one of --sql") || error.message.startsWith("Invalid chart type") || error.message.startsWith("Invalid aggregation") || error.message.startsWith("Invalid metric aggregation") || error.message.startsWith("Invalid filter") || error.message.startsWith("Invalid metric selector") || error.message.startsWith("Invalid time range value"))) {
+  if (error instanceof CliError && (error.message.startsWith("Project is required.") || error.message.startsWith("Invalid project ") || error.message.startsWith("Dashboard ") || error.message.startsWith("Provide --file or --stdin") || error.message.startsWith("Use either --file or --stdin") || error.message.startsWith("Expected JSON or YAML") || error.message.startsWith("Invalid JSON or YAML") || error.message.startsWith("Dashboard initialization data") || error.message.startsWith("Provide exactly one data source") || error.message.startsWith("Use exactly one of --sql") || error.message.startsWith("Invalid chart type") || error.message.startsWith("Invalid aggregation") || error.message.startsWith("Invalid metric aggregation") || error.message.startsWith("Invalid filter") || error.message.startsWith("Invalid metric selector") || error.message.startsWith("Invalid time range value") || error.message.startsWith('Unknown function "'))) {
     console.error(error.message);
     if (command) {
       console.error();
@@ -145299,6 +145375,10 @@ await printVersions();
 if (process.argv.includes("--debug")) {
   enableApiDebug();
 }
+if (process.argv.length === 3 && process.argv[2] === "--version") {
+  version();
+  process.exit(0);
+}
 program2.addCommand(createLoginCommand());
 program2.addCommand(createCreateCommand());
 program2.addCommand(createVersionCommand());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/cli",
-  "version": "3.6.0-rc.3",
+  "version": "3.6.0-rc.4",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {

package/src/commands/dashboard.ts

@@ -559,7 +559,8 @@ function handleDashboardCommandError(error: unknown, command?: Command) {
       error.message.startsWith('Invalid metric aggregation') ||
       error.message.startsWith('Invalid filter') ||
       error.message.startsWith('Invalid metric selector') ||
-      error.message.startsWith('Invalid time range value'))
+      error.message.startsWith('Invalid time range value') ||
+      error.message.startsWith('Unknown function "'))
   ) {
     console.error(error.message)
     if (command) {

package/src/commands/data.ts

@@ -16,6 +16,62 @@ import {
 } from '../api.js'
 
 const DEFAULT_RANGE_STEP = 3600
+
+// Valid function names sourced from sentio/app/lib/functions.ts
+const VALID_METRIC_FUNCTIONS: ReadonlySet<string> = new Set([
+  // Math
+  'abs',
+  'ceil',
+  'floor',
+  'round',
+  'log2',
+  'log10',
+  'ln',
+  // Rollup
+  'rollup_avg',
+  'rollup_count',
+  'rollup_last',
+  'rollup_max',
+  'rollup_min',
+  'rollup_sum',
+  'rollup_delta',
+  // Aggregate Over Time
+  'avg_over_time',
+  'count_over_time',
+  'last_over_time',
+  'max_over_time',
+  'min_over_time',
+  'sum_over_time',
+  'delta_over_time',
+  // Rate
+  'rate',
+  'irate',
+  'delta',
+  'moving_delta',
+  // Rank
+  'topk',
+  'bottomk',
+  // Time
+  'timestamp',
+  'day_of_year',
+  'day_of_month',
+  'day_of_week',
+  'year',
+  'month',
+  'hour',
+  'minute',
+  // TimeShift
+  'before',
+  'after'
+])
+
+const VALID_EVENT_FUNCTIONS: ReadonlySet<string> = new Set([
+  // Rank
+  'topk',
+  'bottomk',
+  // Delta
+  'delta'
+])
 interface CommonDataOptions {
   host?: string
   apiKey?: string
@@ -113,7 +169,7 @@ export function buildEventsInsightQueryBody(
           aggregation: buildEventAggregation(options.aggr),
           selectorExpr: buildSelectorExpr(options.filter),
           groupBy: normalizeListOption(options.groupBy),
-          functions: buildFunctions(options.func),
+          functions: buildFunctions(options.func, VALID_EVENT_FUNCTIONS),
           disabled: false
         }
       }
@@ -148,7 +204,7 @@ export function buildMetricsInsightQueryBody(
           query,
           labelSelector: buildMetricLabelSelector(options.filter),
           aggregate: buildMetricAggregate(options.aggr, options.groupBy),
-          functions: buildFunctions(options.func),
+          functions: buildFunctions(options.func, VALID_METRIC_FUNCTIONS),
           disabled: false
         }
       }
@@ -584,7 +640,8 @@ function shouldShowHelpForDataCommandError(error: CliError) {
     error.message.startsWith('Provide --query, --result, --file, or --stdin.') ||
     error.message.startsWith('Use only one of --query or --result.') ||
     error.message.startsWith('--async only works with --query.') ||
-    error.message.startsWith('Execution id is required.')
+    error.message.startsWith('Execution id is required.') ||
+    error.message.startsWith('Unknown function "')
   )
 }
 
@@ -730,8 +787,14 @@ function parseAnyValue(rawValue: string) {
   return { stringValue: unquotedValue }
 }
 
-function buildFunctions(functions?: string[]) {
-  return normalizeListOption(functions).map(parseFunctionCall)
+function buildFunctions(functions?: string[], validNames?: ReadonlySet<string>) {
+  return normalizeListOption(functions).map((f) => {
+    const parsed = parseFunctionCall(f)
+    if (validNames && !validNames.has(parsed.name)) {
+      throw new CliError(`Unknown function "${parsed.name}". Valid functions: ${[...validNames].sort().join(', ')}.`)
+    }
+    return parsed
+  })
 }
 
 function parseFunctionCall(value: string) {

package/src/commands/processor.ts

@@ -27,7 +27,7 @@ interface ProcessorOptions {
 }
 
 interface ProcessorStatusOptions extends ProcessorOptions {
-  version?: string
+  version?: string | number
 }
 
 interface ProcessorSourceOptions extends ProcessorOptions {
@@ -60,7 +60,11 @@ function createProcessorStatusCommand() {
     withSharedProjectOptions(withAuthOptions(new Command('status').description('Get processor status')))
   )
     .showHelpAfterError()
-    .option('--version <selector>', 'Version selector: active, pending, or all')
+    .option(
+      '--version <selector>',
+      'Version selector: active, pending, all, or a numeric version number',
+      parseVersionSelector
+    )
     .action(async (options, command) => {
       try {
         await runProcessorStatus(options)
@@ -176,22 +180,19 @@ async function runProcessorStatus(options: ProcessorStatusOptions) {
   const context = createApiContext(options)
   const project = await resolveProjectRef(options, context, { ownerSlug: true })
   const requestedVersion = normalizeVersionSelector(options.version)
+  const apiVersion = typeof requestedVersion === 'number' ? 'ALL' : (requestedVersion ?? 'ALL')
   const response = await ProcessorService.getProcessorStatusV2({
     path: {
       owner: project.owner,
       slug: project.slug
     },
     query: {
-      version: requestedVersion ?? 'ALL'
+      version: apiVersion
     },
     headers: context.headers
   })
   const data = unwrapApiResult(response)
-  if (!options.json) {
-    printOutput(options, shapeProcessorStatusOutput(data, requestedVersion))
-    return
-  }
-  printOutput(options, data)
+  printOutput(options, shapeProcessorStatusOutput(data, requestedVersion))
 }
 
 async function runProcessorSource(options: ProcessorSourceOptions) {
@@ -501,7 +502,7 @@ function handleProcessorCommandError(error: unknown, command?: Command) {
     error instanceof CliError &&
     (error.message.startsWith('Project is required.') ||
       error.message.startsWith('Invalid project ') ||
-      error.message.startsWith('Invalid version selector ') ||
+      error.message.startsWith('Invalid version selector') ||
       error.message.startsWith('Source file not found:'))
   ) {
     console.error(error.message)
@@ -610,15 +611,26 @@ function formatOutput(data: unknown) {
   return JSON.stringify(data, null, 2)
 }
 
-function normalizeVersionSelector(value?: string): 'ACTIVE' | 'PENDING' | 'ALL' | undefined {
-  if (!value) {
+function normalizeVersionSelector(value?: string | number): 'ACTIVE' | 'PENDING' | 'ALL' | number | undefined {
+  if (value === undefined) {
     return undefined
   }
+  if (typeof value === 'number') {
+    return value
+  }
   const normalized = value.toUpperCase()
   if (normalized === 'ACTIVE' || normalized === 'PENDING' || normalized === 'ALL') {
     return normalized
   }
-  throw new CliError(`Invalid version selector "${value}". Use active, pending, or all.`)
+  throw new CliError(`Invalid version selector "${value}". Use active, pending, all, or a version number.`)
+}
+
+function parseVersionSelector(value: string): string | number {
+  const num = Number.parseInt(value, 10)
+  if (!Number.isNaN(num) && String(num) === value) {
+    return num
+  }
+  return value
 }
 
 function parseInteger(value: string) {
@@ -639,7 +651,7 @@ function asNumber(value: unknown) {
 
 function shapeProcessorStatusOutput(
   data: { processors?: Array<Record<string, unknown>> },
-  versionSelector?: 'ACTIVE' | 'PENDING' | 'ALL'
+  versionSelector?: 'ACTIVE' | 'PENDING' | 'ALL' | number
 ) {
   const processors = Array.isArray(data.processors) ? data.processors : []
   if (versionSelector === 'ALL') {
@@ -651,6 +663,12 @@ function shapeProcessorStatusOutput(
       processors: processors.filter((processor) => asString(processor.versionState) === versionSelector)
     }
   }
+  if (typeof versionSelector === 'number') {
+    return {
+      ...data,
+      processors: processors.filter((processor) => asNumber(processor.version) === versionSelector)
+    }
+  }
   return {
     ...data,
     processors: processors.filter((processor) => {

package/src/commands/version.ts

@@ -7,7 +7,7 @@ export function createVersionCommand() {
   })
 }
 
-function version() {
+export function version() {
   console.log('CLI Version: ', getCliVersion())
   const sdkVersion = getSdkVersion()
   if (sdkVersion) {

package/src/index.ts

@@ -3,7 +3,7 @@
 import { Command } from '@commander-js/extra-typings'
 import { createLoginCommand } from './commands/login.js'
 import { createCreateCommand } from './commands/create.js'
-import { createVersionCommand } from './commands/version.js'
+import { createVersionCommand, version } from './commands/version.js'
 import { createTestCommand } from './commands/test.js'
 import { createAddCommand } from './commands/add.js'
 import { createCompileCommand } from './commands/compile.js'
@@ -34,6 +34,11 @@ if (process.argv.includes('--debug')) {
   enableApiDebug()
 }
 
+if (process.argv.length === 3 && process.argv[2] === '--version') {
+  version()
+  process.exit(0)
+}
+
 program.addCommand(createLoginCommand())
 program.addCommand(createCreateCommand())
 program.addCommand(createVersionCommand())