update

scratch.coffee

@@ -1,13 +1,10 @@
 plv8 = require('./src/plv8')
-loader = require('./src/loader')
+loader = require('./src/other_loader')
 
 console.log plv8.execute 'select 1'
 
-loader.scan('./scratch_code.coffee')
+init_sql = loader.scan('../src/fhir/crud.coffee')
 
-mod = require('./scratch_code.coffee')
-
-mod.generate_table(plv8, 'users')
-
-console.log plv8.execute 'select plv8_add(1, 3)'
-console.log plv8.execute 'select generate_table($1)', ['musers']
+console.log(init_sql)
+plv8.execute "CREATE SCHEMA IF NOT EXISTS fhir"
+plv8.execute init_sql

scratch_code.coffee

@@ -1,19 +1,4 @@
-plv8_add = (a, b)-> a + b
+u = require('./util')
 
-module.exports.plv8_add = plv8_add
-plv8_add.plv8 = 'plv8_add(a int, b int) RETURNS int'
-
-generate_table = (plv8, nm)->
-  tbl = plv8.quote_ident(nm)
-  plv8.execute """
-   DROP TABLE IF EXISTS #{tbl};
-   CREATE TABLE #{tbl} (
-     id serial PRIMARY KEY,
-     data jsonb
-   );
-  """
-  plv8.elog(INFO, "table #{tbl} generated")
-  "table #{tbl} generated"
-
-module.exports.generate_table = generate_table
-generate_table.plv8 = 'generate_table(nm text) RETURNS text'
+module.exports.myfn = ()->
+  u.hi()

src/cli.coffee

@@ -1,16 +1,31 @@
 mig   = require './migrations'
-load  = require './loader'
+load  = require './other_loader'
+plv8 = require('./plv8')
 
-migrate = (args)->
-  mig.up()
+migrate = (args)-> mig.up()
+unmigrate = (args)-> mig.down()
 
-generate_migration = (args)->
-  mig.generate(args[0])
+generate_migration = (args)-> mig.generate(args[0])
 
+fs = require('fs')
+config = JSON.parse(fs.readFileSync(process.cwd() + '/plpl.json', 'utf8'))
+process.env.DATABASE_URL ||= config.database_url
+# console.log("CONFIG",config)
 
 reload = (args)->
+  console.log("Reloading #{config.entry}")
+  plv8.execute load.scan(process.cwd() + '/' + config.entry)
+
+compile = (args)->
+  console.log("-- Compile #{config.entry}")
+  console.log load.scan(process.cwd() + '/' + config.entry)
 
 commands =
+ compile:
+   default:
+     fn: compile
+     args: ''
+     desc: 'return sql string'
  reload:
    default:
      fn: reload
@@ -25,6 +40,10 @@ commands =
      fn: migrate
      args: ''
      desc: 'migrate up'
+   down:
+     fn: unmigrate
+     args: ''
+     desc: 'migrate down'
    new:
      fn: generate_migration
      args: '<migration_name>'
@@ -43,15 +62,21 @@ exports.run = ()->
   if not cmd_nm
     print_usage(commands)
 
-  subcmd_nm = process.argv[3] || 'default'
+  subcmd_nm = process.argv[3]
   args = process.argv[4..-1]
 
   cmd = commands[cmd_nm]
   unless cmd
     console.log("Unknown command #{cmd_nm}")
     return
   subcmd = cmd[subcmd_nm]
+
+  unless subcmd
+    subcmd = cmd['default']
+    args = [subcmd_nm].concat(args)
+
   unless subcmd
     console.log("Unknown sub-command #{subcmd_nm}")
     return
+
   subcmd.fn(args)

src/migrations.coffee

@@ -76,6 +76,17 @@ up = (dir)->
   else
     console.log "All migrations done!"
 
+down = (dir)->
+  dir = ensure_migrations_dir(dir)
+  ensure_migrations_table()
+  pnd = pending(dir)
+  for m in pending(dir)
+    migrate_down(m)
+  if pnd.length == 0
+    console.log "No pending migrations"
+  else
+    console.log "All migrations done!"
+
 spit = (pth, cnt)->
   fd = fs.openSync(pth, 'a')
   fs.writeSync(fd, cnt)
@@ -97,4 +108,5 @@ exports.down = (plv8)->
   """
 
 module.exports.up = up
+module.exports.down = down
 module.exports.generate = generate

src/other_loader.coffee

@@ -0,0 +1,141 @@
+path = require('path')
+plv8 = require('./plv8')
+Module = require("module")
+
+currentModule = null
+modules_idx = {}
+plv8_exports = {}
+
+oldrequire = Module::require
+
+Module::require = (fl) ->
+  currentModule = fl
+  oldrequire.apply this, arguments
+
+oldcompile = Module::_compile
+
+module_code = (mod, code)->
+  """
+  _modules["#{mod.key}"] = {
+    init:  function(){
+      var exports = {};
+      _current_file = "#{mod.basename}";
+      _current_dir = "#{mod.dir}";
+      var module = {exports: exports};
+      #{code}
+      return module.exports;
+    }
+  }
+  """
+parse_params = (src)->
+  parts = src.split(")")[0].split("(")
+  params = parts[parts.length - 1]
+  params.split(",").map((x)-> x.trim())
+
+zip = (a,b)->
+  coll = if a.length > b.length then b else a
+  coll.reduce(((acc, x, idx)-> acc.push([a[idx],b[idx]]); acc), [])
+
+Module::_compile = (answer, filename) ->
+  dir = path.dirname(filename)
+  basename = path.basename(filename, '.coffee')
+  module = {
+    key: "#{dir}/#{basename}"
+    filename: filename
+    basename: basename
+    dir: dir
+    exports: {}
+  }
+  module.code = module_code(module, answer)
+  plv8_exports[currentModule] = module
+  res = oldcompile.apply(this, arguments)
+  module.schema = @exports.plv8_schema
+  for k,v of @exports when v.plv8_signature?
+      sig = v.plv8_signature
+      params = parse_params(v.toString())[1..-1]
+      module.exports[k] ={
+        name: k
+        returns: sig[(sig.length - 1)]
+        params: zip(params, sig)
+        filename: filename
+      }
+  res
+
+_isAbsolute = (pth)->
+  path.resolve(pth) == path.normalize(pth)
+
+generate_fn = (mod, name, info)->
+  # todo validate params & signature
+  params = (x.join(" ") for x in info.params).join(', ')
+  pass_params = (x for [x,_] in info.params).join(', ')
+  declaration = "#{mod.schema}.#{name}(#{params})"
+
+  """
+  ---
+  CREATE OR REPLACE FUNCTION
+  #{declaration}
+  RETURNS #{info.returns} AS $$
+    var mod = require("#{mod.filename}")
+    mod.#{name}(plv8, #{pass_params})
+  $$ LANGUAGE plv8;
+  ---
+  """
+
+scan = (pth) ->
+  unless _isAbsolute(pth)
+    pth = path.normalize(path.join(path.dirname(module.parent.filename), pth))
+
+  currentModule = null
+  Module._cache = {}
+  plv8_exports = {}
+
+  delete require.cache
+
+  file = require(pth)
+
+  deps = []
+  fns = []
+  for fl, info of plv8_exports
+    console.log("Compile module #{fl}...")
+    deps.push(info.code)
+    for k,v of info.exports
+      console.log("Compile fn #{k}...")
+      fns.push(generate_fn(info, k,v))
+
+  """
+  CREATE OR REPLACE FUNCTION plv8_init() RETURNS text AS $$
+    var _modules = {};
+    var _current_file = null;
+    var _current_dir = null;
+
+    // modules start
+    #{deps.join("\n")}
+    // modules stop
+
+    this.require = function(dep){
+      var abs_path = dep.replace(/\\.coffee$/, '');
+      if(dep.match(/\\.\\//)){
+        abs_path = _current_dir + '/' + dep.replace('./','');
+      }
+      // todo resolve paths
+      var mod = _modules[abs_path]
+      if(!mod){ throw new Error("No module " + abs_path)}
+      if(!mod.cached){ mod.cached = mod.init() }
+      return mod.cached
+    }
+    this.modules = function(){
+      var res = []
+      for(var k in _modules){ res.push(k) }
+      return res;
+    }
+    this.console = {
+      log: function(x){ plv8.elog(NOTICE, x); }
+    };
+    return 'done'
+  $$ LANGUAGE plv8 IMMUTABLE STRICT;
+
+  #{fns.join("\n")}
+  """
+
+exports.scan = scan
+

util.coffee

@@ -0,0 +1 @@
+module.exports.hi = -> "hi"