@git.zone/tsbundle 2.5.2 → 2.6.0

package/ts/mod_rspack/index.child.ts

@@ -11,14 +11,23 @@ export class TsBundleProcess {
   public async getAliases() {
     try {
       const aliasObject: Record<string, string> = {};
-      const localTsConfig = plugins.smartfile.fs.toObjectSync(
-        plugins.path.join(paths.cwd, 'tsconfig.json')
-      );
-      if (localTsConfig.compilerOptions && localTsConfig.compilerOptions.paths) {
+      const tsconfigPath = plugins.path.join(paths.cwd, 'tsconfig.json');
+      const tsconfigContent = await plugins.fs
+        .file(tsconfigPath)
+        .encoding('utf8')
+        .read();
+      const localTsConfig = JSON.parse(tsconfigContent as string);
+      if (
+        localTsConfig.compilerOptions &&
+        localTsConfig.compilerOptions.paths
+      ) {
         for (const alias of Object.keys(localTsConfig.compilerOptions.paths)) {
           const aliasPath = localTsConfig.compilerOptions.paths[alias][0];
           // Convert TypeScript path to absolute path for rspack
-          aliasObject[alias.replace('/*', '')] = plugins.path.resolve(paths.cwd, aliasPath.replace('/*', ''));
+          aliasObject[alias.replace('/*', '')] = plugins.path.resolve(
+            paths.cwd,
+            aliasPath.replace('/*', ''),
+          );
         }
       }
       return aliasObject;
@@ -34,7 +43,7 @@ export class TsBundleProcess {
     const aliases = await this.getAliases();
     const outputDir = plugins.path.dirname(toArg);
     const outputFilename = plugins.path.basename(toArg);
-    
+
     const config = {
       mode: 'development' as const,
       entry: {
@@ -96,13 +105,15 @@ export class TsBundleProcess {
           return;
         }
 
-        console.log(stats.toString({
-          colors: true,
-          modules: false,
-          children: false,
-          chunks: false,
-          chunkModules: false,
-        }));
+        console.log(
+          stats.toString({
+            colors: true,
+            modules: false,
+            children: false,
+            chunks: false,
+            chunkModules: false,
+          }),
+        );
 
         resolve(undefined);
       });
@@ -116,11 +127,11 @@ export class TsBundleProcess {
     console.log('rspack specific:');
     console.log(`from: ${fromArg}`);
     console.log(`to: ${toArg}`);
-    
+
     const aliases = await this.getAliases();
     const outputDir = plugins.path.dirname(toArg);
     const outputFilename = plugins.path.basename(toArg);
-    
+
     const config = {
       mode: 'production' as const,
       entry: {
@@ -192,13 +203,15 @@ export class TsBundleProcess {
           return;
         }
 
-        console.log(stats.toString({
-          colors: true,
-          modules: false,
-          children: false,
-          chunks: false,
-          chunkModules: false,
-        }));
+        console.log(
+          stats.toString({
+            colors: true,
+            modules: false,
+            children: false,
+            chunks: false,
+            chunkModules: false,
+          }),
+        );
 
         resolve(undefined);
       });
@@ -209,7 +222,7 @@ export class TsBundleProcess {
 const run = async () => {
   console.log('running spawned compilation process');
   const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(
-    process.env.transportOptions
+    process.env.transportOptions,
   );
   console.log('=======> RSPACK');
   console.log(transportOptions);
@@ -219,18 +232,30 @@ const run = async () => {
   if (transportOptions.mode === 'test') {
     console.log('building for test:');
     await tsbundleProcessInstance.buildTest(
-      plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()),
-      plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()),
-      transportOptions.argv
+      plugins.smartpath.transform.makeAbsolute(
+        transportOptions.from,
+        process.cwd(),
+      ),
+      plugins.smartpath.transform.makeAbsolute(
+        transportOptions.to,
+        process.cwd(),
+      ),
+      transportOptions.argv,
     );
   } else {
     console.log('building for production:');
     await tsbundleProcessInstance.buildProduction(
-      plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()),
-      plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()),
-      transportOptions.argv
+      plugins.smartpath.transform.makeAbsolute(
+        transportOptions.from,
+        process.cwd(),
+      ),
+      plugins.smartpath.transform.makeAbsolute(
+        transportOptions.to,
+        process.cwd(),
+      ),
+      transportOptions.argv,
     );
   }
 };
 
-run();
+run();

package/ts/mod_rspack/plugins.ts

@@ -2,4 +2,4 @@ export * from '../plugins.js';
 
 import { rspack } from '@rspack/core';
 
-export { rspack }
+export { rspack };

package/ts/paths.ts

@@ -3,7 +3,7 @@ import * as plugins from './plugins.js';
 export const cwd = process.cwd();
 export const packageDir = plugins.path.join(
   plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
-  '../'
+  '../',
 );
 export const htmlDir = plugins.path.join(cwd, './html');
 export const distServeDir = plugins.path.join(cwd, './dist_serve');

package/ts/plugins.ts

@@ -5,7 +5,7 @@ export { path };
 
 // pushrocks scope
 import * as smartcli from '@push.rocks/smartcli';
-import * as smartfile from '@push.rocks/smartfile';
+import * as smartfs from '@push.rocks/smartfs';
 import * as smartlog from '@push.rocks/smartlog';
 import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
 import * as smartpath from '@push.rocks/smartpath';
@@ -14,10 +14,13 @@ import * as smartspawn from '@push.rocks/smartspawn';
 
 export {
   smartcli,
-  smartfile,
+  smartfs,
   smartlog,
   smartlogDestinationLocal,
   smartpath,
   smartpromise,
   smartspawn,
 };
+
+// Create a shared SmartFs instance using Node provider
+export const fs = new smartfs.SmartFs(new smartfs.SmartFsProviderNode());

package/ts/tsbundle.class.tsbundle.ts

@@ -3,12 +3,11 @@ import * as interfaces from './interfaces/index.js';
 import { logger } from './tsbundle.logging.js';
 
 export class TsBundle {
-
   public async build(
     cwdArg: string,
     fromArg: string = './ts_web/index.ts',
     toArg: string = './dist_bundle/bundle.js',
-    argvArg: interfaces.ICliOptions
+    argvArg: interfaces.ICliOptions,
   ) {
     const done = plugins.smartpromise.defer();
     const getBundlerPath = () => {
@@ -21,20 +20,20 @@ export class TsBundle {
         default:
           return './mod_esbuild/index.child.js';
       }
-    }
+    };
     const transportOptions: interfaces.IEnvTransportOptions = {
       cwd: cwdArg,
       from: fromArg,
       to: toArg,
       mode: argvArg && argvArg.production ? 'production' : 'test',
-      argv:  {
-        ...argvArg
-      } 
-    }
+      argv: {
+        ...argvArg,
+      },
+    };
     const threadsimple = new plugins.smartspawn.ThreadSimple(
       plugins.path.join(
         plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
-        getBundlerPath()
+        getBundlerPath(),
       ),
       [],
       {
@@ -42,7 +41,7 @@ export class TsBundle {
           ...process.env,
           transportOptions: JSON.stringify(transportOptions),
         },
-      }
+      },
     );
     const childProcess = await threadsimple.start();
     childProcess.on('exit', (status) => {

package/ts/tsbundle.cli.ts

@@ -18,7 +18,7 @@ export const runCli = async () => {
       process.cwd(),
       './ts_web/index.ts',
       './dist_bundle/bundle.js',
-      argvArg
+      argvArg,
     );
   });
 
@@ -29,7 +29,7 @@ export const runCli = async () => {
       process.cwd(),
       './ts/index.ts',
       './dist_bundle/bundle.js',
-      argvArg
+      argvArg,
     );
   });
 
@@ -42,9 +42,18 @@ export const runCli = async () => {
       process.cwd(),
       './ts_web/index.ts',
       './dist_serve/bundle.js',
-      argvArg
+      argvArg,
     );
-    const htmlFiles = await plugins.smartfile.fs.listFiles('./html', /\.html/);
+    const htmlDirPath = plugins.path.join(process.cwd(), './html');
+    let htmlFiles: string[] = [];
+    const htmlDirExists = await plugins.fs.directory(htmlDirPath).exists();
+    if (htmlDirExists) {
+      const entries = await plugins.fs
+        .directory(htmlDirPath)
+        .filter(/\.html$/)
+        .list();
+      htmlFiles = entries.map((entry) => entry.path);
+    }
     for (const htmlFile of htmlFiles) {
       await htmlHandler.processHtml({
         from: `./html/${htmlFile}`,

package/ts/tsbundle.logging.ts

@@ -12,4 +12,6 @@ export const logger = new plugins.smartlog.Smartlog({
   minimumLogLevel: 'silly',
 });
 
-logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());
+logger.addLogDestination(
+  new plugins.smartlogDestinationLocal.DestinationLocal(),
+);