simple-graph-query 1.1.2 → 1.2.0

package/README.md

@@ -1,118 +1,8 @@
-# Forge Expression Evaluator
+# Simple Graph Expression Evaluator
 
-A TypeScript library for evaluating Forge language expressions with a browser-compatible UMD bundle.
-
-## Installation
-
-```bash
-npm install forge-expr-evaluator
-```
-
-## Usage
-
-### Browser (UMD Bundle)
-```html
-<script src="node_modules/forge-expr-evaluator/dist/forge-expr-evaluator.bundle.js"></script>
-<script>
-  const evaluator = new ForgeExprEvaluator.ForgeExprEvaluatorUtil(datum, sourceCode);
-  const result = evaluator.evaluateExpression("some Board", 0);
-  console.log(result);
-</script>
-```
-
-### Node.js
-```javascript
-const { ForgeExprEvaluatorUtil } = require('forge-expr-evaluator');
-
-const evaluator = new ForgeExprEvaluatorUtil(datum, sourceCode);
-const result = evaluator.evaluateExpression("some Board", 0);
-console.log(result);
-```
-
-### TypeScript
-```typescript
-import { ForgeExprEvaluatorUtil, DatumParsed } from 'forge-expr-evaluator';
-
-const datum: DatumParsed = {
-  parsed: {
-    instances: [/* your data */],
-    bitwidth: 4
-  },
-  data: "<alloy>...</alloy>"
-};
-
-const sourceCode = `
-  sig Board { ... }
-  // your Forge signatures and predicates
-`;
-
-const evaluator = new ForgeExprEvaluatorUtil(datum, sourceCode);
-const result = evaluator.evaluateExpression("some Board", 0);
-```
-
-## API
-
-### `ForgeExprEvaluatorUtil`
-
-#### Constructor
-```typescript
-new ForgeExprEvaluatorUtil(datum: DatumParsed, sourceCode: string)
-```
-
-#### Methods
-```typescript
-evaluateExpression(expression: string, instanceIndex?: number): EvaluationResult
-```
-
-### Types
-- `DatumParsed`: Data structure containing Forge model instances
-- `EvaluationResult`: Result of expression evaluation (value or error)
-- `EvalResult`: Successful evaluation result (string | number | boolean | Tuple[])
-
-## Features
-
-- ✅ Browser-compatible UMD bundle (~688 KiB)
-- ✅ TypeScript support with full type definitions
-- ✅ Evaluates Forge expressions against model data
-- ✅ No external dependencies in the bundle
-- ✅ Works with Sterling/Alloy data formats
-
-## Development
-
-```bash
-# Install dependencies
-npm install
-
-# Build the bundle
-npm run build
-
-# Run tests
-npm test
-
-# Serve demo locally
-npm run serve
-```
+A TypeScript library for evaluating relational + some more expressions with a browser-compatible UMD bundle.
 
 ## License
 
 MIT
 
-## Contributing
-
-1. Fork the repository
-2. Create a feature branch
-3. Make your changes
-4. Add tests if needed
-5. Submit a pull request
-
-## Credits
-
-_Note_: The evaluator makes use of a Forge parser built using ANTLR; this is largely taken from
-the [parser developed by Siddhartha Prasad](https://github.com/sidprasad/forge-antlr/)
-with some minor modifications to the grammar.
-
-## Related
-
-- [Forge Language](https://forge.binghamton.edu/)
-- [Alloy](https://alloytools.org/)
-- [Sterling Visualizer](https://sterling-js.github.io/)

package/dist/ForgeExprEvaluator.d.ts

@@ -20,6 +20,7 @@ export declare class ForgeExprEvaluator extends AbstractParseTreeVisitor<EvalRes
     constructor(datum: IDataInstance);
     private updateFreeVariables;
     private constructFreeVariableKey;
+    private getLabelForValue;
     private cacheResult;
     private getIden;
     protected aggregateResult(aggregate: EvalResult, nextResult: EvalResult): EvalResult;

package/dist/forge-antlr/ForgeLexer.d.ts

@@ -94,24 +94,25 @@ export declare class ForgeLexer extends Lexer {
     static readonly EXAMPLE_TOK = 89;
     static readonly ARROW_TOK = 90;
     static readonly EQ_TOK = 91;
-    static readonly LT_TOK = 92;
-    static readonly GT_TOK = 93;
-    static readonly LEQ_TOK = 94;
-    static readonly GEQ_TOK = 95;
-    static readonly NI_TOK = 96;
-    static readonly NO_TOK = 97;
-    static readonly SUM_TOK = 98;
-    static readonly INT_TOK = 99;
-    static readonly OPTION_TOK = 100;
-    static readonly COMMA_TOK = 101;
-    static readonly SLASH_TOK = 102;
-    static readonly NUM_CONST_TOK = 103;
-    static readonly IDENTIFIER_TOK = 104;
-    static readonly WS = 105;
-    static readonly CCOMMENT = 106;
-    static readonly COMMENT = 107;
-    static readonly MULTCOMMENT = 108;
-    static readonly LANG_DECL = 109;
+    static readonly LABEL_EQ_TOK = 92;
+    static readonly LT_TOK = 93;
+    static readonly GT_TOK = 94;
+    static readonly LEQ_TOK = 95;
+    static readonly GEQ_TOK = 96;
+    static readonly NI_TOK = 97;
+    static readonly NO_TOK = 98;
+    static readonly SUM_TOK = 99;
+    static readonly INT_TOK = 100;
+    static readonly OPTION_TOK = 101;
+    static readonly COMMA_TOK = 102;
+    static readonly SLASH_TOK = 103;
+    static readonly NUM_CONST_TOK = 104;
+    static readonly IDENTIFIER_TOK = 105;
+    static readonly WS = 106;
+    static readonly CCOMMENT = 107;
+    static readonly COMMENT = 108;
+    static readonly MULTCOMMENT = 109;
+    static readonly LANG_DECL = 110;
     static readonly channelNames: string[];
     static readonly modeNames: string[];
     static readonly ruleNames: string[];

package/dist/forge-antlr/ForgeParser.d.ts

@@ -100,24 +100,25 @@ export declare class ForgeParser extends Parser {
     static readonly EXAMPLE_TOK = 89;
     static readonly ARROW_TOK = 90;
     static readonly EQ_TOK = 91;
-    static readonly LT_TOK = 92;
-    static readonly GT_TOK = 93;
-    static readonly LEQ_TOK = 94;
-    static readonly GEQ_TOK = 95;
-    static readonly NI_TOK = 96;
-    static readonly NO_TOK = 97;
-    static readonly SUM_TOK = 98;
-    static readonly INT_TOK = 99;
-    static readonly OPTION_TOK = 100;
-    static readonly COMMA_TOK = 101;
-    static readonly SLASH_TOK = 102;
-    static readonly NUM_CONST_TOK = 103;
-    static readonly IDENTIFIER_TOK = 104;
-    static readonly WS = 105;
-    static readonly CCOMMENT = 106;
-    static readonly COMMENT = 107;
-    static readonly MULTCOMMENT = 108;
-    static readonly LANG_DECL = 109;
+    static readonly LABEL_EQ_TOK = 92;
+    static readonly LT_TOK = 93;
+    static readonly GT_TOK = 94;
+    static readonly LEQ_TOK = 95;
+    static readonly GEQ_TOK = 96;
+    static readonly NI_TOK = 97;
+    static readonly NO_TOK = 98;
+    static readonly SUM_TOK = 99;
+    static readonly INT_TOK = 100;
+    static readonly OPTION_TOK = 101;
+    static readonly COMMA_TOK = 102;
+    static readonly SLASH_TOK = 103;
+    static readonly NUM_CONST_TOK = 104;
+    static readonly IDENTIFIER_TOK = 105;
+    static readonly WS = 106;
+    static readonly CCOMMENT = 107;
+    static readonly COMMENT = 108;
+    static readonly MULTCOMMENT = 109;
+    static readonly LANG_DECL = 110;
     static readonly RULE_predDecl = 0;
     static readonly RULE_parseExpr = 1;
     static readonly RULE_alloyModule = 2;
@@ -769,6 +770,7 @@ export declare class ArrowOpContext extends ParserRuleContext {
 export declare class CompareOpContext extends ParserRuleContext {
     IN_TOK(): TerminalNode | undefined;
     EQ_TOK(): TerminalNode | undefined;
+    LABEL_EQ_TOK(): TerminalNode | undefined;
     LT_TOK(): TerminalNode | undefined;
     GT_TOK(): TerminalNode | undefined;
     LEQ_TOK(): TerminalNode | undefined;