@danielx/civet 0.3.1 → 0.3.2

package/README.md

@@ -147,6 +147,7 @@ Things Added that CoffeeScript didn't
 - Convenience for ES6+ Features
   - `<` as `extends` shorthand
   - `@#id` -> `this.#id` shorthand for private identifiers
+  - `import` shorthand `x from "./x"` -> `import x from "./x"`
 - ClassStaticBlock
 - `get`/`set` method definitions
 - Private identifiers `#id`

package/dist/browser.js

@@ -548,6 +548,7 @@ var Civet = (() => {
         MaybeNestedExpression,
         Return,
         ImportDeclaration,
+        ImpliedImport,
         Import,
         ImportClause,
         NameSpaceImport,
@@ -1306,9 +1307,9 @@ var Civet = (() => {
           return SpacedApplication$0(state);
         }
       }
-      var ApplicationStart$0 = $TS($S($E(OptionalShorthand), $TEXT($P(_)), $N(AdditionalReservedWords)), function($skip, $loc, $0, $1, $2, $3) {
+      var ApplicationStart$0 = $TS($S($E(OptionalShorthand), $N(EOS), $TEXT($P(_)), $N(AdditionalReservedWords)), function($skip, $loc, $0, $1, $2, $3, $4) {
         var opt = $1;
-        var spacing = $2;
+        var spacing = $3;
         return [opt, "(", spacing.replace(/^ /, "")];
       });
       function ApplicationStart(state) {
@@ -2499,11 +2500,24 @@ var Civet = (() => {
       });
       var ImportDeclaration$1 = $S(Import, __, ImportClause, __, FromClause);
       var ImportDeclaration$2 = $S(Import, __, ModuleSpecifier);
+      var ImportDeclaration$3 = $S(ImpliedImport, ImportClause, __, FromClause);
       function ImportDeclaration(state) {
         if (state.tokenize) {
-          return $TOKEN("ImportDeclaration", state, ImportDeclaration$0(state) || ImportDeclaration$1(state) || ImportDeclaration$2(state));
+          return $TOKEN("ImportDeclaration", state, ImportDeclaration$0(state) || ImportDeclaration$1(state) || ImportDeclaration$2(state) || ImportDeclaration$3(state));
         } else {
-          return ImportDeclaration$0(state) || ImportDeclaration$1(state) || ImportDeclaration$2(state);
+          return ImportDeclaration$0(state) || ImportDeclaration$1(state) || ImportDeclaration$2(state) || ImportDeclaration$3(state);
+        }
+      }
+      var ImpliedImport$0 = $T($EXPECT($L32, fail, 'ImpliedImport ""'), function(value) {
+        return "import ";
+      });
+      function ImpliedImport(state) {
+        if (state.verbose)
+          console.log("ENTER:", "ImpliedImport");
+        if (state.tokenize) {
+          return $TOKEN("ImpliedImport", state, ImpliedImport$0(state));
+        } else {
+          return ImpliedImport$0(state);
         }
       }
       var Import$0 = $TS($S($EXPECT($L24, fail, 'Import "import"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
@@ -3767,8 +3781,7 @@ var Civet = (() => {
           if (spacing) {
             str = str.replaceAll(spacing[0], "\n");
           }
-          str = str.replace(/^(\r?\n|\n)/, "");
-          str = str.replace(/(\r?\n|\n)$/, "");
+          str = str.replace(/^(\r?\n|\n)/, "").replace(/(\r?\n|\n)[ \t]*$/, "").replace(/(`|\$)/g, "\\$1");
           return str;
         };
         return $0;