@brianbuie/node-kit 0.3.0 → 0.4.0

package/.dist/Cache.d.ts

@@ -1,6 +1,5 @@
 export declare class Cache<T> {
     file: {
-        addExt(filepath: string): string;
         read(): {
             createdAt: number;
             value: T;

package/.dist/Fetcher.js

@@ -10,7 +10,7 @@ export class Fetcher {
     constructor(opts = {}) {
         const defaultOptions = {
             timeout: 60000,
-            retries: 3,
+            retries: 0,
             retryDelay: 3000,
         };
         this.defaultOptions = merge(defaultOptions, opts);

package/.dist/File.d.ts

@@ -14,26 +14,25 @@ export declare class File {
      */
     lines(): string[];
     static get Adaptor(): typeof FileAdaptor;
-    json<T>(): JsonFile<T>;
+    json<T>(contents?: T): JsonFile<T>;
     static get json(): typeof JsonFile;
-    ndjson<T>(): NdjsonFile<T>;
+    ndjson<T>(contents?: T): NdjsonFile<T>;
     static get ndjson(): typeof NdjsonFile;
 }
-declare class FileAdaptor {
+declare class FileAdaptor<T = string> {
     file: File;
-    constructor(file: string | File);
-    addExt(filepath: string): string;
+    constructor(filepath: string, contents?: T);
     get exists(): boolean;
     get path(): string;
 }
 declare class JsonFile<T> extends FileAdaptor {
-    addExt(filepath: string): string;
+    constructor(filepath: string, contents?: T);
     read(): T | undefined;
     write(contents: T): void;
 }
 declare class NdjsonFile<T> extends FileAdaptor {
-    addExt(filepath: string): string;
-    lines(): T[];
+    constructor(filepath: string, contents?: T);
     append(lines: T | T[]): void;
+    lines(): T[];
 }
 export {};

package/.dist/File.js

@@ -36,14 +36,14 @@ export class File {
     static get Adaptor() {
         return FileAdaptor;
     }
-    json() {
-        return new JsonFile(this);
+    json(contents) {
+        return new JsonFile(this.path, contents);
     }
     static get json() {
         return JsonFile;
     }
-    ndjson() {
-        return new NdjsonFile(this);
+    ndjson(contents) {
+        return new NdjsonFile(this.path, contents);
     }
     static get ndjson() {
         return NdjsonFile;
@@ -51,23 +51,15 @@ export class File {
 }
 class FileAdaptor {
     file;
-    constructor(file) {
-        if (file instanceof File) {
-            const withExt = this.addExt(file.path);
-            if (withExt === file.path) {
-                this.file = file;
+    constructor(filepath, contents) {
+        this.file = new File(filepath);
+        if (contents) {
+            if (typeof contents !== 'string') {
+                throw new Error('File contents must be a string');
             }
-            else {
-                this.file = new File(withExt);
-            }
-        }
-        else {
-            this.file = new File(this.addExt(file));
+            this.file.write(contents);
         }
     }
-    addExt(filepath) {
-        return filepath;
-    }
     get exists() {
         return this.file.exists;
     }
@@ -76,8 +68,10 @@ class FileAdaptor {
     }
 }
 class JsonFile extends FileAdaptor {
-    addExt(filepath) {
-        return filepath.endsWith('.json') ? filepath : filepath + '.json';
+    constructor(filepath, contents) {
+        super(filepath.endsWith('.json') ? filepath : filepath + '.json');
+        if (contents)
+            this.write(contents);
     }
     read() {
         const contents = this.file.read();
@@ -88,16 +82,15 @@ class JsonFile extends FileAdaptor {
     }
 }
 class NdjsonFile extends FileAdaptor {
-    addExt(filepath) {
-        return filepath.endsWith('.ndjson') ? filepath : filepath + '.ndjson';
+    constructor(filepath, contents) {
+        super(filepath.endsWith('.ndjson') ? filepath : filepath + '.ndjson');
+        if (contents)
+            this.append(contents);
+    }
+    append(lines) {
+        this.file.append(Array.isArray(lines) ? lines.map((l) => JSON.stringify(snapshot(l))) : JSON.stringify(snapshot(lines)));
     }
     lines() {
         return this.file.lines().map((l) => JSON.parse(l));
     }
-    append(lines) {
-        const contents = Array.isArray(lines)
-            ? lines.map((l) => JSON.stringify(snapshot(l)))
-            : JSON.stringify(snapshot(lines));
-        this.file.append(contents);
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brianbuie/node-kit",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "license": "ISC",
   "repository": {
     "type": "git",

package/src/Fetcher.ts

@@ -27,7 +27,7 @@ export class Fetcher {
   constructor(opts: FetchOptions = {}) {
     const defaultOptions = {
       timeout: 60000,
-      retries: 3,
+      retries: 0,
       retryDelay: 3000,
     };
     this.defaultOptions = merge(defaultOptions, opts);

package/src/File.test.ts

@@ -51,8 +51,7 @@ describe('File.ndjson', () => {
 
 describe('File.json', () => {
   it('Saves data as json', () => {
-    const file = testDir.file('jsonfile-data').json<typeof thing>();
-    file.write(thing);
+    const file = testDir.file('jsonfile-data').json(thing);
     assert(isEqual(file.read(), thing));
     file.write(thing);
     assert(isEqual(file.read(), thing));

package/src/File.ts

@@ -44,16 +44,16 @@ export class File {
     return FileAdaptor;
   }
 
-  json<T>() {
-    return new JsonFile<T>(this);
+  json<T>(contents?: T) {
+    return new JsonFile<T>(this.path, contents);
   }
 
   static get json() {
     return JsonFile;
   }
 
-  ndjson<T>() {
-    return new NdjsonFile<T>(this);
+  ndjson<T>(contents?: T) {
+    return new NdjsonFile<T>(this.path, contents);
   }
 
   static get ndjson() {
@@ -61,26 +61,19 @@ export class File {
   }
 }
 
-class FileAdaptor {
+class FileAdaptor<T = string> {
   file;
 
-  constructor(file: string | File) {
-    if (file instanceof File) {
-      const withExt = this.addExt(file.path);
-      if (withExt === file.path) {
-        this.file = file;
-      } else {
-        this.file = new File(withExt);
+  constructor(filepath: string, contents?: T) {
+    this.file = new File(filepath);
+    if (contents) {
+      if (typeof contents !== 'string') {
+        throw new Error('File contents must be a string');
       }
-    } else {
-      this.file = new File(this.addExt(file));
+      this.file.write(contents);
     }
   }
 
-  addExt(filepath: string) {
-    return filepath;
-  }
-
   get exists() {
     return this.file.exists;
   }
@@ -91,8 +84,9 @@ class FileAdaptor {
 }
 
 class JsonFile<T> extends FileAdaptor {
-  addExt(filepath: string) {
-    return filepath.endsWith('.json') ? filepath : filepath + '.json';
+  constructor(filepath: string, contents?: T) {
+    super(filepath.endsWith('.json') ? filepath : filepath + '.json');
+    if (contents) this.write(contents);
   }
 
   read() {
@@ -106,18 +100,18 @@ class JsonFile<T> extends FileAdaptor {
 }
 
 class NdjsonFile<T> extends FileAdaptor {
-  addExt(filepath: string) {
-    return filepath.endsWith('.ndjson') ? filepath : filepath + '.ndjson';
+  constructor(filepath: string, contents?: T) {
+    super(filepath.endsWith('.ndjson') ? filepath : filepath + '.ndjson');
+    if (contents) this.append(contents);
   }
 
-  lines() {
-    return this.file.lines().map((l) => JSON.parse(l) as T);
+  append(lines: T | T[]) {
+    this.file.append(
+      Array.isArray(lines) ? lines.map((l) => JSON.stringify(snapshot(l))) : JSON.stringify(snapshot(lines))
+    );
   }
 
-  append(lines: T | T[]) {
-    const contents = Array.isArray(lines)
-      ? lines.map((l) => JSON.stringify(snapshot(l)))
-      : JSON.stringify(snapshot(lines));
-    this.file.append(contents);
+  lines() {
+    return this.file.lines().map((l) => JSON.parse(l) as T);
   }
 }