@theia/vsx-registry 1.66.0-next.12 → 1.66.0-next.32

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 (7) hide show
  1. package/README.md +1 -1
  2. package/lib/browser/vsx-extensions-model.d.ts +0 -3
  3. package/lib/browser/vsx-extensions-model.d.ts.map +1 -1
  4. package/lib/browser/vsx-extensions-model.js +6 -43
  5. package/lib/browser/vsx-extensions-model.js.map +1 -1
  6. package/package.json +10 -10
  7. package/src/browser/vsx-extensions-model.ts +7 -43
package/README.md CHANGED
@@ -4,7 +4,7 @@
4
4
 
5
5
  <img src='https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia.svg?sanitize=true' alt='theia-ext-logo' width='100px' />
6
6
 
7
- <h2>ECLIPSE THEIA - Open VSX Registry Extension</h2>
7
+ <h2>ECLIPSE THEIA - OPEN VSX REGISTRY EXTENSION</h2>
8
8
 
9
9
  <hr />
10
10
 
package/lib/browser/vsx-extensions-model.d.ts CHANGED
@@ -13,7 +13,6 @@ import { OVSXClientProvider } from '../common/ovsx-client-provider';
13
13
  import { RequestService } from '@theia/core/shared/@theia/request';
14
14
  import { OVSXApiFilterProvider } from '@theia/ovsx-client';
15
15
  import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
16
- import { FileService } from '@theia/filesystem/lib/browser/file-service';
17
16
  import { HostedPluginServer } from '@theia/plugin-ext';
18
17
  import { HostedPluginWatcher } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin-watcher';
19
18
  export declare class VSXExtensionsModel {
@@ -44,7 +43,6 @@ export declare class VSXExtensionsModel {
44
43
  readonly search: VSXExtensionsSearchModel;
45
44
  protected request: RequestService;
46
45
  protected vsxApiFilter: OVSXApiFilterProvider;
47
- protected readonly fileService: FileService;
48
46
  protected readonly applicationServer: ApplicationServer;
49
47
  protected init(): void;
50
48
  protected doInit(): Promise<void>;
@@ -61,7 +59,6 @@ export declare class VSXExtensionsModel {
61
59
  isDisabled(id: string): boolean;
62
60
  getExtension(id: string): VSXExtension | undefined;
63
61
  resolve(id: string): Promise<VSXExtension>;
64
- protected findReadmeFile(extension: VSXExtension): Promise<URI | undefined>;
65
62
  protected initInstalled(): Promise<void>;
66
63
  protected initSearchResult(): Promise<void>;
67
64
  protected initRecommended(): Promise<void>;
package/lib/browser/vsx-extensions-model.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extensions-model.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vsx-extensions-model.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-model.ts"],"names":[],"mappings":"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"}
package/lib/browser/vsx-extensions-model.js CHANGED
@@ -29,13 +29,11 @@ const progress_service_1 = require("@theia/core/lib/common/progress-service");
29
29
  const vsx_extensions_search_model_1 = require("./vsx-extensions-search-model");
30
30
  const preference_service_1 = require("@theia/core/lib/common/preferences/preference-service");
31
31
  const browser_1 = require("@theia/workspace/lib/browser");
32
- const uri_1 = require("@theia/core/lib/common/uri");
33
32
  const ovsx_types_1 = require("@theia/ovsx-client/lib/ovsx-types");
34
33
  const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
35
34
  const request_1 = require("@theia/core/shared/@theia/request");
36
35
  const ovsx_client_1 = require("@theia/ovsx-client");
37
36
  const application_protocol_1 = require("@theia/core/lib/common/application-protocol");
38
- const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
39
37
  const plugin_ext_1 = require("@theia/plugin-ext");
40
38
  const hosted_plugin_watcher_1 = require("@theia/plugin-ext/lib/hosted/browser/hosted-plugin-watcher");
41
39
  let VSXExtensionsModel = class VSXExtensionsModel {
@@ -109,30 +107,14 @@ let VSXExtensionsModel = class VSXExtensionsModel {
109
107
  }
110
108
  resolve(id) {
111
109
  return this.doChange(async () => {
112
- var _a;
113
110
  await this.initialized;
114
- const extension = (_a = await this.refresh(id)) !== null && _a !== void 0 ? _a : this.getExtension(id);
111
+ const extension = await this.refresh(id);
115
112
  if (!extension) {
116
113
  throw new Error(`Failed to resolve ${id} extension.`);
117
114
  }
118
- if (extension.readme === undefined) {
115
+ if (extension.readme === undefined && extension.readmeUrl) {
119
116
  try {
120
- let rawReadme = '';
121
- const installedReadme = await this.findReadmeFile(extension);
122
- // Attempt to read the local readme first
123
- // It saves network resources and is faster
124
- if (installedReadme) {
125
- try {
126
- const readmeContent = await this.fileService.readFile(installedReadme);
127
- rawReadme = readmeContent.value.toString();
128
- }
129
- catch {
130
- // fall through
131
- }
132
- }
133
- if (!rawReadme && extension.readmeUrl) {
134
- rawReadme = request_1.RequestContext.asText(await this.request.request({ url: extension.readmeUrl }));
135
- }
117
+ const rawReadme = request_1.RequestContext.asText(await this.request.request({ url: extension.readmeUrl }));
136
118
  const readme = this.compileReadme(rawReadme);
137
119
  extension.update({ readme });
138
120
  }
@@ -145,19 +127,6 @@ let VSXExtensionsModel = class VSXExtensionsModel {
145
127
  return extension;
146
128
  });
147
129
  }
148
- async findReadmeFile(extension) {
149
- var _a, _b;
150
- if (!extension.plugin) {
151
- return undefined;
152
- }
153
- // Since we don't know the exact capitalization of the readme file (might be README.md, readme.md, etc.)
154
- // We attempt to find the readme file by searching through the plugin's directories
155
- const packageUri = new uri_1.default(extension.plugin.metadata.model.packageUri);
156
- const pluginDirStat = await this.fileService.resolve(packageUri);
157
- const possibleNames = ['readme.md', 'readme.txt', 'readme'];
158
- const readmeFileUri = (_b = (_a = pluginDirStat.children) === null || _a === void 0 ? void 0 : _a.find(child => possibleNames.includes(child.name.toLowerCase()))) === null || _b === void 0 ? void 0 : _b.resource;
159
- return readmeFileUri;
160
- }
161
130
  async initInstalled() {
162
131
  await this.pluginSupport.willStart;
163
132
  try {
@@ -406,6 +375,7 @@ let VSXExtensionsModel = class VSXExtensionsModel {
406
375
  return DOMPurify.sanitize(readmeHtml);
407
376
  }
408
377
  async refresh(id, version) {
378
+ var _a;
409
379
  try {
410
380
  let extension = this.getExtension(id);
411
381
  if (!this.shouldRefresh(extension)) {
@@ -429,11 +399,8 @@ let VSXExtensionsModel = class VSXExtensionsModel {
429
399
  targetPlatform
430
400
  });
431
401
  }
432
- if (!data) {
433
- return;
434
- }
435
- if (data.error) {
436
- return this.onDidFailRefresh(id, data.error);
402
+ if (!data || data.error) {
403
+ return this.onDidFailRefresh(id, (_a = data === null || data === void 0 ? void 0 : data.error) !== null && _a !== void 0 ? _a : 'No data found');
437
404
  }
438
405
  if (!data.verified) {
439
406
  if (data.publishedBy.loginName === 'open-vsx') {
@@ -536,10 +503,6 @@ tslib_1.__decorate([
536
503
  (0, inversify_1.inject)(ovsx_client_1.OVSXApiFilterProvider),
537
504
  tslib_1.__metadata("design:type", Function)
538
505
  ], VSXExtensionsModel.prototype, "vsxApiFilter", void 0);
539
- tslib_1.__decorate([
540
- (0, inversify_1.inject)(file_service_1.FileService),
541
- tslib_1.__metadata("design:type", file_service_1.FileService)
542
- ], VSXExtensionsModel.prototype, "fileService", void 0);
543
506
  tslib_1.__decorate([
544
507
  (0, inversify_1.inject)(application_protocol_1.ApplicationServer),
545
508
  tslib_1.__metadata("design:type", Object)
package/lib/browser/vsx-extensions-model.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extensions-model.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vsx-extensions-model.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-model.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,16 +1,16 @@
1
1
  {
2
2
  "name": "@theia/vsx-registry",
3
- "version": "1.66.0-next.12+b31bdedfc",
3
+ "version": "1.66.0-next.32+0e85731b8",
4
4
  "description": "Theia - VSX Registry",
5
5
  "dependencies": {
6
- "@theia/core": "1.66.0-next.12+b31bdedfc",
7
- "@theia/filesystem": "1.66.0-next.12+b31bdedfc",
8
- "@theia/navigator": "1.66.0-next.12+b31bdedfc",
9
- "@theia/ovsx-client": "1.66.0-next.12+b31bdedfc",
10
- "@theia/plugin-ext": "1.66.0-next.12+b31bdedfc",
11
- "@theia/plugin-ext-vscode": "1.66.0-next.12+b31bdedfc",
12
- "@theia/preferences": "1.66.0-next.12+b31bdedfc",
13
- "@theia/workspace": "1.66.0-next.12+b31bdedfc",
6
+ "@theia/core": "1.66.0-next.32+0e85731b8",
7
+ "@theia/filesystem": "1.66.0-next.32+0e85731b8",
8
+ "@theia/navigator": "1.66.0-next.32+0e85731b8",
9
+ "@theia/ovsx-client": "1.66.0-next.32+0e85731b8",
10
+ "@theia/plugin-ext": "1.66.0-next.32+0e85731b8",
11
+ "@theia/plugin-ext-vscode": "1.66.0-next.32+0e85731b8",
12
+ "@theia/preferences": "1.66.0-next.32+0e85731b8",
13
+ "@theia/workspace": "1.66.0-next.32+0e85731b8",
14
14
  "limiter": "^2.1.0",
15
15
  "luxon": "^2.4.0",
16
16
  "p-debounce": "^2.1.0",
@@ -61,5 +61,5 @@
61
61
  "nyc": {
62
62
  "extends": "../../configs/nyc.json"
63
63
  },
64
- "gitHead": "b31bdedfcceb7a9f9a14259633b5280596013b41"
64
+ "gitHead": "0e85731b8d6b22ec862ca4ef7a35a9b81a744107"
65
65
  }
package/src/browser/vsx-extensions-model.ts CHANGED
@@ -33,7 +33,6 @@ import { OVSXClientProvider } from '../common/ovsx-client-provider';
33
33
  import { RequestContext, RequestService } from '@theia/core/shared/@theia/request';
34
34
  import { OVSXApiFilterProvider } from '@theia/ovsx-client';
35
35
  import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
36
- import { FileService } from '@theia/filesystem/lib/browser/file-service';
37
36
  import { HostedPluginServer, PluginIdentifiers, PluginType } from '@theia/plugin-ext';
38
37
  import { HostedPluginWatcher } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin-watcher';
39
38
 
@@ -93,9 +92,6 @@ export class VSXExtensionsModel {
93
92
  @inject(OVSXApiFilterProvider)
94
93
  protected vsxApiFilter: OVSXApiFilterProvider;
95
94
 
96
- @inject(FileService)
97
- protected readonly fileService: FileService;
98
-
99
95
  @inject(ApplicationServer)
100
96
  protected readonly applicationServer: ApplicationServer;
101
97
 
@@ -166,29 +162,15 @@ export class VSXExtensionsModel {
166
162
  resolve(id: string): Promise<VSXExtension> {
167
163
  return this.doChange(async () => {
168
164
  await this.initialized;
169
- const extension = await this.refresh(id) ?? this.getExtension(id);
165
+ const extension = await this.refresh(id);
170
166
  if (!extension) {
171
167
  throw new Error(`Failed to resolve ${id} extension.`);
172
168
  }
173
- if (extension.readme === undefined) {
169
+ if (extension.readme === undefined && extension.readmeUrl) {
174
170
  try {
175
- let rawReadme: string = '';
176
- const installedReadme = await this.findReadmeFile(extension);
177
- // Attempt to read the local readme first
178
- // It saves network resources and is faster
179
- if (installedReadme) {
180
- try {
181
- const readmeContent = await this.fileService.readFile(installedReadme);
182
- rawReadme = readmeContent.value.toString();
183
- } catch {
184
- // fall through
185
- }
186
- }
187
- if (!rawReadme && extension.readmeUrl) {
188
- rawReadme = RequestContext.asText(
189
- await this.request.request({ url: extension.readmeUrl })
190
- );
191
- }
171
+ const rawReadme = RequestContext.asText(
172
+ await this.request.request({ url: extension.readmeUrl })
173
+ );
192
174
  const readme = this.compileReadme(rawReadme);
193
175
  extension.update({ readme });
194
176
  } catch (e) {
@@ -201,21 +183,6 @@ export class VSXExtensionsModel {
201
183
  });
202
184
  }
203
185
 
204
- protected async findReadmeFile(extension: VSXExtension): Promise<URI | undefined> {
205
- if (!extension.plugin) {
206
- return undefined;
207
- }
208
- // Since we don't know the exact capitalization of the readme file (might be README.md, readme.md, etc.)
209
- // We attempt to find the readme file by searching through the plugin's directories
210
- const packageUri = new URI(extension.plugin.metadata.model.packageUri);
211
- const pluginDirStat = await this.fileService.resolve(packageUri);
212
- const possibleNames = ['readme.md', 'readme.txt', 'readme'];
213
- const readmeFileUri = pluginDirStat.children
214
- ?.find(child => possibleNames.includes(child.name.toLowerCase()))
215
- ?.resource;
216
- return readmeFileUri;
217
- }
218
-
219
186
  protected async initInstalled(): Promise<void> {
220
187
  await this.pluginSupport.willStart;
221
188
  try {
@@ -498,11 +465,8 @@ export class VSXExtensionsModel {
498
465
  targetPlatform
499
466
  });
500
467
  }
501
- if (!data) {
502
- return;
503
- }
504
- if (data.error) {
505
- return this.onDidFailRefresh(id, data.error);
468
+ if (!data || data.error) {
469
+ return this.onDidFailRefresh(id, data?.error ?? 'No data found');
506
470
  }
507
471
  if (!data.verified) {
508
472
  if (data.publishedBy.loginName === 'open-vsx') {