fixed bug that was preventing extension activation in production. fixed bug with script paths

Author: luisfontes19

.vscodeignore

@@ -9,3 +9,4 @@ vsc-extension-quickstart.md
 **/.eslintrc.json
 **/*.map
 **/*.ts
+types/**

package-lock.json

@@ -2,18 +2,23 @@
   "name": "vscode-swissknife",
   "displayName": "Swissknife",
   "description": "Scriptable extension to generate or manipulate data. Stop pasting sensitive data in webpages.",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "author": "luisfontes19",
   "publisher": "luisfontes19",
   "license": "MIT",
   "engines": {
     "vscode": "^1.50.0"
   },
+  "repository": {
+    "url": "https://github.com/luisfontes19/vscode-swissknife"
+  },
   "categories": [
     "Other"
   ],
   "activationEvents": [
-    "onStartupFinished"
+    "onCommand:swissknife.show",
+    "onCommand:swissknife.reload",
+    "onCommand:swissknife.openScripts"
   ],
   "main": "./out/extension.js",
   "contributes": {
@@ -27,7 +32,7 @@
         "title": "Reload Swissknife scripts"
       },
       {
-        "command": "swissknife.openScript",
+        "command": "swissknife.openScripts",
         "title": "Open Swissknife user scripts folder"
       }
     ],
@@ -42,6 +47,7 @@
   },
   "scripts": {
     "vscode:prepublish": "npm run compile",
+    "vscode:package": "vsce package",
     "compile": "tsc -p ./",
     "lint": "eslint src --ext ts",
     "watch": "tsc -watch -p ./",
@@ -59,13 +65,13 @@
     "@typescript-eslint/eslint-plugin": "^4.1.1",
     "@typescript-eslint/parser": "^4.1.1",
     "eslint": "^7.9.0",
-    "glob": "^7.1.6",
     "mocha": "^8.1.3",
     "typescript": "^4.0.2",
     "vscode-test": "^1.4.0"
   },
   "dependencies": {
     "@types/bip39": "^3.0.0",
+    "glob": "^7.1.6",
     "showdown": "^1.9.1",
     "uuid": "^8.3.1",
     "vscode-swissknife": "^0.0.2",
@@ -83,4 +89,4 @@
     "developer"
   ],
   "icon": "data/swissknife.png"
-}
+}

package.json

@@ -1,41 +1,50 @@
-import * as vscode from 'vscode';
+import * as fs from 'fs';
 import * as glob from 'glob';
 import * as path from 'path';
-import * as fs from 'fs';
-import { replaceRoutine, informationRoutine, insertRoutine } from './editorOperations';
+import * as vscode from 'vscode';
+import { informationRoutine, insertRoutine, replaceRoutine } from './editorOperations';
 import { IScript, IScriptQuickPickItem, ISwissKnifeContext } from './Interfaces';
 
 
 let scripts: IScriptQuickPickItem[] = [];
 let context: vscode.ExtensionContext;
+
+let extensionFolder: string;
 let userScriptsFolder: string;
 
 
+
+const show = () => {
+	vscode.window.showQuickPick<IScriptQuickPickItem>(scripts).then((selectedItem: IScriptQuickPickItem | undefined) => {
+		if (selectedItem)
+			selectedItem.cb(extensionContext);
+	});
+};
+
+
 export function activate(ctx: vscode.ExtensionContext) {
 	context = ctx;
 
-	userScriptsFolder = path.join(ctx.globalStorageUri.fsPath, "scripts");
+	const cmdShow = vscode.commands.registerCommand('swissknife.show', show);
+	const cmdReload = vscode.commands.registerCommand('swissknife.reload', reload);
+	const cmdOpen = vscode.commands.registerCommand('swissknife.openScripts', openUserScriptsFolder);
+
+	extensionFolder = ctx.globalStorageUri.fsPath;
+	userScriptsFolder = path.join(extensionFolder, "scripts");
 	checkUserScriptsFolder();
 
 	loadScripts();
-	vscode.commands.registerCommand('swissknife.show', show);
-	vscode.commands.registerCommand('swissknife.reload', reload);
-	vscode.commands.registerCommand('swissknife.openScript', openUserScriptsFolder);
 
+	ctx.subscriptions.push(cmdShow);
+	ctx.subscriptions.push(cmdReload);
+	ctx.subscriptions.push(cmdOpen);
 }
 
 
 const reload = () => {
 	loadScripts(true);
 };
 
-const show = () => {
-	vscode.window.showQuickPick<IScriptQuickPickItem>(scripts).then((selectedItem: IScriptQuickPickItem | undefined) => {
-		if (selectedItem)
-			selectedItem.cb(extensionContext);
-	});
-};
-
 const openUserScriptsFolder = () => {
 	vscode.env.openExternal(vscode.Uri.file(userScriptsFolder));
 };
@@ -58,6 +67,7 @@ const loadScripts = (clearCache = false) => {
 
 const loadScriptsAt = (path: string, clearCache: boolean) => {
 	const promises: NodeRequire[] = [];
+
 	const matches = glob.sync(path);
 	matches.forEach(m => {
 		console.log("Queueing script " + m);
@@ -70,6 +80,7 @@ const loadScriptsAt = (path: string, clearCache: boolean) => {
 	});
 
 	Promise.all(promises).then(modules => {
+
 		modules.forEach((m: any) => {
 			if (!m.default) return; //not compliant
 
@@ -83,14 +94,10 @@ const loadScriptsAt = (path: string, clearCache: boolean) => {
 
 
 const checkUserScriptsFolder = () => {
-	return new Promise((resolve, reject) => {
-		if (!fs.existsSync(userScriptsFolder))
-			return fs.mkdir(userScriptsFolder, (err) => {
-				if (err) reject(err);
-				else resolve();
-			});
-	});
-
+	if (!fs.existsSync(extensionFolder))
+		fs.mkdirSync(extensionFolder);
+	if (!fs.existsSync(userScriptsFolder))
+		fs.mkdirSync(userScriptsFolder);
 };
 
 // this method is called when your extension is deactivated

src/extension.ts

@@ -1,10 +1,10 @@
 {
 	"compilerOptions": {
 		"module": "commonjs",
-		"target": "es6",
+		"target": "es2019",
 		"outDir": "out",
 		"lib": [
-			"es6"
+			"es2019"
 		],
 		"sourceMap": true,
 		"rootDir": "src",