From 3d9f46a6cfc14d890d9899fdd4df2cc993478cc0 Mon Sep 17 00:00:00 2001
From: Yoshihisa Mochihara <motihara@gmail.com>
Date: Thu, 27 Dec 2018 10:45:58 +0100
Subject: Rename file.ts to dom_file.ts (#1423)

---
 js/dom_file.ts  | 25 +++++++++++++++++++++++++
 js/file.ts      | 28 ----------------------------
 js/form_data.ts |  8 ++++----
 3 files changed, 29 insertions(+), 32 deletions(-)
 create mode 100644 js/dom_file.ts
 delete mode 100644 js/file.ts

(limited to 'js')

diff --git a/js/dom_file.ts b/js/dom_file.ts
new file mode 100644
index 000000000..2c225248b
--- /dev/null
+++ b/js/dom_file.ts
@@ -0,0 +1,25 @@
+// Copyright 2018 the Deno authors. All rights reserved. MIT license.
+import * as domTypes from "./dom_types";
+import * as blob from "./blob";
+
+// TODO Rename this to DomFileImpl
+export class DenoFile extends blob.DenoBlob implements domTypes.DomFile {
+  lastModified: number;
+  name: string;
+
+  constructor(
+    fileBits: domTypes.BlobPart[],
+    fileName: string,
+    options?: domTypes.FilePropertyBag
+  ) {
+    options = options || {};
+    super(fileBits, options);
+
+    // 4.1.2.1 Replace any "/" character (U+002F SOLIDUS)
+    // with a ":" (U + 003A COLON)
+    this.name = String(fileName).replace(/\u002F/g, "\u003A");
+    // 4.1.3.3 If lastModified is not provided, set lastModified to the current
+    // date and time represented in number of milliseconds since the Unix Epoch.
+    this.lastModified = options.lastModified || Date.now();
+  }
+}
diff --git a/js/file.ts b/js/file.ts
deleted file mode 100644
index 6b5a4fbd0..000000000
--- a/js/file.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2018 the Deno authors. All rights reserved. MIT license.
-// TODO Rename this file to js/dom_file.ts it's currently too similarly named to
-// js/files.ts
-
-import * as domTypes from "./dom_types";
-import * as blob from "./blob";
-
-// TODO Rename this to DomFileImpl
-export class DenoFile extends blob.DenoBlob implements domTypes.DomFile {
-  lastModified: number;
-  name: string;
-
-  constructor(
-    fileBits: domTypes.BlobPart[],
-    fileName: string,
-    options?: domTypes.FilePropertyBag
-  ) {
-    options = options || {};
-    super(fileBits, options);
-
-    // 4.1.2.1 Replace any "/" character (U+002F SOLIDUS)
-    // with a ":" (U + 003A COLON)
-    this.name = String(fileName).replace(/\u002F/g, "\u003A");
-    // 4.1.3.3 If lastModified is not provided, set lastModified to the current
-    // date and time represented in number of milliseconds since the Unix Epoch.
-    this.lastModified = options.lastModified || Date.now();
-  }
-}
diff --git a/js/form_data.ts b/js/form_data.ts
index 163c33b74..8f89b54b5 100644
--- a/js/form_data.ts
+++ b/js/form_data.ts
@@ -1,7 +1,7 @@
 // Copyright 2018 the Deno authors. All rights reserved. MIT license.
 import * as domTypes from "./dom_types";
 import * as blob from "./blob";
-import * as file from "./file";
+import * as domFile from "./dom_file";
 import { DomIterableMixin } from "./mixins/dom_iterable";
 import { requiredArguments } from "./util";
 
@@ -22,7 +22,7 @@ class FormDataBase {
     requiredArguments("FormData.append", arguments.length, 2);
     name = String(name);
     if (value instanceof blob.DenoBlob) {
-      const dfile = new file.DenoFile([value], filename || name);
+      const dfile = new domFile.DenoFile([value], filename || name);
       this[dataSymbol].push([name, dfile]);
     } else {
       this[dataSymbol].push([name, String(value)]);
@@ -112,7 +112,7 @@ class FormDataBase {
       if (this[dataSymbol][i][0] === name) {
         if (!found) {
           if (value instanceof blob.DenoBlob) {
-            const dfile = new file.DenoFile([value], filename || name);
+            const dfile = new domFile.DenoFile([value], filename || name);
             this[dataSymbol][i][1] = dfile;
           } else {
             this[dataSymbol][i][1] = String(value);
@@ -129,7 +129,7 @@ class FormDataBase {
     // Otherwise, append entry to the context object’s entry list.
     if (!found) {
       if (value instanceof blob.DenoBlob) {
-        const dfile = new file.DenoFile([value], filename || name);
+        const dfile = new domFile.DenoFile([value], filename || name);
         this[dataSymbol].push([name, dfile]);
       } else {
         this[dataSymbol].push([name, String(value)]);
-- 
cgit v1.2.3