Skip to content

Commit 4fd016d

Browse files
authored
Merge branch 'develop' into #825-store-displaystyle-in-localstorage
2 parents f44b168 + a4a94ee commit 4fd016d

File tree

23 files changed

+403
-284
lines changed

23 files changed

+403
-284
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ trace-*.json
44
**/.temp
55
.DS_Store
66
.cargo
7+
.tmp-earthly-out
78
artifact
89
server/assets_tmp
910

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ By far most changes relate to `atomic-server`, so if not specified, assume the c
55
**Changes to JS assets (including the front-end and JS libraries) are not shown here**, but in [`/browser/CHANGELOG`](/browser/CHANGELOG.md).
66
See [STATUS.md](server/STATUS.md) to learn more about which features will remain stable.
77

8-
## [UNRELEASED]
8+
## [v0.38.0] - 2024-06-08
99

1010
- Remove `process-management` feature #324 #334
11+
- Add `atomic_lib::client::search` for building queries #778
12+
- Add `atomic-cli search` command #778
13+
- Migrate atomic_cli to use the derive API #890
1114

1215
## [v0.37.0] - 2024-02-01
1316

Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

browser/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.37.0",
2+
"version": "0.38.0",
33
"author": "Polle Pas",
44
"dependencies": {
55
"@tomic/lib": "workspace:*",

browser/data-browser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.37.0",
2+
"version": "0.38.0",
33
"author": {
44
"email": "joep@ontola.io",
55
"name": "Joep Meindertsma"

browser/e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.36.0",
2+
"version": "0.38.0",
33
"author": {
44
"email": "joep@ontola.io",
55
"name": "Joep Meindertsma"

browser/lib/package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.37.0",
2+
"version": "0.38.0",
33
"author": "Joep Meindertsma",
44
"dependencies": {
55
"@noble/ed25519": "1.6.0",
@@ -20,9 +20,7 @@
2020
"vitest": "^0.34.6",
2121
"whatwg-fetch": "^3.6.2"
2222
},
23-
"files": [
24-
"dist"
25-
],
23+
"files": ["dist"],
2624
"gitHead": "2172c73d8df4e5f273e6386676abc91b6c5b2707",
2725
"license": "MIT",
2826
"main": "dist/index.js",

browser/lib/src/search.test.ts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { describe, it } from 'vitest';
2-
import { escapeTantivyKey } from './search.js';
2+
import { escapeTantivyKey, buildSearchSubject, SearchOpts } from './search.js';
33

44
const testTuples = [
55
['https://test', 'https\\://test'],
@@ -12,4 +12,21 @@ describe('search.ts', () => {
1212
expect(escapeTantivyKey(input)).toBe(output);
1313
}
1414
});
15+
16+
it('Builds a good search URL', ({ expect }) => {
17+
const serverURL = 'https://test.com';
18+
const query = 'test';
19+
const searchOpts: SearchOpts = {
20+
include: true,
21+
limit: 30,
22+
parents: 'https://test.com/parent',
23+
filters: {
24+
age: '10',
25+
},
26+
};
27+
const built = buildSearchSubject(serverURL, query, searchOpts);
28+
expect(built).toBe(
29+
'https://test.com/search?q=test&include=true&limit=30&filters=age%3A%2210%22&parents=https%3A%2F%2Ftest.com%2Fparent',
30+
);
31+
});
1532
});

browser/package.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"eslint-plugin-import": "^2.26.0"
3232
},
3333
"name": "@tomic/root",
34-
"version": "0.36.0",
34+
"version": "0.38.0",
3535
"private": true,
3636
"type": "module",
3737
"scripts": {
@@ -53,14 +53,7 @@
5353
}
5454
},
5555
"workspaces": {
56-
"packages": [
57-
"e2e",
58-
"lib",
59-
"react",
60-
"data-browser",
61-
"svelte",
62-
"cli"
63-
]
56+
"packages": ["e2e", "lib", "react", "data-browser", "svelte", "cli"]
6457
},
6558
"packageManager": "pnpm@8.15.2"
6659
}

browser/react/package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.37.0",
2+
"version": "0.38.0",
33
"author": "Joep Meindertsma",
44
"description": "Atomic Data React library",
55
"dependencies": {
@@ -11,9 +11,7 @@
1111
"peerDependencies": {
1212
"react": ">17.0.2"
1313
},
14-
"files": [
15-
"dist"
16-
],
14+
"files": ["dist"],
1715
"license": "MIT",
1816
"name": "@tomic/react",
1917
"main-dev": "src/index.ts",

0 commit comments

Comments
 (0)