@marko/compiler 5.21.5 → 5.22.0

package/dist/babel-plugin/index.js

@@ -102,6 +102,7 @@ const SOURCE_FILES = new WeakMap();var _default =
         undefined;
 
         metadata.marko.watchFiles = metadata.marko.watchFiles.filter(unique);
+        file.path.scope.crawl(); // Ensure all scopes are accurate for subsequent babel plugins
       } finally {
         (0, _fs.setFS)(prevFS);
       }

package/dist/babel-plugin/parser.js

@@ -213,7 +213,7 @@ function parseMarko(file) {
 
 
     },
-    onTagName(part) {
+    onOpenTagName(part) {
       const tagName = parseTemplateString(part);
       const node = t.markoTag(tagName, [], t.markoTagBody());
       let parseType = _htmljsParser.TagType.html;
@@ -334,7 +334,11 @@ function parseMarko(file) {
       `${parser.read(part.params)}=>{}`,
       part.params.start).
       params,
-      (0, _babelUtils.parseScript)(file, parser.read(part.body), part.body.start).body[0]),
+      (0, _babelUtils.parseExpression)(
+      file,
+      `()=>${parser.read(part.body)}`,
+      part.params.start + "()=>".length).
+      body),
 
       part);
 
@@ -436,13 +440,13 @@ function parseMarko(file) {
         parseOptions.statement ||
         parseOptions.openTagOnly)
         {
-          this.onCloseTag(part);
+          this.onCloseTagEnd(part);
         }
       } else if (part.selfClosed) {
-        this.onCloseTag(part);
+        this.onCloseTagEnd(part);
       }
     },
-    onCloseTag(part) {var _node$tagDef3;
+    onCloseTagEnd(part) {var _node$tagDef3;
       const { node } = currentTag;
       const parserPlugin = (_node$tagDef3 = node.tagDef) == null ? void 0 : _node$tagDef3.parser;
       if (preservingWhitespaceUntil === node) {

package/dist/config.js

@@ -141,6 +141,13 @@ var _lassoPackageRoot = require("lasso-package-root");
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -151,7 +158,11 @@ var _lassoPackageRoot = require("lasso-package-root");
 
 var _fs2 = require("./taglib/fs");let config;const globalThis = typeof window === "undefined" ? global : window;const MARKO_CONFIG_KEY = Symbol("Default Marko Compiler Config");if (globalThis[MARKO_CONFIG_KEY]) {config = globalThis[MARKO_CONFIG_KEY];} else {config = globalThis[MARKO_CONFIG_KEY] = { // The default output mode for compiled templates
     output: "html", // Override the runtimeid used when calling `marko/components.init` in the `hydrate` output.
-    runtimeId: null, // Have Marko provide the final AST in the compile result.
+    runtimeId: null, /**
+     * Remove all typescript types from the output.
+     * By default, the compiler will remove types from the output if the
+     * `output` option is not `source` or `migrate`.
+     */stripTypes: undefined, // Have Marko provide the final AST in the compile result.
     ast: false, // Set the false to have Marko not generate the final code string, useful if just reading metadata or AST.
     code: true, /**
      * Whether the version should be written to the template as a comment e.g.

package/dist/index.js

@@ -1,6 +1,9 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports._clearDefaults = _clearDefaults;exports.compile = compile;exports.compileFile = compileFile;exports.compileFileSync = compileFileSync;exports.compileSync = compileSync;exports.configure = configure;exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.types = exports.taglib = void 0;var _types = _interopRequireWildcard(require("./babel-types"));exports.types = _types;
 var _path = _interopRequireDefault(require("path"));
 var babel = _interopRequireWildcard(require("@babel/core"));
+var _pluginTransformModulesCommonjs = _interopRequireDefault(require("@babel/plugin-transform-modules-commonjs"));
+var _pluginSyntaxTypescript = _interopRequireDefault(require("@babel/plugin-syntax-typescript"));
+var _pluginTransformTypescript = _interopRequireDefault(require("@babel/plugin-transform-typescript"));
 var _babelPlugin = _interopRequireDefault(require("./babel-plugin"));
 var _config = _interopRequireDefault(require("./config"));
 var taglib = _interopRequireWildcard(require("./taglib"));exports.taglib = taglib;
@@ -55,7 +58,25 @@ function getRuntimeEntryFiles(output, requestedTranslator) {
 
 function loadBabelConfig(filename, config) {
   const markoConfig = { ...globalConfig, ...config, babelConfig: undefined };
-  const requiredPlugins = [[_babelPlugin.default, markoConfig]];
+
+  if (markoConfig.stripTypes === undefined) {
+    markoConfig.stripTypes =
+    markoConfig.output !== "source" && markoConfig.output !== "migrate";
+  }
+
+  const requiredPlugins = [
+  [_babelPlugin.default, markoConfig],
+  [
+  markoConfig.stripTypes ? _pluginTransformTypescript.default : _pluginSyntaxTypescript.default,
+  {
+    isTSX: false,
+    allowNamespaces: true,
+    optimizeConstEnums: true,
+    onlyRemoveTypeImports: true,
+    disallowAmbiguousJSXLike: false }]];
+
+
+
   const baseBabelConfig = {
     filenameRelative: filename ?
     _path.default.relative(process.cwd(), filename) :
@@ -70,10 +91,7 @@ function loadBabelConfig(filename, config) {
 
 
   if (markoConfig.modules === "cjs") {
-    requiredPlugins.push([
-    require.resolve("@babel/plugin-transform-modules-commonjs"),
-    { loose: true }]);
-
+    requiredPlugins.push([_pluginTransformModulesCommonjs.default, { loose: true }]);
   }
 
   baseBabelConfig.plugins = requiredPlugins.concat(

package/index.d.ts

@@ -16,6 +16,7 @@ type Dep = {
 
 export type Config = {
   output?: "html" | "dom" | "hydrate" | "migrate" | "source";
+  stripTypes?: boolean;
   runtimeId?: string | null;
   ast?: boolean;
   code?: boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/compiler",
   "description": "Marko template to JS compiler.",
-  "version": "5.21.5",
+  "version": "5.22.0",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "dependencies": {
@@ -9,14 +9,16 @@
     "@babel/core": "^7.16.0",
     "@babel/generator": "^7.16.0",
     "@babel/parser": "^7.16.0",
+    "@babel/plugin-syntax-typescript": "^7.16.0",
     "@babel/plugin-transform-modules-commonjs": "^7.16.0",
+    "@babel/plugin-transform-typescript": "^7.16.0",
     "@babel/runtime": "^7.16.0",
     "@babel/traverse": "^7.16.0",
     "@babel/types": "^7.16.0",
     "@marko/babel-utils": "^5.21.1",
     "complain": "^1.6.0",
     "he": "^1.2.0",
-    "htmljs-parser": "^4.0.0",
+    "htmljs-parser": "^5.0.0",
     "jsesc": "^3.0.2",
     "lasso-package-root": "^1.0.1",
     "property-handlers": "^1.1.1",
@@ -28,7 +30,7 @@
     "strip-json-comments": "^3.1.1"
   },
   "devDependencies": {
-    "@marko/translator-default": "^5.21.1"
+    "@marko/translator-default": "^5.21.3"
   },
   "files": [
     "dist",