tpmkms_4wp 7.12.2-beta.3 → 7.12.2-beta.5

package/common/avatar.js

@@ -22,8 +22,9 @@ let configStruct = {
   ],
 
   words: {
-    "my": [{ id: 'objectPrefix', initial: "{ variable: true, value: 'other' }" }],
-    "your": [{ id: 'objectPrefix', initial: "{ variable: true, value: 'self' }" }],
+    // 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' }" }],
   },
@@ -39,14 +40,14 @@ let configStruct = {
        notes: 'paraphrase: add possession ending for your/my',
        priority: -1,
        where: where(),
-       match: ({context}) => !context.isResponse && context.possessive && ['self', 'other'].includes(context.value),
+       match: ({context}) => !(context.isResponse || context.audience == 'other' || context.responding) && context.possessive && ['self', 'other'].includes(context.value),
        apply: ({context, g}) => { return { "self": "your", "other": "my" }[context.value] },
     },
     {
        notes: 'not paraphrase: add possession ending for your/my',
        priority: -1,
        where: where(),
-       match: ({context}) => context.isResponse && context.possessive && ['self', 'other'].includes(context.value),
+       match: ({context}) => (context.isResponse || context.audience == 'other' || context.responding) && context.possessive && ['self', 'other'].includes(context.value),
        apply: ({context, g}) => { return { "self": "my", "other": "your" }[context.value] },
     },
   ],

package/common/crew.test.json

@@ -2413,7 +2413,7 @@
     ],
     "generatedParenthesized": [
       "",
-      "(((status) is ((not armed))))"
+      "((((the (status)) of (the (phasers))) is ((not armed))))"
     ],
     "metadata": {
       "opChoices": [
@@ -4171,12 +4171,12 @@
             },
             "word": "is"
           },
-          "generatedParenthesized": "(((status) is ((not armed))))",
+          "generatedParenthesized": "((((the (status)) of (the (phasers))) is ((not armed))))",
           "paraphrases": "what is the status of the phasers?",
           "paraphrasesParenthesized": "(((what) is ((the (status)) of (the (phasers))))?)",
           "responses": [
             "",
-            "status is not armed"
+            "the status of the phasers is not armed"
           ]
         },
         {
@@ -4232,7 +4232,7 @@
           "paraphrasesParenthesized": "(disarm (the (phasers)))",
           "responses": [
             "",
-            "status is not armed"
+            "the status of the phasers is not armed"
           ]
         },
         {
@@ -4771,7 +4771,7 @@
     "query": "disarm the phasers what is the status of the phasers",
     "responses": [
       "",
-      "status is not armed"
+      "the status of the phasers is not armed"
     ]
   },
   {
@@ -9922,7 +9922,7 @@
     ],
     "generatedParenthesized": [
       "",
-      "(((status) is ((armed))))"
+      "((((the (status)) of (the (photon) (torpedoes))) is ((armed))))"
     ],
     "metadata": {
       "opChoices": [
@@ -11864,11 +11864,11 @@
             },
             "word": "is"
           },
-          "generatedParenthesized": "(((status) is ((armed))))",
+          "generatedParenthesized": "((((the (status)) of (the (photon) (torpedoes))) is ((armed))))",
           "paraphrases": "what is the status of the photon torpedoes?",
           "paraphrasesParenthesized": "(((what) is ((the (status)) of (the (photon) (torpedoes))))?)",
           "responses": [
-            "status is armed"
+            "the status of the photon torpedoes is armed"
           ]
         },
         {
@@ -12583,7 +12583,7 @@
     "query": "the status of the photon torpedoes is armed\\nwhat is the status of the photon torpedoes",
     "responses": [
       "",
-      "status is armed"
+      "the status of the photon torpedoes is armed"
     ]
   },
   {
@@ -13048,7 +13048,7 @@
       }
     ],
     "generatedParenthesized": [
-      "(((types) are (((captains), (seconds) and (doctors)))))"
+      "((((the (types)) of (rank)) are (((captains), (seconds) and (doctors)))))"
     ],
     "metadata": {
       "opChoices": [
@@ -14586,11 +14586,11 @@
             },
             "word": "are"
           },
-          "generatedParenthesized": "(((types) are (((captains), (seconds) and (doctors)))))",
+          "generatedParenthesized": "((((the (types)) of (rank)) are (((captains), (seconds) and (doctors)))))",
           "paraphrases": "what are the types of rank?",
           "paraphrasesParenthesized": "(((what) are ((the (types)) of (rank)))?)",
           "responses": [
-            "types are captains, seconds and doctors"
+            "the types of rank are captains, seconds and doctors"
           ]
         },
         {
@@ -15186,7 +15186,7 @@
     ],
     "query": "what are the types of rank",
     "responses": [
-      "types are captains, seconds and doctors"
+      "the types of rank are captains, seconds and doctors"
     ]
   },
   {
@@ -15566,7 +15566,7 @@
       }
     ],
     "generatedParenthesized": [
-      "((((spock) (name)) is ((spock))))"
+      "(((((spock)'s) (name)) is ((spock))))"
     ],
     "metadata": {
       "opChoices": [
@@ -17008,11 +17008,11 @@
             },
             "word": "is"
           },
-          "generatedParenthesized": "((((spock) (name)) is ((spock))))",
+          "generatedParenthesized": "(((((spock)'s) (name)) is ((spock))))",
           "paraphrases": "what is spock's name?",
           "paraphrasesParenthesized": "(((what) is (((spock)'s) (name)))?)",
           "responses": [
-            "spock name is spock"
+            "spock's name is spock"
           ]
         },
         {
@@ -17608,7 +17608,7 @@
     ],
     "query": "what is spock's name",
     "responses": [
-      "spock name is spock"
+      "spock's name is spock"
     ]
   },
   {
@@ -17988,7 +17988,7 @@
       }
     ],
     "generatedParenthesized": [
-      "((((spock) (rank)) is ((second))))"
+      "(((((spock)'s) (rank)) is ((second))))"
     ],
     "metadata": {
       "opChoices": [
@@ -19430,11 +19430,11 @@
             },
             "word": "is"
           },
-          "generatedParenthesized": "((((spock) (rank)) is ((second))))",
+          "generatedParenthesized": "(((((spock)'s) (rank)) is ((second))))",
           "paraphrases": "what is spock's rank?",
           "paraphrasesParenthesized": "(((what) is (((spock)'s) (rank)))?)",
           "responses": [
-            "spock rank is second"
+            "spock's rank is second"
           ]
         },
         {
@@ -20030,7 +20030,7 @@
     ],
     "query": "what is spock's rank",
     "responses": [
-      "spock rank is second"
+      "spock's rank is second"
     ]
   },
   {
@@ -20453,7 +20453,7 @@
       }
     ],
     "generatedParenthesized": [
-      "((((spock) (rank)) is ((second))))"
+      "(((((spock)'s) (rank)) is ((second))))"
     ],
     "metadata": {
       "opChoices": [
@@ -21939,11 +21939,11 @@
             ],
             "word": "is"
           },
-          "generatedParenthesized": "((((spock) (rank)) is ((second))))",
+          "generatedParenthesized": "(((((spock)'s) (rank)) is ((second))))",
           "paraphrases": "what is spock's rank?",
           "paraphrasesParenthesized": "(((what) is (((spock)'s) (rank)))?)",
           "responses": [
-            "spock rank is second"
+            "spock's rank is second"
           ]
         },
         {
@@ -22539,7 +22539,7 @@
     ],
     "query": "what is spock's rank?",
     "responses": [
-      "spock rank is second"
+      "spock's rank is second"
     ]
   },
   {
@@ -23004,7 +23004,7 @@
       }
     ],
     "generatedParenthesized": [
-      "(((name) is ((jim))))"
+      "((((the (name)) of (kirk)) is ((jim))))"
     ],
     "metadata": {
       "opChoices": [
@@ -24530,11 +24530,11 @@
             },
             "word": "is"
           },
-          "generatedParenthesized": "(((name) is ((jim))))",
+          "generatedParenthesized": "((((the (name)) of (kirk)) is ((jim))))",
           "paraphrases": "what is the name of kirk?",
           "paraphrasesParenthesized": "(((what) is ((the (name)) of (kirk)))?)",
           "responses": [
-            "name is jim"
+            "the name of kirk is jim"
           ]
         },
         {
@@ -25130,7 +25130,7 @@
     ],
     "query": "what is the name of kirk",
     "responses": [
-      "name is jim"
+      "the name of kirk is jim"
     ]
   },
   {
@@ -25595,7 +25595,7 @@
       }
     ],
     "generatedParenthesized": [
-      "(((rank) is ((second))))"
+      "((((the (rank)) of (spock)) is ((second))))"
     ],
     "metadata": {
       "opChoices": [
@@ -27121,11 +27121,11 @@
             },
             "word": "is"
           },
-          "generatedParenthesized": "(((rank) is ((second))))",
+          "generatedParenthesized": "((((the (rank)) of (spock)) is ((second))))",
           "paraphrases": "what is the rank of spock?",
           "paraphrasesParenthesized": "(((what) is ((the (rank)) of (spock)))?)",
           "responses": [
-            "rank is second"
+            "the rank of spock is second"
           ]
         },
         {
@@ -27721,7 +27721,7 @@
     ],
     "query": "what is the rank of spock",
     "responses": [
-      "rank is second"
+      "the rank of spock is second"
     ]
   },
   {
@@ -28222,7 +28222,7 @@
       }
     ],
     "generatedParenthesized": [
-      "(((status) is ((armed))))"
+      "((((the (status)) of (the (phasers))) is ((armed))))"
     ],
     "metadata": {
       "opChoices": [
@@ -29825,11 +29825,11 @@
             },
             "word": "is"
           },
-          "generatedParenthesized": "(((status) is ((armed))))",
+          "generatedParenthesized": "((((the (status)) of (the (phasers))) is ((armed))))",
           "paraphrases": "what is the status of the phasers?",
           "paraphrasesParenthesized": "(((what) is ((the (status)) of (the (phasers))))?)",
           "responses": [
-            "status is armed"
+            "the status of the phasers is armed"
           ]
         },
         {
@@ -30425,7 +30425,7 @@
     ],
     "query": "what is the status of the phasers",
     "responses": [
-      "status is armed"
+      "the status of the phasers is armed"
     ]
   },
   {
@@ -31023,7 +31023,7 @@
       }
     ],
     "generatedParenthesized": [
-      "(((status) is ((armed))))"
+      "((((the (status)) of (the (photon) (torpedoes))) is ((armed))))"
     ],
     "metadata": {
       "opChoices": [
@@ -32723,11 +32723,11 @@
             },
             "word": "is"
           },
-          "generatedParenthesized": "(((status) is ((armed))))",
+          "generatedParenthesized": "((((the (status)) of (the (photon) (torpedoes))) is ((armed))))",
           "paraphrases": "what is the status of the photon torpedoes?",
           "paraphrasesParenthesized": "(((what) is ((the (status)) of (the (photon) (torpedoes))))?)",
           "responses": [
-            "status is armed"
+            "the status of the photon torpedoes is armed"
           ]
         },
         {
@@ -33323,7 +33323,7 @@
     ],
     "query": "what is the status of the photon torpedoes",
     "responses": [
-      "status is armed"
+      "the status of the photon torpedoes is armed"
     ]
   },
   {
@@ -33594,7 +33594,7 @@
       }
     ],
     "generatedParenthesized": [
-      "(((crew_member) are (((kirk), (spock) and (mccoy)))))"
+      "(((the (crew) (members)) are (((kirk), (spock) and (mccoy)))))"
     ],
     "metadata": {
       "opChoices": [
@@ -34941,11 +34941,11 @@
             },
             "word": "are"
           },
-          "generatedParenthesized": "(((crew_member) are (((kirk), (spock) and (mccoy)))))",
+          "generatedParenthesized": "(((the (crew) (members)) are (((kirk), (spock) and (mccoy)))))",
           "paraphrases": "who are the crew members?",
           "paraphrasesParenthesized": "(((who) are (the (crew) (members)))?)",
           "responses": [
-            "crew_member are kirk, spock and mccoy"
+            "the crew members are kirk, spock and mccoy"
           ]
         },
         {
@@ -35541,7 +35541,7 @@
     ],
     "query": "who are the crew members",
     "responses": [
-      "crew_member are kirk, spock and mccoy"
+      "the crew members are kirk, spock and mccoy"
     ]
   }
 ]

package/common/dialogues.js

@@ -490,7 +490,7 @@ let configStruct = {
       where: where(),
       notes: 'x is y (not a response)',
       match: ({context, hierarchy}) => hierarchy.isA(context.marker, 'is') && !context.evalue,
-      apply: ({context, g, gp, callId}) => {
+      apply: ({context, g, gp, gr, callId}) => {
         if ((context.two.evalue || {}).marker == 'answerNotKnown') {
           return g(context.two.evalue)
         }
@@ -523,7 +523,13 @@ let configStruct = {
         if (focus == 'one') {
           return `${g(context.two)} ${isMany(context.one) || isMany(context.two) || isMany(context) ? "are" : "is"} ${gp(context.one)}`
         } else {
-          return `${g(context.one)} ${isMany(context.one) || isMany(context.two) || isMany(context) ? "are" : "is"} ${g(context.two)}`
+          // TODO fix this using the assumed and that whole mess. change isResponse to useValue
+          if (context.isResponse) {
+            return `${gp(context.one, { responding: true })} ${isMany(context.one) || isMany(context.two) || isMany(context) ? "are" : "is"} ${g(context.two)}`
+          } else {
+            return `${gp(context.one)} ${isMany(context.one) || isMany(context.two) || isMany(context) ? "are" : "is"} ${gr(context.two)}`
+          }
+          // return `${gp(context.one)} ${isMany(context.one) || isMany(context.two) || isMany(context) ? "are" : "is"} ${g(context.two)}`
         }
         // return `${g({...context.one})} ${isMany(context.one) || isMany(context.two) || isMany(context) ? "are" : "is"} ${g(context.two)}`
       },

package/common/dimension.js

@@ -85,7 +85,7 @@ let configStruct = {
       isA: [],
       generatorpr: {
         match: ({context}) => context.amount,
-        apply: ({context, g, gp}) => `${g(context.amount)} ${gp(context.unit)}`,
+        apply: ({context, g, gp, gr}) => `${gr(context.amount)} ${gp(context.unit)}`,
       },
     },
     { id: "length", isA: ['dimension'], development: true },
@@ -134,7 +134,7 @@ let configStruct = {
           efrom = e(from).evalue
         }
         if (to.value == efrom.unit.value) {
-          evalue = efrom
+          evalue = efrom.amount
         } else {
           const formula = kms.formulas.api.get(to, [efrom.unit])
           if (!formula) {