@recats/cdeebee 2.2.4 → 2.3.0

package/.editorconfig

@@ -3,8 +3,6 @@ root = true
 [*]
 end_of_line = lf
 insert_final_newline = true
-
-[*.{js,json,yml}]
 charset = utf-8
 indent_style = space
 indent_size = 2

package/.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 
 node_js:
-  - "10"
+  - "20"
 
 sudo: false
 
@@ -9,9 +9,9 @@ notifications:
   email: false
 
 before_script:
-  - yarn install
+  - pnpm install
 
 script:
-  - yarn lint
+  - pnpm lint
 
-cache: yarn
+cache: pnpm

package/eslint.config.mjs

@@ -0,0 +1,26 @@
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import { FlatCompat } from '@eslint/eslintrc'
+
+const compat = new FlatCompat()
+
+export default tseslint.config(
+  {
+    ignores: ['**/dist/**', '**/.storybook/**'],
+  },
+  eslint.configs.recommended,
+  ...tseslint.configs.recommended,
+  ...compat.config(),
+  {
+    files: ['**/*.ts', '**/*.tsx', '**/*.mts'],
+    rules: {
+      'semi': ['error', 'always'],
+      'arrow-parens': ['error', 'as-needed'],
+      'no-multiple-empty-lines': ['error', { 'max': 1 }],
+      '@typescript-eslint/no-explicit-any': 'warn',
+      'object-curly-spacing': [2, 'always'],
+      'quotes': [2, 'single', { 'avoidEscape': true }],
+      'jsx-quotes': [2, 'prefer-single'],
+    }
+  }
+);

package/{src → lib}/actions.ts

@@ -1,11 +1,10 @@
-// @ts-ignore
 import { Dispatch } from 'redux';
 import { cdeebeeTypes, cdeebeeValueList, EntityID } from './definition';
 
 export function unsafe_updateStore(
   entityList: string,
   entityID: EntityID,
-  value: any,
+  value: unknown,
 ) {
   return (dispatch: Dispatch) => {
     dispatch({
@@ -53,7 +52,6 @@ export function resetEntity(
   };
 }
 
-
 export function dropCdeebeePath(path: (string | number)[]) {
   return (dispatch: Dispatch) => dispatch({ type: cdeebeeTypes.CDEEBEEE_DROP_PATH, payload: { path } });
 }

package/{src → lib}/definition.ts

@@ -19,7 +19,6 @@ export enum cdeebeeTypes {
   CDEEBEEE_DROP_REQUEST_BY_API_URL = '@@cdeebee/DROP_REQUEST_BY_API_URL',
   CDEEBEEE_DROP_ERROR_BY_API_URL = '@@cdeebee/DROP_ERROR_BY_API_URL',
 
-
   CHANGE_ROUTE = '@@router/LOCATION_CHANGE',
 }
 
@@ -60,9 +59,14 @@ export type IDefaultOption = {
 };
 
 export type IResponsePropObject = {
+  requestID: string;
+  controller: AbortController;
+  updateStore: boolean;
+  data: object;
+  requestCancel: boolean;
   requestApi: string;
   response: {
-    [params: string]: any,
+    [params: string]: unknown,
   };
   requestStartTime?: Date;
   mergeListStrategy?: { [key: string]: cdeebeeMergeStrategy };
@@ -117,7 +121,7 @@ export type ActionCreator<A> = (...args: any[]) => A;
 export class CdeebeeRequest {
   public requestObject: any;
 
-  // @ts-ignore
+  // @ts-expect-error okok
   constructor(
     defaultRequest: object,
     options: {
@@ -183,7 +187,7 @@ export interface CDEEBEEUpadte {
 export interface CDEEBEEChangeField {
   readonly type: cdeebeeTypes.CDEEBEE_ENTITY_CHANGE_FIELD;
   readonly payload: {
-    list: { key: string, value: object }[],
+    valueList: cdeebeeValueList[],
     entityList: string,
     entityID: number | string,
   };

package/{src → lib}/helpers.ts

@@ -21,7 +21,6 @@ export const dropRequestFromArray = (activeRequest: cdeebeActiveRequest[]): cdee
   })
 );
 
-
 export const requestCancel = (request: cdeebeActiveRequest): void => {
   if (request.controller && request.controller.abort instanceof Function) {
     request.controller.abort();
@@ -44,10 +43,10 @@ export const checkNetworkActivity = (activeRequest: cdeebeActiveRequest[], apiUr
   return false;
 };
 
-export const getSubEntity = <T>(entity: T & IEntity): { __state: cdeebeeEntityState } | (T & IEntity) => entity.__entity || entity;
+export const getSubEntity = <T>(entity: T & IEntity): { __state: cdeebeeEntityState } | (T & IEntity) => Object.prototype.hasOwnProperty.call(entity, '__entity') ? entity.__entity! : entity;
 
 export const getEntityState = <T>(entity: T & IEntity): cdeebeeEntityState => {
-  // @ts-ignore
+  // @ts-expect-error okok
   const entityState = entity?.__entity?.__state || entity?.__state;
   if (!entityState) {
     return cdeebeeEntityState.NORMAL;
@@ -111,6 +110,7 @@ export const batchingUpdate = (
 
 export const defaultNormalize: (d: IDefaultNormalize) => object = (
   {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     response: { responseStatus, ...response },
     cdeebee, mergeListStrategy, primaryKey,
   },
@@ -118,7 +118,7 @@ export const defaultNormalize: (d: IDefaultNormalize) => object = (
   const keys = Object.keys(response);
   for (const key of keys) {
     const newStorageData: any = {};
-    if (response[key] instanceof Object && response[key].hasOwnProperty(primaryKey)) {
+    if (response[key] instanceof Object && Object.prototype.hasOwnProperty.call(response[key], primaryKey)) {
       for (const element of response[key].data) {
         newStorageData[element[response[key][primaryKey]]] = element;
       }
@@ -126,7 +126,7 @@ export const defaultNormalize: (d: IDefaultNormalize) => object = (
       if (mergeListStrategy[key] === cdeebeeMergeStrategy.replace) {
         response[key] = newStorageData;
       } else {
-        // @ts-ignore
+      // @ts-expect-error okok
         response[key] = mergeDeepRight(cdeebee[key], newStorageData);
       }
     } else if (response[key] === null || response[key] === undefined || typeof response[key] === 'string') {

package/{src → lib}/index.ts

@@ -5,9 +5,9 @@ import {
   cdeebeeTypes,
   cdeebeeMergeStrategy,
   cdeebeeEntityState,
-  cdeebeeValueList,
-  cdeebeActiveRequest,
-  cdeebeeIActions,
+  type cdeebeeValueList,
+  type cdeebeActiveRequest,
+  type cdeebeeIActions,
 } from './definition';
 import * as cdeebeeActions from './actions';
 

package/{src → lib}/reducer.ts

@@ -37,7 +37,7 @@ export const cdeebee = (state: any = INITIAL_STORAGE, action: ICdeebee) => {
     case cdeebeeTypes.CDEEBEEE_DROP:
       return INITIAL_STORAGE;
     case cdeebeeTypes.CDEEBEEE_DROP_PATH:
-      return omit(payload.path, state);
+      return omit(payload.path as string[], state);
     default:
       return state;
   }

package/{src → lib}/request.ts

@@ -1,27 +1,17 @@
 import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only';
-// @ts-ignore
-import { fetch } from 'whatwg-fetch';
-import nodeFetch from 'node-fetch';
+// @ts-expect-error okok
+import { fetch as fetchPolyfill } from 'whatwg-fetch';
+import { Dispatch } from 'redux';
 
 import { mergeDeepRight } from 'ramda';
-// @ts-ignore
-import { Dispatch } from 'redux';
 
 import { defaultNormalize } from './helpers';
 
 import { cdeebeeTypes, IDefaultOption, IRequestOptions, IResponsePropObject } from './definition';
 
-interface IResponse {
-  [string: string]: {
-    response: object,
-    requestApi: string,
-  };
-}
-
-let responsePosition: IResponse = {};
+let responsePosition: Record<string, IResponsePropObject> = {};
 
-
-const abortableFetch = typeof window !== 'undefined' ? (('signal' in new Request('')) ? window.fetch : fetch) : nodeFetch;
+const abortableFetch = typeof window !== 'undefined' ? (('signal' in new Request('')) ? window.fetch : fetchPolyfill) : fetch;
 
 // tslint:disable-next-line
 export default class requestManager {
@@ -98,11 +88,11 @@ export default class requestManager {
         body,
       })).json();
 
-
       if (responseData) {
         responsePosition = Object.assign(
           {
             [requestID]: {
+              requestID,
               response: responseData,
               requestApi: api,
               requestStartTime,
@@ -111,23 +101,26 @@ export default class requestManager {
               normalize,
               preError,
               postError,
-              mergeListStrategy
-            },
-          },
+              mergeListStrategy,
+              updateStore,
+              data,
+              requestCancel,
+              controller,
+            } as IResponsePropObject,
+          } as Record<string, IResponsePropObject>,
           responsePosition,
         );
 
         while (responsePosition[getState().requestManager.activeRequest?.[0]?.requestID]) {
           const processID = getState().requestManager.activeRequest[0].requestID;
           const responsePropsObject: IResponsePropObject = responsePosition[processID];
-          delete responsePosition[processID];
 
           if (responseKeyCode && responsePropsObject.response[responseKeyCode] === 0) {
             if (responsePropsObject.preUpdate) {
               responsePropsObject.preUpdate(responsePropsObject.response);
             }
 
-            if (updateStore) {
+            if (responsePropsObject.updateStore) {
               dispatch({
                 type: cdeebeeTypes.CDEEBEEE_UPDATE,
                 payload: {
@@ -165,15 +158,17 @@ export default class requestManager {
           dispatch({
             type: cdeebeeTypes.CDEEBEE_REQUESTMANAGER_SHIFT,
             payload: {
-              requestID,
+              requestID: responsePropsObject.requestID,
               api: responsePropsObject.requestApi,
-              controller,
-              data,
-              requestCancel,
+              controller: responsePropsObject.controller,
+              data: responsePropsObject.data,
+              requestCancel: responsePropsObject.requestCancel,
               requestStartTime: responsePropsObject.requestStartTime,
               requestEndTime: new Date(),
             }
           });
+
+				  delete responsePosition[processID];
         }
       }
     } catch (error: any) {
@@ -192,7 +187,7 @@ export default class requestManager {
           // tslint:disable-next-line
           console.warn('@@makeRequest-info', { requestStartTime, requestEndTime, requestID });
 
-          if (this.options.hasOwnProperty('globalErrorHandler') && this.options.globalErrorHandler instanceof Function) {
+          if (Object.prototype.hasOwnProperty.call(this.options, 'globalErrorHandler') && this.options.globalErrorHandler instanceof Function) {
             this.options.globalErrorHandler(
               error,
               mergeDeepRight(this.requestObject, rq),
@@ -201,5 +196,5 @@ export default class requestManager {
           }
         }
       }
-  }
+  };
 }

package/package.json

@@ -1,18 +1,14 @@
 {
   "name": "@recats/cdeebee",
-  "version": "2.2.4",
+  "version": "2.3.0",
   "description": "React Redux data-logic library",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
   "repository": "git@github.com:recats/cdeebee.git",
+  "type": "module",
   "author": "recats",
   "license": "MIT",
   "scripts": {
-    "build": "rm -rf lib && yarn build-cjs && yarn build-umd && yarn build-esm",
-    "build-cjs": "./node_modules/.bin/rollup src/index.ts --config --file lib/index.js",
-    "build-umd": "./node_modules/.bin/rollup src/index.ts --config --format umd --file lib/index.umd.js",
-    "build-esm": "./node_modules/.bin/rollup src/index.ts --config --format esm --file lib/index.esm.js",
-    "lint": "./node_modules/.bin/tslint -p . ./src/*.ts"
+    "lint": "eslint .",
+    "build": "vite build"
   },
   "keywords": [
     "react",
@@ -21,37 +17,30 @@
     "data",
     "server"
   ],
+  "module": "./dist/cdeebee.js",
+  "exports": {
+    ".": {
+      "import": "./dist/cdeebee.js",
+      "require": "./dist/cdeebee.umd.cjs"
+    }
+  },
   "devDependencies": {
-    "@babel/core": "^7.16.5",
-    "@babel/plugin-proposal-class-properties": "^7.16.5",
-    "@babel/plugin-proposal-object-rest-spread": "^7.16.5",
-    "@babel/plugin-transform-runtime": "^7.16.5",
-    "@babel/preset-env": "^7.16.5",
-    "@types/lodash": "^4.14.178",
-    "@types/node-fetch": "^2.5.8",
-    "@types/ramda": "^0.27.62",
-    "@types/whatwg-fetch": "^0.0.33",
-    "babel-eslint": "^10.1.0",
-    "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-ramda": "^2.0.0",
-    "babel-plugin-rewire-exports": "^2.3.0",
-    "redux": "^4.1.2",
-    "rollup": "^2.62.0",
-    "rollup-plugin-babel": "^4.4.0",
-    "rollup-plugin-commonjs": "^10.1.0",
-    "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-typescript2": "^0.31.1",
-    "tslint": "^6.1.3",
-    "typescript": "^4.5.4"
+    "@types/lodash": "^4.17.13",
+    "@types/node": "^22.10.2",
+    "@types/ramda": "^0.30.2",
+    "eslint": "^9.17.0",
+    "redux": "^5.0.1",
+    "typescript": "^5.7.2",
+    "typescript-eslint": "^8.18.2",
+    "vite": "^6.0.5"
   },
   "peerDependencies": {
     "ramda": ">=0.27.1",
-    "redux": ">=4.0.5"
+    "redux": ">=5.0.0"
   },
   "dependencies": {
-    "abortcontroller-polyfill": "^1.7.3",
-    "node-fetch": "^2.6.1",
-    "whatwg-fetch": "^3.6.2"
-  }
+    "abortcontroller-polyfill": "^1.7.8",
+    "whatwg-fetch": "^3.6.20"
+  },
+  "packageManager": "pnpm@9.15.1"
 }

package/tsconfig.json

@@ -1,12 +1,13 @@
 {
   "compilerOptions": {
-    "module": "es6",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
     "strict": true,
     "declaration": true,
     "noImplicitAny": true,
-    "target": "es5",
-    "lib": ["es2015", "dom"]
+    "target": "ES2020",
+    "lib": ["ES2020", "dom"]
   },
-  "include": ["src/*"],
+  "include": ["lib/*"],
   "exclude": ["node_modules"]
 }

package/vite.config.mjs

@@ -0,0 +1,20 @@
+import { resolve } from 'path'
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'lib/index.ts'),
+      name: 'cdeebee',
+      fileName: 'cdeebee',
+    },
+    rollupOptions: {
+      external: ['redux'],
+      output: {
+        globals: {
+          redux: 'redux',
+        },
+      },
+    },
+  },
+})

package/.babelrc

@@ -1,19 +0,0 @@
-{
-  "presets": [
-    ["@babel/env", {
-      "modules": false,
-      "targets": { "node": 6 }
-    }]
-  ],
-  "plugins": [
-    "ramda",
-    "lodash",
-    "@babel/plugin-proposal-class-properties",
-    "@babel/plugin-proposal-object-rest-spread",
-    "babel-plugin-rewire-exports",
-    ["@babel/plugin-transform-runtime", {
-      "helpers": true,
-      "regenerator": true
-    }]
-  ]
-}

package/.eslintrc

@@ -1,36 +0,0 @@
-{
-  "parser": "babel-eslint",
-  "extends": [
-    "airbnb",
-  ],
-  "plugins": ["compat", "react"],
-  "rules": {
-    "import/no-extraneous-dependencies": "off",
-    "react/jsx-uses-react": "error",
-    "react/jsx-uses-vars": "error",
-    "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
-    "react/prop-types": [0],
-    "react/no-danger": [0],
-    "linebreak-style": "off",
-    "react/no-array-index-key": "off",
-    "react/no-unused-prop-types": "off",
-  },
-  "parserOptions": {
-    "ecmaFeatures": {
-      "jsx": true
-    }
-  },
-  "env": {
-    "node": true,
-    "browser": true
-  },
-  "settings": {
-    "targets": ["chrome >= 50", "firefox", "edge", "ie >= 9", "safari >= 9"],
-    "compiler": "babel"
-  },
-  "globals": {
-    "document": true,
-    "localStorage": true,
-    "window": true
-  }
-}