@digigov/cli-test 2.0.0-rc.20 → 2.0.0-rc.22

package/.rush/temp/shrinkwrap-deps.json

@@ -1,15 +1,10 @@
 {
-  "../../tooling/cli-test": "../../tooling/cli-test:0pLPlpkhBLZn+8ae/eUwnKrziLGttU8eN8S5BLx7PBE=:",
-  "/@testing-library/jest-dom@6.1.4(@jest/globals@29.7.0)(@types/jest@29.0.2)(jest@29.0.2(@types/node@18.19.0)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@18.19.0)(typescript@5.6.2)))": "Missing shrinkwrap entry!",
-  "/@testing-library/react@15.0.7(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": "Missing shrinkwrap entry!",
-  "/@types/jest@29.0.2": "Missing shrinkwrap entry!",
-  "/@types/node@18.19.0": "Missing shrinkwrap entry!",
-  "/@types/react@18.3.3": "Missing shrinkwrap entry!",
-  "/babel-jest@29.0.2(@babel/core@7.12.13)": "Missing shrinkwrap entry!",
-  "/babel-plugin-istanbul@7.0.0": "Missing shrinkwrap entry!",
-  "/jest-cli@29.0.2(@types/node@18.19.0)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@18.19.0)(typescript@5.6.2))": "Missing shrinkwrap entry!",
-  "/jest-environment-jsdom@29.0.2": "Missing shrinkwrap entry!",
-  "/jest@29.0.2(@types/node@18.19.0)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@18.19.0)(typescript@5.6.2))": "Missing shrinkwrap entry!",
+  "../../tooling/cli-test": "../../tooling/cli-test:pMkmz3EGXjjxFWyjvMi7eIIHnaSWxUUhI5JxCg+bIj0=:",
+  "/@testing-library/dom@10.4.0": "Missing shrinkwrap entry!",
+  "/@testing-library/jest-dom@6.1.4(@jest/globals@29.7.0)(@types/jest@29.0.2)(jest@29.0.2(@types/node@22.7.5)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2))(vitest@2.1.3(@types/node@22.7.5)(happy-dom@15.11.0)(jsdom@20.0.3)(lightningcss@1.22.0)(sass-embedded@1.81.0)(terser@5.33.0))": "Missing shrinkwrap entry!",
+  "/@testing-library/react@16.0.1(@testing-library/dom@10.4.0)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": "Missing shrinkwrap entry!",
+  "/@vitest/coverage-istanbul@2.1.3(vitest@2.1.3(@types/node@22.7.5)(happy-dom@15.11.0)(jsdom@20.0.3)(lightningcss@1.22.0)(sass-embedded@1.81.0)(terser@5.33.0))": "Missing shrinkwrap entry!",
   "/publint@0.1.8": "Missing shrinkwrap entry!",
-  "/typescript@5.6.2": "Missing shrinkwrap entry!"
+  "/vite-tsconfig-paths@5.0.1(typescript@5.6.2)(vite@5.4.11(@types/node@22.7.5)(lightningcss@1.22.0)(sass-embedded@1.81.0)(terser@5.33.0))": "Missing shrinkwrap entry!",
+  "/vitest@2.1.3(@types/node@22.7.5)(happy-dom@15.11.0)(jsdom@20.0.3)(lightningcss@1.22.0)(sass-embedded@1.81.0)(terser@5.33.0)": "Missing shrinkwrap entry!"
 }

package/dirsum.js

@@ -1,72 +1,84 @@
-const crypto = require('crypto');
-const fs = require('fs');
+import crypto from "crypto";
+import fs from "fs";
 
-function _summarize(method, hashes) {
-  const keys = Object.keys(hashes);
-  keys.sort();
-
-  const obj = {};
-  obj.files = hashes;
-  const hash = crypto.createHash(method);
-  for(let i = 0; i < keys.length; i++) {
-    if(typeof (hashes[keys[i]]) === 'string') {
-      hash.update(hashes[keys[i]]);
-    } else if(typeof (hashes[keys[i]]) === 'object') {
-      hash.update(hashes[keys[i]].hash);
-    } else {
-      console.error('Unknown type found in hash: ' + typeof (hashes[keys[i]]));
-    }
-  }
-
-  obj.hash = hash.digest('hex');
-  return obj;
-}
+const method = "sha1";
 
-const method = 'sha1';
-function digest(root, options) {
-  if(!root || typeof (root) !== 'string') {
-    throw new TypeError('root is required (string)');
+/**
+ * Generate a digest of a directory
+ *
+ * @param {string} root - The root directory
+ * @param {object} options - The options
+ * @param {RegExp|string} options.ignore - The ignore pattern
+ */
+export function digest(root, options) {
+  if (!root || typeof root !== "string") {
+    throw new TypeError("root is required (string)");
   }
-  if(options.ignore){
-    if(root.match(options.ignore)){
-      return {hash: '', files: {}};
+  if (options.ignore) {
+    if (root.match(options.ignore)) {
+      return { hash: "", files: {} };
     }
   }
   const hashes = {};
   const files = fs.readdirSync(root);
-  if(files.length === 0) {
-    return {hash: '', files: {}};
+  if (files.length === 0) {
+    return { hash: "", files: {} };
   }
 
   let hashed = 0;
-  for(const f of files) {
-    const path = root + '/' + f;
+  for (const f of files) {
+    const path = root + "/" + f;
     const stats = fs.statSync(path);
 
-    if(stats.isDirectory()) {
+    if (stats.isDirectory()) {
       const hash = digest(path, options);
       hashes[f] = hash;
-      if(++hashed >= files.length) {
+      if (++hashed >= files.length) {
         return _summarize(method, hashes);
       }
-    } else if(stats.isFile()) {
-      const data = fs.readFileSync(path, 'utf8');
+    } else if (stats.isFile()) {
+      const data = fs.readFileSync(path, "utf8");
 
       const hash = crypto.createHash(method);
       hash.update(data);
-      hashes[f] = hash.digest('hex');
+      hashes[f] = hash.digest("hex");
 
-      if(++hashed >= files.length) {
+      if (++hashed >= files.length) {
         return _summarize(method, hashes);
       }
     } else {
-      console.error('Skipping hash of %s', f);
-      if(++hashed > files.length) {
+      console.error("Skipping hash of %s", f);
+      if (++hashed > files.length) {
         return _summarize(method, hashes);
       }
     }
   }
+  return { hash: "", files: {} };
+}
+
+/**
+ * @param {string} method - The method
+ * @param {Hashes} hashes - The hashes
+ */
+function _summarize(method, hashes) {
+  const keys = Object.keys(hashes);
+  keys.sort();
+
+  const obj = {
+    files: hashes,
+    hash: "",
+  };
+  const hash = crypto.createHash(method);
+  for (const key of keys) {
+    if (typeof hashes[key] === "string") {
+      hash.update(hashes[key]);
+    } else if (typeof hashes[key] === "object") {
+      hash.update(hashes[key]["hash"]);
+    } else {
+      console.error("Unknown type found in hash: " + typeof hashes[key]);
+    }
+  }
+
+  obj["hash"] = hash.digest("hex");
+  return obj;
 }
-module.exports = {
-  digest: digest
-};

package/index.js

@@ -1,23 +1,26 @@
-const execa = require('execa')
-const path = require('path')
-const {DigigovCommand} = require('@digigov/cli/lib')
+import path from "path";
+import { DigigovCommand } from "@digigov/cli/lib";
+import { fileURLToPath } from "url";
 
-module.exports = class Test extends DigigovCommand {
-  static description = 'test digigov projects'
-  static id = 'test'
-  dirname=__dirname
-  static examples = [
-    `$ digigov test`,
-  ]
+const command = new DigigovCommand("test", import.meta.url);
 
-  static load() { return Test }
-  script = 'jest'
-  async run() {
-    const proc = this.exec(this.script, [
-      '--config', 
-      path.join(__dirname, 'jest.config.js'),
-      ...this.argv
-    ], { env: {}, stdio: 'inherit' });
-    return proc;
-  }
+command
+  .argument("[args...]", "arguments to pass to test runner")
+  .helpOption(false)
+  .allowUnknownOption()
+  .action(runTest);
+
+export default command;
+
+/**
+ * @param {string[]} args - The arguments
+ * @param {DigigovCommand} ctx - The command context
+ */
+async function runTest(args, _, ctx) {
+  const __dirname = path.dirname(fileURLToPath(import.meta.url));
+  await ctx.exec(
+    "vitest",
+    ["--config", path.join(__dirname, "vitest.config.js"), ...args],
+    { env: {}, stdio: "inherit" },
+  );
 }

package/package.json

@@ -1,31 +1,34 @@
 {
   "name": "@digigov/cli-test",
-  "version": "2.0.0-rc.20",
+  "version": "2.0.0-rc.22",
   "description": "Test plugin for Digigov CLI",
   "main": "index.js",
+  "type": "module",
   "author": "GRNET Developers <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
   "private": false,
   "dependencies": {
-    "@types/jest": "29.0.2",
-    "babel-jest": "29.0.2",
-    "babel-plugin-istanbul": "7.0.0",
-    "jest": "29.0.2",
-    "jest-cli": "29.0.2",
     "publint": "0.1.8",
+    "@vitest/coverage-istanbul": "2.1.3",
     "@testing-library/jest-dom": "6.1.4",
-    "@testing-library/react": "15.0.7",
-    "jest-environment-jsdom": "29.0.2"
+    "vite-tsconfig-paths": "5.0.1"
   },
   "devDependencies": {
     "publint": "0.1.8"
   },
   "peerDependencies": {
-    "@digigov/cli": "1.1.1-rc.20",
-    "@digigov/cli-build": "2.0.0-rc.20",
-    "typescript": "5.6.2",
-    "@types/node": "18.19.0",
-    "@types/react": "18.3.3"
+    "vitest": "2.1.3",
+    "@testing-library/dom": "10.4.0",
+    "@testing-library/react": "16.0.1",
+    "@digigov/cli": "2.0.0-rc.22"
+  },
+  "peerDependenciesMeta": {
+    "@testing-library/dom": {
+      "optional": true
+    },
+    "@testing-library/react": {
+      "optional": true
+    }
   },
   "scripts": {
     "publint": "publint"

package/test-setup.js

@@ -0,0 +1,10 @@
+import * as path from "path";
+import * as matchers from "@testing-library/jest-dom/matchers";
+import { expect } from "vitest";
+
+import { digest } from "./dirsum.js";
+
+global.path = path;
+global.digest = digest;
+
+expect.extend(matchers);

package/vitest.config.js

@@ -0,0 +1,33 @@
+import path from "path";
+import { resolveProject } from "@digigov/cli/lib";
+import { defineConfig } from "vitest/config";
+import { fileURLToPath } from "url";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+const project = resolveProject();
+
+export default defineConfig({
+  test: {
+    globals: true,
+    watch: false,
+    environment: "jsdom",
+    setupFiles: path.resolve(__dirname, "test-setup.js"),
+    sequence: {
+      hooks: "list",
+    },
+    snapshotFormat: {
+      printBasicPrototype: true,
+    },
+    coverage: {
+      reporter: ["cobertura", "text"],
+      provider: "istanbul",
+    },
+  },
+  plugins: [
+    tsconfigPaths({
+      root: project.workspace.root,
+    }),
+  ],
+});

package/babelTransformer.js

@@ -1,4 +0,0 @@
-const babelrc = require('@digigov/cli-build/babel.config');
-const { createTransformer } = require('babel-jest');
-
-module.exports = createTransformer(babelrc);

package/jest.common.js

@@ -1,21 +0,0 @@
-const path = require("path");
-const lib = require("@digigov/cli/lib");
-
-function makeJestConfig(dir) {
-  const project = lib.resolveProject(dir);
-  const rootDir = project.root;
-  return {
-    testEnvironment: "jsdom",
-    rootDir,
-    transform: {
-      "^.+\\.[t|j]sx?$": path.resolve(__dirname, "babelTransformer.js"),
-    },
-    setupFilesAfterEnv: [path.resolve(__dirname, "setupTests.js")],
-    testPathIgnorePatterns: ["\\.history/.*", "dist"],
-  };
-}
-
-module.exports = {
-  makeJestConfig,
-  config: makeJestConfig(),
-};

package/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('./jest.common').config

package/setupTests.js

@@ -1,67 +0,0 @@
-var { spawn } = require("child_process");
-const { digest } = require("./dirsum");
-import "@testing-library/jest-dom";
-
-global["digest"] = digest;
-
-class Cli {
-  constructor(options) {
-    this.output = "";
-  }
-  async run(command, options) {
-    return new Promise((resolve, reject) => {
-      const child = spawn(command, options);
-      child.stdout.on("data", (data) => {
-        // console.log(this.output);
-        this.output += data.toString();
-      });
-      this.command = child;
-      resolve();
-    });
-  }
-  getOutput() {
-    return this.output;
-  }
-}
-global.Cli = Cli;
-// console.log(Object.keys(global))
-const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-global["expect"].extend({
-  toSpawnCommand: async (cli, command, args) => {
-    await cli.run(command, args);
-    return {
-      pass: true,
-      message: () => `Spawned command ${command} ${args.join(" ")}`,
-    };
-  },
-  toMatchContent: async (cli, text) => {
-    while (true) {
-      const lastLine = cli.getOutput();
-      if (lastLine.match(text)) {
-        break;
-      }
-      await sleep(100);
-    }
-    return {
-      pass: true,
-      message: () => `Matches ${text}`,
-    };
-  },
-  toEnter: async (cli, text) => {
-    const keyPress = {
-      _UP_: "\x1B[A",
-      _DOWN_: "\x1B[B",
-    };
-    if (keyPress[text]) {
-      text = keyPress[text];
-    }
-    cli.command.stdin.write(text);
-    cli.command.stdin.write("\n");
-    return {
-      pass: true,
-      message: () => `Entered ${text}`,
-    };
-  },
-});
-
-global.path = require("path");