Skip to content

Commit 30a4563

Browse files
committed
Fix inverted and non-inverted sections being rendered when the data is a non-empty array
1 parent eba3bf6 commit 30a4563

File tree

157 files changed

+31
-28
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+31
-28
lines changed

Labstache.lvproj

+6-2
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@
400400
<Item Name="Parse State Queue__jki_lib_state_machine4A668244C627608002181B7F01911EC7.vi" Type="VI" URL="/&lt;vilib&gt;/JKI/_VIPM API_internal_deps/Parse State Queue__jki_lib_state_machine4A668244C627608002181B7F01911EC7.vi"/>
401401
<Item Name="Parse String with TDs__ogtk4A668244C627608002181B7F01911EC7.vi" Type="VI" URL="/&lt;vilib&gt;/JKI/_VIPM API_internal_deps/Parse String with TDs__ogtk4A668244C627608002181B7F01911EC7.vi"/>
402402
<Item Name="Path to URL.vi" Type="VI" URL="/&lt;vilib&gt;/printing/PathToURL.llb/Path to URL.vi"/>
403+
<Item Name="Project File.vi" Type="VI" URL="/&lt;vilib&gt;/Field R&amp;D Services/Labricator/Toolkit/API/File Constants/Project File.vi"/>
403404
<Item Name="property -- cluster.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/Caraya/classes/Test Report.JUnit/property -- cluster.ctl"/>
404405
<Item Name="Read INI Cluster__ogtk4A668244C627608002181B7F01911EC7.vi" Type="VI" URL="/&lt;vilib&gt;/JKI/_VIPM API_internal_deps/Read INI Cluster__ogtk4A668244C627608002181B7F01911EC7.vi"/>
405406
<Item Name="Read Key (Variant)__ogtk4A668244C627608002181B7F01911EC7.vi" Type="VI" URL="/&lt;vilib&gt;/JKI/_VIPM API_internal_deps/Read Key (Variant)__ogtk4A668244C627608002181B7F01911EC7.vi"/>
@@ -417,6 +418,7 @@
417418
<Item Name="Set Enum String Value__ogtk4A668244C627608002181B7F01911EC7.vi" Type="VI" URL="/&lt;vilib&gt;/JKI/_VIPM API_internal_deps/Set Enum String Value__ogtk4A668244C627608002181B7F01911EC7.vi"/>
418419
<Item Name="Set String Value.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Set String Value.vi"/>
419420
<Item Name="Simple Error Handler.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Simple Error Handler.vi"/>
421+
<Item Name="Source Directory.vi" Type="VI" URL="/&lt;vilib&gt;/Field R&amp;D Services/Labricator/Toolkit/API/File Constants/Source Directory.vi"/>
420422
<Item Name="Space Constant.vi" Type="VI" URL="/&lt;vilib&gt;/dlg_ctls.llb/Space Constant.vi"/>
421423
<Item Name="Split Cluster TD__ogtk4A668244C627608002181B7F01911EC7.vi" Type="VI" URL="/&lt;vilib&gt;/JKI/_VIPM API_internal_deps/Split Cluster TD__ogtk4A668244C627608002181B7F01911EC7.vi"/>
422424
<Item Name="String to 1D Array__ogtk4A668244C627608002181B7F01911EC7.vi" Type="VI" URL="/&lt;vilib&gt;/JKI/_VIPM API_internal_deps/String to 1D Array__ogtk4A668244C627608002181B7F01911EC7.vi"/>
@@ -495,9 +497,10 @@
495497
<Property Name="Bld_localDestDir" Type="Path">../builds/Examples</Property>
496498
<Property Name="Bld_localDestDirType" Type="Str">relativeToProject</Property>
497499
<Property Name="Bld_previewCacheID" Type="Str">{E58C4568-1A4C-4802-82A7-8983AFD63A2D}</Property>
498-
<Property Name="Bld_version.build" Type="Int">12</Property>
500+
<Property Name="Bld_version.build" Type="Int">14</Property>
499501
<Property Name="Bld_version.major" Type="Int">1</Property>
500502
<Property Name="Bld_version.minor" Type="Int">1</Property>
503+
<Property Name="Bld_version.patch" Type="Int">1</Property>
501504
<Property Name="Destination[0].destName" Type="Str">Destination Directory</Property>
502505
<Property Name="Destination[0].path" Type="Path">../builds/Examples</Property>
503506
<Property Name="Destination[0].path.type" Type="Str">relativeToProject</Property>
@@ -571,9 +574,10 @@
571574
<Property Name="Bld_localDestDir" Type="Path">../builds/Toolkit</Property>
572575
<Property Name="Bld_localDestDirType" Type="Str">relativeToProject</Property>
573576
<Property Name="Bld_previewCacheID" Type="Str">{61C137C2-EF1A-43FC-968A-9BE44F5FC6F9}</Property>
574-
<Property Name="Bld_version.build" Type="Int">12</Property>
577+
<Property Name="Bld_version.build" Type="Int">14</Property>
575578
<Property Name="Bld_version.major" Type="Int">1</Property>
576579
<Property Name="Bld_version.minor" Type="Int">1</Property>
580+
<Property Name="Bld_version.patch" Type="Int">1</Property>
577581
<Property Name="Destination[0].destName" Type="Str">Destination Directory</Property>
578582
<Property Name="Destination[0].path" Type="Path">../builds/Toolkit</Property>
579583
<Property Name="Destination[0].path.type" Type="Str">relativeToProject</Property>

configs/Labstache.vipb

+13-25
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="2018" Created_Date="2018-07-05 09:51:50" Modified_Date="2019-10-04 15:53:41" Creator="cfield" Comments="" ID="b9cfa4fa0e52764e9c183050d613898c">
1+
<VI_Package_Builder_Settings Version="2018" Created_Date="2018-07-05 09:51:50" Modified_Date="2020-04-12 15:52:21" Creator="cfield" Comments="" ID="75a0f2fb36b8a4f1696e5c7b280e0a4f">
22
<Library_General_Settings>
33
<Package_File_Name>Field_RnD_Services_Labstache</Package_File_Name>
4-
<Library_Version>1.1.0.13</Library_Version>
4+
<Library_Version>1.1.1.15</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>..\builds</Library_Source_Folder>
77
<Library_Output_Folder>..\packages</Library_Output_Folder>
@@ -32,21 +32,9 @@
3232
<Copyright/>
3333
<Packager>Christopher R Field</Packager>
3434
<URL>http://www.fieldrndservices.com/</URL>
35-
<Release_Notes>### Added
35+
<Release_Notes>### Fixed
3636

37-
- Some tests for the Data project library VIs and Classes
38-
- Some tests for recursive partials
39-
40-
### Changed
41-
42-
- Partial loading to the rendering stage
43-
- Parsing partials to the rendering stage
44-
- Input and output descriptions to be consistent
45-
46-
### Fixed
47-
48-
- Recursive partials causing an infinite loop
49-
- Data stack searching from the bottom instead of the top</Release_Notes>
37+
- Inverted and Non-Inverted sections both rendering content if the data is a non-empty array</Release_Notes>
5038
</Description>
5139
<Destinations>
5240
<Toolkit_VIs>
@@ -296,7 +284,7 @@
296284
<Path>..\builds\Data</Path>
297285
<VI_Title/>
298286
</Items_Data>
299-
<GUID>1EE9CC7194752CA2F02FF4298F96C97F</GUID>
287+
<GUID>00E87710BFA790F577B54109A0691D4B</GUID>
300288
</Functions_Palette_Data>
301289
<Functions_Palette_Data>
302290
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -443,7 +431,7 @@
443431
<Path>..\builds\Lexer</Path>
444432
<VI_Title/>
445433
</Items_Data>
446-
<GUID>53D0BA73DAA7AAFB8A9A4FBA7651040F</GUID>
434+
<GUID>8EE328DF29C9B8516ACCE121F2D71ED9</GUID>
447435
</Functions_Palette_Data>
448436
<Functions_Palette_Data>
449437
<Parent_Palette_Index>1</Parent_Palette_Index>
@@ -674,7 +662,7 @@
674662
<Path>..\builds\Toolkit\Low-Level\Loaders\File\Write Search Path.vi</Path>
675663
<VI_Title>Write Search Path</VI_Title>
676664
</Items_Data>
677-
<GUID>5141DFB566874281A480BECADE3DD069</GUID>
665+
<GUID>064F62677CF693AFEA5160B531B420EC</GUID>
678666
</Functions_Palette_Data>
679667
<Functions_Palette_Data>
680668
<Parent_Palette_Index>1</Parent_Palette_Index>
@@ -737,7 +725,7 @@
737725
<Path>..\builds\Toolkit\Low-Level\Readers\String\Is Done.vi</Path>
738726
<VI_Title>Is Done</VI_Title>
739727
</Items_Data>
740-
<GUID>8215278C7DAE263C0EABD4CB8D2372EE</GUID>
728+
<GUID>8D4EB9A936955D08CAF7EC69F64D8086</GUID>
741729
</Functions_Palette_Data>
742730
<Functions_Palette_Data>
743731
<Parent_Palette_Index>1</Parent_Palette_Index>
@@ -800,7 +788,7 @@
800788
<Path>..\builds\Toolkit\Low-Level\Writers\String\New.vi</Path>
801789
<VI_Title>String Writer</VI_Title>
802790
</Items_Data>
803-
<GUID>C5EE33DAB8AEC7B9045E2B6CF386F43F</GUID>
791+
<GUID>C48A3FBF781859D4565D816E7124D79E</GUID>
804792
</Functions_Palette_Data>
805793
<Functions_Palette_Data>
806794
<Parent_Palette_Index>1</Parent_Palette_Index>
@@ -1031,7 +1019,7 @@
10311019
<Path>..\builds\Toolkit\Low-Level\Tokens\Contentable\Read Content.vi</Path>
10321020
<VI_Title>Read Content</VI_Title>
10331021
</Items_Data>
1034-
<GUID>FEE50578F0CA9AE01A01A7A9D954EAC5</GUID>
1022+
<GUID>9CAC422833F3E7090E836D27FEC52DA6</GUID>
10351023
</Functions_Palette_Data>
10361024
<Functions_Palette_Data>
10371025
<Parent_Palette_Index>1</Parent_Palette_Index>
@@ -1290,7 +1278,7 @@
12901278
<Path>..\builds\Toolkit\Low-Level\Nodes\Section\Read Inverted.vi</Path>
12911279
<VI_Title>Read Inverted</VI_Title>
12921280
</Items_Data>
1293-
<GUID>8F23EE7361B61DD2F4FE946BF64176F9</GUID>
1281+
<GUID>3DC11B7A659A8DA529B4D93364507CBC</GUID>
12941282
</Functions_Palette_Data>
12951283
<Functions_Palette_Data>
12961284
<Parent_Palette_Index>1</Parent_Palette_Index>
@@ -1353,7 +1341,7 @@
13531341
<Path>..\builds\Toolkit\Low-Level\Lexer\Run.vi</Path>
13541342
<VI_Title>Run</VI_Title>
13551343
</Items_Data>
1356-
<GUID>D5F51170E964DA88B2ECFC8940E81663</GUID>
1344+
<GUID>5D4D655DDC7EAFF04E1B6B3C7593E64F</GUID>
13571345
</Functions_Palette_Data>
13581346
<Functions_Palette_Data>
13591347
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -1612,7 +1600,7 @@
16121600
<Path>..\builds\Toolkit\Data\Datum\Read Type.vi</Path>
16131601
<VI_Title/>
16141602
</Items_Data>
1615-
<GUID>AF45F3007918188C41B1D1F91AE1C6F1</GUID>
1603+
<GUID>BAD9FAE334D60932FCA4243B819545C7</GUID>
16161604
</Functions_Palette_Data>
16171605
</Library_Palette_Definition>
16181606
</VI_Package_Builder_Settings>

docs/CHANGELOG.md

+6
-1 Bytes
-155 Bytes
-154 Bytes
-154 Bytes
-1 Bytes
0 Bytes
0 Bytes
-1 Bytes
-4 Bytes
-4 Bytes
680 Bytes
Binary file not shown.
-4 Bytes
Binary file not shown.
Binary file not shown.
21.8 KB
Binary file not shown.

tests/Render/Render False Section.vi

412 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-20.4 KB
Binary file not shown.

tests/Render/Render.lvlib

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,15 @@
1212
<Item Name="Render Comment-Text.vi" Type="VI" URL="../Render Comment-Text.vi"/>
1313
<Item Name="Render Comment.vi" Type="VI" URL="../Render Comment.vi"/>
1414
<Item Name="Render Delimiter.vi" Type="VI" URL="../Render Delimiter.vi"/>
15+
<Item Name="Render Empty List Section.vi" Type="VI" URL="../Render Empty List Section.vi"/>
1516
<Item Name="Render Escaped Tag-Text.vi" Type="VI" URL="../Render Escaped Tag-Text.vi"/>
1617
<Item Name="Render Escaped Tag.vi" Type="VI" URL="../Render Escaped Tag.vi"/>
1718
<Item Name="Render False Section.vi" Type="VI" URL="../Render False Section.vi"/>
18-
<Item Name="Render Inverted Section.vi" Type="VI" URL="../Render Inverted Section.vi"/>
19+
<Item Name="Render Inverted Section with Boolean False Pair.vi" Type="VI" URL="../Render Inverted Section with Boolean False Pair.vi"/>
20+
<Item Name="Render Inverted Section with Empty Array Object.vi" Type="VI" URL="../Render Inverted Section with Empty Array Object.vi"/>
21+
<Item Name="Render Inverted Section with Empty Map Object Array.vi" Type="VI" URL="../Render Inverted Section with Empty Map Object Array.vi"/>
22+
<Item Name="Render Inverted Section with Null Array.vi" Type="VI" URL="../Render Inverted Section with Null Array.vi"/>
23+
<Item Name="Render Inverted Section with Null.vi" Type="VI" URL="../Render Inverted Section with Null.vi"/>
1924
<Item Name="Render Non-Empty List Section.vi" Type="VI" URL="../Render Non-Empty List Section.vi"/>
2025
<Item Name="Render Non-False Section.vi" Type="VI" URL="../Render Non-False Section.vi"/>
2126
<Item Name="Render Non-False Value Section.vi" Type="VI" URL="../Render Non-False Value Section.vi"/>

tests/Render/Run All.vi

2.48 KB
Binary file not shown.

0 commit comments

Comments
 (0)