Merge b41baa1 into 99c9c22

.github/workflows/ci.yml

@@ -21,6 +21,7 @@ jobs:
         os:
           - macos-latest
           - ubuntu-latest
+          - windows-latest
 
     steps:
       - uses: actions/checkout@v4
@@ -58,7 +59,13 @@ jobs:
       - run: deno run --no-config --unstable src/mod.ts
 
   dnt:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
     steps:
       - uses: actions/checkout@v4
       - uses: denoland/setup-deno@v1

deno.json

@@ -17,14 +17,16 @@
     "dnt": ".github/deno-to-node.ts"
   },
   "lint": {
-    "include": ["src/"]
+    "include": ["src/"],
+    "exclude": ["**/*.test.ts"]
   },
   "test": {
     "include": ["src/"],
     "exclude": ["dist/"]
   },
   "imports": {
     "is-what": "https://deno.land/x/is_what@v4.1.15/src/index.ts",
-    "deno/": "https://deno.land/std@0.196.0/"
+    "deno/": "https://deno.land/std@0.196.0/",
+    "outdent": "https://deno.land/x/outdent@v0.8.0/mod.ts"
   }
 }

fixtures/projects/bar.com/package.yml

@@ -0,0 +1 @@
+foo: bar

fixtures/projects/foo.com/package.yml

@@ -4,3 +4,6 @@ runtime:
 
 dependencies:
   bar.com: ^1
+
+provides:
+  - bin/foo

fixtures/projects/npmjs.com/package.yml

@@ -0,0 +1,2 @@
+provides:
+  - bin/npm

fixtures/projects/npmjs.com/provider.yml

@@ -0,0 +1,6 @@
+cmds:
+  - truffle
+  - chalk
+args:
+  chalk: npx --yes --package=chalk-cli --
+  ...: [npx, --yes, --]

fixtures/projects/python.org/package.yml

@@ -0,0 +1,9 @@
+provides:
+  - bin/python
+
+interprets:
+  extensions: py
+  args: python
+
+platforms:
+  - darwin

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/useCache.test.ts

@@ -1,12 +1,12 @@
 import { Stowage, StowageNativeBottle } from "../types.ts"
+import { useTestConfig } from "./useTestConfig.ts"
 import { assertEquals } from "deno/assert/mod.ts"
 import SemVer from "../utils/semver.ts"
-import useConfig from "./useConfig.ts"
 import useCache from "./useCache.ts"
 import host from "../utils/host.ts"
 
 Deno.test("useCache", () => {
-  const { cache } = useConfig()
+  const { cache } = useTestConfig()
   const hw = (({ platform, arch }) => `${platform}+${arch}`)(host())
 
   const stowage = StowageNativeBottle({

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

@@ -12,8 +12,15 @@ Deno.test("useConfig", () => {
     assertEquals(config.UserAgent, "libpkgx")
   }
 
-  config = ConfigDefault({ PKGX_PANTRY_PATH: "/foo:/bar", CI: "true" })
-  assertEquals(config.pantries.map(x => x.string), ["/foo", "/bar"])
+
+  const PKGX_PANTRY_PATH = Deno.build.os == 'windows' ? "C:\\foo;D:\\bar" : "/foo:/bar"
+
+  config = ConfigDefault({ PKGX_PANTRY_PATH, CI: "true" })
+  if (Deno.build.os == 'windows') {
+    assertEquals(config.pantries.map(x => x.string), ["C:\\foo", "D:\\bar"])
+  } else {
+    assertEquals(config.pantries.map(x => x.string), ["/foo", "/bar"])
+  }
   assertEquals(config.options.compression, "gz")
 
   assertFalse(_internals.boolize("false"))
@@ -34,6 +41,7 @@ Deno.test("useConfig empty PKGX_DIR is ignored", () => {
 })
 
 Deno.test("useConfig empty PKGX_PANTRY_PATH is ignored", () => {
+  const SEP = Deno.build.os == 'windows' ? ';' : ':'
   assertEquals(ConfigDefault({ PKGX_PANTRY_PATH: "" }).pantries, [])
-  assertEquals(ConfigDefault({ PKGX_PANTRY_PATH: "  : :" }).pantries, [])
+  assertEquals(ConfigDefault({ PKGX_PANTRY_PATH: `  ${SEP} ${SEP}` }).pantries, [])
 })

src/hooks/useConfig.ts

@@ -26,9 +26,11 @@ function platform_cache_default() {
   }
 }
 
+const SEP = Deno.build.os == 'windows' ? ';' : ':'
+
 export function ConfigDefault(env = Deno.env.toObject()): Config {
   const prefix = flatmap(env['PKGX_DIR']?.trim(), x => new Path(x)) ?? Path.home().join('.pkgx')
-  const pantries = env['PKGX_PANTRY_PATH']?.split(":").compact(x => flatmap(x.trim(), x => Path.abs(x) ?? Path.cwd().join(x))) ?? []
+  const pantries = env['PKGX_PANTRY_PATH']?.split(SEP).compact(x => flatmap(x.trim(), x => Path.abs(x) ?? Path.cwd().join(x))) ?? []
   const cache = (flatmap(env["XDG_CACHE_HOME"], x => new Path(x)) ?? platform_cache_default()).join("pkgx")
   const isCI = boolize(env['CI']) ?? false
   const UserAgent = flatmap(getv(), v => `libpkgx/${v}`) ?? 'libpkgx'

src/hooks/useDownload.test.ts

@@ -2,6 +2,8 @@ import { useTestConfig } from "./useTestConfig.ts"
 import { assert } from "deno/assert/mod.ts"
 import useDownload from "./useDownload.ts"
 
+//TODO don’t actually do http obv.
+
 Deno.test("etag-mtime-check", async runner => {
   useTestConfig({ PKGX_DIR: Deno.makeTempDirSync() })
 

src/hooks/useFetch.test.ts

@@ -1,20 +1,15 @@
 import { stub, assertSpyCallArgs } from "deno/testing/mock.ts"
-import useConfig, { _internals, ConfigDefault } from "./useConfig.ts"
-import useFetch from "./useFetch.ts"
+import { useTestConfig } from "./useTestConfig.ts";
+import useFetch, { _internals } from "./useFetch.ts"
 
 
 Deno.test("fetch user-agent header check", async () => {
-  /// doesn't work inside DNT because fetch is shimmed to undici
-  if (Deno.env.get("NODE")) return
-
   const UserAgent = "tests/1.2.3"
-
-  _internals.reset()
-  useConfig({...ConfigDefault(), UserAgent});
+  useTestConfig({ UserAgent })
 
   const url = "https://example.com";
   const fetchStub = stub(
-    globalThis,
+    _internals,
     "fetch",
     () => Promise.resolve(new Response("")),
   );

src/hooks/useFetch.ts

@@ -7,5 +7,9 @@ export default function useFetch(input: string | URL | Request, init?: RequestIn
   if (UserAgent) {
     requestInit.headers = { ...requestInit.headers, "User-Agent": UserAgent }
   }
-  return fetch(input, requestInit)
+  return _internals.fetch(input, requestInit)
+}
+
+export const _internals = {
+  fetch
 }

src/hooks/useInventory.ts

@@ -3,7 +3,6 @@ import { DownloadError } from "./useDownload.ts"
 import SemVer from "../utils/semver.ts"
 import useFetch from "./useFetch.ts"
 import host from "../utils/host.ts"
-import Path from "../utils/Path.ts"
 import "../utils/misc.ts"
 
 export interface Inventory {
@@ -26,10 +25,7 @@ const select = async (rq: PackageRequirement | Package) => {
 
 const get = async (rq: PackageRequirement | Package) => {
   const { platform, arch } = host()
-
-  const url = new URL('https://dist.pkgx.dev')
-  url.pathname = Path.root.join(rq.project, platform, arch, 'versions.txt').string
-
+  const url = new URL(`https://dist.pkgx.dev/${rq.project}/${platform}/${arch}/versions.txt`)
   const rsp = await useFetch(url)
 
   if (!rsp.ok) {

src/hooks/useOffLicense.ts

@@ -1,6 +1,5 @@
 import { Stowage } from "../types.ts"
 import host from "../utils/host.ts"
-import Path from "../utils/Path.ts"
 
 type Type = 's3'
 
@@ -9,18 +8,19 @@ export default function useOffLicense(_type: Type) {
 }
 
 function key(stowage: Stowage) {
-  let rv = Path.root.join(stowage.pkg.project)
+  const rv = [stowage.pkg.project]
   if (stowage.type == 'bottle') {
     const { platform, arch } = stowage.host ?? host()
-    rv = rv.join(`${platform}/${arch}`)
+    rv.push(`${platform}/${arch}`)
   }
   let fn = `v${stowage.pkg.version}`
   if (stowage.type == 'bottle') {
     fn += `.tar.${stowage.compression}`
   } else {
     fn +=  stowage.extname
   }
-  return rv.join(fn).string.slice(1)
+  rv.push(fn)
+  return rv.join("/")
 }
 
 function url(stowage: Stowage) {