fluidB
/
fluidb
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'main' into dev

Browse Source
main
Ziyang Hu 1 year ago
parent 147101b7f3 2197241a6f
commit baeda8e5dc
4 changed files with 131 additions and 85 deletions
Show Stats Download Patch File Download Diff File

154
cozo-core/src/runtime/tests.rs
Unescape Escape View File

@ -276,83 +276,83 @@ fn do_not_unify_underscore() {
#[test]
fn imperative_script() {
let db = new_cozo_mem().unwrap();
let res = db
.run_script(
r#"
{:create _test {a}}
%loop
%if { len[count(x)] := *_test[x]; ?[x] := len[z], x = z >= 10 }
%then %return _test
%end
{ ?[a] := a = rand_uuid_v1(); :put _test {a} }
%debug _test
%end
"#,
Default::default(),
)
.unwrap();
assert_eq!(res.rows.len(), 10);
let res = db
.run_script(
r#"
{?[a] <- [[1], [2], [3]]
:replace _test {a}}
%loop
{ ?[a] := *_test[a]; :limit 1; :rm _test {a} }
%debug _test
%if_not _test
%then %break
%end
%end
%return _test
"#,
Default::default(),
)
.unwrap();
assert_eq!(res.rows.len(), 0);
let res = db.run_script(
r#"
{:create _test {a}}
%loop
{ ?[a] := a = rand_uuid_v1(); :put _test {a} }
%if { len[count(x)] := *_test[x]; ?[x] := len[z], x = z < 10 }
%continue
%end
%return _test
%debug _test
%end
"#,
Default::default(),
);
if let Err(err) = &res {
eprintln!("{err:?}");
}
assert_eq!(res.unwrap().rows.len(), 10);
let res = db
.run_script(
r#"
{?[a] <- [[1], [2], [3]]
:replace _test {a}}
{?[a] <- []
:replace _test2 {a}}
%swap _test _test2
%return _test
"#,
Default::default(),
)
.unwrap();
assert_eq!(res.rows.len(), 0);
// let db = new_cozo_mem().unwrap();
// let res = db
// .run_script(
// r#"
// {:create _test {a}}
//
// %loop
// %if { len[count(x)] := *_test[x]; ?[x] := len[z], x = z >= 10 }
// %then %return _test
// %end
// { ?[a] := a = rand_uuid_v1(); :put _test {a} }
// %debug _test
// %end
// "#,
// Default::default(),
// )
// .unwrap();
// assert_eq!(res.rows.len(), 10);
//
// let res = db
// .run_script(
// r#"
// {?[a] <- [[1], [2], [3]]
// :replace _test {a}}
//
// %loop
// { ?[a] := *_test[a]; :limit 1; :rm _test {a} }
// %debug _test
//
// %if_not _test
// %then %break
// %end
// %end
//
// %return _test
// "#,
// Default::default(),
// )
// .unwrap();
// assert_eq!(res.rows.len(), 0);
//
// let res = db.run_script(
// r#"
// {:create _test {a}}
//
// %loop
// { ?[a] := a = rand_uuid_v1(); :put _test {a} }
//
// %if { len[count(x)] := *_test[x]; ?[x] := len[z], x = z < 10 }
// %continue
// %end
//
// %return _test
// %debug _test
// %end
// "#,
// Default::default(),
// );
// if let Err(err) = &res {
// eprintln!("{err:?}");
// }
// assert_eq!(res.unwrap().rows.len(), 10);
//
// let res = db
// .run_script(
// r#"
// {?[a] <- [[1], [2], [3]]
// :replace _test {a}}
// {?[a] <- []
// :replace _test2 {a}}
// %swap _test _test2
// %return _test
// "#,
// Default::default(),
// )
// .unwrap();
// assert_eq!(res.rows.len(), 0);
}
#[test]

23
cozo-lib-wasm/wasm-react-demo/src/App.js
Unescape Escape View File

@ -6,11 +6,11 @@
* You can obtain one at https://mozilla.org/MPL/2.0/.
*/
import './App.css';
import {
Button,
Checkbox,
Classes,
Colors,
Dialog,
FileInput,
InputGroup,
@ -19,11 +19,13 @@ import {
TextArea,
Toaster
} from "@blueprintjs/core";
import {Cell, Column, Table2} from "@blueprintjs/table";
import React, {useEffect, useState} from "react";
import init, {CozoDb} from "cozo-lib-wasm";
import {parse} from "ansicolor";
import {saveAs} from 'file-saver';
import { Cell, Column, Table2 } from "@blueprintjs/table";
import { parse } from "ansicolor";
import init, { CozoDb } from "cozo-lib-wasm";
import { saveAs } from 'file-saver';
import React, { useEffect, useState } from "react";
import './App.css';
import { useBlueprintThemeClassName, usePreferredColorScheme } from './hooks/use-color-scheme';
function App() {
@ -44,6 +46,9 @@ function App() {
})
}, []);
const colorScheme = usePreferredColorScheme();
useBlueprintThemeClassName(colorScheme);
const renderCell = (colIdx) => (rowIdx) => <Cell>
{displayValue(queryResults.rows[rowIdx][colIdx])}
</Cell>
@ -70,7 +75,7 @@ function App() {
if (typeof v === 'string') {
return v
} else {
return <span style={{color: "#184A90"}}>{JSON.stringify(v)}</span>
return <span style={{color: colorScheme === "light" ? Colors.BLUE2 : Colors.BLUE5}}>{JSON.stringify(v)}</span>
}
}
@ -142,6 +147,7 @@ function App() {
intent={Intent.PRIMARY}
onChange={e => setQueryText(e.target.value)}
onKeyDown={handleKeyDown}
spellCheck="false"
value={queryText}
/>
{showParams && <TextArea
@ -151,6 +157,7 @@ function App() {
large={true}
onChange={e => setParams(e.target.value)}
onKeyDown={handleKeyDown}
spellCheck="false"
value={params}
/>}
</div>
@ -203,7 +210,7 @@ function App() {
</pre> : null}
{queryResults ? (queryResults.rows && queryResults.headers ?
<Table2
cellRendererDependencies={queryResults.rows}
cellRendererDependencies={[renderCell, ...queryResults.rows]}
numRows={queryResults.rows.length}
>
{queryResults.headers.map((n, idx) => <Column

35
cozo-lib-wasm/wasm-react-demo/src/hooks/use-color-scheme.js
Unescape Escape View File

@ -0,0 +1,35 @@
import { useEffect, useState } from "react";
/**
* Detect user preferred color scheme based on OS/browser settings
* @returns {'light' | 'dark'}
*/
export function usePreferredColorScheme() {
const [colorScheme, setColorScheme] = useState("light");
useEffect(() => {
// reference: https://blueprintjs.com/docs/#core/typography.dark-theme
const updateColorScheme = (mediaQueryOrEvent) => setColorScheme(mediaQueryOrEvent.matches ? "dark" : "light");
const mediaQuery = window.matchMedia?.("(prefers-color-scheme: dark)");
if (!mediaQuery) return;
updateColorScheme(mediaQuery);
mediaQuery.addEventListener("change", updateColorScheme);
return () => mediaQuery.removeEventListener("change", updateColorScheme);
}, []);
return colorScheme;
}
/**
* Apply Blueprint design system's recommended theme class name to the body element
* @param {'light' | 'dark'} colorScheme
*/
export function useBlueprintThemeClassName(colorScheme) {
useEffect(() => {
// reference: https://blueprintjs.com/docs/#core/typography.dark-theme
document.body.classList[colorScheme === "dark" ? "add" : "remove"]("bp4-dark");
}, [colorScheme]);
}

4
cozo-lib-wasm/wasm-react-demo/src/index.css
Unescape Escape View File

@ -6,6 +6,10 @@
* You can obtain one at https://mozilla.org/MPL/2.0/.
*/
:root {
color-scheme: dark light;
}
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',

Write Preview
Loading…
Cancel
Save