Skip to content

Commit 041953a

Browse files
mansonamansona
committed
add semis back
1 parent 6ff1c11 commit 041953a

31 files changed

+637
-638
lines changed

Diff for: ‎.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ module.exports = {
2222
},
2323
},
2424
],
25-
}
25+
};

Diff for: ‎.prettierrc

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"singleQuote": true,
3-
"semi": false,
43
"printWidth": 100,
54
"arrowParens": "avoid"
65
}

Diff for: ‎generate-local.js

+45-45
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,99 @@
1-
import chalk from 'chalk'
2-
import commandExists from 'command-exists'
3-
import execa from 'execa'
4-
import { copyFileSync, ensureFileSync, existsSync, removeSync } from 'fs-extra'
5-
import minimist from 'minimist'
6-
import path from 'path'
1+
import chalk from 'chalk';
2+
import commandExists from 'command-exists';
3+
import execa from 'execa';
4+
import { copyFileSync, ensureFileSync, existsSync, removeSync } from 'fs-extra';
5+
import minimist from 'minimist';
6+
import path from 'path';
77

8-
const docsPath = '../ember-api-docs-data'
8+
const docsPath = '../ember-api-docs-data';
99

10-
const argv = minimist(process.argv.slice(2))
10+
const argv = minimist(process.argv.slice(2));
1111

12-
const { project, version, install } = argv
12+
const { project, version, install } = argv;
1313

1414
const exit = function exit() {
15-
console.log(...arguments)
16-
process.exit(1)
17-
}
15+
console.log(...arguments);
16+
process.exit(1);
17+
};
1818

1919
async function runCmd(cmd, path, args = []) {
20-
console.log(chalk.underline(`Running '${chalk.green(cmd)}' in ${path}`))
21-
const executedCmd = await execa(cmd, args, { cwd: path, shell: true, stdio: 'inherit' })
20+
console.log(chalk.underline(`Running '${chalk.green(cmd)}' in ${path}`));
21+
const executedCmd = await execa(cmd, args, { cwd: path, shell: true, stdio: 'inherit' });
2222

2323
if (executedCmd.failed) {
24-
console.error(executedCmd.stdout)
25-
console.error(executedCmd.stderr)
26-
process.exit(1)
24+
console.error(executedCmd.stdout);
25+
console.error(executedCmd.stderr);
26+
process.exit(1);
2727
}
2828

29-
console.log(executedCmd.stdout + '\n')
29+
console.log(executedCmd.stdout + '\n');
3030
}
3131

32-
;(async () => {
32+
(async () => {
3333
if (!project || !version) {
3434
exit(
3535
chalk.red('Both project and version args are required.\n'),
3636
chalk.yellow(' e.g., yarn gen --project ember --version 3.10.1'),
37-
)
37+
);
3838
}
3939

4040
if (!['ember', 'ember-data'].includes(project)) {
41-
exit(chalk.red(`Project has to be either 'ember' or 'ember-data'. (was given ${project})\n`))
41+
exit(chalk.red(`Project has to be either 'ember' or 'ember-data'. (was given ${project})\n`));
4242
}
4343

4444
try {
45-
await commandExists('yarn')
45+
await commandExists('yarn');
4646
} catch (e) {
47-
exit(chalk.red('We need yarn installed globally for this script to work'))
47+
exit(chalk.red('We need yarn installed globally for this script to work'));
4848
}
4949

50-
let emberProjectPath = path.join(__dirname, '../', 'ember.js')
51-
let emberDataProjectPath = path.join(__dirname, '../', 'data')
50+
let emberProjectPath = path.join(__dirname, '../', 'ember.js');
51+
let emberDataProjectPath = path.join(__dirname, '../', 'data');
5252

5353
let checkIfProjectDirExists = dirPath => {
5454
if (!existsSync(dirPath)) {
55-
exit(chalk.yellow(`Please checkout the ${project} project at ${dirPath}`))
55+
exit(chalk.yellow(`Please checkout the ${project} project at ${dirPath}`));
5656
}
57-
}
57+
};
5858

5959
let buildDocs = async projDirPath => {
60-
checkIfProjectDirExists(projDirPath)
60+
checkIfProjectDirExists(projDirPath);
6161

6262
if (project === 'ember') {
63-
await runCmd('volta', projDirPath, ['run', 'yarn'])
63+
await runCmd('volta', projDirPath, ['run', 'yarn']);
6464
} else {
65-
await runCmd('corepack', projDirPath, ['pnpm', 'install'])
65+
await runCmd('corepack', projDirPath, ['pnpm', 'install']);
6666
}
6767

6868
if (install) {
69-
await runCmd(project === 'ember' ? 'yarn' : 'pnpm install', projDirPath)
70-
console.log('\n\n')
69+
await runCmd(project === 'ember' ? 'yarn' : 'pnpm install', projDirPath);
70+
console.log('\n\n');
7171
}
7272

7373
await runCmd(
7474
project === 'ember' ? 'volta run yarn docs' : 'corepack pnpm run build:docs',
7575
projDirPath,
76-
)
76+
);
7777

78-
let destination = `${docsPath}/s3-docs/v${version}/${project}-docs.json`
79-
ensureFileSync(destination)
80-
const projYuiDocFile = destination
81-
removeSync(projYuiDocFile)
82-
removeSync(`${docsPath}/json-docs/${project}/${version}`)
78+
let destination = `${docsPath}/s3-docs/v${version}/${project}-docs.json`;
79+
ensureFileSync(destination);
80+
const projYuiDocFile = destination;
81+
removeSync(projYuiDocFile);
82+
removeSync(`${docsPath}/json-docs/${project}/${version}`);
8383

8484
const yuiDocFile = path.join(
8585
projDirPath,
8686
project === 'ember' ? 'docs/data.json' : 'packages/-ember-data/dist/docs/data.json',
87-
)
88-
copyFileSync(yuiDocFile, projYuiDocFile)
89-
}
87+
);
88+
copyFileSync(yuiDocFile, projYuiDocFile);
89+
};
9090

9191
let dirMap = {
9292
ember: emberProjectPath,
9393
'ember-data': emberDataProjectPath,
94-
}
94+
};
9595

96-
await buildDocs(dirMap[project])
96+
await buildDocs(dirMap[project]);
9797

9898
await execa('volta', [
9999
'run',
@@ -104,5 +104,5 @@ async function runCmd(cmd, path, args = []) {
104104
'--version',
105105
version,
106106
'--no-sync',
107-
]).stdout.pipe(process.stdout)
108-
})()
107+
]).stdout.pipe(process.stdout);
108+
})();

Diff for: ‎index.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// eslint-disable-next-line
22
require = require('esm')(module /*, options*/)
33

4-
const argv = require('minimist')(process.argv.slice(2))
4+
const argv = require('minimist')(process.argv.slice(2));
55

6-
let possibleProjects = ['ember', 'ember-data']
6+
let possibleProjects = ['ember', 'ember-data'];
77
let projects =
8-
argv.project && possibleProjects.includes(argv.project) ? [argv.project] : possibleProjects
9-
let specificDocsVersion = argv.version ? argv.version : ''
8+
argv.project && possibleProjects.includes(argv.project) ? [argv.project] : possibleProjects;
9+
let specificDocsVersion = argv.version ? argv.version : '';
1010

11-
let runClean = !!argv.clean
12-
let noSync = !argv.sync
11+
let runClean = !!argv.clean;
12+
let noSync = !argv.sync;
1313

14-
const { apiDocsProcessor } = require('./main.js')
15-
apiDocsProcessor(projects, specificDocsVersion, runClean, noSync)
14+
const { apiDocsProcessor } = require('./main.js');
15+
apiDocsProcessor(projects, specificDocsVersion, runClean, noSync);

Diff for: ‎lib/add-inherited-items.js

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
import _ from 'lodash'
1+
import _ from 'lodash';
22

33
export default function addInheritedItems(docSets) {
44
docSets.forEach(versionData => {
5-
let data = versionData.data
6-
let classes = _.values(data.classes).filter(klass => klass && klass.name)
7-
classes = classes.filter(removeLongDocsBecauseEmber1HasWeirdDocs)
8-
let classItems = data.classitems.filter(({ itemtype }) => itemtype)
5+
let data = versionData.data;
6+
let classes = _.values(data.classes).filter(klass => klass && klass.name);
7+
classes = classes.filter(removeLongDocsBecauseEmber1HasWeirdDocs);
8+
let classItems = data.classitems.filter(({ itemtype }) => itemtype);
99

1010
classes.forEach(klass => {
11-
let parents = getParents(klass, classes)
11+
let parents = getParents(klass, classes);
1212

1313
for (let i = 0; i < parents.length; ++i) {
14-
parents = parents.concat(getParents(parents[i], classes))
14+
parents = parents.concat(getParents(parents[i], classes));
1515
}
1616
parents.forEach(parent => {
17-
if (!parent) return
18-
let parentItems = classItems.filter(item => item.class === parent.name)
17+
if (!parent) return;
18+
let parentItems = classItems.filter(item => item.class === parent.name);
1919
parentItems = parentItems.map(item => {
20-
item = _.clone(item)
21-
item.inherited = true
22-
item.inheritedFrom = item.class
23-
item.class = klass.name
24-
return item
25-
})
26-
data.classitems = data.classitems.concat(parentItems)
27-
})
28-
})
29-
})
20+
item = _.clone(item);
21+
item.inherited = true;
22+
item.inheritedFrom = item.class;
23+
item.class = klass.name;
24+
return item;
25+
});
26+
data.classitems = data.classitems.concat(parentItems);
27+
});
28+
});
29+
});
3030

31-
return Promise.resolve(docSets)
31+
return Promise.resolve(docSets);
3232
}
3333

3434
function getParents(klass, classes) {
35-
let parents = []
35+
let parents = [];
3636
if (klass.extends) {
37-
parents = parents.concat([klass.extends])
37+
parents = parents.concat([klass.extends]);
3838
}
3939
if (klass.uses && klass.uses.length) {
40-
parents = parents.concat(klass.uses.reverse())
40+
parents = parents.concat(klass.uses.reverse());
4141
}
4242
return parents
4343
.map(parent => _.find(classes, ({ name }) => name === parent))
44-
.filter(parent => parent)
44+
.filter(parent => parent);
4545
}
4646

4747
function removeLongDocsBecauseEmber1HasWeirdDocs({ name }) {
48-
let str = 'A Suite can'
49-
return !name.includes(str)
48+
let str = 'A Suite can';
49+
return !name.includes(str);
5050
}

Diff for: ‎lib/add-since-tags.js

+30-30
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
1-
import _ from 'lodash'
1+
import _ from 'lodash';
22

33
export default function addSinceTags(docSets) {
4-
let versionIndex = Object.create(null)
4+
let versionIndex = Object.create(null);
55

66
docSets.forEach(versionData => {
7-
let data = versionData.data
8-
let version = (versionData.version = versionData.version.replace('v', ''))
9-
let classItems = data.classitems.filter(({ itemtype }) => itemtype)
7+
let data = versionData.data;
8+
let version = (versionData.version = versionData.version.replace('v', ''));
9+
let classItems = data.classitems.filter(({ itemtype }) => itemtype);
1010

1111
classItems.forEach(classItem => {
12-
let classItemName = `${classItem.class}#${classItem.name}`
13-
classItem.version = version
14-
createMethodEntry(versionIndex, classItemName, classItem.itemtype, version)
15-
})
12+
let classItemName = `${classItem.class}#${classItem.name}`;
13+
classItem.version = version;
14+
createMethodEntry(versionIndex, classItemName, classItem.itemtype, version);
15+
});
1616

17-
let classes = _.values(data.classes)
17+
let classes = _.values(data.classes);
1818

1919
classes.forEach(klass => {
20-
klass.version = version
21-
createMethodEntry(versionIndex, klass.name, 'class', version)
22-
})
23-
})
20+
klass.version = version;
21+
createMethodEntry(versionIndex, klass.name, 'class', version);
22+
});
23+
});
2424

25-
sortVersionIndex(versionIndex)
25+
sortVersionIndex(versionIndex);
2626

27-
let classItems = classItemsWithItemType(docSets)
27+
let classItems = classItemsWithItemType(docSets);
2828

2929
classItems.forEach(classItem => {
30-
let classItemName = `${classItem.class}#${classItem.name}`
31-
let version = versionIndex[classItem.itemtype][classItemName][0]
30+
let classItemName = `${classItem.class}#${classItem.name}`;
31+
let version = versionIndex[classItem.itemtype][classItemName][0];
3232

33-
classItem.since = version
34-
})
33+
classItem.since = version;
34+
});
3535

3636
let classes = _.chain(docSets)
3737
.map('data')
3838
.map('classes')
3939
.flatten()
4040
.map(klassSet => _.values(klassSet))
4141
.flatten()
42-
.value()
42+
.value();
4343

44-
classes.forEach(klass => (klass.since = versionIndex['class'][klass.name][0]))
44+
classes.forEach(klass => (klass.since = versionIndex['class'][klass.name][0]));
4545

46-
return Promise.resolve(docSets)
46+
return Promise.resolve(docSets);
4747
}
4848

4949
function sortVersionIndex(versionIndex) {
50-
let keys = Object.keys(versionIndex)
50+
let keys = Object.keys(versionIndex);
5151

5252
keys.forEach(key =>
5353
Object.keys(versionIndex[key]).forEach(item => versionIndex[key][item].sort()),
54-
)
54+
);
5555
}
5656

5757
const createMethodEntry = (versionIndex, method, itemType, version) => {
58-
versionIndex[itemType] = versionIndex[itemType] || Object.create(null)
59-
versionIndex[itemType][method] = versionIndex[itemType][method] || []
60-
versionIndex[itemType][method].push(version)
61-
}
58+
versionIndex[itemType] = versionIndex[itemType] || Object.create(null);
59+
versionIndex[itemType][method] = versionIndex[itemType][method] || [];
60+
versionIndex[itemType][method].push(version);
61+
};
6262

6363
const classItemsWithItemType = versions =>
6464
versions.reduce(
6565
(memo, { data }) => memo.concat(data.classitems.filter(({ itemtype }) => itemtype)),
6666
[],
67-
)
67+
);

Diff for: ‎lib/create-classes.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
import saveDoc from './save-document.js'
1+
import saveDoc from './save-document.js';
22

33
export default async function (document, projectName, projectVersion) {
4-
let things = document.data
4+
let things = document.data;
55

66
for (const klass of things) {
77
if (!klass.id) {
8-
console.log(klass)
9-
console.log(new Error('WHAT').stack)
10-
process.exit(1)
8+
console.log(klass);
9+
console.log(new Error('WHAT').stack);
10+
process.exit(1);
1111
}
1212
const doc = {
1313
data: klass,
14-
}
14+
};
1515

16-
console.log(`Creating ${klass.id} in ${projectName}-${projectVersion}`)
17-
await saveDoc(doc, projectName, projectVersion)
16+
console.log(`Creating ${klass.id} in ${projectName}-${projectVersion}`);
17+
await saveDoc(doc, projectName, projectVersion);
1818
}
1919

20-
return document
20+
return document;
2121
}

0 commit comments

Comments
 (0)