@opencode-ai/util 0.0.0-next-17430 → 0.0.0-next-17444

package/dist/global-roots.js

@@ -1,13 +1,17 @@
 import os from "os";
 import path from "path";
-import { xdgCache, xdgConfig, xdgData, xdgState } from "xdg-basedir";
+const home = os.homedir();
+const data = process.env.XDG_DATA_HOME || (home ? path.join(home, ".local", "share") : undefined);
+const cache = process.env.XDG_CACHE_HOME || (home ? path.join(home, ".cache") : undefined);
+const config = process.env.XDG_CONFIG_HOME || (home ? path.join(home, ".config") : undefined);
+const state = process.env.XDG_STATE_HOME || (home ? path.join(home, ".local", "state") : undefined);
 /** The XDG base directories that root opencode's global paths. */
 export function roots(app) {
     return {
-        data: path.join(xdgData, app),
-        cache: path.join(xdgCache, app),
-        config: path.join(xdgConfig, app),
-        state: path.join(xdgState, app),
+        data: path.join(data, app),
+        cache: path.join(cache, app),
+        config: path.join(config, app),
+        state: path.join(state, app),
         tmp: path.join(os.tmpdir(), app),
     };
 }

package/dist/npm-config.js

@@ -1,12 +1,13 @@
 export * as NpmConfig from "./npm-config.js";
 import { fileURLToPath } from "url";
-// @ts-expect-error npm does not publish types for this internal config API.
-import Config from "@npmcli/config";
-// @ts-expect-error npm does not publish types for this internal config API.
-import { definitions, flatten, nerfDarts, shorthands } from "@npmcli/config/lib/definitions/index.js";
 import { Effect } from "effect";
 export const load = (dir) => Effect.tryPromise({
     try: async () => {
+        // @ts-expect-error npm does not publish types for this internal config API.
+        const { default: Config } = await import("@npmcli/config");
+        // @ts-expect-error npm does not publish types for this internal config API.
+        const { default: npmDefinitions } = await import("@npmcli/config/lib/definitions/index.js");
+        const { definitions, flatten, nerfDarts, shorthands } = npmDefinitions;
         const config = new Config({
             // Resolved per call: on workerd import.meta.url is undefined and building
             // this URL at module scope fails startup validation; npm config never runs there.

package/dist/npm.d.ts

@@ -17,12 +17,6 @@ export interface Interface {
     readonly add: (pkg: string, options?: {
         readonly subpaths?: readonly string[];
     }) => Effect.Effect<EntryPoint, InstallFailedError | EffectFlock.LockError>;
-    readonly install: (dir: string, input?: {
-        add: {
-            name: string;
-            version?: string;
-        }[];
-    }) => Effect.Effect<void, EffectFlock.LockError | InstallFailedError>;
     readonly which: (pkg: string, bin?: string) => Effect.Effect<string | undefined>;
 }
 declare const Service_base: Context.ServiceClass<Service, "@opencode/Npm", Interface>;
@@ -30,6 +24,5 @@ export declare class Service extends Service_base {
 }
 export declare function sanitize(pkg: string): string;
 export declare const node: LayerNode.Node<Service, never, LayerNode.Tag<"global">>;
-export declare function install(...args: Parameters<Interface["install"]>): Promise<void>;
 export declare function add(...args: Parameters<Interface["add"]>): Promise<EntryPoint>;
 export declare function which(...args: Parameters<Interface["which"]>): Promise<string | undefined>;

package/dist/npm.js

@@ -1,6 +1,5 @@
 export * as Npm from "./npm.js";
 import path from "path";
-import npa from "npm-package-arg";
 import { Effect, Schema, Context, Layer, Option, FileSystem } from "effect";
 import * as NodeFileSystem from "@effect/platform-node/NodeFileSystem";
 import { FSUtil } from "./fs-util.js";
@@ -78,6 +77,7 @@ const layer = Layer.effect(Service, Effect.gen(function* () {
         attributes: input,
     }));
     const add = Effect.fn("Npm.add")(function* (pkg, options) {
+        const { default: npa } = yield* Effect.promise(() => import("npm-package-arg"));
         const dir = directory(pkg);
         const name = (() => {
             try {
@@ -100,48 +100,6 @@ const layer = Layer.effect(Service, Effect.gen(function* () {
         }
         return resolveEntryPoint(first.name, first.path, options?.subpaths);
     }, Effect.scoped);
-    const install = Effect.fn("Npm.install")(function* (dir, input) {
-        const canWrite = yield* afs.access(dir, { writable: true }).pipe(Effect.as(true), Effect.orElseSucceed(() => false));
-        if (!canWrite)
-            return;
-        const add = input?.add.map((pkg) => [pkg.name, pkg.version].filter(Boolean).join("@")) ?? [];
-        if (yield* Effect.gen(function* () {
-            const nodeModulesExists = yield* afs.existsSafe(path.join(dir, "node_modules"));
-            if (!nodeModulesExists) {
-                yield* reify({ add, dir });
-                return true;
-            }
-            return false;
-        }).pipe(Effect.withSpan("Npm.checkNodeModules")))
-            return;
-        yield* Effect.gen(function* () {
-            const pkg = yield* afs.readJson(path.join(dir, "package.json")).pipe(Effect.orElseSucceed(() => ({})));
-            const lock = yield* afs.readJson(path.join(dir, "package-lock.json")).pipe(Effect.orElseSucceed(() => ({})));
-            const pkgAny = pkg;
-            const lockAny = lock;
-            const declared = new Set([
-                ...Object.keys(pkgAny?.dependencies || {}),
-                ...Object.keys(pkgAny?.devDependencies || {}),
-                ...Object.keys(pkgAny?.peerDependencies || {}),
-                ...Object.keys(pkgAny?.optionalDependencies || {}),
-                ...(input?.add || []).map((pkg) => pkg.name),
-            ]);
-            const root = lockAny?.packages?.[""] || {};
-            const locked = new Set([
-                ...Object.keys(root?.dependencies || {}),
-                ...Object.keys(root?.devDependencies || {}),
-                ...Object.keys(root?.peerDependencies || {}),
-                ...Object.keys(root?.optionalDependencies || {}),
-            ]);
-            for (const name of declared) {
-                if (!locked.has(name)) {
-                    yield* reify({ dir, add });
-                    return;
-                }
-            }
-        }).pipe(Effect.withSpan("Npm.checkDirty"));
-        return;
-    }, Effect.scoped);
     const which = Effect.fn("Npm.which")(function* (pkg, bin) {
         const dir = directory(pkg);
         const binDir = path.join(dir, "node_modules", ".bin");
@@ -186,7 +144,6 @@ const layer = Layer.effect(Service, Effect.gen(function* () {
     });
     return Service.of({
         add,
-        install,
         which,
     });
 }));
@@ -196,9 +153,6 @@ export const node = makeGlobalNode({
     deps: [FSUtil.node, Global.node, filesystem, EffectFlock.node],
 });
 const { runPromise } = makeRuntime(Service, LayerNode.compile(node));
-export async function install(...args) {
-    return runPromise((svc) => svc.install(...args));
-}
 export async function add(...args) {
     return runPromise((svc) => svc.add(...args));
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/util",
-  "version": "0.0.0-next-17430",
+  "version": "0.0.0-next-17444",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -58,8 +58,7 @@
     "mime-types": "3.0.2",
     "minimatch": "10.2.5",
     "npm-package-arg": "13.0.2",
-    "resolve.exports": "2.0.3",
-    "xdg-basedir": "5.1.0"
+    "resolve.exports": "2.0.3"
   },
   "devDependencies": {
     "@tsconfig/bun": "1.0.9",