@pinata/sdk 2.0.0 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pinata/sdk",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "description": "Official SDK for the Pinata IPFS platform",
     "main": "lib/pinata-sdk.js",
     "types": "types/index.d.ts",
@@ -64,7 +64,6 @@
     },
     "dependencies": {
         "axios": "^0.21.1",
-        "base-path-converter": "^1.0.2",
         "form-data": "^2.3.3",
         "is-ipfs": "^0.6.0",
         "path": "^0.12.7"

package/src/commands/pinning/pinFromFS.ts

@@ -1,7 +1,6 @@
 
 import NodeFormData from 'form-data';
 
-import basePathConverter from 'base-path-converter';
 import { PinataConfig } from '../..';
 import {
     PinataPinOptions,
@@ -12,6 +11,16 @@ import fs from 'fs';
 
 import path from 'path';
 
+export function normalizePath(p: string) {
+    const splitPath = path.normalize(p).split(path.sep).filter(file => file.length > 0 && file !== '..');
+    let folderFile = splitPath;
+    if (splitPath.length > 1) {
+        folderFile = splitPath.slice(splitPath.length - 2);
+    }
+
+    return path.join.apply(null, folderFile);
+}
+
 export default async function pinFromFS(
     config: PinataConfig,
     sourcePath: string,
@@ -32,11 +41,12 @@ export default async function pinFromFS(
         }
             const files = await fs.promises.readdir(sourcePath);
             const data = new NodeFormData();
-
             files.forEach((file: string) => {
+
+                const filepath = path.join(sourcePath, file);
                 //for each file stream, we need to include the correct relative file path
-                data.append('file', fs.createReadStream(file), {
-                    filepath: basePathConverter(sourcePath, file)
+                data.append('file', fs.createReadStream(filepath), {
+                    filepath: normalizePath(filepath)
                 });
             });
 

package/src/index.ts

@@ -1,3 +1,4 @@
+import './require-babel-polyfill';
 import pinByHash, {
     PinataPinByHashPinOptions
 } from './commands/pinning/pinByHash';

package/src/require-babel-polyfill.ts

@@ -0,0 +1,5 @@
+export default (() => {
+    if (!global || !global._babelPolyfill) {
+        require('babel-polyfill');
+    }
+})();

package/src/third-party/global.d.ts

@@ -0,0 +1,9 @@
+export {};
+
+declare global {
+    namespace NodeJS {
+      interface Global {
+        _babelPolyfill: any;
+      }
+    }
+  }

package/test/commands/pinning/pinFromFS.ts

@@ -1,5 +1,7 @@
 import axios from 'axios';
-import pinFromFS from '../../../src/commands/pinning/pinFromFS';
+import pinFromFS, {
+    normalizePath
+} from '../../../src/commands/pinning/pinFromFS';
 jest.mock('axios');
 
 //common values
@@ -12,7 +14,12 @@ test('200 status is returned', () => {
     };
     (axios.post as jest.Mock).mockResolvedValue(goodStatus);
     expect.assertions(1);
-    expect(pinFromFS({ pinataApiKey: 'test', pinataSecretApiKey: 'test' }, testSource)).resolves.toEqual(goodStatus.data);
+    expect(
+        pinFromFS(
+            { pinataApiKey: 'test', pinataSecretApiKey: 'test' },
+            testSource
+        )
+    ).resolves.toEqual(goodStatus.data);
 });
 
 test('Result other than 200 status is returned', () => {
@@ -21,12 +28,44 @@ test('Result other than 200 status is returned', () => {
     };
     (axios.post as jest.Mock).mockResolvedValue(badStatus);
     expect.assertions(1);
-    expect(pinFromFS({ pinataApiKey: 'test', pinataSecretApiKey: 'test' }, testSource)).rejects.toEqual(Error(`unknown server response while pinning to IPFS: ${badStatus}`));
+    expect(
+        pinFromFS(
+            { pinataApiKey: 'test', pinataSecretApiKey: 'test' },
+            testSource
+        )
+    ).rejects.toEqual(
+        Error(`unknown server response while pinning to IPFS: ${badStatus}`)
+    );
 });
 
 test('Rejection handled', () => {
     (axios.post as jest.Mock).mockRejectedValue('test error');
     expect.assertions(1);
-    expect(pinFromFS({ pinataApiKey: 'test', pinataSecretApiKey: 'test' }, testSource)).rejects.toEqual('test error');
+    expect(
+        pinFromFS(
+            { pinataApiKey: 'test', pinataSecretApiKey: 'test' },
+            testSource
+        )
+    ).rejects.toEqual('test error');
 });
 
+test('normalize path', () => {
+    const useCases = [
+        {
+            start: '/Users/somebody/Documents//test-folder-issue/screen.png',
+            end: 'test-folder-issue/screen.png'
+        },
+
+        {
+            start: '../test/commands/data/pinlist-sample-api.ts',
+            end: 'data/pinlist-sample-api.ts'
+        },
+        { start: '../test/log.txt', end: 'test/log.txt' },
+        { start: './cat.pdf', end: 'cat.pdf' },
+        { start: '../cat.pdf', end: 'cat.pdf' }
+    ];
+
+    useCases.forEach((p) => {
+        expect(normalizePath(p.start)).toEqual(p.end);
+    });
+});

package/types/commands/pinning/pinFromFS.d.ts

@@ -1,3 +1,4 @@
 import { PinataConfig } from '../..';
 import { PinataPinOptions, PinataPinResponse } from './pinFileToIPFS';
+export declare function normalizePath(p: string): string;
 export default function pinFromFS(config: PinataConfig, sourcePath: string, options?: PinataPinOptions): Promise<PinataPinResponse>;

package/types/index.d.ts

@@ -1,3 +1,4 @@
+import './require-babel-polyfill';
 import { PinataPinByHashPinOptions } from './commands/pinning/pinByHash';
 import { PinataPinOptions } from './commands/pinning/pinFileToIPFS';
 import { PinataPinJobsFilterOptions } from './commands/pinning/pinJobs/pinJobs';

package/types/require-babel-polyfill.d.ts

@@ -0,0 +1,2 @@
+declare const _default: void;
+export default _default;

package/webpack.config.js

@@ -16,7 +16,7 @@ module.exports = (env) => {
     }
     return {
         mode: mode,
-        entry: ['babel-polyfill', __dirname + '/src/index.ts'],
+        entry: [ __dirname + '/src/index.ts'],
         devtool: 'inline-source-map',
         output: {
             path: __dirname + '/lib',