Module refactoring

src/apps/cif2bcif/converter.ts

@@ -4,7 +4,7 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import Iterator from 'mol-base/collections/iterator'
+import Iterator from 'mol-data/iterator'
 import CIF, { Category } from 'mol-io/reader/cif'
 import * as Encoder from 'mol-io/writer/cif'
 import * as fs from 'fs'

src/apps/cif2bcif/field-classifier.ts

@@ -4,7 +4,7 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import { Column } from 'mol-base/collections/database'
+import { Column } from 'mol-data/db'
 import { Field } from 'mol-io/reader/cif/data-model'
 import { FieldDefinition, FieldType } from 'mol-io/writer/cif/encoder'
 

src/apps/domain-annotation-server/mapping.ts

@@ -4,7 +4,7 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import { Table } from 'mol-base/collections/database'
+import { Table } from 'mol-data/db'
 import { CIFEncoder, create as createEncoder } from 'mol-io/writer/cif'
 import * as S from './schemas'
 import { getCategoryInstanceProvider } from './utils'

src/apps/domain-annotation-server/schemas.ts

@@ -4,7 +4,7 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import { Column } from 'mol-base/collections/database'
+import { Column } from 'mol-data/db'
 
 import Type = Column.Schema
 

src/apps/domain-annotation-server/utils.ts

@@ -4,8 +4,8 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import { Table } from 'mol-base/collections/database'
-import Iterator from 'mol-base/collections/iterator'
+import { Table } from 'mol-data/db'
+import Iterator from 'mol-data/iterator'
 import * as Encoder from 'mol-io/writer/cif'
 
 function columnValue(k: string) {

src/mol-base/utils/uuid.ts

-/**
- * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
- *
- * @author David Sehnal <david.sehnal@gmail.com>
- */
-
-import now from './time'
-
-export default interface UUID extends String { '@type': 'uuid' }
-
-export function newUUID(): UUID {
-    let d = (+new Date()) + now();
-    const uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-        const r = (d + Math.random()*16)%16 | 0;
-        d = Math.floor(d/16);
-        return (c==='x' ? r : (r&0x3|0x8)).toString(16);
-    });
-    return uuid as any;
-}
\ No newline at end of file

src/mol-base/collections/_spec/equiv-index.spec.ts → src/mol-data/_spec/equiv-index.spec.ts

@@ -4,7 +4,7 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import EquivalenceClasses from '../equivalence-classes'
+import EquivalenceClasses from '../util/equivalence-classes'
 
 describe('equiv-classes', () => {
     it('integer mod classes', () => {

src/mol-base/collections/_spec/sort.spec.ts → src/mol-data/_spec/sort.spec.ts

@@ -4,7 +4,7 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import * as Sort from '../sort'
+import * as Sort from '../util/sort'
 
 function shuffle<T>(data: T, len: number, clone: (s: T) => T, swap: Sort.Swapper = Sort.arraySwap) {
     const a = clone(data);

src/mol-base/collections/database.ts → src/mol-data/db.ts

@@ -4,9 +4,9 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import Database from './database/database'
-import Table from './database/table'
-import Column from './database/column'
-import * as ColumnHelpers from './database/column-helpers'
+import Database from './db/database'
+import Table from './db/table'
+import Column from './db/column'
+import * as ColumnHelpers from './db/column-helpers'
 
 export { Database, Table, Column, ColumnHelpers }
\ No newline at end of file

src/mol-base/collections/database/column.ts → src/mol-data/db/column.ts

@@ -5,7 +5,7 @@
  */
 
 import * as ColumnHelpers from './column-helpers'
-import Tensors from '../../math/tensor'
+import { Tensor as Tensors } from 'mol-math/linear-algebra'
 
 interface Column<T> {
     readonly '@type': Column.Type,

src/mol-base/collections/database/table.ts → src/mol-data/db/table.ts

@@ -5,7 +5,7 @@
  */
 
 import Column from './column'
-import { sortArray } from '../sort'
+import { sortArray } from '../util/sort'
 
 /** A collection of columns */
 type Table<Schema extends Table.Schema> = {

src/mol-data/index.ts

+/**
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author David Sehnal <david.sehnal@gmail.com>
+ */
+
+import * as DB from './db'
+import * as Int from './int'
+import Iterator from './iterator'
+import * as Util from './util'
+
+export { DB, Int, Iterator, Util }
\ No newline at end of file

src/mol-base/collections/integer.ts → src/mol-data/int.ts

@@ -4,12 +4,12 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import Interval from './integer/interval'
-import OrderedSet from './integer/ordered-set'
-import Segmentation from './integer/segmentation'
-import SortedArray from './integer/sorted-array'
-import Tuple from './integer/tuple'
-import LinkedIndex from './integer/linked-index'
+import Interval from './int/interval'
+import OrderedSet from './int/ordered-set'
+import Segmentation from './int/segmentation'
+import SortedArray from './int/sorted-array'
+import Tuple from './int/tuple'
+import LinkedIndex from './int/linked-index'
 import Iterator from './iterator'
 
 export { Interval, OrderedSet, Segmentation, SortedArray, Tuple, LinkedIndex, Iterator }
\ No newline at end of file