packtory 0.0.67 → 0.0.68

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,2 +1,2 @@
1
- import { type Project as TSMorphProject } from 'ts-morph';
1
+ import { type FileSystemHost, type Project as TSMorphProject } from 'ts-morph';
2
2
  //# sourceMappingURL=type-script-declaration-project.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"type-script-declaration-project.d.ts","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-declaration-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAMH,KAAK,OAAO,IAAI,cAAc,EAEjC,MAAM,UAAU"}
1
+ {"version":3,"file":"type-script-declaration-project.d.ts","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-declaration-project.ts"],"names":[],"mappings":"AACA,OAAO,EAOH,KAAK,cAAc,EACnB,KAAK,OAAO,IAAI,cAAc,EAEjC,MAAM,UAAU"}
@@ -1,5 +1,5 @@
1
- import { ModuleKind, ModuleResolutionKind, ScriptTarget, ts as typescript } from 'ts-morph';
2
- import { installedPackageFilePath, packageRelativeFilePath } from "../../common/package-layout.js";
1
+ import path from 'node:path';
2
+ import { ModuleKind, ModuleResolutionKind, ScriptKind, ScriptTarget, ts as typescript } from 'ts-morph';
3
3
  function declarationCompilerModes() {
4
4
  return [
5
5
  {
@@ -26,14 +26,23 @@ function moduleSpecifiersIn(sourceFile) {
26
26
  return specifier !== undefined;
27
27
  });
28
28
  }
29
- function toDeclarationDiagnostic(packageName, diagnostic) {
29
+ function declarationProjectPackageFolder(baseFolder, packageName) {
30
+ return path.join(baseFolder, '.packtory-type-integrity', 'node_modules', packageName);
31
+ }
32
+ function declarationProjectPackageFilePath(packageFolder, relativeFilePath) {
33
+ return path.join(packageFolder, relativeFilePath);
34
+ }
35
+ function declarationProjectPackageRelativeFilePath(packageFolder, filePath) {
36
+ return path.relative(packageFolder, filePath).split(path.sep).join(path.posix.sep);
37
+ }
38
+ function toDeclarationDiagnostic(packageFolder, diagnostic) {
30
39
  const sourceFile = diagnostic.getSourceFile();
31
40
  const start = diagnostic.getStart();
32
41
  if (sourceFile === undefined || start === undefined) {
33
42
  return undefined;
34
43
  }
35
44
  return {
36
- declarationPath: packageRelativeFilePath(packageName, sourceFile.getFilePath()),
45
+ declarationPath: declarationProjectPackageRelativeFilePath(packageFolder, sourceFile.getFilePath()),
37
46
  line: sourceFile.getLineAndColumnAtPos(start).line,
38
47
  code: diagnostic.getCode(),
39
48
  message: typescript.flattenDiagnosticMessageText(diagnostic.compilerObject.messageText, '\n')
@@ -42,41 +51,49 @@ function toDeclarationDiagnostic(packageName, diagnostic) {
42
51
  function isDeclarationDiagnostic(diagnostic) {
43
52
  return diagnostic !== undefined;
44
53
  }
45
- function createModeProject(project, packageName, modeLabel) {
54
+ function createModeProject(project, packageFolder, modeLabel) {
46
55
  return {
47
56
  modeLabel,
48
57
  moduleSpecifiersOf(declarationPath) {
49
- return moduleSpecifiersIn(project.getSourceFileOrThrow(installedPackageFilePath(packageName, declarationPath)));
58
+ return moduleSpecifiersIn(project.getSourceFileOrThrow(declarationProjectPackageFilePath(packageFolder, declarationPath)));
50
59
  },
51
60
  listDiagnostics() {
52
61
  return project
53
62
  .getPreEmitDiagnostics()
54
63
  .map(function (diagnostic) {
55
- return toDeclarationDiagnostic(packageName, diagnostic);
64
+ return toDeclarationDiagnostic(packageFolder, diagnostic);
56
65
  })
57
66
  .filter(isDeclarationDiagnostic);
58
67
  }
59
68
  };
60
69
  }
61
70
  export function createDeclarationProjectFactory(dependencies) {
62
- const { Project } = dependencies;
71
+ const { Project, fileSystemHost, packageResolutionBaseFolder } = dependencies;
63
72
  function createProjectForMode(packageName, packageFiles, compilerMode) {
73
+ const packageFolder = declarationProjectPackageFolder(packageResolutionBaseFolder, packageName);
64
74
  const project = new Project({
65
- useInMemoryFileSystem: true,
75
+ fileSystem: fileSystemHost,
66
76
  skipAddingFilesFromTsConfig: true,
67
77
  compilerOptions: {
68
78
  module: compilerMode.module,
69
79
  moduleResolution: compilerMode.moduleResolution,
70
80
  noEmit: true,
81
+ resolveJsonModule: true,
71
82
  skipLibCheck: false,
72
83
  strict: true,
73
84
  target: ScriptTarget.ESNext
74
85
  }
75
86
  });
76
87
  for (const packageFile of packageFiles) {
77
- project.createSourceFile(installedPackageFilePath(packageName, packageFile.filePath), packageFile.content);
88
+ const filePath = declarationProjectPackageFilePath(packageFolder, packageFile.filePath);
89
+ if (path.basename(packageFile.filePath) === 'package.json') {
90
+ project.createSourceFile(filePath, packageFile.content, { scriptKind: ScriptKind.JSON });
91
+ }
92
+ else {
93
+ project.createSourceFile(filePath, packageFile.content);
94
+ }
78
95
  }
79
- return createModeProject(project, packageName, compilerMode.label);
96
+ return createModeProject(project, packageFolder, compilerMode.label);
80
97
  }
81
98
  return function createDeclarationProjects(packageName, packageFiles) {
82
99
  return declarationCompilerModes().map(function (compilerMode) {
@@ -1 +1 @@
1
- {"version":3,"file":"type-script-declaration-project.js","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-declaration-project.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"type-script-declaration-project.js","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-declaration-project.ts"],"names":[],"mappings":"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"}
@@ -40,9 +40,6 @@ function installedPackageFolderPath(packageName) {
40
40
  export function installedPackageFilePath(packageName, relativeFilePath) {
41
41
  return path.posix.join(installedPackageFolderPath(packageName), relativeFilePath);
42
42
  }
43
- export function packageRelativeFilePath(packageName, installedFilePath) {
44
- return path.posix.relative(installedPackageFolderPath(packageName), installedFilePath);
45
- }
46
43
  export function isPackageManifestPath(filePath) {
47
44
  return path.basename(filePath) === packageManifestFilePath;
48
45
  }
@@ -1 +1 @@
1
- {"version":3,"file":"package-layout.js","sourceRoot":"","sources":["../../../../source/common/package-layout.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package-layout.js","sourceRoot":"","sources":["../../../../source/common/package-layout.ts"],"names":[],"mappings":"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"}
@@ -35,9 +35,6 @@ function entryRootFilePathsFor(bundle) {
35
35
  throw new Error(`Bundle "${bundle.name}" is missing root "${rootId}" referenced by its entry surface`);
36
36
  }
37
37
  paths.add(root.js.sourceFilePath);
38
- if (root.declarationFile !== undefined) {
39
- paths.add(root.declarationFile.sourceFilePath);
40
- }
41
38
  }
42
39
  return paths;
43
40
  }
@@ -1 +1 @@
1
- {"version":3,"file":"load-bundle.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/load-bundle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAE5E,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAEtE,OAAO,EAAE,uBAAuB,EAA0B,MAAM,qCAAqC,CAAC;AAEtG,OAAO,EAAE,sBAAsB,EAA0B,MAAM,gCAAgC,CAAC;AAwBhG,SAAS,kBAAkB,CACvB,cAAuB,EACvB,kBAA2B,EAC3B,QAA8B;IAE9B,OAAO,qBAAqB,CAAC,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,cAAc,CAAC;AAChH,CAAC;AAED,SAAS,YAAY,CACjB,cAAuB,EACvB,kBAA2B,EAC3B,QAA8B;IAE9B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,CAAC;QACvD,OAAO,EAAE,QAAQ,EAAE,CAAC;IACxB,CAAC;IACD,MAAM,OAAO,GAAG,kBAAkB,CAAC,cAAc,EAAE,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IACjF,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CACvC,QAAQ,CAAC,eAAe,CAAC,cAAc,EACvC,QAAQ,CAAC,eAAe,CAAC,OAAO,CACnC,CAAC;IACF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,uBAAuB,CAAC,UAAU,CAAC,EAAE,CAAC;AACnF,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAiC;IACxD,MAAM,MAAM,GAAmB,EAAE,CAAC;IAClC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,CAAC,IAAI,CAAC;gBACR,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,cAAc;gBAC7D,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;aAC3B,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAoB;IAC/C,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,WAAW,MAAM,CAAC,IAAI,sBAAsB,MAAM,mCAAmC,CAAC,CAAC;QAC3G,CAAC;QAED,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;QAClC,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;YACrC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QACnD,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,aAA4B,EAAE,KAAuB;IAC5E,MAAM,cAAc,GAAG,aAAa,EAAE,CAAC;IACvC,MAAM,kBAAkB,GAAG,aAAa,EAAE,CAAC;IAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,QAAQ;QACvD,OAAO,YAAY,CAAC,cAAc,EAAE,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,sBAAsB,CAAC;QACxC,KAAK,EAAE,YAAY;QACnB,mBAAmB,EAAE,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC;QACxD,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;KACjD,CAAC,CAAC;IACH,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;AACzD,CAAC"}
1
+ {"version":3,"file":"load-bundle.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/load-bundle.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import { Node as TsMorphNode } from 'ts-morph';
2
+ import { isDeclarationCompanionFilePath } from "../../common/declaration-companion-paths.js";
2
3
  import { bindingId } from "./binding-id.js";
3
4
  import { collectIdentifierTargets } from "./identifier-target-collector.js";
4
5
  import { collectImpureStatements } from "./impure-statements.js";
@@ -15,7 +16,7 @@ function entryPointExportDeclarationSeeds(file, declarationIndex) {
15
16
  });
16
17
  }
17
18
  function exportedBindingSeeds(file, isEntry) {
18
- if (!isEntry) {
19
+ if (!isEntry && !isDeclarationCompanionFilePath(file.sourceFilePath)) {
19
20
  return [];
20
21
  }
21
22
  return file.bindings.flatMap(function (binding) {
@@ -1 +1 @@
1
- {"version":3,"file":"local-seed-gathering.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/reachability/local-seed-gathering.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,WAAW,EAAmC,MAAM,UAAU,CAAC;AAEhF,OAAO,EAAE,SAAS,EAAuB,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAA6B,MAAM,kCAAkC,CAAC;AACvG,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAMjE,SAAS,cAAc,CACnB,UAAgC,EAChC,gBAAsC;IAEtC,OAAO,UAAU,CAAC,OAAO,CAAC,UAAU,SAAS;QACzC,OAAO,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,gCAAgC,CACrC,IAAkB,EAClB,gBAAsC;IAEtC,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,UAAU,SAAS;QAC9D,OAAO,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC;YAC7C,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;YACnE,CAAC,CAAC,EAAE,CAAC;IACb,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAkB,EAAE,OAAgB;IAC9D,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;IACd,CAAC;IACD,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,OAAO;QAC1C,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAE,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACtF,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,YAAY,CACjB,IAAkB,EAClB,OAAgB,EAChB,gBAAsC,EACtC,mBAA4D;IAE5D,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;IACvF,OAAO;QACH,GAAG,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC;QACtC,GAAG,OAAO,CAAC,CAAC,CAAC,gCAAgC,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE;QAC1E,GAAG,cAAc,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;KACxD,CAAC;AACN,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC5B,KAA8B,EAC9B,mBAAwC,EACxC,gBAAsC,EACtC,mBAA4D;IAE5D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC7D,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;QACrF,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC3B,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"local-seed-gathering.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/reachability/local-seed-gathering.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,WAAW,EAAmC,MAAM,UAAU,CAAC;AAChF,OAAO,EAAE,8BAA8B,EAAE,MAAM,6CAA6C,CAAC;AAE7F,OAAO,EAAE,SAAS,EAAuB,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAA6B,MAAM,kCAAkC,CAAC;AACvG,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAMjE,SAAS,cAAc,CACnB,UAAgC,EAChC,gBAAsC;IAEtC,OAAO,UAAU,CAAC,OAAO,CAAC,UAAU,SAAS;QACzC,OAAO,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,gCAAgC,CACrC,IAAkB,EAClB,gBAAsC;IAEtC,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,UAAU,SAAS;QAC9D,OAAO,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC;YAC7C,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;YACnE,CAAC,CAAC,EAAE,CAAC;IACb,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAkB,EAAE,OAAgB;IAC9D,IAAI,CAAC,OAAO,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QACnE,OAAO,EAAE,CAAC;IACd,CAAC;IACD,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,OAAO;QAC1C,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAE,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACtF,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,YAAY,CACjB,IAAkB,EAClB,OAAgB,EAChB,gBAAsC,EACtC,mBAA4D;IAE5D,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;IACvF,OAAO;QACH,GAAG,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC;QACtC,GAAG,OAAO,CAAC,CAAC,CAAC,gCAAgC,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE;QAC1E,GAAG,cAAc,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;KACxD,CAAC;AACN,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC5B,KAA8B,EAC9B,mBAAwC,EACxC,gBAAsC,EACtC,mBAA4D;IAE5D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC7D,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;QACrF,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC3B,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}
package/package.json CHANGED
@@ -128,5 +128,5 @@
128
128
  "./tar/tarball-builder.js"
129
129
  ],
130
130
  "type": "module",
131
- "version": "0.0.67"
131
+ "version": "0.0.68"
132
132
  }
@@ -1,15 +1,18 @@
1
1
  import { checkPackage, Package } from '@arethetypeswrong/core';
2
2
  import { problemAffectsEntrypointResolution, problemAffectsResolutionKind, problemKindInfo } from '@arethetypeswrong/core/problems';
3
+ import { RealFileSystemHost } from '@ts-morph/common';
3
4
  import { Project } from 'ts-morph';
4
5
  import { createCheckRunner } from "../checks/check-runner.js";
5
6
  import { createAllRules } from "../checks/rules/registry.js";
6
7
  import { createDeclarationIntegritySummarizer } from "../checks/rules/type-script-declaration-integrity.js";
7
8
  import { createDeclarationProjectFactory } from "../checks/rules/type-script-declaration-project.js";
8
9
  import { createPackageResolutionAnalyzer } from "../checks/rules/type-script-package-resolution.js";
10
+ import { createFileSystemAdapters } from "../dependency-scanner/typescript-file-host.js";
9
11
  import { createPacktory } from "../packtory/packtory.js";
10
12
  import { createScheduler } from "../packtory/scheduler.js";
11
13
  import { buildPackageProcessorComposition } from "./package-processor.composition.js";
12
- function buildCheckRunner() {
14
+ function buildCheckRunner(repositoryFolder) {
15
+ const fileSystemAdapters = createFileSystemAdapters({ fileSystemHost: new RealFileSystemHost() });
13
16
  const rules = createAllRules({
14
17
  analyzePackageResolution: createPackageResolutionAnalyzer({
15
18
  Package,
@@ -19,7 +22,11 @@ function buildCheckRunner() {
19
22
  problemAffectsEntrypointResolution
20
23
  }),
21
24
  summarizeDeclarationIntegrity: createDeclarationIntegritySummarizer({
22
- createDeclarationProjects: createDeclarationProjectFactory({ Project })
25
+ createDeclarationProjects: createDeclarationProjectFactory({
26
+ Project,
27
+ fileSystemHost: fileSystemAdapters.fileSystemHostWithoutFilter,
28
+ packageResolutionBaseFolder: repositoryFolder
29
+ })
23
30
  })
24
31
  });
25
32
  return createCheckRunner({ rules });
@@ -39,7 +46,7 @@ export function buildPacktoryComposition(options) {
39
46
  fileManager: parts.fileManager,
40
47
  repositoryFolder: parts.repositoryFolder,
41
48
  versionManager: parts.versionManager,
42
- runChecks: buildCheckRunner(),
49
+ runChecks: buildCheckRunner(parts.repositoryFolder),
43
50
  packEmitter: parts.packEmitter,
44
51
  vendorMaterializer: parts.vendorMaterializer,
45
52
  readCurrentGitHead: parts.readCurrentGitHead,
@@ -1 +1 @@
1
- {"version":3,"file":"packtory.composition.js","sourceRoot":"","sources":["../../../../source/packages/packtory.composition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EACH,kCAAkC,EAClC,4BAA4B,EAC5B,eAAe,EAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAoB,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,oCAAoC,EAAE,MAAM,sDAAsD,CAAC;AAC5G,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AACrG,OAAO,EAAE,+BAA+B,EAAE,MAAM,mDAAmD,CAAC;AACpG,OAAO,EAAE,cAAc,EAAiB,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EACH,gCAAgC,EAEnC,MAAM,oCAAoC,CAAC;AAO5C,SAAS,gBAAgB;IACrB,MAAM,KAAK,GAAG,cAAc,CAAC;QACzB,wBAAwB,EAAE,+BAA+B,CAAC;YACtD,OAAO;YACP,YAAY;YACZ,eAAe;YACf,4BAA4B;YAC5B,kCAAkC;SACrC,CAAC;QACF,6BAA6B,EAAE,oCAAoC,CAAC;YAChE,yBAAyB,EAAE,+BAA+B,CAAC,EAAE,OAAO,EAAE,CAAC;SAC1E,CAAC;KACL,CAAC,CAAC;IAEH,OAAO,iBAAiB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAA2C;IAChF,MAAM,KAAK,GAAG,gCAAgC,CAAC,OAAO,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,eAAe,CAAC;QAC9B,yBAAyB,EAAE,KAAK,CAAC,mBAAmB,CAAC,QAAQ;KAChE,CAAC,CAAC;IAEH,OAAO;QACH,QAAQ,EAAE,cAAc,CAAC;YACrB,SAAS;YACT,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;YAC9C,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,SAAS,EAAE,gBAAgB,EAAE;YAC7B,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;SACrD,CAAC;QACF,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;KACjD,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"packtory.composition.js","sourceRoot":"","sources":["../../../../source/packages/packtory.composition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EACH,kCAAkC,EAClC,4BAA4B,EAC5B,eAAe,EAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAoB,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,oCAAoC,EAAE,MAAM,sDAAsD,CAAC;AAC5G,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AACrG,OAAO,EAAE,+BAA+B,EAAE,MAAM,mDAAmD,CAAC;AACpG,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AACzF,OAAO,EAAE,cAAc,EAAiB,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EACH,gCAAgC,EAEnC,MAAM,oCAAoC,CAAC;AAO5C,SAAS,gBAAgB,CAAC,gBAAwB;IAC9C,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,EAAE,cAAc,EAAE,IAAI,kBAAkB,EAAE,EAAE,CAAC,CAAC;IAClG,MAAM,KAAK,GAAG,cAAc,CAAC;QACzB,wBAAwB,EAAE,+BAA+B,CAAC;YACtD,OAAO;YACP,YAAY;YACZ,eAAe;YACf,4BAA4B;YAC5B,kCAAkC;SACrC,CAAC;QACF,6BAA6B,EAAE,oCAAoC,CAAC;YAChE,yBAAyB,EAAE,+BAA+B,CAAC;gBACvD,OAAO;gBACP,cAAc,EAAE,kBAAkB,CAAC,2BAA2B;gBAC9D,2BAA2B,EAAE,gBAAgB;aAChD,CAAC;SACL,CAAC;KACL,CAAC,CAAC;IAEH,OAAO,iBAAiB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAA2C;IAChF,MAAM,KAAK,GAAG,gCAAgC,CAAC,OAAO,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,eAAe,CAAC;QAC9B,yBAAyB,EAAE,KAAK,CAAC,mBAAmB,CAAC,QAAQ;KAChE,CAAC,CAAC;IAEH,OAAO;QACH,QAAQ,EAAE,cAAc,CAAC;YACrB,SAAS;YACT,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;YAC9C,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,SAAS,EAAE,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC;YACnD,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;SACrD,CAAC;QACF,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;KACjD,CAAC;AACN,CAAC"}
package/sbom.cdx.json CHANGED
@@ -16,9 +16,9 @@
16
16
  "component": {
17
17
  "type": "library",
18
18
  "name": "packtory",
19
- "version": "0.0.67",
20
- "bom-ref": "pkg:npm/packtory@0.0.67",
21
- "purl": "pkg:npm/packtory@0.0.67"
19
+ "version": "0.0.68",
20
+ "bom-ref": "pkg:npm/packtory@0.0.68",
21
+ "purl": "pkg:npm/packtory@0.0.68"
22
22
  }
23
23
  },
24
24
  "components": [
@@ -379,7 +379,7 @@
379
379
  "ref": "pkg:npm/npm-registry-fetch@20.0.1"
380
380
  },
381
381
  {
382
- "ref": "pkg:npm/packtory@0.0.67",
382
+ "ref": "pkg:npm/packtory@0.0.68",
383
383
  "dependsOn": [
384
384
  "pkg:npm/@arethetypeswrong/core@0.18.5",
385
385
  "pkg:npm/@cyclonedx/cyclonedx-library@10.1.0",