@fraczak/k 1.1.3 → 1.1.4

package/codes.coffee

@@ -102,7 +102,7 @@ normalizeAll = (codes,representatives) ->
             normalized[name] = { code: code.code } 
             normalized[name][code.code] = normalize code[code.code], representatives
           when "vector"
-            normalized[name] = {code:"vector", vector: representatives[code.vector]}
+            normalized[name] = {code:"vector", vector: representatives[code.vector] ? code.vector}
   
     normalized    
   , {}

package/codes.js

@@ -156,6 +156,7 @@
     return normalized = names.reduce(function(normalized, name) {
       if (name === representatives[name]) {
         (function(code) {
+          var ref;
           switch (code.code) {
             case "union":
             case "product":
@@ -166,7 +167,7 @@
             case "vector":
               return normalized[name] = {
                 code: "vector",
-                vector: representatives[code.vector]
+                vector: (ref = representatives[code.vector]) != null ? ref : code.vector
               };
           }
         })(codes[name]);

package/package.json

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

package/run.coffee

@@ -49,7 +49,8 @@ codes =
 
 verify = (code, value) ->
   # representatives = run.defs.representatives
-  # console.log {code,value,representatives}
+  # defCodes = JSON.stringify run.defs.codes
+  # console.log {code,value, representatives, defCodes}
   switch code.code
     when "vector"
       value.every (x) ->

package/run.js

@@ -112,7 +112,8 @@
 
   verify = function(code, value) {
     // representatives = run.defs.representatives
-    // console.log {code,value,representatives}
+    // defCodes = JSON.stringify run.defs.codes
+    // console.log {code,value, representatives, defCodes}
     switch (code.code) {
       case "vector":
         return value.every(function(x) {

package/test.coffee

@@ -48,3 +48,17 @@ console.log ""
   console.log "k_fn(#{JSON.stringify(data)});"
   console.log "// RETURNS: #{JSON.stringify k_fn data}"
   console.log ""
+
+k_expression = "$ < < [ int ] ints, [ bool ] bools > list, string None>"
+k_fn  = k.compile k_expression
+console.log "var k_fn = k.compile('#{k_expression}');"
+console.log ""
+
+[ 
+  {None: "None"}
+  {list: {ints: []}}
+  {list: {ints: [1,2,3]}}
+].map (data) -> 
+  console.log "k_fn(#{JSON.stringify(data)});"
+  console.log "// RETURNS: #{JSON.stringify k_fn data}"
+  console.log ""

package/test.js

@@ -116,4 +116,34 @@
     return console.log("");
   });
 
+  k_expression = "$ < < [ int ] ints, [ bool ] bools > list, string None>";
+
+  k_fn = k.compile(k_expression);
+
+  console.log(`var k_fn = k.compile('${k_expression}');`);
+
+  console.log("");
+
+  [
+    {
+      None: "None"
+    },
+    {
+      list: {
+        ints: []
+      }
+    },
+    {
+      list: {
+        ints: [1,
+    2,
+    3]
+      }
+    }
+  ].map(function(data) {
+    console.log(`k_fn(${JSON.stringify(data)});`);
+    console.log(`// RETURNS: ${JSON.stringify(k_fn(data))}`);
+    return console.log("");
+  });
+
 }).call(this);