@cmmn/tools 1.9.7 → 1.9.10

package/bundle/esbuild.config.js

@@ -59,7 +59,7 @@ export class ConfigCreator {
         return JSON.stringify({
             imports: Object.fromEntries(this.options.external
                 .map(key => key.replace('*', '/'))
-                .map(key => [key, `/external/${this.options.alias?.[key] ?? key}`]))
+                .map(key => [key, `/node_modules/${this.options.alias?.[key] ?? key}`]))
         })
     }
     getHtmlPlugin(){
@@ -137,6 +137,9 @@ export class ConfigCreator {
             outExtension: {
                 '.js': this.getOutExtension(format, platform)
             },
+            footer:{
+                js: `//# sourceMappingURL=./${this.options.name}.js.map`
+            },
             platform: platform,
             tsconfig: 'tsconfig.json',
             external: [

package/helpers/getTSConfig.js

@@ -0,0 +1,19 @@
+import ts from "typescript";
+
+export function getTSConfig(directory = process.cwd()) {
+    const configPath = ts.findConfigFile(directory, ts.sys.fileExists, 'tsconfig.json');
+    const readConfigFileResult = ts.readConfigFile(configPath, ts.sys.readFile);
+    if (readConfigFileResult.error) {
+        throw readConfigFileResult.error;
+    }
+    return readConfigFileResult.config;
+}
+
+export function getTSCompilerOptions(directory = process.cwd()) {
+    const jsonConfig = getTSConfig(directory);
+    const convertResult = ts.convertCompilerOptionsFromJson(jsonConfig.compilerOptions, './');
+    if (convertResult.errors && convertResult.errors.length > 0) {
+        throw convertResult.errors;
+    }
+    return convertResult.options;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.9.7",
+  "version": "1.9.10",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -10,7 +10,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {},
   "bin": {
     "cmmn": "bin.js"
   },
@@ -38,7 +37,8 @@
     "serve/*",
     "plugins/*",
     "spawn/*",
-    "test/*"
+    "test/*",
+    "helpers/*"
   ],
   "dependencies": {
     "@jest/globals": "27.x.x",
@@ -63,5 +63,6 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "2755b333808bf97f1d9454601c2a2c9a88e4a021"
-}
+  "gitHead": "2755b333808bf97f1d9454601c2a2c9a88e4a021",
+  "scripts": {}
+}

package/serve/serve.js

@@ -20,8 +20,8 @@ export async function serve(...options) {
             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`)])),
+            // .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)
         });
@@ -30,9 +30,9 @@ export async function serve(...options) {
 
 }
 function getModuleName(path) {
-    if (!path.startsWith('/external/'))
+    if (!path.startsWith('/node_modules/'))
         return null;
-    return  path.substring('/external/'.length);
+    return  path.substring('/node_modules/'.length);
 }
 
 const mappingCache = {};
@@ -41,7 +41,7 @@ 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]));
+            return moduleResolve(module, root, new Set([condition]), true);
         }catch (e){
         }
     }
@@ -53,12 +53,13 @@ async function getFileName(moduleName, root) {
     if (moduleName in mappingCache)
         return mappingCache[moduleName];
     let file;
-    if (moduleName.match('\.[cm]?js')) {
+    if (moduleName.match('\.[cm]?js(.map)?$')) {
         const module = moduleName.match(/^(@[^/]+\/)?[^/]+/)[0];
         const main = await resolveModule(module, root);
         const file = main.href.replace(new RegExp('node_modules/' + module + '.*$'), 'node_modules/' + moduleName);
         return mappingCache[moduleName] = file;
     } else {
+        console.log(moduleName, root);
         const file = await resolveModule(moduleName, root);
         return mappingCache[moduleName] = file.href;
     }
@@ -66,20 +67,24 @@ async function getFileName(moduleName, root) {
 const resolveESModule = (rootDir, configs) => async function (req, res, next) {
     const name = getModuleName(req.url);
     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
-        ? await getFileName(refererModule, 'file://' + rootDir + '/package.json')
-        : 'file://' + rootDir + '/package.json';
+    const root = 'file://' + process.cwd() + '/package.json';
     try {
-        const file = uri2path(await getFileName(name, root));
-        var stat = fs.statSync(file);
-        console.info(`Resolve ${name} to ${file}`)
+        const uri = await getFileName(name, root);
+        const file = uri2path(uri);
+        const stat = fs.statSync(file);
+        const relative = path.relative(rootDir, file).replace(/^.*\/node_modules/, '/node_modules');
+        if (req.url !== relative){
+            mappingCache[getModuleName(relative)] = uri;
+            res.writeHead(302, {
+                Location: relative
+            });
+            res.end();
+            return;
+        }
         res.writeHead(200, {
             'Content-Type': 'application/javascript',
             'Content-Length': stat.size