David Sehnal 7 роки тому
батько
коміт
b50dbbc2e5
5 змінених файлів з 16 додано та 12 видалено
  1. 10 10
      package-lock.json
  2. 2 2
      package.json
  3. 1 0
      src/mol-data/query/selection.ts
  4. 2 0
      src/mol-io/reader/cif/schema.ts
  5. 1 0
      tsconfig.json

+ 10 - 10
package-lock.json

@@ -3548,12 +3548,12 @@
       }
     },
     "rollup-plugin-commonjs": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.5.tgz",
-      "integrity": "sha512-RxzILEgDOFvUgnuPVXNCfZ5f7Mv6RlQ1OyW925kmWRCgmV2V+g6G5qmKUmgW2HUQxp0YqqvRkqbez4Q/o6fRog==",
+      "version": "8.2.6",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz",
+      "integrity": "sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==",
       "dev": true,
       "requires": {
-        "acorn": "5.2.0",
+        "acorn": "5.2.1",
         "estree-walker": "0.5.0",
         "magic-string": "0.22.4",
         "resolve": "1.5.0",
@@ -3561,9 +3561,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.0.tgz",
-          "integrity": "sha512-TJT3XkJ12+1vDj24PN5KO5rbUr34UzETv0ZJ4jLBy1IUhQFBb89xpGq9CgovdJfogOuwpFteHyl0jib4ElODzA==",
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
+          "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==",
           "dev": true
         },
         "estree-walker": {
@@ -4207,9 +4207,9 @@
       }
     },
     "typescript": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz",
-      "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz",
+      "integrity": "sha1-7znN6ierrAtQAkLWcmq5DgyEZjE=",
       "dev": true
     },
     "uglify-js": {

+ 2 - 2
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"
   },

+ 1 - 0
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

+ 2 - 0
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;

+ 1 - 0
tsconfig.json

@@ -7,6 +7,7 @@
         "sourceMap": false,
         "noUnusedLocals": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         //"downlevelIteration": true,
         "lib": [ "es6", "dom" ],
         "outDir": "build/js/src",