@vltpkg/cli-sdk 1.6.0 → 1.6.2

package/dist/commands/init.js

@@ -76,7 +76,7 @@ export const command = async (conf) => {
             // create the folder in case it's missing
             mkdirSync(cwd, { recursive: true });
             // run the initialization script and collect results
-            results.push(await init({ cwd }));
+            results.push(await init({ cwd, packageJson: conf.options.packageJson }));
             // Check if this workspace path is covered by existing workspace patterns
             const isMatched = Object.values(parsedWSConfig).some((group) => {
                 const { patterns, ignore } = splitNegatedPatterns(group);
@@ -136,7 +136,10 @@ export const command = async (conf) => {
         await install({ ...conf.options, allowScripts });
         return results;
     }
-    const result = await init({ cwd: process.cwd() });
+    const result = await init({
+        cwd: process.cwd(),
+        packageJson: conf.options.packageJson,
+    });
     // run install to set up node_modules and vlt-lock.json
     await install({ ...conf.options, allowScripts });
     return result;

package/dist/index.js

@@ -8,6 +8,7 @@ import { Config } from "./config/index.js";
 import { flushAndExit, outputCommand, stderr, stdout, } from "./output.js";
 import { indent } from "./print-err.js";
 import { loadCommand } from "./load-command.js";
+import { mark } from '@vltpkg/output/trace';
 const { version } = loadPackageJson(import.meta.filename, process.env.__VLT_INTERNAL_CLI_PACKAGE_JSON);
 const loadVlt = async (cwd, argv) => {
     try {
@@ -85,6 +86,7 @@ const run = async () => {
         const { dispatchRegistry } = await import("./commands/registry.js");
         await dispatchRegistry(vlt);
     }
+    mark('command', { command: vlt.command });
     const command = await loadCommand(vlt.command);
     await outputCommand(command, vlt, { start, vltVersion: version });
 };

package/dist/output.js

@@ -1,4 +1,5 @@
 import { error } from '@vltpkg/error-cause';
+import { mark } from '@vltpkg/output/trace';
 import { formatWithOptions, styleText as utilStyleText, } from 'node:util';
 import { createSupportsColor } from 'supports-color';
 import { defaultView } from "./config/definition.js";
@@ -181,7 +182,10 @@ export const outputCommand = async (cliCommand, conf, { start, vltVersion } = {
         }
         if (conf.globalRoot)
             await sweepPendingRemove(conf.globalRoot);
-        const output = await onDone(await command(conf));
+        const result = await command(conf);
+        mark('command:done');
+        const output = await onDone(result);
+        mark('view:done');
         stopRequestLog();
         const duration_ms = Date.now() - start;
         trackCommand({
@@ -208,6 +212,7 @@ export const outputCommand = async (cliCommand, conf, { start, vltVersion } = {
         // timer is unreffed so even if this is not awaited the process
         // can still exit promptly.
         await flushTelemetry();
+        mark('telemetry:flushed');
     }
     catch (err) {
         stopRequestLog();

package/dist/pack-tarball.d.ts

@@ -1,4 +1,6 @@
 import type { NormalizedManifest } from '@vltpkg/types';
+import type { Stats } from 'node:fs';
+import type { ReadEntry } from 'tar';
 import type { LoadedConfig } from './config/index.ts';
 export type PackTarballResult = {
     name: string;
@@ -27,7 +29,7 @@ export type PackTarballResult = {
  * .npmrc, vlt.json, etc.) are excluded and always-included files (package.json,
  * README, LICENSE, etc.) are included.
  */
-export declare const buildPackFilter: (manifest: NormalizedManifest, packDir: string) => ((path: string) => boolean);
+export declare const buildPackFilter: (manifest: NormalizedManifest, packDir: string) => ((path: string, entry: Stats | ReadEntry) => boolean);
 /**
  * Create a tarball from a package directory
  * @param {NormalizedManifest} manifest - The manifest of the package to pack

package/dist/pack-tarball.js

@@ -3,7 +3,7 @@ import { minimatch } from 'minimatch';
 import { error } from '@vltpkg/error-cause';
 import * as ssri from 'ssri';
 import assert from 'node:assert';
-import { existsSync, readFileSync, statSync } from 'node:fs';
+import { existsSync, readdirSync, readFileSync, statSync, } from 'node:fs';
 import { Spec } from '@vltpkg/spec';
 import { join } from 'node:path';
 import { parse, stringify } from 'polite-json';
@@ -155,7 +155,24 @@ export const buildPackFilter = (manifest, packDir) => {
             }
         }
     }
-    return (path) => {
+    // `files` entries are normalized like npm does: a leading `./` or `/`
+    // and trailing slashes are dropped, empty entries are skipped
+    const files = (manifestWithFiles.files ?? [])
+        .map(pattern => pattern.replace(/^\.?\//, '').replace(/\/+$/, ''))
+        .filter(Boolean);
+    // dirs that only partially match a `files` glob (e.g. `dist/nested` for
+    // `dist/**/*.js`) are descended, unless unreadable: npm's glob expansion
+    // skips those too
+    const isReadableDir = (dir) => {
+        try {
+            readdirSync(join(packDir, dir));
+            return true;
+        }
+        catch {
+            return false;
+        }
+    };
+    return (path, entry) => {
         const normalizedPath = path.replace(/^\.\//, '');
         if (path === '.' || normalizedPath === '') {
             return true;
@@ -173,23 +190,16 @@ export const buildPackFilter = (manifest, packDir) => {
         if (hasEmptyFilesField) {
             return false;
         }
-        if (hasFilesField && manifestWithFiles.files) {
-            return manifestWithFiles.files.some((pattern) => {
-                if (pattern.endsWith('/')) {
-                    const dirName = pattern.slice(0, -1);
-                    const globPattern = pattern.replace(/\/$/, '/**');
-                    const matchesDir = normalizedPath === dirName;
-                    const matchesContents = minimatch(normalizedPath, globPattern, { dot: true });
-                    return matchesDir || matchesContents;
-                }
-                const directMatch = minimatch(normalizedPath, pattern, {
-                    dot: true,
-                });
-                const isParentDir = pattern.includes('/') &&
-                    pattern.startsWith(normalizedPath + '/');
-                const isChildOfPattern = minimatch(normalizedPath, pattern + '/**', { dot: true });
-                return directMatch || isParentDir || isChildOfPattern;
-            });
+        if (hasFilesField) {
+            const isDir = 'isDirectory' in entry && entry.isDirectory();
+            return (files.some(pattern => minimatch(normalizedPath, pattern, { dot: true }) ||
+                minimatch(normalizedPath, `${pattern}/**`, { dot: true })) ||
+                (isDir &&
+                    files.some(pattern => minimatch(normalizedPath, pattern, {
+                        dot: true,
+                        partial: true,
+                    })) &&
+                    isReadableDir(normalizedPath)));
         }
         // Ignore-file mode: apply .npmignore or .gitignore deny patterns
         if (ig?.ignores(normalizedPath)) {

package/dist/telemetry.js

@@ -73,9 +73,16 @@ const getClient = () => {
             // call shutdown at the end so this is just a safety net.
             flushAt: 20,
             flushInterval: 10_000,
+            // one attempt, capped like flush(); failed sends resolve as 204
+            // so offline or erroring runs neither wait nor log
+            fetchRetryCount: 0,
+            requestTimeout: SHUTDOWN_TIMEOUT_MS,
+            fetch: async (url, init) => {
+                const res = await fetch(url, init).catch(() => undefined);
+                return res?.ok ? res : new Response(null, { status: 204 });
+            },
         });
         return _posthog;
-        /* c8 ignore next 4 */
     }
     catch {
         _initFailed = true;

package/package.json

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