@fluidframework/synthesize 0.54.2 → 0.56.0-49831

package/lib/dependencyContainer.js

@@ -2,33 +2,32 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import { IFluidDependencySynthesizer, } from "./IFluidDependencySynthesizer";
 /**
  * DependencyContainer is similar to a IoC Container. It takes providers and will
  * synthesize an object based on them when requested.
  */
 export class DependencyContainer {
-    constructor(parent = undefined) {
-        this.parent = parent;
+    constructor(...parents) {
         this.providers = new Map();
+        this.parents = parents.filter((v) => v !== undefined);
     }
     get IFluidDependencySynthesizer() { return this; }
     /**
-     * {@inheritDoc (IFluidDependencySynthesizer:interface).registeredTypes}
-     */
-    get registeredTypes() {
-        return this.providers.keys();
-    }
-    /**
-     * {@inheritDoc (IFluidDependencySynthesizer:interface).register}
+     * Add a new provider
+     * @param type - Name of the Type T being provided
+     * @param provider - A provider that will resolve the T correctly when asked
+     * @throws - If passing a type that's already registered
      */
     register(type, provider) {
-        if (this.has(type)) {
+        if (this.providers.has(type)) {
             throw new Error(`Attempting to register a provider of type ${type} that already exists`);
         }
         this.providers.set(type, provider);
     }
     /**
-     * {@inheritDoc (IFluidDependencySynthesizer:interface).unregister}
+     * Remove a provider
+     * @param type - Name of the provider to remove
      */
     unregister(type) {
         if (this.providers.has(type)) {
@@ -39,77 +38,76 @@ export class DependencyContainer {
      * {@inheritDoc (IFluidDependencySynthesizer:interface).synthesize}
      */
     synthesize(optionalTypes, requiredTypes) {
-        const optionalValues = Object.values(optionalTypes);
-        const requiredValues = Object.values(requiredTypes);
-        // There was nothing passed in so we can return
-        if (optionalValues === [] && requiredValues === []) {
-            return {};
-        }
-        const required = this.generateRequired(requiredTypes);
-        const optional = this.generateOptional(optionalTypes);
-        return Object.assign(Object.assign({}, required), optional);
+        const base = {};
+        this.generateRequired(base, requiredTypes);
+        this.generateOptional(base, optionalTypes);
+        Object.defineProperty(base, IFluidDependencySynthesizer, { get: () => this });
+        return base;
     }
     /**
      * {@inheritDoc (IFluidDependencySynthesizer:interface).has}
+     * @param excludeParents - If true, exclude checking parent registries
      */
-    has(...types) {
-        return types.every((type) => {
-            return this.providers.has(type);
-        });
-    }
-    /**
-     * {@inheritDoc (IFluidDependencySynthesizer:interface).getProvider}
-     */
-    getProvider(type) {
-        // If we have the provider return it
-        const provider = this.providers.get(type);
-        if (provider) {
-            return provider;
+    has(type, excludeParents) {
+        if (this.providers.has(type)) {
+            return true;
         }
-        if (this.parent) {
-            return this.parent.getProvider(type);
+        if (excludeParents !== true) {
+            return this.parents.some((p) => p.has(type));
         }
-        return undefined;
+        return false;
     }
-    generateRequired(types) {
-        const values = Object.values(types);
-        return Object.assign({}, ...Array.from(values, (t) => {
-            const provider = this.getProvider(t);
-            if (!provider) {
-                throw new Error(`Object attempted to be created without registered required provider ${t}`);
+    generateRequired(base, types) {
+        if (types === undefined)
+            return;
+        for (const key of Object.keys(types)) {
+            const provider = this.resolveProvider(key);
+            if (provider === undefined) {
+                throw new Error(`Object attempted to be created without registered required provider ${key}`);
             }
-            return this.resolveProvider(provider, t);
-        }));
+            Object.defineProperty(base, key, provider);
+        }
     }
-    generateOptional(types) {
-        const values = Object.values(types);
-        return Object.assign({}, ...Array.from(values, (t) => {
-            const provider = this.getProvider(t);
-            if (!provider) {
-                return { get [t]() { return Promise.resolve(undefined); } };
-            }
-            return this.resolveProvider(provider, t);
-        }));
+    generateOptional(base, types) {
+        var _a;
+        if (types === undefined)
+            return;
+        for (const key of Object.keys(types)) {
+            // back-compat: in 0.56 we allow undefined in the types, but we didn't before
+            // this will keep runtime back compat, eventually we should support undefined properties
+            // rather than properties that return promises that resolve to undefined
+            const provider = (_a = this.resolveProvider(key)) !== null && _a !== void 0 ? _a : { get: () => Promise.resolve(undefined) };
+            Object.defineProperty(base, key, provider);
+        }
     }
-    resolveProvider(provider, t) {
+    resolveProvider(t) {
+        // If we have the provider return it
+        const provider = this.providers.get(t);
+        if (provider === undefined) {
+            for (const parent of this.parents) {
+                const sp = { [t]: t };
+                const syn = parent.synthesize(sp, {});
+                const descriptor = Object.getOwnPropertyDescriptor(syn, t);
+                if (descriptor !== undefined) {
+                    return descriptor;
+                }
+            }
+            return undefined;
+        }
         // The double nested gets are required for lazy loading the provider resolution
         if (typeof provider === "function") {
-            // eslint-disable-next-line @typescript-eslint/no-this-alias
-            const self = this;
             return {
-                get [t]() {
+                get() {
                     if (provider && typeof provider === "function") {
-                        return Promise.resolve(provider(self)).then((p) => {
-                            if (p) {
-                                return p[t];
-                            }
-                        });
+                        return Promise.resolve(this[IFluidDependencySynthesizer])
+                            .then(async (fds) => provider(fds))
+                            .then((p) => p === null || p === void 0 ? void 0 : p[t]);
                     }
                 },
             };
         }
         return {
-            get [t]() {
+            get() {
                 if (provider) {
                     return Promise.resolve(provider).then((p) => {
                         if (p) {

package/lib/dependencyContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependencyContainer.js","sourceRoot":"","sources":["../src/dependencyContainer.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IFluidObject } from \"@fluidframework/core-interfaces\";\n\nimport {\n    AsyncFluidObjectProvider,\n    FluidObjectSymbolProvider,\n    FluidObjectProvider,\n    FluidObjectKey,\n} from \"./types\";\nimport {\n    IFluidDependencySynthesizer,\n} from \"./IFluidDependencySynthesizer\";\n\n/**\n * DependencyContainer is similar to a IoC Container. It takes providers and will\n * synthesize an object based on them when requested.\n */\nexport class DependencyContainer implements IFluidDependencySynthesizer {\n    private readonly providers = new Map<keyof IFluidObject, FluidObjectProvider<any>>();\n\n    public get IFluidDependencySynthesizer() { return this; }\n\n    /**\n     * {@inheritDoc (IFluidDependencySynthesizer:interface).registeredTypes}\n     */\n    public get registeredTypes(): Iterable<(keyof IFluidObject)> {\n        return this.providers.keys();\n    }\n\n    public constructor(public parent: IFluidDependencySynthesizer | undefined = undefined) { }\n\n    /**\n     * {@inheritDoc (IFluidDependencySynthesizer:interface).register}\n     */\n    public register<T extends keyof IFluidObject>(type: T, provider: FluidObjectProvider<T>): void {\n        if (this.has(type)) {\n            throw new Error(`Attempting to register a provider of type ${type} that already exists`);\n        }\n\n        this.providers.set(type, provider);\n    }\n\n    /**\n     * {@inheritDoc (IFluidDependencySynthesizer:interface).unregister}\n     */\n    public unregister<T extends keyof IFluidObject>(type: T): void {\n        if (this.providers.has(type)) {\n            this.providers.delete(type);\n        }\n    }\n\n    /**\n     * {@inheritDoc (IFluidDependencySynthesizer:interface).synthesize}\n     */\n    public synthesize<\n        O extends IFluidObject,\n        // eslint-disable-next-line @typescript-eslint/ban-types\n        R extends IFluidObject = {}>(\n            optionalTypes: FluidObjectSymbolProvider<O>,\n            requiredTypes: FluidObjectSymbolProvider<R>,\n    ): AsyncFluidObjectProvider<FluidObjectKey<O>, FluidObjectKey<R>> {\n        const optionalValues = Object.values(optionalTypes);\n        const requiredValues = Object.values(requiredTypes);\n\n        // There was nothing passed in so we can return\n        if (optionalValues === [] && requiredValues === []) {\n            return {} as any;\n        }\n\n        const required = this.generateRequired<R>(requiredTypes);\n        const optional = this.generateOptional<O>(optionalTypes);\n        return { ...required, ...optional };\n    }\n\n    /**\n     * {@inheritDoc (IFluidDependencySynthesizer:interface).has}\n     */\n    public has(...types: (keyof IFluidObject)[]): boolean {\n        return types.every((type) => {\n            return this.providers.has(type);\n        });\n    }\n\n    /**\n     * {@inheritDoc (IFluidDependencySynthesizer:interface).getProvider}\n     */\n    public getProvider<T extends keyof IFluidObject>(type: T): FluidObjectProvider<T> | undefined {\n        // If we have the provider return it\n        const provider = this.providers.get(type);\n        if (provider) {\n            return provider;\n        }\n\n        if (this.parent) {\n            return this.parent.getProvider(type);\n        }\n\n        return undefined;\n    }\n\n    private generateRequired<T extends IFluidObject>(\n        types: FluidObjectSymbolProvider<T>,\n    ) {\n        const values: (keyof IFluidObject)[] = Object.values(types);\n        return Object.assign({}, ...Array.from(values, (t) => {\n            const provider = this.getProvider(t);\n            if (!provider) {\n                throw new Error(`Object attempted to be created without registered required provider ${t}`);\n            }\n\n            return this.resolveProvider(provider, t);\n        }));\n    }\n\n    private generateOptional<T extends IFluidObject>(\n        types: FluidObjectSymbolProvider<T>,\n    ) {\n        const values: (keyof IFluidObject)[] = Object.values(types);\n        return Object.assign({}, ...Array.from(values, (t) => {\n            const provider = this.getProvider(t);\n            if (!provider) {\n                return { get [t]() { return Promise.resolve(undefined); } };\n            }\n\n            return this.resolveProvider(provider, t);\n        }));\n    }\n\n    private resolveProvider<T extends keyof IFluidObject>(provider: FluidObjectProvider<T>, t: keyof IFluidObject) {\n        // The double nested gets are required for lazy loading the provider resolution\n        if (typeof provider === \"function\") {\n            // eslint-disable-next-line @typescript-eslint/no-this-alias\n            const self = this;\n            return {\n                get [t]() {\n                    if (provider && typeof provider === \"function\") {\n                        return Promise.resolve(provider(self)).then((p) => {\n                            if (p) {\n                                return p[t];\n                            }\n                        });\n                    }\n                },\n            };\n        }\n\n        return {\n            get [t]() {\n                if (provider) {\n                    return Promise.resolve(provider).then((p) => {\n                        if (p) {\n                            return p[t];\n                        }\n                    });\n                }\n            },\n        };\n    }\n}\n"]}
+{"version":3,"file":"dependencyContainer.js","sourceRoot":"","sources":["../src/dependencyContainer.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport {\n    AsyncFluidObjectProvider,\n    FluidObjectSymbolProvider,\n    FluidObjectProvider,\n    AsyncOptionalFluidObjectProvider,\n    AsyncRequiredFluidObjectProvider,\n} from \"./types\";\nimport {\n    IFluidDependencySynthesizer,\n} from \"./IFluidDependencySynthesizer\";\n\n/**\n * DependencyContainer is similar to a IoC Container. It takes providers and will\n * synthesize an object based on them when requested.\n */\nexport class DependencyContainer<TMap> implements IFluidDependencySynthesizer {\n    private readonly providers = new Map<keyof TMap, FluidObjectProvider<any>>();\n    private readonly parents: IFluidDependencySynthesizer[];\n    public get IFluidDependencySynthesizer() { return this; }\n\n    public constructor(... parents: (IFluidDependencySynthesizer | undefined)[]) {\n        this.parents = parents.filter((v): v is IFluidDependencySynthesizer => v !== undefined);\n    }\n\n    /**\n     * Add a new provider\n     * @param type - Name of the Type T being provided\n     * @param provider - A provider that will resolve the T correctly when asked\n     * @throws - If passing a type that's already registered\n     */\n    public register<T extends keyof TMap = keyof TMap>(type: T, provider: FluidObjectProvider<Pick<TMap, T>>): void {\n        if (this.providers.has(type)) {\n            throw new Error(`Attempting to register a provider of type ${type} that already exists`);\n        }\n\n        this.providers.set(type, provider);\n    }\n\n    /**\n     * Remove a provider\n     * @param type - Name of the provider to remove\n     */\n    public unregister(type: keyof TMap): void {\n        if (this.providers.has(type)) {\n            this.providers.delete(type);\n        }\n    }\n\n    /**\n     * {@inheritDoc (IFluidDependencySynthesizer:interface).synthesize}\n     */\n    public synthesize<O, R = undefined | Record<string, never>>(\n        optionalTypes: FluidObjectSymbolProvider<O>,\n        requiredTypes: Required<FluidObjectSymbolProvider<R>>,\n    ): AsyncFluidObjectProvider<O, R> {\n        const base: AsyncFluidObjectProvider<O, R> = {} as any;\n        this.generateRequired<R>(base, requiredTypes);\n        this.generateOptional<O>(base, optionalTypes);\n        Object.defineProperty(base, IFluidDependencySynthesizer, { get: () => this });\n        return base;\n    }\n\n    /**\n     * {@inheritDoc (IFluidDependencySynthesizer:interface).has}\n     * @param excludeParents - If true, exclude checking parent registries\n     */\n    public has(type: string, excludeParents?: boolean): boolean {\n        if (this.providers.has(type as keyof TMap)) {\n            return true;\n        }\n        if (excludeParents !== true) {\n            return this.parents.some((p: IFluidDependencySynthesizer) => p.has(type));\n        }\n        return false;\n    }\n\n    private generateRequired<T>(\n        base: AsyncRequiredFluidObjectProvider<T>,\n        types: Required<FluidObjectSymbolProvider<T>>,\n    ) {\n        if(types === undefined) return;\n        for(const key of Object.keys(types) as unknown as (keyof TMap)[]) {\n            const provider = this.resolveProvider(key);\n            if(provider === undefined) {\n                throw new Error(`Object attempted to be created without registered required provider ${key}`);\n            }\n            Object.defineProperty(\n                base,\n                key,\n                provider,\n            );\n        }\n    }\n\n    private generateOptional<T>(\n        base: AsyncOptionalFluidObjectProvider<T>,\n        types: FluidObjectSymbolProvider<T>,\n    ) {\n        if(types === undefined) return;\n        for(const key of Object.keys(types) as unknown as (keyof TMap)[]) {\n            // back-compat: in 0.56 we allow undefined in the types, but we didn't before\n            // this will keep runtime back compat, eventually we should support undefined properties\n            // rather than properties that return promises that resolve to undefined\n            const provider = this.resolveProvider(key) ?? {get:()=>Promise.resolve(undefined)};\n            Object.defineProperty(\n                base,\n                key,\n                provider,\n            );\n        }\n    }\n\n    private resolveProvider<T extends keyof TMap>(t: T): PropertyDescriptor | undefined {\n        // If we have the provider return it\n        const provider = this.providers.get(t);\n        if (provider === undefined) {\n            for(const parent of this.parents) {\n                const sp = { [t]: t } as FluidObjectSymbolProvider<Pick<TMap, T>>;\n                const syn = parent.synthesize<Pick<TMap, T>,{}>(\n                    sp,\n                    {});\n                const descriptor = Object.getOwnPropertyDescriptor(syn, t);\n                if (descriptor !== undefined) {\n                    return descriptor;\n                }\n            }\n            return undefined;\n        }\n\n        // The double nested gets are required for lazy loading the provider resolution\n        if (typeof provider === \"function\") {\n            return {\n                get() {\n                    if (provider && typeof provider === \"function\") {\n                        return Promise.resolve(this[IFluidDependencySynthesizer])\n                            .then(async (fds): Promise<any> => provider(fds))\n                            .then((p) => p?.[t]);\n                    }\n                },\n            };\n        }\n        return {\n                get() {\n                    if (provider) {\n                        return Promise.resolve(provider).then((p) => {\n                            if (p) {\n                                return p[t];\n                            }\n                        });\n                    }\n                },\n            };\n    }\n}\n"]}

package/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\nimport { IFluidObject } from \"@fluidframework/core-interfaces\";\nimport { DependencyContainer } from \"./dependencyContainer\";\n\nexport type FluidObjectKey<T extends IFluidObject> = keyof T & keyof IFluidObject;\n\n/**\n * This is a condensed version of Record that requires the object has all\n * the IFluidObject properties as its type mapped to a string representation\n * of that property.\n *\n * @example - \\{ IFoo: \"IFoo\" \\}\n */\nexport type FluidObjectSymbolProvider<T extends IFluidObject> = {\n    [P in FluidObjectKey<T>]: FluidObjectKey<T> & P;\n};\n\n/**\n * This is a condensed version of Record that requires the object has all\n * the IFluidObject properties as its type mapped to an object that implements\n * the property.\n */\nexport type AsyncRequiredFluidObjectProvider<T extends keyof IFluidObject> = {\n    [P in T]: Promise<NonNullable<IFluidObject[P]>>\n};\n\n/**\n * This is a condensed version of Record that requires the object has all\n * the IFluidObject properties as its type, mapped to an object that implements\n * the property or undefined.\n */\nexport type AsyncOptionalFluidObjectProvider<T extends keyof IFluidObject> = {\n    [P in T]: Promise<IFluidObject[P] | undefined>;\n};\n\n/**\n * Combined type for Optional and Required Async Fluid object Providers\n */\nexport type AsyncFluidObjectProvider<O extends keyof IFluidObject, R extends keyof IFluidObject>\n    = AsyncOptionalFluidObjectProvider<O> & AsyncRequiredFluidObjectProvider<R>;\n\n/**\n * Provided a keyof IFluidObject will ensure the type is an instance of that type\n */\nexport type NonNullableFluidObject<T extends keyof IFluidObject> = NonNullable<IFluidObject[T]>;\n\n/**\n * Multiple ways to provide a Fluid object.\n */\nexport type FluidObjectProvider<T extends keyof IFluidObject> =\n    NonNullableFluidObject<T>\n    | Promise<NonNullableFluidObject<T>>\n    | ((dependencyContainer: DependencyContainer) => NonNullableFluidObject<T>)\n    | ((dependencyContainer: DependencyContainer) => Promise<NonNullableFluidObject<T>>);\n\n/**\n * ProviderEntry is a mapping of the type to the Provider\n */\nexport interface ProviderEntry<T extends keyof IFluidObject> {\n    type: T;\n    provider: FluidObjectProvider<T>\n}\n\n/**\n * A mapping of ProviderEntries\n */\nexport type DependencyContainerRegistry = Iterable<ProviderEntry<any>>;\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\nimport { IFluidDependencySynthesizer } from \".\";\n/**\n * This is a condensed version of Record that requires the object has all\n * the IFluidObject properties as its type mapped to a string representation\n * of that property.\n *\n * @example - \\{ IFoo: \"IFoo\" \\}\n */\nexport type FluidObjectSymbolProvider<T> = {\n    [P in keyof T]?: P;\n};\n\n/**\n * This is a condensed version of Record that requires the object has all\n * the IFluidObject properties as its type mapped to an object that implements\n * the property.\n */\nexport type AsyncRequiredFluidObjectProvider<T> =  T extends undefined ? Record<string, never> : {\n    [P in keyof T]: Promise<NonNullable<Exclude<T[P], undefined | null>>>\n};\n\n/**\n * This is a condensed version of Record that requires the object has all\n * the IFluidObject properties as its type, mapped to an object that implements\n * the property or undefined.\n */\nexport type AsyncOptionalFluidObjectProvider<T> = T extends undefined\n    ? Record<string, never>\n    : {\n        [P in keyof T]?: Promise<T[P] | undefined>;\n    };\n\n/**\n * Combined type for Optional and Required Async Fluid object Providers\n */\nexport type AsyncFluidObjectProvider<O, R = undefined>\n    = AsyncOptionalFluidObjectProvider<O> & AsyncRequiredFluidObjectProvider<R>;\n\n/**\n * Multiple ways to provide a Fluid object.\n */\nexport type FluidObjectProvider<T> =\n    NonNullable<T>\n    | Promise<NonNullable<T>>\n    | ((dependencyContainer: IFluidDependencySynthesizer) => NonNullable<T>)\n    | ((dependencyContainer: IFluidDependencySynthesizer) => Promise<NonNullable<T>>);"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/synthesize",
-  "version": "0.54.2",
+  "version": "0.56.0-49831",
   "description": "A library for synthesizing scope objects.",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -26,7 +26,7 @@
     "ci:build:docs": "api-extractor run --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/* ../../../_api-extractor-temp/",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
     "eslint": "eslint --format stylish src",
-    "eslint:fix": "eslint --format stylish src --fix",
+    "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
     "lint": "npm run eslint",
     "lint:fix": "npm run eslint:fix",
     "test": "npm run test:mocha",
@@ -57,29 +57,28 @@
     ],
     "temp-directory": "nyc/.nyc_output"
   },
-  "dependencies": {
-    "@fluidframework/core-interfaces": "^0.41.0"
-  },
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/datastore": "^0.54.2",
-    "@fluidframework/eslint-config-fluid": "^0.24.0",
-    "@fluidframework/mocha-test-setup": "^0.54.2",
+    "@fluidframework/core-interfaces": "^0.42.0-0",
+    "@fluidframework/datastore": "0.56.0-49831",
+    "@fluidframework/eslint-config-fluid": "^0.25.0",
+    "@fluidframework/mocha-test-setup": "0.56.0-49831",
     "@microsoft/api-extractor": "^7.16.1",
+    "@rushstack/eslint-config": "^2.5.1",
     "@types/mocha": "^8.2.2",
     "@types/node": "^14.18.0",
-    "@typescript-eslint/eslint-plugin": "~4.14.0",
-    "@typescript-eslint/parser": "~4.14.0",
+    "@typescript-eslint/eslint-plugin": "~5.9.0",
+    "@typescript-eslint/parser": "~5.9.0",
     "concurrently": "^6.2.0",
     "copyfiles": "^2.1.0",
     "cross-env": "^7.0.2",
-    "eslint": "~7.18.0",
+    "eslint": "~8.6.0",
+    "eslint-plugin-editorconfig": "~3.2.0",
     "eslint-plugin-eslint-comments": "~3.2.0",
-    "eslint-plugin-import": "~2.22.1",
+    "eslint-plugin-import": "~2.25.4",
     "eslint-plugin-no-null": "~1.0.2",
-    "eslint-plugin-prefer-arrow": "~1.2.2",
-    "eslint-plugin-react": "~7.22.0",
-    "eslint-plugin-unicorn": "~26.0.1",
+    "eslint-plugin-react": "~7.28.0",
+    "eslint-plugin-unicorn": "~40.0.0",
     "mocha": "^8.4.0",
     "nyc": "^15.0.0",
     "rimraf": "^2.6.2",