Merge pull request #52 from hayd/0.34.0

Bump to 0.34.0

example-sam/template.yml

@@ -11,7 +11,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:390065572566:applications/deno
-        SemanticVersion: 0.33.0
+        SemanticVersion: 0.34.0
 
   HelloWorldFunction:
     Type: AWS::Serverless::Function 

example-serverless/deps.ts

@@ -4,5 +4,5 @@ export {
   DynamoDBClient
 } from "https://deno.land/x/dynamodb@v0.2.0/mod.ts";
 
-import { v4 } from "https://deno.land/std@v0.33.0/uuid/mod.ts";
+import { v4 } from "https://deno.land/std@v0.34.0/uuid/mod.ts";
 export const uuid = v4.generate;

example-serverless/serverless.yml

@@ -64,7 +64,7 @@ resources:
       Properties:
         Location:
           ApplicationId: arn:aws:serverlessrepo:us-east-1:390065572566:applications/deno
-          SemanticVersion: 0.33.0
+          SemanticVersion: 0.34.0
 
     candidatesTable:
       Type: AWS::DynamoDB::Table

example-serverless/test.ts

@@ -7,7 +7,7 @@
 import {
   assert,
   assertEquals
-} from "https://deno.land/std@v0.33.0/testing/asserts.ts";
+} from "https://deno.land/std@v0.34.0/testing/asserts.ts";
 import {
   APIGatewayProxyEvent,
   Context

tests/Dockerfile

@@ -1,6 +1,6 @@
 # Note: This must be built in the .. context
 
-FROM hayd/deno:amazonlinux1-0.33.0
+FROM hayd/deno:amazonlinux1-0.34.0
 # This is the runtime used by AWS Lambda
 # plus a compatible deno executable /bin/deno.
 # https://github.com/hayd/deno_docker

tests/decorate.ts

@@ -1,10 +1,15 @@
-function decorate(target) {}
+import {
+  APIGatewayProxyEvent,
+  Context
+} from "https://deno.land/x/lambda/mod.ts";
+
+function decorate(target: any) {}
 
 @decorate
 class Foo {
 }
 
-export async function handler(event, context) {
+export async function handler(event: APIGatewayProxyEvent, context: Context) {
   return {
     statusCode: 200,
     body: `decorated 🦕`

tests/handlers.ts

@@ -4,7 +4,7 @@ import {
 } from "https://deno.land/x/lambda/mod.ts";
 
 class MyError extends Error {
-  constructor(message) {
+  constructor(message: string) {
     super(message);
     this.name = "MyError";
   }
@@ -14,7 +14,7 @@ export async function error(event: APIGatewayProxyEvent, context: Context) {
   throw new MyError("error thrown");
 }
 
-export async function foo(event, context) {
+export async function foo(event: any, context: Context) {
   // is there a foo attribute?! who knows!
   return event.foo || "a string";
 }
@@ -33,13 +33,13 @@ export async function withContext(
 
 // Note: This is evaluated prior to the redefinition of console.log in bootstrap.
 // This is a devious trick to catch the output of console.log and friends.
-let LOGGED = [];
+let LOGGED: any[] = [];
 const _log = console.log;
 console.log = (...args) => {
   LOGGED.push(args);
   _log(args);
 };
-export async function log(event, context) {
+export async function log(event: any, context: Context) {
   LOGGED = [];
   // pretty print with newlines
   const message = JSON.stringify({ message: event.hello }, null, 2);
@@ -56,10 +56,11 @@ export async function log(event, context) {
   };
 }
 
-export async function badPrefix(event, context) {
+export async function badPrefix(event: any, context: Context) {
   // assert warning message on init:
   console.log(event.hello);
   const log = LOGGED.map(args => {
+    // @ts-ignore
     return Deno[Deno.symbols.internal].stringifyArgs(args);
   });
   LOGGED = [];
@@ -70,7 +71,7 @@ export async function noArgs() {
   return {};
 }
 
-export async function runDeno(event, context) {
+export async function runDeno(event: APIGatewayProxyEvent, context: Context) {
   const r = Deno.run({ args: ["deno", "--version"], stdout: "piped" });
   const out = await r.output();
   const version = new TextDecoder().decode(out).split("\n")[0];
@@ -81,6 +82,6 @@ export async function wrongArgs(a: number, b: number, c: number) {
   return { result: a * b * c };
 }
 
-export async function xray(event, context) {
+export async function xray(event: APIGatewayProxyEvent, context: Context) {
   return { _X_AMZN_TRACE_ID: Deno.env("_X_AMZN_TRACE_ID") };
 }

tests/importmap.ts

@@ -1,6 +1,10 @@
+import {
+  APIGatewayProxyEvent,
+  Context
+} from "https://deno.land/x/lambda/mod.ts";
 import { pad } from "std/strings/pad.ts";
 
-export function handler(event, context) {
+export function handler(event: any, context: Context) {
   const strLen: number = Number(event.strLen) || 5;
   return pad("deno", strLen);
 }

tests/pad.ts

@@ -2,12 +2,12 @@
 // i.e. we must download precisely one file from deno.land.
 import { pad } from "https://deno.land/std/strings/pad.ts";
 
-export function handler(event, context) {
+export function handler(event: any, context: any) {
   const strLen: number = Number(event.strLen) || 5;
   return pad("deno", strLen);
 }
 
-export async function assertLock(event, context) {
+export async function assertLock(event: any, context: any) {
   // assert --lock was passed
   // Note: This is a file with external imports in order for -lock to be used.
   // FIXME remove this env hack and pull out the actual cli args from Deno itself.

tests/server.ts

@@ -10,7 +10,7 @@ export interface TestJson {
   files: string | string[];
   expected?: string;
   env: Record<string, string>;
-  headers?: any;
+  headers?: Record<string, Record<string, string | Record<string, string>>>;
   events: string[];
 }
 
@@ -79,11 +79,9 @@ export async function serveEvents(testJson: TestJson) {
         });
         if (testJson.headers) {
           for (let [k, v] of Object.entries(testJson.headers)) {
-            if (Object.prototype.toString.call(v) !== "[object String]") {
-              v = JSON.stringify(v);
-            }
-            assert(typeof v === "string");
-            headers.append(k, v.toString());
+            const vv = typeof v === "string" ? v : JSON.stringify(v);
+            assert(typeof vv === "string");
+            headers.append(k, vv);
           }
         }
         await req.respond({

tests/test_bundle.json

@@ -7,11 +7,11 @@
   "expected": [
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.33.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.34.0 🦕\"}"
     },
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.33.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.34.0 🦕\"}"
     }
   ],
   "files": ["hello.bundle.js"],

tests/test_example_zip.json

@@ -4,11 +4,11 @@
   "expected": [
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.33.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.34.0 🦕\"}"
     },
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.33.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.34.0 🦕\"}"
     }
   ],
   "files": "deno-lambda-example.zip",

tests/test_js.json

@@ -4,11 +4,11 @@
   "expected": [
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"body\":\"Welcome to deno 0.33.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"body\":\"Welcome to deno 0.34.0 🦕\"}"
     },
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"body\":\"Welcome to deno 0.33.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"body\":\"Welcome to deno 0.34.0 🦕\"}"
     }
   ],
   "files": ["hello.js"],

tests/test_run_deno.json

@@ -4,11 +4,11 @@
   "expected": [
     {
       "status": "ok",
-      "content": "{\"out\":\"deno 0.33.0\"}"
+      "content": "{\"out\":\"deno 0.34.0\"}"
     },
     {
       "status": "ok",
-      "content": "{\"out\":\"deno 0.33.0\"}"
+      "content": "{\"out\":\"deno 0.34.0\"}"
     }
   ],
   "files": ["handlers.ts"],

tests/test_self_contained.json

@@ -4,11 +4,11 @@
   "expected": [
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.33.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.34.0 🦕\"}"
     },
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.33.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.34.0 🦕\"}"
     }
   ],
   "files": ["hello.ts", "bootstrap", "bin/deno"]

tests/test_simple.json

@@ -4,11 +4,11 @@
   "expected": [
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.33.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.34.0 🦕\"}"
     },
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.33.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.34.0 🦕\"}"
     }
   ],
   "files": ["hello.ts"],