occam-languages 3.0.96 → 3.0.98

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -10,13 +10,13 @@ Object.defineProperty(exports, "default", {
10
10
  });
11
11
  const _necessary = require("necessary");
12
12
  const { first } = _necessary.arrayUtilities;
13
- function someTerminalNode(callback, tokenType) {
13
+ function someTerminalNode(callback, tokenType = null) {
14
14
  let index = 0;
15
15
  return this.someChildNode((childNode)=>{
16
16
  const childNodeTerminalNode = childNode.isTerminalNode();
17
17
  if (childNodeTerminalNode) {
18
18
  const terminalNode = childNode, terminalNodeType = terminalNode.getType();
19
- if (terminalNodeType === tokenType) {
19
+ if (tokenType === null || terminalNodeType === tokenType) {
20
20
  return callback(terminalNode, index++);
21
21
  }
22
22
  }
@@ -114,4 +114,4 @@ const nodeMixins = {
114
114
  };
115
115
  const _default = nodeMixins;
116
116
 
117
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/mixins/node.js"],"sourcesContent":["\"use strict\";\n\nimport { arrayUtilities } from \"necessary\";\n\nconst { first } = arrayUtilities;\n\nfunction someTerminalNode(callback, tokenType) {\n  let index = 0;\n\n  return this.someChildNode((childNode) => {\n    const childNodeTerminalNode = childNode.isTerminalNode();\n\n    if (childNodeTerminalNode) {\n      const terminalNode = childNode, ///\n            terminalNodeType = terminalNode.getType();\n\n      if (terminalNodeType === tokenType) {\n        return callback(terminalNode, index++);\n      }\n    }\n  });\n}\n\nfunction getNodeByRuleName(...ruleNames) {\n  const node = this.findChildNode((childNode) => {\n    const childNodeNonTerminalNode = childNode.isNonTerminalNode();\n\n    if (childNodeNonTerminalNode) {\n      const nonTerminalNode = childNode, ///\n            ruleName = nonTerminalNode.getRuleName(),\n            ruleNamesIncludesRuleName = ruleNames.includes(ruleName);\n\n      if (ruleNamesIncludesRuleName) {\n        return true;\n      }\n    }\n  }) || null;\n\n  return node;\n}\n\nfunction getNodesByRuleName(...ruleNames) {\n  const nodes = this.filterChildNode((childNode) => {\n    const childNodeNonTerminalNode = childNode.isNonTerminalNode();\n\n    if (childNodeNonTerminalNode) {\n      const nonTerminalNode = childNode, ///\n            ruleName = nonTerminalNode.getRuleName(),\n            ruleNamesIncludesRuleName = ruleNames.includes(ruleName);\n\n      if (ruleNamesIncludesRuleName) {\n        return true;\n      }\n    }\n  });\n\n  return nodes;\n}\n\nfunction getLastNodeByRuleName(...ruleNames) {\n  let lastNode = null;\n\n  this.backwardsSomeChildNode((childNode) => {\n    const childNodeNonTerminalNode = childNode.isNonTerminalNode();\n\n    if (childNodeNonTerminalNode) {\n      const nonTerminalNode = childNode, ///\n            ruleName = nonTerminalNode.getRuleName(),\n            ruleNamesIncludesRuleName = ruleNames.includes(ruleName);\n\n      if (ruleNamesIncludesRuleName) {\n        lastNode = childNode; ///\n\n        return true;\n      }\n    }\n  });\n\n  return lastNode;\n}\n\nfunction getFirstNodeByRuleName(...ruleNames) {\n  let firstNode = null;\n\n  this.forwardsSomeChildNode((childNode) => {\n    const childNodeNonTerminalNode = childNode.isNonTerminalNode();\n\n    if (childNodeNonTerminalNode) {\n      const nonTerminalNode = childNode, ///\n            ruleName = nonTerminalNode.getRuleName(),\n            ruleNamesIncludesRuleName = ruleNames.includes(ruleName);\n\n      if (ruleNamesIncludesRuleName) {\n        firstNode = childNode; ///\n\n        return true;\n      }\n    }\n  });\n\n  return firstNode;\n}\n\nfunction getSingularNodeByRuleName(...ruleNames) {\n  let singularNode = null;\n\n  const nodes = this.filterChildNode((childNode) => {\n          const childNodeNonTerminalNode = childNode.isNonTerminalNode();\n\n          if (childNodeNonTerminalNode) {\n            const nonTerminalNode = childNode, ///\n                  ruleName = nonTerminalNode.getRuleName(),\n                  ruleNamesIncludesRuleName = ruleNames.includes(ruleName);\n\n            if (ruleNamesIncludesRuleName) {\n              return true;\n            }\n          }\n        }),\n        nodesLength = nodes.length;\n\n  if (nodesLength === 1) {\n    const firstNode = first(nodes);\n\n    singularNode = firstNode; ///\n  }\n\n  return singularNode;\n}\n\nfunction getDescendantNodesByRuleName(...ruleNames) {\n  const nodes = this.filterDescendantNode((descendantNode) => {\n    const descendantNodeNonTerminalNode = descendantNode.isNonTerminalNode();\n\n    if (descendantNodeNonTerminalNode) {\n      const nonTerminalNode = descendantNode, ///\n            ruleName = nonTerminalNode.getRuleName(),\n            ruleNamesIncludesRuleName = ruleNames.includes(ruleName);\n\n      if (ruleNamesIncludesRuleName) {\n        return true;\n      }\n    }\n  });\n\n  return nodes;\n}\n\nconst nodeMixins = {\n  someTerminalNode,\n  getNodeByRuleName,\n  getNodesByRuleName,\n  getLastNodeByRuleName,\n  getFirstNodeByRuleName,\n  getSingularNodeByRuleName,\n  getDescendantNodesByRuleName\n};\n\nexport default nodeMixins;\n"],"names":["first","arrayUtilities","someTerminalNode","callback","tokenType","index","someChildNode","childNode","childNodeTerminalNode","isTerminalNode","terminalNode","terminalNodeType","getType","getNodeByRuleName","ruleNames","node","findChildNode","childNodeNonTerminalNode","isNonTerminalNode","nonTerminalNode","ruleName","getRuleName","ruleNamesIncludesRuleName","includes","getNodesByRuleName","nodes","filterChildNode","getLastNodeByRuleName","lastNode","backwardsSomeChildNode","getFirstNodeByRuleName","firstNode","forwardsSomeChildNode","getSingularNodeByRuleName","singularNode","nodesLength","length","getDescendantNodesByRuleName","filterDescendantNode","descendantNode","descendantNodeNonTerminalNode","nodeMixins"],"mappings":"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"}
117
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/mixins/node.js"],"sourcesContent":["\"use strict\";\n\nimport { arrayUtilities } from \"necessary\";\n\nconst { first } = arrayUtilities;\n\nfunction someTerminalNode(callback, tokenType = null) {\n  let index = 0;\n\n  return this.someChildNode((childNode) => {\n    const childNodeTerminalNode = childNode.isTerminalNode();\n\n    if (childNodeTerminalNode) {\n      const terminalNode = childNode, ///\n            terminalNodeType = terminalNode.getType();\n\n      if ((tokenType === null) || (terminalNodeType === tokenType)) {\n        return callback(terminalNode, index++);\n      }\n    }\n  });\n}\n\nfunction getNodeByRuleName(...ruleNames) {\n  const node = this.findChildNode((childNode) => {\n    const childNodeNonTerminalNode = childNode.isNonTerminalNode();\n\n    if (childNodeNonTerminalNode) {\n      const nonTerminalNode = childNode, ///\n            ruleName = nonTerminalNode.getRuleName(),\n            ruleNamesIncludesRuleName = ruleNames.includes(ruleName);\n\n      if (ruleNamesIncludesRuleName) {\n        return true;\n      }\n    }\n  }) || null;\n\n  return node;\n}\n\nfunction getNodesByRuleName(...ruleNames) {\n  const nodes = this.filterChildNode((childNode) => {\n    const childNodeNonTerminalNode = childNode.isNonTerminalNode();\n\n    if (childNodeNonTerminalNode) {\n      const nonTerminalNode = childNode, ///\n            ruleName = nonTerminalNode.getRuleName(),\n            ruleNamesIncludesRuleName = ruleNames.includes(ruleName);\n\n      if (ruleNamesIncludesRuleName) {\n        return true;\n      }\n    }\n  });\n\n  return nodes;\n}\n\nfunction getLastNodeByRuleName(...ruleNames) {\n  let lastNode = null;\n\n  this.backwardsSomeChildNode((childNode) => {\n    const childNodeNonTerminalNode = childNode.isNonTerminalNode();\n\n    if (childNodeNonTerminalNode) {\n      const nonTerminalNode = childNode, ///\n            ruleName = nonTerminalNode.getRuleName(),\n            ruleNamesIncludesRuleName = ruleNames.includes(ruleName);\n\n      if (ruleNamesIncludesRuleName) {\n        lastNode = childNode; ///\n\n        return true;\n      }\n    }\n  });\n\n  return lastNode;\n}\n\nfunction getFirstNodeByRuleName(...ruleNames) {\n  let firstNode = null;\n\n  this.forwardsSomeChildNode((childNode) => {\n    const childNodeNonTerminalNode = childNode.isNonTerminalNode();\n\n    if (childNodeNonTerminalNode) {\n      const nonTerminalNode = childNode, ///\n            ruleName = nonTerminalNode.getRuleName(),\n            ruleNamesIncludesRuleName = ruleNames.includes(ruleName);\n\n      if (ruleNamesIncludesRuleName) {\n        firstNode = childNode; ///\n\n        return true;\n      }\n    }\n  });\n\n  return firstNode;\n}\n\nfunction getSingularNodeByRuleName(...ruleNames) {\n  let singularNode = null;\n\n  const nodes = this.filterChildNode((childNode) => {\n          const childNodeNonTerminalNode = childNode.isNonTerminalNode();\n\n          if (childNodeNonTerminalNode) {\n            const nonTerminalNode = childNode, ///\n                  ruleName = nonTerminalNode.getRuleName(),\n                  ruleNamesIncludesRuleName = ruleNames.includes(ruleName);\n\n            if (ruleNamesIncludesRuleName) {\n              return true;\n            }\n          }\n        }),\n        nodesLength = nodes.length;\n\n  if (nodesLength === 1) {\n    const firstNode = first(nodes);\n\n    singularNode = firstNode; ///\n  }\n\n  return singularNode;\n}\n\nfunction getDescendantNodesByRuleName(...ruleNames) {\n  const nodes = this.filterDescendantNode((descendantNode) => {\n    const descendantNodeNonTerminalNode = descendantNode.isNonTerminalNode();\n\n    if (descendantNodeNonTerminalNode) {\n      const nonTerminalNode = descendantNode, ///\n            ruleName = nonTerminalNode.getRuleName(),\n            ruleNamesIncludesRuleName = ruleNames.includes(ruleName);\n\n      if (ruleNamesIncludesRuleName) {\n        return true;\n      }\n    }\n  });\n\n  return nodes;\n}\n\nconst nodeMixins = {\n  someTerminalNode,\n  getNodeByRuleName,\n  getNodesByRuleName,\n  getLastNodeByRuleName,\n  getFirstNodeByRuleName,\n  getSingularNodeByRuleName,\n  getDescendantNodesByRuleName\n};\n\nexport default nodeMixins;\n"],"names":["first","arrayUtilities","someTerminalNode","callback","tokenType","index","someChildNode","childNode","childNodeTerminalNode","isTerminalNode","terminalNode","terminalNodeType","getType","getNodeByRuleName","ruleNames","node","findChildNode","childNodeNonTerminalNode","isNonTerminalNode","nonTerminalNode","ruleName","getRuleName","ruleNamesIncludesRuleName","includes","getNodesByRuleName","nodes","filterChildNode","getLastNodeByRuleName","lastNode","backwardsSomeChildNode","getFirstNodeByRuleName","firstNode","forwardsSomeChildNode","getSingularNodeByRuleName","singularNode","nodesLength","length","getDescendantNodesByRuleName","filterDescendantNode","descendantNode","descendantNodeNonTerminalNode","nodeMixins"],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-languages",
3
3
  "author": "James Smith",
4
- "version": "3.0.96",
4
+ "version": "3.0.98",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-languages",
7
7
  "description": "Occam's common language functionality.",
@@ -11,11 +11,11 @@
11
11
  },
12
12
  "dependencies": {
13
13
  "necessary": "^17.7.2",
14
- "occam-custom-grammars": "^6.1.31",
14
+ "occam-custom-grammars": "^6.1.32",
15
15
  "occam-grammar-utilities": "^8.1.27",
16
- "occam-grammars": "^1.3.700",
16
+ "occam-grammars": "^1.3.702",
17
17
  "occam-lexers": "^23.2.12",
18
- "occam-model": "^1.0.600",
18
+ "occam-model": "^1.0.601",
19
19
  "occam-parsers": "^23.2.17",
20
20
  "occam-query": "^4.1.210"
21
21
  },
@@ -4,7 +4,7 @@ import { arrayUtilities } from "necessary";
4
4
 
5
5
  const { first } = arrayUtilities;
6
6
 
7
- function someTerminalNode(callback, tokenType) {
7
+ function someTerminalNode(callback, tokenType = null) {
8
8
  let index = 0;
9
9
 
10
10
  return this.someChildNode((childNode) => {
@@ -14,7 +14,7 @@ function someTerminalNode(callback, tokenType) {
14
14
  const terminalNode = childNode, ///
15
15
  terminalNodeType = terminalNode.getType();
16
16
 
17
- if (terminalNodeType === tokenType) {
17
+ if ((tokenType === null) || (terminalNodeType === tokenType)) {
18
18
  return callback(terminalNode, index++);
19
19
  }
20
20
  }