update: Bump Deno to v1.0.0 (#51)

.github/workflows/ci.yml

@@ -25,8 +25,8 @@ jobs:
     - uses: actions/checkout@master
     - uses: denolib/setup-deno@master
       with:
-        deno-version: 0.42.0
+        deno-version: 1.0.0
     - name: Run tests
       run: |
         cp ./ormconfig.gh-actions.json ./ormconfig.json
-        deno run --allow-read --allow-write --allow-env --allow-net --config ./tsconfig.json -r ./test.ts
+        deno run --allow-read --allow-write --allow-env --allow-net --unstable --config ./tsconfig.json -r ./test.ts

dem.json

@@ -3,27 +3,27 @@
     {
       "protocol": "https",
       "path": "deno.land/std",
-      "version": "v0.42.0",
+      "version": "v0.51.0",
       "files": [
+        "/async/deferred.ts",
         "/fmt/colors.ts",
         "/fs/mod.ts",
         "/node/process.ts",
-        "/path/mod.ts",
-        "/util/async.ts"
+        "/path/mod.ts"
       ]
     },
     {
       "protocol": "https",
       "path": "deno.land/x/mysql",
-      "version": "1.9.1",
+      "version": "2.1.0",
       "files": [
         "/mod.ts"
       ]
     },
     {
       "protocol": "https",
       "path": "deno.land/x/postgres",
-      "version": "v0.3.11",
+      "version": "v0.4.0",
       "files": [
         "/mod.ts"
       ]
@@ -39,15 +39,15 @@
     {
       "protocol": "https",
       "path": "deno.land/x/sqlite",
-      "version": "73935087a1ebe9108d784503bc5474662ba54b73",
+      "version": "v1.0.0",
       "files": [
         "/mod.ts"
       ]
     },
     {
       "protocol": "https",
       "path": "unpkg.com/cac",
-      "version": "v6.5.8",
+      "version": "v6.5.9",
       "files": [
         "/mod.js"
       ]

src/connection/ConnectionOptionsReader.ts

@@ -116,7 +116,7 @@ export class ConnectionOptionsReader {
             connectionOptions = await mod.default;
 
         } else if (foundFileFormat === "json") {
-            connectionOptions = await import(configFile);
+            connectionOptions = await this.loadJson(configFile);
 
         } else if (foundFileFormat === "yml") {
             connectionOptions = new ConnectionOptionsYmlReader().read(configFile);
@@ -136,6 +136,12 @@ export class ConnectionOptionsReader {
         return undefined;
     }
 
+    protected async loadJson(path: string): Promise<ConnectionOptions> {
+        const content = await PlatformTools.readFile(path);
+        const decoder = new TextDecoder();
+        return JSON.parse(decoder.decode(content));
+    }
+
     /**
      * Normalize connection options.
      */

src/driver/DriverUtils.ts

@@ -1,6 +1,6 @@
 import { Driver } from "./Driver.ts";
 import { hash } from "../util/StringUtils.ts";
-import type { AutoSavable, AutoSavableDriver } from "./types/AutoSavable.ts";
+import type { AutoSavableDriver } from "./types/AutoSavable.ts";
 
     /**
  * Common driver utility functions.

src/driver/mysql/MysqlDriver.ts

@@ -19,7 +19,7 @@ import {ApplyValueTransformers} from "../../util/ApplyValueTransformers.ts";
 import {NotImplementedError} from "../../error/NotImplementedError.ts";
 import type * as DenoMysql from "../../../vendor/https/deno.land/x/mysql/mod.ts";
 import type {ReleaseConnection, RawExecuteResult} from "./typings.ts";
-import {deferred} from "../../../vendor/https/deno.land/std/util/async.ts";
+import {deferred} from "../../../vendor/https/deno.land/std/async/deferred.ts";
 
 /**
  * Organizes communication with MySQL DBMS.

src/driver/postgres/PostgresDriver.ts

@@ -915,7 +915,7 @@ export class PostgresDriver implements Driver {
 
         // build connection options for the driver
         const connectionOptions = Object.assign({}, {
-            host: credentials.host,
+            hostname: credentials.host,
             user: credentials.username,
             password: credentials.password,
             database: credentials.database,

src/platform/PlatformTools.ts

@@ -87,6 +87,10 @@ export class PlatformTools {
         return fs.existsSync(pathStr);
     }
 
+    static readFile(filename: string): Promise<Uint8Array> {
+        return Deno.readFile(filename);
+    }
+
     static readFileSync(filename: string): Buffer {
         throw new NotImplementedError('PlatformTools.readFileSync');
     }

src/util/PromiseQueue.ts

@@ -1,4 +1,4 @@
-import {deferred, Deferred} from "../../vendor/https/deno.land/std/util/async.ts";
+import {deferred, Deferred} from "../../vendor/https/deno.land/std/async/deferred.ts";
 
 export class PromiseQueue<T> {
     private queue = [] as Array<{ fn: () => Promise<T>, promise: Deferred<T> }>;

test/deps/global.ts

@@ -1 +1,7 @@
 (window as any)['global'] = window;
+
+// * `window.location` was removed in Deno@v1.0.0-rc1.
+// * Mocha depends on `window.location`.
+if ((window as any).location == null) {
+  (window as any).location = {};
+}

test/functional/relations/lazy-relations/basic-lazy-relation/basic-lazy-relations.ts

@@ -9,8 +9,8 @@ import {
     Category,
 } from "./entity/Category.ts";
 import {EntitySchema} from "../../../../../src/index.ts";
-import UserSchemaJSON from "./schema/user.json";
-import ProfileSchemaJSON from "./schema/profile.json";
+import UserSchemaJSON from "./schema/user.js";
+import ProfileSchemaJSON from "./schema/profile.js";
 
 /**
  * Because lazy relations are overriding prototype is impossible to run these tests on multiple connections.

test/functional/relations/lazy-relations/basic-lazy-relation/schema/profile.json → test/functional/relations/lazy-relations/basic-lazy-relation/schema/profile.js

@@ -1,4 +1,4 @@
-{
+export default {
   "name": "Profile",
   "table": {
     "name": "profile"
@@ -23,4 +23,4 @@
       "lazy": true
     }
   }
-}
+}

test/functional/relations/lazy-relations/basic-lazy-relation/schema/user.json → test/functional/relations/lazy-relations/basic-lazy-relation/schema/user.js

@@ -1,4 +1,4 @@
-{
+export default {
   "name": "User",
   "table": {
     "name": "user"
@@ -27,4 +27,4 @@
       "lazy": true
     }
   }
-}
+}

test/functional/repository/basic-methods/repository-basic-methods.ts

@@ -11,7 +11,7 @@ import {Blog} from "./entity/Blog.ts";
 import {Category} from "./entity/Category.ts";
 import {DeepPartial} from "../../../../src/common/DeepPartial.ts";
 import {EntitySchema} from "../../../../src/index.ts";
-import userSchema from "./schema/user.json";
+import userSchema from "./schema/user.js";
 
 describe("repository > basic methods", () => {
 

test/functional/repository/basic-methods/schema/user.json → test/functional/repository/basic-methods/schema/user.js

@@ -1,4 +1,4 @@
-{
+export default {
   "name": "User",
   "table": {
     "name": "user"
@@ -18,4 +18,4 @@
       "nullable": false
     }
   }
-}
+}

vendor/https/deno.land/std/async/deferred.ts

@@ -0,0 +1 @@
+export * from 'https://deno.land/std@v0.51.0/async/deferred.ts';

vendor/https/deno.land/std/fmt/colors.ts

@@ -1 +1 @@
-export * from 'https://deno.land/std@v0.42.0/fmt/colors.ts';
+export * from 'https://deno.land/std@v0.51.0/fmt/colors.ts';

vendor/https/deno.land/std/fs/mod.ts

@@ -1 +1 @@
-export * from 'https://deno.land/std@v0.42.0/fs/mod.ts';
+export * from 'https://deno.land/std@v0.51.0/fs/mod.ts';

vendor/https/deno.land/std/node/process.ts

@@ -1 +1 @@
-export * from 'https://deno.land/std@v0.42.0/node/process.ts';
+export * from 'https://deno.land/std@v0.51.0/node/process.ts';

vendor/https/deno.land/std/path/mod.ts

@@ -1 +1 @@
-export * from 'https://deno.land/std@v0.42.0/path/mod.ts';
+export * from 'https://deno.land/std@v0.51.0/path/mod.ts';

vendor/https/deno.land/x/mysql/mod.ts

@@ -1 +1 @@
-export * from 'https://deno.land/x/mysql@1.9.1/mod.ts';
+export * from 'https://deno.land/x/mysql@2.1.0/mod.ts';

vendor/https/deno.land/x/postgres/mod.ts

@@ -1 +1 @@
-export * from 'https://deno.land/x/postgres@v0.3.11/mod.ts';
+export * from 'https://deno.land/x/postgres@v0.4.0/mod.ts';

vendor/https/deno.land/x/sqlite/mod.ts

@@ -1 +1 @@
-export * from 'https://deno.land/x/sqlite@73935087a1ebe9108d784503bc5474662ba54b73/mod.ts';
+export * from 'https://deno.land/x/sqlite@v1.0.0/mod.ts';

vendor/https/unpkg.com/cac/mod.js

@@ -1 +1 @@
-export * from 'https://unpkg.com/cac@v6.5.8/mod.js';
+export * from 'https://unpkg.com/cac@v6.5.9/mod.js';