@cloudcare/guance-front-tools 1.0.20 → 1.0.21

package/test/cli.test.mjs

@@ -10,19 +10,22 @@ import { fileURLToPath, pathToFileURL } from 'node:url'
 import { covert } from '../lib/scripts/grafana-covert-to-guance-core.js'
 import {
   convertDashboard,
-} from '../skills/grafana-to-guance-dashboard/scripts/convert-grafana-dashboard.mjs'
+  main as convertCliMain,
+  validateDashboardFile,
+} from '../lib/scripts/convert-grafana-dashboard.js'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 const projectRoot = path.resolve(__dirname, '..')
 const require = createRequire(import.meta.url)
 const cliPath = path.join(projectRoot, 'cli.js')
-const skillCliPath = path.join(
+const converterCliPath = path.join(
   projectRoot,
-  'skills/grafana-to-guance-dashboard/scripts/convert-grafana-dashboard.mjs'
+  'lib/scripts/convert-grafana-dashboard.js'
 )
 const grafanaInputPath = path.join(projectRoot, 'lib/example/test2.json')
 const grafanaLoadInputPath = path.join(projectRoot, 'lib/example/grafana2.json')
+const grafanaNodeExporterInputPath = path.join(projectRoot, 'lib/example/1860_rev45.json')
 
 function runCli(args, options = {}) {
   return spawnSync(process.execPath, [cliPath, ...args], {
@@ -32,10 +35,20 @@ function runCli(args, options = {}) {
   })
 }
 
-function runSkillCli(args, options = {}) {
-  return spawnSync(process.execPath, [skillCliPath, ...args], {
+function runConverterCli(args, options = {}) {
+  const evalSource = [
+    "import { main } from './lib/scripts/convert-grafana-dashboard.js'",
+    `process.argv = ['node', '${converterCliPath.replace(/\\/g, '\\\\')}', ...JSON.parse(process.env.GUANCE_TEST_ARGS || '[]')]`,
+    'main()',
+  ].join('; ')
+
+  return spawnSync(process.execPath, ['--input-type=module', '-e', evalSource], {
     cwd: projectRoot,
     encoding: 'utf-8',
+    env: {
+      ...process.env,
+      GUANCE_TEST_ARGS: JSON.stringify(args),
+    },
     ...options,
   })
 }
@@ -53,14 +66,13 @@ test('covert delegates to the shared converter implementation', () => {
   assert.deepEqual(actual, expected)
 })
 
-test('published esm converter entry does not depend on skills path', async () => {
+test('published esm converter entry does not depend on legacy converter paths', async () => {
   const esmCorePath = path.join(projectRoot, 'lib/esm/scripts/grafana-covert-to-guance-core.js')
   const esmCoreSource = fs.readFileSync(esmCorePath, 'utf-8')
   const esmConverterCorePath = path.join(projectRoot, 'lib/esm/scripts/convert-grafana-dashboard-core.js')
   const esmConverterCoreSource = fs.readFileSync(esmConverterCorePath, 'utf-8')
 
   assert.match(esmCoreSource, /convert-grafana-dashboard-core\.js/)
-  assert.doesNotMatch(esmCoreSource, /skills\/grafana-to-guance-dashboard/)
   assert.doesNotMatch(esmConverterCoreSource, /from 'fs'|from "fs"|from 'path'|from "path"|from 'url'|from "url"|from 'ajv'|from "ajv"/)
   assert.doesNotMatch(esmConverterCoreSource, /\?\.|\?\?/)
 
@@ -72,7 +84,7 @@ test('published esm converter entry does not depend on skills path', async () =>
   assert.deepEqual(actual, expected)
 })
 
-test('published cjs converter entry can be required and matches skill converter', () => {
+test('published cjs converter entry can be required and matches converter output', () => {
   const tempDirectory = fs.mkdtempSync(path.join(projectRoot, '.tmp-guance-front-tools-cjs-'))
   const tempPackagePath = path.join(tempDirectory, 'package.json')
   const tempConverterPath = path.join(tempDirectory, 'convert-grafana-dashboard.js')
@@ -95,27 +107,28 @@ test('published cjs converter entry can be required and matches skill converter'
   assert.deepEqual(actual, expected)
 })
 
-test('skill converter script is standalone and does not rely on lib sync paths', () => {
-  const skillWrapperPath = path.join(
+test('converter script exports the local cli helpers and shared converter', () => {
+  const converterWrapperPath = path.join(
     projectRoot,
-    'skills/grafana-to-guance-dashboard/scripts/convert-grafana-dashboard.mjs'
+    'lib/scripts/convert-grafana-dashboard.js'
   )
-  const skillCorePath = path.join(
+  const converterCorePath = path.join(
     projectRoot,
-    'skills/grafana-to-guance-dashboard/scripts/convert-grafana-dashboard-core.js'
+    'lib/scripts/convert-grafana-dashboard-core.js'
   )
-  const skillWrapperSource = fs.readFileSync(skillWrapperPath, 'utf-8')
-  const skillCoreSource = fs.readFileSync(skillCorePath, 'utf-8')
-
-  assert.doesNotMatch(skillWrapperSource, /lib\/scripts\/convert-grafana-dashboard/)
-  assert.doesNotMatch(skillWrapperSource, /findProjectRoot|process\.cwd\(\)/)
-  assert.match(skillWrapperSource, /import \{ convertDashboard \} from '\.\/convert-grafana-dashboard-core\.js'/)
-  assert.match(skillWrapperSource, /^#!\/usr\/bin\/env node/m)
-  assert.match(skillWrapperSource, /export function main\(/)
-  assert.match(skillWrapperSource, /export function validateDashboardFile\(/)
-  assert.match(skillCoreSource, /export function convertDashboard\(/)
-  assert.doesNotMatch(skillWrapperSource, /\?\.|\?\?/)
-  assert.doesNotMatch(skillCoreSource, /\?\.|\?\?/)
+  const converterWrapperSource = fs.readFileSync(converterWrapperPath, 'utf-8')
+  const converterCoreSource = fs.readFileSync(converterCorePath, 'utf-8')
+
+  assert.match(converterWrapperSource, /^#!\/usr\/bin\/env node/m)
+  assert.match(converterWrapperSource, /import Ajv from 'ajv'/)
+  assert.match(converterWrapperSource, /import \{ convertDashboard \} from '\.\/convert-grafana-dashboard-core\.js'/)
+  assert.match(converterWrapperSource, /export function main\(/)
+  assert.match(converterWrapperSource, /export function validateDashboardFile\(/)
+  assert.match(converterCoreSource, /export function convertDashboard\(/)
+  assert.equal(typeof convertCliMain, 'function')
+  assert.equal(typeof validateDashboardFile, 'function')
+  assert.doesNotMatch(converterWrapperSource, /\?\.|\?\?/)
+  assert.doesNotMatch(converterCoreSource, /\?\.|\?\?/)
 })
 
 test('shared converter infers units from query text when panel unit is missing', () => {
@@ -128,7 +141,7 @@ test('shared converter infers units from query text when panel unit is missing',
 
   assert.ok(loadChart)
   assert.equal(loadChart.extend.settings.unitType, 'global')
-  assert.deepEqual(loadChart.extend.settings.globalUnit, ['custom', 'short'])
+  assert.deepEqual(loadChart.extend.settings.globalUnit, ['number', 'short_scale'])
 })
 
 test('shared converter maps offset queries to guance compare settings', () => {
@@ -161,6 +174,24 @@ test('shared converter maps legend and table sort semantics into guance settings
   assert.equal(releaseTableChart.extend.settings.mainMeasurementSort, 'top')
 })
 
+test('shared converter converts node exporter dashboard fixtures', () => {
+  const grafanaDashboard = JSON.parse(fs.readFileSync(grafanaNodeExporterInputPath, 'utf-8'))
+  const actual = convertDashboard(grafanaDashboard)
+
+  assert.equal(actual.title, 'Node Exporter Full')
+  assert.equal(actual.main.vars.length, 2)
+  assert.equal(actual.main.charts.length, 124)
+  assert.equal(actual.main.groups.length, 16)
+
+  assert.ok(actual.main.groups.some((group) => group.name === 'Quick CPU / Mem / Disk'))
+  assert.ok(actual.main.groups.some((group) => group.name === 'Network Traffic'))
+
+  assert.ok(actual.main.charts.some((chart) => chart.name === 'Pressure'))
+  assert.ok(actual.main.charts.some((chart) => chart.name === 'CPU Busy'))
+  assert.ok(actual.main.charts.some((chart) => chart.name === 'Network Traffic'))
+  assert.ok(actual.main.charts.some((chart) => chart.name === 'Uptime'))
+})
+
 test('shared converter maps repeat panels and infers bytes and seconds units', () => {
   const actual = convertDashboard({
     title: 'synthetic',
@@ -191,7 +222,6 @@ test('shared converter maps repeat panels and infers bytes and seconds units', (
   })
 
   assert.deepEqual(actual.main.charts[0].extend.settings.globalUnit, ['digital', 'B'])
-  assert.equal(actual.main.charts[0].extend.settings.repeatChartVariable, 'host')
   assert.equal(actual.main.charts[0].extend.settings.repeatChartRowLimit, 4)
   assert.equal(actual.main.charts[0].extend.settings.extend.layout.repeatDirection, 'h')
   assert.deepEqual(actual.main.charts[1].extend.settings.globalUnit, ['time', 's'])
@@ -423,13 +453,11 @@ test('cli supports shared converter flags and matches API output', () => {
     grafanaInputPath,
     '-o',
     outPath,
-    '--validate',
     '--guance-promql-compatible',
     '--keep-grafana-meta',
   ])
 
   assert.equal(result.status, 0, result.stderr || result.stdout)
-  assert.match(result.stdout, /Validated /)
   assert.equal(fs.existsSync(outPath), true)
 
   const actual = JSON.parse(fs.readFileSync(outPath, 'utf-8'))
@@ -451,69 +479,63 @@ test('cli writes default output file to current working directory', () => {
   assert.deepEqual(actual, expected)
 })
 
-test('skill cli converts and validates a grafana dashboard with explicit output path', () => {
+test('converter cli converts a grafana dashboard with explicit output path', () => {
   const tempDir = createTempDir()
-  const outPath = path.join(tempDir, 'skill', 'guance-dashboard.json')
+  const outPath = path.join(tempDir, 'converter', 'guance-dashboard.json')
   const expected = convertDashboard(JSON.parse(fs.readFileSync(grafanaInputPath, 'utf-8')))
 
-  const result = runSkillCli([
+  const result = runConverterCli([
     '--input',
     grafanaInputPath,
     '--output',
     outPath,
-    '--validate',
   ])
 
   assert.equal(result.status, 0, result.stderr || result.stdout)
-  assert.match(result.stdout, /Validated /)
   assert.equal(fs.existsSync(outPath), true)
 
   const actual = JSON.parse(fs.readFileSync(outPath, 'utf-8'))
   assert.deepEqual(actual, expected)
 })
 
-test('skill cli supports guance promql compatible output', () => {
+test('converter cli supports guance promql compatible output', () => {
   const tempDir = createTempDir()
-  const outPath = path.join(tempDir, 'skill', 'guance-promql.json')
+  const outPath = path.join(tempDir, 'converter', 'guance-promql.json')
   const expected = convertDashboard(JSON.parse(fs.readFileSync(grafanaInputPath, 'utf-8')), {
     guancePromqlCompatible: true,
   })
 
-  const result = runSkillCli([
+  const result = runConverterCli([
     '--input',
     grafanaInputPath,
     '--output',
     outPath,
-    '--validate',
     '--guance-promql-compatible',
   ])
 
   assert.equal(result.status, 0, result.stderr || result.stdout)
-  assert.match(result.stdout, /Validated /)
   assert.equal(fs.existsSync(outPath), true)
 
   const actual = JSON.parse(fs.readFileSync(outPath, 'utf-8'))
   assert.deepEqual(actual, expected)
 })
 
-test('skill cli supports keep grafana meta output', () => {
+test('converter cli supports keep grafana meta output', () => {
   const tempDir = createTempDir()
-  const outPath = path.join(tempDir, 'skill', 'guance-keep-meta.json')
+  const outPath = path.join(tempDir, 'converter', 'guance-keep-meta.json')
   const expected = convertDashboard(JSON.parse(fs.readFileSync(grafanaInputPath, 'utf-8')), {
     keepGrafanaMeta: true,
   })
 
-  const result = runSkillCli([
+  const result = runConverterCli([
     '--input',
     grafanaInputPath,
     '--output',
     outPath,
-    '--validate',
     '--keep-grafana-meta',
   ])
 
   assert.equal(result.status, 0, result.stderr || result.stdout)
-  assert.match(result.stdout, /Validated /)
   assert.equal(fs.existsSync(outPath), true)
 
   const actual = JSON.parse(fs.readFileSync(outPath, 'utf-8'))