diff --git a/components/EditorPanel.tsx b/components/EditorPanel.tsx index 785bb9f..ea07a08 100644 --- a/components/EditorPanel.tsx +++ b/components/EditorPanel.tsx @@ -107,7 +107,7 @@ export default function({ useEffect(() => { // @ts-ignore - window.__webpack_public_path__ = "/static/"; + window.__webpack_public_path__ = "/_next/static/"; }, []); const getSettings = useCallback( @@ -182,8 +182,6 @@ export default function({ setValue(defaultValue); }, [defaultValue]); - console.log(showPreview); - return ( { + reactGa.pageview(router.pathname); + const startProgress = () => NProgress.start(); let timer; - const stopProgress = () => { + const stopProgress = pathname => { + reactGa.pageview(pathname); clearTimeout(timer); NProgress.done(); }; diff --git a/pages/_document.tsx b/pages/_document.tsx index 2aa0089..2bc1952 100644 --- a/pages/_document.tsx +++ b/pages/_document.tsx @@ -8,31 +8,19 @@ interface DocumentProps { } function trackingScript() { - (function(i, s, o, g, r, a, m) { - i["GoogleAnalyticsObject"] = r; - (i[r] = - i[r] || - function() { - (i[r].q = i[r].q || []).push(arguments); - }), - // @ts-ignore - (i[r].l = 1 * new Date()); - (a = s.createElement(o)), (m = s.getElementsByTagName(o)[0]); - a.async = 1; - a.src = g; - m.parentNode.insertBefore(a, m); - })( - window, - document, - "script", - "https://www.google-analytics.com/analytics.js", - "ga" - ); + // @ts-ignore + if (window.dataLayer) return; + // @ts-ignore + window.dataLayer = window.dataLayer || []; + function gtag() { + // @ts-ignore + window.dataLayer.push(arguments); + } + // @ts-ignore + gtag("js", new Date()); // @ts-ignore - window.ga("create", "UA-60624235-5", "auto"); - // @ts-ignore - window.ga("send", "pageview"); + gtag("config", "UA-60624235-8"); } export default class MyDocument extends Document { @@ -47,10 +35,6 @@ export default class MyDocument extends Document { }; } - componentDidMount(): void { - trackingScript(); - } - render() { const { css, hydrationScript } = this.props; @@ -69,6 +53,14 @@ export default class MyDocument extends Document {
{hydrationScript} + + ); diff --git a/pages/graphql-to-introspection-json.tsx b/pages/graphql-to-introspection-json.tsx index 6fe4ad2..912a002 100644 --- a/pages/graphql-to-introspection-json.tsx +++ b/pages/graphql-to-introspection-json.tsx @@ -19,7 +19,8 @@ export default function() { const result = await graphqlWorker.send({ type: GraphqlTransforms.TO_INTROSPECTION_JSON, - value + value, + extension: "json" }); return prettierWorker.send({ diff --git a/pages/graphql-to-java.tsx b/pages/graphql-to-java.tsx index 38a405c..7f5b4a6 100644 --- a/pages/graphql-to-java.tsx +++ b/pages/graphql-to-java.tsx @@ -1,5 +1,5 @@ -import { useCallback } from "react"; import * as React from "react"; +import { useCallback } from "react"; import ConversionPanel, { Transformer } from "@components/ConversionPanel"; import { getWorker } from "@utils/workerWrapper"; import GrapqlWorker from "@workers/graphql.worker"; @@ -17,12 +17,10 @@ export default function() { graphqlWorker = graphqlWorker || getWorker(GrapqlWorker); prettierWorker = prettierWorker || getWorker(PrettierWorker); - const result = await graphqlWorker.send({ + return graphqlWorker.send({ type: GraphqlTransforms.TO_JAVA, value }); - - return result; }, []); return ( diff --git a/pages/graphql-to-schema-ast.tsx b/pages/graphql-to-schema-ast.tsx index d3792a0..0131e64 100644 --- a/pages/graphql-to-schema-ast.tsx +++ b/pages/graphql-to-schema-ast.tsx @@ -19,7 +19,8 @@ export default function() { const result = await graphqlWorker.send({ type: GraphqlTransforms.TO_SCHEMA_AST, - value + value, + extension: "graphql" }); return prettierWorker.send({ diff --git a/pages/graphql-to-typescript-mongodb.tsx b/pages/graphql-to-typescript-mongodb.tsx index ae087d8..e81e444 100644 --- a/pages/graphql-to-typescript-mongodb.tsx +++ b/pages/graphql-to-typescript-mongodb.tsx @@ -19,7 +19,8 @@ export default function() { const result = await graphqlWorker.send({ type: GraphqlTransforms.TO_TYPESCRIPT_MONGODB, - value + value, + extension: "ts" }); return prettierWorker.send({ diff --git a/pages/jsonld-to-compacted.tsx b/pages/jsonld-to-compacted.tsx new file mode 100644 index 0000000..405a1eb --- /dev/null +++ b/pages/jsonld-to-compacted.tsx @@ -0,0 +1,32 @@ +import ConversionPanel, { Transformer } from "@components/ConversionPanel"; +import { useCallback } from "react"; +import * as React from "react"; +import { compact } from "jsonld"; + +export default function() { + const transformer = useCallback( + async ({ value, splitEditorValue }) => { + const jsonLd = await compact( + JSON.parse(value), + JSON.parse(splitEditorValue) + ); + + return JSON.stringify(jsonLd, null, 2); + }, + [] + ); + + return ( + + ); +} diff --git a/pages/jsonld-to-expanded.tsx b/pages/jsonld-to-expanded.tsx new file mode 100644 index 0000000..ab37312 --- /dev/null +++ b/pages/jsonld-to-expanded.tsx @@ -0,0 +1,23 @@ +import ConversionPanel from "@components/ConversionPanel"; +import { useCallback } from "react"; +import * as React from "react"; +import { expand } from "jsonld"; + +export default function() { + const transformer = useCallback(async ({ value }) => { + const jsonLd = await expand(JSON.parse(value)); + + return JSON.stringify(jsonLd, null, 2); + }, []); + + return ( + + ); +} diff --git a/pages/jsonld-to-flattened.tsx b/pages/jsonld-to-flattened.tsx new file mode 100644 index 0000000..a6cb3a1 --- /dev/null +++ b/pages/jsonld-to-flattened.tsx @@ -0,0 +1,32 @@ +import ConversionPanel, { Transformer } from "@components/ConversionPanel"; +import { useCallback } from "react"; +import * as React from "react"; +import { flatten } from "jsonld"; + +export default function() { + const transformer = useCallback( + async ({ value, splitEditorValue }) => { + const jsonLd = await flatten( + JSON.parse(value), + JSON.parse(splitEditorValue) + ); + + return JSON.stringify(jsonLd, null, 2); + }, + [] + ); + + return ( + + ); +} diff --git a/pages/jsonld-to-framed.tsx b/pages/jsonld-to-framed.tsx new file mode 100644 index 0000000..285c395 --- /dev/null +++ b/pages/jsonld-to-framed.tsx @@ -0,0 +1,32 @@ +import ConversionPanel, { Transformer } from "@components/ConversionPanel"; +import { useCallback } from "react"; +import * as React from "react"; +import { frame } from "jsonld"; + +export default function() { + const transformer = useCallback( + async ({ value, splitEditorValue }) => { + const jsonLd = await frame( + JSON.parse(value), + JSON.parse(splitEditorValue) + ); + + return JSON.stringify(jsonLd, null, 2); + }, + [] + ); + + return ( + + ); +} diff --git a/pages/jsonld-to-normalized.tsx b/pages/jsonld-to-normalized.tsx new file mode 100644 index 0000000..4ba3b6d --- /dev/null +++ b/pages/jsonld-to-normalized.tsx @@ -0,0 +1,21 @@ +import ConversionPanel from "@components/ConversionPanel"; +import { useCallback } from "react"; +import * as React from "react"; +import { normalize } from "jsonld"; + +export default function() { + const transformer = useCallback(async ({ value }) => { + return (await normalize(JSON.parse(value))) as Promise; + }, []); + + return ( + + ); +} diff --git a/pages/jsonld-to-nquads.tsx b/pages/jsonld-to-nquads.tsx new file mode 100644 index 0000000..c7b7a61 --- /dev/null +++ b/pages/jsonld-to-nquads.tsx @@ -0,0 +1,23 @@ +import ConversionPanel from "@components/ConversionPanel"; +import { useCallback } from "react"; +import * as React from "react"; +import { toRDF } from "jsonld"; + +export default function() { + const transformer = useCallback(async ({ value }) => { + return toRDF(JSON.parse(value), { + format: "application/n-quads" + }) as Promise; + }, []); + + return ( + + ); +} diff --git a/utils/routes.tsx b/utils/routes.tsx index 40a8050..aff63a4 100644 --- a/utils/routes.tsx +++ b/utils/routes.tsx @@ -153,61 +153,80 @@ export const categorizedRoutes = [ content: [ { label: "to TypeScript", - path: "/graphql-to-typescript", - packageUrl: "https://github.com/dotansimha/graphql-code-generator", - packageName: "graphql-code-generator" + path: "/graphql-to-typescript" }, { label: "to Flow", - path: "/graphql-to-flow", - packageUrl: "https://github.com/dotansimha/graphql-code-generator", - packageName: "graphql-code-generator" + path: "/graphql-to-flow" }, { label: "to JAVA", - path: "/graphql-to-java", - packageUrl: "https://github.com/dotansimha/graphql-code-generator", - packageName: "graphql-code-generator" + path: "/graphql-to-java" }, { label: "to Resolvers Signature", - path: "/graphql-to-resolvers-signature", - packageUrl: "https://github.com/dotansimha/graphql-code-generator", - packageName: "graphql-code-generator" + path: "/graphql-to-resolvers-signature" }, { label: "to Introspection JSON", - path: "/graphql-to-introspection-json", - packageUrl: "https://github.com/dotansimha/graphql-code-generator", - packageName: "graphql-code-generator" + path: "/graphql-to-introspection-json" }, { label: "to Schema AST", - path: "/graphql-to-schema-ast", - packageUrl: "https://github.com/dotansimha/graphql-code-generator", - packageName: "graphql-code-generator" + path: "/graphql-to-schema-ast" }, { label: "to Fragment Matcher", - path: "/graphql-to-fragment-matcher", - packageUrl: "https://github.com/dotansimha/graphql-code-generator", - packageName: "graphql-code-generator" + path: "/graphql-to-fragment-matcher" }, { label: "to Components", - path: "/graphql-to-components", - packageUrl: "https://github.com/dotansimha/graphql-code-generator", - packageName: "graphql-code-generator" + path: "/graphql-to-components" }, { label: "to TypeScript MongoDB", - path: "/graphql-to-typescript-mongodb", - packageUrl: "https://github.com/dotansimha/graphql-code-generator", - packageName: "graphql-code-generator" + path: "/graphql-to-typescript-mongodb" } - ] + ].map(x => ({ + ...x, + packageUrl: "https://github.com/dotansimha/graphql-code-generator", + packageName: "graphql-code-generator" + })) + }, + { + category: "JSON-LD", + content: [ + { + label: "to N-Quads", + path: "jsonld-to-nquads" + }, + { + label: "to Expanded", + path: "jsonld-to-expanded" + }, + { + label: "to Compacted", + path: "jsonld-to-compacted" + }, + { + label: "to Flattened", + path: "jsonld-to-flattened" + }, + { + label: "to Framed", + path: "jsonld-to-framed" + }, + { + label: "to Normalized", + path: "jsonld-to-normalized" + } + ].map(x => ({ + ...x, + packageName: "jsonld", + packageUrl: "https://github.com/digitalbazaar/jsonld.js" + })) }, { category: "Others", diff --git a/workers/graphql.worker.ts b/workers/graphql.worker.ts index a9aea71..14ec870 100644 --- a/workers/graphql.worker.ts +++ b/workers/graphql.worker.ts @@ -54,7 +54,7 @@ function getPlugins(type: GraphqlTransforms) { } _self.onmessage = async ({ data: { id, payload } }) => { - const { value, document = "", type } = payload; + const { value, document = "", type, extension = "tsx" } = payload; try { const plugins = getPlugins(type); @@ -66,7 +66,7 @@ _self.onmessage = async ({ data: { id, payload } }) => { }); const result = await codegen({ - filename: "a.tsx", + filename: `a.${extension}`, schema: parse(value), // @ts-ignore plugins: plugins.map((_plugin, i) => ({ diff --git a/yarn.lock b/yarn.lock index fea352b..2be7995 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1049,6 +1049,13 @@ iterall "^1.1.3" uuid "^3.1.0" +"@now/node@^0.12.0": + version "0.12.0" + resolved "https://registry.yarnpkg.com/@now/node/-/node-0.12.0.tgz#ebd4a2494153062b63d2d2f7922ff15e8403883c" + integrity sha512-uYdwC2DY035bJuoxLMdBKTAAumcCxY7MN2iWqa3gzssAlJbP7sa6nRz86ONSQ8X+dNEFyoyBUHHyiS7hHzn0Ww== + dependencies: + "@types/node" "*" + "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -1170,6 +1177,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636" integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A== +"@types/jsonld@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@types/jsonld/-/jsonld-1.5.0.tgz#cd5cb660dcbeffd391290f820efebab571af65d9" + integrity sha512-EG2N8JLQ1xDfO6Z/1QRdiUcYX3428CqVRqmY7LyK5or5J1RQ16dpKH6qQ4umVD0vBHU47xHlMeyMbQ6o+6tiYg== + "@types/lodash@^4.14.121", "@types/lodash@^4.14.135": version "4.14.136" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.136.tgz#413e85089046b865d960c9ff1d400e04c31ab60f" @@ -5773,6 +5785,16 @@ jsonify@~0.0.0: resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= +jsonld@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/jsonld/-/jsonld-1.6.2.tgz#d81620dccf75fd7bc7501709eeec5da77ecc45e9" + integrity sha512-eMzFHqhF2kPMrMUjw8+Lz9IF1QkrxTOIfVndkP/OpuoZs31VdDtfDs8mLa5EOC/ROdemFTQGLdYPZbRtmMe2Yw== + dependencies: + rdf-canonize "^1.0.2" + request "^2.88.0" + semver "^5.6.0" + xmldom "0.1.19" + jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -6627,6 +6649,11 @@ node-fetch@^1.0.1: encoding "^0.1.11" is-stream "^1.0.1" +node-forge@^0.8.1: + version "0.8.5" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.8.5.tgz#57906f07614dc72762c84cef442f427c0e1b86ee" + integrity sha512-vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q== + node-libs-browser@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" @@ -7771,6 +7798,14 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" +rdf-canonize@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/rdf-canonize/-/rdf-canonize-1.0.3.tgz#71dc56bb808a39d12e3ca17674c15f881cad648a" + integrity sha512-piLMOB5Q6LJSVx2XzmdpHktYVb8TmVTy8coXJBFtdkcMC96DknZOuzpAYqCWx2ERZX7xEW+mMi8/wDuMJS/95w== + dependencies: + node-forge "^0.8.1" + semver "^5.6.0" + react-dom@^16.8.6: version "16.8.6" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f" @@ -7810,6 +7845,11 @@ react-fast-compare@^2.0.1: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9" integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw== +react-ga@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/react-ga/-/react-ga-2.6.0.tgz#c3fe830ead2ad25117e1d33280d9698de9b28496" + integrity sha512-GWHBWZDFjDGMkIk1LzroIn0mNTygKw3adXuqvGvheFZvlbpqMPbHsQsTdQBIxRRdXGQM/Zq+dQLRPKbwIHMTaw== + react-is@16.8.6, react-is@^16.7.0, react-is@^16.8.1: version "16.8.6" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" @@ -8114,7 +8154,7 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -"request@>= 2.44.0 < 3.0.0": +"request@>= 2.44.0 < 3.0.0", request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== @@ -9818,6 +9858,11 @@ xml-name-validator@^1.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-1.0.0.tgz#dcf82ee092322951ef8cc1ba596c9cbfd14a83f1" integrity sha1-3Pgu4JIyKVHvjMG6WWycv9FKg/E= +xmldom@0.1.19: + version "0.1.19" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.19.tgz#631fc07776efd84118bf25171b37ed4d075a0abc" + integrity sha1-Yx/Ad3bv2EEYvyUXGzftTQdaCrw= + "xmlhttprequest@>= 1.6.0 < 2.0.0": version "1.8.0" resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"