tpmkms_4wp 9.2.0 → 9.3.0

package/common/properties.js

@@ -83,8 +83,9 @@ const config = {
   name: 'properties',
   associations: {
     positive: [
-      { context: [["the",0],["unknown",0],["propertyOf",0],["unknown",0],["is",0],["unknown",0]], choose: 4 },
+      { context: [["the",0],["unknown",0],["propertyOf",0],["unknown",0],["is",0],["unknown",0]], choose: { index: 4, increment: true } },
       { context: [["objectPrefix",0],["unknown",0]], choose: 1 },
+      { context: [["unknown",0],["propertyOf", 0],["unknown",0]], choose: 0 },
     ]
   },
 
@@ -431,9 +432,9 @@ const config = {
     {
       where: where(),
       match: ({context}) => context.marker == 'concept' && context.same,
-      apply: ({context, km, config}) => {
-        const api = km('properties').api
-        api.makeObject({ config, context: context.same })
+      apply: (args) => {
+        const {context} = args
+        args.makeObject({ ...args, context: context.same })
         context.sameWasProcessed = true
       }
     },
@@ -542,10 +543,15 @@ const config = {
       where: where(),
       // match: ({context}) => context.marker == 'property' && context.same && context.object,
       match: ({context, hierarchy, uuid}) => hierarchy.isA(context.marker, 'property') && context.same && context.objects && !context[`disable${uuid}`],
-      apply: async ({context, fragments, objects, km, api, log, s, uuid}) => {
+      apply: async (args) => {
+        const {context, fragments, objects, km, api, log, s, uuid} = args
+        // greg55
         const objectContext = context.object;
         const propertyContext = context;
         const objectId = context.object.value
+
+        api.makeObject({ ...args, context: objectContext })
+        api.makeObject({ ...args, context: propertyContext })
         // const propertyId = context.value
         /*
         const propertyId = context.marker
@@ -670,10 +676,18 @@ const config = {
   ]
 };
 
+const initializer = ({objects, config, isModule}) => {
+  // debugger
+  config.addArgs(({config, api, isA}) => ({
+    makeObject: api('properties').makeObject,
+  }))
+}
+
 knowledgeModule( { 
   config,
   api: () => new API(),
   includes: [concept, meta, dialogues],
+  initializer,
 
   module,
   description: 'properties of objects',

package/common/punctuation.js

@@ -16,18 +16,21 @@ const config = {
     {
       id: "comma",
       level: 0,
+      skipable: true,
       bridge: "{ ...before[0], decorators.after: operator, no_convolutions: true }",      // css :after decoration
       words: [{ word: ",", value: ',', depth: '+' }],
     },
     {
       id: "leftParenthesis",
       level: 0,
+      skipable: true,
       bridge: "{ ...after[0], parenthesis: '(' }",
       words: [{ word: "(", value: '(', depth: '+' }],
     },
     {
       id: "rightParenthesis",
       level: 0,
+      skipable: true,
       bridge: "{ ...next(operator) }",
       words: [{ word: ")", value: ')', depth: '-' }],
     },