4.0.32

dist_ts/index.d.ts

@@ -1 +1,4 @@
 export * from './classes.smartarchive.js';
+export * from './classes.tartools.js';
+export * from './classes.ziptools.js';
+export * from './classes.gziptools.js';

dist_ts/index.js

@@ -1,2 +1,5 @@
 export * from './classes.smartarchive.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDJCQUEyQixDQUFDIn0=
+export * from './classes.tartools.js';
+export * from './classes.ziptools.js';
+export * from './classes.gziptools.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDJCQUEyQixDQUFDO0FBQzFDLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLHdCQUF3QixDQUFDIn0=

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartarchive",
-  "version": "4.0.26",
+  "version": "4.0.32",
   "description": "A library for working with archive files, providing utilities for compressing and decompressing data.",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartarchive',
-  version: '4.0.26',
+  version: '4.0.32',
   description: 'A library for working with archive files, providing utilities for compressing and decompressing data.'
 }

ts/classes.gziptools.ts

@@ -43,10 +43,7 @@ export class DecompressGunzipTransform extends plugins.stream.Transform {
 
 
 export class GzipTools {
-  smartArchiveRef: SmartArchive;
-
-  constructor(smartArchiveRefArg: SmartArchive) {
-    this.smartArchiveRef = smartArchiveRefArg;
+  constructor() {
   }
 
   public getCompressionStream() {

ts/classes.smartarchive.ts

@@ -33,10 +33,10 @@ export class SmartArchive {
   }
 
   // INSTANCE
-  public gzipTools = new GzipTools(this);
+  public tarTools = new TarTools();
+  public zipTools = new ZipTools();
+  public gzipTools = new GzipTools();
   public bzip2Tools = new Bzip2Tools(this);
-  public tarTools = new TarTools(this);
-  public zipTools = new ZipTools(this);
   public archiveAnalyzer = new ArchiveAnalyzer(this);
 
   public sourceUrl: string;

ts/classes.tartools.ts

@@ -3,11 +3,7 @@ import * as plugins from './plugins.js';
 
 export class TarTools {
   // INSTANCE
-  smartArchiveRef: SmartArchive;
-
-  constructor(smartArchiveRefArg: SmartArchive) {
-    this.smartArchiveRef = smartArchiveRefArg;
-  }
+  constructor() {}
 
   // packing
   public async addFileToPack(
@@ -55,6 +51,22 @@ export class TarTools {
         contentByteLength = fileStat.size;
       }
 
+      /**
+       * here we try to harmonize all kind of entries towards a readable stream
+       */
+      let content: plugins.smartstream.stream.Readable;
+      if (Buffer.isBuffer(optionsArg.content)) {
+        content = plugins.smartstream.stream.Readable.from(optionsArg.content);
+      } else if (typeof optionsArg.content === 'string') {
+        content = plugins.smartstream.stream.Readable.from(Buffer.from(optionsArg.content));
+      } else if (optionsArg.content instanceof plugins.smartfile.SmartFile) {
+        content = plugins.smartstream.stream.Readable.from(optionsArg.content.contents);
+      } else if (optionsArg.content instanceof plugins.smartfile.StreamFile) {
+        content = await optionsArg.content.createReadStream();
+      } else if (optionsArg.content instanceof plugins.smartstream.stream.Readable) {
+        content = optionsArg.content;
+      }
+
       const entry = pack.entry(
         {
           name: fileName,
@@ -73,19 +85,6 @@ export class TarTools {
         }
       );
 
-      let content: plugins.smartstream.stream.Readable;
-      if (Buffer.isBuffer(optionsArg.content)) {
-        content = plugins.smartstream.stream.Readable.from(optionsArg.content);
-      } else if (typeof optionsArg.content === 'string') {
-        content = plugins.smartstream.stream.Readable.from(Buffer.from(optionsArg.content));
-      } else if (optionsArg.content instanceof plugins.smartfile.SmartFile) {
-        content = plugins.smartstream.stream.Readable.from(optionsArg.content.contents);
-      } else if (optionsArg.content instanceof plugins.smartfile.StreamFile) {
-        content = await optionsArg.content.createReadStream();
-      } else if (optionsArg.content instanceof plugins.smartstream.stream.Readable) {
-        content = optionsArg.content;
-      }
-
       content.pipe(entry);
       entry.on('end', () => {
         resolve();
@@ -110,6 +109,7 @@ export class TarTools {
         content: plugins.smartfile.fsStream.createReadStream(absolutePath),
       });
     }
+    return pack;
   }
 
   public async getPackStream() {

ts/classes.ziptools.ts

@@ -61,10 +61,7 @@ export class CompressZipTransform extends plugins.stream.Transform {
 }
 
 export class ZipTools {
-  smartArchiveRef: SmartArchive;
-
-  constructor(smartArchiveRefArg: SmartArchive) {
-    this.smartArchiveRef = smartArchiveRefArg;
+  constructor() {
   }
 
   public getCompressionStream() {

ts/index.ts

@@ -1 +1,4 @@
 export * from './classes.smartarchive.js';
+export * from './classes.tartools.js';
+export * from './classes.ziptools.js';
+export * from './classes.gziptools.js';