@cmmn/tools 1.6.6 → 1.6.9

package/bin.js

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

package/bundle/bundle.js

@@ -1,76 +1,17 @@
-import {ConfigCreator} from "./rollup.config.js";
 import {rollup, watch} from "rollup";
-import fs from "fs";
-import path from "path";
-import fg from "fast-glob";
-
-function getProjectConfig(rootDir, cmmn, options) {
-    const configCreator = new ConfigCreator({
-        ...options,
-        ...cmmn,
-    });
-    configCreator.setRootDir(rootDir);
-    return configCreator.getConfig();
-}
-
-function getPackageConfigs(rootDir, options, name = null) {
-    const pckPath = path.join(rootDir, 'package.json');
-    if (!fs.existsSync(pckPath))
-        return [];
-    const results = [];
-    const pkg = JSON.parse(fs.readFileSync(pckPath));
-    if (name) {
-        results.push(...getProjectConfig(rootDir, pkg.cmmn[name], {
-            ...options,
-            name
-        }));
-    } else {
-        for (let name in pkg.cmmn) {
-            results.push(...getProjectConfig(rootDir, pkg.cmmn[name], {
-                ...options,
-                name
-            }));
-        }
-    }
-    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));
-}
+import {getConfigOptions} from "./getConfigs.js";
+import {ConfigCreator} from "./rollup.config.js";
 
-function getConfigs(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);
-    }
-    const creator = new ConfigCreator(options);
-    return creator.getConfig();
-}
 
 export async function bundle(...options) {
-    const configs = getConfigs({
+    const configOptions = getConfigOptions({
         input: options.filter(x => !x.startsWith('-'))[0],
         project: options.includes('-b'),
         minify: options.includes('--prod'),
         devServer: options.includes('--run'),
         stats: options.includes('--stats'),
     });
+    const configs = configOptions.flatMap(x => new ConfigCreator(x).getConfig());
     if (!options.includes('--watch')) {
         for (let config of configs) {
             for (let key in config.input){

package/bundle/getConfigs.js

@@ -0,0 +1,60 @@
+import fs from "fs";
+import path from "path";
+import fg from "fast-glob";
+
+function getProjectConfig(rootDir, cmmn, options) {
+    return {
+        ...options,
+        ...cmmn,
+        rootDir: rootDir
+    };
+}
+
+function getPackageConfigs(rootDir, options, name = null) {
+    const pckPath = path.join(rootDir, 'package.json');
+    if (!fs.existsSync(pckPath))
+        return [];
+    const results = [];
+    const pkg = JSON.parse(fs.readFileSync(pckPath));
+    if (name) {
+        results.push(getProjectConfig(rootDir, pkg.cmmn[name], {
+            ...options,
+            name
+        }));
+    } else {
+        for (let name in pkg.cmmn) {
+            results.push(getProjectConfig(rootDir, pkg.cmmn[name], {
+                ...options,
+                name
+            }));
+        }
+    }
+    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);
+    }
+    return [options];
+}

package/bundle/rollup.config.js

@@ -15,6 +15,7 @@ import json from '@rollup/plugin-json';
 import alias from '@rollup/plugin-alias';
 import replace from '@rollup/plugin-replace';
 import sourcemaps from 'rollup-plugin-sourcemaps';
+
 /**
  * @typedef {import(rollup).RollupOptions} RollupOptions
  * @typedef {import(rollup).OutputOptions} OutputOptions
@@ -48,12 +49,14 @@ export class ConfigCreator {
 
     constructor(options) {
         this.options = {
+            module: 'es',
+            external: [],
+            name: 'index',
+            outDir: 'dist/bundle',
             ...options
         };
-    }
-
-    setRootDir(rootDir) {
-        this.root = rootDir;
+        if (options.rootDir)
+            this.root = options.rootDir;
     }
 
     get outDir() {
@@ -100,14 +103,14 @@ export class ConfigCreator {
         return serve({
             open: false,
             contentBase: [this.outDir, path.join(this.root, 'assets')],
-            port: this.options.port ?? 3000,
+            port: this.options.port,
             historyApiFallback: true
         });
     }
 
     get livereload() {
         return livereload({
-            watch: [this.outDir, path.join(this.root, 'assets')],
+            watch: [this.outDir, path.join(this.root, 'assets'), this.options.html],
             verbose: false, // Disable console output
             // other livereload options
             port: 12345,
@@ -137,10 +140,7 @@ export class ConfigCreator {
                 dedupe: this.options.dedupe || []
             }),
             commonjs({
-                requireReturnsDefault: "namespace",
-                dynamicRequireTargets: [
-                    'node_modules/ulid/*.js'
-                ]
+                requireReturnsDefault: "namespace"
             }),
             sourcemaps(),
             builtins(),
@@ -199,7 +199,7 @@ export class ConfigCreator {
                 }
             }));
         }
-        if (this.options.devServer) {
+        if (this.options.devServer && this.options.port) {
             result.push(this.devServer, this.livereload);
         }
         return result;
@@ -217,12 +217,6 @@ export class ConfigCreator {
      * @returns {RollupOptions[]}
      */
     getConfig() {
-        Object.assign(this.options, {
-            module: this.options.module || 'es',
-            external: this.options.external || [],
-            name: this.options.name || 'index',
-            outDir: this.options.outDir || 'dist'
-        });
         if (this.options.external && typeof this.options.external === "string")
             this.options.external = [this.options.external]
         console.log(this.options.name, this.options);
@@ -251,6 +245,9 @@ export class ConfigCreator {
             },
             plugins: this.plugins,
             treeshake: this.options.minify ? "smallest" : "recommended",
+            watch: {
+                exclude: this.getExternals().concat(path.join(this.root, this.outDir)),
+            }
         }]
     }
 }

package/compile/tsconfig.json

@@ -10,8 +10,13 @@
     "checkJs": false,
     "outDir": "./dist/esm",
     "skipLibCheck": true,
+    "incremental": true,
+    "disableSolutionSearching": true,
+    "assumeChangesOnlyAffectDirectDependencies": true,
     "skipDefaultLibCheck": true,
     "allowJs": true,
+    "disableReferencedProjectLoad": true,
+    "disableSourceOfProjectReferenceRedirect": true,
     "allowSyntheticDefaultImports": true,
     "emitDecoratorMetadata": true ,
     "noEmitHelpers": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.6.6",
+  "version": "1.6.9",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -34,6 +34,7 @@
     "gen/*",
     "compile/*",
     "bundle/*",
+    "serve/*",
     "plugins/*",
     "test/*"
   ],
@@ -66,6 +67,7 @@
     "rollup-plugin-styles": "^4",
     "rollup-plugin-terser": "^7",
     "rollup-plugin-visualizer": "^5.5.4",
+    "servor": "4.x.x",
     "sinon": "10.x.x",
     "ts-jest": "27.x.x",
     "ttypescript": "1.5.13",
@@ -74,5 +76,5 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "bf25aab44ebf4d1400d2ba6130a0caddf42677e7"
+  "gitHead": "5b28fdf72e182a3c775b0012bb1c3248fc1955ec"
 }

package/plugins/absolute-plugin.cjs

@@ -8,7 +8,7 @@ function visitExportNode(exportNode, sourceFile) {
         return ;
     }
     const file = exportNode.moduleSpecifier?.text ?? exportNode.test;
-    if (!file)
+    if (!file || !file.startsWith('.'))
         return;
     const sourceFileDir = path.dirname(sourceFile.path);
     const abs = path.resolve(sourceFileDir, file);
@@ -28,7 +28,7 @@ function visitExportNode(exportNode, sourceFile) {
 
 function visitImportNode(importNode, sourceFile, options) {
     const file = importNode.moduleSpecifier?.text;
-    if (!file)
+    if (!file || !file.startsWith('.'))
         return;
     const sourceFileDir = path.dirname(sourceFile.path);
     const abs = path.resolve(sourceFileDir, file);

package/readme.md

@@ -28,4 +28,6 @@
             expect(1).toBe(2);
         }
     }
-    ```
+    ```
+* `cmmn serve [-b]`
+  serves bundled website (-b serves all websites in monorepo)

package/serve/serve.js

@@ -0,0 +1,21 @@
+import {getConfigOptions} from "../bundle/getConfigs.js";
+import servor from "servor";
+import {relative, join} from "path";
+
+export function serve(...options) {
+    const configs = getConfigOptions({
+        project: options.includes('-b'),
+    });
+    configs.filter(x => x.port).forEach(x => {
+        const root = relative(process.cwd(), join(x.rootDir, x.outDir));
+        console.log(`serve ${root} at localhost:${x.port}`);
+        servor({
+            root,
+            fallback: 'index.html',
+            reload: true,
+            port: x.port
+        })
+
+    })
+
+}