From 3a411e9c5f66302eb8b1e2262e35bab0e6e095b5 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Wed, 5 Apr 2023 11:58:23 +0100 Subject: [PATCH] jsonset: support for other data types and documentation --- core/modules/filters/json-ops.js | 39 +++++++- .../test/tiddlers/tests/test-json-filters.js | 9 ++ editions/tw5.com/tiddlers/filters/jsonset.tid | 95 +++++++++++++++++++ 3 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 editions/tw5.com/tiddlers/filters/jsonset.tid diff --git a/core/modules/filters/json-ops.js b/core/modules/filters/json-ops.js index b4c5b3fee..f4b74e12d 100644 --- a/core/modules/filters/json-ops.js +++ b/core/modules/filters/json-ops.js @@ -69,9 +69,40 @@ exports["jsontype"] = function(source,operator,options) { }; exports["jsonset"] = function(source,operator,options) { - var indexes = operator.operands.slice(0,-1), - value = operator.operands[operator.operands.length - 1] || "", + var suffixes = operator.suffixes || [], + type = suffixes[0] && suffixes[0][0], + indexes = operator.operands.slice(0,-1), + value = operator.operands[operator.operands.length - 1], results = []; + if(operator.operands.length === 1 && operator.operands[0] === "") { + value = undefined; + } + switch(type) { + case "string": + // Use value unchanged + break; + case "boolean": + value = (value === "true" ? true : (value === "false" ? false : undefined)); + break; + case "number": + value = $tw.utils.parseNumber(value); + break; + case "array": + indexes = operator.operands; + value = []; + break; + case "object": + indexes = operator.operands; + value = {}; + break; + case "null": + indexes = operator.operands; + value = null; + break; + default: + // Use value unchanged + break; + } source(function(tiddler,title) { var data = $tw.utils.parseJSONSafe(title,title); if(data) { @@ -204,6 +235,10 @@ function getDataItem(data,indexes) { Given a JSON data structure, an array of index strings and a value, return the data structure with the value added at the end of the index chain. If any of the index strings are invalid then the JSON data structure is returned unmodified. If the root item is targetted then a different data object will be returned */ function setDataItem(data,indexes,value) { + // Ignore attempts to assign undefined + if(value === undefined) { + return data; + } // Check for the root item if(indexes.length === 0 || (indexes.length === 1 && indexes[0] === "")) { return value; diff --git a/editions/test/tiddlers/tests/test-json-filters.js b/editions/test/tiddlers/tests/test-json-filters.js index 4a451df80..3d0f16680 100644 --- a/editions/test/tiddlers/tests/test-json-filters.js +++ b/editions/test/tiddlers/tests/test-json-filters.js @@ -104,8 +104,17 @@ describe("json filter tests", function() { }); it("should support the jsonset operator", function() { + expect(wiki.filterTiddlers("[{First}jsonset[]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}}']); expect(wiki.filterTiddlers("[{First}jsonset[],[Antelope]]")).toEqual(['"Antelope"']); + expect(wiki.filterTiddlers("[{First}jsonset:number[],[not a number]]")).toEqual(['0']); expect(wiki.filterTiddlers("[{First}jsonset[id],[Antelope]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":"Antelope"}']); + expect(wiki.filterTiddlers("[{First}jsonset:notatype[id],[Antelope]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":"Antelope"}']); + expect(wiki.filterTiddlers("[{First}jsonset:boolean[id],[false]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":false}']); + expect(wiki.filterTiddlers("[{First}jsonset:boolean[id],[Antelope]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}}']); + expect(wiki.filterTiddlers("[{First}jsonset:number[id],[42]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":42}']); + expect(wiki.filterTiddlers("[{First}jsonset:null[id]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":null}']); + expect(wiki.filterTiddlers("[{First}jsonset:array[d],[f],[5]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null,[]]}}']); + expect(wiki.filterTiddlers("[{First}jsonset:object[d],[f],[5]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null,{}]}}']); expect(wiki.filterTiddlers("[{First}jsonset[missing],[id],[Antelope]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}}']); }); diff --git a/editions/tw5.com/tiddlers/filters/jsonset.tid b/editions/tw5.com/tiddlers/filters/jsonset.tid new file mode 100644 index 000000000..5e6b28e16 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/jsonset.tid @@ -0,0 +1,95 @@ +created: 20230405101444090 +modified: 20230405101444090 +tags: [[Filter Operators]] [[JSON Operators]] +title: jsonset Operator +caption: jsonset +op-purpose: set the value of a property in JSON strings +op-input: a selection of JSON strings +op-parameter: one or more indexes of the property to retrieve and sometimes a value to assign +op-output: the JSON strings with the specified property assigned + +<<.from-version "5.3.0">> See [[JSON in TiddlyWiki]] for background. + +The <<.op jsonset>> operator is used to set a property value in JSON strings. See also the following related operators: + +* <<.olink jsonget>> to retrieve the values of a property in JSON data +* <<.olink jsontype>> to retrieve the type of a JSON value +* <<.olink jsonindexes>> to retrieve the names of the fields of a JSON object, or the indexes of a JSON array +* <<.olink jsonextract>> to retrieve a JSON value as a string of JSON + +Properties within a JSON object are identified by a sequence of indexes. In the following example, the value at `[a]` is `one`, and the value at `[d][f][0]` is `five`. + +``` +{ + "a": "one", + "b": "", + "c": "three", + "d": { + "e": "four", + "f": [ + "five", + "six", + true, + false, + null + ], + "g": { + "x": "max", + "y": "may", + "z": "maize" + } + } +} +``` + +The following examples assume that this JSON data is contained in a variable called `jsondata`. + +The <<.op jsonset>> operator uses multiple operands to specify the indexes of the property to set. When used to assign strings the final operand is interpreted as the value to assign. For example: + +``` +[jsonset[d],[Jaguar]] --> {"a": "one","b": "","c": "three","d": "Jaguar"} +[jsonset[d],[f],[Panther]] --> {"a": "one","b": "","c": "three","d": "{"e": "four","f": "Panther","g": {"x": "max","y": "may","z": "maize"}}"} +``` + +Indexes can be dynamically composed from variables and transclusions: + +``` +[jsonset,{!!field},[0],{CurrentResult}] +``` + +The data type of the value to be assigned to the property can be specified with an optional suffix: + +|!Suffix |!Description | +|''string'' |The string is specified as the final operand | +|''boolean'' |The boolean value is true if the final operand is the string "true" and false if the final operand is the string "false". Any other value for the final string results in the property not being assigned | +|''number'' |The numeric value is taken from the final operand. Invalid numbers are interpreted as zero | +|''object'' |An empty object is assigned to the property. The final operand is not used as a value | +|''array'' |An empty array is assigned to the property. The final operand is not used as a value | +|''null'' |The special value null is assigned to the property. The final operand is not used as a value | + +For example: + +``` +Input string: +{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}} + +[jsonset[]] --> {"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}} +[jsonset[],[Antelope]] --> "Antelope" +[jsonset:number[],[not a number]] --> 0 +[jsonset[id],[Antelope]] --> {"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":"Antelope"} +[jsonset:notatype[id],[Antelope]] --> {"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":"Antelope"} +[jsonset:boolean[id],[false]] --> {"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":false} +[jsonset:boolean[id],[Antelope]] --> {"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}} +[jsonset:number[id],[42]] --> {"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":42} +[jsonset:null[id]] --> {"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":null} +[jsonset:array[d],[f],[5]] --> {"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null,[]]}} +[jsonset:object[d],[f],[5]] --> {"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null,{}]}} +[jsonset[missing],[id],[Antelope]] --> {"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}} +``` + +A subtlety is that the special case of a single operand sets the value of that operand as the new JSON string, entirely replacing the input object. If that operand is blank, the operation is ignored and no assignment takes place. Thus: + +``` +[jsonset[Panther]] --> "Panther" +[jsonset[]] --> {"a": "one","b": "","c": "three","d": "{"e": "four","f": ["five", "six", true, false, null],"g": {"x": "max","y": "may","z": "maize"}}"} +```