@checkdigit/eslint-plugin 7.13.3 → 7.13.4
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.
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// src/require-fixed-services-import.ts
|
|
2
2
|
import { strict as assert } from "node:assert";
|
|
3
|
+
import path from "node:path";
|
|
3
4
|
import { AST_NODE_TYPES, ESLintUtils } from "@typescript-eslint/utils";
|
|
4
5
|
import getDocumentationUrl from "./get-documentation-url.mjs";
|
|
5
6
|
var ruleId = "require-fixed-services-import";
|
|
@@ -24,9 +25,14 @@ var rule = createRule({
|
|
|
24
25
|
defaultOptions: [],
|
|
25
26
|
create(context) {
|
|
26
27
|
const importedServiceTypeMapping = /* @__PURE__ */ new Map();
|
|
28
|
+
const fileFolder = path.dirname(context.filename);
|
|
27
29
|
return {
|
|
28
30
|
ImportDeclaration(importDeclaration) {
|
|
29
31
|
const moduleName = importDeclaration.source.value;
|
|
32
|
+
const resolvedModulePath = path.resolve(fileFolder, moduleName);
|
|
33
|
+
if (!resolvedModulePath.includes("src/services")) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
30
36
|
if (SERVICE_TYPINGS_IMPORT_PATH.test(moduleName)) {
|
|
31
37
|
const match = SERVICE_TYPINGS_IMPORT_PATH_WITH_VERSION.exec(moduleName);
|
|
32
38
|
if (match?.groups) {
|
|
@@ -82,4 +88,4 @@ export {
|
|
|
82
88
|
require_fixed_services_import_default as default,
|
|
83
89
|
ruleId
|
|
84
90
|
};
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
91
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlcXVpcmUtZml4ZWQtc2VydmljZXMtaW1wb3J0LnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQVFBLFNBQVMsVUFBVSxjQUFjO0FBQ2pDLE9BQU8sVUFBVTtBQUVqQixTQUFTLGdCQUFnQixtQkFBNkI7QUFFdEQsT0FBTyx5QkFBeUI7QUFFekIsSUFBTSxTQUFTO0FBRXRCLElBQU0sYUFBYSxZQUFZLFlBQVksQ0FBQyxTQUFTLG9CQUFvQixJQUFJLENBQUM7QUFDOUUsSUFBTSw4QkFBOEI7QUFDcEMsSUFBTSwyQ0FDSjtBQUVGLElBQU0sT0FFRixXQUFXO0FBQUEsRUFDYixNQUFNO0FBQUEsRUFDTixNQUFNO0FBQUEsSUFDSixNQUFNO0FBQUEsSUFDTixNQUFNO0FBQUEsTUFDSixhQUFhO0FBQUEsSUFDZjtBQUFBLElBQ0EsVUFBVTtBQUFBLE1BQ1IsK0JBQ0U7QUFBQSxNQUNGLDRCQUE0QjtBQUFBLE1BQzVCLDRCQUE0QjtBQUFBLElBQzlCO0FBQUEsSUFDQSxTQUFTO0FBQUEsSUFDVCxRQUFRLENBQUM7QUFBQSxFQUNYO0FBQUEsRUFDQSxnQkFBZ0IsQ0FBQztBQUFBLEVBQ2pCLE9BQU8sU0FBUztBQUNkLFVBQU0sNkJBQTZCLG9CQUFJLElBQW9CO0FBQzNELFVBQU0sYUFBYSxLQUFLLFFBQVEsUUFBUSxRQUFRO0FBRWhELFdBQU87QUFBQSxNQUNMLGtCQUFrQixtQkFBbUI7QUFDbkMsY0FBTSxhQUFhLGtCQUFrQixPQUFPO0FBQzVDLGNBQU0scUJBQXFCLEtBQUssUUFBUSxZQUFZLFVBQVU7QUFDOUQsWUFBSSxDQUFDLG1CQUFtQixTQUFTLGNBQWMsR0FBRztBQUNoRDtBQUFBLFFBQ0Y7QUFFQSxZQUFJLDRCQUE0QixLQUFLLFVBQVUsR0FBRztBQUVoRCxnQkFBTSxRQUFRLHlDQUF5QyxLQUFLLFVBQVU7QUFDdEUsY0FBSSxPQUFPLFFBQVE7QUFFakIsa0JBQU0sRUFBRSxTQUFTLFFBQVEsSUFBSSxNQUFNO0FBQ25DLG1CQUFPLEdBQUcsWUFBWSxVQUFhLFlBQVksTUFBUztBQUd4RCx1QkFBVyxhQUFhLGtCQUFrQixZQUFZO0FBQ3BELGtCQUNFLFVBQVUsU0FBUyxlQUFlLG1CQUNsQyxVQUFVLFNBQVMsU0FBUyxlQUFlLFlBQzNDO0FBQ0EsMkNBQTJCLElBQUksVUFBVSxNQUFNLE1BQU0sR0FBRyxPQUFPLElBQUksVUFBVSxTQUFTLElBQUksRUFBRTtBQUFBLGNBQzlGO0FBQUEsWUFDRjtBQUVBLGtCQUFNLGFBQWEsa0JBQWtCLFdBQVcsQ0FBQyxHQUFHLE1BQU0sQ0FBQztBQUMzRCxtQkFBTyxHQUFHLGVBQWUsTUFBUztBQUNsQyxrQkFBTSxXQUFXLGtCQUFrQixXQUFXLEdBQUcsRUFBRSxHQUFHLE1BQU0sQ0FBQztBQUM3RCxtQkFBTyxHQUFHLGFBQWEsTUFBUztBQUVoQyxvQkFBUSxPQUFPO0FBQUEsY0FDYixXQUFXO0FBQUEsY0FDWCxNQUFNLGtCQUFrQjtBQUFBLGNBQ3hCLENBQUMsSUFBSSxPQUFPO0FBQ1Ysc0JBQU0sTUFBTSxpQkFBaUIsQ0FBQyxZQUFZLFFBQVEsR0FBRyxHQUFHLE9BQU8sSUFBSSxRQUFRLE1BQU0sQ0FBQyxDQUFDLE9BQU8sT0FBTyxFQUFFO0FBQUEsY0FDckc7QUFBQSxZQUNGLENBQUM7QUFBQSxVQUNIO0FBR0Esa0JBQVEsT0FBTztBQUFBLFlBQ2IsV0FBVztBQUFBLFlBQ1gsTUFBTSxrQkFBa0I7QUFBQSxZQUN4QixDQUFDLElBQUksT0FBTztBQUNWLG9CQUFNLE1BQU07QUFBQSxnQkFDVixrQkFBa0I7QUFBQSxnQkFDbEIsSUFBSSxXQUFXLE1BQU0sR0FBRyxXQUFXLFFBQVEsYUFBYSxDQUFDLENBQUM7QUFBQSxjQUM1RDtBQUFBLFlBQ0Y7QUFBQSxVQUNGLENBQUM7QUFBQSxRQUNIO0FBQUEsTUFDRjtBQUFBLE1BRUEsZ0JBQWdCLGVBQXlDO0FBQ3ZELFlBQ0UsY0FBYyxTQUFTLFNBQVMsZUFBZSxjQUMvQywyQkFBMkIsSUFBSSxjQUFjLFNBQVMsSUFBSSxHQUMxRDtBQUNBLGdCQUFNLGtCQUFrQiwyQkFBMkIsSUFBSSxjQUFjLFNBQVMsSUFBSTtBQUNsRixpQkFBTyxHQUFHLG9CQUFvQixNQUFTO0FBQ3ZDLGtCQUFRLE9BQU87QUFBQSxZQUNiLFdBQVc7QUFBQSxZQUNYLE1BQU0sY0FBYztBQUFBLFlBQ3BCLElBQUksT0FBTztBQUNULHFCQUFPLE1BQU0sWUFBWSxjQUFjLFVBQVUsZUFBZTtBQUFBLFlBQ2xFO0FBQUEsVUFDRixDQUFDO0FBQUEsUUFDSDtBQUFBLE1BQ0Y7QUFBQSxJQUNGO0FBQUEsRUFDRjtBQUNGLENBQUM7QUFFRCxJQUFPLHdDQUFROyIsCiAgIm5hbWVzIjogW10KfQo=
|
package/package.json
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
9
|
import { strict as assert } from 'node:assert';
|
|
10
|
+
import path from 'node:path';
|
|
10
11
|
|
|
11
12
|
import { AST_NODE_TYPES, ESLintUtils, TSESTree } from '@typescript-eslint/utils';
|
|
12
13
|
|
|
@@ -40,11 +41,18 @@ const rule: ESLintUtils.RuleModule<
|
|
|
40
41
|
defaultOptions: [],
|
|
41
42
|
create(context) {
|
|
42
43
|
const importedServiceTypeMapping = new Map<string, string>();
|
|
44
|
+
const fileFolder = path.dirname(context.filename);
|
|
43
45
|
|
|
44
46
|
return {
|
|
45
47
|
ImportDeclaration(importDeclaration) {
|
|
46
|
-
const moduleName = importDeclaration.source.value;
|
|
48
|
+
const moduleName = importDeclaration.source.value; /*?*/
|
|
49
|
+
const resolvedModulePath = path.resolve(fileFolder, moduleName); /*?*/
|
|
50
|
+
if (!resolvedModulePath.includes('src/services')) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
|
|
47
54
|
if (SERVICE_TYPINGS_IMPORT_PATH.test(moduleName)) {
|
|
55
|
+
// make sure that it matches only the src/services path
|
|
48
56
|
const match = SERVICE_TYPINGS_IMPORT_PATH_WITH_VERSION.exec(moduleName);
|
|
49
57
|
if (match?.groups) {
|
|
50
58
|
// need to import the service typings from the fixed path, and also apply the namespace to the referenced types
|