@xylabs/jest-helpers 4.5.10 → 4.6.1

package/dist/neutral/index.mjs

@@ -47,10 +47,10 @@ var matchFilter = (strParam = "") => (tags2) => {
   return (include.length === 0 || include.some((s) => tags2.includes(s))) && !exclude.some((s) => tags2.includes(s));
 };
 var goodTags = (arr) => {
-  return arr.filter((s) => s.match(GOOD_REGX));
+  return arr.filter((s) => RegExp(GOOD_REGX).exec(s));
 };
 var badTags = (arr) => {
-  return arr.filter((s) => s.match(BAD_REGX)).map((s) => s.replace(NOT_SYMBOL, ""));
+  return arr.filter((s) => RegExp(BAD_REGX).exec(s)).map((s) => s.replace(NOT_SYMBOL, ""));
 };
 
 // src/tags/index.ts

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/describeIf.ts","../../src/itIf.ts","../../src/testIf.ts","../../src/tags/config.ts","../../src/tags/regexps.ts","../../src/tags/filter.ts","../../src/tags/index.ts"],"sourcesContent":["/**\n * Conditionally runs or skips the describe\n * @param expr The condition to evaluate\n * @returns If the condition is true, describe, otherwise skips\n */\nexport const describeIf = <T>(expr?: T | null) => (expr ? describe : describe.skip)\n","/**\n * Conditionally runs or skips the it\n * @param expr The condition to evaluate\n * @returns If the condition is true, it, otherwise skips\n */\nexport const itIf = <T>(expr?: T | null) => (expr ? it : it.skip)\n","/**\n * Conditionally runs or skips the test\n * @param expr The condition to evaluate\n * @returns If the condition is true, test, otherwise skips\n */\nexport const testIf = <T>(expr?: T | null) => (expr ? test : test.skip)\n","export const NOT_SYMBOL = '!'\n\nexport const AND_SYMBOL = '&&'\n\nexport const OR_SYMBOL = '||'\n","import {\n  AND_SYMBOL, NOT_SYMBOL, OR_SYMBOL,\n} from './config.ts'\n\nconst escape = (str: string) => [...str].map(symbol => `\\\\${symbol}`).join('')\n\nexport const AND_REGX = new RegExp(`\\\\s*${escape(AND_SYMBOL)}\\\\s*`)\n\nexport const OR_REGX = new RegExp(`\\\\s*${escape(OR_SYMBOL)}\\\\s*`)\n\nexport const PLAIN_REGX = new RegExp(String.raw`\\s+`)\n\nexport const BAD_REGX = new RegExp(`^${escape(NOT_SYMBOL)}.*$`)\n\nexport const GOOD_REGX = new RegExp(`^[^${escape(NOT_SYMBOL)}].*$`)\n","import {\n  AND_SYMBOL, NOT_SYMBOL, OR_SYMBOL,\n} from './config.ts'\nimport {\n  AND_REGX, BAD_REGX, GOOD_REGX, OR_REGX, PLAIN_REGX,\n} from './regexps.ts'\n\n// f.e. tag1 !tag2\n// tag1 && tag2 && !tag3\n// tag1 || tag2 || !tag3\n\n// ATTENTION!!: cases with () not handled: f.e. (tag1 && tag2) || tag3 won`t work\n\nexport const matchFilter\n  = (strParam = '') =>\n    (tags: string[]) => {\n      const str = strParam.trim()\n      if (typeof tags === 'string') {\n        tags = [tags]\n      }\n      if (str.includes(OR_SYMBOL)) {\n        const include = goodTags(str.split(OR_REGX))\n        const exclude = badTags(str.split(OR_REGX))\n        if (exclude.length === 0) {\n          return include.length === 0 || include.some(s => tags.includes(s))\n        }\n        if (include.length === 0 && exclude.length > 0) {\n          return exclude.some(s => !tags.includes(s))\n        }\n        return include.length === 0 || include.some(s => tags.includes(s)) || exclude.some(s => !tags.includes(s))\n      }\n      if (str.includes(AND_SYMBOL)) {\n        const include = goodTags(str.split(AND_REGX))\n        const exclude = badTags(str.split(AND_REGX))\n\n        return include.every(s => tags.includes(s)) && !exclude.some(s => tags.includes(s))\n      }\n      const include = goodTags(str.split(PLAIN_REGX))\n      const exclude = badTags(str.split(PLAIN_REGX))\n\n      return (include.length === 0 || include.some(s => tags.includes(s))) && !exclude.some(s => tags.includes(s))\n    }\n\nconst goodTags = (arr: string[]) => {\n  return arr.filter(s => s.match(GOOD_REGX))\n}\n\nconst badTags = (arr: string[]) => {\n  return arr.filter(s => s.match(BAD_REGX)).map(s => s.replace(NOT_SYMBOL, ''))\n}\n","import { describeIf } from '../describeIf.ts'\nimport { itIf } from '../itIf.ts'\nimport { testIf } from '../testIf.ts'\nimport { matchFilter } from './filter.ts'\n\n// Based on https://www.npmjs.com/package/jest-tags/v/1.0.1\n\nexport function tags(...tagLabels: string[]) {\n  const tagsParam = process.argv.indexOf('--tags')\n  const passedTags = tagsParam > 0 ? process.argv[tagsParam + 1] : undefined\n  const filter = matchFilter(passedTags)\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const chain: Record<string, any> = {}\n\n  const filterMatch = filter(tagLabels)\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  chain.describeIf = filterMatch ? describeIf : (_param: any) => describe.skip\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  chain.itIf = filterMatch ? itIf : (_param: any) => it.skip\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  chain.testIf = filterMatch ? testIf : (_param: any) => test.skip\n  chain.describe = filterMatch ? globalThis.describe : globalThis.xdescribe\n  chain.it = filterMatch ? globalThis.it : globalThis.xit\n  chain.test = filterMatch ? globalThis.test : globalThis.xtest\n  chain.test.only = globalThis.test.only\n  chain.test.skip = globalThis.test.skip\n  chain.xtest = globalThis.xtest\n  chain.xit = globalThis.xit\n\n  return chain\n}\n"],"mappings":";AAKO,IAAM,aAAa,CAAI,SAAqB,OAAO,WAAW,SAAS;;;ACAvE,IAAM,OAAO,CAAI,SAAqB,OAAO,KAAK,GAAG;;;ACArD,IAAM,SAAS,CAAI,SAAqB,OAAO,OAAO,KAAK;;;ACL3D,IAAM,aAAa;AAEnB,IAAM,aAAa;AAEnB,IAAM,YAAY;;;ACAzB,IAAM,SAAS,CAAC,QAAgB,CAAC,GAAG,GAAG,EAAE,IAAI,YAAU,KAAK,MAAM,EAAE,EAAE,KAAK,EAAE;AAEtE,IAAM,WAAW,IAAI,OAAO,OAAO,OAAO,UAAU,CAAC,MAAM;AAE3D,IAAM,UAAU,IAAI,OAAO,OAAO,OAAO,SAAS,CAAC,MAAM;AAEzD,IAAM,aAAa,IAAI,OAAO,OAAO,QAAQ;AAE7C,IAAM,WAAW,IAAI,OAAO,IAAI,OAAO,UAAU,CAAC,KAAK;AAEvD,IAAM,YAAY,IAAI,OAAO,MAAM,OAAO,UAAU,CAAC,MAAM;;;ACD3D,IAAM,cACT,CAAC,WAAW,OACZ,CAACA,UAAmB;AAClB,QAAM,MAAM,SAAS,KAAK;AAC1B,MAAI,OAAOA,UAAS,UAAU;AAC5B,IAAAA,QAAO,CAACA,KAAI;AAAA,EACd;AACA,MAAI,IAAI,SAAS,SAAS,GAAG;AAC3B,UAAMC,WAAU,SAAS,IAAI,MAAM,OAAO,CAAC;AAC3C,UAAMC,WAAU,QAAQ,IAAI,MAAM,OAAO,CAAC;AAC1C,QAAIA,SAAQ,WAAW,GAAG;AACxB,aAAOD,SAAQ,WAAW,KAAKA,SAAQ,KAAK,OAAKD,MAAK,SAAS,CAAC,CAAC;AAAA,IACnE;AACA,QAAIC,SAAQ,WAAW,KAAKC,SAAQ,SAAS,GAAG;AAC9C,aAAOA,SAAQ,KAAK,OAAK,CAACF,MAAK,SAAS,CAAC,CAAC;AAAA,IAC5C;AACA,WAAOC,SAAQ,WAAW,KAAKA,SAAQ,KAAK,OAAKD,MAAK,SAAS,CAAC,CAAC,KAAKE,SAAQ,KAAK,OAAK,CAACF,MAAK,SAAS,CAAC,CAAC;AAAA,EAC3G;AACA,MAAI,IAAI,SAAS,UAAU,GAAG;AAC5B,UAAMC,WAAU,SAAS,IAAI,MAAM,QAAQ,CAAC;AAC5C,UAAMC,WAAU,QAAQ,IAAI,MAAM,QAAQ,CAAC;AAE3C,WAAOD,SAAQ,MAAM,OAAKD,MAAK,SAAS,CAAC,CAAC,KAAK,CAACE,SAAQ,KAAK,OAAKF,MAAK,SAAS,CAAC,CAAC;AAAA,EACpF;AACA,QAAM,UAAU,SAAS,IAAI,MAAM,UAAU,CAAC;AAC9C,QAAM,UAAU,QAAQ,IAAI,MAAM,UAAU,CAAC;AAE7C,UAAQ,QAAQ,WAAW,KAAK,QAAQ,KAAK,OAAKA,MAAK,SAAS,CAAC,CAAC,MAAM,CAAC,QAAQ,KAAK,OAAKA,MAAK,SAAS,CAAC,CAAC;AAC7G;AAEJ,IAAM,WAAW,CAAC,QAAkB;AAClC,SAAO,IAAI,OAAO,OAAK,EAAE,MAAM,SAAS,CAAC;AAC3C;AAEA,IAAM,UAAU,CAAC,QAAkB;AACjC,SAAO,IAAI,OAAO,OAAK,EAAE,MAAM,QAAQ,CAAC,EAAE,IAAI,OAAK,EAAE,QAAQ,YAAY,EAAE,CAAC;AAC9E;;;AC1CO,SAAS,QAAQ,WAAqB;AAC3C,QAAM,YAAY,QAAQ,KAAK,QAAQ,QAAQ;AAC/C,QAAM,aAAa,YAAY,IAAI,QAAQ,KAAK,YAAY,CAAC,IAAI;AACjE,QAAM,SAAS,YAAY,UAAU;AAGrC,QAAM,QAA6B,CAAC;AAEpC,QAAM,cAAc,OAAO,SAAS;AAGpC,QAAM,aAAa,cAAc,aAAa,CAAC,WAAgB,SAAS;AAExE,QAAM,OAAO,cAAc,OAAO,CAAC,WAAgB,GAAG;AAEtD,QAAM,SAAS,cAAc,SAAS,CAAC,WAAgB,KAAK;AAC5D,QAAM,WAAW,cAAc,WAAW,WAAW,WAAW;AAChE,QAAM,KAAK,cAAc,WAAW,KAAK,WAAW;AACpD,QAAM,OAAO,cAAc,WAAW,OAAO,WAAW;AACxD,QAAM,KAAK,OAAO,WAAW,KAAK;AAClC,QAAM,KAAK,OAAO,WAAW,KAAK;AAClC,QAAM,QAAQ,WAAW;AACzB,QAAM,MAAM,WAAW;AAEvB,SAAO;AACT;","names":["tags","include","exclude"]}
+{"version":3,"sources":["../../src/describeIf.ts","../../src/itIf.ts","../../src/testIf.ts","../../src/tags/config.ts","../../src/tags/regexps.ts","../../src/tags/filter.ts","../../src/tags/index.ts"],"sourcesContent":["/**\n * Conditionally runs or skips the describe\n * @param expr The condition to evaluate\n * @returns If the condition is true, describe, otherwise skips\n */\nexport const describeIf = <T>(expr?: T | null) => (expr ? describe : describe.skip)\n","/**\n * Conditionally runs or skips the it\n * @param expr The condition to evaluate\n * @returns If the condition is true, it, otherwise skips\n */\nexport const itIf = <T>(expr?: T | null) => (expr ? it : it.skip)\n","/**\n * Conditionally runs or skips the test\n * @param expr The condition to evaluate\n * @returns If the condition is true, test, otherwise skips\n */\nexport const testIf = <T>(expr?: T | null) => (expr ? test : test.skip)\n","export const NOT_SYMBOL = '!'\n\nexport const AND_SYMBOL = '&&'\n\nexport const OR_SYMBOL = '||'\n","import {\n  AND_SYMBOL, NOT_SYMBOL, OR_SYMBOL,\n} from './config.ts'\n\nconst escape = (str: string) => [...str].map(symbol => `\\\\${symbol}`).join('')\n\nexport const AND_REGX = new RegExp(`\\\\s*${escape(AND_SYMBOL)}\\\\s*`)\n\nexport const OR_REGX = new RegExp(`\\\\s*${escape(OR_SYMBOL)}\\\\s*`)\n\nexport const PLAIN_REGX = new RegExp(String.raw`\\s+`)\n\nexport const BAD_REGX = new RegExp(`^${escape(NOT_SYMBOL)}.*$`)\n\nexport const GOOD_REGX = new RegExp(`^[^${escape(NOT_SYMBOL)}].*$`)\n","import {\n  AND_SYMBOL, NOT_SYMBOL, OR_SYMBOL,\n} from './config.ts'\nimport {\n  AND_REGX, BAD_REGX, GOOD_REGX, OR_REGX, PLAIN_REGX,\n} from './regexps.ts'\n\n// f.e. tag1 !tag2\n// tag1 && tag2 && !tag3\n// tag1 || tag2 || !tag3\n\n// ATTENTION!!: cases with () not handled: f.e. (tag1 && tag2) || tag3 won`t work\n\nexport const matchFilter\n  = (strParam = '') =>\n    (tags: string[]) => {\n      const str = strParam.trim()\n      if (typeof tags === 'string') {\n        tags = [tags]\n      }\n      if (str.includes(OR_SYMBOL)) {\n        const include = goodTags(str.split(OR_REGX))\n        const exclude = badTags(str.split(OR_REGX))\n        if (exclude.length === 0) {\n          return include.length === 0 || include.some(s => tags.includes(s))\n        }\n        if (include.length === 0 && exclude.length > 0) {\n          return exclude.some(s => !tags.includes(s))\n        }\n        return include.length === 0 || include.some(s => tags.includes(s)) || exclude.some(s => !tags.includes(s))\n      }\n      if (str.includes(AND_SYMBOL)) {\n        const include = goodTags(str.split(AND_REGX))\n        const exclude = badTags(str.split(AND_REGX))\n\n        return include.every(s => tags.includes(s)) && !exclude.some(s => tags.includes(s))\n      }\n      const include = goodTags(str.split(PLAIN_REGX))\n      const exclude = badTags(str.split(PLAIN_REGX))\n\n      return (include.length === 0 || include.some(s => tags.includes(s))) && !exclude.some(s => tags.includes(s))\n    }\n\nconst goodTags = (arr: string[]) => {\n  return arr.filter(s => RegExp(GOOD_REGX).exec(s))\n}\n\nconst badTags = (arr: string[]) => {\n  return arr.filter(s => RegExp(BAD_REGX).exec(s)).map(s => s.replace(NOT_SYMBOL, ''))\n}\n","import { describeIf } from '../describeIf.ts'\nimport { itIf } from '../itIf.ts'\nimport { testIf } from '../testIf.ts'\nimport { matchFilter } from './filter.ts'\n\n// Based on https://www.npmjs.com/package/jest-tags/v/1.0.1\n\nexport function tags(...tagLabels: string[]) {\n  const tagsParam = process.argv.indexOf('--tags')\n  const passedTags = tagsParam > 0 ? process.argv[tagsParam + 1] : undefined\n  const filter = matchFilter(passedTags)\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const chain: Record<string, any> = {}\n\n  const filterMatch = filter(tagLabels)\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  chain.describeIf = filterMatch ? describeIf : (_param: any) => describe.skip\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  chain.itIf = filterMatch ? itIf : (_param: any) => it.skip\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  chain.testIf = filterMatch ? testIf : (_param: any) => test.skip\n  chain.describe = filterMatch ? globalThis.describe : globalThis.xdescribe\n  chain.it = filterMatch ? globalThis.it : globalThis.xit\n  chain.test = filterMatch ? globalThis.test : globalThis.xtest\n  chain.test.only = globalThis.test.only\n  chain.test.skip = globalThis.test.skip\n  chain.xtest = globalThis.xtest\n  chain.xit = globalThis.xit\n\n  return chain\n}\n"],"mappings":"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","names":["tags","include","exclude"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xylabs/jest-helpers",
-  "version": "4.5.10",
+  "version": "4.6.1",
   "description": "Base functionality used throughout XY Labs TypeScript/JavaScript libraries",
   "keywords": [
     "jest",
@@ -28,18 +28,18 @@
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/neutral/index.d.ts",
+      "types": "./dist/types/index.d.ts",
       "default": "./dist/neutral/index.mjs"
     },
     "./package.json": "./package.json"
   },
   "module": "./dist/neutral/index.mjs",
-  "types": "./dist/neutral/index.d.ts",
+  "types": "./dist/types/index.d.ts",
   "devDependencies": {
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.13.9",
-    "@xylabs/ts-scripts-yarn3": "^5.0.39",
-    "@xylabs/tsconfig": "^5.0.39",
+    "@types/node": "^22.13.10",
+    "@xylabs/ts-scripts-yarn3": "^6.1.3",
+    "@xylabs/tsconfig": "^6.1.3",
     "typescript": "^5.8.2"
   },
   "peerDependencies": {

package/src/tags/filter.ts

@@ -42,9 +42,9 @@ export const matchFilter
     }
 
 const goodTags = (arr: string[]) => {
-  return arr.filter(s => s.match(GOOD_REGX))
+  return arr.filter(s => RegExp(GOOD_REGX).exec(s))
 }
 
 const badTags = (arr: string[]) => {
-  return arr.filter(s => s.match(BAD_REGX)).map(s => s.replace(NOT_SYMBOL, ''))
+  return arr.filter(s => RegExp(BAD_REGX).exec(s)).map(s => s.replace(NOT_SYMBOL, ''))
 }