Parkin 6.1.1 6efa5ef (#56)

* Updating tap to version 6.1.1 * chore: update version
lancetipton · Sep 1, 2023 · 1f34001 · 1f34001
1 parent 6efa5ef
commit 1f34001
Show file tree

Hide file tree

Showing 11 changed files with 89 additions and 80 deletions.
diff --git a/.bin/parkin.js b/.bin/parkin.js
@@ -3466,12 +3466,13 @@ var init_hasTag = __esm({
   "src/utils/hasTag.ts"() {
     import_jsutils16 = __toESM(require_cjs());
     parseTags = (tags) => {
-      return (0, import_jsutils16.isStr)(tags) ? tags.match(/[@]\w*/g) : (0, import_jsutils16.isArr)(tags) ? tags : import_jsutils16.emptyArr;
+      const parsed = (0, import_jsutils16.isStr)(tags) ? tags.match(/([@](\w|-)*)/g) : (0, import_jsutils16.isArr)(tags) ? tags : import_jsutils16.emptyArr;
+      return parsed.filter((tag) => (0, import_jsutils16.isStr)(tag) && tag.startsWith(`@`) && tag.length > 2);
     };
     hasTag = (itemTags = import_jsutils16.emptyArr, compareTags = import_jsutils16.emptyArr) => {
       const iTags = (0, import_jsutils16.isStr)(itemTags) ? parseTags(itemTags) : (0, import_jsutils16.eitherArr)(itemTags, []);
       const cTags = (0, import_jsutils16.isStr)(compareTags) ? parseTags(compareTags) : (0, import_jsutils16.eitherArr)(compareTags, []);
-      return Boolean(cTags.find((cTag) => itemTags.includes(cTag)));
+      return Boolean(cTags.find((cTag) => iTags.includes(cTag)));
     };
   }
 });
@@ -14530,11 +14531,13 @@ var init_hooks2 = __esm({
       if (!(hooksResults == null ? void 0 : hooksResults.length))
         return results;
       if (hooksResults == null ? void 0 : hooksResults.length) {
-        const describeResults = hooksResults.map((result) => {
-          const joined = { ...describeResult, ...result, failed: true, passed: false };
-          onSuiteDone(joined);
-          return joined;
-        });
+        const describeResults = await Promise.all(
+          hooksResults.map(async (result) => {
+            const joined = { ...describeResult, ...result, failed: true, passed: false };
+            await onSuiteDone(joined);
+            return joined;
+          })
+        );
         results.push(...describeResults);
       }
       return results;
@@ -14725,11 +14728,11 @@ var init_loopTests = __esm({
             action: "skipped" /* skipped */,
             status: "skipped" /* skipped */
           };
-          onSpecStart(skipped);
+          await onSpecStart(skipped);
           results.push(skipped);
           continue;
         } else
-          onSpecStart(testResult);
+          await onSpecStart(testResult);
         if (shouldAbort())
           break;
         const beforeEachResults = await loopHooks({
@@ -14774,7 +14777,7 @@ var init_loopTests = __esm({
           testsFailed = true;
           if (exitOnFailed) {
             results.push(testResult);
-            onSpecDone(testResult);
+            await onSpecDone(testResult);
             break;
           }
         }
@@ -14794,7 +14797,7 @@ var init_loopTests = __esm({
           break;
         }
         results.push(testResult);
-        onSpecDone({
+        await onSpecDone({
           ...testResult,
           action: "end" /* end */
         });
@@ -14842,7 +14845,7 @@ var init_loopDescribes = __esm({
             fullName: describe2.description
           }
         });
-        onSuiteDone(errorResult);
+        await onSuiteDone(errorResult);
         if (!err.result)
           err.result = errorResult;
         throw err;
@@ -14879,15 +14882,15 @@ var init_loopDescribes = __esm({
           fullName: describe2.description
         });
         if (shouldSkipDescribe({ describe: describe2, describeOnly, testOnly })) {
-          onSuiteStart({
+          await onSuiteStart({
             ...describeResult,
             skipped: true,
             action: "skipped" /* skipped */,
             status: "skipped" /* skipped */
           });
           continue;
         } else
-          onSuiteStart(describeResult);
+          await onSuiteStart(describeResult);
         const beforeResults = await callDescribeHooks({
           root,
           suiteId,
@@ -14922,7 +14925,7 @@ var init_loopDescribes = __esm({
         }) : describeResult;
         if (exitOnFailed && describeResult.failed) {
           describeFailed = true;
-          onSuiteDone(describeResult);
+          await onSuiteDone(describeResult);
           results.push(describeResult);
           break;
         }
@@ -14938,7 +14941,7 @@ var init_loopDescribes = __esm({
         }) : describeResult;
         if (exitOnFailed && describeResult.failed) {
           describeFailed = true;
-          onSuiteDone(describeResult);
+          await onSuiteDone(describeResult);
           results.push(describeResult);
           break;
         }
@@ -14967,7 +14970,7 @@ var init_loopDescribes = __esm({
         }
         if (shouldAbort())
           break;
-        onSuiteDone(describeResult);
+        await onSuiteDone(describeResult);
         results.push(describeResult);
       }
       return shouldAbort() ? { describes: [], failed: describeFailed } : { describes: results, failed: describeFailed };
@@ -15000,7 +15003,7 @@ var init_run = __esm({
         fullName: root.description,
         testPath: `/${Types.root}`
       });
-      onRunStart({
+      await onRunStart({
         ...rootResult,
         action: "start" /* start */,
         description: `Starting test execution`
@@ -15011,8 +15014,8 @@ var init_run = __esm({
         type: Types.beforeAll
       });
       if (shouldAbort()) {
-        onAbort == null ? void 0 : onAbort();
-        onRunDone({
+        await (onAbort == null ? void 0 : onAbort());
+        await onRunDone({
           ...rootResult,
           action: "abort" /* abort */,
           description: `Test execution aborted`
@@ -15027,8 +15030,8 @@ var init_run = __esm({
         describes = resp.describes;
         describesFailed = resp.failed;
         if (shouldAbort()) {
-          onAbort == null ? void 0 : onAbort();
-          onRunDone({
+          await (onAbort == null ? void 0 : onAbort());
+          await onRunDone({
             ...rootResult,
             action: "abort" /* abort */,
             description: `Test execution aborted`
@@ -15061,7 +15064,7 @@ var init_run = __esm({
           type: Types.afterAll
         });
         (afterAllResult == null ? void 0 : afterAllResult.length) && describes.push(...afterAllResult);
-        onRunDone({
+        await onRunDone({
           ...rootResult,
           describes,
           failed: describesFailed,

diff --git a/.bin/parkin.js.map b/.bin/parkin.js.map
diff --git a/docs/parkin/global.js b/docs/parkin/global.js
diff --git a/docs/parkin/global.js.map b/docs/parkin/global.js.map
diff --git a/docs/parkin/index.js b/docs/parkin/index.js
diff --git a/docs/parkin/index.js.map b/docs/parkin/index.js.map
diff --git a/docs/parkin/test/global.js b/docs/parkin/test/global.js
@@ -11598,11 +11598,13 @@ var callDescribeHooks = async (args) => {
   if (!(hooksResults == null ? void 0 : hooksResults.length))
     return results;
   if (hooksResults == null ? void 0 : hooksResults.length) {
-    const describeResults = hooksResults.map((result) => {
-      const joined = { ...describeResult, ...result, failed: true, passed: false };
-      onSuiteDone(joined);
-      return joined;
-    });
+    const describeResults = await Promise.all(
+      hooksResults.map(async (result) => {
+        const joined = { ...describeResult, ...result, failed: true, passed: false };
+        await onSuiteDone(joined);
+        return joined;
+      })
+    );
     results.push(...describeResults);
   }
   return results;
@@ -11760,11 +11762,11 @@ var loopTests = async (args) => {
         action: "skipped" /* skipped */,
         status: "skipped" /* skipped */
       };
-      onSpecStart(skipped);
+      await onSpecStart(skipped);
       results.push(skipped);
       continue;
     } else
-      onSpecStart(testResult);
+      await onSpecStart(testResult);
     if (shouldAbort())
       break;
     const beforeEachResults = await loopHooks({
@@ -11809,7 +11811,7 @@ var loopTests = async (args) => {
       testsFailed = true;
       if (exitOnFailed) {
         results.push(testResult);
-        onSpecDone(testResult);
+        await onSpecDone(testResult);
         break;
       }
     }
@@ -11829,7 +11831,7 @@ var loopTests = async (args) => {
       break;
     }
     results.push(testResult);
-    onSpecDone({
+    await onSpecDone({
       ...testResult,
       action: "end" /* end */
     });
@@ -11867,7 +11869,7 @@ var loopChildren = async (args) => {
         fullName: describe.description
       }
     });
-    onSuiteDone(errorResult);
+    await onSuiteDone(errorResult);
     if (!err.result)
       err.result = errorResult;
     throw err;
@@ -11904,15 +11906,15 @@ var loopDescribes = async (args) => {
       fullName: describe.description
     });
     if (shouldSkipDescribe({ describe, describeOnly, testOnly })) {
-      onSuiteStart({
+      await onSuiteStart({
         ...describeResult,
         skipped: true,
         action: "skipped" /* skipped */,
         status: "skipped" /* skipped */
       });
       continue;
     } else
-      onSuiteStart(describeResult);
+      await onSuiteStart(describeResult);
     const beforeResults = await callDescribeHooks({
       root,
       suiteId,
@@ -11947,7 +11949,7 @@ var loopDescribes = async (args) => {
     }) : describeResult;
     if (exitOnFailed && describeResult.failed) {
       describeFailed = true;
-      onSuiteDone(describeResult);
+      await onSuiteDone(describeResult);
       results.push(describeResult);
       break;
     }
@@ -11963,7 +11965,7 @@ var loopDescribes = async (args) => {
     }) : describeResult;
     if (exitOnFailed && describeResult.failed) {
       describeFailed = true;
-      onSuiteDone(describeResult);
+      await onSuiteDone(describeResult);
       results.push(describeResult);
       break;
     }
@@ -11992,7 +11994,7 @@ var loopDescribes = async (args) => {
     }
     if (shouldAbort())
       break;
-    onSuiteDone(describeResult);
+    await onSuiteDone(describeResult);
     results.push(describeResult);
   }
   return shouldAbort() ? { describes: [], failed: describeFailed } : { describes: results, failed: describeFailed };
@@ -12015,7 +12017,7 @@ var run = async (args) => {
     fullName: root.description,
     testPath: `/${Types.root}`
   });
-  onRunStart({
+  await onRunStart({
     ...rootResult,
     action: "start" /* start */,
     description: `Starting test execution`
@@ -12026,8 +12028,8 @@ var run = async (args) => {
     type: Types.beforeAll
   });
   if (shouldAbort()) {
-    onAbort == null ? void 0 : onAbort();
-    onRunDone({
+    await (onAbort == null ? void 0 : onAbort());
+    await onRunDone({
       ...rootResult,
       action: "abort" /* abort */,
       description: `Test execution aborted`
@@ -12042,8 +12044,8 @@ var run = async (args) => {
     describes = resp.describes;
     describesFailed = resp.failed;
     if (shouldAbort()) {
-      onAbort == null ? void 0 : onAbort();
-      onRunDone({
+      await (onAbort == null ? void 0 : onAbort());
+      await onRunDone({
         ...rootResult,
         action: "abort" /* abort */,
         description: `Test execution aborted`
@@ -12076,7 +12078,7 @@ var run = async (args) => {
       type: Types.afterAll
     });
     (afterAllResult == null ? void 0 : afterAllResult.length) && describes.push(...afterAllResult);
-    onRunDone({
+    await onRunDone({
       ...rootResult,
       describes,
       failed: describesFailed,

diff --git a/docs/parkin/test/global.js.map b/docs/parkin/test/global.js.map