@cmmn/tools 1.4.2 → 1.4.12

package/bundle/bundle.js

@@ -89,16 +89,16 @@ export async function bundle(...options) {
                 console.log('START BUNDLING');
                 break;
             case 'END':
-                console.log('FINISH');
+                console.log(`FINISH at ${new Date().toTimeString().substring(0,8)}`);
                 break;
             case 'BUNDLE_START':
                 for (let key in event.input){
-                    console.log(`1. ${key} -> ${event.output}`);
+                    console.log(`\t${key} -> ${event.output}`);
                 }
                 break;
             case 'BUNDLE_END':
                 for (let key in event.input){
-                    console.log(`1. ${key} -> ${event.output}, (${event.duration / 1000}s)`);
+                    console.log(`\t${key} -> ${event.output}, (${event.duration / 1000}s)`);
                 }
                 break;
 
@@ -119,6 +119,8 @@ export async function bundle(...options) {
                         break;
                 }
                 break;
+            default:
+                console.warn('WARNING:', event)
         }
     });
 }

package/bundle/rollup.config.js

@@ -195,14 +195,17 @@ export class ConfigCreator {
             output: this.output,
             external: (this.options.external || []).map(s => new RegExp(s)),
             onwarn(warning) {
-                // Silence circular dependency warning for moment package
-                if (
-                    warning.code === 'CIRCULAR_DEPENDENCY'
-                ) {
-                    return
+                switch (warning.code){
+                    case 'CIRCULAR_DEPENDENCY':
+                        return;
+                    case 'THIS_IS_UNDEFINED':
+                        console.log(`${warning.message} at`);
+                        console.log(`\t${warning.id}`);
+                        break;
+                    default:
+                        console.warn(`\t(!) ${warning.message}`)
                 }
 
-                console.warn(`(!) ${warning.message}`)
             },
             plugins: this.plugins,
             treeshake: this.options.minify ? "smallest" : "recommended",

package/compile/compile.js

@@ -1,5 +1,5 @@
 import ts from "ttypescript";
-import {resolve} from 'path';
+import {resolve, relative} from 'path';
 
 const rootDir = process.cwd();
 
@@ -16,7 +16,7 @@ export function compile(...flags) {
         incremental: true,
         dry: false
     }, {
-        excludeDirectories: ["node_modules", "dist"]
+        excludeDirectories: ["node_modules", "dist"],
     });
         builder.clean(rootDir);
         builder.build(rootDir);
@@ -26,7 +26,7 @@ function createProgram(rootNames, options, host, oldProgram, configFileParsingDi
     options.outDir = resolve(options.configFilePath, '../dist/esm');
     options.declarationDir = resolve(options.configFilePath, '../dist/typings');
     options.baseUrl = resolve(options.configFilePath, '../');
-    console.log('build', options.configFilePath);
+    console.log('\t', relative(process.cwd(), options.baseUrl));
     return ts.createEmitAndSemanticDiagnosticsBuilderProgram(
         rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences
     )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.4.2",
+  "version": "1.4.12",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -65,5 +65,5 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "824d290afabaa3a44ccb98322cb1758825bd9efb"
+  "gitHead": "6d71154c76d97bf9e1a8ebd52ab3c31df797d56d"
 }

package/plugins/absolute-plugin.cjs

@@ -14,7 +14,7 @@ function visitExportNode(exportNode, sourceFile) {
     const abs = path.resolve(sourceFileDir, file);
     if (/\.(less|css|scss|sass|svg|png|html)$/.test(file)) {
         const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFileDir));
-        const relFile = path.relative(absSource, abs)
+        const relFile = path.relative(absSource, abs).replaceAll(path.sep, '/');
         return ts.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, ts.createStringLiteral(relFile), exportNode.typeOnly);
     }
     if (fs.existsSync(abs + '.ts')) {
@@ -34,9 +34,11 @@ function visitImportNode(importNode, sourceFile, options) {
     const abs = path.resolve(sourceFileDir, file);
     if (/\.(less|css|scss|sass|svg|png|html)$/.test(file)) {
         const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFileDir));
-        const relFile = path.relative(absSource, abs)
+        const relFile = path.relative(absSource, abs).replaceAll(path.sep, '/');
         return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(relFile));
     }
+    if (/\.(json|tsx?|jsx?)$/.test(file))
+        return;
     if (fs.existsSync(abs + '.ts')) {
         return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(file + '.js'));
     }
@@ -56,7 +58,7 @@ function visitRequireNode(importNode, sourceFile) {
         const sourceFileDir = path.dirname(sourceFile.path);
         const abs = path.join(sourceFileDir, file);
         const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFileDir));
-        const relFile = path.relative(absSource, abs)
+        const relFile = path.relative(absSource, abs).replaceAll(path.sep, '/');
         return ts.updateCall(importNode, importNode.expression, undefined, [ts.createStringLiteral(relFile)]);
     }
 }