@jsenv/ast 4.1.0 → 5.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/ast",
-  "version": "4.1.0",
+  "version": "5.0.1",
   "description": "Parse and transform HTML,CSS and JS",
   "license": "MIT",
   "repository": {
@@ -33,12 +33,12 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@babel/parser": "7.22.5",
-    "acorn": "8.8.2",
+    "@babel/parser": "7.22.7",
+    "acorn": "8.10.0",
     "acorn-import-assertions": "1.9.0",
     "acorn-walk": "8.2.0",
     "parse5": "7.1.2",
-    "postcss": "8.4.24",
+    "postcss": "8.4.26",
     "postcss-value-parser": "4.2.0"
   }
 }

package/src/js/js_static_analysis/import_export.js

@@ -3,7 +3,7 @@ import { isStringLiteralNode } from "./helpers.js";
 export const analyzeImportDeclaration = (node, { onUrl }) => {
   const specifierNode = node.source;
   const assertionInfo = extractImportAssertionsInfo(node);
-  onUrl({
+  const info = {
     type: "js_import",
     subtype: "import_static",
     specifier: specifierNode.value,
@@ -11,9 +11,17 @@ export const analyzeImportDeclaration = (node, { onUrl }) => {
     end: specifierNode.end,
     line: specifierNode.loc.start.line,
     column: specifierNode.loc.start.column,
-    expectedType: assertionInfo ? assertionInfo.assert.type : "js_module",
-    ...assertionInfo,
-  });
+    expectedType: "js_module",
+    astInfo: { node: specifierNode },
+  };
+  if (assertionInfo) {
+    const { importAttributes, importNode, importTypeAttributeNode } =
+      assertionInfo;
+    info.expectedType = importAttributes.type;
+    info.importAttributes = importAttributes;
+    Object.assign(info.astInfo, { importNode, importTypeAttributeNode });
+  }
+  onUrl(info);
 };
 export const analyzeImportExpression = (node, { onUrl }) => {
   const specifierNode = node.source;
@@ -21,18 +29,25 @@ export const analyzeImportExpression = (node, { onUrl }) => {
     return;
   }
   const assertionInfo = extractImportAssertionsInfo(node);
-
-  onUrl({
+  const info = {
     type: "js_import",
     subtype: "import_dynamic",
+    expectedType: "js_module",
     specifier: specifierNode.value,
     start: specifierNode.start,
     end: specifierNode.end,
     line: specifierNode.loc.start.line,
     column: specifierNode.loc.start.column,
-    expectedType: assertionInfo ? assertionInfo.assert.type : "js_module",
-    ...assertionInfo,
-  });
+    astInfo: { node: specifierNode },
+  };
+  if (assertionInfo) {
+    const { importAttributes, importNode, importTypeAttributeNode } =
+      assertionInfo;
+    info.expectedType = importAttributes.type;
+    info.importAttributes = importAttributes;
+    Object.assign(info.astInfo, { importNode, importTypeAttributeNode });
+  }
+  onUrl(info);
 };
 export const analyzeExportNamedDeclaration = (node, { onUrl }) => {
   const specifierNode = node.source;
@@ -52,6 +67,7 @@ export const analyzeExportNamedDeclaration = (node, { onUrl }) => {
     end: specifierNode.end,
     line: specifierNode.loc.start.line,
     column: specifierNode.loc.start.column,
+    astInfo: { node: specifierNode },
   });
 };
 export const analyzeExportAllDeclaration = (node, { onUrl }) => {
@@ -64,6 +80,7 @@ export const analyzeExportAllDeclaration = (node, { onUrl }) => {
     end: specifierNode.end,
     line: specifierNode.loc.start.line,
     column: specifierNode.loc.start.column,
+    astInfo: { node: specifierNode },
   });
 };
 
@@ -88,10 +105,11 @@ const extractImportAssertionsInfo = (node) => {
       return null;
     }
     return {
-      assertNode: typeAssertionNode,
-      assert: {
+      importAttributes: {
         type: typeNode.value,
       },
+      importNode: node,
+      importTypeAttributeNode: typeAssertionNode,
     };
   }
   // dynamic import
@@ -127,9 +145,10 @@ const extractImportAssertionsInfo = (node) => {
     return null;
   }
   return {
-    assertNode: firstArgNode,
-    assert: {
+    importAttributes: {
       type: typePropertyValue.value,
     },
+    importNode: node,
+    importTypeAttributeNode: typePropertyNode,
   };
 };

package/src/js/js_static_analysis/import_meta_resolve.js

@@ -14,7 +14,6 @@ export const analyzeImportMetaResolveCall = (node, { onUrl }) => {
   const firstArg = node.arguments[0];
   if (firstArg && isStringLiteralNode(firstArg)) {
     onUrl({
-      node,
       type: "js_import",
       subtype: "import_meta_resolve",
       specifier: firstArg.value,
@@ -22,6 +21,7 @@ export const analyzeImportMetaResolveCall = (node, { onUrl }) => {
       end: firstArg.end,
       line: firstArg.loc.start.line,
       column: firstArg.loc.start.column,
+      astInfo: { node },
     });
   }
 };

package/src/js/js_static_analysis/json_parse.js

@@ -16,7 +16,6 @@ export const analyzeJSONParseCall = (node, { onInlineContent }) => {
   const contentInfo = extractContentInfo(nodeHoldingContent);
   if (contentInfo) {
     onInlineContent({
-      node: nodeHoldingContent,
       type: "json_parse_first_arg",
       contentType: "application/json",
       start: nodeHoldingContent.start,
@@ -28,6 +27,7 @@ export const analyzeJSONParseCall = (node, { onInlineContent }) => {
       nodeType: contentInfo.nodeType,
       quote: contentInfo.quote,
       content: contentInfo.content,
+      astInfo: { node: nodeHoldingContent },
     });
   }
 };

package/src/js/js_static_analysis/new_blob.js

@@ -38,7 +38,6 @@ export const analyzeNewBlobCall = (node, { onInlineContent }) => {
   const contentInfo = extractContentInfo(nodeHoldingContent);
   if (contentInfo) {
     onInlineContent({
-      node: nodeHoldingContent,
       type: "new_blob_first_arg",
       contentType,
       start: nodeHoldingContent.start,
@@ -50,6 +49,7 @@ export const analyzeNewBlobCall = (node, { onInlineContent }) => {
       nodeType: contentInfo.nodeType,
       quote: contentInfo.quote,
       content: contentInfo.content,
+      astInfo: { node: nodeHoldingContent },
     });
   }
 };

package/src/js/js_static_analysis/new_inline_content.js

@@ -32,7 +32,6 @@ export const analyzeNewInlineContentCall = (node, { onInlineContent }) => {
   const contentInfo = extractContentInfo(nodeHoldingContent);
   if (contentInfo) {
     onInlineContent({
-      node: nodeHoldingContent,
       type: "new_inline_content_first_arg",
       contentType,
       start: nodeHoldingContent.start,
@@ -44,6 +43,7 @@ export const analyzeNewInlineContentCall = (node, { onInlineContent }) => {
       nodeType: contentInfo.nodeType,
       quote: contentInfo.quote,
       content: contentInfo.content,
+      astInfo: { node: nodeHoldingContent },
     });
   }
 };

package/src/js/js_static_analysis/new_url.js

@@ -21,6 +21,7 @@ export const analyzeNewUrlCall = (node, { isJsModule, onUrl }) => {
         end: specifierNode.end,
         line: specifierNode.loc.start.line,
         column: specifierNode.loc.start.column,
+        astInfo: { node: specifierNode },
       });
     }
     return;
@@ -53,6 +54,7 @@ export const analyzeNewUrlCall = (node, { isJsModule, onUrl }) => {
           baseUrlType,
           baseUrl:
             baseUrlType === "StringLiteral" ? secondArgNode.value : undefined,
+          astInfo: { node: firstArgNode },
         });
       }
       if (baseUrlType === "StringLiteral") {
@@ -65,6 +67,7 @@ export const analyzeNewUrlCall = (node, { isJsModule, onUrl }) => {
           end: specifierNode.end,
           line: specifierNode.loc.start.line,
           column: specifierNode.loc.start.column,
+          astInfo: { node: specifierNode },
         });
       }
     }

package/src/js/js_static_analysis/system.js

@@ -38,6 +38,7 @@ const analyzeSystemRegisterDeps = (node, { onUrl }) => {
         end: specifierNode.end,
         line: specifierNode.loc.start.line,
         column: specifierNode.loc.start.column,
+        astInfo: { node: specifierNode },
       });
     }
   });
@@ -69,6 +70,7 @@ export const analyzeSystemImportCall = (node, { onUrl }) => {
       end: specifierNode.end,
       line: specifierNode.loc.start.line,
       column: specifierNode.loc.start.column,
+      astInfo: { node: specifierNode },
     });
   }
 };
@@ -101,6 +103,7 @@ export const analyzeSystemResolveCall = (node, { onUrl }) => {
       end: specifierNode.end,
       line: specifierNode.loc.start.line,
       column: specifierNode.loc.start.column,
+      astInfo: { node: specifierNode },
     });
   }
 };

package/src/js/js_static_analysis/web_worker.js

@@ -26,6 +26,7 @@ export const analyzeImportScriptCalls = (node, { onUrl }) => {
         end: specifierNode.end,
         line: specifierNode.loc.start.line,
         column: specifierNode.loc.start.column,
+        astInfo: { node: specifierNode },
       });
     }
   });

package/src/js/js_static_analysis/web_worker_entry_point.js

@@ -122,38 +122,41 @@ const analyzeWorkerCallArguments = (
       subtype: referenceSubtype,
       expectedType,
       expectedSubtype,
-      typePropertyNode,
       specifier: specifierNode.value,
       start: specifierNode.start,
       end: specifierNode.end,
       line: specifierNode.loc.start.line,
       column: specifierNode.loc.start.column,
+      astInfo: {
+        node,
+        typePropertyNode,
+      },
     });
     return;
   }
   if (isNewUrlCall(firstArgNode)) {
     analyzeNewUrlCall(firstArgNode, {
       isJsModule,
-      onUrl: (mention) => {
-        Object.assign(mention, {
+      onUrl: (info) => {
+        info.astInfo.typePropertyNode = typePropertyNode;
+        Object.assign(info, {
           expectedType,
           expectedSubtype,
-          typePropertyNode,
         });
-        onUrl(mention);
+        onUrl(info);
       },
     });
     return;
   }
   if (isJsModule && isImportMetaResolveCall(firstArgNode)) {
     analyzeImportMetaResolveCall(firstArgNode, {
-      onUrl: (mention) => {
-        Object.assign(mention, {
+      onUrl: (info) => {
+        info.astInfo.typePropertyNode = typePropertyNode;
+        Object.assign(info, {
           expectedType,
           expectedSubtype,
-          typePropertyNode,
         });
-        onUrl(mention);
+        onUrl(info);
       },
     });
     return;