FIX: isset function usage & abstract class constructors

Author: MCStreetguy

lib/icon-helper.js

@@ -13,13 +13,11 @@ export default {
 
   activate(state) {
     this.storage = new Storage({dir: '/storage/snippet-injector/snippets/'});
-    console.warn(this.storage.storageDir);
-    console.warn(this.storage.dir);
     this.storage.migrate();
 
-    // Events subscribed to in atom's system can be easily cleaned up with a CompositeDisposable
+    new IconHelper();
+
     this.subscriptions = new CompositeDisposable();
-    // Register command that toggles this view
     this.subscriptions.add(atom.commands.add('atom-workspace', {
       'snippet-injector:create': () => this.create(),
       'snippet-injector:insert': () => this.insert(),
@@ -44,7 +42,7 @@ export default {
     var uid = Util.generateUID({
       unique: true,
       tester: storage.testFile,
-      timeout: 25,
+      timeout: 100,
       length: 20,
       prefix: 'sn',
       insertstring: 'SNIPPET'
@@ -54,7 +52,7 @@ export default {
       btnconfirm: 'Save snippet',
       btncancel: 'Cancel'
     },function(text){
-      if(text !== null && text !== undefined) {
+      if(Util.isset(text,'string')) {
         var result = storage.store(new Snippet({
           title: text,
           tags: new Array(),
@@ -91,7 +89,7 @@ export default {
         nothingfound: 'No Snippets found that match you search.',
         icons: icons
       },function(element) {
-        if(element !== null && element !== undefined) {
+        if(Util.isset(element,'string')) {
           var snippet = new Snippet(JSON.parse(storage.retrieveFile(element)));
           atom.workspace.getActiveTextEditor().insertText(snippet.getContent(),{
             select: true,
@@ -128,7 +126,7 @@ export default {
         suremsg: 'Are you sure?',
         items: items
       },function(element) {
-        if(element !== null && element !== undefined) {
+        if(Util.isset(element,'string')) {
           var snippet = new Snippet(JSON.parse(storage.retrieveFile(element)));
           if(storage.deleteFile(snippet.getUID())) {
             atom.notifications.addSuccess('Snippet \''+snippet.getTitle()+'\' was successfully deleted.', null);

lib/snippet-injector.js

@@ -4,16 +4,16 @@ import { dirname } from 'path';
 import Snippet from './snippet.js';
 import Util from './util.js';
 const fs = require('fs');
-const os = require('os');
+// const os = require('os');
 
 export default class Storage {
 
   dir = '';
   storageDir = dirname(atom.config.getUserConfigPath());
 
   constructor(state) {
-    if(state !== undefined && state !== null && typeof state === 'object') {
-      if(state.dir !== undefined && state.dir !== null && typeof state.dir === 'string') {
+    if(Util.isset(state,'object')) {
+      if(Util.isset(state.dir,'string')) {
         this.init(state.dir);
       }
     }
@@ -44,7 +44,7 @@ export default class Storage {
     var temp = divider;
 
     directory.split(divider).forEach(function(currentValue,index) {
-      if(currentValue !== "" && currentValue !== " " && currentValue !== null && currentValue !== undefined) {
+      if(currentValue !== "" && currentValue !== " " && Util.isset(currentValue,'string')) {
         temp += currentValue+divider;
         try {
           fs.statSync(store+temp);
@@ -57,7 +57,7 @@ export default class Storage {
   }
 
   store(snippet) {
-    if(snippet !== null && snippet !== undefined && snippet instanceof Snippet) {
+    if(Util.isset(snippet,Snippet)) {
       fs.writeFileSync(this.storageDir+this.dir+snippet.getUID().split(' ').join('-')+'.json',JSON.stringify(snippet));
       return fs.existsSync(this.storageDir+this.dir+snippet.getUID().split(' ').join('-')+'.json');
     } else {
@@ -133,7 +133,7 @@ export default class Storage {
             snippet.setUID(Util.generateUID({
               unique: true,
               tester: _this.testFile,
-              timeout: 25,
+              timeout: 100,
               length: 20,
               prefix: 'sn',
               insertstring: 'SNIPPET'

lib/storage.js

@@ -9,7 +9,7 @@ const $ = require('jquery');
 export default class Util {
 
   constructor(state) {
-    if(new.target === Node) throw TypeError("Cannot instantiate abstract class Util.");
+    if(new.target === Util) throw TypeError("Cannot instantiate abstract class Util.");
   }
 
   // Returns an object that can be retrieved when package is activated
@@ -342,7 +342,7 @@ export default class Util {
         patch: parseInt(vers2.split('.')[2])
       };
       console.log(versionB);
-      
+
       if(versionA.major > versionB.major) {
         return vers1;
       } else if(versionB.major > versionA.major) {
@@ -368,6 +368,6 @@ export default class Util {
   }
 
   static isset(attr,type) {
-    return (attr !== null && attr !== undefined && typeof attr === type);
+    return (attr !== null && attr !== undefined && (typeof attr === type || attr instanceof type));
   }
 }