@cmmn/tools 1.9.4 → 1.9.7

package/bundle/bundle.js

@@ -5,27 +5,30 @@ import fs from "fs";
 import path, {relative} from "path";
 
 export async function bundle(...options) {
-    const configOptions = getConfigOptions({
-        input: options.filter(x => !x.startsWith('-'))[0],
-        project: options.includes('-b'),
-        minify: options.includes('--prod'),
-        devServer: options.includes('--run'),
+    const configOptions = await getConfigOptions({
+        minify: options.includes('--minify'),
+        prod: options.includes('--prod'),
         stats: options.includes('--stats'),
     });
     const configs = configOptions.flatMap(x => new ConfigCreator(x).getConfig());
-    const contexts = await Promise.all(configs.map(async x =>
-        [x, await esbuild.context(x)]
-    ));
+    const contexts = [];
+    for (let config of configs){
+        contexts.push([config, await esbuild.context(config)]);
+    }
 
     if (options.includes('--watch')) {
-        for (let [name, context] of contexts) {
+        for (let [config, context] of contexts) {
             await context.watch();
         }
+        console.log('bundled. Continue watching...');
     }else {
         const  logs = [];
         for (let [config, context] of contexts) {
-            const result = await context.rebuild();
             const project = path.relative(process.cwd(), config.absWorkingDir);
+            const result = await context.rebuild().catch(err => {
+                err.message = project + ": " + err.message;
+                throw err;
+            });
             const name = config.entryPoints[0].out;
             let log = logs.find(x => x.project === project && x.name === name);
             if (!log){
@@ -39,86 +42,4 @@ export async function bundle(...options) {
         }
         console.table(logs);
     }
-}
-
-async function runWatching(configs){
-    let counter = 0;
-    while(true){
-        console.log('Check input existence');
-        const missed = await checkMissed(configs);
-        if (!missed.length)
-            break;
-        console.log('missed files:');
-        missed.forEach(x => console.log('\t', relative(process.cwd(), x)));
-        counter = Math.min(++counter, 5);
-        console.log(`wait ${counter} sec...`);
-        await new Promise(resolve => setTimeout(resolve, 1000 * counter));
-        console.clear();
-    }
-    const watcher = watch(configs);
-    watcher.on('event', (event) => {
-        switch (event.code) {
-            case 'START':
-                console.log(`START BUNDLING at ${new Date().toTimeString().substring(0,8)}`);
-                break;
-            case 'END':
-                console.log(`FINISH at ${new Date().toTimeString().substring(0,8)}`);
-                break;
-            case 'BUNDLE_START':
-                for (let key in event.input){
-                    console.log(`\t${key} -> ${event.output}`);
-                }
-                break;
-            case 'BUNDLE_END':
-                for (let key in event.input){
-                    console.log(`\t\t(${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.warn('UNRESOLVED_IMPORT:\t',event.error.message);
-                        break;
-                    case 'MISSING_EXPORT':
-                        console.warn('MISSING_EXPORT: \t', event.error.message);
-                        break;
-                    case 'UNRESOLVED_ENTRY':
-                        console.warn('UNRESOLVED_ENTRY:\t',event.error.message);
-                        watcher.close();
-                        runWatching(configs);
-                        break;
-                    default:
-                        console.warn('Unknown error:', event.error.code);
-                        console.error(event.error);
-                        break;
-                }
-                break;
-            default:
-                console.warn('WARNING:', event)
-        }
-    });
-}
-
-/**
- * @param configs {RollupOptions[]}
- */
-async function checkMissed(configs) {
-    const missed = [];
-    for (let config of configs) {
-        for (let key in config.input) {
-            try {
-                await fs.promises.stat(config.input[key]);
-            }catch (e) {
-                missed.push(config.input[key]);
-            }
-        }
-    }
-    return missed;
 }

package/bundle/esbuild.config.js

@@ -26,6 +26,7 @@ export class ConfigCreator {
      *     platform: string,
      *     dedupe: string[],
      *     target: string
+     *     prod: boolean,
      *     inject: string
      * }}
      */
@@ -117,14 +118,14 @@ export class ConfigCreator {
     getConfig() {
         if (this.options.external && typeof this.options.external === "string")
             this.options.external = [this.options.external]
-        console.log(this.options.name, this.options);
+        // console.log(this.options.name, this.options);
         return this.modules.flatMap(format => this.platforms.map(platform => ({
             entryPoints: [
                 { out: this.options.name, in: this.options.input }
             ],
             bundle: true,
-            minify: this.options.minify,
-            sourcemap: this.options.minify ? false : 'external',
+            minify: this.options.minify || this.options.prod,
+            sourcemap: this.options.prod ? false : 'external',
             target: ['chrome88', 'safari14', 'firefox88'],
             outdir: 'dist/bundle',
             metafile: true,
@@ -138,9 +139,13 @@ export class ConfigCreator {
             },
             platform: platform,
             tsconfig: 'tsconfig.json',
-            external: ["*.woff2", "*.woff", ...this.options.external],
+            external: [
+                "*.woff2", "*.woff",
+                ...(platform !== "node" && this.options.minify ? [] : this.options.external)
+            ],
             define: {
-                'process.env.NODE_ENV': '"production"'
+                'process.env.NODE_ENV': '"production"',
+                PRODUCTION: this.options.prod ? "true": "false"
             },
             publicPath: '/',
             alias: this.options.alias,

package/bundle/getConfigs.js

@@ -1,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-import fg from "fast-glob";
+import {getTSConfig} from "../helpers/getTSConfig.js";
 
 function getProjectConfig(rootDir, cmmn, options) {
     return {
@@ -10,21 +10,27 @@ function getProjectConfig(rootDir, cmmn, options) {
     };
 }
 
-function getPackageConfigs(rootDir, options, name = null) {
+async function *getDependencyOrder(rootDir, visited = []) {
+    const tsConfig = getTSConfig(rootDir)
+    for (let reference of tsConfig.references ?? []){
+        const refRoot = path.resolve(rootDir, reference.path);
+        if (visited.includes(refRoot))
+            continue;
+        visited.push(refRoot)
+        for await (let dep of await getDependencyOrder(refRoot, visited)){
+            yield dep;
+        }
+    }
+    yield rootDir;
+}
+
+
+async function getPackageConfigs(rootDir, options, name = null, visited = []) {
     const pckPath = path.join(rootDir, 'package.json');
     if (!fs.existsSync(pckPath))
         return [];
     const results = [];
-    const pkg = JSON.parse(fs.readFileSync(pckPath));
-    if (pkg.workspaces){
-        const dirs = pkg.workspaces.flatMap(pkg => fg.sync([pkg], {
-            absolute: true,
-            globstar: true,
-            onlyDirectories: true,
-            cwd: rootDir
-        }));
-        dirs.forEach(d => results.push(...getPackageConfigs(d, options, name)));
-    }
+    const pkg = JSON.parse(await fs.promises.readFile(pckPath));
     if (pkg.cmmn) {
         if (name) {
             results.push(getProjectConfig(rootDir, pkg.cmmn[name], {
@@ -45,29 +51,12 @@ function getPackageConfigs(rootDir, options, name = null) {
     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));
-}
 
-export function getConfigOptions(options) {
-    if (!options.input || options.project) {
-        const rootDir = process.cwd();
-        const lernaPath = path.join(rootDir, 'lerna.json');
-        if (fs.existsSync(lernaPath)) {
-            return getLernaSubPackages(lernaPath, options);
-        }
-        return getPackageConfigs(process.cwd(), options);
-    }
-    if (!options.input.includes('.') || !fs.existsSync(options.input)) {
-        return getPackageConfigs(process.cwd(), options, options.input);
+export async function getConfigOptions(options) {
+    const result = []
+    for await (let project of getDependencyOrder(process.cwd())){
+        const configs = await getPackageConfigs(project, options);
+        result.push(...configs);
     }
-    return [options];
+    return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.9.4",
+  "version": "1.9.7",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -47,6 +47,7 @@
     "@types/jest": "27.x.x",
     "@types/sinon": "10.x.x",
     "@zerollup/ts-helpers": "1.7.18",
+    "dependency-order": "1.1.6",
     "esbuild": "0.19.5",
     "esbuild-plugin-less": "1.3.1",
     "esbuild-register": "3.5.0",
@@ -62,5 +63,5 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "1602adb5285c0b8a7bd52d5a5d32860cdad4a434"
+  "gitHead": "2755b333808bf97f1d9454601c2a2c9a88e4a021"
 }

package/serve/serve.js

@@ -5,8 +5,8 @@ import liveServer from "live-server";
 import {resolve, moduleResolve} from 'import-meta-resolve';
 import uri2path from "file-uri-to-path";
 
-export function serve(...options) {
-    const configs = getConfigOptions({
+export async function serve(...options) {
+    const configs = await getConfigOptions({
         project: options.includes('-b'),
     });
     configs.filter(x => x.port).forEach(async (x,i) => {

package/test/jest.config.js

@@ -1,7 +1,7 @@
-import ts from "typescript";
 import {pathsToModuleNameMapper} from "ts-jest";
+import {getTSCompilerOptions} from "../helpers/getTSConfig.js";
 
-const options = getTSConfig();
+const options = getTSCompilerOptions(process.cwd());
 
 export default {
     transform: {
@@ -30,17 +30,3 @@ export default {
 }
 
 
-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;
-}