@theia/application-package 1.57.1 → 1.58.0
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.
- package/lib/application-package.d.ts +1 -2
- package/lib/application-package.d.ts.map +1 -1
- package/lib/application-package.js +4 -7
- package/lib/application-package.js.map +1 -1
- package/lib/extension-package-collector.d.ts +6 -6
- package/lib/extension-package-collector.d.ts.map +1 -1
- package/lib/extension-package-collector.js +9 -9
- package/lib/extension-package-collector.js.map +1 -1
- package/package.json +4 -4
- package/src/application-package.ts +6 -10
- package/src/extension-package-collector.ts +10 -10
|
@@ -9,7 +9,7 @@ export declare class ApplicationPackageOptions {
|
|
|
9
9
|
readonly registry?: NpmRegistry;
|
|
10
10
|
readonly appTarget?: ApplicationProps.Target;
|
|
11
11
|
}
|
|
12
|
-
export type ApplicationModuleResolver = (modulePath: string) => string;
|
|
12
|
+
export type ApplicationModuleResolver = (parentPackagePath: string, modulePath: string) => string;
|
|
13
13
|
export declare class ApplicationPackage {
|
|
14
14
|
protected readonly options: ApplicationPackageOptions;
|
|
15
15
|
readonly projectPath: string;
|
|
@@ -84,6 +84,5 @@ export declare class ApplicationPackage {
|
|
|
84
84
|
* A node module resolver in the context of the application package.
|
|
85
85
|
*/
|
|
86
86
|
get resolveModule(): ApplicationModuleResolver;
|
|
87
|
-
resolveModulePath(moduleName: string, ...segments: string[]): string;
|
|
88
87
|
}
|
|
89
88
|
//# sourceMappingURL=application-package.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application-package.d.ts","sourceRoot":"","sources":["../src/application-package.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,oBAAoB,EAAa,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,uBAAuB,EAAuB,MAAM,qBAAqB,CAAC;AAEhH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAKvD,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAC/E,qBAAa,yBAAyB;IAClC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,GAAG,CAAC,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC;IAChC,QAAQ,CAAC,SAAS,CAAC,EAAE,gBAAgB,CAAC,MAAM,CAAC;CAChD;AAED,MAAM,MAAM,yBAAyB,GAAG,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"application-package.d.ts","sourceRoot":"","sources":["../src/application-package.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,7 +72,7 @@ class ApplicationPackage {
|
|
|
72
72
|
get extensionPackages() {
|
|
73
73
|
if (!this._extensionPackages) {
|
|
74
74
|
const collector = new extension_package_collector_1.ExtensionPackageCollector((raw, options = {}) => this.newExtensionPackage(raw, options), this.resolveModule);
|
|
75
|
-
this._extensionPackages = collector.collect(this.pck);
|
|
75
|
+
this._extensionPackages = collector.collect(this.packagePath, this.pck);
|
|
76
76
|
}
|
|
77
77
|
return this._extensionPackages;
|
|
78
78
|
}
|
|
@@ -244,10 +244,10 @@ class ApplicationPackage {
|
|
|
244
244
|
*/
|
|
245
245
|
get resolveModule() {
|
|
246
246
|
if (!this._moduleResolver) {
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
const resolved = resolvePackagePath(modulePath, resolutionPaths);
|
|
247
|
+
this._moduleResolver = (parentPackagePath, modulePath) => {
|
|
248
|
+
const resolved = resolvePackagePath(modulePath, parentPackagePath);
|
|
250
249
|
if (!resolved) {
|
|
250
|
+
console.error(`cannot resolve ${modulePath} relative to ${parentPackagePath}`);
|
|
251
251
|
throw new Error('Could not resolve module: ' + modulePath);
|
|
252
252
|
}
|
|
253
253
|
return resolved;
|
|
@@ -255,9 +255,6 @@ class ApplicationPackage {
|
|
|
255
255
|
}
|
|
256
256
|
return this._moduleResolver;
|
|
257
257
|
}
|
|
258
|
-
resolveModulePath(moduleName, ...segments) {
|
|
259
|
-
return paths.resolve(this.resolveModule(moduleName + '/package.json'), '..', ...segments);
|
|
260
|
-
}
|
|
261
258
|
}
|
|
262
259
|
exports.ApplicationPackage = ApplicationPackage;
|
|
263
260
|
//# sourceMappingURL=application-package.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application-package.js","sourceRoot":"","sources":["../src/application-package.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"application-package.js","sourceRoot":"","sources":["../src/application-package.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,15 +2,15 @@ import { NodePackage, PublishedNodePackage } from './npm-registry';
|
|
|
2
2
|
import { ExtensionPackage, ExtensionPackageOptions } from './extension-package';
|
|
3
3
|
export declare class ExtensionPackageCollector {
|
|
4
4
|
protected readonly extensionPackageFactory: (raw: PublishedNodePackage, options?: ExtensionPackageOptions) => ExtensionPackage;
|
|
5
|
-
protected readonly resolveModule: (modulePath: string) => string;
|
|
5
|
+
protected readonly resolveModule: (packagepath: string, modulePath: string) => string;
|
|
6
6
|
protected readonly sorted: ExtensionPackage[];
|
|
7
7
|
protected readonly visited: Map<string, boolean>;
|
|
8
|
-
constructor(extensionPackageFactory: (raw: PublishedNodePackage, options?: ExtensionPackageOptions) => ExtensionPackage, resolveModule: (modulePath: string) => string);
|
|
8
|
+
constructor(extensionPackageFactory: (raw: PublishedNodePackage, options?: ExtensionPackageOptions) => ExtensionPackage, resolveModule: (packagepath: string, modulePath: string) => string);
|
|
9
9
|
protected root: NodePackage;
|
|
10
|
-
collect(pck: NodePackage): ReadonlyArray<ExtensionPackage>;
|
|
11
|
-
protected collectPackages(pck: NodePackage): void;
|
|
10
|
+
collect(packagePath: string, pck: NodePackage): ReadonlyArray<ExtensionPackage>;
|
|
11
|
+
protected collectPackages(packagePath: string, pck: NodePackage): void;
|
|
12
12
|
protected parent: ExtensionPackage | undefined;
|
|
13
|
-
protected collectPackagesWithParent(pck: NodePackage, parent: ExtensionPackage): void;
|
|
14
|
-
protected collectPackage(name: string, versionRange: string): void;
|
|
13
|
+
protected collectPackagesWithParent(packagePath: string, pck: NodePackage, parent: ExtensionPackage): void;
|
|
14
|
+
protected collectPackage(parentPackagePath: string, name: string, versionRange: string): void;
|
|
15
15
|
}
|
|
16
16
|
//# sourceMappingURL=extension-package-collector.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension-package-collector.d.ts","sourceRoot":"","sources":["../src/extension-package-collector.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAuB,MAAM,qBAAqB,CAAC;AAErG,qBAAa,yBAAyB;IAM9B,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,CAAC,GAAG,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,uBAAuB,KAAK,gBAAgB;IAC9H,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM;
|
|
1
|
+
{"version":3,"file":"extension-package-collector.d.ts","sourceRoot":"","sources":["../src/extension-package-collector.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAuB,MAAM,qBAAqB,CAAC;AAErG,qBAAa,yBAAyB;IAM9B,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,CAAC,GAAG,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,uBAAuB,KAAK,gBAAgB;IAC9H,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,MAAM;IALzF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAM;IACnD,SAAS,CAAC,QAAQ,CAAC,OAAO,uBAA8B;gBAGjC,uBAAuB,EAAE,CAAC,GAAG,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,uBAAuB,KAAK,gBAAgB,EAC3G,aAAa,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,MAAM;IAGzF,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC;IAC5B,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,aAAa,CAAC,gBAAgB,CAAC;IAM/E,SAAS,CAAC,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,IAAI;IAStE,SAAS,CAAC,MAAM,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC/C,SAAS,CAAC,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI;IAO1G,SAAS,CAAC,cAAc,CAAC,iBAAiB,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;CA4BhG"}
|
|
@@ -25,34 +25,34 @@ class ExtensionPackageCollector {
|
|
|
25
25
|
this.sorted = [];
|
|
26
26
|
this.visited = new Map();
|
|
27
27
|
}
|
|
28
|
-
collect(pck) {
|
|
28
|
+
collect(packagePath, pck) {
|
|
29
29
|
this.root = pck;
|
|
30
|
-
this.collectPackages(pck);
|
|
30
|
+
this.collectPackages(packagePath, pck);
|
|
31
31
|
return this.sorted;
|
|
32
32
|
}
|
|
33
|
-
collectPackages(pck) {
|
|
33
|
+
collectPackages(packagePath, pck) {
|
|
34
34
|
var _a, _b;
|
|
35
35
|
for (const [dependency, versionRange] of [
|
|
36
36
|
...Object.entries((_a = pck.dependencies) !== null && _a !== void 0 ? _a : {}),
|
|
37
37
|
...Object.entries((_b = pck.peerDependencies) !== null && _b !== void 0 ? _b : {})
|
|
38
38
|
]) {
|
|
39
|
-
this.collectPackage(dependency, versionRange);
|
|
39
|
+
this.collectPackage(packagePath, dependency, versionRange);
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
-
collectPackagesWithParent(pck, parent) {
|
|
42
|
+
collectPackagesWithParent(packagePath, pck, parent) {
|
|
43
43
|
const current = this.parent;
|
|
44
44
|
this.parent = parent;
|
|
45
|
-
this.collectPackages(pck);
|
|
45
|
+
this.collectPackages(packagePath, pck);
|
|
46
46
|
this.parent = current;
|
|
47
47
|
}
|
|
48
|
-
collectPackage(name, versionRange) {
|
|
48
|
+
collectPackage(parentPackagePath, name, versionRange) {
|
|
49
49
|
if (this.visited.has(name)) {
|
|
50
50
|
return;
|
|
51
51
|
}
|
|
52
52
|
this.visited.set(name, true);
|
|
53
53
|
let packagePath;
|
|
54
54
|
try {
|
|
55
|
-
packagePath = this.resolveModule(name);
|
|
55
|
+
packagePath = this.resolveModule(parentPackagePath, name);
|
|
56
56
|
}
|
|
57
57
|
catch {
|
|
58
58
|
console.debug(`Failed to resolve module: ${name}`);
|
|
@@ -68,7 +68,7 @@ class ExtensionPackageCollector {
|
|
|
68
68
|
pck.installed = { packagePath, version, parent, transitive };
|
|
69
69
|
pck.version = versionRange;
|
|
70
70
|
const extensionPackage = this.extensionPackageFactory(pck, { alias: name });
|
|
71
|
-
this.collectPackagesWithParent(pck, extensionPackage);
|
|
71
|
+
this.collectPackagesWithParent(packagePath, pck, extensionPackage);
|
|
72
72
|
this.sorted.push(extensionPackage);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension-package-collector.js","sourceRoot":"","sources":["../src/extension-package-collector.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,2CAA2C;AAE3C,2DAAqG;AAErG,MAAa,yBAAyB;IAKlC,YACuB,uBAA2G,EAC3G,
|
|
1
|
+
{"version":3,"file":"extension-package-collector.js","sourceRoot":"","sources":["../src/extension-package-collector.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/application-package",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.58.0",
|
|
4
4
|
"description": "Theia application package API.",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"watch": "theiaext watch"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@theia/request": "1.
|
|
32
|
+
"@theia/request": "1.58.0",
|
|
33
33
|
"@types/fs-extra": "^4.0.2",
|
|
34
34
|
"@types/semver": "^7.5.0",
|
|
35
35
|
"@types/write-json-file": "^2.2.1",
|
|
@@ -43,10 +43,10 @@
|
|
|
43
43
|
"write-json-file": "^2.2.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@theia/ext-scripts": "1.
|
|
46
|
+
"@theia/ext-scripts": "1.58.0"
|
|
47
47
|
},
|
|
48
48
|
"nyc": {
|
|
49
49
|
"extends": "../../configs/nyc.json"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "6594f32b9727aea20d88934bf386dee06d08fa5e"
|
|
52
52
|
}
|
|
@@ -33,7 +33,7 @@ export class ApplicationPackageOptions {
|
|
|
33
33
|
readonly appTarget?: ApplicationProps.Target;
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
-
export type ApplicationModuleResolver = (modulePath: string) => string;
|
|
36
|
+
export type ApplicationModuleResolver = (parentPackagePath: string, modulePath: string) => string;
|
|
37
37
|
|
|
38
38
|
export class ApplicationPackage {
|
|
39
39
|
readonly projectPath: string;
|
|
@@ -109,7 +109,7 @@ export class ApplicationPackage {
|
|
|
109
109
|
(raw: PublishedNodePackage, options: ExtensionPackageOptions = {}) => this.newExtensionPackage(raw, options),
|
|
110
110
|
this.resolveModule
|
|
111
111
|
);
|
|
112
|
-
this._extensionPackages = collector.collect(this.pck);
|
|
112
|
+
this._extensionPackages = collector.collect(this.packagePath, this.pck);
|
|
113
113
|
}
|
|
114
114
|
return this._extensionPackages;
|
|
115
115
|
}
|
|
@@ -315,10 +315,11 @@ export class ApplicationPackage {
|
|
|
315
315
|
*/
|
|
316
316
|
get resolveModule(): ApplicationModuleResolver {
|
|
317
317
|
if (!this._moduleResolver) {
|
|
318
|
-
|
|
319
|
-
this._moduleResolver = modulePath => {
|
|
320
|
-
const resolved = resolvePackagePath(modulePath,
|
|
318
|
+
|
|
319
|
+
this._moduleResolver = (parentPackagePath, modulePath) => {
|
|
320
|
+
const resolved = resolvePackagePath(modulePath, parentPackagePath);
|
|
321
321
|
if (!resolved) {
|
|
322
|
+
console.error(`cannot resolve ${modulePath} relative to ${parentPackagePath}`);
|
|
322
323
|
throw new Error('Could not resolve module: ' + modulePath);
|
|
323
324
|
}
|
|
324
325
|
return resolved;
|
|
@@ -326,9 +327,4 @@ export class ApplicationPackage {
|
|
|
326
327
|
}
|
|
327
328
|
return this._moduleResolver!;
|
|
328
329
|
}
|
|
329
|
-
|
|
330
|
-
resolveModulePath(moduleName: string, ...segments: string[]): string {
|
|
331
|
-
return paths.resolve(this.resolveModule(moduleName + '/package.json'), '..', ...segments);
|
|
332
|
-
}
|
|
333
|
-
|
|
334
330
|
}
|
|
@@ -25,34 +25,34 @@ export class ExtensionPackageCollector {
|
|
|
25
25
|
|
|
26
26
|
constructor(
|
|
27
27
|
protected readonly extensionPackageFactory: (raw: PublishedNodePackage, options?: ExtensionPackageOptions) => ExtensionPackage,
|
|
28
|
-
protected readonly resolveModule: (modulePath: string) => string
|
|
28
|
+
protected readonly resolveModule: (packagepath: string, modulePath: string) => string
|
|
29
29
|
) { }
|
|
30
30
|
|
|
31
31
|
protected root: NodePackage;
|
|
32
|
-
collect(pck: NodePackage): ReadonlyArray<ExtensionPackage> {
|
|
32
|
+
collect(packagePath: string, pck: NodePackage): ReadonlyArray<ExtensionPackage> {
|
|
33
33
|
this.root = pck;
|
|
34
|
-
this.collectPackages(pck);
|
|
34
|
+
this.collectPackages(packagePath, pck);
|
|
35
35
|
return this.sorted;
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
protected collectPackages(pck: NodePackage): void {
|
|
38
|
+
protected collectPackages(packagePath: string, pck: NodePackage): void {
|
|
39
39
|
for (const [dependency, versionRange] of [
|
|
40
40
|
...Object.entries(pck.dependencies ?? {}),
|
|
41
41
|
...Object.entries(pck.peerDependencies ?? {})
|
|
42
42
|
]) {
|
|
43
|
-
this.collectPackage(dependency, versionRange!);
|
|
43
|
+
this.collectPackage(packagePath, dependency, versionRange!);
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
protected parent: ExtensionPackage | undefined;
|
|
48
|
-
protected collectPackagesWithParent(pck: NodePackage, parent: ExtensionPackage): void {
|
|
48
|
+
protected collectPackagesWithParent(packagePath: string, pck: NodePackage, parent: ExtensionPackage): void {
|
|
49
49
|
const current = this.parent;
|
|
50
50
|
this.parent = parent;
|
|
51
|
-
this.collectPackages(pck);
|
|
51
|
+
this.collectPackages(packagePath, pck);
|
|
52
52
|
this.parent = current;
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
-
protected collectPackage(name: string, versionRange: string): void {
|
|
55
|
+
protected collectPackage(parentPackagePath: string, name: string, versionRange: string): void {
|
|
56
56
|
if (this.visited.has(name)) {
|
|
57
57
|
return;
|
|
58
58
|
}
|
|
@@ -60,7 +60,7 @@ export class ExtensionPackageCollector {
|
|
|
60
60
|
|
|
61
61
|
let packagePath: string | undefined;
|
|
62
62
|
try {
|
|
63
|
-
packagePath = this.resolveModule(name);
|
|
63
|
+
packagePath = this.resolveModule(parentPackagePath, name);
|
|
64
64
|
} catch {
|
|
65
65
|
console.debug(`Failed to resolve module: ${name}`);
|
|
66
66
|
}
|
|
@@ -75,7 +75,7 @@ export class ExtensionPackageCollector {
|
|
|
75
75
|
pck.installed = { packagePath, version, parent, transitive };
|
|
76
76
|
pck.version = versionRange;
|
|
77
77
|
const extensionPackage = this.extensionPackageFactory(pck, { alias: name });
|
|
78
|
-
this.collectPackagesWithParent(pck, extensionPackage);
|
|
78
|
+
this.collectPackagesWithParent(packagePath, pck, extensionPackage);
|
|
79
79
|
this.sorted.push(extensionPackage);
|
|
80
80
|
}
|
|
81
81
|
}
|