@monorepolint/rules 0.5.0-alpha.82 → 0.5.0-alpha.85
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/lib/__tests__/alphabeticalScripts.spec.js +22 -24
- package/lib/__tests__/alphabeticalScripts.spec.js.map +1 -1
- package/lib/__tests__/bannedDependencies.spec.js +67 -9
- package/lib/__tests__/bannedDependencies.spec.js.map +1 -1
- package/lib/__tests__/consistentDependencies.spec.js +11 -10
- package/lib/__tests__/consistentDependencies.spec.js.map +1 -1
- package/lib/__tests__/consistentVersions.spec.js +23 -22
- package/lib/__tests__/consistentVersions.spec.js.map +1 -1
- package/lib/__tests__/fileContents.spec.js +25 -32
- package/lib/__tests__/fileContents.spec.js.map +1 -1
- package/lib/__tests__/mustSatisfyPeerDependencies.spec.js +49 -48
- package/lib/__tests__/mustSatisfyPeerDependencies.spec.js.map +1 -1
- package/lib/__tests__/nestedWorkspaces.spec.js +10 -8
- package/lib/__tests__/nestedWorkspaces.spec.js.map +1 -1
- package/lib/__tests__/packageEntry.spec.js +47 -40
- package/lib/__tests__/packageEntry.spec.js.map +1 -1
- package/lib/__tests__/packageOrder.spec.js +34 -33
- package/lib/__tests__/packageOrder.spec.js.map +1 -1
- package/lib/__tests__/packageScript.spec.js +50 -51
- package/lib/__tests__/packageScript.spec.js.map +1 -1
- package/lib/__tests__/requireDependency.spec.js +12 -11
- package/lib/__tests__/requireDependency.spec.js.map +1 -1
- package/lib/__tests__/utils.d.ts +68 -1
- package/lib/__tests__/utils.d.ts.map +1 -1
- package/lib/__tests__/utils.js +70 -21
- package/lib/__tests__/utils.js.map +1 -1
- package/lib/alphabeticalDependencies.js +3 -3
- package/lib/alphabeticalDependencies.js.map +1 -1
- package/lib/alphabeticalScripts.js +1 -1
- package/lib/alphabeticalScripts.js.map +1 -1
- package/lib/bannedDependencies.d.ts +21 -12
- package/lib/bannedDependencies.d.ts.map +1 -1
- package/lib/bannedDependencies.js +86 -57
- package/lib/bannedDependencies.js.map +1 -1
- package/lib/consistentDependencies.d.ts +6 -6
- package/lib/consistentDependencies.d.ts.map +1 -1
- package/lib/consistentDependencies.js +2 -3
- package/lib/consistentDependencies.js.map +1 -1
- package/lib/consistentVersions.d.ts +1 -1
- package/lib/consistentVersions.js +8 -8
- package/lib/consistentVersions.js.map +1 -1
- package/lib/fileContents.d.ts +8 -8
- package/lib/fileContents.d.ts.map +1 -1
- package/lib/fileContents.js +32 -31
- package/lib/fileContents.js.map +1 -1
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/lib/mustSatisfyPeerDependencies.d.ts +31 -31
- package/lib/mustSatisfyPeerDependencies.d.ts.map +1 -1
- package/lib/mustSatisfyPeerDependencies.js +18 -16
- package/lib/mustSatisfyPeerDependencies.js.map +1 -1
- package/lib/packageEntry.d.ts +11 -20
- package/lib/packageEntry.d.ts.map +1 -1
- package/lib/packageEntry.js +15 -7
- package/lib/packageEntry.js.map +1 -1
- package/lib/packageOrder.d.ts +3 -3
- package/lib/packageOrder.d.ts.map +1 -1
- package/lib/packageOrder.js +2 -3
- package/lib/packageOrder.js.map +1 -1
- package/lib/packageScript.d.ts +10 -10
- package/lib/packageScript.js +4 -4
- package/lib/packageScript.js.map +1 -1
- package/lib/requireDependency.d.ts +6 -6
- package/lib/requireDependency.d.ts.map +1 -1
- package/lib/requireDependency.js +3 -3
- package/lib/requireDependency.js.map +1 -1
- package/lib/standardTsconfig.d.ts +10 -10
- package/lib/standardTsconfig.d.ts.map +1 -1
- package/lib/standardTsconfig.js +26 -21
- package/lib/standardTsconfig.js.map +1 -1
- package/lib/util/checkAlpha.d.ts +1 -0
- package/lib/util/checkAlpha.d.ts.map +1 -1
- package/lib/util/checkAlpha.js +8 -5
- package/lib/util/checkAlpha.js.map +1 -1
- package/lib/util/makeDirectory.js +2 -2
- package/lib/util/makeDirectory.js.map +1 -1
- package/lib/util/packageDependencyGraphService.d.ts +3 -3
- package/lib/util/packageDependencyGraphService.d.ts.map +1 -1
- package/lib/util/packageDependencyGraphService.js +3 -3
- package/lib/util/packageDependencyGraphService.js.map +1 -1
- package/package.json +8 -9
- package/src/__tests__/alphabeticalScripts.spec.ts +27 -28
- package/src/__tests__/bannedDependencies.spec.ts +80 -6
- package/src/__tests__/consistentDependencies.spec.ts +11 -6
- package/src/__tests__/consistentVersions.spec.ts +32 -27
- package/src/__tests__/fileContents.spec.ts +32 -40
- package/src/__tests__/mustSatisfyPeerDependencies.spec.ts +52 -47
- package/src/__tests__/nestedWorkspaces.spec.ts +12 -6
- package/src/__tests__/packageEntry.spec.ts +64 -45
- package/src/__tests__/packageOrder.spec.ts +46 -40
- package/src/__tests__/packageScript.spec.ts +62 -54
- package/src/__tests__/requireDependency.spec.ts +11 -6
- package/src/__tests__/utils.ts +109 -19
- package/src/bannedDependencies.ts +106 -74
- package/src/consistentDependencies.ts +1 -2
- package/src/consistentVersions.ts +2 -2
- package/src/fileContents.ts +32 -30
- package/src/mustSatisfyPeerDependencies.ts +6 -2
- package/src/packageEntry.ts +13 -5
- package/src/packageOrder.ts +1 -2
- package/src/packageScript.ts +2 -2
- package/src/requireDependency.ts +2 -2
- package/src/standardTsconfig.ts +22 -19
- package/src/util/checkAlpha.ts +6 -3
- package/src/util/packageDependencyGraphService.ts +8 -5
- package/tsconfig.tsbuildinfo +1 -6233
package/lib/packageEntry.d.ts
CHANGED
|
@@ -6,29 +6,20 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { RuleModule } from "@monorepolint/core";
|
|
8
8
|
import * as r from "runtypes";
|
|
9
|
-
export declare const Options: r.
|
|
10
|
-
entries: r.
|
|
11
|
-
}, false>, r.
|
|
9
|
+
export declare const Options: r.Union<[r.Intersect<[r.Record<{
|
|
10
|
+
entries: r.Dictionary<r.Unknown, string | number | symbol>;
|
|
11
|
+
}, false>, r.Partial<{
|
|
12
12
|
entriesExist: r.Literal<undefined>;
|
|
13
|
-
}
|
|
13
|
+
}, false>]>, r.Intersect<[r.Record<{
|
|
14
14
|
entriesExist: r.Array<r.String, false>;
|
|
15
|
-
}, false>, r.
|
|
15
|
+
}, false>, r.Partial<{
|
|
16
16
|
entries: r.Literal<undefined>;
|
|
17
|
-
}
|
|
18
|
-
entries: r.
|
|
17
|
+
}, false>]>, r.Record<{
|
|
18
|
+
entries: r.Dictionary<r.Unknown, string | number | symbol>;
|
|
19
19
|
entriesExist: r.Array<r.String, false>;
|
|
20
|
-
}, false
|
|
20
|
+
}, false>]>;
|
|
21
21
|
export declare type Options = r.Static<typeof Options>;
|
|
22
|
-
export declare const packageEntry: RuleModule<
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
entriesExist: r.Literal<undefined>;
|
|
26
|
-
}>>, r.Intersect2<r.Record<{
|
|
27
|
-
entriesExist: r.Array<r.String, false>;
|
|
28
|
-
}, false>, r.Part<{
|
|
29
|
-
entries: r.Literal<undefined>;
|
|
30
|
-
}>>, r.Record<{
|
|
31
|
-
entries: r.StringDictionary<r.Unknown>;
|
|
32
|
-
entriesExist: r.Array<r.String, false>;
|
|
33
|
-
}, false>>>;
|
|
22
|
+
export declare const packageEntry: RuleModule<typeof Options>;
|
|
23
|
+
export declare function createStandardizedEntryErrorMessage(key: string): string;
|
|
24
|
+
export declare function createExpectedEntryErrorMessage(key: string): string;
|
|
34
25
|
//# sourceMappingURL=packageEntry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageEntry.d.ts","sourceRoot":"","sources":["../src/packageEntry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAW,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGzD,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAE9B,eAAO,MAAM,OAAO;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"packageEntry.d.ts","sourceRoot":"","sources":["../src/packageEntry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAW,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGzD,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAE9B,eAAO,MAAM,OAAO;;;;;;;;;;;WAuBnB,CAAC;AAEF,oBAAY,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,OAAO,CAAC,CAAC;AAE/C,eAAO,MAAM,YAAY,EAAE,UAAU,CAAC,OAAO,OAAO,CAyCnD,CAAC;AAEF,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,MAAM,UAE9D;AAED,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,MAAM,UAE1D"}
|
package/lib/packageEntry.js
CHANGED
|
@@ -6,20 +6,20 @@
|
|
|
6
6
|
*
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.packageEntry = exports.Options = void 0;
|
|
9
|
+
exports.createExpectedEntryErrorMessage = exports.createStandardizedEntryErrorMessage = exports.packageEntry = exports.Options = void 0;
|
|
10
10
|
const tslib_1 = require("tslib");
|
|
11
11
|
const utils_1 = require("@monorepolint/utils");
|
|
12
12
|
const jest_diff_1 = tslib_1.__importDefault(require("jest-diff"));
|
|
13
13
|
const r = tslib_1.__importStar(require("runtypes"));
|
|
14
14
|
exports.Options = r.Union(r
|
|
15
15
|
.Record({
|
|
16
|
-
entries: r.Dictionary(r.Unknown),
|
|
16
|
+
entries: r.Dictionary(r.Unknown), // string => unknown, enforces existence of keys and their values
|
|
17
17
|
})
|
|
18
18
|
.And(r.Partial({
|
|
19
19
|
entriesExist: r.Undefined,
|
|
20
20
|
})), r
|
|
21
21
|
.Record({
|
|
22
|
-
entriesExist: r.Array(r.String),
|
|
22
|
+
entriesExist: r.Array(r.String), // enforces existence of keys, but not values
|
|
23
23
|
})
|
|
24
24
|
.And(r.Partial({
|
|
25
25
|
entries: r.Undefined,
|
|
@@ -33,16 +33,16 @@ exports.packageEntry = {
|
|
|
33
33
|
if (options.entries) {
|
|
34
34
|
for (const key of Object.keys(options.entries)) {
|
|
35
35
|
const value = options.entries[key];
|
|
36
|
-
const entryDiff = jest_diff_1.default(JSON.stringify(value) + "\n", (JSON.stringify(packageJson[key]) || "") + "\n");
|
|
36
|
+
const entryDiff = (0, jest_diff_1.default)(JSON.stringify(value) + "\n", (JSON.stringify(packageJson[key]) || "") + "\n");
|
|
37
37
|
if ((typeof value !== "object" && value !== packageJson[key]) ||
|
|
38
38
|
entryDiff == null ||
|
|
39
39
|
!entryDiff.includes("Compared values have no visual difference")) {
|
|
40
40
|
context.addError({
|
|
41
41
|
file: context.getPackageJsonPath(),
|
|
42
|
-
message:
|
|
42
|
+
message: createStandardizedEntryErrorMessage(key),
|
|
43
43
|
longMessage: entryDiff,
|
|
44
44
|
fixer: () => {
|
|
45
|
-
utils_1.mutateJson(context.getPackageJsonPath(), (input) => {
|
|
45
|
+
(0, utils_1.mutateJson)(context.getPackageJsonPath(), context.host, (input) => {
|
|
46
46
|
input[key] = value;
|
|
47
47
|
return input;
|
|
48
48
|
});
|
|
@@ -56,7 +56,7 @@ exports.packageEntry = {
|
|
|
56
56
|
if (packageJson[key] === undefined) {
|
|
57
57
|
context.addError({
|
|
58
58
|
file: context.getPackageJsonPath(),
|
|
59
|
-
message:
|
|
59
|
+
message: createExpectedEntryErrorMessage(key),
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
62
|
}
|
|
@@ -64,4 +64,12 @@ exports.packageEntry = {
|
|
|
64
64
|
},
|
|
65
65
|
optionsRuntype: exports.Options,
|
|
66
66
|
};
|
|
67
|
+
function createStandardizedEntryErrorMessage(key) {
|
|
68
|
+
return `Expected standardized entry for '${key}'`;
|
|
69
|
+
}
|
|
70
|
+
exports.createStandardizedEntryErrorMessage = createStandardizedEntryErrorMessage;
|
|
71
|
+
function createExpectedEntryErrorMessage(key) {
|
|
72
|
+
return `Expected entry for '${key}' to exist`;
|
|
73
|
+
}
|
|
74
|
+
exports.createExpectedEntryErrorMessage = createExpectedEntryErrorMessage;
|
|
67
75
|
//# sourceMappingURL=packageEntry.js.map
|
package/lib/packageEntry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageEntry.js","sourceRoot":"","sources":["../src/packageEntry.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH,+CAA8D;AAC9D,kEAA6B;AAC7B,oDAA8B;AAEjB,QAAA,OAAO,GAAG,CAAC,CAAC,KAAK,CAC5B,CAAC;KACE,MAAM,CAAC;IACN,OAAO,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"packageEntry.js","sourceRoot":"","sources":["../src/packageEntry.ts"],"names":[],"mappings":"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"}
|
package/lib/packageOrder.d.ts
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { RuleModule } from "@monorepolint/core";
|
|
8
8
|
import * as r from "runtypes";
|
|
9
|
-
export declare const packageOrder: RuleModule<r.
|
|
10
|
-
order: r.
|
|
11
|
-
}, false>, r.Literal<undefined
|
|
9
|
+
export declare const packageOrder: RuleModule<r.Union<[r.Record<{
|
|
10
|
+
order: r.Union<[r.Array<r.String, false>, r.Function]>;
|
|
11
|
+
}, false>, r.Literal<undefined>]>>;
|
|
12
12
|
//# sourceMappingURL=packageOrder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageOrder.d.ts","sourceRoot":"","sources":["../src/packageOrder.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAW,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"packageOrder.d.ts","sourceRoot":"","sources":["../src/packageOrder.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAW,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAyC9B,eAAO,MAAM,YAAY;;kCA8BM,CAAC"}
|
package/lib/packageOrder.js
CHANGED
|
@@ -8,7 +8,6 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.packageOrder = void 0;
|
|
10
10
|
const tslib_1 = require("tslib");
|
|
11
|
-
const utils_1 = require("@monorepolint/utils");
|
|
12
11
|
const jest_diff_1 = tslib_1.__importDefault(require("jest-diff"));
|
|
13
12
|
const r = tslib_1.__importStar(require("runtypes"));
|
|
14
13
|
const Options = r
|
|
@@ -56,13 +55,13 @@ exports.packageOrder = {
|
|
|
56
55
|
context.addError({
|
|
57
56
|
file: packagePath,
|
|
58
57
|
message: "Incorrect order of fields in package.json",
|
|
59
|
-
longMessage: jest_diff_1.default(expectedOrder, actualOrder, { expand: true }),
|
|
58
|
+
longMessage: (0, jest_diff_1.default)(expectedOrder, actualOrder, { expand: true }),
|
|
60
59
|
fixer: () => {
|
|
61
60
|
const expectedPackageJson = {};
|
|
62
61
|
expectedOrder.forEach((key) => {
|
|
63
62
|
expectedPackageJson[key] = packageJson[key];
|
|
64
63
|
});
|
|
65
|
-
|
|
64
|
+
context.host.writeJson(packagePath, expectedPackageJson);
|
|
66
65
|
},
|
|
67
66
|
});
|
|
68
67
|
}
|
package/lib/packageOrder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageOrder.js","sourceRoot":"","sources":["../src/packageOrder.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH
|
|
1
|
+
{"version":3,"file":"packageOrder.js","sourceRoot":"","sources":["../src/packageOrder.ts"],"names":[],"mappings":"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"}
|
package/lib/packageScript.d.ts
CHANGED
|
@@ -7,19 +7,19 @@
|
|
|
7
7
|
import { RuleModule } from "@monorepolint/core";
|
|
8
8
|
import * as r from "runtypes";
|
|
9
9
|
export declare const Options: r.Record<{
|
|
10
|
-
scripts: r.
|
|
11
|
-
options: r.Array<r.
|
|
12
|
-
}, false>, r.
|
|
13
|
-
fixValue: r.
|
|
14
|
-
}
|
|
10
|
+
scripts: r.Dictionary<r.Union<[r.String, r.Intersect<[r.Record<{
|
|
11
|
+
options: r.Array<r.Union<[r.String, r.Literal<undefined>]>, false>;
|
|
12
|
+
}, false>, r.Partial<{
|
|
13
|
+
fixValue: r.Union<[r.String, r.Literal<undefined>, r.Literal<false>]>;
|
|
14
|
+
}, false>]>]>, string | number | symbol>;
|
|
15
15
|
}, false>;
|
|
16
16
|
export declare type Options = r.Static<typeof Options>;
|
|
17
17
|
export declare const MSG_NO_SCRIPTS_BLOCK = "No scripts block in package.json";
|
|
18
18
|
export declare const packageScript: RuleModule<r.Record<{
|
|
19
|
-
scripts: r.
|
|
20
|
-
options: r.Array<r.
|
|
21
|
-
}, false>, r.
|
|
22
|
-
fixValue: r.
|
|
23
|
-
}
|
|
19
|
+
scripts: r.Dictionary<r.Union<[r.String, r.Intersect<[r.Record<{
|
|
20
|
+
options: r.Array<r.Union<[r.String, r.Literal<undefined>]>, false>;
|
|
21
|
+
}, false>, r.Partial<{
|
|
22
|
+
fixValue: r.Union<[r.String, r.Literal<undefined>, r.Literal<false>]>;
|
|
23
|
+
}, false>]>]>, string | number | symbol>;
|
|
24
24
|
}, false>>;
|
|
25
25
|
//# sourceMappingURL=packageScript.d.ts.map
|
package/lib/packageScript.js
CHANGED
|
@@ -18,7 +18,7 @@ exports.Options = r.Record({
|
|
|
18
18
|
})
|
|
19
19
|
.And(r.Partial({
|
|
20
20
|
fixValue: r.Union(r.String, r.Undefined, r.Literal(false)),
|
|
21
|
-
})))),
|
|
21
|
+
})))), // string => string
|
|
22
22
|
});
|
|
23
23
|
exports.MSG_NO_SCRIPTS_BLOCK = "No scripts block in package.json";
|
|
24
24
|
exports.packageScript = {
|
|
@@ -29,7 +29,7 @@ exports.packageScript = {
|
|
|
29
29
|
file: context.getPackageJsonPath(),
|
|
30
30
|
message: exports.MSG_NO_SCRIPTS_BLOCK,
|
|
31
31
|
fixer: () => {
|
|
32
|
-
utils_1.mutateJson(context.getPackageJsonPath(), (input) => {
|
|
32
|
+
(0, utils_1.mutateJson)(context.getPackageJsonPath(), context.host, (input) => {
|
|
33
33
|
input.scripts = {};
|
|
34
34
|
return input;
|
|
35
35
|
});
|
|
@@ -62,7 +62,7 @@ exports.packageScript = {
|
|
|
62
62
|
if (fixValue !== false && (fixValue !== undefined || fixToEmpty === true)) {
|
|
63
63
|
const q = fixValue;
|
|
64
64
|
fixer = () => {
|
|
65
|
-
utils_1.mutateJson(context.getPackageJsonPath(), (input) => {
|
|
65
|
+
(0, utils_1.mutateJson)(context.getPackageJsonPath(), context.host, (input) => {
|
|
66
66
|
if (fixToEmpty && q === undefined) {
|
|
67
67
|
delete input.scripts[name];
|
|
68
68
|
}
|
|
@@ -79,7 +79,7 @@ exports.packageScript = {
|
|
|
79
79
|
context.addError({
|
|
80
80
|
file: context.getPackageJsonPath(),
|
|
81
81
|
message: `Expected standardized script entry for '${name}'. Valid options: ${validOptionsString}`,
|
|
82
|
-
longMessage: jest_diff_1.default(validOptionsString + "\n", (packageJson.scripts[name] || "") + "\n"),
|
|
82
|
+
longMessage: (0, jest_diff_1.default)(validOptionsString + "\n", (packageJson.scripts[name] || "") + "\n"),
|
|
83
83
|
fixer,
|
|
84
84
|
});
|
|
85
85
|
}
|
package/lib/packageScript.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageScript.js","sourceRoot":"","sources":["../src/packageScript.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH,+CAA8D;AAC9D,kEAA6B;AAC7B,oDAA8B;AAEjB,QAAA,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,OAAO,EAAE,CAAC,CAAC,UAAU,CACnB,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,MAAM,EACR,CAAC;SACE,MAAM,CAAC;QACN,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;KAC3C,CAAC;SACD,GAAG,CACF,CAAC,CAAC,OAAO,CAAC;QACR,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KAC3D,CAAC,CACH,CACJ,CACF;
|
|
1
|
+
{"version":3,"file":"packageScript.js","sourceRoot":"","sources":["../src/packageScript.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,10 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { RuleModule } from "@monorepolint/core";
|
|
8
8
|
import * as r from "runtypes";
|
|
9
|
-
export declare const requireDependency: RuleModule<r.
|
|
10
|
-
dependencies: r.
|
|
11
|
-
devDependencies: r.
|
|
12
|
-
peerDependencies: r.
|
|
13
|
-
optionalDependencies: r.
|
|
14
|
-
}>>;
|
|
9
|
+
export declare const requireDependency: RuleModule<r.Partial<{
|
|
10
|
+
dependencies: r.Dictionary<r.String, string | number | symbol>;
|
|
11
|
+
devDependencies: r.Dictionary<r.String, string | number | symbol>;
|
|
12
|
+
peerDependencies: r.Dictionary<r.String, string | number | symbol>;
|
|
13
|
+
optionalDependencies: r.Dictionary<r.String, string | number | symbol>;
|
|
14
|
+
}, false>>;
|
|
15
15
|
//# sourceMappingURL=requireDependency.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requireDependency.d.ts","sourceRoot":"","sources":["../src/requireDependency.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAW,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGzD,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAW9B,eAAO,MAAM,iBAAiB;;;;;
|
|
1
|
+
{"version":3,"file":"requireDependency.d.ts","sourceRoot":"","sources":["../src/requireDependency.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAW,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGzD,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAW9B,eAAO,MAAM,iBAAiB;;;;;UA+CC,CAAC"}
|
package/lib/requireDependency.js
CHANGED
|
@@ -35,7 +35,7 @@ exports.requireDependency = {
|
|
|
35
35
|
file: packageJsonPath,
|
|
36
36
|
message: `No ${type} block, cannot add required ${type}.`,
|
|
37
37
|
fixer: () => {
|
|
38
|
-
utils_1.mutateJson(packageJsonPath, (input) => {
|
|
38
|
+
(0, utils_1.mutateJson)(packageJsonPath, context.host, (input) => {
|
|
39
39
|
input[type] = options[type];
|
|
40
40
|
return input;
|
|
41
41
|
});
|
|
@@ -48,9 +48,9 @@ exports.requireDependency = {
|
|
|
48
48
|
context.addError({
|
|
49
49
|
file: packageJsonPath,
|
|
50
50
|
message: `Expected dependency ${dep}@${version}`,
|
|
51
|
-
longMessage: jest_diff_1.default(`${dep}@${version}\n`, `${dep}@${packageJson[type][dep] || "missing"}\n`),
|
|
51
|
+
longMessage: (0, jest_diff_1.default)(`${dep}@${version}\n`, `${dep}@${packageJson[type][dep] || "missing"}\n`),
|
|
52
52
|
fixer: () => {
|
|
53
|
-
utils_1.mutateJson(packageJsonPath, (input) => {
|
|
53
|
+
(0, utils_1.mutateJson)(packageJsonPath, context.host, (input) => {
|
|
54
54
|
input[type] = { ...input[type], [dep]: version };
|
|
55
55
|
return input;
|
|
56
56
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requireDependency.js","sourceRoot":"","sources":["../src/requireDependency.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH,+CAA8D;AAC9D,kEAA6B;AAC7B,oDAA8B;AAE9B,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;IACxB,YAAY,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;IACpC,eAAe,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;IACvC,gBAAgB,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;IACxC,oBAAoB,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;CAC7C,CAAC,CAAC;AAIU,QAAA,iBAAiB,GAAG;IAC/B,KAAK,EAAE,SAAS,kBAAkB,CAAC,OAAgB,EAAE,OAAgB;QACnE,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;QAC7C,MAAM,eAAe,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAErD;YACE,cAAuB;YACvB,iBAA0B;YAC1B,kBAA2B;YAC3B,sBAA+B;SAChC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAClB,OAAO;aACR;YAED,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;gBACnC,OAAO,CAAC,QAAQ,CAAC;oBACf,IAAI,EAAE,eAAe;oBACrB,OAAO,EAAE,MAAM,IAAI,+BAA+B,IAAI,GAAG;oBACzD,KAAK,EAAE,GAAG,EAAE;wBACV,kBAAU,
|
|
1
|
+
{"version":3,"file":"requireDependency.js","sourceRoot":"","sources":["../src/requireDependency.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH,+CAA8D;AAC9D,kEAA6B;AAC7B,oDAA8B;AAE9B,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;IACxB,YAAY,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;IACpC,eAAe,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;IACvC,gBAAgB,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;IACxC,oBAAoB,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;CAC7C,CAAC,CAAC;AAIU,QAAA,iBAAiB,GAAG;IAC/B,KAAK,EAAE,SAAS,kBAAkB,CAAC,OAAgB,EAAE,OAAgB;QACnE,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;QAC7C,MAAM,eAAe,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAErD;YACE,cAAuB;YACvB,iBAA0B;YAC1B,kBAA2B;YAC3B,sBAA+B;SAChC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAClB,OAAO;aACR;YAED,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;gBACnC,OAAO,CAAC,QAAQ,CAAC;oBACf,IAAI,EAAE,eAAe;oBACrB,OAAO,EAAE,MAAM,IAAI,+BAA+B,IAAI,GAAG;oBACzD,KAAK,EAAE,GAAG,EAAE;wBACV,IAAA,kBAAU,EAAc,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;4BAC/D,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;4BAC5B,OAAO,KAAK,CAAC;wBACf,CAAC,CAAC,CAAC;oBACL,CAAC;iBACF,CAAC,CAAC;gBACH,OAAO;aACR;YAED,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAE,CAAC,EAAE;gBAC3D,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE;oBACtC,OAAO,CAAC,QAAQ,CAAC;wBACf,IAAI,EAAE,eAAe;wBACrB,OAAO,EAAE,uBAAuB,GAAG,IAAI,OAAO,EAAE;wBAChD,WAAW,EAAE,IAAA,mBAAI,EAAC,GAAG,GAAG,IAAI,OAAO,IAAI,EAAE,GAAG,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,SAAS,IAAI,CAAE;wBAC5F,KAAK,EAAE,GAAG,EAAE;4BACV,IAAA,kBAAU,EAAc,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;gCAC/D,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC;gCACjD,OAAO,KAAK,CAAC;4BACf,CAAC,CAAC,CAAC;wBACL,CAAC;qBACF,CAAC,CAAC;iBACJ;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,cAAc,EAAE,OAAO;CACM,CAAC"}
|
|
@@ -6,15 +6,15 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { RuleModule } from "@monorepolint/core";
|
|
8
8
|
import * as r from "runtypes";
|
|
9
|
-
declare const Options: r.Constraint<r.
|
|
9
|
+
declare const Options: r.Constraint<r.Partial<{
|
|
10
10
|
file: r.String;
|
|
11
11
|
generator: r.Function;
|
|
12
12
|
tsconfigReferenceFile: r.String;
|
|
13
|
-
template: r.
|
|
13
|
+
template: r.Union<[r.Record<{}, false>, r.String]>;
|
|
14
14
|
templateFile: r.String;
|
|
15
|
-
excludedReferences: r.
|
|
16
|
-
additionalReferences: r.
|
|
17
|
-
}>, {
|
|
15
|
+
excludedReferences: r.Union<[r.Array<r.String, false>, r.Literal<undefined>]>;
|
|
16
|
+
additionalReferences: r.Union<[r.Array<r.String, false>, r.Literal<undefined>]>;
|
|
17
|
+
}, false>, {
|
|
18
18
|
file?: string | undefined;
|
|
19
19
|
generator?: ((...args: any[]) => any) | undefined;
|
|
20
20
|
tsconfigReferenceFile?: string | undefined;
|
|
@@ -24,15 +24,15 @@ declare const Options: r.Constraint<r.Part<{
|
|
|
24
24
|
additionalReferences?: string[] | undefined;
|
|
25
25
|
}, unknown>;
|
|
26
26
|
export declare type Options = r.Static<typeof Options>;
|
|
27
|
-
export declare const standardTsconfig: RuleModule<r.Constraint<r.
|
|
27
|
+
export declare const standardTsconfig: RuleModule<r.Constraint<r.Partial<{
|
|
28
28
|
file: r.String;
|
|
29
29
|
generator: r.Function;
|
|
30
30
|
tsconfigReferenceFile: r.String;
|
|
31
|
-
template: r.
|
|
31
|
+
template: r.Union<[r.Record<{}, false>, r.String]>;
|
|
32
32
|
templateFile: r.String;
|
|
33
|
-
excludedReferences: r.
|
|
34
|
-
additionalReferences: r.
|
|
35
|
-
}>, {
|
|
33
|
+
excludedReferences: r.Union<[r.Array<r.String, false>, r.Literal<undefined>]>;
|
|
34
|
+
additionalReferences: r.Union<[r.Array<r.String, false>, r.Literal<undefined>]>;
|
|
35
|
+
}, false>, {
|
|
36
36
|
file?: string | undefined;
|
|
37
37
|
generator?: ((...args: any[]) => any) | undefined;
|
|
38
38
|
tsconfigReferenceFile?: string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"standardTsconfig.d.ts","sourceRoot":"","sources":["../src/standardTsconfig.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAW,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"standardTsconfig.d.ts","sourceRoot":"","sources":["../src/standardTsconfig.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAW,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIzD,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAI9B,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;WAuBT,CAAC;AAEL,oBAAY,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,OAAO,CAAC,CAAC;AAE/C,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;YAiCE,CAAC"}
|
package/lib/standardTsconfig.js
CHANGED
|
@@ -8,9 +8,8 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.standardTsconfig = void 0;
|
|
10
10
|
const tslib_1 = require("tslib");
|
|
11
|
-
const
|
|
11
|
+
const utils_1 = require("@monorepolint/utils");
|
|
12
12
|
const jest_diff_1 = tslib_1.__importDefault(require("jest-diff"));
|
|
13
|
-
const minimatch_1 = tslib_1.__importDefault(require("minimatch"));
|
|
14
13
|
const path = tslib_1.__importStar(require("path"));
|
|
15
14
|
const r = tslib_1.__importStar(require("runtypes"));
|
|
16
15
|
const DEFAULT_TSCONFIG_FILENAME = "tsconfig.json";
|
|
@@ -44,7 +43,9 @@ exports.standardTsconfig = {
|
|
|
44
43
|
const fullPath = path.resolve(context.packageDir, tsconfigFileName);
|
|
45
44
|
const generator = getGenerator(context, opts);
|
|
46
45
|
const expectedContent = generator(context);
|
|
47
|
-
const actualContent =
|
|
46
|
+
const actualContent = context.host.exists(fullPath)
|
|
47
|
+
? context.host.readFile(fullPath, { encoding: "utf-8" })
|
|
48
|
+
: undefined;
|
|
48
49
|
if (expectedContent === undefined) {
|
|
49
50
|
context.addWarning({
|
|
50
51
|
file: fullPath,
|
|
@@ -56,9 +57,11 @@ exports.standardTsconfig = {
|
|
|
56
57
|
context.addError({
|
|
57
58
|
file: fullPath,
|
|
58
59
|
message: "Expect file contents to match",
|
|
59
|
-
longMessage: jest_diff_1.default(expectedContent, actualContent, { expand: true }),
|
|
60
|
+
longMessage: (0, jest_diff_1.default)(expectedContent, actualContent, { expand: true }),
|
|
60
61
|
fixer: () => {
|
|
61
|
-
|
|
62
|
+
context.host.writeFile(fullPath, expectedContent, {
|
|
63
|
+
encoding: "utf-8",
|
|
64
|
+
});
|
|
62
65
|
},
|
|
63
66
|
});
|
|
64
67
|
}
|
|
@@ -72,7 +75,7 @@ function getGenerator(context, opts) {
|
|
|
72
75
|
else if (opts.templateFile) {
|
|
73
76
|
const { packageDir: workspacePackageDir } = context.getWorkspaceContext();
|
|
74
77
|
const fullPath = path.resolve(workspacePackageDir, opts.templateFile);
|
|
75
|
-
const template = JSON.parse(
|
|
78
|
+
const template = JSON.parse(context.host.readFile(fullPath, { encoding: "utf-8" }));
|
|
76
79
|
return makeGenerator(template, opts.excludedReferences, opts.additionalReferences, opts.tsconfigReferenceFile);
|
|
77
80
|
}
|
|
78
81
|
else if (opts.template) {
|
|
@@ -82,7 +85,7 @@ function getGenerator(context, opts) {
|
|
|
82
85
|
throw new Error("Unable to make generator");
|
|
83
86
|
}
|
|
84
87
|
}
|
|
85
|
-
function makeGenerator(template, excludedReferences
|
|
88
|
+
function makeGenerator(template, excludedReferences, additionalReferences, tsconfigReferenceFile) {
|
|
86
89
|
return function generator(context) {
|
|
87
90
|
template = {
|
|
88
91
|
...template,
|
|
@@ -91,20 +94,22 @@ function makeGenerator(template, excludedReferences = [], additionalReferences =
|
|
|
91
94
|
const nameToDirectory = context.getWorkspaceContext().getPackageNameToDir();
|
|
92
95
|
const packageJson = context.getPackageJson();
|
|
93
96
|
const deps = [...Object.keys(packageJson.dependencies || {}), ...Object.keys(packageJson.devDependencies || {})];
|
|
94
|
-
deps
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
additionalReferences
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
97
|
+
for (const dep of deps) {
|
|
98
|
+
const packageDir = nameToDirectory.get(dep);
|
|
99
|
+
if (packageDir !== undefined && (excludedReferences === undefined || (0, utils_1.matchesAnyGlob)(dep, excludedReferences))) {
|
|
100
|
+
const absoluteReferencePath = tsconfigReferenceFile !== undefined ? path.join(packageDir, tsconfigReferenceFile) : packageDir;
|
|
101
|
+
template.references.push({
|
|
102
|
+
path: path.relative(context.packageDir, absoluteReferencePath),
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
if (additionalReferences) {
|
|
107
|
+
for (const additionalReference of additionalReferences) {
|
|
108
|
+
template.references.push({
|
|
109
|
+
path: additionalReference,
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
}
|
|
108
113
|
return JSON.stringify(template, undefined, 2) + "\n";
|
|
109
114
|
};
|
|
110
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"standardTsconfig.js","sourceRoot":"","sources":["../src/standardTsconfig.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH
|
|
1
|
+
{"version":3,"file":"standardTsconfig.js","sourceRoot":"","sources":["../src/standardTsconfig.ts"],"names":[],"mappings":"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"}
|
package/lib/util/checkAlpha.d.ts
CHANGED
|
@@ -6,4 +6,5 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { Context } from "@monorepolint/core";
|
|
8
8
|
export declare function checkAlpha(context: Context, block: "dependencies" | "devDependencies" | "peerDependencies" | "scripts"): void;
|
|
9
|
+
export declare function createIncorrectOrderErrorMessage(block: string, packageName: string): string;
|
|
9
10
|
//# sourceMappingURL=checkAlpha.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkAlpha.d.ts","sourceRoot":"","sources":["../../src/util/checkAlpha.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"checkAlpha.d.ts","sourceRoot":"","sources":["../../src/util/checkAlpha.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,wBAAgB,UAAU,CACxB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,cAAc,GAAG,iBAAiB,GAAG,kBAAkB,GAAG,SAAS,QAgC3E;AAYD,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAElF"}
|
package/lib/util/checkAlpha.js
CHANGED
|
@@ -6,9 +6,8 @@
|
|
|
6
6
|
*
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.checkAlpha = void 0;
|
|
9
|
+
exports.createIncorrectOrderErrorMessage = exports.checkAlpha = void 0;
|
|
10
10
|
const tslib_1 = require("tslib");
|
|
11
|
-
const utils_1 = require("@monorepolint/utils");
|
|
12
11
|
const jest_diff_1 = tslib_1.__importDefault(require("jest-diff"));
|
|
13
12
|
function checkAlpha(context, block) {
|
|
14
13
|
const packageJson = context.getPackageJson();
|
|
@@ -22,8 +21,8 @@ function checkAlpha(context, block) {
|
|
|
22
21
|
if (!arrayOrderCompare(actualOrder, expectedOrder)) {
|
|
23
22
|
context.addError({
|
|
24
23
|
file: packagePath,
|
|
25
|
-
message:
|
|
26
|
-
longMessage: jest_diff_1.default(expectedOrder, actualOrder, { expand: true }),
|
|
24
|
+
message: createIncorrectOrderErrorMessage(block, packageJson.name),
|
|
25
|
+
longMessage: (0, jest_diff_1.default)(expectedOrder, actualOrder, { expand: true }),
|
|
27
26
|
fixer: () => {
|
|
28
27
|
const expectedDependencies = {};
|
|
29
28
|
expectedOrder.forEach((dep) => {
|
|
@@ -31,7 +30,7 @@ function checkAlpha(context, block) {
|
|
|
31
30
|
});
|
|
32
31
|
const newPackageJson = { ...packageJson };
|
|
33
32
|
newPackageJson[block] = expectedDependencies;
|
|
34
|
-
|
|
33
|
+
context.host.writeJson(packagePath, newPackageJson);
|
|
35
34
|
},
|
|
36
35
|
});
|
|
37
36
|
}
|
|
@@ -45,4 +44,8 @@ function arrayOrderCompare(a, b) {
|
|
|
45
44
|
}
|
|
46
45
|
return true;
|
|
47
46
|
}
|
|
47
|
+
function createIncorrectOrderErrorMessage(block, packageName) {
|
|
48
|
+
return `Incorrect order of ${block} in ${packageName}'s package.json`;
|
|
49
|
+
}
|
|
50
|
+
exports.createIncorrectOrderErrorMessage = createIncorrectOrderErrorMessage;
|
|
48
51
|
//# sourceMappingURL=checkAlpha.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkAlpha.js","sourceRoot":"","sources":["../../src/util/checkAlpha.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH
|
|
1
|
+
{"version":3,"file":"checkAlpha.js","sourceRoot":"","sources":["../../src/util/checkAlpha.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH,kEAA6B;AAE7B,SAAgB,UAAU,CACxB,OAAgB,EAChB,KAA0E;IAE1E,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAC7C,MAAM,WAAW,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAEjD,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAEvC,IAAI,WAAW,KAAK,SAAS,EAAE;QAC7B,OAAO;KACR;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,uDAAuD;IAEzG,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE;QAClD,OAAO,CAAC,QAAQ,CAAC;YACf,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,gCAAgC,CAAC,KAAK,EAAE,WAAW,CAAC,IAAK,CAAC;YACnE,WAAW,EAAE,IAAA,mBAAI,EAAC,aAAa,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;YAC/D,KAAK,EAAE,GAAG,EAAE;gBACV,MAAM,oBAAoB,GAA2B,EAAE,CAAC;gBAExD,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC5B,oBAAoB,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;gBAC/C,CAAC,CAAC,CAAC;gBAEH,MAAM,cAAc,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;gBAC1C,cAAc,CAAC,KAAK,CAAC,GAAG,oBAAoB,CAAC;gBAC7C,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;YACtD,CAAC;SACF,CAAC,CAAC;KACJ;AACH,CAAC;AAlCD,gCAkCC;AAED,SAAS,iBAAiB,CAAC,CAAwB,EAAE,CAAwB;IAC3E,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QAC7C,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE;YACzB,OAAO,KAAK,CAAC;SACd;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,gCAAgC,CAAC,KAAa,EAAE,WAAmB;IACjF,OAAO,sBAAsB,KAAK,OAAO,WAAW,iBAAiB,CAAC;AACxE,CAAC;AAFD,4EAEC"}
|
|
@@ -18,8 +18,8 @@ function makeDirectoryRecursively(directoryPath) {
|
|
|
18
18
|
if (dirSegments[i].length > 0) {
|
|
19
19
|
// we skip the empty segment
|
|
20
20
|
const curDirPath = dirSegments.slice(0, i + 1).join(path.sep);
|
|
21
|
-
if (!fs_1.existsSync(curDirPath)) {
|
|
22
|
-
fs_1.mkdirSync(curDirPath);
|
|
21
|
+
if (!(0, fs_1.existsSync)(curDirPath)) {
|
|
22
|
+
(0, fs_1.mkdirSync)(curDirPath);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeDirectory.js","sourceRoot":"","sources":["../../src/util/makeDirectory.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAEH,2BAA2C;AAC3C,mDAA6B;AAE7B,SAAgB,wBAAwB,CAAC,aAAqB;IAC5D,yDAAyD;IACzD,+BAA+B;IAC/B,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,4BAA4B;YAC5B,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9D,IAAI,CAAC,eAAU,
|
|
1
|
+
{"version":3,"file":"makeDirectory.js","sourceRoot":"","sources":["../../src/util/makeDirectory.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAEH,2BAA2C;AAC3C,mDAA6B;AAE7B,SAAgB,wBAAwB,CAAC,aAAqB;IAC5D,yDAAyD;IACzD,+BAA+B;IAC/B,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,4BAA4B;YAC5B,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9D,IAAI,CAAC,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE;gBAC3B,IAAA,cAAS,EAAC,UAAU,CAAC,CAAC;aACvB;SACF;KACF;AACH,CAAC;AAbD,4DAaC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @license Copyright 2019 Palantir Technologies, Inc. All rights reserved.
|
|
3
3
|
*/
|
|
4
|
-
import { PackageJson } from "@monorepolint/utils";
|
|
4
|
+
import { Host, PackageJson } from "@monorepolint/utils";
|
|
5
5
|
/** Interface for a node in a package dependency graph. */
|
|
6
6
|
export interface IPackageDependencyGraphNode {
|
|
7
7
|
packageJson: PackageJson;
|
|
@@ -14,7 +14,7 @@ export interface IPackageDependencyGraphNode {
|
|
|
14
14
|
/** Service abstraction for constructing and traversing package dependency graphs. */
|
|
15
15
|
export interface IPackageDependencyGraphService {
|
|
16
16
|
/** Construct a graph of package dependencies. */
|
|
17
|
-
buildDependencyGraph(packageJsonPath: string, maxDepth?: number): IPackageDependencyGraphNode;
|
|
17
|
+
buildDependencyGraph(packageJsonPath: string, host: Host, maxDepth?: number): IPackageDependencyGraphNode;
|
|
18
18
|
/** Traverse a package dependency graph. */
|
|
19
19
|
traverse(root: IPackageDependencyGraphNode, opts?: {
|
|
20
20
|
/** Traverse each unique path to a given package (potentially slow). */
|
|
@@ -26,7 +26,7 @@ export interface IPackageDependencyGraphService {
|
|
|
26
26
|
/** Default implementation of the package dependency graph service. */
|
|
27
27
|
export declare class PackageDependencyGraphService implements IPackageDependencyGraphService {
|
|
28
28
|
/** Construct a graph of package dependencies and return the root node. */
|
|
29
|
-
buildDependencyGraph(startPackageJsonPath: string, maxDepth?: number): IPackageDependencyGraphNode;
|
|
29
|
+
buildDependencyGraph(startPackageJsonPath: string, host: Host, maxDepth?: number): IPackageDependencyGraphNode;
|
|
30
30
|
/** Traverse a package dependency graph with an iterator. */
|
|
31
31
|
traverse(root: IPackageDependencyGraphNode, opts?: {
|
|
32
32
|
traverseAllPaths: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageDependencyGraphService.d.ts","sourceRoot":"","sources":["../../src/util/packageDependencyGraphService.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"packageDependencyGraphService.d.ts","sourceRoot":"","sources":["../../src/util/packageDependencyGraphService.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIxD,0DAA0D;AAC1D,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;IACvD,KAAK,EAAE;QACL,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;CACH;AAED,qFAAqF;AACrF,MAAM,WAAW,8BAA8B;IAC7C,iDAAiD;IACjD,oBAAoB,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,2BAA2B,CAAC;IAE1G,2CAA2C;IAC3C,QAAQ,CACN,IAAI,EAAE,2BAA2B,EACjC,IAAI,CAAC,EAAE;QACL,uEAAuE;QACvE,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC5B,GACA,gBAAgB,CAAC,2BAA2B,GAAG;QAAE,UAAU,EAAE,2BAA2B,EAAE,CAAA;KAAE,CAAC,CAAC;CAClG;AAED,sEAAsE;AACtE,qBAAa,6BAA8B,YAAW,8BAA8B;IAClF,0EAA0E;IACnE,oBAAoB,CACzB,oBAAoB,EAAE,MAAM,EAC5B,IAAI,EAAE,IAAI,EACV,QAAQ,CAAC,EAAE,MAAM,GAChB,2BAA2B;IAuC9B,4DAA4D;IACpD,QAAQ,CACd,IAAI,EAAE,2BAA2B,EACjC,IAAI;;KAA8B,GACjC,gBAAgB,CAAC,2BAA2B,GAAG;QAAE,UAAU,EAAE,2BAA2B,EAAE,CAAA;KAAE,CAAC;CA8BjG"}
|