@fraczak/k 5.1.1 → 6.0.0

package/pretty.mjs

@@ -1,7 +1,7 @@
-import { find } from "./codes.mjs";
-import { TypePatternGraph } from "./typing.mjs";
+import { TypePatternGraph } from "./TypePatternGraph.mjs";
 
-const nameRE = /^[a-zA-Z0-9_][a-zA-Z0-9_?!]*$/;
+// const nameRE = /^[a-zA-Z0-9_][a-zA-Z0-9_?!]*$/;
+const nameRE = /^[a-zA-Z0-9_+-][a-zA-Z0-9_?!+-]*$/;
 function pLabel_(label) {
   return nameRE.test(label) ? ` ${label}` : `${JSON.stringify(label)}`;
 }
@@ -9,11 +9,11 @@ function pLabel(label) {
   return nameRE.test(label) ? `${label}` : `${JSON.stringify(label)}`;
 }
 
-function prettyCode_labels (representatives, label_ref_map) {
+function prettyCode_labels (representatives, findCode, label_ref_map) {
   return Object.keys(label_ref_map)
     .sort()
     .map( (label) => {
-      return `${prettyCode(representatives, {
+      return `${prettyCode(representatives, findCode, {
         code: "ref",
         ref: label_ref_map[label],
       })}${pLabel_(label)}`;
@@ -21,22 +21,19 @@ function prettyCode_labels (representatives, label_ref_map) {
     .join(", ");
 };
 
-function prettyCode (representatives, codeExp) {
+function prettyCode (representatives, findCode, codeExp) {
   switch (codeExp.code) {
     case "ref":
       const name = representatives[codeExp.ref] || codeExp.ref;
       if (name.startsWith(":")) {
-        return prettyCode(representatives, find(name));
+        return prettyCode(representatives, findCode, findCode(name));
       } else {
         return name;
       }
     case "product":
-      return `{${prettyCode_labels(representatives, codeExp.product)}}`;
+      return `{${prettyCode_labels(representatives, findCode, codeExp.product)}}`;
     case "union":
-      return `< ${prettyCode_labels(representatives, codeExp.union)} >`;
-    case "vector":
-      return `[${prettyCode(representatives, {code:'ref', ref:codeExp.vector})}]`;
-      // return `[${representatives[codeExp.vector] || codeExp.vector}]`;
+      return `< ${prettyCode_labels(representatives, findCode, codeExp.union)} >`;
     default:
       return ":error";
   }
@@ -56,10 +53,11 @@ function prettyFilter ( filter ) {
       return `$${filter.code}`;
     case "name":
       return filter.name;
-    case "vector":
-      return `[${prettyFilter(filter.vector)}]${filter.name ? "=" + filter.name : ""}`;
     case null:
-      if (filter.name && Object.keys(filter.fields).length == 0) 
+      if (!filter.open || Object.keys(filter.fields).length !== 0) {
+        throw new Error(`Unknown-kind filters must be exactly (...): ${JSON.stringify(filter)}`);
+      }
+      if (filter.name)
         return filter.name;
       return `(${fieldsStr()})${filter.name ? "=" + filter.name : ""}`;
     case "union":
@@ -77,12 +75,6 @@ function prettyRel (exp) {
       case "filter":
         if (exp.filter.type == 'code') return `$${exp.filter.code}`;
         return `?${prettyFilter(exp.filter)}`;
-      case "pipe":
-        return `|`;        
-      case "caret":
-        return `(${pretty(exp.caret)} ^)`;        
-      case "vector":
-        return `[${exp.vector.map(pretty).join(", ")}]`;
       case "union":
         return `<${exp.union.map(pretty).join(", ")}>`;
       case "ref":
@@ -91,15 +83,12 @@ function prettyRel (exp) {
         return "()";
       case "comp":
         return exp.comp.map(pretty).join(" ");
-      case "str":
-        return `'${exp.str}'`;
-      case "int":
-        return exp.int;
       case "dot":
-        if ("number" === typeof exp.dot) {
-          return `.${exp.dot}`;
-        } else 
-          return `.${pLabel(exp.dot)}`;
+        return `.${pLabel(exp.dot)}`;
+      case "div":
+        return `/${pLabel(exp.div)}`;
+      case "vid":
+        return `|${pLabel(exp.vid)}`;
       case "code":
         return `$${exp.code}`;
       case "product":
@@ -117,7 +106,7 @@ function prettyRel (exp) {
 
 
 function patterns2filters(typePatternGraph, ...patternIds) {
-  const newTypePatternGraph = new TypePatternGraph();
+  const newTypePatternGraph = new TypePatternGraph(typePatternGraph.registerCodeDef, typePatternGraph.findCode);
   const renamed = typePatternGraph.clone(patternIds, newTypePatternGraph);
   const newPatternIds = patternIds.map((id) => newTypePatternGraph.find(renamed[id]));
 
@@ -159,20 +148,12 @@ function patterns2filters(typePatternGraph, ...patternIds) {
     switch (pattern.pattern) {
       case 'type':
         return {type: "code", code: pattern.type, ...named_filter};
-      case '[]':
-        return {
-          type: "vector", 
-          vector: buildFilter([...path, "vector-member"], Object.values(edges["vector-member"])[0], i),
-          ...named_filter
-        };
       case '(...)':
           return { type: null, open: true, fields: fields(), ...named_filter };
       case '{...}': 
         return { type: 'product', open: true, fields: fields(), ...named_filter };
       case '<...>': 
         return { type: 'union', open: true, fields: fields(), ...named_filter };
-      case '()':
-        return { type: null, fields: fields(), ...named_filter };
       case  '{}':
         return { type: 'product', fields: fields(), ...named_filter };
       case '<>':
@@ -185,5 +166,5 @@ function patterns2filters(typePatternGraph, ...patternIds) {
 
 }
 
-export default { prettyCode, prettyRel, patterns2filters };
-export { prettyCode, prettyRel, patterns2filters };
+export default { prettyCode, prettyRel, prettyFilter, patterns2filters };
+export { prettyCode, prettyRel, prettyFilter, patterns2filters };