fix: handle response erroring and invalid content types (#10)

Author: dsherret

.github/workflows/ci.yml

@@ -4,8 +4,10 @@ jobs:
   CI:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: bvm/gh-action@v1.1.0
+      - uses: actions/checkout@v4
+      - uses: denoland/setup-deno@v1
+        with:
+          deno-version: v1.x
       - name: Test
         run: deno test --allow-net
       - name: Get tag version
@@ -14,10 +16,10 @@ jobs:
         run: echo ::set-output name=TAG_VERSION::${GITHUB_REF/refs\/tags\//}
       - uses: actions/setup-node@v2
         with:
-          node-version: '16.x'
+          node-version: '18.x'
           registry-url: 'https://registry.npmjs.org'
       - name: npm build
-        run: deno run -A --no-check ./scripts/build_npm.ts ${{steps.get_tag_version.outputs.TAG_VERSION}}
+        run: deno task build:npm ${{steps.get_tag_version.outputs.TAG_VERSION}}
       - name: npm publish
         if: startsWith(github.ref, 'refs/tags/')
         env:

.gitignore

@@ -1 +1,3 @@
+.vscode
 npm
+deno.lock

.vscode/settings.json

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020-2022 David Sherret
+Copyright (c) 2020-2023 David Sherret
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -0,0 +1,8 @@
+{
+  "tasks": {
+    "build:npm": "deno run -A ./scripts/build_npm.ts"
+  },
+  "exclude": [
+    "npm"
+  ]
+}

bvm.json

@@ -1,20 +1,11 @@
 {
-  "typescript": {
-    "indentWidth": 2
-  },
-  "json": {
-    "indentWidth": 2
-  },
-  "markdown": {
-  },
-  "includes": ["**/*.{ts,tsx,js,jsx,cjs,mjs,json,md}"],
   "excludes": [
     "**/node_modules",
     "**/*-lock.json"
   ],
   "plugins": [
-    "https://plugins.dprint.dev/typescript-0.74.0.wasm",
-    "https://plugins.dprint.dev/json-0.15.6.wasm",
-    "https://plugins.dprint.dev/markdown-0.14.1.wasm"
+    "https://plugins.dprint.dev/typescript-0.88.7.wasm",
+    "https://plugins.dprint.dev/json-0.19.1.wasm",
+    "https://plugins.dprint.dev/markdown-0.16.3.wasm"
   ]
 }

deno.json

@@ -86,39 +86,41 @@ export function createImportObject(): WebAssembly.Imports {
 }
 
 export interface ResponseLike {
+  status: number;
   arrayBuffer(): Promise<BufferSource>;
+  text(): Promise<string>;
+  headers: {
+    get(name: string): string | null;
+  };
 }
 
 /**
  * Creates a formatter from the specified streaming source.
  * @remarks This is the most efficient way to create a formatter.
  * @param response - The streaming source to create the formatter from.
  */
-export function createStreaming(
-  response: Promise<ResponseLike>,
+export async function createStreaming(
+  responsePromise: Promise<ResponseLike> | ResponseLike,
 ): Promise<Formatter> {
-  if (typeof WebAssembly.instantiateStreaming === "function") {
+  const response = await responsePromise;
+  if (response.status !== 200) {
+    throw new Error(
+      `Unexpected status code: ${response.status}\n${await response.text()}`,
+    );
+  }
+  if (
+    typeof WebAssembly.instantiateStreaming === "function"
+    && response.headers.get("content-type") === "application/wasm"
+  ) {
     return WebAssembly
       // deno-lint-ignore no-explicit-any
       .instantiateStreaming(response as any, createImportObject())
       .then((obj) => createFromInstance(obj.instance));
   } else {
-    // fallback for node.js
-    return getArrayBuffer()
+    // fallback for node.js or when the content type isn't application/wasm
+    return response.arrayBuffer()
       .then((buffer) => createFromBuffer(buffer));
   }
-
-  function getArrayBuffer() {
-    if (isResponse(response)) {
-      return response.arrayBuffer();
-    } else {
-      return response.then((response) => response.arrayBuffer());
-    }
-
-    function isResponse(response: unknown): response is ResponseLike {
-      return (response as Response).arrayBuffer != null;
-    }
-  }
 }
 
 /**

dprint.json

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/std@0.113.0/testing/asserts.ts";
+import { assertEquals } from "https://deno.land/std@0.210.0/assert/mod.ts";
 import { createFromBuffer, createStreaming, Formatter, GlobalConfiguration } from "./mod.ts";
 
 Deno.test("it should create streaming", async () => {

mod.ts

@@ -1,8 +1,7 @@
-import { build } from "https://deno.land/x/dnt@0.14.0/mod.ts";
+import { build } from "https://deno.land/x/dnt@0.39.0/mod.ts";
 
 await build({
   entryPoints: ["mod.ts"],
-  typeCheck: true,
   test: true,
   outDir: "./npm",
   shims: {
@@ -17,6 +16,9 @@ await build({
       },
     }],
   },
+  compilerOptions: {
+    lib: ["ES2021", "DOM"],
+  },
   package: {
     name: "@dprint/formatter",
     version: Deno.args[0],