@marko/compiler 5.34.7 → 5.35.0

package/babel-types.d.ts

@@ -1,4 +1,4 @@
-/* eslint-disable import/export */
+/* eslint-disable import/export, import/no-unresolved */
 import { Scope } from "./dist/traverse";
 export * from "./dist/types";
 export * from "./dist/traverse";

package/dist/register.js

@@ -4,9 +4,8 @@ const shouldOptimize = require("./util/should-optimize").default;
 const compiler = require(".");
 const requiredOptions = { modules: "cjs" };
 const isDev = !shouldOptimize();
-const sourceMaps = new Map();
-let installSourceMaps = () => {
-  installSourceMaps = () => {};
+let setSourceMap = (filename, map) => {
+  const sourceMaps = new Map([[filename, map]]);
   require("source-map-support").install({
     handleUncaughtExceptions: false,
     environment: "node",
@@ -18,6 +17,10 @@ let installSourceMaps = () => {
       return null;
     }
   });
+
+  setSourceMap = (filename, map) => {
+    sourceMaps.set(filename, map);
+  };
 };
 
 module.exports = register;
@@ -40,8 +43,7 @@ function register({ extensions = require.extensions, ...options } = {}) {
     );
 
     if (compiled.map) {
-      sourceMaps.set(filename, compiled.map);
-      installSourceMaps();
+      setSourceMap(filename, compiled.map);
     }
 
     return module._compile(compiled.code, filename);

package/dist/types.d.ts

@@ -31,6 +31,10 @@ export interface SourceLocation {
   };
 }
 
+export interface NodeExtra {
+  [key: string]: unknown;
+}
+
 interface BaseNode {
   leadingComments: ReadonlyArray<Comment> | null;
   innerComments: ReadonlyArray<Comment> | null;
@@ -39,7 +43,7 @@ interface BaseNode {
   end: number | null;
   loc: SourceLocation | null;
   type: Node["type"];
-  extra?: Record<string, unknown>;
+  extra?: NodeExtra;
 }
 
 export type Node = Accessor | AnyTypeAnnotation | ArgumentPlaceholder | ArrayExpression | ArrayPattern | ArrayTypeAnnotation | ArrowFunctionExpression | AssignmentExpression | AssignmentPattern | AwaitExpression | BigIntLiteral | Binary | BinaryExpression | BindExpression | Block | BlockParent | BlockStatement | BooleanLiteral | BooleanLiteralTypeAnnotation | BooleanTypeAnnotation | BreakStatement | CallExpression | CatchClause | Class | ClassAccessorProperty | ClassBody | ClassDeclaration | ClassExpression | ClassImplements | ClassMethod | ClassPrivateMethod | ClassPrivateProperty | ClassProperty | CompletionStatement | Conditional | ConditionalExpression | ContinueStatement | DebuggerStatement | DecimalLiteral | Declaration | DeclareClass | DeclareExportAllDeclaration | DeclareExportDeclaration | DeclareFunction | DeclareInterface | DeclareModule | DeclareModuleExports | DeclareOpaqueType | DeclareTypeAlias | DeclareVariable | DeclaredPredicate | Decorator | Directive | DirectiveLiteral | DoExpression | DoWhileStatement | EmptyStatement | EmptyTypeAnnotation | EnumBody | EnumBooleanBody | EnumBooleanMember | EnumDeclaration | EnumDefaultedMember | EnumMember | EnumNumberBody | EnumNumberMember | EnumStringBody | EnumStringMember | EnumSymbolBody | ExistsTypeAnnotation | ExportAllDeclaration | ExportDeclaration | ExportDefaultDeclaration | ExportDefaultSpecifier | ExportNamedDeclaration | ExportNamespaceSpecifier | ExportSpecifier | Expression | ExpressionStatement | ExpressionWrapper | File | Flow | FlowBaseAnnotation | FlowDeclaration | FlowPredicate | FlowType | For | ForInStatement | ForOfStatement | ForStatement | ForXStatement | Function | FunctionDeclaration | FunctionExpression | FunctionParent | FunctionTypeAnnotation | FunctionTypeParam | GenericTypeAnnotation | Identifier | IfStatement | Immutable | Import | ImportAttribute | ImportDeclaration | ImportDefaultSpecifier | ImportExpression | ImportNamespaceSpecifier | ImportOrExportDeclaration | ImportSpecifier | IndexedAccessType | InferredPredicate | InterfaceDeclaration | InterfaceExtends | InterfaceTypeAnnotation | InterpreterDirective | IntersectionTypeAnnotation | JSX | JSXAttribute | JSXClosingElement | JSXClosingFragment | JSXElement | JSXEmptyExpression | JSXExpressionContainer | JSXFragment | JSXIdentifier | JSXMemberExpression | JSXNamespacedName | JSXOpeningElement | JSXOpeningFragment | JSXSpreadAttribute | JSXSpreadChild | JSXText | LVal | LabeledStatement | Literal | LogicalExpression | Loop | Marko | MarkoAttribute | MarkoCDATA | MarkoClass | MarkoComment | MarkoDeclaration | MarkoDocumentType | MarkoParseError | MarkoPlaceholder | MarkoScriptlet | MarkoSpreadAttribute | MarkoTag | MarkoTagBody | MarkoText | MemberExpression | MetaProperty | Method | Miscellaneous | MixedTypeAnnotation | ModuleDeclaration | ModuleExpression | ModuleSpecifier | NewExpression | Noop | NullLiteral | NullLiteralTypeAnnotation | NullableTypeAnnotation | NumberLiteral | NumberLiteralTypeAnnotation | NumberTypeAnnotation | NumericLiteral | ObjectExpression | ObjectMember | ObjectMethod | ObjectPattern | ObjectProperty | ObjectTypeAnnotation | ObjectTypeCallProperty | ObjectTypeIndexer | ObjectTypeInternalSlot | ObjectTypeProperty | ObjectTypeSpreadProperty | OpaqueType | OptionalCallExpression | OptionalIndexedAccessType | OptionalMemberExpression | ParenthesizedExpression | Pattern | PatternLike | PipelineBareFunction | PipelinePrimaryTopicReference | PipelineTopicExpression | Placeholder | Private | PrivateName | Program | Property | Pureish | QualifiedTypeIdentifier | RecordExpression | RegExpLiteral | RegexLiteral | RestElement | RestProperty | ReturnStatement | Scopable | Scope | SequenceExpression | SpreadElement | SpreadProperty | Standardized | Statement | StaticBlock | StringLiteral | StringLiteralTypeAnnotation | StringTypeAnnotation | Super | SwitchCase | SwitchStatement | SymbolTypeAnnotation | TSAnyKeyword | TSArrayType | TSAsExpression | TSBaseType | TSBigIntKeyword | TSBooleanKeyword | TSCallSignatureDeclaration | TSConditionalType | TSConstructSignatureDeclaration | TSConstructorType | TSDeclareFunction | TSDeclareMethod | TSEntityName | TSEnumDeclaration | TSEnumMember | TSExportAssignment | TSExpressionWithTypeArguments | TSExternalModuleReference | TSFunctionType | TSImportEqualsDeclaration | TSImportType | TSIndexSignature | TSIndexedAccessType | TSInferType | TSInstantiationExpression | TSInterfaceBody | TSInterfaceDeclaration | TSIntersectionType | TSIntrinsicKeyword | TSLiteralType | TSMappedType | TSMethodSignature | TSModuleBlock | TSModuleDeclaration | TSNamedTupleMember | TSNamespaceExportDeclaration | TSNeverKeyword | TSNonNullExpression | TSNullKeyword | TSNumberKeyword | TSObjectKeyword | TSOptionalType | TSParameterProperty | TSParenthesizedType | TSPropertySignature | TSQualifiedName | TSRestType | TSSatisfiesExpression | TSStringKeyword | TSSymbolKeyword | TSThisType | TSTupleType | TSType | TSTypeAliasDeclaration | TSTypeAnnotation | TSTypeAssertion | TSTypeElement | TSTypeLiteral | TSTypeOperator | TSTypeParameter | TSTypeParameterDeclaration | TSTypeParameterInstantiation | TSTypePredicate | TSTypeQuery | TSTypeReference | TSUndefinedKeyword | TSUnionType | TSUnknownKeyword | TSVoidKeyword | TaggedTemplateExpression | TemplateElement | TemplateLiteral | Terminatorless | ThisExpression | ThisTypeAnnotation | ThrowStatement | TopicReference | TryStatement | TupleExpression | TupleTypeAnnotation | TypeAlias | TypeAnnotation | TypeCastExpression | TypeParameter | TypeParameterDeclaration | TypeParameterInstantiation | TypeScript | TypeofTypeAnnotation | UnaryExpression | UnaryLike | UnionTypeAnnotation | UpdateExpression | UserWhitespacable | V8IntrinsicIdentifier | VariableDeclaration | VariableDeclarator | Variance | VoidTypeAnnotation | While | WhileStatement | WithStatement | YieldExpression;
@@ -258,7 +262,6 @@ export interface Program extends BaseNode {
   directives: Array<Directive>;
   sourceType: "script" | "module";
   interpreter: InterpreterDirective | null;
-  sourceFile: string;
 }
 
 export interface ObjectExpression extends BaseNode {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.34.7",
+  "version": "5.35.0",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -14,11 +14,47 @@
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "repository": {
     "type": "git",
-    "url": "https://github.com/marko-js/marko/tree/master/packages/compiler"
+    "url": "https://github.com/marko-js/marko/tree/main/packages/compiler"
   },
   "license": "MIT",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "main": "dist/index.js",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "default": "./src/index.js"
+    },
+    "./config": {
+      "types": "./config.d.ts",
+      "default": "./src/config.js"
+    },
+    "./register": {
+      "types": "./register.d.ts",
+      "default": "./src/register.js"
+    },
+    "./modules": "./modules.js",
+    "./babel-types": "./babel-types.d.ts",
+    "./dist/types": "./dist/types.d.ts",
+    "./package.json": "./package.json"
+  },
+  "exports:override": {
+    ".": {
+      "types": "./index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./config": {
+      "types": "./config.d.ts",
+      "default": "./dist/config.js"
+    },
+    "./register": {
+      "types": "./register.d.ts",
+      "default": "./dist/register.js"
+    },
+    "./modules": "./modules.js",
+    "./babel-types": "./babel-types.d.ts",
+    "./dist/types": "./dist/types.d.ts",
+    "./package.json": "./package.json"
+  },
   "types": "index.d.ts",
   "files": [
     "dist",
@@ -31,22 +67,22 @@
     "register.d.ts"
   ],
   "scripts": {
-    "build": "babel ./src --out-dir ./dist --delete-dir-on-start --copy-files --config-file ../../babel.config.js --env-name=production",
-    "build:types": "node scripts/types-babel-types.mjs > ./dist/types.d.ts && node scripts/types-babel-traverse.js > ./dist/traverse.d.ts"
+    "build": "babel ./src --out-dir ./dist --copy-files --config-file ../../babel.config.js --env-name=production",
+    "prepare": "node -r ~ts scripts/types"
   },
   "dependencies": {
     "@babel/code-frame": "^7.23.5",
-    "@babel/core": "^7.23.7",
+    "@babel/core": "^7.23.9",
     "@babel/generator": "^7.23.6",
-    "@babel/parser": "^7.23.6",
+    "@babel/parser": "^7.23.9",
     "@babel/plugin-syntax-typescript": "^7.23.3",
     "@babel/plugin-transform-modules-commonjs": "^7.23.3",
     "@babel/plugin-transform-typescript": "^7.23.6",
-    "@babel/runtime": "^7.23.8",
-    "@babel/traverse": "^7.23.7",
-    "@babel/types": "^7.23.6",
-    "@luxass/strip-json-comments": "^1.1.1",
-    "@marko/babel-utils": "^6.3.5",
+    "@babel/runtime": "^7.23.9",
+    "@babel/traverse": "^7.23.9",
+    "@babel/types": "^7.23.9",
+    "@luxass/strip-json-comments": "^1.2.0",
+    "@marko/babel-utils": "^6.4.0",
     "complain": "^1.6.0",
     "he": "^1.2.0",
     "htmljs-parser": "^5.5.2",
@@ -60,11 +96,10 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "@marko/translator-default": "^5.31.15"
+    "@marko/translator-default": "^5.32.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "main:dev": "src/index.js",
-  "main:npm": "dist/index.js"
+  "main:override": "src/index.js"
 }