tpmkms_4wp 9.1.1-beta.9 → 9.2.0

package/common/menus.js

@@ -5,8 +5,9 @@ const helpers = require('./helpers/menus')
 const tests = require('./menus.test.json')
 const instance = require('./menus.instance.json')
 
-class API {
-  initialize({ objects }) {
+class MenusAPI {
+  initialize({ objects, config }) {
+    this._config = config
     this._objects = objects
     this._objects.show = []
     this._objects.menuDefs = []
@@ -20,9 +21,14 @@ class API {
       up: helpers.calculateUps(this._objects.menuDefs),
       down: helpers.calculateDowns(this._objects.menuDefs),
       parents: helpers.calculateParents(this._objects.menuDefs),
+      paths: helpers.calculatePaths(this._objects.menuDefs),
     }
   }
 
+  close() {
+    this._objects.close = true
+  }
+
   move(direction, steps = 1, units = undefined) {
     this._objects.move = { direction, steps, units }
     let next = this.current()
@@ -63,7 +69,7 @@ class API {
   }
 
   addMenu(name) {
-    const config = this.args.config
+    const config = this._config
     const id = name
     const languageId = `${name}Menu_menus`
     config.addOperator(`([${languageId}|])`)
@@ -83,7 +89,7 @@ class API {
   }
 
   addMenuItem(menuId, id, name) {
-    const config = this.args.config
+    const config = this._config
     const languageId = `${id}MenuItem_menus`
     config.addOperator(`([${languageId}|])`)
     config.addBridge({ 
@@ -115,9 +121,19 @@ const template = {
     {
       operators: [
         "([show_menus|show] (showable_menus))",
+        "([close_menus|close] (menu_menus/*))",
         "((@<= menu_menus) [typeOfMenu_menus|show] (@== menu_menus))",
       ],
       bridges: [
+        {
+          id: 'close_menus',
+          isA: ['verb'],
+          associations: ['menus'],
+          bridge: "{ ...next(operator), closee: after[0], generate: ['this', 'closee'] }",
+          semantic: ({context, api}) => {
+            api.close()
+          }
+        },
         {
           id: 'show_menus',
           isA: ['verb'],
@@ -153,12 +169,43 @@ const template = {
         },
       ]
     },
+    "resetidsuffix",
   ],
   fragments: [
     "show showable",
   ],
 }
 
+class UIAPI {
+  constructor(menusAPI) {
+    this.menusAPI = menusAPI
+  }
+
+  initialize() {
+  }
+
+  move(direction, steps = 1, units = undefined) {
+    this.menusAPI.move(direction, steps, units)
+  }
+
+  select(item) {
+    this.menusAPI.select(item)
+  }
+
+  unselect(item) {
+    this.menusAPI.unselect(item)
+  }
+
+  cancel(direction) {
+    this.menusAPI.cancel(direction)
+  }
+
+  stop(action) {
+    this.menusAPI.stop(action)
+  }
+
+}
+
 /*
    show the file menu
    pick the file open item
@@ -172,7 +219,9 @@ const fixtures = async ({api, fragment, s, config, objects, kms, isModule}) => {
   const objectMenuId = api.addMenu('object')
 
   api.addMenuItem(fileMenuId, 'fileOpen', 'open')
+  api.addMenuItem(fileMenuId, 'fileOpenRemote', 'open remote')
   api.addMenuItem(fileMenuId, 'fileClose', 'close')
+
   api.addMenuItem(objectMenuId, 'objectOpen', 'open')
   api.addMenuItem(objectMenuId, 'objectClose', 'close')
 }
@@ -180,7 +229,14 @@ const fixtures = async ({api, fragment, s, config, objects, kms, isModule}) => {
 knowledgeModule({ 
   config,
   includes: [ui],
-  api: () => new API(),
+  // api: () => new API(),
+  api: () => {
+    const menusAPI = new MenusAPI()
+    return {
+      'menus': menusAPI,
+      'ui': new UIAPI(menusAPI)
+    }
+  },
   apiKMs: ['menus', 'ui'],
   initializer: ({apis}) => {
     apis('sdefaults').addAssociation('menus')
@@ -193,7 +249,7 @@ knowledgeModule({
     contents: tests,
     fixtures,
     checks: {
-      objects: ['move', 'select', 'unselect', 'cancel', 'stop', 'show', 'menuDefs'],
+      objects: ['move', 'select', 'unselect', 'cancel', 'stop', 'show', 'menuDefs', 'close'],
       context: defaultContextCheck(['operator', 'direction', 'moveable']),
     },
   },