Merge pull request #169 from terminusdb/doc_template_fixes

Adding document templating fixes

Author: GavinMendelGleason

lib/query/woqlCore.js

@@ -159,7 +159,7 @@ WOQLQuery.prototype.jobj = function (qobj) {
 /**
  * Wraps the elements of an AS variable in the appropriate json-ld
  */
-WOQLQuery.prototype.asv = function (colname_or_index, vname, type) {
+WOQLQuery.prototype.asv = function (colname_or_index, variable, type) {
   const asvar = {};
   if (typeof colname_or_index === 'number') {
     asvar['@type'] = 'Column';
@@ -168,8 +168,13 @@ WOQLQuery.prototype.asv = function (colname_or_index, vname, type) {
     asvar['@type'] = 'Column';
     asvar.indicator = { '@type': 'Indicator', name: colname_or_index };
   }
-  if (vname.substring(0, 2) === 'v:') vname = vname.substring(2);
-  asvar.variable = vname;
+  if (variable instanceof Var) {
+    asvar.variable = variable.name;
+  } else if (variable.substring(0, 2) === 'v:') {
+    asvar.variable = variable.substring(2);
+  } else {
+    asvar.variable = variable;
+  }
   if (type) asvar.type = type;
   return asvar;
 };

lib/query/woqlDoc.js

@@ -26,6 +26,12 @@ function convert(obj) {
         '@value': obj,
       },
     };
+  // eslint-disable-next-line no-use-before-define
+  } if (obj instanceof Var) {
+    return {
+      '@type': 'Value',
+      variable: obj.name,
+    };
   } if (typeof (obj) === 'object') {
     const pairs = [];
     // eslint-disable-next-line no-restricted-syntax

lib/query/woqlQuery.js

@@ -12,6 +12,7 @@
 /// /@ts-check
 // WOQLQuery
 const WOQLQuery = require('./woqlCore');
+const { Var, Doc } = require('./woqlDoc');
 
 // I HAVE TO REVIEW THE Inheritance and the prototype chain
 /* class WOQLQuery extends WOQLCore {
@@ -376,10 +377,15 @@ WOQLQuery.prototype.put = function (asvars, query, query_resource) {
  *
  * Imports the value identified by Source to a Target variable
  *
- * calling:
+ * Examples:
+ *
  *   WOQL.as("first var", "v:First_Var", "string").as("second var", "v:Second_Var")
+ *
  *   WOQL.as(["first var", "v:First_Var", "string"], ["second var", "v:Second_Var"])
  *
+ *   let [First_Var,Second_Var] = WOQL.vars("First_Var","Second_Var")
+ *   WOQL.as("first var", First_Var, "string").as("second var", Second_Var)
+ *
  * @param {...(array|string)} varList variable number of arguments
  * @returns WOQLQuery
  */
@@ -407,6 +413,8 @@ WOQLQuery.prototype.as = function (...varList) {
   } else if (typeof varList[0] === 'number' || typeof varList[0] === 'string') {
     if (varList[2] && typeof varList[2] === 'string') {
       var oasv = this.asv(varList[0], varList[1], varList[2]);
+    } else if (varList[1] && varList[1] instanceof Var) {
+      var oasv = this.asv(varList[0], varList[1]);
     } else if (varList[1] && typeof varList[1] === 'string') {
       if (varList[1].substring(0, 4) === 'xsd:' || varList[1].substring(0, 4) === 'xdd:') {
         var oasv = this.asv(this.query.length, varList[0], varList[1]);