@qlover/create-app 0.6.0 → 0.6.2

package/dist/templates/react-app/src/base/services/UserService.ts

@@ -1,26 +1,24 @@
 import { ExecutorPlugin, type SyncStorageInterface } from '@qlover/fe-corekit';
 import type {
-  UserApiGetUserInfoTransaction,
-  UserApiLoginTransaction
+  UserApiLoginTransaction,
+  UserInfo
 } from '@/base/apis/userApi/UserApiType';
 import { RouteService } from './RouteService';
 import {
-  LoginResponseData,
   type UserAuthApiInterface,
+  type UserAuthState,
+  LoginResponseData,
   UserAuthService,
-  UserAuthState,
   UserAuthStore
 } from '@qlover/corekit-bridge';
 import { inject, injectable } from 'inversify';
 import { UserApi } from '@/base/apis/userApi/UserApi';
 import { AppError } from '@/base/cases/AppError';
 import * as errKeys from '@config/Identifier/common.error';
-import { IOCIdentifier } from '@/core/IOC';
+import { IOCIdentifier } from '@config/IOCIdentifier';
 import { AppConfig } from '../cases/AppConfig';
-import { UserApiState } from '../apis/userApi/UserApi';
 
-export type UserServiceUserInfo =
-  UserApiGetUserInfoTransaction['response']['data'];
+export interface UserApiState extends UserAuthState<UserInfo> {}
 
 export interface RegisterFormData {
   username: string;
@@ -32,7 +30,7 @@ export interface RegisterFormData {
 
 @injectable()
 export class UserService
-  extends UserAuthService<UserServiceUserInfo>
+  extends UserAuthService<UserInfo>
   implements ExecutorPlugin
 {
   readonly pluginName = 'UserService';
@@ -40,7 +38,7 @@ export class UserService
   constructor(
     @inject(RouteService) protected routerService: RouteService,
     @inject(UserApi)
-    userApi: UserAuthApiInterface<UserAuthState<UserServiceUserInfo>>,
+    userApi: UserAuthApiInterface<UserInfo>,
     @inject(IOCIdentifier.AppConfig) appConfig: AppConfig,
     @inject(IOCIdentifier.LocalStorageEncrypt)
     storage: SyncStorageInterface<string, string>

package/dist/templates/react-app/src/core/IOC.ts

@@ -1,104 +1,94 @@
 // ! dont't import tsx, only ts file
-import {
-  ApiMockPlugin,
-  EnvConfigInterface,
-  RequestCommonPlugin,
-  ApiCatchPlugin,
-  IOCContainerInterface,
-  createIOCFunction,
-  ServiceIdentifier,
-  TokenStorage,
-  CookieStorage
-} from '@qlover/corekit-bridge';
-import type { JSONSerializer, ObjectStorage } from '@qlover/fe-corekit';
-import type { LoggerInterface } from '@qlover/logger';
 import type { AppConfig } from '@/base/cases/AppConfig';
-import { Container } from 'inversify';
-import { IOCRegisterInterface } from '@qlover/corekit-bridge';
-import { DialogHandler } from '@/base/cases/DialogHandler';
+import type { IOCRegisterInterface } from '@qlover/corekit-bridge';
+import { createIOCFunction } from '@qlover/corekit-bridge';
+import { InversifyContainer } from '@/base/cases/InversifyContainer';
+import { IOCIdentifier } from '@config/IOCIdentifier';
 
+/**
+ * IOC identifier map
+ *
+ * Define the implementation class corresponding to the string identifier
+ */
+export interface IOCIdentifierMap {
+  [IOCIdentifier.JSON]: import('@qlover/fe-corekit').JSONSerializer;
+  [IOCIdentifier.LocalStorage]: import('@qlover/fe-corekit').ObjectStorage<
+    string,
+    string
+  >;
+  [IOCIdentifier.LocalStorageEncrypt]: import('@qlover/fe-corekit').ObjectStorage<
+    string,
+    string
+  >;
+  [IOCIdentifier.CookieStorage]: import('@qlover/corekit-bridge').CookieStorage;
+  [IOCIdentifier.Logger]: import('@qlover/logger').LoggerInterface;
+  [IOCIdentifier.FeApiToken]: import('@qlover/corekit-bridge').TokenStorage<string>;
+  [IOCIdentifier.FeApiCommonPlugin]: import('@qlover/corekit-bridge').RequestCommonPlugin;
+  [IOCIdentifier.AppConfig]: import('@qlover/corekit-bridge').EnvConfigInterface;
+  [IOCIdentifier.ApiMockPlugin]: import('@qlover/corekit-bridge').ApiMockPlugin;
+  [IOCIdentifier.ApiCatchPlugin]: import('@qlover/corekit-bridge').ApiCatchPlugin;
+  [IOCIdentifier.DialogHandler]: import('@/base/cases/DialogHandler').DialogHandler;
+}
+
+/**
+ * IOC register options
+ */
 export type IocRegisterOptions = {
+  /**
+   * The pathname of the current page
+   */
   pathname: string;
+
+  /**
+   * The app config
+   */
   appConfig: AppConfig;
 };
 
-export type InversifyRegisterContainer = Container;
 /**
- * Inversify register interface.
+ * IOC container
+ *
+ * This is a alias of IOCContainerInterface, use it without care about the implementation.
+ *
+ * Need to achieve the effect: when the implementation class on the right side of the equal sign changes, the IOCContainer will change automatically
  */
-export interface InversifyRegisterInterface
-  extends IOCRegisterInterface<InversifyContainer, IocRegisterOptions> {}
-
-export class InversifyContainer implements IOCContainerInterface {
-  private container: Container;
-
-  constructor() {
-    this.container = new Container({
-      // allow `@injectable` decorator, auto bind injectable classes
-      autobind: true,
-      // use singleton scope
-      defaultScope: 'Singleton'
-    });
-  }
-
-  bind<T>(key: ServiceIdentifier<T>, value: T): void {
-    this.container.bind<T>(key).toConstantValue(value);
-  }
-
-  get<K extends keyof IOCIdentifierMap>(
-    serviceIdentifier: K
-  ): IOCIdentifierMap[K];
-  get<T>(serviceIdentifier: ServiceIdentifier<T>): T;
-  get<T, K extends keyof IOCIdentifierMap>(
-    serviceIdentifier: ServiceIdentifier<T> | K
-  ): T | IOCIdentifierMap[K] {
-    return this.container.get<T>(serviceIdentifier);
-  }
-}
+export type IOCContainer = InversifyContainer;
 
 /**
- * IOC identifier
+ * IOC register interface.
  *
- * @description
- * IOC identifier is used to identify the service in the IOC container.
+ * This is shortcut interface, implement this interface, you can use any IOC container.
  *
- * @example
- * ```ts
- * const a = IOC(IOCIdentifier.JSON);
- * const b = IOC('JSON');
- * ```
+ * Need to achieve the effect: when the implementation class on the right side of the equal sign changes, the IOCContainer will change automatically
  */
-export const IOCIdentifier = Object.freeze({
-  JSON: 'JSON',
-  LocalStorage: 'LocalStorage',
-  LocalStorageEncrypt: 'LocalStorageEncrypt',
-  CookieStorage: 'CookieStorage',
-  Logger: 'Logger',
-  FeApiToken: 'FeApiToken',
-  FeApiCommonPlugin: 'FeApiCommonPlugin',
-  AppConfig: 'AppConfig',
-  ApiMockPlugin: 'ApiMockPlugin',
-  ApiCatchPlugin: 'ApiCatchPlugin',
-  DialogHandler: 'DialogHandler'
-});
+export interface IOCRegister
+  extends IOCRegisterInterface<IOCContainer, IocRegisterOptions> {}
 
 /**
- * IOC identifier map
+ * IOC function
+ *
+ * This is the only and main exported content of the file
+ *
+ * @example use A class
+ * ```ts
+ * const userService = IOC(UserService);
+ * ```
+ *
+ * @example use A string identifier
+ *
+ * string identifier is shortcut for `IOCIdentifierMap` type, string key of `IOCIdentifier`
+ *
+ * ```ts
+ * const logger = IOC('Logger'); // Logger instance
+ *
+ * // or
+ * const logger = IOC(IOCIdentifier.Logger);
+ * ```
  */
-export interface IOCIdentifierMap {
-  [IOCIdentifier.JSON]: JSONSerializer;
-  [IOCIdentifier.LocalStorage]: ObjectStorage<string, string>;
-  [IOCIdentifier.LocalStorageEncrypt]: ObjectStorage<string, string>;
-  [IOCIdentifier.CookieStorage]: CookieStorage;
-  [IOCIdentifier.Logger]: LoggerInterface;
-  [IOCIdentifier.FeApiToken]: TokenStorage<string>;
-  [IOCIdentifier.FeApiCommonPlugin]: RequestCommonPlugin;
-  [IOCIdentifier.AppConfig]: EnvConfigInterface;
-  [IOCIdentifier.ApiMockPlugin]: ApiMockPlugin;
-  [IOCIdentifier.ApiCatchPlugin]: ApiCatchPlugin;
-  [IOCIdentifier.DialogHandler]: DialogHandler;
-}
-
 export const IOC = createIOCFunction<IOCIdentifierMap>(
+  /**
+   * If not inversify, you can use any IOC container,
+   * then replace the InversifyContainer with your own IOC container
+   */
   new InversifyContainer()
 );

package/dist/templates/react-app/src/core/bootstraps/BootstrapApp.ts

@@ -1,7 +1,55 @@
-import type { BootstrapExecutorPlugin } from '@qlover/corekit-bridge';
+import { Bootstrap } from '@qlover/corekit-bridge';
+import { envBlackList, envPrefix, browserGlobalsName } from '@config/common';
+import { IOC } from '../IOC';
+import * as globals from '../globals';
+import { GLOBAL_NO_WINDOW } from '@config/Identifier/common.error';
+import { IocRegisterImpl } from '../registers/IocRegisterImpl';
+import { BootstrapsRegistry } from './BootstrapsRegistry';
 
-export class BootstrapApp implements BootstrapExecutorPlugin {
-  readonly pluginName = 'BootstrapApp';
+export class BootstrapApp {
+  static async main(): Promise<void> {
+    const root = window;
 
-  onBefore(): void {}
+    if (!(typeof root !== 'undefined' && root instanceof Window)) {
+      throw new Error(GLOBAL_NO_WINDOW);
+    }
+
+    const { logger, appConfig } = globals;
+    const { pathname } = root.location;
+
+    const bootstrap = new Bootstrap({
+      root,
+      logger,
+      ioc: {
+        manager: IOC,
+        register: new IocRegisterImpl({ pathname, appConfig })
+      },
+      envOptions: {
+        target: appConfig,
+        source: {
+          ...import.meta.env,
+          [envPrefix + 'BOOT_HREF']: root.location.href
+        },
+        prefix: envPrefix,
+        blackList: envBlackList
+      },
+      globalOptions: {
+        sources: globals,
+        target: browserGlobalsName
+      }
+    });
+
+    try {
+      logger.info('bootstrap start...');
+
+      // init bootstrap
+      await bootstrap.initialize();
+
+      const bootstrapsRegistry = new BootstrapsRegistry(IOC);
+
+      await bootstrap.use(bootstrapsRegistry.register()).start();
+    } catch (error) {
+      logger.error(`${appConfig.appName} starup error:`, error);
+    }
+  }
 }

package/dist/templates/react-app/src/core/bootstraps/{index.ts → BootstrapsRegistry.ts}

@@ -4,14 +4,14 @@ import type {
   IOCContainerInterface,
   IOCFunctionInterface
 } from '@qlover/corekit-bridge';
-import { BootstrapApp } from './BootstrapApp';
 import { UserApiBootstarp } from '@/base/apis/userApi/UserApiBootstarp';
 import { FeApiBootstarp } from '@/base/apis/feApi/FeApiBootstarp';
 import { AiApiBootstarp } from '@/base/apis/AiApi';
 import { printBootstrap } from './PrintBootstrap';
-import { IOCIdentifier, type IOCIdentifierMap } from '../IOC';
+import { IOCIdentifier } from '@config/IOCIdentifier';
 import { I18nService } from '@/base/services/I18nService';
 import { I18nKeyErrorPlugin } from '@/base/cases/I18nKeyErrorPlugin';
+import { IOCIdentifierMap } from '../IOC';
 
 export class BootstrapsRegistry {
   constructor(
@@ -30,7 +30,6 @@ export class BootstrapsRegistry {
       new UserApiBootstarp(),
       new FeApiBootstarp(),
       AiApiBootstarp,
-      new BootstrapApp(),
       IOC(I18nKeyErrorPlugin)
     ];
 

package/dist/templates/react-app/src/core/registers/IocRegisterImpl.ts

@@ -0,0 +1,25 @@
+import type { IOCContainer, IOCRegister, IocRegisterOptions } from '../IOC';
+import type { IOCManagerInterface } from '@qlover/corekit-bridge';
+import { RegisterGlobals } from './RegisterGlobals';
+import { RegisterCommon } from './RegisterCommon';
+import { RegisterControllers } from './RegisterControllers';
+
+export class IocRegisterImpl implements IOCRegister {
+  constructor(protected options: IocRegisterOptions) {}
+
+  getRegisterList(): IOCRegister[] {
+    return [RegisterGlobals, RegisterCommon, new RegisterControllers()];
+  }
+
+  /**
+   * @override
+   */
+  register(
+    ioc: IOCContainer,
+    manager: IOCManagerInterface<IOCContainer>
+  ): void {
+    this.getRegisterList().forEach((Register) => {
+      Register.register(ioc, manager, this.options);
+    });
+  }
+}

package/dist/templates/react-app/src/core/registers/RegisterCommon.ts

@@ -1,17 +1,13 @@
-import { FetchAbortPlugin } from '@qlover/fe-corekit';
-import { Logger } from '@qlover/logger';
 import {
-  InversifyContainer,
-  InversifyRegisterInterface,
-  IOCIdentifier,
-  IocRegisterOptions
-} from '@/core/IOC';
+  FetchAbortPlugin,
+  type SyncStorageInterface
+} from '@qlover/fe-corekit';
+import { Logger } from '@qlover/logger';
 import {
   RequestCommonPlugin,
   ApiMockPlugin,
   ApiCatchPlugin,
   ThemeService,
-  IOCManagerInterface,
   TokenStorage
 } from '@qlover/corekit-bridge';
 import mockDataJson from '@config/feapi.mock.json';
@@ -22,13 +18,11 @@ import { I18nService } from '@/base/services/I18nService';
 import { RouteService } from '@/base/services/RouteService';
 import { baseRoutes } from '@config/app.router';
 import { UserService } from '@/base/services/UserService';
+import { IOCRegister } from '../IOC';
+import { IOCIdentifier } from '@config/IOCIdentifier';
 
-export class RegisterCommon implements InversifyRegisterInterface {
-  register(
-    container: InversifyContainer,
-    _: IOCManagerInterface<InversifyContainer>,
-    options: IocRegisterOptions
-  ): void {
+export const RegisterCommon: IOCRegister = {
+  register(container, _, options): void {
     const AppConfig = container.get(IOCIdentifier.AppConfig);
 
     const feApiToken = new TokenStorage(AppConfig.userTokenStorageKey, {
@@ -61,7 +55,7 @@ export class RegisterCommon implements InversifyRegisterInterface {
       ThemeService,
       new ThemeService({
         ...themeConfig,
-        storage: localStorage
+        storage: localStorage as SyncStorageInterface<string, string>
       })
     );
 
@@ -73,6 +67,6 @@ export class RegisterCommon implements InversifyRegisterInterface {
       })
     );
 
-    container.bind(I18nService, new I18nService(options.pathname));
+    container.bind(I18nService, new I18nService(options!.pathname));
   }
-}
+};

package/dist/templates/react-app/src/core/registers/RegisterControllers.ts

@@ -2,12 +2,18 @@ import { localStorage } from '../globals';
 import { JSONStorageController } from '@/uikit/controllers/JSONStorageController';
 import { ProcesserExecutor } from '@/base/services/ProcesserExecutor';
 import { UserService } from '@/base/services/UserService';
-import { InversifyRegisterInterface } from '../IOC';
-import { InversifyContainer } from '../IOC';
 import { I18nKeyErrorPlugin } from '@/base/cases/I18nKeyErrorPlugin';
+import { IOCContainer, IOCRegister } from '../IOC';
+import { IOCManagerInterface } from '@qlover/corekit-bridge';
 
-export class RegisterControllers implements InversifyRegisterInterface {
-  register(container: InversifyContainer): void {
+export class RegisterControllers implements IOCRegister {
+  /**
+   * @override
+   */
+  register(
+    container: IOCContainer,
+    _: IOCManagerInterface<IOCContainer>
+  ): void {
     const jsonStorageController = new JSONStorageController(localStorage);
 
     container.bind(JSONStorageController, jsonStorageController);

package/dist/templates/react-app/src/core/registers/RegisterGlobals.ts

@@ -1,5 +1,4 @@
 import { JSONSerializer } from '@qlover/fe-corekit';
-import type { IOCManagerInterface } from '@qlover/corekit-bridge';
 import {
   cookieStorage,
   dialogHandler,
@@ -8,22 +7,14 @@ import {
   localStorageEncrypt,
   logger
 } from '../globals';
-import {
-  type InversifyContainer,
-  type InversifyRegisterInterface,
-  IOCIdentifier,
-  IocRegisterOptions
-} from '@/core/IOC';
+import { IOCRegister } from '@/core/IOC';
 import { Logger } from '@qlover/logger';
+import { IOCIdentifier } from '@config/IOCIdentifier';
 
-export class RegisterGlobals implements InversifyRegisterInterface {
-  register(
-    container: InversifyContainer,
-    _: IOCManagerInterface<InversifyContainer>,
-    options: IocRegisterOptions
-  ): void {
+export const RegisterGlobals: IOCRegister = {
+  register(container, _, options): void {
     // inject AppConfig to IOC
-    container.bind(IOCIdentifier.AppConfig, options.appConfig);
+    container.bind(IOCIdentifier.AppConfig, options!.appConfig);
     container.bind(IOCIdentifier.DialogHandler, dialogHandler);
 
     container.bind(JSONSerializer, JSON);
@@ -36,4 +27,4 @@ export class RegisterGlobals implements InversifyRegisterInterface {
     container.bind(IOCIdentifier.LocalStorageEncrypt, localStorageEncrypt);
     container.bind(IOCIdentifier.CookieStorage, cookieStorage);
   }
-}
+};

package/dist/templates/react-app/src/main.tsx

@@ -3,12 +3,9 @@ import 'reflect-metadata';
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
 import App from './App.tsx';
-import startup from './core/bootstrap';
+import { BootstrapApp } from './core/bootstraps/BootstrapApp';
 
-startup({
-  root: window,
-  envSource: import.meta.env
-});
+BootstrapApp.main();
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>

package/dist/templates/react-app/src/uikit/controllers/JSONStorageController.ts

@@ -17,7 +17,7 @@ export class JSONStorageController extends StoreInterface<JSONStoragePageState>
     requestTimeout: (state: JSONStoragePageState) => state.requestTimeout
   };
 
-  constructor(private storage: SyncStorageInterface<string, number>) {
+  constructor(private storage: SyncStorageInterface<string, unknown>) {
     super(() => ({
       testKey1: storage.getItem('testKey1') ?? 0,
       testKey2: storage.getItem('testKey2') ?? 0,

package/dist/templates/react-app/tsconfig.app.json

@@ -31,5 +31,6 @@
       "@lib/*": ["./lib/*"]
     }
   },
-  "include": ["src", "config"]
+  "include": ["src", "config"],
+  "exclude": ["node_modules", "dist"]
 }

package/dist/templates/react-app/tsconfig.node.json

@@ -20,5 +20,6 @@
     "noFallthroughCasesInSwitch": true,
     "noUncheckedSideEffectImports": true
   },
-  "include": ["vite.config.ts"]
+  "include": ["vite.config.ts"],
+  "exclude": ["node_modules", "dist"]
 }

package/dist/templates/react-app/vite.config.ts

@@ -8,7 +8,7 @@ import {
 } from './config/common';
 import { name, version } from './package.json';
 import tsconfigPaths from 'vite-tsconfig-paths';
-import envConfig from '@qlover/corekit-bridge/vite-env-config/index';
+import envConfig from '@qlover/corekit-bridge/vite-env-config';
 import ts2Locales from '@brain-toolkit/ts2locales/vite';
 import i18nConfig from './config/i18n';
 import tailwindcss from '@tailwindcss/vite';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qlover/create-app",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Create a new app with a single command",
   "private": false,
   "type": "module",
@@ -38,7 +38,7 @@
   "dependencies": {
     "commander": "^13.1.0",
     "inquirer": "^12.3.2",
-    "@qlover/scripts-context": "0.2.1"
+    "@qlover/scripts-context": "1.0.0"
   },
   "scripts": {
     "build": "tsup",

package/dist/templates/react-app/src/base/port/ApiTransactionInterface.ts

@@ -1,7 +0,0 @@
-/**
- * Use for describe the unified format of Api request
- */
-export interface ApiTransactionInterface<Request, Response> {
-  request: Request;
-  response: Response;
-}

package/dist/templates/react-app/src/base/port/RequestCatcherInterface.ts

@@ -1,12 +0,0 @@
-/**
- * RequestCatcherInterface
- *
- * @description
- * RequestCatcherInterface is a interface that catches the request error
- *
- */
-export interface RequestCatcherInterface<Context> {
-  handler(context: Context): void;
-
-  default(context: Context): void;
-}

package/dist/templates/react-app/src/core/bootstrap.ts

@@ -1,58 +0,0 @@
-import { Bootstrap } from '@qlover/corekit-bridge';
-import { envBlackList, envPrefix, browserGlobalsName } from '@config/common';
-import { IOC } from './IOC';
-import * as globals from '@/core/globals';
-import { IocRegister } from './registers';
-import { BootstrapsRegistry } from './bootstraps';
-import { GLOBAL_NO_WINDOW } from '@config/Identifier/common.error';
-
-export default async function startup({
-  root,
-  envSource
-}: {
-  root: unknown;
-  envSource: Record<string, unknown>;
-}) {
-  if (!(typeof root !== 'undefined' && root instanceof Window)) {
-    throw new Error(GLOBAL_NO_WINDOW);
-  }
-
-  const { logger, appConfig } = globals;
-
-  const iocRegister = new IocRegister({
-    pathname: root.location.pathname,
-    appConfig
-  });
-
-  const bootstrap = new Bootstrap({
-    root,
-    logger,
-    ioc: {
-      manager: IOC,
-      register: iocRegister
-    },
-    envOptions: {
-      target: appConfig,
-      source: { ...envSource, [envPrefix + 'BOOT_HREF']: root.location.href },
-      prefix: envPrefix,
-      blackList: envBlackList
-    },
-    globalOptions: {
-      sources: globals,
-      target: browserGlobalsName
-    }
-  });
-
-  try {
-    logger.info('bootstrap start...');
-
-    // init bootstrap
-    await bootstrap.initialize();
-
-    const bootstrapsRegistry = new BootstrapsRegistry(IOC);
-
-    await bootstrap.use(bootstrapsRegistry.register()).start();
-  } catch (error) {
-    logger.error(`${appConfig.appName} starup error:`, error);
-  }
-}

package/dist/templates/react-app/src/core/registers/RegisterApi.ts

@@ -1,5 +0,0 @@
-import type { InversifyContainer, InversifyRegisterInterface } from '../IOC';
-
-export class RegisterApi implements InversifyRegisterInterface {
-  register(_container: InversifyContainer): void {}
-}

package/dist/templates/react-app/src/core/registers/index.ts

@@ -1,32 +0,0 @@
-import { RegisterGlobals } from './RegisterGlobals';
-import { RegisterCommon } from './RegisterCommon';
-import { RegisterApi } from './RegisterApi';
-import { RegisterControllers } from './RegisterControllers';
-import {
-  InversifyContainer,
-  InversifyRegisterInterface,
-  IocRegisterOptions
-} from '../IOC';
-import { IOCManagerInterface } from '@qlover/corekit-bridge';
-
-export class IocRegister implements InversifyRegisterInterface {
-  constructor(protected options: IocRegisterOptions) {}
-
-  getRegisterList(): InversifyRegisterInterface[] {
-    return [
-      new RegisterGlobals(),
-      new RegisterCommon(),
-      new RegisterApi(),
-      new RegisterControllers()
-    ];
-  }
-
-  register(
-    ioc: InversifyContainer,
-    manager: IOCManagerInterface<InversifyContainer>
-  ): void {
-    this.getRegisterList().forEach((register) => {
-      register.register(ioc, manager, this.options);
-    });
-  }
-}