testeranto.tiposkripto 0.2.11 → 0.2.13

package/dist/module/Node.js

@@ -5,6 +5,7 @@ import path from "path";
 // src/BaseSetup.ts
 var BaseSetup = class {
   constructor(features, actions, checks, setupCB, initialValues) {
+    this.recommendedFsPath = "";
     this.artifacts = [];
     this.fails = 0;
     this.features = features;
@@ -119,6 +120,7 @@ var BaseSetup = class {
 // src/BaseAction.ts
 var BaseAction = class {
   constructor(name, actionCB) {
+    this.error = null;
     this.artifacts = [];
     this.name = name;
     this.actionCB = actionCB;
@@ -245,12 +247,12 @@ var BaseGiven = class extends BaseSetup {
   toObj() {
     return {
       key: this.key,
-      whens: (this.whens || []).map((w) => {
+      actions: (this.whens || []).map((w) => {
         if (w && w.toObj) return w.toObj();
         console.error("When step is not as expected!", JSON.stringify(w));
         return {};
       }),
-      thens: (this.thens || []).map((t) => t && t.toObj ? t.toObj() : {}),
+      checks: (this.thens || []).map((t) => t && t.toObj ? t.toObj() : {}),
       error: this.error ? [this.error, this.error.stack] : null,
       failed: this.failed,
       features: this.features || [],
@@ -508,15 +510,103 @@ var BaseAdapter = () => ({
 });
 var DefaultAdapter = (p) => {
   const base = BaseAdapter();
+  const mapped = { ...p };
+  if (p.beforeAll && !p.prepareAll) {
+    mapped.prepareAll = async (input, testResource, artifactory) => {
+      if (p.beforeAll.length >= 3) {
+        return await p.beforeAll(input, testResource, artifactory);
+      } else if (p.beforeAll.length >= 2) {
+        return await p.beforeAll(input, testResource);
+      } else {
+        return await p.beforeAll(input);
+      }
+    };
+  }
+  if (p.beforeEach && !p.prepareEach) {
+    mapped.prepareEach = async (subject, initializer, testResource, initialValues, artifactory) => {
+      if (p.beforeEach.length >= 5) {
+        return await p.beforeEach(subject, initializer, testResource, initialValues, artifactory);
+      } else if (p.beforeEach.length >= 4) {
+        return await p.beforeEach(subject, initializer, testResource, initialValues);
+      } else if (p.beforeEach.length >= 3) {
+        return await p.beforeEach(subject, initializer, testResource);
+      } else if (p.beforeEach.length >= 2) {
+        return await p.beforeEach(subject, initializer);
+      } else {
+        return await p.beforeEach(subject);
+      }
+    };
+  }
+  if (p.afterEach && !p.cleanupEach) {
+    mapped.cleanupEach = async (store, key, artifactory) => {
+      if (p.afterEach.length >= 3) {
+        return await p.afterEach(store, key, artifactory);
+      } else if (p.afterEach.length >= 2) {
+        return await p.afterEach(store, key);
+      } else {
+        return await p.afterEach(store);
+      }
+    };
+  }
+  if (p.afterAll && !p.cleanupAll) {
+    mapped.cleanupAll = (store, artifactory) => {
+      if (p.afterAll.length >= 2) {
+        return p.afterAll(store, artifactory);
+      } else {
+        return p.afterAll(store);
+      }
+    };
+  }
+  if (p.andWhen && !p.execute) {
+    mapped.execute = async (store, actionCB, testResource, artifactory) => {
+      if (p.andWhen.length >= 4) {
+        return await p.andWhen(store, actionCB, testResource, artifactory);
+      } else if (p.andWhen.length >= 3) {
+        return await p.andWhen(store, actionCB, testResource);
+      } else if (p.andWhen.length >= 2) {
+        return await p.andWhen(store, actionCB);
+      } else {
+        return await p.andWhen(store);
+      }
+    };
+  }
+  if (p.butThen && !p.verify) {
+    mapped.verify = async (store, checkCB, testResource, artifactory) => {
+      if (p.butThen.length >= 4) {
+        return await p.butThen(store, checkCB, testResource, artifactory);
+      } else if (p.butThen.length >= 3) {
+        return await p.butThen(store, checkCB, testResource);
+      } else if (p.butThen.length >= 2) {
+        return await p.butThen(store, checkCB);
+      } else {
+        return await p.butThen(store);
+      }
+    };
+  }
+  if (p.assertThis && !p.assert) {
+    mapped.assert = (x) => {
+      if (p.assertThis.length >= 1) {
+        return p.assertThis(x);
+      } else {
+        return p.assertThis();
+      }
+    };
+  }
   return {
     ...base,
-    ...p
+    ...mapped
   };
 };
 
 // src/BaseSuite.ts
 var BaseSuite = class {
   constructor(name, index, givens = {}, parent) {
+    this.store = null;
+    this.testResourceConfiguration = null;
+    this.index = 0;
+    this.failed = false;
+    this.fails = 0;
+    this.parent = null;
     // Reference to parent BaseTiposkripto instance
     this.artifacts = [];
     const suiteName = name || "testSuite";
@@ -587,10 +677,7 @@ var BaseSuite = class {
   async run(input, testResourceConfiguration) {
     this.testResourceConfiguration = testResourceConfiguration;
     const sNdx = this.index;
-    const subject = await this.setup(
-      input,
-      testResourceConfiguration
-    );
+    const subject = await this.setup(input, null, testResourceConfiguration);
     for (const [gKey, g] of Object.entries(this.givens)) {
       const giver = this.givens[gKey];
       try {
@@ -626,7 +713,9 @@ var BaseSuite = class {
         const basePath = this.testResourceConfiguration?.fs || "testeranto";
         suiteArtifactory = {
           writeFileSync: (filename, payload) => {
-            console.log(`[BaseSuite] Would write to ${basePath}/suite-${this.index}/${filename}: ${payload.substring(0, 100)}...`);
+            console.log(
+              `[BaseSuite] Would write to ${basePath}/suite-${this.index}/${filename}: ${payload.substring(0, 100)}...`
+            );
           },
           screenshot: (filename, payload) => {
             console.log(`[BaseSuite] Would take screenshot: ${filename}`);
@@ -651,8 +740,11 @@ var BaseTiposkripto = class {
   constructor(webOrNode, input, testSpecification, testImplementation, testResourceRequirement = defaultTestResourceRequirement, testAdapter = {}, testResourceConfiguration, wsPort = "3456", wsHost = "localhost") {
     this.totalTests = 0;
     this.artifacts = [];
+    this.assertThis = () => {
+    };
     this.testResourceConfiguration = testResourceConfiguration;
     const fullAdapter = DefaultAdapter(testAdapter);
+    const instance = this;
     if (!testImplementation.suites || typeof testImplementation.suites !== "object") {
       throw new Error(
         `testImplementation.suites must be an object, got ${typeof testImplementation.suites}: ${JSON.stringify(
@@ -663,7 +755,6 @@ var BaseTiposkripto = class {
     const classySuites = Object.entries(testImplementation.suites).reduce(
       (a, [key], index) => {
         a[key] = (somestring, givens) => {
-          const capturedOuterThis = outerThis;
           const capturedFullAdapter = fullAdapter;
           return new class extends BaseSuite {
             afterAll(store, artifactory) {
@@ -674,7 +765,7 @@ var BaseTiposkripto = class {
                     suiteIndex: this.index
                   });
                 } else {
-                  suiteArtifactory = capturedOuterThis.createArtifactory({
+                  suiteArtifactory = instance.createArtifactory({
                     suiteIndex: this.index
                   });
                 }
@@ -684,10 +775,10 @@ var BaseTiposkripto = class {
             assertThat(t) {
               return capturedFullAdapter.assert(t);
             }
-            async setup(s, tr) {
-              return capturedFullAdapter.prepareAll?.(s, tr) ?? s;
+            async setup(s, artifactory, tr) {
+              return capturedFullAdapter.prepareAll?.(s, tr, artifactory) ?? s;
             }
-          }(somestring, index, givens, outerThis);
+          }(somestring, index, givens, instance);
         };
         return a;
       },
@@ -699,11 +790,10 @@ var BaseTiposkripto = class {
           const safeFeatures = Array.isArray(features) ? [...features] : [];
           const safeWhens = Array.isArray(whens) ? [...whens] : [];
           const safeThens = Array.isArray(thens) ? [...thens] : [];
-          const capturedOuterThis = outerThis;
           const capturedFullAdapter = fullAdapter;
           const givenInstance = new class extends BaseGiven {
             async givenThat(subject, testResource, artifactory, initializer, initialValues2) {
-              const givenArtifactory = capturedOuterThis.createArtifactory({
+              const givenArtifactory = instance.createArtifactory({
                 givenKey: key,
                 suiteIndex: this._suiteIndex
               });
@@ -716,7 +806,9 @@ var BaseTiposkripto = class {
               );
             }
             afterEach(store, key2, artifactory) {
-              return Promise.resolve(capturedFullAdapter.cleanupEach(store, key2, artifactory));
+              return Promise.resolve(
+                capturedFullAdapter.cleanupEach(store, key2, artifactory)
+              );
             }
           }(
             safeFeatures,
@@ -725,7 +817,7 @@ var BaseTiposkripto = class {
             testImplementation.givens[key],
             initialValues
           );
-          givenInstance._parent = capturedOuterThis;
+          givenInstance._parent = instance;
           return givenInstance;
         };
         return a;
@@ -738,7 +830,12 @@ var BaseTiposkripto = class {
           const capturedFullAdapter = fullAdapter;
           const whenInstance = new class extends BaseWhen {
             async andWhen(store, whenCB, testResource, artifactory) {
-              return await capturedFullAdapter.execute(store, whenCB, testResource, artifactory);
+              return await capturedFullAdapter.execute(
+                store,
+                whenCB,
+                testResource,
+                artifactory
+              );
             }
           }(`${key}: ${payload && payload.toString()}`, whEn(...payload));
           return whenInstance;
@@ -752,8 +849,16 @@ var BaseTiposkripto = class {
         a[key] = (...args) => {
           const capturedFullAdapter = fullAdapter;
           const thenInstance = new class extends BaseThen {
+            verifyCheck(store, checkCB, testResourceConfiguration2) {
+              throw new Error("Method not implemented.");
+            }
             async butThen(store, thenCB, testResource, artifactory) {
-              return await capturedFullAdapter.verify(store, thenCB, testResource, artifactory);
+              return await capturedFullAdapter.verify(
+                store,
+                thenCB,
+                testResource,
+                artifactory
+              );
             }
           }(`${key}: ${args && args.toString()}`, thEn(...args));
           return thenInstance;
@@ -778,10 +883,7 @@ var BaseTiposkripto = class {
     this.testJobs = this.specs.map((suite) => {
       const suiteRunner = (suite2) => async (testResourceConfiguration2) => {
         try {
-          const x = await suite2.run(
-            input,
-            testResourceConfiguration2
-          );
+          const x = await suite2.run(input, testResourceConfiguration2);
           return x;
         } catch (e) {
           console.error(e.stack);

package/dist/module/Web.js

@@ -1,6 +1,7 @@
 // src/BaseSetup.ts
 var BaseSetup = class {
   constructor(features, actions, checks, setupCB, initialValues) {
+    this.recommendedFsPath = "";
     this.artifacts = [];
     this.fails = 0;
     this.features = features;
@@ -115,6 +116,7 @@ var BaseSetup = class {
 // src/BaseAction.ts
 var BaseAction = class {
   constructor(name, actionCB) {
+    this.error = null;
     this.artifacts = [];
     this.name = name;
     this.actionCB = actionCB;
@@ -241,12 +243,12 @@ var BaseGiven = class extends BaseSetup {
   toObj() {
     return {
       key: this.key,
-      whens: (this.whens || []).map((w) => {
+      actions: (this.whens || []).map((w) => {
         if (w && w.toObj) return w.toObj();
         console.error("When step is not as expected!", JSON.stringify(w));
         return {};
       }),
-      thens: (this.thens || []).map((t) => t && t.toObj ? t.toObj() : {}),
+      checks: (this.thens || []).map((t) => t && t.toObj ? t.toObj() : {}),
       error: this.error ? [this.error, this.error.stack] : null,
       failed: this.failed,
       features: this.features || [],
@@ -504,15 +506,103 @@ var BaseAdapter = () => ({
 });
 var DefaultAdapter = (p) => {
   const base = BaseAdapter();
+  const mapped = { ...p };
+  if (p.beforeAll && !p.prepareAll) {
+    mapped.prepareAll = async (input, testResource, artifactory) => {
+      if (p.beforeAll.length >= 3) {
+        return await p.beforeAll(input, testResource, artifactory);
+      } else if (p.beforeAll.length >= 2) {
+        return await p.beforeAll(input, testResource);
+      } else {
+        return await p.beforeAll(input);
+      }
+    };
+  }
+  if (p.beforeEach && !p.prepareEach) {
+    mapped.prepareEach = async (subject, initializer, testResource, initialValues, artifactory) => {
+      if (p.beforeEach.length >= 5) {
+        return await p.beforeEach(subject, initializer, testResource, initialValues, artifactory);
+      } else if (p.beforeEach.length >= 4) {
+        return await p.beforeEach(subject, initializer, testResource, initialValues);
+      } else if (p.beforeEach.length >= 3) {
+        return await p.beforeEach(subject, initializer, testResource);
+      } else if (p.beforeEach.length >= 2) {
+        return await p.beforeEach(subject, initializer);
+      } else {
+        return await p.beforeEach(subject);
+      }
+    };
+  }
+  if (p.afterEach && !p.cleanupEach) {
+    mapped.cleanupEach = async (store, key, artifactory) => {
+      if (p.afterEach.length >= 3) {
+        return await p.afterEach(store, key, artifactory);
+      } else if (p.afterEach.length >= 2) {
+        return await p.afterEach(store, key);
+      } else {
+        return await p.afterEach(store);
+      }
+    };
+  }
+  if (p.afterAll && !p.cleanupAll) {
+    mapped.cleanupAll = (store, artifactory) => {
+      if (p.afterAll.length >= 2) {
+        return p.afterAll(store, artifactory);
+      } else {
+        return p.afterAll(store);
+      }
+    };
+  }
+  if (p.andWhen && !p.execute) {
+    mapped.execute = async (store, actionCB, testResource, artifactory) => {
+      if (p.andWhen.length >= 4) {
+        return await p.andWhen(store, actionCB, testResource, artifactory);
+      } else if (p.andWhen.length >= 3) {
+        return await p.andWhen(store, actionCB, testResource);
+      } else if (p.andWhen.length >= 2) {
+        return await p.andWhen(store, actionCB);
+      } else {
+        return await p.andWhen(store);
+      }
+    };
+  }
+  if (p.butThen && !p.verify) {
+    mapped.verify = async (store, checkCB, testResource, artifactory) => {
+      if (p.butThen.length >= 4) {
+        return await p.butThen(store, checkCB, testResource, artifactory);
+      } else if (p.butThen.length >= 3) {
+        return await p.butThen(store, checkCB, testResource);
+      } else if (p.butThen.length >= 2) {
+        return await p.butThen(store, checkCB);
+      } else {
+        return await p.butThen(store);
+      }
+    };
+  }
+  if (p.assertThis && !p.assert) {
+    mapped.assert = (x) => {
+      if (p.assertThis.length >= 1) {
+        return p.assertThis(x);
+      } else {
+        return p.assertThis();
+      }
+    };
+  }
   return {
     ...base,
-    ...p
+    ...mapped
   };
 };
 
 // src/BaseSuite.ts
 var BaseSuite = class {
   constructor(name, index, givens = {}, parent) {
+    this.store = null;
+    this.testResourceConfiguration = null;
+    this.index = 0;
+    this.failed = false;
+    this.fails = 0;
+    this.parent = null;
     // Reference to parent BaseTiposkripto instance
     this.artifacts = [];
     const suiteName = name || "testSuite";
@@ -583,10 +673,7 @@ var BaseSuite = class {
   async run(input, testResourceConfiguration) {
     this.testResourceConfiguration = testResourceConfiguration;
     const sNdx = this.index;
-    const subject = await this.setup(
-      input,
-      testResourceConfiguration
-    );
+    const subject = await this.setup(input, null, testResourceConfiguration);
     for (const [gKey, g] of Object.entries(this.givens)) {
       const giver = this.givens[gKey];
       try {
@@ -622,7 +709,9 @@ var BaseSuite = class {
         const basePath = this.testResourceConfiguration?.fs || "testeranto";
         suiteArtifactory = {
           writeFileSync: (filename, payload) => {
-            console.log(`[BaseSuite] Would write to ${basePath}/suite-${this.index}/${filename}: ${payload.substring(0, 100)}...`);
+            console.log(
+              `[BaseSuite] Would write to ${basePath}/suite-${this.index}/${filename}: ${payload.substring(0, 100)}...`
+            );
           },
           screenshot: (filename, payload) => {
             console.log(`[BaseSuite] Would take screenshot: ${filename}`);
@@ -647,8 +736,11 @@ var BaseTiposkripto = class {
   constructor(webOrNode, input, testSpecification, testImplementation, testResourceRequirement = defaultTestResourceRequirement, testAdapter = {}, testResourceConfiguration, wsPort = "3456", wsHost = "localhost") {
     this.totalTests = 0;
     this.artifacts = [];
+    this.assertThis = () => {
+    };
     this.testResourceConfiguration = testResourceConfiguration;
     const fullAdapter = DefaultAdapter(testAdapter);
+    const instance = this;
     if (!testImplementation.suites || typeof testImplementation.suites !== "object") {
       throw new Error(
         `testImplementation.suites must be an object, got ${typeof testImplementation.suites}: ${JSON.stringify(
@@ -659,7 +751,6 @@ var BaseTiposkripto = class {
     const classySuites = Object.entries(testImplementation.suites).reduce(
       (a, [key], index) => {
         a[key] = (somestring, givens) => {
-          const capturedOuterThis = outerThis;
           const capturedFullAdapter = fullAdapter;
           return new class extends BaseSuite {
             afterAll(store, artifactory) {
@@ -670,7 +761,7 @@ var BaseTiposkripto = class {
                     suiteIndex: this.index
                   });
                 } else {
-                  suiteArtifactory = capturedOuterThis.createArtifactory({
+                  suiteArtifactory = instance.createArtifactory({
                     suiteIndex: this.index
                   });
                 }
@@ -680,10 +771,10 @@ var BaseTiposkripto = class {
             assertThat(t) {
               return capturedFullAdapter.assert(t);
             }
-            async setup(s, tr) {
-              return capturedFullAdapter.prepareAll?.(s, tr) ?? s;
+            async setup(s, artifactory, tr) {
+              return capturedFullAdapter.prepareAll?.(s, tr, artifactory) ?? s;
             }
-          }(somestring, index, givens, outerThis);
+          }(somestring, index, givens, instance);
         };
         return a;
       },
@@ -695,11 +786,10 @@ var BaseTiposkripto = class {
           const safeFeatures = Array.isArray(features) ? [...features] : [];
           const safeWhens = Array.isArray(whens) ? [...whens] : [];
           const safeThens = Array.isArray(thens) ? [...thens] : [];
-          const capturedOuterThis = outerThis;
           const capturedFullAdapter = fullAdapter;
           const givenInstance = new class extends BaseGiven {
             async givenThat(subject, testResource, artifactory, initializer, initialValues2) {
-              const givenArtifactory = capturedOuterThis.createArtifactory({
+              const givenArtifactory = instance.createArtifactory({
                 givenKey: key,
                 suiteIndex: this._suiteIndex
               });
@@ -712,7 +802,9 @@ var BaseTiposkripto = class {
               );
             }
             afterEach(store, key2, artifactory) {
-              return Promise.resolve(capturedFullAdapter.cleanupEach(store, key2, artifactory));
+              return Promise.resolve(
+                capturedFullAdapter.cleanupEach(store, key2, artifactory)
+              );
             }
           }(
             safeFeatures,
@@ -721,7 +813,7 @@ var BaseTiposkripto = class {
             testImplementation.givens[key],
             initialValues
           );
-          givenInstance._parent = capturedOuterThis;
+          givenInstance._parent = instance;
           return givenInstance;
         };
         return a;
@@ -734,7 +826,12 @@ var BaseTiposkripto = class {
           const capturedFullAdapter = fullAdapter;
           const whenInstance = new class extends BaseWhen {
             async andWhen(store, whenCB, testResource, artifactory) {
-              return await capturedFullAdapter.execute(store, whenCB, testResource, artifactory);
+              return await capturedFullAdapter.execute(
+                store,
+                whenCB,
+                testResource,
+                artifactory
+              );
             }
           }(`${key}: ${payload && payload.toString()}`, whEn(...payload));
           return whenInstance;
@@ -748,8 +845,16 @@ var BaseTiposkripto = class {
         a[key] = (...args) => {
           const capturedFullAdapter = fullAdapter;
           const thenInstance = new class extends BaseThen {
+            verifyCheck(store, checkCB, testResourceConfiguration2) {
+              throw new Error("Method not implemented.");
+            }
             async butThen(store, thenCB, testResource, artifactory) {
-              return await capturedFullAdapter.verify(store, thenCB, testResource, artifactory);
+              return await capturedFullAdapter.verify(
+                store,
+                thenCB,
+                testResource,
+                artifactory
+              );
             }
           }(`${key}: ${args && args.toString()}`, thEn(...args));
           return thenInstance;
@@ -774,10 +879,7 @@ var BaseTiposkripto = class {
     this.testJobs = this.specs.map((suite) => {
       const suiteRunner = (suite2) => async (testResourceConfiguration2) => {
         try {
-          const x = await suite2.run(
-            input,
-            testResourceConfiguration2
-          );
+          const x = await suite2.run(input, testResourceConfiguration2);
           return x;
         } catch (e) {
           console.error(e.stack);
@@ -933,12 +1035,19 @@ var BaseTiposkripto = class {
 };
 
 // src/Web.ts
-var config = window.testResourceConfig;
+var isBrowser = typeof globalThis !== "undefined" && globalThis.window !== void 0;
+var config = isBrowser ? globalThis.window?.testResourceConfig : {};
 var WebTiposkripto = class extends BaseTiposkripto {
   constructor(input, testSpecification, testImplementation, testResourceRequirement, testAdapter) {
-    const urlParams = new URLSearchParams(window.location.search);
-    const encodedConfig = urlParams.get("config");
-    const testResourceConfig = encodedConfig ? decodeURIComponent(encodedConfig) : "{}";
+    let testResourceConfig = config;
+    if (isBrowser) {
+      const win = globalThis.window;
+      if (win) {
+        const urlParams = new URLSearchParams(win.location.search);
+        const encodedConfig = urlParams.get("config");
+        testResourceConfig = encodedConfig ? decodeURIComponent(encodedConfig) : "{}";
+      }
+    }
     super(
       "web",
       input,
@@ -946,15 +1055,32 @@ var WebTiposkripto = class extends BaseTiposkripto {
       testImplementation,
       testResourceRequirement,
       testAdapter,
-      // JSON.parse(testResourceConfig)
-      config
+      testResourceConfig
     );
   }
   writeFileSync(filename, payload) {
-    window.__writeFile(filename, payload);
+    if (isBrowser) {
+      const win = globalThis.window;
+      if (win && win.__writeFile) {
+        win.__writeFile(filename, payload);
+      } else {
+        console.error("__writeFile not available");
+      }
+    } else {
+      console.error("Not in browser environment");
+    }
   }
   screenshot(filename, payload) {
-    window.__screenshot(filename, payload || "");
+    if (isBrowser) {
+      const win = globalThis.window;
+      if (win && win.__screenshot) {
+        win.__screenshot(filename, payload || "");
+      } else {
+        console.error("__screenshot not available");
+      }
+    } else {
+      console.error("Not in browser environment");
+    }
   }
 };
 var tiposkripto = async (input, testSpecification, testImplementation, testAdapter, testResourceRequirement = defaultTestResourceRequirement) => {
@@ -969,8 +1095,13 @@ var tiposkripto = async (input, testSpecification, testImplementation, testAdapt
     return t;
   } catch (e) {
     console.error(e);
-    const errorEvent = new CustomEvent("test-error", { detail: e });
-    window.dispatchEvent(errorEvent);
+    if (isBrowser) {
+      const win = globalThis.window;
+      if (win) {
+        const errorEvent = new CustomEvent("test-error", { detail: e });
+        win.dispatchEvent(errorEvent);
+      }
+    }
     throw e;
   }
 };