bend-lint 0.2.0 → 0.2.1

package/README.md

@@ -128,7 +128,7 @@ A rule is a file in `bend-lint-rules/`. It imports bend-lint's rule API from Ben
 
 ```
 import Base
-import bend-lint-api@0.2.0.0/linter/lint.bend as Lint
+import bend-lint-api@0.2.1.0/linter/lint.bend as Lint
 
 def rule() -> Lint.Rule:
   ...

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "bend-lint",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Diagnostics for Bend 2 from rules outside the language: source text, and the checker's types",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MattCozendey/bend-lint.git"
+  },
   "bin": {
     "bend-lint": "src/linter/seam.ts"
   },
@@ -11,7 +15,7 @@
     "bun": "1.4.4"
   },
   "bendRelease": "bendlang/bend/v2.0.39",
-  "bendWindows": "MattCozendey/bend/126afd6cbded7e392302b41d2504083ad26b40c1",
+  "bendWindows": "MattCozendey/bend/676492b71a3020e2be5630b6ed3afbe0ccc06da8",
   "scripts": {
     "postinstall": "bun ./src/linter/seam.ts postinstall"
   }

package/src/files/main.bend

@@ -1,6 +1,6 @@
 import Base
-import bend-lint-api@0.2.0.0/shared/lists.bend as Lists
-import bend-lint-api@0.2.0.0/shared/strings.bend as Strings
+import bend-lint-api@0.2.1.0/shared/lists.bend as Lists
+import bend-lint-api@0.2.1.0/shared/strings.bend as Strings
 
 # Types
 # =====

package/src/json/main.bend

@@ -1,6 +1,6 @@
 import Base
-import bend-lint-api@0.2.0.0/shared/names.bend as Names
-import bend-lint-api@0.2.0.0/shared/strings.bend as Strings
+import bend-lint-api@0.2.1.0/shared/names.bend as Names
+import bend-lint-api@0.2.1.0/shared/strings.bend as Strings
 
 # Types
 # =====

package/src/linter/cli.bend

@@ -2,13 +2,13 @@
 import Base
 import ../files/main.bend as Files
 import ../json/main.bend as Json
-import bend-lint-api@0.2.0.0/shared/lists.bend as Lists
-import bend-lint-api@0.2.0.0/shared/names.bend as Names
-import bend-lint-api@0.2.0.0/shared/sets.bend as Sets
+import bend-lint-api@0.2.1.0/shared/lists.bend as Lists
+import bend-lint-api@0.2.1.0/shared/names.bend as Names
+import bend-lint-api@0.2.1.0/shared/sets.bend as Sets
 import ../text/main.bend as Text
 import ./directives.bend as Directives
 import ./fixes.bend as Fixes
-import bend-lint-api@0.2.0.0/linter/lint.bend as Lint
+import bend-lint-api@0.2.1.0/linter/lint.bend as Lint
 
 # Errors
 # ======

package/src/linter/directives.bend

@@ -1,9 +1,9 @@
 import Base
-import bend-lint-api@0.2.0.0/shared/lists.bend as Lists
-import bend-lint-api@0.2.0.0/shared/names.bend as Names
-import bend-lint-api@0.2.0.0/shared/strings.bend as Strings
+import bend-lint-api@0.2.1.0/shared/lists.bend as Lists
+import bend-lint-api@0.2.1.0/shared/names.bend as Names
+import bend-lint-api@0.2.1.0/shared/strings.bend as Strings
 import ../text/main.bend as Text
-import bend-lint-api@0.2.0.0/linter/lint.bend as Lint
+import bend-lint-api@0.2.1.0/linter/lint.bend as Lint
 
 # Scanning
 # ========

package/src/linter/fixes.bend

@@ -1,12 +1,12 @@
 # The fixes a run makes with `--fix-dangerously`: no fix is proven to keep the program until Bend's checker is Bend.
 import Base
 import ../files/main.bend as Files
-import bend-lint-api@0.2.0.0/shared/lists.bend as Lists
-import bend-lint-api@0.2.0.0/shared/names.bend as Names
-import bend-lint-api@0.2.0.0/shared/sets.bend as Sets
-import bend-lint-api@0.2.0.0/shared/strings.bend as Strings
+import bend-lint-api@0.2.1.0/shared/lists.bend as Lists
+import bend-lint-api@0.2.1.0/shared/names.bend as Names
+import bend-lint-api@0.2.1.0/shared/sets.bend as Sets
+import bend-lint-api@0.2.1.0/shared/strings.bend as Strings
 import ../text/main.bend as Text
-import bend-lint-api@0.2.0.0/linter/lint.bend as Lint
+import bend-lint-api@0.2.1.0/linter/lint.bend as Lint
 
 # Types
 # =====

package/src/shared/bend2.ts

@@ -18,9 +18,7 @@ import type { Result } from "./result.ts";
 import {
   getErrorMessageFromUnknown,
   tryGet,
-  tryGetJson,
   tryGetUrlFromFolderPathOrUrl,
-  tryWriteJsonAtomically,
   writeNewFileAtomically,
 } from "./utils.ts";
 
@@ -100,33 +98,19 @@ export const getClang = (): string | undefined => {
 // The line bend-lint prints when the `bend` on PATH is another version than
 // the Bend in the bend2 folder `dir`, which bend-lint checks and builds with;
 // undefined if it is the same, or if none is installed or `bend version` names
-// no version. `bend version` takes a third of a second, so its answer is kept
-// by the path, size and time of the `bend` that gave it. It runs by name:
-// Windows runs a bend.cmd only that way.
+// no version. It asks `bend version` on each run, as the `bend` on PATH can be
+// a script that runs a checkout, whose version changes while the script does
+// not. It runs by name: Windows runs a bend.cmd only that way.
 export const getBendVersionNote = async (dir: URL): Promise<string | undefined> => {
-  const bend = Bun.which("bend");
-  const stat = bend === null ? undefined : nodeFs.statSync(bend, { throwIfNoEntry: false });
-  if (bend === null || stat === undefined) {
-    return undefined;
-  }
-  const key = [bend, stat.size, stat.mtimeMs].join(" ");
-  const file = url.fileURLToPath(new URL("installed-bend.json", getBendLintCacheDir()));
-  const kept = tryGetJson(file) as { key?: string; version?: string } | undefined;
-  const version =
-    kept?.key === key
-      ? kept.version
-      : await new Promise<string | undefined>((resolve) => {
-          const resolveVersion = (e: Error | null, stdout: string): void =>
-            resolve(/^bend (\d+\.\d+\.\d+)(?:\r?\n|$)/.exec(e === null ? stdout : "")?.[1]);
-          try {
-            execFile("bend", ["version"], { encoding: "utf8", timeout: 10_000 }, resolveVersion);
-          } catch (e) {
-            resolveVersion(e as Error, "");
-          }
-        });
-  if (kept?.key !== key) {
-    tryWriteJsonAtomically(file, { key, version });
-  }
+  const version = await new Promise<string | undefined>((resolve) => {
+    const resolveVersion = (e: Error | null, stdout: string): void =>
+      resolve(/^bend (\d+\.\d+\.\d+)(?:\r?\n|$)/.exec(e === null ? stdout : "")?.[1]);
+    try {
+      execFile("bend", ["version"], { encoding: "utf8", timeout: 10_000 }, resolveVersion);
+    } catch (e) {
+      resolveVersion(e as Error, "");
+    }
+  });
   const pinned = /^const VERSION = "([^"]+)";$/m.exec(
     nodeFs.readFileSync(new URL("main.ts", dir), "utf8"),
   )?.[1];

package/src/text/main.bend

@@ -1,9 +1,9 @@
 # Edits to texts, and places in them: the edits to make, spans that must not touch, and the lines and columns of
 # offsets.
 import Base
-import bend-lint-api@0.2.0.0/shared/lists.bend as Lists
-import bend-lint-api@0.2.0.0/shared/names.bend as Names
-import bend-lint-api@0.2.0.0/shared/strings.bend as Strings
+import bend-lint-api@0.2.1.0/shared/lists.bend as Lists
+import bend-lint-api@0.2.1.0/shared/names.bend as Names
+import bend-lint-api@0.2.1.0/shared/strings.bend as Strings
 
 # Edits
 # =====