@futdevpro/nts-dynamo 1.2.90

package/src/_services/dynamobe-shared.service.ts

@@ -0,0 +1,320 @@
+import { Request } from 'express';
+import * as GeoIp from 'geoip-lite';
+import { GeoIpLocation } from '../_models/fullstack-models/control-models/geo-ip-location';
+import { LogStyle } from '../_enum/log-style.enum';
+import { DynamoBEError } from '../_models/fullstack-models/control-models/dynamobe-error';
+
+export const second = 1000;
+export const minute = second * 60;
+export const hour = minute * 60;
+export const day = hour * 24;
+export const week = day * 7;
+export const month = day * 30.4368499;
+export const year = day * 365.242199;
+
+export class DBE_Shared {
+
+  /**
+   * returns remapped object list by path list
+   * @param objList object list to map
+   * @param paths string list of path etc.:
+   * [ [ 'first', 'sub', 'label' ], [ 'first', 'dif', 'name' ]] will be...
+   * from
+   *  {
+   *    first: {
+   *      sub: {
+   *        label: 'vlmi'
+   *      },
+   *      dif: {
+   *        name: 'asd'
+   *      }
+   *    }
+   *  }[]
+   * to
+   * { label: 'vlmi', name: 'asd' }[]
+   * @returns remapped object list (the final obj will use the deepest keys)
+   */
+  static mapObjList(objList: object[], paths: string[][]): object[] {
+    let newObjList = [...objList];
+    newObjList = newObjList.map(obj => {
+      const newObj = {};
+      paths.forEach((path: string[]) => {
+        newObj[path[path.length - 1]] = this.getNestedData(obj, path);
+      });
+      return newObj;
+    });
+    return newObjList;
+  }
+
+  /**
+   * returns nested value from object
+   * @param parentObj data source object
+   * @param nestedDataKeys path of value as string list
+   * etc.: ['nestLvl1', 'nestLvl2', 'nestLvl3'] as parentObj.nestLvl1.nestLvl2.nestLvl3
+   * @returns data from object by path
+   */
+  static getNestedData(parentObj: object, nestedDataKeys: string[]): any {
+    let newData = {...parentObj};
+    nestedDataKeys.forEach((dk: string) => {
+      if (newData) {
+        newData = newData[dk];
+      }
+    });
+    return newData;
+  }
+
+  /**
+   * recursive function that nests data
+   * @param newData the object that that is needed to be updated
+   * @param nestKeys the path where the data should be updated
+   * @param dataToSet the actual value that will be setted
+   * @returns modified data
+   */
+  static nestData(parentObj: object, nestKeys: string[], dataToSet: any): object {
+    const newData = {...parentObj};
+    if (nestKeys.length > 1) {
+      const keys = [...nestKeys];
+      const nextNestKey = keys.shift();
+      newData[nextNestKey] = this.nestData(newData[nextNestKey], keys, dataToSet);
+    } else {
+      newData[nestKeys[0]] = dataToSet;
+    }
+    return newData;
+  }
+
+  /**
+   * recursive function that adds to nested data
+   * @param newData the object that that is needed to be updated
+   * @param nestKeys the path where the data should be updated
+   * @param dataToAdd the actual value that will be setted
+   * @returns modified data
+   */
+  static addToNestedData(parentObj: object, nestKeys: string[], dataToAdd: any): object {
+    const newData = {...parentObj};
+    if (nestKeys.length > 1) {
+      const keys = [...nestKeys];
+      const nextNestKey = keys.shift();
+      newData[nextNestKey] = this.addToNestedData(newData[nextNestKey], keys, dataToAdd);
+    } else {
+      newData[nestKeys[0]] += dataToAdd;
+    }
+    return newData;
+  }
+
+  /**
+   * recursive function that pushes to nested data
+   * @param newData the object that that is needed to be updated
+   * @param nestKeys the path where the data should be updated
+   * @param dataToPush the actual value that will be setted
+   * @returns modified data
+   */
+  static pushToNestedData(parentObj: object, nestKeys: string[], dataToPush: any): object {
+    const newData = {...parentObj};
+    if (nestKeys.length > 1) {
+      const keys = [...nestKeys];
+      const nextNestKey = keys.shift();
+      newData[nextNestKey] = this.pushToNestedData(newData[nextNestKey], keys, dataToPush);
+    } else {
+      if (Array.isArray(newData[nestKeys[0]])) {
+        newData[nestKeys[0]].push(dataToPush);
+      } else {
+        newData[nestKeys[0]] = [dataToPush];
+      }
+    }
+    return newData;
+  }
+
+  /**
+   * recursive function that nests data on recursive data structure etc.: xData: { ..., 'nestedListKey': xData[] }
+   * @param newData the object that that is needed to be updated
+   * @param nestedListKey the location of nested dataList
+   * @param nestIndexes path to the subject ect.: xData.listKey[1].listKey[4].listKey[0] will be [1, 4, 0]
+   * @param dataToSet the actual value that will be setted on location
+   * @returns modified data
+   */
+  static nestRecursiveListedData<T>(parentObj: T, nestedListKey: string, nestIndexes: number[], dataToSet: any): T {
+    const newData = {...parentObj};
+    if (nestIndexes.length > 1) {
+      const indexes = [...nestIndexes];
+      const nextLevelKey = indexes.shift();
+      newData[nestedListKey][nextLevelKey] = this.nestRecursiveListedData(
+          newData[nestedListKey][nextLevelKey], nestedListKey, indexes, dataToSet);
+    } else {
+      newData[nestedListKey][nestIndexes[0]] = dataToSet;
+    }
+    return newData;
+  }
+
+  static getAge(birthDate: Date | number | string) {
+    return this.getYear(+new Date() - +new Date(birthDate));
+  }
+
+  static getYear(date: Date | number | string) {
+    if (typeof date === 'string') {
+      date = new Date(date);
+    }
+    return (+date  / year);
+  }
+
+  static getHour(date: Date | number | string) {
+    if (typeof date === 'string') {
+      date = new Date(date);
+    }
+    return (+date  / hour);
+  }
+
+  static getDateByAge(age: number) {
+    return new Date(+new Date() - (year * age));
+  }
+
+  static getDistanceInKilometres(
+    from: LocationCoordinates,
+    to: LocationCoordinates
+  ): number {
+
+    const R = 6371; // kilometres
+    const φ1 = this.toRadians(from.latitude);
+    const φ2 = this.toRadians(to.latitude);
+    const Δφ = this.toRadians(to.latitude - from.latitude);
+    const Δλ = this.toRadians(to.longitude - from.longitude);
+
+    const a = Math.sin(Δφ / 2) * Math.sin(Δφ / 2) +
+            Math.cos(φ1) * Math.cos(φ2) *
+            Math.sin(Δλ / 2) * Math.sin(Δλ / 2);
+    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+
+    return R * c;
+  }
+
+  static getLocationDegByKilometers(latiOrLong: 'latitude' | 'longitude', distanceInKm: number, latitude?: number): number {
+    if (latiOrLong === 'latitude') {
+      return distanceInKm / 110.574;
+    } else {
+      if (latitude) {
+        return distanceInKm / (Math.cos(this.toRadians(latitude)) * 111.320);
+      } else {
+        throw new DynamoBEError({ status: 417, message: 'When using getLocationDegByKilometers for longitude, you need to give latitude!' });
+      }
+    }
+  }
+
+  static toRadians(deg: number): number {
+    return deg * (Math.PI / 180);
+  }
+
+  static addMetadataToSchema(schema: any): any {
+    schema.__created = { type: Date };
+    schema.__createdBy = { type: String };
+    schema.__lastModified = { type: Date };
+    schema.__lastModifiedBy = { type: String };
+    return schema;
+  }
+
+  static oneHourAgo(): Date {
+    return new Date(+new Date() - hour);
+  }
+  static oneDayAgo(): Date {
+    return new Date(+new Date() - day);
+  }
+  static oneWeekAgo(): Date {
+    return new Date(+new Date() - week);
+  }
+  static oneMonthAgo(): Date {
+    return new Date(+new Date() - month);
+  }
+  static oneYearAgo(): Date {
+    return new Date(+new Date() - year);
+  }
+
+  static getIpFromRequest(request: Request): string {
+    /* console.log('TESTTTT route:\n', 
+      `\n|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||\n
+      HEADERS\n`, request.headers,
+      `\n|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||\n
+      ELSE\n`, 
+      `\nremote `, request.socket.remoteAddress,
+      `\nlocal  `, request.socket.localAddress,
+    ); */
+
+    let ip: string;
+    if (request.headers['x-forwarded-for']) {
+      const route: string[] = (request.headers['x-forwarded-for'] as string).split(', ');
+      console.log('TESTTTT route:', route);
+      ip = route[route.length - 1];
+    } else {
+      ip = request.socket.remoteAddress;
+    }
+
+    /* console.log(`ip from request: ${ip}`); */
+    return ip;
+  }
+
+  static getLocationDataByRequest(request: Request): GeoIpLocation {
+    return GeoIp.lookup(this.getIpFromRequest(request));
+  }
+
+  static setLogStyle(styles: LogStyle[]): void {
+    let styleSets = '';
+    styles.forEach((style: LogStyle) => {
+      styleSets += style;
+    });
+    console.log(styleSets);
+  }
+  static resetLogStyle(): void {
+    console.log(LogStyle.reset);
+  }
+
+  static logStyle(input: string, styles: LogStyle[], dontReset?: boolean): string {
+    let result = '';
+    styles.forEach((style: LogStyle) => {
+      result += style;
+    });
+    result += input;
+    if (!dontReset) {
+      result += LogStyle.reset;
+    }
+    return result;
+  }
+
+  static logSuccess(message: string, ...optionalParams: any[]): void {
+    if (0 < optionalParams.length) {
+      console.error(`${LogStyle.green}${LogStyle.bright}${message}`, ...optionalParams, LogStyle.reset);
+    } else {
+      console.error(`${LogStyle.green}${LogStyle.bright}${message}${LogStyle.reset}`);
+    }
+  }
+
+  static logError(message: string, ...optionalParams: any[]): void {
+    if (0 < optionalParams.length) {
+      console.error(`${LogStyle.red}${LogStyle.bright}${message}`, ...optionalParams, LogStyle.reset);
+    } else {
+      console.error(`${LogStyle.red}${LogStyle.bright}${message}${LogStyle.reset}`);
+    }
+  }
+
+  static logWarning(message: string, ...optionalParams: any[]): void {
+    if (0 < optionalParams.length) {
+      console.warn(`${LogStyle.yellow}${LogStyle.bright}${message}`, ...optionalParams, LogStyle.reset);
+    } else {
+      console.warn(`${LogStyle.yellow}${LogStyle.bright}${message}${LogStyle.reset}`);
+    }
+  }
+}
+
+export interface LocationCoordinates {
+  longitude: number;
+  latitude: number;
+}
+
+export const dynamoTitleLog =
+`\x1b[32m \x1b[1m
+
+    ||||||VVV  VVV     /// |||V    |||     //VV     |||V    /|||    /|||||V
+    |||    VVV  VVV   ///  |||VV   |||    ///VVV    |||VV  //|||   ///   VVV
+    |||    |||   VVV ///   |||VVV  |||   ///  VVV   |||VVV///|||  |||     |||
+    |||    |||    V|||/    ||| VVV |||  |||    |||  ||| VV// |||  |||     |||
+    |||    |||     |||     |||  VVV|||  ||||||||||  |||      |||  |||     |||
+    |||    ///     |||     |||   VV|||  |||    |||  |||      |||   VVV   ///
+    ||||||///      |||     |||    V|||  |||    |||  |||      |||    V|||||/
+
+                                     By Future Development Program Kft.\x1b[0m`.replace(/V/g, '\\');

package/src/_services/dynamobe-singleton.service.ts

@@ -0,0 +1,16 @@
+
+export class DynamoBESingletonService {
+  /// ---     ---     ---     SINGLETON     ---     ---     --- \\\
+  protected static instance;
+  
+  static getSingletonInstance() {
+    if (!this.instance) {
+      this.instance = new this();
+    }
+    return this.instance;
+  }
+  /// ---     ---     ---     SINGLETON     ---     ---     --- ///
+  
+  // SINGLETON services are using private constructor  
+  protected constructor() {}
+}

package/src/index-newo.ts

@@ -0,0 +1,71 @@
+/* 
+// ENUMS
+import { DataModelType } from './_enum/data-model-types.enum';
+import { DynamoBEDSF } from './_enum/dynamobe-data-service-function.enum';
+import { DynamoBERouteSecurity } from './_enum/dynamobe-route-security.enum';
+import { LogStyle } from './_enum/log-style.enum';
+import { PredefinedDataTypes } from './_enum/predefined-data-types.enum';
+  // HTTP ENUMS
+import { HttpCallType } from './_enum/http/http-call-type.enum';
+import { HttpResponseType } from './_enum/http/http-response-type.enum';
+
+// MODELS
+import { DynamoBEApiCallParams } from './_models/dynamobe-api-call-params';
+import { DynamoBEAppParams } from './_models/dynamobe-app-params';
+import { DynamoBEDataModelParams } from './_models/dynamobe-data-model-params';
+import { DynamoBEEndpointParams } from './_models/dynamobe-endpoint-control';
+import { DynamoBEGlobalSettings } from './_models/dynamobe-global-settings';
+  // FULLSTACK - CONTROL MODELS
+import { DailyUsageData } from './_models/fullstack-models/control-models/daily-usage-data';
+import { DynamoBEDataPropertyParams } from './_models/fullstack-models/control-models/dynamobe-data-property-params';
+import { DynamoBEError } from './_models/fullstack-models/control-models/dynamobe-error';
+import { GeoIpLocation } from './_models/fullstack-models/control-models/geo-ip-location';
+import { DynamoUsageAction } from './_models/fullstack-models/control-models/usage-action';
+import { DynamoUsageData } from './_models/fullstack-models/control-models/usage-data';
+  // FULLSTACK - DATA MODELS
+import { Metadata } from './_models/fullstack-models/data-models/metadata';
+import { CustomData, customDataModelParams } from './_models/fullstack-models/data-models/custom-data';
+import { DynamoUsageSession, usageSessionModelParams } from './_models/fullstack-models/data-models/usage-session';
+
+// MODULES
+import { TestController } from './_modules/test-route/test-controller';
+import { CustomDataService } from './_modules/test-route/custom-data.service';
+import { UsageController } from './_modules/usage-route/usage-controller';
+import { UsageService } from './_modules/usage-route/usage.service';
+
+// SERVICES
+import { DynamoBEApiService } from './_services/dynamobe-api.service';
+import { DynamoBEApp } from './_services/dynamobe-app';
+import { DynamoBEAuthService } from './_services/dynamobe-auth.service';
+import { DynamoBEController } from './_services/dynamobe-controller.service';
+import { DynamoBEDataService } from './_services/dynamobe-data.service';
+import { DynamoBEDBServiceCollection } from './_services/dynamobe-db-service-collection.service';
+import { DynamoBEDBService } from './_services/dynamobe-db.service';
+import { DynamoBEEmailServiceCollection } from './_services/dynamobe-email-service-collection.service';
+import { DynamoBEEmailService } from './_services/dynamobe-email.service';
+import { DBE_Global_S } from './_services/dynamobe-global.service';
+import { DynamoBERountingModule } from './_services/dynamobe-routing-module.service';
+import { DynamoBEServer } from './_services/dynamobe-server';
+import { DBE_Shared } from './_services/dynamobe-shared.service';
+import { DynamoBESingletonService } from './_services/dynamobe-singleton.service';
+
+module.exports = { 
+  // ENUMS
+  DataModelType, DynamoBEDSF, DynamoBERouteSecurity, LogStyle, PredefinedDataTypes, 
+  HttpCallType, HttpResponseType,
+
+  // MODELS
+  DynamoBEApiCallParams, DynamoBEAppParams, DynamoBEDataModelParams, DynamoBEEndpointParams, DynamoBEGlobalSettings,
+  DailyUsageData, DynamoBEDataPropertyParams, DynamoBEError, GeoIpLocation, DynamoUsageAction, DynamoUsageData, 
+  Metadata, CustomData, customDataModelParams, DynamoUsageSession, usageSessionModelParams,
+
+  // MODULES
+  TestController, CustomDataService, UsageController, UsageService,
+
+  // SERVICES
+  DynamoBEApiService, DynamoBEApp, DynamoBEAuthService, DynamoBEController, DynamoBEDataService, DynamoBEDBServiceCollection, 
+  DynamoBEDBService, DynamoBEEmailServiceCollection, DynamoBEEmailService, DBE_Global_S, DynamoBERountingModule, DynamoBEServer, 
+  DBE_Shared, DynamoBESingletonService 
+};
+
+ */

package/src/index.ts

@@ -0,0 +1,50 @@
+
+// ENUMS
+export * from './_enum/data-model-types.enum';
+export * from './_enum/dynamobe-data-service-function.enum';
+export * from './_enum/dynamobe-route-security.enum';
+export * from './_enum/log-style.enum';
+export * from './_enum/predefined-data-types.enum';
+  // HTTP ENUMS
+export * from './_enum/http/http-call-type.enum';
+export * from './_enum/http/http-response-type.enum';
+
+// MODULES
+export * from './_models/dynamobe-api-call-params';
+export * from './_models/dynamobe-app-params';
+export * from './_models/dynamobe-data-model-params';
+export * from './_models/dynamobe-endpoint-control';
+export * from './_models/dynamobe-global-settings';
+  // FULLSTACK - CONTROL MODELS
+export * from './_models/fullstack-models/control-models/daily-usage-data';
+export * from './_models/fullstack-models/control-models/dynamobe-data-property-params';
+export * from './_models/fullstack-models/control-models/dynamobe-error';
+export * from './_models/fullstack-models/control-models/geo-ip-location';
+export * from './_models/fullstack-models/control-models/usage-action';
+export * from './_models/fullstack-models/control-models/usage-data';
+  // FULLSTACK - DATA MODELS
+export * from './_models/fullstack-models/data-models/custom-data';
+export * from './_models/fullstack-models/data-models/metadata';
+export * from './_models/fullstack-models/data-models/usage-session';
+
+// MODULES
+export * from './_modules/test-route/test-controller';
+export * from './_modules/test-route/custom-data.service';
+export * from './_modules/usage-route/usage-controller';
+export * from './_modules/usage-route/usage.service';
+
+// SERVICES
+export * from './_services/dynamobe-api.service';
+export * from './_services/dynamobe-app';
+export * from './_services/dynamobe-auth.service';
+export * from './_services/dynamobe-controller.service';
+export * from './_services/dynamobe-data.service';
+export * from './_services/dynamobe-db-service-collection.service';
+export * from './_services/dynamobe-db.service';
+export * from './_services/dynamobe-email-service-collection.service';
+export * from './_services/dynamobe-email.service';
+export * from './_services/dynamobe-global.service';
+export * from './_services/dynamobe-routing-module.service';
+export * from './_services/dynamobe-server';
+export * from './_services/dynamobe-shared.service';
+export * from './_services/dynamobe-singleton.service';

package/src/version.json

@@ -0,0 +1,2 @@
+
+"v01.02.71"

package/tsconfig.app.json

@@ -0,0 +1,12 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": [
+      "_assets/html.d"
+    ]
+  },
+  "include": [
+    "src/_assets"
+  ]
+}

package/tsconfig.json

@@ -0,0 +1,72 @@
+{
+  "compilerOptions": {
+    /* Basic Options */
+    "incremental": true,                   /* Enable incremental compilation */
+    "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */
+    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    //"lib": ["es6"],                     /* Specify library files to be included in the compilation. */
+    //"allowJs": true,                          /* Allow javascript files to be compiled. */
+    // "checkJs": true,                       /* Report errors in .js files. */
+    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    //"declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    "outDir": "lib",                        /* Redirect output structure to the directory. */
+    //"rootDir": "./",                         /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "composite": true,                     /* Enable project compilation */
+    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
+    // "removeComments": true,                /* Do not emit comments to output. */
+    // "noEmit": true,                        /* Do not emit outputs. */
+    "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    // "strict": false,                          /* Enable all strict type-checking options. */
+    // "noImplicitAny": false,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,              /* Enable strict null checks. */
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+    // "strictPropertyInitialization": false,  /* Enable strict checking of property initialization in classes. */
+    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true,                /* Report errors on unused locals. */
+    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    //"types": [ "./build/src/index.d.ts" ],                           /* Type declaration files to be included in compilation. */
+    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+     "esModuleInterop": true,               /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+
+    /* Advanced Options */
+    "resolveJsonModule": true                 /* Include modules imported with '.json' extension */
+  },
+  "include": [
+    "src"
+  ]
+}