feat: support voca syntax (#168)

Author: dstallenberg

libraries/analysis-javascript/lib/target/export/ExportDefaultDeclaration.ts

@@ -26,69 +26,80 @@ export function extractExportsFromExportDefaultDeclaration(
   visitor: ExportVisitor,
   filePath: string,
   path: NodePath<t.ExportDefaultDeclaration>
-): Export {
+): Export[] {
   let name: string;
   let id: string;
 
-  switch (path.node.declaration.type) {
-    case "Identifier": {
-      name = path.node.declaration.name;
-      id = visitor._getBindingId(path.get("declaration"));
-      break;
-    }
-    case "NewExpression": {
-      if (path.node.declaration.callee.type !== "Identifier") {
-        // unsupported
-        throw new Error("Unsupported export default declaration");
-      }
-      name = path.node.declaration.callee.name;
-      // idk if this is correct
-      id = visitor._getNodeId(path.get("declaration"));
+  const declaration = path.get("declaration");
 
-      break;
-    }
-    case "FunctionDeclaration":
-    case "ClassDeclaration": {
-      name = path.node.declaration.id
-        ? path.node.declaration.id.name
-        : "default";
-      id = visitor._getNodeId(path.get("declaration"));
-      break;
-    }
-    case "CallExpression": {
-      // e.g export default func(...)
-      name = "default";
-      id = visitor._getNodeId(path.get("declaration"));
-      break;
-    }
-    case "ObjectExpression": {
-      // e.g export default {}
-      name = "default";
-      id = visitor._getNodeId(path.get("declaration"));
-      break;
-    }
-    default: {
-      // we could also put anon here, but that would be a bit weird
-      //   name = "anonymous"
+  if (declaration.isIdentifier()) {
+    name = declaration.node.name;
+    id = visitor._getBindingId(declaration);
+  } else if (declaration.isLiteral()) {
+    name = "default";
+    id = visitor._getNodeId(declaration);
+  } else if (declaration.isNewExpression()) {
+    if (declaration.node.callee.type !== "Identifier") {
       // unsupported
-      // examples which we don't support:
-      // export default true
-      // export default 1
-      // export default "string"
-      // export default []
-      // etc.
-      throw new Error(
-        `Unsupported export default declaration at ${visitor._getNodeId(path)}`
-      );
+      throw new Error("Unsupported export default declaration");
+    }
+    name = declaration.node.callee.name;
+    // idk if this is correct
+    id = visitor._getNodeId(declaration);
+  } else if (
+    declaration.isFunctionDeclaration() ||
+    declaration.isClassDeclaration()
+  ) {
+    name = declaration.node.id ? declaration.node.id.name : "default";
+    id = visitor._getNodeId(declaration);
+  } else if (declaration.isCallExpression()) {
+    name = "default";
+    id = visitor._getNodeId(declaration);
+  } else if (declaration.isObjectExpression()) {
+    const exports: Export[] = [];
+    for (const property of declaration.get("properties")) {
+      if (property.isObjectProperty()) {
+        const key = property.get("key");
+        const value = property.get("value");
+        if (!key.isIdentifier()) {
+          throw new Error("unsupported syntax");
+        }
+        exports.push({
+          id: visitor._getBindingId(value),
+          filePath,
+          name: value.isIdentifier() ? value.node.name : key.node.name,
+          renamedTo: key.node.name,
+          default: false,
+          module: false,
+        });
+      }
     }
+
+    return exports;
+  } else {
+    // we could also put anon here, but that would be a bit weird
+    //   name = "anonymous"
+    // unsupported
+    // examples which we don't support:
+    // export default true
+    // export default 1
+    // export default "string"
+    // export default {}
+    // export default []
+    // etc.
+    throw new Error(
+      `Unsupported export default declaration at ${visitor._getNodeId(path)}`
+    );
   }
 
-  return {
-    id: id,
-    filePath,
-    name: name,
-    renamedTo: name,
-    default: true,
-    module: false,
-  };
+  return [
+    {
+      id: id,
+      filePath,
+      name: name,
+      renamedTo: name,
+      default: true,
+      module: false,
+    },
+  ];
 }

libraries/analysis-javascript/lib/target/export/ExportVisitor.ts

@@ -53,7 +53,7 @@ export class ExportVisitor extends AbstractSyntaxTreeVisitor {
     path: NodePath<t.ExportDefaultDeclaration>
   ) => void = (path) => {
     this._exports.push(
-      extractExportsFromExportDefaultDeclaration(this, this.filePath, path)
+      ...extractExportsFromExportDefaultDeclaration(this, this.filePath, path)
     );
   };
 

libraries/analysis-javascript/lib/type/discovery/object/ObjectVisitor.ts

@@ -305,6 +305,9 @@ export class ObjectVisitor extends AbstractSyntaxTreeVisitor {
     if (path.node.object.type === "ThisExpression") {
       const parent = this._getThisParent(path);
 
+      if (!parent) {
+        return;
+      }
       const _object = this.objectTypeMap.get(this._getNodeId(parent));
 
       if (!_object) {

libraries/analysis-javascript/lib/type/discovery/relation/RelationVisitor.ts

@@ -244,7 +244,9 @@ export class RelationVisitor extends AbstractSyntaxTreeVisitor {
 
     const parent = this._getThisParent(path);
 
-    this._createRelation(path, type, [parent]);
+    if (parent) {
+      this._createRelation(path, type, [parent]);
+    }
   };
 
   public ArrayExpression: (path: NodePath<t.ArrayExpression>) => void = (

libraries/ast-visitor-javascript/lib/AbstractSyntaxTreeVisitor.ts

@@ -206,6 +206,16 @@ export class AbstractSyntaxTreeVisitor implements TraverseOptions {
       return this._getNodeId(path);
     }
 
+    if (
+      path.parentPath.isExportSpecifier() &&
+      path.parentPath.get("exported") === path
+    ) {
+      // we are the export name of a renamed export
+      // so this is the first definition of foo
+      // e.g. export {bar as foo}
+      return this._getNodeId(path);
+    }
+
     if (
       (path.parentPath.isObjectProperty() ||
         path.parentPath.isObjectMethod()) &&
@@ -290,7 +300,7 @@ export class AbstractSyntaxTreeVisitor implements TraverseOptions {
             path
           )}`
         );
-        return <NodePath<t.Program>>path.findParent((p) => p.isProgram());
+        return undefined; // <NodePath<t.Program>>path.findParent((p) => p.isProgram());
       } else {
         throw new Error(
           `ThisExpression without parent function found at ${this._getNodeId(
@@ -311,7 +321,7 @@ export class AbstractSyntaxTreeVisitor implements TraverseOptions {
               path
             )}`
           );
-          return <NodePath<t.Program>>path.findParent((p) => p.isProgram());
+          return undefined; // <NodePath<t.Program>>path.findParent((p) => p.isProgram());
         } else {
           throw new Error(
             `ThisExpression without parent function found at ${this._getNodeId(