@marko/compiler 5.21.0 → 5.21.3

package/dist/babel-types/types/patch.js

@@ -1,7 +1,7 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var babelTypes = _interopRequireWildcard(require("@babel/types"));
-var _builder = _interopRequireDefault(require("@babel/types/lib/builders/builder"));
 var _utils = _interopRequireDefault(require("@babel/types/lib/definitions/utils"));
+var _validate = _interopRequireDefault(require("@babel/types/lib/validators/validate"));
 var generatedValidators = _interopRequireWildcard(require("@babel/types/lib/validators/generated"));
 var referencedValidators = _interopRequireWildcard(require("@babel/types/lib/validators/isReferenced"));
 var _definitions = _interopRequireWildcard(require("./definitions"));function _getRequireWildcardCache(nodeInterop) {if (typeof WeakMap !== "function") return null;var cacheBabelInterop = new WeakMap();var cacheNodeInterop = new WeakMap();return (_getRequireWildcardCache = function (nodeInterop) {return nodeInterop ? cacheNodeInterop : cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj, nodeInterop) {if (!nodeInterop && obj && obj.__esModule) {return obj;}if (obj === null || typeof obj !== "object" && typeof obj !== "function") {return { default: obj };}var cache = _getRequireWildcardCache(nodeInterop);if (cache && cache.has(obj)) {return cache.get(obj);}var newObj = {};var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var key in obj) {if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;if (desc && (desc.get || desc.set)) {Object.defineProperty(newObj, key, desc);} else {newObj[key] = obj[key];}}}newObj.default = obj;if (cache) {cache.set(obj, newObj);}return newObj;} /* eslint-disable no-import-assign */
@@ -37,7 +37,7 @@ _definitions.MARKO_TYPES.forEach((typeName) => {
   babelTypes[checkKey] = (node, opts) => is(typeName, node, opts);
   babelTypes[assertKey] = (node, opts) => assert(typeName, node, opts);
   babelTypes[typeName] = babelTypes[lowerName] = function () {
-    return _builder.default.apply(typeName, arguments);
+    return builder(typeName, arguments);
   };
 });
 
@@ -68,4 +68,38 @@ function assert(typeName, node, opts) {
     }, but instead got "${node.type}".`);
 
   }
+}
+
+function builder(type, args) {
+  const definition = _definitions.default[type];
+  const keys = definition.builder;
+  const countArgs = args.length;
+  if (countArgs > keys.length) {
+    throw new Error(
+    `${type}: Too many arguments passed. Received ${countArgs} but can receive no more than ${keys.length}`);
+
+  }
+
+  const node = { type };
+
+  for (let i = 0; i < keys.length; ++i) {
+    const key = keys[i];
+    const field = definition.fields[key];
+
+    let arg;
+    if (i < countArgs) arg = args[i];
+    if (arg === undefined) {
+      arg = Array.isArray(field.default) ? [] : field.default;
+    }
+
+    node[key] = arg;
+  }
+
+  // (assume all enumerable properties are own)
+  // eslint-disable-next-line guard-for-in
+  for (const key in node) {
+    (0, _validate.default)(node, key, node[key]);
+  }
+
+  return node;
 }

package/dist/types.d.ts

@@ -58,7 +58,7 @@ export interface AssignmentExpression extends BaseNode {
 
 export interface BinaryExpression extends BaseNode {
   type: "BinaryExpression";
-  operator: "+" | "-" | "/" | "%" | "*" | "**" | "&" | "|" | ">>" | ">>>" | "<<" | "^" | "==" | "===" | "!=" | "!==" | "in" | "instanceof" | ">" | "<" | ">=" | "<=";
+  operator: "+" | "-" | "/" | "%" | "*" | "**" | "&" | "|" | ">>" | ">>>" | "<<" | "^" | "==" | "===" | "!=" | "!==" | "in" | "instanceof" | ">" | "<" | ">=" | "<=" | "|>";
   left: Expression | PrivateName;
   right: Expression;
 }
@@ -165,6 +165,7 @@ export interface FunctionDeclaration extends BaseNode {
   generator: boolean;
   async: boolean;
   declare: boolean | null;
+  predicate: DeclaredPredicate | InferredPredicate | null;
   returnType: TypeAnnotation | TSTypeAnnotation | Noop | null;
   typeParameters: TypeParameterDeclaration | TSTypeParameterDeclaration | Noop | null;
 }
@@ -176,6 +177,7 @@ export interface FunctionExpression extends BaseNode {
   body: BlockStatement;
   generator: boolean;
   async: boolean;
+  predicate: DeclaredPredicate | InferredPredicate | null;
   returnType: TypeAnnotation | TSTypeAnnotation | Noop | null;
   typeParameters: TypeParameterDeclaration | TSTypeParameterDeclaration | Noop | null;
 }
@@ -380,7 +382,7 @@ export interface WithStatement extends BaseNode {
 
 export interface AssignmentPattern extends BaseNode {
   type: "AssignmentPattern";
-  left: Identifier | ObjectPattern | ArrayPattern | MemberExpression;
+  left: Identifier | ObjectPattern | ArrayPattern | MemberExpression | TSAsExpression | TSTypeAssertion | TSNonNullExpression;
   right: Expression;
   decorators: Array<Decorator> | null;
   typeAnnotation: TypeAnnotation | TSTypeAnnotation | Noop | null;
@@ -401,6 +403,7 @@ export interface ArrowFunctionExpression extends BaseNode {
   async: boolean;
   expression: boolean;
   generator: boolean;
+  predicate: DeclaredPredicate | InferredPredicate | null;
   returnType: TypeAnnotation | TSTypeAnnotation | Noop | null;
   typeParameters: TypeParameterDeclaration | TSTypeParameterDeclaration | Noop | null;
 }
@@ -866,9 +869,9 @@ export interface NumberTypeAnnotation extends BaseNode {
 export interface ObjectTypeAnnotation extends BaseNode {
   type: "ObjectTypeAnnotation";
   properties: Array<ObjectTypeProperty | ObjectTypeSpreadProperty>;
-  indexers: Array<ObjectTypeIndexer> | null;
-  callProperties: Array<ObjectTypeCallProperty> | null;
-  internalSlots: Array<ObjectTypeInternalSlot> | null;
+  indexers: Array<ObjectTypeIndexer>;
+  callProperties: Array<ObjectTypeCallProperty>;
+  internalSlots: Array<ObjectTypeInternalSlot>;
   exact: boolean;
   inexact: boolean | null;
 }
@@ -1743,8 +1746,8 @@ export type Function = FunctionDeclaration | FunctionExpression | ObjectMethod |
 export type FunctionParent = FunctionDeclaration | FunctionExpression | ObjectMethod | ArrowFunctionExpression | ClassMethod | ClassPrivateMethod | StaticBlock;
 export type Pureish = FunctionDeclaration | FunctionExpression | StringLiteral | NumericLiteral | NullLiteral | BooleanLiteral | RegExpLiteral | ArrowFunctionExpression | BigIntLiteral | DecimalLiteral;
 export type Declaration = FunctionDeclaration | VariableDeclaration | ClassDeclaration | ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration | ImportDeclaration | DeclareClass | DeclareFunction | DeclareInterface | DeclareModule | DeclareModuleExports | DeclareTypeAlias | DeclareOpaqueType | DeclareVariable | DeclareExportDeclaration | DeclareExportAllDeclaration | InterfaceDeclaration | OpaqueType | TypeAlias | EnumDeclaration | TSDeclareFunction | TSInterfaceDeclaration | TSTypeAliasDeclaration | TSEnumDeclaration | TSModuleDeclaration;
-export type PatternLike = Identifier | RestElement | AssignmentPattern | ArrayPattern | ObjectPattern;
-export type LVal = Identifier | MemberExpression | RestElement | AssignmentPattern | ArrayPattern | ObjectPattern | TSParameterProperty;
+export type PatternLike = Identifier | RestElement | AssignmentPattern | ArrayPattern | ObjectPattern | TSAsExpression | TSTypeAssertion | TSNonNullExpression;
+export type LVal = Identifier | MemberExpression | RestElement | AssignmentPattern | ArrayPattern | ObjectPattern | TSParameterProperty | TSAsExpression | TSTypeAssertion | TSNonNullExpression;
 export type TSEntityName = Identifier | TSQualifiedName;
 export type Literal = StringLiteral | NumericLiteral | NullLiteral | BooleanLiteral | RegExpLiteral | TemplateLiteral | BigIntLiteral | DecimalLiteral;
 export type Immutable = StringLiteral | NumericLiteral | NullLiteral | BooleanLiteral | BigIntLiteral | JSXAttribute | JSXClosingElement | JSXElement | JSXExpressionContainer | JSXSpreadChild | JSXOpeningElement | JSXText | JSXFragment | JSXOpeningFragment | JSXClosingFragment | DecimalLiteral;
@@ -1832,7 +1835,7 @@ export interface Aliases {
 
 export function arrayExpression(elements?: Array<null | Expression | SpreadElement>): ArrayExpression;
 export function assignmentExpression(operator: string, left: LVal, right: Expression): AssignmentExpression;
-export function binaryExpression(operator: "+" | "-" | "/" | "%" | "*" | "**" | "&" | "|" | ">>" | ">>>" | "<<" | "^" | "==" | "===" | "!=" | "!==" | "in" | "instanceof" | ">" | "<" | ">=" | "<=", left: Expression | PrivateName, right: Expression): BinaryExpression;
+export function binaryExpression(operator: "+" | "-" | "/" | "%" | "*" | "**" | "&" | "|" | ">>" | ">>>" | "<<" | "^" | "==" | "===" | "!=" | "!==" | "in" | "instanceof" | ">" | "<" | ">=" | "<=" | "|>", left: Expression | PrivateName, right: Expression): BinaryExpression;
 export function interpreterDirective(value: string): InterpreterDirective;
 export function directive(value: DirectiveLiteral): Directive;
 export function directiveLiteral(value: string): DirectiveLiteral;
@@ -1881,7 +1884,7 @@ export function variableDeclaration(kind: "var" | "let" | "const", declarations:
 export function variableDeclarator(id: LVal, init?: Expression | null): VariableDeclarator;
 export function whileStatement(test: Expression, body: Statement): WhileStatement;
 export function withStatement(object: Expression, body: Statement): WithStatement;
-export function assignmentPattern(left: Identifier | ObjectPattern | ArrayPattern | MemberExpression, right: Expression): AssignmentPattern;
+export function assignmentPattern(left: Identifier | ObjectPattern | ArrayPattern | MemberExpression | TSAsExpression | TSTypeAssertion | TSNonNullExpression, right: Expression): AssignmentPattern;
 export function arrayPattern(elements: Array<null | PatternLike>): ArrayPattern;
 export function arrowFunctionExpression(params: Array<Identifier | Pattern | RestElement>, body: BlockStatement | Expression, async?: boolean): ArrowFunctionExpression;
 export function classBody(body: Array<ClassMethod | ClassPrivateMethod | ClassProperty | ClassPrivateProperty | ClassAccessorProperty | TSDeclareMethod | TSIndexSignature | StaticBlock>): ClassBody;
@@ -1950,7 +1953,7 @@ export function emptyTypeAnnotation(): EmptyTypeAnnotation;
 export function nullableTypeAnnotation(typeAnnotation: FlowType): NullableTypeAnnotation;
 export function numberLiteralTypeAnnotation(value: number): NumberLiteralTypeAnnotation;
 export function numberTypeAnnotation(): NumberTypeAnnotation;
-export function objectTypeAnnotation(properties: Array<ObjectTypeProperty | ObjectTypeSpreadProperty>, indexers?: Array<ObjectTypeIndexer> | null, callProperties?: Array<ObjectTypeCallProperty> | null, internalSlots?: Array<ObjectTypeInternalSlot> | null, exact?: boolean): ObjectTypeAnnotation;
+export function objectTypeAnnotation(properties: Array<ObjectTypeProperty | ObjectTypeSpreadProperty>, indexers?: Array<ObjectTypeIndexer>, callProperties?: Array<ObjectTypeCallProperty>, internalSlots?: Array<ObjectTypeInternalSlot>, exact?: boolean): ObjectTypeAnnotation;
 export function objectTypeInternalSlot(id: Identifier, value: FlowType, optional: boolean, _static: boolean, method: boolean): ObjectTypeInternalSlot;
 export function objectTypeCallProperty(value: FlowType): ObjectTypeCallProperty;
 export function objectTypeIndexer(id: Identifier | null | undefined, key: FlowType, value: FlowType, variance?: Variance | null): ObjectTypeIndexer;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/compiler",
   "description": "Marko template to JS compiler.",
-  "version": "5.21.0",
+  "version": "5.21.3",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "dependencies": {
@@ -13,10 +13,10 @@
     "@babel/runtime": "^7.16.0",
     "@babel/traverse": "^7.16.0",
     "@babel/types": "^7.16.0",
-    "@marko/babel-utils": "^5.21.0",
+    "@marko/babel-utils": "^5.21.1",
     "complain": "^1.6.0",
     "he": "^1.2.0",
-    "htmljs-parser": "^3.3.1",
+    "htmljs-parser": "^3.3.4",
     "jsesc": "^3.0.2",
     "lasso-package-root": "^1.0.1",
     "property-handlers": "^1.1.1",
@@ -28,7 +28,7 @@
     "strip-json-comments": "^3.1.1"
   },
   "devDependencies": {
-    "@marko/translator-default": "^5.21.0"
+    "@marko/translator-default": "^5.21.1"
   },
   "files": [
     "dist",
@@ -48,7 +48,7 @@
     "plugin"
   ],
   "license": "MIT",
-  "main": "src/index.js",
+  "main": "dist/index.js",
   "main:dev": "src/index.js",
   "main:npm": "dist/index.js",
   "publishConfig": {

package/src/index.js

@@ -1,117 +0,0 @@
-export * as types from "./babel-types";
-import path from "path";
-import * as babel from "@babel/core";
-import corePlugin from "./babel-plugin";
-import defaultConfig from "./config";
-import * as taglib from "./taglib";
-import shouldOptimize from "./util/should-optimize";
-import tryLoadTranslator from "./util/try-load-translator";
-export { taglib };
-
-let globalConfig = { ...defaultConfig };
-export function configure(newConfig) {
-  globalConfig = { ...defaultConfig, ...newConfig };
-}
-
-export async function compile(src, filename, config) {
-  const babelConfig = loadBabelConfig(filename, config);
-  const babelResult = await babel.transformAsync(src, babelConfig);
-  scheduleDefaultClear(config);
-  return buildResult(babelResult);
-}
-
-export function compileSync(src, filename, config) {
-  const babelConfig = loadBabelConfig(filename, config);
-  const babelResult = babel.transformSync(src, babelConfig);
-  scheduleDefaultClear(config);
-  return buildResult(babelResult);
-}
-
-export async function compileFile(filename, config) {
-  return new Promise((resolve, reject) => {
-    getFs(config).readFile(filename, "utf-8", (err, src) => {
-      if (err) {
-        return reject(err);
-      }
-
-      return resolve(compile(src, filename, config));
-    });
-  });
-}
-
-export function compileFileSync(filename, config) {
-  const src = getFs(config).readFileSync(filename, "utf-8");
-  return compileSync(src, filename, config);
-}
-
-export function getRuntimeEntryFiles(output, requestedTranslator) {
-  const translator = tryLoadTranslator(requestedTranslator);
-  if (translator && translator.getRuntimeEntryFiles) {
-    return translator.getRuntimeEntryFiles(output, shouldOptimize());
-  }
-
-  return [];
-}
-
-function loadBabelConfig(filename, config) {
-  const markoConfig = { ...globalConfig, ...config, babelConfig: undefined };
-  const requiredPlugins = [[corePlugin, markoConfig]];
-  const baseBabelConfig = {
-    filenameRelative: filename
-      ? path.relative(process.cwd(), filename)
-      : undefined,
-    sourceFileName: filename ? path.basename(filename) : undefined,
-    ...(config && config.babelConfig),
-    filename,
-    sourceType: "module",
-    sourceMaps: markoConfig.sourceMaps,
-    code: markoConfig.code,
-    ast: markoConfig.ast
-  };
-
-  if (markoConfig.modules === "cjs") {
-    requiredPlugins.push([
-      require.resolve("@babel/plugin-transform-modules-commonjs"),
-      { loose: true }
-    ]);
-  }
-
-  baseBabelConfig.plugins = requiredPlugins.concat(
-    baseBabelConfig.plugins || []
-  );
-
-  return babel.loadPartialConfig(baseBabelConfig).options;
-}
-
-function buildResult(babelResult) {
-  const {
-    ast,
-    map,
-    code,
-    metadata: { marko: meta }
-  } = babelResult;
-  return { ast, map, code, meta };
-}
-
-let clearingDefaultCache = false;
-function scheduleDefaultClear(config) {
-  if (
-    !clearingDefaultCache &&
-    (clearingDefaultCache = isDefaultCache(config))
-  ) {
-    setImmediate(_clearDefaults);
-  }
-}
-
-export function _clearDefaults() {
-  clearingDefaultCache = false;
-  globalConfig.cache.clear();
-}
-
-function isDefaultCache(config) {
-  return !config.cache || config.cache === globalConfig.cache;
-}
-
-function getFs(config) {
-  return config.fileSystem || globalConfig.fileSystem;
-}