@theia/variable-resolver 1.77.0-next.99 → 1.78.0-next.0

package/src/browser/common-variable-contribution.ts

@@ -15,14 +15,14 @@
 // *****************************************************************************
 
 import { injectable, inject, optional } from '@theia/core/shared/inversify';
-import { VariableContribution, VariableRegistry } from './variable';
+import { VariableContribution, VariableRegistry } from './variable.js';
 import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { CommandService } from '@theia/core/lib/common/command';
 import { OS } from '@theia/core/lib/common/os';
 import { PreferenceService } from '@theia/core/lib/common/preferences/preference-service';
 import { ResourceContextKey } from '@theia/core/lib/browser/resource-context-key';
-import { VariableInput } from './variable-input';
+import { VariableInput } from './variable-input.js';
 import { QuickInputService, QuickPickValue } from '@theia/core/lib/browser';
 import { MaybeArray, RecursivePartial } from '@theia/core/lib/common/types';
 import { cancelled } from '@theia/core/lib/common/cancellation';
@@ -73,7 +73,7 @@ export class CommonVariableContribution implements VariableContribution {
                 if (!preferenceName) {
                     return undefined;
                 }
-                return this.preferences.get(preferenceName, undefined, resourceUri && resourceUri.toString());
+                return this.preferences.get(preferenceName, { resource: resourceUri && resourceUri.toString() });
             }
         });
         variables.registerVariable({
@@ -98,7 +98,7 @@ export class CommonVariableContribution implements VariableContribution {
                 if (!variable || !section) {
                     return undefined;
                 }
-                const configuration = this.preferences.get<RecursivePartial<{ inputs: MaybeArray<VariableInput> }>>(section, undefined, resourceUri && resourceUri.toString());
+                const configuration = this.preferences.get<RecursivePartial<{ inputs: MaybeArray<VariableInput> }>>(section, { resource: resourceUri && resourceUri.toString() });
                 const inputs = !!configuration && 'inputs' in configuration ? configuration.inputs : undefined;
                 const input = Array.isArray(inputs) && inputs.find(item => !!item && item.id === variable);
                 if (!input) {

package/src/browser/index.ts

@@ -14,6 +14,6 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-export * from './variable';
-export * from './variable-quick-open-service';
-export * from './variable-resolver-service';
+export * from './variable.js';
+export * from './variable-quick-open-service.js';
+export * from './variable-resolver-service.js';

package/src/browser/variable-quick-open-service.ts

@@ -16,8 +16,8 @@
 
 import { inject, injectable, optional } from '@theia/core/shared/inversify';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import { VariableRegistry, Variable } from './variable';
-import { VariableResolverService } from './variable-resolver-service';
+import { VariableRegistry, Variable } from './variable.js';
+import { VariableResolverService } from './variable-resolver-service.js';
 import { QuickPickItem, QuickInputService } from '@theia/core/lib/browser';
 
 @injectable()

package/src/browser/variable-resolver-frontend-contribution.spec.ts

@@ -25,9 +25,9 @@ import * as chai from 'chai';
 import { Container, ContainerModule } from '@theia/core/shared/inversify';
 import { ILogger, bindContributionProvider } from '@theia/core/lib/common';
 import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
-import { VariableContribution, VariableRegistry } from './variable';
-import { VariableQuickOpenService } from './variable-quick-open-service';
-import { VariableResolverFrontendContribution } from './variable-resolver-frontend-contribution';
+import { VariableContribution, VariableRegistry } from './variable.js';
+import { VariableQuickOpenService } from './variable-quick-open-service.js';
+import { VariableResolverFrontendContribution } from './variable-resolver-frontend-contribution.js';
 
 disableJSDOM();
 

package/src/browser/variable-resolver-frontend-contribution.ts

@@ -17,8 +17,8 @@
 import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { Command, CommandContribution, CommandRegistry, ContributionProvider } from '@theia/core/lib/common';
-import { VariableContribution, VariableRegistry } from './variable';
-import { VariableQuickOpenService } from './variable-quick-open-service';
+import { VariableContribution, VariableRegistry } from './variable.js';
+import { VariableQuickOpenService } from './variable-quick-open-service.js';
 
 export const LIST_VARIABLES: Command = Command.toLocalizedCommand({
     id: 'variable.list',

package/src/browser/variable-resolver-frontend-module.ts

@@ -17,11 +17,11 @@
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { bindRootContributionProvider, CommandContribution } from '@theia/core';
 import { FrontendApplicationContribution } from '@theia/core/lib/browser';
-import { VariableRegistry, VariableContribution } from './variable';
-import { VariableQuickOpenService } from './variable-quick-open-service';
-import { VariableResolverFrontendContribution } from './variable-resolver-frontend-contribution';
-import { VariableResolverService } from './variable-resolver-service';
-import { CommonVariableContribution } from './common-variable-contribution';
+import { VariableRegistry, VariableContribution } from './variable.js';
+import { VariableQuickOpenService } from './variable-quick-open-service.js';
+import { VariableResolverFrontendContribution } from './variable-resolver-frontend-contribution.js';
+import { VariableResolverService } from './variable-resolver-service.js';
+import { CommonVariableContribution } from './common-variable-contribution.js';
 
 export default new ContainerModule(bind => {
     bind(VariableRegistry).toSelf().inSingletonScope();

package/src/browser/variable-resolver-service.spec.ts

@@ -17,8 +17,8 @@
 import * as chai from 'chai';
 import { Container } from '@theia/core/shared/inversify';
 import { cancelled } from '@theia/core/lib/common';
-import { VariableRegistry } from './variable';
-import { VariableResolverService } from './variable-resolver-service';
+import { VariableRegistry } from './variable.js';
+import { VariableResolverService } from './variable-resolver-service.js';
 import { ILogger } from '@theia/core';
 import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
 

package/src/browser/variable-resolver-service.ts

@@ -17,9 +17,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { injectable, inject } from '@theia/core/shared/inversify';
-import { VariableRegistry } from './variable';
+import { VariableRegistry } from './variable.js';
 import URI from '@theia/core/lib/common/uri';
-import { CommandIdVariables } from '../common/variable-types';
+import { CommandIdVariables } from '../common/variable-types.js';
 import { isCancelled } from '@theia/core';
 
 export interface VariableResolveOptions {

package/src/browser/variable.spec.ts

@@ -18,7 +18,7 @@ import * as chai from 'chai';
 import { Container, ContainerModule } from '@theia/core/shared/inversify';
 import { ILogger, Disposable } from '@theia/core/lib/common';
 import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
-import { Variable, VariableRegistry } from './variable';
+import { Variable, VariableRegistry } from './variable.js';
 
 const expect = chai.expect;
 let variableRegistry: VariableRegistry;

package/src/browser/variable.ts

@@ -17,7 +17,7 @@
 import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { Disposable, DisposableCollection, MaybePromise, ILogger } from '@theia/core';
 import URI from '@theia/core/lib/common/uri';
-import { CommandIdVariables } from '../common/variable-types';
+import { CommandIdVariables } from '../common/variable-types.js';
 
 /**
  * Variable can be used inside of strings using ${variableName} syntax.