occam-languages 0.0.258 → 0.0.260

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.
@@ -102,6 +102,10 @@ class FileContext extends _context.default {
102
102
  const { fileContent, filePath } = json, tokens = null, node = null, context = remainingArguments.pop(), fileContext = new Class(context, fileContent, filePath, tokens, node, json, ...remainingArguments);
103
103
  return fileContext;
104
104
  }
105
+ static fromNodeAndTokens(Class, node, tokens, ...remainingArguments) {
106
+ const fileContent = null, filePath = null, json = null, context = remainingArguments.pop(), fileContext = new Class(context, fileContent, filePath, tokens, node, json, ...remainingArguments);
107
+ return fileContext;
108
+ }
105
109
  }
106
110
 
107
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/context/file.js"],"sourcesContent":["\"use strict\";\n\nimport Context from '../context';\nimport BreakPoint from \"../breakPoint\";\n\nimport { nodeAsString, nodesAsString } from \"../utilities/node\";\n\nexport default class FileContext extends Context {\n  constructor(context, fileContent, filePath, tokens, node, json) {\n    super(context);\n\n    this.fileContent = fileContent;\n    this.filePath = filePath;\n    this.tokens = tokens;\n    this.node = node;\n    this.json = json;\n  }\n\n  getFileContent() {\n    return this.fileContent;\n  }\n\n  getFilePath() {\n    return this.filePath;\n  }\n\n  getTokens() {\n    return this.tokens;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getJSON() {\n    return this.json;\n  }\n\n  getLexer() {\n    const lexer = null;\n\n    return lexer;\n  }\n\n  getParser() {\n    const parser = null;\n\n    return parser;\n  }\n\n  getTypePrefix() {\n    const context = this.getContext(),\n          typePrefix = context.getTypePrefix();\n\n    return typePrefix;\n  }\n\n  matchFilePath(filePath) {\n    const filePathMatches = (this.filePath === filePath);\n\n    return filePathMatches;\n  }\n\n  nodeAsString(node) {\n    const string = nodeAsString(node, this.tokens);\n\n    return string;\n  }\n\n  nodesAsString(nodes) {\n    const string = nodesAsString(nodes, this.tokens);\n\n    return string;\n  }\n\n  async break(node, breakPoint) {\n    const filePath = this.filePath,\n          releaseContext = this.getReleaseContext();\n\n    if (breakPoint === null) {\n      breakPoint = BreakPoint.fromFilePathNodeAndTokens(filePath, node, this.tokens);\n    }\n\n    await releaseContext.break(breakPoint);\n\n    return breakPoint;\n  }\n\n  async verify() {\n    let verifies = false;\n\n    if (this.node === null) {\n      this.warning(`Unable to verify the '${this.filePath}' file because it cannot be parsed.`);\n    } else {\n      this.debug(`Verifying the '${this.filePath}' file...`);\n\n      const fileVerifies = await this.verifyFile();\n\n      if (fileVerifies) {\n        verifies = true;\n      }\n\n      verifies ?\n        this.complete() :\n          this.clear();\n\n      if (verifies) {\n        this.info(`...verified the '${this.filePath}' file.`);\n      }\n    }\n\n    return verifies;\n  }\n\n  initialise() {\n    const lexer = this.getLexer(),\n          parser = this.getParser(),\n          content = this.fileContent; ///\n\n    this.tokens = lexer.tokenise(content);\n\n    this.node = parser.parse(this.tokens);\n  }\n\n  static fromFile(Class, file, ...remainingArguments) {\n    const fileContent = file.getContent(),\n          filePath = file.getPath(),\n          tokens = null,\n          node = null,\n          json = null,\n          context = remainingArguments.pop(), ///\n          fileContext = new Class(context, fileContent, filePath, tokens, node, json, ...remainingArguments);\n\n    return fileContext;\n  }\n\n  static fromJSON(Class, json, ...remainingArguments) {\n    const { fileContent, filePath } = json,\n          tokens = null,\n          node = null,\n          context = remainingArguments.pop(), ///\n          fileContext = new Class(context, fileContent, filePath, tokens, node, json, ...remainingArguments);\n\n    return fileContext;\n  }\n}\n"],"names":["FileContext","Context","context","fileContent","filePath","tokens","node","json","getFileContent","getFilePath","getTokens","getNode","getJSON","getLexer","lexer","getParser","parser","getTypePrefix","getContext","typePrefix","matchFilePath","filePathMatches","nodeAsString","string","nodesAsString","nodes","break","breakPoint","releaseContext","getReleaseContext","BreakPoint","fromFilePathNodeAndTokens","verify","verifies","warning","debug","fileVerifies","verifyFile","complete","clear","info","initialise","content","tokenise","parse","fromFile","Class","file","remainingArguments","getContent","getPath","pop","fileContext","fromJSON"],"mappings":"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"}
111
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/context/file.js"],"sourcesContent":["\"use strict\";\n\nimport Context from '../context';\nimport BreakPoint from \"../breakPoint\";\n\nimport { nodeAsString, nodesAsString } from \"../utilities/node\";\n\nexport default class FileContext extends Context {\n  constructor(context, fileContent, filePath, tokens, node, json) {\n    super(context);\n\n    this.fileContent = fileContent;\n    this.filePath = filePath;\n    this.tokens = tokens;\n    this.node = node;\n    this.json = json;\n  }\n\n  getFileContent() {\n    return this.fileContent;\n  }\n\n  getFilePath() {\n    return this.filePath;\n  }\n\n  getTokens() {\n    return this.tokens;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getJSON() {\n    return this.json;\n  }\n\n  getLexer() {\n    const lexer = null;\n\n    return lexer;\n  }\n\n  getParser() {\n    const parser = null;\n\n    return parser;\n  }\n\n  getTypePrefix() {\n    const context = this.getContext(),\n          typePrefix = context.getTypePrefix();\n\n    return typePrefix;\n  }\n\n  matchFilePath(filePath) {\n    const filePathMatches = (this.filePath === filePath);\n\n    return filePathMatches;\n  }\n\n  nodeAsString(node) {\n    const string = nodeAsString(node, this.tokens);\n\n    return string;\n  }\n\n  nodesAsString(nodes) {\n    const string = nodesAsString(nodes, this.tokens);\n\n    return string;\n  }\n\n  async break(node, breakPoint) {\n    const filePath = this.filePath,\n          releaseContext = this.getReleaseContext();\n\n    if (breakPoint === null) {\n      breakPoint = BreakPoint.fromFilePathNodeAndTokens(filePath, node, this.tokens);\n    }\n\n    await releaseContext.break(breakPoint);\n\n    return breakPoint;\n  }\n\n  async verify() {\n    let verifies = false;\n\n    if (this.node === null) {\n      this.warning(`Unable to verify the '${this.filePath}' file because it cannot be parsed.`);\n    } else {\n      this.debug(`Verifying the '${this.filePath}' file...`);\n\n      const fileVerifies = await this.verifyFile();\n\n      if (fileVerifies) {\n        verifies = true;\n      }\n\n      verifies ?\n        this.complete() :\n          this.clear();\n\n      if (verifies) {\n        this.info(`...verified the '${this.filePath}' file.`);\n      }\n    }\n\n    return verifies;\n  }\n\n  initialise() {\n    const lexer = this.getLexer(),\n          parser = this.getParser(),\n          content = this.fileContent; ///\n\n    this.tokens = lexer.tokenise(content);\n\n    this.node = parser.parse(this.tokens);\n  }\n\n  static fromFile(Class, file, ...remainingArguments) {\n    const fileContent = file.getContent(),\n          filePath = file.getPath(),\n          tokens = null,\n          node = null,\n          json = null,\n          context = remainingArguments.pop(), ///\n          fileContext = new Class(context, fileContent, filePath, tokens, node, json, ...remainingArguments);\n\n    return fileContext;\n  }\n\n  static fromJSON(Class, json, ...remainingArguments) {\n    const { fileContent, filePath } = json,\n      tokens = null,\n      node = null,\n      context = remainingArguments.pop(), ///\n      fileContext = new Class(context, fileContent, filePath, tokens, node, json, ...remainingArguments);\n\n    return fileContext;\n  }\n\n  static fromNodeAndTokens(Class, node, tokens, ...remainingArguments) {\n    const fileContent = null,\n          filePath = null,\n          json = null,\n          context = remainingArguments.pop(), ///\n          fileContext = new Class(context, fileContent, filePath, tokens, node, json, ...remainingArguments);\n\n    return fileContext;\n  }\n}\n"],"names":["FileContext","Context","context","fileContent","filePath","tokens","node","json","getFileContent","getFilePath","getTokens","getNode","getJSON","getLexer","lexer","getParser","parser","getTypePrefix","getContext","typePrefix","matchFilePath","filePathMatches","nodeAsString","string","nodesAsString","nodes","break","breakPoint","releaseContext","getReleaseContext","BreakPoint","fromFilePathNodeAndTokens","verify","verifies","warning","debug","fileVerifies","verifyFile","complete","clear","info","initialise","content","tokenise","parse","fromFile","Class","file","remainingArguments","getContent","getPath","pop","fileContext","fromJSON","fromNodeAndTokens"],"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": "0.0.258",
4
+ "version": "0.0.260",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-languages",
7
7
  "description": "Occam's common language functionality.",
@@ -136,8 +136,18 @@ export default class FileContext extends Context {
136
136
 
137
137
  static fromJSON(Class, json, ...remainingArguments) {
138
138
  const { fileContent, filePath } = json,
139
- tokens = null,
140
- node = null,
139
+ tokens = null,
140
+ node = null,
141
+ context = remainingArguments.pop(), ///
142
+ fileContext = new Class(context, fileContent, filePath, tokens, node, json, ...remainingArguments);
143
+
144
+ return fileContext;
145
+ }
146
+
147
+ static fromNodeAndTokens(Class, node, tokens, ...remainingArguments) {
148
+ const fileContent = null,
149
+ filePath = null,
150
+ json = null,
141
151
  context = remainingArguments.pop(), ///
142
152
  fileContext = new Class(context, fileContent, filePath, tokens, node, json, ...remainingArguments);
143
153