@quenk/wml 2.11.4 → 2.12.0

package/lib/cli.js

@@ -1,22 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileFile = exports.compileDir = void 0;
-var path_1 = require("path");
-var future_1 = require("@quenk/noni/lib/control/monad/future");
-var file_1 = require("@quenk/noni/lib/io/file");
-var compile_1 = require("./compile");
+const path_1 = require("path");
+const future_1 = require("@quenk/noni/lib/control/monad/future");
+const file_1 = require("@quenk/noni/lib/io/file");
+const compile_1 = require("./compile");
 /**
  * compileDir will compile each wml file found in the specified path.
  */
-var compileDir = function (path, opts) {
-    return (0, file_1.listFilesRec)(path)
-        .map(function (list) {
-        return list
-            .map(function (p) { return (0, path_1.resolve)(path, p); })
-            .map(function (p) { return (0, exports.compileFile)(p, opts); });
-    })
-        .chain(future_1.parallel);
-};
+const compileDir = (path, opts) => (0, file_1.listFilesRec)(path)
+    .map(list => list
+    .map(p => (0, path_1.resolve)(path, p))
+    .map(p => (0, exports.compileFile)(p, opts)))
+    .chain(future_1.parallel);
 exports.compileDir = compileDir;
 /**
  * compileFile will compile a single wml file.
@@ -24,25 +20,24 @@ exports.compileDir = compileDir;
  * If that file does not have the specified inputExtension, it will be
  * ignored.
  */
-var compileFile = function (path, opts) {
-    if ((0, path_1.extname)(path) !== ".".concat(opts.inputExtension)) {
+const compileFile = (path, opts) => (0, future_1.doFuture)(function* () {
+    if ((0, path_1.extname)(path) !== `.${opts.inputExtension}`) {
         return (0, future_1.pure)(undefined);
     }
     else {
-        var p_1 = "".concat(getFileName(path), ".").concat(opts.outputExtension);
-        return (0, file_1.readTextFile)(path)
-            .chain(function (buf) {
-            var eitherTs = (0, compile_1.compile)(buf, opts);
-            if (eitherTs.isLeft())
-                return (0, future_1.raise)(eitherTs.takeLeft());
-            else
-                return (0, future_1.pure)(eitherTs.takeRight());
-        })
-            .chain(function (txt) { return (0, file_1.writeTextFile)(p_1, txt); });
+        let p = `${getFileName(path)}.${opts.outputExtension}`;
+        let buf = yield (0, file_1.readTextFile)(path);
+        let eitherTs = (0, compile_1.compile)(buf, opts);
+        if (eitherTs.isLeft()) {
+            let msg = eitherTs.takeLeft().message;
+            return (0, future_1.raise)(new Error(`Error occurred while compiling "${path}":\n ${msg}`));
+        }
+        else {
+            yield (0, file_1.writeTextFile)(p, eitherTs.takeRight());
+        }
+        return future_1.voidPure;
     }
-};
+});
 exports.compileFile = compileFile;
-var getFileName = function (file) {
-    return "".concat((0, path_1.dirname)(file), "/").concat((0, path_1.basename)(file, (0, path_1.extname)(file)));
-};
+const getFileName = (file) => `${(0, path_1.dirname)(file)}/${(0, path_1.basename)(file, (0, path_1.extname)(file))}`;
 //# sourceMappingURL=cli.js.map

package/lib/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["cli.ts"],"names":[],"mappings":";;;AAAA,6BAA2D;AAE3D,+DAK8C;AAC9C,gDAIiC;AAEjC,qCAA6C;AAuC7C;;GAEG;AACI,IAAM,UAAU,GAAG,UAAC,IAAY,EAAE,IAAgB;IACrD,OAAA,IAAA,mBAAY,EAAC,IAAI,CAAC;SACb,GAAG,CAAC,UAAA,IAAI;QACL,OAAA,IAAI;aACC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,IAAA,cAAO,EAAC,IAAI,EAAE,CAAC,CAAC,EAAhB,CAAgB,CAAC;aAC1B,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,IAAA,mBAAW,EAAC,CAAC,EAAE,IAAI,CAAC,EAApB,CAAoB,CAAC;IAFnC,CAEmC,CAAC;SACvC,KAAK,CAAC,iBAAQ,CAAC;AALpB,CAKoB,CAAC;AANZ,QAAA,UAAU,cAME;AAEzB;;;;;GAKG;AACI,IAAM,WAAW,GAAG,UAAC,IAAY,EAAE,IAAgB;IAGtD,IAAI,IAAA,cAAO,EAAC,IAAI,CAAC,KAAK,WAAI,IAAI,CAAC,cAAc,CAAE,EAAE;QAE7C,OAAO,IAAA,aAAI,EAAO,SAAS,CAAC,CAAC;KAEhC;SAAM;QAEH,IAAI,GAAC,GAAG,UAAG,WAAW,CAAC,IAAI,CAAC,cAAI,IAAI,CAAC,eAAe,CAAE,CAAC;QAEvD,OAAO,IAAA,mBAAY,EAAC,IAAI,CAAC;aACpB,KAAK,CAAC,UAAA,GAAG;YAEN,IAAI,QAAQ,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAElC,IAAI,QAAQ,CAAC,MAAM,EAAE;gBACjB,OAAO,IAAA,cAAK,EAAS,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;;gBAE1C,OAAO,IAAA,aAAI,EAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;QAE1C,CAAC,CAAC;aACD,KAAK,CAAC,UAAA,GAAG,IAAI,OAAA,IAAA,oBAAa,EAAC,GAAC,EAAE,GAAG,CAAC,EAArB,CAAqB,CAAC,CAAC;KAC5C;AAEL,CAAC,CAAA;AAzBY,QAAA,WAAW,eAyBvB;AAED,IAAM,WAAW,GAAG,UAAC,IAAY;IAC7B,OAAA,UAAG,IAAA,cAAO,EAAC,IAAI,CAAC,cAAI,IAAA,eAAQ,EAAC,IAAI,EAAE,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,CAAE;AAAnD,CAAmD,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["cli.ts"],"names":[],"mappings":";;;AAAA,+BAA2D;AAE3D,iEAO8C;AAC9C,kDAIiC;AAEjC,uCAA6C;AAuC7C;;GAEG;AACI,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,IAAgB,EAAE,EAAE,CACzD,IAAA,mBAAY,EAAC,IAAI,CAAC;KACb,GAAG,CAAC,IAAI,CAAC,EAAE,CACR,IAAI;KACC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,cAAO,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;KAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;KACvC,KAAK,CAAC,iBAAQ,CAAC,CAAC;AANZ,QAAA,UAAU,cAME;AAEzB;;;;;GAKG;AACI,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,IAAgB,EAAiB,EAAE,CAC3E,IAAA,iBAAQ,EAAC,QAAQ,CAAC;IAEhB,IAAI,IAAA,cAAO,EAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE;QAE7C,OAAO,IAAA,aAAI,EAAO,SAAS,CAAC,CAAC;KAEhC;SAAM;QAEH,IAAI,CAAC,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QAEvD,IAAI,GAAG,GAAG,MAAM,IAAA,mBAAY,EAAC,IAAI,CAAC,CAAC;QAEnC,IAAI,QAAQ,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAEpC,IAAG,QAAQ,CAAC,MAAM,EAAE,EAAE;YAEpB,IAAI,GAAG,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC;YAEtC,OAAO,IAAA,cAAK,EAAC,IAAI,KAAK,CACpB,mCAAmC,IAAI,QAAQ,GAAG,EAAE,CAAC,CAAC,CAAC;SAE1D;aAAM;YAED,MAAM,IAAA,oBAAa,EAAC,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;SACpD;QAEC,OAAO,iBAAQ,CAAC;KAEjB;AACL,CAAC,CAAC,CAAC;AA9BU,QAAA,WAAW,eA8BrB;AAEH,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CACjC,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,IAAI,IAAA,eAAQ,EAAC,IAAI,EAAE,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC"}

package/lib/cli.ts

@@ -4,7 +4,9 @@ import {
     Future,
     pure,
     raise,
-    parallel
+    parallel,
+    doFuture,
+    voidPure
 } from '@quenk/noni/lib/control/monad/future';
 import {
     listFilesRec,
@@ -68,8 +70,8 @@ export const compileDir = (path: string, opts: CLIOptions) =>
  * If that file does not have the specified inputExtension, it will be
  * ignored.
  */
-export const compileFile = (path: string, opts: CLIOptions)
-    : Future<void> => {
+export const compileFile = (path: string, opts: CLIOptions) : Future<void> => 
+  doFuture(function*() {
 
     if (extname(path) !== `.${opts.inputExtension}`) {
 
@@ -79,21 +81,26 @@ export const compileFile = (path: string, opts: CLIOptions)
 
         let p = `${getFileName(path)}.${opts.outputExtension}`;
 
-        return readTextFile(path)
-            .chain(buf => {
+        let buf = yield readTextFile(path);
 
-                let eitherTs = compile(buf, opts);
+        let eitherTs = compile(buf, opts);
 
-                if (eitherTs.isLeft())
-                    return raise<string>(eitherTs.takeLeft());
-                else
-                    return pure(eitherTs.takeRight());
+      if(eitherTs.isLeft()) {
 
-            })
-            .chain(txt => writeTextFile(p, txt));
+        let msg = eitherTs.takeLeft().message;
+        
+        return raise(new Error(
+          `Error occurred while compiling "${path}":\n ${msg}`));
+
+      } else {
+
+            yield writeTextFile(p, eitherTs.takeRight());
     }
 
-}
+      return voidPure;
+
+    }
+});
 
 const getFileName = (file: string) =>
     `${dirname(file)}/${basename(file, extname(file))}`;

package/lib/compile/codegen.d.ts

@@ -244,15 +244,7 @@ export declare const attributeName2TS: (_: CodeGenerator, n: ast.Attribute) => s
 /**
  * attrs2String
  */
-export declare const attrs2String: (attrs: {
-    [key: string]: string | string[];
-}) => string;
-/**
- * groupAttrs
- */
-export declare const groupAttrs: (ctx: CodeGenerator, attrs: ast.Attribute[]) => {
-    [key: string]: string | string[];
-};
+export declare const attrs2String: (ctx: CodeGenerator, attrs: ast.Attribute[]) => string;
 /**
  * interpolation2TS
  */