@cmmn/tools 1.7.12 → 1.8.0

package/compile/compile.js

@@ -1,4 +1,4 @@
-import ts from "ttypescript";
+import ts from "typescript/lib/typescript.js";
 import {resolve, relative} from 'path';
 import fs from "fs";
 const rootDir = process.cwd();

package/compile/tsconfig.json

@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
-    "module": "esnext",
-    "moduleResolution": "Node",
-    "target": "ES2020",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "target": "ESNext",
     "composite": true,
     "sourceMap": false,
     "baseUrl": "./",
@@ -21,29 +21,14 @@
     "emitDecoratorMetadata": true ,
     "noEmitHelpers": true,
     "declarationDir": "./dist/typings",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "useDefineForClassFields": false,
     "declaration": true,
-    "types": [
-      "@cmmn/tools"
-    ],
     "lib": [
       "ES2020.BigInt",
       "ESNext",
       "DOM"
-    ],
-    "plugins": [
-      //       Transform paths in output .js files
-      {
-        "transform": "typescript-transform-paths"
-      },
-      {
-        "transform": "@cmmn/tools/plugins/absolute-plugin.cjs",
-        "after": true
-      },
-      //       Transform paths in output .d.ts files (Include this line if you output declarations files)
-      {
-        "transform": "typescript-transform-paths",
-        "afterDeclarations": true
-      }
     ]
   },
   "exclude": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.7.12",
+  "version": "1.8.0",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -15,6 +15,7 @@
     "cmmn": "bin.js"
   },
   "exports": {
+    "./compile/tsconfig.json": "./compile/tsconfig.json",
     "./test": "./test/index.js",
     "./test/config": "./test/jest.config.js"
   },
@@ -58,7 +59,7 @@
     "fast-glob": "^3.2.11",
     "file-uri-to-path": "2.x.x",
     "import-meta-resolve": "2",
-    "jest": "27.x.x",
+    "jest": "29.x.x",
     "less": "^4",
     "live-server": "1.2.2",
     "postcss-assets": "6",
@@ -76,13 +77,11 @@
     "rollup-plugin-terser": "^7",
     "rollup-plugin-visualizer": "^5.5.4",
     "sinon": "10.x.x",
-    "ts-jest": "27.x.x",
-    "ttypescript": "1.5.13",
-    "typescript": "4.6.x",
-    "typescript-transform-paths": "^3.3.1",
+    "ts-jest": "29.x.x",
+    "typescript-transform-paths": "3.4.6",
     "unique-slug": "*"
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "fcf6faf7560f27a57563dcf211e1b4773e9dd7e0"
+  "gitHead": "c265a04bb744ba37bdd61f5e11a5beafabb74b7b"
 }

package/plugins/absolute-plugin.cjs

@@ -26,14 +26,16 @@ function visitExportNode(exportNode, sourceFile) {
     }
 }
 
-function visitImportNode(importNode, sourceFile, options) {
+function visitImportNode(importNode, sourceFile, options, context) {
     const file = importNode.moduleSpecifier?.text;
     if (!file || !file.startsWith('.'))
         return;
+    const caseSensitiveFileNames = context.getEmitHost().useCaseSensitiveFileNames();
+    const formatPath = caseSensitiveFileNames ? x => x : x => x.toLowerCase();
     const sourceFileDir = path.dirname(sourceFile.path);
-    const abs = path.resolve(sourceFileDir, file);
+    const abs = formatPath(path.resolve(sourceFileDir, formatPath(file)));
     if (/\.(less|css|scss|sass|svg|png|html)$/.test(file)) {
-        const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFileDir));
+        const absSource = formatPath(path.join(options.outDir, formatPath(path.relative(options.baseUrl, sourceFileDir))));
         const relFile = path.relative(absSource, abs).replaceAll(path.sep, '/');
         return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(relFile));
     }
@@ -65,6 +67,7 @@ function visitRequireNode(importNode, sourceFile) {
 
 const lessToStringTransformer = function (context) {
     const options = context.getCompilerOptions();
+    console.log(context);
     return (sourceFile) => {
         function visitor(node) {
             // if (node && node.kind == ts.SyntaxKind.ImportDeclaration) {
@@ -78,7 +81,7 @@ const lessToStringTransformer = function (context) {
                     return result;
             }
             if (ts.isImportDeclaration(node)) {
-                const result = visitImportNode(node, sourceFile, options);
+                const result = visitImportNode(node, sourceFile, options, context);
                 if (result)
                     return result;
             }