pdc: breaking changes; namespaced key expression is removed, fixes when used with scoped variables

Author: devdinc

scripts/libs/pdc.sk

@@ -72,11 +72,10 @@ local function coerce_pdt_value(pdt: object, value: object) :: object:
     return {_none}
 
 
-expression [devdinc] %namespacedkey% [with]in %object%[ for %-object%]:
+expression [devdinc] [namespaced]( |-)key %string% [with]in %object%[ for %-object%]:
     parse:
-        set {_key} to expr-1
         set {_pdt} to expr-3
-
+        
         if any:
             "%{_pdt}%" contains "[devdinc] (pdt|[persistent data ]type)"
             "%{_pdt}%" contains "PersistentDataType"
@@ -86,7 +85,7 @@ expression [devdinc] %namespacedkey% [with]in %object%[ for %-object%]:
             continue
 
     get:
-        set {_key} to expr-1
+        set {_key} to NamespacedKey.fromString(expr-1, null) 
         set {_pdc} to expr-2.getPersistentDataContainer() if expr-2 is instance of PersistentDataHolder else expr-2
         set {_pdt} to expr-3
 
@@ -102,7 +101,7 @@ expression [devdinc] %namespacedkey% [with]in %object%[ for %-object%]:
                 loop scoped {-primitives::str::*}:
                     if {_typeId} is loop-value:
                         set {_pdt} to {_i}th element of scoped {-primitives::pdt::*}
-                        return {_pdc}.get({_key}, {_pdt})
+                        return try {_pdc}.get({_key}, {_pdt}) # try is used for if the key does not exist
                     add 1 to {_i}
 
             else:
@@ -117,9 +116,8 @@ expression [devdinc] %namespacedkey% [with]in %object%[ for %-object%]:
         else:
             return {_pdc}.get({_key}, {_pdt})
 
-
     set:
-        set {_key} to expr-1
+        set {_key} to NamespacedKey.fromString(expr-1, null) 
         set {_pdc} to expr-2.getPersistentDataContainer() if expr-2 is instance of PersistentDataHolder else expr-2
         set {_pdt} to expr-3
 
@@ -167,7 +165,7 @@ expression [devdinc] %namespacedkey% [with]in %object%[ for %-object%]:
 
 
     delete:
-        set {_key} to expr-1
+        set {_key} to NamespacedKey.fromString(expr-1, null) 
         set {_pdc} to expr-2.getPersistentDataContainer() if expr-2 is instance of PersistentDataHolder else expr-2
         set {_pdt} to expr-3
 
@@ -178,13 +176,6 @@ expression [devdinc] %namespacedkey% [with]in %object%[ for %-object%]:
         {_pdc}.remove({_key})
 
 
-expression [devdinc] [namespaced]( |-)key %string%:
-    parse:
-        continue
-    get:
-        return NamespacedKey.fromString(expr-1, null)
-
-
 object property p[ersistent ]d[ata ]c[ontainer]:
     parse:
         continue

tests/pdc.sk

@@ -2,125 +2,114 @@ import:
     java.util.HashMap
 
 on load:
-    set scoped {-key} to namespaced-key "plugin:test_pdt"
+    set scoped {-key} to "plugin:test_pdt"
 
 after each test:
-    delete scoped {-key} within test-world if scoped {-key} is set
-
-test "pdc basic set/get with typed pdt":
-
-    set scoped {-key} within test-world for pdt integer to 42
-    assert scoped {-key} within test-world for pdt integer is 42 with "typed pdt get failed"
-
+    event-script is current script
+    delete namespaced-key scoped {-key} within test-world if scoped {-key} is set
+    
+# since we use after each test we have to use devdinc test pattern here
 
-test "pdc overwrite typed value":
+devdinc test "pdc basic set/get with typed pdt":
 
-    set scoped {-key} within test-world for pdt string to "a"
-    set scoped {-key} within test-world for pdt string to "b"
+    set namespaced-key scoped {-key} within test-world for pdt integer to 42
+    assert namespaced-key scoped {-key} within test-world for pdt integer is 42 with "typed pdt get failed"
 
-    assert scoped {-key} within test-world for pdt string is "b" with "overwrite failed"
+devdinc test "pdc overwrite typed value":
 
+    set namespaced-key scoped {-key} within test-world for pdt string to "a"
+    set namespaced-key scoped {-key} within test-world for pdt string to "b"
 
-test "pdc delete typed value":
-    set scoped {-key} within test-world for pdt long to 100
-    delete scoped {-key} within test-world for pdt long
+    assert namespaced-key scoped {-key} within test-world for pdt string is "b" with "overwrite failed"
 
-    assert scoped {-key} within test-world for pdt long is not set with "delete failed"
+devdinc test "pdc delete typed value":
+    set namespaced-key scoped {-key} within test-world for pdt long to 100
+    delete namespaced-key scoped {-key} within test-world for pdt long
 
+    assert namespaced-key scoped {-key} within test-world for pdt long is not set with "delete failed"
 
-test "pdc object serialization (byte_array implicit)":
+devdinc test "pdc object serialization (byte_array implicit)":
 
     set {_obj} to new HashMap()
     {_obj}.put("a", 1)
     {_obj}.put("b", 2)
 
-    set scoped {-key} within test-world to {_obj}
+    set namespaced-key scoped {-key} within test-world to {_obj}
 
-    set {_out} to scoped {-key} within test-world
+    set {_out} to namespaced-key scoped {-key} within test-world
     assert {_out}.get("a") is 1 with "object deserialize failed (a)"
     assert {_out}.get("b") is 2 with "object deserialize failed (b)"
 
+devdinc test "pdc remove object via null":
 
-test "pdc remove object via null":
+    set namespaced-key scoped {-key} within test-world to "temp"
+    set namespaced-key scoped {-key} within test-world to null
 
-    set scoped {-key} within test-world to "temp"
-    set scoped {-key} within test-world to null
+    assert namespaced-key scoped {-key} within test-world is not set with "object remove via null failed"
 
-    assert scoped {-key} within test-world is not set with "object remove via null failed"
-
-
-test "pdc holder vs direct pdc equivalence":
+devdinc test "pdc holder vs direct pdc equivalence":
     set {_pdc} to test-world's pdc
 
-    set scoped {-key} within test-world for pdt byte to 7
-    assert scoped {-key} within {_pdc} for pdt byte is 7 with "direct pdc access failed"
-
-
-test "pdc boolean pdt":
+    set namespaced-key scoped {-key} within test-world for pdt byte to 7
+    assert namespaced-key scoped {-key} within {_pdc} for pdt byte is 7 with "direct pdc access failed"
 
-    set scoped {-key} within test-world for pdt boolean to true
-    assert scoped {-key} within test-world for pdt boolean is true with "boolean pdt failed"
+devdinc test "pdc boolean pdt":
 
+    set namespaced-key scoped {-key} within test-world for pdt boolean to true
+    assert namespaced-key scoped {-key} within test-world for pdt boolean is true with "boolean pdt failed"
 
-test "pdc default object missing returns none":
+devdinc test "pdc default object missing returns none":
 
-    assert scoped {-key} within test-world is not set with "missing object did not return none"
+    assert namespaced-key scoped {-key} within test-world is not set with "missing object did not return none"
 
-test "pdc unspecified pdt boolean":
+devdinc test "pdc unspecified pdt boolean":
 
-    set scoped {-key} within test-world to true
-    assert scoped {-key} within test-world is true with "unspecified boolean failed"
+    set namespaced-key scoped {-key} within test-world to true
+    assert namespaced-key scoped {-key} within test-world is true with "unspecified boolean failed"
 
+devdinc test "pdc unspecified pdt byte":
 
-test "pdc unspecified pdt byte":
+    set namespaced-key scoped {-key} within test-world to 5
+    assert namespaced-key scoped {-key} within test-world is 5 with "unspecified byte failed"
 
-    set scoped {-key} within test-world to 5
-    assert scoped {-key} within test-world is 5 with "unspecified byte failed"
+devdinc test "pdc unspecified pdt short":
 
+    set namespaced-key scoped {-key} within test-world to 12
+    assert namespaced-key scoped {-key} within test-world is 12 with "unspecified short failed"
 
-test "pdc unspecified pdt short":
+devdinc test "pdc unspecified pdt integer":
 
-    set scoped {-key} within test-world to 12
-    assert scoped {-key} within test-world is 12 with "unspecified short failed"
+    set namespaced-key scoped {-key} within test-world to 123
+    assert namespaced-key scoped {-key} within test-world is 123 with "unspecified integer failed"
 
+devdinc test "pdc unspecified pdt long":
 
-test "pdc unspecified pdt integer":
+    set namespaced-key scoped {-key} within test-world to 123
+    assert namespaced-key scoped {-key} within test-world is 123 with "unspecified long failed"
 
-    set scoped {-key} within test-world to 123
-    assert scoped {-key} within test-world is 123 with "unspecified integer failed"
+devdinc test "pdc unspecified pdt float":
 
+    set namespaced-key scoped {-key} within test-world to 1.5
+    assert namespaced-key scoped {-key} within test-world is 1.5 with "unspecified float failed"
 
-test "pdc unspecified pdt long":
-
-    set scoped {-key} within test-world to 123
-    assert scoped {-key} within test-world is 123 with "unspecified long failed"
-
-
-test "pdc unspecified pdt float":
-
-    set scoped {-key} within test-world to 1.5
-    assert scoped {-key} within test-world is 1.5 with "unspecified float failed"
-
-
-test "pdc unspecified pdt double":
+devdinc test "pdc unspecified pdt double":
 
-    set scoped {-key} within test-world to 2.75
-    assert scoped {-key} within test-world is 2.75 with "unspecified double failed"
-
+    set namespaced-key scoped {-key} within test-world to 2.75
+    assert namespaced-key scoped {-key} within test-world is 2.75 with "unspecified double failed"
 
-test "pdc unspecified pdt string":
 
-    set scoped {-key} within test-world to "hello"
-    assert scoped {-key} within test-world is "hello" with "unspecified string failed"
+devdinc test "pdc unspecified pdt string":
 
+    set namespaced-key scoped {-key} within test-world to "hello"
+    assert namespaced-key scoped {-key} within test-world is "hello" with "unspecified string failed"
 
-test "pdc unspecified pdt tag_container":
+devdinc test "pdc unspecified pdt tag_container":
 
     set {_inner-pdc} to new pdc from test-world
-    set {_inner-key} to namespaced-key "plugin:inner_key"
-    set {_inner-key} within {_inner-pdc} for pdt integer to 9
+    set {_inner-key} to "plugin:inner_key"
+    set namespaced-key {_inner-key} within {_inner-pdc} for pdt integer to 9
 
-    set scoped {-key} within test-world to {_inner-pdc}
+    set namespaced-key scoped {-key} within test-world to {_inner-pdc}
 
-    set {_out-pdc} to scoped {-key} within test-world
-    assert {_inner-key} within {_out-pdc} for pdt integer is 9 with "unspecified tag_container failed"
+    set {_out-pdc} to namespaced-key scoped {-key} within test-world
+    assert namespaced-key {_inner-key} within {_out-pdc} for pdt integer is 9 with "unspecified tag_container failed"