sync w/ jevko-cli

Author: djedr

bundlable/deps.bremote.js

@@ -1,4 +1,4 @@
 export {jevkoml} from 'https://raw.githubusercontent.com/jevko/jevkoml/v0.5.1/jevkoml.js'
-export {jevkodata, map, prep, prettyFromJsonStr} from 'https://raw.githubusercontent.com/jevko/jevkodata/v0.4.1/mod.js'
+export {jevkodata, convert, map, prep, prettyFromJsonStr} from 'https://raw.githubusercontent.com/jevko/jevkodata/v0.4.1/mod.js'
 export {jevkocfg} from 'https://raw.githubusercontent.com/jevko/jevkoconfig1.js/v0.2.1/jevkocfg.js'
 export {jevkoFromString as parseJevkoWithHeredocs} from 'https://cdn.jsdelivr.net/gh/jevko/jevko.js@v0.1.5/mod.js'

node/bundle.js

@@ -1926,14 +1926,16 @@ var importDirective = (jevko, options) => {
         subs.push(...subjevkos2);
         continue;
       } else if (directive === "paste") {
-        const fileName = string2(jevko2);
+        const opts = convert(jevko2);
+        const fileName = typeof opts === "string" ? opts : opts.path;
+        const tag = typeof opts === "string" ? void 0 : opts.tag;
         let path;
         if ((0, import_node_path.isAbsolute)(fileName))
           path = fileName;
         else
           path = (0, import_node_path.join)(dir, fileName);
         const src = readTextFileSync(path);
-        subs.push(makeTextNode2(src));
+        subs.push(makeTextNode2(src, tag));
         continue;
       }
     }
@@ -1947,16 +1949,17 @@ var string2 = (jevko) => {
     throw Error("oops");
   return suffix;
 };
-var makeTextNode2 = (text) => {
+var makeTextNode2 = (text, tag) => {
   return {
     prefix: "",
-    jevko: suffixToJevko2(text)
+    jevko: suffixToJevko2(text, tag)
   };
 };
-var suffixToJevko2 = (suffix) => {
+var suffixToJevko2 = (suffix, tag) => {
   return {
     subjevkos: [],
-    suffix
+    suffix,
+    tag
   };
 };
 

portable/importDirective.js

@@ -1,5 +1,5 @@
 import { dirname, join, isAbsolute, readTextFileSync } from "../nonportable/deps.js";
-import {parseJevkoWithHeredocs} from '../bundlable/deps.b.js'
+import {convert, parseJevkoWithHeredocs} from '../bundlable/deps.b.js'
 
 //?todo: extract to a separate lib
 //?todo: handle via streaming (requires rearchitecting and rewriting the entire jevko cli)
@@ -46,7 +46,10 @@ export const importDirective = (jevko, options) => {
         // paste: how to be consistent accross formats?
         // maybe paste as `/jevko:paste/.../jevko:paste/
 
-        const fileName = string(jevko)
+        const opts = convert(jevko)
+
+        const fileName = typeof opts === 'string'? opts: opts.path
+        const tag = typeof opts === 'string'? undefined: opts.tag
 
         let path
         if (isAbsolute(fileName)) path = fileName
@@ -55,7 +58,7 @@ export const importDirective = (jevko, options) => {
         // console.log(isAbsolute(fileName), fileName, dir, path)
 
         const src = readTextFileSync(path)
-        subs.push(makeTextNode(src))
+        subs.push(makeTextNode(src, tag))
         continue
       }
       // note: unknown directives are treated as normal subjevkos
@@ -75,15 +78,16 @@ const string = jevko => {
   return suffix
 }
 
-const makeTextNode = text => {
+const makeTextNode = (text, tag) => {
   return {
     prefix: "", 
-    jevko: suffixToJevko(text),
+    jevko: suffixToJevko(text, tag),
   }
 }
-const suffixToJevko = suffix => {
+const suffixToJevko = (suffix, tag) => {
   return {
     subjevkos: [],
     suffix,
+    tag,
   }
 }