@cloudcare/guance-front-tools 1.0.18 → 1.0.19

package/test/cli.test.mjs

@@ -4,6 +4,7 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import { spawnSync } from 'node:child_process'
+import { createRequire } from 'node:module'
 import { fileURLToPath, pathToFileURL } from 'node:url'
 
 import { covert } from '../lib/scripts/grafana-covert-to-guance-core.js'
@@ -14,6 +15,7 @@ import {
 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(
   projectRoot,
@@ -70,7 +72,30 @@ test('published esm converter entry does not depend on skills path', async () =>
   assert.deepEqual(actual, expected)
 })
 
-test('skill converter script ships wrapper and core files without importing lib paths', () => {
+test('published cjs converter entry can be required and matches skill converter', () => {
+  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')
+  const tempConverterCorePath = path.join(tempDirectory, 'convert-grafana-dashboard-core.js')
+  const cjsConverterPath = path.join(projectRoot, 'lib/cjs/scripts/convert-grafana-dashboard.js')
+  const cjsConverterCorePath = path.join(projectRoot, 'lib/cjs/scripts/convert-grafana-dashboard-core.js')
+
+  fs.writeFileSync(tempPackagePath, JSON.stringify({ type: 'commonjs' }), 'utf-8')
+  fs.copyFileSync(cjsConverterPath, tempConverterPath)
+  fs.copyFileSync(cjsConverterCorePath, tempConverterCorePath)
+
+  const cjsConverter = require(tempConverterPath)
+  const grafanaDashboard = JSON.parse(fs.readFileSync(grafanaLoadInputPath, 'utf-8'))
+
+  const actual = cjsConverter.convertDashboard(grafanaDashboard)
+  const expected = convertDashboard(grafanaDashboard)
+
+  assert.equal(typeof cjsConverter.main, 'function')
+  assert.equal(typeof cjsConverter.validateDashboardFile, 'function')
+  assert.deepEqual(actual, expected)
+})
+
+test('skill converter script is standalone and does not rely on lib sync paths', () => {
   const skillWrapperPath = path.join(
     projectRoot,
     'skills/grafana-to-guance-dashboard/scripts/convert-grafana-dashboard.mjs'
@@ -83,6 +108,7 @@ test('skill converter script ships wrapper and core files without importing lib
   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\(/)

package/tsconfig.cjs.scripts.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "types": ["node"],
+    "esModuleInterop": true,
+    "moduleResolution": "node",
+    "module": "CommonJS",
+    "target": "ES2018",
+    "outDir": "lib/cjs/scripts",
+    "rootDir": "lib/scripts",
+    "declaration": false,
+    "allowJs": true,
+    "resolveJsonModule": true,
+    "typeRoots": ["./node_modules/@types"]
+  },
+  "include": [
+    "./lib/scripts/convert-grafana-dashboard.js",
+    "./lib/scripts/convert-grafana-dashboard-core.js"
+  ]
+}

package/tsconfig.esm.scripts.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "types": ["node"],
+    "esModuleInterop": true,
+    "moduleResolution": "node",
+    "module": "ES6",
+    "target": "ES2018",
+    "outDir": "lib/esm/scripts",
+    "rootDir": "lib/scripts",
+    "declaration": false,
+    "allowJs": true,
+    "resolveJsonModule": true,
+    "typeRoots": ["./node_modules/@types"]
+  },
+  "include": [
+    "./lib/scripts/convert-grafana-dashboard.js",
+    "./lib/scripts/convert-grafana-dashboard-core.js"
+  ]
+}

package/scripts/sync-converter.mjs

@@ -1,57 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-import ts from 'typescript'
-
-const projectRoot = process.cwd()
-const syncPairs = [
-  {
-    sourcePath: path.join(projectRoot, 'lib', 'scripts', 'convert-grafana-dashboard.js'),
-    targets: [
-      path.join(projectRoot, 'lib', 'esm', 'scripts', 'convert-grafana-dashboard.js'),
-      path.join(projectRoot, 'lib', 'cjs', 'scripts', 'convert-grafana-dashboard.js'),
-      path.join(projectRoot, 'skills', 'grafana-to-guance-dashboard', 'scripts', 'convert-grafana-dashboard.mjs'),
-    ],
-  },
-  {
-    sourcePath: path.join(projectRoot, 'lib', 'scripts', 'convert-grafana-dashboard-core.js'),
-    targets: [
-      path.join(projectRoot, 'lib', 'esm', 'scripts', 'convert-grafana-dashboard-core.js'),
-      path.join(projectRoot, 'lib', 'cjs', 'scripts', 'convert-grafana-dashboard-core.js'),
-      path.join(projectRoot, 'skills', 'grafana-to-guance-dashboard', 'scripts', 'convert-grafana-dashboard-core.js'),
-    ],
-  },
-]
-const staleTargets = [
-  path.join(projectRoot, 'lib', 'scripts', 'convert-grafana-dashboard.mjs'),
-  path.join(projectRoot, 'lib', 'esm', 'scripts', 'convert-grafana-dashboard.mjs'),
-  path.join(projectRoot, 'lib', 'cjs', 'scripts', 'convert-grafana-dashboard.mjs'),
-]
-
-function transpileForTarget(sourcePath, targetPath) {
-  const source = fs.readFileSync(sourcePath, 'utf8')
-  const isCommonJsTarget = targetPath.includes(`${path.sep}lib${path.sep}cjs${path.sep}`)
-  const fileName = targetPath.endsWith('.mjs') ? targetPath.replace(/\.mjs$/, '.mts') : targetPath
-  const { outputText } = ts.transpileModule(source, {
-    fileName,
-    compilerOptions: {
-      target: ts.ScriptTarget.ES2018,
-      module: isCommonJsTarget ? ts.ModuleKind.CommonJS : ts.ModuleKind.ES2020,
-      allowJs: true,
-    },
-  })
-  return outputText
-}
-
-for (const { sourcePath, targets } of syncPairs) {
-  for (const target of targets) {
-    fs.mkdirSync(path.dirname(target), { recursive: true })
-    fs.writeFileSync(target, transpileForTarget(sourcePath, target), 'utf8')
-    console.log(`Synced ${path.relative(projectRoot, sourcePath)} -> ${path.relative(projectRoot, target)}`)
-  }
-}
-
-for (const target of staleTargets) {
-  if (!fs.existsSync(target)) continue
-  fs.rmSync(target, { force: true })
-  console.log(`Removed stale ${path.relative(projectRoot, target)}`)
-}