@fraczak/k 4.0.0 → 4.0.1

package/README.md

@@ -177,7 +177,7 @@ is not supported in _code derivation_ (explained below).
         "[1,2.11,0.3e-32]" --> [1,2.11,3e-33]
 
 - other predefined parial functions are: `DIV`, `FDIV`, `CONS`,
-  `SNOC`, `toDateMsec`, `toDateStr`, and `_log!`.
+  `SNOC`, `toVEC`, `toDateMsec`, `toDateStr`, and `_log!`.
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraczak/k",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "description": "k-language for JSON-like data transformation",
     "main": "index.mjs",
     "scripts": {

package/patterns.mjs

@@ -360,7 +360,7 @@ function patterns(representatives, rels) {
         rel.patterns[0] = rootDef.typePatternGraph.addNewNode({pattern: '[]'}, {"vector-member": [rel.patterns[1]]});
         break;
       case "toVEC":
-        rel.patterns[0] = rootDef.typePatternGraph.addNewNode();
+        rel.patterns[0] = rootDef.typePatternGraph.getTypeId('string')
         rel.patterns[1] = rootDef.typePatternGraph.addNewNode({pattern: '[]'}, {"vector-member": [rel.patterns[0]]});
         break;
       case "toDateMsec":

package/repl.mjs

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
+import readline from "node:readline";
+import fs from "node:fs";
 
 import k from "./index.mjs";
 import {run, closeVector } from "./run.mjs";
 import { prettyCode, prettyRel, patterns2filters } from "./pretty.mjs";
 import { find } from "./codes.mjs";
 
-import fs from "node:fs";
 
 const splice = [].splice;
 
@@ -15,7 +16,7 @@ const help = function () {
   console.log(" --h          print help");
   console.log(" --a          print codes and relations");
   console.log(" --c          print aliased codes");
-  console.log(" --C CODE     print code definition");
+  console.log(" --C code     print code definition");
   console.log(" --r          print rels");
   console.log(" --p          pretty-print last value");
   console.log(" --pp         print last value via node.js 'console.log'");
@@ -23,7 +24,7 @@ const help = function () {
   console.log(" --g reg      get the value from register 'reg'");
   console.log(" --regs       print registers names");
   console.log(" --l file.k   load 'file.k'");
-  console.log(" --x rel      Print out the type of 'rel'");
+  console.log(" --x rel      print out the type pattern of 'rel'");
 };
 
 help();
@@ -34,140 +35,150 @@ const re__g = /^[ \n\t]*(?:--g[ ]+)(.+)[ ]*?$/;
 const re__x = /^[ \n\t]*(?:--x[ ]+)(.+)[ ]*?$/;
 const re__C = /^[ \n\t]*(?:--C[ ]+)(.+)[ ]*?$/;
 
-const registers = {};
+const rl = readline.createInterface({
+  input: process.stdin,
+  output: process.stdout,
+  prompt: ''
+});
 
-(function (val, buffer) {
-  return process.stdin.on("data", function (data) {
-    var e, file, first, i, kScript, last, len, line, ref, rest, todo;
-    [first, ...rest] = data.toString("utf8").split("\n");
-    buffer.push(first);
-    if (rest.length > 0) {
-      todo = buffer.join("");
-      (ref = rest), ([...rest] = ref), ([last] = splice.call(rest, -1));
-      buffer = [last];
-      todo = [todo, ...rest];
-      for (i = 0, len = todo.length; i < len; i++) {
-        try {
-          line = todo[i];
-          if (val === void 0) {
-            val = {};
+rl.prompt();
+
+rl.on('line', (line) => {
+  // console.log(`Received: ${line}`);
+  evaluate(line);
+  rl.prompt();
+}).on('close', () => {
+  console.log('REPL closed');
+  process.exit(0);
+});
+
+let val = {};
+const registers = {};
+const buffer = [];
+function evaluate(line) {
+  if (line.trim().endsWith('\\')) {
+    buffer.push(line.slice(0, -1));
+    return;
+  }
+  line = [...buffer, line].join('\n');
+  buffer.length = 0;
+  try {
+    if (val === void 0) {
+      val = {};
+    }
+    if (line.match(/^[ \n\t]*(?:--h)?$/)) {
+      // --h
+      help();
+    } else if (line.match(/^[ \n\t]*\^$/)) {
+      val = closeVector(val); 
+      console.log(`=> ${JSON.stringify(val)}`);
+    } else if (line.match(re__l)) {
+      // --l 
+      const file = line.match(re__l)[1];
+      console.log(` -- loading file: ${file} ...`);
+      const kScript = fs.readFileSync(file).toString();
+      console.log(` ----------------------------- compiling file: ${file} ...`);
+      // console.log(kScript);
+      val = k.compile("+++\n" + kScript + "\n()")(val);
+      console.log(`=> ${JSON.stringify(val)}`);
+    } else if (line.match(/^[ \n\t]*(?:--a)?$/)) {
+      // --a
+      val = run.defs;
+      console.log(val);
+      // --r
+    } else if (line.match(/^[ \n\t]*(?:--r)?$/)) {
+      console.log(
+        (function (defs, result) {
+          if (defs == null) {
+            return result;
           }
-          if (line.match(/^[ \n\t]*(?:--h)?$/)) {
-            // --h
-            help();
-          } else if (line.match(/^[ \n\t]*\^$/)) {
-            val = closeVector(val); 
-            console.log(`=> ${JSON.stringify(val)}`);
-          } else if (line.match(re__l)) {
-            // --l 
-            file = line.match(re__l)[1];
-            console.log(` -- loading file: ${file} ...`);
-            kScript = fs.readFileSync(file).toString();
-            console.log(` ----------------------------- compiling file: ${file} ...`);
-            // console.log(kScript);
-            val = k.compile("+++" + kScript + "\n()")(val);
-            console.log(`=> ${JSON.stringify(val)}`);
-          } else if (line.match(/^[ \n\t]*(?:--a)?$/)) {
-            // --a
-            val = run.defs;
-            console.log(val);
-            // --r
-          } else if (line.match(/^[ \n\t]*(?:--r)?$/)) {
-            console.log(
-              (function (defs, result) {
-                if (defs == null) {
-                  return result;
-                }
-                return (function (prettyRel) {
-                  var ref1, relName;
-                  ref1 = defs.rels;
-                  for (relName in ref1) {
-                    result[relName] = prettyRel(ref1[relName].def);
-                  }
-                  return result;
-                })(
-                  prettyRel.bind(
-                    null,
-                    prettyCode.bind(null, defs.representatives)
-                  )
-                );
-              })(run.defs, {}));
-              // --c
-          } else if (line.match(/^[ \n\t]*(?:--c)?$/)) {
-            console.log(
-              (function (defs, result) {
-                for (const codeName of Object.keys(defs.representatives || {})) {
-                  const codeExp = find(defs.representatives[codeName] || codeName);
-                  result[codeName] = prettyCode(
-                    defs.representatives,
-                    codeExp
-                  );
-                }
-                return result;
-              })(run.defs || {}, {})
-            );
-            // --C
-          } else if (line.match(re__C)) {
-            let codeName = line.match(re__C)[1];
-            if (codeName.startsWith("?"))
-              codeName = codeName.slice(1);
-            if (codeName.startsWith("$"))
-              codeName = codeName.slice(1);
-            const canonicalName = run.defs.representatives[codeName] || codeName;
-            const codeExp = find( canonicalName );
-            console.log(` $ ${canonicalName} = ${prettyCode(run.defs.representatives, codeExp)}; -- ${codeExp.def}`);
-            // --pp
-          } else if (line.match(/^[ \n\t]*(?:--pp)?$/)) {
-            console.log(val);
-          // --p
-          } else if (line.match(/^[ \n\t]*(?:--p)?$/)) {
-            console.log(JSON.stringify(val, null, 2));
-            // --regs
-          } else if (line.match(/^[ \n\t]*(?:--regs)?$/)) {
-            console.log(` -- registers: ${Object.keys(registers).join(", ")}`);
-            // --s
-          } else if (line.match(re__s)) {
-            let reg = line.match(re__s)[1];
-            registers[reg] = val;
-            console.log(` -- current value stored in register: '${reg}'`);
-            // --g
-          } else if (line.match(re__g)) {
-            console.log(" -- getting value from register...");
-            let reg = line.match(re__g)[1];
-            val = registers[reg];
-            console.log(val);
-              // --x
-          } else if (line.match(re__x)) {
-            const relName = line.match(re__x)[1];
-            const rel = run.defs?.rels[relName];
-            if (!rel) {
-              console.log(` -- relation '${relName}' not found`);
-              continue;
-            }
-            const filters = patterns2filters(rel.typePatternGraph, ...rel.def.patterns);
-            // console.log(filters);
-            // console.log(" variables:", JSON.stringify(variables));
-            // console.log(JSON.stringify({filters, variables}, null, 2));
-            // for (const filter of filters) {
-            const pcodef= prettyCode.bind(null, run.defs.representatives);
-            const filtersStr = filters.map( x => prettyRel(pcodef, {op: "filter", filter: x}));
-            console.log(`  ${relName} :  ${filtersStr[0]}  -->  ${filtersStr[1]}`);
-            // }
-            // ------ k code
-          } else if (!line.match(/^[ \n\t]*(?:#.*)?$/)) {
-            try {
-              val = k.run(`+++ ${line}\n ()`, val);
-              console.log(`=> ${JSON.stringify(val)}`);
-            } catch (error) {
-              e = error;
-              console.error("ERROR:");
-              console.error(e);
+          return (function (prettyRel) {
+            let ref1, relName;
+            ref1 = defs.rels;
+            for (relName in ref1) {
+              result[relName] = prettyRel(ref1[relName].def);
             }
+            return result;
+          })(
+            prettyRel.bind(
+              null,
+              prettyCode.bind(null, defs.representatives)
+            )
+          );
+        })(run.defs, {}));
+        // --c
+    } else if (line.match(/^[ \n\t]*(?:--c)?$/)) {
+      console.log(
+        (function (defs, result) {
+          for (const codeName of Object.keys(defs.representatives || {})) {
+            const codeExp = find(defs.representatives[codeName] || codeName);
+            result[codeName] = prettyCode(
+              defs.representatives,
+              codeExp
+            );
           }
-        } catch (e) {
-          console.error(e.message);
-        }
+          return result;
+        })(run.defs || {}, {})
+      );
+      // --C
+    } else if (line.match(re__C)) {
+      let codeName = line.match(re__C)[1];
+      if (codeName.startsWith("?"))
+        codeName = codeName.slice(1);
+      if (codeName.startsWith("$"))
+        codeName = codeName.slice(1);
+      const canonicalName = run.defs.representatives[codeName] || codeName;
+      const codeExp = find( canonicalName );
+      console.log(` $ ${canonicalName} = ${prettyCode(run.defs.representatives, codeExp)}; -- ${codeExp.def}`);
+      // --pp
+    } else if (line.match(/^[ \n\t]*(?:--pp)?$/)) {
+      console.log(val);
+    // --p
+    } else if (line.match(/^[ \n\t]*(?:--p)?$/)) {
+      console.log(JSON.stringify(val, null, 2));
+      // --regs
+    } else if (line.match(/^[ \n\t]*(?:--regs)?$/)) {
+      console.log(` -- registers: ${Object.keys(registers).join(", ")}`);
+      // --s
+    } else if (line.match(re__s)) {
+      let reg = line.match(re__s)[1];
+      registers[reg] = val;
+      console.log(` -- current value stored in register: '${reg}'`);
+      // --g
+    } else if (line.match(re__g)) {
+      console.log(" -- getting value from register...");
+      let reg = line.match(re__g)[1];
+      val = registers[reg];
+      console.log(val);
+        // --x
+    } else if (line.match(re__x)) {
+      const relName = line.match(re__x)[1];
+      const rel = run.defs?.rels[relName];
+      if (!rel) {
+        console.log(` -- relation '${relName}' not found`);
+        return;
+      }
+      const filters = patterns2filters(rel.typePatternGraph, ...rel.def.patterns);
+      // console.log(filters);
+      // console.log(" variables:", JSON.stringify(variables));
+      // console.log(JSON.stringify({filters, variables}, null, 2));
+      // for (const filter of filters) {
+      const pcodef= prettyCode.bind(null, run.defs.representatives);
+      const filtersStr = filters.map( x => prettyRel(pcodef, {op: "filter", filter: x}));
+      console.log(`  ${relName} :  ${filtersStr[0]}  -->  ${filtersStr[1]}`);
+      // }
+      // ------ k code
+    } else if (!line.match(/^[ \n\t]*(?:#.*)?$/)) {
+      try {
+        val = k.run(`+++\n${line}\n()`, val);
+        console.log(`=> ${JSON.stringify(val)}`);
+      } catch (error) {
+        e = error;
+        console.error("ERROR:");
+        console.error(e);
       }
     }
-  });
-})({}, []);
+  } catch (e) {
+    console.error(e.message);
+  }
+}

package/run.mjs

@@ -55,7 +55,7 @@ const builtin = {
   },
   FDIV: ([x, y]) => x / y,
   CONCAT: (strs) => strs.join(""),
-  toVEC: (str) => [...str],
+  toVEC: (str) => [...`${str}`],
   true: () => true,
   false: () => false,
   null: () => null,

package/symbol-table.mjs

@@ -124,7 +124,7 @@ class SymbolTable {
 
   add_rel(name, rel) {
     if (this.rels[name] != undefined)
-      console.error(`SymbolTable: rel ${name} already defined (lines ${rel.start?.line}:${rel.start?.column}...${rel.end?.line}:${rel.end?.column})`);
+      console.error(`SymbolTable: rel '${name}' is redefined (lines ${rel.start?.line}:${rel.start?.column}...${rel.end?.line}:${rel.end?.column})`);
 
     this.rels[name] = {def: rel};
   }