ThetaDev/automerge
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
791 commits 52 branches 27 tags 40 MiB
Commit graph

791 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Jeffery
5452aa4e4d
Merge pull request #406 from jeffa5/docs-ci 
ci: Rename docs script to rust-docs and build cmake docs in CI
 2022-07-13 19:47:42 +01:00
Andrew Jeffery
8c93d498b3 ci: Rename docs script to rust-docs and build cmake docs in CI 2022-07-13 18:25:25 +01:00
Adel Salakh
f14a61e581 Sort successors in SuccEncoder 
Makes SuccEncoder sort successors in Lamport clock order.
Such an ordering is expected by automerge js when loading documents,
otherwise some documents fail to load with a "operation IDs are not in
ascending order" error.
 2022-07-13 11:25:12 +01:00
Andrew Jeffery
65c478981c
Merge pull request #403 from jeffa5/parents-error 
Change parents to return result if objid is not an object
 2022-07-12 21:19:31 +01:00
Andrew Jeffery
75fb4f0f0c
Merge pull request #404 from jeffa5/trim-deps 
Clean up automerge dependencies
 2022-07-12 19:26:48 +01:00
Andrew Jeffery
be439892a4 Clean up automerge dependencies 2022-07-12 19:09:47 +01:00
Andrew Jeffery
6ea5982c16 Change parents to return result if objid is not an object 
There is easy confusion when calling parents with the id of a scalar,
wanting it to get the parent object first but that is not implemented.
To get the parent object of a scalar id would mean searching every
object for the OpId which may get too expensive when lots of objects are
around, this may be reconsidered later but the result would still be
useful to indicate when the id doesn't exist in the document vs has no
parents.
 2022-07-12 18:36:47 +01:00
Andrew Jeffery
0cd515526d
Merge pull request #402 from jeffa5/fix-cmake-docs 
Don't build tests for docs
 2022-07-12 10:17:43 +01:00
Andrew Jeffery
246ed4afab Test building docs on PRs 2022-07-12 10:12:07 +01:00
Andrew Jeffery
0a86a4d92c Don't build tests for docs 
The test `CMakeLists.txt` brings in cmocka but we don't actually need to
build the tests to get the docs. This just makes the cmake docs script
tell cmake not to build docs.
 2022-07-12 09:59:03 +01:00
Andrew Jeffery
1d3263c002
Merge pull request #397 from jeffa5/edit-trace-improvements 
Fixup js edit-trace script and documentation bits
 2022-07-07 09:47:43 +01:00
Andrew Jeffery
7e8cbf510a Add links to projects 2022-07-07 09:40:18 +01:00
Andrew Jeffery
c49ba5ea98 Fixup js edit-trace script and documentation bits 2022-07-07 09:25:45 +01:00
Andrew Jeffery
fe4071316d Add docs workflow status badge to README 2022-07-07 09:24:57 +01:00
Orion Henry
1a6f56f7e6
Merge pull request #393 from jkankiewicz/add_AMkeys_to_C_API 
Add AMkeys() to the C API
 2022-06-21 20:24:44 +02:00
Orion Henry
d5ca0947c0 minor update on js wrapper 2022-06-21 13:40:15 -04:00
Jason Kankiewicz
e5a8b67b11 Added AMspliceText(). 
Added `AMtext()`.
Replaced `*mut` function arguments with `*const`
function arguments where possible.
Added "out" directions to the documentation for
out function parameters.
 2022-06-20 23:15:25 -07:00
Jason Kankiewicz
aeb8db556c Added "out" directions to the documentation for 
out function parameters.
 2022-06-20 23:11:03 -07:00
Jason Kankiewicz
eb462cb228 Made free_results() reset the stack pointer. 2022-06-20 15:55:31 -07:00
Jason Kankiewicz
0cbacaebb6 Simplified the AMstrings struct to directly 
reference `std::ffi::CString` values.
Switched the `AMresult` struct to store a `Vec<CString>` instead of a
`Vec<String>`.
 2022-06-20 14:35:30 -07:00
Jason Kankiewicz
bf4988dcca Fixed AM{change_hashes,changes,haves,strings}Prev(). 2022-06-20 13:50:05 -07:00
Jason Kankiewicz
770c064978 Made cosmetic changes to the quickstart example. 2022-06-20 13:45:32 -07:00
Jason Kankiewicz
db0333fc5a Added AM_ROOT usage to the documentation. 
Renamed the `value` argument of `AM{list,map}PutBytes()` to `src` for
consistency with standard `memcpy()`.
 2022-06-20 02:16:33 -07:00
Jason Kankiewicz
7bdf726ce1 Sublimated memory management in the quickstart 
example.
 2022-06-20 02:07:33 -07:00
Jason Kankiewicz
47c5277406 Added AMkeys(). 
Removed `AMobjSizeAt()`.
Added an optional `AMchangeHashes` argument to `AMobjSize()`.
Replaced the term "length" with "size" in the
documentation.
 2022-06-20 01:53:31 -07:00
Jason Kankiewicz
ea8bd32cc1 Added the AMstrings type. 2022-06-20 01:38:32 -07:00
Jason Kankiewicz
be130560f0 Added a check for a 0 increment in the iterator 
types.
Improved the documentation for the `detail` field in the iterator types.
 2022-06-20 01:34:36 -07:00
Jason Kankiewicz
103d729bd1 Replaced the term "length" with "size" in the 
documentation.
 2022-06-20 01:31:08 -07:00
Jason Kankiewicz
7b30c84a4c Added AMchangeHashesInit(). 2022-06-20 01:17:20 -07:00
Jason Kankiewicz
39db64e5d9 Publicized the AMbyteSpan fields. 2022-06-20 01:11:30 -07:00
Jason Kankiewicz
32baae1a31 Hoisted InvalidChangeHashSlice into the 
`Automerge` namespace.
 2022-06-20 01:09:50 -07:00
Ryan Fitzgerald
88073c0cf4 Fix TypeScript syntax error in automerge-wasm definitions 
I'm not sure if there are some configurations under which this works,
but I get

    index.d.ts:2:21 - error TS1005: ';' expected.

    2 export default from "automerge-types"
                          ~~~~~~~~~~~~~~~~~

both in my project that depends on `automerge-wasm` and when I run `tsc`
in this repo.

It seems like `export default from` is still a Stage 1 proposal, so I
wouldn't expect it to be supported by TS, although I couldn't really
find hard evidence one way or the other. It does seem like this syntax
should be exactly equivalent based on the proposal doc though.
 2022-06-17 20:11:26 -07:00
Orion Henry
f5e9e3537d v0.1.4 2022-06-16 17:50:46 -04:00
Orion Henry
44b6709a60 add getBackend to automerge-js 2022-06-16 17:49:32 -04:00
Orion Henry
1610f6d6a6
Merge pull request #391 from jkankiewicz/expose_ActorId_to_C_API 
Add `AMactorId` to the C API
 2022-06-16 21:57:56 +02:00
Orion Henry
40b32566f4
Merge pull request #390 from jkankiewicz/make_C_API_testing_explicit 
Make C API testing explicit
 2022-06-16 21:56:26 +02:00
Orion Henry
3a4af9a719
Merge pull request #371 from automerge/typescript 
Convert automerge-js to typescript
 2022-06-16 21:52:22 +02:00
Jason Kankiewicz
400b8acdff Switched the AMactorId unit test suite to group 
setup/teardown.
Removed superfluous group state from the `AMactorIdInit()` test.
 2022-06-14 23:16:45 -07:00
Jason Kankiewicz
2f37d194ba Asserted that the string forms of two random 
`AMactorId` structs are unequal.
 2022-06-14 23:04:18 -07:00
Orion Henry
ceecef3b87 update list of read methods in c readme 2022-06-14 21:28:10 -04:00
Jason Kankiewicz
6de9ff620d Moved hex_to_bytes() so that it could be shared 
by the unit test suites for `AMactorId` and `AMdoc` functions.
 2022-06-14 00:52:06 -07:00
Jason Kankiewicz
84fa83a3f0 Added AMactorId. 
Updated `AMchangeActorId()`.
Updated `AMsetActor()`.
Removed `AMgetActorHex()`.
Removed `AMsetActorHex()`.
 2022-06-14 00:49:20 -07:00
Jason Kankiewicz
ac3709e670 Hoisted InvalidActorId into the automerge 
namespace.
 2022-06-14 00:38:55 -07:00
Jason Kankiewicz
71d8a7e717 Removed the superfluous AutomergeError::HexDecode 
variant.
 2022-06-14 00:37:42 -07:00
Jason Kankiewicz
bdedafa021 Decouple the "test_automerge" build target from 
the "ALL" target.
 2022-06-13 12:01:54 -07:00
Jason Kankiewicz
efa0a5624a Removed renamed unit test suite source files. 2022-06-11 21:04:36 -07:00
Jason Kankiewicz
4efe9a4f68 Replaced "cmake -E make_directory" invocation with 
"mkdir -p" invocation for consistency with the other CI scripts.
 2022-06-11 21:03:26 -07:00
Jason Kankiewicz
4f7843e007 Removed CMocka from the "docs" CI workflow's list 
of dependencies.
 2022-06-11 20:57:28 -07:00
Jason Kankiewicz
30dd3da578 Updated the CMake build CI script to build the 
"test_automerge" target explicitly.
 2022-06-11 20:55:44 -07:00
Jason Kankiewicz
6668f79a6e Decouple the "test_automerge" build target from 
the "ALL" target.
 2022-06-11 20:53:17 -07:00