occam-furtle 3.0.39 → 3.0.41

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-furtle",
   "author": "James Smith",
-  "version": "3.0.39",
+  "version": "3.0.41",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-furtle",
   "description": "Occam's Furtle language.",
@@ -13,11 +13,8 @@
     "necessary": "^17.0.9",
     "occam-grammar-utilities": "^8.0.395",
     "occam-grammars": "^1.3.510",
-    "occam-lexers": "^23.1.35",
-    "occam-model": "^1.0.489",
-    "occam-nominal": "^0.0.5",
-    "occam-parsers": "^23.1.38",
-    "occam-query": "^4.1.142"
+    "occam-languages": "^0.0.3",
+    "occam-parsers": "^23.1.38"
   },
   "devDependencies": {
     "@swc/core": "1.13.20",
@@ -27,8 +24,11 @@
     "esbuild": "0.11.14",
     "express": "^4.17.1",
     "juxtapose": "^4.0.130",
+    "occam-nominal": "^0.0.5",
+    "occam-model": "^1.0.492",
     "lively-cli": "^2.0.77",
-    "watchful-cli": "^1.7.67"
+    "watchful-cli": "^1.7.67",
+    "occam-query": "^4.1.142"
   },
   "scripts": {
     "start": "node ./bin/main.js",

package/src/constants.js

@@ -1,17 +1,5 @@
 "use strict";
 
-import { levels } from "necessary";
-
-export const { TRACE_LEVEL, DEBUG_LEVEL, INFO_LEVEL, WARNING_LEVEL, ERROR_LEVEL } = levels;
-
-export const LEVELS = [
-  TRACE_LEVEL,
-  DEBUG_LEVEL,
-  INFO_LEVEL,
-  WARNING_LEVEL,
-  ERROR_LEVEL
-];
-
 export const NULL = "null";
 export const TRUE = "true";
 export const FALSE = "false";

package/src/context/block.js

@@ -1,13 +1,12 @@
 "use strict";
 
 import { arrayUtilities } from "necessary";
+import { Context, contextUtilities } from "occam-languages";
 
-import Context from "../context";
 import Exception from "../exception";
 
-import { chainContext } from "../utilities/context";
-
-const { push } = arrayUtilities;
+const { push } = arrayUtilities,
+      { chainContext } = contextUtilities;
 
 export default class BlockContext extends Context {
   constructor(context, variables) {

package/src/context/file/furtle.js

@@ -1,14 +1,13 @@
 "use strict";
 
 import { arrayUtilities } from "necessary";
-
-import FileContext from "../../context/file";
+import { FileContext, contextUtilities } from "occam-languages";
 
 import { verifyFile } from "../../process/verify";
-import { chainContext } from "../../utilities/context";
 import { furtleLexer, furtleParser } from "../../utilities/furtle";
 
-const { push } = arrayUtilities;
+const { push } = arrayUtilities,
+      { chainContext } = contextUtilities;
 
 export default class FurtleFileContext extends FileContext {
   constructor(context, filePath, tokens, node, procedures) {

package/src/element/assignment/array.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import Element from "../../element";
+import { Element } from "occam-languages";
+
 import elements from "../../elements";
 import Exception from "../../exception";
 

package/src/element/assignment/object.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import Element from "../../element";
+import { Element } from "occam-languages";
+
 import elements from "../../elements";
 import Exception from "../../exception";
 import nodeProperties from "../../nodeProperties";

package/src/element/assignment/variable.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import Element from "../../element";
+import { Element } from "occam-languages";
 
 import { define } from "../../elements";
 

package/src/element/assignments/variable.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import { define } from "../../elements";
+import { Element, asynchronousUtilities } from "occam-languages";
 
-import Element from "../../element";
+import { define } from "../../elements";
 
-import { asyncForEach } from "../../utilities/asynchronous";
+const { asyncForEach } = asynchronousUtilities;
 
 export default define(class VariableAssignments extends Element {
   constructor(context, string, node, array) {

package/src/element/declaration/procedure.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import { define } from "../../elements";
+import { Element } from "occam-languages";
 
-import Element from "../../element";
+import { define } from "../../elements";
 
 export default define(class ProcedureDeclaration extends Element {
   constructor(context, string, node, procedure) {

package/src/element/error.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import { define } from "../elements";
+import { Element } from "occam-languages";
 
-import Element from "../element";
+import { define } from "../elements";
 
 export default define(class Error extends Element {
   constructor(conterxt, string, node) {

package/src/element/every.js

@@ -1,14 +1,16 @@
 "use strict";
 
-import Element from "../element";
+import { Element, asynchronousUtilities } from "occam-languages";
+
 import elements from "../elements";
 import Exception from "../exception";
 
 import { define } from "../elements";
-import { asyncEvery } from "../utilities/asynchronous";
 import { NODES_TYPE, BOOLEAN_TYPE } from "../types";
 import { termFromNode, termFromBoolean } from "../utilities/term";
 
+const { asyncEvery } = asynchronousUtilities;
+
 export default define(class Every extends Element {
   constructor(context, string, node, variable, anonymousProcedure) {
     super(context, string, node)

package/src/element/expression.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-languages";
 
 import { define } from "../elements";
 

package/src/element/label.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-languages";
 
 import { define } from "../elements";
 

package/src/element/nodeQuery.js

@@ -1,8 +1,8 @@
 "use strict";
 
+import { Element } from "occam-languages";
 import { arrayUtilities } from "necessary";
 
-import Element from "../element";
 import Exception from "../exception";
 
 import { define } from "../elements";

package/src/element/nodesQuery.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-languages";
+
 import Exception from "../exception";
 
 import { define } from "../elements";

package/src/element/parameter/named.js

@@ -1,11 +1,11 @@
 "use strict";
 
+import { Element } from "occam-languages";
+
 import Exception from "../../exception";
 
 import { define } from "../../elements";
 
-import Element from "../../element";
-
 export default define(class NamedParameter extends Element {
   constructor(context, string, node, type, name, alias) {
     super(context, string, node)

package/src/element/parameter.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-languages";
+
 import Exception from "../exception";
 
 import { define } from "../elements";

package/src/element/parameters/named.js

@@ -1,11 +1,11 @@
 "use strict";
 
+import { Element } from "occam-languages";
+
 import Exception from "../../exception";
 
 import { define } from "../../elements";
 
-import Element from "../../element";
-
 export default define(class NamedParameters extends Element {
   constructor(context, string, node, array) {
     super(context, string, node)

package/src/element/parameters.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-languages";
+
 import Exception from "../exception";
 
 import { define } from "../elements";

package/src/element/primitive.js

@@ -1,8 +1,8 @@
 "use strict";
 
+import { Element } from "occam-languages";
 import { arrayUtilities } from "necessary";
 
-import Element from "../element";
 import elements from "../elements";
 import nullNode from "../nullNode";
 

package/src/element/procedure/anonymous.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import Element from "../../element";
+import { Element } from "occam-languages";
+
 import Exception from "../../exception";
 
 import { define } from "../../elements";

package/src/element/procedure.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-languages";
+
 import elements from "../elements";
 import Exception from "../exception";
 

package/src/element/procedureCall.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-languages";
+
 import Exception from "../exception";
 
 import { define } from "../elements";

package/src/element/reduce.js

@@ -1,14 +1,16 @@
 "use strict";
 
-import Element from "../element";
+import { Element, asynchronousUtilities } from "occam-languages";
+
 import elements from "../elements";
 import Exception from "../exception";
 
 import { define } from "../elements";
 import { NODES_TYPE } from "../types";
-import { asyncReduce } from "../utilities/asynchronous";
 import { termFromNode } from "../utilities/term";
 
+const { asyncReduce } = asynchronousUtilities;
+
 export default define(class Reduce extends Element {
   constructor(context, string, node, variable, initialExpression, anonymousProcedure) {
     super(context, string, node)

package/src/element/reference.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-languages";
 
 import { define } from "../elements";
 

package/src/element/returnBlock.js

@@ -1,11 +1,13 @@
 "use strict";
 
-import Element from "../element";
+import { Element, asynchronousUtilities } from "occam-languages";
+
 import Exception from "../exception";
 import BlockContext from "../context/block";
 
 import { define } from "../elements";
-import { asyncForEach } from "../utilities/asynchronous";
+
+const { asyncForEach } = asynchronousUtilities;
 
 export default define(class ReturnBlock extends Element {
   constructor(context, string, node, steps, nonsensical, returnStatement) {

package/src/element/some.js

@@ -1,14 +1,16 @@
 "use strict";
 
-import Element from "../element";
+import { Element, asynchronousUtilities } from "occam-languages";
+
 import elements from "../elements";
 import Exception from "../exception";
 
 import { define } from "../elements";
-import { asyncSome } from "../utilities/asynchronous";
 import { NODES_TYPE, BOOLEAN_TYPE } from "../types";
 import { termFromNode, termFromBoolean } from "../utilities/term";
 
+const { asyncSome } = asynchronousUtilities;
+
 export default define(class Some extends Element {
   constructor(context, string, node, variable, anonymousProcedure) {
     super(context, string, node)

package/src/element/statement/return.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import { define } from "../../elements";
+import { Element } from "occam-languages";
 
-import Element from "../../element";
+import { define } from "../../elements";
 
 export default define(class ReturnStatement extends Element {
   constructor(context, string, node, term) {

package/src/element/step.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-languages";
 
 import { define } from "../elements";
 

package/src/element/term/bracketed.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import { define } from "../../elements";
+import { Element } from "occam-languages";
 
-import Element from "../../element";
+import { define } from "../../elements";
 
 export default define(class BracketedTerm extends Element {
   constructor(context, string, node, term) {

package/src/element/term/comparison.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import Element from "../../element";
+import { Element } from "occam-languages";
+
 import Exception from "../../exception";
 
 import { define } from "../../elements";

package/src/element/term/logical.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import Element from "../../element";
+import { Element } from "occam-languages";
+
 import Exception from "../../exception";
 
 import { define } from "../../elements";

package/src/element/term/negated.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import Element from "../../element";
+import { Element } from "occam-languages";
+
 import Exception from "../../exception";
 
 import { define } from "../../elements";

package/src/element/term.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-languages";
 
 import { define } from "../elements";
 

package/src/element/terms.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-languages";
 
 import { define } from "../elements";
 import { termsStringFromTermsArray } from "../utilities/string";

package/src/element/ternary.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-languages";
+
 import Exception from "../exception";
 
 import { define } from "../elements";

package/src/element/variable.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-languages";
+
 import Exception from "../exception";
 
 import { define } from "../elements";

package/src/example/view.js

@@ -3,9 +3,8 @@
 import withStyle from "easy-with-style";  ///
 
 import { Element } from "easy";
-import { FurtleLexer,FurtleParser } from "occam-grammars";
-import { lexersUtilities, parsersUtilities } from "../index"; ///
 import { RowsDiv, ColumnDiv, ColumnsDiv, VerticalSplitterDiv } from "easy-layout";
+import { FurtleLexer,FurtleParser, lexersUtilities, parsersUtilities } from "../index"; ///
 
 import SubHeading from "./view/subHeading";
 import SizeableDiv from "./view/div/sizeable";

package/src/furtle/parser.js

@@ -1,8 +1,9 @@
 "use strict";
 
+import { NonTerminalNode } from "occam-languages";
+
 import { FurtleParser as FurtleParserBase } from "occam-grammars";
 
-import NonTerminalNode from "../nonTerminalNode";
 import NonTerminalNodeMap from "../nonTerminalNodeMap";
 
 export default class FurtleParser extends FurtleParserBase {

package/src/index.js

@@ -4,19 +4,10 @@ import "./preamble";
 
 export { default as Terms } from "./element/terms";
 
-export { default as Log } from "./log";
-export { default as Element } from "./element";
-export { default as Context } from "./context";
-export { default as FileContext } from "./context/file";
-export { default as ReleaseContext } from "./context/release";
-export { default as NonTerminalNode } from "./nonTerminalNode";
+export { default as FurtleLexer } from "./furtle/lexer";
+export { default as FurtleParser } from "./furtle/parser";
 export { default as FurtleFileContext } from "./context/file/furtle";
 
-export { default as testUtilities } from "./utilities/nominal";
-export { default as nodeUtilities } from "./utilities/node";
-export { default as queryUtilities } from "./utilities/query";
 export { default as termsUtilities } from "./utilities/terms";
 export { default as lexersUtilities } from "./utilities/lexers";
 export { default as parsersUtilities } from "./utilities/parsers";
-export { default as contextUtilities } from "./utilities/context";
-export { default as asynchronousUtilities } from "./utilities/asynchronous";

package/src/node/assignment.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-languages";
 
 export default class AssignmentrNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence); }

package/src/node/assignments.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-languages";
 
 export default class AssignmentrsNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence); }

package/src/node/declaration.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-languages";
 
 export default class DeclarationNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence); }

package/src/node/document.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-languages";
 
 export default class DocumentNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(DocumentNode, ruleName, childNodes, opacity, precedence); }

package/src/node/error.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-languages";
 
 export default class ErrorNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ErrorNode, ruleName, childNodes, opacity, precedence); }

package/src/node/every.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-languages";
 
 import { VARIABLE_RULE_NAME, ANONYMOUS_PROCEDURE_RULE_NAME } from "../ruleNames";
 

package/src/node/expression.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-languages";
 
 import { TERM_RULE_NAME,
          SOME_RULE_NAME,

package/src/node/label.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-languages";
 
 import { NAME_TOKEN_TYPE } from "../tokenTypes";
 

package/src/node/nodeQuery.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-languages";
 
 import { VARIABLE_RULE_NAME } from "../ruleNames";
 import { stringFromStringLiteral } from "../utilities/stringLiteral";

package/src/node/nodesQuery.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-languages";
 
 import { VARIABLE_RULE_NAME } from "../ruleNames";
 import { stringFromStringLiteral } from "../utilities/stringLiteral";

package/src/node/nonsense.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-languages";
 
 export default class NonsenseNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(NonsenseNode, ruleName, childNodes, opacity, precedence); }

package/src/node/parameter.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-languages";
 
 import { TYPE_TOKEN_TYPE, NAME_TOKEN_TYPE } from "../tokenTypes";