Skip to content
This repository was archived by the owner on Jun 1, 2022. It is now read-only.

Commit c8b99fa

Browse files
committed
feat: rxjs + merge from all mighties
1 parent 868009c commit c8b99fa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2212
-1744
lines changed

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Welcome to Mighty JS (MJS)
22

3-
[![Build Status](https://travis-ci.org/Elium/mighty-js.svg?branch=master)](https://travis-ci.org/Elium/mighty-js)
4-
[![Coverage Status](https://coveralls.io/repos/github/Elium/mighty-js/badge.svg?branch=master)](https://coveralls.io/github/Elium/mighty-js?branch=master)
3+
[![Build Status](https://travis-ci.org/Elium/mighty.svg?branch=master)](https://travis-ci.org/Elium/mighty)
4+
[![Coverage Status](https://coveralls.io/repos/github/Elium/mighty/badge.svg?branch=master)](https://coveralls.io/github/Elium/mighty?branch=master)
55

66
## Preamble
77

@@ -22,7 +22,6 @@ That's where MJS is going strong, look at all the features bellow.
2222
NodeJS is required. Use the folling commands to bootstrap your application :
2323

2424
- `npm install`
25-
- `npm run typings`
2625
- `npm run build`
2726

2827
To launch tests :

gulpfile.js

Lines changed: 0 additions & 26 deletions
This file was deleted.

package.json

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,48 @@
11
{
2-
"name": "@elium/mighty-js",
2+
"name": "@elium/mighty",
33
"appName": "mighty",
4-
"version": "4.2.2",
5-
"homepage": "https://github.com/Elium/mighty-js#readme",
4+
"version": "4.2.2-rxjs.0",
5+
"homepage": "https://github.com/Elium/mighty#readme",
66
"author": "Arnaud Bosc <[email protected]>",
77
"description": "Context agnostic TS & JS ORM",
88
"license": "MIT",
99
"scripts": {
10-
"build": "gulp build",
11-
"dev": "gulp dev",
10+
"build": "tsc -p .",
11+
"dev": "tsc -w -p .",
1212
"start": "npm run dev",
1313
"pretest": "npm run build",
1414
"test": "mocha lib/test --recursive -R spec",
1515
"coverage": "istanbul cover _mocha -- --recursive lib/test -R spec",
1616
"coverage:ci": "istanbul cover _mocha --report lcovonly -- -R spec --recursive lib/test && cat ./coverage/lcov.info | coveralls",
1717
"test:watch": "npm run build && npm run mocha:watch",
1818
"preversion": "npm test",
19-
"postversion": "git push --follow-tags"
19+
"postversion": "git push --follow-tags",
20+
"deploy": "cp package.json LICENSE.md ./lib/ && npm publish --access=public"
2021
},
2122
"repository": {
22-
"url": "git+https://github.com/Elium/mighty-js.git"
23+
"url": "git+https://github.com/Elium/mighty.git"
2324
},
2425
"main": "index.js",
2526
"devDependencies": {
2627
"@types/chai": "^3.4.34",
27-
"@types/core-js": "^0.9.34",
28-
"@types/lodash": "^4.14.38",
29-
"@types/mocha": "^2.2.32",
28+
"@types/core-js": "^0.9.35",
29+
"@types/lodash": "^4.14.50",
30+
"@types/mocha": "^2.2.38",
31+
"@types/node": "^7.0.1",
3032
"chai": "^3.5.0",
3133
"coveralls": "^2.11.12",
3234
"del": "^2.2.1",
33-
"gulp": "^3.9.1",
34-
"gulp-sourcemaps": "^1.6.0",
35-
"gulp-typescript": "^3.1.2",
35+
"hapi": "^16.1.0",
3636
"istanbul": "^0.4.4",
37-
"lodash": "^4.12.0",
38-
"merge2": "^1.0.2",
39-
"mocha": "^2.4.5",
37+
"mocha": "^3.2.0",
4038
"mocha-lcov-reporter": "^1.2.0",
41-
"run-sequence": "^1.2.2",
42-
"typescript": "^2.0.8"
39+
"typescript": "^2.1.5"
4340
},
4441
"dependencies": {
45-
"core-js": "^2.4.1",
46-
"lodash": "^4.12.0"
42+
"lodash": "^4.17.4",
43+
"rxjs": "^5.0.3"
4744
},
4845
"bugs": {
49-
"url": "https://github.com/Elium/mighty-js/issues"
46+
"url": "https://github.com/Elium/mighty/issues"
5047
}
5148
}

src/adapter/adapter.ts renamed to src/core/adapter/adapter.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@ import {IRequest} from './request';
22
import {IResponse} from './response';
33
import {IRecord} from '../resource/record';
44
import {IResource} from '../resource/resource';
5+
import {Observable} from 'rxjs/Observable';
56

67
export interface IAdapter {
7-
create <R extends IRecord>(resource: IResource<R>, request: IRequest): Promise<IResponse>
8-
find <R extends IRecord>(resource: IResource<R>, request: IRequest): Promise<IResponse>
9-
findOne <R extends IRecord>(resource: IResource<R>, request: IRequest): Promise<IResponse>
10-
save <R extends IRecord>(resource: IResource<R>, request: IRequest): Promise<IResponse>
11-
destroy <R extends IRecord>(resource: IResource<R>, request: IRequest): Promise<IResponse>
8+
create <R extends IRecord>(resource: IResource<R>, request: IRequest): Observable<IResponse>
9+
find <R extends IRecord>(resource: IResource<R>, request: IRequest): Observable<IResponse>
10+
findOne <R extends IRecord>(resource: IResource<R>, request: IRequest): Observable<IResponse>
11+
save <R extends IRecord>(resource: IResource<R>, request: IRequest): Observable<IResponse>
12+
destroy <R extends IRecord>(resource: IResource<R>, request: IRequest): Observable<IResponse>
1213
}
1314

1415
export abstract class Adapter implements IAdapter {
15-
abstract create<R extends IRecord>(resource: IResource<R>, request: IRequest): Promise<IResponse>;
16-
abstract find<R extends IRecord>(resource: IResource<R>, request: IRequest): Promise<IResponse>;
17-
abstract findOne<R extends IRecord>(resource: IResource<R>, request: IRequest): Promise<IResponse>;
18-
abstract save<R extends IRecord>(resource: IResource<R>, request: IRequest): Promise<IResponse>;
19-
abstract destroy<R extends IRecord>(resource: IResource<R>, request: IRequest): Promise<IResponse>;
16+
abstract create<R extends IRecord>(resource: IResource<R>, request: IRequest): Observable<IResponse>;
17+
abstract find<R extends IRecord>(resource: IResource<R>, request: IRequest): Observable<IResponse>;
18+
abstract findOne<R extends IRecord>(resource: IResource<R>, request: IRequest): Observable<IResponse>;
19+
abstract save<R extends IRecord>(resource: IResource<R>, request: IRequest): Observable<IResponse>;
20+
abstract destroy<R extends IRecord>(resource: IResource<R>, request: IRequest): Observable<IResponse>;
2021
}
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/core/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export * from "./adapter";
2+
export * from "./resource";
3+
export * from "./store";
4+
export * from "./utils";
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)