tpmkms_4wp 7.12.8-beta.4 → 7.12.8-beta.6

package/common/animals.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [
+  "configs": [
     "birds and mammals are animals",
     "mammals have ears",
     "mammals have hair",
@@ -394,26 +394,26 @@
             "value": [
               {
                 "marker": "type",
+                "value": "birds",
+                "word": "birds",
+                "text": "birds",
                 "range": {
                   "start": 0,
                   "end": 4
                 },
-                "word": "birds",
-                "text": "birds",
-                "value": "birds",
                 "unknown": true,
                 "dead": true,
                 "level": 1
               },
               {
                 "marker": "type",
+                "value": "mammals",
+                "word": "mammals",
+                "text": "mammals",
                 "range": {
                   "start": 10,
                   "end": 16
                 },
-                "word": "mammals",
-                "text": "mammals",
-                "value": "mammals",
                 "unknown": true,
                 "dead": true,
                 "level": 1
@@ -423,13 +423,13 @@
           },
           "two": {
             "marker": "unknown",
+            "value": "animals",
+            "word": "animals",
+            "text": "animals",
             "range": {
               "start": 22,
               "end": 28
             },
-            "word": "animals",
-            "text": "animals",
-            "value": "animals",
             "unknown": true,
             "dead": true,
             "types": [
@@ -950,13 +950,13 @@
           },
           "property": {
             "marker": "property",
+            "value": "ears",
+            "word": "ears",
+            "text": "ears",
             "range": {
               "start": 13,
               "end": 16
             },
-            "word": "ears",
-            "text": "ears",
-            "value": "ears",
             "unknown": true,
             "dead": true,
             "types": [
@@ -1022,16 +1022,6 @@
             1
           ]
         ],
-        [
-          [
-            "have",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "have",
@@ -1474,13 +1464,13 @@
           },
           "property": {
             "marker": "property",
+            "value": "hair",
+            "word": "hair",
+            "text": "hair",
             "range": {
               "start": 13,
               "end": 16
             },
-            "word": "hair",
-            "text": "hair",
-            "value": "hair",
             "unknown": true,
             "dead": true,
             "types": [
@@ -1546,16 +1536,6 @@
             1
           ]
         ],
-        [
-          [
-            "have",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "have",
@@ -2028,13 +2008,13 @@
           },
           "property": {
             "marker": "property",
+            "value": "wings",
+            "word": "wings",
+            "text": "wings",
             "range": {
               "start": 18,
               "end": 22
             },
-            "word": "wings",
-            "text": "wings",
-            "value": "wings",
             "unknown": true,
             "dead": true,
             "types": [
@@ -2122,16 +2102,6 @@
             1
           ]
         ],
-        [
-          [
-            "have",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "have",
@@ -2574,13 +2544,13 @@
           },
           "property": {
             "marker": "property",
+            "value": "skin",
+            "word": "skin",
+            "text": "skin",
             "range": {
               "start": 13,
               "end": 16
             },
-            "word": "skin",
-            "text": "skin",
-            "value": "skin",
             "unknown": true,
             "dead": true,
             "types": [
@@ -2646,16 +2616,6 @@
             1
           ]
         ],
-        [
-          [
-            "have",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "have",
@@ -3098,13 +3058,13 @@
           },
           "property": {
             "marker": "property",
+            "value": "eyes",
+            "word": "eyes",
+            "text": "eyes",
             "range": {
               "start": 13,
               "end": 16
             },
-            "word": "eyes",
-            "text": "eyes",
-            "value": "eyes",
             "unknown": true,
             "dead": true,
             "types": [
@@ -3170,16 +3130,6 @@
             1
           ]
         ],
-        [
-          [
-            "have",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "have",
@@ -3622,13 +3572,13 @@
           },
           "property": {
             "marker": "property",
+            "value": "wings",
+            "word": "wings",
+            "text": "wings",
             "range": {
               "start": 11,
               "end": 15
             },
-            "word": "wings",
-            "text": "wings",
-            "value": "wings",
             "unknown": true,
             "dead": true,
             "types": [
@@ -3694,16 +3644,6 @@
             1
           ]
         ],
-        [
-          [
-            "have",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "have",
@@ -4146,13 +4086,13 @@
           },
           "property": {
             "marker": "property",
+            "value": "beaks",
+            "word": "beaks",
+            "text": "beaks",
             "range": {
               "start": 11,
               "end": 15
             },
-            "word": "beaks",
-            "text": "beaks",
-            "value": "beaks",
             "unknown": true,
             "dead": true,
             "types": [
@@ -4218,16 +4158,6 @@
             1
           ]
         ],
-        [
-          [
-            "have",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "have",
@@ -4849,52 +4779,52 @@
             "value": [
               {
                 "marker": "unknown",
+                "value": "humans",
+                "word": "humans",
+                "text": "humans",
                 "range": {
                   "start": 0,
                   "end": 5
                 },
-                "word": "humans",
-                "text": "humans",
-                "value": "humans",
                 "unknown": true,
                 "dead": true,
                 "level": 1
               },
               {
                 "marker": "unknown",
+                "value": "bats",
+                "word": "bats",
+                "text": "bats",
                 "range": {
                   "start": 7,
                   "end": 10
                 },
-                "word": "bats",
-                "text": "bats",
-                "value": "bats",
                 "unknown": true,
                 "dead": true,
                 "level": 1
               },
               {
                 "marker": "unknown",
+                "value": "felines",
+                "word": "felines",
+                "text": "felines",
                 "range": {
                   "start": 12,
                   "end": 18
                 },
-                "word": "felines",
-                "text": "felines",
-                "value": "felines",
                 "unknown": true,
                 "dead": true,
                 "level": 2
               },
               {
                 "marker": "unknown",
+                "value": "canines",
+                "word": "canines",
+                "text": "canines",
                 "range": {
                   "start": 24,
                   "end": 30
                 },
-                "word": "canines",
-                "text": "canines",
-                "value": "canines",
                 "unknown": true,
                 "dead": true,
                 "level": 2
@@ -5787,52 +5717,52 @@
             "value": [
               {
                 "marker": "unknown",
+                "value": "owls",
+                "word": "owls",
+                "text": "owls",
                 "range": {
                   "start": 0,
                   "end": 3
                 },
-                "word": "owls",
-                "text": "owls",
-                "value": "owls",
                 "unknown": true,
                 "dead": true,
                 "level": 1
               },
               {
                 "marker": "unknown",
+                "value": "eagles",
+                "word": "eagles",
+                "text": "eagles",
                 "range": {
                   "start": 5,
                   "end": 10
                 },
-                "word": "eagles",
-                "text": "eagles",
-                "value": "eagles",
                 "unknown": true,
                 "dead": true,
                 "level": 1
               },
               {
                 "marker": "unknown",
+                "value": "pidgeons",
+                "word": "pidgeons",
+                "text": "pidgeons",
                 "range": {
                   "start": 12,
                   "end": 19
                 },
-                "word": "pidgeons",
-                "text": "pidgeons",
-                "value": "pidgeons",
                 "unknown": true,
                 "dead": true,
                 "level": 2
               },
               {
                 "marker": "unknown",
+                "value": "parrots",
+                "word": "parrots",
+                "text": "parrots",
                 "range": {
                   "start": 25,
                   "end": 31
                 },
-                "word": "parrots",
-                "text": "parrots",
-                "value": "parrots",
                 "unknown": true,
                 "dead": true,
                 "level": 2
@@ -6658,13 +6588,13 @@
           "one": {
             "number": "many",
             "marker": "unknown",
+            "value": "cats",
+            "word": "cats",
+            "text": "cats",
             "range": {
               "start": 0,
               "end": 15
             },
-            "word": "cats",
-            "text": "cats",
-            "value": "cats",
             "unknown": true,
             "dead": true,
             "types": [
@@ -7530,26 +7460,26 @@
             "value": [
               {
                 "marker": "unknown",
+                "value": "dogs",
+                "word": "dogs",
+                "text": "dogs",
                 "range": {
                   "start": 0,
                   "end": 3
                 },
-                "word": "dogs",
-                "text": "dogs",
-                "value": "dogs",
                 "unknown": true,
                 "dead": true,
                 "level": 2
               },
               {
                 "marker": "unknown",
+                "value": "wolves",
+                "word": "wolves",
+                "text": "wolves",
                 "range": {
                   "start": 9,
                   "end": 14
                 },
-                "word": "wolves",
-                "text": "wolves",
-                "value": "wolves",
                 "unknown": true,
                 "dead": true,
                 "level": 2
@@ -8469,13 +8399,13 @@
           },
           "property": {
             "marker": "property",
+            "value": "wings",
+            "word": "wings",
+            "text": "wings",
             "range": {
               "start": 10,
               "end": 14
             },
-            "word": "wings",
-            "text": "wings",
-            "value": "wings",
             "unknown": true,
             "dead": true,
             "types": [
@@ -8541,16 +8471,6 @@
             1
           ]
         ],
-        [
-          [
-            "have",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "have",
@@ -9008,86 +8928,6 @@
         1
       ]
     ],
-    [
-      [
-        "have",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "have",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "have",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "have",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "have",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "have",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "have",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "have",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "have",

package/common/animals.js

@@ -5,7 +5,7 @@ const animals_tests = require('./animals.test.json')
 const animals_instance = require('./animals.instance.json')
 
 const template = {
-  queries: [
+  configs: [
     "birds and mammals are animals",
     "mammals have ears",
     "mammals have hair",

package/common/avatar.js

@@ -22,11 +22,13 @@ let configStruct = {
   ],
 
   words: {
-    // TODO use pronoun 
-    "my": [{ id: 'objectPrefix', initial: "{ variable: true, value: 'other', possessive: true }" }],
-    "your": [{ id: 'objectPrefix', initial: "{ variable: true, value: 'self', possessive: true }" }],
-    "you": [{ id: 'self', initial: "{ variable: true, value: 'self' }" }],
-    "i": [{ id: 'self', initial: "{ variable: true, value: 'speaker' }" }],
+    "literals": {
+      // TODO use pronoun 
+      "my": [{ id: 'objectPrefix', initial: "{ variable: true, value: 'other', possessive: true }" }],
+      "your": [{ id: 'objectPrefix', initial: "{ variable: true, value: 'self', possessive: true }" }],
+      "you": [{ id: 'self', initial: "{ variable: true, value: 'self' }" }],
+      "i": [{ id: 'self', initial: "{ variable: true, value: 'speaker' }" }],
+    }
   },
 
   generators: [

package/common/characters.js

@@ -40,11 +40,13 @@ let configStruct = {
     { id: 'help', level: 0, bridge: "{ ...next(operator)  }" },
   ],
   "words": {
-    "sally": [{"id": "character", development: true, "initial": "{ value: 'sally' }" }],
-    "bob": [{"id": "character", development: true, "initial": "{ value: 'bob' }" }],
-    //"product1": [{"id": "reportObject", "initial": "{ value: 'api1' }" }],
-    //"api2": [{"id": "reportObject", "initial": "{ value: 'api2' }" }],
-    //" ([0-9]+)": [{"id": "amount", "initial": "{ value: int(group[0]) }" }],
+    "literals": {
+      "sally": [{"id": "character", development: true, "initial": "{ value: 'sally' }" }],
+      "bob": [{"id": "character", development: true, "initial": "{ value: 'bob' }" }],
+      //"product1": [{"id": "reportObject", "initial": "{ value: 'api1' }" }],
+      //"api2": [{"id": "reportObject", "initial": "{ value: 'api2' }" }],
+      //" ([0-9]+)": [{"id": "amount", "initial": "{ value: int(group[0]) }" }],
+    },
   },
 
   generators: [