# HG changeset patch # User drewp@bigasterisk.com # Date 1576229969 28800 # Node ID e90d9021c6a021d50c1b698ccee46bf2daeebd56 # Parent f143ebe0acdb80fd4ddd2bba619a1aeeac2b623a add back s-g code; this breaks the build a little. WIP diff -r f143ebe0acdb -r e90d9021c6a0 src/graph_view.ts --- a/src/graph_view.ts Fri Dec 13 01:36:57 2019 -0800 +++ b/src/graph_view.ts Fri Dec 13 01:39:29 2019 -0800 @@ -6,10 +6,11 @@ import { SuffixLabels } from './suffixLabels'; // import ns from 'n3/src/IRIs'; // const { rdf } = ns; +const rdf = { type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" }; type TypeToSubjs = Map>; function groupByRdfType(graph: N3Store): { byType: TypeToSubjs, untyped: Set } { - const rdfType = namedNode('rdf:type'); + const rdfType = namedNode(rdf.type); const byType: TypeToSubjs = new Map(); // type : subjs const untyped: Set = new Set(); // subjs graph.forEach((q) => { diff -r f143ebe0acdb -r e90d9021c6a0 src/json_ld_quads.ts --- a/src/json_ld_quads.ts Fri Dec 13 01:36:57 2019 -0800 +++ b/src/json_ld_quads.ts Fri Dec 13 01:39:29 2019 -0800 @@ -5,7 +5,7 @@ // import {} from 'n3'; // const { rdf } = ns; -const rdf = { type: "http://rdf/type/todo" }; +const rdf = { type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" }; function _emitQuad( onQuad: (q: Quad) => void, diff -r f143ebe0acdb -r e90d9021c6a0 src/streamed-graph.ts --- a/src/streamed-graph.ts Fri Dec 13 01:36:57 2019 -0800 +++ b/src/streamed-graph.ts Fri Dec 13 01:39:29 2019 -0800 @@ -2,98 +2,97 @@ // these are just for timebank- move them out import '@polymer/polymer/lib/elements/dom-bind.js'; - import { PolymerElement, html } from '@polymer/polymer'; -import { customElement, property, computed } from '@polymer/decorators'; import { render } from 'lit-html'; +import { N3Store } from "n3" +import { customElement, property, computed } from '@polymer/decorators'; + import { GraphView } from './graph_view'; -import { N3Store } from "n3" +import { StreamedGraphClient } from './streamed_graph_client'; -import { StreamedGraphClient } from './streamed_graph_client'; +interface VersionedGraph { version: number, store: N3Store|undefined }; @customElement('streamed-graph') class StreamedGraph extends PolymerElement { @property({ type: String }) url: string = ''; - // @property({ type: Object }) - // graph: {version: number, store!: N3Store}; + @property({ type: Object }) + graph!: VersionedGraph; - // @property({ type: boolean }) - // expanded: boolean = false; + @property({ type: Boolean }) + expanded: boolean = false; // @computed('expanded') - // expandAction(): string { - // return this.expanded ? '-' : '+'; - // } + expandAction(): string { + return this.expanded ? '-' : '+'; + } - // @property({ type: string }) - // status: string = ''; + @property({ type: String }) + status: string = ''; - // sg: StreamedGraphClient; - // graphView: Element; - // graphViewDirty = true; + sg!: StreamedGraphClient; + graphView!: Element; + graphViewDirty = true; - // static get template() { - // return html` - // - //
- // - // StreamedGraph [source]: - // {{status}} - //
- //
`; - // } + static get template() { + return html` + +
+ + StreamedGraph [source]: + {{status}} +
+
`; + } - // ready() { - // super.ready(); - // this.graph = {version: -1, store: null}; - // this.graphView = (this.shadowRoot as ShadowRoot).getElementById("graphView") as Element; + ready() { + super.ready(); + this.graph = { version: -1, store: undefined }; + this.graphView = (this.shadowRoot as ShadowRoot).getElementById("graphView") as Element; - // this._onUrl(this.url); // todo: watch for changes and rebuild - // } + this._onUrl(this.url); // todo: watch for changes and rebuild + } - // toggleExpand(ev) { - // this.expanded = !this.expanded; - // if (this.expanded) { - // this.redrawGraph() - // } else { - // this.graphViewDirty = false; - // render(null, this.graphView); - // } - // } + toggleExpand(ev: Event) { + this.expanded = !this.expanded; + if (this.expanded) { + this.redrawGraph() + } else { + this.graphViewDirty = false; + render(null, this.graphView); + } + } - // redrawGraph() { - // this.graphViewDirty = true; - // requestAnimationFrame(this._redrawLater.bind(this)); - // } + redrawGraph() { + this.graphViewDirty = true; + requestAnimationFrame(this._redrawLater.bind(this)); + } - // _onUrl(url) { - // if (this.sg) { this.sg.close(); } - // this.sg = new StreamedGraphClient( - // url, - // this.onGraphChanged.bind(this), - // this.set.bind(this, 'status'), - // [],//window.NS, - // [] - // ); - // } + _onUrl(url: string) { + if (this.sg) { this.sg.close(); } + this.sg = new StreamedGraphClient( + url, + this.onGraphChanged.bind(this), + this.set.bind(this, 'status'), + [],//window.NS, + [] + ); + } - // onGraphChanged() { - // this.graph = { - // version: this.graph.version + 1, - // store: this.sg.store - // }; - // if (this.expanded) { - // this.redrawGraph(); - // } - // } + onGraphChanged() { + this.graph = { + version: this.graph.version + 1, + store: this.sg.store + }; + if (this.expanded) { + this.redrawGraph(); + } + } - // _redrawLater() { - // if (!this.graphViewDirty) return; - // render(new GraphView(this.url, this.graph.store).makeTemplate(), this.graphView); - // this.graphViewDirty = false; - // } - - + _redrawLater() { + if (!this.graphViewDirty) return; + render(new GraphView(this.url, (this.graph as VersionedGraph).store as N3Store).makeTemplate(), this.graphView); + this.graphViewDirty = false; + } } \ No newline at end of file diff -r f143ebe0acdb -r e90d9021c6a0 tsconfig.json --- a/tsconfig.json Fri Dec 13 01:36:57 2019 -0800 +++ b/tsconfig.json Fri Dec 13 01:39:29 2019 -0800 @@ -10,7 +10,7 @@ "noImplicitReturns": true, "noImplicitThis": true, "outDir": "./build/js", - "strict": true, + // "strict": true, "strictFunctionTypes": true, "strictNullChecks": true, "strictPropertyInitialization": true, @@ -18,10 +18,10 @@ // "allowSyntheticDefaultImports": true, // "baseUrl": "./", // "emitDecoratorMetadata": true, - // "esModuleInterop": true, + "esModuleInterop": true, // "noUnusedLocals": true, // "noUnusedParameters": true, - // "rootDir": ".", + "rootDir": ".", // "types": [ "node", "jest" ], } } \ No newline at end of file