@cascateer/database 0.0.3 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cascateer/database",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cascateer/database.git"

package/src/file.ts

@@ -1,20 +1,13 @@
 import { createHash } from "crypto";
 import { createReadStream } from "fs";
-import { Ora } from "ora";
 import { extname, relative, resolve } from "path";
 import { defaults } from "./defaults";
-import { FileTable } from "./types";
 
 export class File {
   static BASE_URL = defaults.FILE_BASE_URL;
 
   static fromPath = (path: string) => new File(relative(this.BASE_URL, path));
 
-  static fromUrl = (table: FileTable, url: string, spinner?: Ora) =>
-    table
-      .accessSome([url], spinner)
-      .then(([{ name, checksum }]) => new File(name).verified(checksum));
-
   constructor(public name: string) {}
 
   get path() {

package/src/table.ts

@@ -18,8 +18,10 @@ import { resolve } from "path";
 import { mergeMap, NextObserver, Subject, Subscription } from "rxjs";
 import { v4 } from "uuid";
 import { defaults } from "./defaults";
+import { File } from "./file";
 import { reduceActions } from "./observables/reduceActions";
 import {
+  FileTableRecord,
   TableAction,
   TableActionCreator,
   TableActionCreatorResult,
@@ -282,3 +284,10 @@ export const createTable = memoize(
     },
   nthArg(0),
 );
+
+export class FileTable extends Table<FileTableRecord, "originalUrl"> {
+  fromUrl = (url: string, spinner?: Ora) =>
+    this.accessSome([url], spinner).then(([{ name, checksum }]) =>
+      new File(name).verified(checksum),
+    );
+}

package/src/types.ts

@@ -2,7 +2,6 @@ import { MaybePromise } from "@cascateer/lib";
 import { LazyPromise } from "@cascateer/lib/promises";
 import { Function1 } from "lodash";
 import { Ora } from "ora";
-import { Table } from "./table";
 
 interface BaseTableAction<Type> {
   id: string;
@@ -73,5 +72,3 @@ export interface FileTableRecord {
   name: string;
   checksum: string;
 }
-
-export interface FileTable extends Table<FileTableRecord, "originalUrl"> {}