@jsenv/ast 1.4.4 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/ast",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "Parse and transform HTML,CSS and JS",
   "license": "MIT",
   "repository": {
@@ -33,13 +33,13 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@babel/parser": "7.20.1",
+    "@babel/parser": "7.20.3",
     "@parcel/css": "1.14.0",
     "acorn": "8.8.1",
     "acorn-import-assertions": "1.8.0",
     "acorn-walk": "8.2.0",
-    "parse5": "7.1.1",
-    "postcss": "8.4.18",
+    "parse5": "7.1.2",
+    "postcss": "8.4.19",
     "postcss-value-parser": "4.2.0"
   }
 }

package/src/js/js_static_analysis/import_export.js

@@ -4,7 +4,7 @@ export const analyzeImportDeclaration = (node, { onUrl }) => {
   const specifierNode = node.source
   const assertionInfo = extractImportAssertionsInfo(node)
   onUrl({
-    type: "js_import_export",
+    type: "js_import",
     subtype: "import_static",
     specifier: specifierNode.value,
     specifierStart: specifierNode.start,
@@ -23,7 +23,7 @@ export const analyzeImportExpression = (node, { onUrl }) => {
   const assertionInfo = extractImportAssertionsInfo(node)
 
   onUrl({
-    type: "js_import_export",
+    type: "js_import",
     subtype: "import_dynamic",
     specifier: specifierNode.value,
     specifierStart: specifierNode.start,
@@ -45,7 +45,7 @@ export const analyzeExportNamedDeclaration = (node, { onUrl }) => {
     return
   }
   onUrl({
-    type: "js_import_export",
+    type: "js_import",
     subtype: "export_named",
     specifier: specifierNode.value,
     specifierStart: specifierNode.start,
@@ -57,7 +57,7 @@ export const analyzeExportNamedDeclaration = (node, { onUrl }) => {
 export const analyzeExportAllDeclaration = (node, { onUrl }) => {
   const specifierNode = node.source
   onUrl({
-    type: "js_import_export",
+    type: "js_import",
     subtype: "export_all",
     specifier: specifierNode.value,
     specifierStart: specifierNode.start,

package/src/js/js_static_analysis/import_meta_resolve.js

@@ -0,0 +1,27 @@
+import { isStringLiteralNode } from "./helpers.js"
+
+export const isImportMetaResolveCall = (node) => {
+  return (
+    node.type === "CallExpression" &&
+    node.callee.type === "MemberExpression" &&
+    node.callee.object.type === "MetaProperty" &&
+    node.callee.property.type === "Identifier" &&
+    node.callee.property.name === "resolve"
+  )
+}
+
+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,
+      specifierStart: firstArg.start,
+      specifierEnd: firstArg.end,
+      specifierLine: firstArg.loc.start.line,
+      specifierColumn: firstArg.loc.start.column,
+    })
+  }
+}

package/src/js/js_static_analysis/new_url.js

@@ -14,7 +14,7 @@ export const analyzeNewUrlCall = (node, { isJsModule, onUrl }) => {
     if (urlType === "StringLiteral") {
       const specifierNode = firstArgNode
       onUrl({
-        type: "js_url_specifier",
+        type: "js_url",
         subtype: "new_url_first_arg",
         specifier: specifierNode.value,
         specifierStart: specifierNode.start,
@@ -43,7 +43,7 @@ export const analyzeNewUrlCall = (node, { isJsModule, onUrl }) => {
         // we can understand the first argument
         const specifierNode = firstArgNode
         onUrl({
-          type: "js_url_specifier",
+          type: "js_url",
           subtype: "new_url_first_arg",
           specifier: specifierNode.value,
           specifierStart: specifierNode.start,
@@ -58,7 +58,7 @@ export const analyzeNewUrlCall = (node, { isJsModule, onUrl }) => {
       if (baseUrlType === "StringLiteral") {
         const specifierNode = secondArgNode
         onUrl({
-          type: "js_url_specifier",
+          type: "js_url",
           subtype: "new_url_second_arg",
           specifier: specifierNode.value,
           specifierStart: specifierNode.start,

package/src/js/js_static_analysis/system.js

@@ -30,7 +30,7 @@ const analyzeSystemRegisterDeps = (node, { onUrl }) => {
     if (isStringLiteralNode(element)) {
       const specifierNode = element
       onUrl({
-        type: "js_url_specifier",
+        type: "js_url",
         subtype: "system_register_arg",
         expectedType: "js_classic",
         specifier: specifierNode.value,
@@ -61,7 +61,7 @@ export const analyzeSystemImportCall = (node, { onUrl }) => {
   if (isStringLiteralNode(firstArgNode)) {
     const specifierNode = firstArgNode
     onUrl({
-      type: "js_url_specifier",
+      type: "js_url",
       subtype: "system_import_arg",
       expectedType: "js_classic",
       specifier: specifierNode.value,
@@ -72,3 +72,35 @@ export const analyzeSystemImportCall = (node, { onUrl }) => {
     })
   }
 }
+
+export const isSystemResolveCall = (node) => {
+  const callee = node.callee
+  return (
+    callee.type === "MemberExpression" &&
+    callee.object.type === "MemberExpression" &&
+    callee.object.object.type === "Identifier" &&
+    // because of minification we can't assume _context.
+    // so anything matching "*.meta.resolve()"
+    // will be assumed to be the equivalent to "meta.resolve()"
+    // callee.object.object.name === "_context" &&
+    callee.object.property.type === "Identifier" &&
+    callee.object.property.name === "meta" &&
+    callee.property.type === "Identifier" &&
+    callee.property.name === "resolve"
+  )
+}
+export const analyzeSystemResolveCall = (node, { onUrl }) => {
+  const firstArgNode = node.arguments[0]
+  if (isStringLiteralNode(firstArgNode)) {
+    const specifierNode = firstArgNode
+    onUrl({
+      type: "js_url",
+      subtype: "system_resolve_arg",
+      specifier: specifierNode.value,
+      specifierStart: specifierNode.start,
+      specifierEnd: specifierNode.end,
+      specifierLine: specifierNode.loc.start.line,
+      specifierColumn: specifierNode.loc.start.column,
+    })
+  }
+}

package/src/js/js_static_analysis/web_worker.js

@@ -18,7 +18,7 @@ export const analyzeImportScriptCalls = (node, { onUrl }) => {
     if (isStringLiteralNode(arg)) {
       const specifierNode = arg
       onUrl({
-        type: "js_url_specifier",
+        type: "js_url",
         subtype: "self_import_scripts_arg",
         expectedType: "js_classic",
         specifier: specifierNode.value,

package/src/js/js_static_analysis/web_worker_entry_point.js

@@ -1,5 +1,9 @@
 import { getTypePropertyNode, isStringLiteralNode } from "./helpers.js"
 import { isNewUrlCall, analyzeNewUrlCall } from "./new_url.js"
+import {
+  isImportMetaResolveCall,
+  analyzeImportMetaResolveCall,
+} from "./import_meta_resolve.js"
 
 export const isNewWorkerCall = (node) => {
   return (
@@ -114,7 +118,7 @@ const analyzeWorkerCallArguments = (
   if (isStringLiteralNode(firstArgNode)) {
     const specifierNode = firstArgNode
     onUrl({
-      type: "js_url_specifier",
+      type: "js_url",
       subtype: referenceSubtype,
       expectedType,
       expectedSubtype,
@@ -139,5 +143,19 @@ const analyzeWorkerCallArguments = (
         onUrl(mention)
       },
     })
+    return
+  }
+  if (isJsModule && isImportMetaResolveCall(firstArgNode)) {
+    analyzeImportMetaResolveCall(firstArgNode, {
+      onUrl: (mention) => {
+        Object.assign(mention, {
+          expectedType,
+          expectedSubtype,
+          typePropertyNode,
+        })
+        onUrl(mention)
+      },
+    })
+    return
   }
 }

package/src/js/parse_js_urls.js

@@ -7,6 +7,10 @@ import {
   analyzeExportNamedDeclaration,
   analyzeExportAllDeclaration,
 } from "./js_static_analysis/import_export.js"
+import {
+  isImportMetaResolveCall,
+  analyzeImportMetaResolveCall,
+} from "./js_static_analysis/import_meta_resolve.js"
 import {
   isNewWorkerCall,
   analyzeNewWorkerCall,
@@ -28,6 +32,8 @@ import {
   analyzeSystemRegisterCall,
   isSystemImportCall,
   analyzeSystemImportCall,
+  isSystemResolveCall,
+  analyzeSystemResolveCall,
 } from "./js_static_analysis/system.js"
 
 export const parseJsUrls = async ({
@@ -59,6 +65,10 @@ export const parseJsUrls = async ({
       analyzeExportAllDeclaration(node, { onUrl })
     },
     CallExpression: (node) => {
+      if (isJsModule && isImportMetaResolveCall(node)) {
+        analyzeImportMetaResolveCall(node, { onUrl })
+        return
+      }
       if (isServiceWorkerRegisterCall(node)) {
         analyzeServiceWorkerRegisterCall(node, {
           isJsModule,
@@ -84,6 +94,12 @@ export const parseJsUrls = async ({
         })
         return
       }
+      if (!isJsModule && isSystemResolveCall(node)) {
+        analyzeSystemResolveCall(node, {
+          onUrl,
+        })
+        return
+      }
     },
     NewExpression: (node, ancestors) => {
       if (isNewWorkerCall(node)) {