@blaasvaer/frmwrk 0.1.19 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/connections.js +6 -11
  2. package/package.json +1 -1
  3. package/.vscode/settings.json +0 -22
  4. package/package 2.json +0 -30
package/connections.js CHANGED
@@ -4,7 +4,7 @@ const utils = require('./utils');
4
4
  * Install connections
5
5
  */
6
6
  function installconnections ( config ) {
7
- FW.connections = FW.connections || {};
7
+ FW.databases = {};
8
8
 
9
9
  let connections_dir = config.root + '/connections/';
10
10
 
@@ -14,6 +14,8 @@ function installconnections ( config ) {
14
14
  const connection_files = [];
15
15
 
16
16
  files.forEach( file => {
17
+ let connection_name = file.split('.')[0];
18
+
17
19
  // Skip file if name start with an underscore
18
20
  if ( file.charAt(0) === '_' )
19
21
  return;
@@ -23,20 +25,13 @@ function installconnections ( config ) {
23
25
  let connection = require( connections_dir + file );
24
26
 
25
27
  if ( connection ) {
26
- // FW.connections[ path.parse(file).name ] = connection;
27
- FW.connections[ file.split('.')[0] ] = connection;
28
-
29
- // Check for config connection type
30
- if ( config.connection && FW.connections[ config.connection ] ) {
31
- FW.database = FW.connections[ config.connection ];
32
- }
33
-
28
+ FW.databases[ connection_name ] = connection;
29
+
34
30
  resolve( file );
35
31
  } else {
36
32
  reject( "Loading of connection: " + file + " failed!" );
37
33
  }
38
- });
39
-
34
+ });
40
35
  connection_files.push( promise );
41
36
  });
42
37
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blaasvaer/frmwrk",
3
- "version": "0.1.19",
3
+ "version": "0.2.1",
4
4
  "description": "My personal Node framework",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/.vscode/settings.json DELETED
@@ -1,22 +0,0 @@
1
- {
2
- "workbench.colorCustomizations": {
3
- "activityBar.activeBackground": "#2f7c47",
4
- "activityBar.activeBorder": "#422c74",
5
- "activityBar.background": "#2f7c47",
6
- "activityBar.foreground": "#e7e7e7",
7
- "activityBar.inactiveForeground": "#e7e7e799",
8
- "activityBarBadge.background": "#422c74",
9
- "activityBarBadge.foreground": "#e7e7e7",
10
- "statusBar.background": "#215732",
11
- "statusBar.foreground": "#e7e7e7",
12
- "statusBarItem.hoverBackground": "#2f7c47",
13
- "titleBar.activeBackground": "#215732",
14
- "titleBar.activeForeground": "#e7e7e7",
15
- "titleBar.inactiveBackground": "#21573299",
16
- "titleBar.inactiveForeground": "#e7e7e799",
17
- "sash.hoverBorder": "#2f7c47",
18
- "statusBarItem.remoteBackground": "#215732",
19
- "statusBarItem.remoteForeground": "#e7e7e7"
20
- },
21
- "peacock.color": "#215732"
22
- }
package/package 2.json DELETED
@@ -1,30 +0,0 @@
1
- {
2
- "name": "@blaasvaer/frmwrk",
3
- "version": "0.1.14",
4
- "description": "My personal Node framework",
5
- "main": "index.js",
6
- "scripts": {
7
- "test": "echo \"Error: no test specified\" && exit 1",
8
- "patch": "npm version patch --force && npm publish",
9
- "major": "npm version major --force && npm publish",
10
- "minor": "npm version minor --force && npm publish"
11
- },
12
- "repository": {
13
- "type": "git",
14
- "url": "git+ssh://git@bitbucket.org/blaasvaer/frmwrk.git"
15
- },
16
- "keywords": [
17
- "Node",
18
- "Framework",
19
- "Homebrew"
20
- ],
21
- "author": "Sam Blåsvær",
22
- "license": "ISC",
23
- "bugs": {
24
- "url": "https://bitbucket.org/blaasvaer/frmwrk/issues"
25
- },
26
- "homepage": "https://bitbucket.org/blaasvaer/frmwrk#readme",
27
- "dependencies": {
28
- "serve-handler": "^6.1.3"
29
- }
30
- }