Clean up node construction API

1 files changed, 119 insertions, 82 deletions

diff --git a/tests/serd_test.c b/tests/serd_test.c
index 002da68c..de59c769 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -93,8 +93,8 @@ test_file_uri(const char* hostname,
 		expected_path = path;
 	}
 
-	SerdNode*   node     = serd_node_new_file_uri(path, hostname, 0, escape);
-	const char* node_str = serd_node_get_string(node);
+	SerdNode*   node         = serd_node_new_file_uri(path, hostname, escape);
+	const char* node_str     = serd_node_get_string(node);
 	char*       out_hostname = NULL;
 	char*       out_path     = serd_file_uri_parse(node_str, &out_hostname);
 	assert(!strcmp(node_str, expected_uri));
@@ -337,17 +337,16 @@ static void
 test_node_equals(void)
 {
 	const uint8_t replacement_char_str[] = { 0xEF, 0xBF, 0xBD, 0 };
-	SerdNode* lhs = serd_node_new_string(SERD_LITERAL, (const char*)replacement_char_str);
-	SerdNode* rhs = serd_node_new_string(SERD_LITERAL, "123");
+	SerdNode* lhs = serd_node_new_string((const char*)replacement_char_str);
+	SerdNode* rhs = serd_node_new_string("123");
 	assert(!serd_node_equals(lhs, rhs));
 
-	SerdNode* qnode = serd_node_new_string(SERD_CURIE, "foo:bar");
+	SerdNode* qnode = serd_node_new_curie("foo:bar");
 	assert(!serd_node_equals(lhs, qnode));
-	assert(serd_node_equals(lhs, lhs));
+	serd_node_free(qnode);
 
 	assert(!serd_node_copy(NULL));
 
-	serd_node_free(qnode);
 	serd_node_free(lhs);
 	serd_node_free(rhs);
 }
@@ -355,34 +354,44 @@ test_node_equals(void)
 static void
 test_node_from_string(void)
 {
-	SerdNode* hello = serd_node_new_string(SERD_LITERAL, "hello\"");
-	assert(serd_node_get_length(hello) == 6 &&
-	       serd_node_get_flags(hello) == SERD_HAS_QUOTE &&
-	       !strcmp(serd_node_get_string(hello), "hello\""));
+	assert(!serd_node_new_string(NULL));
 
-	assert(!serd_node_new_string(SERD_URI, NULL));
+	SerdNode* hello = serd_node_new_string("hello\"");
+	assert(serd_node_get_length(hello) == 6);
+	assert(serd_node_get_flags(hello) == SERD_HAS_QUOTE);
+	assert(!strncmp(serd_node_get_string(hello), "hello\"", 6));
 	serd_node_free(hello);
 }
 
 static void
 test_node_from_substring(void)
 {
-	assert(!serd_node_new_substring(SERD_LITERAL, NULL, 32));
+	assert(!serd_node_new_substring(NULL, 32));
 
-	SerdNode* a_b = serd_node_new_substring(SERD_LITERAL, "a\"bc", 3);
-	assert(serd_node_get_length(a_b) == 3 &&
-	       serd_node_get_flags(a_b) == SERD_HAS_QUOTE &&
-	       !strncmp(serd_node_get_string(a_b), "a\"b", 3));
+	SerdNode* a_b = serd_node_new_substring("a\"bc", 3);
+	assert(serd_node_get_length(a_b) == 3);
+	assert(serd_node_get_flags(a_b) == SERD_HAS_QUOTE);
+	assert(strlen(serd_node_get_string(a_b)) == 3);
+	assert(!strncmp(serd_node_get_string(a_b), "a\"b", 3));
 
 	serd_node_free(a_b);
-	a_b = serd_node_new_substring(SERD_LITERAL, "a\"bc", 10);
-	assert(serd_node_get_length(a_b) == 4 &&
-	       serd_node_get_flags(a_b) == SERD_HAS_QUOTE &&
-	       !strncmp(serd_node_get_string(a_b), "a\"bc", 4));
+	a_b = serd_node_new_substring("a\"bc", 10);
+	assert(serd_node_get_length(a_b) == 4);
+	assert(serd_node_get_flags(a_b) == SERD_HAS_QUOTE);
+	assert(strlen(serd_node_get_string(a_b)) == 4);
+	assert(!strncmp(serd_node_get_string(a_b), "a\"bc", 4));
 	serd_node_free(a_b);
 }
 
-static void test_literal(void)
+static void
+test_simple_node(void)
+{
+	assert(!serd_node_new_simple_node(SERD_LITERAL, "Literal", 7));
+	assert(!serd_node_new_simple_node(SERD_URI, NULL, 0));
+}
+
+static void
+test_literal(void)
 {
 	assert(!serd_node_new_literal(NULL, NULL, NULL));
 
@@ -401,9 +410,7 @@ static void test_literal(void)
 	               "en"));
 	serd_node_free(hello_l);
 
-	SerdNode* eg_Thing = serd_node_new_uri_from_string(
-	        "http://example.org/Thing", NULL, NULL);
-
+	SerdNode* eg_Thing = serd_node_new_uri("http://example.org/Thing");
 	SerdNode* hello_dt = serd_node_new_literal("hello_dt\"", eg_Thing, NULL);
 	assert(serd_node_get_length(hello_dt) == 9);
 	assert(!strcmp(serd_node_get_string(hello_dt), "hello_dt\""));
@@ -418,58 +425,79 @@ static void test_literal(void)
 static void
 test_uri_from_string(void)
 {
-	assert(!serd_node_new_uri_from_string(NULL, NULL, NULL));
-
-	SerdURI   base_uri;
-	SerdNode* base = serd_node_new_uri_from_string("http://example.org/",
-	                                               NULL, &base_uri);
-	SerdNode* nil  = serd_node_new_uri_from_string(NULL, &base_uri, NULL);
-	SerdNode* nil2 = serd_node_new_uri_from_string("", &base_uri, NULL);
+	assert(!serd_node_new_uri(NULL));
+
+	SerdNode* base      = serd_node_new_uri("http://example.org/a/b/c/");
+	SerdNode* not_a_uri = serd_node_new_string("hello");
+	SerdNode* nil       = serd_node_new_resolved_uri(NULL, base);
+	SerdNode* nil2      = serd_node_new_resolved_uri("", base);
+	assert(!serd_node_new_resolved_uri("", NULL));
+	assert(!serd_node_new_resolved_uri("", not_a_uri));
 	assert(serd_node_get_type(nil) == SERD_URI);
 	assert(!strcmp(serd_node_get_string(nil), serd_node_get_string(base)));
 	assert(serd_node_get_type(nil2) == SERD_URI);
 	assert(!strcmp(serd_node_get_string(nil2), serd_node_get_string(base)));
-	serd_node_free(nil);
 	serd_node_free(nil2);
+	serd_node_free(nil);
+	serd_node_free(not_a_uri);
 	serd_node_free(base);
 }
 
 static void
-test_relative_uri(void)
+check_rel_uri(const char*     uri,
+              const SerdNode* base,
+              const SerdNode* root,
+              const char*     expected)
 {
-	SerdURI   base_uri;
-	SerdNode* base = serd_node_new_uri_from_string("http://example.org/",
-	                                               NULL, &base_uri);
-
-	SerdNode* abs = serd_node_new_string(SERD_URI, "http://example.org/foo/bar");
-	SerdURI   abs_uri;
-	serd_uri_parse(serd_node_get_string(abs), &abs_uri);
-
-	SerdURI   rel_uri;
-	SerdNode* rel = serd_node_new_relative_uri(&abs_uri, &base_uri, NULL, &rel_uri);
-	assert(!strcmp(serd_node_get_string(rel), "/foo/bar"));
+	SerdNode* rel = serd_node_new_relative_uri(uri, base, root);
+	const int ret = strcmp(serd_node_get_string(rel), expected);
+	serd_node_free(rel);
+	assert(!ret);
+}
 
-	SerdNode* up = serd_node_new_relative_uri(&base_uri, &abs_uri, NULL, NULL);
-	assert(!strcmp(serd_node_get_string(up), "../"));
+static void
+test_relative_uri(void)
+{
+	SerdNode* root = serd_node_new_uri("http://example.org/a/b/");
+	SerdNode* base = serd_node_new_uri("http://example.org/a/b/c/");
 
-	SerdNode* noup = serd_node_new_relative_uri(&base_uri, &abs_uri, &abs_uri, NULL);
-	assert(!strcmp(serd_node_get_string(noup), "http://example.org/"));
+	check_rel_uri("http://example.org/a/b/c/foo", base, NULL, "foo");
+	check_rel_uri("http://example.org/a/", base, NULL, "../../");
+	check_rel_uri("http://example.org/a/", base, root, "http://example.org/a/");
+	check_rel_uri("http://example.org/", base, NULL, "../../../");
+	check_rel_uri("http://drobilla.net/a", base, NULL, "http://drobilla.net/a");
 
-	SerdNode* x = serd_node_new_string(SERD_URI, "http://example.org/foo/x");
-	SerdURI   x_uri;
-	serd_uri_parse(serd_node_get_string(x), &x_uri);
+	serd_node_free(base);
+	serd_node_free(root);
+}
 
-	SerdNode* x_rel =
-		serd_node_new_relative_uri(&x_uri, &abs_uri, &abs_uri, NULL);
-	assert(!strcmp(serd_node_get_string(x_rel), "x"));
+static void
+test_uri_resolution(void)
+{
+	SerdNode* base      = serd_node_new_uri("http://example.org/a/b/c/");
+	SerdNode* nil       = serd_node_new_resolved_uri(NULL, base);
+	SerdNode* nil2      = serd_node_new_resolved_uri("", base);
+	SerdNode* not_a_uri = serd_node_new_string("hello");
+	SerdNode* root      = serd_node_new_uri("http://example.org/a/b/");
+
+	assert(!serd_node_resolve(NULL, base));
+	assert(!serd_node_resolve(nil, NULL));
+	assert(!serd_node_resolve(not_a_uri, base));
+	assert(!serd_node_resolve(nil, not_a_uri));
+
+	SerdNode* rel = serd_node_new_relative_uri(
+		"http://example.org/a/b/c/foo", base, NULL);
+	SerdNode* resolved = serd_node_resolve(rel, base);
+	assert(!strcmp(serd_node_get_string(resolved),
+	               "http://example.org/a/b/c/foo"));
 
-	serd_node_free(x_rel);
-	serd_node_free(x);
-	serd_node_free(noup);
-	serd_node_free(up);
-	serd_node_free(abs);
+	serd_node_free(nil);
+	serd_node_free(nil2);
+	serd_node_free(not_a_uri);
+	serd_node_free(resolved);
 	serd_node_free(rel);
 	serd_node_free(base);
+	serd_node_free(root);
 }
 
 static void
@@ -489,13 +517,21 @@ test_env(void)
 {
 	SerdWorld* world = serd_world_new();
 
-	SerdNode* u   = serd_node_new_string(SERD_URI, "http://example.org/foo");
-	SerdNode* b   = serd_node_new_string(SERD_CURIE, "invalid");
-	SerdNode* c   = serd_node_new_string(SERD_CURIE, "eg.2:b");
-	SerdNode* s   = serd_node_new_string(SERD_LITERAL, "hello");
-	SerdEnv*  env = serd_env_new(NULL);
+	SerdNode* hello = serd_node_new_string("hello\"");
+	SerdNode* u     = serd_node_new_uri("http://example.org/foo");
+	SerdNode* b     = serd_node_new_curie("invalid");
+	SerdNode* c     = serd_node_new_curie("eg.2:b");
+	SerdNode* s     = serd_node_new_string("hello");
+	SerdEnv*  env   = serd_env_new(NULL);
 	serd_env_set_prefix_from_strings(env, "eg.2", "http://example.org/");
 
+	assert(!serd_env_get_base_uri(env));
+	assert(serd_env_set_base_uri(env, NULL));
+	assert(!serd_env_get_base_uri(env));
+	assert(serd_env_set_base_uri(env, hello));
+	assert(!serd_env_get_base_uri(env));
+	serd_node_free(hello);
+
 	SerdStringView prefix;
 	SerdStringView suffix;
 	assert(serd_env_expand(env, b, &prefix, &suffix));
@@ -510,7 +546,7 @@ test_env(void)
 	assert(!strcmp(serd_node_get_string(xu), "http://example.org/foo"));
 	serd_node_free(xu);
 
-	SerdNode* badpre  = serd_node_new_string(SERD_CURIE, "hm:what");
+	SerdNode* badpre = serd_node_new_curie("hm:what");
 	SerdNode* xbadpre = serd_env_expand_node(env, badpre);
 	assert(!xbadpre);
 
@@ -520,7 +556,7 @@ test_env(void)
 
 	assert(serd_env_set_prefix(env, NULL, NULL));
 
-	SerdNode* lit = serd_node_new_string(SERD_LITERAL, "hello");
+	SerdNode* lit = serd_node_new_string("hello");
 	assert(serd_env_set_prefix(env, b, lit));
 
 	int n_prefixes = 0;
@@ -528,10 +564,9 @@ test_env(void)
 	serd_env_foreach(env, count_prefixes, &n_prefixes);
 	assert(n_prefixes == 1);
 
-	SerdNode*       shorter_uri = serd_node_new_string(SERD_URI, "urn:foo");
+	SerdNode*       shorter_uri = serd_node_new_uri("urn:foo");
 	const SerdNode* prefix_name = NULL;
 	assert(!serd_env_qualify(env, shorter_uri, &prefix_name, &suffix));
-
 	serd_node_free(shorter_uri);
 	serd_node_free(lit);
 	serd_node_free(badpre);
@@ -557,7 +592,6 @@ test_writer(const char* const path)
 	                                     SERD_TURTLE,
 	                                     (SerdStyle)0,
 	                                     env,
-	                                     NULL,
 	                                     (SerdWriteFunc)fwrite,
 	                                     fd);
 	assert(writer);
@@ -565,7 +599,7 @@ test_writer(const char* const path)
 	serd_writer_chop_blank_prefix(writer, "tmp");
 	serd_writer_chop_blank_prefix(writer, NULL);
 
-	SerdNode* lit = serd_node_new_string(SERD_LITERAL, "hello");
+	SerdNode* lit = serd_node_new_string("hello");
 
 	const SerdSink* iface = serd_writer_get_sink(writer);
 	assert(iface->base(iface->handle, lit));
@@ -574,9 +608,9 @@ test_writer(const char* const path)
 	assert(serd_writer_get_env(writer) == env);
 
 	uint8_t buf[] = { 0xEF, 0xBF, 0xBD, 0 };
-	SerdNode* s = serd_node_new_string(SERD_URI, "");
-	SerdNode* p = serd_node_new_string(SERD_URI, "http://example.org/pred");
-	SerdNode* o = serd_node_new_string(SERD_LITERAL, (char*)buf);
+	SerdNode* s = serd_node_new_uri("");
+	SerdNode* p = serd_node_new_uri("http://example.org/pred");
+	SerdNode* o = serd_node_new_string((char*)buf);
 
 	// Write 3 invalid statements (should write nothing)
 	const SerdNode* junk[][5] = { { s,    p,    NULL },
@@ -595,7 +629,7 @@ test_writer(const char* const path)
 			       junk[i][0], junk[i][1], junk[i][2]));
 	}
 
-	SerdNode* urn_Type = serd_node_new_uri_from_string("urn:Type", NULL, NULL);
+	SerdNode* urn_Type = serd_node_new_uri("urn:Type");
 
 	SerdNode* t = serd_node_new_literal((char*)buf, urn_Type, NULL);
 	SerdNode* l = serd_node_new_literal((char*)buf, NULL, "en");
@@ -616,16 +650,17 @@ test_writer(const char* const path)
 
 	// Write statements with bad UTF-8 (should be replaced)
 	const char bad_str[] = { (char)0xFF, (char)0x90, 'h', 'i', 0 };
-	SerdNode*  bad_lit   = serd_node_new_string(SERD_LITERAL, bad_str);
-	SerdNode*  bad_uri   = serd_node_new_string(SERD_URI, bad_str);
+	SerdNode*  bad_lit   = serd_node_new_string(bad_str);
+	SerdNode*  bad_uri   = serd_node_new_uri(bad_str);
 	assert(!iface->statement(iface->handle, 0, NULL, s, p, bad_lit));
 	assert(!iface->statement(iface->handle, 0, NULL, s, p, bad_uri));
-	serd_node_free(bad_lit);
+
 	serd_node_free(bad_uri);
+	serd_node_free(bad_lit);
 
 	// Write 1 valid statement
 	serd_node_free(o);
-	o = serd_node_new_string(SERD_LITERAL, "hello");
+	o = serd_node_new_string("hello");
 	assert(!iface->statement(iface->handle, 0, NULL, s, p, o));
 
 	serd_writer_free(writer);
@@ -640,9 +675,9 @@ test_writer(const char* const path)
 	// Test buffer sink
 	SerdBuffer buffer = { NULL, 0 };
 	writer = serd_writer_new(
-		world, SERD_TURTLE, (SerdStyle)0, env, NULL, serd_buffer_sink, &buffer);
+		world, SERD_TURTLE, (SerdStyle)0, env, serd_buffer_sink, &buffer);
 
-	o = serd_node_new_string(SERD_URI, "http://example.org/base");
+	o = serd_node_new_uri("http://example.org/base");
 	assert(!serd_writer_set_base_uri(writer, o));
 
 	serd_node_free(o);
@@ -665,7 +700,7 @@ test_reader(const char* path)
 	SerdReader* reader = serd_reader_new(world, SERD_TURTLE, &sink);
 	assert(reader);
 
-	SerdNode* g = serd_node_new_string(SERD_URI, "http://example.org/");
+	SerdNode* g = serd_node_new_uri("http://example.org/");
 	serd_reader_set_default_graph(reader, g);
 	serd_reader_add_blank_prefix(reader, "tmp");
 	serd_reader_add_blank_prefix(reader, NULL);
@@ -699,9 +734,11 @@ main(void)
 	test_node_equals();
 	test_node_from_string();
 	test_node_from_substring();
+	test_simple_node();
 	test_literal();
 	test_uri_from_string();
 	test_relative_uri();
+	test_uri_resolution();
 	test_blank();
 	test_env();
 	test_read_chunks();