removed badly formed sample files; tweaked gram-cli stat output to be…

… a valid gram graph node
gram-data · May 6, 2024 · f21f4ee · f21f4ee
1 parent 287d4fe
commit f21f4ee
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 243 deletions.
diff --git a/packages/gram/src/lib/parser/parser.ts b/packages/gram/src/lib/parser/parser.ts
@@ -36,7 +36,14 @@ export type GramCstRelationshipTypeTag =
   "squiggle_left";
 
 
-export type GramSemanticElementTypeTag = "node" | GramCstRelationshipTypeTag;
+export type GramSemanticElementTypeTag = 
+  "pattern" | 
+  "node" | 
+  "relationship" | 
+  "record" | 
+  "identifier" |
+  "labels" |
+  GramCstRelationshipTypeTag;
 
 export type GramSyntaxElementTypeTag = GramSemanticElementTypeTag;
 
@@ -48,7 +55,11 @@ export interface GramSyntaxNode extends Parser.SyntaxNode {
 export type GramStats = Partial<Record<GramSemanticElementTypeTag, number>>;
 
 export const emptyStats:GramStats = {
+  // pattern: 0,
+  // relationship: 0,
+  // record: 0,
   // node: 0,
+  // identifier: 0,
   // single_undirected: 0,
   // single_bidirectional: 0,
   // single_right: 0,
@@ -78,7 +89,10 @@ export const isGramSemanticElement = (o:unknown):o is GramSyntaxNode => {
     return false;
   }
   switch (o.type) {
+    case "pattern":
     case "node":
+    case "relationship":
+    case "record":
     case "single_undirected":
     case "single_bidirectional":
     case "single_right":
@@ -91,6 +105,8 @@ export const isGramSemanticElement = (o:unknown):o is GramSyntaxNode => {
     case "squiggle_bidirectional":
     case "squiggle_right":
     case "squiggle_left":
+    case "labels":
+    case "identifier":
       return true;
     default:
       return false;
@@ -103,7 +119,8 @@ export const stats = (cst:GramSyntaxNode) => reduce(cst, (cst, acc) => {
     isGramSemanticElement(cst) ? Option.some(cst) : Option.none(),
     Option.map((cst) => ({
       ...acc,
-      [cst.type]: (acc[cst.type] ?? 0) + 1,
+      [cst.type]: (acc[cst.type] ?? 0) + 
+        ((cst.type === "labels") ? cst.namedChildCount : 1)
     })),
     Option.getOrElse(() => acc)
   )

diff --git a/samples/double_arrows00.gram-e b/samples/double_arrows00.gram-e
diff --git a/samples/double_arrows12.gram b/samples/double_arrows12.gram
diff --git a/samples/empty_nodes03.gram b/samples/empty_nodes03.gram
diff --git a/samples/empty_relationships05.gram b/samples/empty_relationships05.gram
diff --git a/samples/gql_grqph_type02.gram b/samples/gql_grqph_type02.gram
diff --git a/samples/graph_shape04.gram b/samples/graph_shape04.gram
diff --git a/samples/identifiers09.gram b/samples/identifiers09.gram
diff --git a/samples/labeled_nodes04.gram b/samples/labeled_nodes04.gram
diff --git a/samples/labeled_relationships03.gram b/samples/labeled_relationships03.gram
diff --git a/samples/number_graphs01.gram b/samples/number_graphs01.gram
@@ -1,18 +1,3 @@
----
-
-(gram
-  (pattern
-    (relationship
-      (node (integer))
-      (single_right)
-      (node (integer))
-    )
-  )
-)
-
-==================
-Number graph: 1 +1 = 2
-==================
 
 (1)-[`+1`]->(2)
 
diff --git a/samples/number_graphs02.gram b/samples/number_graphs02.gram
diff --git a/samples/number_values05.gram b/samples/number_values05.gram
diff --git a/samples/records09.gram b/samples/records09.gram
diff --git a/samples/series08.gram b/samples/series08.gram
diff --git a/samples/single_arrows10.gram b/samples/single_arrows10.gram
diff --git a/samples/squiggle_arrows11.gram b/samples/squiggle_arrows11.gram
diff --git a/samples/text_graphs04.gram b/samples/text_graphs04.gram
diff --git a/samples/text_values09.gram b/samples/text_values09.gram
diff --git a/tools/gram-cli/README.md b/tools/gram-cli/README.md
@@ -13,7 +13,12 @@ nx run gram-cli:build
 Then, run it directly:
 
 ```
+node dist/tools/gram-cli/main.js --help
+```
+
+See stats for a gram file:
 
 ```
-node dist/tools/gram-cli/main.js --help
-```
+node dist/tools/gram-cli/main.js stat <filenames>...
+```
+
diff --git a/tools/gram-cli/src/gram-stat.ts b/tools/gram-cli/src/gram-stat.ts
@@ -16,10 +16,12 @@ const gramStats = (filename:string, verbose: boolean) => FileSystem.FileSystem.p
   Effect.map((content) => parse(content)),
   Effect.tap((cst) => (verbose) ? Effect.all([
     Console.log("cst:"),
-    Console.log(cst.rootNode.toString())
+    Console.log(cst.rootNode.toString()),
+    Console.log("")
    ]) : Effect.void),
   Effect.map((cst) => stats(cst.rootNode)),
-  Effect.flatMap((stats) => Console.log("stats:", stats))
+  Effect.map((stats) => ({ source: filename, ...stats })),
+  Effect.flatMap((stats) => Console.log("(:Stats ", stats, ")")),
 )