Skip to content

Commit 07b52e6

Browse files
ShMcKShMcK
committed
clean up typing issues in modules & config
1 parent aae3fa5 commit 07b52e6

File tree

14 files changed

+110
-75
lines changed

14 files changed

+110
-75
lines changed

‎lib/modules/tutorial/reducer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
var path_1 = require('path');
3-
var tutorial_config_1 = require('./utils/tutorial-config');
3+
var config_1 = require('./utils/config');
44
var types_1 = require('./types');
55
var config_paths_1 = require('./utils/config-paths');
66
var _tutorial = {
@@ -17,7 +17,7 @@ function tutorialReducer(tutorial, action) {
1717
var _a = action.payload, name_1 = _a.name, dir = _a.dir;
1818
var packagePath = path_1.join(dir, 'node_modules', name_1);
1919
var packageJson = require(path_1.join(packagePath, 'package.json'));
20-
var config = tutorial_config_1.tutorialConfig(packageJson, dir);
20+
var config = config_1.tutorialConfig(packageJson, dir);
2121
var _b = require(path_1.join(packagePath, packageJson.main)), info = _b.info, pages = _b.pages;
2222
pages = config_paths_1.default(dir, name_1, config, pages || []);
2323
return {

‎lib/modules/tutorial/utils/config-repo.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
"use strict";
2+
function configRepo(repo) {
3+
if (repo && repo.url) {
4+
var url = repo.url;
5+
if (!!url.match(/\.git$/)) {
6+
url = url.slice(0, url.length - 4);
7+
}
8+
return url;
9+
}
10+
return null;
11+
}
12+
exports.configRepo = configRepo;
13+
function configIssuesPath(bugs) {
14+
return bugs && bugs.url ? bugs.url : null;
15+
}
16+
exports.configIssuesPath = configIssuesPath;

‎lib/modules/tutorial/utils/tutorial-config.js renamed to ‎lib/modules/tutorial/utils/config-runner.js

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,7 @@
22
var path_1 = require('path');
33
var node_file_exists_1 = require('node-file-exists');
44
var system_1 = require('./system');
5-
function tutorialConfig(tutorialPj, dir) {
6-
var config = tutorialPj.config, name = tutorialPj.name;
7-
var repo = loadRepo(tutorialPj.repo);
8-
var testSuffix = config.testSuffix;
9-
return {
10-
dir: path_1.join(dir, 'node_modules', name, config.dir),
11-
testSuffix: testSuffix.length && testSuffix[0] === '.'
12-
? testSuffix
13-
: '.' + testSuffix || null,
14-
runner: config.runner,
15-
runnerOptions: config.runnerOptions || {},
16-
run: loadRunner(name, config.runner, dir),
17-
repo: repo,
18-
edit: tutorialPj.config.edit && repo || false,
19-
issuesPath: getIssuesPath(tutorialPj.bugs)
20-
};
21-
}
22-
exports.tutorialConfig = tutorialConfig;
23-
function getIssuesPath(bugs) {
24-
return bugs && bugs.url ? bugs.url : null;
25-
}
26-
function loadRunner(name, runner, dir) {
5+
function configRunner(name, runner, dir) {
276
var flatDep = path_1.join(dir, 'node_modules', runner, 'package.json');
287
var treeDep = path_1.join(dir, 'node_modules', name, 'node_modules', runner, 'package.json');
298
var runnerMain;
@@ -52,13 +31,5 @@ function loadRunner(name, runner, dir) {
5231
return require(pathToMain);
5332
}
5433
}
55-
function loadRepo(repo) {
56-
if (repo && repo.url) {
57-
var url = repo.url;
58-
if (!!url.match(/\.git$/)) {
59-
url = url.slice(0, url.length - 4);
60-
}
61-
return url;
62-
}
63-
return null;
64-
}
34+
Object.defineProperty(exports, "__esModule", { value: true });
35+
exports.default = configRunner;

‎lib/modules/tutorial/utils/config.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
"use strict";
2+
var path_1 = require('path');
3+
var config_runner_1 = require('./config-runner');
4+
var config_repo_1 = require('./config-repo');
5+
function tutorialConfig(tutorialPj, dir) {
6+
var config = tutorialPj.config, name = tutorialPj.name;
7+
var repo = config_repo_1.configRepo(tutorialPj.repo);
8+
var tutorialDir = path_1.join(dir, 'node_modules', name, config.dir);
9+
var runner = config.runner;
10+
var runnerOptions = config.runnerOptions || {};
11+
var configEdit = tutorialPj.config.edit;
12+
return {
13+
dir: tutorialDir,
14+
runner: runner,
15+
runnerOptions: runnerOptions,
16+
run: config_runner_1.default(name, config.runner, dir),
17+
testSuffix: configTestSuffix(config.testSuffix),
18+
issuesPath: config_repo_1.configIssuesPath(tutorialPj.bugs),
19+
repo: repo,
20+
edit: !!repo && configEdit || false,
21+
};
22+
}
23+
exports.tutorialConfig = tutorialConfig;
24+
function configTestSuffix(suffix) {
25+
return suffix.length && suffix[0] === '.' ? suffix : '.' + suffix || null;
26+
}

‎lib/typings/atom-plugin-command-line/index.js

Whitespace-only changes.

‎package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@
4343
"marked": "0.3.5",
4444
"material-ui": "0.15.0",
4545
"node-file-exists": "^1.0.0",
46-
"react": "15.0.2",
47-
"react-dom": "15.0.2",
46+
"process-console-log": "^0.1.0",
47+
"react": "15.1.0",
48+
"react-dom": "15.1.0",
4849
"react-redux": "4.4.5",
4950
"react-tap-event-plugin": "1.0.0",
5051
"redux": "3.5.2",

‎src/modules/alert/reducer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default function alert(
4242
return setAlert(action.payload.alert);
4343

4444
case ALERT_CLOSE:
45-
return Object.assign({}, alert, {open: false});
45+
return Object.assign({}, alert, { open: false });
4646

4747
default:
4848
return alert;

‎src/modules/tutorial/reducer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {join} from 'path';
2-
import {tutorialConfig} from './utils/tutorial-config';
2+
import {tutorialConfig} from './utils/config';
33
import {TUTORIAL_SET} from './types';
44
import configPaths from './utils/config-paths';
55

‎src/modules/tutorial/utils/config-repo.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
export function configRepo(repo?: { url: string }): string {
2+
if (repo && repo.url) {
3+
let url: string = repo.url;
4+
if (!!url.match(/\.git$/)) {
5+
url = url.slice(0, url.length - 4);
6+
}
7+
return url;
8+
}
9+
return null;
10+
}
11+
12+
export function configIssuesPath(bugs?: { url: string }): string {
13+
return bugs && bugs.url ? bugs.url : null;
14+
}

‎src/modules/tutorial/utils/tutorial-config.ts renamed to ‎src/modules/tutorial/utils/config-runner.ts

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,7 @@ import {join} from 'path';
22
import fileExists from 'node-file-exists';
33
import {isWindows} from './system';
44

5-
export function tutorialConfig(
6-
tutorialPj: PackageJson, dir: string
7-
): Tutorial.Config {
8-
const {config, name} = tutorialPj;
9-
const repo: string = loadRepo(tutorialPj.repo);
10-
const testSuffix: string = config.testSuffix;
11-
return {
12-
dir: join(dir, 'node_modules', name, config.dir),
13-
testSuffix: testSuffix.length && testSuffix[0] === '.'
14-
? testSuffix
15-
: '.' + testSuffix || null,
16-
runner: config.runner,
17-
runnerOptions: config.runnerOptions || {},
18-
run: loadRunner(name, config.runner, dir),
19-
repo,
20-
edit: tutorialPj.config.edit && repo || false,
21-
issuesPath: getIssuesPath(tutorialPj.bugs)
22-
};
23-
}
24-
25-
function getIssuesPath(bugs?: { url: string }) {
26-
return bugs && bugs.url ? bugs.url : null;
27-
}
28-
29-
function loadRunner(name: string, runner: string, dir: string): () => any {
5+
export default function configRunner(name: string, runner: string, dir: string): () => any {
306
// test runner dir
317
let flatDep = join(
328
dir, 'node_modules', runner, 'package.json'
@@ -63,14 +39,3 @@ function loadRunner(name: string, runner: string, dir: string): () => any {
6339
return require(pathToMain);
6440
}
6541
}
66-
67-
function loadRepo(repo?: { url: string }): string {
68-
if (repo && repo.url) {
69-
let url: string = repo.url;
70-
if (!!url.match(/\.git$/)) {
71-
url = url.slice(0, url.length - 4);
72-
}
73-
return url;
74-
}
75-
return null;
76-
}

‎src/modules/tutorial/utils/config.ts

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import {join} from 'path';
2+
import fileExists from 'node-file-exists';
3+
import {isWindows} from './system';
4+
import configRunner from './config-runner';
5+
import {configRepo, configIssuesPath} from './config-repo';
6+
7+
export function tutorialConfig(
8+
tutorialPj: PackageJson, dir: string
9+
): Tutorial.Config {
10+
// package.json: name, config
11+
const {config, name} = tutorialPj;
12+
const repo: string = configRepo(tutorialPj.repo);
13+
const tutorialDir: string = join(dir, 'node_modules', name, config.dir);
14+
const runner: string = config.runner;
15+
const runnerOptions: Object = config.runnerOptions || {};
16+
const configEdit: boolean = tutorialPj.config.edit;
17+
18+
return {
19+
dir: tutorialDir,
20+
runner,
21+
runnerOptions,
22+
run: configRunner(name, config.runner, dir),
23+
testSuffix: configTestSuffix(config.testSuffix),
24+
issuesPath: configIssuesPath(tutorialPj.bugs),
25+
repo,
26+
edit: !!repo && configEdit || false,
27+
};
28+
}
29+
30+
function configTestSuffix(suffix: string) {
31+
return suffix.length && suffix[0] === '.' ? suffix : '.' + suffix || null;
32+
}

‎src/typings/atom-plugin-command-line/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
declare module 'atom-plugin-command-line' {
2+
export default function commandLine(root: string, commands?: string): Promise<string>;
3+
}

‎src/typings/node-file-exists/node-file-exists.d.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
declare module 'node-file-exists' {
2+
export default function fileExists(path: string): boolean;
3+
}

‎tsconfig.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"src/typings/marked/marked.d.ts",
3434
"src/typings/material-ui/material-ui.d.ts",
3535
"src/typings/mixto/mixto.d.ts",
36+
"src/typings/node-file-exists/node-file-exists.d.ts",
3637
"src/typings/node/node.d.ts",
3738
"src/typings/pathwatcher/pathwatcher.d.ts",
3839
"src/typings/q/Q.d.ts",
@@ -119,8 +120,10 @@
119120
"src/modules/tutorial/reducer.ts",
120121
"src/modules/tutorial/types.ts",
121122
"src/modules/tutorial/utils/config-paths.ts",
123+
"src/modules/tutorial/utils/config-repo.ts",
124+
"src/modules/tutorial/utils/config-runner.ts",
125+
"src/modules/tutorial/utils/config.ts",
122126
"src/modules/tutorial/utils/system.ts",
123-
"src/modules/tutorial/utils/tutorial-config.ts",
124127
"src/modules/tutorials/actions.ts",
125128
"src/modules/tutorials/index.ts",
126129
"src/modules/tutorials/reducer.ts",
@@ -136,6 +139,7 @@
136139
"src/services/polyfills.ts",
137140
"src/store.ts",
138141
"src/subscriptions.ts",
142+
"src/typings/atom-plugin-command-line/index.ts",
139143
"src/components/App.tsx",
140144
"src/components/AppMenu/CloseWindow.tsx",
141145
"src/components/AppMenu/index.tsx",

0 commit comments

Comments
 (0)