From b50dbbc2e5a89b0f44680e31b40eb9647b646226 Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Wed, 1 Nov 2017 10:52:07 +0100
Subject: [PATCH] Updated to TS 2.6
---
package-lock.json | Bin 156689 -> 156627 bytes
package.json | 4 ++--
src/mol-data/query/selection.ts | 1 +
src/mol-io/reader/cif/schema.ts | 2 ++
tsconfig.json | 1 +
5 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 7c59de544f879018656eb92fe3ca8a026f1778de..1ce79bb2dc8d4d8557caa3e2f73f46de4c4992d2 100644
GIT binary patch
delta 331
zcmbPug7flm&W0_FyDl@DO;%(xoStxrk#G91%ZzG_W|JM~D1{b!8)%niWS8XTIi^Qt
zdt?{7l_qBS<pz{n8mDCy`I~DyR~EY@R)o8nW)+17Sw;ls1ecX2=9@-&1!zZPR#iA!
zl&2<UXQW3)I+Y}aRapkRI~8P2e)vdyvcqeI=@YIpvU4bz>KW-7D(Ot$aF0=T`tK`@
zJ0@?8F`Hb#&c|pvIX+Nra)2O9XqLM{sd=)APo=hTV0L!6p+%UsUyzHRwn<XBM@mkf
zv4NkDVU&-NW0_l2RBm9ZzEfI$L8Nm@dWN&NcbHRXaB4}ENuYOfrK3SXq?x{nd$~nG
znZ@LQa_Q*}l8mC$cim$Y*uMQ5BTE>g+4MpYCX?wObeJR=%_d)bsU&4ymFH)cnOaoj
gSQ6-%?Gv7yTWIQ%Ug;W@HC>RGQF;4vU8XEE003QcHvj+t
delta 389
zcmcb7oO9v{&W0_FyDm@O=w&oL;SwX?^k0`5)h0L2m!BLU$PyY<QRV65n(pH7Ru-C`
zR~ir&;pdzdWtwL0TV@uN6KLpP8E$E0nw=XS<eZ)xW)!BKZsu-UnCl&yn;vfD5gJ%g
zU=UeYSQeCBn3P&&5~!bVmKKyh{h=$P+4TOaj2s+Frg}zt21+{9H{4^Co&Ng@<BrLF
zWoDBL*!d=3DANuL@d`1H$o4Wc(l#t}$ucqt@H6%HH!VsEEiyI<t#S=1Gl=ps$?|ck
zH1rJ32y}BwvaqZua4)oUPR}n(@k+~2_b)9ka4SjmsLV0Q%1knG&GC1sa-1AkE;YSD
zl2LT}u6v9E+qYk1WC>$5o!q$Fc=~%CCMibK$pHxpVDA@{_yh+Q8wHyLmIj;Y`@0yX
zI(oZn2b;QE1O}EAg_;J17#n$o`lLh!miQX_7>9>s8k>X{mzr2a=A~3+T2vJKCj~h=
jSq24^=zC{4T9)S&xVo85UwDC0e6oW$@AgbxrYti69F~S_
diff --git a/package.json b/package.json
index 11d5d2928..44477c283 100644
--- a/package.json
+++ b/package.json
@@ -37,13 +37,13 @@
"jest": "^21.2.1",
"rollup": "^0.50.0",
"rollup-plugin-buble": "^0.16.0",
- "rollup-plugin-commonjs": "^8.2.5",
+ "rollup-plugin-commonjs": "^8.2.6",
"rollup-plugin-json": "^2.3.0",
"rollup-plugin-node-resolve": "^3.0.0",
"rollup-watch": "^4.3.1",
"ts-jest": "^21.1.4",
"tslint": "^5.8.0",
- "typescript": "^2.5.3",
+ "typescript": "^2.6.1",
"uglify-js": "^3.1.6",
"util.promisify": "^1.0.0"
},
diff --git a/src/mol-data/query/selection.ts b/src/mol-data/query/selection.ts
index a509c40fe..1ae15e608 100644
--- a/src/mol-data/query/selection.ts
+++ b/src/mol-data/query/selection.ts
@@ -18,6 +18,7 @@ namespace Selection {
// TODO: 'structure iterator'
// TODO: selection builders (linear / unique)
// TODO: spatial lookup
+ // TODO: If all structures in a selection are "singletons", collapse them into a single structure
}
export default Selection
\ No newline at end of file
diff --git a/src/mol-io/reader/cif/schema.ts b/src/mol-io/reader/cif/schema.ts
index 67c11c14a..b1e7d8d35 100644
--- a/src/mol-io/reader/cif/schema.ts
+++ b/src/mol-io/reader/cif/schema.ts
@@ -60,6 +60,7 @@ function createColumn<T>(type: Column.Type, field: Data.Field, value: (row: numb
class _TypedFrame implements TypedFrame<any> { // tslint:disable-line:class-name
header = this._frame.header;
+ [k: string]: any;
constructor(public _frame: Data.Frame, schema: FrameSchema) {
for (const k of Object.keys(schema)) {
Object.defineProperty(this, k, { value: createTypedCategory(k, schema[k], _frame), enumerable: true, writable: false, configurable: false });
@@ -70,6 +71,7 @@ class _TypedFrame implements TypedFrame<any> { // tslint:disable-line:class-name
class _TypedCategory implements Table<any> { // tslint:disable-line:class-name
_rowCount = this._category.rowCount;
_columns: ReadonlyArray<string>;
+ [k: string]: any;
constructor(public _category: Data.Category, schema: Table.Schema, public _isDefined: boolean) {
const fieldKeys = Object.keys(schema);
this._columns = fieldKeys;
diff --git a/tsconfig.json b/tsconfig.json
index 750314b79..b0f81fbe9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,6 +7,7 @@
"sourceMap": false,
"noUnusedLocals": true,
"strictNullChecks": true,
+ "strictFunctionTypes": true,
//"downlevelIteration": true,
"lib": [ "es6", "dom" ],
"outDir": "build/js/src",
--
GitLab