deslop-js 0.0.15 → 0.0.16-dev.e558efe

package/dist/index.cjs

@@ -3694,7 +3694,7 @@ const toPosixPath = (filePath) => filePath.replace(/\\/g, "/");
 const collectSourceFiles = async (config) => {
 	const extensions = config.includeExtensions.length > 0 ? config.includeExtensions : DEFAULT_EXTENSIONS;
 	const extensionGlob = extensions.length === 1 ? `**/*${extensions[0]}` : `**/*{${extensions.join(",")}}`;
-	const ignorePatterns = [...DEFAULT_EXCLUSIONS, ...config.ignorePatterns];
+	const ignorePatterns = [...DEFAULT_EXCLUSIONS, ...config.ignorePatterns].map(toPosixPath);
 	const absoluteRoot = (0, node_path.resolve)(config.rootDir);
 	const mainFiles = await (0, fast_glob.default)(extensionGlob, {
 		cwd: absoluteRoot,
@@ -3711,7 +3711,7 @@ const collectSourceFiles = async (config) => {
 		dot: true,
 		onlyFiles: true
 	}) : [];
-	return [...mainFiles, ...hiddenFiles].sort().map((filePath, fileIndex) => ({
+	return [...new Set([...mainFiles, ...hiddenFiles].map(toPosixPath))].sort().map((filePath, fileIndex) => ({
 		index: fileIndex,
 		path: filePath
 	}));
@@ -7001,9 +7001,16 @@ const isConfigFile = (filePath) => {
 //#endregion
 //#region src/linker/build.ts
 const buildDependencyGraph = (inputs) => {
+	const normalizedInputs = inputs.map((input) => ({
+		...input,
+		fileId: {
+			...input.fileId,
+			path: toPosixPath(input.fileId.path)
+		}
+	}));
 	const fileIdMap = /* @__PURE__ */ new Map();
-	for (const input of inputs) fileIdMap.set(toPosixPath(input.fileId.path), input.fileId.index);
-	const modules = inputs.map((input) => ({
+	for (const input of normalizedInputs) fileIdMap.set(input.fileId.path, input.fileId.index);
+	const modules = normalizedInputs.map((input) => ({
 		fileId: input.fileId,
 		imports: input.parsed.imports,
 		exports: input.parsed.exports,
@@ -7041,7 +7048,7 @@ const buildDependencyGraph = (inputs) => {
 			if (!existingReverseEdges.includes(sourceIndex)) existingReverseEdges.push(sourceIndex);
 		} else reverseEdges.set(targetIndex, [sourceIndex]);
 	};
-	for (const input of inputs) {
+	for (const input of normalizedInputs) {
 		const sourceIndex = input.fileId.index;
 		for (const importInfo of input.parsed.imports) {
 			if (importInfo.isGlob) {
@@ -7643,8 +7650,11 @@ const collectPnpmWorkspaceOverrideMappings = (rootDir) => {
 };
 
 //#endregion
-//#region src/utils/matches-package-import-reference.ts
+//#region src/utils/escape-reg-exp.ts
 const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+
+//#endregion
+//#region src/utils/matches-package-import-reference.ts
 const matchesPackageImportReference = (content, packageName) => {
 	const escapedPackageName = escapeRegExp(packageName);
 	const subpathPattern = `(?:/[^'"]*)?`;
@@ -7657,6 +7667,13 @@ const matchesPackageImportReference = (content, packageName) => {
 	].some((pattern) => pattern.test(content));
 };
 
+//#endregion
+//#region src/utils/matches-package-token-reference.ts
+const matchesPackageTokenReference = (command, packageName) => {
+	const escapedPackageName = escapeRegExp(packageName);
+	return new RegExp(`(?:^|[\\s='"\`(,;:|&])${escapedPackageName}(?:/[^\\s'"\`]*)?(?=$|[\\s='"\`),;:|&])`).test(command);
+};
+
 //#endregion
 //#region src/report/packages.ts
 const discoverAllPackageJsonPaths = (rootDir) => {
@@ -7946,6 +7963,10 @@ const collectScriptReferencedPackages = (packageJsonPath, declaredNames, binToPa
 			if (typeof scriptCommand !== "string") continue;
 			const commandReferenced = collectCommandReferencedPackages(scriptCommand, declaredNames, binToPackage);
 			for (const packageName of commandReferenced) referenced.add(packageName);
+			for (const declaredName of declaredNames) {
+				if (referenced.has(declaredName)) continue;
+				if (matchesPackageTokenReference(scriptCommand, declaredName)) referenced.add(declaredName);
+			}
 		}
 	} catch {
 		return referenced;

package/dist/index.mjs

@@ -3663,7 +3663,7 @@ const toPosixPath = (filePath) => filePath.replace(/\\/g, "/");
 const collectSourceFiles = async (config) => {
 	const extensions = config.includeExtensions.length > 0 ? config.includeExtensions : DEFAULT_EXTENSIONS;
 	const extensionGlob = extensions.length === 1 ? `**/*${extensions[0]}` : `**/*{${extensions.join(",")}}`;
-	const ignorePatterns = [...DEFAULT_EXCLUSIONS, ...config.ignorePatterns];
+	const ignorePatterns = [...DEFAULT_EXCLUSIONS, ...config.ignorePatterns].map(toPosixPath);
 	const absoluteRoot = resolve(config.rootDir);
 	const mainFiles = await fg(extensionGlob, {
 		cwd: absoluteRoot,
@@ -3680,7 +3680,7 @@ const collectSourceFiles = async (config) => {
 		dot: true,
 		onlyFiles: true
 	}) : [];
-	return [...mainFiles, ...hiddenFiles].sort().map((filePath, fileIndex) => ({
+	return [...new Set([...mainFiles, ...hiddenFiles].map(toPosixPath))].sort().map((filePath, fileIndex) => ({
 		index: fileIndex,
 		path: filePath
 	}));
@@ -6970,9 +6970,16 @@ const isConfigFile = (filePath) => {
 //#endregion
 //#region src/linker/build.ts
 const buildDependencyGraph = (inputs) => {
+	const normalizedInputs = inputs.map((input) => ({
+		...input,
+		fileId: {
+			...input.fileId,
+			path: toPosixPath(input.fileId.path)
+		}
+	}));
 	const fileIdMap = /* @__PURE__ */ new Map();
-	for (const input of inputs) fileIdMap.set(toPosixPath(input.fileId.path), input.fileId.index);
-	const modules = inputs.map((input) => ({
+	for (const input of normalizedInputs) fileIdMap.set(input.fileId.path, input.fileId.index);
+	const modules = normalizedInputs.map((input) => ({
 		fileId: input.fileId,
 		imports: input.parsed.imports,
 		exports: input.parsed.exports,
@@ -7010,7 +7017,7 @@ const buildDependencyGraph = (inputs) => {
 			if (!existingReverseEdges.includes(sourceIndex)) existingReverseEdges.push(sourceIndex);
 		} else reverseEdges.set(targetIndex, [sourceIndex]);
 	};
-	for (const input of inputs) {
+	for (const input of normalizedInputs) {
 		const sourceIndex = input.fileId.index;
 		for (const importInfo of input.parsed.imports) {
 			if (importInfo.isGlob) {
@@ -7612,8 +7619,11 @@ const collectPnpmWorkspaceOverrideMappings = (rootDir) => {
 };
 
 //#endregion
-//#region src/utils/matches-package-import-reference.ts
+//#region src/utils/escape-reg-exp.ts
 const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+
+//#endregion
+//#region src/utils/matches-package-import-reference.ts
 const matchesPackageImportReference = (content, packageName) => {
 	const escapedPackageName = escapeRegExp(packageName);
 	const subpathPattern = `(?:/[^'"]*)?`;
@@ -7626,6 +7636,13 @@ const matchesPackageImportReference = (content, packageName) => {
 	].some((pattern) => pattern.test(content));
 };
 
+//#endregion
+//#region src/utils/matches-package-token-reference.ts
+const matchesPackageTokenReference = (command, packageName) => {
+	const escapedPackageName = escapeRegExp(packageName);
+	return new RegExp(`(?:^|[\\s='"\`(,;:|&])${escapedPackageName}(?:/[^\\s'"\`]*)?(?=$|[\\s='"\`),;:|&])`).test(command);
+};
+
 //#endregion
 //#region src/report/packages.ts
 const discoverAllPackageJsonPaths = (rootDir) => {
@@ -7915,6 +7932,10 @@ const collectScriptReferencedPackages = (packageJsonPath, declaredNames, binToPa
 			if (typeof scriptCommand !== "string") continue;
 			const commandReferenced = collectCommandReferencedPackages(scriptCommand, declaredNames, binToPackage);
 			for (const packageName of commandReferenced) referenced.add(packageName);
+			for (const declaredName of declaredNames) {
+				if (referenced.has(declaredName)) continue;
+				if (matchesPackageTokenReference(scriptCommand, declaredName)) referenced.add(declaredName);
+			}
 		}
 	} catch {
 		return referenced;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deslop-js",
-  "version": "0.0.15",
+  "version": "0.0.16-dev.e558efe",
   "description": "Deslop JavaScript code",
   "keywords": [
     "dead-code",