@cmmn/tools 1.9.3 → 1.9.6

package/bundle/bundle.js

@@ -5,7 +5,7 @@ import fs from "fs";
 import path, {relative} from "path";
 
 export async function bundle(...options) {
-    const configOptions = getConfigOptions({
+    const configOptions = await getConfigOptions({
         input: options.filter(x => !x.startsWith('-'))[0],
         project: options.includes('-b'),
         minify: options.includes('--prod'),
@@ -13,14 +13,16 @@ export async function bundle(...options) {
         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) {

package/bundle/esbuild.config.js

@@ -54,6 +54,13 @@ export class ConfigCreator {
         return path.join(this.root, this.options.outDir);
     }
 
+    get importMaps(){
+        return JSON.stringify({
+            imports: Object.fromEntries(this.options.external
+                .map(key => key.replace('*', '/'))
+                .map(key => [key, `/external/${this.options.alias?.[key] ?? key}`]))
+        })
+    }
     getHtmlPlugin(){
         if (!this.options.html)
             return [];
@@ -61,21 +68,26 @@ export class ConfigCreator {
             {
                 name: 'esbuild-html-plugin',
                 setup: (build) => { build.onEnd(async result => {
-                    const inject = [
+                    if (!result.metafile)
+                        return;
+                    const injectStyles = [];
+                    const injectScripts = [
                         `<script type="importmap">${this.importMaps}</script>`
                     ];
                     for (let [key, value] of Object.entries(result.metafile.outputs)){
                         if (value.entryPoint !== this.options.input) continue;
                         const file = path.relative(this.outDir, path.join(this.root, key));
-                        inject.push(`<script type="module" src="/${file}"/>`)
+                        injectScripts.push(`<script type="module" src="/${file}"></script>`)
                         if (value.cssBundle) {
                             const file = path.relative(this.outDir, path.join(this.root, value.cssBundle));
-                            inject.push(`<style rel="stylesheet" href="/${file}"/>`)
+                            injectStyles.push(`<link rel="stylesheet" href="/${file}"></link>`)
                         }
                         const html = await fs.promises.readFile(path.join(this.root, this.options.html));
                         await fs.promises.writeFile(
                             path.join(this.outDir, 'index.html'),
-                            html.toString().replace('</head>', `${inject.map(x => `\t${x}\n`).join('')}</head>`)
+                            html.toString()
+                                .replace('</head>', `${injectStyles.map(x => `\t${x}\n`).join('')}</head>`)
+                                .replace('</body>', `${injectScripts.map(x => `\t${x}\n`).join('')}</body>`)
                         );
                     }
                 }); }
@@ -105,14 +117,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: true,
+            sourcemap: this.options.minify ? false : 'external',
             target: ['chrome88', 'safari14', 'firefox88'],
             outdir: 'dist/bundle',
             metafile: true,
@@ -126,7 +138,10 @@ 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"'
             },

package/bundle/getConfigs.js

@@ -1,6 +1,7 @@
 import fs from "fs";
 import path from "path";
 import fg from "fast-glob";
+import { dependencyOrder } from "dependency-order";
 
 function getProjectConfig(rootDir, cmmn, options) {
     return {
@@ -10,21 +11,15 @@ function getProjectConfig(rootDir, cmmn, options) {
     };
 }
 
-function getPackageConfigs(rootDir, options, name = null) {
+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 packageInfos = await dependencyOrder({
+        cwd: rootDir
+    });
     if (pkg.cmmn) {
         if (name) {
             results.push(getProjectConfig(rootDir, pkg.cmmn[name], {
@@ -42,32 +37,24 @@ function getPackageConfigs(rootDir, options, name = null) {
             }
         }
     }
+    for (let packageInfo of packageInfos) {
+        const root = packageInfo.packageMeta.directory;
+        if (visited.includes(root))
+            continue;
+        visited.push(root)
+        const configs = await getPackageConfigs(root, options, name, visited);
+        results.push(...configs);
+    }
     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) {
+export async 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);
+        return await getPackageConfigs(process.cwd(), options);
     }
     if (!options.input.includes('.') || !fs.existsSync(options.input)) {
-        return getPackageConfigs(process.cwd(), options, options.input);
+        return await getPackageConfigs(process.cwd(), options, options.input);
     }
     return [options];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.9.3",
+  "version": "1.9.6",
   "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": "5b83506f4132e1876b5573f7245d8bc759fcb92d"
+  "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) => {
@@ -17,10 +17,11 @@ export function serve(...options) {
             file: 'index.html',
             port: process.env.PORT ? (+process.env.PORT + i) : x.port,
             open: false,
+            watch: configs.map(x => path.join(x.rootDir, x.outDir ?? 'dist/bundle')).join(','),
             mount: x.mount && Object.entries(x.mount)
-                .map(([from, to]) => [from, path.resolve(x.rootDir, to)])
-                .concat(configs.map(x => [`/external/${x.package}`,
-                    path.join(x.rootDir, x.outDir ?? `dist/bundle/${x.name}.js`)])),
+                .map(([from, to]) => [from, path.resolve(x.rootDir, to)]),
+                // .concat(configs.map(x => [`/external/${x.package}`,
+                //     path.join(x.rootDir, x.outDir ?? `dist/bundle/${x.name}.js`)])),
             proxy: Object.entries(x.proxy ?? {}),
             middleware: [resolveESModule(x.rootDir, configs)].filter(x => x)
         });
@@ -36,6 +37,16 @@ function getModuleName(path) {
 
 const mappingCache = {};
 
+async function resolveModule(module, root){
+    const conditions = ['browser', 'main', 'module', 'import', 'node', 'default'];
+    for (let condition of conditions) {
+        try {
+            return moduleResolve(module, root, new Set([condition]));
+        }catch (e){
+        }
+    }
+    throw new Error(`Failed resolve ${module} from ${root}`);
+}
 // for resolve modules and files inside modules
 async function getFileName(moduleName, root) {
     // console.log(moduleName, root);
@@ -44,21 +55,22 @@ async function getFileName(moduleName, root) {
     let file;
     if (moduleName.match('\.[cm]?js')) {
         const module = moduleName.match(/^(@[^/]+\/)?[^/]+/)[0];
-        const main = (await moduleResolve(module, root, new Set(['module', 'import', 'browser', 'main', 'node'])));
+        const main = await resolveModule(module, root);
         const file = main.href.replace(new RegExp('node_modules/' + module + '.*$'), 'node_modules/' + moduleName);
-        console.log(file)
         return mappingCache[moduleName] = file;
     } else {
-        const file = (await moduleResolve(moduleName, root, new Set(['module', 'import', 'browser', 'main', 'node'])));
+        const file = await resolveModule(moduleName, root);
         return mappingCache[moduleName] = file.href;
     }
 }
 const resolveESModule = (rootDir, configs) => async function (req, res, next) {
     const name = getModuleName(req.url);
-    if (!name)
-        return next();
-    if (configs.some(x => x.package === name))
+    if (!name) {
+        console.log(`skip ${req.url}`)
         return next();
+    }
+    // if (configs.some(x => x.package === name))
+    //     return next();
     const referer = req.headers.referer?.substring(req.headers.origin.length);
     const refererModule = referer && getModuleName(referer);
     const root = refererModule
@@ -67,7 +79,7 @@ const resolveESModule = (rootDir, configs) => async function (req, res, next) {
     try {
         const file = uri2path(await getFileName(name, root));
         var stat = fs.statSync(file);
-
+        console.info(`Resolve ${name} to ${file}`)
         res.writeHead(200, {
             'Content-Type': 'application/javascript',
             'Content-Length': stat.size