@definitelytyped/utils 0.1.9 → 0.1.10

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @definitelytyped/utils
 
+## 0.1.10
+
+### Patch Changes
+
+- 7b1302d: Correct npm options
+- c80c8da: Switch back to official npm libs
+
 ## 0.1.9
 
 ### Patch Changes

package/dist/io.d.ts

@@ -4,7 +4,7 @@ import { LoggerWithErrors } from "./logging";
 export declare function readFile(path: string): Promise<string>;
 export declare function readFileSync(path: string): string;
 /** If a file doesn't exist, warn and tell the step it should have been generated by. */
-export declare function readFileAndWarn(generatedBy: string, filePath: string): Promise<object>;
+export declare function readFileAndWarn(generatedBy: string, filePath: string): Promise<Record<string, unknown>>;
 export declare function readJsonSync(path: string): unknown;
 export declare function readJsonSync<T>(path: string, predicate: (parsed: unknown) => parsed is T): T;
 export declare function readJson(path: string): Promise<unknown>;

package/dist/miscellany.d.ts

@@ -3,7 +3,7 @@ export declare function tryParseJson<T>(text: string, predicate: (parsed: unknow
 export declare function parseJson<T>(text: string): unknown;
 export declare function parseJson<T>(text: string, predicate?: (parsed: unknown) => parsed is T): T;
 export declare function identity<T>(t: T): T;
-export declare function isObject(value: unknown): value is object;
+export declare function isObject(value: unknown): value is Record<string, unknown>;
 export declare function withoutStart(s: string, start: string): string | undefined;
 export declare function computeHash(content: string): string;
 export declare function isScopedPackage(packageName: string): boolean;

package/dist/npm.d.ts

@@ -1,16 +1,13 @@
 import { Logger } from "./logging";
-export declare const npmRegistryHostName = "registry.npmjs.org";
-export declare const npmRegistry = "https://registry.npmjs.org/";
 export declare const cacheDir: string;
-type NeedToFixNpmRegistryClientTypings = any;
+export interface NpmPublishClientConfig {
+    defaultTag?: string;
+}
 export declare class NpmPublishClient {
-    private readonly client;
-    private readonly auth;
-    private readonly registry;
-    static create(token: string, config?: NeedToFixNpmRegistryClientTypings): Promise<NpmPublishClient>;
+    private readonly token;
+    private readonly defaultTag;
+    static create(token: string, config?: NpmPublishClientConfig): Promise<NpmPublishClient>;
     private constructor();
-    publish(publishedDirectory: string, packageJson: {}, dry: boolean, log: Logger): Promise<void>;
+    publish(publishedDirectory: string, packageJson: Record<string, unknown>, dry: boolean, log: Logger): Promise<void>;
     tag(packageName: string, version: string, distTag: string, dry: boolean, log: Logger): Promise<void>;
-    deprecate(packageName: string, version: string, message: string): Promise<void>;
 }
-export {};

package/dist/npm.js

@@ -36,81 +36,55 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NpmPublishClient = exports.cacheDir = exports.npmRegistry = exports.npmRegistryHostName = void 0;
+exports.NpmPublishClient = exports.cacheDir = void 0;
 const os = __importStar(require("os"));
 const process_1 = __importDefault(require("process"));
 const fs_1 = __importDefault(require("fs"));
-const npm_registry_client_1 = __importDefault(require("@qiwi/npm-registry-client"));
-const url_1 = require("url");
+const libnpmpublish_1 = require("libnpmpublish");
+const npm_registry_fetch_1 = __importDefault(require("npm-registry-fetch"));
 const fs_2 = require("./fs");
 const io_1 = require("./io");
-exports.npmRegistryHostName = "registry.npmjs.org";
-exports.npmRegistry = `https://${exports.npmRegistryHostName}/`;
 exports.cacheDir = (0, fs_2.joinPaths)(process_1.default.env.GITHUB_ACTIONS ? (0, fs_2.joinPaths)(__dirname, "../../..") : os.tmpdir(), "cache");
 class NpmPublishClient {
-    client;
-    auth;
-    registry;
-    static async create(token, config) {
-        return new NpmPublishClient(new npm_registry_client_1.default(config), { token }, exports.npmRegistry);
+    token;
+    defaultTag;
+    static async create(token, config = {}) {
+        return new NpmPublishClient(token, config.defaultTag);
     }
-    constructor(client, auth, registry) {
-        this.client = client;
-        this.auth = auth;
-        this.registry = registry;
+    constructor(token, defaultTag) {
+        this.token = token;
+        this.defaultTag = defaultTag;
     }
     async publish(publishedDirectory, packageJson, dry, log) {
-        const readme = await fs_1.default.promises.readFile((0, fs_2.joinPaths)(publishedDirectory, "README.md"));
-        return new Promise((resolve, reject) => {
-            const body = (0, io_1.createTgz)(publishedDirectory, reject);
-            const metadata = { readme, ...packageJson };
-            if (dry) {
-                log(`(dry) Skip publish of ${publishedDirectory} to ${this.registry}`);
-            }
-            resolve(dry
-                ? undefined
-                : promisifyVoid((cb) => {
-                    this.client.publish(this.registry, {
-                        access: "public",
-                        auth: this.auth,
-                        metadata: metadata,
-                        body: body,
-                    }, cb);
-                }));
+        if (dry) {
+            log(`(dry) Skip publish of ${publishedDirectory}`);
+            return;
+        }
+        const readme = await fs_1.default.promises.readFile((0, fs_2.joinPaths)(publishedDirectory, "README.md"), "utf-8");
+        const tarballBuffer = await (0, io_1.streamToBuffer)((0, io_1.createTgz)(publishedDirectory, (err) => {
+            throw err;
+        }));
+        const manifest = { ...packageJson, readme };
+        await (0, libnpmpublish_1.publish)(manifest, tarballBuffer, {
+            forceAuth: { token: this.token },
+            access: "public",
+            defaultTag: this.defaultTag,
         });
     }
-    tag(packageName, version, distTag, dry, log) {
+    async tag(packageName, version, distTag, dry, log) {
         if (dry) {
             log(`(dry) Skip tag of ${packageName}@${distTag} as ${version}`);
-            return Promise.resolve();
+            return;
         }
-        return promisifyVoid((cb) => {
-            this.client.distTags.add(this.registry, { package: packageName, version, distTag, auth: this.auth }, cb);
-        });
-    }
-    deprecate(packageName, version, message) {
-        const url = (0, url_1.resolve)(exports.npmRegistry, packageName);
-        const params = {
-            message,
-            version,
-            auth: this.auth,
-        };
-        return promisifyVoid((cb) => {
-            this.client.deprecate(url, params, cb);
+        await (0, npm_registry_fetch_1.default)(`/-/package/${encodeURIComponent(packageName)}/dist-tags/${encodeURIComponent(distTag)}`, {
+            method: "PUT",
+            forceAuth: { token: this.token },
+            body: JSON.stringify(version),
+            headers: {
+                "content-type": "application/json",
+            },
         });
     }
 }
 exports.NpmPublishClient = NpmPublishClient;
-function promisifyVoid(callsBack) {
-    return new Promise((resolve, reject) => {
-        callsBack((error) => {
-            if (error) {
-                reject(error);
-            }
-            else {
-                resolve();
-            }
-        });
-    });
-}
 //# sourceMappingURL=npm.js.map

package/dist/npm.js.map

@@ -1 +1 @@
-{"version":3,"file":"npm.js","sourceRoot":"","sources":["../src/npm.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"npm.js","sourceRoot":"","sources":["../src/npm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,sDAA8B;AAC9B,4CAAoB;AACpB,iDAAwC;AACxC,4EAA0C;AAC1C,6BAAiC;AAEjC,6BAAiD;AAEpC,QAAA,QAAQ,GAAG,IAAA,cAAS,EAAC,iBAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,IAAA,cAAS,EAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;AAMxH,MAAa,gBAAgB;IAMR;IACA;IANnB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAa,EAAE,SAAiC,EAAE;QACpE,OAAO,IAAI,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IACxD,CAAC;IAED,YACmB,KAAa,EACb,UAA8B;QAD9B,UAAK,GAAL,KAAK,CAAQ;QACb,eAAU,GAAV,UAAU,CAAoB;IAC9C,CAAC;IAEJ,KAAK,CAAC,OAAO,CACX,kBAA0B,EAC1B,WAAoC,EACpC,GAAY,EACZ,GAAW;QAEX,IAAI,GAAG,EAAE,CAAC;YACR,GAAG,CAAC,yBAAyB,kBAAkB,EAAE,CAAC,CAAC;YACnD,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAA,cAAS,EAAC,kBAAkB,EAAE,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC;QAC/F,MAAM,aAAa,GAAG,MAAM,IAAA,mBAAc,EACxC,IAAA,cAAS,EAAC,kBAAkB,EAAE,CAAC,GAAG,EAAE,EAAE;YACpC,MAAM,GAAG,CAAC;QACZ,CAAC,CAAC,CACH,CAAC;QAEF,MAAM,QAAQ,GAAG,EAAE,GAAG,WAAW,EAAE,MAAM,EAAkD,CAAC;QAC5F,MAAM,IAAA,uBAAO,EAAC,QAAQ,EAAE,aAAa,EAAE;YACrC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE;YAChC,MAAM,EAAE,QAAQ;YAChB,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,WAAmB,EAAE,OAAe,EAAE,OAAe,EAAE,GAAY,EAAE,GAAW;QACxF,IAAI,GAAG,EAAE,CAAC;YACR,GAAG,CAAC,qBAAqB,WAAW,IAAI,OAAO,OAAO,OAAO,EAAE,CAAC,CAAC;YACjE,OAAO;QACT,CAAC;QAED,MAAM,IAAA,4BAAQ,EAAC,cAAc,kBAAkB,CAAC,WAAW,CAAC,cAAc,kBAAkB,CAAC,OAAO,CAAC,EAAE,EAAE;YACvG,MAAM,EAAE,KAAK;YACb,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE;YAChC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YAC7B,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAC,CAAC;IACL,CAAC;CACF;AAnDD,4CAmDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@definitelytyped/utils",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "Shared utilities for DefinitelyTyped tools",
   "homepage": "https://github.com/microsoft/DefinitelyTyped-tools/tree/main/packages/utils#readme",
   "license": "MIT",
@@ -15,18 +15,20 @@
     "url": "https://github.com/microsoft/DefinitelyTyped-tools/issues"
   },
   "dependencies": {
-    "@qiwi/npm-registry-client": "^8.9.1",
     "@types/node": "^25.1.0",
     "cachedir": "^2.4.0",
     "charm": "^1.0.2",
+    "libnpmpublish": "^11.1.3",
     "minimatch": "^10.1.1",
+    "npm-registry-fetch": "^19.1.1",
     "tar": "^7.5.7",
     "tar-stream": "^3.1.7",
     "which": "^6.0.0"
   },
   "devDependencies": {
-    "@qiwi/npm-types": "^1.0.3",
     "@types/charm": "^1.0.6",
+    "@types/libnpmpublish": "^9.0.1",
+    "@types/npm-registry-fetch": "^8.0.8",
     "@types/tar-stream": "^3.1.4",
     "@types/which": "^3.0.4"
   },