@enonic-types/lib-grid 7.11.0-B1 → 7.11.0-B4

package/README.md

@@ -5,38 +5,23 @@
 ## Install
 
 ```bash
-npm i --save-dev @enonic/lib-grid
+npm i --save-dev @enonic-types/lib-grid
 ```
 
 ## Use
 
-Add the corresponding types to your `tsconfig.json` file that is used for application's server-side TypeScript code.
-
-`tsconfig.json`
-
-```json
-{
-  "compilerOptions": {
-    "types": [
-      "@enonic-types/lib-grid"
-    ]
-  }
-}
-```
-
 ### Require and custom imports
 
-To make `require` work out of box, you must install and add the `@enonic-types/global` types. Aside from providing definitions for XP global
-objects, e.g. `log`, `app`, `__`, etc, requiring library by the default path will return typed object.
+To make `require` work out of the box, you must install and add the `@enonic-types/global` types. Aside from providing definitions for XP
+global objects, e.g. `log`, `app`, `__`, etc, requiring a library by the default path will return typed object.
 
 `tsconfig.json`
 
-```diff
+```json
 {
   "compilerOptions": {
     "types": [
-+     "@enonic-types/global"
-      "@enonic-types/lib-grid"
+      "@enonic-types/global"
     ]
   }
 }
@@ -49,7 +34,7 @@ const {getMap} = require('/lib/xp/grid');
 ```
 
 More detailed explanation on how it works and how to type custom import function can be
-found [here](https://github.com/enonic/xp/tree/master/modules/lib/typescript/README.md).
+found [here](https://developer.enonic.com/docs/xp/stable/api).
 
 ### ES6-style import
 
@@ -58,16 +43,13 @@ types mapping to your configuration.
 
 `tsconfig.json`
 
-```diff
+```json
 {
   "compilerOptions": {
-    "types": [
-      "@enonic-types/lib-grid"
-    ]
-+   "baseUrl": "./",
-+   "paths": {
-+     "/lib/xp/grid": ["node_modules/@enonic-types/lib-grid"],
-+   }
+    "baseUrl": "./",
+    "paths": {
+      "/lib/xp/grid": ["node_modules/@enonic-types/lib-grid"]
+    }
   }
 }
 ```

package/grid.d.ts

@@ -12,62 +12,23 @@ declare global {
     }
 }
 export declare type SharedMapValueType = string | number | boolean | object | null;
-export declare type SharedMapModifierFn = (oldValue: SharedMapValueType) => SharedMapValueType;
-export interface SetParams {
-    key: string;
-    value: SharedMapValueType;
+export declare type GridMap = Record<string, SharedMapValueType>;
+export declare type SharedMapModifierFn<Map extends GridMap, Key extends keyof Map> = (value: Map[Key] | null) => SharedMapValueType | Record<string, unknown> | object[];
+export interface SetParams<Map extends GridMap, Key extends keyof Map> {
+    key: Key;
+    value: Map[Key] | null;
     ttlSeconds?: number;
 }
-export interface ModifyParams {
-    key: string;
-    func: SharedMapModifierFn;
+export interface ModifyParams<Map extends GridMap, Key extends keyof Map> {
+    key: Key;
+    func: SharedMapModifierFn<Map, Key>;
     ttlSeconds?: number;
 }
-/**
- * Shared Map is similar to other Map, but its instances are shared across all applications and even cluster nodes.
-
- WARNING: Due to distributed nature of the Shared Map not all types of keys and values can be used. Strings, numbers, and pure JSON objects are supported. There is no runtime check for type compatibility due to performance reasons. The developer is also responsible for not modifying shared objects (keys and values) in place.
- * @param mapId - map identifier
- * @constructor
- */
-export declare class SharedMap {
-    private map;
-    constructor(mapId: string);
-    /**
-     * Returns the value to which the specified key is mapped, or null if this map contains no mapping for the key.
-     *
-     * @param {string} key - key the key whose associated value is to be returned
-     * @returns {string|number|boolean|JSON|null} the value to which the specified key is mapped, or null if this map contains no mapping for the key
-     */
-    get(key: string): SharedMapValueType;
-    /**
-     * Puts an entry into this map with a given time to live (TTL).
-     * If value is null, the existing entry will be removed.
-     *
-     * @param {object} params JSON with the parameters.
-     * @param {string} params.key key of the entry
-     * @param {string|number|boolean|JSON|null} params.value value of the entry
-     * @param {number} [params.ttlSeconds] maximum time to live in seconds for this entry to stay in the map. (0 means infinite, negative means map config default or infinite if map config is not available)
-     */
-    set(params: SetParams): void;
-    /**
-     * Attempts to compute a mapping for the specified key and its current mapped value.
-     *
-     * @param {object} params JSON with the parameters.
-     * @param {string} params.key  key of the entry
-     * @param {function} params.func mapping function that accepts the existing mapped value (or null, if there is no associated mapping).
-     *                            The returned value replaces the existing mapped value for the specified key.
-     *                            If returned value is null then the value is removed from the map
-     * @param {number} [params.ttlSeconds] maximum time to live in seconds for this entry to stay in the map. (0 means infinite, negative means map config default or infinite if map config is not available)
-     * @returns the new value to which the specified key is mapped, or null if this map no longer contains mapping for the key
-     */
-    modify(params: ModifyParams): SharedMapValueType;
-    /**
-     * Removes the mapping for the key from this map if it is present.
-     *
-     * @param {string} key the key whose associated value is to be removed
-     */
-    delete(key: string): void;
+export interface SharedMap<Map extends GridMap> {
+    get<Key extends keyof Map>(key: Key): Map[Key];
+    set<Key extends keyof Map>(params: SetParams<Map, Key>): void;
+    modify<Key extends keyof Map>(params: ModifyParams<Map, Key>): Map[Key];
+    delete(key: keyof Map): void;
 }
 /**
  * Returns an instance of SharedMap by the specified map identifier.
@@ -75,4 +36,4 @@ export declare class SharedMap {
  * @param {string} mapId map identifier
  * @returns {SharedMap} an instance of SharedMap
  */
-export declare function getMap(mapId: string): SharedMap;
+export declare function getMap<Map extends GridMap>(mapId: string): SharedMap<Map>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@enonic-types/lib-grid",
-    "version": "7.11.0-B1",
+    "version": "7.11.0-B4",
     "description": "Type definitions for lib-grid.",
     "types": "grid.d.ts",
     "files": [
@@ -26,6 +26,7 @@
         "url": "https://github.com/enonic/xp/issues"
     },
     "homepage": "https://github.com/enonic/xp/tree/master#readme",
+    "dependencies": {},
     "publishConfig": {
         "access": "public"
     }