@adtrackify/at-service-common 1.1.19 → 1.1.20

package/jest.config.ts

@@ -1,41 +1,41 @@
-/*eslint-disable */
-
-export default {
-  globals: {
-    'ts-jest': {
-      isolatedModules: true
-    },
-    '@swc/jest': {
-      isolatedModules: true
-    }
-
-  },
-  roots: [ '<rootDir>/src' ],
-  testRegex: '\\.spec\\.(js|ts)$',
-  transform: {
-    "^.+\\.(t|j)sx?$": [ "@swc/jest" ],
-  },
-  moduleFileExtensions: [ 'js', 'json', 'ts' ],
-  transformIgnorePatterns: [],
-  runner: 'groups',
-  verbose: false,
-  coverageThreshold: {
-    global: {
-      branches: 0,
-      functions: 0,
-      lines: 0,
-      statements: 0
-    }
-  },
-  coverageReporters: [ 'html', 'text', 'text-summary', 'cobertura' ],
-  reporters: [ 'default', 'jest-junit' ],
-  collectCoverageFrom: [
-    'src/**/*.ts',
-    '!src/**/*.spec.js',
-    'src/**/*.js',
-    '!src/**/*.spec.ts',
-    '!src/**/tests/**'
-  ],
-  setupFilesAfterEnv: [],
-};
+/*eslint-disable */
+
+export default {
+  globals: {
+    'ts-jest': {
+      isolatedModules: true
+    },
+    '@swc/jest': {
+      isolatedModules: true
+    }
+
+  },
+  roots: [ '<rootDir>/src' ],
+  testRegex: '\\.spec\\.(js|ts)$',
+  transform: {
+    "^.+\\.(t|j)sx?$": [ "@swc/jest" ],
+  },
+  moduleFileExtensions: [ 'js', 'json', 'ts' ],
+  transformIgnorePatterns: [],
+  runner: 'groups',
+  verbose: false,
+  coverageThreshold: {
+    global: {
+      branches: 0,
+      functions: 0,
+      lines: 0,
+      statements: 0
+    }
+  },
+  coverageReporters: [ 'html', 'text', 'text-summary', 'cobertura' ],
+  reporters: [ 'default', 'jest-junit' ],
+  collectCoverageFrom: [
+    'src/**/*.ts',
+    '!src/**/*.spec.js',
+    'src/**/*.js',
+    '!src/**/*.spec.ts',
+    '!src/**/tests/**'
+  ],
+  setupFilesAfterEnv: [],
+};
 /*eslint-enable */

package/package.json

@@ -1,25 +1,34 @@
 {
   "name": "@adtrackify/at-service-common",
-  "version": "1.1.19",
+  "version": "1.1.20",
   "description": "",
-  "module": "./dist/index.js",
   "main": "./dist/index.js",
+  "module": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
+  "type": "module",
   "modules": "esm",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.esm.js",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "engines": {
     "npm": ">=8.0.0 <9.0.0",
     "node": ">=16.0.0 <18.14.2"
   },
   "scripts": {
     "clean": "rimraf dist",
-    "build": "npm run clean && npm run verify && cross-env NODE_ENV=production stage=dev APP_ENV=dev node build.js",
+    "build": "cross-env NODE_ENV=production node build.js",
     "build:dev": "npm run clean && npm run verify && cross-env NODE_ENV=production stage=dev APP_ENV=dev npm run build",
-    "build:qa": "npm run clean && npm run verify && cross-env NODE_ENV=production stage=qa APP_ENV=qa webpack",
-    "build:prod": "npm run clean && npm run verify && cross-env NODE_ENV=production stage=prod APP_ENV=prod webpack",
-    "elint": "eslint --ignore-path .gitignore .",
+    "build:qa": "npm run clean && npm run verify && cross-env NODE_ENV=production stage=qa APP_ENV=qa npm run build",
+    "build:prod": "npm run clean && npm run verify && cross-env NODE_ENV=production stage=prod APP_ENV=prod npm run build",
+    "elint": "eslint .",
     "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
     "lint": "eslint src/",
-    "lint:fix": "eslint --ignore-path .gitignore . --fix",
+    "lint:fix": "eslint . --fix",
     "coverage": "npm run test:all -- --coverage --group=unit",
     "test": "jest --group=unit --coverage",
     "test:all": "cross-env AWS_REGION=us-east-2 NODE_ENV=test jest --group=unit --coverage",
@@ -31,13 +40,8 @@
     "type-check": "tsc --noEmit"
   },
   "dependencies": {
-    "@types/axios": "^0.14.0",
-    "@types/lambda-log": "^2.2.1",
-    "@types/luxon": "^3.0.1",
-    "@types/ua-parser-js": "^0.7.36",
-    "@types/uuid": "^8.3.4",
-    "axios": "^0.27.2",
-    "axios-retry": "^3.3.1",
+    "axios": "^1.3.4",
+    "axios-retry": "^3.4.0",
     "joi": "^17.6.0",
     "lambda-log": "^3.1.0",
     "luxon": "^3.0.3",
@@ -52,30 +56,26 @@
     "@aws-sdk/client-eventbridge": "^3.278.0",
     "@aws-sdk/client-s3": "^3.282.0",
     "@aws-sdk/lib-dynamodb": "^3.279.0",
-    "@babel/cli": "^7.13.16",
-    "@babel/core": "^7.19.1",
-    "@babel/plugin-proposal-optional-chaining": "^7.13.8",
-    "@babel/plugin-transform-runtime": "^7.19.1",
-    "@babel/preset-env": "^7.19.1",
-    "@babel/preset-typescript": "^7.16.7",
-    "@babel/runtime-corejs3": "^7.19.1",
     "@faker-js/faker": "^7.5.0",
     "@swc/core": "^1.3.1",
     "@swc/jest": "^0.2.22",
     "@types/jest": "^28.1.8",
+    "@types/lambda-log": "^2.2.1",
+    "@types/luxon": "^3.0.1",
     "@types/node": "^17.0.8",
+    "@types/ua-parser-js": "^0.7.36",
+    "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^5.37.0",
     "@typescript-eslint/parser": "^5.37.0",
     "core-js": "^3.25.1",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.14.54",
+    "esbuild": "^0.17.1",
     "eslint": "^8.23.1",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-n": "^15.2.5",
     "eslint-plugin-promise": "^6.0.1",
-    "eslint-webpack-plugin": "^3.1.1",
     "glob": "^8.0.3",
     "husky": "^6.0.0",
     "jest": "^29.2.1",
@@ -90,12 +90,12 @@
     "regenerator-runtime": "^0.13.9",
     "rimraf": "^3.0.2",
     "swc-loader": "^0.2.3",
-    "ts-jest": "^29.0.3",
-    "ts-loader": "^9.3.1",
+    "ts-jest": "^29.0.5",
+    "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "repository": {
     "type": "git",
@@ -104,4 +104,4 @@
   "author": "",
   "license": "ISC",
   "homepage": "https://bitbucket.org/eacap/at-service-common#readme"
-}
+}

package/src/__tests__/helpers/subscription-helper.spec.ts

@@ -7,7 +7,7 @@
 
 jest.mock('lambda-log');
 import * as Logger from 'lambda-log';
-import { getPlanDetails } from '../../helpers';
+import { getPlanDetails } from '../../helpers/subscription-helper.js';
 
 describe('postmark service email test', () => {
   jest.spyOn(Logger, 'warn').mockImplementation(() => {

package/src/clients/generic/axios.d.ts

@@ -1,8 +1,8 @@
-declare module 'axios/lib/adapters/http' {
-  import { AxiosAdapter } from 'axios';
-
-  const httpAdapter: AxiosAdapter;
-  namespace httpAdapter { }
-
-  export = httpAdapter;
+declare module 'axios/lib/adapters/http' {
+  import { AxiosAdapter } from 'axios';
+
+  const httpAdapter: AxiosAdapter;
+  namespace httpAdapter { }
+
+  export = httpAdapter;
 }

package/src/clients/generic/eventbridge-client.ts

@@ -1,6 +1,6 @@
 import { EventBridgeClient as EventBridge, PutEventsCommand, PutEventsCommandInput } from '@aws-sdk/client-eventbridge';
 import { v4 as uuidv4 } from 'uuid';
-import { getCurrentTimestamp } from '../../libs/dates';
+import { getCurrentTimestamp } from '../../libs/dates.js';
 import * as log from 'lambda-log';
 
 export class EventBridgeClient {

package/src/clients/generic/http-client.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import axiosRetry from 'axios-retry';
+//import axiosRetry from 'axios-retry';
 import https from 'https';
 import httpAdapter from 'axios/lib/adapters/http';
 
@@ -20,8 +20,7 @@ export const axiosHttpService = (config: any = {}) => {
   config.adapter = httpAdapter;
   config.httpsAgent = new https.Agent({ keepAlive: true });
   const axiosService = axios.create(config);
-
-  axiosRetry(axiosService, { retryDelay: axiosRetry.exponentialDelay, retries: 3 });
+  // axiosRetry(axiosService, { retryDelay: axiosRetry.exponentialDelay, retries: 3 });
 
   return {
     instance: () => axiosService,

package/src/clients/generic/index.ts

@@ -1,5 +1,5 @@
-export * from './dynamodb-client';
-export * from './eventbridge-client';
-export * from './http-client';
-export * from './s3-client';
-export * from './cognito-client';
+export * from './dynamodb-client.js';
+export * from './eventbridge-client.js';
+export * from './http-client.js';
+export * from './s3-client.js';
+export * from './cognito-client.js';

package/src/clients/index.ts

@@ -1,3 +1,3 @@
-export * from './generic';
-export * from './internal-api';
-export * from './third-party';
+export * from './generic/index.js';
+export * from './internal-api/index.js';
+export * from './third-party/index.js';

package/src/clients/internal-api/accounts-client.ts

@@ -1,7 +1,7 @@
 import * as log from 'lambda-log';
-import { ApiResponse } from '../../types/api-response';
+import { ApiResponse } from '../../types/api-response.js';
 import { Account, ACCOUNT_STATUS, Destination } from '@adtrackify/at-tracking-event-types';
-import { axiosHttpService } from '../generic/http-client';
+import { axiosHttpService } from '../generic/http-client.js';
 
 //const BASE_API_URL = process.env.BASE_API_URL;
 

package/src/clients/internal-api/destinations-client.ts

@@ -1,7 +1,7 @@
 import * as log from 'lambda-log';
 //const log = require('lambda-log');
-import { ApiResponse } from '../../types/api-response';
-import { axiosHttpService } from '../generic/http-client';
+import { ApiResponse } from '../../types/api-response.js';
+import { axiosHttpService } from '../generic/http-client.js';
 import { Destination } from '@adtrackify/at-tracking-event-types';
 //const BASE_API_URL = process.env.BASE_API_URL;
 //const DESTINATIONS_API_KEY = process.env.DESTINATIONS_API_KEY;

package/src/clients/internal-api/index.ts

@@ -1,4 +1,4 @@
-export * from './destinations-client';
-export * from './accounts-client';
-export * from './users-auth-client';
-export * from './shopify-app-install-client';
+export * from './destinations-client.js';
+export * from './accounts-client.js';
+export * from './users-auth-client.js';
+export * from './shopify-app-install-client.js';

package/src/clients/internal-api/shopify-app-install-client.ts

@@ -1,6 +1,6 @@
 import log from 'lambda-log';
-import { ApiResponse } from '../../types/api-response';
-import { axiosHttpService } from '../generic/http-client';
+import { ApiResponse } from '../../types/api-response.js';
+import { axiosHttpService } from '../generic/http-client.js';
 import { ShopifyAppInstall, ShopifyAppSubscriptionStatus } from '@adtrackify/at-tracking-event-types';
 //const BASE_API_URL = process.env.BASE_API_URL;
 //const DESTINATIONS_API_KEY = process.env.DESTINATIONS_API_KEY;
@@ -61,6 +61,6 @@ export class ShopifyAppInstallClient {
     const client = await this.getClient();
     const response = await client.get(`/?shop=${shop}`);
     log.info('getShopifyAppInstallByShop', { response });
-    return response as ApiResponse<ShopifyAppInstallResponseData>; 
-  }
+    return response as ApiResponse<ShopifyAppInstallResponseData>;
+  };
 }

package/src/clients/internal-api/users-auth-client.ts

@@ -1,8 +1,9 @@
 import { User } from '@adtrackify/at-tracking-event-types';
 import * as log from 'lambda-log';
-import { HttpError, HttpStatusCodes } from '../../libs';
-import { ApiResponse } from '../../types/api-response';
-import { axiosHttpService } from '../generic/http-client';
+import { HttpError } from '../../libs/http-error.js';
+import { HttpStatusCodes } from '../../libs/http-status-codes.js';
+import { ApiResponse } from '../../types/api-response.js';
+import { axiosHttpService } from '../generic/http-client.js';
 
 export interface UserResponseData {
   user: User;

package/src/clients/third-party/index.ts

@@ -1 +1 @@
-export * from './shopify-client';
+export * from './shopify-client.js';

package/src/clients/third-party/shopify-client.ts

@@ -1,4 +1,4 @@
-import { axiosHttpService } from '../generic/http-client';
+import { axiosHttpService } from '../generic/http-client.js';
 import * as log from 'lambda-log';
 
 export class ShopifyClient {

package/src/helpers/index.ts

@@ -1,5 +1,5 @@
-export * from './input-validation-helper';
-export * from './logging-helper';
-export * from './response-helper';
-export * from './shopify-helper';
-export * from './subscription-helper';
+export * from './input-validation-helper.js';
+export * from './logging-helper.js';
+export * from './response-helper.js';
+export * from './shopify-helper.js';
+export * from './subscription-helper.js';

package/src/helpers/input-validation-helper.ts

@@ -1,6 +1,6 @@
 import Joi from 'joi';
 import * as log from 'lambda-log';
-import { HttpError } from '../libs/http-error';
+import { HttpError } from '../libs/http-error.js';
 
 export const validateInput = (schema: Joi.ObjectSchema<any>, input: any) => {
   const { error, value } = schema.validate(input);

package/src/helpers/shopify-helper.ts

@@ -1,7 +1,7 @@
 import { createHmac } from 'crypto';
 import * as log from 'lambda-log';
-import { HttpError } from '../libs';
-import { mapObjectToQueryString } from '../libs/url';
+import { HttpError } from '../libs/http-error.js';
+import { mapObjectToQueryString } from '../libs/url.js';
 export interface ShopifyRequestValidationParameters {
   code: string,
   hmac?: string,

package/src/index.ts

@@ -1,5 +1,5 @@
-export * from './clients';
-export * from './helpers';
-export * from './libs';
-export * from './types';
-export * from './services';
+export * from './clients/index.js';
+export * from './helpers/index.js';
+export * from './libs/index.js';
+export * from './types/index.js';
+export * from './services/index.js';

package/src/libs/index.ts

@@ -1,7 +1,7 @@
-export * from '../helpers/shopify-helper';
-export * from './crypto';
-export * from './dates';
-export * from './http-error';
-export * from './http-status-codes';
-export * from './url';
+export * from '../helpers/shopify-helper.js';
+export * from './crypto.js';
+export * from './dates.js';
+export * from './http-error.js';
+export * from './http-status-codes.js';
+export * from './url.js';
 

package/src/libs/url.ts

@@ -1,10 +1,10 @@
-// Record<string, string> is any object
-export const mapObjectToQueryString = (inputObj: any): string => {
-  const qsp = Object.entries(inputObj).sort((a, b) => a[ 0 ] < b[ 0 ] ? -1 : 1);
-  const urlParams = new URLSearchParams();
-  qsp.map(p => {
-    urlParams.append(p[ 0 ], p[ 1 ] as string);
-  });
-  const qs = urlParams.toString();
-  return qs;
+// Record<string, string> is any object
+export const mapObjectToQueryString = (inputObj: any): string => {
+  const qsp = Object.entries(inputObj).sort((a, b) => a[ 0 ] < b[ 0 ] ? -1 : 1);
+  const urlParams = new URLSearchParams();
+  qsp.map(p => {
+    urlParams.append(p[ 0 ], p[ 1 ] as string);
+  });
+  const qs = urlParams.toString();
+  return qs;
 };

package/src/services/eventbridge-integration-service.ts

@@ -1,4 +1,4 @@
-import { EventBridgeClient } from '../clients';
+import { EventBridgeClient } from '../clients/generic/eventbridge-client.js';
 import { Message, TemplatedMessage } from 'postmark';
 
 export const enum PostmarkRequestType {

package/src/services/index.ts

@@ -1 +1 @@
-export * from './eventbridge-integration-service';
+export * from './eventbridge-integration-service.js';

package/src/types/index.ts

@@ -1 +1 @@
-export * from './internal-events';
+export * from './internal-events/index.js';

package/src/types/internal-events/event-detail-types.ts

@@ -1,10 +1,10 @@
-export enum ADTRACKIFY_EVENT_TYPES {
-  NOTIFY_SHOPIFY_SUBSCRIPTION_CREATED = 'shopifySubscriptionCreated',
-  NOTIFY_SUBSCRIPTION_SIGNUP_COMPLETED = 'subscription.signupCompleted',
-  REQUEST_SET_ACCOUNT_OWNER = 'setAccountOwner',
-  REQUEST_SET_ACCOUNT_SUBSCRIPTION_ID = 'setAccountSubscriptionId',
-}
-
-export enum ADTRACKIFY_EVENT_SOURCES {
-  SUBSCRIPTIONS = 'subscriptions',
+export enum ADTRACKIFY_EVENT_TYPES {
+  NOTIFY_SHOPIFY_SUBSCRIPTION_CREATED = 'shopifySubscriptionCreated',
+  NOTIFY_SUBSCRIPTION_SIGNUP_COMPLETED = 'subscription.signupCompleted',
+  REQUEST_SET_ACCOUNT_OWNER = 'setAccountOwner',
+  REQUEST_SET_ACCOUNT_SUBSCRIPTION_ID = 'setAccountSubscriptionId',
+}
+
+export enum ADTRACKIFY_EVENT_SOURCES {
+  SUBSCRIPTIONS = 'subscriptions',
 }

package/src/types/internal-events/index.ts

@@ -1 +1 @@
-export * from './event-detail-types';
+export * from './event-detail-types.js';

package/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "esnext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */,
     "module": "esnext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
-
+    "moduleResolution": "nodenext",
     "allowJs": false, /* Allow javascript files to be compiled. */
     "checkJs": false /* Report errors in .js files. */,
     "outDir": "dist", /* Redirect output to the directory. */
@@ -15,7 +15,6 @@
     "experimentalDecorators": true,
     "sourceMap": true,
     "declaration": true,
-    "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "removeComments": true,
@@ -28,7 +27,7 @@
     ]
   },
   "include": [
-    "./src"
+    "./src/**/*.ts"
   ],
   "exclude": [
     "node_modules"