@cmmn/tools 1.0.3 → 1.1.0

package/bin.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-
-import {bundle} from "./bundle/bundle.js";
-import {compile} from "./compile/compile.js";
-
-const [action, ...args] = process.argv.slice(2);
-
-const actions = {
-    bundle, compile
-}
-
+
+import {bundle} from "./bundle/bundle.js";
+import {compile} from "./compile/compile.js";
+
+const [action, ...args] = process.argv.slice(2);
+
+const actions = {
+    bundle, compile
+}
+
 actions[action](...args);

package/bundle/bundle.js

@@ -1,53 +1,101 @@
-import {getConfig} from "./rollup.config.js";
-import {rollup, watch} from "rollup";
-
-export async function bundle(target, ...options) {
-    const config = getConfig({
-        input: target,
-        minify: options.includes('--prop'),
-        devServer: options.includes('--run')
-    });
-    config.onwarn = function (message){
-
-    }
-    if (options.includes('--watch')) {
-        const watcher = watch(config);
-        watcher.on('event', (event) => {
-            switch (event.code){
-                case 'START':
-                    console.clear();
-                    console.log('START BUNDLING');
-                    break;
-                case 'END':
-                    console.log('FINISH');
-                    break;
-                case 'BUNDLE_START':
-                    console.log(`1. ${event.input} -> ${event.output}`);
-                    break;
-                case 'BUNDLE_END':
-                    console.log(`1. ${event.input} -> ${event.output}, (${event.duration/1000}s)`);
-                    break;
-
-                case 'ERROR':
-                    switch (event.error.code){
-                        case 'PARSE_ERROR':
-                            console.warn('Error parsing files:');
-                            console.log(`\t${event.error.parserError.message}`);
-                            console.log(`\tat: ${event.error.id}`);
-                            console.log(`\tline: ${event.error.frame}`);
-                            break;
-                        case 'UNRESOLVED_IMPORT':
-                            console.error(event.error.message);
-                            break;
-                        default:
-                            console.warn('Unknown error:', event.error.code);
-                            console.error(event.error);
-                            break;
-                    }
-                    break;
-            }
-        });
-    } else {
-        const build = await rollup(config);
-    }
-}
+import {getConfig} from "./rollup.config.js";
+import {rollup, watch} from "rollup";
+import fs from "fs";
+import path from "path";
+import fg from "fast-glob";
+
+function getPackageConfigs(rootDir, options) {
+    const results = [];
+    const pkg = JSON.parse(fs.readFileSync(path.join(rootDir, 'package.json')));
+    for (let name in pkg.cmmn) {
+        results.push(...getConfig({
+            name,
+            outDir: path.join(rootDir, pkg.cmmn[name].output ?? 'dist'),
+            input: path.join(rootDir, pkg.cmmn[name].input ?? 'index.ts'),
+            minify: options.includes('--prod'),
+            devServer: options.includes('--run'),
+            stats: options.includes('--stats'),
+            module: pkg.cmmn[name].module ?? 'es'
+        }))
+    }
+    return results;
+}
+
+function getLernaSubPackages(lernaFile, options) {
+    const config = JSON.parse(fs.readFileSync(lernaFile, 'utf8'));
+    const packages = config.packages;
+    const dirs = packages.flatMap(pkg => fg.sync([pkg], {
+        absolute: true,
+        globstar: true,
+        onlyDirectories: true,
+        cwd: path.dirname(lernaFile)
+    }));
+    return dirs.flatMap(dir => getPackageConfigs(dir, options));
+}
+
+function getConfigs(options) {
+    if (options.includes('-b')) {
+        const rootDir = process.cwd();
+        const lernaPath = path.join(rootDir, 'lerna.json');
+        if (fs.existsSync(lernaPath)) {
+            return getLernaSubPackages(lernaPath, options);
+        }
+    }
+    const input = options.filter(x => !x.startsWith('-'))[0];
+    return getConfig({
+        input,
+        minify: options.includes('--prod'),
+        devServer: options.includes('--run'),
+        stats: options.includes('--stats'),
+        module: 'es'
+    });
+}
+
+export async function bundle(...options) {
+    const configs = getConfigs(options);
+    if (!options.includes('--watch')) {
+        for (let config of configs) {
+            console.log(`1. ${config.input} -> ${config.output.file}`);
+            const build = await rollup(config);
+            await build.write(config.output);
+            console.log('SUCCESS');
+        }
+        return;
+    }
+    const watcher = watch(configs);
+    watcher.on('event', (event) => {
+        switch (event.code) {
+            case 'START':
+                console.clear();
+                console.log('START BUNDLING');
+                break;
+            case 'END':
+                console.log('FINISH');
+                break;
+            case 'BUNDLE_START':
+                console.log(`1. ${event.input} -> ${event.output}`);
+                break;
+            case 'BUNDLE_END':
+                console.log(`1. ${event.input} -> ${event.output}, (${event.duration / 1000}s)`);
+                break;
+
+            case 'ERROR':
+                switch (event.error.code) {
+                    case 'PARSE_ERROR':
+                        console.warn('Error parsing files:');
+                        console.log(`\t${event.error.parserError.message}`);
+                        console.log(`\tat: ${event.error.id}`);
+                        console.log(`\tline: ${event.error.frame}`);
+                        break;
+                    case 'UNRESOLVED_IMPORT':
+                        console.error(event.error.message);
+                        break;
+                    default:
+                        console.warn('Unknown error:', event.error.code);
+                        console.error(event.error);
+                        break;
+                }
+                break;
+        }
+    });
+}

package/bundle/rollup.config.js

@@ -1,78 +1,61 @@
-import commonjs from '@rollup/plugin-commonjs';
-import nodeResolve from '@rollup/plugin-node-resolve';
-import {terser} from "rollup-plugin-terser"
-import { visualizer } from 'rollup-plugin-visualizer';
-import  less from 'rollup-plugin-less';
-import { string } from "rollup-plugin-string";
-import serve from 'rollup-plugin-serve'
-
-export const getConfig = ({minify, input, devServer}) => {
-    if (minify){
-        return {
-            input,
-            output: {
-                file: 'dist/index.min.js',
-                format: 'cjs'
-            },
-            plugins: [
-                commonjs(),
-                nodeResolve({
-                    browser: true,
-                }),
-                terser({
-                }),
-                visualizer({
-                    open: true,
-                    template: 'sunburst',
-                    brotliSize: true,
-                    filename: 'dist/stats.html'
-                }),
-
-            ]
-        }
-    }
-    return ({
-        input,
-        output: [
-            {
-                file: 'dist/index-cjs.js',
-                sourcemap: true,
-                format: 'cjs',
-                exports: 'auto',
-            },
-            {
-                file: 'dist/index-umd.js',
-                sourcemap: true,
-                format: 'umd',
-                name: 'global'
-            },
-            {
-                file: 'dist/index-es.js',
-                sourcemap: true,
-                exports: 'auto',
-                format: 'es'
-            }
-        ],
-        // prettier-ignore
-        plugins: [
-            nodeResolve({
-                browser: true,
-            }),
-            commonjs({
-
-            }),
-            less({
-               insert: true
-            }),
-            string({
-                include: /\.(html|svg)$/,
-            }),
-            ...[devServer ? serve({
-                open: false,
-                contentBase: ['dist', 'assets'],
-                port: 3001,
-                historyApiFallback: true
-            }) : '']
-        ]
-    });
-};
+import commonjs from '@rollup/plugin-commonjs';
+import nodeResolve from '@rollup/plugin-node-resolve';
+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'
+
+export const getConfig = ({minify, input, devServer, module, stats, name, outDir}) => {
+    const output = `${outDir ?? 'dist'}/${name ?? 'index'}-${module}${minify ? '.min' : ''}.js`;
+    return [{
+        input,
+        output: {
+            file: output,
+            sourcemap: !minify,
+            format: module,
+            exports: 'auto',
+            name: 'global'
+        },
+        onwarn: function () {
+
+        },
+        // prettier-ignore
+        plugins: [
+            nodeResolve({
+                browser: true,
+                dedupe: ['lib0']
+            }),
+            commonjs({}),
+            styles({mode: "emit"}),
+            string({
+                include: /\.(html|svg|less|css)$/,
+            }),
+            ...(minify ? [terser({})] : []),
+            ...(devServer ? [
+                serve({
+                    open: false,
+                    contentBase: ['dist', 'assets'],
+                    port: 3001,
+                    historyApiFallback: true
+                }), livereload({
+                    watch: ['dist', 'assets'],
+                    verbose: false, // Disable console output
+
+                    // other livereload options
+                    port: 12345,
+                    delay: 300,
+                })] : []),
+            ...(stats ? [
+                visualizer({
+                    open: true,
+                    sourcemap: true,
+                    template: 'treemap',
+                    brotliSize: true,
+                    filename: 'dist/stats.html'
+                }),
+            ] : [])
+        ]
+    }];
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "di, base extensions, useful functions",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -13,26 +13,29 @@
   },
   "files": [
     "bin.js",
-    "absolute-plugin.cjs",
-    "bundle/*",
-    "compile/*"
+    "bundle/*"
   ],
-  "peerDependencies": {
-    "typescript": "4.4.3"
-  },
   "dependencies": {
+    "less": "^4",
+    "ttypescript": "1.5.13",
+    "typescript": "4.4.3",
+    "typescript-transform-paths": "^3.3.1"
+  },
+  "devDependencies": {
     "@rollup/plugin-commonjs": "^21",
     "@rollup/plugin-node-resolve": "^13",
     "@rollup/plugin-typescript": "^8",
+    "@web/rollup-plugin-html": "^1.10.1",
+    "fast-glob": "^3.2.11",
     "rollup": "^2",
-    "rollup-plugin-less": "^1.1.3",
+    "rollup-plugin-livereload": "^2.0.5",
     "rollup-plugin-serve": "^1.1.0",
     "rollup-plugin-string": "^3.0.0",
+    "rollup-plugin-styles": "^4",
     "rollup-plugin-terser": "^7",
-    "rollup-plugin-visualizer": "^5.5.4",
-    "typescript": "4.4.3"
+    "rollup-plugin-visualizer": "^5.5.4"
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "a96e009d45a7e453cb419989710f16f30e5d8290"
+  "gitHead": "5309832cf3397001967465f0508d947cbab2540d"
 }

package/absolute-plugin.cjs

@@ -1,36 +0,0 @@
-const ts = require("typescript");
-const path_1 = require("path");
-
-function visitRequireNode(importNode) {
-    if (importNode.expression.kind == ts.SyntaxKind.Identifier &&
-        importNode.expression.escapedText == "require") {
-        const file = importNode.arguments[0].text;
-        if (/\.(less|css|scss|sass|svg|png|html)/.test(file)) {
-            const currentFileName = importNode.getSourceFile().fileName;
-            const absolute = path_1.join(path_1.dirname(currentFileName), file);
-            return ts.updateCall(importNode, importNode.expression, undefined, [ts.createStringLiteral(absolute)]);
-        }
-    }
-    return null;
-}
-
-const lessToStringTransformer = function (context) {
-    return (sourceFile) => {
-        function visitor(node) {
-            // if (node && node.kind == ts.SyntaxKind.ImportDeclaration) {
-            //     return visitImportNode(node as ts.ImportDeclaration);
-            // }
-            if (node && ts.isCallExpression(node)) {
-                const result = visitRequireNode(node);
-                if (result)
-                    return result;
-            }
-            return ts.visitEachChild(node, visitor, context);
-        }
-
-        return ts.visitEachChild(sourceFile, visitor, context);
-    };
-};
-exports.default = function (program, pluginOptions) {
-    return lessToStringTransformer;
-}

package/compile/compile.js

@@ -1,47 +0,0 @@
-import ts from "typescript";
-
-export function compile(target, options) {
-    const config = {
-        declaration: true,
-        declarationDir: "dist/typings",
-        experimentalDecorators: true,
-        emitDecoratorMetadata: true,
-        module: ts.ModuleKind.ES2020,
-        moduleResolution: ts.ModuleResolutionKind.NodeJs,
-        lib: ["lib.es2020.d.ts", "lib.dom.d.ts"],
-        noEmitHelpers: false,
-        noImplicitAny: true,
-        downlevelIteration: true,
-        noImplicitOverride: true,
-        noImplicitReturns: true,
-        outDir: "dist/esm",
-        target: ts.ScriptTarget.ES2018
-    }
-    // Note that there is another overload for `createWatchCompilerHost` that takes
-    // a set of root files.
-    const host = ts.createWatchCompilerHost(
-        [ target ],
-        config,
-        ts.sys
-    );
-
-    // You can technically override any given hook on the host, though you probably
-    // don't need to.
-    // Note that we're assuming `origCreateProgram` and `origPostProgramCreate`
-    // doesn't use `this` at all.
-    const origCreateProgram = host.createProgram;
-    host.createProgram = (rootNames, options, host, oldProgram) => {
-        console.log("** We're about to create the program! **");
-        return origCreateProgram(rootNames, options, host, oldProgram);
-    };
-    const origPostProgramCreate = host.afterProgramCreate;
-
-    host.afterProgramCreate = program => {
-        console.log("** We finished making the program! **");
-        origPostProgramCreate(program);
-    };
-
-    // `createWatchProgram` creates an initial program, watches files, and updates
-    // the program over time.
-    ts.createWatchProgram(host);
-}