@danielx/civet 0.3.14 → 0.3.16

package/dist/browser.js

@@ -672,6 +672,8 @@ var Civet = (() => {
         InsertCloseParen,
         InsertOpenBrace,
         InsertCloseBrace,
+        InsertConst,
+        InsertReadonly,
         InsertNewline,
         InsertIndent,
         InsertSpace,
@@ -1151,7 +1153,7 @@ var Civet = (() => {
         }
       }
       var Class$0 = $TV($EXPECT($L15, fail, 'Class "class"'), function($skip, $loc, $0, $1) {
-        return { $loc, token: $0 };
+        return { $loc, token: $1 };
       });
       function Class(state) {
         if (state.verbose)
@@ -1240,21 +1242,7 @@ var Civet = (() => {
           return Static$0(state);
         }
       }
-      var FieldDefinition$0 = $TS($S(ClassElementName, $E(TypeSuffix), __, ConstAssignment, AssignmentExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-        var name = $1;
-        var suffix = $2;
-        var ws = $3;
-        var ca = $4;
-        var exp = $5;
-        return [
-          { ts: true, token: "readonly ", $loc: ca.$loc },
-          name,
-          suffix,
-          ws,
-          { token: "=", $loc: ca.$loc },
-          exp
-        ];
-      });
+      var FieldDefinition$0 = $S(InsertReadonly, ClassElementName, $E(TypeSuffix), __, ConstAssignment, AssignmentExpression);
       var FieldDefinition$1 = $S(ClassElementName, $E(TypeSuffix), $E(Initializer));
       function FieldDefinition(state) {
         if (state.tokenize) {
@@ -1264,7 +1252,7 @@ var Civet = (() => {
         }
       }
       var This$0 = $TV($EXPECT($L19, fail, 'This "this"'), function($skip, $loc, $0, $1) {
-        return { $loc, token: $0 };
+        return { $loc, token: $1 };
       });
       var This$1 = $S(AtAccessor, $S($E($EXPECT($L20, fail, 'This "#"')), IdentifierName));
       var This$2 = $TV($EXPECT($L21, fail, 'This "@"'), function($skip, $loc, $0, $1) {
@@ -2124,8 +2112,12 @@ var Civet = (() => {
       });
       var BinaryOpSymbol$21 = $EXPECT($L78, fail, 'BinaryOpSymbol "||"');
       var BinaryOpSymbol$22 = $EXPECT($L79, fail, 'BinaryOpSymbol "??"');
-      var BinaryOpSymbol$23 = $S($EXPECT($L80, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue);
-      var BinaryOpSymbol$24 = $S($EXPECT($L81, fail, 'BinaryOpSymbol "in"'), NonIdContinue);
+      var BinaryOpSymbol$23 = $TS($S($EXPECT($L80, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        return $1;
+      });
+      var BinaryOpSymbol$24 = $TS($S($EXPECT($L81, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        return $1;
+      });
       var BinaryOpSymbol$25 = $EXPECT($L82, fail, 'BinaryOpSymbol "&"');
       var BinaryOpSymbol$26 = $EXPECT($L83, fail, 'BinaryOpSymbol "^"');
       var BinaryOpSymbol$27 = $EXPECT($L84, fail, 'BinaryOpSymbol "|"');
@@ -2788,21 +2780,7 @@ var Civet = (() => {
         }
       }
       var LexicalDeclaration$0 = $S(LetOrConst, __, LexicalBinding, $Q($S(__, $EXPECT($L0, fail, 'LexicalDeclaration ","'), __, LexicalBinding)));
-      var LexicalDeclaration$1 = $TS($S($C(BindingPattern, BindingIdentifier), $E(TypeSuffix), __, ConstAssignment, AssignmentExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-        var bind = $1;
-        var suffix = $2;
-        var ws = $3;
-        var ca = $4;
-        var exp = $5;
-        return [
-          "const ",
-          bind,
-          suffix,
-          ws,
-          { token: "=", $loc: ca.$loc },
-          exp
-        ];
-      });
+      var LexicalDeclaration$1 = $S(InsertConst, $C(BindingPattern, BindingIdentifier), $E(TypeSuffix), __, ConstAssignment, AssignmentExpression);
       function LexicalDeclaration(state) {
         if (state.tokenize) {
           return $TOKEN("LexicalDeclaration", state, LexicalDeclaration$0(state) || LexicalDeclaration$1(state));
@@ -2811,7 +2789,7 @@ var Civet = (() => {
         }
       }
       var ConstAssignment$0 = $TV($EXPECT($L116, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
-        return { $loc, token: $0 };
+        return { $loc, token: "=" };
       });
       function ConstAssignment(state) {
         if (state.verbose)
@@ -3605,7 +3583,7 @@ var Civet = (() => {
           return Type$0(state);
         }
       }
-      var TypeBinary$0 = $S(TypeUnary, $Q($S(__, TypeBinaryOp, TypeUnary)));
+      var TypeBinary$0 = $S(TypeUnary, $Q($S(__, TypeBinaryOp, __, TypeUnary)));
       function TypeBinary(state) {
         if (state.verbose)
           console.log("ENTER:", "TypeBinary");
@@ -3873,6 +3851,30 @@ var Civet = (() => {
           return InsertCloseBrace$0(state);
         }
       }
+      var InsertConst$0 = $T($EXPECT($L33, fail, 'InsertConst ""'), function(value) {
+        return "const ";
+      });
+      function InsertConst(state) {
+        if (state.verbose)
+          console.log("ENTER:", "InsertConst");
+        if (state.tokenize) {
+          return $TOKEN("InsertConst", state, InsertConst$0(state));
+        } else {
+          return InsertConst$0(state);
+        }
+      }
+      var InsertReadonly$0 = $T($EXPECT($L33, fail, 'InsertReadonly ""'), function(value) {
+        return { "ts": true, "children": ["readonly "] };
+      });
+      function InsertReadonly(state) {
+        if (state.verbose)
+          console.log("ENTER:", "InsertReadonly");
+        if (state.tokenize) {
+          return $TOKEN("InsertReadonly", state, InsertReadonly$0(state));
+        } else {
+          return InsertReadonly$0(state);
+        }
+      }
       var InsertNewline$0 = $TV($EXPECT($L33, fail, 'InsertNewline ""'), function($skip, $loc, $0, $1) {
         return "\n";
       });
@@ -4271,6 +4273,7 @@ var Civet = (() => {
   var require_main = __commonJS({
     "source/main.coffee"(exports, module) {
       var SourceMap;
+      var base64Encode;
       var defaultOptions;
       var gen;
       var parse;
@@ -4283,24 +4286,38 @@ var Civet = (() => {
       module.exports = {
         parse,
         compile: function(src, options = defaultOptions) {
-          var ast, code, sm;
+          var ast, code, filename, sm, srcMapJSON;
+          filename = options.filename || "unknown";
           ast = prune(parse(src, {
-            filename: options.filename
+            filename
           }));
-          if (options.sourceMap) {
+          if (options.ast) {
+            return ast;
+          }
+          if (options.sourceMap || options.inlineMap) {
             sm = SourceMap(src);
             options.updateSourceMap = sm.updateSourceMap;
             code = gen(ast, options);
-            return {
-              code,
-              sourceMap: sm
-            };
+            if (options.inlineMap) {
+              srcMapJSON = sm.json(filename, filename.replace(/(?:\.civet$)?/, ".ts"));
+              return `${code}
+//# sourceMappingURL=data:application/json;base64,${base64Encode(JSON.stringify(srcMapJSON))}
+`;
+            } else {
+              return {
+                code,
+                sourceMap: sm
+              };
+            }
           }
           return gen(ast, options);
         },
         generate: gen,
         util
       };
+      base64Encode = function(src) {
+        return Buffer.from(src).toString("base64");
+      };
     }
   });
   return require_main();

package/dist/civet

@@ -1,20 +1,22 @@
 #!/usr/bin/env node
 "use strict";
-var ast, encoding, fs, generate, input, js, output, parse, prune;
+var ast, compile, encoding, fs, generate, inlineMap, input, js, output, parse, prune;
 if (process.argv.includes("--version")) {
   process.stdout.write(require("../package.json").version + "\n");
   process.exit(0);
 }
-({ parse, generate } = require("./main"));
+({ parse, compile, generate } = require("./main"));
 ({ prune } = generate);
 encoding = "utf8";
 fs = require("fs");
 input = fs.readFileSync(process.stdin.fd, encoding);
-ast = prune(parse(input));
+process.argv.includes("--ast");
 js = process.argv.includes("--js");
-if (process.argv.includes("--ast")) {
+inlineMap = process.argv.includes("--inline-map");
+if (ast) {
+  ast = prune(parse(input));
   process.stdout.write(JSON.stringify(ast, null, 2));
-  return;
+  process.exit(0);
 }
-output = generate(ast, { js });
+output = compile(input, { js, inlineMap });
 process.stdout.write(output);

package/dist/esbuild-plugin.js

@@ -7,7 +7,7 @@ module.exports = {
   name: 'civet',
   setup(build) {
     build.onLoad({
-      filter: /\.civet/,
+      filter: /\.civet$/,
     }, function(args) {
       return readFile(args.path, 'utf8')
       .then(function(source) {

package/dist/main.js

@@ -671,6 +671,8 @@ var require_parser = __commonJS({
       InsertCloseParen,
       InsertOpenBrace,
       InsertCloseBrace,
+      InsertConst,
+      InsertReadonly,
       InsertNewline,
       InsertIndent,
       InsertSpace,
@@ -1150,7 +1152,7 @@ var require_parser = __commonJS({
       }
     }
     var Class$0 = $TV($EXPECT($L15, fail, 'Class "class"'), function($skip, $loc, $0, $1) {
-      return { $loc, token: $0 };
+      return { $loc, token: $1 };
     });
     function Class(state) {
       if (state.verbose)
@@ -1239,21 +1241,7 @@ var require_parser = __commonJS({
         return Static$0(state);
       }
     }
-    var FieldDefinition$0 = $TS($S(ClassElementName, $E(TypeSuffix), __, ConstAssignment, AssignmentExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var name = $1;
-      var suffix = $2;
-      var ws = $3;
-      var ca = $4;
-      var exp = $5;
-      return [
-        { ts: true, token: "readonly ", $loc: ca.$loc },
-        name,
-        suffix,
-        ws,
-        { token: "=", $loc: ca.$loc },
-        exp
-      ];
-    });
+    var FieldDefinition$0 = $S(InsertReadonly, ClassElementName, $E(TypeSuffix), __, ConstAssignment, AssignmentExpression);
     var FieldDefinition$1 = $S(ClassElementName, $E(TypeSuffix), $E(Initializer));
     function FieldDefinition(state) {
       if (state.tokenize) {
@@ -1263,7 +1251,7 @@ var require_parser = __commonJS({
       }
     }
     var This$0 = $TV($EXPECT($L19, fail, 'This "this"'), function($skip, $loc, $0, $1) {
-      return { $loc, token: $0 };
+      return { $loc, token: $1 };
     });
     var This$1 = $S(AtAccessor, $S($E($EXPECT($L20, fail, 'This "#"')), IdentifierName));
     var This$2 = $TV($EXPECT($L21, fail, 'This "@"'), function($skip, $loc, $0, $1) {
@@ -2123,8 +2111,12 @@ var require_parser = __commonJS({
     });
     var BinaryOpSymbol$21 = $EXPECT($L78, fail, 'BinaryOpSymbol "||"');
     var BinaryOpSymbol$22 = $EXPECT($L79, fail, 'BinaryOpSymbol "??"');
-    var BinaryOpSymbol$23 = $S($EXPECT($L80, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue);
-    var BinaryOpSymbol$24 = $S($EXPECT($L81, fail, 'BinaryOpSymbol "in"'), NonIdContinue);
+    var BinaryOpSymbol$23 = $TS($S($EXPECT($L80, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      return $1;
+    });
+    var BinaryOpSymbol$24 = $TS($S($EXPECT($L81, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      return $1;
+    });
     var BinaryOpSymbol$25 = $EXPECT($L82, fail, 'BinaryOpSymbol "&"');
     var BinaryOpSymbol$26 = $EXPECT($L83, fail, 'BinaryOpSymbol "^"');
     var BinaryOpSymbol$27 = $EXPECT($L84, fail, 'BinaryOpSymbol "|"');
@@ -2787,21 +2779,7 @@ var require_parser = __commonJS({
       }
     }
     var LexicalDeclaration$0 = $S(LetOrConst, __, LexicalBinding, $Q($S(__, $EXPECT($L0, fail, 'LexicalDeclaration ","'), __, LexicalBinding)));
-    var LexicalDeclaration$1 = $TS($S($C(BindingPattern, BindingIdentifier), $E(TypeSuffix), __, ConstAssignment, AssignmentExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var bind = $1;
-      var suffix = $2;
-      var ws = $3;
-      var ca = $4;
-      var exp = $5;
-      return [
-        "const ",
-        bind,
-        suffix,
-        ws,
-        { token: "=", $loc: ca.$loc },
-        exp
-      ];
-    });
+    var LexicalDeclaration$1 = $S(InsertConst, $C(BindingPattern, BindingIdentifier), $E(TypeSuffix), __, ConstAssignment, AssignmentExpression);
     function LexicalDeclaration(state) {
       if (state.tokenize) {
         return $TOKEN("LexicalDeclaration", state, LexicalDeclaration$0(state) || LexicalDeclaration$1(state));
@@ -2810,7 +2788,7 @@ var require_parser = __commonJS({
       }
     }
     var ConstAssignment$0 = $TV($EXPECT($L116, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
-      return { $loc, token: $0 };
+      return { $loc, token: "=" };
     });
     function ConstAssignment(state) {
       if (state.verbose)
@@ -3604,7 +3582,7 @@ var require_parser = __commonJS({
         return Type$0(state);
       }
     }
-    var TypeBinary$0 = $S(TypeUnary, $Q($S(__, TypeBinaryOp, TypeUnary)));
+    var TypeBinary$0 = $S(TypeUnary, $Q($S(__, TypeBinaryOp, __, TypeUnary)));
     function TypeBinary(state) {
       if (state.verbose)
         console.log("ENTER:", "TypeBinary");
@@ -3872,6 +3850,30 @@ var require_parser = __commonJS({
         return InsertCloseBrace$0(state);
       }
     }
+    var InsertConst$0 = $T($EXPECT($L33, fail, 'InsertConst ""'), function(value) {
+      return "const ";
+    });
+    function InsertConst(state) {
+      if (state.verbose)
+        console.log("ENTER:", "InsertConst");
+      if (state.tokenize) {
+        return $TOKEN("InsertConst", state, InsertConst$0(state));
+      } else {
+        return InsertConst$0(state);
+      }
+    }
+    var InsertReadonly$0 = $T($EXPECT($L33, fail, 'InsertReadonly ""'), function(value) {
+      return { "ts": true, "children": ["readonly "] };
+    });
+    function InsertReadonly(state) {
+      if (state.verbose)
+        console.log("ENTER:", "InsertReadonly");
+      if (state.tokenize) {
+        return $TOKEN("InsertReadonly", state, InsertReadonly$0(state));
+      } else {
+        return InsertReadonly$0(state);
+      }
+    }
     var InsertNewline$0 = $TV($EXPECT($L33, fail, 'InsertNewline ""'), function($skip, $loc, $0, $1) {
       return "\n";
     });
@@ -4268,6 +4270,7 @@ var require_util = __commonJS({
 
 // source/main.coffee
 var SourceMap;
+var base64Encode;
 var defaultOptions;
 var gen;
 var parse;
@@ -4280,21 +4283,35 @@ defaultOptions = {};
 module.exports = {
   parse,
   compile: function(src, options = defaultOptions) {
-    var ast, code, sm;
+    var ast, code, filename, sm, srcMapJSON;
+    filename = options.filename || "unknown";
     ast = prune(parse(src, {
-      filename: options.filename
+      filename
     }));
-    if (options.sourceMap) {
+    if (options.ast) {
+      return ast;
+    }
+    if (options.sourceMap || options.inlineMap) {
       sm = SourceMap(src);
       options.updateSourceMap = sm.updateSourceMap;
       code = gen(ast, options);
-      return {
-        code,
-        sourceMap: sm
-      };
+      if (options.inlineMap) {
+        srcMapJSON = sm.json(filename, filename.replace(/(?:\.civet$)?/, ".ts"));
+        return `${code}
+//# sourceMappingURL=data:application/json;base64,${base64Encode(JSON.stringify(srcMapJSON))}
+`;
+      } else {
+        return {
+          code,
+          sourceMap: sm
+        };
+      }
     }
     return gen(ast, options);
   },
   generate: gen,
   util
 };
+base64Encode = function(src) {
+  return Buffer.from(src).toString("base64");
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.3.14",
+  "version": "0.3.16",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "exports": {