@jsenv/ast 6.0.7 → 6.1.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jsenv/ast",
-  "version": "6.0.7",
-  "description": "Parse and transform HTML,CSS and JS",
+  "version": "6.1.1",
+  "description": "Parse and transform HTML, CSS and JS",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "@babel/parser": "7.24.7",
     "@jsenv/urls": "2.2.7",
     "acorn": "8.12.1",
-    "acorn-import-assertions": "1.9.0",
+    "acorn-import-attributes": "1.9.5",
     "acorn-walk": "8.3.3",
     "parse5": "7.1.2",
     "postcss": "8.4.39",

package/src/css/postcss_plugin_url_visitor.js

@@ -283,7 +283,7 @@ const isImageSetFunctionNode = (node) => {
 };
 
 const isDataUrl = (url) => {
-  return /data:[^\n\r;]+?(?:;charset=[^\n\r;]+?)?;base64,([\d+/A-Za-z]+={0,2})/.test(
+  return /data:[^\n\r;]+(?:;charset=[^\n\r;]+)?;base64,[\d+/A-Za-z]+={0,2}/.test(
     url,
   );
 };

package/src/html/html_parse.js

@@ -33,7 +33,6 @@ export const parseHtml = ({
       const htmlParseError = new Error(
         `Unable to parse HTML; ${parse5Error.code}`,
       );
-
       htmlParseError.reasonCode = parse5Error.code;
       htmlParseError.code = "PARSE_ERROR";
       htmlParseError.url = url;

package/src/js/apply_babel_plugins.js

@@ -44,7 +44,7 @@ export const applyBabelPlugins = async ({
       plugins: [
         // "importMeta",
         // "topLevelAwait",
-        ...(inputIsJsModule ? ["dynamicImport", "importAssertions"] : []),
+        ...(inputIsJsModule ? ["dynamicImport", "importAttributes"] : []),
         "jsx",
         "classProperties",
         "classPrivateProperties",
@@ -58,6 +58,7 @@ export const applyBabelPlugins = async ({
     generatorOpts: {
       compact: false,
       ...(options.generatorOpts || {}),
+      ...(inputIsJsModule ? { importAttributesKeyword: "with" } : {}),
     },
   };
   try {

package/src/js/js_static_analysis/import_export.js

@@ -2,7 +2,7 @@ import { isStringLiteralNode } from "./helpers.js";
 
 export const analyzeImportDeclaration = (node, { onUrl }) => {
   const specifierNode = node.source;
-  const assertionInfo = extractImportAssertionsInfo(node);
+  const attributesInfo = extractImportAttributesInfo(node);
   const info = {
     type: "js_import",
     subtype: "import_static",
@@ -14,9 +14,9 @@ export const analyzeImportDeclaration = (node, { onUrl }) => {
     expectedType: "js_module",
     astInfo: { node: specifierNode },
   };
-  if (assertionInfo) {
+  if (attributesInfo) {
     const { importAttributes, importNode, importTypeAttributeNode } =
-      assertionInfo;
+      attributesInfo;
     info.expectedType = importAttributes.type;
     info.importAttributes = importAttributes;
     Object.assign(info.astInfo, { importNode, importTypeAttributeNode });
@@ -28,7 +28,7 @@ export const analyzeImportExpression = (node, { onUrl }) => {
   if (!isStringLiteralNode(specifierNode)) {
     return;
   }
-  const assertionInfo = extractImportAssertionsInfo(node);
+  const attributesInfo = extractImportAttributesInfo(node);
   const info = {
     type: "js_import",
     subtype: "import_dynamic",
@@ -40,9 +40,9 @@ export const analyzeImportExpression = (node, { onUrl }) => {
     column: specifierNode.loc.start.column,
     astInfo: { node: specifierNode },
   };
-  if (assertionInfo) {
+  if (attributesInfo) {
     const { importAttributes, importNode, importTypeAttributeNode } =
-      assertionInfo;
+      attributesInfo;
     info.expectedType = importAttributes.type;
     info.importAttributes = importAttributes;
     Object.assign(info.astInfo, { importNode, importTypeAttributeNode });
@@ -84,23 +84,23 @@ export const analyzeExportAllDeclaration = (node, { onUrl }) => {
   });
 };
 
-const extractImportAssertionsInfo = (node) => {
+const extractImportAttributesInfo = (node) => {
   if (node.type === "ImportDeclaration") {
     // static import
-    const { assertions } = node;
-    if (!assertions) {
+    const { attributes } = node;
+    if (!attributes) {
       return null;
     }
-    if (assertions.length === 0) {
+    if (attributes.length === 0) {
       return null;
     }
-    const typeAssertionNode = assertions.find(
-      (assertion) => assertion.key.name === "type",
+    const typeAttributeNode = attributes.find(
+      (attributeNode) => attributeNode.key.name === "type",
     );
-    if (!typeAssertionNode) {
+    if (!typeAttributeNode) {
       return null;
     }
-    const typeNode = typeAssertionNode.value;
+    const typeNode = typeAttributeNode.value;
     if (!isStringLiteralNode(typeNode)) {
       return null;
     }
@@ -109,7 +109,7 @@ const extractImportAssertionsInfo = (node) => {
         type: typeNode.value,
       },
       importNode: node,
-      importTypeAttributeNode: typeAssertionNode,
+      importTypeAttributeNode: typeAttributeNode,
     };
   }
   // dynamic import
@@ -123,18 +123,18 @@ const extractImportAssertionsInfo = (node) => {
     return null;
   }
   const { properties } = firstArgNode;
-  const assertProperty = properties.find((property) => {
-    return property.key.name === "assert";
+  const withProperty = properties.find((property) => {
+    return property.key.name === "with";
   });
-  if (!assertProperty) {
+  if (!withProperty) {
     return null;
   }
-  const assertValueNode = assertProperty.value;
-  if (assertValueNode.type !== "ObjectExpression") {
+  const withValueNode = withProperty.value;
+  if (withValueNode.type !== "ObjectExpression") {
     return null;
   }
-  const assertValueProperties = assertValueNode.properties;
-  const typePropertyNode = assertValueProperties.find((property) => {
+  const withValueProperties = withValueNode.properties;
+  const typePropertyNode = withValueProperties.find((property) => {
     return property.key.name === "type";
   });
   if (!typePropertyNode) {

package/src/js/parse_js_with_acorn.js

@@ -1,10 +1,10 @@
 import { Parser, getLineInfo } from "acorn";
-import { importAssertions } from "acorn-import-assertions";
+import { importAttributes } from "acorn-import-attributes";
 
 import { createJsParseError } from "./js_parse_error.js";
 
 export const parseJsWithAcorn = ({ js, url, isJsModule }) => {
-  const AcornParser = Parser.extend(importAssertions);
+  const AcornParser = Parser.extend(importAttributes);
   const comments = [];
 
   try {