@creator.co/wapi 1.7.0 → 1.7.1-alpha1

package/src/Database/integrations/pgsql/PostgresTransaction.ts

@@ -1,4 +1,4 @@
-import { Pool, PoolClient } from 'pg'
+import * as pg from 'pg'
 
 import { PostgresDatabase } from './PostgresDatabase'
 import { Database } from '../../Database'
@@ -8,7 +8,7 @@ import { DatabaseTransaction } from '../../DatabaseTransaction'
  * A type alias representing a Postgres transaction. It extends the `PostgresTransactionImpl`
  * interface and includes the `PoolClient` interface.
  */
-export type PostgresTransaction = PostgresTransactionImpl & PoolClient
+export type PostgresTransaction = PostgresTransactionImpl & pg.PoolClient
 
 /**
  * Represents a transaction in a Postgres database.
@@ -18,16 +18,16 @@ export class PostgresTransactionImpl extends DatabaseTransaction {
    * A Pool object used for writing operations.
    * @readonly
    */
-  public readonly writer: Pool
+  public readonly writer: pg.Pool
   /**
    * A readonly property representing a pool reader.
    */
-  public readonly reader: Pool
+  public readonly reader: pg.Pool
   /**
    * Represents a database transaction using a PoolClient.
    * @type {PoolClient}
    */
-  protected transaction: PoolClient
+  protected transaction: pg.PoolClient
   /**
    * A protected property representing a database of type Database<PostgresTransaction>.
    * This property is used to interact with a Postgres database using transactions.
@@ -39,7 +39,7 @@ export class PostgresTransactionImpl extends DatabaseTransaction {
    * @param {PostgresDatabase} database - The Postgres database instance.
    * @param {Pool} [reader] - The reader pool for database operations (optional).
    */
-  private constructor(writer: Pool, database: PostgresDatabase, reader?: Pool) {
+  private constructor(writer: pg.Pool, database: PostgresDatabase, reader?: pg.Pool) {
     super(writer, database, reader)
   }
 
@@ -51,9 +51,9 @@ export class PostgresTransactionImpl extends DatabaseTransaction {
    * @returns {Promise<PostgresTransaction>} A promise that resolves to a new PostgresTransaction instance.
    */
   public static async newTransaction(
-    writer: Pool,
+    writer: pg.Pool,
     database: PostgresDatabase,
-    reader?: Pool
+    reader?: pg.Pool
   ): Promise<PostgresTransaction> {
     const tx = new PostgresTransactionImpl(writer, database, reader)
     await tx.begin() // defaults to opened

package/src/Globals.ts

@@ -1,4 +1,4 @@
-import * as dotenv from 'dotenv'
+import dotenv from 'dotenv'
 
 import Utils from './Util/Utils'
 

package/src/Logger/Logger.ts

@@ -1,6 +1,6 @@
-import * as abind from 'abind'
-import * as stringify from 'json-stringify-safe'
-import * as stackTrace from 'stack-trace'
+import abind from 'abind'
+import stringify from 'json-stringify-safe'
+import stackTrace from 'stack-trace'
 
 import Utils from '../Util/Utils'
 

package/src/Mailer/Mailer.ts

@@ -1,8 +1,8 @@
 import * as SES from '@aws-sdk/client-ses'
 import { defaultProvider } from '@aws-sdk/credential-provider-node'
-import * as Email from 'email-templates'
-import * as nodemailer from 'nodemailer'
-import type * as SESTransport from 'nodemailer/lib/ses-transport'
+import Email from 'email-templates'
+import nodemailer from 'nodemailer'
+import type SESTransport from 'nodemailer/lib/ses-transport'
 
 export default class Mailer {
   /**

package/src/Publisher/Publisher.ts

@@ -4,7 +4,7 @@ import {
   PublishCommandOutput,
   PublishCommandInput,
 } from '@aws-sdk/client-sns'
-import * as sha1 from 'sha1'
+import sha1 from 'sha1'
 //reusable client
 /**
  * A variable that holds the connection to the SNS client for publishing messages.

package/src/Server/Router.ts

@@ -1,6 +1,6 @@
 import { Server as HTTPServer } from 'http'
 
-import * as express from 'express'
+import express from 'express'
 import { z } from 'zod'
 
 import ContainerServer from './lib/ContainerServer'

package/src/Server/lib/container/GenericHandlerEvent.ts

@@ -1,5 +1,5 @@
 import type { APIGatewayProxyEvent, Context } from 'aws-lambda'
-import * as cuid from 'cuid'
+import cuid from 'cuid'
 import { Request } from 'express'
 
 import { parseMultiValueQueryStringParameters, parseQueryStringParameters } from './Utils'

package/src/Server/lib/container/Proxy.ts

@@ -1,16 +1,19 @@
+import fs from 'fs'
 import { Server as HTTPServer, createServer } from 'http'
 
-import * as cors from 'cors'
-import * as express from 'express'
+import cors from 'cors'
+import express from 'express'
 
 import Server from './../Server'
 import GenericHandler from './GenericHandler'
 import HealthHandler from './HealthHandler'
-import { version as appVersion } from '../../../../package.json'
 import Globals from '../../../Globals'
 import Utils from '../../../Util/Utils'
 import { RouterConfig } from '../../Router'
 
+/* Get package.json version from Wapi on ESM */
+const { version: appVersion } = JSON.parse(fs.readFileSync('package.json').toString())
+
 /**
  * Represents a Proxy class that handles routing and server functionality.
  */

package/tests/API/Response.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { APIGatewayEvent, Context } from 'aws-lambda'
 import { expect as c_expect } from 'chai'
 

package/tests/BaseEvent/Transaction.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { expect as c_expect } from 'chai'
 
 import Response from '../../src/API/Response'

package/tests/Cache/Redis-client.test.ts

@@ -1,3 +1,5 @@
+import { jest } from '@jest/globals'
+
 import Redis from '../../src/Cache/Redis'
 
 let _connectionId = 1

package/tests/Cache/Redis-cluster.test.ts

@@ -1,3 +1,5 @@
+import { jest } from '@jest/globals'
+
 import Redis from '../../src/Cache/Redis'
 
 let _connectionId = 1

package/tests/Database/DatabaseManager.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { expect } from 'chai'
 
 import { DatabaseManager } from '../../src/Database'
@@ -17,13 +18,13 @@ describe('Database Manager', () => {
     const underTest = new DatabaseManager()
 
     underTest['databases'] = {
-      knex: jest.fn(config => {
+      knex: jest.fn((config: any) => {
         return { host: config.host, type: 'knex' } as any
       }) as any,
-      pg: jest.fn(config => {
+      pg: jest.fn((config: any) => {
         return { host: config.host, type: 'pg' } as any
       }) as any,
-      kysely: jest.fn(config => {
+      kysely: jest.fn((config: any) => {
         return { host: config.host, type: 'kysely' } as any
       }) as any,
     }

package/tests/Database/integrations/knex/KnexDatabase.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { Knex } from 'knex'
 
 import type { DbConfig } from '../../../../src/Database'

package/tests/Database/integrations/knex/KnexTransaction.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { Knex } from 'knex'
 
 import { DbConfig } from '../../../../src/Database'

package/tests/Database/integrations/kysely/KyselyDatabase.test.ts

@@ -1,5 +1,6 @@
+import { jest } from '@jest/globals'
 import { PostgresDialect } from 'kysely'
-import { PoolClient } from 'pg'
+import * as pg from 'pg'
 
 import type { DbConfig } from '../../../../src/Database'
 import { KyselyDatabase } from '../../../../src/Database/integrations/kysely/KyselyDatabase'
@@ -38,7 +39,7 @@ describe('KyselyDatabase', () => {
   let mockPgClient
   beforeEach(() => {
     mockTrans = {
-      execute: jest.fn(async cb => {
+      execute: jest.fn(async (cb: any) => {
         cb(mockTrans)
       }),
     } as any
@@ -68,7 +69,7 @@ describe('KyselyDatabase', () => {
       () =>
         ({
           connect: async () => mockPgTrans,
-        }) as PoolClient
+        }) as pg.PoolClient
     )
     KyselyDatabase['pgProvider'] = mockPgClient as any
   })

package/tests/Database/integrations/kysely/KyselyTransaction.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { Kysely, Transaction } from 'kysely'
 
 import type { DbConfig } from '../../../../src/Database'
@@ -23,7 +24,7 @@ const testResources = async (config: Partial<DbConfig<'kysely'>>) => {
 
   const transaction = jest.fn().mockImplementation(() => {
     return {
-      execute: jest.fn(async cb => {
+      execute: jest.fn(async (cb: any) => {
         try {
           await cb(transaction)
         } catch (e) {

package/tests/Database/integrations/pg/PostgresDatabase.test.ts

@@ -1,4 +1,5 @@
-import { PoolClient } from 'pg'
+import { jest } from '@jest/globals'
+import * as pg from 'pg'
 
 import type { DbConfig } from '../../../../src/Database'
 import { PostgresDatabase } from '../../../../src/Database/integrations/pgsql/PostgresDatabase'
@@ -39,7 +40,7 @@ describe('PostgresDatabase', () => {
       () =>
         ({
           connect: async () => mockTrans,
-        }) as PoolClient
+        }) as pg.PoolClient
     )
     PostgresDatabase['pgProvider'] = mockClient as any
   })

package/tests/Database/integrations/pg/PostgresTransaction.test.ts

@@ -1,4 +1,5 @@
-import { Pool, PoolClient } from 'pg'
+import { jest } from '@jest/globals'
+import * as pg from 'pg'
 
 import type { DbConfig } from '../../../../src/Database'
 import { PostgresDatabase } from '../../../../src/Database/integrations/pgsql/PostgresDatabase'
@@ -18,13 +19,13 @@ const testResources = async (config: Partial<DbConfig<'pg'>>) => {
       rollback: jest.fn(),
       query: jest.fn(),
     }
-  })() as any as PoolClient
+  })() as any as pg.PoolClient
 
   const writer = jest.fn().mockImplementation(() => {
     return {
       connect: jest.fn(() => transaction),
     }
-  })() as any as Pool
+  })() as any as pg.Pool
 
   return {
     transaction,

package/tests/Logger/Logger.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { expect as c_expect } from 'chai'
 
 // get console ref and mock before logger import

package/tests/Server/Router.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { expect } from 'chai'
 
 import ContainerServer from '../../src/Server/lib/ContainerServer'

package/tests/Server/lib/ContainerServer.test.ts

@@ -1,5 +1,6 @@
+import { jest } from '@jest/globals'
 import { expect as c_expect } from 'chai'
-import * as request from 'supertest'
+import request from 'supertest'
 import { z } from 'zod'
 
 import { HttpMethod } from '../../../src/API/Request'

package/tests/Server/lib/container/GenericHandler.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { APIGatewayProxyEvent, Context } from 'aws-lambda'
 import { expect as c_expect } from 'chai'
 import { Request, Response } from 'express'

package/tests/Server/lib/container/HealthHandler.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { expect as c_expect } from 'chai'
 import { Request, Response } from 'express'
 

package/tests/Server/lib/container/Proxy.test.ts

@@ -1,6 +1,7 @@
+import { jest } from '@jest/globals'
 import { APIGatewayProxyEvent, Context } from 'aws-lambda'
 import { expect as c_expect } from 'chai'
-import * as request from 'supertest'
+import request from 'supertest'
 
 import Globals from '../../../../src/Globals'
 import Proxy from '../../../../src/Server/lib/container/Proxy'

package/tests/Test.utils.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { APIGatewayEvent, Context, SQSEvent } from 'aws-lambda'
 import { z } from 'zod'
 
@@ -68,6 +69,6 @@ export function emptyQueueEvent(data?: any) {
 
 export function observableTransaction() {
   const t = new Transaction(emptyEvent(), observableContext())
-  t.responseProxy = jest.fn()
+  t.responseProxy = jest.fn() as any
   return t
 }

package/tsconfig.json

@@ -1,5 +1,6 @@
 {
-  "exclude": ["**/*.test.*", "**/__mocks__/*", "**/__tests__/*", "**/tests/*", "./dist/**/*"],
+  "exclude": ["**/*.test.*", "**/__mocks__/*", "**/__tests__/*", "**/tests/*", "./dist/**/*", "./smoke-tests/**/*", "./jest*", "./node_modules"],
+  "include": ["./**/*", "./package.json", "./package-lock.json"],
   "compilerOptions": {
     "lib": [
       "es5",
@@ -9,6 +10,7 @@
     "module": "esnext",
     "target": "es6",
     "moduleResolution": "node",
+    "esModuleInterop": true,
     "noImplicitAny": false,
     "noEmitOnError": true,
     "removeComments": false,

package/tsconfig.smoke.json

@@ -0,0 +1,26 @@
+{
+  "exclude": ["./dist/**/*", "./smoke-tests/**/*", "./node_modules", "./**/Logger.test.*"],
+  "include": ["./**/*", "./package.json", "./package-lock.json"],
+  "compilerOptions": {
+    "lib": [
+      "es5",
+      "es6",
+      "dom"
+    ],
+    "module": "esnext",
+    "target": "es6",
+    "moduleResolution": "node",
+    "noImplicitAny": false,
+    "noEmitOnError": true,
+    "removeComments": false,
+    "downlevelIteration": true,
+    "resolveJsonModule": true,
+    "sourceMap": true,
+    "esModuleInterop": true,
+    "outDir": "smoke-tests",
+    "declaration": true,
+    "skipLibCheck": true,
+    "strictNullChecks": true,
+    "noErrorTruncation": true
+  }
+}

package/dist/jest.config.d.ts

@@ -1,3 +0,0 @@
-import type { Config } from '@jest/types';
-declare const config: Config.InitialOptions;
-export default config;

package/dist/jest.config.js

@@ -1,32 +0,0 @@
-/* eslint-env node */
-const config = {
-    preset: 'ts-jest',
-    testEnvironment: 'node',
-    reporters: [
-        'default',
-        [
-            'jest-junit',
-            {
-                outputDirectory: 'coverage',
-                outputName: 'jest-junit.xml',
-                ancestorSeparator: ' › ',
-                uniqueOutputName: 'false',
-                suiteNameTemplate: '{filepath}',
-                classNameTemplate: '{classname}',
-                titleTemplate: '{title}',
-            },
-        ],
-    ],
-    coverageReporters: ['clover', 'json', 'lcov', ['text', { file: 'coverage.txt' }], 'json-summary'],
-    collectCoverageFrom: ['src/**/*.(t|j)s', '!src/**/*.d.(t|j)s'],
-    coverageThreshold: {
-        global: {
-            branches: 80,
-            functions: 80,
-            lines: 80,
-            statements: 80,
-        },
-    },
-};
-export default config;
-//# sourceMappingURL=jest.config.js.map

package/dist/jest.config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"jest.config.js","sourceRoot":"","sources":["../jest.config.ts"],"names":[],"mappings":"AACA,qBAAqB;AACrB,MAAM,MAAM,GAA0B;IACpC,MAAM,EAAE,SAAS;IACjB,eAAe,EAAE,MAAM;IACvB,SAAS,EAAE;QACT,SAAS;QACT;YACE,YAAY;YACZ;gBACE,eAAe,EAAE,UAAU;gBAC3B,UAAU,EAAE,gBAAgB;gBAC5B,iBAAiB,EAAE,KAAK;gBACxB,gBAAgB,EAAE,OAAO;gBACzB,iBAAiB,EAAE,YAAY;gBAC/B,iBAAiB,EAAE,aAAa;gBAChC,aAAa,EAAE,SAAS;aACzB;SACF;KACF;IACD,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,EAAE,cAAc,CAAC;IACjG,mBAAmB,EAAE,CAAC,iBAAiB,EAAE,oBAAoB,CAAC;IAC9D,iBAAiB,EAAE;QACjB,MAAM,EAAE;YACN,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,EAAE;YACb,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,EAAE;SACf;KACF;CACF,CAAA;AACD,eAAe,MAAM,CAAA"}

package/tests/main.test.ts

@@ -1,15 +0,0 @@
-// requireActual ensures you get the real file
-// instead of an automock
-// we use import type and <typeof ...> to still get types
-// import type * as Silly from "../silly"
-// const { sillyFunction } = jest.requireActual<typeof Silly>("../silly")
-
-describe('silly function', () => {
-  test('guaranteed random', () => {
-    expect(4).toBe(4)
-  })
-})
-
-// required with this small example
-// to make the isolatedModules config happy
-export {}