@sima-land/isomorph 11.0.0-alpha.4 → 11.0.0-alpha.41

package/package.json

@@ -1,64 +1,311 @@
 {
   "name": "@sima-land/isomorph",
-  "version": "11.0.0-alpha.4",
+  "version": "11.0.0-alpha.41",
   "description": "Tiny framework for fast start frontend microservices",
   "author": "www.sima-land.ru team",
   "license": "Apache-2.0",
+  "engines": {
+    "node": ">=16.15.1"
+  },
+  "files": [
+    "dist",
+    "src",
+    "README.md"
+  ],
+  "exports": {
+    "./cache": {
+      "types": "./dist/types/cache/index.d.ts",
+      "require": "./dist/cjs/cache/index.js",
+      "import": "./dist/esm/cache/index.js",
+      "default": "./dist/esm/cache/index.js"
+    },
+    "./config": {
+      "types": "./dist/types/config/index.d.ts",
+      "require": "./dist/cjs/config/index.js",
+      "import": "./dist/esm/config/index.js",
+      "default": "./dist/esm/config/index.js"
+    },
+    "./di": {
+      "types": "./dist/types/di/index.d.ts",
+      "require": "./dist/cjs/di/index.js",
+      "import": "./dist/esm/di/index.js",
+      "default": "./dist/esm/di/index.js"
+    },
+    "./http": {
+      "types": "./dist/types/http/index.d.ts",
+      "require": "./dist/cjs/http/index.js",
+      "import": "./dist/esm/http/index.js",
+      "default": "./dist/esm/http/index.js"
+    },
+    "./log": {
+      "types": "./dist/types/log/index.d.ts",
+      "require": "./dist/cjs/log/index.js",
+      "import": "./dist/esm/log/index.js",
+      "default": "./dist/esm/log/index.js"
+    },
+    "./tokens": {
+      "types": "./dist/types/tokens.d.ts",
+      "require": "./dist/cjs/tokens.js",
+      "import": "./dist/esm/tokens.js",
+      "default": "./dist/esm/tokens.js"
+    },
+    "./preset/isomorphic": {
+      "types": "./dist/types/preset/isomorphic/index.d.ts",
+      "require": "./dist/cjs/preset/isomorphic/index.js",
+      "import": "./dist/esm/preset/isomorphic/index.js",
+      "default": "./dist/esm/preset/isomorphic/index.js"
+    },
+    "./preset/isomorphic/providers": {
+      "types": "./dist/types/preset/isomorphic/providers/index.d.ts",
+      "require": "./dist/cjs/preset/isomorphic/providers/index.js",
+      "import": "./dist/esm/preset/isomorphic/providers/index.js",
+      "default": "./dist/esm/preset/isomorphic/providers/index.js"
+    },
+    "./preset/isomorphic/utils": {
+      "types": "./dist/types/preset/isomorphic/utils/index.d.ts",
+      "require": "./dist/cjs/preset/isomorphic/utils/index.js",
+      "import": "./dist/esm/preset/isomorphic/utils/index.js",
+      "default": "./dist/esm/preset/isomorphic/utils/index.js"
+    },
+    "./preset/web": {
+      "types": "./dist/types/preset/web/index.d.ts",
+      "require": "./dist/cjs/preset/web/index.js",
+      "import": "./dist/esm/preset/web/index.js",
+      "default": "./dist/esm/preset/web/index.js"
+    },
+    "./preset/web/providers": {
+      "types": "./dist/types/preset/web/providers/index.d.ts",
+      "require": "./dist/cjs/preset/web/providers/index.js",
+      "import": "./dist/esm/preset/web/providers/index.js",
+      "default": "./dist/esm/preset/web/providers/index.js"
+    },
+    "./preset/node": {
+      "types": "./dist/types/preset/node/index.d.ts",
+      "require": "./dist/cjs/preset/node/index.js",
+      "import": "./dist/esm/preset/node/index.js",
+      "default": "./dist/esm/preset/node/index.js"
+    },
+    "./preset/node/node/providers": {
+      "types": "./dist/types/preset/node/node/providers/index.d.ts",
+      "require": "./dist/cjs/preset/node/node/providers/index.js",
+      "import": "./dist/esm/preset/node/node/providers/index.js",
+      "default": "./dist/esm/preset/node/node/providers/index.js"
+    },
+    "./preset/node/node/utils": {
+      "types": "./dist/types/preset/node/node/utils/index.d.ts",
+      "require": "./dist/cjs/preset/node/node/utils/index.js",
+      "import": "./dist/esm/preset/node/node/utils/index.js",
+      "default": "./dist/esm/preset/node/node/utils/index.js"
+    },
+    "./preset/node/handler/providers": {
+      "types": "./dist/types/preset/node/handler/providers/index.d.ts",
+      "require": "./dist/cjs/preset/node/handler/providers/index.js",
+      "import": "./dist/esm/preset/node/handler/providers/index.js",
+      "default": "./dist/esm/preset/node/handler/providers/index.js"
+    },
+    "./preset/node/handler/utils": {
+      "types": "./dist/types/preset/node/handler/utils/index.d.ts",
+      "require": "./dist/cjs/preset/node/handler/utils/index.js",
+      "import": "./dist/esm/preset/node/handler/utils/index.js",
+      "default": "./dist/esm/preset/node/handler/utils/index.js"
+    },
+    "./utils": {
+      "types": "./dist/types/utils/index.d.ts",
+      "require": "./dist/cjs/utils/index.js",
+      "import": "./dist/esm/utils/index.js",
+      "default": "./dist/esm/utils/index.js"
+    },
+    "./utils/axios": {
+      "types": "./dist/types/utils/axios/index.d.ts",
+      "require": "./dist/cjs/utils/axios/index.js",
+      "import": "./dist/esm/utils/axios/index.js",
+      "default": "./dist/esm/utils/axios/index.js"
+    },
+    "./utils/express": {
+      "types": "./dist/types/utils/express/index.d.ts",
+      "require": "./dist/cjs/utils/express/index.js",
+      "import": "./dist/esm/utils/express/index.js",
+      "default": "./dist/esm/utils/express/index.js"
+    },
+    "./utils/react": {
+      "types": "./dist/types/utils/react/index.d.ts",
+      "require": "./dist/cjs/utils/react/index.js",
+      "import": "./dist/esm/utils/react/index.js",
+      "default": "./dist/esm/utils/react/index.js"
+    },
+    "./utils/redux": {
+      "types": "./dist/types/utils/redux/index.d.ts",
+      "require": "./dist/cjs/utils/redux/index.js",
+      "import": "./dist/esm/utils/redux/index.js",
+      "default": "./dist/esm/utils/redux/index.js"
+    },
+    "./utils/redux-saga": {
+      "types": "./dist/types/utils/redux-saga/index.d.ts",
+      "require": "./dist/cjs/utils/redux-saga/index.js",
+      "import": "./dist/esm/utils/redux-saga/index.js",
+      "default": "./dist/esm/utils/redux-saga/index.js"
+    },
+    "./utils/ssr": {
+      "types": "./dist/types/utils/ssr/index.d.ts",
+      "require": "./dist/cjs/utils/ssr/index.js",
+      "import": "./dist/esm/utils/ssr/index.js",
+      "default": "./dist/esm/utils/ssr/index.js"
+    },
+    "./utils/web/analytics": {
+      "types": "./dist/types/utils/web/analytics/index.d.ts",
+      "require": "./dist/cjs/utils/web/analytics/index.js",
+      "import": "./dist/esm/utils/web/analytics/index.js",
+      "default": "./dist/esm/utils/web/analytics/index.js"
+    },
+    "./utils/webpack": {
+      "types": "./dist/types/utils/webpack/index.d.ts",
+      "require": "./dist/cjs/utils/webpack/index.js",
+      "import": "./dist/esm/utils/webpack/index.js",
+      "default": "./dist/esm/utils/webpack/index.js"
+    }
+  },
+  "typesVersions": {
+    ">=4.2": {
+      "./cache": [
+        "./dist/types/cache/index.d.ts"
+      ],
+      "./config": [
+        "./dist/types/config/index.d.ts"
+      ],
+      "./di": [
+        "./dist/types/di/index.d.ts"
+      ],
+      "./http": [
+        "./dist/types/http/index.d.ts"
+      ],
+      "./log": [
+        "./dist/types/log/index.d.ts"
+      ],
+      "./tokens": [
+        "./dist/types/tokens.d.ts"
+      ],
+      "./preset/isomorphic": [
+        "./dist/types/preset/isomorphic/index.d.ts"
+      ],
+      "./preset/isomorphic/providers": [
+        "./dist/types/preset/isomorphic/providers/index.d.ts"
+      ],
+      "./preset/isomorphic/utils": [
+        "./dist/types/preset/isomorphic/utils/index.d.ts"
+      ],
+      "./preset/web": [
+        "./dist/types/preset/web/index.d.ts"
+      ],
+      "./preset/web/providers": [
+        "./dist/types/preset/web/providers/index.d.ts"
+      ],
+      "./preset/node": [
+        "./dist/types/preset/node/index.d.ts"
+      ],
+      "./preset/node/node/providers": [
+        "./dist/types/preset/node/node/providers/index.d.ts"
+      ],
+      "./preset/node/node/utils": [
+        "./dist/types/preset/node/node/utils/index.d.ts"
+      ],
+      "./preset/node/handler/providers": [
+        "./dist/types/preset/node/handler/providers/index.d.ts"
+      ],
+      "./preset/node/handler/utils": [
+        "./dist/types/preset/node/handler/utils/index.d.ts"
+      ],
+      "./utils": [
+        "./dist/types/utils/index.d.ts"
+      ],
+      "./utils/axios": [
+        "./dist/types/utils/axios/index.d.ts"
+      ],
+      "./utils/express": [
+        "./dist/types/utils/express/index.d.ts"
+      ],
+      "./utils/react": [
+        "./dist/types/utils/react/index.d.ts"
+      ],
+      "./utils/redux": [
+        "./dist/types/utils/redux/index.d.ts"
+      ],
+      "./utils/redux-saga": [
+        "./dist/types/utils/redux-saga/index.d.ts"
+      ],
+      "./utils/ssr": [
+        "./dist/types/utils/ssr/index.d.ts"
+      ],
+      "./utils/web/analytics": [
+        "./dist/types/utils/web/analytics/index.d.ts"
+      ],
+      "./utils/webpack": [
+        "./dist/types/utils/webpack/index.d.ts"
+      ]
+    }
+  },
   "scripts": {
-    "prepare": "",
     "type-check": "tsc -p . --noEmit",
-    "build:before": "rm -rf dist",
-    "build:main": "tsc --project tsconfig.build.json",
-    "build:after": "cp package.json dist/package.json",
-    "build": "npm run build:before && npm run build:main && npm run build:after",
+    "build:before": "rm -rf dist cache config di http log preset utils",
+    "build:esm": "babel src --config-file ./babel.config.esm.js -d dist/esm --source-maps --extensions '.ts,.tsx' --ignore='**/__test__/**/*' --ignore='**/*.d.ts' && node scripts/make-pkg-esm.mjs",
+    "build:cjs": "babel src --config-file ./babel.config.cjs.js -d dist/cjs --source-maps --extensions '.ts,.tsx' --ignore='**/__test__/**/*' --ignore='**/*.d.ts' && node scripts/make-pkg-cjs.mjs",
+    "build:types": "tsc --project tsconfig.types.json",
+    "post-build-esm": "node scripts/post-build-esm.mjs",
+    "build": "npm run build:before && npm run build:esm && npm run build:cjs && npm run build:types && npm run post-build-esm",
     "lint": "eslint --cache ./src --ext .js,.jsx,.ts,.tsx",
-    "test": "jest",
-    "test:coverage": "jest --clearCache && jest --coverage"
+    "test": "jest"
   },
   "devDependencies": {
-    "@sima-land/linters": "^2.1.2",
-    "@swc/jest": "^0.2.20",
-    "@testing-library/react": "^12.1.3",
-    "@types/ejs": "^3.1.1",
-    "@types/express": "^4.17.13",
-    "@types/jest": "^27.4.1",
-    "@types/lodash": "^4.14.182",
-    "@types/react": "^17.0.40",
-    "@types/react-dom": "^17.0.13",
-    "@types/webpack": "^5.28.0",
-    "husky": "^7.0.4",
-    "jest": "^27.5.1",
-    "typescript": "^4.6.2"
+    "@babel/cli": "^7.23.0",
+    "@babel/core": "^7.23.0",
+    "@babel/preset-env": "^7.22.5",
+    "@babel/preset-react": "^7.22.5",
+    "@babel/preset-typescript": "^7.22.5",
+    "@sima-land/linters": "^2.1.5",
+    "@testing-library/react": "^14.0.0",
+    "@types/express": "^4.17.17",
+    "@types/jest": "^28.1.7",
+    "@types/jsesc": "^3.0.1",
+    "@types/react": "^18.2.14",
+    "@types/react-dom": "^18.2.6",
+    "@types/webpack": "^5.28.1",
+    "babel-jest": "^29.5.0",
+    "fs-extra": "^11.1.1",
+    "husky": "^8.0.3",
+    "jest": "^28.1.3",
+    "jest-environment-jsdom": "^28.1.3",
+    "prettier": "^2.8.8",
+    "typescript": "^4.9.4",
+    "whatwg-fetch": "^3.6.17"
   },
   "dependencies": {
-    "@humanwhocodes/env": "^2.2.0",
-    "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/exporter-jaeger": "^1.0.1",
-    "@opentelemetry/instrumentation": "^0.27.0",
-    "@opentelemetry/instrumentation-express": "^0.28.0",
-    "@opentelemetry/instrumentation-http": "^0.27.0",
-    "@opentelemetry/resources": "^1.0.1",
-    "@opentelemetry/sdk-trace-node": "^1.0.1",
-    "@opentelemetry/semantic-conventions": "^1.0.1",
-    "@opentelemetry/tracing": "^0.24.0",
-    "@sentry/browser": "^6.19.3",
-    "@sentry/node": "^6.19.3",
-    "dotenv": "^16.0.0",
-    "ejs": "^3.1.8",
-    "express": "^4.17.3",
-    "middleware-axios": "^2.1.2",
-    "pino": "^7.9.1",
-    "pino-pretty": "^7.5.4",
-    "prom-client": "^14.0.1",
-    "webpack": "^5.72.0"
+    "@humanwhocodes/env": "^2.2.2",
+    "@krutoo/fetch-tools": "^0.0.10",
+    "@opentelemetry/api": "^1.4.1",
+    "@opentelemetry/exporter-prometheus": "^0.38.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.39.1",
+    "@opentelemetry/propagator-jaeger": "^1.12.0",
+    "@opentelemetry/resources": "^1.12.0",
+    "@opentelemetry/sdk-metrics": "^1.12.0",
+    "@opentelemetry/sdk-trace-base": "^1.12.0",
+    "@opentelemetry/sdk-trace-node": "^1.12.0",
+    "@opentelemetry/semantic-conventions": "^1.12.0",
+    "@sentry/browser": "^7.51.2",
+    "@sentry/node": "^7.51.2",
+    "dotenv": "^16.3.1",
+    "express": "^4.18.2",
+    "jsesc": "^3.0.2",
+    "middleware-axios": "^2.1.5",
+    "pino": "^8.14.1",
+    "pino-pretty": "^9.1.1",
+    "prom-client": "^14.2.0",
+    "webpack": "^5.82.0"
   },
   "peerDependencies": {
-    "@reduxjs/toolkit": "^1.8.0",
-    "axios": "^0.24.0",
-    "lodash": "^4.17.21",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-redux": "^7.2.6",
-    "redux-saga": "^1.1.3"
+    "@reduxjs/toolkit": "^1.9.5",
+    "axios": "^1.4.0",
+    "react": "^17.0 || ^18.0",
+    "react-dom": "^17.0 || ^18.0",
+    "react-redux": "^8.0.5",
+    "redux-saga": "^1.2.3"
   }
 }

package/src/cache/index.ts

@@ -0,0 +1 @@
+export type { Cache } from './types';

package/src/cache/types.ts

@@ -0,0 +1,34 @@
+/**
+ * Простейший интерфейс кэша.
+ * @todo Рассмотреть web-стандарт CacheStorage.
+ */
+export interface Cache {
+  /**
+   * Возвращает значение из кэша по ключу.
+   * @param key Ключ.
+   * @return Значение.
+   */
+  get: (key: string) => unknown;
+
+  /**
+   * Записывает значение в кэш по ключу.
+   * @param key Ключ.
+   */
+  set: (key: string, value: any) => void;
+
+  /**
+   * Удаляет значение из кэша по ключу.
+   * @param key Ключ.
+   */
+  delete: (key: string) => void;
+
+  /**
+   * Полностью очищает кэш.
+   */
+  clear: () => void;
+
+  /**
+   * Возвращает `true` в случае, если значение под переданным ключом присутствует в кэше, `false` в противном случае.
+   */
+  has: (key: string) => boolean;
+}

package/src/config/base.ts

@@ -0,0 +1,18 @@
+import type { ConfigSource, BaseConfig } from './types';
+
+/**
+ * Возвращает новую базовую конфигурацию.
+ * @param source Источник конфигурации.
+ * @return Базовая конфигурация.
+ */
+export function createBaseConfig(source: ConfigSource): BaseConfig {
+  const env = source.require('NODE_ENV');
+  const appName = source.require('APP_NAME');
+  const appVersion = source.require('APP_VERSION');
+
+  return {
+    env,
+    appName,
+    appVersion,
+  };
+}

package/src/config/index.ts

@@ -0,0 +1,3 @@
+export type { ConfigSource, BaseConfig } from './types';
+export { createConfigSource } from './source';
+export { createBaseConfig } from './base';

package/src/config/source.ts

@@ -0,0 +1,23 @@
+import type { ConfigSource, Dictionary } from './types';
+import { Env } from '@humanwhocodes/env';
+
+declare const __ISOMORPH_ENV__: unknown;
+
+/**
+ * Возвращает новый источник конфигурации.
+ * @param dictionary Опции.
+ * @return Источник.
+ */
+export function createConfigSource(dictionary: Dictionary): ConfigSource {
+  const source: Dictionary = {};
+
+  // берем все переменные из предоставленной среды
+  Object.assign(source, dictionary);
+
+  // докидываем зашиваемые переменные окружения
+  if (typeof __ISOMORPH_ENV__ !== 'undefined') {
+    Object.assign(source, __ISOMORPH_ENV__);
+  }
+
+  return new Env(source);
+}

package/src/config/types.ts

@@ -0,0 +1,25 @@
+import type { Env } from '@humanwhocodes/env';
+
+/** Источник конфигурации. */
+export type ConfigSource = Env;
+
+/**
+ * Базовая информация о приложении, необходимая в большинстве мест.
+ */
+export interface BaseConfig {
+  /** Строка, характеризующая среду выполнения, например "production". */
+  env: string;
+
+  /** Имя приложения. */
+  appName: string;
+
+  /** Версия приложения. */
+  appVersion: string;
+}
+
+/**
+ * Словарь.
+ */
+export interface Dictionary {
+  readonly [key: string]: string | undefined;
+}