@digigov/cli-test 1.1.0 → 2.0.0-0138f8bd

package/dirsum.js

@@ -1,72 +1,83 @@
-const crypto = require('crypto');
-const fs = require('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;
-}
+import crypto from 'crypto';
+import fs from 'fs';
 
 const method = 'sha1';
-function digest(root, options) {
-  if(!root || typeof (root) !== '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) {
+  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()) {
+    } else if (stats.isFile()) {
       const data = fs.readFileSync(path, 'utf8');
 
       const hash = crypto.createHash(method);
       hash.update(data);
       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) {
+      if (++hashed > files.length) {
         return _summarize(method, hashes);
       }
     }
   }
+  return { hash: '', files: {} };
+}
+
+/**
+ * @param {string} method - The method
+ */
+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/eslint.config.js

@@ -0,0 +1,3 @@
+import config from '@digigov/cli-lint/eslint.config';
+
+export default [...config];

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,35 +1,43 @@
 {
   "name": "@digigov/cli-test",
-  "version": "1.1.0",
+  "version": "2.0.0-0138f8bd",
   "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/enzyme": "3.10.8",
-    "@types/enzyme-adapter-react-16": "1.0.5",
-    "@types/jest": "26.0.15",
-    "babel-jest": "26.6.3",
-    "babel-plugin-istanbul": "6.0.0",
-    "enzyme": "3.11.0",
-    "enzyme-adapter-react-16": "1.15.2",
-    "enzyme-to-json": "3.4.3",
-    "jest": "26.6.3",
-    "jest-cli": "26.6.3",
-    "publint": "0.1.8"
+    "publint": "0.1.8",
+    "@vitest/coverage-istanbul": "2.1.3",
+    "@testing-library/jest-dom": "6.1.4",
+    "jsdom": "25.0.1"
   },
   "devDependencies": {
+    "@digigov/cli": "2.0.0-0138f8bd",
+    "@digigov/cli-lint": "2.0.0-0138f8bd",
+    "eslint": "9.16.0",
+    "prettier": "3.4.2",
+    "vitest": "2.1.3",
     "publint": "0.1.8"
   },
   "peerDependencies": {
-    "@digigov/cli": "1.1.0",
-    "@digigov/cli-build": "1.1.0",
-    "typescript": "5.3.2",
-    "@types/node": "16.6.2",
-    "@types/react": "16.9.56"
+    "vitest": "2.1.3",
+    "@testing-library/dom": "10.4.0",
+    "@testing-library/react": "16.2.0",
+    "@digigov/cli": "2.0.0-0138f8bd"
+  },
+  "peerDependenciesMeta": {
+    "@testing-library/dom": {
+      "optional": true
+    },
+    "@testing-library/react": {
+      "optional": true
+    }
   },
   "scripts": {
-    "publint": "publint"
+    "publint": "publint",
+    "lint": "digigov lint",
+    "typecheck": "tsc"
   }
 }

package/test-setup.js

@@ -0,0 +1,11 @@
+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;
+
+// @ts-ignore
+expect.extend(matchers);

package/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "@digigov/cli/tsconfig.cli",
+  "include": ["./*.js"]
+}

package/vitest.config.js

@@ -0,0 +1,41 @@
+import path from 'path';
+import fs from 'fs';
+import { resolveProject } from '@digigov/cli/lib';
+import { defineConfig } from 'vitest/config';
+import { fileURLToPath } from 'url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+const project = resolveProject();
+
+const tsconfigPath = path.join(project.root, 'tsconfig.json');
+const tsconfig = JSON.parse(fs.readFileSync(tsconfigPath, 'utf8'));
+
+const alias = Object.fromEntries(
+  Object.entries(tsconfig.compilerOptions.paths).map(([key, [value]]) => [
+    key.replace(/\/\*$/, ''),
+    path.resolve(project.root, value.replace(/\/\*$/, '')),
+  ])
+);
+
+export default defineConfig({
+  resolve: {
+    alias,
+  },
+  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',
+    },
+  },
+});

package/.rush/temp/package-deps_publint.json

@@ -1,15 +0,0 @@
-{
-  "files": {
-    "tooling/cli-test/CHANGELOG.json": "b68c9ea29daf822ca9fa86ba4f217c3e143407d5",
-    "tooling/cli-test/CHANGELOG.md": "c6dcf53cb759736582a8512323baecc27f8284a3",
-    "tooling/cli-test/babelTransformer.js": "271e13591a0aaca483eb49e043c567107b58e4b2",
-    "tooling/cli-test/dirsum.js": "a94b73135c0c3813aa986136cfc0280f47be383e",
-    "tooling/cli-test/index.js": "8b1c22589b41f7defd89757e5cb24045c271ae07",
-    "tooling/cli-test/jest.common.js": "a0e0f68855647bccf3492423632519ad9f1d2bb1",
-    "tooling/cli-test/jest.config.js": "4e614114a0600f0293ac9569739bf708fb742ba9",
-    "tooling/cli-test/package.json": "e4cd9e0ea4808eaca47d178c9ed7041892fff92e",
-    "tooling/cli-test/setupTests.js": "ce2d70b8bb1a75d11370ae65b32dff9b9c4e21f4",
-    "tooling/cli-test/.rush/temp/shrinkwrap-deps.json": "f6053570d951206e32e09c3d9d0e866fbfff0114"
-  },
-  "arguments": "publint "
-}

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/cli-test.publint.log

@@ -1,3 +0,0 @@
-Invoking: publint 
-@digigov/cli-test lint results:
-All good!

package/jest.common.js

@@ -1,24 +0,0 @@
-const path = require('path');
-const lib = require('@digigov/cli/lib');
-function makeJestConfig(dir) {
-  const project = lib.resolveProject(dir);
-  const rootDir = project.root;
-  let roots = [path.join(project.root, project.src)];
-  return {
-    rootDir,
-    transform: {
-      '^.+\\.[t|j]sx?$': path.resolve(
-        __dirname,
-        'babelTransformer.js'
-      ),
-    },
-    "setupFilesAfterEnv": [path.resolve(__dirname, 'setupTests.js')],
-    snapshotSerializers: ['enzyme-to-json/serializer'],
-    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,70 +0,0 @@
-const { configure } = require('enzyme');
-const React16Adapter = require('enzyme-adapter-react-16');
-var {spawn} = require('child_process');
-const {digest} = require('./dirsum')
-
-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;
-configure({ adapter: new React16Adapter() });
-// 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')
-