@opensumi/ide-core-common 2.27.3-rc-1708399099.0 → 2.27.3-rc-1710386185.0

package/src/command.ts

@@ -2,7 +2,7 @@ import { Autowired, Injectable } from '@opensumi/di';
 import { Disposable, Emitter, Event, IDisposable, MaybePromise } from '@opensumi/ide-utils';
 
 import { ContributionProvider } from './contribution-provider';
-import { createLocalizedStr, ILocalizedStr, replaceLocalizePlaceholder } from './localize';
+import { ILocalizedStr, createLocalizedStr, replaceLocalizePlaceholder } from './localize';
 import { getDebugLogger } from './log';
 import { IExtensionInfo } from './types';
 

package/src/comparers.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Some code copied and modified from https://github.com/microsoft/vscode/blob/1.44.0/src/vs/base/common/comparers.ts
 
-import { path, IdleValue } from '@opensumi/ide-utils';
+import { IdleValue, path } from '@opensumi/ide-utils';
 
 import { IRange } from './types';
 const { sep } = path;

package/src/const/application.ts

@@ -4,10 +4,10 @@ export const DEFAULT_APPLICATION_WEB_HOST = 'web';
 export const DEFAULT_URI_SCHEME = 'sumi';
 export const DEFAULT_OPENVSX_REGISTRY = 'https://open-vsx.org'; // Official Registry
 
-export namespace DEFAULT_TRS_REGISTRY {
-  export const ENDPOINT = 'https://marketplace.opentrs.cn';
-  export const ACCOUNT_ID = 'clcJKq_Gea47whxAJGrgoYqf';
-  export const MASTER_KEY = '_V_LPJ6Ar-1nrSVa05xDGBYp';
+export namespace DEFAULT_ALIPAY_CLOUD_REGISTRY {
+  export const ENDPOINT = 'https://twebgwnet.alipay.com/atsmarketplace';
+  export const ACCOUNT_ID = 'WWPLOa7vWXCUTSHCfV5FK7Su';
+  export const MASTER_KEY = 'i6rkupqyvC6Bc6CiO0yVLNqq';
 }
 
 export const DEFAULT_VSCODE_ENGINE_VERSION = '1.68.0';

package/src/contribution-provider.ts

@@ -1,4 +1,4 @@
-import { Injector, Domain, ConstructorOf } from '@opensumi/di';
+import { ConstructorOf, Domain, Injector } from '@opensumi/di';
 
 export const ContributionProvider = Symbol('ContributionProvider');
 

package/src/di-helper/domain-helper.ts

@@ -1,4 +1,4 @@
-import { markInjectable, getInjectableOpts, Domain } from '@opensumi/di';
+import { Domain, getInjectableOpts, markInjectable } from '@opensumi/di';
 
 import { ConstructorOf } from '../declare';
 
@@ -13,36 +13,3 @@ export function Domain(...domains: Domain[]) {
     markInjectable(target, opts);
   };
 }
-
-const domainMap = new Map<Domain, ConstructorOf<any>>();
-
-/**
- * 带全局记录的 Domain 装饰器
- * @param domain
- */
-export function EffectDomain(domain: Domain) {
-  return (target: ConstructorOf<any>) => {
-    const opts = getInjectableOpts(target) || {};
-    opts.domain = domain;
-    markInjectable(target, opts);
-
-    const tmp = domainMap.get(domain);
-    if (!tmp) {
-      domainMap.set(domain, target);
-    }
-  };
-}
-
-export function getDomainConstructors(...domains: Domain[]) {
-  const constructorSet = new Set<ConstructorOf<any>>();
-  for (const domain of domains) {
-    const constructor = domainMap.get(domain);
-    if (constructor) {
-      constructorSet.add(constructor);
-    } else {
-      // eslint-disable-next-line no-console
-      console.error(`Unable to retrieve the Constructor for ${String(domain)}`);
-    }
-  }
-  return Array.from(constructorSet);
-}

package/src/electron.ts

@@ -1,9 +1,9 @@
-import type Electron from 'electron';
-
 import { IDisposable } from '@opensumi/ide-utils';
 
 import { ExtensionCandidate } from './types';
 
+import type Electron from 'electron';
+
 export interface IElectronMainApi<Events> {
   on(event: Events, listener: (...args) => void): IDisposable;
 }

package/src/event-bus/event-bus.ts

@@ -1,10 +1,10 @@
 import { Injectable } from '@opensumi/di';
-import { Emitter, IAsyncResult, Event } from '@opensumi/ide-utils';
+import { Emitter, Event, IAsyncResult } from '@opensumi/ide-utils';
 
 import { ConstructorOf } from '../declare';
 
 import { BasicEvent } from './basic-event';
-import { IEventBus, IEventListener, IEventFireOpts, IAsyncEventFireOpts } from './event-bus-types';
+import { IAsyncEventFireOpts, IEventBus, IEventFireOpts, IEventListener } from './event-bus-types';
 
 @Injectable()
 export class EventBusImpl implements IEventBus {

package/src/hash-calculate/WASMInterface.ts

@@ -7,7 +7,7 @@
 // copy and modified from https://github.com/Daninet/hash-wasm/blob/bd3a205ca5603fc80adf71d0966fc72e8d4fa0ef/lib/WASMInterface.ts
 
 import { Mutex } from './mutex';
-import { decodeBase64, getDigestHex, getUInt8Buffer, IDataType, writeHexToUInt8, hexStringEqualsUInt8 } from './util';
+import { IDataType, decodeBase64, getDigestHex, getUInt8Buffer, hexStringEqualsUInt8, writeHexToUInt8 } from './util';
 
 export const MAX_HEAP = 16 * 1024;
 const WASM_FUNC_HASH_LENGTH = 4;

package/src/hash-calculate/lockedCreate.ts

@@ -7,7 +7,7 @@
 // copy and modified from https://github.com/Daninet/hash-wasm/blob/bd3a205ca5603fc80adf71d0966fc72e8d4fa0ef/lib/lockedCreate.ts
 
 import { Mutex } from './mutex';
-import { WASMInterface, IWASMInterface } from './WASMInterface';
+import { IWASMInterface, WASMInterface } from './WASMInterface';
 
 export async function lockedCreate(mutex: Mutex, binary: any, hashLength: number): Promise<IWASMInterface> {
   const unlock = await mutex.lock();

package/src/index.ts

@@ -21,7 +21,6 @@ export * from './range';
 export * from './problem-pattern';
 export * from './problem-matcher';
 export * from './task-definition';
-export * from './node/port';
 export * from './line-text';
 export * from './keyboard';
 export * from './theme';

package/src/json-schema.ts

@@ -1,8 +1,10 @@
+export type JSONSchemaType = string | 'number' | 'integer' | 'boolean' | 'null' | 'array' | 'object';
+
 export interface IJSONSchema {
   id?: string;
   $id?: string;
   $schema?: string;
-  type?: string | string[];
+  type?: JSONSchemaType | JSONSchemaType[];
   title?: string;
   default?: any;
   definitions?: IJSONSchemaMap;
@@ -39,6 +41,7 @@ export interface IJSONSchema {
   const?: any;
   contains?: IJSONSchema;
   propertyNames?: IJSONSchema;
+  examples?: any[];
 
   // schema draft 07
   $comment?: string;
@@ -46,16 +49,37 @@ export interface IJSONSchema {
   then?: IJSONSchema;
   else?: IJSONSchema;
 
+  unevaluatedProperties?: boolean | IJSONSchema;
+  unevaluatedItems?: boolean | IJSONSchema;
+  minContains?: number;
+  maxContains?: number;
+  deprecated?: boolean;
+  dependentRequired?: { [prop: string]: string[] };
+  dependentSchemas?: IJSONSchemaMap;
+  $defs?: { [name: string]: IJSONSchema };
+  $anchor?: string;
+  $recursiveRef?: string;
+  $recursiveAnchor?: string;
+  $vocabulary?: any;
+
+  prefixItems?: IJSONSchema[];
+  $dynamicRef?: string;
+  $dynamicAnchor?: string;
+
   // VSCode extensions
-  defaultSnippets?: IJSONSchemaSnippet[]; // VSCode extension
-  errorMessage?: string; // VSCode extension
-  patternErrorMessage?: string; // VSCode extension
-  deprecationMessage?: string; // VSCode extension
-  enumDescriptions?: string[]; // VSCode extension
-  markdownEnumDescriptions?: string[]; // VSCode extension
-  markdownDescription?: string; // VSCode extension
-  doNotSuggest?: boolean; // VSCode extension
-  allowComments?: boolean; // VSCode extension
+
+  defaultSnippets?: IJSONSchemaSnippet[];
+  errorMessage?: string;
+  patternErrorMessage?: string;
+  deprecationMessage?: string;
+  markdownDeprecationMessage?: string;
+  enumDescriptions?: string[];
+  markdownEnumDescriptions?: string[];
+  markdownDescription?: string;
+  doNotSuggest?: boolean;
+  suggestSortText?: string;
+  allowComments?: boolean;
+  allowTrailingCommas?: boolean;
 }
 
 export interface IJSONSchemaMap {

package/src/line-text.ts

@@ -2,7 +2,7 @@
  * 用于实现效率更高的编辑操作
  */
 
-import { IRange, IPosition, IEditOperation } from './types/editor';
+import { IEditOperation, IPosition, IRange } from './types/editor';
 
 export class BasicTextLines {
   constructor(protected readonly _lines: string[], protected _eol: '\n' | '\r\n') {}

package/src/localize.ts

@@ -1,4 +1,4 @@
-import { strings, CaseInsensitiveMap } from '@opensumi/ide-utils';
+import { CaseInsensitiveMap, strings } from '@opensumi/ide-utils';
 
 const { format, mnemonicButtonLabel } = strings;
 

package/src/module.ts

@@ -2,7 +2,7 @@
  * 项目中会使用到的模块接口定义
  */
 
-import { Autowired, INJECTOR_TOKEN, Injector, Provider, ConstructorOf, Token, Domain } from '@opensumi/di';
+import { Autowired, ConstructorOf, Domain, INJECTOR_TOKEN, Injector, Provider, Token } from '@opensumi/di';
 
 import { RPCProtocol } from './types/rpc';
 
@@ -22,8 +22,15 @@ export interface BackService {
 export class BasicModule {
   @Autowired(INJECTOR_TOKEN)
   protected injector: Injector;
+
   providers?: Provider[];
+  /**
+   * providers only avaiable in electron
+   */
   electronProviders?: Provider[];
+  /**
+   * providers only avaiable in web
+   */
   webProviders?: Provider[];
   backServices?: BackService[];
   frontServices?: FrontService[];

package/src/network.ts

@@ -44,4 +44,6 @@ export namespace Schemes {
   export const userData = 'vscode-userdata';
 
   export const userStorage = 'user_storage';
+
+  export const design = 'design';
 }

package/src/problem-matcher.ts

@@ -15,16 +15,16 @@
  ********************************************************************************/
 // Some code copied and modified from https://github.com/eclipse-theia/theia/tree/v1.14.0/packages/task/src/browser/task-problem-matcher-registry.ts
 
-import { Injectable, Autowired } from '@opensumi/di';
-import { URI, Emitter, DisposableCollection, Disposable, IDisposable } from '@opensumi/ide-utils';
+import { Autowired, Injectable } from '@opensumi/di';
+import { Disposable, DisposableCollection, Emitter, IDisposable, URI } from '@opensumi/ide-utils';
 
 import {
-  IProblemPatternRegistry,
   ApplyToKind,
   FileLocationKind,
-  Severity,
-  ProblemPatternContribution,
+  IProblemPatternRegistry,
   ProblemPattern,
+  ProblemPatternContribution,
+  Severity,
   WatchingPattern,
 } from './problem-pattern';
 

package/src/problem-pattern.ts

@@ -15,10 +15,11 @@
  ********************************************************************************/
 // Some code copied and modified from https://github.com/eclipse-theia/theia/tree/v1.14.0/packages/core/src/common/severity.ts
 
+// eslint-disable-next-line import/no-unresolved
 import { Diagnostic } from 'vscode';
 
 import { Injectable } from '@opensumi/di';
-import { isArray, isString, IDisposable, Disposable, DisposableCollection, URI } from '@opensumi/ide-utils';
+import { Disposable, DisposableCollection, IDisposable, URI, isArray, isString } from '@opensumi/ide-utils';
 
 import { ProblemMatcher } from './problem-matcher';
 

package/src/reference.ts

@@ -1,4 +1,4 @@
-import { Emitter, Event, Disposable, MaybePromise } from '@opensumi/ide-utils';
+import { Disposable, Emitter, Event, MaybePromise } from '@opensumi/ide-utils';
 
 export interface IRef<T> {
   instance: T;

package/src/reporter.ts

@@ -1,15 +1,15 @@
-import { Injectable, Inject } from '@opensumi/di';
+import { Inject, Injectable } from '@opensumi/di';
 import { IDisposable } from '@opensumi/ide-utils';
 
 import { getDebugLogger } from './log';
 import {
-  IReporterService,
-  ReporterMetadata,
   IReporter,
+  IReporterService,
+  IReporterTimer,
   PerformanceData,
   PointData,
-  IReporterTimer,
   REPORT_NAME,
+  ReporterMetadata,
 } from './types/reporter';
 
 class ReporterTimer implements IReporterTimer {

package/src/settings/ai-native.ts

@@ -0,0 +1,4 @@
+export enum AINativeSettingSectionsId {
+  INLINE_CHAT_AUTO_VISIBLE = 'inlineChat.auto.visible',
+}
+export const AI_NATIVE_SETTING_GROUP_ID = 'AI-Native';

package/src/settings/general.ts

@@ -2,4 +2,5 @@ export const enum GeneralSettingsId {
   Icon = 'general.icon',
   Theme = 'general.theme',
   Language = 'general.language',
+  ProductIconTheme = 'general.productIconTheme',
 }

package/src/settings/index.ts

@@ -2,3 +2,4 @@ export * from './general';
 export * from './search';
 export * from './terminal';
 export * from './menubar';
+export * from './ai-native';

package/src/storage.ts

@@ -1,5 +1,5 @@
-import { Injectable, Autowired } from '@opensumi/di';
-import { IDisposable, MaybePromise, Event, URI } from '@opensumi/ide-utils';
+import { Autowired, Injectable } from '@opensumi/di';
+import { Event, IDisposable, MaybePromise, URI } from '@opensumi/ide-utils';
 
 import { ContributionProvider } from './contribution-provider';
 

package/src/task-definition.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@opensumi/di';
-import { objects, IDisposable, Disposable } from '@opensumi/ide-utils';
+import { Disposable, IDisposable, objects } from '@opensumi/ide-utils';
 
-import { IJSONSchemaMap, IJSONSchema } from './json-schema';
+import { IJSONSchema, IJSONSchemaMap } from './json-schema';
 import { formatLocalize } from './localize';
 import { IStringDictionary } from './types/string';
 

package/src/theme.ts

@@ -1,7 +1,99 @@
+import { isObject, isString, isUndefined } from '@opensumi/ide-utils';
+
+import { Codicon } from './codicons';
+
 export interface IThemeColor {
   id: string;
 }
 
+export interface ThemeIcon {
+  readonly id: string;
+  readonly color?: IThemeColor;
+  // for  sumiicon proxy
+  readonly alias?: string[];
+}
+
+export namespace IThemeColor {
+  export function isThemeColor(obj: any): obj is IThemeColor {
+    return obj && typeof obj === 'object' && typeof obj.id === 'string';
+  }
+}
+
 export function isThemeColor(obj: any): obj is IThemeColor {
   return obj && typeof obj === 'object' && typeof (obj as IThemeColor).id === 'string';
 }
+
+export namespace ThemeIcon {
+  export const iconNameSegment = '[A-Za-z0-9]+';
+  export const iconNameExpression = '[A-Za-z0-9-]+';
+  export const iconModifierExpression = '~[A-Za-z]+';
+  export const iconNameCharacter = '[A-Za-z0-9~-]';
+
+  const ThemeIconIdRegex = new RegExp(`^(${iconNameExpression})(${iconModifierExpression})?$`);
+
+  export function asClassNameArray(icon: ThemeIcon): string[] {
+    const match = ThemeIconIdRegex.exec(icon.id);
+    if (!match) {
+      return asClassNameArray(Codicon.error);
+    }
+    const [, id, modifier] = match;
+    const classNames = ['codicon', 'codicon-' + id];
+    if (modifier) {
+      classNames.push('codicon-modifier-' + modifier.substring(1));
+    }
+    return classNames;
+  }
+
+  export function asClassName(icon: ThemeIcon): string {
+    return asClassNameArray(icon).join(' ');
+  }
+
+  export function asCSSSelector(icon: ThemeIcon): string {
+    return '.' + asClassNameArray(icon).join('.');
+  }
+
+  export function isThemeIcon(obj: any): obj is ThemeIcon {
+    return isObject(obj) && isString(obj.id) && (isUndefined(obj.color) || IThemeColor.isThemeColor(obj.color));
+  }
+
+  const _regexFromString = new RegExp(
+    `^\\$\\((${ThemeIcon.iconNameExpression}(?:${ThemeIcon.iconModifierExpression})?)\\)$`,
+  );
+
+  export function fromString(str: string): ThemeIcon | undefined {
+    const match = _regexFromString.exec(str);
+    if (!match) {
+      return undefined;
+    }
+    const [, name] = match;
+    return { id: name };
+  }
+
+  export function fromId(id: string): ThemeIcon {
+    return { id };
+  }
+
+  export function modify(icon: ThemeIcon, modifier: 'disabled' | 'spin' | undefined): ThemeIcon {
+    let id = icon.id;
+    const tildeIndex = id.lastIndexOf('~');
+    if (tildeIndex !== -1) {
+      id = id.substring(0, tildeIndex);
+    }
+    if (modifier) {
+      id = `${id}~${modifier}`;
+    }
+    return { id };
+  }
+
+  export function getModifier(icon: ThemeIcon): string | undefined {
+    const tildeIndex = icon.id.lastIndexOf('~');
+    if (tildeIndex !== -1) {
+      return icon.id.substring(tildeIndex + 1);
+    }
+    return undefined;
+  }
+
+  export function isEqual(ti1: ThemeIcon, ti2: ThemeIcon): boolean {
+    return ti1.id === ti2.id && ti1.color?.id === ti2.color?.id;
+  }
+}

package/src/types/ai-native.ts

@@ -0,0 +1,94 @@
+import { CancellationToken } from '../utils';
+
+export interface IAINativeCapabilities {
+  /**
+   * Use opensumi design UI style
+   */
+  supportsOpenSumiDesign?: boolean;
+  /**
+   * Problem panel uses ai capabilities
+   */
+  supportsMarkers?: boolean;
+  /**
+   * Use ai chat capabilities
+   */
+  supportsChatAssistant?: boolean;
+  /**
+   * Use inline chat capabilities
+   */
+  supportsInlineChat?: boolean;
+  /**
+   * Use code intelligent completion capabilities
+   */
+  supportsInlineCompletion?: boolean;
+  /**
+   * Use ai to intelligently resolve conflicts
+   */
+  supportsConflictResolve?: boolean;
+}
+
+export interface IAINativeConfig {
+  capabilities?: IAINativeCapabilities;
+}
+
+export interface IAICompletionResultModel {
+  sessionId: string;
+  codeModelList: Array<{ content: string }>;
+  isCancel?: boolean;
+}
+
+export const AIBackSerivceToken = Symbol('AIBackSerivceToken');
+export const AIBackSerivcePath = 'AIBackSerivcePath';
+
+export interface IAIBackServiceResponse<T = string> {
+  errorCode?: number;
+  errorMsg?: string;
+  isCancel?: boolean;
+  data?: T;
+}
+
+export interface IAIBackServiceOption {
+  type?: string;
+  model?: string;
+  enableGptCache?: boolean;
+}
+
+export interface IAICompletionOption {
+  prompt: string;
+  suffix?: string;
+  language?: string;
+  fileUrl?: string;
+  sessionId?: string;
+}
+
+export interface IAIReportCompletionOption {
+  relationId: string;
+  sessionId: string;
+  accept: boolean;
+  repo?: string;
+  completionUseTime?: number;
+  renderingTime?: number;
+}
+
+export interface IAIBackService<
+  BaseResponse extends IAIBackServiceResponse = IAIBackServiceResponse,
+  StreamResponse extends NodeJS.ReadableStream = NodeJS.ReadableStream,
+  CompletionResponse = IAICompletionResultModel,
+> {
+  request<O extends IAIBackServiceOption>(
+    input: string,
+    options: O,
+    cancelToken?: CancellationToken,
+  ): Promise<BaseResponse>;
+  requestStream<O extends IAIBackServiceOption>(
+    input: string,
+    options: O,
+    cancelToken?: CancellationToken,
+  ): Promise<StreamResponse>;
+  requestCompletion<I extends IAICompletionOption>(
+    input: I,
+    cancelToken?: CancellationToken,
+  ): Promise<CompletionResponse>;
+  reportCompletion<I extends IAIReportCompletionOption>(input: I): Promise<void>;
+  destroyStreamRequest?: (sessionId: string) => Promise<void>;
+}

package/src/types/application.ts

@@ -4,8 +4,7 @@ export const IApplicationService = Symbol('IApplicationService');
 
 export interface IApplicationService {
   /**
-   * In Electron environment, if `isRemote` is not specified, use local connection by default: `electronEnv.metadata.windowClientId`
-   * Otherwise, use WebSocket connection: `WSChannelHandler.clientId`
+   * equals to `WSChannelHandler.clientId`, which will be inited when create connection to backend
    */
   clientId: string;
   /**

package/src/types/authentication.ts

@@ -1,15 +1,10 @@
-import { IDisposable, Event } from '@opensumi/ide-utils';
+import { Event, IDisposable } from '@opensumi/ide-utils';
 
 export const noAccountsId = 'authentication.noAccounts';
 
 export const ACCOUNTS_MENU = ['accounts_menu'];
 export const ACCOUNTS_SUBMENU = [...ACCOUNTS_MENU, '1_accounts_submenu'];
 
-export interface AllowedExtension {
-  id: string;
-  name: string;
-}
-
 export interface AuthenticationSessionsChangeEvent {
   added: ReadonlyArray<AuthenticationSession>;
   removed: ReadonlyArray<AuthenticationSession>;

package/src/types/file.ts

@@ -1,4 +1,5 @@
 import { Event, Uri } from '@opensumi/ide-utils';
+import { IReadableStream } from '@opensumi/ide-utils/lib/stream';
 
 import { FileChangeEvent } from './file-watch';
 
@@ -123,6 +124,11 @@ export enum FileType {
   SymbolicLink = 64,
 }
 
+export interface IReadFileStreamOptions {
+  position?: number;
+  length?: number;
+}
+
 /**
  * Compatible with vscode.FileSystemProvider
  */
@@ -197,6 +203,8 @@ export interface FileSystemProvider {
    */
   readFile(uri: Uri, encoding?: string): Uint8Array | void | Promise<Uint8Array | void>;
 
+  readFileStream?(uri: Uri, opts?: IReadFileStreamOptions): Promise<IReadableStream<Uint8Array>>;
+
   /**
    * Write data to a file, replacing its entire contents.
    *

package/src/types/index.ts

@@ -13,3 +13,4 @@ export * from './accessibility';
 export * from './statusbar';
 export * from './markdown';
 export * from './editor';
+export * from './ai-native';

package/src/types/markdown.ts

@@ -1,10 +1 @@
-import { UriComponents } from '@opensumi/ide-utils';
-
-export interface IMarkdownString {
-  value: string;
-  isTrusted?: boolean;
-  supportThemeIcons?: boolean;
-  supportHtml?: boolean;
-  baseUri?: UriComponents;
-  uris?: { [href: string]: UriComponents };
-}
+export type { IMarkdownString } from '@opensumi/monaco-editor-core/esm/vs/base/common/htmlContent';

package/src/types/markers/markers-manager.ts

@@ -3,8 +3,7 @@ import { Emitter, Event, IDisposable, arrays } from '@opensumi/ide-utils';
 
 import { WithEventBus } from '../../event-bus';
 
-import { MapMap } from './markers';
-import { IMarker, IMarkerData, MarkerStatistics, MarkerSeverity } from './markers';
+import { IMarker, IMarkerData, MapMap, MarkerSeverity, MarkerStatistics } from './markers';
 
 const { isFalsyOrEmpty } = arrays;
 

package/src/types/markers/markers.ts

@@ -1,4 +1,4 @@
-import { isEmptyObject, URI } from '@opensumi/ide-utils';
+import { URI, isEmptyObject } from '@opensumi/ide-utils';
 
 export interface MapMap<V> {
   [key: string]: { [key: string]: V };