@cmmn/tools 1.2.3 → 1.4.1

package/bin.js

@@ -10,4 +10,10 @@ const actions = {
     bundle, compile, gen
 }
 
-actions[action](...args);
+if (action in actions) {
+    actions[action](...args);
+} else {
+    console.log(`cmmn bundle [-b] [index.ts] [--watch] [--run] [--prod]`);
+    console.log(`cmmn compile [-b] [--watch]`);
+    console.log(`cmmn gen AppRoot . [--nested]`);
+}

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,20 +57,31 @@ export class ConfigCreator {
         return path.join(this.root, this.options.outDir);
     }
 
+    getOutputFileName(module, minify) {
+        switch (module) {
+            case "cjs":
+                return `[name]${minify ? '.min' : ''}.cjs`;
+            case "es":
+                return `[name]${minify ? '.min' : ''}.js`;
+            default:
+                return `[name]-${module}${minify ? '.min' : ''}.js`;
+        }
+    }
+
     /**
      *
      * @returns {OutputOptions}
      */
     get output() {
         // const output = `${this.options.name ?? 'index'}-${this.options.module}${this.options.minify ? '.min' : ''}.js`;
-        return {
-            entryFileNames: `[name]-${this.options.module}${this.options.minify ? '.min' : ''}.js`,
+        return this.options.module.split(',').map(module => ({
+            entryFileNames: this.getOutputFileName(module, this.options.minify),
             // file: output,
             dir: this.outDir,
             sourcemap: true,
-            format: this.options.module,
+            format: module,
             name: 'global',
-        };
+        }));
     }
 
     get html() {
@@ -84,7 +96,7 @@ export class ConfigCreator {
         return serve({
             open: false,
             contentBase: [this.outDir, path.join(this.root, 'assets')],
-            port: 3001,
+            port: this.options.port ?? 3000,
             historyApiFallback: true
         });
     }
@@ -112,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/tsconfig.json

@@ -18,6 +18,7 @@
     "declarationDir": "./dist/typings",
     "declaration": true,
     "types": [
+      "@cmmn/tools"
     ],
     "lib": [
       "ES2020.BigInt",

package/compile/typings.d.ts

@@ -0,0 +1,19 @@
+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.2.3",
-  "description": "di, base extensions, useful functions",
+  "version": "1.4.1",
+  "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
   "publishConfig": {
@@ -11,22 +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",
@@ -37,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-transform-paths": "^3.3.1"
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "68d02f49f1ecba35975351e05ec1cb0519bf0ada"
+  "gitHead": "d1405a0626569d43adc867fe660f4df8b5c3b492"
 }

package/plugins/absolute-plugin.cjs

@@ -13,32 +13,35 @@ 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)) {
-        return ts.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, ts.createStringLiteral(abs), exportNode.typeOnly);
+        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);
     }
     if (fs.existsSync(abs + '.ts')) {
         return ts.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, ts.createStringLiteral(file + '.js'), exportNode.typeOnly);
     }
     if (fs.existsSync(abs + '/')) {
-        const indexFile = './'+path.join(file, 'index.js');
-        console.log(sourceFileDir, file, indexFile);
+        const indexFile = `${file}/index.js`;
         return ts.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, ts.createStringLiteral(indexFile), exportNode.typeOnly);
     }
 }
 
-function visitImportNode(importNode, sourceFile) {
+function visitImportNode(importNode, sourceFile, options) {
     const file = importNode.moduleSpecifier?.text;
     if (!file)
         return;
     const sourceFileDir = path.dirname(sourceFile.path);
     const abs = path.resolve(sourceFileDir, file);
     if (/\.(less|css|scss|sass|svg|png|html)$/.test(file)) {
-        return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(abs));
+        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));
     }
     if (fs.existsSync(abs + '.ts')) {
         return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(file + '.js'));
     }
     if (fs.existsSync(abs + '/')) {
-        const indexFile = './' + path.join(file, 'index.js');
+        const indexFile = `${file}/index.js`;
         return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(indexFile));
     }
 }
@@ -51,12 +54,15 @@ function visitRequireNode(importNode, sourceFile) {
     const file = importNode.arguments[0].text;
     if (/\.(less|css|scss|sass|svg|png|html)/.test(file)) {
         const sourceFileDir = path.dirname(sourceFile.path);
-        const real = path.join(sourceFileDir, file);
-        return ts.updateCall(importNode, importNode.expression, undefined, [ts.createStringLiteral(real)]);
+        const abs = path.join(sourceFileDir, file);
+        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)]);
     }
 }
 
 const lessToStringTransformer = function (context) {
+    const options = context.getCompilerOptions();
     return (sourceFile) => {
         function visitor(node) {
             // if (node && node.kind == ts.SyntaxKind.ImportDeclaration) {
@@ -70,7 +76,7 @@ const lessToStringTransformer = function (context) {
                     return result;
             }
             if (ts.isImportDeclaration(node)) {
-                const result = visitImportNode(node, sourceFile);
+                const result = visitImportNode(node, sourceFile, options);
                 if (result)
                     return result;
             }

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;
+}