yapp 2.2.180 → 3.0.1

package/src/plugin.js

@@ -29,7 +29,11 @@ class Plugin {
     return this.node;
   }
 
-  getLanguage() { return this.language; }
+  getLanguage() {
+    const { language } = this.constructor;
+
+    return language;
+  }
 
   setLexer(lexer) {
     this.lexer = lexer;

package/src/processor/javascript.js

@@ -4,20 +4,19 @@ import { Query } from "occam-dom";
 import { characters } from "necessary";
 
 import Processor from "../processor";
-import JSXToken from "../token/significant/jsx";
 import ErrorToken from "../token/significant/error";
 import StringToken from "../token/significant/string";
 import VariableToken from "../token/significant/variable";
 import ArgumentToken from "../token/significant/argument";
+import TagNameJSXToken from "../token/significant/jsx/tagName";
+import AttributeNameJSXToken from "../token/significant/jsx/attributeName";
 
 const errorTerminalNodeQuery = Query.fromExpression("//error/@*"),
       jsxNonTerminalNodeQuery = Query.fromExpression("//jsx"),
-      jsxTagTerminalNodeQuery = Query.fromExpression("//jsxCompleteTag|jsxStartTag|jsxEndTag/@*"),
       variableTerminalNodeQuery = Query.fromExpression("//variable/@*"),
       jsxTagNameTerminalNodeQuery = Query.fromExpression("//jsxCompleteTag|jsxStartTag|jsxEndTag/name/@*"),
       functionNonTerminalNodeQuery = Query.fromExpression("//functionBody|arrowFunction"),
-      jsxTagAttributeTerminalNodeQuery = Query.fromExpression("//jsxAttribute/@*"),
-      argumentVariableTerminalNodeQuery = Query.fromExpression("//argument//variable/@*"),
+      argumentVariableTerminalNodeQuery = Query.fromExpression("//argument/variable/@*"),
       jsxTagAttributeNameTerminalNodeQuery = Query.fromExpression("//jsxAttribute/name/@*"),
       variableDeclarationTerminalNodeQuery = Query.fromExpression("//var|let|const/variable/@*"),
       templateLiteralStringTerminalNodeQuery = Query.fromExpression("//templateLiteral/string/@*"),
@@ -38,10 +37,10 @@ export default class JavaScriptProcessor extends Processor {
 
       this.replaceTerminalNodesSignificantToken(tokens, node, (content) => (content === BACKTICK_CHARACTER) ? StringToken : null, templateLiteralDelimiterTerminalNodeQuery);
 
-      jsxNonTerminalNodes.forEach((jsxNonTerminalNode) => this.replaceTerminalNodesSignificantToken(tokens, jsxNonTerminalNode, (content) => JSXToken, jsxTagTerminalNodeQuery,
-                                                                                                                                                       jsxTagNameTerminalNodeQuery,
-                                                                                                                                                       jsxTagAttributeTerminalNodeQuery,
-                                                                                                                                                       jsxTagAttributeNameTerminalNodeQuery));
+      jsxNonTerminalNodes.forEach((jsxNonTerminalNode) => {
+        this.replaceTerminalNodesSignificantToken(tokens, jsxNonTerminalNode, (content) => TagNameJSXToken, jsxTagNameTerminalNodeQuery);
+        this.replaceTerminalNodesSignificantToken(tokens, jsxNonTerminalNode, (content) => AttributeNameJSXToken, jsxTagAttributeNameTerminalNodeQuery);
+      });
 
       functionNonTerminalNodes.forEach((functionNonTerminalNode) => {
         const argumentNames = this.replaceTerminalNodesSignificantToken(tokens, functionNonTerminalNode, (content) => ArgumentToken, argumentVariableTerminalNodeQuery),

package/src/scheme/syntax/javaScript.js

@@ -1,9 +1,11 @@
 "use strict";
 
-import { springWood, cadetBlue, tahiti } from "../../colours";
-
-export const jsxColour = springWood;
+import { celery, tahiti, sycamore, cadetBlue } from "../../colours";
 
 export const argumentColour = tahiti;
 
 export const variableColour = cadetBlue;
+
+export const jsxTagNameColour = sycamore;
+
+export const jsxAttributeNameColour = celery;

package/src/style/syntax/javaScript.js

@@ -1,18 +1,17 @@
 "use strict";
 
-import { jsxColour, argumentColour, variableColour } from "../../scheme/syntax/javaScript";
+import { argumentColour, variableColour, jsxTagNameColour, jsxAttributeNameColour } from "../../scheme/syntax/javaScript";
 
 const javaScriptSyntaxStyle = `
 
-  .javascript.syntax > .jsx { 
-    color: ${jsxColour};
-    font-weight: bold; 
-  }
-
   .javascript.syntax > .variable { color: ${variableColour}; }
 
   .javascript.syntax > .argument { color: ${argumentColour}; }
 
+  .javascript.syntax > .jsx-tag-name { color: ${jsxTagNameColour};}
+
+  .javascript.syntax > .jsx-attribute-name { color: ${jsxAttributeNameColour};}
+
 `;
 
 export default javaScriptSyntaxStyle;

package/src/token/significant/jsx/attributeName.js

@@ -0,0 +1,11 @@
+"use strict";
+
+import { SignificantToken } from "occam-lexers";
+
+import { JSX_ATTRIBUTE_NAME_TOKEN_TYPE } from "../../../tokenTypes";
+
+const type = JSX_ATTRIBUTE_NAME_TOKEN_TYPE;  ///
+
+export default class JSXAttributeNameToken extends SignificantToken {
+  static fromContent(content) { return SignificantToken.fromContentAndType(JSXAttributeNameToken, content, type); }
+}

package/src/token/significant/jsx/tagName.js

@@ -0,0 +1,11 @@
+"use strict";
+
+import { SignificantToken } from "occam-lexers";
+
+import { JSX_TAG_NAME_TOKEN_TYPE } from "../../../tokenTypes";
+
+const type = JSX_TAG_NAME_TOKEN_TYPE;  ///
+
+export default class JSXTagNameToken extends SignificantToken {
+  static fromContent(content) { return SignificantToken.fromContentAndType(JSXTagNameToken, content, type); }
+}

package/src/tokenTypes.js

@@ -1,9 +1,10 @@
 "use strict";
 
-export const JSX_TOKEN_TYPE = "jsx";
 export const NAME_TOKEN_TYPE = "name";
 export const ERROR_TOKEN_TYPE = "error";
 export const COMMENT_TOKEN_TYPE = "comment";
 export const ARGUMENT_TOKEN_TYPE = "argument";
 export const VARIABLE_TOKEN_TYPE = "variable";
 export const ATTRIBUTE_TOKEN_TYPE = "attribute";
+export const JSX_TAG_NAME_TOKEN_TYPE = "jsx-tag-name";
+export const JSX_ATTRIBUTE_NAME_TOKEN_TYPE = "jsx-attribute-name";

package/lib/parser/yapp.js

@@ -1,132 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return YappParser;
-    }
-});
-var _occamParsers = require("occam-parsers");
-var _occamGrammarUtilities = require("occam-grammar-utilities");
-function _assertThisInitialized(self) {
-    if (self === void 0) {
-        throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
-}
-function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
-function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-    }
-}
-function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-}
-function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
-        return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-}
-function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-        throw new TypeError("Super expression must either be null or a function");
-    }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-        constructor: {
-            value: subClass,
-            writable: true,
-            configurable: true
-        }
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-}
-function _possibleConstructorReturn(self, call) {
-    if (call && (_typeof(call) === "object" || typeof call === "function")) {
-        return call;
-    }
-    return _assertThisInitialized(self);
-}
-function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
-        o.__proto__ = p;
-        return o;
-    };
-    return _setPrototypeOf(o, p);
-}
-var _typeof = function(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-};
-function _isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-    try {
-        Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
-function _createSuper(Derived) {
-    var hasNativeReflectConstruct = _isNativeReflectConstruct();
-    return function _createSuperInternal() {
-        var Super = _getPrototypeOf(Derived), result;
-        if (hasNativeReflectConstruct) {
-            var NewTarget = _getPrototypeOf(this).constructor;
-            result = Reflect.construct(Super, arguments, NewTarget);
-        } else {
-            result = Super.apply(this, arguments);
-        }
-        return _possibleConstructorReturn(this, result);
-    };
-}
-var rulesFromBNF = _occamGrammarUtilities.parserUtilities.rulesFromBNF, parserFromRules = _occamGrammarUtilities.parserUtilities.parserFromRules;
-var YappParser = /*#__PURE__*/ function(CommonParser) {
-    _inherits(YappParser, CommonParser);
-    var _super = _createSuper(YappParser);
-    function YappParser() {
-        _classCallCheck(this, YappParser);
-        return _super.apply(this, arguments);
-    }
-    _createClass(YappParser, null, [
-        {
-            key: "fromNothing",
-            value: function fromNothing(Class) {
-                var bnf = Class.bnf, rules = rulesFromBNF(bnf), parser = parserFromRules(Class, rules);
-                return parser;
-            }
-        },
-        {
-            key: "fromBNF",
-            value: function fromBNF(Class, bnf) {
-                var rules = rulesFromBNF(bnf), parser = parserFromRules(Class, rules);
-                return parser;
-            }
-        },
-        {
-            key: "fromRules",
-            value: function fromRules(Class, rules) {
-                var parser = parserFromRules(Class, rules);
-                return parser;
-            }
-        }
-    ]);
-    return YappParser;
-}(_occamParsers.CommonParser);
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYXJzZXIveWFwcC5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgQ29tbW9uUGFyc2VyIH0gZnJvbSBcIm9jY2FtLXBhcnNlcnNcIjtcbmltcG9ydCB7IHBhcnNlclV0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1ncmFtbWFyLXV0aWxpdGllc1wiO1xuXG5jb25zdCB7IHJ1bGVzRnJvbUJORiwgcGFyc2VyRnJvbVJ1bGVzIH0gPSBwYXJzZXJVdGlsaXRpZXM7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFlhcHBQYXJzZXIgZXh0ZW5kcyBDb21tb25QYXJzZXIge1xuICBzdGF0aWMgZnJvbU5vdGhpbmcoQ2xhc3MpIHtcbiAgICBjb25zdCB7IGJuZiB9ID0gQ2xhc3MsXG4gICAgICAgICAgcnVsZXMgPSBydWxlc0Zyb21CTkYoYm5mKSxcbiAgICAgICAgICBwYXJzZXIgPSBwYXJzZXJGcm9tUnVsZXMoQ2xhc3MsIHJ1bGVzKTtcblxuICAgIHJldHVybiBwYXJzZXI7XG4gIH1cblxuICBzdGF0aWMgZnJvbUJORihDbGFzcywgYm5mKSB7XG4gICAgY29uc3QgcnVsZXMgPSBydWxlc0Zyb21CTkYoYm5mKSxcbiAgICAgICAgICBwYXJzZXIgPSBwYXJzZXJGcm9tUnVsZXMoQ2xhc3MsIHJ1bGVzKTtcblxuICAgIHJldHVybiBwYXJzZXI7XG4gIH1cblxuICBzdGF0aWMgZnJvbVJ1bGVzKENsYXNzLCBydWxlcykge1xuICAgIGNvbnN0IHBhcnNlciA9IHBhcnNlckZyb21SdWxlcyhDbGFzcywgcnVsZXMpO1xuXG4gICAgcmV0dXJuIHBhcnNlcjtcbiAgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJZYXBwUGFyc2VyIiwicnVsZXNGcm9tQk5GIiwicGFyc2VyVXRpbGl0aWVzIiwicGFyc2VyRnJvbVJ1bGVzIiwiZnJvbU5vdGhpbmciLCJDbGFzcyIsImJuZiIsInJ1bGVzIiwicGFyc2VyIiwiZnJvbUJORiIsImZyb21SdWxlcyIsIkNvbW1vblBhcnNlciJdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWSxDQUFDOzs7Ozs7O2VBT1FBLFVBQVU7Ozs0QkFMRixlQUFlO3FDQUNaLHlCQUF5Qjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFekQsSUFBUUMsWUFBWSxHQUFzQkMsc0JBQWUsZ0JBQUEsQ0FBakRELFlBQVksRUFBRUUsZUFBZSxHQUFLRCxzQkFBZSxnQkFBQSxDQUFuQ0MsZUFBZSxBQUFxQjtBQUUzQyxJQUFBLEFBQU1ILFVBQVUsaUJBQWhCOzs7YUFBTUEsVUFBVTs7Ozs7O1lBQ3RCSSxHQUFXLEVBQVhBLGFBQVc7bUJBQWxCLFNBQU9BLFdBQVcsQ0FBQ0MsS0FBSyxFQUFFO2dCQUN4QixJQUFNLEFBQUVDLEdBQUcsR0FBS0QsS0FBSyxDQUFiQyxHQUFHLEFBQVUsRUFDZkMsS0FBSyxHQUFHTixZQUFZLENBQUNLLEdBQUcsQ0FBQyxFQUN6QkUsTUFBTSxHQUFHTCxlQUFlLENBQUNFLEtBQUssRUFBRUUsS0FBSyxDQUFDLEFBQUM7Z0JBRTdDLE9BQU9DLE1BQU0sQ0FBQzthQUNmOzs7WUFFTUMsR0FBTyxFQUFQQSxTQUFPO21CQUFkLFNBQU9BLE9BQU8sQ0FBQ0osS0FBSyxFQUFFQyxHQUFHLEVBQUU7Z0JBQ3pCLElBQU1DLEtBQUssR0FBR04sWUFBWSxDQUFDSyxHQUFHLENBQUMsRUFDekJFLE1BQU0sR0FBR0wsZUFBZSxDQUFDRSxLQUFLLEVBQUVFLEtBQUssQ0FBQyxBQUFDO2dCQUU3QyxPQUFPQyxNQUFNLENBQUM7YUFDZjs7O1lBRU1FLEdBQVMsRUFBVEEsV0FBUzttQkFBaEIsU0FBT0EsU0FBUyxDQUFDTCxLQUFLLEVBQUVFLEtBQUssRUFBRTtnQkFDN0IsSUFBTUMsTUFBTSxHQUFHTCxlQUFlLENBQUNFLEtBQUssRUFBRUUsS0FBSyxDQUFDLEFBQUM7Z0JBRTdDLE9BQU9DLE1BQU0sQ0FBQzthQUNmOzs7O0NBQ0YsQ0FyQnVDRyxhQUFZLGFBQUEsQ0FxQm5EIn0=

package/src/lexer/yapp.js

@@ -1,5 +0,0 @@
-"use strict";
-
-import { CommonLexer } from "occam-lexers";
-
-export default class YappLexer extends CommonLexer {}

package/src/parser/yapp.js

@@ -1,29 +0,0 @@
-"use strict";
-
-import { CommonParser } from "occam-parsers";
-import { parserUtilities } from "occam-grammar-utilities";
-
-const { rulesFromBNF, parserFromRules } = parserUtilities;
-
-export default class YappParser extends CommonParser {
-  static fromNothing(Class) {
-    const { bnf } = Class,
-          rules = rulesFromBNF(bnf),
-          parser = parserFromRules(Class, rules);
-
-    return parser;
-  }
-
-  static fromBNF(Class, bnf) {
-    const rules = rulesFromBNF(bnf),
-          parser = parserFromRules(Class, rules);
-
-    return parser;
-  }
-
-  static fromRules(Class, rules) {
-    const parser = parserFromRules(Class, rules);
-
-    return parser;
-  }
-}

package/src/token/significant/jsx.js

@@ -1,11 +0,0 @@
-"use strict";
-
-import { SignificantToken } from "occam-lexers";
-
-import { JSX_TOKEN_TYPE } from "../../tokenTypes";
-
-const type = JSX_TOKEN_TYPE;  ///
-
-export default class JSXToken extends SignificantToken {
-  static fromContent(content) { return SignificantToken.fromContentAndType(JSXToken, content, type); }
-}