@opensumi/ide-core-common 3.4.4 → 3.4.5-next-1729069673.0

package/lib/remote-service/README.md

@@ -345,16 +345,18 @@ class TerminalService {
 由于装饰器的执行是在类实例化之前，所以我们可以在 `GDataStore` 这个装饰器中收集 token，然后将它们加入 Injector 即可：
 
 ```ts
-const dataStore = [] as [string, DataStoreOptions][];
+function generateToken(type: 'global' | 'session', token: string, options?: DataStoreOptions) {
+  // ...
+}
+
+export type GDataStore<T, K = number> = InMemoryDataStore<T, K>;
 export function GDataStore(token: string, options?: DataStoreOptions): PropertyDecorator {
-  dataStore.push([token, options]);
+  const sym = generateToken('global', token, options);
 
-  return Autowired(GDataStore, {
-    tag: String(token),
+  return Autowired(sym, {
+    tag: token,
   });
 }
-
-export type GDataStore<T> = InMemoryDataStore<T>;
 ```
 
 用一个闭包中的变量 `dataStore` 来储存，然后在创建 Injector 的时候将所有的 token 放入 injector:
@@ -363,10 +365,8 @@ export type GDataStore<T> = InMemoryDataStore<T>;
 function _injectDataStores(injector: Injector) {
   dataStore.forEach(([token, opts]) => {
     injector.addProviders({
-      token: GDataStore,
+      token,
       useValue: new InMemoryDataStore(opts),
-      tag: String(token),
-      dropdownForTag: false,
     });
   });
 }

package/lib/remote-service/data-store/decorators.d.ts

@@ -1,8 +1,8 @@
 import { Injector } from '@opensumi/di';
 import { DataStoreOptions, InMemoryDataStore } from './store';
-export type GDataStore<T> = InMemoryDataStore<T>;
+export type GDataStore<Item extends Record<any, any>, PrimaryKey = keyof Item, PrimaryKeyType = Item[PrimaryKey]> = InMemoryDataStore<Item, PrimaryKey, PrimaryKeyType>;
 export declare function GDataStore(token: string, options?: DataStoreOptions): PropertyDecorator;
-export type SessionDataStore<T> = InMemoryDataStore<T>;
+export type SessionDataStore<Item extends Record<any, any>, PrimaryKey = keyof Item, PrimaryKeyType = Item[PrimaryKey]> = InMemoryDataStore<Item, PrimaryKey, PrimaryKeyType>;
 export declare function SessionDataStore(token: string, options?: DataStoreOptions): PropertyDecorator;
 export declare function injectGDataStores(injector: Injector): void;
 export declare function injectSessionDataStores(injector: Injector): void;

package/lib/remote-service/data-store/decorators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../../src/remote-service/data-store/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,QAAQ,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAgB9D,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC;AACjD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,iBAAiB,CAMvF;AAED,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC;AACvD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,iBAAiB,CAM7F;AAkBD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,QAEnD;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,QAEzD"}
+{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../../src/remote-service/data-store/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,QAAQ,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AA8B9D,MAAM,MAAM,UAAU,CACpB,IAAI,SAAS,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7B,UAAU,GAAG,MAAM,IAAI,EACvB,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,IAC/B,iBAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;AACxD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,iBAAiB,CAIvF;AAED,MAAM,MAAM,gBAAgB,CAC1B,IAAI,SAAS,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7B,UAAU,GAAG,MAAM,IAAI,EACvB,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,IAC/B,iBAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;AACxD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,iBAAiB,CAI7F;AAcD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,QAEnD;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,QAEzD"}

package/lib/remote-service/data-store/decorators.js

@@ -4,48 +4,46 @@ exports.injectSessionDataStores = exports.injectGDataStores = exports.SessionDat
 const di_1 = require("@opensumi/di");
 const store_1 = require("./store");
 const dataStore = {
-    global: {},
-    session: {},
+    GDataStore: {},
+    SessionDataStore: {},
 };
-function saveToken(type, token, options) {
+function generateToken(type, token, options) {
     if (dataStore[type][token]) {
         // 同样的 token 只能被注入一次，options 也以第一次为准
-        return;
+        return dataStore[type][token].sym;
     }
-    dataStore[type][token] = options;
+    const sym = Symbol(`${type}:${token}`);
+    dataStore[type][token] = {
+        sym,
+        options,
+    };
+    return sym;
 }
 function GDataStore(token, options) {
-    saveToken('global', token, options);
-    return (0, di_1.Autowired)(GDataStore, {
-        tag: String(token),
-    });
+    const sym = generateToken('GDataStore', token, options);
+    return (0, di_1.Autowired)(sym);
 }
 exports.GDataStore = GDataStore;
 function SessionDataStore(token, options) {
-    saveToken('session', token, options);
-    return (0, di_1.Autowired)(SessionDataStore, {
-        tag: String(token),
-    });
+    const sym = generateToken('SessionDataStore', token, options);
+    return (0, di_1.Autowired)(sym);
 }
 exports.SessionDataStore = SessionDataStore;
 function _injectDataStores(type, injector) {
     const stores = dataStore[type];
     if (stores) {
-        const token = type === 'global' ? GDataStore : SessionDataStore;
-        injector.addProviders(...Object.entries(stores).map(([tag, opts]) => ({
-            token,
-            useValue: new store_1.InMemoryDataStore(opts),
-            tag,
-            dropdownForTag: false,
+        injector.addProviders(...Object.values(stores).map((opts) => ({
+            token: opts.sym,
+            useValue: new store_1.InMemoryDataStore(opts.options),
         })));
     }
 }
 function injectGDataStores(injector) {
-    _injectDataStores('global', injector);
+    _injectDataStores('GDataStore', injector);
 }
 exports.injectGDataStores = injectGDataStores;
 function injectSessionDataStores(injector) {
-    _injectDataStores('session', injector);
+    _injectDataStores('SessionDataStore', injector);
 }
 exports.injectSessionDataStores = injectSessionDataStores;
 //# sourceMappingURL=decorators.js.map

package/lib/remote-service/data-store/decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../src/remote-service/data-store/decorators.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AAEnD,mCAA8D;AAE9D,MAAM,SAAS,GAAG;IAChB,MAAM,EAAE,EAAkD;IAC1D,OAAO,EAAE,EAAkD;CACnD,CAAC;AAEX,SAAS,SAAS,CAAC,IAA0B,EAAE,KAAa,EAAE,OAA0B;IACtF,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE;QAC1B,oCAAoC;QACpC,OAAO;KACR;IAED,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;AACnC,CAAC;AAGD,SAAgB,UAAU,CAAC,KAAa,EAAE,OAA0B;IAClE,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAEpC,OAAO,IAAA,cAAS,EAAC,UAAU,EAAE;QAC3B,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC;KACnB,CAAC,CAAC;AACL,CAAC;AAND,gCAMC;AAGD,SAAgB,gBAAgB,CAAC,KAAa,EAAE,OAA0B;IACxE,SAAS,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAErC,OAAO,IAAA,cAAS,EAAC,gBAAgB,EAAE;QACjC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC;KACnB,CAAC,CAAC;AACL,CAAC;AAND,4CAMC;AAED,SAAS,iBAAiB,CAAC,IAA0B,EAAE,QAAkB;IACvE,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,MAAM,EAAE;QACV,MAAM,KAAK,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC;QAEhE,QAAQ,CAAC,YAAY,CACnB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9C,KAAK;YACL,QAAQ,EAAE,IAAI,yBAAiB,CAAC,IAAI,CAAC;YACrC,GAAG;YACH,cAAc,EAAE,KAAK;SACtB,CAAC,CAAC,CACJ,CAAC;KACH;AACH,CAAC;AAED,SAAgB,iBAAiB,CAAC,QAAkB;IAClD,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AACxC,CAAC;AAFD,8CAEC;AAED,SAAgB,uBAAuB,CAAC,QAAkB;IACxD,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC;AAFD,0DAEC"}
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../src/remote-service/data-store/decorators.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AAEnD,mCAA8D;AAU9D,MAAM,SAAS,GAAG;IAChB,UAAU,EAAE,EAAmB;IAC/B,gBAAgB,EAAE,EAAmB;CAC7B,CAAC;AAGX,SAAS,aAAa,CAAC,IAAmB,EAAE,KAAa,EAAE,OAA0B;IACnF,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE;QAC1B,oCAAoC;QACpC,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC;KACnC;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC,CAAC;IACvC,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG;QACvB,GAAG;QACH,OAAO;KACR,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC;AAOD,SAAgB,UAAU,CAAC,KAAa,EAAE,OAA0B;IAClE,MAAM,GAAG,GAAG,aAAa,CAAC,YAAY,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAExD,OAAO,IAAA,cAAS,EAAC,GAAG,CAAC,CAAC;AACxB,CAAC;AAJD,gCAIC;AAOD,SAAgB,gBAAgB,CAAC,KAAa,EAAE,OAA0B;IACxE,MAAM,GAAG,GAAG,aAAa,CAAC,kBAAkB,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAE9D,OAAO,IAAA,cAAS,EAAC,GAAG,CAAC,CAAC;AACxB,CAAC;AAJD,4CAIC;AAED,SAAS,iBAAiB,CAAC,IAAmB,EAAE,QAAkB;IAChE,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,MAAM,EAAE;QACV,QAAQ,CAAC,YAAY,CACnB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACtC,KAAK,EAAE,IAAI,CAAC,GAAG;YACf,QAAQ,EAAE,IAAI,yBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC;SAC9C,CAAC,CAAC,CACJ,CAAC;KACH;AACH,CAAC;AAED,SAAgB,iBAAiB,CAAC,QAAkB;IAClD,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;AAC5C,CAAC;AAFD,8CAEC;AAED,SAAgB,uBAAuB,CAAC,QAAkB;IACxD,iBAAiB,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;AAClD,CAAC;AAFD,0DAEC"}

package/lib/remote-service/data-store/select.d.ts

@@ -1,4 +1,4 @@
-export type Query = Record<string, any>;
-export type Store<T> = Iterable<T> | Record<string, T> | Map<string, T>;
+export type Query = Record<any, any>;
+export type Store<T> = Iterable<T> | Record<any, T> | Map<any, T>;
 export declare function select<I, T extends Store<I>>(items: T, query: Query): I[];
 //# sourceMappingURL=select.d.ts.map

package/lib/remote-service/data-store/select.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/remote-service/data-store/select.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AACxC,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;AAexE,wBAAgB,MAAM,CAAC,CAAC,EAAE,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,CAqBzE"}
+{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/remote-service/data-store/select.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACrC,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAelE,wBAAgB,MAAM,CAAC,CAAC,EAAE,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,CAqBzE"}

package/lib/remote-service/data-store/select.js.map

@@ -1 +1 @@
-{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/remote-service/data-store/select.ts"],"names":[],"mappings":";;;AAAA,mDAAiD;AAKjD,SAAS,WAAW,CAAC,KAAY;IAC/B,MAAM,UAAU,GAAG,EAAc,CAAC;IAClC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC7C,UAAU,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG;aACL,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;GACjC,CAAC;IAEF,OAAO,IAAI,QAAQ,CAAC,MAAM,EAAE,OAAO,CAA6B,CAAC;AACnE,CAAC;AAED,SAAgB,MAAM,CAAwB,KAAQ,EAAE,KAAY;IAClE,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,MAAM,GAAG,EAAS,CAAC;IAEzB,IAAI,SAAoC,CAAC;IAEzC,IAAI,KAAK,YAAY,GAAG,EAAE;QACxB,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;KAC5B;SAAM,IAAI,IAAA,sBAAU,EAAC,KAAK,CAAC,EAAE;QAC5B,SAAS,GAAG,KAAK,CAAC;KACnB;SAAM;QACL,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAClC;IAED,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;QAC5B,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;YACjB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,wBAqBC"}
+{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/remote-service/data-store/select.ts"],"names":[],"mappings":";;;AAAA,mDAAiD;AAKjD,SAAS,WAAW,CAAC,KAAY;IAC/B,MAAM,UAAU,GAAG,EAAc,CAAC;IAClC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC7C,UAAU,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG;aACL,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;GACjC,CAAC;IAEF,OAAO,IAAI,QAAQ,CAAC,MAAM,EAAE,OAAO,CAA2B,CAAC;AACjE,CAAC;AAED,SAAgB,MAAM,CAAwB,KAAQ,EAAE,KAAY;IAClE,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,MAAM,GAAG,EAAS,CAAC;IAEzB,IAAI,SAAoC,CAAC;IAEzC,IAAI,KAAK,YAAY,GAAG,EAAE;QACxB,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;KAC5B;SAAM,IAAI,IAAA,sBAAU,EAAC,KAAK,CAAC,EAAE;QAC5B,SAAS,GAAG,KAAK,CAAC;KACnB;SAAM;QACL,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAClC;IAED,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;QAC5B,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;YACjB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,wBAqBC"}

package/lib/remote-service/data-store/store.d.ts

@@ -1,21 +1,21 @@
 import { EventEmitter } from '@opensumi/events';
-export interface DataStore<Item> {
-    create(item: Item): Item;
-    find(query: Record<string, any>): Item[] | undefined;
-    size(query: Record<string, any>): number;
-    get(id: string, query?: Record<string, any>): Item | undefined;
-    update(id: string, item: Partial<Item>): void;
-    remove(id: string): void;
-}
-export interface DataStoreEvent<Item> extends Record<string, any> {
+/**
+ * The query looks like:
+ *   { field: value }
+ *   { field: conditions }
+ */
+export type Query = Record<string, any>;
+export interface DataStoreEvent<Item> {
     created: [item: Item];
     updated: [oldItem: Item, newItem: Item];
     removed: [item: Item];
+    [key: string]: any[];
 }
 export interface DataStoreOptions {
     id?: string;
 }
-export declare class InMemoryDataStore<Item> extends EventEmitter<DataStoreEvent<Item>> implements DataStore<Item> {
+type MarkOptional<T, K extends keyof T> = Omit<T, K> & Partial<T>;
+export declare class InMemoryDataStore<Item extends Record<any, any>, PrimaryKey extends keyof Item = 'id', PrimaryKeyType = Required<Item>[PrimaryKey]> extends EventEmitter<DataStoreEvent<Item>> {
     protected options?: DataStoreOptions | undefined;
     private store;
     private _uid;
@@ -24,12 +24,15 @@ export declare class InMemoryDataStore<Item> extends EventEmitter<DataStoreEvent
      */
     private id;
     constructor(options?: DataStoreOptions | undefined);
-    create(item: Item): Item;
-    find(query: Record<string, any>): Item[] | undefined;
-    size(query?: Record<string, any>): number;
-    get(id: string): Item | undefined;
-    has(id: string): boolean;
-    update(id: string, item: Partial<Item>): void;
-    remove(id: string): void;
+    create(item: MarkOptional<Item, PrimaryKey>): Item;
+    find(query?: Query): Item[] | undefined;
+    count(query?: Query): number;
+    get(id: PrimaryKeyType): Item | undefined;
+    has(id: PrimaryKeyType): boolean;
+    update(id: PrimaryKeyType, item: Partial<Item>): void;
+    remove(id: PrimaryKeyType): void;
+    removeItem(item: Item): void;
+    removeAll(query?: Query): void;
 }
+export {};
 //# sourceMappingURL=store.d.ts.map

package/lib/remote-service/data-store/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../src/remote-service/data-store/store.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIhD,MAAM,WAAW,SAAS,CAAC,IAAI;IAC7B,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC;IACrD,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC;IACzC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAC/D,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC9C,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,cAAc,CAAC,IAAI,CAAE,SAAQ,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAC/D,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACtB,OAAO,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACxC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,qBAAa,iBAAiB,CAAC,IAAI,CAAE,SAAQ,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,CAAE,YAAW,SAAS,CAAC,IAAI,CAAC;IAQ5F,SAAS,CAAC,OAAO,CAAC;IAP9B,OAAO,CAAC,KAAK,CAA2B;IACxC,OAAO,CAAC,IAAI,CAAK;IACjB;;OAEG;IACH,OAAO,CAAC,EAAE,CAAS;gBAEG,OAAO,CAAC,8BAAkB;IAKhD,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAUxB,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,SAAS;IAIpD,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;IAQzC,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAIjC,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAIxB,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAY7C,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;CAQzB"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../src/remote-service/data-store/store.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAKhD;;;;GAIG;AACH,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAExC,MAAM,WAAW,cAAc,CAAC,IAAI;IAClC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACtB,OAAO,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACxC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEtB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,KAAK,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAElE,qBAAa,iBAAiB,CAC5B,IAAI,SAAS,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7B,UAAU,SAAS,MAAM,IAAI,GAAG,IAAI,EACpC,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAC3C,SAAQ,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAQ9B,SAAS,CAAC,OAAO,CAAC;IAP9B,OAAO,CAAC,KAAK,CAAmC;IAChD,OAAO,CAAC,IAAI,CAAK;IACjB;;OAEG;IACH,OAAO,CAAC,EAAE,CAAS;gBAEG,OAAO,CAAC,8BAAkB;IAKhD,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,IAAI;IAUlD,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,SAAS;IAOvC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM;IAQ5B,GAAG,CAAC,EAAE,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS;IAIzC,GAAG,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO;IAIhC,MAAM,CAAC,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAYrD,MAAM,CAAC,EAAE,EAAE,cAAc,GAAG,IAAI;IAShC,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAS5B,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI;CAmB/B"}

package/lib/remote-service/data-store/store.js

@@ -4,6 +4,7 @@ exports.InMemoryDataStore = void 0;
 const tslib_1 = require("tslib");
 const extend_1 = tslib_1.__importDefault(require("lodash/extend"));
 const events_1 = require("@opensumi/events");
+const ide_utils_1 = require("@opensumi/ide-utils");
 const select_1 = require("./select");
 class InMemoryDataStore extends events_1.EventEmitter {
     constructor(options) {
@@ -14,18 +15,21 @@ class InMemoryDataStore extends events_1.EventEmitter {
         this.id = (options === null || options === void 0 ? void 0 : options.id) || 'id';
     }
     create(item) {
-        const id = item[this.id] || String(this._uid++);
+        const id = item[this.id] || this._uid++;
         const result = (0, extend_1.default)({}, item, { [this.id]: id });
         this.store.set(id, result);
         this.emit('created', result);
         return result;
     }
     find(query) {
+        if ((0, ide_utils_1.isUndefined)(query)) {
+            return Array.from(this.store.values());
+        }
         return (0, select_1.select)(this.store, query);
     }
-    size(query) {
+    count(query) {
         var _a;
-        if (!query) {
+        if ((0, ide_utils_1.isUndefined)(query)) {
             return this.store.size;
         }
         return ((_a = this.find(query)) === null || _a === void 0 ? void 0 : _a.length) || 0;
@@ -38,7 +42,7 @@ class InMemoryDataStore extends events_1.EventEmitter {
     }
     update(id, item) {
         const current = this.store.get(id);
-        if (!current) {
+        if ((0, ide_utils_1.isUndefined)(current)) {
             return;
         }
         const result = (0, extend_1.default)({}, current, item);
@@ -52,6 +56,30 @@ class InMemoryDataStore extends events_1.EventEmitter {
         }
         this.store.delete(id);
     }
+    removeItem(item) {
+        const id = item[this.id];
+        if ((0, ide_utils_1.isUndefined)(id)) {
+            return;
+        }
+        this.remove(id);
+    }
+    removeAll(query) {
+        if ((0, ide_utils_1.isUndefined)(query)) {
+            const items = Array.from(this.store.values());
+            this.store.clear();
+            items.forEach((item) => {
+                this.emit('removed', item);
+            });
+            return;
+        }
+        const items = this.find(query);
+        if (items) {
+            items.forEach((item) => {
+                this.store.delete(item[this.id]);
+                this.emit('removed', item);
+            });
+        }
+    }
 }
 exports.InMemoryDataStore = InMemoryDataStore;
 //# sourceMappingURL=store.js.map

package/lib/remote-service/data-store/store.js.map

@@ -1 +1 @@
-{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../src/remote-service/data-store/store.ts"],"names":[],"mappings":";;;;AAAA,mEAAmC;AAEnC,6CAAgD;AAEhD,qCAAkC;AAqBlC,MAAa,iBAAwB,SAAQ,qBAAkC;IAQ7E,YAAsB,OAA0B;QAC9C,KAAK,EAAE,CAAC;QADY,YAAO,GAAP,OAAO,CAAmB;QAPxC,UAAK,GAAG,IAAI,GAAG,EAAgB,CAAC;QAChC,SAAI,GAAG,CAAC,CAAC;QAQf,IAAI,CAAC,EAAE,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,KAAI,IAAI,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,IAAU;QACf,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,IAAA,gBAAM,EAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAS,CAAC;QAE3D,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAE3B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC7B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,KAA0B;QAC7B,OAAO,IAAA,eAAM,EAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,CAAC,KAA2B;;QAC9B,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;SACxB;QAED,OAAO,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,0CAAE,MAAM,KAAI,CAAC,CAAC;IACvC,CAAC;IAED,GAAG,CAAC,EAAU;QACZ,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,GAAG,CAAC,EAAU;QACZ,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,EAAU,EAAE,IAAmB;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QAED,MAAM,MAAM,GAAG,IAAA,gBAAM,EAAC,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAEtC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,EAAU;QACf,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChC,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;SAC5B;QAED,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;CACF;AA/DD,8CA+DC"}
+{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../src/remote-service/data-store/store.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-core-common",
-  "version": "3.4.4",
+  "version": "3.4.5-next-1729069673.0",
   "description": "@opensumi/ide-core-common",
   "files": [
     "lib",
@@ -20,10 +20,10 @@
   "dependencies": {
     "@opensumi/di": "^1.8.0",
     "@opensumi/events": "^1.0.0",
-    "@opensumi/ide-utils": "3.4.4"
+    "@opensumi/ide-utils": "3.4.5-next-1729069673.0"
   },
   "devDependencies": {
-    "@opensumi/ide-dev-tool": "3.4.4"
+    "@opensumi/ide-dev-tool": "3.4.5-next-1729069673.0"
   },
-  "gitHead": "591891f890560abddd476796a0a7a5b9683b1847"
+  "gitHead": "7c5e59b90a73d8dee58adab31b1239a9a319c972"
 }

package/src/remote-service/README.md

@@ -345,16 +345,18 @@ class TerminalService {
 由于装饰器的执行是在类实例化之前，所以我们可以在 `GDataStore` 这个装饰器中收集 token，然后将它们加入 Injector 即可：
 
 ```ts
-const dataStore = [] as [string, DataStoreOptions][];
+function generateToken(type: 'global' | 'session', token: string, options?: DataStoreOptions) {
+  // ...
+}
+
+export type GDataStore<T, K = number> = InMemoryDataStore<T, K>;
 export function GDataStore(token: string, options?: DataStoreOptions): PropertyDecorator {
-  dataStore.push([token, options]);
+  const sym = generateToken('global', token, options);
 
-  return Autowired(GDataStore, {
-    tag: String(token),
+  return Autowired(sym, {
+    tag: token,
   });
 }
-
-export type GDataStore<T> = InMemoryDataStore<T>;
 ```
 
 用一个闭包中的变量 `dataStore` 来储存，然后在创建 Injector 的时候将所有的 token 放入 injector:
@@ -363,10 +365,8 @@ export type GDataStore<T> = InMemoryDataStore<T>;
 function _injectDataStores(injector: Injector) {
   dataStore.forEach(([token, opts]) => {
     injector.addProviders({
-      token: GDataStore,
+      token,
       useValue: new InMemoryDataStore(opts),
-      tag: String(token),
-      dropdownForTag: false,
     });
   });
 }

package/src/remote-service/data-store/decorators.ts

@@ -2,58 +2,72 @@ import { Autowired, Injector } from '@opensumi/di';
 
 import { DataStoreOptions, InMemoryDataStore } from './store';
 
+type DataStoreItem = Record<
+  string,
+  {
+    sym: symbol;
+    options: DataStoreOptions | undefined;
+  }
+>;
+
 const dataStore = {
-  global: {} as Record<string, DataStoreOptions | undefined>,
-  session: {} as Record<string, DataStoreOptions | undefined>,
+  GDataStore: {} as DataStoreItem,
+  SessionDataStore: {} as DataStoreItem,
 } as const;
+type DataStoreType = keyof typeof dataStore;
 
-function saveToken(type: 'global' | 'session', token: string, options?: DataStoreOptions) {
+function generateToken(type: DataStoreType, token: string, options?: DataStoreOptions) {
   if (dataStore[type][token]) {
     // 同样的 token 只能被注入一次，options 也以第一次为准
-    return;
+    return dataStore[type][token].sym;
   }
 
-  dataStore[type][token] = options;
+  const sym = Symbol(`${type}:${token}`);
+  dataStore[type][token] = {
+    sym,
+    options,
+  };
+  return sym;
 }
 
-export type GDataStore<T> = InMemoryDataStore<T>;
+export type GDataStore<
+  Item extends Record<any, any>,
+  PrimaryKey = keyof Item,
+  PrimaryKeyType = Item[PrimaryKey],
+> = InMemoryDataStore<Item, PrimaryKey, PrimaryKeyType>;
 export function GDataStore(token: string, options?: DataStoreOptions): PropertyDecorator {
-  saveToken('global', token, options);
+  const sym = generateToken('GDataStore', token, options);
 
-  return Autowired(GDataStore, {
-    tag: String(token),
-  });
+  return Autowired(sym);
 }
 
-export type SessionDataStore<T> = InMemoryDataStore<T>;
+export type SessionDataStore<
+  Item extends Record<any, any>,
+  PrimaryKey = keyof Item,
+  PrimaryKeyType = Item[PrimaryKey],
+> = InMemoryDataStore<Item, PrimaryKey, PrimaryKeyType>;
 export function SessionDataStore(token: string, options?: DataStoreOptions): PropertyDecorator {
-  saveToken('session', token, options);
+  const sym = generateToken('SessionDataStore', token, options);
 
-  return Autowired(SessionDataStore, {
-    tag: String(token),
-  });
+  return Autowired(sym);
 }
 
-function _injectDataStores(type: 'global' | 'session', injector: Injector) {
+function _injectDataStores(type: DataStoreType, injector: Injector) {
   const stores = dataStore[type];
   if (stores) {
-    const token = type === 'global' ? GDataStore : SessionDataStore;
-
     injector.addProviders(
-      ...Object.entries(stores).map(([tag, opts]) => ({
-        token,
-        useValue: new InMemoryDataStore(opts),
-        tag,
-        dropdownForTag: false,
+      ...Object.values(stores).map((opts) => ({
+        token: opts.sym,
+        useValue: new InMemoryDataStore(opts.options),
       })),
     );
   }
 }
 
 export function injectGDataStores(injector: Injector) {
-  _injectDataStores('global', injector);
+  _injectDataStores('GDataStore', injector);
 }
 
 export function injectSessionDataStores(injector: Injector) {
-  _injectDataStores('session', injector);
+  _injectDataStores('SessionDataStore', injector);
 }

package/src/remote-service/data-store/select.ts

@@ -1,7 +1,7 @@
 import { isIterable } from '@opensumi/ide-utils';
 
-export type Query = Record<string, any>;
-export type Store<T> = Iterable<T> | Record<string, T> | Map<string, T>;
+export type Query = Record<any, any>;
+export type Store<T> = Iterable<T> | Record<any, T> | Map<any, T>;
 
 function makeMatcher(query: Query) {
   const statements = [] as string[];
@@ -13,7 +13,7 @@ function makeMatcher(query: Query) {
     return ${statements.join(' && ')};
   `;
 
-  return new Function('item', matcher) as (item: Query) => boolean;
+  return new Function('item', matcher) as (item: any) => boolean;
 }
 
 export function select<I, T extends Store<I>>(items: T, query: Query): I[] {

package/src/remote-service/data-store/store.ts

@@ -1,30 +1,37 @@
 import extend from 'lodash/extend';
 
 import { EventEmitter } from '@opensumi/events';
+import { isUndefined } from '@opensumi/ide-utils';
 
 import { select } from './select';
 
-export interface DataStore<Item> {
-  create(item: Item): Item;
-  find(query: Record<string, any>): Item[] | undefined;
-  size(query: Record<string, any>): number;
-  get(id: string, query?: Record<string, any>): Item | undefined;
-  update(id: string, item: Partial<Item>): void;
-  remove(id: string): void;
-}
+/**
+ * The query looks like:
+ *   { field: value }
+ *   { field: conditions }
+ */
+export type Query = Record<string, any>;
 
-export interface DataStoreEvent<Item> extends Record<string, any> {
+export interface DataStoreEvent<Item> {
   created: [item: Item];
   updated: [oldItem: Item, newItem: Item];
   removed: [item: Item];
+
+  [key: string]: any[];
 }
 
 export interface DataStoreOptions {
   id?: string;
 }
 
-export class InMemoryDataStore<Item> extends EventEmitter<DataStoreEvent<Item>> implements DataStore<Item> {
-  private store = new Map<string, Item>();
+type MarkOptional<T, K extends keyof T> = Omit<T, K> & Partial<T>;
+
+export class InMemoryDataStore<
+  Item extends Record<any, any>,
+  PrimaryKey extends keyof Item = 'id',
+  PrimaryKeyType = Required<Item>[PrimaryKey],
+> extends EventEmitter<DataStoreEvent<Item>> {
+  private store = new Map<PrimaryKeyType, Item>();
   private _uid = 0;
   /**
    * primary key
@@ -36,8 +43,8 @@ export class InMemoryDataStore<Item> extends EventEmitter<DataStoreEvent<Item>>
     this.id = options?.id || 'id';
   }
 
-  create(item: Item): Item {
-    const id = item[this.id] || String(this._uid++);
+  create(item: MarkOptional<Item, PrimaryKey>): Item {
+    const id = item[this.id] || (this._uid++ as PrimaryKeyType);
     const result = extend({}, item, { [this.id]: id }) as Item;
 
     this.store.set(id, result);
@@ -46,29 +53,32 @@ export class InMemoryDataStore<Item> extends EventEmitter<DataStoreEvent<Item>>
     return result;
   }
 
-  find(query: Record<string, any>): Item[] | undefined {
+  find(query?: Query): Item[] | undefined {
+    if (isUndefined(query)) {
+      return Array.from(this.store.values());
+    }
     return select(this.store, query);
   }
 
-  size(query?: Record<string, any>): number {
-    if (!query) {
+  count(query?: Query): number {
+    if (isUndefined(query)) {
       return this.store.size;
     }
 
     return this.find(query)?.length || 0;
   }
 
-  get(id: string): Item | undefined {
+  get(id: PrimaryKeyType): Item | undefined {
     return this.store.get(id);
   }
 
-  has(id: string): boolean {
+  has(id: PrimaryKeyType): boolean {
     return this.store.has(id);
   }
 
-  update(id: string, item: Partial<Item>): void {
+  update(id: PrimaryKeyType, item: Partial<Item>): void {
     const current = this.store.get(id);
-    if (!current) {
+    if (isUndefined(current)) {
       return;
     }
 
@@ -78,7 +88,7 @@ export class InMemoryDataStore<Item> extends EventEmitter<DataStoreEvent<Item>>
     this.store.set(id, result);
   }
 
-  remove(id: string): void {
+  remove(id: PrimaryKeyType): void {
     const item = this.store.get(id);
     if (item) {
       this.emit('removed', item);
@@ -86,4 +96,33 @@ export class InMemoryDataStore<Item> extends EventEmitter<DataStoreEvent<Item>>
 
     this.store.delete(id);
   }
+
+  removeItem(item: Item): void {
+    const id = item[this.id] as PrimaryKeyType;
+    if (isUndefined(id)) {
+      return;
+    }
+
+    this.remove(id);
+  }
+
+  removeAll(query?: Query): void {
+    if (isUndefined(query)) {
+      const items = Array.from(this.store.values());
+      this.store.clear();
+
+      items.forEach((item) => {
+        this.emit('removed', item);
+      });
+      return;
+    }
+
+    const items = this.find(query);
+    if (items) {
+      items.forEach((item) => {
+        this.store.delete(item[this.id]);
+        this.emit('removed', item);
+      });
+    }
+  }
 }