chore(deps): bump inversify from 6.2.2 to 7.0.1

Bumps [inversify](https://github.com/inversify/InversifyJS) from 6.2.2 to 7.0.1.
- [Release notes](https://github.com/inversify/InversifyJS/releases)
- [Changelog](https://github.com/inversify/InversifyJS/blob/master/CHANGELOG.md)
- [Commits](inversify/InversifyJS@v6.2.2...v7.0.1)

---
updated-dependencies:
- dependency-name: inversify
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Emilien Escalle <emilien.escalle@escemi.com>

package.json

@@ -42,7 +42,7 @@
     "eta": "^3.1.1",
     "figlet": "^1.7.0",
     "handlebars": "^4.7.8",
-    "inversify": "^6.0.2",
+    "inversify": "^7.0.1",
     "js-ini": "^1.6.0",
     "parse-github-url": "^1.0.2",
     "pluralize": "^8.0.0",

src/actions/AbstractActionWithAdapters.ts

@@ -1,4 +1,4 @@
-import { inject } from "inversify";
+import { inject, ServiceIdentifier } from "inversify";
 
 import container from "../container";
 import { ConsoleService } from "../services/ConsoleService";
@@ -14,7 +14,7 @@ export abstract class AbstractActionWithAdapters<
 > implements RealpathAction<O>
 {
   protected abstract name: string;
-  protected abstract adapterKey: string;
+  protected abstract adapterIdentifier: ServiceIdentifier<A>;
 
   constructor(
     @inject(ConsoleService) private readonly consoleService: ConsoleService,
@@ -26,7 +26,7 @@ export abstract class AbstractActionWithAdapters<
   }
 
   protected getAdapters(): A[] {
-    return container.getAll<A>(this.adapterKey);
+    return container.getAll<A>(this.adapterIdentifier);
   }
 
   async detectAdapter(realpath: string): Promise<A | null> {

src/actions/add-hosting/AddHosting.ts

@@ -4,5 +4,5 @@ import { AdapterKey } from "./container";
 
 export default class AddHosting extends AbstractCommitableActionWithAdapters<HostingAdapter> {
   protected name = "Hosting";
-  protected adapterKey = AdapterKey;
+  protected adapterIdentifier = AdapterKey;
 }

src/actions/add-hosting/adapters/amplify/Amplify.ts

@@ -1,6 +1,6 @@
 import { resolve } from "path";
 
-import { LazyServiceIdentifier, inject } from "inversify";
+import { LazyServiceIdentifier, inject, injectFromBase } from "inversify";
 import prompts from "prompts";
 
 import { CliService } from "../../../../services/CliService";
@@ -48,6 +48,7 @@ type BackendConfig = {
   };
 };
 
+@injectFromBase()
 export default class Amplify extends AbstractAdapterWithPackageAction implements HostingAdapter {
   protected name = "Amplify";
   protected adapterPackageName = "@reactionable/amplify";

src/actions/add-hosting/adapters/netlify/Netlify.ts

@@ -1,7 +1,7 @@
 import { error, info } from "console";
 import { resolve } from "path";
 
-import { inject } from "inversify";
+import { inject, injectFromBase } from "inversify";
 import prompts from "prompts";
 
 import { CliService } from "../../../../services/CliService";
@@ -16,6 +16,7 @@ import { TemplateService } from "../../../../services/template/TemplateService";
 import { AbstractAdapterAction, AdapterActionOptions } from "../../../AbstractAdapterAction";
 import { HostingAdapter } from "../HostingAdapter";
 
+@injectFromBase()
 export default class Netlify extends AbstractAdapterAction implements HostingAdapter {
   protected name = "Netlify (https://docs.netlify.com)";
 

src/actions/add-router/AddRouter.ts

@@ -1,8 +1,10 @@
+import { injectFromBase } from "inversify";
 import { AbstractActionWithAdapters } from "../AbstractActionWithAdapters";
 import { RouterAdapter } from "./adapters/RouterAdapter";
 import { AdapterKey } from "./container";
 
+@injectFromBase()
 export default class AddRouter extends AbstractActionWithAdapters<RouterAdapter> {
   protected name = "Router";
-  protected adapterKey = AdapterKey;
+  protected adapterIdentifier = AdapterKey;
 }

src/actions/add-router/adapters/RouterAdapter.ts

@@ -1,3 +1,4 @@
+import { injectFromBase } from "inversify";
 import {
   AbstractAdapterWithPackageAction,
   AdapterWithPackageActionOptions,
@@ -7,6 +8,7 @@ export type RouterAdapter<
   O extends AdapterWithPackageActionOptions = AdapterWithPackageActionOptions,
 > = AbstractAdapterWithPackageAction<O>;
 
+@injectFromBase()
 export abstract class AbstractRouterAdapter
   extends AbstractAdapterWithPackageAction
   implements RouterAdapter {}

src/actions/add-router/adapters/NextJs.ts → src/actions/add-router/adapters/next-js/NextJs.ts

@@ -1,6 +1,8 @@
-import { AbstractAdapterWithPackageAction } from "../../AbstractAdapterWithPackageAction";
-import { RouterAdapter } from "./RouterAdapter";
+import { injectFromBase } from "inversify";
+import { AbstractAdapterWithPackageAction } from "../../../AbstractAdapterWithPackageAction";
+import { RouterAdapter } from "../RouterAdapter";
 
+@injectFromBase()
 export default class NextJs extends AbstractAdapterWithPackageAction implements RouterAdapter {
   protected name = "NextJS (NextJs routing integration)";
   protected adapterPackageName = "@reactionable/nextjs";

src/actions/add-router/adapters/RouterDom.ts → src/actions/add-router/adapters/router-dom/RouterDom.ts

@@ -1,5 +1,7 @@
-import { AbstractRouterAdapter } from "./RouterAdapter";
+import { injectFromBase } from "inversify";
+import { AbstractRouterAdapter } from "../RouterAdapter";
 
+@injectFromBase()
 export default class RouterDom extends AbstractRouterAdapter {
   protected name = "RouterDom (React Router Dom integration)";
   protected adapterPackageName = "@reactionable/router-dom";

src/actions/add-router/container.ts

@@ -2,9 +2,9 @@ import "reflect-metadata";
 
 import { Container } from "inversify";
 
-import NextJs from "./adapters/NextJs";
+import NextJs from "./adapters/next-js/NextJs";
 import { RouterAdapter } from "./adapters/RouterAdapter";
-import RouterDom from "./adapters/RouterDom";
+import RouterDom from "./adapters/router-dom/RouterDom";
 
 export const AdapterKey = "RouterAdapter";
 

src/actions/add-ui-framework/AddUIFramework.ts

@@ -1,8 +1,10 @@
+import { injectFromBase } from "inversify";
 import { AbstractActionWithAdapters } from "../AbstractActionWithAdapters";
 import { UIFrameworkAdapter } from "./adapters/UIFrameworkAdapter";
 import { AdapterKey } from "./container";
 
+@injectFromBase()
 export default class AddUIFramework extends AbstractActionWithAdapters<UIFrameworkAdapter> {
   protected name = "UI Framework";
-  protected adapterKey = AdapterKey;
+  protected adapterIdentifier = AdapterKey;
 }

src/actions/add-ui-framework/adapters/UIBootstrap.ts → src/actions/add-ui-framework/adapters/ui-bootstrap/UIBootstrap.ts

@@ -1,8 +1,10 @@
 import { resolve } from "path";
 
-import { AdapterWithPackageActionOptions } from "../../AbstractAdapterWithPackageAction";
-import { AbstractUIFrameworkAdapter } from "./UIFrameworkAdapter";
+import { AdapterWithPackageActionOptions } from "../../../AbstractAdapterWithPackageAction";
+import { AbstractUIFrameworkAdapter } from "../UIFrameworkAdapter";
+import { injectFromBase } from "inversify";
 
+@injectFromBase()
 export default class UIBootstrap extends AbstractUIFrameworkAdapter {
   protected name = "UI Bootstrap (React Bootstrap)";
   protected adapterPackageName = "@reactionable/ui-bootstrap";

src/actions/add-ui-framework/adapters/UIMaterial.ts → src/actions/add-ui-framework/adapters/ui-material/UIMaterial.ts

@@ -1,6 +1,8 @@
-import { AbstractAdapterWithPackageAction } from "../../AbstractAdapterWithPackageAction";
-import { UIFrameworkAdapter } from "./UIFrameworkAdapter";
+import { injectFromBase } from "inversify";
+import { AbstractAdapterWithPackageAction } from "../../../AbstractAdapterWithPackageAction";
+import { UIFrameworkAdapter } from "../UIFrameworkAdapter";
 
+@injectFromBase()
 export default class UIMaterial
   extends AbstractAdapterWithPackageAction
   implements UIFrameworkAdapter

src/actions/add-ui-framework/container.ts

@@ -2,9 +2,9 @@ import "reflect-metadata";
 
 import { Container } from "inversify";
 
-import UIBootstrap from "./adapters/UIBootstrap";
+import UIBootstrap from "./adapters/ui-bootstrap/UIBootstrap";
 import { UIFrameworkAdapter } from "./adapters/UIFrameworkAdapter";
-import UIMaterial from "./adapters/UIMaterial";
+import UIMaterial from "./adapters/ui-material/UIMaterial";
 
 export const AdapterKey = "UIFrameworkAdapter";
 

src/actions/add-versioning/AddVersioning.ts

@@ -1,8 +1,8 @@
 import { AbstractActionWithAdapters } from "../AbstractActionWithAdapters";
-import { AdapterKey } from "./container";
+import { AdapterIdentifier } from "./container";
 import { VersioningAdapter } from "./VersioningAdapter";
 
 export default class AddVersioning extends AbstractActionWithAdapters<VersioningAdapter> {
   protected name = "Versioning";
-  protected adapterKey = AdapterKey;
+  protected adapterIdentifier = AdapterIdentifier;
 }

src/actions/add-versioning/adapters/github/Github.ts

@@ -2,7 +2,9 @@ import { Result } from "parse-github-url";
 
 import { VersioningAdapterOptions } from "../../VersioningAdapter";
 import AbstractVersioning from "../AbstractVersioning";
+import { injectFromBase } from "inversify";
 
+@injectFromBase()
 export default class Github extends AbstractVersioning {
   protected name = "Github";
 

src/actions/add-versioning/container.ts

@@ -5,9 +5,9 @@ import { Container } from "inversify";
 import Github from "./adapters/github/Github";
 import { VersioningAdapter } from "./VersioningAdapter";
 
-export const AdapterKey = "VersioningAdapter";
+export const AdapterIdentifier = Symbol("VersioningAdapter");
 
 export function bindVersioningAdapters(container: Container): void {
-  container.bind<VersioningAdapter>(AdapterKey).to(Github);
-  container.bind<Github>(Github).toSelf();
+  container.bind<VersioningAdapter>(AdapterIdentifier).to(Github);
+  container.bind(Github).toSelf();
 }

src/actions/container.ts

@@ -0,0 +1,41 @@
+import { Container } from "inversify";
+import AddHosting from "./add-hosting/AddHosting";
+import { bindHostingAdapters } from "./add-hosting/container";
+import AddRouter from "./add-router/AddRouter";
+import { bindRouterAdapters } from "./add-router/container";
+import AddUIFramework from "./add-ui-framework/AddUIFramework";
+import { bindUIFrameworkAdapters } from "./add-ui-framework/container";
+import AddVersioning from "./add-versioning/AddVersioning";
+import { bindVersioningAdapters } from "./add-versioning/container";
+import { bindCreateAppAdapters } from "./create-app/container";
+import CreateApp from "./create-app/CreateApp";
+import CreateComponent from "./create-component/CreateComponent";
+import CreateCrudComponent from "./create-component/CreateCrudComponent";
+import GenerateReadme from "./generate-readme/GenerateReadme";
+
+export const ActionIdentifier = Symbol("Action");
+
+export function bindActions(container: Container): void {
+  // Available root actions
+  container.bind<CreateApp>(ActionIdentifier).to(CreateApp);
+  container.bind<CreateApp>(CreateApp).toSelf();
+  container.bind<CreateComponent>(ActionIdentifier).to(CreateComponent);
+  container.bind<CreateComponent>(CreateComponent).toSelf();
+  container.bind<CreateCrudComponent>(ActionIdentifier).to(CreateCrudComponent);
+  container.bind<CreateCrudComponent>(CreateCrudComponent).toSelf();
+  container.bind<GenerateReadme>(ActionIdentifier).to(GenerateReadme);
+  container.bind<GenerateReadme>(GenerateReadme).toSelf();
+
+  // Sub actions
+  container.bind<AddUIFramework>(AddUIFramework).toSelf();
+  container.bind<AddRouter>(AddRouter).toSelf();
+  container.bind<AddVersioning>(AddVersioning).toSelf();
+  container.bind<AddHosting>(AddHosting).toSelf();
+
+  // Bind adapters
+  bindCreateAppAdapters(container);
+  bindHostingAdapters(container);
+  bindRouterAdapters(container);
+  bindUIFrameworkAdapters(container);
+  bindVersioningAdapters(container);
+}

src/actions/create-app/CreateApp.ts

@@ -1,8 +1,8 @@
 import { AbstractCommitableActionWithAdapters } from "../AbstractCommitableActionWithAdapters";
 import { CreateAppAdapter } from "./adapters/CreateAppAdapter";
-import { AdapterKey } from "./container";
+import { AdapterIdentifier } from "./container";
 
 export default class CreateApp extends AbstractCommitableActionWithAdapters<CreateAppAdapter> {
   protected name = "Create a new application";
-  protected adapterKey = AdapterKey;
+  protected adapterIdentifier = AdapterIdentifier;
 }

src/actions/create-app/adapters/create-next-app/CreateNextApp.ts

@@ -2,7 +2,9 @@ import { dirname, join, resolve } from "path";
 
 import { PackageManagerType } from "../../../../services/package-manager/PackageManagerService";
 import { AbstractCreateAppAdapter } from "../CreateAppAdapter";
+import { injectFromBase } from "inversify";
 
+@injectFromBase()
 export default class CreateNextApp extends AbstractCreateAppAdapter {
   protected name = "Create a new NextJs app";
 

src/actions/create-app/adapters/create-react-app/CreateReactApp.ts

@@ -2,7 +2,9 @@ import { dirname, resolve } from "path";
 
 import { PackageManagerType } from "../../../../services/package-manager/PackageManagerService";
 import { AbstractCreateAppAdapter } from "../CreateAppAdapter";
+import { injectFromBase } from "inversify";
 
+@injectFromBase()
 export default class CreateReactApp extends AbstractCreateAppAdapter {
   protected name = "Create a new React app";
 

src/actions/create-app/container.ts

@@ -6,11 +6,11 @@ import CreateNextApp from "./adapters/create-next-app/CreateNextApp";
 import CreateReactApp from "./adapters/create-react-app/CreateReactApp";
 import { CreateAppAdapter } from "./adapters/CreateAppAdapter";
 
-export const AdapterKey = "CreateAppAdapter";
+export const AdapterIdentifier = Symbol("CreateAppAdapter");
 
 export function bindCreateAppAdapters(container: Container): void {
-  container.bind<CreateAppAdapter>(AdapterKey).to(CreateReactApp);
+  container.bind<CreateAppAdapter>(AdapterIdentifier).to(CreateReactApp);
   container.bind<CreateReactApp>(CreateReactApp).toSelf();
-  container.bind<CreateAppAdapter>(AdapterKey).to(CreateNextApp);
+  container.bind<CreateAppAdapter>(AdapterIdentifier).to(CreateNextApp);
   container.bind<CreateNextApp>(CreateNextApp).toSelf();
 }

src/actions/create-component/CreateCrudComponent.ts

@@ -7,7 +7,9 @@ import { TypescriptFile } from "../../services/file/TypescriptFile";
 import { TypescriptImport } from "../../services/file/TypescriptImport";
 import { StringUtils } from "../../services/StringUtils";
 import CreateComponent, { CreateComponentOptions } from "./CreateComponent";
+import { injectFromBase } from "inversify";
 
+@injectFromBase()
 export default class CreateCrudComponent extends CreateComponent {
   getName(): string {
     return "Create a new CRUD component";

src/cli/Cli.ts

@@ -9,6 +9,7 @@ import container from "../container";
 import { CliService } from "../services/CliService";
 import { ConsoleService } from "../services/ConsoleService";
 import { PackageManagerService } from "../services/package-manager/PackageManagerService";
+import { ActionIdentifier } from "../actions/container";
 
 // run [-v,--verbose] [--name ARG]
 class RunCommand extends Command {
@@ -29,7 +30,7 @@ class RunCommand extends Command {
           message: "What do you want to do?",
           type: "select",
           choices: [
-            ...container.getAll<NamedAction>("Action").map((action) => ({
+            ...container.getAll<NamedAction>(ActionIdentifier).map((action) => ({
               title: action.getName(),
               value: action,
             })),

src/container.ts

@@ -2,19 +2,6 @@ import "reflect-metadata";
 
 import { Container } from "inversify";
 
-import AddHosting from "./actions/add-hosting/AddHosting";
-import { bindHostingAdapters } from "./actions/add-hosting/container";
-import AddRouter from "./actions/add-router/AddRouter";
-import { bindRouterAdapters } from "./actions/add-router/container";
-import AddUIFramework from "./actions/add-ui-framework/AddUIFramework";
-import { bindUIFrameworkAdapters } from "./actions/add-ui-framework/container";
-import AddVersioning from "./actions/add-versioning/AddVersioning";
-import { bindVersioningAdapters } from "./actions/add-versioning/container";
-import { bindCreateAppAdapters } from "./actions/create-app/container";
-import CreateApp from "./actions/create-app/CreateApp";
-import CreateComponent from "./actions/create-component/CreateComponent";
-import CreateCrudComponent from "./actions/create-component/CreateCrudComponent";
-import GenerateReadme from "./actions/generate-readme/GenerateReadme";
 import { CliService } from "./services/CliService";
 import { ConsoleService } from "./services/ConsoleService";
 import { FileDiffService } from "./services/file/FileDiffService";
@@ -27,13 +14,10 @@ import { bindTemplateAdapters } from "./services/template/container";
 import { TemplateFileService } from "./services/template/TemplateFileService";
 import { TemplateService } from "./services/template/TemplateService";
 import { ColorService } from "./services/ColorService";
+import { bindActions } from "./actions/container";
 
 const container = new Container({ defaultScope: "Singleton" });
 
-export const TYPES = {
-  Action: "Action",
-};
-
 // Services
 container.bind<PackageManagerService>(PackageManagerService).toSelf();
 container.bind<GitService>(GitService).toSelf();
@@ -47,28 +31,10 @@ container.bind<FileFactory>(FileFactory).toSelf();
 container.bind<CliService>(CliService).toSelf();
 container.bind<ColorService>(ColorService).toSelf();
 
-// Available root actions
-container.bind<CreateApp>(TYPES.Action).to(CreateApp);
-container.bind<CreateApp>(CreateApp).toSelf();
-container.bind<CreateComponent>(TYPES.Action).to(CreateComponent);
-container.bind<CreateComponent>(CreateComponent).toSelf();
-container.bind<CreateCrudComponent>(TYPES.Action).to(CreateCrudComponent);
-container.bind<CreateCrudComponent>(CreateCrudComponent).toSelf();
-container.bind<GenerateReadme>(TYPES.Action).to(GenerateReadme);
-container.bind<GenerateReadme>(GenerateReadme).toSelf();
-
-// Sub actions
-container.bind<AddUIFramework>(AddUIFramework).toSelf();
-container.bind<AddRouter>(AddRouter).toSelf();
-container.bind<AddVersioning>(AddVersioning).toSelf();
-container.bind<AddHosting>(AddHosting).toSelf();
+// Bind actions
+bindActions(container);
 
 // Bind adapters
-bindCreateAppAdapters(container);
-bindHostingAdapters(container);
-bindRouterAdapters(container);
-bindUIFrameworkAdapters(container);
-bindVersioningAdapters(container);
 bindTemplateAdapters(container);
 
 export default container;