@definitelytyped/dtslint 0.0.199 → 0.0.201
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.
- package/CHANGELOG.md +13 -0
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/lint.js +11 -17
- package/dist/lint.js.map +1 -1
- package/dist/updateConfig.js +4 -11
- package/dist/updateConfig.js.map +1 -1
- package/dist/util.d.ts +0 -2
- package/dist/util.js +1 -23
- package/dist/util.js.map +1 -1
- package/dt.json +1 -4
- package/dtslint.json +1 -3
- package/package.json +2 -3
- package/src/index.ts +6 -0
- package/src/lint.ts +12 -22
- package/src/updateConfig.ts +4 -14
- package/src/util.ts +0 -25
- package/test/tsconfig.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/rules/npmNamingRule.d.ts +0 -21
- package/dist/rules/npmNamingRule.js +0 -286
- package/dist/rules/npmNamingRule.js.map +0 -1
- package/dist/suggestions.d.ts +0 -5
- package/dist/suggestions.js +0 -62
- package/dist/suggestions.js.map +0 -1
- package/docs/npm-naming.md +0 -137
- package/src/rules/npmNamingRule.ts +0 -311
- package/src/suggestions.ts +0 -76
- package/test/npm-naming/code/tslint.json +0 -6
- package/test/npm-naming/code/types/dts-critic/index.d.ts +0 -1
- package/test/npm-naming/code/types/dts-critic/index.d.ts.lint +0 -8
- package/test/npm-naming/code/types/dts-critic/package.json +0 -17
- package/test/npm-naming/name/tslint.json +0 -6
- package/test/npm-naming/name/types/wenceslas/index.d.ts +0 -1
- package/test/npm-naming/name/types/wenceslas/index.d.ts.lint +0 -2
- package/test/npm-naming/name/types/wenceslas/package.json +0 -17
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# @definitelytyped/dtslint
|
|
2
2
|
|
|
3
|
+
## 0.0.201
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 92b5cd51: Remove more tslint code to make dtslint work again
|
|
8
|
+
|
|
9
|
+
## 0.0.200
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- 414ae487: Move npm-naming lint rule from tslint to eslint
|
|
14
|
+
- ae742dde: Special-case a useful error for `pnpm test` without arguments
|
|
15
|
+
|
|
3
16
|
## 0.0.199
|
|
4
17
|
|
|
5
18
|
### Patch Changes
|
package/dist/index.js
CHANGED
|
@@ -23,6 +23,10 @@ async function main() {
|
|
|
23
23
|
let lookingForTsLocal = false;
|
|
24
24
|
let tsLocal;
|
|
25
25
|
console.log(`dtslint@${require("../package.json").version}`);
|
|
26
|
+
if (args.length === 1 && args[0] === "types") {
|
|
27
|
+
console.log("Please provide a package name to test.\nTo test all changed packages at once, run `pnpm run test-all`.");
|
|
28
|
+
process.exit(1);
|
|
29
|
+
}
|
|
26
30
|
for (const arg of args) {
|
|
27
31
|
if (lookingForTsLocal) {
|
|
28
32
|
if (arg.startsWith("--")) {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;AAEA,8EAA+F;AAC/F,iCAAkC;AAClC,4CAAoB;AACpB,+BAAqE;AAErE,kDAKgC;AAChC,qCAA2D;AAC3D,iCAA0D;AAC1D,iCAAiE;AACjE,kEAAkE;AAElE,KAAK,UAAU,IAAI;IACjB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnC,IAAI,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC5B,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,IAAI,OAA2B,CAAC;IAEhC,OAAO,CAAC,GAAG,CAAC,WAAW,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/lint.js
CHANGED
|
@@ -18,12 +18,8 @@ async function lint(dirPath, minVersion, maxVersion, isLatest, expectOnly, tsLoc
|
|
|
18
18
|
process.env.TSESTREE_SINGLE_RUN = "true";
|
|
19
19
|
// TODO: To remove tslint, replace this with a ts.createProgram (probably)
|
|
20
20
|
const lintProgram = tslint_1.Linter.createProgram(tsconfigPath);
|
|
21
|
-
// tslint no longer checks ExpectType; skip linting entirely if we're only checking ExpectType.
|
|
22
|
-
const linter = !expectOnly ? new tslint_1.Linter({ fix: false, formatter: "stylish" }, lintProgram) : undefined;
|
|
23
|
-
const configPath = getConfigPath(dirPath);
|
|
24
21
|
// TODO: To port expect-rule, eslint's config will also need to include [minVersion, maxVersion]
|
|
25
22
|
// Also: expect-rule should be renamed to expect-type or check-type or something
|
|
26
|
-
const config = getLintConfig(configPath);
|
|
27
23
|
const esfiles = [];
|
|
28
24
|
for (const file of lintProgram.getSourceFiles()) {
|
|
29
25
|
if (lintProgram.isSourceFileDefaultLibrary(file)) {
|
|
@@ -41,18 +37,26 @@ async function lint(dirPath, minVersion, maxVersion, isLatest, expectOnly, tsLoc
|
|
|
41
37
|
// External dependencies should have been handled by `testDependencies`;
|
|
42
38
|
// typesVersions should be handled in a separate lint
|
|
43
39
|
if (!isExternalDependency(file, dirPath, lintProgram) && (!isLatest || !isTypesVersionPath(fileName, dirPath))) {
|
|
44
|
-
linter === null || linter === void 0 ? void 0 : linter.lint(fileName, text, config);
|
|
45
40
|
esfiles.push(fileName);
|
|
46
41
|
}
|
|
47
42
|
}
|
|
48
|
-
|
|
49
|
-
let output = (result === null || result === void 0 ? void 0 : result.failures.length) ? result.output : "";
|
|
43
|
+
let output = "";
|
|
50
44
|
const versionsToTest = range(minVersion, maxVersion).map((versionName) => ({
|
|
51
45
|
versionName,
|
|
52
46
|
path: (0, utils_1.typeScriptPath)(versionName, tsLocal),
|
|
53
47
|
}));
|
|
54
48
|
const options = {
|
|
55
49
|
cwd: dirPath,
|
|
50
|
+
baseConfig: {
|
|
51
|
+
overrides: [
|
|
52
|
+
{
|
|
53
|
+
files: ["*.ts", "*.cts", "*.mts", "*.tsx"],
|
|
54
|
+
rules: {
|
|
55
|
+
"@definitelytyped/npm-naming": "error",
|
|
56
|
+
},
|
|
57
|
+
},
|
|
58
|
+
],
|
|
59
|
+
},
|
|
56
60
|
overrideConfig: {
|
|
57
61
|
overrides: [
|
|
58
62
|
{
|
|
@@ -140,16 +144,6 @@ exports.checkTslintJson = checkTslintJson;
|
|
|
140
144
|
function getConfigPath(dirPath) {
|
|
141
145
|
return (0, path_1.join)(dirPath, "tslint.json");
|
|
142
146
|
}
|
|
143
|
-
function getLintConfig(expectedConfigPath) {
|
|
144
|
-
const configExists = fs_1.default.existsSync(expectedConfigPath);
|
|
145
|
-
const configPath = configExists ? expectedConfigPath : (0, path_1.join)(__dirname, "..", "dtslint.json");
|
|
146
|
-
// Second param to `findConfiguration` doesn't matter, since config path is provided.
|
|
147
|
-
const config = tslint_1.Configuration.findConfiguration(configPath, "").results;
|
|
148
|
-
if (!config) {
|
|
149
|
-
throw new Error(`Could not load config at ${configPath}`);
|
|
150
|
-
}
|
|
151
|
-
return config;
|
|
152
|
-
}
|
|
153
147
|
function range(minVersion, maxVersion) {
|
|
154
148
|
if (minVersion === "local") {
|
|
155
149
|
assert(maxVersion === "local");
|
package/dist/lint.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":";;;;;;AAAA,8EAAyE;AACzE,kDAAsE;AACtE,iCAAkC;AAClC,4CAAoB;AACpB,+BAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"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"}
|
package/dist/updateConfig.js
CHANGED
|
@@ -15,7 +15,6 @@ const path = require("path");
|
|
|
15
15
|
const tslint_1 = require("tslint");
|
|
16
16
|
const yargs = require("yargs");
|
|
17
17
|
const lint_1 = require("./lint");
|
|
18
|
-
const npmNamingRule_1 = require("./rules/npmNamingRule");
|
|
19
18
|
// Rule "expect" needs TypeScript version information, which this script doesn't collect.
|
|
20
19
|
const ignoredRules = ["expect"];
|
|
21
20
|
function main() {
|
|
@@ -190,9 +189,6 @@ function walkPackageDir(rootDir) {
|
|
|
190
189
|
function isVersionDir(dirName) {
|
|
191
190
|
return /^ts\d+\.\d$/.test(dirName) || /^v\d+(\.\d+)?$/.test(dirName);
|
|
192
191
|
}
|
|
193
|
-
const defaultDisabler = () => {
|
|
194
|
-
return false;
|
|
195
|
-
};
|
|
196
192
|
function disableRules(allFailures) {
|
|
197
193
|
const ruleToFailures = new Map();
|
|
198
194
|
for (const failure of allFailures) {
|
|
@@ -205,14 +201,11 @@ function disableRules(allFailures) {
|
|
|
205
201
|
}
|
|
206
202
|
}
|
|
207
203
|
const newRulesConfig = {};
|
|
208
|
-
ruleToFailures.
|
|
209
|
-
if (ignoredRules.includes(rule)) {
|
|
210
|
-
|
|
204
|
+
for (const rule of ruleToFailures.keys()) {
|
|
205
|
+
if (!ignoredRules.includes(rule)) {
|
|
206
|
+
newRulesConfig[rule] = false;
|
|
211
207
|
}
|
|
212
|
-
|
|
213
|
-
const opts = disabler(failures);
|
|
214
|
-
newRulesConfig[rule] = opts;
|
|
215
|
-
});
|
|
208
|
+
}
|
|
216
209
|
return newRulesConfig;
|
|
217
210
|
}
|
|
218
211
|
if (require.main === module) {
|
package/dist/updateConfig.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateConfig.js","sourceRoot":"","sources":["../src/updateConfig.ts"],"names":[],"mappings":";AAAA,gGAAgG;AAChG,iGAAiG;AACjG,2EAA2E;AAC3E,4FAA4F;AAC5F,sFAAsF;AACtF,oGAAoG;AACpG,gFAAgF;AAChF,0FAA0F;;AAE1F,oCAAqC;AACrC,yBAA0B;AAC1B,mDAAoD;AACpD,6BAA8B;AAC9B,mCAAoH;AAEpH,+BAAgC;AAChC,iCAA8C;
|
|
1
|
+
{"version":3,"file":"updateConfig.js","sourceRoot":"","sources":["../src/updateConfig.ts"],"names":[],"mappings":";AAAA,gGAAgG;AAChG,iGAAiG;AACjG,2EAA2E;AAC3E,4FAA4F;AAC5F,sFAAsF;AACtF,oGAAoG;AACpG,gFAAgF;AAChF,0FAA0F;;AAE1F,oCAAqC;AACrC,yBAA0B;AAC1B,mDAAoD;AACpD,6BAA8B;AAC9B,mCAAoH;AAEpH,+BAAgC;AAChC,iCAA8C;AAE9C,yFAAyF;AACzF,MAAM,YAAY,GAAa,CAAC,QAAQ,CAAC,CAAC;AAE1C,SAAS,IAAI;IACX,MAAM,IAAI,GAAG,KAAK;SACf,KAAK,CACJ;oEAC8D,CAC/D;SACA,MAAM,CAAC,SAAS,EAAE;QACjB,QAAQ,EAAE,qBAAqB;QAC/B,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE,IAAI;KAChB,CAAC;SACD,MAAM,CAAC,IAAI,EAAE;QACZ,QAAQ,EAAE,2CAA2C;QACrD,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE,SAAS;KACrB,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,QAAQ,EAAE,yEAAyE;QACnF,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,EAAc;KACxB,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;SACxE;QACD,MAAM,gBAAgB,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACjF,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,SAAS,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;SAC1F;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;SACD,SAAS,EAAE,CAAC;IAEf,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;KACnD;SAAM,IAAI,IAAI,CAAC,EAAE,EAAE;QAClB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;KAC1C;AACH,CAAC;AAED,MAAM,YAAY,GAAG,SAAS,CAAC;AAE/B,SAAS,QAAQ,CAAC,YAAsB;IACtC,MAAM,MAAM,GAAG,sBAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;IAC9D,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,4BAA4B,YAAY,GAAG,CAAC,CAAC;KAC9D;IACD,wCAAwC;IACxC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE;QAC1C,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC;QAC/B,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE;YAC5F,QAAQ,CAAC,YAAY,GAAG,KAAK,CAAC;SAC/B;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,SAAS,CAAC,MAAc,EAAE,MAAiC;IAClE,MAAM,QAAQ,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5D,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;QAC1B,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;KACxD;AACH,CAAC;AAED,SAAS,aAAa,CAAC,OAAe,EAAE,UAAqC;IAC3E,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC7B,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IAEzC,MAAM,UAAU,GAAmB;QACjC,GAAG,EAAE,KAAK;KACX,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;QAC1B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACjD,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACrD,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;YAC5E,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;SAC7B;KACF;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAe;IAC1C,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,EAAE;QACrD,EAAE,CAAC,QAAQ,CAAC,+EAA+E,EAAE;YAC3F,QAAQ,EAAE,MAAM;YAChB,GAAG,EAAE,OAAO;SACb,CAAC,CAAC;KACJ;AACH,CAAC;AAED,SAAS,gBAAgB,CACvB,MAA4B,EAC5B,QAA+B,EAC/B,UAAqC;IAErC,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;QAC9C,IAAI,QAAQ,CAAC,YAAY,KAAK,KAAK,EAAE;YACnC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC5B;IACH,CAAC,CAAC,CAAC;IACH,MAAM,QAAQ,GAA0B,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;IAC3D,IAAI,cAAc,GAA0B,EAAE,CAAC;IAC/C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACxC,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC9B,SAAS;SACV;QACD,cAAc,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;KACvC;IACD,cAAc,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,QAAQ,EAAE,CAAC;IACpD,OAAO,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;AAC9C,CAAC;AAED;;;;GAIG;AACH,MAAM,WAAW;IAIf,YAAoB,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;QAH3B,UAAK,GAAoB,EAAE,CAAC;QAIlC,IAAI,CAAC,OAAO,GAAG,eAAM,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;IAChF,CAAC;IAED,MAAM;QACJ,OAAO,sBAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,OAAO,CAAC,QAAgB;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACvB;IACH,CAAC;IAED,IAAI,CAAC,IAAoB,EAAE,MAAiC;QAC1D,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC7B,IAAI,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;gBAChD,SAAS;aACV;YACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC/C;QACD,OAAO,MAAM,CAAC,SAAS,EAAE,CAAC;IAC5B,CAAC;IAED,YAAY,CAAC,MAA4B;QACvC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE;YACxF,QAAQ,EAAE,MAAM;YAChB,IAAI,EAAE,GAAG;SACV,CAAC,CAAC;IACL,CAAC;CACF;AAED,SAAS,UAAU,CAAC,IAAmB,EAAE,OAAe,EAAE,OAAmB;IAC3E,OAAO,OAAO,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,IAAA,2BAAoB,EAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;AAChH,CAAC;AAED,SAAS,cAAc,CAAC,OAAe;IACrC,MAAM,QAAQ,GAAkB,EAAE,CAAC;IAEnC,SAAS,IAAI,CAAC,UAAuB,EAAE,GAAW;QAChD,KAAK,MAAM,GAAG,IAAI,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE;YAChF,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE;gBAChB,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aAC7B;iBAAM,IAAI,GAAG,CAAC,WAAW,EAAE,IAAI,GAAG,CAAC,IAAI,KAAK,cAAc,EAAE;gBAC3D,IAAI,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC1B,MAAM,UAAU,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;oBAC5C,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAC1B,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;iBAC3B;qBAAM;oBACL,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;iBAC3B;aACF;SACF;IACH,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3B,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC3B,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,SAAS,YAAY,CAAC,OAAe;IACnC,OAAO,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,YAAY,CAAC,WAA0B;IAC9C,MAAM,cAAc,GAAoC,IAAI,GAAG,EAAE,CAAC;IAClE,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE;QACjC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QACrC,IAAI,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;YAC5C,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC7D;aAAM;YACL,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;SACzD;KACF;IAED,MAAM,cAAc,GAA0B,EAAE,CAAC;IACjD,KAAK,MAAM,IAAI,IAAI,cAAc,CAAC,IAAI,EAAE,EAAE;QACxC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAChC,cAAc,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;SAC9B;KACF;IAED,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;IAC3B,IAAI,EAAE,CAAC;CACR"}
|
package/dist/util.d.ts
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
import * as ts from "typescript";
|
|
2
2
|
export declare function packageNameFromPath(path: string): string;
|
|
3
3
|
export declare function readJson(path: string): any;
|
|
4
|
-
export declare function failure(ruleName: string, s: string): string;
|
|
5
4
|
export declare function getCompilerOptions(dirPath: string): ts.CompilerOptions;
|
|
6
|
-
export declare function isMainFile(fileName: string, allowNested: boolean): boolean;
|
package/dist/util.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.getCompilerOptions = exports.readJson = exports.packageNameFromPath = void 0;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const stripJsonComments = require("strip-json-comments");
|
|
@@ -17,10 +17,6 @@ function readJson(path) {
|
|
|
17
17
|
return JSON.parse(stripJsonComments(text));
|
|
18
18
|
}
|
|
19
19
|
exports.readJson = readJson;
|
|
20
|
-
function failure(ruleName, s) {
|
|
21
|
-
return `${s} See: https://github.com/microsoft/DefinitelyTyped-tools/blob/master/packages/dtslint/docs/${ruleName}.md`;
|
|
22
|
-
}
|
|
23
|
-
exports.failure = failure;
|
|
24
20
|
function getCompilerOptions(dirPath) {
|
|
25
21
|
const tsconfigPath = (0, path_1.join)(dirPath, "tsconfig.json");
|
|
26
22
|
if (!fs_1.default.existsSync(tsconfigPath)) {
|
|
@@ -29,22 +25,4 @@ function getCompilerOptions(dirPath) {
|
|
|
29
25
|
return readJson(tsconfigPath).compilerOptions;
|
|
30
26
|
}
|
|
31
27
|
exports.getCompilerOptions = getCompilerOptions;
|
|
32
|
-
function isMainFile(fileName, allowNested) {
|
|
33
|
-
// Linter may be run with cwd of the package. We want `index.d.ts` but not `submodule/index.d.ts` to match.
|
|
34
|
-
if (fileName === "index.d.ts") {
|
|
35
|
-
return true;
|
|
36
|
-
}
|
|
37
|
-
if ((0, path_1.basename)(fileName) !== "index.d.ts") {
|
|
38
|
-
return false;
|
|
39
|
-
}
|
|
40
|
-
let parent = (0, path_1.dirname)(fileName);
|
|
41
|
-
// May be a directory for an older version, e.g. `v0`.
|
|
42
|
-
// Note a types redirect `foo/ts3.1` should not have its own header.
|
|
43
|
-
if (allowNested && /^v(0\.)?\d+$/.test((0, path_1.basename)(parent))) {
|
|
44
|
-
parent = (0, path_1.dirname)(parent);
|
|
45
|
-
}
|
|
46
|
-
// Allow "types/foo/index.d.ts", not "types/foo/utils/index.d.ts"
|
|
47
|
-
return (0, path_1.basename)((0, path_1.dirname)(parent)) === "types";
|
|
48
|
-
}
|
|
49
|
-
exports.isMainFile = isMainFile;
|
|
50
28
|
//# sourceMappingURL=util.js.map
|
package/dist/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,+BAA+C;AAC/C,yDAA0D;AAG1D,SAAgB,mBAAmB,CAAC,IAAY;IAC9C,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;IAC5B,OAAO,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAChG,CAAC;AAHD,kDAGC;AACD,SAAgB,QAAQ,CAAC,IAAY;IACnC,MAAM,IAAI,GAAG,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5C,OAAO,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7C,CAAC;AAHD,4BAGC;AAED,SAAgB,
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,+BAA+C;AAC/C,yDAA0D;AAG1D,SAAgB,mBAAmB,CAAC,IAAY;IAC9C,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;IAC5B,OAAO,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAChG,CAAC;AAHD,kDAGC;AACD,SAAgB,QAAQ,CAAC,IAAY;IACnC,MAAM,IAAI,GAAG,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5C,OAAO,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7C,CAAC;AAHD,4BAGC;AAED,SAAgB,kBAAkB,CAAC,OAAe;IAChD,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACpD,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,kCAAkC,OAAO,EAAE,CAAC,CAAC;KAC9D;IACD,OAAO,QAAQ,CAAC,YAAY,CAAC,CAAC,eAAqC,CAAC;AACtE,CAAC;AAND,gDAMC"}
|
package/dt.json
CHANGED
package/dtslint.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@definitelytyped/dtslint",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.201",
|
|
4
4
|
"description": "Runs tests on TypeScript definition files",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"bin": "./dist/index.js",
|
|
@@ -29,9 +29,8 @@
|
|
|
29
29
|
"strip-json-comments": "^3.1.1",
|
|
30
30
|
"tslint": "5.14.0",
|
|
31
31
|
"yargs": "^17.7.2",
|
|
32
|
-
"@definitelytyped/dts-critic": "0.0.191",
|
|
33
|
-
"@definitelytyped/header-parser": "0.0.190",
|
|
34
32
|
"@definitelytyped/typescript-versions": "0.0.182",
|
|
33
|
+
"@definitelytyped/header-parser": "0.0.190",
|
|
35
34
|
"@definitelytyped/utils": "0.0.188"
|
|
36
35
|
},
|
|
37
36
|
"peerDependencies": {
|
package/src/index.ts
CHANGED
|
@@ -26,6 +26,12 @@ async function main(): Promise<void> {
|
|
|
26
26
|
let tsLocal: string | undefined;
|
|
27
27
|
|
|
28
28
|
console.log(`dtslint@${require("../package.json").version}`);
|
|
29
|
+
if (args.length === 1 && args[0] === "types") {
|
|
30
|
+
console.log(
|
|
31
|
+
"Please provide a package name to test.\nTo test all changed packages at once, run `pnpm run test-all`.",
|
|
32
|
+
);
|
|
33
|
+
process.exit(1);
|
|
34
|
+
}
|
|
29
35
|
|
|
30
36
|
for (const arg of args) {
|
|
31
37
|
if (lookingForTsLocal) {
|
package/src/lint.ts
CHANGED
|
@@ -3,11 +3,9 @@ import { typeScriptPath, withoutStart } from "@definitelytyped/utils";
|
|
|
3
3
|
import assert = require("assert");
|
|
4
4
|
import fs from "fs";
|
|
5
5
|
import { join as joinPaths, normalize } from "path";
|
|
6
|
-
import {
|
|
6
|
+
import { Linter } from "tslint";
|
|
7
7
|
import { ESLint } from "eslint";
|
|
8
8
|
import * as TsType from "typescript";
|
|
9
|
-
type Configuration = typeof Configuration;
|
|
10
|
-
type IConfigurationFile = Configuration.IConfigurationFile;
|
|
11
9
|
|
|
12
10
|
import { readJson } from "./util";
|
|
13
11
|
|
|
@@ -27,12 +25,8 @@ export async function lint(
|
|
|
27
25
|
// TODO: To remove tslint, replace this with a ts.createProgram (probably)
|
|
28
26
|
const lintProgram = Linter.createProgram(tsconfigPath);
|
|
29
27
|
|
|
30
|
-
// tslint no longer checks ExpectType; skip linting entirely if we're only checking ExpectType.
|
|
31
|
-
const linter = !expectOnly ? new Linter({ fix: false, formatter: "stylish" }, lintProgram) : undefined;
|
|
32
|
-
const configPath = getConfigPath(dirPath);
|
|
33
28
|
// TODO: To port expect-rule, eslint's config will also need to include [minVersion, maxVersion]
|
|
34
29
|
// Also: expect-rule should be renamed to expect-type or check-type or something
|
|
35
|
-
const config = getLintConfig(configPath);
|
|
36
30
|
const esfiles = [];
|
|
37
31
|
|
|
38
32
|
for (const file of lintProgram.getSourceFiles()) {
|
|
@@ -53,12 +47,10 @@ export async function lint(
|
|
|
53
47
|
// External dependencies should have been handled by `testDependencies`;
|
|
54
48
|
// typesVersions should be handled in a separate lint
|
|
55
49
|
if (!isExternalDependency(file, dirPath, lintProgram) && (!isLatest || !isTypesVersionPath(fileName, dirPath))) {
|
|
56
|
-
linter?.lint(fileName, text, config);
|
|
57
50
|
esfiles.push(fileName);
|
|
58
51
|
}
|
|
59
52
|
}
|
|
60
|
-
|
|
61
|
-
let output = result?.failures.length ? result.output : "";
|
|
53
|
+
let output = "";
|
|
62
54
|
|
|
63
55
|
const versionsToTest = range(minVersion, maxVersion).map((versionName) => ({
|
|
64
56
|
versionName,
|
|
@@ -67,6 +59,16 @@ export async function lint(
|
|
|
67
59
|
|
|
68
60
|
const options: ESLint.Options = {
|
|
69
61
|
cwd: dirPath,
|
|
62
|
+
baseConfig: {
|
|
63
|
+
overrides: [
|
|
64
|
+
{
|
|
65
|
+
files: ["*.ts", "*.cts", "*.mts", "*.tsx"],
|
|
66
|
+
rules: {
|
|
67
|
+
"@definitelytyped/npm-naming": "error",
|
|
68
|
+
},
|
|
69
|
+
},
|
|
70
|
+
],
|
|
71
|
+
},
|
|
70
72
|
overrideConfig: {
|
|
71
73
|
overrides: [
|
|
72
74
|
{
|
|
@@ -169,18 +171,6 @@ function getConfigPath(dirPath: string): string {
|
|
|
169
171
|
return joinPaths(dirPath, "tslint.json");
|
|
170
172
|
}
|
|
171
173
|
|
|
172
|
-
function getLintConfig(expectedConfigPath: string): IConfigurationFile {
|
|
173
|
-
const configExists = fs.existsSync(expectedConfigPath);
|
|
174
|
-
const configPath = configExists ? expectedConfigPath : joinPaths(__dirname, "..", "dtslint.json");
|
|
175
|
-
// Second param to `findConfiguration` doesn't matter, since config path is provided.
|
|
176
|
-
const config = Configuration.findConfiguration(configPath, "").results;
|
|
177
|
-
if (!config) {
|
|
178
|
-
throw new Error(`Could not load config at ${configPath}`);
|
|
179
|
-
}
|
|
180
|
-
|
|
181
|
-
return config;
|
|
182
|
-
}
|
|
183
|
-
|
|
184
174
|
function range(minVersion: TsVersion, maxVersion: TsVersion): readonly TsVersion[] {
|
|
185
175
|
if (minVersion === "local") {
|
|
186
176
|
assert(maxVersion === "local");
|
package/src/updateConfig.ts
CHANGED
|
@@ -15,7 +15,6 @@ import { Configuration as Config, ILinterOptions, IRuleFailureJson, Linter, Lint
|
|
|
15
15
|
import * as ts from "typescript";
|
|
16
16
|
import yargs = require("yargs");
|
|
17
17
|
import { isExternalDependency } from "./lint";
|
|
18
|
-
import { disabler as npmNamingDisabler } from "./rules/npmNamingRule";
|
|
19
18
|
|
|
20
19
|
// Rule "expect" needs TypeScript version information, which this script doesn't collect.
|
|
21
20
|
const ignoredRules: string[] = ["expect"];
|
|
@@ -216,12 +215,6 @@ function isVersionDir(dirName: string): boolean {
|
|
|
216
215
|
return /^ts\d+\.\d$/.test(dirName) || /^v\d+(\.\d+)?$/.test(dirName);
|
|
217
216
|
}
|
|
218
217
|
|
|
219
|
-
type RuleOptions = boolean | unknown[];
|
|
220
|
-
type RuleDisabler = (failures: IRuleFailureJson[]) => RuleOptions;
|
|
221
|
-
const defaultDisabler: RuleDisabler = () => {
|
|
222
|
-
return false;
|
|
223
|
-
};
|
|
224
|
-
|
|
225
218
|
function disableRules(allFailures: RuleFailure[]): Config.RawRulesConfig {
|
|
226
219
|
const ruleToFailures: Map<string, IRuleFailureJson[]> = new Map();
|
|
227
220
|
for (const failure of allFailures) {
|
|
@@ -234,14 +227,11 @@ function disableRules(allFailures: RuleFailure[]): Config.RawRulesConfig {
|
|
|
234
227
|
}
|
|
235
228
|
|
|
236
229
|
const newRulesConfig: Config.RawRulesConfig = {};
|
|
237
|
-
ruleToFailures.
|
|
238
|
-
if (ignoredRules.includes(rule)) {
|
|
239
|
-
|
|
230
|
+
for (const rule of ruleToFailures.keys()) {
|
|
231
|
+
if (!ignoredRules.includes(rule)) {
|
|
232
|
+
newRulesConfig[rule] = false;
|
|
240
233
|
}
|
|
241
|
-
|
|
242
|
-
const opts: RuleOptions = disabler(failures);
|
|
243
|
-
newRulesConfig[rule] = opts;
|
|
244
|
-
});
|
|
234
|
+
}
|
|
245
235
|
|
|
246
236
|
return newRulesConfig;
|
|
247
237
|
}
|
package/src/util.ts
CHANGED
|
@@ -12,10 +12,6 @@ export function readJson(path: string) {
|
|
|
12
12
|
return JSON.parse(stripJsonComments(text));
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
export function failure(ruleName: string, s: string): string {
|
|
16
|
-
return `${s} See: https://github.com/microsoft/DefinitelyTyped-tools/blob/master/packages/dtslint/docs/${ruleName}.md`;
|
|
17
|
-
}
|
|
18
|
-
|
|
19
15
|
export function getCompilerOptions(dirPath: string): ts.CompilerOptions {
|
|
20
16
|
const tsconfigPath = join(dirPath, "tsconfig.json");
|
|
21
17
|
if (!fs.existsSync(tsconfigPath)) {
|
|
@@ -23,24 +19,3 @@ export function getCompilerOptions(dirPath: string): ts.CompilerOptions {
|
|
|
23
19
|
}
|
|
24
20
|
return readJson(tsconfigPath).compilerOptions as ts.CompilerOptions;
|
|
25
21
|
}
|
|
26
|
-
|
|
27
|
-
export function isMainFile(fileName: string, allowNested: boolean) {
|
|
28
|
-
// Linter may be run with cwd of the package. We want `index.d.ts` but not `submodule/index.d.ts` to match.
|
|
29
|
-
if (fileName === "index.d.ts") {
|
|
30
|
-
return true;
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
if (basename(fileName) !== "index.d.ts") {
|
|
34
|
-
return false;
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
let parent = dirname(fileName);
|
|
38
|
-
// May be a directory for an older version, e.g. `v0`.
|
|
39
|
-
// Note a types redirect `foo/ts3.1` should not have its own header.
|
|
40
|
-
if (allowNested && /^v(0\.)?\d+$/.test(basename(parent))) {
|
|
41
|
-
parent = dirname(parent);
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
// Allow "types/foo/index.d.ts", not "types/foo/utils/index.d.ts"
|
|
45
|
-
return basename(dirname(parent)) === "types";
|
|
46
|
-
}
|