Feature: type manager 8 support

Author: dpimonov

.github/workflows/publish.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: '16.x'
+          node-version: '22.x'
           registry-url: 'https://registry.npmjs.org'
       - name: Install dependencies
         run: npm install

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.0.0] - 2025-06-09
+
+### Added
+
+- Type manager 8 support.
+
 ## [2.4.1] - 2024-07-01
 
 ### Added

package-lock.json

@@ -2,18 +2,16 @@
   "author": "DipScope authors and contributors",
   "description": "Json api entity provider for entity store.",
   "dependencies": {
-    "tslib": "^2.0.1",
-    "cross-fetch": "^3.1.5"
+    "tslib": "^2.0.1"
   },
   "peerDependencies": {
     "lodash": "^4.17.0",
-    "@dipscope/type-manager": "^7.2.1",
-    "@dipscope/entity-store": "^2.0.4"
+    "@dipscope/type-manager": "^8.2.1",
+    "@dipscope/entity-store": "^3.0.0"
   },
   "devDependencies": {
     "@types/jasmine": "^3.6.3",
     "@types/lodash": "^4.14.182",
-    "@types/node": "^18.7.3",
     "@typescript-eslint/eslint-plugin": "^4.14.2",
     "@typescript-eslint/parser": "^4.14.2",
     "circular-dependency-plugin": "^5.2.2",
@@ -39,7 +37,6 @@
   ],
   "license": "Apache-2.0",
   "main": "./dist/umd/index.js",
-  "browser": "./dist/umd/index.browser.js",
   "module": "./dist/es5/index.js",
   "es2015": "./dist/es2015/index.js",
   "types": "./dist/types/index.d.ts",

package.json

@@ -1,4 +1,3 @@
-import fetch from 'cross-fetch';
 import { EntityCollection, EntitySet, EntityStore } from '@dipscope/entity-store';
 import { Inject, Property, Type, TypeConfiguration, TypeManager, TypeMetadata } from '@dipscope/type-manager';
 import { JsonApiEntityProvider, JsonApiNetFilterExpressionVisitor, JsonApiNetMetadataExtractor, JsonApiNetPaginateExpressionVisitor, JsonApiResource, JsonApiResourceMetadata } from '../src';

spec/entity-store.spec.ts

@@ -528,7 +528,7 @@ export class JsonApiAdapter
 
         for (const propertyMetadata of serializerContext.typeMetadata.propertyMetadataMap.values())
         {
-            if (propertyMetadata.serializationConfigured && !propertyMetadata.serializable)
+            if (!propertyMetadata.serializable)
             {
                 continue;
             }
@@ -823,7 +823,7 @@ export class JsonApiAdapter
 
         for (const propertyMetadata of serializerContext.typeMetadata.propertyMetadataMap.values())
         {
-            if (propertyMetadata.serializationConfigured && !propertyMetadata.deserializable)
+            if (!propertyMetadata.deserializable)
             {
                 continue;
             }

src/json-api-adapter.ts

@@ -1,4 +1,3 @@
-import { Headers, Request } from 'cross-fetch';
 import { isEmpty, isObject, isString } from 'lodash';
 import { ConflictJsonApiError } from './errors/conflict-json-api-error';
 import { ForbiddenJsonApiError } from './errors/forbidden-json-api-error';

src/json-api-connection.ts

@@ -1,4 +1,3 @@
-import fetch from 'cross-fetch';
 import { first, isNil, merge, toString } from 'lodash';
 import { AddCommand, BatchRemoveCommand, BatchUpdateCommand, CommandNotSupportedError, EntitySet } from '@dipscope/entity-store';
 import { IncludeClause, IncludeCollectionClause, PaginatedEntityCollection } from '@dipscope/entity-store';
@@ -47,7 +46,7 @@ export class JsonApiEntityProvider implements EntityProvider
     {
         const defaultJsonApiRequestInterceptor = (request: Request) => request;
         const defaultJsonApiResponseInterceptor = (response: Response) => response;
-        const defaultJsonApiFetchInterceptor = fetch;
+        const defaultJsonApiFetchInterceptor = (request: Request) => fetch(request);
         const jsonApiRequestInterceptor = jsonApiEntityProviderOptions.jsonApiRequestInterceptor ?? defaultJsonApiRequestInterceptor;
         const jsonApiResponseInterceptor = jsonApiEntityProviderOptions.jsonApiResponseInterceptor ?? defaultJsonApiResponseInterceptor;
         const jsonApiFetchInterceptor = jsonApiEntityProviderOptions.jsonApiFetchInterceptor ?? defaultJsonApiFetchInterceptor;

src/json-api-entity-provider.ts

@@ -33,7 +33,7 @@ export class JsonApiResourceMetadata<TEntity extends Entity> extends TypeExtensi
      */
     public get type(): string
     {
-        return this.typeMetadata.extractCustomOption(jsonApiResourceTypeKey) ?? this.typeMetadata.typeName;
+        return this.typeMetadata.extractCustomValue(jsonApiResourceTypeKey) ?? this.typeMetadata.typeName;
     }
 
     /**
@@ -43,7 +43,7 @@ export class JsonApiResourceMetadata<TEntity extends Entity> extends TypeExtensi
      */
     public get route(): string
     {
-        return this.typeMetadata.extractCustomOption(jsonApiResourceRouteKey) ?? this.type;
+        return this.typeMetadata.extractCustomValue(jsonApiResourceRouteKey) ?? this.type;
     }
 
     /**
@@ -55,7 +55,7 @@ export class JsonApiResourceMetadata<TEntity extends Entity> extends TypeExtensi
      */
     public hasType(type: string | undefined): this
     {
-        this.typeMetadata.hasCustomOption(jsonApiResourceTypeKey, type)
+        this.typeMetadata.hasCustomValue(jsonApiResourceTypeKey, type)
             .hasDiscriminator(jsonApiResourceType)
             .hasDiscriminant(this.type)
             .shouldPreserveDiscriminator();
@@ -72,7 +72,7 @@ export class JsonApiResourceMetadata<TEntity extends Entity> extends TypeExtensi
      */
     public hasRoute(route: string | undefined): this
     {
-        this.typeMetadata.hasCustomOption(jsonApiResourceRouteKey, route);
+        this.typeMetadata.hasCustomValue(jsonApiResourceRouteKey, route);
 
         return this;
     }

src/json-api-resource-metadata.ts

@@ -1,10 +1,9 @@
 const Path = require('path');
 const CircularDependencyPlugin = require('circular-dependency-plugin');
 
-module.exports = [{
+module.exports = {
     mode: 'production',
     devtool: 'source-map',
-    target: 'node',
     entry: {
         index: './src/index.ts'
     },
@@ -63,66 +62,4 @@ module.exports = [{
     resolve: {
         extensions: ['.tsx', '.ts', '.js']
     }
-}, {
-    mode: 'production',
-    devtool: 'source-map',
-    target: 'web',
-    entry: {
-        index: './src/index.ts'
-    },
-    output: {
-        path: Path.resolve(__dirname, 'dist/umd'),
-        filename: '[name].browser.js',
-        library: '$DSJsonApiEntityProvider',
-        libraryTarget: 'umd',
-        globalObject: 'this',
-        umdNamedDefine: true
-    },
-    externals: {
-        'lodash': {
-            commonjs: 'lodash',
-            commonjs2: 'lodash',
-            amd: 'lodash',
-            root: '_'
-        },
-        '@dipscope/type-manager': {
-            commonjs: '@dipscope/type-manager',
-            commonjs2: '@dipscope/type-manager',
-            amd: '@dipscope/type-manager',
-            root: '$DSTypeManager'
-        },
-        '@dipscope/entity-store': {
-            commonjs: '@dipscope/entity-store',
-            commonjs2: '@dipscope/entity-store',
-            amd: '@dipscope/entity-store',
-            root: '$DSEntityStore'
-        }
-    },
-    plugins: [
-        new CircularDependencyPlugin({
-            exclude: /node_modules/,
-            include: /src/,
-            failOnError: true,
-            allowAsyncCycles: false,
-            cwd: process.cwd()
-        })
-    ],
-    module: {
-        rules: [{
-            test: /\.tsx?$/,
-            use: [{
-                loader: 'ts-loader',
-                options: {
-                    configFile: 'tsconfig/tsconfig.umd.json'
-                }
-            }],
-            exclude: /node_modules/,
-            include: [
-                Path.resolve(__dirname, 'src')
-            ],
-        }]
-    },
-    resolve: {
-        extensions: ['.tsx', '.ts', '.js']
-    }
-}];
+};