Skip to content

Commit

Permalink
Updated tasks and recompiled with TS1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
notheotherben committed Apr 30, 2015
1 parent 974686a commit 859646a
Show file tree
Hide file tree
Showing 22 changed files with 75 additions and 54 deletions.
48 changes: 37 additions & 11 deletions .settings/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,40 +17,66 @@
"tasks": [
{
"taskName": "build",
"args": ["run", "build"],
"args": ["run"],
"isBuildCommand": true,
"problemMatcher": "$tsc"
"problemMatcher": ["$tsc", {
"fileLocation": "relative",
"owner": "typescript",
"pattern": {
"regexp": "^([^(]+)\\((\\d+,\\d+)\\)\\: (error|warning) TS(\\d+): (.*)$",
"file": 1,
"location": 2,
"code": 3,
"severity": 4,
"message": 5
}
}, {
"fileLocation": "relative",
"owner": "typescript",
"pattern": {
"regexp": "^(error|warning) TS(\\d+): File '([^']+)'.*$",
"file": 3,
"location": 2,
"code": 2,
"severity": 1,
"message": 3
}
}]
},
{
"taskName": "test",
"args": ["run", "test"],
"args": [],
"isTestCommand": true,
"problemMatcher": {
"owner": "mocha",
"pattern": {
"regexp": "^\\s*\\d+\\)\\s*(.*)\\:$",
"file": -1,
"location": -1,
"message": 1
"regexp": "^\\s*(\\d+)\\)\\s*(.+)\\:$",
"file": 1,
"message": 2
}
}
},
{
"taskName": "lint",
"args": ["run", "lint", "--", "${file}", "--exclude"],
"problemMatcher": "$jshint"
},
{
"taskName": "install",
"args": ["install"]
"args": []
},
{
"taskName": "update",
"args": ["update", "--save"]
"args": []
},
{
"taskName": "benchmark",
"args": ["run", "benchmark"],
"args": ["run"],
"showOutput": "always"
},
{
"taskName": "publish",
"args": ["publish"]
"args": []
}
]
}
2 changes: 2 additions & 0 deletions lib/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.js
*.map
8 changes: 4 additions & 4 deletions lib/Core.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/Core.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions lib/Core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import events = require('events');

import config = require('./Configuration');
import IPlugin = require('./Plugins');
import model = require('./Model');
import instance = require('./Instance');
import Model = require('./Model');
import Instance = require('./Instance');

import middleware = require('./Middleware');
import expressMiddleware = require('./middleware/Express');
import ExpressMiddleware = require('./middleware/Express');

import cache = require('./Cache');
import noOpCache = require('./caches/NoOpCache');
import memoryCache = require('./caches/MemoryCache');
import Cache = require('./Cache');
import NoOpCache = require('./caches/NoOpCache');
import MemoryCache = require('./caches/MemoryCache');

var MongoConnectAsyc = Bluebird.promisify(MongoDB.MongoClient.connect);

Expand All @@ -26,7 +26,7 @@ class Core {
private _url: string;
private _config: config;
private _connection: MongoDB.Db;
private _cache: cache = new noOpCache();
private _cache: Cache = new NoOpCache();

/**
* Gets the plugins registered with this Iridium Core
Expand Down Expand Up @@ -82,11 +82,11 @@ class Core {
* Gets the cache used to store objects retrieved from the database for performance reasons
* @returns {cache}
*/
get cache(): cache {
get cache(): Cache {
return this._cache;
}

set cache(value: cache) {
set cache(value: Cache) {
this._cache = value;
}

Expand Down Expand Up @@ -166,7 +166,7 @@ class Core {
* to the current Iridium instance.
* @returns {Iridium.ExpressMiddleware}
*/
express(): expressMiddleware.ExpressMiddleware {
return expressMiddleware.ExpressMiddlewareFactory(this);
express(): ExpressMiddleware.ExpressMiddleware {
return ExpressMiddleware.ExpressMiddlewareFactory(this);
}
}
13 changes: 4 additions & 9 deletions lib/Cursor.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 859646a

Please sign in to comment.