csonpath 0.18.0__tar.gz → 0.19.0__tar.gz

{csonpath-0.18.0 → csonpath-0.19.0}/Makefile

@@ -101,6 +101,8 @@ cov:
 	rm -rf coverage-c coverage-c.html coverage-py coverage-rust build
 	find . -name '*.gcov' -delete
 	$(MAKE) CFLAGS='--coverage -O0 -g' LDFLAGS='--coverage' tests-c
+	$(MAKE) CFLAGS='--coverage -O0 -g' LDFLAGS='--coverage' csonpath
+	bash tests/cli/run.sh ./csonpath
 	CFLAGS='--coverage -O0' LDFLAGS='--coverage' python setup.py build_ext --inplace --force
 	python -m coverage run -m pytest
 	python -m coverage html -d coverage-py

{csonpath-0.18.0/csonpath.egg-info → csonpath-0.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csonpath
-Version: 0.18.0
+Version: 0.19.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev
@@ -30,6 +30,7 @@ Out of the box it ships with C backends for [json-c](https://github.com/json-c/j
 | Array index | `$.array[0]` | Access by zero-based index |
 | Wildcard `[*]` | `$.array[*].field` | Iterate all array elements |
 | Recursive descent `..` | `$..name` | Search recursively for a key |
+| Recursive descent wildcard `..*` | `$..*` | Return all descendants |
 | Union `,` (inside brackets) | `$['a','b']`, `$.array[0,1]`, `$.items[?n==1, ?n==2]` | Match all listed selectors at once |
 | OR fallback `\|` | `$.a \| $.b` | Try the left path first; fall back to the right one if it does not match. Only the first successful path is used. |
 | Filters | `$.items[?price > 10]` | Filter array elements |
@@ -37,6 +38,7 @@ Out of the box it ships with C backends for [json-c](https://github.com/json-c/j
 | Multiple filters (`&`) | `$.items[?a=1 & b=2]` | Combine conditions |
 | Subpath expressions | `$.obj[$.key]` | Use JSON values as dynamic path keys |
 | `@` current object | `$.items[?@.price > 10]` | Reference the current element in filters |
+| Type selectors | `$..["@odata.id"]@string()`, `$.*@integer()` | Filter matches by JSON type (`string`, `integer`, `null`) |
 
 ### Operations
 - **Find First** — retrieve the first match.

{csonpath-0.18.0 → csonpath-0.19.0}/README.md

@@ -21,6 +21,7 @@ Out of the box it ships with C backends for [json-c](https://github.com/json-c/j
 | Array index | `$.array[0]` | Access by zero-based index |
 | Wildcard `[*]` | `$.array[*].field` | Iterate all array elements |
 | Recursive descent `..` | `$..name` | Search recursively for a key |
+| Recursive descent wildcard `..*` | `$..*` | Return all descendants |
 | Union `,` (inside brackets) | `$['a','b']`, `$.array[0,1]`, `$.items[?n==1, ?n==2]` | Match all listed selectors at once |
 | OR fallback `\|` | `$.a \| $.b` | Try the left path first; fall back to the right one if it does not match. Only the first successful path is used. |
 | Filters | `$.items[?price > 10]` | Filter array elements |
@@ -28,6 +29,7 @@ Out of the box it ships with C backends for [json-c](https://github.com/json-c/j
 | Multiple filters (`&`) | `$.items[?a=1 & b=2]` | Combine conditions |
 | Subpath expressions | `$.obj[$.key]` | Use JSON values as dynamic path keys |
 | `@` current object | `$.items[?@.price > 10]` | Reference the current element in filters |
+| Type selectors | `$..["@odata.id"]@string()`, `$.*@integer()` | Filter matches by JSON type (`string`, `integer`, `null`) |
 
 ### Operations
 - **Find First** — retrieve the first match.

{csonpath-0.18.0 → csonpath-0.19.0/csonpath.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csonpath
-Version: 0.18.0
+Version: 0.19.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev
@@ -30,6 +30,7 @@ Out of the box it ships with C backends for [json-c](https://github.com/json-c/j
 | Array index | `$.array[0]` | Access by zero-based index |
 | Wildcard `[*]` | `$.array[*].field` | Iterate all array elements |
 | Recursive descent `..` | `$..name` | Search recursively for a key |
+| Recursive descent wildcard `..*` | `$..*` | Return all descendants |
 | Union `,` (inside brackets) | `$['a','b']`, `$.array[0,1]`, `$.items[?n==1, ?n==2]` | Match all listed selectors at once |
 | OR fallback `\|` | `$.a \| $.b` | Try the left path first; fall back to the right one if it does not match. Only the first successful path is used. |
 | Filters | `$.items[?price > 10]` | Filter array elements |
@@ -37,6 +38,7 @@ Out of the box it ships with C backends for [json-c](https://github.com/json-c/j
 | Multiple filters (`&`) | `$.items[?a=1 & b=2]` | Combine conditions |
 | Subpath expressions | `$.obj[$.key]` | Use JSON values as dynamic path keys |
 | `@` current object | `$.items[?@.price > 10]` | Reference the current element in filters |
+| Type selectors | `$..["@odata.id"]@string()`, `$.*@integer()` | Filter matches by JSON type (`string`, `integer`, `null`) |
 
 ### Operations
 - **Find First** — retrieve the first match.

{csonpath-0.18.0 → csonpath-0.19.0}/csonpath.h

@@ -89,6 +89,7 @@ enum csonpath_instuction_raw {
 	CSONPATH_INST_UNION_JMP,
 	CSONPATH_INST_UNION_END,
 	CSONPATH_INST_FIND_ALL,
+	CSONPATH_INST_TYPECHECK,
 	CSONPATH_INST_RANGE,
 	CSONPATH_INST_OR,
 	CSONPATH_INST_END,
@@ -118,6 +119,7 @@ static int csonpath_instuction_len[] = {
     1, /* E.5000 CSONPATH_INST_UNION_JMP */
     1, /* E.6 CSONPATH_INST_UNION_END */
     -1, /* F CSONPATH_INST_FIND_ALL */
+    2, /* F.1 CSONPATH_INST_TYPECHECK */
     1, /* 10 CSONPATH_INST_RANGE */
     1, /* 11 CSONPATH_INST_OR */
     1, /* 12 CSONPATH_INST_END */
@@ -149,6 +151,7 @@ CSONPATH_UNUSED static const char *csonpath_instuction_str[] = {
 	"UNION_JMP",
 	"UNION_END",
 	"FIND_ALL",
+	"TYPECHECK",
 	"RANGE",
 	"OR",
 	"END",
@@ -462,6 +465,27 @@ root_again:
 	}
 
 	switch (to_check) {
+	case '@':
+	  ++walker;
+	  if (!strncmp(walker, "string", 6)) {
+	    csonpath_push_char(cjp, CSONPATH_INST_TYPECHECK, inst_idx);
+	    csonpath_push_char(cjp, CSONPATH_STR, inst_idx);
+	    walker += 6;
+	  } else if (!strncmp(walker, "integer", 7)) {
+	    csonpath_push_char(cjp, CSONPATH_INST_TYPECHECK, inst_idx);
+	    csonpath_push_char(cjp, CSONPATH_INTEGER, inst_idx);
+	    walker += 7;
+	  } else if (!strncmp(walker, "null", 4)) {
+	    csonpath_push_char(cjp, CSONPATH_INST_TYPECHECK, inst_idx);
+	    csonpath_push_char(cjp, CSONPATH_NONE, inst_idx);
+	    walker += 4;
+	  } else {
+	    CSONPATH_COMPILE_ERR(tmp, walker - orig, "unknow type selector");
+	  }
+	  CSONPATH_SKIP('(', walker);
+	  CSONPATH_SKIP(')', walker);
+	  to_check = *walker;
+	  goto again;
 	case '[':
 	{
 	    int end;
@@ -925,10 +949,24 @@ root_again:
 	    if (*walker == '.') {
 		inst = CSONPATH_INST_FIND_ALL;
 		++walker;
+		if (*walker == '*') {
+		    ++walker;
+		    /*
+		     * Encode $..* as FIND_ALL followed by the GET_ALL byte and a NUL.
+		     * GET_ALL (0x0E) is a non-printable control character, so it can
+		     * never appear raw in a valid JSON key; this avoids collision with
+		     * real recursive-descent keys like $..name.
+		     */
+		    csonpath_push_char(cjp, CSONPATH_INST_FIND_ALL, inst_idx);
+		    csonpath_push_char(cjp, CSONPATH_INST_GET_ALL, inst_idx);
+		    csonpath_push_char(cjp, 0, inst_idx);
+		    to_check = *walker;
+		    goto again;
+		}
 	    } else if (*walker == '*') {
 		inst = CSONPATH_INST_GET_ALL;
 		++walker;
-		if (*walker != '.' && *walker != '[' && *walker != '\0') {
+		if (*walker != '.' && *walker != '[' && *walker != '\0' && *walker != '@') {
 		    CSONPATH_COMPILE_ERR(tmp, walker - orig, "unsuported characters '%c' after '*'", *walker);
 		    goto error;
 		}

{csonpath-0.18.0 → csonpath-0.19.0}/csonpath_do.h

@@ -145,13 +145,14 @@ static CSONPATH_DO_RET_TYPE csonpath_do_dotdot(const struct csonpath cjp[const s
     (void)ctx;
 
     CSONPATH_DO_FIND_ALL_PRE_LOOP;
+    const int is_wildcard = (unsigned char)walker[1] == CSONPATH_INST_GET_ALL;
     if (is_obj) {
 	const char *key;
 	CSONPATH_FOREACH_OBJ(tmp, el, key) {
 	    key_idx = (intptr_t)key;
 	    (void)key_idx;
 	    CSONPATH_DO_FOREACH_PRE_SET;
-	    if (!strcmp(key, walker + 1)) {
+	    if (is_wildcard || !strcmp(key, walker + 1)) {
 		if (!next_inst)
 		    next_inst = csonpath_walker_next_inst(walker);
 		tret = csonpath_do_internal(cjp, origin, el, tmp,
@@ -169,6 +170,14 @@ static CSONPATH_DO_RET_TYPE csonpath_do_dotdot(const struct csonpath cjp[const s
 	CSONPATH_FOREACH_ARRAY(tmp, el, key_idx) {
 	    (void)key_idx;
 	    CSONPATH_DO_FOREACH_PRE_SET;
+	    if (is_wildcard) {
+		if (!next_inst)
+		    next_inst = csonpath_walker_next_inst(walker);
+		tret = csonpath_do_internal(cjp, origin, el, tmp,
+					    next_inst
+					    CSONPATH_DO_EXTRA_ARGS_NEESTED);
+		CSONPATH_DO_FIND_ALL;
+	    }
 	    if (CSONPATH_IS_OBJ(el) || CSONPATH_IS_ARRAY(el)) {
 		tret = csonpath_do_dotdot(cjp, origin, el, tmp, walker
 					  CSONPATH_DO_EXTRA_ARGS_NEESTED);
@@ -415,6 +424,29 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(const struct csonpath cjp[const
 	    walker = owalker;
 	    break;
 	}
+	case CSONPATH_INST_TYPECHECK:
+	{
+	    int type = (unsigned char)walker[1];
+	    ++walker;
+	    switch (type) {
+	    case CSONPATH_STR:
+		if (!CSONPATH_IS_STR(tmp))
+		    return CSONPATH_NONE_FOUND_RET;
+		break;
+	    case CSONPATH_INTEGER:
+		if (!CSONPATH_IS_NUM(tmp))
+		    return CSONPATH_NONE_FOUND_RET;
+		break;
+	    case CSONPATH_NONE:
+		if (!CSONPATH_IS_NULL(tmp))
+		    return CSONPATH_NONE_FOUND_RET;
+		break;
+	    default:
+		CSONPATH_GETTER_ERR("unknown typecheck %d, is csonpath corrupted ?\n", type);
+		break;
+	    }
+	    break;
+	}
 	case CSONPATH_INST_GET_OBJ:
 	{
 	    CSONPATH_UNUSED const char *this_idx = &walker[1];

{csonpath-0.18.0 → csonpath-0.19.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "csonpath"
-version = "0.18.0"
+version = "0.19.0"
 readme = "README.md"
 
 [tool.setuptools]
@@ -27,7 +27,7 @@ test-command = "pytest {project}/tests/python"
 before-build = "choco install mingw -y"
 
 [tool.bumpversion]
-current_version = "0.18.0"
+current_version = "0.19.0"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"