From bf2ad4ac03c9fa666286fef5838b7dbb6f83d6bd Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Sun, 28 Feb 2021 13:48:38 +0300 Subject: [PATCH 01/17] init commit --- examples/vue-datastore/.gitignore | 27 ++++ examples/vue-datastore/.graphqlrc.yml | 8 + examples/vue-datastore/README.md | 75 +++++++++ examples/vue-datastore/package.json | 61 +++++++ examples/vue-datastore/public/favicon.ico | Bin 0 -> 3150 bytes examples/vue-datastore/public/index.html | 43 +++++ examples/vue-datastore/public/logo192.png | Bin 0 -> 5347 bytes examples/vue-datastore/public/logo512.png | Bin 0 -> 9664 bytes examples/vue-datastore/public/manifest.json | 25 +++ examples/vue-datastore/public/robots.txt | 3 + examples/vue-datastore/src/App.tsx | 110 +++++++++++++ .../src/components/Todo/Todo.tsx | 48 ++++++ .../src/components/Todo/TodoList.tsx | 27 ++++ .../src/components/Todo/index.ts | 2 + .../vue-datastore/src/components/UI/Empty.tsx | 11 ++ .../vue-datastore/src/components/UI/Error.tsx | 12 ++ .../src/components/UI/Header.tsx | 15 ++ .../src/components/UI/Loading.tsx | 11 ++ .../vue-datastore/src/components/UI/index.ts | 4 + .../src/components/forms/AddTodo.tsx | 37 +++++ .../src/components/forms/EditTodo.tsx | 40 +++++ .../src/components/forms/ToggleTodo.tsx | 32 ++++ .../src/components/forms/formSchema.ts | 33 ++++ .../src/components/forms/index.ts | 3 + .../vue-datastore/src/components/index.ts | 3 + .../vue-datastore/src/datastore/config.ts | 32 ++++ .../src/datastore/generated/index.ts | 6 + .../src/datastore/generated/schema.json | 57 +++++++ .../src/datastore/generated/types.ts | 19 +++ examples/vue-datastore/src/datastore/hooks.ts | 11 ++ examples/vue-datastore/src/index.tsx | 14 ++ .../vue-datastore/src/model/runtime.graphql | 23 +++ examples/vue-datastore/src/react-app-env.d.ts | 1 + examples/vue-datastore/src/serviceWorker.ts | 149 ++++++++++++++++++ examples/vue-datastore/src/setupTests.ts | 5 + examples/vue-datastore/src/types.ts | 39 +++++ examples/vue-datastore/tsconfig.json | 25 +++ .../datastore/src/vue/ReducerUtils.ts | 38 +++++ .../datastore/src/vue/hooks/delete.ts | 23 +++ .../datastore/src/vue/hooks/query.ts | 129 +++++++++++++++ .../datastore/datastore/src/vue/hooks/save.ts | 22 +++ .../datastore/src/vue/hooks/subscription.ts | 17 ++ .../datastore/src/vue/hooks/update.ts | 24 +++ packages/datastore/datastore/src/vue/index.ts | 0 44 files changed, 1264 insertions(+) create mode 100644 examples/vue-datastore/.gitignore create mode 100644 examples/vue-datastore/.graphqlrc.yml create mode 100644 examples/vue-datastore/README.md create mode 100644 examples/vue-datastore/package.json create mode 100644 examples/vue-datastore/public/favicon.ico create mode 100644 examples/vue-datastore/public/index.html create mode 100644 examples/vue-datastore/public/logo192.png create mode 100644 examples/vue-datastore/public/logo512.png create mode 100644 examples/vue-datastore/public/manifest.json create mode 100644 examples/vue-datastore/public/robots.txt create mode 100644 examples/vue-datastore/src/App.tsx create mode 100644 examples/vue-datastore/src/components/Todo/Todo.tsx create mode 100644 examples/vue-datastore/src/components/Todo/TodoList.tsx create mode 100644 examples/vue-datastore/src/components/Todo/index.ts create mode 100644 examples/vue-datastore/src/components/UI/Empty.tsx create mode 100644 examples/vue-datastore/src/components/UI/Error.tsx create mode 100644 examples/vue-datastore/src/components/UI/Header.tsx create mode 100644 examples/vue-datastore/src/components/UI/Loading.tsx create mode 100644 examples/vue-datastore/src/components/UI/index.ts create mode 100644 examples/vue-datastore/src/components/forms/AddTodo.tsx create mode 100644 examples/vue-datastore/src/components/forms/EditTodo.tsx create mode 100644 examples/vue-datastore/src/components/forms/ToggleTodo.tsx create mode 100644 examples/vue-datastore/src/components/forms/formSchema.ts create mode 100644 examples/vue-datastore/src/components/forms/index.ts create mode 100644 examples/vue-datastore/src/components/index.ts create mode 100644 examples/vue-datastore/src/datastore/config.ts create mode 100644 examples/vue-datastore/src/datastore/generated/index.ts create mode 100644 examples/vue-datastore/src/datastore/generated/schema.json create mode 100644 examples/vue-datastore/src/datastore/generated/types.ts create mode 100644 examples/vue-datastore/src/datastore/hooks.ts create mode 100644 examples/vue-datastore/src/index.tsx create mode 100644 examples/vue-datastore/src/model/runtime.graphql create mode 100644 examples/vue-datastore/src/react-app-env.d.ts create mode 100644 examples/vue-datastore/src/serviceWorker.ts create mode 100644 examples/vue-datastore/src/setupTests.ts create mode 100644 examples/vue-datastore/src/types.ts create mode 100644 examples/vue-datastore/tsconfig.json create mode 100644 packages/datastore/datastore/src/vue/ReducerUtils.ts create mode 100644 packages/datastore/datastore/src/vue/hooks/delete.ts create mode 100644 packages/datastore/datastore/src/vue/hooks/query.ts create mode 100644 packages/datastore/datastore/src/vue/hooks/save.ts create mode 100644 packages/datastore/datastore/src/vue/hooks/subscription.ts create mode 100644 packages/datastore/datastore/src/vue/hooks/update.ts create mode 100644 packages/datastore/datastore/src/vue/index.ts diff --git a/examples/vue-datastore/.gitignore b/examples/vue-datastore/.gitignore new file mode 100644 index 000000000..99cdaa2aa --- /dev/null +++ b/examples/vue-datastore/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js + +# testing +/coverage + +# production +/build + +# misc +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local +.gradle + +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +/android +/ios diff --git a/examples/vue-datastore/.graphqlrc.yml b/examples/vue-datastore/.graphqlrc.yml new file mode 100644 index 000000000..e900bd68a --- /dev/null +++ b/examples/vue-datastore/.graphqlrc.yml @@ -0,0 +1,8 @@ +schema: './src/schema.graphql' +extensions: + graphback: + # path to data model file(s) + model: './src/model/runtime.graphql' + plugins: + offix-datasync-client-plugin: + modelOutputDir: './src/datasync' diff --git a/examples/vue-datastore/README.md b/examples/vue-datastore/README.md new file mode 100644 index 000000000..76a0c08f7 --- /dev/null +++ b/examples/vue-datastore/README.md @@ -0,0 +1,75 @@ +# Offix - React Todo Example App + +This example demonstrates how to get started using Offix in a React project. The app is a simple +todo app making use of the `offix-client` and can be used as launch pad to getting started +with Offix and make use of the features in the library. + +## Getting started + +To get started, run: + +``` +yarn install +``` + +### Setting up a server + +For simplicity, a GraphQL Serve in-memory server has been provided. You can make changes to the GrapQL schema, by editing the `models/runtime.graphql` file. To start the server, run the following +command: + +``` +yarn startServer +``` + +Alternatively, you can implement your own backend server. + +### Starting the client + +Next, configure the GraphQL server address in the `src/clientConfig.js` file: + +``` + +... + +const wsLink = new WebSocketLink({ + uri: 'ws://', + ... +}); + +const httpLink = new HttpLink({ + uri: 'http://', +}); + +... + +``` + +### Starting the client + +Lastly, run the following commands from the React example folder. + +``` +yarn start +``` + +## Adding more models + +1. Edit runtime.graphql file in `src/model/runtime.graphql` +2. Generate models yarn generate +3. Review new models + + +## Running as native capacitor application + + +yarn build +yarn cap add ios +yarn cap copy ios +yarn cap open ios + + +yarn build +yarn cap add android +// Swap main activity https://github.com/capacitor-community/sqlite +yarn cap copy android +yarn cap open android diff --git a/examples/vue-datastore/package.json b/examples/vue-datastore/package.json new file mode 100644 index 000000000..d96f1d266 --- /dev/null +++ b/examples/vue-datastore/package.json @@ -0,0 +1,61 @@ +{ + "name": "react-offix", + "version": "0.1.0", + "private": true, + "dependencies": { + "@ant-design/icons": "~4.2.1", + "@apollo/react-hooks": "^3.1.5", + "@capacitor-community/sqlite": "^2.4.0", + "@capacitor/android": "2.4.0", + "@testing-library/jest-dom": "^4.2.4", + "@testing-library/react": "^9.3.2", + "@testing-library/user-event": "^7.1.2", + "@types/jest": "^24.0.0", + "@types/node": "^12.0.0", + "@types/react": "^16.9.0", + "@types/react-dom": "^16.9.0", + "antd": "~4.4.1", + "graphql.macro": "^1.4.2", + "offix-datastore": "0.4.0", + "react": "^16.13.1", + "react-dom": "^16.13.1", + "react-scripts": "3.4.1", + "typescript": "4.1.5", + "uniforms": "3.0.0-alpha.5", + "uniforms-antd": "3.0.0-alpha.5", + "uniforms-bridge-graphql": "3.0.0-alpha.5", + "uuidv4": "^6.1.1", + "@capacitor/core": "^2.4.0" + }, + "scripts": { + "start": "SKIP_PREFLIGHT_CHECK=true react-scripts start", + "startServer": "gqlserve serve --datasync --conflict=clientSideWins --port=5400 ./src/model/runtime.graphql", + "build": "react-scripts build", + "test": "react-scripts test", + "eject": "react-scripts eject", + "generate": "offix generate --schema ./src/model/runtime.graphql --outputPath ./src/datastore/generated", + "linkdatastore": "cd ../../packages/datastore/datastore && yarn link && cd - && yarn link offix-datastore && rm -Rf ./node_modules/react && && rm -Rf ./node_modules/react-dom", + "linkdatastorecli": "cd ../../packages/datastore/cli && yarn link && cd - && yarn link @offix/cli" + }, + "eslintConfig": { + "extends": "react-app" + }, + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] + }, + "devDependencies": { + "@capacitor/cli": "^2.4.0", + "@offix/cli": "0.2.1", + "graphback-cli": "1.1.1", + "graphql-serve": "1.1.1" + } +} diff --git a/examples/vue-datastore/public/favicon.ico b/examples/vue-datastore/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..bcd5dfd67cd0361b78123e95c2dd96031f27f743 GIT binary patch literal 3150 zcmaKtc{Ei0AIGn;MZ^<@lHD*OV;K7~W1q3jSjJcqNywTkMOhP*k~Oj?GO|6{m(*C2 zC7JA+hN%%Bp7T4;J@?%2_x=5zbI<2~->=X60stMr0B~{wzpi9D0MG|# zyuANt7z6;uz%?PEfAnimLl^)6h5ARwGXemG2>?hqQv-I^Gpyh$JH}Ag92}3{$a#z& zd`il2Sb#$U&e&4#^4R|GTgk!Qs+x*PCL{2+`uB5mqtnqLaaw`*H2oqJ?XF(zUACc2 zSibBrdQzcidqv*TK}rpEv1ie&;Famq2IK5%4c}1Jt2b1x_{y1C!?EU)@`_F)yN*NK z)(u03@%g%uDawwXGAMm%EnP9FgoucUedioDwL~{6RVO@A-Q$+pwVRR%WYR>{K3E&Q zzqzT!EEZ$_NHGYM6&PK#CGUV$pTWsiI5#~m>htoJ!vbc0=gm3H8sz8KzIiVN5xdCT z%;}`UH2Pc8))1VS-unh?v4*H*NIy5On{MRKw7BTmOO9oE2UApwkCl9Z?^dod9M^#w z51tEZhf+#dpTo#GDDy#kuzoIjMjZ?%v*h$ z*vwUMOjGc?R0(FjLWkMD)kca4z6~H45FIzQ!Zzu&-yWyMdCBsDr2`l}Q{8fH$H@O< z$&snNzbqLk?(GIe?!PVh?F~2qk4z^rMcp$P^hw^rUPjyCyoNTRw%;hNOwrCoN?G0E z!wT^=4Loa9@O{t;Wk(Nj=?ms1Z?UN_;21m%sUm?uib=pg&x|u)8pP#l--$;B9l47n zUUnMV0sXLe*@Gvy>XWjRoqc2tOzgYn%?g@Lb8C&WsxV1Kjssh^ZBs*Ysr+E6%tsC_ zCo-)hkYY=Bn?wMB4sqm?WS>{kh<6*DO)vXnQpQ9`-_qF6!#b;3Nf@;#B>e2j$yokl6F|9p1<($2 z=WSr%)Z?^|r6njhgbuMrIN>8JE05u0x5t@_dEfbGn9r0hK4c2vp>(*$GXsjeLL_uz zWpyfUgdv!~-2N;llVzik#s2*XB*%7u8(^sJv&T3pzaR&<9({17Zs~UY>#ugZZkHBs zD+>0_an$?}utGp$dcXtyFHnTQZJ}SF=oZ}X07dz~K>^o(vjTzw8ZQc!Fw1W=&Z?9% zv63|~l}70sJbY?H8ON8j)w5=6OpXuaZ}YT03`2%u8{;B0Vafo_iY7&BiQTbRkdJBYL}?%ATfmc zLG$uXt$@3j#OIjALdT&Ut$=9F8cgV{w_f5eS)PjoVi z&oemp-SKJ~UuGuCP1|iY?J^S&P z)-IG?O-*=z6kfZrX5H*G=aQ{ZaqnOqP@&+_;nq@mA>EcjgxrYX8EK|Iq4&E&rxR?R z8N$QOdRwY zr{P`O)=87>YLHtFfGXW z6P)ucrhj~It_9w<^v5>T6N1U}+BkS))=WX*2JY=}^b2czGhH<`?`(}}qMcpPx_%>M zM|fs(+I1m&_h(zqp-HgP>re$2O^o$q)xu#fl0ivOJE({duU)a*OD(eYgSi^cdTn}pqcPM(;S)2%1By^Wh%-CaC%>d9hi`7J zaxL7@;nhA>PE%s99&;z{8>VFgf{u!(-B-x7Of6ueme+ScryL`h(^qKE)DtieWY>-7 zgB)VJESQS4*1LU(2&@pgLvSt{(((C?K_V(rQk``i&5}ZPG;G^FiPlZ$7|-vEmMWlU z5lQ%iK2nu=h2wd_7>gK@vX=*AG+u~rQP$NwPC`ZA?4nh{3tui1x@bT6-;Rk3yDQ>d z?3qRD#+PeV7#FAa>s`Xwxsx_oRFcN$StW2=CW`=qObsT?SD^#^jM1Yk}PSPxJ zG@-_mnNU_)vM|iLRSI>UMp|hatyS}17R{10IuL0TLlupt>9dRs_SPQbv7BLYyC#qv16E-y@XZ= z-!p7I%#r-BVi$nQq3&ssRc_IC%R6$tA&^s_l46880~Wst3@>(|EO<}T4~ci~#!=e; zD)B>o%1+$ksURD1p7I-<3ehlFyVkqrySf&gg>Bp0Z9?JaG|gyTZ{Cb8SdvAWVmFX7v2ohs!OCc!Udk zUITUpmZ33rKLI#(&lDj}cKA#dpL4Fil=$5pu_wi1XJR!llw` zSItPBDEdMHk2>c7#%lBxZHHvtVUOZ$}v?=?AT~9!Jcqa@IJGuMg(s^7r>pcTrd)pS`{5Cu8WPey` z9)!!OUUY@L%9Q+bZa*S5`3f_|lFCPN6kdp_M2>{le8;cn^XUsPa+TUk47qd6)IBR% zk*&Ip?!Ge_gmmdj)BX}P_5o@VI2*wbZ^>UhFju}0gQZh!pP%4XT9{@w;G#b3XK8sN zF(7i$Jv(IM$8Akys9dhP^^~H2(7BfJp}yDW1#@!CL-!mGcSCnJ599WK9MV@yo_u$v MDeX2GIKR{Qf5okjU;qFB literal 0 HcmV?d00001 diff --git a/examples/vue-datastore/public/index.html b/examples/vue-datastore/public/index.html new file mode 100644 index 000000000..aa069f27c --- /dev/null +++ b/examples/vue-datastore/public/index.html @@ -0,0 +1,43 @@ + + + + + + + + + + + + + React App + + + +
+ + + diff --git a/examples/vue-datastore/public/logo192.png b/examples/vue-datastore/public/logo192.png new file mode 100644 index 0000000000000000000000000000000000000000..fc44b0a3796c0e0a64c3d858ca038bd4570465d9 GIT binary patch literal 5347 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 b{|{}U^kRn2wo}j7|0ATu<;8xA7zX}7|B6mN literal 0 HcmV?d00001 diff --git a/examples/vue-datastore/public/manifest.json b/examples/vue-datastore/public/manifest.json new file mode 100644 index 000000000..080d6c77a --- /dev/null +++ b/examples/vue-datastore/public/manifest.json @@ -0,0 +1,25 @@ +{ + "short_name": "React App", + "name": "Create React App Sample", + "icons": [ + { + "src": "favicon.ico", + "sizes": "64x64 32x32 24x24 16x16", + "type": "image/x-icon" + }, + { + "src": "logo192.png", + "type": "image/png", + "sizes": "192x192" + }, + { + "src": "logo512.png", + "type": "image/png", + "sizes": "512x512" + } + ], + "start_url": ".", + "display": "standalone", + "theme_color": "#000000", + "background_color": "#ffffff" +} diff --git a/examples/vue-datastore/public/robots.txt b/examples/vue-datastore/public/robots.txt new file mode 100644 index 000000000..e9e57dc4d --- /dev/null +++ b/examples/vue-datastore/public/robots.txt @@ -0,0 +1,3 @@ +# https://www.robotstxt.org/robotstxt.html +User-agent: * +Disallow: diff --git a/examples/vue-datastore/src/App.tsx b/examples/vue-datastore/src/App.tsx new file mode 100644 index 000000000..1d231e21c --- /dev/null +++ b/examples/vue-datastore/src/App.tsx @@ -0,0 +1,110 @@ +import React, { useState, useEffect } from 'react'; +import { Button } from 'antd'; +import 'antd/dist/antd.css'; + +import { useFindTodos } from './datastore/hooks'; +import { TodoList, AddTodo, Loading, Error, Header } from './components'; +import { datastore } from './datastore/config'; +import { NetworkStatusEvent } from 'offix-datastore/types/replication/network/NetworkStatus'; + +function App() { + + const [replicating, setReplicating] = useState(true); + const [addView, setAddView] = useState(false); + const { loading, error, data, subscribeToUpdates } = useFindTodos(); + + useEffect(() => { + datastore.getNetworkIndicator()?.subscribe({ + next: (event: NetworkStatusEvent) => { + if (event.isOnline) { + datastore.startReplication(); + setReplicating(true); + } else { + datastore.stopReplication(); + setReplicating(false); + } + } + }) + }) + + useEffect(() => { + // We can start replication on a per model basis + // or for the entire store with: + // datastore.startReplication + // the `startReplication` method accepts an + // optional filter + datastore.startReplication() + }); + + useEffect(() => { + const subscription = subscribeToUpdates(); + return () => subscription.unsubscribe(); + }, [data, subscribeToUpdates]); + + if (loading) return ; + + if (error) return ; + + return ( +
+
+
setAddView(false) + } + extra={ + addView ? null : ( + <> + + + + ) + } + > + { + !addView && ( + <> + + + ) + } + { + addView && ( + <> + setAddView(false)} /> + + ) + } +
+
+
+ ); +} + +const containerStyle = { + display: 'flex', + alignItems: 'start', + justifyContent: 'center', + minHeight: '100vh', + width: '100vw', + padding: '2em 0' +} + +export default App; diff --git a/examples/vue-datastore/src/components/Todo/Todo.tsx b/examples/vue-datastore/src/components/Todo/Todo.tsx new file mode 100644 index 000000000..78a4234af --- /dev/null +++ b/examples/vue-datastore/src/components/Todo/Todo.tsx @@ -0,0 +1,48 @@ +import React, { useState, FormEvent } from 'react'; +import { Row, Col, Button } from 'antd'; +import { EditOutlined, DeleteOutlined } from '@ant-design/icons'; + +import { EditTodo, ToggleTodo } from '../forms'; +import { TodoProps } from '../../types'; +import { useDeleteTodo } from '../../datastore/hooks'; + +export const Todo = ({ todo }: TodoProps) => { + const [edit, setEdit] = useState(false); + const { remove: deleteTodo } = useDeleteTodo(); + + const handleDelete = (e: FormEvent) => { + e.preventDefault(); + deleteTodo(todo) + .then((res: any) => console.log(res)) + .catch((error: any) => console.log(error)); + }; + + if (edit) { + return ( + setEdit(!edit)} + /> + ); + } + + return ( + + + +

+ Description:
+ {todo.description} +

+ + + + + + + ); +}; diff --git a/examples/vue-datastore/src/components/Todo/TodoList.tsx b/examples/vue-datastore/src/components/Todo/TodoList.tsx new file mode 100644 index 000000000..85605cce4 --- /dev/null +++ b/examples/vue-datastore/src/components/Todo/TodoList.tsx @@ -0,0 +1,27 @@ +import React from 'react'; +import { Card } from 'antd'; + +import { Empty } from '../UI'; +import { Todo } from './Todo'; +import { TodoListProps } from '../../types'; + +export const TodoList = ({ todos }: TodoListProps) => { + + if (!todos || todos.length === 0) return ; + + return ( + // map through todos and render + // each todo item + <> + { + todos && todos.map((todo) => ( + + + + )) + } + + ); +}; diff --git a/examples/vue-datastore/src/components/Todo/index.ts b/examples/vue-datastore/src/components/Todo/index.ts new file mode 100644 index 000000000..3a6dc8a33 --- /dev/null +++ b/examples/vue-datastore/src/components/Todo/index.ts @@ -0,0 +1,2 @@ +export { Todo } from './Todo'; +export { TodoList } from './TodoList'; \ No newline at end of file diff --git a/examples/vue-datastore/src/components/UI/Empty.tsx b/examples/vue-datastore/src/components/UI/Empty.tsx new file mode 100644 index 000000000..65367c908 --- /dev/null +++ b/examples/vue-datastore/src/components/UI/Empty.tsx @@ -0,0 +1,11 @@ +import React from 'react'; + +export const Empty = () => { + return ( +
+
+

You have no todo items

+

Click the button to create a new task

+
+ ); +}; diff --git a/examples/vue-datastore/src/components/UI/Error.tsx b/examples/vue-datastore/src/components/UI/Error.tsx new file mode 100644 index 000000000..509691d71 --- /dev/null +++ b/examples/vue-datastore/src/components/UI/Error.tsx @@ -0,0 +1,12 @@ +import React from 'react'; +import { Result } from 'antd'; + +export function Error({ message }: { message: string }) { + return ( + + ); +} \ No newline at end of file diff --git a/examples/vue-datastore/src/components/UI/Header.tsx b/examples/vue-datastore/src/components/UI/Header.tsx new file mode 100644 index 000000000..2ce010df0 --- /dev/null +++ b/examples/vue-datastore/src/components/UI/Header.tsx @@ -0,0 +1,15 @@ +import React from 'react'; +import { PageHeader } from 'antd'; + +export function Header({ title, onBack, extra, children } : any, props : any) { + return ( + + { children } + + ); +} diff --git a/examples/vue-datastore/src/components/UI/Loading.tsx b/examples/vue-datastore/src/components/UI/Loading.tsx new file mode 100644 index 000000000..f6a3f7763 --- /dev/null +++ b/examples/vue-datastore/src/components/UI/Loading.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import { Result, Spin } from 'antd'; + +export function Loading() { + return ( + } + title="Loading..." + /> + ); +} \ No newline at end of file diff --git a/examples/vue-datastore/src/components/UI/index.ts b/examples/vue-datastore/src/components/UI/index.ts new file mode 100644 index 000000000..4d2d3c1af --- /dev/null +++ b/examples/vue-datastore/src/components/UI/index.ts @@ -0,0 +1,4 @@ +export { Empty } from './Empty'; +export { Error } from './Error'; +export { Header } from './Header'; +export { Loading } from './Loading'; \ No newline at end of file diff --git a/examples/vue-datastore/src/components/forms/AddTodo.tsx b/examples/vue-datastore/src/components/forms/AddTodo.tsx new file mode 100644 index 000000000..941d2879c --- /dev/null +++ b/examples/vue-datastore/src/components/forms/AddTodo.tsx @@ -0,0 +1,37 @@ +import React from 'react'; +import { Button } from 'antd'; +import { + AutoForm, + TextField, + LongTextField, + SubmitField +} from 'uniforms-antd'; + +import { AddTodoProps } from '../../types'; +import { schema } from './formSchema'; +import { useAddTodo } from '../../datastore/hooks'; +import { Todo } from '../../datastore/generated'; + +export const AddTodo = ({ cancel }: AddTodoProps) => { + + const { save: addTodo } = useAddTodo(); + + const handleSubmit = ({ title, description }: Todo) => { + addTodo({ + title, + description, + completed: false, + }) + .then(() => cancel()) + .catch((error: any) => console.log(error)); + }; + + return ( + + + + + + + ); +}; diff --git a/examples/vue-datastore/src/components/forms/EditTodo.tsx b/examples/vue-datastore/src/components/forms/EditTodo.tsx new file mode 100644 index 000000000..67e654513 --- /dev/null +++ b/examples/vue-datastore/src/components/forms/EditTodo.tsx @@ -0,0 +1,40 @@ +import React from 'react'; +import { Button } from 'antd'; +import { AutoForm, TextField, LongTextField, SubmitField } from 'uniforms-antd'; + +import { schema } from './formSchema'; +import { EditTodoProps } from '../../types'; +import { useEditTodo } from '../../datastore/hooks'; +import { Todo } from '../../datastore/generated'; + +export const EditTodo = ({ todo, toggleEdit }: EditTodoProps) => { + + const { update: editTodo } = useEditTodo(); + + const handleUpdate = (todo: Todo) => { + editTodo({ + ...todo, + title: todo.title, + description: todo.description, + _version: todo._version ?? 1, + }) + .then(() => toggleEdit()) + .catch((error: any) => { + console.log(error); + }); + }; + + return ( + + + + + + + ); +}; diff --git a/examples/vue-datastore/src/components/forms/ToggleTodo.tsx b/examples/vue-datastore/src/components/forms/ToggleTodo.tsx new file mode 100644 index 000000000..30f7d7dc2 --- /dev/null +++ b/examples/vue-datastore/src/components/forms/ToggleTodo.tsx @@ -0,0 +1,32 @@ +import React from 'react'; +import { QuickForm, BoolField } from 'uniforms-antd'; + +import { ToggleTodoProps } from "../../types"; +import { schema } from './formSchema'; +import { useEditTodo } from '../../datastore/hooks'; + +export function ToggleTodo({ todo }: ToggleTodoProps) { + + const { update: editTodo } = useEditTodo(); + + const handleUpdate = () => { + editTodo({ + ...todo, + _version: todo._version ?? 1, + completed: !todo.completed, + }) + .then((res: any) => console.log("response", res)) + .catch((error: any) => console.log("error", error)); + }; + + return ( + + + + ); +} diff --git a/examples/vue-datastore/src/components/forms/formSchema.ts b/examples/vue-datastore/src/components/forms/formSchema.ts new file mode 100644 index 000000000..ce68f5c62 --- /dev/null +++ b/examples/vue-datastore/src/components/forms/formSchema.ts @@ -0,0 +1,33 @@ +import { GraphQLBridge } from 'uniforms-bridge-graphql'; +import { buildASTSchema } from 'graphql'; +import { loader } from 'graphql.macro'; +import { Todo } from '../../datastore/generated'; + +// import the grapqhl model +const model = loader('../../model/runtime.graphql'); + +const validator = (model: Todo) => { + const details = []; + + if (!model.title) { + details.push({ name: 'title' }); + } + + if (details.length) { + // eslint-disable-next-line + throw { details }; + } +}; + +const data = { + title: { + required: true, + errorMessage: 'Title is required', + } +} + +export const schema = new GraphQLBridge( + buildASTSchema((model)).getType('Todo'), + validator, + data, +); diff --git a/examples/vue-datastore/src/components/forms/index.ts b/examples/vue-datastore/src/components/forms/index.ts new file mode 100644 index 000000000..016c57292 --- /dev/null +++ b/examples/vue-datastore/src/components/forms/index.ts @@ -0,0 +1,3 @@ +export { AddTodo } from './AddTodo'; +export { EditTodo } from './EditTodo'; +export { ToggleTodo } from './ToggleTodo'; \ No newline at end of file diff --git a/examples/vue-datastore/src/components/index.ts b/examples/vue-datastore/src/components/index.ts new file mode 100644 index 000000000..c902aa263 --- /dev/null +++ b/examples/vue-datastore/src/components/index.ts @@ -0,0 +1,3 @@ +export { Todo, TodoList } from './Todo'; +export { AddTodo, EditTodo, ToggleTodo } from './forms'; +export { Empty, Error, Loading, Header } from './UI'; \ No newline at end of file diff --git a/examples/vue-datastore/src/datastore/config.ts b/examples/vue-datastore/src/datastore/config.ts new file mode 100644 index 000000000..e92617528 --- /dev/null +++ b/examples/vue-datastore/src/datastore/config.ts @@ -0,0 +1,32 @@ +import { DataStore } from 'offix-datastore'; +import { schema, User, Todo } from './generated'; + +export const datastore = new DataStore({ + dbName: "offix-datasync", + replicationConfig: { + client: { + url: "http://localhost:5400/graphql", + wsUrl: "ws://localhost:5400/graphql", + }, + delta: { enabled: true, pullInterval: 20000 }, + mutations: { enabled: true }, + liveupdates: { enabled: true } + } +}); + +export const TodoModel = datastore.setupModel(schema.Todo); +export const UserModel = datastore.setupModel(schema.User); + +datastore.init(); + +// After init we can start replication immediately with: +// datastore.startReplication() +// Or we can start replication at a later stage. +// +// we can also execute operations freely using hooks in components and plain js. +// const user = { name: "User" + new Date().getTime() }; +// UserModel.save(user).then(async (result) => { +// result.name = "NewUser"; +// await UserModel.updateById(result); +// await UserModel.removeById(result.id as string); +// }).catch(console.log) diff --git a/examples/vue-datastore/src/datastore/generated/index.ts b/examples/vue-datastore/src/datastore/generated/index.ts new file mode 100644 index 000000000..7d28cc6ed --- /dev/null +++ b/examples/vue-datastore/src/datastore/generated/index.ts @@ -0,0 +1,6 @@ +import { GeneratedModelSchema } from "offix-datastore"; +import jsonSchema from "./schema.json"; + +export const schema = jsonSchema as GeneratedModelSchema; + +export * from "./types"; diff --git a/examples/vue-datastore/src/datastore/generated/schema.json b/examples/vue-datastore/src/datastore/generated/schema.json new file mode 100644 index 000000000..5ee203f14 --- /dev/null +++ b/examples/vue-datastore/src/datastore/generated/schema.json @@ -0,0 +1,57 @@ +{ + "Todo": { + "name": "Todo", + "version": 1, + "type": "object", + "primaryKey": "_id", + "properties": { + "_id": { + "type": "string", + "key": "_id", + "isRequired": true, + "primary": true + }, + "title": { + "type": "string", + "key": "title" + }, + "description": { + "type": "string", + "key": "description" + }, + "completed": { + "type": "boolean", + "key": "completed" + }, + "_version": { + "type": "string", + "key": "_version", + "isRequired": true + } + } + }, + "User": { + "name": "User", + "version": 1, + "type": "object", + "primaryKey": "_id", + "properties": { + "_id": { + "type": "string", + "key": "_id", + "isRequired": true, + "primary": true + }, + "name": { + "type": "string", + "key": "name", + "isRequired": true + }, + "_version": { + "type": "string", + "key": "_version", + "isRequired": true + } + } + } +} diff --git a/examples/vue-datastore/src/datastore/generated/types.ts b/examples/vue-datastore/src/datastore/generated/types.ts new file mode 100644 index 000000000..0fe37641c --- /dev/null +++ b/examples/vue-datastore/src/datastore/generated/types.ts @@ -0,0 +1,19 @@ +export interface Todo { + _id: string; + title?: string; + description?: string; + completed?: boolean + _version: number; +} + +export type TodoCreate = Omit; +export type TodoChange = Pick & Partial; + +export interface User { + _id: string; + name: string + _version: number; +} + +export type UserCreate = Omit; +export type UserChange = Pick & Partial; diff --git a/examples/vue-datastore/src/datastore/hooks.ts b/examples/vue-datastore/src/datastore/hooks.ts new file mode 100644 index 000000000..f1053ff7f --- /dev/null +++ b/examples/vue-datastore/src/datastore/hooks.ts @@ -0,0 +1,11 @@ +import { Filter, useQuery, useSave, useUpdate, useRemove } from 'offix-datastore'; +import { TodoModel } from './config'; +import { Todo } from './generated'; + +export const useFindTodos = (filter?: Filter) => useQuery(TodoModel, filter); + +export const useAddTodo = () => useSave(TodoModel); + +export const useEditTodo = () => useUpdate(TodoModel); + +export const useDeleteTodo = () => useRemove(TodoModel); diff --git a/examples/vue-datastore/src/index.tsx b/examples/vue-datastore/src/index.tsx new file mode 100644 index 000000000..d68fa09e7 --- /dev/null +++ b/examples/vue-datastore/src/index.tsx @@ -0,0 +1,14 @@ +import React from 'react'; +import ReactDOM from 'react-dom'; +import App from './App'; +import * as serviceWorker from './serviceWorker'; + +// enable logger for datasync in browser +localStorage.debug = 'datasync:*'; + +ReactDOM.render(, document.getElementById("root")); + +// If you want your app to work offline and load faster, you can change +// unregister() to register() below. Note this comes with some pitfalls. +// Learn more about service workers: https://bit.ly/CRA-PWA +serviceWorker.register(); diff --git a/examples/vue-datastore/src/model/runtime.graphql b/examples/vue-datastore/src/model/runtime.graphql new file mode 100644 index 000000000..4be42b410 --- /dev/null +++ b/examples/vue-datastore/src/model/runtime.graphql @@ -0,0 +1,23 @@ +scalar GraphbackObjectID + +""" +@model +@datasync +""" +type Todo { + _id: GraphbackObjectID! + title: String + description: String + completed: Boolean +} + +""" +@model +@datasync +""" +type User { + _id: GraphbackObjectID! + name: String! + # TODO + # todos: [Todo!]! +} diff --git a/examples/vue-datastore/src/react-app-env.d.ts b/examples/vue-datastore/src/react-app-env.d.ts new file mode 100644 index 000000000..6431bc5fc --- /dev/null +++ b/examples/vue-datastore/src/react-app-env.d.ts @@ -0,0 +1 @@ +/// diff --git a/examples/vue-datastore/src/serviceWorker.ts b/examples/vue-datastore/src/serviceWorker.ts new file mode 100644 index 000000000..b09523f15 --- /dev/null +++ b/examples/vue-datastore/src/serviceWorker.ts @@ -0,0 +1,149 @@ +// This optional code is used to register a service worker. +// register() is not called by default. + +// This lets the app load faster on subsequent visits in production, and gives +// it offline capabilities. However, it also means that developers (and users) +// will only see deployed updates on subsequent visits to a page, after all the +// existing tabs open on the page have been closed, since previously cached +// resources are updated in the background. + +// To learn more about the benefits of this model and instructions on how to +// opt-in, read https://bit.ly/CRA-PWA + +const isLocalhost = Boolean( + window.location.hostname === 'localhost' || + // [::1] is the IPv6 localhost address. + window.location.hostname === '[::1]' || + // 127.0.0.0/8 are considered localhost for IPv4. + window.location.hostname.match( + /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ + ) +); + +type Config = { + onSuccess?: (registration: ServiceWorkerRegistration) => void; + onUpdate?: (registration: ServiceWorkerRegistration) => void; +}; + +export function register(config?: Config) { + if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { + // The URL constructor is available in all browsers that support SW. + const publicUrl = new URL( + process.env.PUBLIC_URL, + window.location.href + ); + if (publicUrl.origin !== window.location.origin) { + // Our service worker won't work if PUBLIC_URL is on a different origin + // from what our page is served on. This might happen if a CDN is used to + // serve assets; see https://github.com/facebook/create-react-app/issues/2374 + return; + } + + window.addEventListener('load', () => { + const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; + + if (isLocalhost) { + // This is running on localhost. Let's check if a service worker still exists or not. + checkValidServiceWorker(swUrl, config); + + // Add some additional logging to localhost, pointing developers to the + // service worker/PWA documentation. + navigator.serviceWorker.ready.then(() => { + console.log( + 'This web app is being served cache-first by a service ' + + 'worker. To learn more, visit https://bit.ly/CRA-PWA' + ); + }); + } else { + // Is not localhost. Just register service worker + registerValidSW(swUrl, config); + } + }); + } +} + +function registerValidSW(swUrl: string, config?: Config) { + navigator.serviceWorker + .register(swUrl) + .then(registration => { + registration.onupdatefound = () => { + const installingWorker = registration.installing; + if (installingWorker == null) { + return; + } + installingWorker.onstatechange = () => { + if (installingWorker.state === 'installed') { + if (navigator.serviceWorker.controller) { + // At this point, the updated precached content has been fetched, + // but the previous service worker will still serve the older + // content until all client tabs are closed. + console.log( + 'New content is available and will be used when all ' + + 'tabs for this page are closed. See https://bit.ly/CRA-PWA.' + ); + + // Execute callback + if (config && config.onUpdate) { + config.onUpdate(registration); + } + } else { + // At this point, everything has been precached. + // It's the perfect time to display a + // "Content is cached for offline use." message. + console.log('Content is cached for offline use.'); + + // Execute callback + if (config && config.onSuccess) { + config.onSuccess(registration); + } + } + } + }; + }; + }) + .catch(error => { + console.error('Error during service worker registration:', error); + }); +} + +function checkValidServiceWorker(swUrl: string, config?: Config) { + // Check if the service worker can be found. If it can't reload the page. + fetch(swUrl, { + headers: { 'Service-Worker': 'script' } + }) + .then(response => { + // Ensure service worker exists, and that we really are getting a JS file. + const contentType = response.headers.get('content-type'); + if ( + response.status === 404 || + (contentType != null && contentType.indexOf('javascript') === -1) + ) { + // No service worker found. Probably a different app. Reload the page. + navigator.serviceWorker.ready.then(registration => { + registration.unregister().then(() => { + window.location.reload(); + }); + }); + } else { + // Service worker found. Proceed as normal. + registerValidSW(swUrl, config); + } + }) + .catch(() => { + console.log( + 'No internet connection found. App is running in offline mode.' + ); + }); +} + +export function unregister() { + if ('serviceWorker' in navigator) { + navigator.serviceWorker.ready + .then(registration => { + registration.unregister(); + }) + .catch(error => { + console.error(error.message); + }); + } +} diff --git a/examples/vue-datastore/src/setupTests.ts b/examples/vue-datastore/src/setupTests.ts new file mode 100644 index 000000000..74b1a275a --- /dev/null +++ b/examples/vue-datastore/src/setupTests.ts @@ -0,0 +1,5 @@ +// jest-dom adds custom jest matchers for asserting on DOM nodes. +// allows you to do things like: +// expect(element).toHaveTextContent(/react/i) +// learn more: https://github.com/testing-library/jest-dom +import '@testing-library/jest-dom/extend-expect'; diff --git a/examples/vue-datastore/src/types.ts b/examples/vue-datastore/src/types.ts new file mode 100644 index 000000000..01194bea6 --- /dev/null +++ b/examples/vue-datastore/src/types.ts @@ -0,0 +1,39 @@ +import { Todo } from "./datastore/generated"; + +export type TodoProps = { + todo: Todo, +}; + +export type TodoListProps = { + todos: Array, +}; + +export type AddTodoProps = { + cancel: () => void, +}; + +export type EditTodoProps = { + todo: Todo, + toggleEdit: () => void, +}; + +export type ToggleTodoProps = { + todo: Todo, +}; + +export type HookState = { + data: any | null, + loading: boolean, + error: Error | null, +}; + +export enum ActionType { + REQ_START = 0, + REQ_SUCCESS = 1, + REQ_FAILED = 2, +}; + +export type ReducerAction = { + type: ActionType, + payload?: any, +} diff --git a/examples/vue-datastore/tsconfig.json b/examples/vue-datastore/tsconfig.json new file mode 100644 index 000000000..f2850b716 --- /dev/null +++ b/examples/vue-datastore/tsconfig.json @@ -0,0 +1,25 @@ +{ + "compilerOptions": { + "target": "es5", + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], + "allowJs": true, + "skipLibCheck": true, + "esModuleInterop": true, + "allowSyntheticDefaultImports": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "module": "esnext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "jsx": "react" + }, + "include": [ + "src" + ] +} diff --git a/packages/datastore/datastore/src/vue/ReducerUtils.ts b/packages/datastore/datastore/src/vue/ReducerUtils.ts new file mode 100644 index 000000000..d4394bb03 --- /dev/null +++ b/packages/datastore/datastore/src/vue/ReducerUtils.ts @@ -0,0 +1,38 @@ +export enum ActionType { + INITIATE_REQUEST, + REQUEST_COMPLETE, + UPDATE_RESULT, + DELTA_FORCED +} + +export interface Action { + type: ActionType; + data?: any; + error?: any; +} + +export interface ResultState { + loading: boolean; + data?: any; + error?: any; +} + +export const InitialState: ResultState = { loading: false }; + +export const reducer = (state: ResultState, action: Action) => { + switch (action.type) { + case ActionType.INITIATE_REQUEST: + return { ...state, loading: true, error: null }; + + case ActionType.REQUEST_COMPLETE: + return { ...state, loading: false, data: action.data, error: action.error }; + + case ActionType.UPDATE_RESULT: + // Don't update result when request is loading + if (state.loading) { return state; } + return { ...state, data: action.data }; + + default: + return state; + } +}; diff --git a/packages/datastore/datastore/src/vue/hooks/delete.ts b/packages/datastore/datastore/src/vue/hooks/delete.ts new file mode 100644 index 000000000..0cebfdabd --- /dev/null +++ b/packages/datastore/datastore/src/vue/hooks/delete.ts @@ -0,0 +1,23 @@ +import { useReducer } from "react"; +import { Model } from "../../Model"; +import { reducer, InitialState, ActionType } from "../ReducerUtils"; +import { Filter } from "../../filters"; + +export const useRemove = (model: Model) => { + const [state, dispatch] = useReducer(reducer, InitialState); + + const remove = async (filter: Filter) => { + if (state.loading) { return; } + + dispatch({ type: ActionType.INITIATE_REQUEST }); + try { + const results = await model.remove(filter); + dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); + return results; + } catch (error) { + dispatch({ type: ActionType.REQUEST_COMPLETE, error }); + } + }; + + return { ...state, remove }; +}; diff --git a/packages/datastore/datastore/src/vue/hooks/query.ts b/packages/datastore/datastore/src/vue/hooks/query.ts new file mode 100644 index 000000000..8b404bcad --- /dev/null +++ b/packages/datastore/datastore/src/vue/hooks/query.ts @@ -0,0 +1,129 @@ +import { useEffect, useReducer, useCallback, Dispatch } from "react"; +import { Model } from "../../Model"; +import { reducer, InitialState, ActionType, Action, ResultState } from "../ReducerUtils"; +import { CRUDEvents, StoreChangeEvent } from "../../storage"; +import { Filter } from "../../filters"; + +const onAdded = (currentData: any[], newData: any[]) => { + if (!currentData) { return newData; } + return [...currentData, ...newData]; +}; + +const onChanged = (currentData: any[], newData: any[], primaryKey: string) => { + if (!currentData) { return []; } + // What happens to data that get's updated and falls outside original query filter? + return currentData.map((d) => { + const index = newData.findIndex((newD) => newD[primaryKey] === d[primaryKey]); + if (index === -1) { return d; } + return newData[index]; + }); +}; + +const onIdSwapped = (currentData: any[], newData: any[], primaryKey: string) => { + if (!currentData) { return []; } + + return currentData.map((d) => { + const index = newData.findIndex((newD) => newD.previous[primaryKey] === d[primaryKey]); + if (index === -1) { return d; } + return newData[index].current; + }); +}; + +const onRemoved = (currentData: any[], removedData: any[], primaryKey: string) => { + if (!currentData) { return []; } + return currentData + .filter( + (d) => removedData.findIndex((newD) => newD[primaryKey] === d[primaryKey]) + ); +}; + +export const updateResult = (state: ResultState, event: StoreChangeEvent, primaryKey: string) => { + switch (event.eventType) { + case CRUDEvents.ADD: + return onAdded(state.data, event.data); + + case CRUDEvents.UPDATE: + return onChanged(state.data, event.data, primaryKey); + + case CRUDEvents.ID_SWAP: + return onIdSwapped(state.data, event.data, primaryKey); + + case CRUDEvents.DELETE: + return onRemoved(state.data, event.data, primaryKey); + + default: + throw new Error(`Invalid event ${event.eventType} received`); + } +}; + +const createSubscribeToUpdates = (state: ResultState, model: Model, dispatch: Dispatch) => { + return (eventsToWatch?: CRUDEvents[], customEventHandler?: (state: ResultState, data: any) => any) => { + const subscription = model.subscribe((event) => { + let newData; + + if (customEventHandler) { + newData = customEventHandler(state, event.data); + } + newData = updateResult(state, event, model.getSchema().getPrimaryKey()); + + if (!subscription.closed) { + // Important to check beacuse Componnent could be unmounted + dispatch({ type: ActionType.UPDATE_RESULT, data: newData }); + } + }, eventsToWatch); + return subscription; + }; +}; + +export const useQuery = (model: Model, selector?: Filter | string) => { + const [state, dispatch] = useReducer(reducer, InitialState); + const subscribeToUpdates = useCallback( + createSubscribeToUpdates(state, model, dispatch), [state, model, dispatch] + ); + + useEffect(() => { + (async () => { + if (state.loading) { return; } + + dispatch({ type: ActionType.INITIATE_REQUEST }); + try { + let results; + if ((typeof selector) === "string") { + results = await model.queryById(selector as string); + } else { + results = await model.query(selector); + } + dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); + } catch (error) { + dispatch({ type: ActionType.REQUEST_COMPLETE, error }); + } + })(); + }, [model, selector]); + return { ...state, subscribeToUpdates }; +}; + +export const useLazyQuery = (model: Model) => { + const [state, dispatch] = useReducer(reducer, InitialState); + const subscribeToUpdates = useCallback( + createSubscribeToUpdates(state, model, dispatch), [state, model, dispatch] + ); + + const query = async (selector?: Filter | string) => { + if (state.loading) { return; } + + dispatch({ type: ActionType.INITIATE_REQUEST }); + try { + let results; + if ((typeof selector) === "string") { + results = await model.queryById(selector as string); + } else { + results = await model.query(selector); + } + dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); + } catch (error) { + dispatch({ type: ActionType.REQUEST_COMPLETE, error }); + } + }; + + return { ...state, query, subscribeToUpdates }; +}; diff --git a/packages/datastore/datastore/src/vue/hooks/save.ts b/packages/datastore/datastore/src/vue/hooks/save.ts new file mode 100644 index 000000000..ffa668b60 --- /dev/null +++ b/packages/datastore/datastore/src/vue/hooks/save.ts @@ -0,0 +1,22 @@ +import { useReducer } from "react"; +import { Model } from "../../Model"; +import { reducer, InitialState, ActionType } from "../ReducerUtils"; + +export const useSave = (model: Model) => { + const [state, dispatch] = useReducer(reducer, InitialState); + + const save = async (input: any) => { + if (state.loading) { return; } + + dispatch({ type: ActionType.INITIATE_REQUEST }); + try { + const result = await model.save(input); + dispatch({ type: ActionType.REQUEST_COMPLETE, data: result }); + return result; + } catch (error) { + dispatch({ type: ActionType.REQUEST_COMPLETE, error }); + } + }; + + return { ...state, save }; +}; diff --git a/packages/datastore/datastore/src/vue/hooks/subscription.ts b/packages/datastore/datastore/src/vue/hooks/subscription.ts new file mode 100644 index 000000000..29cb17118 --- /dev/null +++ b/packages/datastore/datastore/src/vue/hooks/subscription.ts @@ -0,0 +1,17 @@ +import { useEffect, useReducer } from "react"; +import { Model } from "../../Model"; +import { CRUDEvents } from "../.."; +import { InitialState, reducer, ActionType } from "../ReducerUtils"; + +export const useSubscription = (model: Model, eventTypes: CRUDEvents[]) => { + const [state, dispatch] = useReducer(reducer, InitialState); + + useEffect(() => { + const subscription = model.subscribe((event) => { + dispatch({ type: ActionType.REQUEST_COMPLETE, data: event.data }); + }, eventTypes); + return () => subscription.unsubscribe(); + }, [model, eventTypes]); + + return state; +}; diff --git a/packages/datastore/datastore/src/vue/hooks/update.ts b/packages/datastore/datastore/src/vue/hooks/update.ts new file mode 100644 index 000000000..422127ee6 --- /dev/null +++ b/packages/datastore/datastore/src/vue/hooks/update.ts @@ -0,0 +1,24 @@ +import { useReducer } from "react"; +import { Model } from "../../Model"; +import { reducer, InitialState, ActionType } from "../ReducerUtils"; + +export const useUpdate = (model: Model) => { + const [state, dispatch] = useReducer(reducer, InitialState); + + const update = async (input: any, upsert: boolean = false) => { + if (state.loading) { return; } + if (state.data) { return; } + + dispatch({ type: ActionType.INITIATE_REQUEST }); + try { + const results = await (upsert ? + model.saveOrUpdate(input): model.updateById(input)); + dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); + return results; + } catch (error) { + dispatch({ type: ActionType.REQUEST_COMPLETE, error }); + } + }; + + return { ...state, update }; +}; diff --git a/packages/datastore/datastore/src/vue/index.ts b/packages/datastore/datastore/src/vue/index.ts new file mode 100644 index 000000000..e69de29bb From a19830a2dd20f0004ba24027c7566b637c8b7b8d Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Sun, 28 Feb 2021 15:14:00 +0300 Subject: [PATCH 02/17] feat: save, update, remove hook. Not tested todo: query hook --- examples/react-datastore/src/App.tsx | 95 ++++--- .../src/components/forms/AddTodo.tsx | 39 +-- .../src/components/forms/EditTodo.tsx | 30 +-- package.json | 3 +- .../datastore/src/react/ReducerUtils.ts | 50 ++-- .../datastore/src/react/hooks/delete.ts | 33 +-- .../datastore/src/react/hooks/query.ts | 243 ++++++++++-------- .../datastore/src/react/hooks/save.ts | 31 ++- .../datastore/src/react/hooks/subscription.ts | 5 +- .../datastore/src/react/hooks/update.ts | 38 +-- .../datastore/src/utils/ActionsTypes.ts | 6 + .../datastore/src/vue/ReducerUtils.ts | 38 --- .../datastore/datastore/src/vue/StateUtils.ts | 53 ++++ .../datastore/src/vue/hooks/delete.ts | 43 ++-- .../datastore/datastore/src/vue/hooks/save.ts | 41 +-- .../datastore/src/vue/hooks/subscription.ts | 43 +++- .../datastore/src/vue/hooks/update.ts | 45 ++-- packages/datastore/datastore/src/vue/index.ts | 4 + 18 files changed, 483 insertions(+), 357 deletions(-) create mode 100644 packages/datastore/datastore/src/utils/ActionsTypes.ts delete mode 100644 packages/datastore/datastore/src/vue/ReducerUtils.ts create mode 100644 packages/datastore/datastore/src/vue/StateUtils.ts diff --git a/examples/react-datastore/src/App.tsx b/examples/react-datastore/src/App.tsx index 1d231e21c..c0b7bff0a 100644 --- a/examples/react-datastore/src/App.tsx +++ b/examples/react-datastore/src/App.tsx @@ -1,17 +1,15 @@ -import React, { useState, useEffect } from 'react'; -import { Button } from 'antd'; -import 'antd/dist/antd.css'; - -import { useFindTodos } from './datastore/hooks'; -import { TodoList, AddTodo, Loading, Error, Header } from './components'; -import { datastore } from './datastore/config'; -import { NetworkStatusEvent } from 'offix-datastore/types/replication/network/NetworkStatus'; +import { Button } from "antd"; +import "antd/dist/antd.css"; +import { NetworkStatusEvent } from "offix-datastore/types/replication/network/NetworkStatus"; +import React, { useEffect, useState } from "react"; +import { AddTodo, Error, Header, Loading, TodoList } from "./components"; +import { datastore } from "./datastore/config"; +import { useFindTodos } from "./datastore/hooks"; function App() { - const [replicating, setReplicating] = useState(true); const [addView, setAddView] = useState(false); - const { loading, error, data, subscribeToUpdates } = useFindTodos(); + const { loading, error, data, subscribeToUpdates } = useFindTodos(); useEffect(() => { datastore.getNetworkIndicator()?.subscribe({ @@ -23,9 +21,9 @@ function App() { datastore.stopReplication(); setReplicating(false); } - } - }) - }) + }, + }); + }); useEffect(() => { // We can start replication on a per model basis @@ -33,9 +31,17 @@ function App() { // datastore.startReplication // the `startReplication` method accepts an // optional filter - datastore.startReplication() - }); + if (replicating) { + datastore.startReplication(); + } + }, [replicating]); + const toggleReplication = () => { + if (replicating) { + datastore.stopReplication(); + } + setReplicating(!replicating); + }; useEffect(() => { const subscription = subscribeToUpdates(); return () => subscription.unsubscribe(); @@ -47,51 +53,38 @@ function App() { return (
-
+
setAddView(false) - } + title={!addView ? "Offix Todo" : "Add Todo"} + onBack={!addView ? null : () => setAddView(false)} extra={ addView ? null : ( <> - ) } > - { - !addView && ( - <> - - - ) - } - { - addView && ( - <> - setAddView(false)} /> - - ) - } + {!addView && ( + <> + + + )} + {addView && ( + <> + setAddView(false)} /> + + )}
@@ -99,12 +92,12 @@ function App() { } const containerStyle = { - display: 'flex', - alignItems: 'start', - justifyContent: 'center', - minHeight: '100vh', - width: '100vw', - padding: '2em 0' -} + display: "flex", + alignItems: "start", + justifyContent: "center", + minHeight: "100vh", + width: "100vw", + padding: "2em 0", +}; export default App; diff --git a/examples/react-datastore/src/components/forms/AddTodo.tsx b/examples/react-datastore/src/components/forms/AddTodo.tsx index 941d2879c..65f16cc4c 100644 --- a/examples/react-datastore/src/components/forms/AddTodo.tsx +++ b/examples/react-datastore/src/components/forms/AddTodo.tsx @@ -1,20 +1,13 @@ -import React from 'react'; -import { Button } from 'antd'; -import { - AutoForm, - TextField, - LongTextField, - SubmitField -} from 'uniforms-antd'; - -import { AddTodoProps } from '../../types'; -import { schema } from './formSchema'; -import { useAddTodo } from '../../datastore/hooks'; -import { Todo } from '../../datastore/generated'; +import { Button } from "antd"; +import React from "react"; +import { AutoForm, LongTextField, SubmitField, TextField } from "uniforms-antd"; +import { Todo } from "../../datastore/generated"; +import { useAddTodo } from "../../datastore/hooks"; +import { AddTodoProps } from "../../types"; +import { schema } from "./formSchema"; export const AddTodo = ({ cancel }: AddTodoProps) => { - - const { save: addTodo } = useAddTodo(); + const { save: addTodo, data, loading, error } = useAddTodo(); const handleSubmit = ({ title, description }: Todo) => { addTodo({ @@ -22,16 +15,24 @@ export const AddTodo = ({ cancel }: AddTodoProps) => { description, completed: false, }) - .then(() => cancel()) - .catch((error: any) => console.log(error)); + .then(() => { + console.log({ data, loading, error }); + + cancel(); + }) + .catch((error: any) => console.log(error)); }; return ( - + - + ); }; diff --git a/examples/react-datastore/src/components/forms/EditTodo.tsx b/examples/react-datastore/src/components/forms/EditTodo.tsx index 67e654513..a5efb0749 100644 --- a/examples/react-datastore/src/components/forms/EditTodo.tsx +++ b/examples/react-datastore/src/components/forms/EditTodo.tsx @@ -1,14 +1,12 @@ -import React from 'react'; -import { Button } from 'antd'; -import { AutoForm, TextField, LongTextField, SubmitField } from 'uniforms-antd'; - -import { schema } from './formSchema'; -import { EditTodoProps } from '../../types'; -import { useEditTodo } from '../../datastore/hooks'; -import { Todo } from '../../datastore/generated'; +import { Button } from "antd"; +import React from "react"; +import { AutoForm, LongTextField, SubmitField, TextField } from "uniforms-antd"; +import { Todo } from "../../datastore/generated"; +import { useEditTodo } from "../../datastore/hooks"; +import { EditTodoProps } from "../../types"; +import { schema } from "./formSchema"; export const EditTodo = ({ todo, toggleEdit }: EditTodoProps) => { - const { update: editTodo } = useEditTodo(); const handleUpdate = (todo: Todo) => { @@ -18,10 +16,12 @@ export const EditTodo = ({ todo, toggleEdit }: EditTodoProps) => { description: todo.description, _version: todo._version ?? 1, }) - .then(() => toggleEdit()) - .catch((error: any) => { - console.log(error); - }); + .then(() => { + toggleEdit(); + }) + .catch((error: any) => { + console.log(error); + }); }; return ( @@ -33,8 +33,8 @@ export const EditTodo = ({ todo, toggleEdit }: EditTodoProps) => { > - - + + ); }; diff --git a/package.json b/package.json index 87b3a1b8e..4f03d5c24 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,8 @@ }, "dependencies": { "@types/mocha": "8.2.1", - "@types/node": "12.20.1" + "@types/node": "12.20.1", + "vue": "^3.0.6" }, "workspaces": [ "packages/*/*" diff --git a/packages/datastore/datastore/src/react/ReducerUtils.ts b/packages/datastore/datastore/src/react/ReducerUtils.ts index d4394bb03..4d5ce8153 100644 --- a/packages/datastore/datastore/src/react/ReducerUtils.ts +++ b/packages/datastore/datastore/src/react/ReducerUtils.ts @@ -1,38 +1,40 @@ -export enum ActionType { - INITIATE_REQUEST, - REQUEST_COMPLETE, - UPDATE_RESULT, - DELTA_FORCED -} +import { ActionType } from "../utils/ActionsTypes"; export interface Action { - type: ActionType; - data?: any; - error?: any; + type: ActionType; + data?: any; + error?: any; } export interface ResultState { - loading: boolean; - data?: any; - error?: any; + loading: boolean; + data?: any; + error?: any; } export const InitialState: ResultState = { loading: false }; export const reducer = (state: ResultState, action: Action) => { - switch (action.type) { - case ActionType.INITIATE_REQUEST: - return { ...state, loading: true, error: null }; + switch (action.type) { + case ActionType.INITIATE_REQUEST: + return { ...state, loading: true, error: null }; - case ActionType.REQUEST_COMPLETE: - return { ...state, loading: false, data: action.data, error: action.error }; + case ActionType.REQUEST_COMPLETE: + return { + ...state, + loading: false, + data: action.data, + error: action.error, + }; - case ActionType.UPDATE_RESULT: - // Don't update result when request is loading - if (state.loading) { return state; } - return { ...state, data: action.data }; + case ActionType.UPDATE_RESULT: + // Don't update result when request is loading + if (state.loading) { + return state; + } + return { ...state, data: action.data }; - default: - return state; - } + default: + return state; + } }; diff --git a/packages/datastore/datastore/src/react/hooks/delete.ts b/packages/datastore/datastore/src/react/hooks/delete.ts index 0cebfdabd..133dd3063 100644 --- a/packages/datastore/datastore/src/react/hooks/delete.ts +++ b/packages/datastore/datastore/src/react/hooks/delete.ts @@ -1,23 +1,26 @@ import { useReducer } from "react"; -import { Model } from "../../Model"; -import { reducer, InitialState, ActionType } from "../ReducerUtils"; import { Filter } from "../../filters"; +import { Model } from "../../Model"; +import { ActionType } from "../../utils/ActionsTypes"; +import { InitialState, reducer } from "../ReducerUtils"; export const useRemove = (model: Model) => { - const [state, dispatch] = useReducer(reducer, InitialState); + const [state, dispatch] = useReducer(reducer, InitialState); - const remove = async (filter: Filter) => { - if (state.loading) { return; } + const remove = async (filter: Filter) => { + if (state.loading) { + return; + } - dispatch({ type: ActionType.INITIATE_REQUEST }); - try { - const results = await model.remove(filter); - dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); - return results; - } catch (error) { - dispatch({ type: ActionType.REQUEST_COMPLETE, error }); - } - }; + dispatch({ type: ActionType.INITIATE_REQUEST }); + try { + const results = await model.remove(filter); + dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); + return results; + } catch (error) { + dispatch({ type: ActionType.REQUEST_COMPLETE, error }); + } + }; - return { ...state, remove }; + return { ...state, remove }; }; diff --git a/packages/datastore/datastore/src/react/hooks/query.ts b/packages/datastore/datastore/src/react/hooks/query.ts index 8b404bcad..1069471b0 100644 --- a/packages/datastore/datastore/src/react/hooks/query.ts +++ b/packages/datastore/datastore/src/react/hooks/query.ts @@ -1,129 +1,170 @@ -import { useEffect, useReducer, useCallback, Dispatch } from "react"; +import { Dispatch, useCallback, useEffect, useReducer } from "react"; +import { Filter } from "../../filters"; import { Model } from "../../Model"; -import { reducer, InitialState, ActionType, Action, ResultState } from "../ReducerUtils"; import { CRUDEvents, StoreChangeEvent } from "../../storage"; -import { Filter } from "../../filters"; +import { ActionType } from "../../utils/ActionsTypes"; +import { Action, InitialState, reducer, ResultState } from "../ReducerUtils"; const onAdded = (currentData: any[], newData: any[]) => { - if (!currentData) { return newData; } - return [...currentData, ...newData]; + if (!currentData) { + return newData; + } + return [...currentData, ...newData]; }; const onChanged = (currentData: any[], newData: any[], primaryKey: string) => { - if (!currentData) { return []; } - // What happens to data that get's updated and falls outside original query filter? - return currentData.map((d) => { - const index = newData.findIndex((newD) => newD[primaryKey] === d[primaryKey]); - if (index === -1) { return d; } - return newData[index]; - }); + if (!currentData) { + return []; + } + // What happens to data that get's updated and falls outside original query filter? + return currentData.map((d) => { + const index = newData.findIndex( + (newD) => newD[primaryKey] === d[primaryKey] + ); + if (index === -1) { + return d; + } + return newData[index]; + }); }; -const onIdSwapped = (currentData: any[], newData: any[], primaryKey: string) => { - if (!currentData) { return []; } - - return currentData.map((d) => { - const index = newData.findIndex((newD) => newD.previous[primaryKey] === d[primaryKey]); - if (index === -1) { return d; } - return newData[index].current; - }); +const onIdSwapped = ( + currentData: any[], + newData: any[], + primaryKey: string +) => { + if (!currentData) { + return []; + } + + return currentData.map((d) => { + const index = newData.findIndex( + (newD) => newD.previous[primaryKey] === d[primaryKey] + ); + if (index === -1) { + return d; + } + return newData[index].current; + }); }; -const onRemoved = (currentData: any[], removedData: any[], primaryKey: string) => { - if (!currentData) { return []; } - return currentData - .filter( - (d) => removedData.findIndex((newD) => newD[primaryKey] === d[primaryKey]) - ); +const onRemoved = ( + currentData: any[], + removedData: any[], + primaryKey: string +) => { + if (!currentData) { + return []; + } + return currentData.filter((d) => + removedData.findIndex((newD) => newD[primaryKey] === d[primaryKey]) + ); }; -export const updateResult = (state: ResultState, event: StoreChangeEvent, primaryKey: string) => { - switch (event.eventType) { - case CRUDEvents.ADD: - return onAdded(state.data, event.data); +export const updateResult = ( + state: ResultState, + event: StoreChangeEvent, + primaryKey: string +) => { + switch (event.eventType) { + case CRUDEvents.ADD: + return onAdded(state.data, event.data); - case CRUDEvents.UPDATE: - return onChanged(state.data, event.data, primaryKey); + case CRUDEvents.UPDATE: + return onChanged(state.data, event.data, primaryKey); - case CRUDEvents.ID_SWAP: - return onIdSwapped(state.data, event.data, primaryKey); + case CRUDEvents.ID_SWAP: + return onIdSwapped(state.data, event.data, primaryKey); - case CRUDEvents.DELETE: - return onRemoved(state.data, event.data, primaryKey); + case CRUDEvents.DELETE: + return onRemoved(state.data, event.data, primaryKey); - default: - throw new Error(`Invalid event ${event.eventType} received`); - } + default: + throw new Error(`Invalid event ${event.eventType} received`); + } }; -const createSubscribeToUpdates = (state: ResultState, model: Model, dispatch: Dispatch) => { - return (eventsToWatch?: CRUDEvents[], customEventHandler?: (state: ResultState, data: any) => any) => { - const subscription = model.subscribe((event) => { - let newData; - - if (customEventHandler) { - newData = customEventHandler(state, event.data); - } - newData = updateResult(state, event, model.getSchema().getPrimaryKey()); - - if (!subscription.closed) { - // Important to check beacuse Componnent could be unmounted - dispatch({ type: ActionType.UPDATE_RESULT, data: newData }); - } - }, eventsToWatch); - return subscription; - }; +const createSubscribeToUpdates = ( + state: ResultState, + model: Model, + dispatch: Dispatch +) => { + return ( + eventsToWatch?: CRUDEvents[], + customEventHandler?: (state: ResultState, data: any) => any + ) => { + const subscription = model.subscribe((event) => { + let newData; + + if (customEventHandler) { + newData = customEventHandler(state, event.data); + } + newData = updateResult(state, event, model.getSchema().getPrimaryKey()); + + if (!subscription.closed) { + // Important to check beacuse Componnent could be unmounted + dispatch({ type: ActionType.UPDATE_RESULT, data: newData }); + } + }, eventsToWatch); + return subscription; + }; }; export const useQuery = (model: Model, selector?: Filter | string) => { - const [state, dispatch] = useReducer(reducer, InitialState); - const subscribeToUpdates = useCallback( - createSubscribeToUpdates(state, model, dispatch), [state, model, dispatch] - ); - - useEffect(() => { - (async () => { - if (state.loading) { return; } - - dispatch({ type: ActionType.INITIATE_REQUEST }); - try { - let results; - if ((typeof selector) === "string") { - results = await model.queryById(selector as string); - } else { - results = await model.query(selector); - } - dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); - } catch (error) { - dispatch({ type: ActionType.REQUEST_COMPLETE, error }); - } - })(); - }, [model, selector]); - return { ...state, subscribeToUpdates }; + const [state, dispatch] = useReducer(reducer, InitialState); + const subscribeToUpdates = useCallback( + createSubscribeToUpdates(state, model, dispatch), + [state, model, dispatch] + ); + + useEffect(() => { + (async () => { + if (state.loading) { + return; + } + + dispatch({ type: ActionType.INITIATE_REQUEST }); + try { + let results; + if (typeof selector === "string") { + results = await model.queryById(selector as string); + } else { + results = await model.query(selector); + } + dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); + } catch (error) { + dispatch({ type: ActionType.REQUEST_COMPLETE, error }); + } + })(); + }, [model, selector]); + return { ...state, subscribeToUpdates }; }; export const useLazyQuery = (model: Model) => { - const [state, dispatch] = useReducer(reducer, InitialState); - const subscribeToUpdates = useCallback( - createSubscribeToUpdates(state, model, dispatch), [state, model, dispatch] - ); + const [state, dispatch] = useReducer(reducer, InitialState); + const subscribeToUpdates = useCallback( + createSubscribeToUpdates(state, model, dispatch), + [state, model, dispatch] + ); + + const query = async (selector?: Filter | string) => { + if (state.loading) { + return; + } - const query = async (selector?: Filter | string) => { - if (state.loading) { return; } - - dispatch({ type: ActionType.INITIATE_REQUEST }); - try { - let results; - if ((typeof selector) === "string") { - results = await model.queryById(selector as string); - } else { - results = await model.query(selector); - } - dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); - } catch (error) { - dispatch({ type: ActionType.REQUEST_COMPLETE, error }); - } - }; + dispatch({ type: ActionType.INITIATE_REQUEST }); + try { + let results; + if (typeof selector === "string") { + results = await model.queryById(selector as string); + } else { + results = await model.query(selector); + } + dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); + } catch (error) { + dispatch({ type: ActionType.REQUEST_COMPLETE, error }); + } + }; - return { ...state, query, subscribeToUpdates }; + return { ...state, query, subscribeToUpdates }; }; diff --git a/packages/datastore/datastore/src/react/hooks/save.ts b/packages/datastore/datastore/src/react/hooks/save.ts index ffa668b60..9753281a2 100644 --- a/packages/datastore/datastore/src/react/hooks/save.ts +++ b/packages/datastore/datastore/src/react/hooks/save.ts @@ -1,22 +1,25 @@ import { useReducer } from "react"; import { Model } from "../../Model"; -import { reducer, InitialState, ActionType } from "../ReducerUtils"; +import { ActionType } from "../../utils/ActionsTypes"; +import { InitialState, reducer } from "../ReducerUtils"; export const useSave = (model: Model) => { - const [state, dispatch] = useReducer(reducer, InitialState); + const [state, dispatch] = useReducer(reducer, InitialState); - const save = async (input: any) => { - if (state.loading) { return; } + const save = async (input: any) => { + if (state.loading) { + return; + } - dispatch({ type: ActionType.INITIATE_REQUEST }); - try { - const result = await model.save(input); - dispatch({ type: ActionType.REQUEST_COMPLETE, data: result }); - return result; - } catch (error) { - dispatch({ type: ActionType.REQUEST_COMPLETE, error }); - } - }; + dispatch({ type: ActionType.INITIATE_REQUEST }); + try { + const result = await model.save(input); + dispatch({ type: ActionType.REQUEST_COMPLETE, data: result }); + return result; + } catch (error) { + dispatch({ type: ActionType.REQUEST_COMPLETE, error }); + } + }; - return { ...state, save }; + return { ...state, save }; }; diff --git a/packages/datastore/datastore/src/react/hooks/subscription.ts b/packages/datastore/datastore/src/react/hooks/subscription.ts index 29cb17118..49d17c67e 100644 --- a/packages/datastore/datastore/src/react/hooks/subscription.ts +++ b/packages/datastore/datastore/src/react/hooks/subscription.ts @@ -1,7 +1,8 @@ import { useEffect, useReducer } from "react"; -import { Model } from "../../Model"; import { CRUDEvents } from "../.."; -import { InitialState, reducer, ActionType } from "../ReducerUtils"; +import { Model } from "../../Model"; +import { ActionType } from "../../utils/ActionsTypes"; +import { InitialState, reducer } from "../ReducerUtils"; export const useSubscription = (model: Model, eventTypes: CRUDEvents[]) => { const [state, dispatch] = useReducer(reducer, InitialState); diff --git a/packages/datastore/datastore/src/react/hooks/update.ts b/packages/datastore/datastore/src/react/hooks/update.ts index 422127ee6..c353a894e 100644 --- a/packages/datastore/datastore/src/react/hooks/update.ts +++ b/packages/datastore/datastore/src/react/hooks/update.ts @@ -1,24 +1,30 @@ import { useReducer } from "react"; import { Model } from "../../Model"; -import { reducer, InitialState, ActionType } from "../ReducerUtils"; +import { ActionType } from "../../utils/ActionsTypes"; +import { InitialState, reducer } from "../ReducerUtils"; export const useUpdate = (model: Model) => { - const [state, dispatch] = useReducer(reducer, InitialState); + const [state, dispatch] = useReducer(reducer, InitialState); - const update = async (input: any, upsert: boolean = false) => { - if (state.loading) { return; } - if (state.data) { return; } + const update = async (input: any, upsert: boolean = false) => { + if (state.loading) { + return; + } + if (state.data) { + return; + } - dispatch({ type: ActionType.INITIATE_REQUEST }); - try { - const results = await (upsert ? - model.saveOrUpdate(input): model.updateById(input)); - dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); - return results; - } catch (error) { - dispatch({ type: ActionType.REQUEST_COMPLETE, error }); - } - }; + dispatch({ type: ActionType.INITIATE_REQUEST }); + try { + const results = await (upsert + ? model.saveOrUpdate(input) + : model.updateById(input)); + dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); + return results; + } catch (error) { + dispatch({ type: ActionType.REQUEST_COMPLETE, error }); + } + }; - return { ...state, update }; + return { ...state, update }; }; diff --git a/packages/datastore/datastore/src/utils/ActionsTypes.ts b/packages/datastore/datastore/src/utils/ActionsTypes.ts new file mode 100644 index 000000000..f46c965d8 --- /dev/null +++ b/packages/datastore/datastore/src/utils/ActionsTypes.ts @@ -0,0 +1,6 @@ +export enum ActionType { + INITIATE_REQUEST, + REQUEST_COMPLETE, + UPDATE_RESULT, + DELTA_FORCED, +} diff --git a/packages/datastore/datastore/src/vue/ReducerUtils.ts b/packages/datastore/datastore/src/vue/ReducerUtils.ts deleted file mode 100644 index d4394bb03..000000000 --- a/packages/datastore/datastore/src/vue/ReducerUtils.ts +++ /dev/null @@ -1,38 +0,0 @@ -export enum ActionType { - INITIATE_REQUEST, - REQUEST_COMPLETE, - UPDATE_RESULT, - DELTA_FORCED -} - -export interface Action { - type: ActionType; - data?: any; - error?: any; -} - -export interface ResultState { - loading: boolean; - data?: any; - error?: any; -} - -export const InitialState: ResultState = { loading: false }; - -export const reducer = (state: ResultState, action: Action) => { - switch (action.type) { - case ActionType.INITIATE_REQUEST: - return { ...state, loading: true, error: null }; - - case ActionType.REQUEST_COMPLETE: - return { ...state, loading: false, data: action.data, error: action.error }; - - case ActionType.UPDATE_RESULT: - // Don't update result when request is loading - if (state.loading) { return state; } - return { ...state, data: action.data }; - - default: - return state; - } -}; diff --git a/packages/datastore/datastore/src/vue/StateUtils.ts b/packages/datastore/datastore/src/vue/StateUtils.ts new file mode 100644 index 000000000..601aa1f1d --- /dev/null +++ b/packages/datastore/datastore/src/vue/StateUtils.ts @@ -0,0 +1,53 @@ +import { Maybe } from "graphql/jsutils/Maybe"; +import { reactive, UnwrapRef } from "vue"; +import { ActionType } from "../utils/ActionsTypes"; + +export interface Action { + type: ActionType; + data?: Maybe; + error?: Maybe; +} + +export interface ResultState { + loading: boolean; + data?: Maybe; + error?: Maybe; +} +export interface ReactiveState { + loading: boolean; + data?: Maybe>; + error?: Maybe; +} +export const initialState = () => + reactive>({ loading: false }); + +export const changeState = ({ + action, + state, +}: { + state: ReactiveState; + action: Action; +}) => { + switch (action.type) { + case ActionType.INITIATE_REQUEST: + return { state, loading: true, error: null }; + + case ActionType.REQUEST_COMPLETE: + return { + state, + loading: false, + data: action.data, + error: action.error, + }; + + case ActionType.UPDATE_RESULT: + // Don't update result when request is loading + if (state.loading) { + return state; + } + return { state, data: action.data }; + + default: + return state; + } +}; diff --git a/packages/datastore/datastore/src/vue/hooks/delete.ts b/packages/datastore/datastore/src/vue/hooks/delete.ts index 0cebfdabd..cb5305933 100644 --- a/packages/datastore/datastore/src/vue/hooks/delete.ts +++ b/packages/datastore/datastore/src/vue/hooks/delete.ts @@ -1,23 +1,32 @@ -import { useReducer } from "react"; -import { Model } from "../../Model"; -import { reducer, InitialState, ActionType } from "../ReducerUtils"; import { Filter } from "../../filters"; +import { Model } from "../../Model"; +import { ActionType } from "../../utils/ActionsTypes"; +import { changeState, initialState } from "../StateUtils"; -export const useRemove = (model: Model) => { - const [state, dispatch] = useReducer(reducer, InitialState); +export const useRemove = (model: Model) => { + const state = initialState(); - const remove = async (filter: Filter) => { - if (state.loading) { return; } + const remove = async (filter: Filter) => { + if (state.loading) return; - dispatch({ type: ActionType.INITIATE_REQUEST }); - try { - const results = await model.remove(filter); - dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); - return results; - } catch (error) { - dispatch({ type: ActionType.REQUEST_COMPLETE, error }); - } - }; + changeState({ + state, + action: { type: ActionType.INITIATE_REQUEST }, + }); + try { + const results = await model.remove(filter); + changeState({ + state, + action: { type: ActionType.REQUEST_COMPLETE, data: results }, + }); + return results; + } catch (error) { + changeState({ + state, + action: { type: ActionType.REQUEST_COMPLETE, error }, + }); + } + }; - return { ...state, remove }; + return { state, remove }; }; diff --git a/packages/datastore/datastore/src/vue/hooks/save.ts b/packages/datastore/datastore/src/vue/hooks/save.ts index ffa668b60..98756cd0b 100644 --- a/packages/datastore/datastore/src/vue/hooks/save.ts +++ b/packages/datastore/datastore/src/vue/hooks/save.ts @@ -1,22 +1,31 @@ -import { useReducer } from "react"; import { Model } from "../../Model"; -import { reducer, InitialState, ActionType } from "../ReducerUtils"; +import { ActionType } from "../../utils/ActionsTypes"; +import { changeState, initialState } from "../StateUtils"; -export const useSave = (model: Model) => { - const [state, dispatch] = useReducer(reducer, InitialState); +export const useSave = (model: Model) => { + const state = initialState(); - const save = async (input: any) => { - if (state.loading) { return; } + const save = async (input: TInput) => { + if (state.loading) return; - dispatch({ type: ActionType.INITIATE_REQUEST }); - try { - const result = await model.save(input); - dispatch({ type: ActionType.REQUEST_COMPLETE, data: result }); - return result; - } catch (error) { - dispatch({ type: ActionType.REQUEST_COMPLETE, error }); - } - }; + changeState({ + state, + action: { type: ActionType.INITIATE_REQUEST }, + }); + try { + const results = await model.save(input); + changeState({ + state, + action: { type: ActionType.REQUEST_COMPLETE, data: results }, + }); + return results; + } catch (error) { + changeState({ + state, + action: { type: ActionType.REQUEST_COMPLETE, error }, + }); + } + }; - return { ...state, save }; + return { state, save }; }; diff --git a/packages/datastore/datastore/src/vue/hooks/subscription.ts b/packages/datastore/datastore/src/vue/hooks/subscription.ts index 29cb17118..a5249dd25 100644 --- a/packages/datastore/datastore/src/vue/hooks/subscription.ts +++ b/packages/datastore/datastore/src/vue/hooks/subscription.ts @@ -1,17 +1,40 @@ -import { useEffect, useReducer } from "react"; -import { Model } from "../../Model"; +import { onMounted, onUnmounted, ref, Ref, watch } from "@vue/runtime-core"; +import { Maybe } from "graphql/jsutils/Maybe"; +import { Subscription } from "wonka"; import { CRUDEvents } from "../.."; -import { InitialState, reducer, ActionType } from "../ReducerUtils"; +import { Model } from "../../Model"; +import { ActionType } from "../../utils/ActionsTypes"; +import { changeState, initialState } from "../StateUtils"; -export const useSubscription = (model: Model, eventTypes: CRUDEvents[]) => { - const [state, dispatch] = useReducer(reducer, InitialState); +export const useSubscription = ( + model: Ref>, + eventTypes: CRUDEvents[] +) => { + const state = initialState(); + let subscription = ref>(); - useEffect(() => { - const subscription = model.subscribe((event) => { - dispatch({ type: ActionType.REQUEST_COMPLETE, data: event.data }); + const subscribe = () => { + subscription.value = model.value.subscribe((event) => { + changeState({ + state, + action: { type: ActionType.REQUEST_COMPLETE, data: event.data }, + }); }, eventTypes); - return () => subscription.unsubscribe(); - }, [model, eventTypes]); + }; + const unsubscribe = () => { + subscription.value?.unsubscribe(); + }; + + watch( + model, + () => { + unsubscribe(); + subscribe(); + }, + { deep: true, immediate: true } + ); + onMounted(subscribe); + onUnmounted(unsubscribe); return state; }; diff --git a/packages/datastore/datastore/src/vue/hooks/update.ts b/packages/datastore/datastore/src/vue/hooks/update.ts index 422127ee6..8fc919911 100644 --- a/packages/datastore/datastore/src/vue/hooks/update.ts +++ b/packages/datastore/datastore/src/vue/hooks/update.ts @@ -1,24 +1,33 @@ -import { useReducer } from "react"; import { Model } from "../../Model"; -import { reducer, InitialState, ActionType } from "../ReducerUtils"; +import { ActionType } from "../../utils/ActionsTypes"; +import { changeState, initialState } from "../StateUtils"; -export const useUpdate = (model: Model) => { - const [state, dispatch] = useReducer(reducer, InitialState); +export const useUpdate = (model: Model) => { + const state = initialState(); - const update = async (input: any, upsert: boolean = false) => { - if (state.loading) { return; } - if (state.data) { return; } + const update = async (input: TInput, upsert: boolean = false) => { + if (state.loading) return; - dispatch({ type: ActionType.INITIATE_REQUEST }); - try { - const results = await (upsert ? - model.saveOrUpdate(input): model.updateById(input)); - dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); - return results; - } catch (error) { - dispatch({ type: ActionType.REQUEST_COMPLETE, error }); - } - }; + changeState({ + state, + action: { type: ActionType.INITIATE_REQUEST }, + }); + try { + const results = await (upsert + ? model.saveOrUpdate(input) + : model.updateById(input)); + changeState({ + state, + action: { type: ActionType.REQUEST_COMPLETE, data: results }, + }); + return results; + } catch (error) { + changeState({ + state, + action: { type: ActionType.REQUEST_COMPLETE, error }, + }); + } + }; - return { ...state, update }; + return { state, update }; }; diff --git a/packages/datastore/datastore/src/vue/index.ts b/packages/datastore/datastore/src/vue/index.ts index e69de29bb..4a1b06a75 100644 --- a/packages/datastore/datastore/src/vue/index.ts +++ b/packages/datastore/datastore/src/vue/index.ts @@ -0,0 +1,4 @@ +export * from "./hooks/delete"; +export * from "./hooks/query"; +export * from "./hooks/save"; +export * from "./hooks/update"; From ec3461cc62651b557a845847327f2f085e71b715 Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Sun, 28 Feb 2021 15:21:02 +0300 Subject: [PATCH 03/17] fix: restore original react example --- examples/react-datastore/src/App.tsx | 95 ++++++++++--------- .../src/components/forms/AddTodo.tsx | 39 ++++---- .../src/components/forms/EditTodo.tsx | 30 +++--- package.json | 3 +- packages/datastore/datastore/package.json | 3 +- 5 files changed, 88 insertions(+), 82 deletions(-) diff --git a/examples/react-datastore/src/App.tsx b/examples/react-datastore/src/App.tsx index c0b7bff0a..1d231e21c 100644 --- a/examples/react-datastore/src/App.tsx +++ b/examples/react-datastore/src/App.tsx @@ -1,15 +1,17 @@ -import { Button } from "antd"; -import "antd/dist/antd.css"; -import { NetworkStatusEvent } from "offix-datastore/types/replication/network/NetworkStatus"; -import React, { useEffect, useState } from "react"; -import { AddTodo, Error, Header, Loading, TodoList } from "./components"; -import { datastore } from "./datastore/config"; -import { useFindTodos } from "./datastore/hooks"; +import React, { useState, useEffect } from 'react'; +import { Button } from 'antd'; +import 'antd/dist/antd.css'; + +import { useFindTodos } from './datastore/hooks'; +import { TodoList, AddTodo, Loading, Error, Header } from './components'; +import { datastore } from './datastore/config'; +import { NetworkStatusEvent } from 'offix-datastore/types/replication/network/NetworkStatus'; function App() { + const [replicating, setReplicating] = useState(true); const [addView, setAddView] = useState(false); - const { loading, error, data, subscribeToUpdates } = useFindTodos(); + const { loading, error, data, subscribeToUpdates } = useFindTodos(); useEffect(() => { datastore.getNetworkIndicator()?.subscribe({ @@ -21,9 +23,9 @@ function App() { datastore.stopReplication(); setReplicating(false); } - }, - }); - }); + } + }) + }) useEffect(() => { // We can start replication on a per model basis @@ -31,17 +33,9 @@ function App() { // datastore.startReplication // the `startReplication` method accepts an // optional filter - if (replicating) { - datastore.startReplication(); - } - }, [replicating]); + datastore.startReplication() + }); - const toggleReplication = () => { - if (replicating) { - datastore.stopReplication(); - } - setReplicating(!replicating); - }; useEffect(() => { const subscription = subscribeToUpdates(); return () => subscription.unsubscribe(); @@ -53,38 +47,51 @@ function App() { return (
-
+
setAddView(false)} + title={!addView ? 'Offix Todo' : 'Add Todo'} + onBack={ + !addView ? null : () => setAddView(false) + } extra={ addView ? null : ( <> - ) } > - {!addView && ( - <> - - - )} - {addView && ( - <> - setAddView(false)} /> - - )} + { + !addView && ( + <> + + + ) + } + { + addView && ( + <> + setAddView(false)} /> + + ) + }
@@ -92,12 +99,12 @@ function App() { } const containerStyle = { - display: "flex", - alignItems: "start", - justifyContent: "center", - minHeight: "100vh", - width: "100vw", - padding: "2em 0", -}; + display: 'flex', + alignItems: 'start', + justifyContent: 'center', + minHeight: '100vh', + width: '100vw', + padding: '2em 0' +} export default App; diff --git a/examples/react-datastore/src/components/forms/AddTodo.tsx b/examples/react-datastore/src/components/forms/AddTodo.tsx index 65f16cc4c..941d2879c 100644 --- a/examples/react-datastore/src/components/forms/AddTodo.tsx +++ b/examples/react-datastore/src/components/forms/AddTodo.tsx @@ -1,13 +1,20 @@ -import { Button } from "antd"; -import React from "react"; -import { AutoForm, LongTextField, SubmitField, TextField } from "uniforms-antd"; -import { Todo } from "../../datastore/generated"; -import { useAddTodo } from "../../datastore/hooks"; -import { AddTodoProps } from "../../types"; -import { schema } from "./formSchema"; +import React from 'react'; +import { Button } from 'antd'; +import { + AutoForm, + TextField, + LongTextField, + SubmitField +} from 'uniforms-antd'; + +import { AddTodoProps } from '../../types'; +import { schema } from './formSchema'; +import { useAddTodo } from '../../datastore/hooks'; +import { Todo } from '../../datastore/generated'; export const AddTodo = ({ cancel }: AddTodoProps) => { - const { save: addTodo, data, loading, error } = useAddTodo(); + + const { save: addTodo } = useAddTodo(); const handleSubmit = ({ title, description }: Todo) => { addTodo({ @@ -15,24 +22,16 @@ export const AddTodo = ({ cancel }: AddTodoProps) => { description, completed: false, }) - .then(() => { - console.log({ data, loading, error }); - - cancel(); - }) - .catch((error: any) => console.log(error)); + .then(() => cancel()) + .catch((error: any) => console.log(error)); }; return ( - + - + ); }; diff --git a/examples/react-datastore/src/components/forms/EditTodo.tsx b/examples/react-datastore/src/components/forms/EditTodo.tsx index a5efb0749..67e654513 100644 --- a/examples/react-datastore/src/components/forms/EditTodo.tsx +++ b/examples/react-datastore/src/components/forms/EditTodo.tsx @@ -1,12 +1,14 @@ -import { Button } from "antd"; -import React from "react"; -import { AutoForm, LongTextField, SubmitField, TextField } from "uniforms-antd"; -import { Todo } from "../../datastore/generated"; -import { useEditTodo } from "../../datastore/hooks"; -import { EditTodoProps } from "../../types"; -import { schema } from "./formSchema"; +import React from 'react'; +import { Button } from 'antd'; +import { AutoForm, TextField, LongTextField, SubmitField } from 'uniforms-antd'; + +import { schema } from './formSchema'; +import { EditTodoProps } from '../../types'; +import { useEditTodo } from '../../datastore/hooks'; +import { Todo } from '../../datastore/generated'; export const EditTodo = ({ todo, toggleEdit }: EditTodoProps) => { + const { update: editTodo } = useEditTodo(); const handleUpdate = (todo: Todo) => { @@ -16,12 +18,10 @@ export const EditTodo = ({ todo, toggleEdit }: EditTodoProps) => { description: todo.description, _version: todo._version ?? 1, }) - .then(() => { - toggleEdit(); - }) - .catch((error: any) => { - console.log(error); - }); + .then(() => toggleEdit()) + .catch((error: any) => { + console.log(error); + }); }; return ( @@ -33,8 +33,8 @@ export const EditTodo = ({ todo, toggleEdit }: EditTodoProps) => { > - - + + ); }; diff --git a/package.json b/package.json index 4f03d5c24..87b3a1b8e 100644 --- a/package.json +++ b/package.json @@ -45,8 +45,7 @@ }, "dependencies": { "@types/mocha": "8.2.1", - "@types/node": "12.20.1", - "vue": "^3.0.6" + "@types/node": "12.20.1" }, "workspaces": [ "packages/*/*" diff --git a/packages/datastore/datastore/package.json b/packages/datastore/datastore/package.json index 83e019070..d1a2f55c1 100644 --- a/packages/datastore/datastore/package.json +++ b/packages/datastore/datastore/package.json @@ -45,7 +45,8 @@ "size-limit": "4.9.2", "supports-color": "8.1.1", "ts-jest": "26.5.1", - "typescript": "4.1.5" + "typescript": "4.1.5", + "vue": "^3.0.6" }, "dependencies": { "graphql-tag": "2.11.0", From 2f01318ec9e02fa87cd0cfa7ec452d15f357352c Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Sun, 28 Feb 2021 17:01:49 +0300 Subject: [PATCH 04/17] feat: query. Not tested. todo: example on vue and test vue hooks --- .../datastore/datastore/src/vue/StateUtils.ts | 54 +-- .../datastore/src/vue/hooks/delete.ts | 3 +- .../datastore/src/vue/hooks/query.ts | 307 +++++++++++------- .../datastore/datastore/src/vue/hooks/save.ts | 3 +- .../datastore/src/vue/hooks/subscription.ts | 11 +- .../datastore/src/vue/hooks/update.ts | 3 +- 6 files changed, 242 insertions(+), 139 deletions(-) diff --git a/packages/datastore/datastore/src/vue/StateUtils.ts b/packages/datastore/datastore/src/vue/StateUtils.ts index 601aa1f1d..651e1f043 100644 --- a/packages/datastore/datastore/src/vue/StateUtils.ts +++ b/packages/datastore/datastore/src/vue/StateUtils.ts @@ -1,25 +1,28 @@ import { Maybe } from "graphql/jsutils/Maybe"; -import { reactive, UnwrapRef } from "vue"; +import { reactive } from "vue"; import { ActionType } from "../utils/ActionsTypes"; export interface Action { type: ActionType; - data?: Maybe; + data?: Maybe[] | TModel>; error?: Maybe; } -export interface ResultState { - loading: boolean; - data?: Maybe; - error?: Maybe; +export interface IdSwap { + previous: TModel; + current: TModel; } export interface ReactiveState { loading: boolean; - data?: Maybe>; - error?: Maybe; + data: Maybe[]; + error: Maybe; } -export const initialState = () => - reactive>({ loading: false }); +export const initialState = (): ReactiveState => + reactive>({ + loading: false, + data: [], + error: null, + }) as ReactiveState; export const changeState = ({ action, @@ -28,26 +31,27 @@ export const changeState = ({ state: ReactiveState; action: Action; }) => { + const data = (() => { + if (action.data == null) return []; + if (Array.isArray(action.data)) return action.data; + return [action.data]; + })(); switch (action.type) { case ActionType.INITIATE_REQUEST: - return { state, loading: true, error: null }; - + state.loading = true; + state.error = null; + break; case ActionType.REQUEST_COMPLETE: - return { - state, - loading: false, - data: action.data, - error: action.error, - }; - + state.loading = false; + state.data = data; + state.error = action.error; + break; case ActionType.UPDATE_RESULT: // Don't update result when request is loading - if (state.loading) { - return state; + if (!state.loading) { + state.data = data; } - return { state, data: action.data }; - - default: - return state; + break; } + return state; }; diff --git a/packages/datastore/datastore/src/vue/hooks/delete.ts b/packages/datastore/datastore/src/vue/hooks/delete.ts index cb5305933..5eae3459a 100644 --- a/packages/datastore/datastore/src/vue/hooks/delete.ts +++ b/packages/datastore/datastore/src/vue/hooks/delete.ts @@ -1,3 +1,4 @@ +import { readonly } from "@vue/reactivity"; import { Filter } from "../../filters"; import { Model } from "../../Model"; import { ActionType } from "../../utils/ActionsTypes"; @@ -28,5 +29,5 @@ export const useRemove = (model: Model) => { } }; - return { state, remove }; + return { state: readonly(state), remove }; }; diff --git a/packages/datastore/datastore/src/vue/hooks/query.ts b/packages/datastore/datastore/src/vue/hooks/query.ts index 8b404bcad..db7b989a8 100644 --- a/packages/datastore/datastore/src/vue/hooks/query.ts +++ b/packages/datastore/datastore/src/vue/hooks/query.ts @@ -1,129 +1,218 @@ -import { useEffect, useReducer, useCallback, Dispatch } from "react"; +import { readonly } from "@vue/reactivity"; +import { Maybe } from "graphql/jsutils/Maybe"; +import { Ref, watch } from "vue"; +import { Filter } from "../../filters"; import { Model } from "../../Model"; -import { reducer, InitialState, ActionType, Action, ResultState } from "../ReducerUtils"; import { CRUDEvents, StoreChangeEvent } from "../../storage"; -import { Filter } from "../../filters"; - -const onAdded = (currentData: any[], newData: any[]) => { - if (!currentData) { return newData; } - return [...currentData, ...newData]; +import { ActionType } from "../../utils/ActionsTypes"; +import { + changeState, + IdSwap, + initialState, + ReactiveState, +} from "../StateUtils"; + +const onAdded = (state: ReactiveState, newData: TModel[]) => { + const changedData = [...state.data, ...newData]; + return changedData; }; -const onChanged = (currentData: any[], newData: any[], primaryKey: string) => { - if (!currentData) { return []; } - // What happens to data that get's updated and falls outside original query filter? - return currentData.map((d) => { - const index = newData.findIndex((newD) => newD[primaryKey] === d[primaryKey]); - if (index === -1) { return d; } - return newData[index]; - }); +const onChanged = ( + state: ReactiveState, + newData: TModel[], + primaryKeyName: string +) => { + if (state.data.length == 0) return state.data; + + // What happens to data that get's updated and falls outside original query filter? + const changedData = state.data.map((d) => { + const dPrimaryKey = (d as Record)[primaryKeyName]; + const index = newData.findIndex( + (newD) => + (newD as Record)[primaryKeyName] === dPrimaryKey + ); + if (index === -1) { + return d; + } + return newData[index]; + }); + return changedData; }; -const onIdSwapped = (currentData: any[], newData: any[], primaryKey: string) => { - if (!currentData) { return []; } - - return currentData.map((d) => { - const index = newData.findIndex((newD) => newD.previous[primaryKey] === d[primaryKey]); - if (index === -1) { return d; } - return newData[index].current; - }); +const onIdSwapped = ( + state: ReactiveState, + newData: IdSwap[], + primaryKeyName: string +) => { + if (state.data.length == 0) return state.data; + + const changedData = state.data.map((d) => { + const dPrimaryKey = (d as Record)[primaryKeyName]; + const index = newData.findIndex( + (newD) => + (newD.previous as Record)[primaryKeyName] === + dPrimaryKey + ); + if (index === -1) { + return d; + } + return newData[index].current; + }); + return changedData; }; -const onRemoved = (currentData: any[], removedData: any[], primaryKey: string) => { - if (!currentData) { return []; } - return currentData - .filter( - (d) => removedData.findIndex((newD) => newD[primaryKey] === d[primaryKey]) - ); +const onRemoved = ( + state: ReactiveState, + removedData: TModel[], + primaryKeyName: string +) => { + if (state.data.length == 0) return state.data; + const changedData = state.data.filter((d) => { + const dPrimaryKey = (d as Record)[primaryKeyName]; + return removedData.findIndex( + (newD) => + (newD as Record)[primaryKeyName] === dPrimaryKey + ); + }); + return changedData; }; -export const updateResult = (state: ResultState, event: StoreChangeEvent, primaryKey: string) => { - switch (event.eventType) { - case CRUDEvents.ADD: - return onAdded(state.data, event.data); - - case CRUDEvents.UPDATE: - return onChanged(state.data, event.data, primaryKey); - - case CRUDEvents.ID_SWAP: - return onIdSwapped(state.data, event.data, primaryKey); +export const updateResult = ( + state: ReactiveState, + event: StoreChangeEvent, + primaryKeyName: string +) => { + const data = event.data; + switch (event.eventType) { + case CRUDEvents.ADD: + return onAdded(state, data); + case CRUDEvents.UPDATE: + return onChanged(state, data, primaryKeyName); + case CRUDEvents.ID_SWAP: + return onIdSwapped(state, data, primaryKeyName); + case CRUDEvents.DELETE: + return onRemoved(state, data, primaryKeyName); + default: + throw new Error(`Invalid event ${event.eventType} received`); + } +}; - case CRUDEvents.DELETE: - return onRemoved(state.data, event.data, primaryKey); +const createSubscribeToUpdates = ( + state: ReactiveState, + model: Model +) => { + return ( + eventsToWatch?: CRUDEvents[], + customEventHandler?: ( + state: ReactiveState, + // FIXME: investigate type + data: Maybe[]> + ) => Maybe[]> + ) => { + const subscription = model.subscribe((event) => { + let newData; + + if (customEventHandler) { + newData = customEventHandler(state, event.data); + } + const primaryKeyName = model.getSchema().getPrimaryKey(); + newData = updateResult(state, event, primaryKeyName); + + if (!subscription.closed) { + // Important to check beacuse Componnent could be unmounted + changeState({ + state, + action: { type: ActionType.UPDATE_RESULT, data: newData }, + }); + } + }, eventsToWatch); + return subscription; + }; +}; - default: - throw new Error(`Invalid event ${event.eventType} received`); +interface QueryResults extends UseQuery { + state: ReactiveState; +} +const queryResults = async ({ + state, + selector, + model, +}: QueryResults) => { + if (state.loading) { + return; + } + + changeState({ state, action: { type: ActionType.INITIATE_REQUEST } }); + try { + let results; + const selectorValue = selector.value; + if (typeof selectorValue === "string") { + results = await model.value.queryById(selectorValue); + } else { + results = await model.value.query(selectorValue); } + changeState({ + state, + action: { type: ActionType.REQUEST_COMPLETE, data: results }, + }); + } catch (error) { + changeState({ + state, + action: { type: ActionType.REQUEST_COMPLETE, error }, + }); + } }; -const createSubscribeToUpdates = (state: ResultState, model: Model, dispatch: Dispatch) => { - return (eventsToWatch?: CRUDEvents[], customEventHandler?: (state: ResultState, data: any) => any) => { - const subscription = model.subscribe((event) => { - let newData; - - if (customEventHandler) { - newData = customEventHandler(state, event.data); - } - newData = updateResult(state, event, model.getSchema().getPrimaryKey()); - - if (!subscription.closed) { - // Important to check beacuse Componnent could be unmounted - dispatch({ type: ActionType.UPDATE_RESULT, data: newData }); - } - }, eventsToWatch); - return subscription; - }; +interface UseQuery { + model: Ref>; + selector: Ref | string | undefined>; +} +const subscribeQueryToUpdates = ({ + state, + model, +}: { + state: ReactiveState; + model: Ref>; +}) => () => { + watch( + model, + () => { + createSubscribeToUpdates(state, model.value); + }, + { deep: true, immediate: true } + ); }; -export const useQuery = (model: Model, selector?: Filter | string) => { - const [state, dispatch] = useReducer(reducer, InitialState); - const subscribeToUpdates = useCallback( - createSubscribeToUpdates(state, model, dispatch), [state, model, dispatch] - ); - - useEffect(() => { - (async () => { - if (state.loading) { return; } - - dispatch({ type: ActionType.INITIATE_REQUEST }); - try { - let results; - if ((typeof selector) === "string") { - results = await model.queryById(selector as string); - } else { - results = await model.query(selector); - } - dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); - } catch (error) { - dispatch({ type: ActionType.REQUEST_COMPLETE, error }); - } - })(); - }, [model, selector]); - return { ...state, subscribeToUpdates }; +export const useQuery = ({ model, selector }: UseQuery) => { + const state = initialState(); + const subscribeToUpdates = subscribeQueryToUpdates({ model, state }); + const runQuery = () => + queryResults({ + model, + state, + selector, + }); + watch(selector, runQuery, { deep: true, immediate: true }); + watch(model, runQuery, { deep: true, immediate: true }); + return { state: readonly(state), subscribeToUpdates }; }; -export const useLazyQuery = (model: Model) => { - const [state, dispatch] = useReducer(reducer, InitialState); - const subscribeToUpdates = useCallback( - createSubscribeToUpdates(state, model, dispatch), [state, model, dispatch] - ); - - const query = async (selector?: Filter | string) => { - if (state.loading) { return; } - - dispatch({ type: ActionType.INITIATE_REQUEST }); - try { - let results; - if ((typeof selector) === "string") { - results = await model.queryById(selector as string); - } else { - results = await model.query(selector); - } - dispatch({ type: ActionType.REQUEST_COMPLETE, data: results }); - } catch (error) { - dispatch({ type: ActionType.REQUEST_COMPLETE, error }); - } - }; - - return { ...state, query, subscribeToUpdates }; +export const useLazyQuery = ({ + model, +}: { + model: Ref>; +}) => { + const state = initialState(); + const subscribeToUpdates = subscribeQueryToUpdates({ model, state }); + const query = async ({ + selector, + }: { + selector: Ref | string | undefined>; + }) => + await queryResults({ + model, + selector, + state, + }); + return { state: readonly(state), query, subscribeToUpdates }; }; diff --git a/packages/datastore/datastore/src/vue/hooks/save.ts b/packages/datastore/datastore/src/vue/hooks/save.ts index 98756cd0b..7bab1e739 100644 --- a/packages/datastore/datastore/src/vue/hooks/save.ts +++ b/packages/datastore/datastore/src/vue/hooks/save.ts @@ -1,3 +1,4 @@ +import { readonly } from "vue"; import { Model } from "../../Model"; import { ActionType } from "../../utils/ActionsTypes"; import { changeState, initialState } from "../StateUtils"; @@ -27,5 +28,5 @@ export const useSave = (model: Model) => { } }; - return { state, save }; + return { state: readonly(state), save }; }; diff --git a/packages/datastore/datastore/src/vue/hooks/subscription.ts b/packages/datastore/datastore/src/vue/hooks/subscription.ts index a5249dd25..40fd13cd2 100644 --- a/packages/datastore/datastore/src/vue/hooks/subscription.ts +++ b/packages/datastore/datastore/src/vue/hooks/subscription.ts @@ -1,4 +1,11 @@ -import { onMounted, onUnmounted, ref, Ref, watch } from "@vue/runtime-core"; +import { + onMounted, + onUnmounted, + readonly, + ref, + Ref, + watch, +} from "@vue/runtime-core"; import { Maybe } from "graphql/jsutils/Maybe"; import { Subscription } from "wonka"; import { CRUDEvents } from "../.."; @@ -36,5 +43,5 @@ export const useSubscription = ( onMounted(subscribe); onUnmounted(unsubscribe); - return state; + return { state: readonly(state) }; }; diff --git a/packages/datastore/datastore/src/vue/hooks/update.ts b/packages/datastore/datastore/src/vue/hooks/update.ts index 8fc919911..4cc16a2b4 100644 --- a/packages/datastore/datastore/src/vue/hooks/update.ts +++ b/packages/datastore/datastore/src/vue/hooks/update.ts @@ -1,3 +1,4 @@ +import { readonly } from "vue"; import { Model } from "../../Model"; import { ActionType } from "../../utils/ActionsTypes"; import { changeState, initialState } from "../StateUtils"; @@ -29,5 +30,5 @@ export const useUpdate = (model: Model) => { } }; - return { state, update }; + return { state: readonly(state), update }; }; From cf0f5962cd58ef1832a28abc77f2d7ca3204f2a8 Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Sun, 28 Feb 2021 18:17:13 +0300 Subject: [PATCH 05/17] wip: vue example --- examples/vue-datastore/.eslintrc.js | 20 ++ examples/vue-datastore/.gitignore | 2 + examples/vue-datastore/README.md | 37 +++- examples/vue-datastore/babel.config.js | 9 + examples/vue-datastore/package.json | 78 ++++---- examples/vue-datastore/public/favicon.ico | Bin 3150 -> 4286 bytes .../img/icons/android-chrome-192x192.png | Bin 0 -> 9416 bytes .../img/icons/android-chrome-512x512.png | Bin 0 -> 29808 bytes .../icons/android-chrome-maskable-192x192.png | Bin 0 -> 6401 bytes .../icons/android-chrome-maskable-512x512.png | Bin 0 -> 23038 bytes .../img/icons/apple-touch-icon-120x120.png | Bin 0 -> 3369 bytes .../img/icons/apple-touch-icon-152x152.png | Bin 0 -> 4046 bytes .../img/icons/apple-touch-icon-180x180.png | Bin 0 -> 4678 bytes .../img/icons/apple-touch-icon-60x60.png | Bin 0 -> 1491 bytes .../img/icons/apple-touch-icon-76x76.png | Bin 0 -> 1823 bytes .../public/img/icons/apple-touch-icon.png | Bin 0 -> 4678 bytes .../public/img/icons/favicon-16x16.png | Bin 0 -> 799 bytes .../public/img/icons/favicon-32x32.png | Bin 0 -> 1271 bytes .../img/icons/msapplication-icon-144x144.png | Bin 0 -> 1169 bytes .../public/img/icons/mstile-150x150.png | Bin 0 -> 4282 bytes .../public/img/icons/safari-pinned-tab.svg | 3 + examples/vue-datastore/public/index.html | 48 ++--- examples/vue-datastore/public/logo192.png | Bin 5347 -> 0 bytes examples/vue-datastore/public/logo512.png | Bin 9664 -> 0 bytes examples/vue-datastore/public/manifest.json | 25 --- examples/vue-datastore/public/robots.txt | 1 - examples/vue-datastore/reactPackage.json | 59 ++++++ examples/vue-datastore/src/App.tsx | 185 ++++++++---------- examples/vue-datastore/src/App.vue | 27 +++ examples/vue-datastore/src/index.tsx | 14 -- examples/vue-datastore/src/main.ts | 5 + examples/vue-datastore/src/react-app-env.d.ts | 1 - .../src/registerServiceWorker.ts | 34 ++++ examples/vue-datastore/src/serviceWorker.ts | 149 -------------- examples/vue-datastore/src/setupTests.ts | 5 - examples/vue-datastore/src/shims-vue.d.ts | 6 + examples/vue-datastore/src/types.ts | 39 ---- examples/vue-datastore/tsconfig.json | 46 +++-- examples/vue-datastore/vue.config.js | 11 ++ 39 files changed, 372 insertions(+), 432 deletions(-) create mode 100644 examples/vue-datastore/.eslintrc.js create mode 100644 examples/vue-datastore/babel.config.js create mode 100644 examples/vue-datastore/public/img/icons/android-chrome-192x192.png create mode 100644 examples/vue-datastore/public/img/icons/android-chrome-512x512.png create mode 100644 examples/vue-datastore/public/img/icons/android-chrome-maskable-192x192.png create mode 100644 examples/vue-datastore/public/img/icons/android-chrome-maskable-512x512.png create mode 100644 examples/vue-datastore/public/img/icons/apple-touch-icon-120x120.png create mode 100644 examples/vue-datastore/public/img/icons/apple-touch-icon-152x152.png create mode 100644 examples/vue-datastore/public/img/icons/apple-touch-icon-180x180.png create mode 100644 examples/vue-datastore/public/img/icons/apple-touch-icon-60x60.png create mode 100644 examples/vue-datastore/public/img/icons/apple-touch-icon-76x76.png create mode 100644 examples/vue-datastore/public/img/icons/apple-touch-icon.png create mode 100644 examples/vue-datastore/public/img/icons/favicon-16x16.png create mode 100644 examples/vue-datastore/public/img/icons/favicon-32x32.png create mode 100644 examples/vue-datastore/public/img/icons/msapplication-icon-144x144.png create mode 100644 examples/vue-datastore/public/img/icons/mstile-150x150.png create mode 100644 examples/vue-datastore/public/img/icons/safari-pinned-tab.svg delete mode 100644 examples/vue-datastore/public/logo192.png delete mode 100644 examples/vue-datastore/public/logo512.png delete mode 100644 examples/vue-datastore/public/manifest.json create mode 100644 examples/vue-datastore/reactPackage.json create mode 100644 examples/vue-datastore/src/App.vue delete mode 100644 examples/vue-datastore/src/index.tsx create mode 100644 examples/vue-datastore/src/main.ts delete mode 100644 examples/vue-datastore/src/react-app-env.d.ts create mode 100644 examples/vue-datastore/src/registerServiceWorker.ts delete mode 100644 examples/vue-datastore/src/serviceWorker.ts delete mode 100644 examples/vue-datastore/src/setupTests.ts create mode 100644 examples/vue-datastore/src/shims-vue.d.ts delete mode 100644 examples/vue-datastore/src/types.ts create mode 100644 examples/vue-datastore/vue.config.js diff --git a/examples/vue-datastore/.eslintrc.js b/examples/vue-datastore/.eslintrc.js new file mode 100644 index 000000000..f948388bf --- /dev/null +++ b/examples/vue-datastore/.eslintrc.js @@ -0,0 +1,20 @@ +module.exports = { + root: true, + env: { + node: true + }, + extends: [ + "plugin:vue/vue3-essential", + "eslint:recommended", + "@vue/typescript/recommended", + "@vue/prettier", + "@vue/prettier/@typescript-eslint" + ], + parserOptions: { + ecmaVersion: 2020 + }, + rules: { + "no-console": process.env.NODE_ENV === "production" ? "warn" : "off", + "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off" + } +}; diff --git a/examples/vue-datastore/.gitignore b/examples/vue-datastore/.gitignore index 99cdaa2aa..4eea610cb 100644 --- a/examples/vue-datastore/.gitignore +++ b/examples/vue-datastore/.gitignore @@ -19,9 +19,11 @@ .env.production.local .gradle +# Log files npm-debug.log* yarn-debug.log* yarn-error.log* +pnpm-debug.log* /android /ios diff --git a/examples/vue-datastore/README.md b/examples/vue-datastore/README.md index 76a0c08f7..9762d2439 100644 --- a/examples/vue-datastore/README.md +++ b/examples/vue-datastore/README.md @@ -1,6 +1,36 @@ -# Offix - React Todo Example App +# vue-datastore -This example demonstrates how to get started using Offix in a React project. The app is a simple +## Project setup + +``` +yarn install +``` + +### Compiles and hot-reloads for development + +``` +yarn serve +``` + +### Compiles and minifies for production + +``` +yarn build +``` + +### Lints and fixes files + +``` +yarn lint +``` + +### Customize configuration + +See [Configuration Reference](https://cli.vuejs.org/config/). + +# Offix - Vue3 Todo Example App + +This example demonstrates how to get started using Offix in a Vue project. The app is a simple todo app making use of the `offix-client` and can be used as launch pad to getting started with Offix and make use of the features in the library. @@ -58,16 +88,13 @@ yarn start 2. Generate models yarn generate 3. Review new models - ## Running as native capacitor application - yarn build yarn cap add ios yarn cap copy ios yarn cap open ios - yarn build yarn cap add android // Swap main activity https://github.com/capacitor-community/sqlite diff --git a/examples/vue-datastore/babel.config.js b/examples/vue-datastore/babel.config.js new file mode 100644 index 000000000..c97d61964 --- /dev/null +++ b/examples/vue-datastore/babel.config.js @@ -0,0 +1,9 @@ +module.exports = { + presets: ["@vue/cli-plugin-babel/preset"], + plugins: [ + [ + "import", + { libraryName: "ant-design-vue", libraryDirectory: "es", style: "css" } + ] // `style: true` for less + ] +}; diff --git a/examples/vue-datastore/package.json b/examples/vue-datastore/package.json index d96f1d266..7389f7ffc 100644 --- a/examples/vue-datastore/package.json +++ b/examples/vue-datastore/package.json @@ -1,44 +1,12 @@ { - "name": "react-offix", + "name": "vue-datastore", "version": "0.1.0", "private": true, - "dependencies": { - "@ant-design/icons": "~4.2.1", - "@apollo/react-hooks": "^3.1.5", - "@capacitor-community/sqlite": "^2.4.0", - "@capacitor/android": "2.4.0", - "@testing-library/jest-dom": "^4.2.4", - "@testing-library/react": "^9.3.2", - "@testing-library/user-event": "^7.1.2", - "@types/jest": "^24.0.0", - "@types/node": "^12.0.0", - "@types/react": "^16.9.0", - "@types/react-dom": "^16.9.0", - "antd": "~4.4.1", - "graphql.macro": "^1.4.2", - "offix-datastore": "0.4.0", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "react-scripts": "3.4.1", - "typescript": "4.1.5", - "uniforms": "3.0.0-alpha.5", - "uniforms-antd": "3.0.0-alpha.5", - "uniforms-bridge-graphql": "3.0.0-alpha.5", - "uuidv4": "^6.1.1", - "@capacitor/core": "^2.4.0" - }, "scripts": { - "start": "SKIP_PREFLIGHT_CHECK=true react-scripts start", - "startServer": "gqlserve serve --datasync --conflict=clientSideWins --port=5400 ./src/model/runtime.graphql", - "build": "react-scripts build", - "test": "react-scripts test", - "eject": "react-scripts eject", - "generate": "offix generate --schema ./src/model/runtime.graphql --outputPath ./src/datastore/generated", - "linkdatastore": "cd ../../packages/datastore/datastore && yarn link && cd - && yarn link offix-datastore && rm -Rf ./node_modules/react && && rm -Rf ./node_modules/react-dom", - "linkdatastorecli": "cd ../../packages/datastore/cli && yarn link && cd - && yarn link @offix/cli" - }, - "eslintConfig": { - "extends": "react-app" + "serve": "vue-cli-service serve", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint", + "startServer": "gqlserve serve --datasync --conflict=clientSideWins --port=5400 ./src/model/runtime.graphql" }, "browserslist": { "production": [ @@ -52,10 +20,38 @@ "last 1 safari version" ] }, + "dependencies": { + "@ant-design/icons-vue": "^6.0.1", + "ant-design-vue": "^2.0.1", + "core-js": "^3.6.5", + "offix-datastore": "^0.4.0", + "register-service-worker": "^1.7.1", + "vue": "^3.0.6", + "graphql.macro": "^1.4.2" + }, "devDependencies": { - "@capacitor/cli": "^2.4.0", - "@offix/cli": "0.2.1", - "graphback-cli": "1.1.1", - "graphql-serve": "1.1.1" + "@offix/cli": "^0.3.3", + "@typescript-eslint/eslint-plugin": "^2.33.0", + "@typescript-eslint/parser": "^2.33.0", + "@vue/cli-plugin-babel": "^4.5.0", + "@vue/cli-plugin-eslint": "^4.5.0", + "@vue/cli-plugin-pwa": "^4.5.0", + "@vue/cli-plugin-typescript": "^4.5.0", + "@vue/cli-service": "^4.5.0", + "@vue/compiler-sfc": "^3.0.0", + "@vue/eslint-config-prettier": "^6.0.0", + "@vue/eslint-config-typescript": "^5.0.2", + "babel-plugin-import": "^1.13.3", + "eslint": "^6.7.2", + "eslint-plugin-prettier": "^3.1.3", + "eslint-plugin-vue": "^7.0.0-0", + "graphback-cli": "^1.1.2", + "less": "^4.1.1", + "less-loader": "^8.0.0", + "prettier": "^1.19.1", + "sass": "^1.26.5", + "sass-loader": "^8.0.2", + "typescript": "^4.2.2", + "graphql-serve": "1.1.2" } } diff --git a/examples/vue-datastore/public/favicon.ico b/examples/vue-datastore/public/favicon.ico index bcd5dfd67cd0361b78123e95c2dd96031f27f743..df36fcfb72584e00488330b560ebcf34a41c64c2 100644 GIT binary patch literal 4286 zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56 zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei z@g6Xq-pDoPl=MANPiR7%172VA%r)kevtV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp= zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8 zx!=3<4seY*%=OlbCbcae?5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3 z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD zsW0Ab)ZK@0cIW%W7z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6 z={Xwx{TKxD#iCLfl2vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S literal 3150 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 MDeX2GIKR{Qf5okjU;qFB diff --git a/examples/vue-datastore/public/img/icons/android-chrome-192x192.png b/examples/vue-datastore/public/img/icons/android-chrome-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..b02aa64d97167ad649e496908b35f14c603d9249 GIT binary patch literal 9416 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 literal 0 HcmV?d00001 diff --git a/examples/vue-datastore/public/img/icons/apple-touch-icon-120x120.png b/examples/vue-datastore/public/img/icons/apple-touch-icon-120x120.png new file mode 100644 index 0000000000000000000000000000000000000000..1427cf62752646ad7217df0a61aa01fdef7475d1 GIT binary patch literal 3369 zcmb7Hc{J2t8~Qk{w!5*3fu4c1kWV+f$uhdfm0Yr%@PJy8NU6F}hlE z<1AX3WTJu?$Npcik#7CO?ayV<8`12wv7ZdiDu4XrX_S{y+>=n~7d z9~&9D#2F*oV`RtK8X)8&x@yY(YO;P#O8VrmY|d)|7MBrpa!TRjvt9!rl6&=SCy~c3 z>tM*u-OKjWv%~5yU#iI0Y%ba~ElhEMq>t?o9nPi0c8kOI`nQYO7}ztojdXae;|Ot| z1tkl6Pk(J$XNb`OjhfPtmHxj!*zoW_BOrg>FvxHSkxfFQcjl=iZnZTFXn>+==EinV z-Xmp!-T3sQo#EA%F3G*MX?@bc)XC9Pf^|eg(0!7i!0u2D-+-rICwD+)jlOq8W>J%$ z65NtyPbiD!d?=FWge094u-`xKuC;0f^}W7-ve>-f>=u~k6i473knYXnU3-;)Cy~2T z`>(D&oL!DUa+l&*b$&iEhGb8whwg9eRO2U)=hDrKUVWJeJ6UyMyUN5m$+@3_;7kn7 zK1rGAplVFG%?QnlKP64ZhenV>WFY*0+aDLT@()k0GD2Ab?Ibx8&jJJIZof1m&-#O(8`oI|;xMi!W}KQU8AH(cwfP zRHmA|G89iRdkq&0_Tqn*yZMOg^86f+<cKq5n=7GaAFUPW z`sFW=)ylcF%KE)5yNckwDX*?}pJ`i;dc|{a-aH6&CMeiqs{gkTq3;Rg=VwpRyBUeB zOx7g{vDpp{f0{;_O{DjKtl+kb9iB~c9<}fp>oa;d(-W^XBkD6rsb$5|WqzxHf)Tx4 z&1dhImzRCX0mom>G<}b#e3~c6UvITjsnoU`Ef-{pTk)BLMbhh*pV!<|%q6RKrGS+*c+Wa(S7OJOxr*xa(0equIvspi8v&!kNpn`_~vb26^#YO5^#-KG{gQ6`M( zyXD%si{qrqc=Xg;h2q9M{9D)^HN%dk71S6XLOho3cpaI*6=Q3RWFmjKmQFTf30tuK zf`%LT#6Z}^i)(_RF{2ta@Ctq+7iFmb_op8jj->Qhkq4ZtGan`!LP8(6Wqh6dToGLJ zo#e}RVdI);2R$J7lJ}l{vbsv`n4udjL*>M?{OsI<7~A;o%n-y(BQF9pLJr$B`q->D z60Dto1*#4yMZ@6a| zM$Y@!805V@5#0EsAZxE(7AJDeigN~H6zk*T^We+o(0oD1@(0kSc~SlkIjhH!71i53gD5%O-UWfM5*~QQi)N%Oo_FK!S z^ROYHVo@tP1;yUGb@|29N_)z{u9s6nKU`Xw#3K_TY;~zG2&`zqd&lp~TS7hG*b998 z!bVjQPS+T_EhC!rMg8!sP7xm_Hk-QE*1D*p;)~S1$uZVZ*X~MBq)#qFX@}joCkQFZ zXXkN&Kc_GadVJ)+d)mIsI1`WwHb(N>^tK#gL4qZ|;|ngT#x@{eUXJ7B?;5M1k2PKs zxka3**9)$T4c0{8H^KD1QB0054?U-)ja=(P-9&wLCJL`L<||44#F)U81wQ(}Z`Y?& zh=mCtQ>7jbL8{ZzK1P)1Ca{?49l}Jw8iBrDN6ZUW)tVr?#qTs*xtbT zr+W=Th&)8bfXeGr!~bGOG+of8gULS}rfv>jWIPMJ;(cAVyRg+$|W>A70c`{iX z3&YgP&k1xnrfXu84pv-yp-Wgn{)v`P%2rn`%Bu=KMQ_rn`zwg6Y!5t3nIcGs7$mSV z@dq9xHTkzpT5{&fU;3d-K0r%2uszSfV;5ISKZFIAOD`@y#yWXDe{N6!N|@=<-?1Sk z1~_KEsi4LExBl`fQ2~w$MV@(K0eA1BIx>sN$dl_j?Rz|l@0J=QQ0-!~MQv&^EV~7r z!YYIho@&wxLbF=Ia`Akf332zjMqaV%6p-_0y7g@xX0^B#wb`2zvnwQg(Lzrv72mol zji_aHGo0MSWe!>(xc%=)q#hWoXlF-6H5pL`Z7x+#$Z-#uU`+7c`W?6U zoxg4->_Es21+*D?AJ!@Nj5tA?Gx2r_Pc)(w1;9?z1xJ*QM$8o+_V9Thqm>+sn9=#;-db_4ymFYe{`7$b{Y-W%KRR;za>e=+-D4qGS zRf@HvzI852D}`X=g6ELBcSQDG?|vKyI#@(cto;5yEoK-*M!tEPr<7;DkMoOw4o629 zFeAci>yyiby-nV?wsZbS#Y^b4W#PBP?^uNgE*QTxRKZU)vo$ioi{5{tlgp{SW%0qr z70#Z23&GdmYR6rT{;lOIYC<3PB6G0KjY}0lGNGD+yN+A}M!~Z+X0W*njdsCwo^w90 ze6F@vY1(@Z>B+R_rA*{j4bm*Bj8htRU&UO6;p4YNN)l}e_jCwsm!H7lSdt=Gj%O(n zo;ac94z}kW%h~6F2c!8XHRUQeyH}U|bVAKOp_+ADO5PkH?$E4P**m9VIn|FSjis#H zjCZfWrv!g7hlqQ5xZX@=gxMIHU0?yi@61_j-j=;5_uf58HMDq%i)cj%LB6UQw*Bco zn4*;MC@nDR0fZO${V{q`Tel}Ojw=aX#M*xw!RN(PJmITN@CAqD*?KGr5zjf=Ai?~i zR4lE2I`L8Wq?V+JV4>~NhrJ%Vp{*Xt+qw%C-%Vf9yj+TSPH+h8*8{Iefp6-_? zu5p8;GfK3Rx)Hx>pV0aD?b2N2kWJ=eK|^nX-<4NYI}Nd@mj+J%^0$#Qf~GH@3m{d_9(?C z6OSF?p&cwqYbSP=$`_KJYw&yz4t~*3l=}OLu!Z2Cghc62E?9=B%n|cdWib_MK1hCK zsCd;w3@jz@xwM%%`+U~6IlFyIBsirXFu&;TV46nEmbn-h_kd!bg=Lq^Es2QSTL6tx zN@ ROru=^AazZ3N)e9H{|11FNXq~K literal 0 HcmV?d00001 diff --git a/examples/vue-datastore/public/img/icons/apple-touch-icon-152x152.png b/examples/vue-datastore/public/img/icons/apple-touch-icon-152x152.png new file mode 100644 index 0000000000000000000000000000000000000000..f24d454a2ecb8851bb893192b64ee09386d30e24 GIT binary patch literal 4046 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 cK^5JQ0?3d{m_4Kdj*!1;003@kYpI!lw*K!+ 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�MrHbYR_buu=L>f*wO=Er8~{qfkYT+HoHag8)VqJoC-#@ zNT})4xRE%sP-B9?xmL5!2Y8VLa?yj@Y@r1C)6o~9GF9nWG!SI2VJ$>ejtUE%Qv&r_ zYLgZ0h3iIrw7{TyurC(g^$XT%PP5`FB3aFpP&fM-8!J#3I_ujG?;7(Xv5ni%BjYP4 z^+oydy=)_&bdxYJx`X%G5PFkUB%3h6RiOs^F?#ojsB%DbfhqzGhuv4)S1%vw@PDyE z3xWF{Y^0>+=Wg! z{>z@$rD6ej*V- z^$zKIOWOfdN4~7@ndhru01+3cxwD&_Muyja({*O;-5VnF(e$WDALNStE{1{F#ts+VR{o zSlQ*@U=Du8fgKW$lU~)O)b6FS?H1SSnKVIC=DOvbo8IUvM zVf+U4YxG%qLGd%ew7Jp8>@U`ew+A#Q=2oJHNH@_f!WadS20$KZEZ+BHAvU@FB zzRCYN5r+Z#g`C^hrH$yW7ABstwjvMM*CHGzY41bbo2zy$6E8DAOPn zUnHG?e7?u7pQ}Kqbu1jEd+=mcGea4aL6V4g(m*b7x}z|ijsjb3e|tf-3&^JK{=sWz z8sqIu9jy)#J}n}cXqtXmkb-NDVPcAKn=G9uX42zYvufu_OCr>xJ=oTNp8WA5wEqvM z{r~m8;7_C>U68iRr@|rd7UYhON#(-S_+Uf>s)hhPU{{exlxc&eD literal 0 HcmV?d00001 diff --git a/examples/vue-datastore/public/img/icons/apple-touch-icon-60x60.png b/examples/vue-datastore/public/img/icons/apple-touch-icon-60x60.png new file mode 100644 index 0000000000000000000000000000000000000000..cf10a5602e653bb126332934e2b7f34081c19a01 GIT binary patch literal 1491 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

aZW9cb|x>1jZDoAu$NpeWiVk@{x{! zmmBmDgx|qNN?LyIrl9$qmj{KjZ8zpa=4edK3FuFS$KFl}bWPoO*Ax#Z1c2#3JAN(O zYhi>`%H9fSnLkAq|5vs>+?U*bdfMc6TmDu+QqnN9xgfZsG25($^;v7U1nBl9Q^o*i z)&?UaYZ=~7XZa75xPKB1s~MB1m<*dN08pqiy*q!)_Kc|;EZs3&nNdMQ5#LFu+J z?*($vO)$hkMOVc16f-ep;K@_~&Y6t?0t9I0(lBkZBfic|u)3pK$Xv=A@jUQnB2sC` zbI)L9m;VNkWOao}2c3b4_u4+bg zuf-@d1$?asdD1~mORQ02#!&1Xm#41*xz}wETNqKb;kueQ*~OpcAXTpJFYUYcKoA&Z z8Ke=2Vh~cu_uTb&6AH75L!k8zo~&wRsDLs^3YkD2!~;%u6sFrzV2A5(FQ|3}+0-K- zWX)W2yq%?^)iKhyMGPB5*DnWBaLqAHLJ47;r5nvkeq3u_?J{Xaf_}6I+xpLwKS7NC z|KYU%zup)8i85jc)^Yt*I0W8;+zHUI3V7@o;3DUYasdq>DFK%im4J)F?;|B-<=}8R z>HESGa5)KyCnGII|E+YX&h4Y+xCRvyX@oGhhG4 j58+{W$RJv~NLLKlV4)8v^7hU(R-4l(}$teLl` literal 0 HcmV?d00001 diff --git a/examples/vue-datastore/public/img/icons/favicon-16x16.png b/examples/vue-datastore/public/img/icons/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..42af00963d81b8e39a30435c60ac482d1f8756e0 GIT binary patch literal 799 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>WRE8{w#)hawXn|-Xp4{E;v!=;4B^%-x&;Cm1 zP>^*#n_J!T^1SBMI!C4h-R53dN8`?ylD}d{L%(vZvUKT)~-CgWFQy3lt zIqW5#zOL*K8HL%o&D;R|TePl5?VWhq^wrj^qed%lKKkpp-FogeyEi+p zE?K8rW7E1fuEJ{5jaaAp0~aIt+keS?T)@vXM=*X}V#VGMCm1~v-+0wr{w3CJ-R8wG zS@XVpzqP-5Mf0H?y-zh=XVL>S6E;rKnDmrMQlmoKbK9p$evXN`oe{6g>lvi)-+#c) zb+Al&$zRqtWk1@VTt6MPmq9d7^!kmXZn8k{sFt`!l%ynwlArU1(iRB6fMfqu& zIjIUIl?AB^nFS@u3=9=>9)IHDC=AokIOTu(jOWuJ24-b$y<~1-Wnu5hBFw@HE)6D! wQ<#-EhbWxBaplC3Ge=~Ou%B-5Sm33{@Jd{;RG<|Mp00i_>zopr0DGh}-~a#s literal 0 HcmV?d00001 diff --git a/examples/vue-datastore/public/img/icons/favicon-32x32.png b/examples/vue-datastore/public/img/icons/favicon-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..46ca04dee251a4fa85a2891a145fbe20cc619d96 GIT binary patch literal 1271 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 + + diff --git a/examples/vue-datastore/public/index.html b/examples/vue-datastore/public/index.html index aa069f27c..3e5a13962 100644 --- a/examples/vue-datastore/public/index.html +++ b/examples/vue-datastore/public/index.html @@ -1,43 +1,17 @@ - + - - - - - - - - - - React App + + + + + <%= htmlWebpackPlugin.options.title %> - -

- + +
+ diff --git a/examples/vue-datastore/public/logo192.png b/examples/vue-datastore/public/logo192.png deleted file mode 100644 index fc44b0a3796c0e0a64c3d858ca038bd4570465d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5347 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 b{|{}U^kRn2wo}j7|0ATu<;8xA7zX}7|B6mN diff --git a/examples/vue-datastore/public/manifest.json b/examples/vue-datastore/public/manifest.json deleted file mode 100644 index 080d6c77a..000000000 --- a/examples/vue-datastore/public/manifest.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "short_name": "React App", - "name": "Create React App Sample", - "icons": [ - { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - }, - { - "src": "logo192.png", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "logo512.png", - "type": "image/png", - "sizes": "512x512" - } - ], - "start_url": ".", - "display": "standalone", - "theme_color": "#000000", - "background_color": "#ffffff" -} diff --git a/examples/vue-datastore/public/robots.txt b/examples/vue-datastore/public/robots.txt index e9e57dc4d..eb0536286 100644 --- a/examples/vue-datastore/public/robots.txt +++ b/examples/vue-datastore/public/robots.txt @@ -1,3 +1,2 @@ -# https://www.robotstxt.org/robotstxt.html User-agent: * Disallow: diff --git a/examples/vue-datastore/reactPackage.json b/examples/vue-datastore/reactPackage.json new file mode 100644 index 000000000..52af8d604 --- /dev/null +++ b/examples/vue-datastore/reactPackage.json @@ -0,0 +1,59 @@ +{ + "name": "react-offix", + "version": "0.1.0", + "private": true, + "dependencies": { + "@ant-design/icons": "~4.2.1", + "@apollo/react-hooks": "^3.1.5", + "@capacitor-community/sqlite": "^2.4.0", + "@capacitor/android": "2.4.0", + "@testing-library/jest-dom": "^4.2.4", + "@testing-library/react": "^9.3.2", + "@testing-library/user-event": "^7.1.2", + "@types/jest": "^24.0.0", + "@types/node": "^12.0.0", + "@types/react": "^16.9.0", + "@types/react-dom": "^16.9.0", + "antd": "~4.4.1", + "graphql.macro": "^1.4.2", + "offix-datastore": "0.4.0", + "react": "^16.13.1", + "react-dom": "^16.13.1", + "react-scripts": "3.4.1", + "typescript": "4.1.5", + "uniforms": "3.0.0-alpha.5", + "uniforms-antd": "3.0.0-alpha.5", + "uniforms-bridge-graphql": "3.0.0-alpha.5", + "uuidv4": "^6.1.1", + "@capacitor/core": "^2.4.0" + }, + "scripts": { + "start": "SKIP_PREFLIGHT_CHECK=true react-scripts start", + "startServer": "gqlserve serve --datasync --conflict=clientSideWins --port=5400 ./src/model/runtime.graphql", + "build": "react-scripts build", + "test": "react-scripts test", + "eject": "react-scripts eject", + "generate": "offix generate --schema ./src/model/runtime.graphql --outputPath ./src/datastore/generated", + "linkdatastore": "cd ../../packages/datastore/datastore && yarn link && cd - && yarn link offix-datastore && rm -Rf ./node_modules/react && && rm -Rf ./node_modules/react-dom", + "linkdatastorecli": "cd ../../packages/datastore/cli && yarn link && cd - && yarn link @offix/cli" + }, + "eslintConfig": { + "extends": "react-app" + }, + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] + }, + "devDependencies": { + "@capacitor/cli": "^2.4.0", + "graphql-serve": "1.1.1" + } +} diff --git a/examples/vue-datastore/src/App.tsx b/examples/vue-datastore/src/App.tsx index 1d231e21c..8976f5cd1 100644 --- a/examples/vue-datastore/src/App.tsx +++ b/examples/vue-datastore/src/App.tsx @@ -1,110 +1,97 @@ -import React, { useState, useEffect } from 'react'; -import { Button } from 'antd'; -import 'antd/dist/antd.css'; - -import { useFindTodos } from './datastore/hooks'; -import { TodoList, AddTodo, Loading, Error, Header } from './components'; -import { datastore } from './datastore/config'; -import { NetworkStatusEvent } from 'offix-datastore/types/replication/network/NetworkStatus'; +import { Button } from "ant-design-vue"; +import { NetworkStatusEvent } from "offix-datastore/types/replication/network/NetworkStatus"; +import { defineComponent, h, onMounted, ref, watch } from "vue"; +import { AddTodo, Error, Header, Loading, TodoList } from "./components"; +import { datastore } from "./datastore/config"; +import { useFindTodos } from "./datastore/hooks"; function App() { + return defineComponent({ + components: { + Button + }, + setup() { + const replicating = ref(true); + const addView = ref(false); - const [replicating, setReplicating] = useState(true); - const [addView, setAddView] = useState(false); - const { loading, error, data, subscribeToUpdates } = useFindTodos(); - - useEffect(() => { - datastore.getNetworkIndicator()?.subscribe({ - next: (event: NetworkStatusEvent) => { - if (event.isOnline) { - datastore.startReplication(); - setReplicating(true); - } else { - datastore.stopReplication(); - setReplicating(false); - } - } - }) - }) - - useEffect(() => { - // We can start replication on a per model basis - // or for the entire store with: - // datastore.startReplication - // the `startReplication` method accepts an - // optional filter - datastore.startReplication() - }); - - useEffect(() => { - const subscription = subscribeToUpdates(); - return () => subscription.unsubscribe(); - }, [data, subscribeToUpdates]); + const { loading, error, data, subscribeToUpdates } = useFindTodos(); - if (loading) return ; + onMounted(() => { + datastore.getNetworkIndicator()?.subscribe({ + next: (event: NetworkStatusEvent) => { + if (event.isOnline) { + datastore.startReplication(); + replicating.value = true; + } else { + datastore.stopReplication(); + replicating.value = false; + } + } + }); + }); - if (error) return ; + watch( + data, + () => { + const subscription = subscribeToUpdates(); + return () => subscription.unsubscribe(); + }, + { deep: true, immediate: true } + ); + // FIXME: + if (loading) return () => ; + // FIXME: + if (error) return ; - return ( -
-
-
setAddView(false) - } - extra={ - addView ? null : ( - <> - - - - ) - } - > - { - !addView && ( - <> - - - ) - } - { - addView && ( - <> - setAddView(false)} /> - - ) - } -
-
-
- ); + return () => + h( +
+
+
(addView.value = false)} + extra={ + addView.value ? null : ( + <> + + + + ) + } + > + {!addView && ( + <> + + + )} + {addView && ( + <> + (addView.value = true)} /> + + )} +
+
+
+ ); + } + }); } const containerStyle = { - display: 'flex', - alignItems: 'start', - justifyContent: 'center', - minHeight: '100vh', - width: '100vw', - padding: '2em 0' -} + display: "flex", + alignItems: "start", + justifyContent: "center", + minHeight: "100vh", + width: "100vw", + padding: "2em 0" +}; export default App; diff --git a/examples/vue-datastore/src/App.vue b/examples/vue-datastore/src/App.vue new file mode 100644 index 000000000..6da59b1d2 --- /dev/null +++ b/examples/vue-datastore/src/App.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/examples/vue-datastore/src/index.tsx b/examples/vue-datastore/src/index.tsx deleted file mode 100644 index d68fa09e7..000000000 --- a/examples/vue-datastore/src/index.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import App from './App'; -import * as serviceWorker from './serviceWorker'; - -// enable logger for datasync in browser -localStorage.debug = 'datasync:*'; - -ReactDOM.render(, document.getElementById("root")); - -// If you want your app to work offline and load faster, you can change -// unregister() to register() below. Note this comes with some pitfalls. -// Learn more about service workers: https://bit.ly/CRA-PWA -serviceWorker.register(); diff --git a/examples/vue-datastore/src/main.ts b/examples/vue-datastore/src/main.ts new file mode 100644 index 000000000..620d8f88d --- /dev/null +++ b/examples/vue-datastore/src/main.ts @@ -0,0 +1,5 @@ +import { createApp } from "vue"; +import App from "./App"; +import "./registerServiceWorker"; + +createApp(App).mount("#app"); diff --git a/examples/vue-datastore/src/react-app-env.d.ts b/examples/vue-datastore/src/react-app-env.d.ts deleted file mode 100644 index 6431bc5fc..000000000 --- a/examples/vue-datastore/src/react-app-env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/examples/vue-datastore/src/registerServiceWorker.ts b/examples/vue-datastore/src/registerServiceWorker.ts new file mode 100644 index 000000000..30b7895d2 --- /dev/null +++ b/examples/vue-datastore/src/registerServiceWorker.ts @@ -0,0 +1,34 @@ +/* eslint-disable no-console */ + +import { register } from "register-service-worker"; + +if (process.env.NODE_ENV === "production") { + register(`${process.env.BASE_URL}service-worker.js`, { + ready() { + console.log( + "App is being served from cache by a service worker.\n" + + "For more details, visit https://goo.gl/AFskqB" + ); + }, + registered() { + console.log("Service worker has been registered."); + }, + cached() { + console.log("Content has been cached for offline use."); + }, + updatefound() { + console.log("New content is downloading."); + }, + updated() { + console.log("New content is available; please refresh."); + }, + offline() { + console.log( + "No internet connection found. App is running in offline mode." + ); + }, + error(error) { + console.error("Error during service worker registration:", error); + } + }); +} diff --git a/examples/vue-datastore/src/serviceWorker.ts b/examples/vue-datastore/src/serviceWorker.ts deleted file mode 100644 index b09523f15..000000000 --- a/examples/vue-datastore/src/serviceWorker.ts +++ /dev/null @@ -1,149 +0,0 @@ -// This optional code is used to register a service worker. -// register() is not called by default. - -// This lets the app load faster on subsequent visits in production, and gives -// it offline capabilities. However, it also means that developers (and users) -// will only see deployed updates on subsequent visits to a page, after all the -// existing tabs open on the page have been closed, since previously cached -// resources are updated in the background. - -// To learn more about the benefits of this model and instructions on how to -// opt-in, read https://bit.ly/CRA-PWA - -const isLocalhost = Boolean( - window.location.hostname === 'localhost' || - // [::1] is the IPv6 localhost address. - window.location.hostname === '[::1]' || - // 127.0.0.0/8 are considered localhost for IPv4. - window.location.hostname.match( - /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ - ) -); - -type Config = { - onSuccess?: (registration: ServiceWorkerRegistration) => void; - onUpdate?: (registration: ServiceWorkerRegistration) => void; -}; - -export function register(config?: Config) { - if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { - // The URL constructor is available in all browsers that support SW. - const publicUrl = new URL( - process.env.PUBLIC_URL, - window.location.href - ); - if (publicUrl.origin !== window.location.origin) { - // Our service worker won't work if PUBLIC_URL is on a different origin - // from what our page is served on. This might happen if a CDN is used to - // serve assets; see https://github.com/facebook/create-react-app/issues/2374 - return; - } - - window.addEventListener('load', () => { - const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; - - if (isLocalhost) { - // This is running on localhost. Let's check if a service worker still exists or not. - checkValidServiceWorker(swUrl, config); - - // Add some additional logging to localhost, pointing developers to the - // service worker/PWA documentation. - navigator.serviceWorker.ready.then(() => { - console.log( - 'This web app is being served cache-first by a service ' + - 'worker. To learn more, visit https://bit.ly/CRA-PWA' - ); - }); - } else { - // Is not localhost. Just register service worker - registerValidSW(swUrl, config); - } - }); - } -} - -function registerValidSW(swUrl: string, config?: Config) { - navigator.serviceWorker - .register(swUrl) - .then(registration => { - registration.onupdatefound = () => { - const installingWorker = registration.installing; - if (installingWorker == null) { - return; - } - installingWorker.onstatechange = () => { - if (installingWorker.state === 'installed') { - if (navigator.serviceWorker.controller) { - // At this point, the updated precached content has been fetched, - // but the previous service worker will still serve the older - // content until all client tabs are closed. - console.log( - 'New content is available and will be used when all ' + - 'tabs for this page are closed. See https://bit.ly/CRA-PWA.' - ); - - // Execute callback - if (config && config.onUpdate) { - config.onUpdate(registration); - } - } else { - // At this point, everything has been precached. - // It's the perfect time to display a - // "Content is cached for offline use." message. - console.log('Content is cached for offline use.'); - - // Execute callback - if (config && config.onSuccess) { - config.onSuccess(registration); - } - } - } - }; - }; - }) - .catch(error => { - console.error('Error during service worker registration:', error); - }); -} - -function checkValidServiceWorker(swUrl: string, config?: Config) { - // Check if the service worker can be found. If it can't reload the page. - fetch(swUrl, { - headers: { 'Service-Worker': 'script' } - }) - .then(response => { - // Ensure service worker exists, and that we really are getting a JS file. - const contentType = response.headers.get('content-type'); - if ( - response.status === 404 || - (contentType != null && contentType.indexOf('javascript') === -1) - ) { - // No service worker found. Probably a different app. Reload the page. - navigator.serviceWorker.ready.then(registration => { - registration.unregister().then(() => { - window.location.reload(); - }); - }); - } else { - // Service worker found. Proceed as normal. - registerValidSW(swUrl, config); - } - }) - .catch(() => { - console.log( - 'No internet connection found. App is running in offline mode.' - ); - }); -} - -export function unregister() { - if ('serviceWorker' in navigator) { - navigator.serviceWorker.ready - .then(registration => { - registration.unregister(); - }) - .catch(error => { - console.error(error.message); - }); - } -} diff --git a/examples/vue-datastore/src/setupTests.ts b/examples/vue-datastore/src/setupTests.ts deleted file mode 100644 index 74b1a275a..000000000 --- a/examples/vue-datastore/src/setupTests.ts +++ /dev/null @@ -1,5 +0,0 @@ -// jest-dom adds custom jest matchers for asserting on DOM nodes. -// allows you to do things like: -// expect(element).toHaveTextContent(/react/i) -// learn more: https://github.com/testing-library/jest-dom -import '@testing-library/jest-dom/extend-expect'; diff --git a/examples/vue-datastore/src/shims-vue.d.ts b/examples/vue-datastore/src/shims-vue.d.ts new file mode 100644 index 000000000..3804a43e2 --- /dev/null +++ b/examples/vue-datastore/src/shims-vue.d.ts @@ -0,0 +1,6 @@ +/* eslint-disable */ +declare module '*.vue' { + import type { DefineComponent } from 'vue' + const component: DefineComponent<{}, {}, any> + export default component +} diff --git a/examples/vue-datastore/src/types.ts b/examples/vue-datastore/src/types.ts deleted file mode 100644 index 01194bea6..000000000 --- a/examples/vue-datastore/src/types.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { Todo } from "./datastore/generated"; - -export type TodoProps = { - todo: Todo, -}; - -export type TodoListProps = { - todos: Array, -}; - -export type AddTodoProps = { - cancel: () => void, -}; - -export type EditTodoProps = { - todo: Todo, - toggleEdit: () => void, -}; - -export type ToggleTodoProps = { - todo: Todo, -}; - -export type HookState = { - data: any | null, - loading: boolean, - error: Error | null, -}; - -export enum ActionType { - REQ_START = 0, - REQ_SUCCESS = 1, - REQ_FAILED = 2, -}; - -export type ReducerAction = { - type: ActionType, - payload?: any, -} diff --git a/examples/vue-datastore/tsconfig.json b/examples/vue-datastore/tsconfig.json index f2850b716..e621cbc36 100644 --- a/examples/vue-datastore/tsconfig.json +++ b/examples/vue-datastore/tsconfig.json @@ -1,25 +1,39 @@ { "compilerOptions": { - "target": "es5", - "lib": [ - "dom", - "dom.iterable", - "esnext" - ], - "allowJs": true, + "target": "esnext", + "module": "esnext", + "strict": true, + "jsx": "preserve", + "importHelpers": true, + "moduleResolution": "node", "skipLibCheck": true, "esModuleInterop": true, "allowSyntheticDefaultImports": true, - "strict": true, - "forceConsistentCasingInFileNames": true, - "module": "esnext", - "moduleResolution": "node", - "resolveJsonModule": true, - "isolatedModules": true, - "noEmit": true, - "jsx": "react" + "sourceMap": true, + "baseUrl": ".", + "types": [ + "webpack-env" + ], + "paths": { + "@/*": [ + "src/*" + ] + }, + "lib": [ + "esnext", + "dom", + "dom.iterable", + "scripthost" + ] }, "include": [ - "src" + "src/**/*.ts", + "src/**/*.tsx", + "src/**/*.vue", + "tests/**/*.ts", + "tests/**/*.tsx" + ], + "exclude": [ + "node_modules" ] } diff --git a/examples/vue-datastore/vue.config.js b/examples/vue-datastore/vue.config.js new file mode 100644 index 000000000..1ff7edc0d --- /dev/null +++ b/examples/vue-datastore/vue.config.js @@ -0,0 +1,11 @@ +module.exports = { + css: { + loaderOptions: { + less: { + lessOptions: { + javascriptEnabled: true + } + } + } + } +}; From 2d8b7bca1ecd41c920c518843900f92e9b53d6c4 Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Mon, 1 Mar 2021 04:43:51 +0300 Subject: [PATCH 06/17] feat: vue example feat: vue hooks (full crud) todo: sync is not working correctly --- examples/vue-datastore/.eslintrc.js | 20 -- examples/vue-datastore/.gitignore | 29 --- examples/vue-datastore/.graphqlrc.yml | 8 - examples/vue-datastore/babel.config.js | 9 - examples/vue-datastore/index.html | 13 ++ examples/vue-datastore/package.json | 50 ++--- .../img/icons/android-chrome-192x192.png | Bin 9416 -> 0 bytes .../img/icons/android-chrome-512x512.png | Bin 29808 -> 0 bytes .../icons/android-chrome-maskable-192x192.png | Bin 6401 -> 0 bytes .../icons/android-chrome-maskable-512x512.png | Bin 23038 -> 0 bytes .../img/icons/apple-touch-icon-120x120.png | Bin 3369 -> 0 bytes .../img/icons/apple-touch-icon-152x152.png | Bin 4046 -> 0 bytes .../img/icons/apple-touch-icon-180x180.png | Bin 4678 -> 0 bytes .../img/icons/apple-touch-icon-60x60.png | Bin 1491 -> 0 bytes .../img/icons/apple-touch-icon-76x76.png | Bin 1823 -> 0 bytes .../public/img/icons/apple-touch-icon.png | Bin 4678 -> 0 bytes .../public/img/icons/favicon-16x16.png | Bin 799 -> 0 bytes .../public/img/icons/favicon-32x32.png | Bin 1271 -> 0 bytes .../img/icons/msapplication-icon-144x144.png | Bin 1169 -> 0 bytes .../public/img/icons/mstile-150x150.png | Bin 4282 -> 0 bytes .../public/img/icons/safari-pinned-tab.svg | 3 - examples/vue-datastore/public/index.html | 17 -- examples/vue-datastore/public/robots.txt | 2 - examples/vue-datastore/reactPackage.json | 59 ------ examples/vue-datastore/src/App.tsx | 97 --------- examples/vue-datastore/src/App.vue | 100 +++++++-- .../src/components/Todo/Todo.tsx | 48 ----- .../src/components/Todo/TodoItem.tsx | 57 ++++++ .../src/components/Todo/TodoList.tsx | 57 +++--- .../src/components/Todo/index.ts | 4 +- .../vue-datastore/src/components/UI/Empty.tsx | 26 ++- .../vue-datastore/src/components/UI/Error.tsx | 32 ++- .../src/components/UI/Header.tsx | 15 -- .../src/components/UI/Loading.tsx | 11 - .../src/components/UI/Loading.vue | 13 ++ .../vue-datastore/src/components/UI/index.ts | 6 +- .../src/components/forms/AddTodo.tsx | 37 ---- .../src/components/forms/AddTodo.vue | 41 ++++ .../src/components/forms/EditTodo.tsx | 40 ---- .../src/components/forms/EditTodo.vue | 47 +++++ .../src/components/forms/ToggleTodo.tsx | 32 --- .../src/components/forms/ToggleTodo.vue | 40 ++++ .../src/components/forms/formSchema.ts | 54 ++--- .../src/components/forms/index.ts | 3 - .../vue-datastore/src/components/index.ts | 5 +- .../vue-datastore/src/datastore/config.ts | 8 +- .../src/datastore/generated/index.ts | 1 - .../src/datastore/generated/schema.json | 12 +- .../src/datastore/generated/types.ts | 23 ++- examples/vue-datastore/src/datastore/hooks.ts | 28 ++- examples/vue-datastore/src/main.ts | 10 +- .../src/registerServiceWorker.ts | 34 ---- examples/vue-datastore/src/shims-vue.d.ts | 3 +- examples/vue-datastore/src/types.ts | 39 ++++ examples/vue-datastore/tsconfig.json | 38 +--- examples/vue-datastore/vite.config.ts | 22 ++ examples/vue-datastore/vue.config.js | 11 - .../datastore/datastore/src/vue/StateUtils.ts | 25 ++- .../datastore/src/vue/hooks/delete.ts | 7 +- .../datastore/src/vue/hooks/query.ts | 190 ++++++++++-------- .../datastore/datastore/src/vue/hooks/save.ts | 8 +- .../datastore/src/vue/hooks/subscription.ts | 13 +- .../datastore/src/vue/hooks/update.ts | 9 +- packages/datastore/datastore/tsconfig.json | 17 +- 64 files changed, 676 insertions(+), 797 deletions(-) delete mode 100644 examples/vue-datastore/.eslintrc.js delete mode 100644 examples/vue-datastore/.gitignore delete mode 100644 examples/vue-datastore/.graphqlrc.yml delete mode 100644 examples/vue-datastore/babel.config.js create mode 100644 examples/vue-datastore/index.html delete mode 100644 examples/vue-datastore/public/img/icons/android-chrome-192x192.png delete mode 100644 examples/vue-datastore/public/img/icons/android-chrome-512x512.png delete mode 100644 examples/vue-datastore/public/img/icons/android-chrome-maskable-192x192.png delete mode 100644 examples/vue-datastore/public/img/icons/android-chrome-maskable-512x512.png delete mode 100644 examples/vue-datastore/public/img/icons/apple-touch-icon-120x120.png delete mode 100644 examples/vue-datastore/public/img/icons/apple-touch-icon-152x152.png delete mode 100644 examples/vue-datastore/public/img/icons/apple-touch-icon-180x180.png delete mode 100644 examples/vue-datastore/public/img/icons/apple-touch-icon-60x60.png delete mode 100644 examples/vue-datastore/public/img/icons/apple-touch-icon-76x76.png delete mode 100644 examples/vue-datastore/public/img/icons/apple-touch-icon.png delete mode 100644 examples/vue-datastore/public/img/icons/favicon-16x16.png delete mode 100644 examples/vue-datastore/public/img/icons/favicon-32x32.png delete mode 100644 examples/vue-datastore/public/img/icons/msapplication-icon-144x144.png delete mode 100644 examples/vue-datastore/public/img/icons/mstile-150x150.png delete mode 100644 examples/vue-datastore/public/img/icons/safari-pinned-tab.svg delete mode 100644 examples/vue-datastore/public/index.html delete mode 100644 examples/vue-datastore/public/robots.txt delete mode 100644 examples/vue-datastore/reactPackage.json delete mode 100644 examples/vue-datastore/src/App.tsx delete mode 100644 examples/vue-datastore/src/components/Todo/Todo.tsx create mode 100644 examples/vue-datastore/src/components/Todo/TodoItem.tsx delete mode 100644 examples/vue-datastore/src/components/UI/Header.tsx delete mode 100644 examples/vue-datastore/src/components/UI/Loading.tsx create mode 100644 examples/vue-datastore/src/components/UI/Loading.vue delete mode 100644 examples/vue-datastore/src/components/forms/AddTodo.tsx create mode 100644 examples/vue-datastore/src/components/forms/AddTodo.vue delete mode 100644 examples/vue-datastore/src/components/forms/EditTodo.tsx create mode 100644 examples/vue-datastore/src/components/forms/EditTodo.vue delete mode 100644 examples/vue-datastore/src/components/forms/ToggleTodo.tsx create mode 100644 examples/vue-datastore/src/components/forms/ToggleTodo.vue delete mode 100644 examples/vue-datastore/src/components/forms/index.ts delete mode 100644 examples/vue-datastore/src/registerServiceWorker.ts create mode 100644 examples/vue-datastore/src/types.ts create mode 100644 examples/vue-datastore/vite.config.ts delete mode 100644 examples/vue-datastore/vue.config.js diff --git a/examples/vue-datastore/.eslintrc.js b/examples/vue-datastore/.eslintrc.js deleted file mode 100644 index f948388bf..000000000 --- a/examples/vue-datastore/.eslintrc.js +++ /dev/null @@ -1,20 +0,0 @@ -module.exports = { - root: true, - env: { - node: true - }, - extends: [ - "plugin:vue/vue3-essential", - "eslint:recommended", - "@vue/typescript/recommended", - "@vue/prettier", - "@vue/prettier/@typescript-eslint" - ], - parserOptions: { - ecmaVersion: 2020 - }, - rules: { - "no-console": process.env.NODE_ENV === "production" ? "warn" : "off", - "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off" - } -}; diff --git a/examples/vue-datastore/.gitignore b/examples/vue-datastore/.gitignore deleted file mode 100644 index 4eea610cb..000000000 --- a/examples/vue-datastore/.gitignore +++ /dev/null @@ -1,29 +0,0 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - -# dependencies -/node_modules -/.pnp -.pnp.js - -# testing -/coverage - -# production -/build - -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local -.gradle - -# Log files -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* - -/android -/ios diff --git a/examples/vue-datastore/.graphqlrc.yml b/examples/vue-datastore/.graphqlrc.yml deleted file mode 100644 index e900bd68a..000000000 --- a/examples/vue-datastore/.graphqlrc.yml +++ /dev/null @@ -1,8 +0,0 @@ -schema: './src/schema.graphql' -extensions: - graphback: - # path to data model file(s) - model: './src/model/runtime.graphql' - plugins: - offix-datasync-client-plugin: - modelOutputDir: './src/datasync' diff --git a/examples/vue-datastore/babel.config.js b/examples/vue-datastore/babel.config.js deleted file mode 100644 index c97d61964..000000000 --- a/examples/vue-datastore/babel.config.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - presets: ["@vue/cli-plugin-babel/preset"], - plugins: [ - [ - "import", - { libraryName: "ant-design-vue", libraryDirectory: "es", style: "css" } - ] // `style: true` for less - ] -}; diff --git a/examples/vue-datastore/index.html b/examples/vue-datastore/index.html new file mode 100644 index 000000000..11603f878 --- /dev/null +++ b/examples/vue-datastore/index.html @@ -0,0 +1,13 @@ + + + + + + + Vite App + + +
+ + + diff --git a/examples/vue-datastore/package.json b/examples/vue-datastore/package.json index 7389f7ffc..913db3e2f 100644 --- a/examples/vue-datastore/package.json +++ b/examples/vue-datastore/package.json @@ -1,12 +1,15 @@ { "name": "vue-datastore", - "version": "0.1.0", - "private": true, + "version": "0.0.0", "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint", - "startServer": "gqlserve serve --datasync --conflict=clientSideWins --port=5400 ./src/model/runtime.graphql" + "dev": "vite", + "build": "vite build", + "serve": "vite preview", + "upgrade-next": "yarn yarn-upgrade-all add vue@next ant-design-vue@next", + "generate": "offix generate --schema ./src/model/runtime.graphql --outputPath ./src/datastore/generated", + "startServer": "gqlserve serve --datasync --conflict=clientSideWins --port=5400 ./src/model/runtime.graphql", + "linkdatastore": "cd ../../packages/datastore/datastore && yarn link && cd - && yarn link offix-datastore && rm -Rf ./node_modules/react && && rm -Rf ./node_modules/react-dom", + "linkdatastorecli": "cd ../../packages/datastore/cli && yarn link && cd - && yarn link @offix/cli" }, "browserslist": { "production": [ @@ -21,37 +24,26 @@ ] }, "dependencies": { - "@ant-design/icons-vue": "^6.0.1", + "@ant-design/colors": "^6.0.0", "ant-design-vue": "^2.0.1", - "core-js": "^3.6.5", "offix-datastore": "^0.4.0", - "register-service-worker": "^1.7.1", "vue": "^3.0.6", - "graphql.macro": "^1.4.2" + "@ant-design/icons-vue": "^6.0.1" }, "devDependencies": { "@offix/cli": "^0.3.3", - "@typescript-eslint/eslint-plugin": "^2.33.0", - "@typescript-eslint/parser": "^2.33.0", - "@vue/cli-plugin-babel": "^4.5.0", - "@vue/cli-plugin-eslint": "^4.5.0", - "@vue/cli-plugin-pwa": "^4.5.0", - "@vue/cli-plugin-typescript": "^4.5.0", - "@vue/cli-service": "^4.5.0", - "@vue/compiler-sfc": "^3.0.0", - "@vue/eslint-config-prettier": "^6.0.0", - "@vue/eslint-config-typescript": "^5.0.2", + "@types/node": "^14.14.31", + "@vitejs/plugin-vue": "^1.1.4", + "@vitejs/plugin-vue-jsx": "^1.1.2", + "@vue/compiler-sfc": "^3.0.5", "babel-plugin-import": "^1.13.3", - "eslint": "^6.7.2", - "eslint-plugin-prettier": "^3.1.3", - "eslint-plugin-vue": "^7.0.0-0", + "eslint": "^7.21.0", + "eslint-plugin-vue": "^7.6.0", "graphback-cli": "^1.1.2", - "less": "^4.1.1", - "less-loader": "^8.0.0", - "prettier": "^1.19.1", - "sass": "^1.26.5", - "sass-loader": "^8.0.2", + "graphql-serve": "1.1.2", + "sass": "^1.32.8", "typescript": "^4.2.2", - "graphql-serve": "1.1.2" + "vite": "^2.0.4", + "yarn-upgrade-all": "^0.5.4" } } diff --git a/examples/vue-datastore/public/img/icons/android-chrome-192x192.png b/examples/vue-datastore/public/img/icons/android-chrome-192x192.png deleted file mode 100644 index b02aa64d97167ad649e496908b35f14c603d9249..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9416 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 diff --git a/examples/vue-datastore/public/img/icons/apple-touch-icon-120x120.png b/examples/vue-datastore/public/img/icons/apple-touch-icon-120x120.png deleted file mode 100644 index 1427cf62752646ad7217df0a61aa01fdef7475d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3369 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 ROru=^AazZ3N)e9H{|11FNXq~K diff --git a/examples/vue-datastore/public/img/icons/apple-touch-icon-152x152.png b/examples/vue-datastore/public/img/icons/apple-touch-icon-152x152.png deleted file mode 100644 index f24d454a2ecb8851bb893192b64ee09386d30e24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4046 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 cK^5JQ0?3d{m_4Kdj*!1;003@kYpI!lw*K!+ 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�MrHbYR_buu=L>f*wO=Er8~{qfkYT+HoHag8)VqJoC-#@ zNT})4xRE%sP-B9?xmL5!2Y8VLa?yj@Y@r1C)6o~9GF9nWG!SI2VJ$>ejtUE%Qv&r_ zYLgZ0h3iIrw7{TyurC(g^$XT%PP5`FB3aFpP&fM-8!J#3I_ujG?;7(Xv5ni%BjYP4 z^+oydy=)_&bdxYJx`X%G5PFkUB%3h6RiOs^F?#ojsB%DbfhqzGhuv4)S1%vw@PDyE z3xWF{Y^0>+=Wg! z{>z@$rD6ej*V- z^$zKIOWOfdN4~7@ndhru01+3cxwD&_Muyja({*O;-5VnF(e$WDALNStE{1{F#ts+VR{o zSlQ*@U=Du8fgKW$lU~)O)b6FS?H1SSnKVIC=DOvbo8IUvM zVf+U4YxG%qLGd%ew7Jp8>@U`ew+A#Q=2oJHNH@_f!WadS20$KZEZ+BHAvU@FB zzRCYN5r+Z#g`C^hrH$yW7ABstwjvMM*CHGzY41bbo2zy$6E8DAOPn zUnHG?e7?u7pQ}Kqbu1jEd+=mcGea4aL6V4g(m*b7x}z|ijsjb3e|tf-3&^JK{=sWz z8sqIu9jy)#J}n}cXqtXmkb-NDVPcAKn=G9uX42zYvufu_OCr>xJ=oTNp8WA5wEqvM z{r~m8;7_C>U68iRr@|rd7UYhON#(-S_+Uf>s)hhPU{{exlxc&eD diff --git a/examples/vue-datastore/public/img/icons/apple-touch-icon-60x60.png b/examples/vue-datastore/public/img/icons/apple-touch-icon-60x60.png deleted file mode 100644 index cf10a5602e653bb126332934e2b7f34081c19a01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1491 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

aZW9cb|x>1jZDoAu$NpeWiVk@{x{! zmmBmDgx|qNN?LyIrl9$qmj{KjZ8zpa=4edK3FuFS$KFl}bWPoO*Ax#Z1c2#3JAN(O zYhi>`%H9fSnLkAq|5vs>+?U*bdfMc6TmDu+QqnN9xgfZsG25($^;v7U1nBl9Q^o*i z)&?UaYZ=~7XZa75xPKB1s~MB1m<*dN08pqiy*q!)_Kc|;EZs3&nNdMQ5#LFu+J z?*($vO)$hkMOVc16f-ep;K@_~&Y6t?0t9I0(lBkZBfic|u)3pK$Xv=A@jUQnB2sC` zbI)L9m;VNkWOao}2c3b4_u4+bg zuf-@d1$?asdD1~mORQ02#!&1Xm#41*xz}wETNqKb;kueQ*~OpcAXTpJFYUYcKoA&Z z8Ke=2Vh~cu_uTb&6AH75L!k8zo~&wRsDLs^3YkD2!~;%u6sFrzV2A5(FQ|3}+0-K- zWX)W2yq%?^)iKhyMGPB5*DnWBaLqAHLJ47;r5nvkeq3u_?J{Xaf_}6I+xpLwKS7NC z|KYU%zup)8i85jc)^Yt*I0W8;+zHUI3V7@o;3DUYasdq>DFK%im4J)F?;|B-<=}8R z>HESGa5)KyCnGII|E+YX&h4Y+xCRvyX@oGhhG4 j58+{W$RJv~NLLKlV4)8v^7hU(R-4l(}$teLl` diff --git a/examples/vue-datastore/public/img/icons/favicon-16x16.png b/examples/vue-datastore/public/img/icons/favicon-16x16.png deleted file mode 100644 index 42af00963d81b8e39a30435c60ac482d1f8756e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 799 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>WRE8{w#)hawXn|-Xp4{E;v!=;4B^%-x&;Cm1 zP>^*#n_J!T^1SBMI!C4h-R53dN8`?ylD}d{L%(vZvUKT)~-CgWFQy3lt zIqW5#zOL*K8HL%o&D;R|TePl5?VWhq^wrj^qed%lKKkpp-FogeyEi+p zE?K8rW7E1fuEJ{5jaaAp0~aIt+keS?T)@vXM=*X}V#VGMCm1~v-+0wr{w3CJ-R8wG zS@XVpzqP-5Mf0H?y-zh=XVL>S6E;rKnDmrMQlmoKbK9p$evXN`oe{6g>lvi)-+#c) zb+Al&$zRqtWk1@VTt6MPmq9d7^!kmXZn8k{sFt`!l%ynwlArU1(iRB6fMfqu& zIjIUIl?AB^nFS@u3=9=>9)IHDC=AokIOTu(jOWuJ24-b$y<~1-Wnu5hBFw@HE)6D! wQ<#-EhbWxBaplC3Ge=~Ou%B-5Sm33{@Jd{;RG<|Mp00i_>zopr0DGh}-~a#s diff --git a/examples/vue-datastore/public/img/icons/favicon-32x32.png b/examples/vue-datastore/public/img/icons/favicon-32x32.png deleted file mode 100644 index 46ca04dee251a4fa85a2891a145fbe20cc619d96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1271 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 - - diff --git a/examples/vue-datastore/public/index.html b/examples/vue-datastore/public/index.html deleted file mode 100644 index 3e5a13962..000000000 --- a/examples/vue-datastore/public/index.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - <%= htmlWebpackPlugin.options.title %> - - - -

- - - diff --git a/examples/vue-datastore/public/robots.txt b/examples/vue-datastore/public/robots.txt deleted file mode 100644 index eb0536286..000000000 --- a/examples/vue-datastore/public/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: diff --git a/examples/vue-datastore/reactPackage.json b/examples/vue-datastore/reactPackage.json deleted file mode 100644 index 52af8d604..000000000 --- a/examples/vue-datastore/reactPackage.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "name": "react-offix", - "version": "0.1.0", - "private": true, - "dependencies": { - "@ant-design/icons": "~4.2.1", - "@apollo/react-hooks": "^3.1.5", - "@capacitor-community/sqlite": "^2.4.0", - "@capacitor/android": "2.4.0", - "@testing-library/jest-dom": "^4.2.4", - "@testing-library/react": "^9.3.2", - "@testing-library/user-event": "^7.1.2", - "@types/jest": "^24.0.0", - "@types/node": "^12.0.0", - "@types/react": "^16.9.0", - "@types/react-dom": "^16.9.0", - "antd": "~4.4.1", - "graphql.macro": "^1.4.2", - "offix-datastore": "0.4.0", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "react-scripts": "3.4.1", - "typescript": "4.1.5", - "uniforms": "3.0.0-alpha.5", - "uniforms-antd": "3.0.0-alpha.5", - "uniforms-bridge-graphql": "3.0.0-alpha.5", - "uuidv4": "^6.1.1", - "@capacitor/core": "^2.4.0" - }, - "scripts": { - "start": "SKIP_PREFLIGHT_CHECK=true react-scripts start", - "startServer": "gqlserve serve --datasync --conflict=clientSideWins --port=5400 ./src/model/runtime.graphql", - "build": "react-scripts build", - "test": "react-scripts test", - "eject": "react-scripts eject", - "generate": "offix generate --schema ./src/model/runtime.graphql --outputPath ./src/datastore/generated", - "linkdatastore": "cd ../../packages/datastore/datastore && yarn link && cd - && yarn link offix-datastore && rm -Rf ./node_modules/react && && rm -Rf ./node_modules/react-dom", - "linkdatastorecli": "cd ../../packages/datastore/cli && yarn link && cd - && yarn link @offix/cli" - }, - "eslintConfig": { - "extends": "react-app" - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - }, - "devDependencies": { - "@capacitor/cli": "^2.4.0", - "graphql-serve": "1.1.1" - } -} diff --git a/examples/vue-datastore/src/App.tsx b/examples/vue-datastore/src/App.tsx deleted file mode 100644 index 8976f5cd1..000000000 --- a/examples/vue-datastore/src/App.tsx +++ /dev/null @@ -1,97 +0,0 @@ -import { Button } from "ant-design-vue"; -import { NetworkStatusEvent } from "offix-datastore/types/replication/network/NetworkStatus"; -import { defineComponent, h, onMounted, ref, watch } from "vue"; -import { AddTodo, Error, Header, Loading, TodoList } from "./components"; -import { datastore } from "./datastore/config"; -import { useFindTodos } from "./datastore/hooks"; - -function App() { - return defineComponent({ - components: { - Button - }, - setup() { - const replicating = ref(true); - const addView = ref(false); - - const { loading, error, data, subscribeToUpdates } = useFindTodos(); - - onMounted(() => { - datastore.getNetworkIndicator()?.subscribe({ - next: (event: NetworkStatusEvent) => { - if (event.isOnline) { - datastore.startReplication(); - replicating.value = true; - } else { - datastore.stopReplication(); - replicating.value = false; - } - } - }); - }); - - watch( - data, - () => { - const subscription = subscribeToUpdates(); - return () => subscription.unsubscribe(); - }, - { deep: true, immediate: true } - ); - // FIXME: - if (loading) return () => ; - // FIXME: - if (error) return ; - - return () => - h( -
-
-
(addView.value = false)} - extra={ - addView.value ? null : ( - <> - - - - ) - } - > - {!addView && ( - <> - - - )} - {addView && ( - <> - (addView.value = true)} /> - - )} -
-
-
- ); - } - }); -} - -const containerStyle = { - display: "flex", - alignItems: "start", - justifyContent: "center", - minHeight: "100vh", - width: "100vw", - padding: "2em 0" -}; - -export default App; diff --git a/examples/vue-datastore/src/App.vue b/examples/vue-datastore/src/App.vue index 6da59b1d2..ebe829b5f 100644 --- a/examples/vue-datastore/src/App.vue +++ b/examples/vue-datastore/src/App.vue @@ -1,27 +1,89 @@ - - - diff --git a/examples/vue-datastore/src/components/Todo/Todo.tsx b/examples/vue-datastore/src/components/Todo/Todo.tsx deleted file mode 100644 index 78a4234af..000000000 --- a/examples/vue-datastore/src/components/Todo/Todo.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import React, { useState, FormEvent } from 'react'; -import { Row, Col, Button } from 'antd'; -import { EditOutlined, DeleteOutlined } from '@ant-design/icons'; - -import { EditTodo, ToggleTodo } from '../forms'; -import { TodoProps } from '../../types'; -import { useDeleteTodo } from '../../datastore/hooks'; - -export const Todo = ({ todo }: TodoProps) => { - const [edit, setEdit] = useState(false); - const { remove: deleteTodo } = useDeleteTodo(); - - const handleDelete = (e: FormEvent) => { - e.preventDefault(); - deleteTodo(todo) - .then((res: any) => console.log(res)) - .catch((error: any) => console.log(error)); - }; - - if (edit) { - return ( - setEdit(!edit)} - /> - ); - } - - return ( - - - -

- Description:
- {todo.description} -

- - - - - - - ); -}; diff --git a/examples/vue-datastore/src/components/Todo/TodoItem.tsx b/examples/vue-datastore/src/components/Todo/TodoItem.tsx new file mode 100644 index 000000000..2b98f357e --- /dev/null +++ b/examples/vue-datastore/src/components/Todo/TodoItem.tsx @@ -0,0 +1,57 @@ +import { DeleteOutlined, EditOutlined } from "@ant-design/icons-vue"; +import { defineComponent, h, ref } from "@vue/runtime-core"; +import { PropType } from "vue"; +import { useDeleteTodo } from "../../datastore/hooks"; +import EditTodo from "../forms/EditTodo.vue"; +import ToggleTodo from "../forms/ToggleTodo.vue"; +import { Todo } from "/@/datastore/generated"; +export const TodoItem = defineComponent({ + props: { + todo: { + type: Object as PropType, + required: true, + }, + }, + components: { + ToggleTodo, + EditTodo, + }, + setup(props) { + const { remove: deleteTodo } = useDeleteTodo(); + const edit = ref(false); + const handleDelete = () => { + deleteTodo(props.todo) + .then((res) => console.log("response", res)) + .catch((error: any) => console.log(error)); + }; + + return () => + h( + edit.value ? ( + (edit.value = !edit.value)} + /> + ) : ( + + + +

+ Description: +
+ {props.todo.description} +

+ + + (edit.value = true)}> + + + + + + + + ) + ); + }, +}); diff --git a/examples/vue-datastore/src/components/Todo/TodoList.tsx b/examples/vue-datastore/src/components/Todo/TodoList.tsx index 85605cce4..c1e3545b8 100644 --- a/examples/vue-datastore/src/components/Todo/TodoList.tsx +++ b/examples/vue-datastore/src/components/Todo/TodoList.tsx @@ -1,27 +1,32 @@ -import React from 'react'; -import { Card } from 'antd'; +import { computed, defineComponent, h, PropType } from "vue"; +import { Todo } from "../../datastore/generated"; +import { Empty } from "../UI"; +import { TodoItem } from "./TodoItem"; -import { Empty } from '../UI'; -import { Todo } from './Todo'; -import { TodoListProps } from '../../types'; - -export const TodoList = ({ todos }: TodoListProps) => { - - if (!todos || todos.length === 0) return ; - - return ( - // map through todos and render - // each todo item - <> - { - todos && todos.map((todo) => ( - - - - )) - } - - ); -}; +export const TodoList = defineComponent({ + props: { + todos: { + type: Array as PropType, + required: true, + default: () => [], + }, + }, + components: { + TodoItem, + Empty, + }, + setup(props) { + const noTodos = computed(() => !props.todos || props.todos.length === 0); + return () => + h("div", {}, [ + noTodos.value ? h() : null, + ...props.todos.map((todo) => + h( + + + + ) + ), + ]); + }, +}); diff --git a/examples/vue-datastore/src/components/Todo/index.ts b/examples/vue-datastore/src/components/Todo/index.ts index 3a6dc8a33..4022695b4 100644 --- a/examples/vue-datastore/src/components/Todo/index.ts +++ b/examples/vue-datastore/src/components/Todo/index.ts @@ -1,2 +1,2 @@ -export { Todo } from './Todo'; -export { TodoList } from './TodoList'; \ No newline at end of file +export * from "./TodoItem"; +export * from "./TodoList"; diff --git a/examples/vue-datastore/src/components/UI/Empty.tsx b/examples/vue-datastore/src/components/UI/Empty.tsx index 65367c908..d2570c171 100644 --- a/examples/vue-datastore/src/components/UI/Empty.tsx +++ b/examples/vue-datastore/src/components/UI/Empty.tsx @@ -1,11 +1,17 @@ -import React from 'react'; +//@ts-nocheck //FIXME: remove ignore +import { defineComponent, h } from "@vue/runtime-core"; -export const Empty = () => { - return ( -
-
-

You have no todo items

-

Click the button to create a new task

-
- ); -}; +export const Empty = defineComponent({ + setup() { + return () => + h( +
+
+ +
+

You have no todo items

+

Click the button to create a new task

+
+ ); + } +}); diff --git a/examples/vue-datastore/src/components/UI/Error.tsx b/examples/vue-datastore/src/components/UI/Error.tsx index 509691d71..647f70f75 100644 --- a/examples/vue-datastore/src/components/UI/Error.tsx +++ b/examples/vue-datastore/src/components/UI/Error.tsx @@ -1,12 +1,22 @@ -import React from 'react'; -import { Result } from 'antd'; +import { defineComponent, h } from "vue"; -export function Error({ message }: { message: string }) { - return ( - - ); -} \ No newline at end of file +export const Error = defineComponent({ + name: "Error", + props: { + message: { + type: String, + required: false, + default: "", + }, + }, + setup(props) { + return () => + h( + + ); + }, +}); diff --git a/examples/vue-datastore/src/components/UI/Header.tsx b/examples/vue-datastore/src/components/UI/Header.tsx deleted file mode 100644 index 2ce010df0..000000000 --- a/examples/vue-datastore/src/components/UI/Header.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import React from 'react'; -import { PageHeader } from 'antd'; - -export function Header({ title, onBack, extra, children } : any, props : any) { - return ( - - { children } - - ); -} diff --git a/examples/vue-datastore/src/components/UI/Loading.tsx b/examples/vue-datastore/src/components/UI/Loading.tsx deleted file mode 100644 index f6a3f7763..000000000 --- a/examples/vue-datastore/src/components/UI/Loading.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react'; -import { Result, Spin } from 'antd'; - -export function Loading() { - return ( - } - title="Loading..." - /> - ); -} \ No newline at end of file diff --git a/examples/vue-datastore/src/components/UI/Loading.vue b/examples/vue-datastore/src/components/UI/Loading.vue new file mode 100644 index 000000000..328b5fb6b --- /dev/null +++ b/examples/vue-datastore/src/components/UI/Loading.vue @@ -0,0 +1,13 @@ + + diff --git a/examples/vue-datastore/src/components/UI/index.ts b/examples/vue-datastore/src/components/UI/index.ts index 4d2d3c1af..b7f93e1a7 100644 --- a/examples/vue-datastore/src/components/UI/index.ts +++ b/examples/vue-datastore/src/components/UI/index.ts @@ -1,4 +1,2 @@ -export { Empty } from './Empty'; -export { Error } from './Error'; -export { Header } from './Header'; -export { Loading } from './Loading'; \ No newline at end of file +export { Empty } from "./Empty"; +export { Error } from "./Error"; diff --git a/examples/vue-datastore/src/components/forms/AddTodo.tsx b/examples/vue-datastore/src/components/forms/AddTodo.tsx deleted file mode 100644 index 941d2879c..000000000 --- a/examples/vue-datastore/src/components/forms/AddTodo.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import React from 'react'; -import { Button } from 'antd'; -import { - AutoForm, - TextField, - LongTextField, - SubmitField -} from 'uniforms-antd'; - -import { AddTodoProps } from '../../types'; -import { schema } from './formSchema'; -import { useAddTodo } from '../../datastore/hooks'; -import { Todo } from '../../datastore/generated'; - -export const AddTodo = ({ cancel }: AddTodoProps) => { - - const { save: addTodo } = useAddTodo(); - - const handleSubmit = ({ title, description }: Todo) => { - addTodo({ - title, - description, - completed: false, - }) - .then(() => cancel()) - .catch((error: any) => console.log(error)); - }; - - return ( - - - - - - - ); -}; diff --git a/examples/vue-datastore/src/components/forms/AddTodo.vue b/examples/vue-datastore/src/components/forms/AddTodo.vue new file mode 100644 index 000000000..582b12783 --- /dev/null +++ b/examples/vue-datastore/src/components/forms/AddTodo.vue @@ -0,0 +1,41 @@ + + diff --git a/examples/vue-datastore/src/components/forms/EditTodo.tsx b/examples/vue-datastore/src/components/forms/EditTodo.tsx deleted file mode 100644 index 67e654513..000000000 --- a/examples/vue-datastore/src/components/forms/EditTodo.tsx +++ /dev/null @@ -1,40 +0,0 @@ -import React from 'react'; -import { Button } from 'antd'; -import { AutoForm, TextField, LongTextField, SubmitField } from 'uniforms-antd'; - -import { schema } from './formSchema'; -import { EditTodoProps } from '../../types'; -import { useEditTodo } from '../../datastore/hooks'; -import { Todo } from '../../datastore/generated'; - -export const EditTodo = ({ todo, toggleEdit }: EditTodoProps) => { - - const { update: editTodo } = useEditTodo(); - - const handleUpdate = (todo: Todo) => { - editTodo({ - ...todo, - title: todo.title, - description: todo.description, - _version: todo._version ?? 1, - }) - .then(() => toggleEdit()) - .catch((error: any) => { - console.log(error); - }); - }; - - return ( - - - - - - - ); -}; diff --git a/examples/vue-datastore/src/components/forms/EditTodo.vue b/examples/vue-datastore/src/components/forms/EditTodo.vue new file mode 100644 index 000000000..7aa687530 --- /dev/null +++ b/examples/vue-datastore/src/components/forms/EditTodo.vue @@ -0,0 +1,47 @@ + + diff --git a/examples/vue-datastore/src/components/forms/ToggleTodo.tsx b/examples/vue-datastore/src/components/forms/ToggleTodo.tsx deleted file mode 100644 index 30f7d7dc2..000000000 --- a/examples/vue-datastore/src/components/forms/ToggleTodo.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import React from 'react'; -import { QuickForm, BoolField } from 'uniforms-antd'; - -import { ToggleTodoProps } from "../../types"; -import { schema } from './formSchema'; -import { useEditTodo } from '../../datastore/hooks'; - -export function ToggleTodo({ todo }: ToggleTodoProps) { - - const { update: editTodo } = useEditTodo(); - - const handleUpdate = () => { - editTodo({ - ...todo, - _version: todo._version ?? 1, - completed: !todo.completed, - }) - .then((res: any) => console.log("response", res)) - .catch((error: any) => console.log("error", error)); - }; - - return ( - - - - ); -} diff --git a/examples/vue-datastore/src/components/forms/ToggleTodo.vue b/examples/vue-datastore/src/components/forms/ToggleTodo.vue new file mode 100644 index 000000000..644c15db0 --- /dev/null +++ b/examples/vue-datastore/src/components/forms/ToggleTodo.vue @@ -0,0 +1,40 @@ + + diff --git a/examples/vue-datastore/src/components/forms/formSchema.ts b/examples/vue-datastore/src/components/forms/formSchema.ts index ce68f5c62..eb0e40fc2 100644 --- a/examples/vue-datastore/src/components/forms/formSchema.ts +++ b/examples/vue-datastore/src/components/forms/formSchema.ts @@ -1,33 +1,33 @@ -import { GraphQLBridge } from 'uniforms-bridge-graphql'; -import { buildASTSchema } from 'graphql'; -import { loader } from 'graphql.macro'; -import { Todo } from '../../datastore/generated'; +// import { GraphQLBridge } from 'uniforms-bridge-graphql'; +// import { buildASTSchema } from 'graphql'; +// import { loader } from 'graphql.macro'; +// import { Todo } from '../../datastore/generated'; -// import the grapqhl model -const model = loader('../../model/runtime.graphql'); +// // import the grapqhl model +// const model = loader('../../model/runtime.graphql'); -const validator = (model: Todo) => { - const details = []; +// const validator = (model: Todo) => { +// const details = []; - if (!model.title) { - details.push({ name: 'title' }); - } +// if (!model.title) { +// details.push({ name: 'title' }); +// } - if (details.length) { - // eslint-disable-next-line - throw { details }; - } -}; +// if (details.length) { +// // eslint-disable-next-line +// throw { details }; +// } +// }; -const data = { - title: { - required: true, - errorMessage: 'Title is required', - } -} +// const data = { +// title: { +// required: true, +// errorMessage: 'Title is required', +// } +// } -export const schema = new GraphQLBridge( - buildASTSchema((model)).getType('Todo'), - validator, - data, -); +// export const schema = new GraphQLBridge( +// buildASTSchema((model)).getType('Todo'), +// validator, +// data, +// ); diff --git a/examples/vue-datastore/src/components/forms/index.ts b/examples/vue-datastore/src/components/forms/index.ts deleted file mode 100644 index 016c57292..000000000 --- a/examples/vue-datastore/src/components/forms/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export { AddTodo } from './AddTodo'; -export { EditTodo } from './EditTodo'; -export { ToggleTodo } from './ToggleTodo'; \ No newline at end of file diff --git a/examples/vue-datastore/src/components/index.ts b/examples/vue-datastore/src/components/index.ts index c902aa263..566d0f985 100644 --- a/examples/vue-datastore/src/components/index.ts +++ b/examples/vue-datastore/src/components/index.ts @@ -1,3 +1,2 @@ -export { Todo, TodoList } from './Todo'; -export { AddTodo, EditTodo, ToggleTodo } from './forms'; -export { Empty, Error, Loading, Header } from './UI'; \ No newline at end of file +export * from "./Todo"; +export * from "./UI"; diff --git a/examples/vue-datastore/src/datastore/config.ts b/examples/vue-datastore/src/datastore/config.ts index e92617528..a6118cfaa 100644 --- a/examples/vue-datastore/src/datastore/config.ts +++ b/examples/vue-datastore/src/datastore/config.ts @@ -1,12 +1,12 @@ -import { DataStore } from 'offix-datastore'; -import { schema, User, Todo } from './generated'; +import { DataStore } from "offix-datastore"; +import { schema, User, Todo } from "./generated"; export const datastore = new DataStore({ dbName: "offix-datasync", replicationConfig: { client: { url: "http://localhost:5400/graphql", - wsUrl: "ws://localhost:5400/graphql", + wsUrl: "ws://localhost:5400/graphql" }, delta: { enabled: true, pullInterval: 20000 }, mutations: { enabled: true }, @@ -22,7 +22,7 @@ datastore.init(); // After init we can start replication immediately with: // datastore.startReplication() // Or we can start replication at a later stage. -// +// // we can also execute operations freely using hooks in components and plain js. // const user = { name: "User" + new Date().getTime() }; // UserModel.save(user).then(async (result) => { diff --git a/examples/vue-datastore/src/datastore/generated/index.ts b/examples/vue-datastore/src/datastore/generated/index.ts index 7d28cc6ed..b96956dff 100644 --- a/examples/vue-datastore/src/datastore/generated/index.ts +++ b/examples/vue-datastore/src/datastore/generated/index.ts @@ -2,5 +2,4 @@ import { GeneratedModelSchema } from "offix-datastore"; import jsonSchema from "./schema.json"; export const schema = jsonSchema as GeneratedModelSchema; - export * from "./types"; diff --git a/examples/vue-datastore/src/datastore/generated/schema.json b/examples/vue-datastore/src/datastore/generated/schema.json index 5ee203f14..9a435673b 100644 --- a/examples/vue-datastore/src/datastore/generated/schema.json +++ b/examples/vue-datastore/src/datastore/generated/schema.json @@ -27,6 +27,11 @@ "type": "string", "key": "_version", "isRequired": true + }, + "_lastUpdatedAt": { + "type": "number", + "key": "_lastUpdatedAt", + "isRequired": true } } }, @@ -51,7 +56,12 @@ "type": "string", "key": "_version", "isRequired": true + }, + "_lastUpdatedAt": { + "type": "number", + "key": "_lastUpdatedAt", + "isRequired": true } } } -} +} \ No newline at end of file diff --git a/examples/vue-datastore/src/datastore/generated/types.ts b/examples/vue-datastore/src/datastore/generated/types.ts index 0fe37641c..57f0d9753 100644 --- a/examples/vue-datastore/src/datastore/generated/types.ts +++ b/examples/vue-datastore/src/datastore/generated/types.ts @@ -1,19 +1,20 @@ export interface Todo { - _id: string; - title?: string; - description?: string; - completed?: boolean - _version: number; + _id: string; + title?: string; + description?: string; + completed?: boolean; + _version: string; + _lastUpdatedAt: number; } export type TodoCreate = Omit; -export type TodoChange = Pick & Partial; - +export type TodoChange = Pick & Partial; export interface User { - _id: string; - name: string - _version: number; + _id: string; + name: string; + _version: string; + _lastUpdatedAt: number; } export type UserCreate = Omit; -export type UserChange = Pick & Partial; +export type UserChange = Pick & Partial; diff --git a/examples/vue-datastore/src/datastore/hooks.ts b/examples/vue-datastore/src/datastore/hooks.ts index f1053ff7f..327afb3d6 100644 --- a/examples/vue-datastore/src/datastore/hooks.ts +++ b/examples/vue-datastore/src/datastore/hooks.ts @@ -1,11 +1,23 @@ -import { Filter, useQuery, useSave, useUpdate, useRemove } from 'offix-datastore'; -import { TodoModel } from './config'; -import { Todo } from './generated'; +import { Filter } from "offix-datastore"; +import { Model } from "../../../../packages/datastore/datastore/src/Model"; +import { + useQuery, + useRemove, + useSave, + useUpdate +} from "../../../../packages/datastore/datastore/src/vue"; +import { TodoModel } from "./config"; +import { Todo, TodoChange, TodoCreate } from "./generated"; +// FIXME: how to handle wrong model type from package and from monorepo? +const castModel = (model: unknown) => { + return model as Model; +}; +const castedTodoModel = castModel(TodoModel); +export const useFindTodos = (filter?: Filter) => + useQuery({ model: castedTodoModel, filter: filter }); -export const useFindTodos = (filter?: Filter) => useQuery(TodoModel, filter); +export const useAddTodo = () => useSave(castedTodoModel); -export const useAddTodo = () => useSave(TodoModel); +export const useEditTodo = () => useUpdate(castedTodoModel); -export const useEditTodo = () => useUpdate(TodoModel); - -export const useDeleteTodo = () => useRemove(TodoModel); +export const useDeleteTodo = () => useRemove(castedTodoModel); diff --git a/examples/vue-datastore/src/main.ts b/examples/vue-datastore/src/main.ts index 620d8f88d..fade0d8fe 100644 --- a/examples/vue-datastore/src/main.ts +++ b/examples/vue-datastore/src/main.ts @@ -1,5 +1,9 @@ +// import "@/styles/index.scss"; +import Antd from "ant-design-vue"; +import "ant-design-vue/dist/antd.css"; import { createApp } from "vue"; -import App from "./App"; -import "./registerServiceWorker"; +import App from "./App.vue"; -createApp(App).mount("#app"); +const app = createApp(App); +app.use(Antd); +app.mount("#app"); diff --git a/examples/vue-datastore/src/registerServiceWorker.ts b/examples/vue-datastore/src/registerServiceWorker.ts deleted file mode 100644 index 30b7895d2..000000000 --- a/examples/vue-datastore/src/registerServiceWorker.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* eslint-disable no-console */ - -import { register } from "register-service-worker"; - -if (process.env.NODE_ENV === "production") { - register(`${process.env.BASE_URL}service-worker.js`, { - ready() { - console.log( - "App is being served from cache by a service worker.\n" + - "For more details, visit https://goo.gl/AFskqB" - ); - }, - registered() { - console.log("Service worker has been registered."); - }, - cached() { - console.log("Content has been cached for offline use."); - }, - updatefound() { - console.log("New content is downloading."); - }, - updated() { - console.log("New content is available; please refresh."); - }, - offline() { - console.log( - "No internet connection found. App is running in offline mode." - ); - }, - error(error) { - console.error("Error during service worker registration:", error); - } - }); -} diff --git a/examples/vue-datastore/src/shims-vue.d.ts b/examples/vue-datastore/src/shims-vue.d.ts index 3804a43e2..ac1ded792 100644 --- a/examples/vue-datastore/src/shims-vue.d.ts +++ b/examples/vue-datastore/src/shims-vue.d.ts @@ -1,6 +1,5 @@ -/* eslint-disable */ declare module '*.vue' { - import type { DefineComponent } from 'vue' + import { DefineComponent } from 'vue' const component: DefineComponent<{}, {}, any> export default component } diff --git a/examples/vue-datastore/src/types.ts b/examples/vue-datastore/src/types.ts new file mode 100644 index 000000000..979af5c6a --- /dev/null +++ b/examples/vue-datastore/src/types.ts @@ -0,0 +1,39 @@ +import { Todo } from "./datastore/generated"; + +export type TodoProps = { + todo: Todo; +}; + +export type TodoListProps = { + todos: Array; +}; + +export type AddTodoProps = { + cancel: () => void; +}; + +export type EditTodoProps = { + todo: Todo; + toggleEdit: () => void; +}; + +export type ToggleTodoProps = { + todo: Todo; +}; + +export type HookState = { + data: any | null; + loading: boolean; + error: Error | null; +}; + +export enum ActionType { + REQ_START = 0, + REQ_SUCCESS = 1, + REQ_FAILED = 2 +} + +export type ReducerAction = { + type: ActionType; + payload?: any; +}; diff --git a/examples/vue-datastore/tsconfig.json b/examples/vue-datastore/tsconfig.json index e621cbc36..2ac9574ad 100644 --- a/examples/vue-datastore/tsconfig.json +++ b/examples/vue-datastore/tsconfig.json @@ -2,38 +2,22 @@ "compilerOptions": { "target": "esnext", "module": "esnext", + "moduleResolution": "node", "strict": true, "jsx": "preserve", - "importHelpers": true, - "moduleResolution": "node", - "skipLibCheck": true, + "sourceMap": true, + "resolveJsonModule": true, "esModuleInterop": true, + "lib": ["esnext", "dom"], + "types": ["vite/client"], + "importHelpers": true, + "experimentalDecorators": true, "allowSyntheticDefaultImports": true, - "sourceMap": true, "baseUrl": ".", - "types": [ - "webpack-env" - ], "paths": { - "@/*": [ - "src/*" - ] - }, - "lib": [ - "esnext", - "dom", - "dom.iterable", - "scripthost" - ] + "/@/*": ["src/*"] + } }, - "include": [ - "src/**/*.ts", - "src/**/*.tsx", - "src/**/*.vue", - "tests/**/*.ts", - "tests/**/*.tsx" - ], - "exclude": [ - "node_modules" - ] + "exclude": ["node_modules", "dist"], + "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"] } diff --git a/examples/vue-datastore/vite.config.ts b/examples/vue-datastore/vite.config.ts new file mode 100644 index 000000000..785fa8039 --- /dev/null +++ b/examples/vue-datastore/vite.config.ts @@ -0,0 +1,22 @@ +import vue from "@vitejs/plugin-vue"; +import vueJsx from "@vitejs/plugin-vue-jsx"; +import { resolve } from "path"; +import { defineConfig } from "vite"; + +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [ + vue(), + vueJsx({ + // options are passed on to @vue/babel-plugin-jsx + }), + ], + resolve: { + alias: { + "@/": resolve(__dirname, "src"), + }, + }, + optimizeDeps: { + include: ["@ant-design/icons-vue"], + }, +}); diff --git a/examples/vue-datastore/vue.config.js b/examples/vue-datastore/vue.config.js deleted file mode 100644 index 1ff7edc0d..000000000 --- a/examples/vue-datastore/vue.config.js +++ /dev/null @@ -1,11 +0,0 @@ -module.exports = { - css: { - loaderOptions: { - less: { - lessOptions: { - javascriptEnabled: true - } - } - } - } -}; diff --git a/packages/datastore/datastore/src/vue/StateUtils.ts b/packages/datastore/datastore/src/vue/StateUtils.ts index 651e1f043..9ed18b947 100644 --- a/packages/datastore/datastore/src/vue/StateUtils.ts +++ b/packages/datastore/datastore/src/vue/StateUtils.ts @@ -1,5 +1,5 @@ import { Maybe } from "graphql/jsutils/Maybe"; -import { reactive } from "vue"; +import { Ref, ref } from "vue"; import { ActionType } from "../utils/ActionsTypes"; export interface Action { @@ -17,18 +17,17 @@ export interface ReactiveState { data: Maybe[]; error: Maybe; } -export const initialState = (): ReactiveState => - reactive>({ +export const initialState = (): Ref> => + ref>({ loading: false, data: [], error: null, - }) as ReactiveState; - + }) as Ref>; export const changeState = ({ action, state, }: { - state: ReactiveState; + state: Ref>; action: Action; }) => { const data = (() => { @@ -38,18 +37,18 @@ export const changeState = ({ })(); switch (action.type) { case ActionType.INITIATE_REQUEST: - state.loading = true; - state.error = null; + state.value.loading = true; + state.value.error = null; break; case ActionType.REQUEST_COMPLETE: - state.loading = false; - state.data = data; - state.error = action.error; + state.value.loading = false; + state.value.data = data; + state.value.error = action.error; break; case ActionType.UPDATE_RESULT: // Don't update result when request is loading - if (!state.loading) { - state.data = data; + if (!state.value.loading) { + state.value.data = data; } break; } diff --git a/packages/datastore/datastore/src/vue/hooks/delete.ts b/packages/datastore/datastore/src/vue/hooks/delete.ts index 5eae3459a..c6d204f62 100644 --- a/packages/datastore/datastore/src/vue/hooks/delete.ts +++ b/packages/datastore/datastore/src/vue/hooks/delete.ts @@ -1,4 +1,3 @@ -import { readonly } from "@vue/reactivity"; import { Filter } from "../../filters"; import { Model } from "../../Model"; import { ActionType } from "../../utils/ActionsTypes"; @@ -8,14 +7,14 @@ export const useRemove = (model: Model) => { const state = initialState(); const remove = async (filter: Filter) => { - if (state.loading) return; + if (state.value.loading) return; changeState({ state, action: { type: ActionType.INITIATE_REQUEST }, }); try { - const results = await model.remove(filter); + const results = (await model.remove(filter)) as TModel[]; changeState({ state, action: { type: ActionType.REQUEST_COMPLETE, data: results }, @@ -29,5 +28,5 @@ export const useRemove = (model: Model) => { } }; - return { state: readonly(state), remove }; + return { state: state, remove }; }; diff --git a/packages/datastore/datastore/src/vue/hooks/query.ts b/packages/datastore/datastore/src/vue/hooks/query.ts index db7b989a8..7073879b8 100644 --- a/packages/datastore/datastore/src/vue/hooks/query.ts +++ b/packages/datastore/datastore/src/vue/hooks/query.ts @@ -1,6 +1,5 @@ -import { readonly } from "@vue/reactivity"; import { Maybe } from "graphql/jsutils/Maybe"; -import { Ref, watch } from "vue"; +import { ref, Ref, watch } from "vue"; import { Filter } from "../../filters"; import { Model } from "../../Model"; import { CRUDEvents, StoreChangeEvent } from "../../storage"; @@ -11,42 +10,61 @@ import { initialState, ReactiveState, } from "../StateUtils"; +interface UpdateArr { + oldArr: T[]; + newArr: T[]; + primaryKeyName: string; +} -const onAdded = (state: ReactiveState, newData: TModel[]) => { - const changedData = [...state.data, ...newData]; - return changedData; +const updateArr = ({ oldArr, newArr, primaryKeyName }: UpdateArr) => { + const finalArr = [...oldArr]; + const map = new Map( + oldArr.map((el, i) => [(el as Record)[primaryKeyName], i]) + ); + for (const newItem of newArr) { + const newItemKey = (newItem as Record)[primaryKeyName]; + const i = map.get(newItemKey); + if (i != null && i >= 0) { + finalArr.splice(i, 1, newItem); + } else { + finalArr.push(newItem); + } + } + return finalArr; }; -const onChanged = ( - state: ReactiveState, - newData: TModel[], +const onAdded = ( + state: Ref>, + newData: TItem[], primaryKeyName: string -) => { - if (state.data.length == 0) return state.data; +) => + updateArr({ + newArr: newData, + oldArr: state.value.data, + primaryKeyName, + }); - // What happens to data that get's updated and falls outside original query filter? - const changedData = state.data.map((d) => { - const dPrimaryKey = (d as Record)[primaryKeyName]; - const index = newData.findIndex( - (newD) => - (newD as Record)[primaryKeyName] === dPrimaryKey - ); - if (index === -1) { - return d; - } - return newData[index]; +const onChanged = ( + state: Ref>, + newData: TItem[], + primaryKeyName: string +) => { + if (state.value.data.length === 0) return state.value.data; + return updateArr({ + newArr: newData, + oldArr: state.value.data, + primaryKeyName, }); - return changedData; }; -const onIdSwapped = ( - state: ReactiveState, - newData: IdSwap[], +const onIdSwapped = ( + state: Ref>, + newData: IdSwap[], primaryKeyName: string ) => { - if (state.data.length == 0) return state.data; + if (state.value.data.length === 0) return state.value.data; - const changedData = state.data.map((d) => { + const changedData = state.value.data.map((d) => { const dPrimaryKey = (d as Record)[primaryKeyName]; const index = newData.findIndex( (newD) => @@ -61,13 +79,13 @@ const onIdSwapped = ( return changedData; }; -const onRemoved = ( - state: ReactiveState, - removedData: TModel[], +const onRemoved = ( + state: Ref>, + removedData: TItem[], primaryKeyName: string ) => { - if (state.data.length == 0) return state.data; - const changedData = state.data.filter((d) => { + if (state.value.data.length === 0) return state.value.data; + const changedData = state.value.data.filter((d) => { const dPrimaryKey = (d as Record)[primaryKeyName]; return removedData.findIndex( (newD) => @@ -77,15 +95,15 @@ const onRemoved = ( return changedData; }; -export const updateResult = ( - state: ReactiveState, +export const updateResult = ( + state: Ref>, event: StoreChangeEvent, primaryKeyName: string ) => { const data = event.data; switch (event.eventType) { case CRUDEvents.ADD: - return onAdded(state, data); + return onAdded(state, data, primaryKeyName); case CRUDEvents.UPDATE: return onChanged(state, data, primaryKeyName); case CRUDEvents.ID_SWAP: @@ -97,17 +115,17 @@ export const updateResult = ( } }; -const createSubscribeToUpdates = ( - state: ReactiveState, - model: Model +const createSubscribeToUpdates = ( + state: Ref>, + model: Model ) => { return ( eventsToWatch?: CRUDEvents[], customEventHandler?: ( - state: ReactiveState, + state: Ref>, // FIXME: investigate type - data: Maybe[]> - ) => Maybe[]> + data: Maybe[]> + ) => Maybe[]> ) => { const subscription = model.subscribe((event) => { let newData; @@ -130,26 +148,24 @@ const createSubscribeToUpdates = ( }; }; -interface QueryResults extends UseQuery { - state: ReactiveState; +interface QueryResults extends UseQuery { + state: Ref>; } -const queryResults = async ({ +const queryResults = async ({ state, - selector, + filter, model, -}: QueryResults) => { - if (state.loading) { - return; - } +}: QueryResults) => { + if (state.value.loading) return; changeState({ state, action: { type: ActionType.INITIATE_REQUEST } }); try { let results; - const selectorValue = selector.value; - if (typeof selectorValue === "string") { - results = await model.value.queryById(selectorValue); + const filterValue = filter; + if (typeof filterValue === "string") { + results = await model.queryById(filterValue); } else { - results = await model.value.query(selectorValue); + results = await model.query(filterValue); } changeState({ state, @@ -163,56 +179,64 @@ const queryResults = async ({ } }; -interface UseQuery { - model: Ref>; - selector: Ref | string | undefined>; +interface UseQuery { + model: Model; + filter: Filter | string | undefined; } -const subscribeQueryToUpdates = ({ +const subscribeQueryToUpdates = ({ state, model, }: { - state: ReactiveState; - model: Ref>; -}) => () => { + state: Ref>; + model: Ref>; +}) => { + let subscriptionFn = createSubscribeToUpdates(state, model.value); watch( model, () => { - createSubscribeToUpdates(state, model.value); + subscriptionFn = createSubscribeToUpdates(state, model.value); }, { deep: true, immediate: true } ); + return subscriptionFn; }; -export const useQuery = ({ model, selector }: UseQuery) => { - const state = initialState(); - const subscribeToUpdates = subscribeQueryToUpdates({ model, state }); - const runQuery = () => - queryResults({ - model, +export const useQuery = (arg: UseQuery) => { + const argRef = ref(arg); + const modelRef = ref(arg.model) as Ref>; + + const state = initialState(); + const subscribeToUpdates = subscribeQueryToUpdates({ + model: modelRef, + state, + }); + const runQuery = async () => + await queryResults({ + model: arg.model, state, - selector, + filter: arg.filter, }); - watch(selector, runQuery, { deep: true, immediate: true }); - watch(model, runQuery, { deep: true, immediate: true }); - return { state: readonly(state), subscribeToUpdates }; + watch(argRef, runQuery, { deep: true, immediate: true }); + return { state: state, subscribeToUpdates }; }; -export const useLazyQuery = ({ - model, -}: { - model: Ref>; -}) => { - const state = initialState(); - const subscribeToUpdates = subscribeQueryToUpdates({ model, state }); +export const useLazyQuery = ({ model }: { model: Model }) => { + const modelRef = ref(model) as Ref>; + + const state = initialState(); + const subscribeToUpdates = subscribeQueryToUpdates({ + model: modelRef, + state, + }); const query = async ({ - selector, + filter, }: { - selector: Ref | string | undefined>; + filter: Filter | string | undefined; }) => - await queryResults({ + await queryResults({ model, - selector, + filter, state, }); - return { state: readonly(state), query, subscribeToUpdates }; + return { state: state, query, subscribeToUpdates }; }; diff --git a/packages/datastore/datastore/src/vue/hooks/save.ts b/packages/datastore/datastore/src/vue/hooks/save.ts index 7bab1e739..dcdd82b63 100644 --- a/packages/datastore/datastore/src/vue/hooks/save.ts +++ b/packages/datastore/datastore/src/vue/hooks/save.ts @@ -1,4 +1,3 @@ -import { readonly } from "vue"; import { Model } from "../../Model"; import { ActionType } from "../../utils/ActionsTypes"; import { changeState, initialState } from "../StateUtils"; @@ -7,14 +6,13 @@ export const useSave = (model: Model) => { const state = initialState(); const save = async (input: TInput) => { - if (state.loading) return; - + if (state.value.loading) return; changeState({ state, action: { type: ActionType.INITIATE_REQUEST }, }); try { - const results = await model.save(input); + const results = (await model.save(input)) as TModel; changeState({ state, action: { type: ActionType.REQUEST_COMPLETE, data: results }, @@ -28,5 +26,5 @@ export const useSave = (model: Model) => { } }; - return { state: readonly(state), save }; + return { state: state, save }; }; diff --git a/packages/datastore/datastore/src/vue/hooks/subscription.ts b/packages/datastore/datastore/src/vue/hooks/subscription.ts index 40fd13cd2..3d45a133c 100644 --- a/packages/datastore/datastore/src/vue/hooks/subscription.ts +++ b/packages/datastore/datastore/src/vue/hooks/subscription.ts @@ -1,16 +1,9 @@ -import { - onMounted, - onUnmounted, - readonly, - ref, - Ref, - watch, -} from "@vue/runtime-core"; import { Maybe } from "graphql/jsutils/Maybe"; -import { Subscription } from "wonka"; +import { onMounted, onUnmounted, ref, Ref, watch } from "vue"; import { CRUDEvents } from "../.."; import { Model } from "../../Model"; import { ActionType } from "../../utils/ActionsTypes"; +import { Subscription } from "../../utils/PushStream"; import { changeState, initialState } from "../StateUtils"; export const useSubscription = ( @@ -43,5 +36,5 @@ export const useSubscription = ( onMounted(subscribe); onUnmounted(unsubscribe); - return { state: readonly(state) }; + return { state: state }; }; diff --git a/packages/datastore/datastore/src/vue/hooks/update.ts b/packages/datastore/datastore/src/vue/hooks/update.ts index 4cc16a2b4..cf648bf0a 100644 --- a/packages/datastore/datastore/src/vue/hooks/update.ts +++ b/packages/datastore/datastore/src/vue/hooks/update.ts @@ -1,4 +1,3 @@ -import { readonly } from "vue"; import { Model } from "../../Model"; import { ActionType } from "../../utils/ActionsTypes"; import { changeState, initialState } from "../StateUtils"; @@ -7,16 +6,16 @@ export const useUpdate = (model: Model) => { const state = initialState(); const update = async (input: TInput, upsert: boolean = false) => { - if (state.loading) return; + if (state.value.loading) return; changeState({ state, action: { type: ActionType.INITIATE_REQUEST }, }); try { - const results = await (upsert + const results = (await (upsert ? model.saveOrUpdate(input) - : model.updateById(input)); + : model.updateById(input))) as TModel; changeState({ state, action: { type: ActionType.REQUEST_COMPLETE, data: results }, @@ -30,5 +29,5 @@ export const useUpdate = (model: Model) => { } }; - return { state: readonly(state), update }; + return { state: state, update }; }; diff --git a/packages/datastore/datastore/tsconfig.json b/packages/datastore/datastore/tsconfig.json index c2088947f..8f29100d2 100644 --- a/packages/datastore/datastore/tsconfig.json +++ b/packages/datastore/datastore/tsconfig.json @@ -1,23 +1,12 @@ { "extends": "../../../tsconfig.json", - "include": [ - "./src/**/*.ts", "*.d.ts" - ], + "include": ["./src/**/*.ts", "*.d.ts"], "compilerOptions": { "esModuleInterop": true, "sourceMap": false, "outDir": "./dist/", "declarationDir": "./types", - "lib": [ - "esnext.asynciterable", - "es2015", - "dom", - "es2016" - ], - "types": [ - "websql", - "jest", - "node" - ], + "lib": ["esnext.asynciterable", "es2015", "dom", "es2016"], + "types": ["websql", "jest", "node"] } } From 5146c142593e3c2e5254bd2ee460ac390eae4f32 Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Mon, 1 Mar 2021 04:59:20 +0300 Subject: [PATCH 07/17] fix: init replication on mounted bug: requests to server is not valid --- examples/vue-datastore/src/App.vue | 10 +++++++--- .../vue-datastore/src/datastore/generated/index.ts | 2 +- .../vue-datastore/src/datastore/generated/types.ts | 8 ++++---- examples/vue-datastore/src/model/runtime.graphql | 2 ++ 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/examples/vue-datastore/src/App.vue b/examples/vue-datastore/src/App.vue index ebe829b5f..26a67cfb1 100644 --- a/examples/vue-datastore/src/App.vue +++ b/examples/vue-datastore/src/App.vue @@ -46,18 +46,22 @@ export default defineComponent({ width: "100vw", padding: "2em 0", }; - const replicating = ref(true); + const replicating = ref(false); const isToAddView = ref(false); const isNotToAddView = computed(() => !isToAddView.value); const { state, subscribeToUpdates } = useFindTodos(); const { loading, data, error } = toRefs(state.value); console.log({ loading, data, error, state }); + const startReplication = () => { + datastore.startReplication(); + replicating.value = true; + }; onMounted(() => { + startReplication(); datastore.getNetworkIndicator()?.subscribe({ next: (event: NetworkStatusEvent) => { if (event.isOnline) { - datastore.startReplication(); - replicating.value = true; + startReplication(); } else { datastore.stopReplication(); replicating.value = false; diff --git a/examples/vue-datastore/src/datastore/generated/index.ts b/examples/vue-datastore/src/datastore/generated/index.ts index b96956dff..38c469346 100644 --- a/examples/vue-datastore/src/datastore/generated/index.ts +++ b/examples/vue-datastore/src/datastore/generated/index.ts @@ -2,4 +2,4 @@ import { GeneratedModelSchema } from "offix-datastore"; import jsonSchema from "./schema.json"; export const schema = jsonSchema as GeneratedModelSchema; -export * from "./types"; +export * from "./types"; \ No newline at end of file diff --git a/examples/vue-datastore/src/datastore/generated/types.ts b/examples/vue-datastore/src/datastore/generated/types.ts index 57f0d9753..e49297bdc 100644 --- a/examples/vue-datastore/src/datastore/generated/types.ts +++ b/examples/vue-datastore/src/datastore/generated/types.ts @@ -4,17 +4,17 @@ export interface Todo { description?: string; completed?: boolean; _version: string; - _lastUpdatedAt: number; + _lastUpdatedAt: number } export type TodoCreate = Omit; -export type TodoChange = Pick & Partial; +export type TodoChange = Pick & Partial; export interface User { _id: string; name: string; _version: string; - _lastUpdatedAt: number; + _lastUpdatedAt: number } export type UserCreate = Omit; -export type UserChange = Pick & Partial; +export type UserChange = Pick & Partial; \ No newline at end of file diff --git a/examples/vue-datastore/src/model/runtime.graphql b/examples/vue-datastore/src/model/runtime.graphql index 4be42b410..dba3e6495 100644 --- a/examples/vue-datastore/src/model/runtime.graphql +++ b/examples/vue-datastore/src/model/runtime.graphql @@ -3,6 +3,7 @@ scalar GraphbackObjectID """ @model @datasync +@versioned """ type Todo { _id: GraphbackObjectID! @@ -14,6 +15,7 @@ type Todo { """ @model @datasync +@versioned """ type User { _id: GraphbackObjectID! From 7cdc5d3d38e96a2dd6da02b3235b9c780b913575 Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Wed, 3 Mar 2021 15:27:27 +0300 Subject: [PATCH 08/17] feat: vue hooks tests fix: create new item typings --- .../src/components/forms/AddTodo.vue | 2 - .../vue-datastore/src/model/runtime.graphql | 5 ++ packages/datastore/datastore/src/index.ts | 5 +- .../datastore/datastore/src/vue/hooks/save.ts | 6 +- .../datastore/datastore/tests/Vue.test.ts | 69 +++++++++++++++++++ 5 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 packages/datastore/datastore/tests/Vue.test.ts diff --git a/examples/vue-datastore/src/components/forms/AddTodo.vue b/examples/vue-datastore/src/components/forms/AddTodo.vue index 582b12783..89c241f9c 100644 --- a/examples/vue-datastore/src/components/forms/AddTodo.vue +++ b/examples/vue-datastore/src/components/forms/AddTodo.vue @@ -29,8 +29,6 @@ export default defineComponent({ title: title.value, description: description.value, completed: false, - _version: "1", - _lastUpdatedAt: Date.now(), }) .then(() => props.cancel()) .catch((error: any) => console.log(error)); diff --git a/examples/vue-datastore/src/model/runtime.graphql b/examples/vue-datastore/src/model/runtime.graphql index dba3e6495..dfcd9f323 100644 --- a/examples/vue-datastore/src/model/runtime.graphql +++ b/examples/vue-datastore/src/model/runtime.graphql @@ -1,4 +1,5 @@ scalar GraphbackObjectID +scalar GraphbackTimestamp """ @model @@ -10,6 +11,8 @@ type Todo { title: String description: String completed: Boolean + _version: String + _lastUpdatedAt: GraphbackTimestamp } """ @@ -20,6 +23,8 @@ type Todo { type User { _id: GraphbackObjectID! name: String! + _version: String + _lastUpdatedAt: GraphbackTimestamp # TODO # todos: [Todo!]! } diff --git a/packages/datastore/datastore/src/index.ts b/packages/datastore/datastore/src/index.ts index a5115dac4..a49ad3982 100644 --- a/packages/datastore/datastore/src/index.ts +++ b/packages/datastore/datastore/src/index.ts @@ -1,5 +1,6 @@ -export * from "./storage"; -export * from "./ModelSchema"; export * from "./DataStore"; export * from "./filters"; +export * from "./ModelSchema"; export * from "./react"; +export * from "./storage"; +export * as useDatastoreHooks from "./vue"; diff --git a/packages/datastore/datastore/src/vue/hooks/save.ts b/packages/datastore/datastore/src/vue/hooks/save.ts index dcdd82b63..9efcdf908 100644 --- a/packages/datastore/datastore/src/vue/hooks/save.ts +++ b/packages/datastore/datastore/src/vue/hooks/save.ts @@ -5,14 +5,16 @@ import { changeState, initialState } from "../StateUtils"; export const useSave = (model: Model) => { const state = initialState(); - const save = async (input: TInput) => { + const save = async (input: Omit) => { if (state.value.loading) return; changeState({ state, action: { type: ActionType.INITIATE_REQUEST }, }); try { - const results = (await model.save(input)) as TModel; + const results = (await model.save( + (input as unknown) as Partial + )) as TModel; changeState({ state, action: { type: ActionType.REQUEST_COMPLETE, data: results }, diff --git a/packages/datastore/datastore/tests/Vue.test.ts b/packages/datastore/datastore/tests/Vue.test.ts new file mode 100644 index 000000000..fe75ca42b --- /dev/null +++ b/packages/datastore/datastore/tests/Vue.test.ts @@ -0,0 +1,69 @@ +import { Maybe } from "graphql/jsutils/Maybe"; +import { ref } from "vue"; +import { CRUDEvents, useDatastoreHooks } from "../src"; +import { ReactiveState } from "../src/vue/StateUtils"; + +describe("vue hooks test suite", () => { + const originState: ReactiveState> = { + data: [], + error: null, + loading: false, + }; + const stateCopy = (title?: Maybe) => { + const copy = JSON.parse(JSON.stringify(originState)) as ReactiveState< + Record + >; + if (title) copy.data.push({ title }); + return copy; + }; + + test("it should update result for add", () => { + const state = ref(stateCopy()); + const event = { + eventType: CRUDEvents.ADD, + data: [{ title: "Test" }], + }; + const result = useDatastoreHooks.updateResult(state, event, "title"); + + expect(result).toEqual(event.data); + }); + + test("it should update result for update", () => { + const state = ref(stateCopy("Test")); + const event = { + eventType: CRUDEvents.UPDATE, + data: [{ title: "Test", pass: true }], + }; + const result = useDatastoreHooks.updateResult(state, event, "title"); + + expect(result).toEqual(event.data); + }); + + test("it should update id on ID_SWAP event", () => { + const state = ref(stateCopy("Test")); + const event = { + eventType: CRUDEvents.ID_SWAP, + data: [ + { + previous: { title: "Test", pass: true }, + current: { title: "NewTest", pass: true }, + }, + ], + }; + const result = useDatastoreHooks.updateResult(state, event, "title"); + + expect(result.length).toEqual(1); + expect(result[0]).toEqual(event.data[0].current); + }); + + test("it should update result for delete", () => { + const state = ref(stateCopy()); + const event = { + eventType: CRUDEvents.DELETE, + data: [{ title: "Test" }], + }; + const result = useDatastoreHooks.updateResult(state, event, "title"); + + expect(result).toEqual([]); + }); +}); From 63e46a3d86e76f564a927bf40d4ca55db75f6c06 Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Wed, 3 Mar 2021 15:55:03 +0300 Subject: [PATCH 09/17] fix: typings for delete --- examples/vue-datastore/src/components/Todo/TodoItem.tsx | 2 +- examples/vue-datastore/src/datastore/config.ts | 8 ++++---- packages/datastore/datastore/src/vue/hooks/delete.ts | 8 ++++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/examples/vue-datastore/src/components/Todo/TodoItem.tsx b/examples/vue-datastore/src/components/Todo/TodoItem.tsx index 2b98f357e..98e9db79d 100644 --- a/examples/vue-datastore/src/components/Todo/TodoItem.tsx +++ b/examples/vue-datastore/src/components/Todo/TodoItem.tsx @@ -20,7 +20,7 @@ export const TodoItem = defineComponent({ const { remove: deleteTodo } = useDeleteTodo(); const edit = ref(false); const handleDelete = () => { - deleteTodo(props.todo) + deleteTodo({ _id: props.todo._id }) .then((res) => console.log("response", res)) .catch((error: any) => console.log(error)); }; diff --git a/examples/vue-datastore/src/datastore/config.ts b/examples/vue-datastore/src/datastore/config.ts index a6118cfaa..ad7d7439a 100644 --- a/examples/vue-datastore/src/datastore/config.ts +++ b/examples/vue-datastore/src/datastore/config.ts @@ -1,17 +1,17 @@ import { DataStore } from "offix-datastore"; -import { schema, User, Todo } from "./generated"; +import { schema, Todo, User } from "./generated"; export const datastore = new DataStore({ dbName: "offix-datasync", replicationConfig: { client: { url: "http://localhost:5400/graphql", - wsUrl: "ws://localhost:5400/graphql" + wsUrl: "ws://localhost:5400/graphql", }, delta: { enabled: true, pullInterval: 20000 }, mutations: { enabled: true }, - liveupdates: { enabled: true } - } + liveupdates: { enabled: true }, + }, }); export const TodoModel = datastore.setupModel(schema.Todo); diff --git a/packages/datastore/datastore/src/vue/hooks/delete.ts b/packages/datastore/datastore/src/vue/hooks/delete.ts index c6d204f62..9f1df4151 100644 --- a/packages/datastore/datastore/src/vue/hooks/delete.ts +++ b/packages/datastore/datastore/src/vue/hooks/delete.ts @@ -6,7 +6,9 @@ import { changeState, initialState } from "../StateUtils"; export const useRemove = (model: Model) => { const state = initialState(); - const remove = async (filter: Filter) => { + const remove = async ( + filter: Filter> + ) => { if (state.value.loading) return; changeState({ @@ -14,7 +16,9 @@ export const useRemove = (model: Model) => { action: { type: ActionType.INITIATE_REQUEST }, }); try { - const results = (await model.remove(filter)) as TModel[]; + const results = (await model.remove( + (filter as unknown) as Filter + )) as TModel[]; changeState({ state, action: { type: ActionType.REQUEST_COMPLETE, data: results }, From a3af20eaffc2d84b53873bc01df6cd483b4929c0 Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Wed, 3 Mar 2021 16:56:20 +0300 Subject: [PATCH 10/17] fix: vue build error by adding lib es2020 to tsconfig fix: add vue as peer dependency --- packages/datastore/datastore/package.json | 5 +++-- packages/datastore/datastore/tsconfig.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/datastore/datastore/package.json b/packages/datastore/datastore/package.json index d1a2f55c1..0c4475fdd 100644 --- a/packages/datastore/datastore/package.json +++ b/packages/datastore/datastore/package.json @@ -21,7 +21,8 @@ "size:why": "size-limit --why" }, "peerDependencies": { - "react": "17.0.1" + "react": "17.0.1", + "vue": "3.0.6" }, "peerDependenciesMeta": { "react": { @@ -46,7 +47,7 @@ "supports-color": "8.1.1", "ts-jest": "26.5.1", "typescript": "4.1.5", - "vue": "^3.0.6" + "vue": "3.0.6" }, "dependencies": { "graphql-tag": "2.11.0", diff --git a/packages/datastore/datastore/tsconfig.json b/packages/datastore/datastore/tsconfig.json index 8f29100d2..ce7ab4075 100644 --- a/packages/datastore/datastore/tsconfig.json +++ b/packages/datastore/datastore/tsconfig.json @@ -6,7 +6,7 @@ "sourceMap": false, "outDir": "./dist/", "declarationDir": "./types", - "lib": ["esnext.asynciterable", "es2015", "dom", "es2016"], + "lib": ["esnext.asynciterable", "es2015", "dom", "es2016", "es2020"], "types": ["websql", "jest", "node"] } } From a665c4375d5cb7e3081a7c4410b3897720213b76 Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Wed, 3 Mar 2021 17:00:22 +0300 Subject: [PATCH 11/17] fix: error in react types by adding skipLibCheck --- packages/datastore/datastore/tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/datastore/datastore/tsconfig.json b/packages/datastore/datastore/tsconfig.json index ce7ab4075..0b47c61ab 100644 --- a/packages/datastore/datastore/tsconfig.json +++ b/packages/datastore/datastore/tsconfig.json @@ -5,6 +5,7 @@ "esModuleInterop": true, "sourceMap": false, "outDir": "./dist/", + "skipLibCheck": true, "declarationDir": "./types", "lib": ["esnext.asynciterable", "es2015", "dom", "es2016", "es2020"], "types": ["websql", "jest", "node"] From 01f9f0b91ef2c90156346b428502a9771afc1eec Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Wed, 3 Mar 2021 17:06:42 +0300 Subject: [PATCH 12/17] fix: linting errors --- .../datastore/src/react/ReducerUtils.ts | 2 +- .../datastore/datastore/src/vue/StateUtils.ts | 8 ++--- .../datastore/src/vue/hooks/delete.ts | 8 ++--- .../datastore/src/vue/hooks/query.ts | 34 +++++++++---------- .../datastore/datastore/src/vue/hooks/save.ts | 8 ++--- .../datastore/src/vue/hooks/subscription.ts | 4 +-- .../datastore/src/vue/hooks/update.ts | 8 ++--- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/packages/datastore/datastore/src/react/ReducerUtils.ts b/packages/datastore/datastore/src/react/ReducerUtils.ts index 4d5ce8153..4899c769b 100644 --- a/packages/datastore/datastore/src/react/ReducerUtils.ts +++ b/packages/datastore/datastore/src/react/ReducerUtils.ts @@ -24,7 +24,7 @@ export const reducer = (state: ResultState, action: Action) => { ...state, loading: false, data: action.data, - error: action.error, + error: action.error }; case ActionType.UPDATE_RESULT: diff --git a/packages/datastore/datastore/src/vue/StateUtils.ts b/packages/datastore/datastore/src/vue/StateUtils.ts index 9ed18b947..844c4267d 100644 --- a/packages/datastore/datastore/src/vue/StateUtils.ts +++ b/packages/datastore/datastore/src/vue/StateUtils.ts @@ -21,18 +21,18 @@ export const initialState = (): Ref> => ref>({ loading: false, data: [], - error: null, + error: null }) as Ref>; export const changeState = ({ action, - state, + state }: { state: Ref>; action: Action; }) => { const data = (() => { - if (action.data == null) return []; - if (Array.isArray(action.data)) return action.data; + if (action.data == null) {return [];} + if (Array.isArray(action.data)) {return action.data;} return [action.data]; })(); switch (action.type) { diff --git a/packages/datastore/datastore/src/vue/hooks/delete.ts b/packages/datastore/datastore/src/vue/hooks/delete.ts index 9f1df4151..9626d6a75 100644 --- a/packages/datastore/datastore/src/vue/hooks/delete.ts +++ b/packages/datastore/datastore/src/vue/hooks/delete.ts @@ -9,11 +9,11 @@ export const useRemove = (model: Model) => { const remove = async ( filter: Filter> ) => { - if (state.value.loading) return; + if (state.value.loading) {return;} changeState({ state, - action: { type: ActionType.INITIATE_REQUEST }, + action: { type: ActionType.INITIATE_REQUEST } }); try { const results = (await model.remove( @@ -21,13 +21,13 @@ export const useRemove = (model: Model) => { )) as TModel[]; changeState({ state, - action: { type: ActionType.REQUEST_COMPLETE, data: results }, + action: { type: ActionType.REQUEST_COMPLETE, data: results } }); return results; } catch (error) { changeState({ state, - action: { type: ActionType.REQUEST_COMPLETE, error }, + action: { type: ActionType.REQUEST_COMPLETE, error } }); } }; diff --git a/packages/datastore/datastore/src/vue/hooks/query.ts b/packages/datastore/datastore/src/vue/hooks/query.ts index 7073879b8..500f4d117 100644 --- a/packages/datastore/datastore/src/vue/hooks/query.ts +++ b/packages/datastore/datastore/src/vue/hooks/query.ts @@ -8,7 +8,7 @@ import { changeState, IdSwap, initialState, - ReactiveState, + ReactiveState } from "../StateUtils"; interface UpdateArr { oldArr: T[]; @@ -41,7 +41,7 @@ const onAdded = ( updateArr({ newArr: newData, oldArr: state.value.data, - primaryKeyName, + primaryKeyName }); const onChanged = ( @@ -49,11 +49,11 @@ const onChanged = ( newData: TItem[], primaryKeyName: string ) => { - if (state.value.data.length === 0) return state.value.data; + if (state.value.data.length === 0) {return state.value.data;} return updateArr({ newArr: newData, oldArr: state.value.data, - primaryKeyName, + primaryKeyName }); }; @@ -62,7 +62,7 @@ const onIdSwapped = ( newData: IdSwap[], primaryKeyName: string ) => { - if (state.value.data.length === 0) return state.value.data; + if (state.value.data.length === 0) {return state.value.data;} const changedData = state.value.data.map((d) => { const dPrimaryKey = (d as Record)[primaryKeyName]; @@ -84,7 +84,7 @@ const onRemoved = ( removedData: TItem[], primaryKeyName: string ) => { - if (state.value.data.length === 0) return state.value.data; + if (state.value.data.length === 0) {return state.value.data;} const changedData = state.value.data.filter((d) => { const dPrimaryKey = (d as Record)[primaryKeyName]; return removedData.findIndex( @@ -140,7 +140,7 @@ const createSubscribeToUpdates = ( // Important to check beacuse Componnent could be unmounted changeState({ state, - action: { type: ActionType.UPDATE_RESULT, data: newData }, + action: { type: ActionType.UPDATE_RESULT, data: newData } }); } }, eventsToWatch); @@ -154,9 +154,9 @@ interface QueryResults extends UseQuery { const queryResults = async ({ state, filter, - model, + model }: QueryResults) => { - if (state.value.loading) return; + if (state.value.loading) {return;} changeState({ state, action: { type: ActionType.INITIATE_REQUEST } }); try { @@ -169,12 +169,12 @@ const queryResults = async ({ } changeState({ state, - action: { type: ActionType.REQUEST_COMPLETE, data: results }, + action: { type: ActionType.REQUEST_COMPLETE, data: results } }); } catch (error) { changeState({ state, - action: { type: ActionType.REQUEST_COMPLETE, error }, + action: { type: ActionType.REQUEST_COMPLETE, error } }); } }; @@ -185,7 +185,7 @@ interface UseQuery { } const subscribeQueryToUpdates = ({ state, - model, + model }: { state: Ref>; model: Ref>; @@ -208,13 +208,13 @@ export const useQuery = (arg: UseQuery) => { const state = initialState(); const subscribeToUpdates = subscribeQueryToUpdates({ model: modelRef, - state, + state }); const runQuery = async () => await queryResults({ model: arg.model, state, - filter: arg.filter, + filter: arg.filter }); watch(argRef, runQuery, { deep: true, immediate: true }); return { state: state, subscribeToUpdates }; @@ -226,17 +226,17 @@ export const useLazyQuery = ({ model }: { model: Model }) => { const state = initialState(); const subscribeToUpdates = subscribeQueryToUpdates({ model: modelRef, - state, + state }); const query = async ({ - filter, + filter }: { filter: Filter | string | undefined; }) => await queryResults({ model, filter, - state, + state }); return { state: state, query, subscribeToUpdates }; }; diff --git a/packages/datastore/datastore/src/vue/hooks/save.ts b/packages/datastore/datastore/src/vue/hooks/save.ts index 9efcdf908..0006eb2e8 100644 --- a/packages/datastore/datastore/src/vue/hooks/save.ts +++ b/packages/datastore/datastore/src/vue/hooks/save.ts @@ -6,10 +6,10 @@ export const useSave = (model: Model) => { const state = initialState(); const save = async (input: Omit) => { - if (state.value.loading) return; + if (state.value.loading) {return;} changeState({ state, - action: { type: ActionType.INITIATE_REQUEST }, + action: { type: ActionType.INITIATE_REQUEST } }); try { const results = (await model.save( @@ -17,13 +17,13 @@ export const useSave = (model: Model) => { )) as TModel; changeState({ state, - action: { type: ActionType.REQUEST_COMPLETE, data: results }, + action: { type: ActionType.REQUEST_COMPLETE, data: results } }); return results; } catch (error) { changeState({ state, - action: { type: ActionType.REQUEST_COMPLETE, error }, + action: { type: ActionType.REQUEST_COMPLETE, error } }); } }; diff --git a/packages/datastore/datastore/src/vue/hooks/subscription.ts b/packages/datastore/datastore/src/vue/hooks/subscription.ts index 3d45a133c..1fe243027 100644 --- a/packages/datastore/datastore/src/vue/hooks/subscription.ts +++ b/packages/datastore/datastore/src/vue/hooks/subscription.ts @@ -11,13 +11,13 @@ export const useSubscription = ( eventTypes: CRUDEvents[] ) => { const state = initialState(); - let subscription = ref>(); + const subscription = ref>(); const subscribe = () => { subscription.value = model.value.subscribe((event) => { changeState({ state, - action: { type: ActionType.REQUEST_COMPLETE, data: event.data }, + action: { type: ActionType.REQUEST_COMPLETE, data: event.data } }); }, eventTypes); }; diff --git a/packages/datastore/datastore/src/vue/hooks/update.ts b/packages/datastore/datastore/src/vue/hooks/update.ts index cf648bf0a..dc4dbecfd 100644 --- a/packages/datastore/datastore/src/vue/hooks/update.ts +++ b/packages/datastore/datastore/src/vue/hooks/update.ts @@ -6,11 +6,11 @@ export const useUpdate = (model: Model) => { const state = initialState(); const update = async (input: TInput, upsert: boolean = false) => { - if (state.value.loading) return; + if (state.value.loading) {return;} changeState({ state, - action: { type: ActionType.INITIATE_REQUEST }, + action: { type: ActionType.INITIATE_REQUEST } }); try { const results = (await (upsert @@ -18,13 +18,13 @@ export const useUpdate = (model: Model) => { : model.updateById(input))) as TModel; changeState({ state, - action: { type: ActionType.REQUEST_COMPLETE, data: results }, + action: { type: ActionType.REQUEST_COMPLETE, data: results } }); return results; } catch (error) { changeState({ state, - action: { type: ActionType.REQUEST_COMPLETE, error }, + action: { type: ActionType.REQUEST_COMPLETE, error } }); } }; From d394682f793027677827ccf3ba924796cd4f7c82 Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Thu, 4 Mar 2021 03:10:00 +0300 Subject: [PATCH 13/17] fix: useLazyQuery return state --- .../datastore/datastore/src/vue/hooks/query.ts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/datastore/datastore/src/vue/hooks/query.ts b/packages/datastore/datastore/src/vue/hooks/query.ts index 500f4d117..39376904f 100644 --- a/packages/datastore/datastore/src/vue/hooks/query.ts +++ b/packages/datastore/datastore/src/vue/hooks/query.ts @@ -49,7 +49,9 @@ const onChanged = ( newData: TItem[], primaryKeyName: string ) => { - if (state.value.data.length === 0) {return state.value.data;} + if (state.value.data.length === 0) { + return state.value.data; + } return updateArr({ newArr: newData, oldArr: state.value.data, @@ -62,7 +64,9 @@ const onIdSwapped = ( newData: IdSwap[], primaryKeyName: string ) => { - if (state.value.data.length === 0) {return state.value.data;} + if (state.value.data.length === 0) { + return state.value.data; + } const changedData = state.value.data.map((d) => { const dPrimaryKey = (d as Record)[primaryKeyName]; @@ -84,7 +88,9 @@ const onRemoved = ( removedData: TItem[], primaryKeyName: string ) => { - if (state.value.data.length === 0) {return state.value.data;} + if (state.value.data.length === 0) { + return state.value.data; + } const changedData = state.value.data.filter((d) => { const dPrimaryKey = (d as Record)[primaryKeyName]; return removedData.findIndex( @@ -156,7 +162,9 @@ const queryResults = async ({ filter, model }: QueryResults) => { - if (state.value.loading) {return;} + if (state.value.loading) { + return; + } changeState({ state, action: { type: ActionType.INITIATE_REQUEST } }); try { @@ -171,6 +179,7 @@ const queryResults = async ({ state, action: { type: ActionType.REQUEST_COMPLETE, data: results } }); + return state; } catch (error) { changeState({ state, From a915f057d5be29fb65e0501b5e3193636e381d01 Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Thu, 4 Mar 2021 03:26:54 +0300 Subject: [PATCH 14/17] fix: useLazyQuery returns always state --- packages/datastore/datastore/src/vue/hooks/query.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/datastore/datastore/src/vue/hooks/query.ts b/packages/datastore/datastore/src/vue/hooks/query.ts index 39376904f..73f5f35c0 100644 --- a/packages/datastore/datastore/src/vue/hooks/query.ts +++ b/packages/datastore/datastore/src/vue/hooks/query.ts @@ -179,12 +179,13 @@ const queryResults = async ({ state, action: { type: ActionType.REQUEST_COMPLETE, data: results } }); - return state; } catch (error) { changeState({ state, action: { type: ActionType.REQUEST_COMPLETE, error } }); + } finally { + return state; } }; From fae1b861c88d7baf7ff0fd283c6abc8c194ea502 Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Fri, 19 Mar 2021 09:19:13 +0300 Subject: [PATCH 15/17] fix: test errors --- packages/datastore/datastore/src/vue/hooks/query.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/datastore/datastore/src/vue/hooks/query.ts b/packages/datastore/datastore/src/vue/hooks/query.ts index 73f5f35c0..28543e0c1 100644 --- a/packages/datastore/datastore/src/vue/hooks/query.ts +++ b/packages/datastore/datastore/src/vue/hooks/query.ts @@ -184,9 +184,8 @@ const queryResults = async ({ state, action: { type: ActionType.REQUEST_COMPLETE, error } }); - } finally { - return state; } + return state; }; interface UseQuery { From 6f62b5d97d8527bf5445f9ed50bfbce5e2321877 Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Fri, 19 Mar 2021 09:21:24 +0300 Subject: [PATCH 16/17] fix: merge afterfixes --- examples/vue-datastore/src/datastore/hooks.ts | 4 ++-- packages/datastore/{datastore => }/src/utils/ActionsTypes.ts | 0 packages/datastore/{datastore => }/src/vue/StateUtils.ts | 0 packages/datastore/{datastore => }/src/vue/hooks/delete.ts | 0 packages/datastore/{datastore => }/src/vue/hooks/query.ts | 0 packages/datastore/{datastore => }/src/vue/hooks/save.ts | 0 .../datastore/{datastore => }/src/vue/hooks/subscription.ts | 0 packages/datastore/{datastore => }/src/vue/hooks/update.ts | 0 packages/datastore/{datastore => }/src/vue/index.ts | 0 packages/datastore/{datastore => }/tests/Vue.test.ts | 0 10 files changed, 2 insertions(+), 2 deletions(-) rename packages/datastore/{datastore => }/src/utils/ActionsTypes.ts (100%) rename packages/datastore/{datastore => }/src/vue/StateUtils.ts (100%) rename packages/datastore/{datastore => }/src/vue/hooks/delete.ts (100%) rename packages/datastore/{datastore => }/src/vue/hooks/query.ts (100%) rename packages/datastore/{datastore => }/src/vue/hooks/save.ts (100%) rename packages/datastore/{datastore => }/src/vue/hooks/subscription.ts (100%) rename packages/datastore/{datastore => }/src/vue/hooks/update.ts (100%) rename packages/datastore/{datastore => }/src/vue/index.ts (100%) rename packages/datastore/{datastore => }/tests/Vue.test.ts (100%) diff --git a/examples/vue-datastore/src/datastore/hooks.ts b/examples/vue-datastore/src/datastore/hooks.ts index 327afb3d6..4faf9fb53 100644 --- a/examples/vue-datastore/src/datastore/hooks.ts +++ b/examples/vue-datastore/src/datastore/hooks.ts @@ -4,8 +4,8 @@ import { useQuery, useRemove, useSave, - useUpdate -} from "../../../../packages/datastore/datastore/src/vue"; + useUpdate, +} from "../../../../packages/datastore/src/vue"; import { TodoModel } from "./config"; import { Todo, TodoChange, TodoCreate } from "./generated"; // FIXME: how to handle wrong model type from package and from monorepo? diff --git a/packages/datastore/datastore/src/utils/ActionsTypes.ts b/packages/datastore/src/utils/ActionsTypes.ts similarity index 100% rename from packages/datastore/datastore/src/utils/ActionsTypes.ts rename to packages/datastore/src/utils/ActionsTypes.ts diff --git a/packages/datastore/datastore/src/vue/StateUtils.ts b/packages/datastore/src/vue/StateUtils.ts similarity index 100% rename from packages/datastore/datastore/src/vue/StateUtils.ts rename to packages/datastore/src/vue/StateUtils.ts diff --git a/packages/datastore/datastore/src/vue/hooks/delete.ts b/packages/datastore/src/vue/hooks/delete.ts similarity index 100% rename from packages/datastore/datastore/src/vue/hooks/delete.ts rename to packages/datastore/src/vue/hooks/delete.ts diff --git a/packages/datastore/datastore/src/vue/hooks/query.ts b/packages/datastore/src/vue/hooks/query.ts similarity index 100% rename from packages/datastore/datastore/src/vue/hooks/query.ts rename to packages/datastore/src/vue/hooks/query.ts diff --git a/packages/datastore/datastore/src/vue/hooks/save.ts b/packages/datastore/src/vue/hooks/save.ts similarity index 100% rename from packages/datastore/datastore/src/vue/hooks/save.ts rename to packages/datastore/src/vue/hooks/save.ts diff --git a/packages/datastore/datastore/src/vue/hooks/subscription.ts b/packages/datastore/src/vue/hooks/subscription.ts similarity index 100% rename from packages/datastore/datastore/src/vue/hooks/subscription.ts rename to packages/datastore/src/vue/hooks/subscription.ts diff --git a/packages/datastore/datastore/src/vue/hooks/update.ts b/packages/datastore/src/vue/hooks/update.ts similarity index 100% rename from packages/datastore/datastore/src/vue/hooks/update.ts rename to packages/datastore/src/vue/hooks/update.ts diff --git a/packages/datastore/datastore/src/vue/index.ts b/packages/datastore/src/vue/index.ts similarity index 100% rename from packages/datastore/datastore/src/vue/index.ts rename to packages/datastore/src/vue/index.ts diff --git a/packages/datastore/datastore/tests/Vue.test.ts b/packages/datastore/tests/Vue.test.ts similarity index 100% rename from packages/datastore/datastore/tests/Vue.test.ts rename to packages/datastore/tests/Vue.test.ts From 42f9c5df6f10e91081c8dba093535d9bc7024e85 Mon Sep 17 00:00:00 2001 From: Anton Malofeev Date: Fri, 19 Mar 2021 09:43:01 +0300 Subject: [PATCH 17/17] fix: comma-dangle --- packages/datastore/tests/Vue.test.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/datastore/tests/Vue.test.ts b/packages/datastore/tests/Vue.test.ts index fe75ca42b..31f06bc36 100644 --- a/packages/datastore/tests/Vue.test.ts +++ b/packages/datastore/tests/Vue.test.ts @@ -7,13 +7,13 @@ describe("vue hooks test suite", () => { const originState: ReactiveState> = { data: [], error: null, - loading: false, + loading: false }; const stateCopy = (title?: Maybe) => { const copy = JSON.parse(JSON.stringify(originState)) as ReactiveState< Record >; - if (title) copy.data.push({ title }); + if (title) {copy.data.push({ title });} return copy; }; @@ -21,7 +21,7 @@ describe("vue hooks test suite", () => { const state = ref(stateCopy()); const event = { eventType: CRUDEvents.ADD, - data: [{ title: "Test" }], + data: [{ title: "Test" }] }; const result = useDatastoreHooks.updateResult(state, event, "title"); @@ -32,7 +32,7 @@ describe("vue hooks test suite", () => { const state = ref(stateCopy("Test")); const event = { eventType: CRUDEvents.UPDATE, - data: [{ title: "Test", pass: true }], + data: [{ title: "Test", pass: true }] }; const result = useDatastoreHooks.updateResult(state, event, "title"); @@ -46,9 +46,9 @@ describe("vue hooks test suite", () => { data: [ { previous: { title: "Test", pass: true }, - current: { title: "NewTest", pass: true }, - }, - ], + current: { title: "NewTest", pass: true } + } + ] }; const result = useDatastoreHooks.updateResult(state, event, "title"); @@ -60,7 +60,7 @@ describe("vue hooks test suite", () => { const state = ref(stateCopy()); const event = { eventType: CRUDEvents.DELETE, - data: [{ title: "Test" }], + data: [{ title: "Test" }] }; const result = useDatastoreHooks.updateResult(state, event, "title");