@fraczak/k 1.3.0 → 1.3.1

package/index.coffee

@@ -1,4 +1,3 @@
-fs = require "fs"
 {parse} = require "./parser.js"
 run = require "./run"
 t = require "./codes"
@@ -22,12 +21,8 @@ compile = (script) ->
     
 compile.doc = "Transforms k-script (string) into a function"
 
-compile_file = (fileName) ->
-  compile fs.readFileSync(fileName).toString "utf8"
-compile_file.doc = "Transforms k-script (from file) into a function"
-
 runScriptOnData = (script, data) ->
   compile(script) data
 runScriptOnData.doc = "Run 'script' (string) on 'data': (script,data) -> data"
 
-module.exports = {compile, compile_file, run: runScriptOnData, parse: parse}
+module.exports = {compile, run: runScriptOnData, parse}

package/index.js

@@ -1,8 +1,6 @@
 // Generated by CoffeeScript 2.7.0
 (function() {
-  var compile, compile_file, finalize, fs, parse, run, runScriptOnData, t;
-
-  fs = require("fs");
+  var compile, finalize, parse, run, runScriptOnData, t;
 
   ({parse} = require("./parser.js"));
 
@@ -36,12 +34,6 @@
 
   compile.doc = "Transforms k-script (string) into a function";
 
-  compile_file = function(fileName) {
-    return compile(fs.readFileSync(fileName).toString("utf8"));
-  };
-
-  compile_file.doc = "Transforms k-script (from file) into a function";
-
   runScriptOnData = function(script, data) {
     return compile(script)(data);
   };
@@ -50,9 +42,8 @@
 
   module.exports = {
     compile,
-    compile_file,
     run: runScriptOnData,
-    parse: parse
+    parse
   };
 
 }).call(this);

package/package.json

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

package/pretty.coffee

@@ -6,12 +6,12 @@ compareAs = (fn) ->
     return 1 if a > b
     0 
 
-nameRE = /^[a-zA-Z_][a-zA-Z0-9_?!]*$/
+nameRE = /^[a-zA-Z0-9_][a-zA-Z0-9_?!]*$/
 prettyCode_labels = ( codes, representatives, label_ref_map) ->
   labels = Object.keys(label_ref_map)
   .sort compareAs (x) -> x
   .map (label) ->
-    plabel = if /^[a-zA-Z_][a-zA-Z0-9_?!]*$/.test label
+    plabel = if nameRE.test label
       label
     else    
       "'#{label}'" 
@@ -64,7 +64,7 @@ prettyRel = (prettyCode, exp) ->
         "$#{prettyCode {code:"ref",ref:exp.code}}"
       when 'product'
         do (labelled = exp.product.map ({label,exp}) ->
-              if /^[a-zA-Z_][a-zA-Z0-9_?!]*$/.test label
+              if nameRE.test label
                   "#{pretty exp} #{label}"
               else    
                   "#{pretty exp} '#{label}'") ->

package/pretty.js

@@ -15,7 +15,7 @@
     };
   };
 
-  nameRE = /^[a-zA-Z_][a-zA-Z0-9_?!]*$/;
+  nameRE = /^[a-zA-Z0-9_][a-zA-Z0-9_?!]*$/;
 
   prettyCode_labels = function(codes, representatives, label_ref_map) {
     var labels;
@@ -23,7 +23,7 @@
       return x;
     })).map(function(label) {
       var plabel;
-      plabel = /^[a-zA-Z_][a-zA-Z0-9_?!]*$/.test(label) ? label : `'${label}'`;
+      plabel = nameRE.test(label) ? label : `'${label}'`;
       return `${prettyCode(codes, representatives, {
         code: "ref",
         ref: label_ref_map[label]
@@ -90,7 +90,7 @@
           return (function(labelled) {
             return `{${labelled.join(", ")}}`;
           })(exp.product.map(function({label, exp}) {
-            if (/^[a-zA-Z_][a-zA-Z0-9_?!]*$/.test(label)) {
+            if (nameRE.test(label)) {
               return `${pretty(exp)} ${label}`;
             } else {
               return `${pretty(exp)} '${label}'`;

package/run.coffee

@@ -1,5 +1,3 @@
-fs = require "fs"
-
 valid = (x) ->
   return undefined if isNaN x
   return x if x?

package/run.js

@@ -1,10 +1,8 @@
 // Generated by CoffeeScript 2.7.0
 (function() {
-  var builtin, codes, fs, run, valid, verify,
+  var builtin, codes, run, valid, verify,
     modulo = function(a, b) { return (+a % (b = +b) + b) % b; };
 
-  fs = require("fs");
-
   valid = function(x) {
     if (isNaN(x)) {
       return void 0;