Skip to content
Snippets Groups Projects
Commit 47d801ea authored by David Sehnal's avatar David Sehnal
Browse files

updated to typescript 3.2

parent bc2df6eb
No related branches found
No related tags found
No related merge requests found
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
"style-loader": "^0.23.1", "style-loader": "^0.23.1",
"ts-jest": "^23.10.5", "ts-jest": "^23.10.5",
"tslint": "^5.11.0", "tslint": "^5.11.0",
"typescript": "^3.1.6", "typescript": "^3.2.0",
"uglify-js": "^3.4.9", "uglify-js": "^3.4.9",
"util.promisify": "^1.0.0", "util.promisify": "^1.0.0",
"webpack": "^4.26.1", "webpack": "^4.26.1",
......
...@@ -116,21 +116,21 @@ function createDatabaseFromCif(model: Model): AssemblySymmetry.Database { ...@@ -116,21 +116,21 @@ function createDatabaseFromCif(model: Model): AssemblySymmetry.Database {
if (model.sourceData.frame.categoryNames.includes('rcsb_assembly_symmetry_cluster')) { if (model.sourceData.frame.categoryNames.includes('rcsb_assembly_symmetry_cluster')) {
rcsb_assembly_symmetry_cluster = toTable(Schema.rcsb_assembly_symmetry_cluster, model.sourceData.frame.categories.rcsb_assembly_symmetry_cluster) rcsb_assembly_symmetry_cluster = toTable(Schema.rcsb_assembly_symmetry_cluster, model.sourceData.frame.categories.rcsb_assembly_symmetry_cluster)
} else { } else {
rcsb_assembly_symmetry_cluster = CifCategory.empty rcsb_assembly_symmetry_cluster = toTable(Schema.rcsb_assembly_symmetry_cluster, CifCategory.empty as any)
} }
let rcsb_assembly_symmetry_cluster_member let rcsb_assembly_symmetry_cluster_member
if (model.sourceData.frame.categoryNames.includes('rcsb_assembly_symmetry_cluster_member')) { if (model.sourceData.frame.categoryNames.includes('rcsb_assembly_symmetry_cluster_member')) {
rcsb_assembly_symmetry_cluster_member = toTable(Schema.rcsb_assembly_symmetry_cluster_member, model.sourceData.frame.categories.rcsb_assembly_symmetry_cluster_member) rcsb_assembly_symmetry_cluster_member = toTable(Schema.rcsb_assembly_symmetry_cluster_member, model.sourceData.frame.categories.rcsb_assembly_symmetry_cluster_member)
} else { } else {
rcsb_assembly_symmetry_cluster_member = CifCategory.empty rcsb_assembly_symmetry_cluster_member = toTable(Schema.rcsb_assembly_symmetry_cluster_member, CifCategory.empty as any)
} }
let rcsb_assembly_symmetry_axis let rcsb_assembly_symmetry_axis
if (model.sourceData.frame.categoryNames.includes('rcsb_assembly_symmetry_axis')) { if (model.sourceData.frame.categoryNames.includes('rcsb_assembly_symmetry_axis')) {
rcsb_assembly_symmetry_axis = toTable(Schema.rcsb_assembly_symmetry_axis, model.sourceData.frame.categories.rcsb_assembly_symmetry_axis) rcsb_assembly_symmetry_axis = toTable(Schema.rcsb_assembly_symmetry_axis, model.sourceData.frame.categories.rcsb_assembly_symmetry_axis)
} else { } else {
rcsb_assembly_symmetry_axis = CifCategory.empty rcsb_assembly_symmetry_axis = toTable(Schema.rcsb_assembly_symmetry_axis, CifCategory.empty as any)
} }
return _Database.ofTables('rcsb_assembly_symmetry', Schema, { return _Database.ofTables('rcsb_assembly_symmetry', Schema, {
......
...@@ -26,6 +26,7 @@ import { Theme, createEmptyTheme } from 'mol-theme/theme'; ...@@ -26,6 +26,7 @@ import { Theme, createEmptyTheme } from 'mol-theme/theme';
import { ColorTheme } from 'mol-theme/color'; import { ColorTheme } from 'mol-theme/color';
import { SizeTheme } from 'mol-theme/size'; import { SizeTheme } from 'mol-theme/size';
import { RenderableState } from 'mol-gl/renderable'; import { RenderableState } from 'mol-gl/renderable';
import { UnitsParams } from './units-representation';
export interface ComplexVisual<P extends StructureParams> extends Visual<Structure, P> { } export interface ComplexVisual<P extends StructureParams> extends Visual<Structure, P> { }
...@@ -214,7 +215,7 @@ export type ComplexMeshParams = typeof ComplexMeshParams ...@@ -214,7 +215,7 @@ export type ComplexMeshParams = typeof ComplexMeshParams
export interface ComplexMeshVisualBuilder<P extends ComplexMeshParams> extends ComplexVisualBuilder<P, Mesh> { } export interface ComplexMeshVisualBuilder<P extends ComplexMeshParams> extends ComplexVisualBuilder<P, Mesh> { }
export function ComplexMeshVisual<P extends ComplexMeshParams>(builder: ComplexMeshVisualBuilder<P>): ComplexVisual<P> { export function ComplexMeshVisual<P extends ComplexMeshParams>(builder: ComplexMeshVisualBuilder<P>): ComplexVisual<P> {
return ComplexVisual({ return ComplexVisual<StructureMeshParams & UnitsParams>({
...builder, ...builder,
setUpdateState: (state: VisualUpdateState, newProps: PD.Values<P>, currentProps: PD.Values<P>, newTheme: Theme, currentTheme: Theme) => { setUpdateState: (state: VisualUpdateState, newProps: PD.Values<P>, currentProps: PD.Values<P>, newTheme: Theme, currentTheme: Theme) => {
builder.setUpdateState(state, newProps, currentProps, newTheme, currentTheme) builder.setUpdateState(state, newProps, currentProps, newTheme, currentTheme)
......
...@@ -49,9 +49,9 @@ interface UnitsVisualBuilder<P extends UnitsParams, G extends Geometry> { ...@@ -49,9 +49,9 @@ interface UnitsVisualBuilder<P extends UnitsParams, G extends Geometry> {
interface UnitsVisualGeometryBuilder<P extends UnitsParams, G extends Geometry> extends UnitsVisualBuilder<P, G> { interface UnitsVisualGeometryBuilder<P extends UnitsParams, G extends Geometry> extends UnitsVisualBuilder<P, G> {
createEmptyGeometry(geometry?: G): G createEmptyGeometry(geometry?: G): G
createRenderObject(group: Unit.SymmetryGroup, geometry: Geometry, locationIt: LocationIterator, theme: Theme, currentProps: PD.Values<P>): UnitsRenderObject createRenderObject(group: Unit.SymmetryGroup, geometry: Geometry, locationIt: LocationIterator, theme: Theme, currentProps: PD.Values<P>): UnitsRenderObject
updateValues(values: RenderableValues, newProps: PD.Values<P>): void updateValues(values: RenderableValues, newProps: Partial<PD.Values<P>>): void
updateBoundingSphere(values: RenderableValues, geometry: Geometry): void updateBoundingSphere(values: RenderableValues, geometry: Geometry): void
updateRenderableState(state: RenderableState, props: PD.Values<P>): void updateRenderableState(state: RenderableState, props: Partial<PD.Values<P>>): void
} }
export function UnitsVisual<P extends UnitsParams>(builder: UnitsVisualGeometryBuilder<P, Geometry>): UnitsVisual<P> { export function UnitsVisual<P extends UnitsParams>(builder: UnitsVisualGeometryBuilder<P, Geometry>): UnitsVisual<P> {
...@@ -256,7 +256,7 @@ export type UnitsMeshParams = typeof UnitsMeshParams ...@@ -256,7 +256,7 @@ export type UnitsMeshParams = typeof UnitsMeshParams
export interface UnitsMeshVisualBuilder<P extends UnitsMeshParams> extends UnitsVisualBuilder<P, Mesh> { } export interface UnitsMeshVisualBuilder<P extends UnitsMeshParams> extends UnitsVisualBuilder<P, Mesh> { }
export function UnitsMeshVisual<P extends UnitsMeshParams>(builder: UnitsMeshVisualBuilder<P>): UnitsVisual<P> { export function UnitsMeshVisual<P extends UnitsMeshParams>(builder: UnitsMeshVisualBuilder<P>): UnitsVisual<P> {
return UnitsVisual({ return UnitsVisual<StructureMeshParams & UnitsParams>({
...builder, ...builder,
setUpdateState: (state: VisualUpdateState, newProps: PD.Values<P>, currentProps: PD.Values<P>, newTheme: Theme, currentTheme: Theme) => { setUpdateState: (state: VisualUpdateState, newProps: PD.Values<P>, currentProps: PD.Values<P>, newTheme: Theme, currentTheme: Theme) => {
builder.setUpdateState(state, newProps, currentProps, newTheme, currentTheme) builder.setUpdateState(state, newProps, currentProps, newTheme, currentTheme)
...@@ -280,7 +280,7 @@ export type UnitsPointsParams = typeof UnitsPointsParams ...@@ -280,7 +280,7 @@ export type UnitsPointsParams = typeof UnitsPointsParams
export interface UnitsPointVisualBuilder<P extends UnitsPointsParams> extends UnitsVisualBuilder<P, Points> { } export interface UnitsPointVisualBuilder<P extends UnitsPointsParams> extends UnitsVisualBuilder<P, Points> { }
export function UnitsPointsVisual<P extends UnitsPointsParams>(builder: UnitsPointVisualBuilder<P>): UnitsVisual<P> { export function UnitsPointsVisual<P extends UnitsPointsParams>(builder: UnitsPointVisualBuilder<P>): UnitsVisual<P> {
return UnitsVisual({ return UnitsVisual<StructurePointsParams & UnitsParams>({
...builder, ...builder,
createEmptyGeometry: Points.createEmpty, createEmptyGeometry: Points.createEmpty,
createRenderObject: createUnitsPointsRenderObject, createRenderObject: createUnitsPointsRenderObject,
...@@ -304,7 +304,7 @@ export type UnitsLinesParams = typeof UnitsLinesParams ...@@ -304,7 +304,7 @@ export type UnitsLinesParams = typeof UnitsLinesParams
export interface UnitsLinesVisualBuilder<P extends UnitsLinesParams> extends UnitsVisualBuilder<P, Lines> { } export interface UnitsLinesVisualBuilder<P extends UnitsLinesParams> extends UnitsVisualBuilder<P, Lines> { }
export function UnitsLinesVisual<P extends UnitsLinesParams>(builder: UnitsLinesVisualBuilder<P>): UnitsVisual<P> { export function UnitsLinesVisual<P extends UnitsLinesParams>(builder: UnitsLinesVisualBuilder<P>): UnitsVisual<P> {
return UnitsVisual({ return UnitsVisual<StructureLinesParams & UnitsParams>({
...builder, ...builder,
createEmptyGeometry: Lines.createEmpty, createEmptyGeometry: Lines.createEmpty,
createRenderObject: createUnitsLinesRenderObject, createRenderObject: createUnitsLinesRenderObject,
...@@ -328,7 +328,7 @@ export type UnitsDirectVolumeParams = typeof UnitsDirectVolumeParams ...@@ -328,7 +328,7 @@ export type UnitsDirectVolumeParams = typeof UnitsDirectVolumeParams
export interface UnitsDirectVolumeVisualBuilder<P extends UnitsDirectVolumeParams> extends UnitsVisualBuilder<P, DirectVolume> { } export interface UnitsDirectVolumeVisualBuilder<P extends UnitsDirectVolumeParams> extends UnitsVisualBuilder<P, DirectVolume> { }
export function UnitsDirectVolumeVisual<P extends UnitsDirectVolumeParams>(builder: UnitsDirectVolumeVisualBuilder<P>): UnitsVisual<P> { export function UnitsDirectVolumeVisual<P extends UnitsDirectVolumeParams>(builder: UnitsDirectVolumeVisualBuilder<P>): UnitsVisual<P> {
return UnitsVisual({ return UnitsVisual<StructureDirectVolumeParams & UnitsParams>({
...builder, ...builder,
createEmptyGeometry: DirectVolume.createEmpty, createEmptyGeometry: DirectVolume.createEmpty,
createRenderObject: createUnitsDirectVolumeRenderObject, createRenderObject: createUnitsDirectVolumeRenderObject,
......
...@@ -80,7 +80,7 @@ export namespace Color { ...@@ -80,7 +80,7 @@ export namespace Color {
} }
export type ColorTable<T extends { [k: string]: number[] }> = { [k in keyof T]: Color[] } export type ColorTable<T extends { [k: string]: number[] }> = { [k in keyof T]: Color[] }
export function ColorTable<T extends { [k: string]: number[] }>(o: T) { return o as ColorTable<T> } export function ColorTable<T extends { [k: string]: number[] }>(o: T) { return o as unknown as ColorTable<T> }
export type ColorMap<T extends { [k: string]: number }> = { [k in keyof T]: Color } export type ColorMap<T extends { [k: string]: number }> = { [k in keyof T]: Color }
export function ColorMap<T extends { [k: string]: number }>(o: T) { return o as ColorMap<T> } export function ColorMap<T extends { [k: string]: number }>(o: T) { return o as unknown as ColorMap<T> }
\ No newline at end of file \ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment