removed .js hack

azizghuloum · Dec 25, 2024 · bb2562e · bb2562e
1 parent d884dd9
commit bb2562e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/src/library-manager.ts b/src/library-manager.ts
@@ -565,7 +565,7 @@ export class LibraryManager {
           this.global_unit,
           this.global_context,
         );
-      } else if (path.endsWith(".d.ts") || path.endsWith(".d.cts")) {
+      } else if (path.endsWith(".d.ts") || path.endsWith(".d.cts") || path.endsWith(".js")) {
         return new DtsModule(
           pkg,
           pkg_relative_path,
@@ -575,16 +575,6 @@ export class LibraryManager {
           this.global_unit,
           this.global_context,
         );
-      } else if (path.endsWith(".js")) {
-        return new DtsModule(
-          pkg,
-          pkg_relative_path.replace(/\.js$/, ".d.ts"),
-          path.replace(/\.js$/, ".d.ts"),
-          this,
-          this.libs,
-          this.global_unit,
-          this.global_context,
-        );
       } else {
         throw new Error(`don't know how to import ${path}`);
       }

diff --git a/src/parse-dts.ts b/src/parse-dts.ts
@@ -74,7 +74,6 @@ function parse_statements(statements: TS.NodeArray<TS.Statement>, path: string):
 
   function handle_main_definition(global: boolean) {
     function push_lexical(name: string) {
-      assert(!lexicals[name], `lexical '${name}' is multiply defined in '${path}'`);
       lexicals[name] = { global };
     }
     function push_type(name: string) {
@@ -98,6 +97,14 @@ function parse_statements(statements: TS.NodeArray<TS.Statement>, path: string):
       assert(!exported[name], `duplicate export ${origin_name} as ${name}`);
       exported[name] = { type_only, origin_name, origin_module, global };
     }
+    function push_exported_local_type(name: string) {
+      assert(!exported[name], `duplicate export ${name}`);
+      exported[name] = { type_only: true, origin_name: name, origin_module: undefined, global };
+    }
+    function push_exported_local_value(name: string) {
+      assert(!exported[name], `duplicate export ${name}`);
+      exported[name] = { type_only: false, origin_name: name, origin_module: undefined, global };
+    }
     function push_namespace(name: string, literal: boolean) {
       const ns = literal ? literal_namespaces : id_namespaces;
       assert(!ns[name]);
@@ -203,40 +210,45 @@ function parse_statements(statements: TS.NodeArray<TS.Statement>, path: string):
       const declared =
         decl.modifiers?.some((x) => x.kind === TS.SyntaxKind.DeclareKeyword) ?? false;
       assert(!declared);
-      assert(!exported);
       push_type(name);
+      if (exported) push_exported_local_type(name);
     }
     function handle_type_alias_declaration(decl: TS.TypeAliasDeclaration) {
       const exported = decl.modifiers?.some((x) => x.kind === TS.SyntaxKind.ExportKeyword) ?? false;
       const declared =
         decl.modifiers?.some((x) => x.kind === TS.SyntaxKind.DeclareKeyword) ?? false;
       assert(!declared);
-      assert(!exported);
       const name = decl.name.text;
       push_type(name);
+      if (exported) push_exported_local_type(name);
     }
     function handle_function_declaration(decl: TS.FunctionDeclaration) {
       const name = decl.name?.text;
       const exported = decl.modifiers?.some((x) => x.kind === TS.SyntaxKind.ExportKeyword) ?? false;
       assert(!exported);
-      const declared =
-        decl.modifiers?.some((x) => x.kind === TS.SyntaxKind.DeclareKeyword) ?? false;
       assert(name !== undefined);
-      assert(declared);
       push_lexical(name);
     }
     function handle_variable_statement(decl: TS.VariableStatement) {
       const exported = decl.modifiers?.some((x) => x.kind === TS.SyntaxKind.ExportKeyword) ?? false;
-      assert(!exported);
-      const declared =
-        decl.modifiers?.some((x) => x.kind === TS.SyntaxKind.DeclareKeyword) ?? false;
-      assert(declared);
+      function handle_binding_element(binding: TS.BindingElement) {
+        handle_binding_name(binding.name);
+      }
       function handle_binding_name(binding: TS.BindingName) {
         switch (binding.kind) {
-          case TS.SyntaxKind.Identifier:
-            return push_lexical(binding.text);
+          case TS.SyntaxKind.Identifier: {
+            push_lexical(binding.text);
+            if (exported) push_exported_local_value(binding.text);
+            return;
+          }
+          case TS.SyntaxKind.ObjectBindingPattern: {
+            binding.elements.forEach(handle_binding_element);
+            return;
+          }
           default:
-            throw new Error(`unhandled binding type '${TS.SyntaxKind[binding.kind]}'`);
+            throw new Error(
+              `unhandled binding type '${TS.SyntaxKind[binding.kind]}' in ${path}:${binding.pos}`,
+            );
         }
       }
       function handle_decl(decl: TS.VariableDeclaration) {
@@ -273,6 +285,9 @@ function parse_statements(statements: TS.NodeArray<TS.Statement>, path: string):
           return handle_variable_statement(stmt as TS.VariableStatement);
         case TS.SyntaxKind.ClassDeclaration:
           return handle_class_declaration(stmt as TS.ClassDeclaration);
+        case TS.SyntaxKind.ExpressionStatement:
+        case TS.SyntaxKind.TryStatement:
+          return;
         default:
           throw new Error(`unhandled statement in d.ts file '${TS.SyntaxKind[stmt.kind]}'`);
       }