fix: upgrade to node 16 and arc 10 and fix type

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
       - run: npm ci
       - name: Release
         env:

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
       - run: npm ci
       - name: Test
         run: npm run test
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
       - run: npm ci
       - name: Lint
         run: npm run lint

.node-version

@@ -0,0 +1 @@
+16.16.0

README.md

@@ -145,10 +145,10 @@ Subscription
 ```
 
 ```ts
-import { tables } from '@architect/functions'
+import { tables as arcTables } from '@architect/functions'
 
 const fetchTableNames = async () => {
-  const tables = await tables()
+  const tables = await arcTables()
 
   const ensureName = (table) => {
     const actualTableName = tables.name(table)
@@ -165,7 +165,7 @@ const fetchTableNames = async () => {
 }
 
 const subscriptionServer = makeServer({
-  dynamodb: tables.db,
+  dynamodb: tables._db,
   schema,
   tableNames: fetchTableNames(),
 })

lib/index-test.ts

@@ -1,18 +1,19 @@
 import { assert } from 'chai'
 import { Handler } from 'aws-lambda'
-import { tables } from '@architect/sandbox'
+import { start, end } from '@architect/sandbox'
 import { makeServer } from '.'
 import { mockServerArgs } from './test/mockServer'
 import { APIGatewayWebSocketEvent, WebSocketResponse } from './types'
+import { join } from 'path'
 
 describe('makeServer', () => {
   describe('webSocketHandler', () => {
     before(async () => {
-      await tables.start({ cwd: './mocks/arc-basic-events', quiet: true })
+      await start({ cwd: join(process.cwd(),'./mocks/arc-basic-events'), quiet: true })
     })
 
     after(async () => {
-      await tables.end()
+      await end()
     })
 
     it('is type compatible with aws-lambda handler', async () => {

lib/messages/subscribe-test.ts

@@ -1,24 +1,25 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { assert } from 'chai'
-import { tables } from '@architect/sandbox'
+import { start, end } from '@architect/sandbox'
 import { subscribe } from './subscribe'
 import { mockServerContext } from '../test/mockServer'
 import { connection_init } from './connection_init'
 import { collect } from 'streaming-iterables'
 import { subscribe as pubsubSubscribe } from '../pubsub/subscribe'
 import { makeExecutableSchema } from '@graphql-tools/schema'
+import { join } from 'path'
 
 const connectionId = '7rWmyMbMr'
 const ConnectionId = connectionId
 const connectionInitEvent: any = { requestContext: { connectedAt: 1628905962601, connectionId, domainName: 'localhost:6001', eventType: 'MESSAGE', messageDirection: 'IN', messageId: 'Pn6evkpk2', requestId: 'gN1MPybyL', requestTimeEpoch: 1628905962602, routeKey: '$default', stage: 'testing' }, isBase64Encoded: false, body: '{"type":"connection_init"}' }
 
 describe('messages/subscribe', () => {
   beforeEach(async () => {
-    await tables.start({ cwd: './mocks/arc-basic-events', quiet: true })
+    await start({ cwd: join(process.cwd(),'./mocks/arc-basic-events'), quiet: true })
   })
 
   afterEach(async () => {
-    await tables.end()
+    await end()
   })
 
   it('executes a query/mutation', async () => {

lib/pubsub/complete-test.ts

@@ -1,14 +1,15 @@
-import { tables } from '@architect/sandbox'
+import { start, end } from '@architect/sandbox'
+import { join } from 'path'
 import { mockServerContext } from '../test/mockServer'
 import { complete } from './complete'
 
 describe('pubsub:complete', () => {
   before(async () => {
-    await tables.start({ cwd: './mocks/arc-basic-events', quiet: true })
+    await start({ cwd: join(process.cwd(), './mocks/arc-basic-events'), quiet: true })
   })
 
   after(async () => {
-    await tables.end()
+    await end()
   })
 
   it('takes a topic', async () => {

lib/pubsub/getFilteredSubs-test.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { tables } from '@architect/sandbox'
+import { start, end } from '@architect/sandbox'
 import { assert } from 'chai'
+import { join } from 'path'
 import { mockServerContext } from '../test/mockServer'
 import { collapseKeys, getFilteredSubs } from './getFilteredSubs'
 
@@ -29,11 +30,11 @@ const makeTopic = () => `topic-${count++}`
 
 describe('getFilteredSubs', () => {
   before(async () => {
-    await tables.start({ cwd: './mocks/arc-basic-events', quiet: true })
+    await start({ cwd: join(process.cwd(),'./mocks/arc-basic-events'), quiet: true })
   })
 
   after(async () => {
-    await tables.end()
+    await end()
   })
 
   it('can match on no filter', async () => {

lib/test/integration-events-test.ts

@@ -1,19 +1,22 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { assert } from 'chai'
-import { start as sandBoxStart, end as sandBoxStop } from '@architect/sandbox'
+import { start as sandboxStart, end as sandboxEnd } from '@architect/sandbox'
 import { collect, map } from 'streaming-iterables'
 import { executeDoubleQuery, executeQuery, executeToComplete, executeToDisconnect } from './execute-helper'
 import { startGqlWSServer } from './graphql-ws-schema'
+import { join } from 'path'
 
 describe('Events', () => {
   before(async () => {
-    await sandBoxStart({ cwd: './mocks/arc-basic-events', quiet: true })
+    await sandboxStart({ cwd: join(process.cwd(), './mocks/arc-basic-events'), quiet: true })
   })
 
   after(async () => {
-    await new Promise(resolve => setTimeout(resolve, 100)) // pending ddb writes need to finish
-    await sandBoxStop()
+    // pending ddb writes need to finish, this is annoying
+    await new Promise(resolve => setTimeout(resolve, 100))
+    await sandboxEnd()
   })
+
   describe('Basic Events', () => {
     it('queries', async () => {
       const { url, stop } = await startGqlWSServer()

lib/test/mockServer.ts

@@ -47,7 +47,7 @@ export const mockServerArgs = async (args: Partial<ServerArgs> = {}): Promise<Se
   const tables = await arcTables()
 
   return {
-    dynamodb: arcTables.db,
+    dynamodb: tables._db,
     schema,
     tableNames: {
       connections: ensureName(tables, 'Connection'),

lib/test/setup.js

@@ -0,0 +1,8 @@
+import { use, assert } from 'chai'
+import chaiSubset from 'chai-subset'
+
+process.env.PORT = '6001'
+
+global.assert = assert
+
+use(chaiSubset)

lib/types.ts

@@ -195,8 +195,8 @@ export type MessageHandler<T> = (arg: { server: ServerClosure, event: APIGateway
   Matches the ApiGatewayManagementApi class from aws-sdk but only provides the methods we use
 */
 export interface ApiGatewayManagementApiSubset {
-  postToConnection(input: { ConnectionId: string, Data: string }): { promise: () => Promise<void> }
-  deleteConnection(input: { ConnectionId: string }): { promise: () => Promise<void> }
+  postToConnection(input: { ConnectionId: string, Data: string }): { promise: () => Promise<any> }
+  deleteConnection(input: { ConnectionId: string }): { promise: () => Promise<any> }
 }
 
 

mocks/arc-basic-events/app.arc

@@ -3,9 +3,6 @@ basic-events
 
 @ws
 
-@static
-folder dist
-
 @tables
 Connection
   id *String
@@ -14,8 +11,7 @@ Subscription
   id *String
   ttl TTL
 
-@indexes
-
+@tables-indexes
 Subscription
   connectionId *String
   name ConnectionIndex

mocks/arc-basic-events/lib/graphql.js → mocks/arc-basic-events/lib/graphql.ts

@@ -1,9 +1,7 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-require('esbuild-register')
-const { makeExecutableSchema } = require('@graphql-tools/schema')
-const { tables: arcTables, ws } = require('@architect/functions')
-const { makeServer, subscribe } = require('../../../lib')
-const { GraphQLError } = require('graphql')
+import { makeExecutableSchema } from '@graphql-tools/schema'
+import { tables as arcTables, ws } from '@architect/functions'
+import { makeServer, subscribe } from '../../../lib'
+import { GraphQLError } from 'graphql'
 
 const typeDefs = `
   type Query {
@@ -148,7 +146,7 @@ const schema = makeExecutableSchema({
 const fetchTableNames = async () => {
   const tables = await arcTables()
 
-  const ensureName = (table) => {
+  const ensureName = (table: string) => {
     const actualTableName = tables.name(table)
     if (!actualTableName) {
       throw new Error(`No table found for ${table}`)
@@ -163,7 +161,7 @@ const fetchTableNames = async () => {
 }
 
 const subscriptionServer = makeServer({
-  dynamodb: arcTables.db,
+  dynamodb: arcTables().then(tables => tables._db),
   schema,
   tableNames: fetchTableNames(),
   apiGatewayManagementApi: ws._api,
@@ -172,4 +170,4 @@ const subscriptionServer = makeServer({
   },
 })
 
-module.exports = { subscriptionServer }
+export { subscriptionServer }

mocks/arc-basic-events/src/ws/connect/index.js

@@ -1,3 +1,4 @@
+require('esbuild-register')
 const { subscriptionServer } = require('../../../lib/graphql')
 
 exports.handler = subscriptionServer.webSocketHandler

mocks/arc-basic-events/src/ws/default/index.js

@@ -1,3 +1,4 @@
+require('esbuild-register')
 const { subscriptionServer } = require('../../../lib/graphql')
 
 exports.handler = subscriptionServer.webSocketHandler

mocks/arc-basic-events/src/ws/disconnect/index.js

@@ -1,3 +1,4 @@
+require('esbuild-register')
 const { subscriptionServer } = require('../../../lib/graphql')
 
 exports.handler = subscriptionServer.webSocketHandler