occam-verify-cli 1.0.475 → 1.0.478

package/src/element/topLevelAssertion/conjecture.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import TopLevelAssertion from "../topLevelAssertion";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class Conjecture extends TopLevelAssertion {
   verify() {

package/src/element/topLevelAssertion/lemma.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import TopLevelAssertion from "../topLevelAssertion";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class Lemma extends TopLevelAssertion {
   verify() {

package/src/element/topLevelAssertion/theorem.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import TopLevelAssertion from "../topLevelAssertion";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class Theorem extends TopLevelAssertion {
   verify() {

package/src/element/topLevelMetaAssertion/metaLemma.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import TopLevelMetaAssertion from "./../topLevelMetaAssertion";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class MetaLemma extends TopLevelMetaAssertion {
   verify() {

package/src/element/topLevelMetaAssertion/metatheorem.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import TopLevelMetaAssertion from "../topLevelMetaAssertion";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class Metatheorem extends TopLevelMetaAssertion {
   verify() {

package/src/element/type.js

@@ -1,14 +1,14 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { arrayUtilities } from "necessary";
-import { Element, elements } from "occam-furtle";
 
+import { define } from "../elements";
 import { baseTypeFromNothing } from "../types";
 import { typeStringFromTypeNameTypePrefixNameAndSuperTypes } from "../utilities/string";
 import { superTypesFromJSON, propertiesFromJSON, superTypesToSuperTypesJSON, propertiesToPropertiesJSON } from "../utilities/json";
 
-const { define } = elements,
-      { push, first } = arrayUtilities;
+const { push, first } = arrayUtilities;
 
 export default define(class Type extends Element {
   constructor(context, string, node, name, prefixName, superTypes, properties, provisional) {

package/src/element/typePrefix.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
-const { define } = elements;
+import { define } from "../elements";
 
 export default define(class TypePrefix extends Element {
   constructor(context, string, node, name) {

package/src/element/variable.js

@@ -1,12 +1,11 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
+import { define } from "../elements";
 import { synthetically } from "../utilities/context";
 import { typeToTypeJSON } from "../utilities/json";
 
-const { define } = elements;
-
 export default define(class Variable extends Element {
   constructor(context, string, node, type, identifier, propertyRelations) {
     super(context, string, node);

package/src/elements.js

@@ -0,0 +1,13 @@
+"use strict";
+
+const elements = {};
+
+export function define(Element) {
+  const { name } = Element;
+
+  elements[name] = Element;
+
+  return Element;
+}
+
+export default elements;

package/src/metaTypes.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { elements } from "occam-furtle";
+import elements from "./elements";
 
 import { FRAME_META_TYPE_NAME, REFERENCE_META_TYPE_NAME, STATEMENT_META_TYPE_NAME } from "./metaTypeNames";
 

package/src/process/equate.js

@@ -1,8 +1,11 @@
 "use strict";
 
-import { nodeQuery } from "../utilities/query";
+import { queryUtilities } from "occam-furtle";
+
 import { terminalNodeMapFromNodes, areTerminalNodeMapsEqual } from "../utilities/pass";
 
+const { nodeQuery } = queryUtilities;
+
 const termNodeQuery = nodeQuery("/term"),
       nonTerminalNodeQuery = nodeQuery("/*");
 

package/src/process/unify.js

@@ -1,10 +1,13 @@
 "use strict";
 
-import { nodeQuery } from "../utilities/query";
+import { queryUtilities } from "occam-furtle";
+
 import { findMetaTypeByMetaTypeName } from "../metaTypes";
 import { termFromTermNode, frameFromFrameNode, statementFromStatementNode } from "../utilities/element";
 import { terminalNodeMapFromNodes, areTerminalNodeMapsEqual, isLastRemainingArgumentFunction } from "../utilities/pass";
 
+const { nodeQuery } = queryUtilities;
+
 const nonTerminalNodeQuery = nodeQuery("/*");
 
 const typeNodeQuery = nodeQuery("/type"),

package/src/process/validate.js

@@ -1,9 +1,12 @@
 "use strict";
 
-import { nodeQuery } from "../utilities/query";
+import { queryUtilities } from "occam-furtle";
+
 import { isLastRemainingArgumentFunction } from "../utilities/pass";
 import { termFromTermNode, statementFromStatementNode } from "../utilities/element";
 
+const { nodeQuery } = queryUtilities;
+
 const nonTerminalNodeQuery = nodeQuery("/*");
 
 const termNodeQuery = nodeQuery("/term"),

package/src/process/verify.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import { nodeQuery } from "../utilities/query";
+import { queryUtilities } from "occam-furtle";
+
 import { termFromTermNode, statementFromStatementNode } from "../utilities/element";
 import { ruleFromRuleNode,
          errorFromErrorNode,
@@ -19,6 +20,8 @@ import { ruleFromRuleNode,
          complexTypeDeclarationFromComplexTypeDeclarationNode,
          metavariableDeclarationFromMetavariableDeclarationNode } from "../utilities/element";
 
+const { nodeQuery } = queryUtilities;
+
 const nonTerminalNodeQuery = nodeQuery("/*");
 
 const ruleNodeQuery = nodeQuery("/rule"),

package/src/types.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { elements } from "occam-furtle";
+import elements from "./elements";
 
 import { BASE_TYPE_SYMBOL } from "./constants";
 

package/src/utilities/element.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { elements } from "occam-furtle";
+import elements from "../elements";
 
 import { literally } from "../utilities/context";
 import { baseTypeFromNothing } from "../types";

package/src/utilities/json.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { elements } from "occam-furtle";
+import elements from "../elements";
 
 import { findMetaTypeByMetaTypeName } from "../metaTypes";
 

package/src/utilities/unification.js

@@ -1,8 +1,9 @@
 "use strict";
 
-import { elements } from "occam-furtle";
 import { arrayUtilities } from "necessary";
 
+import elements from "../elements";
+
 import { synthetically } from "../utilities/context";
 import { equalityFromStatement,
          judgementFromStatement,

package/src/utilities/validation.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { elements } from "occam-furtle";
+import elements from "../elements";
 
 import { bracketedConstructorFromNothing, bracketedCombinatorFromNothing } from "../utilities/instance";
 import { equalityFromStatement,

package/lib/utilities/query.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: Object.getOwnPropertyDescriptor(all, name).get
-    });
-}
-_export(exports, {
-    get nodeQuery () {
-        return nodeQuery;
-    },
-    get nodesQuery () {
-        return nodesQuery;
-    }
-});
-var _occamquery = require("occam-query");
-function nodeQuery(expressionString) {
-    var query = _occamquery.Query.fromExpressionString(expressionString);
-    return function(node) {
-        var nodes = query.execute(node);
-        node = nodes.shift() || null; ///
-        return node;
-    };
-}
-function nodesQuery(expressionString) {
-    var query = _occamquery.Query.fromExpressionString(expressionString);
-    return function(node) {
-        var nodes = query.execute(node);
-        return nodes;
-    };
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcXVlcnkuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IFF1ZXJ5IH0gZnJvbSBcIm9jY2FtLXF1ZXJ5XCI7XG5cbmV4cG9ydCBmdW5jdGlvbiBub2RlUXVlcnkoZXhwcmVzc2lvblN0cmluZykge1xuICBjb25zdCBxdWVyeSA9IFF1ZXJ5LmZyb21FeHByZXNzaW9uU3RyaW5nKGV4cHJlc3Npb25TdHJpbmcpO1xuXG4gIHJldHVybiBmdW5jdGlvbihub2RlKSB7XG4gICAgY29uc3Qgbm9kZXMgPSBxdWVyeS5leGVjdXRlKG5vZGUpO1xuXG4gICAgbm9kZSA9IG5vZGVzLnNoaWZ0KCkgfHwgbnVsbDsgLy8vXG5cbiAgICByZXR1cm4gbm9kZTtcbiAgfTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG5vZGVzUXVlcnkoZXhwcmVzc2lvblN0cmluZykge1xuICBjb25zdCBxdWVyeSA9IFF1ZXJ5LmZyb21FeHByZXNzaW9uU3RyaW5nKGV4cHJlc3Npb25TdHJpbmcpO1xuXG4gIHJldHVybiBmdW5jdGlvbihub2RlKSB7XG4gICAgY29uc3Qgbm9kZXMgPSBxdWVyeS5leGVjdXRlKG5vZGUpO1xuXG4gICAgcmV0dXJuIG5vZGVzO1xuICB9O1xufVxuIl0sIm5hbWVzIjpbIm5vZGVRdWVyeSIsIm5vZGVzUXVlcnkiLCJleHByZXNzaW9uU3RyaW5nIiwicXVlcnkiLCJRdWVyeSIsImZyb21FeHByZXNzaW9uU3RyaW5nIiwibm9kZSIsIm5vZGVzIiwiZXhlY3V0ZSIsInNoaWZ0Il0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7UUFJZ0JBO2VBQUFBOztRQVlBQztlQUFBQTs7OzBCQWRNO0FBRWYsU0FBU0QsVUFBVUUsZ0JBQWdCO0lBQ3hDLElBQU1DLFFBQVFDLGlCQUFLLENBQUNDLG9CQUFvQixDQUFDSDtJQUV6QyxPQUFPLFNBQVNJLElBQUk7UUFDbEIsSUFBTUMsUUFBUUosTUFBTUssT0FBTyxDQUFDRjtRQUU1QkEsT0FBT0MsTUFBTUUsS0FBSyxNQUFNLE1BQU0sR0FBRztRQUVqQyxPQUFPSDtJQUNUO0FBQ0Y7QUFFTyxTQUFTTCxXQUFXQyxnQkFBZ0I7SUFDekMsSUFBTUMsUUFBUUMsaUJBQUssQ0FBQ0Msb0JBQW9CLENBQUNIO0lBRXpDLE9BQU8sU0FBU0ksSUFBSTtRQUNsQixJQUFNQyxRQUFRSixNQUFNSyxPQUFPLENBQUNGO1FBRTVCLE9BQU9DO0lBQ1Q7QUFDRiJ9

package/src/utilities/query.js

@@ -1,25 +0,0 @@
-"use strict";
-
-import { Query } from "occam-query";
-
-export function nodeQuery(expressionString) {
-  const query = Query.fromExpressionString(expressionString);
-
-  return function(node) {
-    const nodes = query.execute(node);
-
-    node = nodes.shift() || null; ///
-
-    return node;
-  };
-}
-
-export function nodesQuery(expressionString) {
-  const query = Query.fromExpressionString(expressionString);
-
-  return function(node) {
-    const nodes = query.execute(node);
-
-    return nodes;
-  };
-}