removed temporarily test coverage infra

Author: Sayan751

package-lock.json

@@ -4,22 +4,20 @@
   "description": "OData EDM generator",
   "type": "module",
   "exports": {
-    "require": "./dist/cjs/api/decorators.js",
-    "import": "./dist/esm/decorators.js"
+    "import": "./dist/esm/api/decorators.js"
   },
-  "typings": "dist/types/decorators",
+  "typings": "dist/types/api/decorators",
   "bin": {
-    "gen-edm": "dist/cjs/cli/index.js"
+    "gen-edm": "dist/esm/cli/index.js"
   },
   "scripts": {
     "lint": "eslint . --ext .ts --cache",
     "prebuild": "rimraf dist && npm run lint",
-    "build": "tsc && tsc -p tsconfig.esm.json",
+    "build": "tsc",
     "dev": "tsc -w --preserveWatchOutput",
     "pretest": "tsc -p tests/tsconfig.json",
-    "test": "mocha ./tests/.artifacts/dist/tests/**/*.js",
-    "test_original": "nyc --nycrc-path ./tests/nyc.config.js mocha --config ./tests/.mocharc.js",
-    "test:dev": "cross-env DEV=true nyc --nycrc-path ./tests/nyc.config.cjs mocha --config ./tests/.mocharc.cjs --bail"
+    "test": "mocha --config ./tests/.mocharc.cjs",
+    "test:dev": "mocha --config ./tests/.mocharc.cjs --bail"
   },
   "repository": {
     "type": "git",
@@ -61,9 +59,7 @@
     "husky": "^9.0.11",
     "mocha": "^10.2.0",
     "mock-fs": "^5.2.0",
-    "nyc": "^15.1.0",
     "rimraf": "^5.0.1",
-    "source-map-support": "^0.5.21",
     "standard-version": "^9.5.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.4.2",

package.json

@@ -3,6 +3,7 @@ import { promises as fs } from 'fs';
 import { isAbsolute, resolve } from 'path';
 import { EndpointConfiguration, Logger } from './shared.js';
 import { exists as exists } from './file-system-helper.js';
+import { pathToFileURL } from 'url';
 
 export class Configuration {
 
@@ -37,8 +38,9 @@ export class Configuration {
           if (!await exists(configPath) || !(await fs.stat(configPath)).isFile()) {
             throw new Error(`The config file "${configPath}" does not exist.`);
           }
-          // eslint-disable-next-line @typescript-eslint/no-var-requires
-          await instance.applyConfiguration(await require(configPath) as ConfigSchema);
+          let importedConfig = await import(pathToFileURL(configPath).href) as ConfigSchema & { default?: ConfigSchema };
+          importedConfig = importedConfig.default as ConfigSchema ?? importedConfig;
+          await instance.applyConfiguration(importedConfig);
           break;
         }
         case 'endpoint':

src/cli/configuration.ts

@@ -1,23 +1,5 @@
-const path = require("path");
-const { register } = require('node:module');
-const { pathToFileURL } = require('node:url');
-
-const cwd = pathToFileURL("./");
-register(
-  "ts-node/esm",
-  cwd,
-  { project: path.resolve(cwd.href, './tests/tsconfig.json') }
-);
-
-const isDev = !!process.env.DEV;
 module.exports = {
-  // extension: ['ts', 'js'],
-  spec: './tests/**/*.spec.ts',
-  // "node-option": [
-  //   "loader=ts-node/esm"
-  // ],
-  // require: [path.resolve('./tests/ts-hook.cjs')/* , 'source-map-support/register' */],
-  // reporter: '@netatwork/mocha-utils/dist/JunitSpecReporter.js',
-  // reporterOptions: ['mochaFile=./tests/.artifacts/results.xml'],
-  // ...(isDev ? { watch: true, 'watch-files': './**/*.ts' } : {})
+  spec: './tests/.artifacts/dist/tests/**/*.spec.js',
+  reporter: '@netatwork/mocha-utils/dist/JunitSpecReporter.js',
+  reporterOptions: ['mochaFile=./tests/.artifacts/results.xml'],
 };

tests/.mocharc.cjs

@@ -6,16 +6,16 @@
 import { assert } from 'chai';
 import { gray, green, red } from 'colorette';
 import { diffLines } from 'diff';
-import { Dirent, promises as fs } from 'fs';
+import { promises as fs, readdirSync } from 'fs';
 import mockFs from 'mock-fs';
 import type { DirectoryItems } from 'mock-fs/lib/filesystem';
-import { join } from 'path';
 import { URL } from 'node:url';
+import { join } from 'path';
 import { v4 as uuid } from 'uuid';
 import { Configuration } from '../src/cli/configuration.js';
+import { exists } from '../src/cli/file-system-helper.js';
 import { $Generator } from '../src/cli/generator.js';
 import { Endpoint, EndpointConfiguration } from '../src/cli/shared.js';
-import { exists } from '../src/cli/file-system-helper.js';
 
 const __dirname = process.cwd();
 
@@ -65,14 +65,10 @@ describe('generator', function () {
   }
 
   const dataPath = join(__dirname, 'tests', 'data');
-  let directoryEntries: Dirent[] = [];
-  before(async function () {
-    directoryEntries = (await fs.readdir(dataPath, { encoding: 'utf8', withFileTypes: true }))
-    .filter((x) => x.isDirectory());
-  });
-  for (const dirent of directoryEntries) {
+  for (const dirent of (readdirSync(dataPath, { encoding: 'utf8', withFileTypes: true }))
+    .filter((x) => x.isDirectory())) {
     const dirName = dirent.name;
-    it.only(`works for ${dirName}`, async function () {
+    it(`works for ${dirName}`, async function () {
       let generator: $Generator | null = null;
       try {
         // arrange
@@ -81,15 +77,17 @@ describe('generator', function () {
         const inputDir = join(caseDir, 'input');
 
         const mockFsConfig: DirectoryItems = { [baseOutputPath]: {} };
-        const configFilePath = join(inputDir, 'config.js');
+        const configFilePath = join(inputDir, 'config.cjs');
 
         let configuredEndpoints: EndpointConfiguration[] | undefined = undefined;
         let hasConfiguredEndpoints = false;
         const args = ['--outputDir', baseOutputPath];
-        if (await exists(configFilePath)) {
+        if (await mockFs.bypass(() => exists(configFilePath))) {
           args.unshift('--config', configFilePath);
           mockFsConfig[configFilePath] = mockFs.load(configFilePath);
-          configuredEndpoints = (await import(`file:///${configFilePath}`)).endpoints;
+          let importedConfig = await import(`file:///${configFilePath}`);
+          importedConfig = importedConfig.default ?? importedConfig;
+          configuredEndpoints = importedConfig.endpoints;
           hasConfiguredEndpoints = Array.isArray(configuredEndpoints) && configuredEndpoints.length > 0;
         }
         if (!hasConfiguredEndpoints) {
@@ -102,12 +100,11 @@ describe('generator', function () {
 
         for (const ep of configuration.endpoints) {
           let epInput = join(inputDir, new URL(ep.url).hostname);
-          epInput = await exists(epInput) ? epInput : inputDir;
+          epInput = await mockFs.bypass(() => exists(epInput)) ? epInput : inputDir;
 
-          const edmxXml = await fs.readFile(join(epInput, 'metadata.xml'), 'utf8');
-          console.log('[test] edmxXml', edmxXml);
+          const edmxXml = await mockFs.bypass(() => fs.readFile(join(epInput, 'metadata.xml'), 'utf8'));
           // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-          const endpoints: Endpoint[] = JSON.parse(await fs.readFile(join(epInput, 'endpoints.json'), 'utf8')).value;
+          const endpoints: Endpoint[] = JSON.parse(await mockFs.bypass(() => fs.readFile(join(epInput, 'endpoints.json'), 'utf8'))).value;
 
           // act
           await generator.generateEndpointsFile(endpoints, ep);

tests/generator.spec.ts

@@ -4,7 +4,6 @@
     "target": "ES6",
     "module": "ES2020",
     "outDir": "./.artifacts/dist",
-    "declaration": false,
 	},
 	"include": [
 		"../tests"

tests/nyc.config.cjs

@@ -1,14 +1,15 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "module": "ES6",
+    "module": "ES2020",
     "lib": [
-      "ESNext",
       "dom"
     ],
-    "declaration": false,
+    "declaration": true,
+    "declarationMap": true,
+    "declarationDir": "./dist/types",
     "sourceMap": true,
-    "outDir": "./dist/cjs",
+    "outDir": "./dist/esm",
     "strict": true,
     "moduleResolution": "node",
     "esModuleInterop": true,