symlink-dir 5.1.0 → 5.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/LICENSE CHANGED
@@ -1,6 +1,6 @@
1
1
  The MIT License (MIT)
2
2
 
3
- Copyright (c) 2016-2022 Zoltan Kochan <z@kochan.io>
3
+ Copyright (c) 2016-2023 Zoltan Kochan <z@kochan.io>
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
package/dist/index.js CHANGED
@@ -43,7 +43,7 @@ async function forceSymlink(src, dest, opts) {
43
43
  `Details: ${mkdirError}`;
44
44
  throw mkdirError;
45
45
  }
46
- await forceSymlink(src, dest);
46
+ await forceSymlink(src, dest, opts);
47
47
  return { reused: false };
48
48
  case 'EEXIST':
49
49
  case 'EISDIR':
@@ -64,18 +64,28 @@ async function forceSymlink(src, dest, opts) {
64
64
  catch (err) {
65
65
  // Dest is not a link
66
66
  const parentDir = path.dirname(dest);
67
- const ignore = `.ignored_${path.basename(dest)}`;
68
- await renameOverwrite(dest, path.join(parentDir, ignore));
67
+ let warn;
68
+ if (opts === null || opts === void 0 ? void 0 : opts.renameTried) {
69
+ // This is needed in order to fix a mysterious bug that sometimes happens on macOS.
70
+ // It is hard to reproduce and is described here: https://github.com/pnpm/pnpm/issues/5909#issuecomment-1400066890
71
+ await fs_1.promises.unlink(dest);
72
+ warn = `Symlink wanted name was occupied by directory or file. Old entity removed: "${parentDir}${path.sep}{${path.basename(dest)}".`;
73
+ }
74
+ else {
75
+ const ignore = `.ignored_${path.basename(dest)}`;
76
+ await renameOverwrite(dest, path.join(parentDir, ignore));
77
+ warn = `Symlink wanted name was occupied by directory or file. Old entity moved: "${parentDir}${path.sep}{${path.basename(dest)} => ${ignore}".`;
78
+ }
69
79
  return {
70
- ...await forceSymlink(src, dest),
71
- warn: `Symlink wanted name was occupied by directory or file. Old entity moved: "${parentDir}${path.sep}{${path.basename(dest)} => ${ignore}}".`,
80
+ ...await forceSymlink(src, dest, { ...opts, renameTried: true }),
81
+ warn,
72
82
  };
73
83
  }
74
84
  if (src === linkString) {
75
85
  return { reused: true };
76
86
  }
77
87
  await fs_1.promises.unlink(dest);
78
- return await forceSymlink(src, dest);
88
+ return await forceSymlink(src, dest, opts);
79
89
  }
80
90
  // for backward compatibility
81
91
  symlinkDir['default'] = symlinkDir;
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "symlink-dir",
3
- "version": "5.1.0",
3
+ "version": "5.1.1",
4
4
  "description": "Cross-platform directory symlinking",
5
5
  "main": "dist/index.js",
6
6
  "files": [
@@ -34,8 +34,6 @@
34
34
  "devDependencies": {
35
35
  "@types/node": "^16.18.3",
36
36
  "@types/tape": "^4.13.2",
37
- "mos": "^1.3.1",
38
- "mos-plugin-readme": "^1.0.4",
39
37
  "rimraf": "^3.0.2",
40
38
  "tape": "^5.6.1",
41
39
  "tempy": "^1.0.1",
@@ -61,9 +59,7 @@
61
59
  "scripts": {
62
60
  "pretest": "rimraf node_modules/src",
63
61
  "test": "ts-node test",
64
- "test-md": "mos t",
65
62
  "premd": "rimraf node_modules/src && npm run tsc",
66
- "md": "mos",
67
63
  "tsc": "rimraf dist && tsc"
68
64
  }
69
65
  }