susee 1.6.0 → 1.6.2

package/dist/index.mjs

@@ -598,78 +598,114 @@ var utils;
         gen.findProperty = findProperty;
     })(gen = utils.gen || (utils.gen = {})); // namespace gen
 })(utils || (utils = {})); // namespace utils
+const getScopeNodeLabel = (sourceFile, node, index) => {
+    if (ts6.isModuleDeclaration(node)) {
+        return `namespace:${node.name.getText(sourceFile)}`;
+    }
+    if (ts6.isClassDeclaration(node)) {
+        return `class:${node.name?.text ?? `anonymous-${index}`}`;
+    }
+    if (ts6.isFunctionDeclaration(node) || ts6.isFunctionExpression(node)) {
+        return `function:${node.name?.text ?? `anonymous-${index}`}`;
+    }
+    if (ts6.isArrowFunction(node)) {
+        return `arrow:${index}`;
+    }
+    if (ts6.isMethodDeclaration(node)) {
+        return `method:${node.name.getText(sourceFile)}`;
+    }
+    if (ts6.isBlock(node)) {
+        return `block:${index}`;
+    }
+    return `${ts6.SyntaxKind[node.kind].toLowerCase()}:${index}`;
+};
+const getScopeKey = (file, scopeStack) => {
+    if (scopeStack.length === 0) {
+        return "global";
+    }
+    return `${file}::${scopeStack.join(" > ")}`;
+};
+const isScopeNode = (node) => ts6.isModuleDeclaration(node) ||
+    ts6.isClassDeclaration(node) ||
+    ts6.isFunctionDeclaration(node) ||
+    ts6.isFunctionExpression(node) ||
+    ts6.isArrowFunction(node) ||
+    ts6.isMethodDeclaration(node) ||
+    ts6.isBlock(node);
+const collectDeclarationNames = (node) => {
+    if (ts6.isVariableStatement(node)) {
+        return node.declarationList.declarations.flatMap((decl) => {
+            if (!ts6.isIdentifier(decl.name)) {
+                return [];
+            }
+            return [{ name: decl.name.text, positionNode: decl.name }];
+        });
+    }
+    if (ts6.isFunctionDeclaration(node) ||
+        ts6.isClassDeclaration(node) ||
+        ts6.isEnumDeclaration(node) ||
+        ts6.isInterfaceDeclaration(node) ||
+        ts6.isTypeAliasDeclaration(node)) {
+        if (node.name) {
+            return [{ name: node.name.text, positionNode: node.name }];
+        }
+    }
+    return [];
+};
 const collectDuplicateDeclarations = (deps, bundledSourceFile) => {
     const duplicateNameMap = new Map();
-    const addDuplicateDeclaration = (name, file, sourceFile, positionNode) => {
+    const addDuplicateDeclaration = (scopeKey, name, file, sourceFile, positionNode) => {
         const { line, character } = sourceFile.getLineAndCharacterOfPosition(positionNode.getStart(sourceFile));
         const location = {
             file,
             line: line + 1,
             column: character + 1,
         };
-        if (!duplicateNameMap.has(name)) {
-            duplicateNameMap.set(name, new Set([location]));
+        const duplicateKey = `${scopeKey}::${name}`;
+        if (!duplicateNameMap.has(duplicateKey)) {
+            duplicateNameMap.set(duplicateKey, {
+                name,
+                locations: new Set([location]),
+            });
             return;
         }
-        duplicateNameMap.get(name)?.add(location);
+        duplicateNameMap.get(duplicateKey)?.locations.add(location);
     };
-    const collectFile = (file, sourceFile, node, isGlobalScope = true) => {
-        if (isGlobalScope) {
-            if (ts6.isVariableStatement(node)) {
-                node.declarationList.declarations.forEach((decl) => {
-                    if (ts6.isIdentifier(decl.name)) {
-                        const name = decl.name.text;
-                        addDuplicateDeclaration(name, file, sourceFile, decl.name);
-                    }
-                });
-            }
-            else if (ts6.isFunctionDeclaration(node) ||
-                ts6.isClassDeclaration(node) ||
-                ts6.isEnumDeclaration(node) ||
-                ts6.isInterfaceDeclaration(node) ||
-                ts6.isTypeAliasDeclaration(node)) {
-                const name = node.name?.text;
-                if (name) {
-                    addDuplicateDeclaration(name, file, sourceFile, node.name);
-                }
-            }
-        }
-        if (ts6.isBlock(node) ||
-            ts6.isFunctionDeclaration(node) ||
-            ts6.isFunctionExpression(node) ||
-            ts6.isArrowFunction(node) ||
-            ts6.isMethodDeclaration(node) ||
-            ts6.isClassDeclaration(node)) {
-            if (ts6.isBlock(node)) {
-                node.statements.forEach((child) => collectFile(file, sourceFile, child, false));
-            }
-            else {
-                ts6.forEachChild(node, (child) => {
-                    collectFile(file, sourceFile, child, false);
-                });
-            }
+    const collectFile = (file, sourceFile, node, scopeStack = []) => {
+        const scopeKey = getScopeKey(file, scopeStack);
+        for (const declaration of collectDeclarationNames(node)) {
+            addDuplicateDeclaration(scopeKey, declaration.name, file, sourceFile, declaration.positionNode);
+        }
+        if (isScopeNode(node)) {
+            const nextScopeStack = [
+                ...scopeStack,
+                getScopeNodeLabel(sourceFile, node, node.getStart(sourceFile)),
+            ];
+            ts6.forEachChild(node, (child) => {
+                collectFile(file, sourceFile, child, nextScopeStack);
+            });
             return;
         }
         ts6.forEachChild(node, (child) => {
-            collectFile(file, sourceFile, child, isGlobalScope);
+            collectFile(file, sourceFile, child, scopeStack);
         });
     };
     for (const dep of deps) {
         const sourceFile = bundledSourceFile(dep.file, dep.content);
-        collectFile(dep.file, sourceFile, sourceFile, true);
+        collectFile(dep.file, sourceFile, sourceFile);
     }
     return duplicateNameMap;
 };
 const checkDuplicates = (tree, bundledSourceFile) => {
     let _err = false;
     const duplicateNameMap = collectDuplicateDeclarations(tree.depFiles, bundledSourceFile);
-    duplicateNameMap.forEach((files, name) => {
-        if (files.size > 1) {
+    duplicateNameMap.forEach(({ name, locations }) => {
+        if (locations.size > 1) {
             _err = true;
             console.warn(tcolor.yellow("[susee:error]"));
             console.warn("  Duplicate declarations found in your dependencies tree as follows:");
             console.warn(`  - "${tcolor.magenta(name)}" declared in multiple files : `);
-            files.forEach((f) => console.warn(`    - ${f.file}:${f.line}:${f.column}`));
+            locations.forEach((f) => console.warn(`    - ${f.file}:${f.line}:${f.column}`));
             console.info("Please rename these with different names to avoid duplicate declarations.");
         }
     });
@@ -2381,7 +2417,7 @@ async function bundle(entry) {
     return await bundler(entry);
 }
 //package.json
-const __jsonModule__package = { "name": "susee", "version": "1.6.0", "description": "TypeScript-first bundler for library packages", "type": "module", "main": "dist/index.cjs", "types": "dist/index.d.cts", "module": "dist/index.mjs", "exports": { ".": { "import": { "types": "./dist/index.d.mts", "default": "./dist/index.mjs" }, "require": { "types": "./dist/index.d.cts", "default": "./dist/index.cjs" } } }, "bin": { "susee": "bin/susee" }, "scripts": { "build": "tsx build.ts", "lint": "biome lint ./src ./__tests__  --write", "fmt": "biome format --write", "test": "tsx --test", "coverage": "npx tsx --test --experimental-test-coverage --test-reporter=lcov --test-reporter-destination=__tests__/coverage/lcov.info", "hooks:install": "bash scripts/install-hooks.sh", "commit": "bash scripts/commit.sh", "v:patch": "npm version patch --no-git-tag-version", "v:minor": "npm version minor --no-git-tag-version", "v:major": "npm version major --no-git-tag-version", "vercel:install": "npm i mmcov shiki tsx && bundle install", "vercel:build": "bash scripts/vercel_build.sh", "docs:dev": "bundle exec jekyll serve --profile", "docs:init": "bash scripts/setup.sh" }, "keywords": ["bundler", "susee", "suseejs"], "author": { "name": "Pho Thin Mg", "email": "phothinmg@disroot.org", "url": "https://phothinmg.github.io/" }, "license": "Apache-2.0", "files": ["package.json", "README.md", "LICENSE", "dist/**/*", "bin/**/*"], "publishConfig": { "provenance": true, "access": "public" }, "repository": { "url": "git+https://github.com/phothinmg/susee.git", "type": "git" }, "homepage": "https://susee.js.org/", "bugs": { "url": "https://github.com/phothinmg/susee/issues" }, "dependencies": { "@suseejs/color": "^0.0.9", "@suseejs/ts6": "^1.0.0", "mmcov": "^0.0.8", "shiki": "^4.3.1" }, "devDependencies": { "@biomejs/biome": "^2.4.12", "@suseejs/banner-text-plugin": "^0.0.9", "@suseejs/terser-plugin": "^0.0.9", "@suseejs/type": "^0.0.9", "@types/node": "^25.6.0", "tsx": "^4.21.0", "typescript": "^7.0.2" }, "allowScripts": { "esbuild@0.28.1": true } };
+const __jsonModule__package = { "name": "susee", "version": "1.6.2", "description": "TypeScript-first bundler for library packages", "type": "module", "main": "dist/index.cjs", "types": "dist/index.d.cts", "module": "dist/index.mjs", "exports": { ".": { "import": { "types": "./dist/index.d.mts", "default": "./dist/index.mjs" }, "require": { "types": "./dist/index.d.cts", "default": "./dist/index.cjs" } } }, "bin": { "susee": "bin/susee" }, "scripts": { "build": "tsx build.ts", "lint": "biome lint ./src ./__tests__  --write", "fmt": "biome format --write", "test": "tsx --test", "hooks:install": "bash scripts/install-hooks.sh", "commit": "bash scripts/commit.sh", "v:patch": "npm version patch --no-git-tag-version", "v:minor": "npm version minor --no-git-tag-version", "v:major": "npm version major --no-git-tag-version" }, "keywords": ["bundler", "susee", "suseejs"], "author": "Pho Thin Mg <phothinmg@disroot.org> (https://phothinmg.github.io/)", "license": "Apache-2.0", "files": ["package.json", "README.md", "LICENSE", "dist/**/*", "bin/**/*"], "publishConfig": { "provenance": true, "access": "public" }, "repository": { "url": "git+https://github.com/phothinmg/susee.git", "type": "git" }, "homepage": "https://susee.js.org/", "bugs": { "url": "https://github.com/phothinmg/susee/issues" }, "dependencies": { "@suseejs/color": "^0.0.9", "@suseejs/ts6": "^1.0.0" }, "devDependencies": { "@biomejs/biome": "^2.4.12", "@suseejs/banner-text-plugin": "^0.0.9", "@suseejs/type": "^0.0.9", "@types/node": "^25.6.0", "tsx": "^4.23.1", "typescript": "^7.0.2" }, "allowScripts": { "esbuild@0.28.1": true }, "workspaces": ["susee-docs"] };
 /**
  * Finds the path of the susee.config file if it exists.
  * It checks for the existence of "susee.config.ts", "susee.config.js", and "susee.config.mjs" in the current working directory.