@cmmn/tools 1.8.1 → 1.8.6

package/{plugins/absolute-plugin.cjs → compile/absolute-plugin.js}

@@ -1,6 +1,6 @@
-const ts = require("typescript");
-const path = require("path");
-const fs = require("fs");
+import ts from "typescript";
+import path from "path";
+import fs from "fs";
 
 function visitExportNode(exportNode, sourceFile) {
     if (exportNode.typeOnly){
@@ -27,6 +27,7 @@ function visitExportNode(exportNode, sourceFile) {
 }
 
 function visitImportNode(importNode, sourceFile, options, context) {
+    const factory = context.factory;
     const file = importNode.moduleSpecifier?.text;
     if (!file || !file.startsWith('.'))
         return;
@@ -37,16 +38,16 @@ function visitImportNode(importNode, sourceFile, options, context) {
     if (/\.(less|css|scss|sass|svg|png|html)$/.test(file)) {
         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));
+        return factory.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, factory.createStringLiteral(relFile));
     }
     if (/\.(json|tsx?|jsx?)$/.test(file))
         return;
     if (fs.existsSync(abs + '.ts') || fs.existsSync(abs + '.tsx')) {
-        return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(file + '.js'));
+        return factory.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, factory.createStringLiteral(file + '.js'));
     }
     if (fs.existsSync(abs + '/')) {
         const indexFile = `${file}/index.js`;
-        return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(indexFile));
+        return factory.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, factory.createStringLiteral(indexFile));
     }
 }
 
@@ -65,9 +66,8 @@ function visitRequireNode(importNode, sourceFile) {
     }
 }
 
-const lessToStringTransformer = function (context) {
+export const lessToStringTransformer = function (context) {
     const options = context.getCompilerOptions();
-    console.log(context);
     return (sourceFile) => {
         function visitor(node) {
             // if (node && node.kind == ts.SyntaxKind.ImportDeclaration) {
@@ -95,7 +95,4 @@ const lessToStringTransformer = function (context) {
 
         return ts.visitEachChild(sourceFile, visitor, context);
     };
-};
-exports.default = function (program, pluginOptions) {
-    return lessToStringTransformer;
-}
+};

package/compile/compile.js

@@ -1,11 +1,21 @@
 import ts from "typescript/lib/typescript.js";
 import {resolve, relative} from 'path';
 import fs from "fs";
+import { lessToStringTransformer } from "./absolute-plugin.js";
+
 const rootDir = process.cwd();
 
 export function compile(...flags) {
 
     const host = ts.createSolutionBuilderWithWatchHost(ts.sys, createProgram);
+    console.log()
+    host.getCustomTransformers = () => ({
+        before: [
+            lessToStringTransformer
+        ],
+        afterDeclarations: [
+        ]
+    });
     host.useCaseSensitiveFileNames();
 
     const builderFactory = flags.includes('--watch') ?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.8.1",
+  "version": "1.8.6",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -83,5 +83,5 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "6c114c08370cc1eeb81338f78df5feef6531bfed"
+  "gitHead": "c49859634cc0fb40bc888d468d46f8b47b7ff840"
 }

package/test/jest.config.js

@@ -18,7 +18,7 @@ export default {
                     decoratorMetadata: true,
                 },
                 paths: options.paths,
-                baseUrl: '.'
+                baseUrl: process.cwd()
             },
         }],
     },