eslint-plugin-obsidian 2.6.0 → 2.6.1

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.
Files changed (37) hide show
  1. package/dist/dto/class.js +2 -1
  2. package/dist/dto/class.js.map +1 -1
  3. package/dist/dto/classFile.d.ts +9 -0
  4. package/dist/dto/classFile.d.ts.map +1 -0
  5. package/dist/dto/classFile.js +12 -0
  6. package/dist/dto/classFile.js.map +1 -0
  7. package/dist/dto/file.d.ts +4 -3
  8. package/dist/dto/file.d.ts.map +1 -1
  9. package/dist/dto/file.js +4 -3
  10. package/dist/dto/file.js.map +1 -1
  11. package/dist/dto/method.js +2 -1
  12. package/dist/dto/method.js.map +1 -1
  13. package/dist/framework/fileReader.d.ts +2 -4
  14. package/dist/framework/fileReader.d.ts.map +1 -1
  15. package/dist/framework/fileReader.js +4 -5
  16. package/dist/framework/fileReader.js.map +1 -1
  17. package/dist/framework/pathResolver.d.ts +1 -2
  18. package/dist/framework/pathResolver.d.ts.map +1 -1
  19. package/dist/framework/pathResolver.js +2 -2
  20. package/dist/framework/pathResolver.js.map +1 -1
  21. package/dist/unresolvedProviderDependencies/dependencyResolver.d.ts +2 -1
  22. package/dist/unresolvedProviderDependencies/dependencyResolver.d.ts.map +1 -1
  23. package/dist/unresolvedProviderDependencies/dependencyResolver.js +3 -3
  24. package/dist/unresolvedProviderDependencies/dependencyResolver.js.map +1 -1
  25. package/dist/unresolvedProviderDependencies/graphHandler.js +1 -1
  26. package/dist/unresolvedProviderDependencies/graphHandler.js.map +1 -1
  27. package/dist/unresolvedProviderDependencies/index.js +1 -1
  28. package/dist/unresolvedProviderDependencies/index.js.map +1 -1
  29. package/dist/unresolvedProviderDependencies/subgraphResolver.d.ts +2 -2
  30. package/dist/unresolvedProviderDependencies/subgraphResolver.d.ts.map +1 -1
  31. package/dist/unresolvedProviderDependencies/subgraphResolver.js +17 -18
  32. package/dist/unresolvedProviderDependencies/subgraphResolver.js.map +1 -1
  33. package/package.json +1 -1
  34. package/dist/dto/classWithImports.d.ts +0 -8
  35. package/dist/dto/classWithImports.d.ts.map +0 -1
  36. package/dist/dto/classWithImports.js +0 -11
  37. package/dist/dto/classWithImports.js.map +0 -1
package/dist/dto/class.js CHANGED
@@ -16,7 +16,8 @@ class Clazz {
16
16
  }) || [];
17
17
  }
18
18
  get decorators() {
19
- return this.node.decorators.map((decorator) => {
19
+ var _a;
20
+ return ((_a = this.node.decorators) !== null && _a !== void 0 ? _a : []).map((decorator) => {
20
21
  return new decorator_1.Decorator(decorator);
21
22
  });
22
23
  }
@@ -1 +1 @@
1
- {"version":3,"file":"class.js","sourceRoot":"","sources":["../../rules/dto/class.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AACxC,oDAAoD;AACpD,wCAAkD;AAClD,qCAAkC;AAElC,MAAa,KAAK;IAChB,YAAmB,IAA+B;QAA/B,SAAI,GAAJ,IAAI,CAA2B;QAChD,IAAA,0BAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAoB,EAAE,EAAE;YAClD,OAAO,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;QAC1C,CAAC,CAAC,IAAI,EAAE,CAAC;IACX,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAA6B,EAAE,EAAE;YAChE,OAAO,IAAI,qBAAS,CAAC,SAAS,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC7B,CAAC;IAEM,mBAAmB,CAAC,aAAqB;QAC9C,OAAO,IAAI,CAAC,IAAI;aACb,MAAM,CAAC,0BAAkB,CAAC;aAC1B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,eAAM,CAAC,IAAI,CAAC,CAAC;aAC/B,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;IAC/D,CAAC;IAEM,gBAAgB,CAAC,IAAY;QAClC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,UAAqB,EAAE,EAAE;YAC/D,OAAO,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC;QACpD,CAAC,CAAC,CAAC;QACH,IAAA,0BAAa,EAAC,SAAS,EAAE,aAAa,IAAI,uBAAuB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9E,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAY,IAAI;;QACd,OAAO,MAAA,IAAI,CAAC,IAAI,CAAC,EAAE,0CAAE,IAAI,CAAC;IAC5B,CAAC;CACF;AAvCD,sBAuCC"}
1
+ {"version":3,"file":"class.js","sourceRoot":"","sources":["../../rules/dto/class.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AACxC,oDAAoD;AACpD,wCAAkD;AAClD,qCAAkC;AAElC,MAAa,KAAK;IAChB,YAAmB,IAA+B;QAA/B,SAAI,GAAJ,IAAI,CAA2B;QAChD,IAAA,0BAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAoB,EAAE,EAAE;YAClD,OAAO,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;QAC1C,CAAC,CAAC,IAAI,EAAE,CAAC;IACX,CAAC;IAED,IAAI,UAAU;;QACZ,OAAO,CAAC,MAAA,IAAI,CAAC,IAAI,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAA6B,EAAE,EAAE;YACxE,OAAO,IAAI,qBAAS,CAAC,SAAS,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC7B,CAAC;IAEM,mBAAmB,CAAC,aAAqB;QAC9C,OAAO,IAAI,CAAC,IAAI;aACb,MAAM,CAAC,0BAAkB,CAAC;aAC1B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,eAAM,CAAC,IAAI,CAAC,CAAC;aAC/B,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;IAC/D,CAAC;IAEM,gBAAgB,CAAC,IAAY;QAClC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,UAAqB,EAAE,EAAE;YAC/D,OAAO,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC;QACpD,CAAC,CAAC,CAAC;QACH,IAAA,0BAAa,EAAC,SAAS,EAAE,aAAa,IAAI,uBAAuB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9E,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAY,IAAI;;QACd,OAAO,MAAA,IAAI,CAAC,IAAI,CAAC,EAAE,0CAAE,IAAI,CAAC;IAC5B,CAAC;CACF;AAvCD,sBAuCC"}
@@ -0,0 +1,9 @@
1
+ import type { Clazz } from './class';
2
+ import type { Import } from './import';
3
+ export declare class ClassFile {
4
+ readonly clazz: Clazz;
5
+ readonly imports: Import[];
6
+ readonly path: string;
7
+ constructor(clazz: Clazz, imports: Import[], path: string);
8
+ }
9
+ //# sourceMappingURL=classFile.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"classFile.d.ts","sourceRoot":"","sources":["../../rules/dto/classFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,qBAAa,SAAS;aAGF,KAAK,EAAE,KAAK;aACZ,OAAO,EAAE,MAAM,EAAE;aACjB,IAAI,EAAE,MAAM;gBAFZ,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,EAAE,MAAM;CAE/B"}
@@ -0,0 +1,12 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ClassFile = void 0;
4
+ class ClassFile {
5
+ constructor(clazz, imports, path) {
6
+ this.clazz = clazz;
7
+ this.imports = imports;
8
+ this.path = path;
9
+ }
10
+ }
11
+ exports.ClassFile = ClassFile;
12
+ //# sourceMappingURL=classFile.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"classFile.js","sourceRoot":"","sources":["../../rules/dto/classFile.ts"],"names":[],"mappings":";;;AAGA,MAAa,SAAS;IAEpB,YACkB,KAAY,EACZ,OAAiB,EACjB,IAAY;QAFZ,UAAK,GAAL,KAAK,CAAO;QACZ,YAAO,GAAP,OAAO,CAAU;QACjB,SAAI,GAAJ,IAAI,CAAQ;IAC3B,CAAC;CACL;AAPD,8BAOC"}
@@ -1,14 +1,15 @@
1
1
  import type { TSESTree } from '@typescript-eslint/types';
2
2
  import { Clazz } from './class';
3
3
  import { Import } from './import';
4
- import { ClassWithImports } from './classWithImports';
4
+ import { ClassFile } from './classFile';
5
5
  export declare class File {
6
6
  private program;
7
- constructor(program: TSESTree.Program);
7
+ private path;
8
+ constructor(program: TSESTree.Program, path: string);
8
9
  requireGraph(name: string): Clazz;
9
10
  private get classNodes();
10
11
  private get body();
11
- toClassWithImports(): ClassWithImports[];
12
+ toClassWithImports(): ClassFile[];
12
13
  get imports(): Import[];
13
14
  get graphs(): Clazz[];
14
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../rules/dto/file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,qBAAa,IAAI;IACH,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,QAAQ,CAAC,OAAO;IAEtC,YAAY,CAAC,IAAI,EAAE,MAAM;IAQhC,OAAO,KAAK,UAAU,GAIrB;IAED,OAAO,KAAK,IAAI,GAEf;IAEM,kBAAkB;IAMzB,IAAI,OAAO,aAIV;IAED,IAAI,MAAM,YAUT;CACF"}
1
+ {"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../rules/dto/file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,qBAAa,IAAI;IAEb,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,IAAI;gBADJ,OAAO,EAAE,QAAQ,CAAC,OAAO,EACzB,IAAI,EAAE,MAAM;IAGf,YAAY,CAAC,IAAI,EAAE,MAAM;IAQhC,OAAO,KAAK,UAAU,GAIrB;IAED,OAAO,KAAK,IAAI,GAEf;IAEM,kBAAkB;IAMzB,IAAI,OAAO,aAIV;IAED,IAAI,MAAM,YAUT;CACF"}
package/dist/dto/file.js CHANGED
@@ -4,11 +4,12 @@ exports.File = void 0;
4
4
  const class_1 = require("./class");
5
5
  const utils_1 = require("../ast/utils");
6
6
  const import_1 = require("./import");
7
- const classWithImports_1 = require("./classWithImports");
7
+ const classFile_1 = require("./classFile");
8
8
  const assertions_1 = require("../utils/assertions");
9
9
  class File {
10
- constructor(program) {
10
+ constructor(program, path) {
11
11
  this.program = program;
12
+ this.path = path;
12
13
  }
13
14
  requireGraph(name) {
14
15
  const graph = this.classNodes.find((node) => {
@@ -28,7 +29,7 @@ class File {
28
29
  }
29
30
  toClassWithImports() {
30
31
  return this.graphs.map((graph) => {
31
- return new classWithImports_1.ClassWithImports(graph, this.imports);
32
+ return new classFile_1.ClassFile(graph, this.imports, this.path);
32
33
  });
33
34
  }
34
35
  get imports() {
@@ -1 +1 @@
1
- {"version":3,"file":"file.js","sourceRoot":"","sources":["../../rules/dto/file.ts"],"names":[],"mappings":";;;AACA,mCAAgC;AAChC,wCAAqF;AACrF,qCAAkC;AAClC,yDAAsD;AACtD,oDAAoD;AAEpD,MAAa,IAAI;IACf,YAAoB,OAAyB;QAAzB,YAAO,GAAP,OAAO,CAAkB;IAAI,CAAC;IAE3C,YAAY,CAAC,IAAY;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;;YAC1C,OAAO,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,EAAE,0CAAE,IAAI,MAAK,IAAI,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,IAAA,0BAAa,EAAC,KAAK,EAAE,SAAS,IAAI,oBAAoB,CAAC,CAAC;QACxD,OAAO,IAAI,aAAK,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED,IAAY,UAAU;QACpB,OAAO,IAAI,CAAC,IAAI;aACb,MAAM,CAAC,mBAAW,CAAC;aACnB,GAAG,CAAC,2BAAmB,CAAC,CAAC;IAC9B,CAAC;IAED,IAAY,IAAI;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/B,OAAO,IAAI,mCAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,IAAI;aACb,MAAM,CAAC,2BAAmB,CAAC;aAC3B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,eAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,IAAI;aACb,MAAM,CAAC,mBAAW,CAAC;aACnB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACZ,MAAM,KAAK,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,CAAC;YACxC,OAAO,KAAK,IAAI,IAAI,aAAK,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,KAAwB,EAAE,EAAE;YACnC,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAChE,CAAC,CAAY,CAAC;IAClB,CAAC;CACF;AA5CD,oBA4CC"}
1
+ {"version":3,"file":"file.js","sourceRoot":"","sources":["../../rules/dto/file.ts"],"names":[],"mappings":";;;AACA,mCAAgC;AAChC,wCAAqF;AACrF,qCAAkC;AAClC,2CAAwC;AACxC,oDAAoD;AAEpD,MAAa,IAAI;IACf,YACU,OAAyB,EACzB,IAAY;QADZ,YAAO,GAAP,OAAO,CAAkB;QACzB,SAAI,GAAJ,IAAI,CAAQ;IAClB,CAAC;IAEE,YAAY,CAAC,IAAY;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;;YAC1C,OAAO,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,EAAE,0CAAE,IAAI,MAAK,IAAI,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,IAAA,0BAAa,EAAC,KAAK,EAAE,SAAS,IAAI,oBAAoB,CAAC,CAAC;QACxD,OAAO,IAAI,aAAK,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED,IAAY,UAAU;QACpB,OAAO,IAAI,CAAC,IAAI;aACb,MAAM,CAAC,mBAAW,CAAC;aACnB,GAAG,CAAC,2BAAmB,CAAC,CAAC;IAC9B,CAAC;IAED,IAAY,IAAI;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/B,OAAO,IAAI,qBAAS,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,IAAI;aACb,MAAM,CAAC,2BAAmB,CAAC;aAC3B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,eAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,IAAI;aACb,MAAM,CAAC,mBAAW,CAAC;aACnB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACZ,MAAM,KAAK,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,CAAC;YACxC,OAAO,KAAK,IAAI,IAAI,aAAK,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,KAAwB,EAAE,EAAE;YACnC,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAChE,CAAC,CAAY,CAAC;IAClB,CAAC;CACF;AA/CD,oBA+CC"}
@@ -19,7 +19,8 @@ class Method {
19
19
  });
20
20
  }
21
21
  get decorators() {
22
- return this.node.decorators.map((decorator) => {
22
+ var _a;
23
+ return ((_a = this.node.decorators) !== null && _a !== void 0 ? _a : []).map((decorator) => {
23
24
  return new decorator_1.Decorator(decorator);
24
25
  }) || [];
25
26
  }
@@ -1 +1 @@
1
- {"version":3,"file":"method.js","sourceRoot":"","sources":["../../rules/dto/method.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AACxC,2CAAwC;AAExC,MAAa,MAAM;IAEjB,YAA4B,IAA+B;QAA/B,SAAI,GAAJ,IAAI,CAA2B;IAAG,CAAC;IAE/D,IAAI,IAAI;QACN,OAAQ,IAAI,CAAC,IAAI,CAAC,GAA2B,CAAC,IAAI,CAAC;IACrD,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,qBAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,eAAe,CAAC,aAAqB;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;YACxC,OAAO,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,aAAa,CAAC;QAC5D,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAY,UAAU;QACpB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC5C,OAAO,IAAI,qBAAS,CAAC,SAAS,CAAC,CAAC;QAClC,CAAC,CAAC,IAAI,EAAE,CAAC;IACX,CAAC;CACF;AAvBD,wBAuBC"}
1
+ {"version":3,"file":"method.js","sourceRoot":"","sources":["../../rules/dto/method.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AACxC,2CAAwC;AAExC,MAAa,MAAM;IAEjB,YAA4B,IAA+B;QAA/B,SAAI,GAAJ,IAAI,CAA2B;IAAG,CAAC;IAE/D,IAAI,IAAI;QACN,OAAQ,IAAI,CAAC,IAAI,CAAC,GAA2B,CAAC,IAAI,CAAC;IACrD,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,qBAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,eAAe,CAAC,aAAqB;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;YACxC,OAAO,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,aAAa,CAAC;QAC5D,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAY,UAAU;;QACpB,OAAO,CAAC,MAAA,IAAI,CAAC,IAAI,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YACpD,OAAO,IAAI,qBAAS,CAAC,SAAS,CAAC,CAAC;QAClC,CAAC,CAAC,IAAI,EAAE,CAAC;IACX,CAAC;CACF;AAvBD,wBAuBC"}
@@ -1,11 +1,9 @@
1
- import type { RuleContext } from '@typescript-eslint/utils/ts-eslint';
2
1
  import type { PathResolver } from './pathResolver';
3
2
  import { File } from '../dto/file';
4
3
  export declare class FileReader {
5
- private context;
6
4
  private pathResolver;
7
- constructor(context: RuleContext<any, any>, pathResolver: PathResolver);
8
- read(relativeFilePath: string): File;
5
+ constructor(pathResolver: PathResolver);
6
+ read(baseFilePath: string, relativeFilePath: string): File;
9
7
  private parse;
10
8
  }
11
9
  //# sourceMappingURL=fileReader.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"fileReader.d.ts","sourceRoot":"","sources":["../../rules/framework/fileReader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAGtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,qBAAa,UAAU;IACT,OAAO,CAAC,OAAO;IAAyB,OAAO,CAAC,YAAY;gBAApD,OAAO,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,EAAU,YAAY,EAAE,YAAY;IAE/E,IAAI,CAAC,gBAAgB,EAAE,MAAM;IAOpC,OAAO,CAAC,KAAK;CAmBd"}
1
+ {"version":3,"file":"fileReader.d.ts","sourceRoot":"","sources":["../../rules/framework/fileReader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,qBAAa,UAAU;IACT,OAAO,CAAC,YAAY;gBAAZ,YAAY,EAAE,YAAY;IAEvC,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM;IAO1D,OAAO,CAAC,KAAK;CAmBd"}
@@ -28,15 +28,14 @@ const fs = __importStar(require("fs"));
28
28
  const parser_1 = require("@typescript-eslint/parser");
29
29
  const file_1 = require("../dto/file");
30
30
  class FileReader {
31
- constructor(context, pathResolver) {
32
- this.context = context;
31
+ constructor(pathResolver) {
33
32
  this.pathResolver = pathResolver;
34
33
  }
35
- read(relativeFilePath) {
36
- const filePath = this.pathResolver.resolve(this.context, relativeFilePath);
34
+ read(baseFilePath, relativeFilePath) {
35
+ const filePath = this.pathResolver.resolve(baseFilePath, relativeFilePath);
37
36
  const fileContent = fs.readFileSync(filePath, { encoding: 'utf8' });
38
37
  const fileAST = this.parse(fileContent, filePath);
39
- return new file_1.File(fileAST);
38
+ return new file_1.File(fileAST, filePath);
40
39
  }
41
40
  parse(content, filePath) {
42
41
  return (0, parser_1.parse)(content, {
@@ -1 +1 @@
1
- {"version":3,"file":"fileReader.js","sourceRoot":"","sources":["../../rules/framework/fileReader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAyB;AACzB,sDAAkD;AAElD,sCAAmC;AAEnC,MAAa,UAAU;IACrB,YAAoB,OAA8B,EAAU,YAA0B;QAAlE,YAAO,GAAP,OAAO,CAAuB;QAAU,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAEnF,IAAI,CAAC,gBAAwB;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAC3E,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAClD,OAAO,IAAI,WAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,OAAe,EAAE,QAAgB;QAC7C,OAAO,IAAA,cAAK,EACV,OAAO,EACP;YACE,WAAW,EAAE,CAAC;YACd,YAAY,EAAE;gBACZ,YAAY,EAAE,KAAK;gBACnB,GAAG,EAAE,IAAI;aACV;YACD,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,IAAI;YACb,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE,IAAI;YACT,KAAK,EAAE,IAAI;YACX,QAAQ;SACT,CACF,CAAC;IACJ,CAAC;CACF;AA7BD,gCA6BC"}
1
+ {"version":3,"file":"fileReader.js","sourceRoot":"","sources":["../../rules/framework/fileReader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,sDAAkD;AAElD,sCAAmC;AAEnC,MAAa,UAAU;IACrB,YAAoB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAI,CAAC;IAE5C,IAAI,CAAC,YAAoB,EAAE,gBAAwB;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;QAC3E,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAClD,OAAO,IAAI,WAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACrC,CAAC;IAEO,KAAK,CAAC,OAAe,EAAE,QAAgB;QAC7C,OAAO,IAAA,cAAK,EACV,OAAO,EACP;YACE,WAAW,EAAE,CAAC;YACd,YAAY,EAAE;gBACZ,YAAY,EAAE,KAAK;gBACnB,GAAG,EAAE,IAAI;aACV;YACD,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,IAAI;YACb,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE,IAAI;YACT,KAAK,EAAE,IAAI;YACX,QAAQ;SACT,CACF,CAAC;IACJ,CAAC;CACF;AA7BD,gCA6BC"}
@@ -1,5 +1,4 @@
1
- import type { RuleContext } from '@typescript-eslint/utils/ts-eslint';
2
1
  export declare class PathResolver {
3
- resolve(context: RuleContext<any, any>, relativeFilePath: string): string;
2
+ resolve(baseFilePath: string, relativeFilePath: string): string;
4
3
  }
5
4
  //# sourceMappingURL=pathResolver.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"pathResolver.d.ts","sourceRoot":"","sources":["../../rules/framework/pathResolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAGtE,qBAAa,YAAY;IAChB,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,gBAAgB,EAAE,MAAM;CAGxE"}
1
+ {"version":3,"file":"pathResolver.d.ts","sourceRoot":"","sources":["../../rules/framework/pathResolver.ts"],"names":[],"mappings":"AAEA,qBAAa,YAAY;IAChB,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM;CAG9D"}
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.PathResolver = void 0;
4
4
  const path = require("path");
5
5
  class PathResolver {
6
- resolve(context, relativeFilePath) {
7
- return path.join(path.dirname(context.getFilename()), `${relativeFilePath}.ts`);
6
+ resolve(baseFilePath, relativeFilePath) {
7
+ return path.resolve(path.dirname(baseFilePath), `${relativeFilePath}.ts`);
8
8
  }
9
9
  }
10
10
  exports.PathResolver = PathResolver;
@@ -1 +1 @@
1
- {"version":3,"file":"pathResolver.js","sourceRoot":"","sources":["../../rules/framework/pathResolver.ts"],"names":[],"mappings":";;;AACA,6BAA+B;AAE/B,MAAa,YAAY;IAChB,OAAO,CAAC,OAA8B,EAAE,gBAAwB;QACrE,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,GAAG,gBAAgB,KAAK,CAAC,CAAC;IAClF,CAAC;CACF;AAJD,oCAIC"}
1
+ {"version":3,"file":"pathResolver.js","sourceRoot":"","sources":["../../rules/framework/pathResolver.ts"],"names":[],"mappings":";;;AAAA,6BAA+B;AAE/B,MAAa,YAAY;IAChB,OAAO,CAAC,YAAoB,EAAE,gBAAwB;QAC3D,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,GAAG,gBAAgB,KAAK,CAAC,CAAC;IAC5E,CAAC;CACF;AAJD,oCAIC"}
@@ -1,10 +1,11 @@
1
1
  import type { Import } from '../dto/import';
2
2
  import type { Clazz } from '../dto/class';
3
3
  import type { SubgraphResolver } from './subgraphResolver';
4
+ import type { Context } from './types';
4
5
  export declare class DependencyResolver {
5
6
  private subgraphResolver;
6
7
  constructor(subgraphResolver: SubgraphResolver);
7
- resolve(clazz: Clazz, imports: Import[]): string[];
8
+ resolve(context: Context, clazz: Clazz, imports: Import[]): string[];
8
9
  private getDependenciesFromSubgraphs;
9
10
  private getGraphDependencies;
10
11
  }
@@ -1 +1 @@
1
- {"version":3,"file":"dependencyResolver.d.ts","sourceRoot":"","sources":["../../rules/unresolvedProviderDependencies/dependencyResolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,qBAAa,kBAAkB;IACjB,OAAO,CAAC,gBAAgB;gBAAhB,gBAAgB,EAAE,gBAAgB;IAE/C,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE;IAQ9C,OAAO,CAAC,4BAA4B;IAMpC,OAAO,CAAC,oBAAoB;CAK7B"}
1
+ {"version":3,"file":"dependencyResolver.d.ts","sourceRoot":"","sources":["../../rules/unresolvedProviderDependencies/dependencyResolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEvC,qBAAa,kBAAkB;IACjB,OAAO,CAAC,gBAAgB;gBAAhB,gBAAgB,EAAE,gBAAgB;IAE/C,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE;IAQhE,OAAO,CAAC,4BAA4B;IAMpC,OAAO,CAAC,oBAAoB;CAK7B"}
@@ -1,13 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DependencyResolver = void 0;
4
- const classWithImports_1 = require("../dto/classWithImports");
4
+ const classFile_1 = require("../dto/classFile");
5
5
  class DependencyResolver {
6
6
  constructor(subgraphResolver) {
7
7
  this.subgraphResolver = subgraphResolver;
8
8
  }
9
- resolve(clazz, imports) {
10
- const classWithImports = new classWithImports_1.ClassWithImports(clazz, imports);
9
+ resolve(context, clazz, imports) {
10
+ const classWithImports = new classFile_1.ClassFile(clazz, imports, context.physicalFilename);
11
11
  return [
12
12
  ...this.getGraphDependencies(classWithImports),
13
13
  ...this.getDependenciesFromSubgraphs(classWithImports),
@@ -1 +1 @@
1
- {"version":3,"file":"dependencyResolver.js","sourceRoot":"","sources":["../../rules/unresolvedProviderDependencies/dependencyResolver.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAK3D,MAAa,kBAAkB;IAC7B,YAAoB,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAI,CAAC;IAEpD,OAAO,CAAC,KAAY,EAAE,OAAiB;QAC5C,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC9D,OAAO;YACL,GAAG,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC;YAC9C,GAAG,IAAI,CAAC,4BAA4B,CAAC,gBAAgB,CAAC;SACvD,CAAC;IACJ,CAAC;IAEO,4BAA4B,CAAC,KAAuB;QAC1D,OAAO,IAAI,CAAC,gBAAgB;aACzB,OAAO,CAAC,KAAK,CAAC;aACd,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IAEO,oBAAoB,CAAC,EAAE,KAAK,EAAoB;QACtD,OAAO,KAAK;aACT,mBAAmB,CAAC,UAAU,CAAC;aAC/B,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;CACF;AAtBD,gDAsBC"}
1
+ {"version":3,"file":"dependencyResolver.js","sourceRoot":"","sources":["../../rules/unresolvedProviderDependencies/dependencyResolver.ts"],"names":[],"mappings":";;;AAAA,gDAA6C;AAM7C,MAAa,kBAAkB;IAC7B,YAAoB,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAI,CAAC;IAEpD,OAAO,CAAC,OAAgB,EAAE,KAAY,EAAE,OAAiB;QAC9D,MAAM,gBAAgB,GAAG,IAAI,qBAAS,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,gBAAiB,CAAC,CAAC;QAClF,OAAO;YACL,GAAG,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC;YAC9C,GAAG,IAAI,CAAC,4BAA4B,CAAC,gBAAgB,CAAC;SACvD,CAAC;IACJ,CAAC;IAEO,4BAA4B,CAAC,KAAgB;QACnD,OAAO,IAAI,CAAC,gBAAgB;aACzB,OAAO,CAAC,KAAK,CAAC;aACd,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IAEO,oBAAoB,CAAC,EAAE,KAAK,EAAa;QAC/C,OAAO,KAAK;aACT,mBAAmB,CAAC,UAAU,CAAC;aAC/B,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;CACF;AAtBD,gDAsBC"}
@@ -11,7 +11,7 @@ class GraphHandler {
11
11
  }
12
12
  handle(clazz, imports) {
13
13
  if (this.hasGraphDecorator(clazz)) {
14
- const dependencies = this.dependencyResolver.resolve(clazz, imports);
14
+ const dependencies = this.dependencyResolver.resolve(this.context, clazz, imports);
15
15
  const resolvedDependenciesCheck = this.resolvedDependencyChecker.check(clazz, dependencies);
16
16
  (0, errorReporter_1.reportErrorIfDependencyIsUnresolved)(this.context, resolvedDependenciesCheck);
17
17
  }
@@ -1 +1 @@
1
- {"version":3,"file":"graphHandler.js","sourceRoot":"","sources":["../../rules/unresolvedProviderDependencies/graphHandler.ts"],"names":[],"mappings":";;;AAEA,mDAAsE;AAGtE,2EAAwE;AAExE,MAAa,YAAY;IACvB,YACU,OAAgB,EAChB,kBAAsC,EACtC,4BAAuD,IAAI,qDAAyB,EAAE;QAFtF,YAAO,GAAP,OAAO,CAAS;QAChB,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,8BAAyB,GAAzB,yBAAyB,CAA6D;IAC5F,CAAC;IAEE,MAAM,CAAC,KAAY,EAAE,OAAiB;QAC3C,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE;YACjC,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACrE,MAAM,yBAAyB,GAAG,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;YAC5F,IAAA,mDAAmC,EAAC,IAAI,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;SAC9E;IACH,CAAC;IAEO,iBAAiB,CAAC,KAAY;QACpC,OAAO,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACF;AAlBD,oCAkBC"}
1
+ {"version":3,"file":"graphHandler.js","sourceRoot":"","sources":["../../rules/unresolvedProviderDependencies/graphHandler.ts"],"names":[],"mappings":";;;AAEA,mDAAsE;AAGtE,2EAAwE;AAExE,MAAa,YAAY;IACvB,YACU,OAAgB,EAChB,kBAAsC,EACtC,4BAAuD,IAAI,qDAAyB,EAAE;QAFtF,YAAO,GAAP,OAAO,CAAS;QAChB,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,8BAAyB,GAAzB,yBAAyB,CAA6D;IAC5F,CAAC;IAEE,MAAM,CAAC,KAAY,EAAE,OAAiB;QAC3C,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE;YACjC,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;YACnF,MAAM,yBAAyB,GAAG,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;YAC5F,IAAA,mDAAmC,EAAC,IAAI,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;SAC9E;IACH,CAAC;IAEO,iBAAiB,CAAC,KAAY;QACpC,OAAO,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACF;AAlBD,oCAkBC"}
@@ -9,7 +9,7 @@ const createRule = utils_1.ESLintUtils.RuleCreator((name) => `https://wix-incuba
9
9
  const unresolvedProviderDependenciesGenerator = (pathResolver = new pathResolver_1.PathResolver()) => {
10
10
  return createRule({
11
11
  create: (context) => {
12
- return (0, createRule_1.create)(context, new fileReader_1.FileReader(context, pathResolver));
12
+ return (0, createRule_1.create)(context, new fileReader_1.FileReader(pathResolver));
13
13
  },
14
14
  name: 'unresolved-provider-dependencies',
15
15
  meta: {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../rules/unresolvedProviderDependencies/index.ts"],"names":[],"mappings":";;;AAAA,oDAAsE;AAEtE,6CAAsC;AACtC,4DAAyD;AACzD,wDAAqD;AAIrD,MAAM,UAAU,GAAG,mBAAW,CAAC,WAAW,CACxC,CAAC,IAAI,EAAE,EAAE,CAAC,2EAA2E,IAAI,EAAE,CAC5F,CAAC;AAEK,MAAM,uCAAuC,GAAG,CACrD,eAA6B,IAAI,2BAAY,EAAE,EAC/C,EAAE;IACF,OAAO,UAAU,CAAC;QAChB,MAAM,EAAE,CAAC,OAA4D,EAAE,EAAE;YACvE,OAAO,IAAA,mBAAM,EAAC,OAAO,EAAE,IAAI,uBAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,EAAE,kCAAkC;QACxC,IAAI,EAAE;YACJ,IAAI,EAAE;gBACJ,WAAW,EAAE,6DAA6D;gBAC1E,WAAW,EAAE,QAAQ;aACtB;YACD,QAAQ,EAAE;gBACR,kCAAkC,EAAE,gDAAgD;aACrF;YACD,MAAM,EAAE,EAAE;YACV,IAAI,EAAE,SAAS;SAChB;QACD,cAAc,EAAE,EAAE;KACnB,CAAgB,CAAC;AACpB,CAAC,CAAC;AArBW,QAAA,uCAAuC,2CAqBlD"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../rules/unresolvedProviderDependencies/index.ts"],"names":[],"mappings":";;;AAAA,oDAAsE;AAEtE,6CAAsC;AACtC,4DAAyD;AACzD,wDAAqD;AAIrD,MAAM,UAAU,GAAG,mBAAW,CAAC,WAAW,CACxC,CAAC,IAAI,EAAE,EAAE,CAAC,2EAA2E,IAAI,EAAE,CAC5F,CAAC;AAEK,MAAM,uCAAuC,GAAG,CACrD,eAA6B,IAAI,2BAAY,EAAE,EAC/C,EAAE;IACF,OAAO,UAAU,CAAC;QAChB,MAAM,EAAE,CAAC,OAA4D,EAAE,EAAE;YACvE,OAAO,IAAA,mBAAM,EAAC,OAAO,EAAE,IAAI,uBAAU,CAAC,YAAY,CAAC,CAAC,CAAC;QACvD,CAAC;QACD,IAAI,EAAE,kCAAkC;QACxC,IAAI,EAAE;YACJ,IAAI,EAAE;gBACJ,WAAW,EAAE,6DAA6D;gBAC1E,WAAW,EAAE,QAAQ;aACtB;YACD,QAAQ,EAAE;gBACR,kCAAkC,EAAE,gDAAgD;aACrF;YACD,MAAM,EAAE,EAAE;YACV,IAAI,EAAE,SAAS;SAChB;QACD,cAAc,EAAE,EAAE;KACnB,CAAgB,CAAC;AACpB,CAAC,CAAC;AArBW,QAAA,uCAAuC,2CAqBlD"}
@@ -1,9 +1,9 @@
1
- import { ClassWithImports } from '../dto/classWithImports';
1
+ import { ClassFile } from '../dto/classFile';
2
2
  import type { FileReader } from '../framework/fileReader';
3
3
  export declare class SubgraphResolver {
4
4
  private fileReader;
5
5
  constructor(fileReader: FileReader);
6
- resolve(clazz: ClassWithImports): ClassWithImports[];
6
+ resolve(clazz: ClassFile): ClassFile[];
7
7
  private getImportedGraphs;
8
8
  private getImportedSubgraphClasses;
9
9
  private getLocalGraphs;
@@ -1 +1 @@
1
- {"version":3,"file":"subgraphResolver.d.ts","sourceRoot":"","sources":["../../rules/unresolvedProviderDependencies/subgraphResolver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAI3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1D,qBAAa,gBAAgB;IACf,OAAO,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAEnC,OAAO,CAAC,KAAK,EAAE,gBAAgB,GAAG,gBAAgB,EAAE;IAO3D,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,sCAAsC;IAK9C,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,uBAAuB;IAQ/B,OAAO,CAAC,qCAAqC;IAO7C,OAAO,CAAC,kBAAkB;CAO3B"}
1
+ {"version":3,"file":"subgraphResolver.d.ts","sourceRoot":"","sources":["../../rules/unresolvedProviderDependencies/subgraphResolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1D,qBAAa,gBAAgB;IACf,OAAO,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAEnC,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,EAAE;IAO7C,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,sCAAsC;IAK9C,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,uBAAuB;IAQ/B,OAAO,CAAC,qCAAqC;IAO7C,OAAO,CAAC,kBAAkB;CAO3B"}
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.SubgraphResolver = void 0;
4
4
  const utils_1 = require("../ast/utils");
5
- const classWithImports_1 = require("../dto/classWithImports");
5
+ const classFile_1 = require("../dto/classFile");
6
6
  const file_1 = require("../dto/file");
7
7
  class SubgraphResolver {
8
8
  constructor(fileReader) {
@@ -14,52 +14,51 @@ class SubgraphResolver {
14
14
  ...this.getLocalGraphs(clazz),
15
15
  ].flatMap((g) => [g, ...this.resolve(g)]);
16
16
  }
17
- getImportedGraphs({ clazz, imports }) {
17
+ getImportedGraphs(clazz) {
18
18
  const subgraphs = this.getSubgraphsPropertyFromGraphDecorator(clazz);
19
- return this.getImportedSubgraphClasses(subgraphs, imports);
19
+ return this.getImportedSubgraphClasses(clazz, subgraphs);
20
20
  }
21
- getImportedSubgraphClasses(subgraphs, imports) {
21
+ getImportedSubgraphClasses(clazz, subgraphs) {
22
22
  if (!subgraphs)
23
23
  return [];
24
24
  const subgraphNames = this.getSubgraphNamesFromDecoratorProperty(subgraphs);
25
25
  const classes = [];
26
- imports.forEach(($import) => {
27
- // TODO: convert this to a map with an inner for each?
26
+ clazz.imports.forEach(($import) => {
28
27
  subgraphNames.forEach((subgraphName) => {
29
28
  if ($import.includes(subgraphName)) {
30
- classes.push(...this.fileReader.read($import.path).toClassWithImports());
29
+ classes.push(...this.fileReader.read(clazz.path, $import.path).toClassWithImports());
31
30
  }
32
31
  });
33
32
  });
34
33
  return classes;
35
34
  }
36
- getLocalGraphs(clazzWithImports) {
37
- const subgraphs = this.getSubgraphsPropertyFromGraphDecorator(clazzWithImports.clazz);
38
- return this.getLocalSubgraphClasses(subgraphs, clazzWithImports);
35
+ getLocalGraphs(clazz) {
36
+ const subgraphs = this.getSubgraphsPropertyFromGraphDecorator(clazz);
37
+ return this.getLocalSubgraphClasses(subgraphs, clazz);
39
38
  }
40
- getSubgraphsPropertyFromGraphDecorator(clazz) {
39
+ getSubgraphsPropertyFromGraphDecorator({ clazz }) {
41
40
  const graphDecorator = clazz.requireDecorator('Graph');
42
41
  return graphDecorator.getProperty('subgraphs');
43
42
  }
44
- getLocalSubgraphClasses(subgraphs, { clazz, imports }) {
43
+ getLocalSubgraphClasses(subgraphs, clazz) {
45
44
  if (!subgraphs)
46
45
  return [];
47
46
  const allSubgraphs = this.getSubgraphNamesFromDecoratorProperty(subgraphs);
48
- const localGraphNames = this.getLocalGraphNames(allSubgraphs, imports);
49
- return this.createLocalGraphClasses(clazz, localGraphNames, imports);
47
+ const localGraphNames = this.getLocalGraphNames(allSubgraphs, clazz);
48
+ return this.createLocalGraphClasses(clazz, localGraphNames);
50
49
  }
51
- createLocalGraphClasses(clazz, localGraphNames, imports) {
50
+ createLocalGraphClasses({ clazz, imports, path }, localGraphNames) {
52
51
  if (localGraphNames.length === 0)
53
52
  return [];
54
- const parent = new file_1.File((0, utils_1.requireProgram)(clazz.node));
53
+ const parent = new file_1.File((0, utils_1.requireProgram)(clazz.node), path);
55
54
  return localGraphNames.map((localGraphName) => {
56
- return new classWithImports_1.ClassWithImports(parent.requireGraph(localGraphName), imports);
55
+ return new classFile_1.ClassFile(parent.requireGraph(localGraphName), imports, path);
57
56
  });
58
57
  }
59
58
  getSubgraphNamesFromDecoratorProperty(subgraphs) {
60
59
  return (0, utils_1.mapArrayExpression)(subgraphs.getValue(), (el) => el.name);
61
60
  }
62
- getLocalGraphNames(subgraphs, imports) {
61
+ getLocalGraphNames(subgraphs, { imports }) {
63
62
  return subgraphs.filter((subgraph) => {
64
63
  return imports.some(($import) => {
65
64
  return $import.includes(subgraph);
@@ -1 +1 @@
1
- {"version":3,"file":"subgraphResolver.js","sourceRoot":"","sources":["../../rules/unresolvedProviderDependencies/subgraphResolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"subgraphResolver.js","sourceRoot":"","sources":["../../rules/unresolvedProviderDependencies/subgraphResolver.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "eslint-plugin-obsidian",
3
3
  "description": "ESLint rules for Obsidian",
4
4
  "main": "dist/index.js",
5
- "version": "2.6.0",
5
+ "version": "2.6.1",
6
6
  "scripts": {
7
7
  "build": "npx tsc --project tsconfig.prod.json",
8
8
  "test": "npx jest",
@@ -1,8 +0,0 @@
1
- import type { Clazz } from './class';
2
- import type { Import } from './import';
3
- export declare class ClassWithImports {
4
- readonly clazz: Clazz;
5
- readonly imports: Import[];
6
- constructor(clazz: Clazz, imports: Import[]);
7
- }
8
- //# sourceMappingURL=classWithImports.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"classWithImports.d.ts","sourceRoot":"","sources":["../../rules/dto/classWithImports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,qBAAa,gBAAgB;aAGT,KAAK,EAAE,KAAK;aACZ,OAAO,EAAE,MAAM,EAAE;gBADjB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,MAAM,EAAE;CAEpC"}
@@ -1,11 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.ClassWithImports = void 0;
4
- class ClassWithImports {
5
- constructor(clazz, imports) {
6
- this.clazz = clazz;
7
- this.imports = imports;
8
- }
9
- }
10
- exports.ClassWithImports = ClassWithImports;
11
- //# sourceMappingURL=classWithImports.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"classWithImports.js","sourceRoot":"","sources":["../../rules/dto/classWithImports.ts"],"names":[],"mappings":";;;AAGA,MAAa,gBAAgB;IAE3B,YACkB,KAAY,EACZ,OAAiB;QADjB,UAAK,GAAL,KAAK,CAAO;QACZ,YAAO,GAAP,OAAO,CAAU;IAChC,CAAC;CACL;AAND,4CAMC"}