@cmmn/tools 1.9.12 → 1.9.13

package/bundle/esbuild.config.js

@@ -135,7 +135,8 @@ export class ConfigCreator {
                 es: 'esm'
             })[format] ?? format,
             outExtension: {
-                '.js': this.getOutExtension(format, platform)
+                '.js': this.getOutExtension(format, platform),
+                '.css': this.options.minify ? '.min.css' : '.css'
             },
             footer:{
                 js: `//# sourceMappingURL=./${this.options.name+this.getOutExtension(format, platform)}.map`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.9.12",
+  "version": "1.9.13",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -41,13 +41,11 @@
     "helpers/*"
   ],
   "dependencies": {
-    "@jest/globals": "27.x.x",
-    "@swc/jest": "0.2.17",
     "@testdeck/jest": "0.2.0",
-    "@types/jest": "27.x.x",
+    "@types/node": "20.x.x",
     "@types/sinon": "10.x.x",
     "@zerollup/ts-helpers": "1.7.18",
-    "dependency-order": "1.1.6",
+    "earl": "^1.1.0",
     "esbuild": "0.19.5",
     "esbuild-plugin-less": "1.3.1",
     "esbuild-register": "3.5.0",
@@ -55,11 +53,10 @@
     "fast-glob": "^3.2.11",
     "file-uri-to-path": "2.x.x",
     "import-meta-resolve": "2",
-    "jest": "29.x.x",
+    "jasmine-expect": "5.0.0",
     "less": "^4",
     "live-server": "1.2.2",
-    "sinon": "10.x.x",
-    "ts-jest": "29.x.x"
+    "sinon": "17.0.1"
   },
   "author": "",
   "license": "ISC",

package/readme.md

@@ -25,7 +25,7 @@
     
         @test
         equalsTest() {
-            expect(1).toBe(2);
+            expect(1).toEqual(2);
         }
     }
     ```

package/test/index.d.ts

@@ -1,3 +1,18 @@
 export {suite, test, timeout,} from "@testdeck/jest";
-export {expect,} from "@jest/globals";
-export * as sinon from "sinon";
+export {expect} from "earl";
+import * as sinonModule from "sinon";
+
+export type AssertionExt = Assertion & {
+    toEqual: Assertion["eql"]
+}
+export const sinon = sinonModule;
+
+declare module 'earl' {
+    interface Validators<T> {
+        // Note that `this: Validators<number>` ensures that
+        // the validator is only callable for numbers.
+        toBeInstanceOf<V>(this: Validators<T>, type: V): T extends V ? true : false;
+        toBe: Validators<T>["toEqual"];
+        toHaveProperty<TProp, TValue>(this: Validators<T>, prop: TProp, value: TValue): T extends Record<TProp, TValue> ? true: false;
+    }
+}

package/test/index.js

@@ -1,6 +1,11 @@
+import * as test from "node:test";
+Object.assign(globalThis, test);
 export {suite, test, timeout,} from "@testdeck/jest";
-import * as globals from "@jest/globals";
-import * as sinon1 from "sinon/pkg/sinon.js";
-export const sinon = sinon1.default;
-const {expect} = globals;
-export {expect};
+import { expect as expectBase, registerValidator, isEqual} from "earl";
+import assert from "node:assert";
+// import * as globals from "@jest/globals";
+export * as sinon from "sinon";
+registerValidator("toBe", isEqual)
+registerValidator("toBeInstanceOf", type => value => value instanceof type)
+registerValidator("toHaveProperty", (prop, value) => obj => isEqual(obj[prop], value))
+export const expect = expectBase;

package/test/jest.config.js

@@ -1,5 +1,5 @@
-import {pathsToModuleNameMapper} from "ts-jest";
 import {getTSCompilerOptions} from "../helpers/getTSConfig.js";
+import {pathsToModuleNameMapper} from "./pathsToModuleNameMapper.js";
 
 const options = getTSCompilerOptions(process.cwd());
 

package/test/pathsToModuleNameMapper.js

@@ -0,0 +1,46 @@
+// we don't need to escape all chars, so commented out is the real one
+// const escapeRegex = (str: string) => str.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')
+const escapeRegex = (str) => str.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&')
+
+export const pathsToModuleNameMapper = (mapping, { prefix = '', useESM = false }= {}) => {
+    const jestMap = {}
+    for (const fromPath of Object.keys(mapping)) {
+        const toPaths = mapping[fromPath]
+        // check that we have only one target path
+        if (toPaths.length === 0) {
+            continue
+        }
+
+        // split with '*'
+        const segments = fromPath.split(/\*/g)
+        if (segments.length === 1) {
+            const paths = toPaths.map((target) => {
+                const enrichedPrefix = prefix !== '' && !prefix.endsWith('/') ? `${prefix}/` : prefix
+
+                return `${enrichedPrefix}${target}`
+            })
+            const cjsPattern = `^${escapeRegex(fromPath)}$`
+            jestMap[cjsPattern] = paths.length === 1 ? paths[0] : paths
+        } else if (segments.length === 2) {
+            const paths = toPaths.map((target) => {
+                const enrichedTarget =
+                    target.startsWith('./') && prefix !== '' ? target.substring(target.indexOf('/') + 1) : target
+                const enrichedPrefix = prefix !== '' && !prefix.endsWith('/') ? `${prefix}/` : prefix
+
+                return `${enrichedPrefix}${enrichedTarget.replace(/\*/g, '$1')}`
+            })
+            if (useESM) {
+                const esmPattern = `^${escapeRegex(segments[0])}(.*)${escapeRegex(segments[1])}\\.js$`
+                jestMap[esmPattern] = paths.length === 1 ? paths[0] : paths
+            }
+            const cjsPattern = `^${escapeRegex(segments[0])}(.*)${escapeRegex(segments[1])}$`
+            jestMap[cjsPattern] = paths.length === 1 ? paths[0] : paths
+        }
+    }
+
+    if (useESM) {
+        jestMap['^(\\.{1,2}/.*)\\.js$'] = '$1'
+    }
+
+    return jestMap
+}