wrap class by constructor function

Author: v-rudkovskiy

docs/client-demo.js

@@ -21,7 +21,9 @@ const NetLicensingDemo = async () => {
     TokenService,
   } = NetLicensing;
 
-  const context = new Context().setUsername('demo').setPassword('demo');
+  const context = Context();
+  context.setUsername('demo');
+  context.setPassword('demo');
 
   const randomNumber = Math.random().toString(36).slice(2);
   const productNumber = numberWithPrefix('P', randomNumber);
@@ -211,7 +213,7 @@ const NetLicensingDemo = async () => {
 
   // region ********* Validate
 
-  const validationParameters = new ValidationParameters();
+  const validationParameters = ValidationParameters();
   validationParameters.setProductNumber(productNumber);
   validationParameters.setLicenseeName(numberWithPrefix('Licensee-', Math.random().toString(36).slice(2)));
   validationParameters.setProductModuleValidationParameters(productModuleNumber, {

eslint.config.mjs

@@ -14,6 +14,9 @@ export default defineConfig([
   {
     ...pluginVitest.configs.recommended,
     files: ['**/*.spec.ts', '**/*.test.ts'],
+    rules: {
+      'vitest/expect-expect': ['error', { assertFunctionNames: ['expect', 'expectEntity', 'expectEntityProp'] }],
+    }
   },
 
   {
@@ -30,7 +33,7 @@ export default defineConfig([
       import: importPlugin,
     },
 
-    ignores: ['/node_modules', '/dist'],
+    ignores: ['/node_modules', '/dist', '/docs'],
 
     rules: {
       // General

src/converters/itemToTransaction.ts

@@ -38,7 +38,7 @@ export default <T extends object = TransactionProps>(item?: Item) => {
       const transaction = Transaction({ number: transactionNumber });
       const license = License({ number: licenseNumber });
 
-      return new LicenseTransactionJoin(transaction, license);
+      return LicenseTransactionJoin(transaction, license);
     });
   }
 

src/entities/LicenseTransactionJoin.ts

@@ -10,7 +10,7 @@ import type { Transaction } from '@/types/entities/Transaction';
  * @copyright 2017 Labs64 NetLicensing
  */
 
-export default class LicenseTransactionJoin implements ILicenseTransactionJoin {
+class LicenseTransactionJoin implements ILicenseTransactionJoin {
   transaction: Transaction;
   license: License;
 
@@ -35,3 +35,5 @@ export default class LicenseTransactionJoin implements ILicenseTransactionJoin {
     return this.license;
   }
 }
+
+export default (transaction: Transaction, license: License) => new LicenseTransactionJoin(transaction, license);

src/errors/NlicError.ts

@@ -2,7 +2,6 @@ import { AxiosError, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
 
 export default class NlicError<T = unknown, D = unknown> extends AxiosError<T, D> {
   isNlicError = true;
-  isAxiosError = true;
 
   constructor(
     message?: string,
@@ -14,8 +13,6 @@ export default class NlicError<T = unknown, D = unknown> extends AxiosError<T, D
   ) {
     super(message, code, config, request, response);
     this.name = 'NlicError';
-    this.isNlicError = true;
-    this.isAxiosError = true;
 
     if (stack) {
       this.stack = stack;

src/services/LicenseeService.ts

@@ -27,6 +27,7 @@ import { RequestConfig } from '@/types/services/Service';
 import { Context } from '@/types/vo/Context';
 import { Page as IPage } from '@/types/vo/Page';
 import { ValidationParameters } from '@/types/vo/ValidationParameters';
+import { ValidationResults as IValidationResults } from '@/types/vo/ValidationResults';
 
 // utils
 import { encode } from '@/utils/filter';
@@ -236,7 +237,7 @@ const licenseeService: LicenseeService = {
     number: string,
     validationParameters?: ValidationParameters,
     config?: RequestConfig,
-  ): Promise<ValidationResults> {
+  ): Promise<IValidationResults> {
     ensureNotEmpty(number, 'number');
 
     const data: Record<string, string | boolean> = {};
@@ -279,7 +280,7 @@ const licenseeService: LicenseeService = {
 
     const response = await Service.post(context, `${endpoint}/${number}/${endpointValidate}`, data, config);
 
-    const validationResults = new ValidationResults();
+    const validationResults = ValidationResults();
 
     const ttl = response.data.ttl;
 

src/types/services/LicenseeService.ts

@@ -13,9 +13,7 @@ import { RequestConfig } from '@/types/services/Service';
 import { Context } from '@/types/vo/Context';
 import { Page } from '@/types/vo/Page';
 import { ValidationParameters } from '@/types/vo/ValidationParameters';
-
-// vo
-import ValidationResults from '@/vo/ValidationResults';
+import { ValidationResults } from '@/types/vo/ValidationResults';
 
 export interface LicenseeService {
   get<T extends object = LicenseeProps>(context: Context, number: string, config?: RequestConfig): Promise<Licensee<T>>;

src/types/vo/ValidationResults.ts

@@ -10,7 +10,7 @@ export interface ProductModuleValidation {
   [key: string]: string;
 }
 
-export interface ValidationResult {
+export interface ValidationResults {
   readonly validations: Record<string, ProductModuleValidation>;
   ttl?: Date;
 

src/vo/Context.ts

@@ -82,4 +82,4 @@ class Context implements IContext {
   }
 }
 
-export default Context;
+export default (props?: ContextConfig) => new Context(props);

src/vo/ValidationParameters.ts

@@ -104,4 +104,4 @@ class ValidationParameters implements IValidationParameters {
   }
 }
 
-export default ValidationParameters;
+export default () => new ValidationParameters();