tpmkms_4wp 9.5.1 → 9.6.0-beta.1

package/common/latin.instance.json

@@ -4,7 +4,7 @@
       "apply": "({config}) => {\n      config.addArgs(({config, api, isA}) => ({\n        addLatinNoun: ({ id, nominative, genetive, development }) => {\n          config.addOperator({ pattern: `([${id}|])`, development: development })\n          config.addBridge({ id, isA: ['hierarchiable'] })\n          const declensions = getDeclensions(nominative, genetive)\n          for (const declension of declensions) {\n            config.addWord(declension.word, { id, initial: { ...declension, development } })\n          }\n        }\n      }))\n    }"
     },
     {
-      "apply": "({addLatinNoun}) => {\n      addLatinNoun({ id: 'davus_person', nominative: 'davus', development: true })\n      addLatinNoun({ id: 'titus_person', nominative: 'titus', development: true })\n      addLatinNoun({ id: 'pear_food', nominative: 'pirum', development: true })\n      addLatinNoun({ id: 'table_latin', nominative: 'mensa', development: true })\n    }"
+      "apply": "({addLatinNoun}) => {\n      addLatinNoun({ id: 'davus_person', nominative: 'davus', scope: \"testing\" })\n      addLatinNoun({ id: 'titus_person', nominative: 'titus', scope: \"testing\" })\n      addLatinNoun({ id: 'pear_food', nominative: 'pirum', scope: \"testing\" })\n      addLatinNoun({ id: 'table_latin', nominative: 'mensa', scope: \"testing\" })\n    }"
     },
     {
       "operators": [
@@ -70,7 +70,7 @@
               "person": "third"
             }
           ],
-          "bridge": "{ ...next(operator), thrower: nominative?, receiver: dative?, object: object?, location: location?, interpolate: [{ property: 'thrower' }, { property: 'receiver' }, { property: 'location' }, { property: 'object' }, operator] }",
+          "bridge": "{ ...next(operator), thrower: nominative?, receiver: dative?, object: object?, location: location?, interpolate: [{ property: 'thrower' }, { property: 'receiver' }, { property: 'location' }, { property: 'object' }, { context: operator }] }",
           "selector": {
             "arguments": {
               "nominative": "(context.declension == 'nominative' && context.number == operator.number)",
@@ -83,7 +83,7 @@
         {
           "id": "dare",
           "level": 0,
-          "bridge": "{ ...next(operator), giver: nominative?, receiver: dative?, object: accusative?, interpolate: [{ property: 'giver' }, { property: 'receiver' }, { property: 'object' }, operator] }",
+          "bridge": "{ ...next(operator), giver: nominative?, receiver: dative?, object: accusative?, interpolate: [{ property: 'giver' }, { property: 'receiver' }, { property: 'object' }, { context: operator }] }",
           "selector": {
             "arguments": {
               "nominative": "(context.declension == 'nominative' && context.number == operator.number)",
@@ -159,7 +159,7 @@
         },
         {
           "id": "queryMarker",
-          "bridge": "{ ...before[0], verb: before[0], interpolate: [before[0], '', operator], question: true }",
+          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], question: true }",
           "separators": "|",
           "before": [
             "hierarchy"
@@ -173,7 +173,7 @@
               "listable"
             ]
           ],
-          "bridge": "{ ...before[0], verb: before[0], interpolate: [before[0], '', operator], isList: true }",
+          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], isList: true }",
           "separators": "|"
         },
         {
@@ -187,7 +187,7 @@
               "hierarchiable"
             ]
           ],
-          "bridge": "{ ...next(operator), child: arguments[0], parent: arguments[1], question: less_than(indexes.operator, indexes.arguments[0]), interpolate: all }",
+          "bridge": "{ ...next(operator), child: arguments[0], parent: arguments[1], question: less_than(indexes.operator, indexes.arguments[0]), interpolate: map(all, { context: element }) }",
           "words": [
             {
               "word": "sum",
@@ -238,7 +238,7 @@
       "apply": "({config}) => {\n      config.addArgs(({config, api, isA}) => ({\n        addLatinNoun: ({ id, nominative, genetive, development }) => {\n          config.addOperator({ pattern: `([${id}|])`, development: development })\n          config.addBridge({ id, isA: ['hierarchiable'] })\n          const declensions = getDeclensions(nominative, genetive)\n          for (const declension of declensions) {\n            config.addWord(declension.word, { id, initial: { ...declension, development } })\n          }\n        }\n      }))\n    }"
     },
     {
-      "apply": "({addLatinNoun}) => {\n      addLatinNoun({ id: 'davus_person', nominative: 'davus', development: true })\n      addLatinNoun({ id: 'titus_person', nominative: 'titus', development: true })\n      addLatinNoun({ id: 'pear_food', nominative: 'pirum', development: true })\n      addLatinNoun({ id: 'table_latin', nominative: 'mensa', development: true })\n    }"
+      "apply": "({addLatinNoun}) => {\n      addLatinNoun({ id: 'davus_person', nominative: 'davus', scope: \"testing\" })\n      addLatinNoun({ id: 'titus_person', nominative: 'titus', scope: \"testing\" })\n      addLatinNoun({ id: 'pear_food', nominative: 'pirum', scope: \"testing\" })\n      addLatinNoun({ id: 'table_latin', nominative: 'mensa', scope: \"testing\" })\n    }"
     },
     {
       "extraConfig": true,
@@ -305,7 +305,7 @@
               "person": "third"
             }
           ],
-          "bridge": "{ ...next(operator), thrower: nominative?, receiver: dative?, object: object?, location: location?, interpolate: [{ property: 'thrower' }, { property: 'receiver' }, { property: 'location' }, { property: 'object' }, operator] }",
+          "bridge": "{ ...next(operator), thrower: nominative?, receiver: dative?, object: object?, location: location?, interpolate: [{ property: 'thrower' }, { property: 'receiver' }, { property: 'location' }, { property: 'object' }, { context: operator }] }",
           "selector": {
             "arguments": {
               "nominative": "(context.declension == 'nominative' && context.number == operator.number)",
@@ -318,7 +318,7 @@
         {
           "id": "dare",
           "level": 0,
-          "bridge": "{ ...next(operator), giver: nominative?, receiver: dative?, object: accusative?, interpolate: [{ property: 'giver' }, { property: 'receiver' }, { property: 'object' }, operator] }",
+          "bridge": "{ ...next(operator), giver: nominative?, receiver: dative?, object: accusative?, interpolate: [{ property: 'giver' }, { property: 'receiver' }, { property: 'object' }, { context: operator }] }",
           "selector": {
             "arguments": {
               "nominative": "(context.declension == 'nominative' && context.number == operator.number)",
@@ -394,7 +394,7 @@
         },
         {
           "id": "queryMarker",
-          "bridge": "{ ...before[0], verb: before[0], interpolate: [before[0], '', operator], question: true }",
+          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], question: true }",
           "separators": "|",
           "before": [
             "hierarchy"
@@ -408,7 +408,7 @@
               "listable"
             ]
           ],
-          "bridge": "{ ...before[0], verb: before[0], interpolate: [before[0], '', operator], isList: true }",
+          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], isList: true }",
           "separators": "|"
         },
         {
@@ -422,7 +422,7 @@
               "hierarchiable"
             ]
           ],
-          "bridge": "{ ...next(operator), child: arguments[0], parent: arguments[1], question: less_than(indexes.operator, indexes.arguments[0]), interpolate: all }",
+          "bridge": "{ ...next(operator), child: arguments[0], parent: arguments[1], question: less_than(indexes.operator, indexes.arguments[0]), interpolate: map(all, { context: element }) }",
           "words": [
             {
               "word": "sum",

package/common/latin.js

@@ -3,7 +3,7 @@ const { defaultContextCheck } = require('./helpers')
 const gdefaults = require("./gdefaults")
 const { conjugateVerb, getDeclensions } = require("./latin_helpers")
 const latin_tests = require('./latin.test.json')
-const latin_instance = require('./latin.instance.json')
+const instance = require('./latin.instance.json')
 
 /*
   marcus est vir
@@ -56,7 +56,7 @@ const config = {
       words: [
         ...conjugateVerb('iacere'),
       ],
-      bridge: "{ ...next(operator), thrower: nominative?, receiver: dative?, object: object?, location: location?, interpolate: [{ property: 'thrower' }, { property: 'receiver' }, { property: 'location' }, { property: 'object' }, operator] }",
+      bridge: "{ ...next(operator), thrower: nominative?, receiver: dative?, object: object?, location: location?, interpolate: [{ property: 'thrower' }, { property: 'receiver' }, { property: 'location' }, { property: 'object' }, { context: operator }] }",
       selector: {
         arguments: {
           nominative: "(context.declension == 'nominative' && context.number == operator.number)",
@@ -69,7 +69,7 @@ const config = {
     {
       id: "dare",
       level: 0,
-      bridge: "{ ...next(operator), giver: nominative?, receiver: dative?, object: accusative?, interpolate: [{ property: 'giver' }, { property: 'receiver' }, { property: 'object' }, operator] }",
+      bridge: "{ ...next(operator), giver: nominative?, receiver: dative?, object: accusative?, interpolate: [{ property: 'giver' }, { property: 'receiver' }, { property: 'object' }, { context: operator }] }",
       selector: {
         arguments: {
           nominative: "(context.declension == 'nominative' && context.number == operator.number)",
@@ -105,21 +105,21 @@ const config = {
 
     { 
       id: "queryMarker",
-      bridge: "{ ...before[0], verb: before[0], interpolate: [before[0], '', operator], question: true }",
+      bridge: "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], question: true }",
       separators: '|',
       before: ['hierarchy'],
     },
     { 
       id: "listMarker",
       localHierarchy: [['unknown', 'listable']],
-      bridge: "{ ...before[0], verb: before[0], interpolate: [before[0], '', operator], isList: true }",
+      bridge: "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], isList: true }",
       separators: '|',
     },
     { id: "hierarchiable" },
     { 
       id: "hierarchy",
       localHierarchy: [['unknown', 'hierarchiable']],
-      bridge:  "{ ...next(operator), child: arguments[0], parent: arguments[1], question: less_than(indexes.operator, indexes.arguments[0]), interpolate: all }",
+      bridge:  "{ ...next(operator), child: arguments[0], parent: arguments[1], question: less_than(indexes.operator, indexes.arguments[0]), interpolate: map(all, { context: element }) }",
       words: [
         { word: 'sum', number: 'singular', person: 'first' },
         { word: 'es', number: 'singular', person: 'second' },
@@ -159,10 +159,10 @@ const template = {
       }))
     },
     ({addLatinNoun}) => {
-      addLatinNoun({ id: 'davus_person', nominative: 'davus', development: true })
-      addLatinNoun({ id: 'titus_person', nominative: 'titus', development: true })
-      addLatinNoun({ id: 'pear_food', nominative: 'pirum', development: true })
-      addLatinNoun({ id: 'table_latin', nominative: 'mensa', development: true })
+      addLatinNoun({ id: 'davus_person', nominative: 'davus', scope: "testing" })
+      addLatinNoun({ id: 'titus_person', nominative: 'titus', scope: "testing" })
+      addLatinNoun({ id: 'pear_food', nominative: 'pirum', scope: "testing" })
+      addLatinNoun({ id: 'table_latin', nominative: 'mensa', scope: "testing" })
     },
     config,
     ({addSuffix}) => addSuffix('que'),
@@ -191,8 +191,6 @@ knowledgeModule( {
     },
   },
 
-  template: {
-    template,
-    instance: latin_instance,
-  },
+  instance,
+  template,
 })