@cmmn/tools 1.3.0 → 1.4.2

package/bin.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import {bundle} from "./bundle/bundle.js";
 import {compile} from "./compile/compile.js";

package/bundle/bundle.js

@@ -70,10 +70,14 @@ export async function bundle(...options) {
     });
     if (!options.includes('--watch')) {
         for (let config of configs) {
-            console.log(`1. ${config.input} -> ${config.output.file}`);
+            for (let key in config.input){
+                // console.log(`1. ${key} (${config.input[key]})`);
+            }
             const build = await rollup(config);
-            await build.write(config.output);
-            console.log('SUCCESS');
+            for (let out of config.output){
+                console.log(`SUCCESS: ${out.dir} ${out.entryFileNames.replace('[name]', Object.keys(config.input)[0])}`);
+                await build.write(out);
+            }
         }
         return;
     }
@@ -88,10 +92,14 @@ export async function bundle(...options) {
                 console.log('FINISH');
                 break;
             case 'BUNDLE_START':
-                console.log(`1. ${event.input} -> ${event.output}`);
+                for (let key in event.input){
+                    console.log(`1. ${key} -> ${event.output}`);
+                }
                 break;
             case 'BUNDLE_END':
-                console.log(`1. ${event.input} -> ${event.output}, (${event.duration / 1000}s)`);
+                for (let key in event.input){
+                    console.log(`1. ${key} -> ${event.output}, (${event.duration / 1000}s)`);
+                }
                 break;
 
             case 'ERROR':

package/bundle/rollup.config.js

@@ -4,8 +4,9 @@ import {terser} from "rollup-plugin-terser"
 import {visualizer} from 'rollup-plugin-visualizer';
 import styles from "rollup-plugin-styles";
 import {string} from "rollup-plugin-string";
-import serve from 'rollup-plugin-serve'
-import livereload from 'rollup-plugin-livereload'
+import serve from 'rollup-plugin-serve';
+import builtins from 'rollup-plugin-node-builtins';
+import livereload from 'rollup-plugin-livereload';
 import fs from "fs";
 import path from "path";
 import html from '@open-wc/rollup-plugin-html';
@@ -56,8 +57,8 @@ export class ConfigCreator {
         return path.join(this.root, this.options.outDir);
     }
 
-    getOutputFileName(module, minify){
-        switch (module){
+    getOutputFileName(module, minify) {
+        switch (module) {
             case "cjs":
                 return `[name]${minify ? '.min' : ''}.cjs`;
             case "es":
@@ -79,7 +80,7 @@ export class ConfigCreator {
             dir: this.outDir,
             sourcemap: true,
             format: module,
-            name: 'global',
+            name: this.options.global ?? 'global',
         }));
     }
 
@@ -123,14 +124,17 @@ export class ConfigCreator {
 
     get plugins() {
         const result = [
-            // builtins(),
             nodeResolve({
                 browser: this.options.browser,
                 dedupe: this.options.dedupe || []
             }),
             commonjs({
                 requireReturnsDefault: "namespace",
+                dynamicRequireTargets: [
+                    'node_modules/ulid/*.js'
+                ]
             }),
+            builtins(),
             styles({
                 mode: "emit",
             }),

package/compile/typings.d.ts

@@ -2,3 +2,18 @@ declare module "*.less"{
     const style: string;
     export default style;
 }
+
+declare module "*.svg"{
+    const style: string;
+    export default style;
+}
+
+declare module "*.css"{
+    const style: string;
+    export default style;
+}
+
+declare module "*.html"{
+    const style: string;
+    export default style;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.3.0",
-  "description": "di, base extensions, useful functions",
+  "version": "1.4.2",
+  "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
   "publishConfig": {
@@ -11,23 +11,43 @@
   "bin": {
     "cmmn": "bin.js"
   },
+  "exports": {
+    "./test": "./test/index.js",
+    "./test/config": "./test/jest.config.js"
+  },
+  "typesVersions": {
+    "*": {
+      "test": [
+        "./test/index.d.ts"
+      ],
+      ".": [
+        "./compile/typings.d.ts"
+      ]
+    }
+  },
   "typings": "compile/typings.d.ts",
   "files": [
     "bin.js",
     "gen/*",
     "compile/*",
     "bundle/*",
-    "plugins/*"
+    "plugins/*",
+    "test/*"
   ],
   "dependencies": {
+    "@jest/globals": "27.x.x",
     "@open-wc/rollup-plugin-html": "^1.2.5",
     "@rollup/plugin-alias": "3",
     "@rollup/plugin-commonjs": "^21",
     "@rollup/plugin-json": "4",
     "@rollup/plugin-node-resolve": "^13",
     "@rollup/plugin-typescript": "^8",
+    "@swc/jest": "0.2.17",
+    "@testdeck/jest": "0.2.0",
+    "@types/jest": "27.x.x",
     "@web/rollup-plugin-html": "^1.10.1",
     "fast-glob": "^3.2.11",
+    "jest": "27.x.x",
     "less": "^4",
     "rollup": "^2",
     "rollup-plugin-livereload": "^2.0.5",
@@ -38,11 +58,12 @@
     "rollup-plugin-styles": "^4",
     "rollup-plugin-terser": "^7",
     "rollup-plugin-visualizer": "^5.5.4",
+    "ts-jest": "27.x.x",
     "ttypescript": "1.5.13",
-    "typescript": "4.4.3",
+    "typescript": "4.x.x",
     "typescript-transform-paths": "^3.3.1"
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "76478b70f43752f9bfe6cb96b4e540b1ff1e52e3"
+  "gitHead": "824d290afabaa3a44ccb98322cb1758825bd9efb"
 }

package/plugins/absolute-plugin.cjs

@@ -13,7 +13,7 @@ function visitExportNode(exportNode, sourceFile) {
     const sourceFileDir = path.dirname(sourceFile.path);
     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, sourceFile.path));
+        const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFileDir));
         const relFile = path.relative(absSource, abs)
         return ts.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, ts.createStringLiteral(relFile), exportNode.typeOnly);
     }
@@ -33,7 +33,7 @@ function visitImportNode(importNode, sourceFile, options) {
     const sourceFileDir = path.dirname(sourceFile.path);
     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, sourceFile.path));
+        const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFileDir));
         const relFile = path.relative(absSource, abs)
         return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(relFile));
     }
@@ -55,7 +55,7 @@ function visitRequireNode(importNode, sourceFile) {
     if (/\.(less|css|scss|sass|svg|png|html)/.test(file)) {
         const sourceFileDir = path.dirname(sourceFile.path);
         const abs = path.join(sourceFileDir, file);
-        const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFile.path));
+        const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFileDir));
         const relFile = path.relative(absSource, abs)
         return ts.updateCall(importNode, importNode.expression, undefined, [ts.createStringLiteral(relFile)]);
     }

package/readme.md

@@ -1,11 +1,31 @@
 ## Builder and bundler for your projects
 
 ### Use cases:
-`cmmn compile [target] [-b] [--watch]`
-> Runs typescript compiler
+* `cmmn compile [target] [-b] [--watch]`
+  > Runs typescript compiler
   
-`cmmn bundle [target] [-b] [--watch] [--run] [--prod]`
-> Runs rollup bundler
+* `cmmn bundle [target] [-b] [--watch] [--run] [--prod]`
+  > Runs rollup bundler
   
-`cmmn gen name directory [-n]`
-> Generates component with template at directory
+* `cmmn gen name directory [-n]`
+  > Generates component with template at directory
+
+* default `jest.config.js`:
+    ```typescript
+    import config from "@cmmn/tools/test/config";
+    export default config;
+    ```
+  
+* tests: `some.spec.ts`
+  ```typescript
+    import {suite, test, expect} from "@cmmn/tools/test";
+    
+    @suite
+    export class SomeSpec {
+    
+        @test
+        equalsTest() {
+            expect(1).toBe(2);
+        }
+    }
+    ```

package/test/index.d.ts

@@ -0,0 +1,2 @@
+export {suite, test, timeout,} from "@testdeck/jest";
+export {expect,} from "@jest/globals";

package/test/index.js

@@ -0,0 +1,5 @@
+export {suite, test, timeout,} from "@testdeck/jest";
+import * as globals from "@jest/globals";
+
+const {expect} = globals;
+export {expect};

package/test/jest.config.js

@@ -0,0 +1,46 @@
+import ts from "typescript";
+import {pathsToModuleNameMapper} from "ts-jest";
+
+const options = getTSConfig();
+
+export default {
+    transform: {
+        '^.+\\.tsx?$': ['@swc/jest', {
+            jsc: {
+                parser: {
+                    syntax: "typescript",
+                    // tsx: true, // If you use react
+                    dynamicImport: true,
+                    decorators: true,
+                },
+                target: "es2021",
+                transform: {
+                    decoratorMetadata: true,
+                },
+                paths: options.paths,
+                baseUrl: '.'
+            },
+        }],
+    },
+    roots: [process.cwd()],
+    moduleNameMapper: pathsToModuleNameMapper(options.paths ?? {}, {
+        prefix: '<rootDir>'
+    }),
+    extensionsToTreatAsEsm: ['.ts', '.tsx', '.jsx?'],
+}
+
+
+function getTSConfig() {
+    const configPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists, 'tsconfig.json');
+    const readConfigFileResult = ts.readConfigFile(configPath, ts.sys.readFile);
+    if (readConfigFileResult.error) {
+        throw new Error(ts.formatDiagnostic(readConfigFileResult.error, formatHost));
+    }
+    const jsonConfig = readConfigFileResult.config;
+    const convertResult = ts.convertCompilerOptionsFromJson(jsonConfig.compilerOptions, './');
+    if (convertResult.errors && convertResult.errors.length > 0) {
+        throw new Error(ts.formatDiagnostics(convertResult.errors, formatHost));
+    }
+    const compilerOptions = convertResult.options;
+    return compilerOptions;
+}