#283 Refactor client and parser

Author: Polleps

.gitignore

@@ -12,6 +12,9 @@ publish
 test-results
 */nohup.out
 */yarn-error.log
+lib/coverage
+react/coverage
+data-browser/coverage
 .yarn/*
 !.yarn/cache
 !.yarn/patches

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 This changelog covers all three packages, as they are (for now) updated as a whole
 
+## v0.35.0
+
+### @tomic/lib
+
+- Add the ability to change the `fetch` function used to fetch resources over http.
+- `store.addResource` is depricated in favor of `store.addResources`.
+
+#### Breaking Changes:
+
+- `tryValidURL` and `isValidURL` are now static methods on `Client`.
+- Rename `store.fetchResource` to `store.fetchResourceFromServer`.
+
 ## v0.34.10
 
 - Don't use WebSocket in Node context #280

data-browser/package.json

@@ -41,8 +41,8 @@
     "gh-pages": "^3.1.0",
     "lint-staged": "^10.5.4",
     "types-wm": "^1.1.0",
-    "vite": "^3.0.5",
-    "vite-plugin-pwa": "^0.13.1",
+    "vite": "^4.0.4",
+    "vite-plugin-pwa": "^0.14.1",
     "workbox-cli": "^6.4.1"
   },
   "homepage": "https://atomicdata.dev/",

data-browser/src/App.tsx

@@ -71,8 +71,8 @@ if (agent) {
 }
 
 /** Fetch all the Properties and Classes - this helps speed up the app. */
-store.fetchResource(urls.properties.getAll);
-store.fetchResource(urls.classes.getAll);
+store.fetchResourceFromServer(urls.properties.getAll);
+store.fetchResourceFromServer(urls.classes.getAll);
 
 // Register global event handlers.
 registerHandlers(store);

data-browser/src/components/HotKeyWrapper.tsx

@@ -3,7 +3,7 @@ import { dataURL, editURL } from '../helpers/navigation';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { useNavigate } from 'react-router-dom';
 import { useCurrentSubject } from '../helpers/useCurrentSubject';
-import { isValidURL } from '@tomic/react';
+import { Client } from '@tomic/react';
 import { useSettings } from '../helpers/AppSettings';
 import { paths } from '../routes/paths';
 
@@ -71,7 +71,7 @@ function HotKeysWrapper({ children }: Props): JSX.Element {
     shortcuts.edit,
     e => {
       e.preventDefault();
-      isValidURL(subject) && navigate(editURL(subject!));
+      Client.isValidURL(subject) && navigate(editURL(subject!));
     },
     {},
     [subject],
@@ -80,7 +80,7 @@ function HotKeysWrapper({ children }: Props): JSX.Element {
     shortcuts.data,
     e => {
       e.preventDefault();
-      isValidURL(subject) && navigate(dataURL(subject!));
+      Client.isValidURL(subject) && navigate(dataURL(subject!));
     },
     {},
     [subject],

data-browser/src/components/ResourceContextMenu/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
-import { isValidURL, useStore } from '@tomic/react';
+import { Client, useStore } from '@tomic/react';
 import {
   editURL,
   dataURL,
@@ -50,7 +50,7 @@ function ResourceContextMenu({
     return null;
   }
 
-  if (!isValidURL(subject)) {
+  if (!Client.isValidURL(subject)) {
     return null;
   }
 
@@ -98,7 +98,7 @@ function ResourceContextMenu({
             label: 'refresh',
             helper:
               'Fetch the resouce again from the server, possibly see new changes.',
-            onClick: () => store.fetchResource(subject),
+            onClick: () => store.fetchResourceFromServer(subject),
           },
         ]),
     {

data-browser/src/components/Searchbar.tsx

@@ -1,4 +1,4 @@
-import { tryValidURL, useResource, useTitle } from '@tomic/react';
+import { Client, useResource, useTitle } from '@tomic/react';
 import { transparentize } from 'polished';
 import React, { useEffect, useState } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
@@ -41,7 +41,7 @@ export function Searchbar({
     setInput(e.target.value);
 
     try {
-      tryValidURL(e.target.value);
+      Client.tryValidURL(e.target.value);
       // Replace instead of push to make the back-button behavior better.
       navigate(constructOpenURL(e.target.value), { replace: true });
     } catch (_err) {

data-browser/src/components/forms/FileDropzone/FileDropzone.tsx

@@ -4,7 +4,7 @@ import { useDropzone } from 'react-dropzone';
 import { FaUpload } from 'react-icons/fa';
 import styled, { keyframes } from 'styled-components';
 import { ErrMessage } from '../InputStyles';
-import { useUpload } from './useUpload';
+import { useUpload } from '../../../hooks/useUpload';
 
 export interface FileDropZoneProps {
   parentResource: Resource;

data-browser/src/components/forms/FileDropzone/FileDropzoneInput.tsx

@@ -4,7 +4,7 @@ import { useDropzone } from 'react-dropzone';
 import { FaUpload } from 'react-icons/fa';
 import styled from 'styled-components';
 import { ErrMessage } from '../InputStyles';
-import { useUpload } from './useUpload';
+import { useUpload } from '../../../hooks/useUpload';
 
 export interface FileDropzoneInputProps {
   parentResource: Resource;

data-browser/src/components/forms/ResourceForm.tsx

@@ -10,7 +10,7 @@ import {
   urls,
   useDebounce,
   useCanWrite,
-  isValidURL,
+  Client,
   useStore,
 } from '@tomic/react';
 import styled from 'styled-components';
@@ -137,7 +137,7 @@ export function ResourceForm({
   function handleAddProp() {
     setNewPropErr(undefined);
 
-    if (!isValidURL(newProperty)) {
+    if (!Client.isValidURL(newProperty)) {
       setNewPropErr(new Error('Invalid URL'));
 
       return;