@marko/compiler 5.37.19 → 5.37.21

package/dist/taglib/index.js

@@ -37,26 +37,16 @@ function buildLookup(dirname, requestedTranslator, onError) {
     loadedTranslatorsTaglibs.set(
       translator,
       taglibsForDir = registeredTaglibs.concat(
-        resolveOptionalTaglibs(translator.optionalTaglibs || []).
+        resolveOptionalTaglibs(translator.optionalTaglibs || [], onError).
         concat(translator.taglibs).
         map(([id, props]) => loadTaglib(id, props))
       )
     );
   }
 
-  if (onError) {
-    const prevOnError = _config.default.onError;
-    _config.default.onError = onError;
-    try {
-      taglibsForDir = _finder2.default.find(dirname, taglibsForDir);
-    } catch (err) {
-      _config.default.onError(err);
-    } finally {
-      _config.default.onError = prevOnError;
-    }
-  } else {
+  runAndCatchErrors(() => {
     taglibsForDir = _finder2.default.find(dirname, taglibsForDir);
-  }
+  }, onError);
 
   const cacheKey = taglibsForDir.
   map((it) => it.id).
@@ -95,11 +85,13 @@ function clearCaches() {
   lookupCache = Object.create(null);
 }
 
-function resolveOptionalTaglibs(taglibIds) {
+function resolveOptionalTaglibs(taglibIds, onError) {
   const resolvedTaglibs = [];
   for (const id of taglibIds) {
     if (hasRootDependency(id)) {
-      resolvedTaglibs.push(resolveTaglib(id));
+      runAndCatchErrors(() => {
+        resolvedTaglibs.push(resolveTaglib(id));
+      }, onError);
     }
   }
 
@@ -110,6 +102,22 @@ function resolveOptionalTaglibs(taglibIds) {
 const _loader = exports._loader = _loader2.default;
 const _finder = exports._finder = _finder2.default;
 
+function runAndCatchErrors(fn, onError) {
+  if (onError) {
+    const prevOnError = _config.default.onError;
+    _config.default.onError = onError;
+    try {
+      fn();
+    } catch (err) {
+      _config.default.onError(err);
+    } finally {
+      _config.default.onError = prevOnError;
+    }
+  } else {
+    fn();
+  }
+}
+
 function loadTaglib(id, props) {
   return _loader2.default.loadTaglibFromProps(_loader2.default.createTaglib(id), props);
 }
@@ -133,5 +141,5 @@ function resolveTaglib(id) {
 
 function hasRootDependency(id) {
   const pkg = (0, _lassoPackageRoot.getRootPackage)(process.cwd());
-  return !!(pkg && pkg.dependencies?.[id] || pkg.devDependencies?.[id]);
+  return !!(pkg && (pkg.dependencies?.[id] || pkg.devDependencies?.[id]));
 }

package/dist/types.d.ts

@@ -789,12 +789,16 @@ export interface DeclareExportDeclaration extends BaseNode {
   declaration: Flow | null;
   specifiers: Array<ExportSpecifier | ExportNamespaceSpecifier> | null;
   source: StringLiteral | null;
+  attributes: Array<ImportAttribute> | null;
+  assertions: Array<ImportAttribute> | null;
   default: boolean | null;
 }
 
 export interface DeclareExportAllDeclaration extends BaseNode {
   type: "DeclareExportAllDeclaration";
   source: StringLiteral;
+  attributes: Array<ImportAttribute> | null;
+  assertions: Array<ImportAttribute> | null;
   exportKind: "type" | "value" | null;
 }
 
@@ -1182,6 +1186,9 @@ export interface Placeholder extends BaseNode {
   type: "Placeholder";
   expectedNode: "Identifier" | "StringLiteral" | "Expression" | "Statement" | "Declaration" | "BlockStatement" | "ClassBody" | "Pattern";
   name: Identifier;
+  decorators: Array<Decorator> | null;
+  optional: boolean | null;
+  typeAnnotation: TypeAnnotation | TSTypeAnnotation | Noop | null;
 }
 
 export interface V8IntrinsicIdentifier extends BaseNode {
@@ -1596,6 +1603,7 @@ export interface TSModuleDeclaration extends BaseNode {
   body: TSModuleBlock | TSModuleDeclaration;
   declare: boolean | null;
   global: boolean | null;
+  kind: "global" | "module" | "namespace";
 }
 
 export interface TSModuleBlock extends BaseNode {
@@ -1979,8 +1987,8 @@ export function declareModuleExports(typeAnnotation: TypeAnnotation): DeclareMod
 export function declareTypeAlias(id: Identifier, typeParameters: TypeParameterDeclaration | null | undefined, right: FlowType): DeclareTypeAlias;
 export function declareOpaqueType(id: Identifier, typeParameters?: TypeParameterDeclaration | null, supertype?: FlowType | null): DeclareOpaqueType;
 export function declareVariable(id: Identifier): DeclareVariable;
-export function declareExportDeclaration(declaration?: Flow | null, specifiers?: Array<ExportSpecifier | ExportNamespaceSpecifier> | null, source?: StringLiteral | null): DeclareExportDeclaration;
-export function declareExportAllDeclaration(source: StringLiteral): DeclareExportAllDeclaration;
+export function declareExportDeclaration(declaration?: Flow | null, specifiers?: Array<ExportSpecifier | ExportNamespaceSpecifier> | null, source?: StringLiteral | null, attributes?: Array<ImportAttribute> | null): DeclareExportDeclaration;
+export function declareExportAllDeclaration(source: StringLiteral, attributes?: Array<ImportAttribute> | null): DeclareExportAllDeclaration;
 export function declaredPredicate(value: Flow): DeclaredPredicate;
 export function existsTypeAnnotation(): ExistsTypeAnnotation;
 export function functionTypeAnnotation(typeParameters: TypeParameterDeclaration | null | undefined, params: Array<FunctionTypeParam>, rest: FunctionTypeParam | null | undefined, returnType: FlowType): FunctionTypeAnnotation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.37.19",
+  "version": "5.37.21",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -55,19 +55,19 @@
     "prepare": "node -r ~ts scripts/types"
   },
   "dependencies": {
-    "@babel/code-frame": "^7.24.7",
-    "@babel/core": "^7.25.2",
-    "@babel/generator": "^7.25.0",
-    "@babel/parser": "^7.25.3",
-    "@babel/plugin-syntax-typescript": "^7.24.7",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.8",
-    "@babel/plugin-transform-typescript": "^7.25.2",
-    "@babel/runtime": "^7.25.0",
-    "@babel/traverse": "^7.25.3",
-    "@babel/types": "^7.25.2",
+    "@babel/code-frame": "^7.26.0",
+    "@babel/core": "^7.26.0",
+    "@babel/generator": "^7.26.0",
+    "@babel/parser": "^7.26.1",
+    "@babel/plugin-syntax-typescript": "^7.25.9",
+    "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+    "@babel/plugin-transform-typescript": "^7.25.9",
+    "@babel/runtime": "^7.26.0",
+    "@babel/traverse": "^7.25.9",
+    "@babel/types": "^7.26.0",
     "@luxass/strip-json-comments": "^1.3.2",
-    "@marko/babel-utils": "^6.5.7",
-    "complain": "^1.6.0",
+    "@marko/babel-utils": "^6.5.8",
+    "complain": "^1.6.1",
     "he": "^1.2.0",
     "htmljs-parser": "^5.5.2",
     "jsesc": "^3.0.2",
@@ -80,7 +80,7 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "@marko/translator-default": "^6.0.19"
+    "@marko/translator-default": "^6.0.21"
   },
   "publishConfig": {
     "access": "public"