Merge 4a5c670 into 99c9c22

.github/workflows/ci.yml

@@ -21,11 +21,12 @@ jobs:
         os:
           - macos-latest
           - ubuntu-latest
+          - windows-latest
 
     steps:
       - uses: actions/checkout@v4
       - uses: denoland/setup-deno@v1
-      - run: deno cache mod.ts
+      # - run: deno cache mod.ts
 
       - run: deno task test
           --coverage=cov_profile
@@ -47,35 +48,35 @@ jobs:
       with:
         parallel-finished: true
 
-  verify-usage-as-deno-lib:
-    # we’re checking no import-map type imports snuck in
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src
-      - uses: denoland/setup-deno@v1
-      - run: deno run --no-config --unstable src/mod.ts
+  # verify-usage-as-deno-lib:
+  #   # we’re checking no import-map type imports snuck in
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #       with:
+  #         path: src
+  #     - uses: denoland/setup-deno@v1
+  #     - run: deno run --no-config --unstable src/mod.ts
 
-  dnt:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: denoland/setup-deno@v1
-      - run: deno run -A --unstable .github/deno-to-node.ts
+  # dnt:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: denoland/setup-deno@v1
+  #     - run: deno run -A --unstable .github/deno-to-node.ts
 
-      - run: |
-          npm i
-          npm start
-        working-directory:
-          fixtures/npm-integration-test
+  #     - run: |
+  #         npm i
+  #         npm start
+  #       working-directory:
+  #         fixtures/npm-integration-test
 
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: denoland/setup-deno@v1
-      - run: deno lint
+  # lint:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: denoland/setup-deno@v1
+  #     - run: deno lint
 
   typecheck:
     runs-on: ubuntu-latest

mod.ts

@@ -9,65 +9,65 @@ export * as types from "./src/types.ts"
 import * as pkg from "./src/utils/pkg.ts"
 
 import { panic, PkgxError } from "./src/utils/error.ts"
-import useConfig from "./src/hooks/useConfig.ts"
-import useOffLicense  from "./src/hooks/useOffLicense.ts"
-import useCache from "./src/hooks/useCache.ts"
-import useCellar, { InstallationNotFoundError} from "./src/hooks/useCellar.ts"
-import useMoustaches from "./src/hooks/useMoustaches.ts"
-import usePantry, { PantryError, PantryParseError, PantryNotFoundError, PackageNotFoundError } from "./src/hooks/usePantry.ts"
-import useFetch from "./src/hooks/useFetch.ts"
-import useDownload, { DownloadError } from "./src/hooks/useDownload.ts"
-import useShellEnv from "./src/hooks/useShellEnv.ts"
-import useInventory from "./src/hooks/useInventory.ts"
-import hydrate from "./src/plumbing/hydrate.ts"
-import which from "./src/plumbing/which.ts"
-import link from "./src/plumbing/link.ts"
-import install, { ConsoleLogger } from "./src/plumbing/install.ts"
-import resolve, { ResolveError } from "./src/plumbing/resolve.ts"
-import useSync from "./src/hooks/useSync.ts"
-import run, { RunError } from "./src/porcelain/run.ts"
-import porcelain_install from "./src/porcelain/install.ts"
+// import useConfig from "./src/hooks/useConfig.ts"
+// import useOffLicense  from "./src/hooks/useOffLicense.ts"
+// import useCache from "./src/hooks/useCache.ts"
+// import useCellar, { InstallationNotFoundError} from "./src/hooks/useCellar.ts"
+// import useMoustaches from "./src/hooks/useMoustaches.ts"
+// import usePantry, { PantryError, PantryParseError, PantryNotFoundError, PackageNotFoundError } from "./src/hooks/usePantry.ts"
+// import useFetch from "./src/hooks/useFetch.ts"
+// import useDownload, { DownloadError } from "./src/hooks/useDownload.ts"
+// import useShellEnv from "./src/hooks/useShellEnv.ts"
+// import useInventory from "./src/hooks/useInventory.ts"
+// import hydrate from "./src/plumbing/hydrate.ts"
+// import which from "./src/plumbing/which.ts"
+// import link from "./src/plumbing/link.ts"
+// import install, { ConsoleLogger } from "./src/plumbing/install.ts"
+// import resolve, { ResolveError } from "./src/plumbing/resolve.ts"
+// import useSync from "./src/hooks/useSync.ts"
+// import run, { RunError } from "./src/porcelain/run.ts"
+// import porcelain_install from "./src/porcelain/install.ts"
 
 const utils = {
-  pkg, host, flatmap, validate, panic, ConsoleLogger
+  pkg, host, flatmap, validate, panic, //ConsoleLogger
 }
 
-const hooks = {
-  useCache,
-  useCellar,
-  useConfig,
-  useDownload,
-  useFetch,
-  useInventory,
-  useMoustaches,
-  useOffLicense,
-  usePantry,
-  useShellEnv,
-  useSync,
-}
+// const hooks = {
+//   useCache,
+//   useCellar,
+//   useConfig,
+//   useDownload,
+//   useFetch,
+//   useInventory,
+//   useMoustaches,
+//   useOffLicense,
+//   usePantry,
+//   useShellEnv,
+//   useSync,
+// }
 
-const plumbing = {
-  hydrate,
-  link,
-  install,
-  resolve,
-  which
-}
+// const plumbing = {
+//   hydrate,
+//   link,
+//   install,
+//   resolve,
+//   which
+// }
 
-const porcelain = {
-  install: porcelain_install,
-  run
-}
+// const porcelain = {
+//   install: porcelain_install,
+//   run
+// }
 
 export {
-  utils, hooks, plumbing, porcelain,
+  utils, //hooks, plumbing, porcelain,
   semver,
   PkgxError,
-    RunError,
-    ResolveError,
-    PantryError, PantryParseError, PantryNotFoundError, PackageNotFoundError,
-    InstallationNotFoundError,
-    DownloadError
+    // RunError,
+    // ResolveError,
+    // PantryError, PantryParseError, PantryNotFoundError, PackageNotFoundError,
+    // InstallationNotFoundError,
+    // DownloadError
 }
 
 /// export types

src/hooks/useCellar.test.ts

@@ -1,14 +1,15 @@
 import { assertEquals, assertRejects } from "deno/assert/mod.ts"
 import SemVer, * as semver from "../utils/semver.ts"
 import { useTestConfig } from "./useTestConfig.ts"
-import install from "../plumbing/install.ts"
 import useCellar from "./useCellar.ts"
 
 Deno.test("useCellar.resolve()", async () => {
   useTestConfig()
 
-  const pkgrq = { project: "python.org", version: new SemVer("3.11.3")}
-  const installation = await install(pkgrq)
+  const pkg = { project: "python.org", version: new SemVer("3.11.3") }
+  const path = useCellar().shelf(pkg.project).join(`v${pkg.version}`).mkdir('p')
+  path.join("cant-be-empty").touch()
+  const installation = { pkg, path }
 
   await useCellar().resolve(installation)
   await useCellar().resolve(installation.pkg)
@@ -21,11 +22,13 @@ Deno.test("useCellar.resolve()", async () => {
 Deno.test("useCellar.has()", async () => {
   useTestConfig()
 
-  const rq = { project: "beyondgrep.com", version: new SemVer("3.6.0") }
+  const pkg = { project: "beyondgrep.com", version: new SemVer("3.6.0") }
 
-  assertEquals(await useCellar().has(rq), undefined)
+  assertEquals(await useCellar().has(pkg), undefined)
 
-  const installation = await install(rq)
+  const path = useCellar().shelf(pkg.project).join(`v${pkg.version}`).mkdir('p')
+  path.join("cant-be-empty").touch()
+  const installation = { pkg, path }
 
-  assertEquals(await useCellar().has(rq), installation)
+  assertEquals(await useCellar().has(pkg), installation)
 })

src/hooks/useConfig.test.ts

@@ -13,7 +13,11 @@ Deno.test("useConfig", () => {
   }
 
   config = ConfigDefault({ PKGX_PANTRY_PATH: "/foo:/bar", CI: "true" })
-  assertEquals(config.pantries.map(x => x.string), ["/foo", "/bar"])
+  if (Deno.build.os != 'windows') {
+    assertEquals(config.pantries.map(x => x.string), ["/foo", "/bar"])
+  } else {
+    assertEquals(config.pantries.map(x => x.string), ["C:\\foo", "C:\\bar"])
+  }
   assertEquals(config.options.compression, "gz")
 
   assertFalse(_internals.boolize("false"))