Proper cli setup and fixed bug

Author: CodeF0x

lib/main.js renamed to bin/main.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 const yargs = require('yargs');
 const { hideBin } = require('yargs/helpers');
 const { readFileSync } = require('fs');
@@ -8,7 +10,7 @@ const {
   listPastes,
   loginUser,
   logout,
-} = require('./api-functions.js');
+} = require('../lib/api-functions.js');
 
 let userToken;
 let apiToken;

lib/api-functions.js

@@ -118,15 +118,17 @@ async function createPaste(argv, apiToken, userToken) {
 
   const { file, string, format, visibility, expiry, folder, name } = argv;
 
+  if (!file && !string) {
+    return 'You need to supply either -f (--file) OR -s (--string)';
+  }
+
   if (!FORMAT_CHOICES.includes(format)) {
     return 'Error! Format option is not supported by pastebin. See https://pastebin.com/doc_api#8 for supported formats';
   }
 
   const mappedVisibility = mapToVisiblityCode(visibility);
   const pasteText = file ? readFileSync(file, 'utf-8').trim() : string;
 
-  console.log(name, pasteText);
-
   const response = await fetch(API_URLS.apiPost, {
     body: `api_dev_key=${apiToken}&api_user_key=${userToken}&api_option=paste&api_paste_code=${pasteText}&api_paste_name=${name}&api_paste_format=${format}&api_paste_private=${mappedVisibility}`,
     headers: {

package-lock.json

@@ -6,6 +6,13 @@
   "directories": {
     "lib": "lib"
   },
+  "bin": {
+    "pasty": "bin/main.js"
+  },
+  "files": [
+    "lib/",
+    "bin/"
+  ],
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --verbose --watch"
   },

package.json

@@ -123,7 +123,7 @@ describe('apiFunctions', () => {
       __setResponseText(responseText);
 
       const apiRes = await createPaste(
-        { format: 'text' },
+        { format: 'text', string: 'string' },
         'api token',
         'user token'
       );
@@ -159,24 +159,38 @@ describe('apiFunctions', () => {
       __setStatusCode(500);
 
       const apiRes = await createPaste(
-        { format: 'text' },
+        { format: 'text', string: 'string' },
         'api token',
         'user token'
       );
 
       expect(apiRes).toBe(`Error! ${responseText}`);
     });
 
-    it('should return error if fomit is not supported by pastebin', async () => {
+    it('should return error if format is not supported by pastebin', async () => {
+      const resonseText =
+        'Error! Format option is not supported by pastebin. See https://pastebin.com/doc_api#8 for supported formats';
+
       const apiRes = await createPaste(
-        { format: 'does not exist' },
+        { format: 'does not exist', string: 'string' },
         'api token',
         'user token'
       );
 
-      expect(apiRes).toBe(
-        'Error! Format option is not supported by pastebin. See https://pastebin.com/doc_api#8 for supported formats'
+      expect(apiRes).toBe(resonseText);
+    });
+
+    it('should return error if neither file or string are supplied', async () => {
+      const responseText =
+        'You need to supply either -f (--file) OR -s (--string)';
+
+      const apiRes = await createPaste(
+        { format: 'text' },
+        'api token',
+        'user token'
       );
+
+      expect(apiRes).toBe(responseText);
     });
   });