@openrewrite/rewrite 8.77.1 → 8.77.2

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.
@@ -3,28 +3,18 @@ import { ExecutionContext } from "../../execution";
3
3
  import { TreeVisitor } from "../../visitor";
4
4
  import { DependencyScope, PackageManager } from "../node-resolution-result";
5
5
  import { DependencyRecipeAccumulator } from "../package-manager";
6
- /**
7
- * Information about a project that needs updating
8
- */
6
+ interface MatchedDependency {
7
+ packageName: string;
8
+ dependencyScope: DependencyScope;
9
+ currentVersion: string;
10
+ }
9
11
  interface ProjectUpdateInfo {
10
- /** Relative path to package.json (from source root) */
11
12
  packageJsonPath: string;
12
- /** Original package.json content */
13
13
  originalPackageJson: string;
14
- /** The scope where the dependency was found */
15
- dependencyScope: DependencyScope;
16
- /** Current version constraint */
17
- currentVersion: string;
18
- /** New version constraint to apply */
14
+ matchedDependencies: MatchedDependency[];
19
15
  newVersion: string;
20
- /** The package manager used by this project */
21
16
  packageManager: PackageManager;
22
- /**
23
- * If true, skip running the package manager because the resolved version
24
- * already satisfies the new constraint. Only package.json needs updating.
25
- */
26
17
  skipInstall: boolean;
27
- /** Config file contents extracted from the project (e.g., .npmrc) */
28
18
  configFiles?: Record<string, string>;
29
19
  }
30
20
  interface Accumulator extends DependencyRecipeAccumulator<ProjectUpdateInfo> {
@@ -48,9 +38,13 @@ interface Accumulator extends DependencyRecipeAccumulator<ProjectUpdateInfo> {
48
38
  export declare class UpgradeDependencyVersion extends ScanningRecipe<Accumulator> {
49
39
  readonly name = "org.openrewrite.javascript.dependencies.upgrade-dependency-version";
50
40
  readonly displayName = "Upgrade npm dependency version";
51
- readonly description = "Upgrades the version of a direct dependency in `package.json` and updates the lock file by running the package manager.";
52
- packageName: string;
41
+ readonly description = "Upgrades the version of a direct dependency in `package.json` and updates the lock file by running the package manager. Either `packageName` or `packagePattern` must be specified.";
42
+ packageName?: string;
43
+ packagePattern?: string;
53
44
  newVersion: string;
45
+ private _matcher?;
46
+ private get matcher();
47
+ matchesPackage(name: string): boolean;
54
48
  initialValue(_ctx: ExecutionContext): Accumulator;
55
49
  /**
56
50
  * Determines if the dependency should be upgraded from currentVersion to newVersion.
@@ -73,15 +67,7 @@ export declare class UpgradeDependencyVersion extends ScanningRecipe<Accumulator
73
67
  * All file contents are provided from in-memory sources (SourceFiles), not read from disk.
74
68
  */
75
69
  private runPackageManagerInstall;
76
- /**
77
- * Creates a modified package.json with the updated dependency version.
78
- * Used for the temp directory to validate the version exists.
79
- */
80
70
  private createModifiedPackageJson;
81
- /**
82
- * Updates just the versionConstraint in the marker for the target dependency.
83
- * Used when skipInstall is true - the resolved version is unchanged.
84
- */
85
71
  private updateMarkerVersionConstraint;
86
72
  }
87
73
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"upgrade-dependency-version.d.ts","sourceRoot":"","sources":["../../../src/javascript/recipes/upgrade-dependency-version.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAS,cAAc,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAK1C,OAAO,EAEH,eAAe,EAEf,cAAc,EAEjB,MAAM,2BAA2B,CAAC;AAKnC,OAAO,EAGH,2BAA2B,EAQ9B,MAAM,oBAAoB,CAAC;AAE5B;;GAEG;AACH,UAAU,iBAAiB;IACvB,uDAAuD;IACvD,eAAe,EAAE,MAAM,CAAC;IACxB,oCAAoC;IACpC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,+CAA+C;IAC/C,eAAe,EAAE,eAAe,CAAC;IACjC,iCAAiC;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,sCAAsC;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,+CAA+C;IAC/C,cAAc,EAAE,cAAc,CAAC;IAC/B;;;OAGG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB,qEAAqE;IACrE,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC;AAED,UAAU,WAAY,SAAQ,2BAA2B,CAAC,iBAAiB,CAAC;IACxE,0DAA0D;IAC1D,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,wBAAyB,SAAQ,cAAc,CAAC,WAAW,CAAC;IACrE,QAAQ,CAAC,IAAI,wEAAwE;IACrF,QAAQ,CAAC,WAAW,oCAAoC;IACxD,QAAQ,CAAC,WAAW,6HAA6H;IAOjJ,WAAW,EAAG,MAAM,CAAC;IAOrB,UAAU,EAAG,MAAM,CAAC;IAEpB,YAAY,CAAC,IAAI,EAAE,gBAAgB,GAAG,WAAW;IAOjD;;;;;;;;;;;OAWG;IACH,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO;IAqB5D,OAAO,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAqHtE,cAAc,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAqEnF;;;;OAIG;YACW,wBAAwB;IAkCtC;;;OAGG;IACH,OAAO,CAAC,yBAAyB;IAcjC;;;OAGG;IACH,OAAO,CAAC,6BAA6B;CA2BxC"}
1
+ {"version":3,"file":"upgrade-dependency-version.d.ts","sourceRoot":"","sources":["../../../src/javascript/recipes/upgrade-dependency-version.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAS,cAAc,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAK1C,OAAO,EAEH,eAAe,EAEf,cAAc,EAEjB,MAAM,2BAA2B,CAAC;AAMnC,OAAO,EAGH,2BAA2B,EAQ9B,MAAM,oBAAoB,CAAC;AAE5B,UAAU,iBAAiB;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,UAAU,iBAAiB;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,iBAAiB,EAAE,CAAC;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC;AAED,UAAU,WAAY,SAAQ,2BAA2B,CAAC,iBAAiB,CAAC;IACxE,0DAA0D;IAC1D,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,wBAAyB,SAAQ,cAAc,CAAC,WAAW,CAAC;IACrE,QAAQ,CAAC,IAAI,wEAAwE;IACrF,QAAQ,CAAC,WAAW,oCAAoC;IACxD,QAAQ,CAAC,WAAW,yLAAyL;IAQ7M,WAAW,CAAC,EAAE,MAAM,CAAC;IAQrB,cAAc,CAAC,EAAE,MAAM,CAAC;IAOxB,UAAU,EAAG,MAAM,CAAC;IAEpB,OAAO,CAAC,QAAQ,CAAC,CAAoB;IAErC,OAAO,KAAK,OAAO,GAOlB;IAED,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAUrC,YAAY,CAAC,IAAI,EAAE,gBAAgB,GAAG,WAAW;IAUjD;;;;;;;;;;;OAWG;IACH,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO;IAqB5D,OAAO,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IA0GtE,cAAc,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAoEnF;;;;OAIG;YACW,wBAAwB;IAiCtC,OAAO,CAAC,yBAAyB;IAgBjC,OAAO,CAAC,6BAA6B;CA4BxC"}
@@ -63,6 +63,7 @@ const text_1 = require("../../text");
63
63
  const node_resolution_result_1 = require("../node-resolution-result");
64
64
  const path = __importStar(require("path"));
65
65
  const semver = __importStar(require("semver"));
66
+ const picomatch = __importStar(require("picomatch"));
66
67
  const markers_1 = require("../../markers");
67
68
  const print_1 = require("../../print");
68
69
  const package_manager_1 = require("../package-manager");
@@ -85,9 +86,29 @@ class UpgradeDependencyVersion extends recipe_1.ScanningRecipe {
85
86
  super(...arguments);
86
87
  this.name = "org.openrewrite.javascript.dependencies.upgrade-dependency-version";
87
88
  this.displayName = "Upgrade npm dependency version";
88
- this.description = "Upgrades the version of a direct dependency in `package.json` and updates the lock file by running the package manager.";
89
+ this.description = "Upgrades the version of a direct dependency in `package.json` and updates the lock file by running the package manager. Either `packageName` or `packagePattern` must be specified.";
90
+ }
91
+ get matcher() {
92
+ if (this.packagePattern && !this._matcher) {
93
+ this._matcher = picomatch.default
94
+ ? picomatch.default(this.packagePattern)
95
+ : picomatch(this.packagePattern);
96
+ }
97
+ return this._matcher;
98
+ }
99
+ matchesPackage(name) {
100
+ if (this.packageName && name === this.packageName) {
101
+ return true;
102
+ }
103
+ if (this.matcher) {
104
+ return this.matcher(name);
105
+ }
106
+ return false;
89
107
  }
90
108
  initialValue(_ctx) {
109
+ if (!this.packageName && !this.packagePattern) {
110
+ throw new Error("Either packageName or packagePattern must be specified");
111
+ }
91
112
  return Object.assign(Object.assign({}, (0, package_manager_1.createDependencyRecipeAccumulator)()), { originalLockFiles: new Map() });
92
113
  }
93
114
  /**
@@ -139,7 +160,7 @@ class UpgradeDependencyVersion extends recipe_1.ScanningRecipe {
139
160
  return tree;
140
161
  }
141
162
  async handleJsonDocument(doc, _ctx) {
142
- var _a, _b;
163
+ var _a;
143
164
  const basename = path.basename(doc.sourcePath);
144
165
  // Capture JSON lock file content (package-lock.json, bun.lock)
145
166
  if (LOCK_FILE_NAMES.includes(basename)) {
@@ -155,32 +176,29 @@ class UpgradeDependencyVersion extends recipe_1.ScanningRecipe {
155
176
  return doc;
156
177
  }
157
178
  const pm = (_a = marker.packageManager) !== null && _a !== void 0 ? _a : node_resolution_result_1.PackageManager.Npm;
158
- // Check each dependency scope for the target package
159
- const scopes = node_resolution_result_1.allDependencyScopes;
160
- let foundScope;
161
- let currentVersion;
162
- for (const scope of scopes) {
179
+ const matchedDeps = [];
180
+ for (const scope of node_resolution_result_1.allDependencyScopes) {
163
181
  const deps = marker[scope];
164
- const dep = deps === null || deps === void 0 ? void 0 : deps.find(d => d.name === recipe.packageName);
165
- if (dep) {
166
- foundScope = scope;
167
- currentVersion = dep.versionConstraint;
168
- break;
182
+ if (!deps)
183
+ continue;
184
+ for (const dep of deps) {
185
+ if (recipe.matchesPackage(dep.name) && recipe.shouldUpgrade(dep.versionConstraint, recipe.newVersion)) {
186
+ matchedDeps.push({
187
+ packageName: dep.name,
188
+ dependencyScope: scope,
189
+ currentVersion: dep.versionConstraint
190
+ });
191
+ }
169
192
  }
170
193
  }
171
- if (!foundScope || !currentVersion) {
172
- return doc; // Dependency not found in any scope
173
- }
174
- // Check if upgrade is needed
175
- if (!recipe.shouldUpgrade(currentVersion, recipe.newVersion)) {
176
- return doc; // Already at target version or newer
194
+ if (matchedDeps.length === 0) {
195
+ return doc;
177
196
  }
178
- // Check if we can skip running the package manager
179
- // (resolved version already satisfies the new constraint)
180
- const resolvedDep = (_b = marker.resolvedDependencies) === null || _b === void 0 ? void 0 : _b.find(rd => rd.name === recipe.packageName);
181
- const skipInstall = resolvedDep !== undefined &&
182
- semver.satisfies(resolvedDep.version, recipe.newVersion);
183
- // Serialize npmrc configs from marker using requested scopes
197
+ const skipInstall = matchedDeps.every(md => {
198
+ var _a;
199
+ const resolvedDep = (_a = marker.resolvedDependencies) === null || _a === void 0 ? void 0 : _a.find(rd => rd.name === md.packageName);
200
+ return resolvedDep !== undefined && semver.satisfies(resolvedDep.version, recipe.newVersion);
201
+ });
184
202
  const configFiles = {};
185
203
  const npmrcContent = (0, node_resolution_result_1.serializeNpmrcConfigs)(marker.npmrcConfigs);
186
204
  if (npmrcContent) {
@@ -189,8 +207,7 @@ class UpgradeDependencyVersion extends recipe_1.ScanningRecipe {
189
207
  acc.projectsToUpdate.set(doc.sourcePath, {
190
208
  packageJsonPath: doc.sourcePath,
191
209
  originalPackageJson: await print_1.TreePrinters.print(doc),
192
- dependencyScope: foundScope,
193
- currentVersion,
210
+ matchedDependencies: matchedDeps,
194
211
  newVersion: recipe.newVersion,
195
212
  packageManager: pm,
196
213
  skipInstall,
@@ -226,20 +243,19 @@ class UpgradeDependencyVersion extends recipe_1.ScanningRecipe {
226
243
  if (!updateInfo) {
227
244
  return doc; // This package.json doesn't need updating
228
245
  }
229
- // Run package manager install if needed, check for failure
230
- // Skip if the resolved version already satisfies the new constraint
231
246
  const failureMessage = updateInfo.skipInstall
232
247
  ? undefined
233
248
  : await (0, package_manager_1.runInstallIfNeeded)(sourcePath, acc, () => recipe.runPackageManagerInstall(acc, updateInfo, ctx));
234
249
  if (failureMessage) {
235
- return (0, markers_1.markupWarn)(doc, `Failed to upgrade ${recipe.packageName} to ${recipe.newVersion}`, failureMessage);
250
+ const names = updateInfo.matchedDependencies.map(d => d.packageName).join(', ');
251
+ return (0, markers_1.markupWarn)(doc, `Failed to upgrade ${names} to ${recipe.newVersion}`, failureMessage);
252
+ }
253
+ let modifiedDoc = doc;
254
+ for (const md of updateInfo.matchedDependencies) {
255
+ const visitor = new UpdateVersionVisitor(md.packageName, updateInfo.newVersion, md.dependencyScope);
256
+ modifiedDoc = await visitor.visit(modifiedDoc, undefined);
236
257
  }
237
- // Update the dependency version in the JSON AST (preserves formatting)
238
- const visitor = new UpdateVersionVisitor(recipe.packageName, updateInfo.newVersion, updateInfo.dependencyScope);
239
- const modifiedDoc = await visitor.visit(doc, undefined);
240
- // Update the NodeResolutionResult marker
241
258
  if (updateInfo.skipInstall) {
242
- // Just update the versionConstraint in the marker - resolved version is unchanged
243
259
  return recipe.updateMarkerVersionConstraint(modifiedDoc, updateInfo);
244
260
  }
245
261
  return (0, package_manager_1.updateNodeResolutionMarker)(modifiedDoc, updateInfo, acc);
@@ -266,8 +282,7 @@ class UpgradeDependencyVersion extends recipe_1.ScanningRecipe {
266
282
  * All file contents are provided from in-memory sources (SourceFiles), not read from disk.
267
283
  */
268
284
  async runPackageManagerInstall(acc, updateInfo, _ctx) {
269
- // Create modified package.json with the new version constraint
270
- const modifiedPackageJson = this.createModifiedPackageJson(updateInfo.originalPackageJson, updateInfo.dependencyScope, updateInfo.newVersion);
285
+ const modifiedPackageJson = this.createModifiedPackageJson(updateInfo.originalPackageJson, updateInfo.matchedDependencies, updateInfo.newVersion);
271
286
  // Get the lock file path based on package manager
272
287
  const lockFileName = (0, package_manager_1.getLockFileName)(updateInfo.packageManager);
273
288
  const packageJsonDir = path.dirname(updateInfo.packageJsonPath);
@@ -282,31 +297,28 @@ class UpgradeDependencyVersion extends recipe_1.ScanningRecipe {
282
297
  });
283
298
  (0, package_manager_1.storeInstallResult)(result, acc, updateInfo, modifiedPackageJson);
284
299
  }
285
- /**
286
- * Creates a modified package.json with the updated dependency version.
287
- * Used for the temp directory to validate the version exists.
288
- */
289
- createModifiedPackageJson(originalContent, scope, newVersion) {
300
+ createModifiedPackageJson(originalContent, matchedDependencies, newVersion) {
301
+ var _a;
290
302
  const packageJson = JSON.parse(originalContent);
291
- if (packageJson[scope] && packageJson[scope][this.packageName]) {
292
- packageJson[scope][this.packageName] = newVersion;
303
+ for (const md of matchedDependencies) {
304
+ if ((_a = packageJson[md.dependencyScope]) === null || _a === void 0 ? void 0 : _a[md.packageName]) {
305
+ packageJson[md.dependencyScope][md.packageName] = newVersion;
306
+ }
293
307
  }
294
308
  return JSON.stringify(packageJson, null, 2);
295
309
  }
296
- /**
297
- * Updates just the versionConstraint in the marker for the target dependency.
298
- * Used when skipInstall is true - the resolved version is unchanged.
299
- */
300
310
  updateMarkerVersionConstraint(doc, updateInfo) {
301
311
  const existingMarker = (0, node_resolution_result_1.findNodeResolutionResult)(doc);
302
312
  if (!existingMarker) {
303
313
  return doc;
304
314
  }
305
- // Update the versionConstraint for the target dependency
306
- const deps = existingMarker[updateInfo.dependencyScope];
307
- const updatedDeps = deps === null || deps === void 0 ? void 0 : deps.map(dep => dep.name === this.packageName
308
- ? Object.assign(Object.assign({}, dep), { versionConstraint: updateInfo.newVersion }) : dep);
309
- const newMarker = Object.assign(Object.assign({}, existingMarker), { [updateInfo.dependencyScope]: updatedDeps });
315
+ const matchedNames = new Set(updateInfo.matchedDependencies.map(md => md.packageName));
316
+ let newMarker = Object.assign({}, existingMarker);
317
+ for (const md of updateInfo.matchedDependencies) {
318
+ const deps = newMarker[md.dependencyScope];
319
+ newMarker = Object.assign(Object.assign({}, newMarker), { [md.dependencyScope]: deps === null || deps === void 0 ? void 0 : deps.map(dep => matchedNames.has(dep.name)
320
+ ? Object.assign(Object.assign({}, dep), { versionConstraint: updateInfo.newVersion }) : dep) });
321
+ }
310
322
  return Object.assign(Object.assign({}, doc), { markers: (0, markers_1.replaceMarkerByKind)(doc.markers, newMarker) });
311
323
  }
312
324
  }
@@ -314,10 +326,19 @@ exports.UpgradeDependencyVersion = UpgradeDependencyVersion;
314
326
  __decorate([
315
327
  (0, recipe_1.Option)({
316
328
  displayName: "Package name",
317
- description: "The name of the npm package to upgrade (e.g., `lodash`, `@types/node`)",
329
+ description: "The exact name of the npm package to upgrade (e.g., `lodash`, `@types/node`). Either this or `packagePattern` must be specified.",
330
+ required: false,
318
331
  example: "lodash"
319
332
  })
320
333
  ], UpgradeDependencyVersion.prototype, "packageName", void 0);
334
+ __decorate([
335
+ (0, recipe_1.Option)({
336
+ displayName: "Package pattern",
337
+ description: "A glob expression to match package names (e.g., `@angular/*`, `@types/*`). Either this or `packageName` must be specified.",
338
+ required: false,
339
+ example: "@angular/*"
340
+ })
341
+ ], UpgradeDependencyVersion.prototype, "packagePattern", void 0);
321
342
  __decorate([
322
343
  (0, recipe_1.Option)({
323
344
  displayName: "Version",
@@ -1 +1 @@
1
- {"version":3,"file":"upgrade-dependency-version.js","sourceRoot":"","sources":["../../../src/javascript/recipes/upgrade-dependency-version.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upgrade-dependency-version.js","sourceRoot":"","sources":["../../../src/javascript/recipes/upgrade-dependency-version.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,yCAAoD;AAEpD,2CAA0C;AAE1C,qCAAkF;AAClF,qCAAqD;AACrD,qCAAkD;AAClD,sEAMmC;AACnC,2CAA6B;AAC7B,+CAAiC;AACjC,qDAAuC;AACvC,2CAA8D;AAC9D,uCAAyC;AACzC,wDAW4B;AAuB5B;;;;;;;;;;;;;GAaG;AACH,MAAa,wBAAyB,SAAQ,uBAA2B;IAAzE;;QACa,SAAI,GAAG,oEAAoE,CAAC;QAC5E,gBAAW,GAAG,gCAAgC,CAAC;QAC/C,gBAAW,GAAG,qLAAqL,CAAC;IAyVjN,CAAC;IA9TG,IAAY,OAAO;QACf,IAAI,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO;gBAC7B,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC;gBACxC,CAAC,CAAE,SAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,cAAc,CAAC,IAAY;QACvB,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;YAChD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,YAAY,CAAC,IAAsB;QAC/B,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC9E,CAAC;QACD,uCACO,IAAA,mDAAiC,GAAqB,KACzD,iBAAiB,EAAE,IAAI,GAAG,EAAE,IAC9B;IACN,CAAC;IAED;;;;;;;;;;;OAWG;IACH,aAAa,CAAC,cAAsB,EAAE,UAAkB;QACpD,kDAAkD;QAClD,IAAI,cAAc,KAAK,UAAU,EAAE,CAAC;YAChC,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,mDAAmD;QACnD,0EAA0E;QAC1E,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAE7C,kEAAkE;QAClE,mCAAmC;QACnC,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC;YACzB,OAAO,cAAc,KAAK,UAAU,CAAC;QACzC,CAAC;QAED,uEAAuE;QACvE,OAAO,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAgB;QAC1B,MAAM,MAAM,GAAG,IAAI,CAAC;QACpB,MAAM,eAAe,GAAG,IAAA,qCAAmB,GAAE,CAAC;QAE9C,OAAO,IAAI,KAAM,SAAQ,qBAAmC;YAC9C,KAAK,CAAC,MAAM,CAAC,IAAU,EAAE,GAAqB;gBACpD,2DAA2D;gBAC3D,IAAI,IAAA,aAAM,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,WAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACnD,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAqB,EAAE,GAAG,CAAC,CAAC;gBAC/D,CAAC;gBAED,yCAAyC;gBACzC,IAAI,IAAA,aAAM,EAAC,IAAI,CAAC,IAAI,IAAA,kBAAW,EAAC,IAAI,CAAC,EAAE,CAAC;oBACpC,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAC9C,CAAC;gBAED,sDAAsD;gBACtD,IAAI,IAAA,kBAAW,EAAC,IAAI,CAAC,EAAE,CAAC;oBACpB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAiB,EAAE,GAAG,CAAC,CAAC;gBAChE,CAAC;gBAED,OAAO,IAAI,CAAC;YAChB,CAAC;YAEO,KAAK,CAAC,kBAAkB,CAAC,GAAkB,EAAE,IAAsB;;gBACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAE/C,+DAA+D;gBAC/D,IAAI,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACrC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,oBAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;oBACzE,OAAO,GAAG,CAAC;gBACf,CAAC;gBAED,0DAA0D;gBAC1D,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;oBAC3C,OAAO,GAAG,CAAC;gBACf,CAAC;gBAED,MAAM,MAAM,GAAG,IAAA,iDAAwB,EAAC,GAAG,CAAC,CAAC;gBAC7C,IAAI,CAAC,MAAM,EAAE,CAAC;oBACV,OAAO,GAAG,CAAC;gBACf,CAAC;gBAED,MAAM,EAAE,GAAG,MAAA,MAAM,CAAC,cAAc,mCAAI,uCAAc,CAAC,GAAG,CAAC;gBAEvD,MAAM,WAAW,GAAwB,EAAE,CAAC;gBAC5C,KAAK,MAAM,KAAK,IAAI,4CAAmB,EAAE,CAAC;oBACtC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;oBAC3B,IAAI,CAAC,IAAI;wBAAE,SAAS;oBACpB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;wBACrB,IAAI,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;4BACpG,WAAW,CAAC,IAAI,CAAC;gCACb,WAAW,EAAE,GAAG,CAAC,IAAI;gCACrB,eAAe,EAAE,KAAK;gCACtB,cAAc,EAAE,GAAG,CAAC,iBAAiB;6BACxC,CAAC,CAAC;wBACP,CAAC;oBACL,CAAC;gBACL,CAAC;gBAED,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC3B,OAAO,GAAG,CAAC;gBACf,CAAC;gBAED,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;;oBACvC,MAAM,WAAW,GAAG,MAAA,MAAM,CAAC,oBAAoB,0CAAE,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,WAAW,CAAC,CAAC;oBACxF,OAAO,WAAW,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;gBACjG,CAAC,CAAC,CAAC;gBAEH,MAAM,WAAW,GAA2B,EAAE,CAAC;gBAC/C,MAAM,YAAY,GAAG,IAAA,8CAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAChE,IAAI,YAAY,EAAE,CAAC;oBACf,WAAW,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAC;gBACzC,CAAC;gBAED,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE;oBACrC,eAAe,EAAE,GAAG,CAAC,UAAU;oBAC/B,mBAAmB,EAAE,MAAM,oBAAY,CAAC,KAAK,CAAC,GAAG,CAAC;oBAClD,mBAAmB,EAAE,WAAW;oBAChC,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,cAAc,EAAE,EAAE;oBAClB,WAAW;oBACX,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;iBAC7E,CAAC,CAAC;gBAEH,OAAO,GAAG,CAAC;YACf,CAAC;YAEO,KAAK,CAAC,kBAAkB,CAAC,IAAoB,EAAE,IAAsB;gBACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAChD,IAAI,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACrC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,oBAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC/E,CAAC;gBACD,OAAO,IAAI,CAAC;YAChB,CAAC;YAEO,KAAK,CAAC,uBAAuB,CAAC,IAAe,EAAE,IAAsB;gBACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAChD,IAAI,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACrC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,oBAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC/E,CAAC;gBACD,OAAO,IAAI,CAAC;YAChB,CAAC;SACJ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAgB;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC;QAEpB,yEAAyE;QACzE,MAAM,UAAU,GAAG,IAAI,KAAM,SAAQ,kBAA6B;YACpD,KAAK,CAAC,aAAa,CAAC,GAAkB,EAAE,GAAqB;gBACnE,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;gBAElC,4BAA4B;gBAC5B,IAAI,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;oBACtC,MAAM,UAAU,GAAG,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;oBACxD,IAAI,CAAC,UAAU,EAAE,CAAC;wBACd,OAAO,GAAG,CAAC,CAAC,0CAA0C;oBAC1D,CAAC;oBAED,MAAM,cAAc,GAAG,UAAU,CAAC,WAAW;wBACzC,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC,MAAM,IAAA,oCAAkB,EAAC,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,CAC7C,MAAM,CAAC,wBAAwB,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,CAAC,CACxD,CAAC;oBACN,IAAI,cAAc,EAAE,CAAC;wBACjB,MAAM,KAAK,GAAG,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAChF,OAAO,IAAA,oBAAU,EACb,GAAG,EACH,qBAAqB,KAAK,OAAO,MAAM,CAAC,UAAU,EAAE,EACpD,cAAc,CACjB,CAAC;oBACN,CAAC;oBAED,IAAI,WAAW,GAAG,GAAG,CAAC;oBACtB,KAAK,MAAM,EAAE,IAAI,UAAU,CAAC,mBAAmB,EAAE,CAAC;wBAC9C,MAAM,OAAO,GAAG,IAAI,oBAAoB,CACpC,EAAE,CAAC,WAAW,EACd,UAAU,CAAC,UAAU,EACrB,EAAE,CAAC,eAAe,CACrB,CAAC;wBACF,WAAW,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,CAAkB,CAAC;oBAC/E,CAAC;oBAED,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;wBACzB,OAAO,MAAM,CAAC,6BAA6B,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;oBACzE,CAAC;oBACD,OAAO,IAAA,4CAA0B,EAAC,WAAW,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;gBACpE,CAAC;gBAED,uDAAuD;gBACvD,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBAC/C,IAAI,IAAA,qCAAmB,GAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC/C,MAAM,kBAAkB,GAAG,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;oBAChE,IAAI,kBAAkB,EAAE,CAAC;wBACrB,MAAM,MAAM,GAAG,MAAM,IAAA,sCAAoB,EAAC,kBAAkB,EAAE,UAAU,EAAE,YAAY,CAAkB,CAAC;wBACzG,6CAA6C;wBAC7C,OAAO,gCACA,GAAG,KACN,KAAK,EAAE,MAAM,CAAC,KAAK,EACnB,GAAG,EAAE,MAAM,CAAC,GAAG,GACD,CAAC;oBACvB,CAAC;gBACL,CAAC;gBAED,OAAO,GAAG,CAAC;YACf,CAAC;SACJ,CAAC;QAEF,sEAAsE;QACtE,OAAO,IAAA,sCAAoB,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,wBAAwB,CAClC,GAAgB,EAChB,UAA6B,EAC7B,IAAsB;QAEtB,MAAM,mBAAmB,GAAG,IAAI,CAAC,yBAAyB,CACtD,UAAU,CAAC,mBAAmB,EAC9B,UAAU,CAAC,mBAAmB,EAC9B,UAAU,CAAC,UAAU,CACxB,CAAC;QAEF,kDAAkD;QAClD,MAAM,YAAY,GAAG,IAAA,iCAAe,EAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAChE,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAChE,MAAM,YAAY,GAAG,cAAc,KAAK,GAAG;YACvC,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAE9C,mEAAmE;QACnE,MAAM,uBAAuB,GAAG,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAExE,MAAM,MAAM,GAAG,MAAM,IAAA,qCAAmB,EACpC,UAAU,CAAC,cAAc,EACzB,mBAAmB,EACnB;YACI,uBAAuB;YACvB,WAAW,EAAE,UAAU,CAAC,WAAW;SACtC,CACJ,CAAC;QAEF,IAAA,oCAAkB,EAAC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAC;IACrE,CAAC;IAEO,yBAAyB,CAC7B,eAAuB,EACvB,mBAAwC,EACxC,UAAkB;;QAElB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAEhD,KAAK,MAAM,EAAE,IAAI,mBAAmB,EAAE,CAAC;YACnC,IAAI,MAAA,WAAW,CAAC,EAAE,CAAC,eAAe,CAAC,0CAAG,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;gBACpD,WAAW,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,UAAU,CAAC;YACjE,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAChD,CAAC;IAEO,6BAA6B,CACjC,GAAkB,EAClB,UAA6B;QAE7B,MAAM,cAAc,GAAG,IAAA,iDAAwB,EAAC,GAAG,CAAC,CAAC;QACrD,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,OAAO,GAAG,CAAC;QACf,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QACvF,IAAI,SAAS,qBAAO,cAAc,CAAC,CAAC;QACpC,KAAK,MAAM,EAAE,IAAI,UAAU,CAAC,mBAAmB,EAAE,CAAC;YAC9C,MAAM,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;YAC3C,SAAS,mCACF,SAAS,KACZ,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAClC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;oBACtB,CAAC,iCAAK,GAAG,KAAE,iBAAiB,EAAE,UAAU,CAAC,UAAU,IACnD,CAAC,CAAC,GAAG,CACZ,GACJ,CAAC;QACN,CAAC;QAED,uCACO,GAAG,KACN,OAAO,EAAE,IAAA,6BAAmB,EAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,IACtD;IACN,CAAC;CACJ;AA5VD,4DA4VC;AAjVG;IANC,IAAA,eAAM,EAAC;QACJ,WAAW,EAAE,cAAc;QAC3B,WAAW,EAAE,kIAAkI;QAC/I,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,QAAQ;KACpB,CAAC;6DACmB;AAQrB;IANC,IAAA,eAAM,EAAC;QACJ,WAAW,EAAE,iBAAiB;QAC9B,WAAW,EAAE,4HAA4H;QACzI,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,YAAY;KACxB,CAAC;gEACsB;AAOxB;IALC,IAAA,eAAM,EAAC;QACJ,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,mEAAmE;QAChF,OAAO,EAAE,QAAQ;KACpB,CAAC;4DACkB;AAoUxB;;GAEG;AACH,MAAM,oBAAqB,SAAQ,kBAAiB;IAMhD,YAAY,WAAmB,EAAE,UAAkB,EAAE,WAA4B;QAC7E,KAAK,EAAE,CAAC;QAHJ,kBAAa,GAAG,KAAK,CAAC;QAI1B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,MAAmB,EAAE,CAAO;QACpD,2CAA2C;QAC3C,MAAM,OAAO,GAAG,IAAA,uBAAgB,EAAC,MAAM,CAAC,CAAC;QAEzC,IAAI,OAAO,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;YAC/B,wCAAwC;YACxC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC1B,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAClD,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;YAC3B,OAAO,MAAM,CAAC;QAClB,CAAC;QAED,oDAAoD;QACpD,IAAI,IAAI,CAAC,aAAa,IAAI,OAAO,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;YACrD,2BAA2B;YAC3B,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC;IAEO,aAAa,CAAC,MAAmB;QACrC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAE3B,IAAI,CAAC,IAAA,gBAAS,EAAC,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC,CAAC,oCAAoC;QACvD,CAAC;QAED,0CAA0C;QAC1C,MAAM,UAAU,mCACT,KAAK,KACR,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,GAAG,EAC9B,KAAK,EAAE,IAAI,CAAC,UAAU,GACzB,CAAC;QAEF,uCACO,MAAM,KACT,KAAK,EAAE,UAAU,IACnB;IACN,CAAC;CACJ"}
@@ -2,13 +2,14 @@ import ts from "typescript";
2
2
  import { Type } from "../java";
3
3
  export declare class JavaScriptTypeMapping {
4
4
  private readonly checker;
5
+ private readonly sourceRoot?;
5
6
  private readonly typeCache;
6
7
  private readonly methodCache;
7
8
  private readonly regExpSymbol;
8
9
  private readonly stringWrapperType;
9
10
  private readonly numberWrapperType;
10
11
  private readonly booleanWrapperType;
11
- constructor(checker: ts.TypeChecker);
12
+ constructor(checker: ts.TypeChecker, sourceRoot?: string | undefined);
12
13
  type(node: ts.Node): Type | undefined;
13
14
  private getType;
14
15
  private getSignature;
@@ -1 +1 @@
1
- {"version":3,"file":"type-mapping.d.ts","sourceRoot":"","sources":["../../src/javascript/type-mapping.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAC,IAAI,EAAC,MAAM,SAAS,CAAC;AAG7B,qBAAa,qBAAqB;IAa1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAV5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyC;IACnE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAuC;IAEnE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAwB;IACrD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAsB;IACxD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAsB;IACxD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAsB;gBAIpC,OAAO,EAAE,EAAE,CAAC,WAAW;IA4B5C,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,GAAG,SAAS;IAoBrC,OAAO,CAAC,OAAO;IA6Nf,OAAO,CAAC,YAAY;IA4BpB,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS;IAQ5C,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,GAAG,SAAS;IAoKtD;;;;;;;;;;OAUG;IACH,OAAO,CAAC,yBAAyB;IAkDjC;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAmDxB,OAAO,CAAC,WAAW;IAanB,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,SAAS;IA0TlD;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IA6F7B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAkC5B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IA6HzB;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IA4CpC;;;OAGG;IACH,OAAO,CAAC,eAAe;IAqBvB;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAqB9B;;;;OAIG;IACH,OAAO,CAAC,yBAAyB;IAmCjC;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAiB/B;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;CA8D/B"}
1
+ {"version":3,"file":"type-mapping.d.ts","sourceRoot":"","sources":["../../src/javascript/type-mapping.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,EAAC,IAAI,EAAC,MAAM,SAAS,CAAC;AAG7B,qBAAa,qBAAqB;IAa1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAXhC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyC;IACnE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAuC;IAEnE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAwB;IACrD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAsB;IACxD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAsB;IACxD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAsB;gBAIpC,OAAO,EAAE,EAAE,CAAC,WAAW,EACvB,UAAU,CAAC,EAAE,MAAM,YAAA;IA4BxC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,GAAG,SAAS;IAuBrC,OAAO,CAAC,OAAO;IA6Nf,OAAO,CAAC,YAAY;IA4BpB,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS;IAQ5C,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,GAAG,SAAS;IAoKtD;;;;;;;;;;OAUG;IACH,OAAO,CAAC,yBAAyB;IAkDjC;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAmDxB,OAAO,CAAC,WAAW;IAanB,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,SAAS;IA0UlD;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAqG7B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAkC5B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IA6HzB;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IA4CpC;;;OAGG;IACH,OAAO,CAAC,eAAe;IAqBvB;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAqB9B;;;;OAIG;IACH,OAAO,CAAC,yBAAyB;IAmCjC;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAiB/B;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;CA8D/B"}
@@ -1,4 +1,37 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
2
35
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
37
  };
@@ -20,11 +53,13 @@ exports.JavaScriptTypeMapping = void 0;
20
53
  * limitations under the License.
21
54
  */
22
55
  const typescript_1 = __importDefault(require("typescript"));
56
+ const path = __importStar(require("path"));
23
57
  const java_1 = require("../java");
24
58
  var FUNCTION_TYPE_NAME = java_1.Type.FUNCTION_TYPE_NAME;
25
59
  class JavaScriptTypeMapping {
26
- constructor(checker) {
60
+ constructor(checker, sourceRoot) {
27
61
  this.checker = checker;
62
+ this.sourceRoot = sourceRoot;
28
63
  // Primary cache: Use type signatures (preferring type.id) as cache keys
29
64
  // TypeScript assigns stable IDs to all types, so we don't need secondary caches
30
65
  this.typeCache = new Map();
@@ -55,13 +90,16 @@ class JavaScriptTypeMapping {
55
90
  }
56
91
  // Fall through to regular type checking if not a variable
57
92
  }
93
+ // TypeNode needs getTypeFromTypeNode (resolves the annotation itself).
94
+ // Everything else — expressions, declarations, specifiers, bindings, etc. —
95
+ // uses getTypeAtLocation which works for virtually all node kinds.
58
96
  let type;
59
- if (typescript_1.default.isExpression(node)) {
60
- type = this.checker.getTypeAtLocation(node);
61
- }
62
- else if (typescript_1.default.isTypeNode(node)) {
97
+ if (typescript_1.default.isTypeNode(node)) {
63
98
  type = this.checker.getTypeFromTypeNode(node);
64
99
  }
100
+ else {
101
+ type = this.checker.getTypeAtLocation(node);
102
+ }
65
103
  return type && this.getType(type);
66
104
  }
67
105
  getType(type) {
@@ -823,6 +861,22 @@ class JavaScriptTypeMapping {
823
861
  }
824
862
  }
825
863
  }
864
+ else if (typescript_1.default.isConstructorDeclaration(node)) {
865
+ // For constructor declarations
866
+ signature = this.checker.getSignatureFromDeclaration(node);
867
+ if (!signature) {
868
+ return undefined;
869
+ }
870
+ methodName = "<constructor>";
871
+ const parent = node.parent;
872
+ if (typescript_1.default.isClassDeclaration(parent) || typescript_1.default.isClassExpression(parent)) {
873
+ const parentType = this.checker.getTypeAtLocation(parent);
874
+ declaringType = this.getType(parentType);
875
+ }
876
+ else {
877
+ declaringType = java_1.Type.unknownType;
878
+ }
879
+ }
826
880
  else if (typescript_1.default.isFunctionDeclaration(node) || typescript_1.default.isFunctionExpression(node)) {
827
881
  // For function declarations/expressions
828
882
  signature = this.checker.getSignatureFromDeclaration(node);
@@ -929,6 +983,15 @@ class JavaScriptTypeMapping {
929
983
  }
930
984
  }
931
985
  }
986
+ else if (path.isAbsolute(cleanedName)) {
987
+ // TypeScript returns absolute file paths as module names for project source files
988
+ // that are ES modules (have imports/exports). Relativize using sourceRoot.
989
+ // Example: /var/moderne/.../BookStack/resources/js/foo.MyClass
990
+ // Should become: resources/js/foo.MyClass
991
+ if (this.sourceRoot) {
992
+ cleanedName = path.relative(this.sourceRoot, cleanedName);
993
+ }
994
+ }
932
995
  return cleanedName.endsWith('Constructor') ?
933
996
  cleanedName.substring(0, cleanedName.length - 'Constructor'.length) :
934
997
  cleanedName;