3.0.0

package.json

@@ -1,9 +1,10 @@
 {
   "name": "@pushrocks/smartarchive",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "description": "work with archives",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
     "test": "(tstest test/ --web)",
     "build": "tsbuild  --web"
@@ -19,23 +20,23 @@
   },
   "homepage": "https://github.com/pushrocks/smartarchive#readme",
   "dependencies": {
-    "@pushrocks/smartfile": "^8.0.9",
-    "@pushrocks/smartpath": "^4.0.3",
-    "@pushrocks/smartrequest": "^1.1.51",
-    "@pushrocks/smartrx": "^2.0.19",
+    "@pushrocks/smartfile": "^9.0.6",
+    "@pushrocks/smartpath": "^5.0.5",
+    "@pushrocks/smartrequest": "^1.1.56",
+    "@pushrocks/smartrx": "^2.0.25",
     "@pushrocks/smartunique": "^3.0.3",
-    "@pushrocks/streamfunction": "^2.0.1",
+    "@pushrocks/streamfunction": "^4.0.1",
     "@types/gunzip-maybe": "^1.4.0",
-    "@types/tar": "^4.0.4",
-    "@types/tar-stream": "^2.2.0",
+    "@types/tar": "^6.1.1",
+    "@types/tar-stream": "^2.2.2",
     "gunzip-maybe": "^1.4.2",
-    "tar": "^6.1.0",
+    "tar": "^6.1.11",
     "tar-stream": "^2.2.0"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.2.14",
+    "@gitzone/tsbuild": "^2.1.61",
+    "@gitzone/tstest": "^1.0.70",
+    "@pushrocks/tapbundle": "^5.0.3",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },

test/test.ts

@@ -1,6 +1,7 @@
 import { tap, expect } from '@pushrocks/tapbundle';
 
 import * as path from 'path';
+import * as smartpath from '@pushrocks/smartpath';
 import * as smartfile from '@pushrocks/smartfile';
 import * as smartrequest from '@pushrocks/smartrequest';
 
@@ -11,11 +12,11 @@ const testPlugins = {
 };
 
 const testPaths = {
-  nogitDir: testPlugins.path.join(__dirname, '../.nogit/'),
-  remoteDir: testPlugins.path.join(__dirname, '../.nogit/remote'),
+  nogitDir: testPlugins.path.join(smartpath.get.dirnameFromImportMetaUrl(import.meta.url), '../.nogit/'),
+  remoteDir: testPlugins.path.join(smartpath.get.dirnameFromImportMetaUrl(import.meta.url), '../.nogit/remote'),
 };
 
-import * as smartarchive from '../ts/index';
+import * as smartarchive from '../ts/index.js';
 
 tap.preTask('should prepare .nogit dir', async () => {
   await testPlugins.smartfile.fs.ensureDir(testPaths.remoteDir);
@@ -60,23 +61,35 @@ tap.test('should extract a package using tarStream', async (tools) => {
   const extractionFileObservable = await testSmartarchive.extractArchiveFromBufferToObservable(
     testTgzBuffer
   );
-  const subscription = extractionFileObservable.subscribe(file => {
-    console.log(file.path);
-  });
-  await tools.delayFor(2000);
-  done.resolve();
+  const subscription = extractionFileObservable.subscribe(
+    (file) => {
+      console.log(file.path);
+    },
+    (err) => {
+      console.log(err);
+    },
+    () => {
+      done.resolve();
+    }
+  );
   await done.promise;
 });
 
 tap.test('should extract a file from url to replaySubject', async (tools) => {
   const done = tools.defer();
   const testSmartarchive = new smartarchive.SmartArchive();
-  const extractionFileObservable = await testSmartarchive.extractArchiveFromUrlToObservable('https://verdaccio.lossless.one/@pushrocks%2fwebsetup/-/websetup-2.0.14.tgz');
-  const subscription = extractionFileObservable.subscribe(file => {
+  const extractionFileObservable = await testSmartarchive.extractArchiveFromUrlToObservable(
+    'https://verdaccio.lossless.one/@pushrocks%2fwebsetup/-/websetup-2.0.14.tgz'
+  );
+  const subscription = extractionFileObservable.subscribe((file) => {
     console.log(file.path);
+  },
+  (err) => {
+    console.log(err);
+  },
+  () => {
+    done.resolve();
   });
-  await tools.delayFor(2000);
-  done.resolve();
   await done.promise;
 });
 

ts/index.ts

@@ -1 +1 @@
-export * from './smartarchive.classes.smartarchive';
+export * from './smartarchive.classes.smartarchive.js';

ts/smartarchive.classes.smartarchive.ts

@@ -1,5 +1,5 @@
-import * as plugins from './smartarchive.plugins';
-import * as paths from './smartarchive.paths';
+import * as plugins from './smartarchive.plugins.js';
+import * as paths from './smartarchive.paths.js';
 import { extract } from 'tar';
 
 export class SmartArchive {
@@ -12,6 +12,7 @@ export class SmartArchive {
   public async extractArchiveFromUrlToFs(urlArg: string, targetDir: string) {
     const parsedPath = plugins.path.parse(urlArg);
     const uniqueFileName = plugins.smartunique.uni() + parsedPath.ext;
+    plugins.smartfile.fs.ensureDir(paths.nogitDir); // TODO: totally remove caching needs
     const downloadPath = plugins.path.join(paths.nogitDir, uniqueFileName);
     const downloadedArchive = (await plugins.smartrequest.getBinary(urlArg)).body;
     await plugins.smartfile.memory.toFs(downloadedArchive, downloadPath);
@@ -68,7 +69,7 @@ export class SmartArchive {
       stream.resume();
     });
     extractPipeStop.on('finish', () => {
-      replaySubject.unsubscribe();
+      replaySubject.complete();
     });
     // lets run the stream
     readableStream

ts/smartarchive.paths.ts

@@ -1,5 +1,4 @@
-import * as plugins from './smartarchive.plugins';
+import * as plugins from './smartarchive.plugins.js';
 
-export const packageDir = plugins.path.join(__dirname, '../');
-export const nogitDir = plugins.path.join(__dirname, './.nogit');
-plugins.smartfile.fs.ensureDir(nogitDir);
+export const packageDir = plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), '../');
+export const nogitDir = plugins.path.join(packageDir, './.nogit');

ts/smartarchive.plugins.ts

@@ -1,5 +1,5 @@
 // node native scope
-import path from 'path';
+import * as path from 'path';
 
 export { path };
 

tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext"
+  }
+}