tpmkms_4wp 9.5.1-beta.10 → 9.5.1-beta.11

package/common/can.js

@@ -100,7 +100,7 @@ const config = {
           ]
         },
         { "apply": true, "operator": "operator", "set": "context" },
-        { "apply": true, "bridge": "{ ...context, interpolate: [context.interpolate[2], { property: 'can' }, { property: 'be' }, context.interpolate[1], { property: 'by' }, context.interpolate[0]] }", "set": "context" },
+        { "apply": true, "bridge": "{ ...context, passive: true, interpolate: [context.interpolate[2], { property: 'can' }, { property: 'be' }, context.interpolate[1], { property: 'by' }, context.interpolate[0]] }", "set": "context" },
         // { "apply": true, "bridge": "{ ...context, interpolate: [context.interpolate[2], context.interpolate[0], context.interpolate[1]] }", set: "context" },
       ],
     },
@@ -112,7 +112,7 @@ const config = {
         // { "apply": true, "bridge": "{ ...after[1], can: operator, operator: after[1], interpolate: [{ property: 'can' }, { property: 'operator' }] }", "set": "operator" },
         { "apply": true, "bridge": "{ ...after[2], can: operator, be: after[1], operator: after[2], by: after[3] }", "set": "operator" },
         { "apply": true, "operator": "operator", "set": "context" },
-        { "apply": true, "bridge": "{ ...context, interpolate: [context.interpolate[0], { property: 'can' }, context.interpolate[2], { property: 'be' }, context.interpolate[1], { property: 'by' }] }", "set": "context" },
+        { "apply": true, "bridge": "{ ...context, passive: true, interpolate: [context.interpolate[0], { property: 'can' }, context.interpolate[2], { property: 'be' }, context.interpolate[1], { property: 'by' }] }", "set": "context" },
         // { "apply": true, "bridge": "{ ...context, interpolate: [context.interpolate[2], context.interpolate[0], context.interpolate[1]] }", set: "context" },
       ],
     },
@@ -177,7 +177,9 @@ knowledgeModule( {
     name: './can.test.json',
     contents: can_tests,
     checks: {
-      context: [defaultContextCheck()],
+      context: [
+        defaultContextCheck({ extra: ['can', 'evalue', 'makeable', 'maker', 'operator', 'interpolate', 'number', 'property'] }),
+      ],
     },
   },
   template: {

package/common/colors.instance.json

@@ -3586,20 +3586,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -35827,20 +35813,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "is",

package/common/dates.instance.json

@@ -3401,20 +3401,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -11765,20 +11751,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -15868,20 +15840,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -18843,48 +18801,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "setIdSuffix",

package/common/dialogues.js

@@ -56,7 +56,6 @@ const config = {
 
     "(([queryable]) [is|] ([queryable|]))",
     "([isQuery|] ([queryable]) ([queryable]))",
-    // "(([queryable]) [is:isEdBridge|is,are] ([isEdAble|]))",
     // who is the car owned by
     "(([queryable]) [(<isEd|> ([isEdAble|]))])",
 
@@ -68,26 +67,16 @@ const config = {
     "([isEdee|])",
     "([isEder|])",
 
-    // "([nevermind])",
-    // { pattern: "([nevermindTestSetup] (allowed))", scope: "testing" },
     "([why])",
     "([reason])",
-    // "([thisitthat|])",
-    // "([it])",
-    // "([this])",
-    // "([that])",
 
     "(<what> ([whatAble|]))",
     "([what:optional])",
-    // "(<the|> ([theAble|]))",
-    // "(<a|a,an> ([theAble|]))",
-    // "([unknown])",
 
     "([be] ([briefOrWordy|]))",
 
     "([([canBeQuestion])])",
     "(([canBeQuestion/1,2]) <questionMark|>)",
-    // "(([is/2]) <questionMark|>)",
 
     "(([what]) [(<does|> ([doesAble|]))])",
     "([canBeDoQuestion])",
@@ -101,46 +90,29 @@ const config = {
 
     "([to] ([toAble|]))",
   ],
-  associations: {
-    positive: [
-      { context: [['unknown', 0], ['isEdAble', 0]], choose: 1 },
-      { context: [['isQuery', 0], ['a', 0], ['unknown', 0], ['a', 0], ['unknown', 0]], choose: { index: 0, increment: true } },
-
-      { context: [["unknown",0],["isEd",0],["isEdAble",0],["by",0],["unknown",0]], choose: { index: 0, increment: true } },
-      { context: [["unknown",0],["isEd",0],["isEdAble",0],["by",1]], choose: { index: 0, increment: true } },
-      { context: [["unknown",0],["isEd",0],["isEdAble",0]], choose: { index: 0, increment: true } },
-
-
-      // ...listorama('unknown'),
-      // ...listorama('queryable'),
-      { context: [['unknown', 0], ['list', 0], ['unknown', 0]], choose: 0 },
-      { context: [['unknown', 0], ['list', 0], ['unknown', 1]], choose: 0 },
-      { context: [['unknown', 1], ['list', 0], ['unknown', 0]], choose: 0 },
-      { context: [['unknown', 1], ['list', 0], ['unknown', 1]], choose: 0 },
-
-      { context: [['queryable', 0], ['list', 0], ['unknown', 0]], choose: 1 },
-      { context: [['queryable', 0], ['list', 0], ['unknown', 1]], choose: 1 },
-      { context: [['queryable', 1], ['list', 0], ['unknown', 0]], choose: 1 },
-      { context: [['queryable', 1], ['list', 0], ['unknown', 1]], choose: 1 },
-
-      { context: [['unknown', 0], ['list', 0], ['queryable', 0]], choose: 2 },
-      { context: [['unknown', 0], ['list', 0], ['queryable', 1]], choose: 2 },
-      { context: [['unknown', 1], ['list', 0], ['queryable', 0]], choose: 2 },
-      { context: [['unknown', 1], ['list', 0], ['queryable', 1]], choose: 2 },
-
-      { context: [['queryable', 0], ['list', 0], ['queryable', 0]], choose: 0 },
-      { context: [['queryable', 0], ['list', 0], ['queryable', 1]], choose: 0 },
-      { context: [['queryable', 1], ['list', 0], ['queryable', 0]], choose: 0 },
-      { context: [['queryable', 1], ['list', 0], ['queryable', 1]], choose: 0 },
-    ]
-  },
   bridges: [
     {
       id: 'thatVerb',
       before: ['verb'],
-      // bridge: "{ ...after[0], verb: after[0], that: operator, generate: ['that', 'verb'], localPriorities: { before: [\"verb\"] }, bridge_override: { operator: after[0].marker, bridge: '{ ...bridge.subject, postModifiers: [\"conditions\"], generate: append(before[0].generate, concatm(\"thatClause.\", operator.generate)), thatClause: bridge, conditions: append(after[0].conditions, [bridge]) }' } }",
-      // bridge: "{ ...after[0], verb: after[0], that: operator, generate: ['that', 'verb'], localPriorities: { before: [\"verb\"] }, bridge_override: { operator: after[0].marker, bridge: '{ ...bridge.subject, postModifiers: [\"conditions\"], generate: concatm(\"thatClause.\", bridge.generate), thatClause: bridge, conditions: append(bridge.subject.conditions, [bridge]) }' } }",
-      bridge: "{ ...after[0], verb: after[0], that: operator, generate: ['that', 'verb'], localPriorities: { actLike: [\"subordinatedVerb\", 0] }, bridge_override: { operator: after[0].marker, bridge: '{ ...bridge.subject, postModifiers: [\"conditions\"], modifiers: [], generate: concatm(\"thatClause.\", bridge.generate), thatClause: bridge, conditions: append(bridge.subject.conditions, [bridge]) }' } }",
+      bridge: `
+      { 
+        ...after[0], 
+        verb: after[0], 
+        that: operator, 
+        generate: ['that', 'verb'], 
+        localPriorities: { actLike: ["subordinatedVerb", 0] }, 
+        bridge_override: { 
+          operator: after[0].marker, 
+          bridge: '{ 
+            ...bridge.subject, 
+            postModifiers: ["conditions"], 
+            modifiers: [], 
+            generate: concatm("thatClause.", bridge.generate), 
+            thatClause: bridge, 
+            conditions: append(bridge.subject.conditions, [bridge]) 
+          }' 
+        } 
+      }`,
     },
 
     {
@@ -245,40 +217,7 @@ const config = {
     { id: "canBeDoQuestion", level: 2, bridge: "{ ...next(operator) }" },
     { id: "doesAble", level: 0, bridge: "{ ...next(operator) }" },
     { id: "doesAble", level: 1, bridge: "{ ...next(operator), before: before[0] }" },
-    // { id: "does", level: 0, bridge: "{ query: true, wantsTruthValue: true, what: operator.marker, ...context, number: operator.number, object.number: operator.number }*" },
     { id: "does", level: 0, bridge: "{ query: true, what: operator.marker, ...context, number: operator.number, object.number: operator.number }*" },
-
-    /*
-    { 
-      id: 'the', 
-      level: 0, 
-      bridge: '{ ...after[0], focusableForPhrase: true, pullFromContext: true, concept: true, wantsValue: true, determiner: "the", modifiers: append(["determiner"], after[0].modifiers)}' 
-    },
-    { 
-      id: "a", 
-      level: 0, 
-      // bridge: "{ ...after[0], pullFromContext: false, instance: true, concept: true, number: 'one', wantsValue: true, determiner: operator, modifiers: append(['determiner'], after[0].modifiers) }" 
-      bridge: "{ ...after[0], pullFromContext: false, concept: true, number: 'one', wantsValue: true, determiner: operator, modifiers: append(['determiner'], after[0].modifiers) }" 
-    },
-    */
-    /*
-    { 
-      id: "theAble", 
-      children: ['noun'],
-      bridge: "{ ...next(operator) }" 
-    },
-    */
-
-    // TODO make this hierarchy thing work
-    /*
-    { 
-      id: "thisitthat", 
-      level: 0, 
-      isA: ['queryable'], 
-      before: ['verby'],
-      bridge: "{ ...next(operator) }" 
-    },
-    */
     { 
       id: "why", 
       level: 0, 
@@ -288,26 +227,6 @@ const config = {
       id: "reason", 
       isA: ['theAble', 'queryable'], 
     },
-    /*
-    { 
-      id: "it", 
-      level: 0, 
-      isA: ['thisitthat'], 
-      bridge: "{ ...next(operator), pullFromContext: true, unknown: true, determined: true }" 
-    },
-    { 
-      id: "this", 
-      level: 0, 
-      isA: ['thisitthat'], 
-      bridge: "{ ...next(operator), unknown: true, pullFromContext: true }" 
-    },
-    { 
-      id: "that", 
-      level: 0, 
-      isA: ['thisitthat'], 
-      bridge: "{ ...next(operator), unknown: true, pullFromContext: true }" 
-    },
-    */
   ],
   words: {
     "literals": {
@@ -348,12 +267,9 @@ const config = {
     ['it', 'pronoun'],
     ['this', 'pronoun'],
     ['questionMark', 'punctuation'],
-    // ['questionMark', 'isEd'],
     ['a', 'article'],
     ['the', 'article'],
-    // ['unknown', 'theAble'],
     ['theAble', 'queryable'],
-    // ['unknown', 'queryable'],
     ['it', 'queryable'],
     ['what', 'queryable'],
     ['whatAble', 'queryable'],

package/common/edible.instance.json

@@ -6462,20 +6462,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -24414,20 +24400,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -68722,34 +68694,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "is",