- r converted mocha namer to typescript

.eslintignore

@@ -1,6 +1,7 @@
 lib/Namer.js
 lib/Core/*.js
 lib/Providers/Jest/*.js
+lib/Providers/Mocha/*.js
 lib/Scrubbers/Scrubbers.js
 lib/Scrubbers/DateScrubber.js
 lib/Utilities/*.js

.gitignore

@@ -53,3 +53,4 @@ lib/Namer.js
 lib/Scrubbers/Scrubbers.js
 lib/Scrubbers/DateScrubber.js
 /yarn.lock
+/lib/Providers/Mocha/**/**.js

lib/Approvals.js

@@ -79,7 +79,8 @@ var mochaExport = function (optionalBaseDir) {
     optionalBaseDir = path.dirname(callsite()[1].getFileName());
   }
 
-  var Namer = require("./Providers/Mocha/MochaNamer");
+  var { MochaNamer } = require("./Providers/Mocha/MochaNamer");
+  var Namer = MochaNamer
   var baseVerifier = require("./Providers/BeforeEachVerifierBase.js");
 
   baseVerifier(Namer, "require('Approvals').mocha();", optionalBaseDir);

lib/Core/Options.ts

@@ -1,6 +1,5 @@
 import type {Scrubber} from "../Scrubbers/Scrubbers";
-import type {Namer} from "../Namer";
-import {getJestNamer} from "../Providers/Jest/JestNamer";
+const Namer: any = require("../Namer");
 
 export type ConfigModifier = (t: any) => any;
 
@@ -71,11 +70,11 @@ export class Options {
         return modifier(config);
     }
 
-    withNamer(namer: Namer): Options {
+    withNamer(namer: typeof Namer): Options {
         return this.modify("Namer", namer);
     }
 
-    getNamer(): Namer {
-        return this.get("Namer", () => getJestNamer());
+    getNamer(): typeof Namer {
+        return this.get("Namer", () => new Namer('',''));
     }
 }

lib/Namer.ts

@@ -4,8 +4,8 @@ import path from 'path';
 
 export class Namer {
 
-  private path: string;
-  private name: string;
+  protected path: string;
+  protected name: string;
 
   constructor(path: string, name: string) {
     path = path || '';

lib/Providers/Jest/JestApprovals.ts

@@ -11,13 +11,15 @@ import {printArray, printJson} from "../../Utilities/Printers";
 ```
 */
 import {Options} from "../../Core/Options";
+import {getJestNamer} from "./JestNamer";
 
 const StringWriter = require("../../StringWriter");
 const approvals = require("../../Approvals");
 
 
 export function verify(sut: any, options?: Options): void {
     options = options || new Options()
+    options = options.withNamer(getJestNamer());
     const config = options.getConfig(approvals.getConfig());
     const scrubbed = options.scrub(`${sut}`);
     const writer = new StringWriter(config,  scrubbed, options.forFile().getFileExtension());

lib/Providers/Mocha/MochaApprovals.ts

@@ -0,0 +1,49 @@
+import {printArray, printJson} from "../../Utilities/Printers";
+/* ^^^ If the above line is failing, please add
+# 1. Jest Config
+```
+"transformIgnorePatterns": ["node_modules/@3ds"]
+```
+
+# 2. tsconfig.json
+```
+    "esModuleInterop": true
+```
+*/
+import {Options} from "../../Core/Options";
+import {MochaNamer} from "./MochaNamer";
+import mocha from 'mocha';
+
+const StringWriter = require("../../StringWriter");
+const approvals = require("../../Approvals");
+let mochaTest: any = null;
+
+export function it2(label: string, test: () => void): void {
+    mocha.it(label, function () {
+        mochaTest = this;
+        console.log("Mocha Test: ", mochaTest.test.name);
+        test();
+    });
+}
+
+export function verify(sut: any, options?: Options): void {
+    options = options || new Options()
+    options = options.withNamer(new MochaNamer(mochaTest.test));
+    const config = options.getConfig(approvals.getConfig());
+    const scrubbed = options.scrub(`${sut}`);
+    const writer = new StringWriter(config,  scrubbed, options.forFile().getFileExtension());
+    let namer = options.getNamer();
+    approvals.verifyWithControl(namer, writer, null, config);
+}
+
+export function verifyAsJson(data: any, options?: Options): void {
+    const text = printJson(data);
+    options = options || new Options()
+    options = options.forFile().withFileExtention(".json")
+    verify(text, options);
+}
+
+export function verifyAll<T>(header:string, list: T[], formatter?: ((element: T) => string), options?: Options): void{
+    const text = printArray(header, list, formatter);
+    verify(text, options);
+}

lib/Providers/Mocha/MochaNamer.ts

@@ -0,0 +1,60 @@
+import path from "path";
+
+const Namer: any = require("../../Namer");
+
+export interface MochaTest {
+    file: string;
+    parent?: MochaTest;
+    title: string;
+}
+
+export class MochaNamer extends Namer {
+    private ctx: MochaTest;
+
+    constructor(mochaTest: any, overrideBasePath?: string) {
+        if (!mochaTest) {
+            throw new Error("Mocha test context was not supplied");
+        }
+        mochaTest = mochaTest.test || mochaTest;
+
+        super('', '');
+
+        this.ctx = mochaTest;
+        this.path = overrideBasePath || path.dirname(mochaTest.file);
+    }
+
+    getFullTestName(testContext: MochaTest): string {
+        let test = testContext;
+
+        let parentStack: MochaTest[] = [];
+        let currParent: MochaTest | undefined = test;
+        while (currParent && currParent.parent) {
+            parentStack.push(currParent);
+            currParent = currParent.parent;
+        }
+
+        let newTitle = '';
+        let parentStackReversed = parentStack.reverse();
+        parentStackReversed.forEach((item, index) => {
+            if (index !== 0) {
+                newTitle += ".";
+            }
+
+            newTitle += item.title.split(' ').join('_').replace(/[^\w\s]/gi, '_');
+        });
+
+        return newTitle;
+    }
+
+    pathCreator(type: string, ext: string): string {
+        if (!this.name) {
+            if (!this.ctx) {
+                throw new Error("ctx was not defined.");
+            }
+            this.name = this.getFullTestName(this.ctx);
+        }
+
+        return super.pathCreator(type, ext);
+    }
+}
+

test/Providers/Mocha/MochaNamerTests.js

@@ -2,7 +2,7 @@
 
 var assert = require("assert");
 var path = require('path');
-var MochaNamer = require("../../../lib/Providers/Mocha/MochaNamer.js");
+var { MochaNamer } = require("../../../lib/Providers/Mocha/MochaNamer");
 
 describe('MochaNamer', function () {
 

test/Providers/Mocha/Typescript/Mocha.test.ts

@@ -1,13 +1,21 @@
 //require('approvals').mocha();
 
+import {it2, verify} from "../../../../lib/Providers/Mocha/MochaApprovals";
+
 const assert = require('assert');
+// import { describe, it } from 'mocha';
 
 describe("Mocha Typescript Approvals", () => {
 
   it("verify", () => {
     // verify("Hello From Approvals");
     assert.equal(2, 2);
   });
+
+   //  it2("verify approvals", () => {
+   //      verify("Hello From Approvals");
+   //      // get the test name of the current mocha test
+   // });
 });