@overkill-dev/type-test 0.0.5 → 0.0.6

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 (80) hide show
  1. package/config/adapter-facts.js +15 -0
  2. package/config/adapter-facts.js.map +1 -0
  3. package/generated-input-path.js +5 -0
  4. package/generated-input-path.js.map +1 -0
  5. package/package-version.js +34 -0
  6. package/package-version.js.map +1 -0
  7. package/package.json +8 -12
  8. package/packages/type-test/assertion-reference.d.ts +3 -12
  9. package/packages/type-test/assertion-reference.d.ts.map +1 -1
  10. package/packages/type-test/assertion-reference.js +0 -12
  11. package/packages/type-test/assertion-reference.js.map +1 -1
  12. package/packages/type-test/checker-boundary-validation.js +13 -10
  13. package/packages/type-test/checker-boundary-validation.js.map +1 -1
  14. package/packages/type-test/checker-diagnostics.js +2 -2
  15. package/packages/type-test/checker-diagnostics.js.map +1 -1
  16. package/packages/type-test/checker-evidence.js.map +1 -1
  17. package/packages/type-test/checker-project.js +5 -3
  18. package/packages/type-test/checker-project.js.map +1 -1
  19. package/packages/type-test/checker-resolution.js +15 -24
  20. package/packages/type-test/checker-resolution.js.map +1 -1
  21. package/packages/type-test/checker.entry-point.js +33 -14
  22. package/packages/type-test/checker.entry-point.js.map +1 -1
  23. package/packages/type-test/compiler-file-system.js +67 -0
  24. package/packages/type-test/compiler-file-system.js.map +1 -0
  25. package/packages/type-test/compiler-lifetime.js +52 -0
  26. package/packages/type-test/compiler-lifetime.js.map +1 -0
  27. package/packages/type-test/compiler-plan.js +92 -44
  28. package/packages/type-test/compiler-plan.js.map +1 -1
  29. package/packages/type-test/family-backend.entry-point.js +3 -3
  30. package/packages/type-test/family-backend.entry-point.js.map +1 -1
  31. package/packages/type-test/frozen-inputs.js +68 -97
  32. package/packages/type-test/frozen-inputs.js.map +1 -1
  33. package/packages/type-test/frozen-project.js +63 -41
  34. package/packages/type-test/frozen-project.js.map +1 -1
  35. package/packages/type-test/generated-imports.js +45 -31
  36. package/packages/type-test/generated-imports.js.map +1 -1
  37. package/packages/type-test/generated-input.entry-point.js +4 -3
  38. package/packages/type-test/generated-input.entry-point.js.map +1 -1
  39. package/packages/type-test/generated-module-plan.js +9 -14
  40. package/packages/type-test/generated-module-plan.js.map +1 -1
  41. package/packages/type-test/installed-compiler.js +112 -0
  42. package/packages/type-test/installed-compiler.js.map +1 -0
  43. package/packages/type-test/native-execution.js +6 -6
  44. package/packages/type-test/native-execution.js.map +1 -1
  45. package/packages/type-test/native-reference-expression.js +5 -29
  46. package/packages/type-test/native-reference-expression.js.map +1 -1
  47. package/packages/type-test/native-reference.js +16 -43
  48. package/packages/type-test/native-reference.js.map +1 -1
  49. package/packages/type-test/native-results.js +1 -1
  50. package/packages/type-test/native-results.js.map +1 -1
  51. package/packages/type-test/native-translation.js +33 -54
  52. package/packages/type-test/native-translation.js.map +1 -1
  53. package/packages/type-test/profile-settings.d.ts +19 -7
  54. package/packages/type-test/profile-settings.d.ts.map +1 -1
  55. package/packages/type-test/profile-settings.js +3 -2
  56. package/packages/type-test/profile-settings.js.map +1 -1
  57. package/packages/type-test/profile.entry-point.d.ts +8 -11
  58. package/packages/type-test/profile.entry-point.d.ts.map +1 -1
  59. package/packages/type-test/profile.entry-point.js +1 -5
  60. package/packages/type-test/profile.entry-point.js.map +1 -1
  61. package/packages/type-test/scope-assertions.js +40 -37
  62. package/packages/type-test/scope-assertions.js.map +1 -1
  63. package/packages/type-test/source-analysis.js +109 -14
  64. package/packages/type-test/source-analysis.js.map +1 -1
  65. package/packages/type-test/source-options.js +81 -30
  66. package/packages/type-test/source-options.js.map +1 -1
  67. package/packages/type-test/source-ownership.js +48 -46
  68. package/packages/type-test/source-ownership.js.map +1 -1
  69. package/packages/type-test/type-test.entry-point.d.ts +9 -60
  70. package/packages/type-test/type-test.entry-point.d.ts.map +1 -1
  71. package/packages/type-test/type-test.entry-point.js +2 -27
  72. package/packages/type-test/type-test.entry-point.js.map +1 -1
  73. package/readme.md +75 -171
  74. package/software-bill-of-materials.cyclonedx.json +14 -31
  75. package/packages/type-test/check.entry-point.d.ts +0 -13
  76. package/packages/type-test/check.entry-point.d.ts.map +0 -1
  77. package/packages/type-test/check.entry-point.js +0 -82
  78. package/packages/type-test/check.entry-point.js.map +0 -1
  79. package/packages/type-test/decorator-translation.js +0 -58
  80. package/packages/type-test/decorator-translation.js.map +0 -1
@@ -1,3 +1,4 @@
1
+ import { __addDisposableResource, __disposeResources } from "tslib";
1
2
  import { isBuiltin } from 'node:module';
2
3
  import { dirname, relative, resolve } from 'node:path';
3
4
  import { mapSourceRange, replaceMappedText } from "./generated-source.js";
@@ -25,7 +26,7 @@ function moduleReferences(compiler, source) {
25
26
  if (reference !== undefined && compiler.isStringLiteralLike(reference)) {
26
27
  literals.push(reference);
27
28
  }
28
- compiler.forEachChild(node, visit);
29
+ node.forEachChild(visit);
29
30
  }
30
31
  visit(source);
31
32
  return literals.toSorted(function descending(left, right) {
@@ -53,21 +54,6 @@ function ambiguous(context, literal) {
53
54
  }
54
55
  function verifiedRepair(context, literal, path, generated) {
55
56
  const to = siblingSpecifier(context.module.path, generated, literal.text);
56
- const host = {
57
- ...context.compiler.sys,
58
- fileExists(candidate) {
59
- return Array.from(context.paths.values()).includes(resolve(candidate)) ||
60
- context.compiler.sys.fileExists(candidate);
61
- }
62
- };
63
- const mode = context.compiler.getModeForUsageLocation(context.source, literal, context.options);
64
- const target = context
65
- .compiler
66
- .resolveModuleName(to, context.module.path, context.options, host, undefined, undefined, mode)
67
- .resolvedModule;
68
- if (target === undefined || resolve(target.resolvedFileName) !== generated) {
69
- return ambiguous(context, literal);
70
- }
71
57
  return {
72
58
  kind: 'repair',
73
59
  path,
@@ -76,12 +62,27 @@ function verifiedRepair(context, literal, path, generated) {
76
62
  range: { start: literal.getStart(context.source), end: literal.end }
77
63
  };
78
64
  }
79
- function resolveRepair(context, literal) {
80
- const { compiler, options, module, paths, source } = context;
81
- const mode = compiler.getModeForUsageLocation(source, literal, options);
82
- const target = compiler
83
- .resolveModuleName(literal.text, module.path, options, compiler.sys, undefined, undefined, mode)
84
- .resolvedModule;
65
+ async function originalImport(context, literal) {
66
+ const { compiler, module, project } = context;
67
+ const original = await project.program.getSourceFile(module.path);
68
+ const ranges = mapSourceRange(module.mappings, { start: literal.getStart(context.source), end: literal.end }, 'generated');
69
+ return original === undefined
70
+ ? undefined
71
+ : moduleReferences(compiler, original).find(function matching(candidate) {
72
+ return candidate.text === literal.text && ranges.some(function contains(range) {
73
+ return candidate.getStart(original) <= range.start && candidate.end >= range.end;
74
+ });
75
+ });
76
+ }
77
+ async function resolveRepair(context, literal) {
78
+ const { paths, project } = context;
79
+ if (literal.text === 'tstyche') {
80
+ return { kind: 'unrelated' };
81
+ }
82
+ const originalLiteral = await originalImport(context, literal);
83
+ const target = originalLiteral === undefined
84
+ ? undefined
85
+ : await project.program.getResolvedModuleFromModuleSpecifier(originalLiteral);
85
86
  if (target === undefined) {
86
87
  return isBuiltin(literal.text) ? { kind: 'unrelated' } : ambiguous(context, literal);
87
88
  }
@@ -105,14 +106,27 @@ function applyRepair(result, repair) {
105
106
  repairs: [...result.repairs, { from: repair.from, to: repair.to }]
106
107
  };
107
108
  }
108
- export function repairGeneratedImports(compiler, options, module, paths) {
109
- const source = compiler.createSourceFile(module.path, module.text, {
110
- languageVersion: compiler.ScriptTarget.Latest,
111
- impliedNodeFormat: compiler.getImpliedNodeFormatForFile(module.path, undefined, compiler.sys, options)
112
- }, true);
113
- const context = { compiler, options, module, paths, source };
114
- return moduleReferences(compiler, source).reduce(function repair(result, literal) {
115
- return applyRepair(result, resolveRepair(context, literal));
116
- }, { module, dependencies: [], repairs: [], diagnostics: [] });
109
+ export async function repairGeneratedImports(project, options, module, paths) {
110
+ const env_1 = { stack: [], error: void 0, hasError: false };
111
+ try {
112
+ const compiler = project.compiler.syntax;
113
+ const lease = __addDisposableResource(env_1, await project.api.createSourceFile(module.path, module.text), true);
114
+ const source = lease.sourceFile;
115
+ const context = { compiler, project, options, module, paths, source };
116
+ let result = { module, dependencies: [], repairs: [], diagnostics: [] };
117
+ for (const literal of moduleReferences(compiler, source)) {
118
+ result = applyRepair(result, await resolveRepair(context, literal));
119
+ }
120
+ return result;
121
+ }
122
+ catch (e_1) {
123
+ env_1.error = e_1;
124
+ env_1.hasError = true;
125
+ }
126
+ finally {
127
+ const result_1 = __disposeResources(env_1);
128
+ if (result_1)
129
+ await result_1;
130
+ }
117
131
  }
118
132
  //# sourceMappingURL=generated-imports.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"generated-imports.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/generated-imports.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generated-imports.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/generated-imports.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKvD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAA2C,MAAM,uBAAuB,CAAC;AAoCnH,SAAS,eAAe,CAAC,QAAwB,EAAE,IAAqB;IACpE,IAAI,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3E,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IACD,IAAI,QAAQ,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IACD,IAAI,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/E,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjC,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAwB,EAAE,IAAqB;IACrE,OAAO,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,QAAQ,CAAC,UAAU,CAAC,aAAa;QAChG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QACnB,CAAC,CAAC,SAAS,CAAC;AACpB,CAAC;AAED,SAAS,gBAAgB,CACrB,QAAwB,EACxB,MAA6B;IAE7B,MAAM,QAAQ,GAAuC,EAAE,CAAC;IACxD,SAAS,KAAK,CAAC,IAAqB;QAChC,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACtF,IAAI,SAAS,KAAK,SAAS,IAAI,QAAQ,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;YACrE,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;QACD,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,CAAC;IACd,OAAO,QAAQ,CAAC,QAAQ,CAAC,SAAS,UAAU,CAAC,IAAI,EAAE,KAAK;QACpD,OAAO,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IAChC,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY,EAAE,MAAc,EAAE,QAAgB;IACpE,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACtE,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC;IACvE,OAAO,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC;QACxC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AACrG,CAAC;AAED,SAAS,SAAS,CAAC,OAA0B,EAAE,OAAyC;IACpF,OAAO;QACH,IAAI,EAAE,WAAW;QACjB,UAAU,EAAE;YACR,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI;YACzB,MAAM,EAAE,cAAc,CAClB,OAAO;iBACF,MAAM;iBACN,QAAQ,EACb,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAC7D,WAAW,CACd;YACD,OAAO,EAAE,iCAAiC,OAAO,CAAC,IAAI,EAAE;SAC3D;KACJ,CAAC;AACN,CAAC;AAED,SAAS,cAAc,CACnB,OAA0B,EAC1B,OAAyC,EACzC,IAAY,EACZ,SAAiB;IAEjB,MAAM,EAAE,GAAG,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,OAAO;QACH,IAAI,EAAE,QAAQ;QACd,IAAI;QACJ,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,EAAE;QACF,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;KACvE,CAAC;AACN,CAAC;AAED,KAAK,UAAU,cAAc,CACzB,OAA0B,EAC1B,OAAyC;IAEzC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC9C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,cAAc,CACzB,MAAM,CAAC,QAAQ,EACf,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAC7D,WAAW,CACd,CAAC;IACF,OAAO,QAAQ,KAAK,SAAS;QACzB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,QAAQ,CAAC,SAAS;YACnE,OAAO,SAAS,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,QAAQ,CAAC,KAAK;gBACzE,OAAO,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,KAAK,IAAI,SAAS,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC;YACrF,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;AACX,CAAC;AAED,KAAK,UAAU,aAAa,CACxB,OAA0B,EAC1B,OAAyC;IAEzC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACnC,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IACjC,CAAC;IACD,MAAM,eAAe,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,eAAe,KAAK,SAAS;QACxC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,oCAAoC,CAAC,eAAe,CAAC,CAAC;IAClF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzF,CAAC;IACD,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC9C,OAAO,aAAa,KAAK,SAAS;QAC9B,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE;QACvB,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,WAAW,CAAC,MAAsB,EAAE,MAAoB;IAC7D,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC;IAClB,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC9B,OAAO,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,CAAE,GAAG,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAE,EAAE,CAAC;IACpF,CAAC;IACD,OAAO;QACH,GAAG,MAAM;QACT,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACjF,YAAY,EAAE,CAAE,GAAG,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAE;QACrD,OAAO,EAAE,CAAE,GAAG,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAE;KACvE,CAAC;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CACxC,OAAsB,EACtB,OAAoC,EACpC,MAAwB,EACxB,KAAkC;;;QAElC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;QACzC,MAAY,KAAK,kCAAG,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAA,CAAC;QACjF,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC;QAChC,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QACtE,IAAI,MAAM,GAAmB,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;QACxF,KAAK,MAAM,OAAO,IAAI,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;YACvD,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,MAAM,CAAC;;;;;;;;;;;CACjB"}
@@ -1,9 +1,9 @@
1
- import { isGeneratedTypeTestPath } from "@overkill-dev/run";
1
+ import { isGeneratedTypeTestPath } from "../../generated-input-path.js";
2
2
  import { createGeneratedFileOwnership } from "./generated-file-ownership.js";
3
3
  import { planGeneratedModules, parseProject } from "./generated-module-plan.js";
4
4
  import { mapSourceRange } from "./generated-source.js";
5
5
  export { mapSourceRange } from "./generated-source.js";
6
- export { isGeneratedTypeTestPath } from "@overkill-dev/run";
6
+ export { isGeneratedTypeTestPath } from "../../generated-input-path.js";
7
7
  async function writeReadyInputs(modules, repaired, owned) {
8
8
  const ready = modules.filter(function readyModule(result) {
9
9
  return result.kind === 'ready';
@@ -21,7 +21,8 @@ async function writeReadyInputs(modules, repaired, owned) {
21
21
  async function prepareInputs(request, owned) {
22
22
  const { paths, repaired, modules } = await planGeneratedModules(request);
23
23
  await writeReadyInputs(modules, repaired, owned);
24
- if (parseProject(request).fileNames.some(isGeneratedTypeTestPath)) {
24
+ const original = await parseProject(request);
25
+ if (original.fileNames.some(isGeneratedTypeTestPath)) {
25
26
  throw new Error('Original project discovers generated inputs; exclude .overkill-type-test-* files before checking.');
26
27
  }
27
28
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"generated-input.entry-point.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/generated-input.entry-point.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generated-input.entry-point.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/generated-input.entry-point.ts"],"names":[],"mappings":"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"}
@@ -1,20 +1,14 @@
1
1
  import { randomUUID } from 'node:crypto';
2
2
  import { readFile } from 'node:fs/promises';
3
3
  import { basename, dirname, isAbsolute, join, resolve } from 'node:path';
4
- import { isGeneratedTypeTestPath } from "@overkill-dev/run";
4
+ import { isGeneratedTypeTestPath } from "../../generated-input-path.js";
5
5
  import { sourceFingerprint as fingerprint } from "./frozen-inputs.js";
6
6
  import { repairGeneratedImports } from "./generated-imports.js";
7
7
  import { checkerCompilerOptions } from "./checker-resolution.js";
8
8
  import { validateMappings } from "./generated-source.js";
9
- export function parseProject(request) {
10
- const errors = [];
11
- const project = request.compiler.getParsedCommandLineOfConfigFile(request.projectConfigPath, {}, {
12
- ...request.compiler.sys,
13
- onUnRecoverableConfigFileDiagnostic(diagnostic) {
14
- errors.push(diagnostic);
15
- }
16
- });
17
- if (project === undefined || errors.length > 0 || project.errors.length > 0) {
9
+ export async function parseProject(request) {
10
+ const project = await request.project.api.parseConfigFile(request.projectConfigPath);
11
+ if (project.errors.length > 0) {
18
12
  throw new Error(`Cannot parse original project: ${request.projectConfigPath}`);
19
13
  }
20
14
  return project;
@@ -83,11 +77,12 @@ async function allocatePaths(request) {
83
77
  return paths;
84
78
  }
85
79
  export async function planGeneratedModules(request) {
86
- const project = parseProject(request);
80
+ const project = await parseProject(request);
87
81
  const paths = await allocatePaths(request);
88
- const repaired = request.modules.map(function repair(module) {
89
- return repairGeneratedImports(request.compiler, checkerCompilerOptions(request.compiler, project.options), module, paths);
90
- });
82
+ const repaired = [];
83
+ for (const module of request.modules) {
84
+ repaired.push(await repairGeneratedImports(request.project, checkerCompilerOptions(request.compiler, project.options), module, paths));
85
+ }
91
86
  return { paths, repaired, modules: moduleResults(repaired, paths) };
92
87
  }
93
88
  //# sourceMappingURL=generated-module-plan.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"generated-module-plan.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/generated-module-plan.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generated-module-plan.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/generated-module-plan.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,112 @@
1
+ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
2
+ if (typeof path === "string" && /^\.\.?\//.test(path)) {
3
+ return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
4
+ return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
5
+ });
6
+ }
7
+ return path;
8
+ };
9
+ import { createRequire } from 'node:module';
10
+ import { readFile, realpath, readdir } from 'node:fs/promises';
11
+ import { dirname, resolve, join } from 'node:path';
12
+ import { pathToFileURL } from 'node:url';
13
+ import { createHash } from 'node:crypto';
14
+ import { z } from 'zod';
15
+ import pLimit from 'p-limit';
16
+ const compilerReadConcurrency = 8;
17
+ const readCompilerFile = pLimit(compilerReadConcurrency);
18
+ const manifestSchema = z.object({ name: z.literal('typescript'), version: z.string() });
19
+ const loadedImplementations = new Map();
20
+ const nativeSchema = z.custom(function nativeModule(value) {
21
+ return typeof value === 'object' && value !== null && typeof Reflect.get(value, 'API') === 'function' &&
22
+ ['SymbolFlags', 'TypeFlags', 'ModuleKind', 'ModuleResolutionKind'].every(function exported(name) {
23
+ return typeof Reflect.get(value, name) === 'object';
24
+ });
25
+ });
26
+ const syntaxSchema = z.custom(function syntaxModule(value) {
27
+ return typeof value === 'object' && value !== null && typeof Reflect.get(value, 'SyntaxKind') === 'object' &&
28
+ ['isIdentifier', 'isTypeAssertion', 'isStringLiteralLikeNode', 'isFunctionLikeDeclaration'].every(function exported(name) {
29
+ return typeof Reflect.get(value, name) === 'function';
30
+ });
31
+ });
32
+ async function fingerprint(path) {
33
+ return createHash('sha256').update(await readFile(path)).digest('hex');
34
+ }
35
+ async function compilerFile(path) {
36
+ return { path: await realpath(path), fingerprint: await fingerprint(path) };
37
+ }
38
+ async function compilerFiles(root) {
39
+ const require = createRequire(pathToFileURL(join(root, 'package.json')));
40
+ const binaryManifestPath = require.resolve(`@typescript/typescript-${process.platform}-${process.arch}/package.json`);
41
+ z.object({ version: z.literal('7.1.0-beta') }).parse(JSON.parse(await readFile(binaryManifestPath, 'utf8')));
42
+ const executable = join(dirname(binaryManifestPath), 'lib', process.platform === 'win32' ? 'tsc.exe' : 'tsc');
43
+ const entries = await readdir(root, { recursive: true, withFileTypes: true });
44
+ const paths = entries
45
+ .filter(function implementation(entry) {
46
+ return entry.isFile() && /\.(?:js|cjs|json|ts)$/u.test(entry.name);
47
+ })
48
+ .map(function implementationPath(entry) {
49
+ return join(entry.parentPath, entry.name);
50
+ });
51
+ const unique = Array.from(new Set([binaryManifestPath, executable, ...paths])).toSorted(function byPath(left, right) {
52
+ return left.localeCompare(right);
53
+ });
54
+ return await Promise.all(unique.map(async function readImplementation(path) {
55
+ return readCompilerFile(async function () {
56
+ return compilerFile(path);
57
+ });
58
+ }));
59
+ }
60
+ async function installation(projectRoot, selection) {
61
+ const require = createRequire(pathToFileURL(resolve(projectRoot, 'package.json')));
62
+ const specifier = selection.kind === 'local' ? 'typescript' : selection.specifier;
63
+ const manifestPath = await realpath(require.resolve(`${specifier}/package.json`));
64
+ const manifest = manifestSchema.parse(JSON.parse(await readFile(manifestPath, 'utf8')));
65
+ if (selection.kind === 'package' && selection.version !== manifest.version) {
66
+ throw new Error('Installed compiler does not match the requested exact version.');
67
+ }
68
+ if (manifest.version !== '7.1.0-beta') {
69
+ throw new Error(`Unsupported TypeScript compiler: ${manifest.version}; expected 7.1.0-beta.`);
70
+ }
71
+ const root = dirname(manifestPath);
72
+ return { root, packageUrl: pathToFileURL(`${root}/`).href, files: await compilerFiles(root), require, specifier };
73
+ }
74
+ function verifyLoadedImplementation(input) {
75
+ const loaded = loadedImplementations.get(input.packageUrl);
76
+ if (loaded !== undefined && loaded !== JSON.stringify(input.files)) {
77
+ throw new Error('Compiler implementation changed after loading; restart the execution host.');
78
+ }
79
+ }
80
+ export async function verifyInstalledCompiler(compiler) {
81
+ for (const file of compiler.files) {
82
+ if (await fingerprint(file.path) !== file.fingerprint) {
83
+ throw new Error('Compiler implementation changed after preparation.');
84
+ }
85
+ }
86
+ }
87
+ async function loadCompiler(input) {
88
+ const native = nativeSchema.parse(await import(__rewriteRelativeImportExtension(pathToFileURL(input.require.resolve(`${input.specifier}/async`)).href)));
89
+ const ast = syntaxSchema.parse(await import(__rewriteRelativeImportExtension(pathToFileURL(input.require.resolve(`${input.specifier}/ast`)).href)));
90
+ const reported = await import(__rewriteRelativeImportExtension(pathToFileURL(input.require.resolve(input.specifier)).href));
91
+ z.object({ version: z.literal('7.1.0-beta') }).parse(reported);
92
+ const syntax = {
93
+ ...ast,
94
+ SymbolFlags: native.SymbolFlags,
95
+ TypeFlags: native.TypeFlags,
96
+ ModuleKind: native.ModuleKind,
97
+ ModuleResolutionKind: native.ModuleResolutionKind,
98
+ isTypeAssertionExpression: ast.isTypeAssertion,
99
+ isStringLiteralLike: ast.isStringLiteralLikeNode,
100
+ isFunctionLike: ast.isFunctionLikeDeclaration
101
+ };
102
+ return { syntax, native, version: '7.1.0-beta', packageUrl: input.packageUrl, files: input.files };
103
+ }
104
+ export async function resolveInstalledCompiler(projectRoot, selection) {
105
+ const input = await installation(projectRoot, selection);
106
+ verifyLoadedImplementation(input);
107
+ const compiler = await loadCompiler(input);
108
+ await verifyInstalledCompiler(compiler);
109
+ loadedImplementations.set(input.packageUrl, JSON.stringify(input.files));
110
+ return compiler;
111
+ }
112
+ //# sourceMappingURL=installed-compiler.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"installed-compiler.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/installed-compiler.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { parseAdapterFacts } from "@overkill-dev/run";
1
+ import { parseAdapterFacts } from "../../config/adapter-facts.js";
2
2
  import { verifyFrozenProject, fingerprint } from "./frozen-project.js";
3
3
  import { translateNativePlan } from "./native-translation.js";
4
4
  import { checkGeneratedInputs } from "./checker.entry-point.js";
@@ -26,12 +26,12 @@ async function executeNative(input) {
26
26
  }
27
27
  }
28
28
  export async function collectProject(plan, project) {
29
- const translation = translateNativePlan({
30
- compiler: project.compiler,
29
+ const translation = await translateNativePlan({
30
+ compiler: project.compiler.syntax,
31
31
  program: project.program,
32
- checker: project.program.getTypeChecker()
32
+ checker: project.configured.checker
33
33
  }, plan);
34
- const { configFile, ...compilerOptions } = project.project.options;
34
+ const compilerOptions = project.project.options;
35
35
  const configurationJson = JSON.stringify({
36
36
  options: compilerOptions,
37
37
  files: project.project.fileNames,
@@ -69,7 +69,7 @@ export async function collectProject(plan, project) {
69
69
  compilerVersion: project.compiler.version,
70
70
  request: {
71
71
  projectConfigPath: project.projectConfigPath,
72
- compiler: { kind: 'version', version: project.compiler.version },
72
+ project,
73
73
  modules: translation.modules
74
74
  }
75
75
  });
@@ -1 +1 @@
1
- {"version":3,"file":"native-execution.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/native-execution.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"native-execution.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/native-execution.ts"],"names":[],"mappings":"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"}
@@ -7,18 +7,8 @@ function copied(node) {
7
7
  }
8
8
  return { kind: 'copied', original: { start: node.getFullStart(), end: node.end } };
9
9
  }
10
- export function needsTypeSubject(reference) {
11
- return reference.matcher === 'toAcceptProps' && reference.form === 'typed';
12
- }
13
10
  function subject(context) {
14
11
  const { reference, operands, expectName } = context;
15
- if (needsTypeSubject(reference)) {
16
- return [
17
- syntax(context, `${expectName}<${expectName}Subject<`),
18
- copied(reference.types[0]),
19
- syntax(context, '>>()')
20
- ];
21
- }
22
12
  if (reference.form === 'withActual' || reference.form === 'expressions') {
23
13
  return [syntax(context, `${expectName}(`), copied(operands[0]), syntax(context, ')')];
24
14
  }
@@ -26,35 +16,21 @@ function subject(context) {
26
16
  }
27
17
  function validateOperandCount(context) {
28
18
  const { reference, operands } = context;
29
- if (reference.kind === 'relation') {
30
- const counts = { typed: 0, withActual: 1, withExpected: 1, expressions: 2 };
31
- if (operands.length !== counts[reference.form]) {
32
- throw new Error('Invalid native relation operand count.');
33
- }
34
- }
35
- if (reference.kind === 'instantiation' && operands.length !== (reference.form === 'typed' ? 0 : 1)) {
36
- throw new Error('Invalid instantiation operand count.');
19
+ const counts = { typed: 0, withActual: 1, withExpected: 1, expressions: 2 };
20
+ if (operands.length !== counts[reference.form]) {
21
+ throw new Error('Invalid native relation operand count.');
37
22
  }
38
23
  }
39
- function typedTarget(reference) {
40
- const forms = {
41
- instantiation: ['typed', 'withActual'],
42
- relation: ['typed', 'withActual'],
43
- ability: [],
44
- decorator: []
45
- };
46
- return forms[reference.kind].includes(reference.form);
47
- }
48
24
  function target(context) {
49
25
  const { reference, operands } = context;
50
- if (typedTarget(reference)) {
26
+ if (reference.form === 'typed' || reference.form === 'withActual') {
51
27
  return [
52
28
  syntax(context, '<'),
53
29
  copied(reference.types[reference.form === 'typed' ? 1 : 0]),
54
30
  syntax(context, '>()')
55
31
  ];
56
32
  }
57
- const start = reference.form === 'withActual' || reference.form === 'expressions' ? 1 : 0;
33
+ const start = reference.form === 'expressions' ? 1 : 0;
58
34
  return [
59
35
  syntax(context, '('),
60
36
  ...operands.slice(start).flatMap(function operand(node, index) {
@@ -1 +1 @@
1
- {"version":3,"file":"native-reference-expression.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/native-reference-expression.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"native-reference-expression.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/native-reference-expression.ts"],"names":[],"mappings":"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"}
@@ -1,38 +1,32 @@
1
- import { sourceSymbol } from "./source-analysis.js";
1
+ import { sourceSymbol, sourceDeclarations } from "./source-analysis.js";
2
2
  const bindings = {
3
3
  sameType: { matcher: 'toBe', kind: 'relation' },
4
4
  assignableTo: { matcher: 'toBeAssignableTo', kind: 'relation' },
5
- assignableFrom: { matcher: 'toBeAssignableFrom', kind: 'relation' },
6
- acceptsProps: { matcher: 'toAcceptProps', kind: 'ability' },
7
- applicableTo: { matcher: 'toBeApplicable', kind: 'decorator' },
8
- callableWith: { matcher: 'toBeCallableWith', kind: 'ability' },
9
- constructableWith: { matcher: 'toBeConstructableWith', kind: 'ability' },
10
- instantiableWith: { matcher: 'toBeInstantiableWith', kind: 'instantiation' },
11
- hasProperty: { matcher: 'toHaveProperty', kind: 'ability' },
12
- raisesTypeError: { matcher: 'toRaiseError', kind: 'ability' }
5
+ assignableFrom: { matcher: 'toBeAssignableFrom', kind: 'relation' }
13
6
  };
14
7
  function adapterDeclaration(declaration) {
15
8
  const path = declaration.getSourceFile().fileName.replaceAll('\\', '/');
16
9
  return path.endsWith('/packages/type-test/type-test.entry-point.ts') ||
17
10
  path.includes('/node_modules/@overkill-dev/type-test/');
18
11
  }
19
- export function nativeMatcherBinding(analysis, expression) {
12
+ export async function nativeMatcherBinding(analysis, expression) {
20
13
  const location = analysis.compiler.isPropertyAccessExpression(expression) ? expression.name : expression;
21
- const symbol = sourceSymbol(analysis, location);
14
+ const symbol = await sourceSymbol(analysis, location);
22
15
  if (symbol === undefined) {
23
16
  return null;
24
17
  }
25
18
  const binding = bindings[symbol.name];
26
- return binding !== undefined && symbol.declarations?.some(adapterDeclaration) === true ? binding : null;
19
+ const declarations = await sourceDeclarations(symbol);
20
+ return binding !== undefined && declarations.some(adapterDeclaration) ? binding : null;
27
21
  }
28
- function referenceBinding(analysis, original) {
22
+ async function referenceBinding(analysis, original) {
29
23
  let expression = original;
30
24
  let members = [];
31
- let binding = nativeMatcherBinding(analysis, expression);
25
+ let binding = await nativeMatcherBinding(analysis, expression);
32
26
  while (binding === null && analysis.compiler.isPropertyAccessExpression(expression)) {
33
27
  members = [expression.name.text, ...members];
34
28
  expression = expression.expression;
35
- binding = nativeMatcherBinding(analysis, expression);
29
+ binding = await nativeMatcherBinding(analysis, expression);
36
30
  }
37
31
  if (binding === null) {
38
32
  throw new Error('Assertion reference is not an adapter-owned export.');
@@ -44,7 +38,7 @@ const referenceForms = new Map([
44
38
  ['withExpected', 'withExpected'],
45
39
  ['expressions', 'expressions']
46
40
  ]);
47
- function referenceForm(members, kind) {
41
+ function referenceForm(members) {
48
42
  const [member] = members;
49
43
  if (member === undefined) {
50
44
  return 'typed';
@@ -53,20 +47,8 @@ function referenceForm(members, kind) {
53
47
  if (members.length !== 1 || form === undefined) {
54
48
  throw new Error('Unsupported native assertion reference form.');
55
49
  }
56
- if (kind !== 'relation' && form !== 'withActual') {
57
- throw new Error('Unsupported native assertion reference form.');
58
- }
59
50
  return form;
60
51
  }
61
- function expectedTypeCount(kind, form) {
62
- const counts = {
63
- relation: { typed: 2, withActual: 1, withExpected: 1, expressions: 0 },
64
- ability: { typed: 1, withActual: 0, withExpected: 0, expressions: 0 },
65
- decorator: { typed: 1, withActual: 0, withExpected: 0, expressions: 0 },
66
- instantiation: { typed: 2, withActual: 1, withExpected: 0, expressions: 0 }
67
- };
68
- return counts[kind][form];
69
- }
70
52
  function referenceSyntax(analysis, node) {
71
53
  return analysis.compiler.isCallExpression(node)
72
54
  ? {
@@ -77,27 +59,18 @@ function referenceSyntax(analysis, node) {
77
59
  }
78
60
  : { expression: node, types: [], operands: [], called: false };
79
61
  }
80
- function validateDecoratorSyntax(syntax) {
81
- if (!syntax.called || syntax.operands.length !== 1 || syntax.types.length > 1) {
82
- throw new Error('Decorator expression references require one actual operand.');
83
- }
84
- }
85
- function validateReferenceSyntax(binding, form, syntax) {
86
- if (binding.kind === 'decorator' && form === 'withActual') {
87
- validateDecoratorSyntax(syntax);
88
- return;
89
- }
90
- const count = expectedTypeCount(binding.kind, form);
62
+ function validateReferenceSyntax(form, syntax) {
63
+ const count = { typed: 2, withActual: 1, withExpected: 1, expressions: 0 }[form];
91
64
  if (syntax.called !== count > 0 || syntax.types.length !== count || syntax.operands.length > 0) {
92
65
  throw new Error('Invalid native reference factory arguments.');
93
66
  }
94
67
  }
95
- export function nativeReference(analysis, node) {
68
+ export async function nativeReference(analysis, node) {
96
69
  const syntax = referenceSyntax(analysis, node);
97
- const { binding, members } = referenceBinding(analysis, syntax.expression);
70
+ const { binding, members } = await referenceBinding(analysis, syntax.expression);
98
71
  const negated = members[0] === 'not';
99
- const form = referenceForm(negated ? members.slice(1) : members, binding.kind);
100
- validateReferenceSyntax(binding, form, syntax);
72
+ const form = referenceForm(negated ? members.slice(1) : members);
73
+ validateReferenceSyntax(form, syntax);
101
74
  return { ...binding, negated, form, types: syntax.types };
102
75
  }
103
76
  //# sourceMappingURL=native-reference.js.map