@cmmn/tools 1.9.13 → 2.0.1

package/compile/ts-resolve-plugin.js

@@ -42,7 +42,7 @@ class Visitor {
         }
     }
     findFile(importPath, sourceFile) {
-        const sourceFileDir = path.dirname(sourceFile.path);
+        const sourceFileDir = path.dirname(sourceFile.fileName);
 
         return [
             importPath,
@@ -56,7 +56,7 @@ class Visitor {
         ].find(x => fs.existsSync(path.resolve(sourceFileDir, x)))?.replace(/(\.ts)x?$/, '.js');
     }
     resolveFile(importPath, sourceFile){
-        const sourceFileDir = path.dirname(sourceFile.path);
+        const sourceFileDir = path.dirname(sourceFile.fileName);
         const existed = this.findFile(importPath, sourceFile);
         if (existed) return existed;
         const suggestions = this.resolver.getImportSuggestions(importPath, sourceFileDir) ?? [];
@@ -72,9 +72,7 @@ class Visitor {
      */
     resolve(importPath, sourceFile){
         importPath = this.resolveFile(importPath, sourceFile);
-        const sourceFileDir = path.dirname(sourceFile.path);
-        const caseSensitiveFileNames = this.context.getEmitHost().useCaseSensitiveFileNames();
-        const formatPath = caseSensitiveFileNames ? x => x : x => x.toLowerCase();
+        const sourceFileDir = path.dirname(sourceFile.fileName);
         const absSource = path.join(this.options.outDir, path.relative(this.options.baseUrl, sourceFileDir));
         const abs = path.resolve(sourceFileDir, importPath);
         if (this.config.import.test(importPath)) {
@@ -85,9 +83,6 @@ class Visitor {
             return importPath+".js";
         }
         if (this.config.copy.test(importPath)) {
-            // console.log(abs, absSource, path.relative(absSource,abs));
-            // const outFile = path.resolve(absSource, importPath).replaceAll(path.sep, '/');
-            // fs.cpSync(path.resolve(sourceFileDir, importPath), outFile);
             return  path.relative(absSource,abs);
         }
         return importPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.9.13",
+  "version": "2.0.1",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -53,7 +53,6 @@
     "fast-glob": "^3.2.11",
     "file-uri-to-path": "2.x.x",
     "import-meta-resolve": "2",
-    "jasmine-expect": "5.0.0",
     "less": "^4",
     "live-server": "1.2.2",
     "sinon": "17.0.1"

package/test/index.js

@@ -1,11 +1,16 @@
 import * as test from "node:test";
 Object.assign(globalThis, test);
 export {suite, test, timeout,} from "@testdeck/jest";
-import { expect as expectBase, registerValidator, isEqual} from "earl";
-import assert from "node:assert";
+import { expect as expectBase, registerValidator, isEqual, formatCompact} from "earl";
 // 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))
+registerValidator("toHaveProperty", (control, prop, value) => {
+    const actualInline = formatCompact(control.actual)
+    const actualValue = formatCompact(control.actual[prop])
+    control.assert({
+        success: control.actual[prop] === value,
+        reason: `The value ${actualInline}[${prop}] = ${actualValue} is not equal to ${value}, but is expected to be eqaul`,
+        negatedReason: `The value ${actualInline}[${prop}] = ${actualValue} is equal to ${value}, but is expected not to be eqaul`,
+    })
+})
 export const expect = expectBase;