yapp 3.0.1 → 3.0.2

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,8 +10,6 @@ Object.defineProperty(exports, "default", {
10
10
  });
11
11
  var _easyWithStyle = /*#__PURE__*/ _interopRequireDefault(require("easy-with-style"));
12
12
  var _easy = require("easy");
13
- var _occamLexers = require("occam-lexers");
14
- var _occamParsers = require("occam-parsers");
15
13
  var _occamGrammarUtilities = require("occam-grammar-utilities");
16
14
  var _easyLayout = require("easy-layout");
17
15
  var _yapp = /*#__PURE__*/ _interopRequireDefault(require("./yapp"));
@@ -203,7 +201,7 @@ function _templateObject() {
203
201
  };
204
202
  return data;
205
203
  }
206
- var bnfLexer = _occamLexers.BNFLexer.fromNothing(), bnfParser = _occamParsers.BNFParser.fromNothing();
204
+ var rulesFromBNF = _occamGrammarUtilities.parserUtilities.rulesFromBNF;
207
205
  var View = /*#__PURE__*/ function(Element) {
208
206
  _inherits(View, Element);
209
207
  var _super = _createSuper(View);
@@ -222,10 +220,7 @@ var View = /*#__PURE__*/ function(Element) {
222
220
  key: "keyUpHandler",
223
221
  value: function keyUpHandler(event, element) {
224
222
  try {
225
- var lexicalEntries = this.getLexicalEntries(), entries = lexicalEntries, bnf = this.getBNF(), tokens = bnfLexer.tokensFromBNF(bnf);
226
- var rules = bnfParser.rulesFromTokens(tokens);
227
- rules = (0, _occamGrammarUtilities.eliminateLeftRecursion)(rules);
228
- var Plugin = this.constructor.Plugin, Lexer = Plugin.Lexer, Parser = Plugin.Parser, lexer = Lexer.fromEntries(entries), parser = Parser.fromRules(rules), yappLexer = lexer, yappParser = parser; ///
223
+ var Plugin = this.constructor.Plugin, Lexer = Plugin.Lexer, Parser = Plugin.Parser, lexicalEntries = this.getLexicalEntries(), bnf = this.getBNF(), entries = lexicalEntries, rules = rulesFromBNF(bnf), lexer = Lexer.fromEntries(entries), parser = Parser.fromRules(rules), yappLexer = lexer, yappParser = parser; ///
229
224
  this.setYappLexer(yappLexer);
230
225
  this.setYappParser(yappParser);
231
226
  this.updateYapp();
@@ -316,4 +311,4 @@ _defineProperty(View, "defaultProperties", {
316
311
  });
317
312
  var _default = (0, _easyWithStyle.default)(View)(_templateObject());
318
313
 
319
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/example/view.js"],"sourcesContent":["\"use strict\";\n\nimport withStyle from \"easy-with-style\";  ///\n\nimport { Element } from \"easy\";\nimport { BNFLexer } from \"occam-lexers\";\nimport { BNFParser } from \"occam-parsers\";\nimport { eliminateLeftRecursion, rewriteNodes } from \"occam-grammar-utilities\";\nimport { RowDiv, RowsDiv, ColumnDiv, ColumnsDiv, VerticalSplitterDiv, HorizontalSplitterDiv } from \"easy-layout\";\n\nimport Yapp from \"./yapp\";\nimport SubHeading from \"./subHeading\";\nimport BNFTextarea from \"./textarea/bnf\";\nimport TokensTextarea from \"./textarea/tokens\";\nimport TopSizeableDiv from \"./div/sizeable/top\";\nimport LeftSizeableDiv from \"./div/sizeable/left\";\nimport RightSizeableDiv from \"./div/sizeable/right\";\nimport MiddleSizeableDiv from \"./div/sizeable/middle\";\nimport ParseTreeTextarea from \"./textarea/parseTree\";\nimport LexicalEntriesTextarea from \"./textarea/lexicalEntries\";\n\nconst bnfLexer = BNFLexer.fromNothing(),\n      bnfParser = BNFParser.fromNothing();\n\nclass View extends Element {\n  contentChangeHandler(event, element) {\n    this.update();\n  }\n\n  keyUpHandler(event, element) {\n    try {\n      const lexicalEntries = this.getLexicalEntries(),\n            entries = lexicalEntries, ///\n            bnf = this.getBNF(),\n            tokens = bnfLexer.tokensFromBNF(bnf);\n\n      let rules = bnfParser.rulesFromTokens(tokens);\n\n      rules = eliminateLeftRecursion(rules);\n\n      const { Plugin } = this.constructor,\n            { Lexer, Parser } = Plugin,\n            lexer = Lexer.fromEntries(entries),\n            parser = Parser.fromRules(rules),\n            yappLexer = lexer,  ///\n            yappParser = parser;  ///\n\n      this.setYappLexer(yappLexer);\n\n      this.setYappParser(yappParser);\n\n      this.updateYapp();\n\n      this.update();\n    } catch (error) {\n      console.log(error);\n    }\n  }\n\n  dragHandler() {\n    const leftSizeableDivWidth = this.getLeftSizeableDivWidth(),\n          topSizeableDivHeight = this.getTopSizeableDivHeight(),\n          yappWidth = leftSizeableDivWidth, ///\n          yappHeight = topSizeableDivHeight;  ///\n\n    this.setYappWidth(yappWidth);\n    this.setYappHeight(yappHeight);\n\n    this.resizeYapp();\n  }\n\n  update() {\n    try {\n      let parseTree = null;\n\n      const plugin = this.getPlugin(),\n            tokens = plugin.getTokens(),\n            node = plugin.getNode();\n\n      if (node !== null) {\n        rewriteNodes(node);\n\n        parseTree = node.asParseTree(tokens);\n      }\n\n      this.setTokens(tokens);\n\n      this.setParseTree(parseTree);\n    } catch (error) {\n      console.log(error);\n\n      this.clearTokens();\n\n      this.clearParseTree();\n    }\n  }\n\n  didMount() {\n    this.update();\n\n    this.dragHandler(); ///\n\n    this.resizeYapp();  ///\n  }\n\n  willUnmount() {\n    ///\n  }\n\n  childElements() {\n    const { Plugin, firaCode, initialContent } = this.constructor,\n          dragHandler = this.dragHandler.bind(this),\n          keyUpHandler = this.keyUpHandler.bind(this),\n          contentChangeHandler = this.contentChangeHandler.bind(this);\n\n    return ([\n\n      <ColumnsDiv>\n        <LeftSizeableDiv>\n          <RowsDiv>\n            <TopSizeableDiv>\n              <Yapp Plugin={Plugin} firaCode={firaCode} onContentChange={contentChangeHandler} >\n                {initialContent}\n              </Yapp>\n            </TopSizeableDiv>\n            <HorizontalSplitterDiv onDrag={dragHandler}/>\n            <RowDiv>\n              <RowsDiv>\n                <MiddleSizeableDiv>\n                  <RowsDiv>\n                    <SubHeading>\n                      Tokens\n                    </SubHeading>\n                    <TokensTextarea />\n                  </RowsDiv>\n                </MiddleSizeableDiv>\n                <HorizontalSplitterDiv />\n                <RowsDiv>\n                  <SubHeading>\n                    Parse tree\n                  </SubHeading>\n                  <ParseTreeTextarea />\n                </RowsDiv>\n              </RowsDiv>\n            </RowDiv>\n          </RowsDiv>\n        </LeftSizeableDiv>\n        <VerticalSplitterDiv onDrag={dragHandler}/>\n        <ColumnDiv>\n          <RowsDiv>\n            <RightSizeableDiv>\n              <RowsDiv>\n                <SubHeading>\n                  Lexical entries\n                </SubHeading>\n                <LexicalEntriesTextarea onKeyUp={keyUpHandler} />\n              </RowsDiv>\n            </RightSizeableDiv>\n            <HorizontalSplitterDiv />\n            <RowDiv>\n              <RowsDiv>\n                <SubHeading>\n                  BNF\n                </SubHeading>\n                <BNFTextarea onKeyUp={keyUpHandler} />\n              </RowsDiv>\n            </RowDiv>\n          </RowsDiv>\n        </ColumnDiv>\n      </ColumnsDiv>\n\n    ]);\n  }\n\n  initialise() {\n    this.assignContext();\n\n    const { Plugin } = this.constructor,\n          { Lexer, Parser } = Plugin,\n          { bnf } = Parser,\n          { entries } = Lexer,\n          lexicalEntries = entries; ///\n\n    this.setBNF(bnf);\n\n    this.setLexicalEntries(lexicalEntries);\n  }\n\n  static tagName = \"div\";\n\n  static defaultProperties = {\n    className: \"view\"\n  };\n}\n\nexport default withStyle(View)`\n\n  width: 100%;\n  height: 100vh;\n  display: flex;\n  padding: 1rem;\n  \n`;\n"],"names":["bnfLexer","BNFLexer","fromNothing","bnfParser","BNFParser","View","contentChangeHandler","event","element","update","keyUpHandler","lexicalEntries","getLexicalEntries","entries","bnf","getBNF","tokens","tokensFromBNF","rules","rulesFromTokens","eliminateLeftRecursion","Plugin","constructor","Lexer","Parser","lexer","fromEntries","parser","fromRules","yappLexer","yappParser","setYappLexer","setYappParser","updateYapp","error","console","log","dragHandler","leftSizeableDivWidth","getLeftSizeableDivWidth","topSizeableDivHeight","getTopSizeableDivHeight","yappWidth","yappHeight","setYappWidth","setYappHeight","resizeYapp","parseTree","plugin","getPlugin","getTokens","node","getNode","rewriteNodes","asParseTree","setTokens","setParseTree","clearTokens","clearParseTree","didMount","willUnmount","childElements","firaCode","initialContent","bind","ColumnsDiv","LeftSizeableDiv","RowsDiv","TopSizeableDiv","Yapp","onContentChange","HorizontalSplitterDiv","onDrag","RowDiv","MiddleSizeableDiv","SubHeading","TokensTextarea","ParseTreeTextarea","VerticalSplitterDiv","ColumnDiv","RightSizeableDiv","LexicalEntriesTextarea","onKeyUp","BNFTextarea","initialise","assignContext","setBNF","setLexicalEntries","Element","tagName","defaultProperties","className","withStyle"],"mappings":"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"}
314
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/example/view.js"],"sourcesContent":["\"use strict\";\n\nimport withStyle from \"easy-with-style\";  ///\n\nimport { Element } from \"easy\";\nimport { rewriteNodes, parserUtilities } from \"occam-grammar-utilities\";\nimport { RowDiv, RowsDiv, ColumnDiv, ColumnsDiv, VerticalSplitterDiv, HorizontalSplitterDiv } from \"easy-layout\";\n\nimport Yapp from \"./yapp\";\nimport SubHeading from \"./subHeading\";\nimport BNFTextarea from \"./textarea/bnf\";\nimport TokensTextarea from \"./textarea/tokens\";\nimport TopSizeableDiv from \"./div/sizeable/top\";\nimport LeftSizeableDiv from \"./div/sizeable/left\";\nimport RightSizeableDiv from \"./div/sizeable/right\";\nimport MiddleSizeableDiv from \"./div/sizeable/middle\";\nimport ParseTreeTextarea from \"./textarea/parseTree\";\nimport LexicalEntriesTextarea from \"./textarea/lexicalEntries\";\n\nconst { rulesFromBNF } = parserUtilities;\n\nclass View extends Element {\n  contentChangeHandler(event, element) {\n    this.update();\n  }\n\n  keyUpHandler(event, element) {\n    try {\n      const { Plugin } = this.constructor,\n            { Lexer, Parser } = Plugin,\n            lexicalEntries = this.getLexicalEntries(),\n            bnf = this.getBNF(),\n            entries = lexicalEntries, ///\n            rules = rulesFromBNF(bnf),\n            lexer = Lexer.fromEntries(entries),\n            parser = Parser.fromRules(rules),\n            yappLexer = lexer,  ///\n            yappParser = parser;  ///\n\n      this.setYappLexer(yappLexer);\n\n      this.setYappParser(yappParser);\n\n      this.updateYapp();\n\n      this.update();\n    } catch (error) {\n      console.log(error);\n    }\n  }\n\n  dragHandler() {\n    const leftSizeableDivWidth = this.getLeftSizeableDivWidth(),\n          topSizeableDivHeight = this.getTopSizeableDivHeight(),\n          yappWidth = leftSizeableDivWidth, ///\n          yappHeight = topSizeableDivHeight;  ///\n\n    this.setYappWidth(yappWidth);\n\n    this.setYappHeight(yappHeight);\n\n    this.resizeYapp();\n  }\n\n  update() {\n    try {\n      let parseTree = null;\n\n      const plugin = this.getPlugin(),\n            tokens = plugin.getTokens(),\n            node = plugin.getNode();\n\n      if (node !== null) {\n        rewriteNodes(node);\n\n        parseTree = node.asParseTree(tokens);\n      }\n\n      this.setTokens(tokens);\n\n      this.setParseTree(parseTree);\n    } catch (error) {\n      console.log(error);\n\n      this.clearTokens();\n\n      this.clearParseTree();\n    }\n  }\n\n  didMount() {\n    this.update();\n\n    this.dragHandler(); ///\n\n    this.resizeYapp();  ///\n  }\n\n  willUnmount() {\n    ///\n  }\n\n  childElements() {\n    const { Plugin, firaCode, initialContent } = this.constructor,\n          dragHandler = this.dragHandler.bind(this),\n          keyUpHandler = this.keyUpHandler.bind(this),\n          contentChangeHandler = this.contentChangeHandler.bind(this);\n\n    return ([\n\n      <ColumnsDiv>\n        <LeftSizeableDiv>\n          <RowsDiv>\n            <TopSizeableDiv>\n              <Yapp Plugin={Plugin} firaCode={firaCode} onContentChange={contentChangeHandler} >\n                {initialContent}\n              </Yapp>\n            </TopSizeableDiv>\n            <HorizontalSplitterDiv onDrag={dragHandler}/>\n            <RowDiv>\n              <RowsDiv>\n                <MiddleSizeableDiv>\n                  <RowsDiv>\n                    <SubHeading>\n                      Tokens\n                    </SubHeading>\n                    <TokensTextarea />\n                  </RowsDiv>\n                </MiddleSizeableDiv>\n                <HorizontalSplitterDiv />\n                <RowsDiv>\n                  <SubHeading>\n                    Parse tree\n                  </SubHeading>\n                  <ParseTreeTextarea />\n                </RowsDiv>\n              </RowsDiv>\n            </RowDiv>\n          </RowsDiv>\n        </LeftSizeableDiv>\n        <VerticalSplitterDiv onDrag={dragHandler}/>\n        <ColumnDiv>\n          <RowsDiv>\n            <RightSizeableDiv>\n              <RowsDiv>\n                <SubHeading>\n                  Lexical entries\n                </SubHeading>\n                <LexicalEntriesTextarea onKeyUp={keyUpHandler} />\n              </RowsDiv>\n            </RightSizeableDiv>\n            <HorizontalSplitterDiv />\n            <RowDiv>\n              <RowsDiv>\n                <SubHeading>\n                  BNF\n                </SubHeading>\n                <BNFTextarea onKeyUp={keyUpHandler} />\n              </RowsDiv>\n            </RowDiv>\n          </RowsDiv>\n        </ColumnDiv>\n      </ColumnsDiv>\n\n    ]);\n  }\n\n  initialise() {\n    this.assignContext();\n\n    const { Plugin } = this.constructor,\n          { Lexer, Parser } = Plugin,\n          { bnf } = Parser,\n          { entries } = Lexer,\n          lexicalEntries = entries; ///\n\n    this.setBNF(bnf);\n\n    this.setLexicalEntries(lexicalEntries);\n  }\n\n  static tagName = \"div\";\n\n  static defaultProperties = {\n    className: \"view\"\n  };\n}\n\nexport default withStyle(View)`\n\n  width: 100%;\n  height: 100vh;\n  display: flex;\n  padding: 1rem;\n  \n`;\n"],"names":["rulesFromBNF","parserUtilities","View","contentChangeHandler","event","element","update","keyUpHandler","Plugin","constructor","Lexer","Parser","lexicalEntries","getLexicalEntries","bnf","getBNF","entries","rules","lexer","fromEntries","parser","fromRules","yappLexer","yappParser","setYappLexer","setYappParser","updateYapp","error","console","log","dragHandler","leftSizeableDivWidth","getLeftSizeableDivWidth","topSizeableDivHeight","getTopSizeableDivHeight","yappWidth","yappHeight","setYappWidth","setYappHeight","resizeYapp","parseTree","plugin","getPlugin","tokens","getTokens","node","getNode","rewriteNodes","asParseTree","setTokens","setParseTree","clearTokens","clearParseTree","didMount","willUnmount","childElements","firaCode","initialContent","bind","ColumnsDiv","LeftSizeableDiv","RowsDiv","TopSizeableDiv","Yapp","onContentChange","HorizontalSplitterDiv","onDrag","RowDiv","MiddleSizeableDiv","SubHeading","TokensTextarea","ParseTreeTextarea","VerticalSplitterDiv","ColumnDiv","RightSizeableDiv","LexicalEntriesTextarea","onKeyUp","BNFTextarea","initialise","assignContext","setBNF","setLexicalEntries","Element","tagName","defaultProperties","className","withStyle"],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "yapp",
3
3
  "author": "James Smith",
4
- "version": "3.0.1",
4
+ "version": "3.0.2",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/yapp",
7
7
  "description": "Yet Another Pretty Printer.",
@@ -15,7 +15,7 @@
15
15
  "easy-with-style": "^3.0.176",
16
16
  "necessary": "^11.0.40",
17
17
  "occam-dom": "^3.0.171",
18
- "occam-grammar-utilities": "^7.0.32",
18
+ "occam-grammar-utilities": "^7.0.36",
19
19
  "occam-lexers": "^16.0.46",
20
20
  "occam-parsers": "^16.0.101"
21
21
  },
@@ -3,9 +3,7 @@
3
3
  import withStyle from "easy-with-style"; ///
4
4
 
5
5
  import { Element } from "easy";
6
- import { BNFLexer } from "occam-lexers";
7
- import { BNFParser } from "occam-parsers";
8
- import { eliminateLeftRecursion, rewriteNodes } from "occam-grammar-utilities";
6
+ import { rewriteNodes, parserUtilities } from "occam-grammar-utilities";
9
7
  import { RowDiv, RowsDiv, ColumnDiv, ColumnsDiv, VerticalSplitterDiv, HorizontalSplitterDiv } from "easy-layout";
10
8
 
11
9
  import Yapp from "./yapp";
@@ -19,8 +17,7 @@ import MiddleSizeableDiv from "./div/sizeable/middle";
19
17
  import ParseTreeTextarea from "./textarea/parseTree";
20
18
  import LexicalEntriesTextarea from "./textarea/lexicalEntries";
21
19
 
22
- const bnfLexer = BNFLexer.fromNothing(),
23
- bnfParser = BNFParser.fromNothing();
20
+ const { rulesFromBNF } = parserUtilities;
24
21
 
25
22
  class View extends Element {
26
23
  contentChangeHandler(event, element) {
@@ -29,17 +26,12 @@ class View extends Element {
29
26
 
30
27
  keyUpHandler(event, element) {
31
28
  try {
32
- const lexicalEntries = this.getLexicalEntries(),
33
- entries = lexicalEntries, ///
34
- bnf = this.getBNF(),
35
- tokens = bnfLexer.tokensFromBNF(bnf);
36
-
37
- let rules = bnfParser.rulesFromTokens(tokens);
38
-
39
- rules = eliminateLeftRecursion(rules);
40
-
41
29
  const { Plugin } = this.constructor,
42
30
  { Lexer, Parser } = Plugin,
31
+ lexicalEntries = this.getLexicalEntries(),
32
+ bnf = this.getBNF(),
33
+ entries = lexicalEntries, ///
34
+ rules = rulesFromBNF(bnf),
43
35
  lexer = Lexer.fromEntries(entries),
44
36
  parser = Parser.fromRules(rules),
45
37
  yappLexer = lexer, ///
@@ -64,6 +56,7 @@ class View extends Element {
64
56
  yappHeight = topSizeableDivHeight; ///
65
57
 
66
58
  this.setYappWidth(yappWidth);
59
+
67
60
  this.setYappHeight(yappHeight);
68
61
 
69
62
  this.resizeYapp();