changed macro schema

Author: epoberezkin

macros/call.json

@@ -1,10 +1,10 @@
 {
   "name": "call",
-  "description": "function call",
+  "description": "short syntax for function call",
   "rules": [
     {
       "description": "call named function with arguments",
-      "rule": {
+      "pattern": {
         "^\\$\\#(.+)$": 1
       },
       "script": {

macros/exec.json

@@ -1,25 +1,25 @@
 {
   "name": "exec",
-  "description": "executor call",
+  "description": "short syntax for executor call",
   "rules": [
     {
-      "description": "executor call without method",
-      "rule": {
-        "^\\$\\$([^\\.]+)$": 1
+      "description": "executor call with method",
+      "pattern": {
+        "^\\$\\$([^\\.]+)\\.([^\\.]+)$": 1
       },
       "script": {
         "$exec": "$1",
+        "$method": "$2",
         "$args": 1
       }
     },
     {
-      "description": "executor call with method",
-      "rule": {
-        "^\\$\\$([^\\.]+)\\.([^\\.]+)$": 1
+      "description": "executor call without method",
+      "pattern": {
+        "^\\$\\$([^\\.]+)$": 1
       },
       "script": {
         "$exec": "$1",
-        "$method": "$2",
         "$args": 1
       }
     }

schema/expand_macros.json

@@ -12,33 +12,33 @@
         "anyOf": [
           {
             "expandJsMacro": {
-              "description": "executor call without method",
-              "rule": {
-                "^\\$\\$([^\\.]+)$": 1
+              "description": "executor call with method",
+              "pattern": {
+                "^\\$\\$([^\\.]+)\\.([^\\.]+)$": 1
               },
               "script": {
                 "$exec": "$1",
+                "$method": "$2",
                 "$args": 1
               }
             }
           },
           {
             "expandJsMacro": {
-              "description": "executor call with method",
-              "rule": {
-                "^\\$\\$([^\\.]+)\\.([^\\.]+)$": 1
+              "description": "executor call without method",
+              "pattern": {
+                "^\\$\\$([^\\.]+)$": 1
               },
               "script": {
                 "$exec": "$1",
-                "$method": "$2",
                 "$args": 1
               }
             }
           },
           {
             "expandJsMacro": {
               "description": "call named function with arguments",
-              "rule": {
+              "pattern": {
                 "^\\$\\#(.+)$": 1
               },
               "script": {

schema/macro.json

@@ -19,11 +19,11 @@
       "minItems": 1,
       "items": {
         "type": "object",
-        "required": [ "description", "rule", "script" ],
+        "required": [ "description", "pattern", "script" ],
         "additionalProperties": false,
         "properties": {
           "description": { "$ref": "#nonEmptyString" },
-          "rule": {
+          "pattern": {
             "type": "object",
             "minProperties": 1,
             "maxProperties": 1,