@teambit/jest 0.0.554 → 0.0.558

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/jest",
-  "version": "0.0.554",
+  "version": "0.0.558",
   "homepage": "https://bit.dev/teambit/defender/jest",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.defender",
     "name": "jest",
-    "version": "0.0.554"
+    "version": "0.0.558"
   },
   "dependencies": {
     "@teambit/harmony": "0.2.11",
@@ -21,12 +21,12 @@
     "jest-watcher": "26.6.2",
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
-    "@teambit/cli": "0.0.385",
-    "@teambit/logger": "0.0.470",
-    "@teambit/worker": "0.0.554",
-    "@teambit/component": "0.0.554",
-    "@teambit/tester": "0.0.554",
-    "@teambit/tests-results": "0.0.71"
+    "@teambit/cli": "0.0.388",
+    "@teambit/logger": "0.0.473",
+    "@teambit/worker": "0.0.558",
+    "@teambit/component": "0.0.558",
+    "@teambit/tester": "0.0.558",
+    "@teambit/tests-results": "0.0.74"
   },
   "devDependencies": {
     "@types/react": "^17.0.8",
@@ -39,7 +39,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.171",
+    "@teambit/legacy": "1.0.174",
     "jest": "26.6.3",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
@@ -72,6 +72,14 @@
       }
     }
   },
+  "files": [
+    "dist",
+    "!dist/tsconfig.tsbuildinfo",
+    "README.md",
+    "README.mdx",
+    "*.js",
+    "*.json"
+  ],
   "private": false,
   "engines": {
     "node": ">=12.22.0"

package/tsconfig.json

@@ -15,9 +15,9 @@
     "skipLibCheck": true,
     "moduleResolution": "node",
     "esModuleInterop": true,
-    "outDir": "dist",
     "composite": true,
     "emitDeclarationOnly": true,
+    "outDir": "dist",
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "allowSyntheticDefaultImports": true,
@@ -25,7 +25,6 @@
     "strict": true,
     "noImplicitAny": false,
     "rootDir": ".",
-    "removeComments": true,
     "preserveConstEnums": true,
     "resolveJsonModule": true
   },

package/error.ts

@@ -1,9 +0,0 @@
-export class JestError extends Error {
-  constructor(message: string, stack?: string | null, public readonly code?: unknown, public readonly type?: string) {
-    super(message);
-  }
-
-  get stack() {
-    return this.stack;
-  }
-}

package/index.ts

@@ -1,3 +0,0 @@
-export { JestTester } from './jest.tester';
-export type { JestMain } from './jest.main.runtime';
-export { JestAspect } from './jest.aspect';

package/jest.aspect.ts

@@ -1,5 +0,0 @@
-import { Aspect } from '@teambit/harmony';
-
-export const JestAspect = Aspect.create({
-  id: 'teambit.defender/jest',
-});

package/jest.composition.tsx

@@ -1,7 +0,0 @@
-import React from 'react';
-
-export const Logo = () => (
-  <div style={{ height: '100%', display: 'flex', justifyContent: 'center' }}>
-    <img style={{ width: 70 }} src="https://static.bit.dev/brands/logo-jest.svg" />
-  </div>
-);

package/jest.main.runtime.ts

@@ -1,27 +0,0 @@
-import { MainRuntime } from '@teambit/cli';
-import { LoggerAspect, LoggerMain, Logger } from '@teambit/logger';
-import { WorkerAspect, WorkerMain, HarmonyWorker } from '@teambit/worker';
-import { JestAspect } from './jest.aspect';
-import { JestTester } from './jest.tester';
-import type { JestWorker } from './jest.worker';
-
-export const WORKER_NAME = 'jest';
-
-export class JestMain {
-  constructor(private jestWorker: HarmonyWorker<JestWorker>, private logger: Logger) {}
-
-  createTester(jestConfig: any, jestModulePath = require.resolve('jest')) {
-    return new JestTester(JestAspect.id, jestConfig, jestModulePath, this.jestWorker, this.logger);
-  }
-
-  static runtime = MainRuntime;
-  static dependencies = [WorkerAspect, LoggerAspect];
-
-  static async provider([worker, loggerAspect]: [WorkerMain, LoggerMain]) {
-    const logger = loggerAspect.createLogger(JestAspect.id);
-    const jestWorker = await worker.declareWorker<JestWorker>(WORKER_NAME, require.resolve('./jest.worker'));
-    return new JestMain(jestWorker, logger);
-  }
-}
-
-JestAspect.addRuntime(JestMain);

package/jest.tester.ts

@@ -1,218 +0,0 @@
-import { readFileSync } from 'fs-extra';
-import minimatch from 'minimatch';
-import { compact, flatten } from 'lodash';
-import { proxy } from 'comlink';
-import { Logger } from '@teambit/logger';
-import { HarmonyWorker } from '@teambit/worker';
-import { Tester, CallbackFn, TesterContext, Tests, ComponentPatternsMap } from '@teambit/tester';
-import { TestsFiles, TestResult, TestsResult } from '@teambit/tests-results';
-import { TestResult as JestTestResult, AggregatedResult } from '@jest/test-result';
-import { formatResultsErrors } from 'jest-message-util';
-import { ComponentMap, ComponentID } from '@teambit/component';
-import { AbstractVinyl } from '@teambit/legacy/dist/consumer/component/sources';
-import type jest from 'jest';
-import { JestError } from './error';
-import type { JestWorker } from './jest.worker';
-
-export class JestTester implements Tester {
-  private readonly jestModule: typeof jest;
-
-  constructor(
-    readonly id: string,
-    readonly jestConfig: any,
-    private jestModulePath: string,
-    private jestWorker: HarmonyWorker<JestWorker>,
-    private logger: Logger
-  ) {
-    // eslint-disable-next-line global-require,import/no-dynamic-require
-    this.jestModule = require(jestModulePath);
-  }
-
-  configPath = this.jestConfig;
-
-  displayName = 'Jest';
-
-  _callback: CallbackFn | undefined;
-
-  displayConfig() {
-    return readFileSync(this.jestConfig, 'utf8');
-  }
-
-  version() {
-    return this.jestModule.getVersion();
-  }
-
-  // private getTestFile(path: string, testerContext: TesterContext): AbstractVinyl | undefined {
-  //   return testerContext.specFiles.toArray().reduce((acc: AbstractVinyl | undefined, [, specs]) => {
-  //     const file = specs.find((spec) => spec.path === path);
-  //     if (file) acc = file;
-  //     return acc;
-  //   }, undefined);
-  // }
-
-  private attachTestsToComponent(testerContext: TesterContext, testResult: JestTestResult[]) {
-    return ComponentMap.as(testerContext.components, (component) => {
-      const componentSpecFiles = testerContext.patterns.get(component);
-      if (!componentSpecFiles) return undefined;
-      const [, specs] = componentSpecFiles;
-      return testResult.filter((test) => {
-        return specs.filter((pattern) => minimatch(test.testFilePath, pattern.path)).length > 0;
-      });
-    });
-  }
-
-  private buildTestsObj(
-    aggregatedResult: AggregatedResult,
-    components: ComponentMap<JestTestResult[] | undefined>,
-    testerContext: TesterContext,
-    config?: any
-  ) {
-    const testsSuiteResult = components.toArray().map(([component, testsFiles]) => {
-      if (!testsFiles) return;
-      if (testsFiles?.length === 0) return;
-      const tests = testsFiles.map((test) => {
-        const file = new AbstractVinyl({ path: test.testFilePath, contents: readFileSync(test.testFilePath) });
-        const testResults = test.testResults.map((testResult) => {
-          const error = formatResultsErrors([testResult], config, { noStackTrace: true }) || undefined;
-          const isFailure = testResult.status === 'failed';
-          return new TestResult(
-            testResult.ancestorTitles,
-            testResult.title,
-            testResult.status,
-            testResult.duration,
-            isFailure ? undefined : error,
-            isFailure ? error : undefined
-          );
-        });
-        const filePath = file?.basename || test.testFilePath;
-        const error = {
-          failureMessage: test.testExecError ? test.failureMessage : undefined,
-          error: test.testExecError?.message,
-        };
-        return new TestsFiles(
-          filePath,
-          testResults,
-          test.numPassingTests,
-          test.numFailingTests,
-          test.numPendingTests,
-          test.perfStats.runtime,
-          test.perfStats.slow,
-          error
-        );
-      });
-      // TODO @guy - fix this eslint error
-      // eslint-disable-next-line
-      return {
-        componentId: component.id,
-        results: new TestsResult(tests, aggregatedResult.success, aggregatedResult.startTime),
-      };
-    });
-
-    return compact(testsSuiteResult) as { componentId: ComponentID; results: TestsResult }[];
-  }
-
-  private getErrors(testResult: JestTestResult[]): JestError[] {
-    return testResult.reduce((errors: JestError[], test) => {
-      if (test.testExecError) {
-        const { message, stack, code, type } = test.testExecError;
-        errors.push(new JestError(message, stack, code, type));
-      }
-      if (test.failureMessage) {
-        errors.push(new JestError(test.failureMessage));
-      }
-      return errors;
-    }, []);
-  }
-
-  async onTestRunComplete(callback: CallbackFn) {
-    this._callback = callback;
-  }
-
-  async test(context: TesterContext): Promise<Tests> {
-    const config: any = {
-      rootDir: context.rootPath,
-    };
-
-    // eslint-disable-next-line no-console
-    console.warn = (message: string) => {
-      this.logger.warn(message);
-    };
-
-    if (context.debug) config.runInBand = true;
-    if (context.coverage) config.coverage = true;
-    config.runInBand = true;
-
-    if (context.watch) {
-      config.watchAll = true;
-      config.noCache = true;
-    }
-    // eslint-disable-next-line global-require,import/no-dynamic-require
-    const jestConfig = require(this.jestConfig);
-
-    const jestConfigWithSpecs = Object.assign(jestConfig, {
-      testMatch: this.patternsToArray(context.patterns),
-    });
-
-    const withEnv = Object.assign(jestConfigWithSpecs, config);
-    const testsOutPut = await this.jestModule.runCLI(withEnv, [this.jestConfig]);
-    const testResults = testsOutPut.results.testResults;
-    const componentsWithTests = this.attachTestsToComponent(context, testResults);
-    const componentTestResults = this.buildTestsObj(
-      testsOutPut.results,
-      componentsWithTests,
-      context,
-      jestConfigWithSpecs
-    );
-    const globalErrors = this.getErrors(testResults);
-    return { components: componentTestResults, errors: globalErrors };
-  }
-
-  async watch(context: TesterContext): Promise<Tests> {
-    // eslint-disable-next-line
-    return new Promise(async (resolve) => {
-      const workerApi = this.jestWorker.initiate(
-        context.ui ? { stdout: true, stderr: true, stdin: true } : { stdout: false, stderr: false, stdin: false }
-      );
-
-      // eslint-disable-next-line
-      const jestConfig = require(this.jestConfig);
-
-      const jestConfigWithSpecs = Object.assign(jestConfig, {
-        testMatch: this.patternsToArray(context.patterns),
-      });
-
-      try {
-        const cbFn = proxy((results) => {
-          if (!this._callback) return;
-          const testResults = results.testResults;
-          const componentsWithTests = this.attachTestsToComponent(context, testResults);
-          const componentTestResults = this.buildTestsObj(results, componentsWithTests, context, jestConfigWithSpecs);
-          const globalErrors = this.getErrors(testResults);
-          const watchTestResults = {
-            loading: false,
-            errors: globalErrors,
-            components: componentTestResults,
-          };
-          this._callback(watchTestResults);
-          resolve(watchTestResults);
-        });
-
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        await workerApi.onTestComplete(cbFn);
-
-        await workerApi.watch(
-          this.jestConfig,
-          this.patternsToArray(context.patterns),
-          context.rootPath,
-          this.jestModulePath
-        );
-      } catch (err: any) {
-        this.logger.error('jest.tester.watch() caught an error', err);
-      }
-    });
-  }
-
-  private patternsToArray(patterns: ComponentPatternsMap) {
-    return flatten(patterns.toArray().map(([, pattern]) => pattern.map((p) => p.path)));
-  }
-}

package/jest.worker.ts

@@ -1,64 +0,0 @@
-import { stringify, parse } from 'flatted';
-import { expose } from '@teambit/worker';
-import type jest from 'jest';
-
-export class JestWorker {
-  private onTestCompleteCb;
-
-  onTestComplete(onTestComplete) {
-    this.onTestCompleteCb = onTestComplete;
-    // return this;
-  }
-
-  watch(jestConfigPath: string, testFiles: string[], rootPath: string, jestModulePath: string): Promise<void> {
-    return new Promise((resolve) => {
-      // TODO: remove this after jest publish new version to npm: https://github.com/facebook/jest/pull/10804
-      // eslint-disable-next-line
-      console.warn = function () {};
-      // eslint-disable-next-line import/no-dynamic-require,global-require
-      const jestConfig = require(jestConfigPath);
-      // eslint-disable-next-line import/no-dynamic-require,global-require
-      const jestModule: typeof jest = require(jestModulePath);
-
-      const jestConfigWithSpecs = Object.assign(jestConfig, {
-        testMatch: testFiles,
-      });
-
-      const config: any = {
-        // useStderr: true,
-        // TODO: check way to enable it
-        runInBand: true,
-        silent: false,
-        rootDir: rootPath,
-        watch: true,
-        watchAll: true,
-        watchPlugins: [
-          [
-            `${__dirname}/watch.js`,
-            {
-              specFiles: testFiles,
-              onComplete: (results) => {
-                if (!this.onTestCompleteCb) return;
-                try {
-                  const json = parse(stringify(results));
-                  this.onTestCompleteCb(json);
-                  // disable eslint because we want to catch error but not print it on worker
-                  // eslint-disable-next-line
-                } catch (error: any) {}
-              },
-            },
-          ],
-        ],
-      };
-
-      const withEnv = Object.assign(jestConfigWithSpecs, config);
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      const res = jestModule.runCLI(withEnv, [jestConfigPath]);
-      // eslint-disable-next-line no-console
-      res.catch((err) => console.error(err));
-      resolve();
-    });
-  }
-}
-
-expose(new JestWorker());

package/types/asset.d.ts

@@ -1,29 +0,0 @@
-declare module '*.png' {
-  const value: any;
-  export = value;
-}
-declare module '*.svg' {
-  import type { FunctionComponent, SVGProps } from 'react';
-
-  export const ReactComponent: FunctionComponent<SVGProps<SVGSVGElement> & { title?: string }>;
-  const src: string;
-  export default src;
-}
-
-// @TODO Gilad
-declare module '*.jpg' {
-  const value: any;
-  export = value;
-}
-declare module '*.jpeg' {
-  const value: any;
-  export = value;
-}
-declare module '*.gif' {
-  const value: any;
-  export = value;
-}
-declare module '*.bmp' {
-  const value: any;
-  export = value;
-}

package/types/style.d.ts

@@ -1,42 +0,0 @@
-declare module '*.module.css' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-declare module '*.module.scss' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-declare module '*.module.sass' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-
-declare module '*.module.less' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-
-declare module '*.less' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-
-declare module '*.css' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-
-declare module '*.sass' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-
-declare module '*.scss' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-
-declare module '*.mdx' {
-  const component: any;
-  export default component;
-}

package/watch.ts

@@ -1,61 +0,0 @@
-import { Prompt, WatchPlugin, JestHookSubscriber, UsageData } from 'jest-watcher';
-import { SpecFiles } from '@teambit/tester';
-
-export type PluginConfig = {
-  onComplete: (testSuite: any) => void;
-  specFiles: SpecFiles;
-};
-
-class Watch implements WatchPlugin {
-  _stdin: NodeJS.ReadStream;
-
-  _stdout: NodeJS.WriteStream;
-
-  _prompt: Prompt;
-
-  _testResults: any;
-
-  _usageInfo: UsageData;
-
-  _specFiles: SpecFiles;
-
-  _onComplete: (testSuite: any) => void;
-
-  constructor({
-    stdin,
-    stdout,
-    config,
-  }: {
-    stdin: NodeJS.ReadStream;
-    stdout: NodeJS.WriteStream;
-    config: PluginConfig;
-  }) {
-    this._stdin = stdin;
-    this._stdout = stdout;
-    this._specFiles = config.specFiles;
-    this._onComplete = config.onComplete;
-  }
-
-  private findComponent(specFile: string) {
-    const component = this._specFiles.toArray().find(([, specs]) => {
-      const paths = specs.map((spec) => spec.path);
-      if (paths.includes(specFile)) return true;
-      return false;
-    });
-    return component?.[0];
-  }
-
-  apply(jestHooks: JestHookSubscriber) {
-    // jestHooks.shouldRunTestSuite(async (testSuite) => {
-    //   const component = this.findComponent(testSuite.testPath);
-    //   if ((await component?.isModified()) || (await component?.isNew())) return true;
-    //   return false;
-    // });
-
-    jestHooks.onTestRunComplete((results) => {
-      this._onComplete(results);
-    });
-  }
-}
-
-module.exports = Watch;