Merge pull request #90 from pkgxdev/jsr-publish

fix global declares (jsr doesn't allow them)

Author: jhheider

.github/workflows/publish-jsr.yml

@@ -22,7 +22,7 @@ jobs:
         with:
           deno-version: v2.x
       - name: dry-run
-        run: deno publish --dry-run --allow-slow-types --no-check --unstable-fs --unstable-ffi
+        run: deno publish --dry-run --unstable-fs --unstable-ffi
       - name: publish
         if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
-        run: deno publish --allow-slow-types --no-check --unstable-fs --unstable-ffi
+        run: deno publish --unstable-fs --unstable-ffi

deno.json

@@ -37,17 +37,11 @@
   "tasks": {
     "test": "deno test --parallel --unstable-fs --unstable-ffi --allow-all",
     "typecheck": "deno check ./mod.ts",
-    "publish:dry": "deno publish --dry-run --allow-slow-types --no-check --allow-dirty --unstable-fs --unstable-ffi"
+    "publish:dry": "deno publish --dry-run --allow-dirty --unstable-fs --unstable-ffi"
   },
   "lint": {
     "include": ["src/", "mod.ts"],
-    "exclude": ["**/*.test.ts", "vendor/", "src/hooks/useTestConfig.ts"],
-    "rules": {
-      // Prototype extensions (Array.compact, Promise.swallow, etc.) use
-      // `declare global`, which JSR forbids without --allow-slow-types.
-      // Explicit public return types are fixed; globals are a larger refactor.
-      "exclude": ["no-slow-types"]
-    }
+    "exclude": ["**/*.test.ts", "vendor/", "src/hooks/useTestConfig.ts"]
   },
   "test": {
     "include": ["src/"],

mod.ts

@@ -1,5 +1,4 @@
-import "./src/utils/misc.ts"
-import { flatmap, validate } from "./src/utils/misc.ts"
+import { chuzzle, compact, flatmap, insert, validate } from "./src/utils/misc.ts"
 
 import host from "./src/utils/host.ts"
 import type { SupportedArchitecture, SupportedPlatform } from "./src/utils/host.ts"
@@ -9,7 +8,7 @@ import Path from "./src/utils/Path.ts"
 export * as types from "./src/types.ts"
 import * as pkg from "./src/utils/pkg.ts"
 
-import { panic, PkgxError } from "./src/utils/error.ts"
+import { panic, PkgxError, swallow } 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"
@@ -30,7 +29,7 @@ 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, swallow, compact, insert, chuzzle
 }
 
 const hooks = {

src/hooks/useCellar.ts

@@ -1,5 +1,5 @@
 import type { Package, PackageRequirement, Installation } from "../types.ts"
-import { PkgxError } from "../utils/error.ts"
+import { PkgxError, swallow } from "../utils/error.ts"
 import * as pkgutils from "../utils/pkg.ts"
 import SemVer from "../utils/semver.ts"
 import useConfig from "./useConfig.ts"
@@ -32,7 +32,7 @@ export default function useCellar(): UseCellar {
   const keg = (pkg: Package) => shelf(pkg.project).join(`v${pkg.version}`)
 
   /// returns the `Installation` if the pkg is installed
-  const has = (pkg: Package | PackageRequirement | Path) => resolve(pkg).swallow(InstallationNotFoundError)
+  const has = (pkg: Package | PackageRequirement | Path) => swallow(resolve(pkg), InstallationNotFoundError)
 
   return {
     has,

src/hooks/useConfig.ts

@@ -1,4 +1,4 @@
-import { flatmap } from "../utils/misc.ts"
+import { compact, flatmap } from "../utils/misc.ts"
 import { deno } from "../deps.ts"
 import host from "../utils/host.ts"
 import Path from "../utils/Path.ts"
@@ -54,7 +54,7 @@ export function ConfigDefault(env: Record<string, string> = Deno.env.toObject())
   const prefix = flatmap(env['PKGX_DIR']?.trim(), x => new Path(x)) ??
     flatmap(env['XDG_DATA_HOME'], x => new Path(x).join("pkgx")) ??
     home.join('.pkgx')
-  const pantries = env['PKGX_PANTRY_PATH']?.split(SEP).compact(x => flatmap(x.trim(), x => Path.abs(x) ?? Path.cwd().join(x))) ?? []
+  const pantries = compact(env['PKGX_PANTRY_PATH']?.split(SEP) ?? [], x => flatmap(x.trim(), x => Path.abs(x) ?? Path.cwd().join(x)))
   const cache = (
     (Deno.build.os == 'linux' ? flatmap(env["XDG_CACHE_HOME"], Path.abs) : undefined)
     ?? platform_cache_default(home, env)

src/hooks/useDownload.ts

@@ -3,11 +3,11 @@ const { crypto: crypto_, streams: { writeAll } } = deno
 const { crypto } = crypto_
 import { encodeHex } from "@std/encoding"
 import { PkgxError, panic } from "../utils/error.ts"
+import { chuzzle } from "../utils/misc.ts"
 import useConfig from "./useConfig.ts"
 import useFetch from "./useFetch.ts"
 import Path from "../utils/Path.ts"
 import * as fs from "node:fs"
-import "../utils/misc.ts"
 
 interface DownloadOptions {
   src: URL
@@ -119,7 +119,7 @@ async function the_meat<T>({ src, logger, headers, dst }: DownloadOptions): Prom
 
   switch (rsp.status) {
   case 200: {
-    const sz = parseInt(rsp.headers.get("Content-Length")!).chuzzle()
+    const sz = chuzzle(parseInt(rsp.headers.get("Content-Length")!))
 
     if (logger) logger({ src, dst, total: sz })
 

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 "../utils/misc.ts"
 import useConfig from "./useConfig.ts";
 
 export interface Inventory {

src/hooks/usePantry.ts

@@ -5,8 +5,8 @@ import { provides as cache_provides, available as cache_available, runtime_env a
 import type SemVer from "../utils/semver.ts"
 import * as semver from "../utils/semver.ts"
 import useMoustaches from "./useMoustaches.ts"
-import { PkgxError } from "../utils/error.ts"
-import { validate } from "../utils/misc.ts"
+import { PkgxError, swallow } from "../utils/error.ts"
+import { compact, insert, validate } from "../utils/misc.ts"
 import * as pkgutils from "../utils/pkg.ts"
 import useConfig from "./useConfig.ts"
 import host from "../utils/host.ts"
@@ -79,7 +79,7 @@ export default function usePantry(): {
     for (const prefix of pantry_paths()) {
       for await (const path of _ls_pantry(prefix)) {
         const project = path.parent().relative({ to: prefix })
-        if (seen.insert(project).inserted) {
+        if (insert(seen, project).inserted) {
           yield { project, path }
         }
       }
@@ -149,7 +149,7 @@ export default function usePantry(): {
       }
       if (!isArray(node)) throw new PantryParseError(project)
 
-      return node.compact(x => {
+      return compact(node, x => {
         if (isPlainObject(x)) {
           x = x["executable"]
         }
@@ -241,7 +241,7 @@ export default function usePantry(): {
         rv.push(proj)
         continue
       }
-      const yaml = await proj.yaml().swallow()
+      const yaml = await swallow(proj.yaml())
       if (!yaml) {
         console.warn("warn: parse failure:", pkg.project)
       } else if (yaml["display-name"]?.toLowerCase() == name) {
@@ -315,8 +315,7 @@ export function parse_pkgs_node(node: any): PackageRequirement[] {
   node = validate.obj(node)
   platform_reduce(node)
 
-  return Object.entries(node)
-    .compact(([project, constraint]) =>
+  return compact(Object.entries(node), ([project, constraint]) =>
       validatePackageRequirement(project, constraint))
 }
 

src/hooks/useShellEnv.ts

@@ -1,4 +1,5 @@
 import type { Installation } from "../types.ts"
+import { insert } from "../utils/misc.ts"
 import usePantry from "./usePantry.ts"
 import host from "../utils/host.ts"
 
@@ -64,7 +65,7 @@ async function map({installations}: Options): Promise<Record<string, string[]>>
 
   for (const installation of installations) {
 
-    if (!seen.insert(installation.pkg.project).inserted) {
+    if (!insert(seen, installation.pkg.project).inserted) {
       console.warn("pkgx: env is being duped:", installation.pkg.project)
     }
 

src/plumbing/hydrate.ts

@@ -1,4 +1,5 @@
 import type { PackageRequirement, Package } from "../types.ts"
+import { compact } from "../utils/misc.ts"
 import * as semver from "../utils/semver.ts"
 import usePantry from "../hooks/usePantry.ts"
 import { is_what } from "../deps.ts"
@@ -144,7 +145,7 @@ export default async function hydrate(
   pkgs.push(...additional)
 
   //TODO strictly we need to record precisely the bootstrap version constraint
-  const bootstrap_required = new Set(pkgs.compact(({project}) => bootstrap.has(project) && project))
+  const bootstrap_required = new Set(compact(pkgs, ({project}) => bootstrap.has(project) && project))
 
   return {
     pkgs,