@vltpkg/cli-sdk 1.0.0-rc.31 → 1.0.0-rc.32

package/dist/commands/token.js

@@ -133,6 +133,7 @@ const listTokens = async (rc, registry, identity, alias) => {
 export const command = async (conf) => {
     const reg = normalizeRegistryKey(conf.options.registry);
     switch (conf.positionals[0]) {
+        case 'ls':
         case 'list': {
             const rc = new RegistryClient(conf.options);
             const identity = conf.options.identity;
@@ -171,6 +172,7 @@ export const command = async (conf) => {
             await setToken(reg, `Bearer ${await readPassword('Paste bearer token: ')}`, conf.options.identity);
             break;
         }
+        case 'remove':
         case 'rm': {
             await deleteToken(reg, conf.options.identity);
             break;
@@ -178,7 +180,7 @@ export const command = async (conf) => {
         default: {
             throw error('Invalid token subcommand', {
                 found: conf.positionals[0],
-                validOptions: ['list', 'add', 'rm'],
+                validOptions: ['list', 'ls', 'add', 'rm', 'remove'],
                 code: 'EUSAGE',
             });
         }

package/dist/parse-add-remove-args.js

@@ -1,6 +1,7 @@
 import { asDependency } from '@vltpkg/graph';
-import { joinDepIDTuple } from '@vltpkg/dep-id';
+import { joinDepIDTuple, splitDepID } from '@vltpkg/dep-id';
 import { Spec } from '@vltpkg/spec';
+import { isAbsolute, relative, resolve } from 'node:path';
 const rootDepID = joinDepIDTuple(['file', '.']);
 /**
  * Compute a DepID for the current working directory relative to the project
@@ -45,6 +46,36 @@ class AddImportersDependenciesMapImpl extends Map {
 class RemoveImportersDependenciesMapImpl extends Map {
     modifiedDependencies = false;
 }
+/**
+ * Rebase a file: spec's relative path from process.cwd() to the
+ * importer's location. CLI positional args are relative to cwd,
+ * but the graph resolver resolves file: paths relative to the
+ * importer node's location. When these differ (e.g. `-w` flag),
+ * the path must be rebased.
+ *
+ * Also detects when the target path is a workspace and converts
+ * the spec to `workspace:*`.
+ */
+const rebaseFileSpec = (spec, importerPath, scurryCwd, specOptions, monorepo) => {
+    if (spec.type !== 'file' || !spec.file || isAbsolute(spec.file)) {
+        return spec;
+    }
+    const targetAbs = resolve(process.cwd(), spec.file);
+    if (monorepo) {
+        for (const ws of monorepo.values()) {
+            if (ws.fullpath === targetAbs) {
+                return Spec.parse(ws.name, 'workspace:*', specOptions);
+            }
+        }
+    }
+    const importerAbs = resolve(scurryCwd, importerPath);
+    const rebasedPath = relative(importerAbs, targetAbs)
+        .split('\\')
+        .join('/');
+    if (rebasedPath === spec.file)
+        return spec;
+    return Spec.parseArgs(rebasedPath, specOptions);
+};
 /**
  * Parses the positional arguments into {@link AddImportersDependenciesMap}.
  */
@@ -53,7 +84,6 @@ export const parseAddArgs = (config, scurry, monorepo) => {
     const items = config.positionals;
     const type = getType(config.values);
     const importers = getWorkspaceImporters(config.values, monorepo);
-    const newDependencies = new Map();
     const specOptions = config.options;
     // nameless spec definitions will need to use their full
     // stringified spec result instead of their name in order
@@ -61,21 +91,45 @@ export const parseAddArgs = (config, scurry, monorepo) => {
     const getName = (s) => s.name === '(unknown)' ? s.spec : s.name;
     // parses each positional argument into a Spec and
     // adds it to the new dependencies Map
+    const parsedItems = [];
+    let hasFileSpecs = false;
     for (const item of items) {
         const spec = Spec.parseArgs(item, specOptions);
-        newDependencies.set(getName(spec), asDependency({ spec, type }));
+        parsedItems.push({ spec, type });
+        if (spec.type === 'file')
+            hasFileSpecs = true;
         add.modifiedDependencies = true;
     }
     // assigns the new dependencies to each selected workspace importer
-    for (const importer of importers) {
-        add.set(importer, newDependencies);
+    // file: specs need per-importer rebasing since CLI paths are relative
+    // to process.cwd() but get resolved relative to the importer's location
+    if (hasFileSpecs && importers.size) {
+        const scurryCwd = scurry.cwd.fullpath();
+        for (const importer of importers) {
+            const [, importerPath] = splitDepID(importer);
+            const importerDeps = new Map();
+            for (const { spec, type: depType } of parsedItems) {
+                const rebased = rebaseFileSpec(spec, importerPath, scurryCwd, specOptions, monorepo);
+                importerDeps.set(getName(rebased), asDependency({ spec: rebased, type: depType }));
+            }
+            add.set(importer, importerDeps);
+        }
     }
-    // if no workspaces were selected, default to the cwd importer which
-    // can be either the root or a nested folder in case the user is installing
-    // from a subfolder that is also a file: type dependency
-    if (!importers.size) {
-        const cwdDepID = getCwdDepID(scurry);
-        add.set(cwdDepID, newDependencies);
+    else {
+        const newDependencies = new Map();
+        for (const { spec, type: depType } of parsedItems) {
+            newDependencies.set(getName(spec), asDependency({ spec, type: depType }));
+        }
+        for (const importer of importers) {
+            add.set(importer, newDependencies);
+        }
+        // if no workspaces were selected, default to the cwd importer which
+        // can be either the root or a nested folder in case the user is installing
+        // from a subfolder that is also a file: type dependency
+        if (!importers.size) {
+            const cwdDepID = getCwdDepID(scurry);
+            add.set(cwdDepID, newDependencies);
+        }
     }
     return {
         add,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vltpkg/cli-sdk",
   "description": "The source for the vlt CLI",
-  "version": "1.0.0-rc.31",
+  "version": "1.0.0-rc.32",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vltpkg/vltpkg.git",
@@ -14,30 +14,30 @@
   },
   "dependencies": {
     "@resvg/resvg-wasm": "^2.6.2",
-    "@vltpkg/config": "1.0.0-rc.31",
-    "@vltpkg/dep-id": "1.0.0-rc.31",
-    "@vltpkg/dot-prop": "1.0.0-rc.31",
-    "@vltpkg/error-cause": "1.0.0-rc.31",
-    "@vltpkg/git": "1.0.0-rc.31",
-    "@vltpkg/graph": "1.0.0-rc.31",
-    "@vltpkg/graph-run": "1.0.0-rc.31",
-    "@vltpkg/init": "1.0.0-rc.31",
-    "@vltpkg/output": "1.0.0-rc.31",
-    "@vltpkg/package-info": "1.0.0-rc.31",
-    "@vltpkg/package-json": "1.0.0-rc.31",
-    "@vltpkg/promise-spawn": "1.0.0-rc.31",
-    "@vltpkg/query": "1.0.0-rc.31",
-    "@vltpkg/registry-client": "1.0.0-rc.31",
-    "@vltpkg/rollback-remove": "1.0.0-rc.31",
-    "@vltpkg/run": "1.0.0-rc.31",
-    "@vltpkg/security-archive": "1.0.0-rc.31",
-    "@vltpkg/spec": "1.0.0-rc.31",
-    "@vltpkg/types": "1.0.0-rc.31",
-    "@vltpkg/url-open": "1.0.0-rc.31",
-    "@vltpkg/vlt-json": "1.0.0-rc.31",
-    "@vltpkg/vlx": "1.0.0-rc.31",
-    "@vltpkg/workspaces": "1.0.0-rc.31",
-    "@vltpkg/xdg": "1.0.0-rc.31",
+    "@vltpkg/config": "1.0.0-rc.32",
+    "@vltpkg/dep-id": "1.0.0-rc.32",
+    "@vltpkg/dot-prop": "1.0.0-rc.32",
+    "@vltpkg/error-cause": "1.0.0-rc.32",
+    "@vltpkg/git": "1.0.0-rc.32",
+    "@vltpkg/graph": "1.0.0-rc.32",
+    "@vltpkg/graph-run": "1.0.0-rc.32",
+    "@vltpkg/init": "1.0.0-rc.32",
+    "@vltpkg/output": "1.0.0-rc.32",
+    "@vltpkg/package-info": "1.0.0-rc.32",
+    "@vltpkg/package-json": "1.0.0-rc.32",
+    "@vltpkg/promise-spawn": "1.0.0-rc.32",
+    "@vltpkg/query": "1.0.0-rc.32",
+    "@vltpkg/registry-client": "1.0.0-rc.32",
+    "@vltpkg/rollback-remove": "1.0.0-rc.32",
+    "@vltpkg/run": "1.0.0-rc.32",
+    "@vltpkg/security-archive": "1.0.0-rc.32",
+    "@vltpkg/spec": "1.0.0-rc.32",
+    "@vltpkg/types": "1.0.0-rc.32",
+    "@vltpkg/url-open": "1.0.0-rc.32",
+    "@vltpkg/vlt-json": "1.0.0-rc.32",
+    "@vltpkg/vlx": "1.0.0-rc.32",
+    "@vltpkg/workspaces": "1.0.0-rc.32",
+    "@vltpkg/xdg": "1.0.0-rc.32",
     "ansi-to-pre": "^1.0.6",
     "beautiful-mermaid": "^1.1.3",
     "chalk": "^5.6.2",