@pnpm/assert-project 1.1.2 → 1.2.2

package/LICENSE

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Zoltan Kochan <z@kochan.io>
+Copyright (c) 2015-2016 Rico Sta. Cruz and other contributors
+Copyright (c) 2016-2022 Zoltan Kochan and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -2,8 +2,6 @@
 
 > Utils for testing projects that use pnpm
 
-[![npm version](https://img.shields.io/npm/v/@pnpm/assert-project.svg)](https://www.npmjs.com/package/@pnpm/assert-project) [![Build Status](https://img.shields.io/travis/pnpm/assert-project/master.svg)](https://travis-ci.org/pnpm/assert-project)
-
 ## Installation
 
 ```
@@ -27,4 +25,4 @@ test('...', t => {
 
 ## License
 
-[MIT](./LICENSE) © [Zoltan Kochan](https://www.kochan.io/)
+MIT

package/lib/index.d.ts

@@ -1,20 +1,35 @@
-/// <reference types="tape" />
+import { Lockfile, ProjectSnapshot } from '@pnpm/lockfile-types';
 import { Modules } from '@pnpm/modules-yaml';
-import { Test } from 'tape';
 import isExecutable from './isExecutable';
-export { isExecutable };
-declare const _default: (t: Test, projectPath: string, encodedRegistryName?: string | undefined) => {
-    requireModule(pkgName: string): any;
-    has(pkgName: string): Promise<void>;
-    hasNot(pkgName: string): Promise<void>;
-    getStorePath(): Promise<string>;
-    resolve(pkgName: string, version?: string | undefined, relativePath?: string | undefined): Promise<string>;
-    storeHas(pkgName: string, version?: string | undefined): Promise<void>;
-    storeHasNot(pkgName: string, version?: string | undefined): Promise<void>;
-    isExecutable(pathToExe: string): Promise<void>;
-    loadCurrentShrinkwrap(): Promise<any>;
-    loadModules: () => Promise<Modules | null>;
-    loadShrinkwrap(): Promise<any>;
-    writePackageJson(pkgJson: object): Promise<void>;
-};
+export { isExecutable, Modules };
+export declare type RawLockfile = Lockfile & Partial<ProjectSnapshot>;
+export interface Project {
+    requireModule: (moduleName: string) => any;
+    dir: () => string;
+    has: (pkgName: string, modulesDir?: string) => Promise<void>;
+    hasNot: (pkgName: string, modulesDir?: string) => Promise<void>;
+    getStorePath: () => Promise<string>;
+    resolve: (pkgName: string, version?: string, relativePath?: string) => Promise<string>;
+    getPkgIndexFilePath: (pkgName: string, version?: string) => Promise<string>;
+    cafsHas: (pkgName: string, version?: string) => Promise<void>;
+    cafsHasNot: (pkgName: string, version?: string) => Promise<void>;
+    storeHas: (pkgName: string, version?: string) => Promise<string>;
+    storeHasNot: (pkgName: string, version?: string) => Promise<void>;
+    isExecutable: (pathToExe: string) => Promise<void>;
+    /**
+     * TODO: Remove the `Required<T>` cast.
+     *
+     * https://github.com/microsoft/TypeScript/pull/32695 might help with this.
+     */
+    readCurrentLockfile: () => Promise<Required<RawLockfile>>;
+    readModulesManifest: () => Promise<Modules | null>;
+    /**
+     * TODO: Remove the `Required<T>` cast.
+     *
+     * https://github.com/microsoft/TypeScript/pull/32695 might help with this.
+     */
+    readLockfile: () => Promise<Required<RawLockfile>>;
+    writePackageJson: (pkgJson: object) => Promise<void>;
+}
+declare const _default: (projectPath: string, encodedRegistryName?: string | undefined) => Project;
 export default _default;

package/lib/index.js

@@ -1,114 +1,125 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isExecutable = void 0;
+const path_1 = __importDefault(require("path"));
+const assert_store_1 = __importDefault(require("@pnpm/assert-store"));
+const constants_1 = require("@pnpm/constants");
 const modules_yaml_1 = require("@pnpm/modules-yaml");
-const loadYamlFile = require("load-yaml-file");
-const path = require("path");
-const exists = require("path-exists");
-const writePkg = require("write-pkg");
-const isExecutable_1 = require("./isExecutable");
+const registry_mock_1 = require("@pnpm/registry-mock");
+const read_yaml_file_1 = __importDefault(require("read-yaml-file"));
+const path_exists_1 = __importDefault(require("path-exists"));
+const write_pkg_1 = __importDefault(require("write-pkg"));
+const isExecutable_1 = __importDefault(require("./isExecutable"));
 exports.isExecutable = isExecutable_1.default;
-exports.default = (t, projectPath, encodedRegistryName) => {
-    const ern = encodedRegistryName || 'localhost+4873';
-    const modules = path.join(projectPath, 'node_modules');
-    let cachedStorePath;
-    const project = {
+exports.default = (projectPath, encodedRegistryName) => {
+    const ern = encodedRegistryName !== null && encodedRegistryName !== void 0 ? encodedRegistryName : `localhost+${registry_mock_1.REGISTRY_MOCK_PORT}`;
+    const modules = path_1.default.join(projectPath, 'node_modules');
+    let cachedStore;
+    async function getStoreInstance() {
+        if (!cachedStore) {
+            const modulesYaml = await (0, modules_yaml_1.read)(modules);
+            if (modulesYaml == null) {
+                throw new Error(`Cannot find module store. No .modules.yaml found at "${modules}"`);
+            }
+            const storePath = modulesYaml.storeDir;
+            cachedStore = {
+                storePath,
+                ...(0, assert_store_1.default)(storePath, ern),
+            };
+        }
+        return cachedStore;
+    }
+    async function getVirtualStoreDir() {
+        const modulesYaml = await (0, modules_yaml_1.read)(modules);
+        if (modulesYaml == null) {
+            return path_1.default.join(modules, '.pnpm');
+        }
+        return modulesYaml.virtualStoreDir;
+    }
+    // eslint-disable-next-line
+    const ok = (value) => expect(value).toBeTruthy();
+    // eslint-disable-next-line
+    const notOk = (value) => expect(value).toBeFalsy();
+    return {
+        dir: () => projectPath,
         requireModule(pkgName) {
-            return require(path.join(modules, pkgName));
+            // eslint-disable-next-line
+            return require(path_1.default.join(modules, pkgName));
         },
-        has(pkgName) {
-            return __awaiter(this, void 0, void 0, function* () {
-                t.ok(yield exists(path.join(modules, pkgName)), `${pkgName} is in node_modules`);
-            });
+        async has(pkgName, _modulesDir) {
+            const md = _modulesDir ? path_1.default.join(projectPath, _modulesDir) : modules;
+            ok(await (0, path_exists_1.default)(path_1.default.join(md, pkgName)));
         },
-        hasNot(pkgName) {
-            return __awaiter(this, void 0, void 0, function* () {
-                t.notOk(yield exists(path.join(modules, pkgName)), `${pkgName} is not in node_modules`);
-            });
+        async hasNot(pkgName, _modulesDir) {
+            const md = _modulesDir ? path_1.default.join(projectPath, _modulesDir) : modules;
+            notOk(await (0, path_exists_1.default)(path_1.default.join(md, pkgName)));
         },
-        getStorePath() {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (!cachedStorePath) {
-                    const modulesYaml = yield modules_yaml_1.read(modules);
-                    if (!modulesYaml) {
-                        throw new Error('Cannot find module store');
-                    }
-                    cachedStorePath = modulesYaml.store;
-                }
-                return cachedStorePath;
-            });
+        async getStorePath() {
+            const store = await getStoreInstance();
+            return store.storePath;
         },
-        resolve(pkgName, version, relativePath) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const pkgFolder = version ? path.join(ern, pkgName, version) : pkgName;
-                if (relativePath) {
-                    return path.join(yield project.getStorePath(), pkgFolder, 'package', relativePath);
-                }
-                return path.join(yield project.getStorePath(), pkgFolder, 'package');
-            });
+        async resolve(pkgName, version, relativePath) {
+            const store = await getStoreInstance();
+            return store.resolve(pkgName, version, relativePath);
         },
-        storeHas(pkgName, version) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const pathToCheck = yield project.resolve(pkgName, version);
-                t.ok(yield exists(pathToCheck), `${pkgName}@${version} is in store (at ${pathToCheck})`);
-            });
+        async getPkgIndexFilePath(pkgName, version) {
+            const store = await getStoreInstance();
+            return store.getPkgIndexFilePath(pkgName, version);
         },
-        storeHasNot(pkgName, version) {
-            return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const pathToCheck = yield project.resolve(pkgName, version);
-                    t.notOk(yield exists(pathToCheck), `${pkgName}@${version} is not in store (at ${pathToCheck})`);
-                }
-                catch (err) {
-                    if (err.message === 'Cannot find module store') {
-                        t.pass(`${pkgName}@${version} is not in store`);
-                        return;
-                    }
-                    throw err;
-                }
-            });
+        async cafsHas(pkgName, version) {
+            const store = await getStoreInstance();
+            return store.cafsHas(pkgName, version);
         },
-        isExecutable(pathToExe) {
-            return isExecutable_1.default(t, path.join(modules, pathToExe));
+        async cafsHasNot(pkgName, version) {
+            const store = await getStoreInstance();
+            return store.cafsHasNot(pkgName, version);
         },
-        loadCurrentShrinkwrap() {
-            return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    return yield loadYamlFile(path.join(modules, '.shrinkwrap.yaml')); // tslint:disable-line
-                }
-                catch (err) {
-                    if (err.code === 'ENOENT')
-                        return null;
-                    throw err;
-                }
-            });
+        async storeHas(pkgName, version) {
+            const store = await getStoreInstance();
+            return store.resolve(pkgName, version);
         },
-        loadModules: () => modules_yaml_1.read(modules),
-        loadShrinkwrap() {
-            return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    return yield loadYamlFile(path.join(projectPath, 'shrinkwrap.yaml')); // tslint:disable-line
-                }
-                catch (err) {
-                    if (err.code === 'ENOENT')
-                        return null;
-                    throw err;
+        async storeHasNot(pkgName, version) {
+            try {
+                const store = await getStoreInstance();
+                return store.storeHasNot(pkgName, version);
+            }
+            catch (err) { // eslint-disable-line
+                if (err.message.startsWith('Cannot find module store')) {
+                    return;
                 }
-            });
+                throw err;
+            }
+        },
+        async isExecutable(pathToExe) {
+            return (0, isExecutable_1.default)(ok, path_1.default.join(modules, pathToExe));
+        },
+        async readCurrentLockfile() {
+            try {
+                return await (0, read_yaml_file_1.default)(path_1.default.join(await getVirtualStoreDir(), 'lock.yaml')); // eslint-disable-line
+            }
+            catch (err) { // eslint-disable-line
+                if (err.code === 'ENOENT')
+                    return null;
+                throw err;
+            }
+        },
+        readModulesManifest: async () => (0, modules_yaml_1.read)(modules),
+        async readLockfile() {
+            try {
+                return await (0, read_yaml_file_1.default)(path_1.default.join(projectPath, constants_1.WANTED_LOCKFILE)); // eslint-disable-line
+            }
+            catch (err) { // eslint-disable-line
+                if (err.code === 'ENOENT')
+                    return null;
+                throw err;
+            }
         },
-        writePackageJson(pkgJson) {
-            return __awaiter(this, void 0, void 0, function* () {
-                yield writePkg(projectPath, pkgJson);
-            });
+        async writePackageJson(pkgJson) {
+            return (0, write_pkg_1.default)(projectPath, pkgJson); // eslint-disable-line
         },
     };
-    return project;
 };
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/isExecutable.d.ts

@@ -1,4 +1,2 @@
-/// <reference types="tape" />
-import { Test } from 'tape';
-declare const _default: (t: Test, filePath: string) => Promise<void>;
+declare const _default: (ok: (value: any, comment: string) => void, filePath: string) => Promise<void>;
 export default _default;

package/lib/isExecutable.js

@@ -1,26 +1,22 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const isWindows = require("is-windows");
-const isexeCB = require("isexe");
-const fs = require("mz/fs");
-const promisify = require("util.promisify");
-const IS_WINDOWS = isWindows();
-const isexe = promisify(isexeCB);
-exports.default = (t, filePath) => __awaiter(this, void 0, void 0, function* () {
+const fs_1 = require("fs");
+const util_1 = require("util");
+const is_windows_1 = __importDefault(require("is-windows"));
+const isexe_1 = __importDefault(require("isexe"));
+const IS_WINDOWS = (0, is_windows_1.default)();
+const isexe = (0, util_1.promisify)(isexe_1.default);
+// eslint-disable-next-line
+exports.default = async (ok, filePath) => {
     if (IS_WINDOWS) {
-        t.ok(yield isexe(`${filePath}.cmd`), `${filePath}.cmd is executable`);
+        ok(await isexe(`${filePath}.cmd`), `${filePath}.cmd is executable`);
         return;
     }
-    const stat = yield fs.stat(filePath);
-    t.equal(stat.mode, parseInt('100755', 8), `${filePath} is executable`);
-    t.ok(stat.isFile(), `${filePath} refers to a file`);
-});
+    const stat = await fs_1.promises.stat(filePath);
+    ok((stat.mode & 0o111) === 0o111, `${filePath} is executable`);
+    ok(stat.isFile(), `${filePath} refers to a file`);
+};
 //# sourceMappingURL=isExecutable.js.map

package/lib/isExecutable.js.map

@@ -1 +1 @@
-{"version":3,"file":"isExecutable.js","sourceRoot":"","sources":["../src/isExecutable.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,wCAAwC;AACxC,iCAAiC;AACjC,4BAA4B;AAE5B,4CAA4C;AAE5C,MAAM,UAAU,GAAG,SAAS,EAAE,CAAA;AAC9B,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;AAEhC,kBAAe,CAAO,CAAO,EAAE,QAAgB,EAAE,EAAE;IACjD,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QACf,CAAC,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,GAAG,QAAQ,MAAM,CAAC,EAAE,GAAG,QAAQ,oBAAoB,CAAC,CAAA;QACrE,MAAM,CAAA;IACR,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACpC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,GAAG,QAAQ,gBAAgB,CAAC,CAAA;IACtE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,QAAQ,mBAAmB,CAAC,CAAA;AACrD,CAAC,CAAA,CAAA"}
+{"version":3,"file":"isExecutable.js","sourceRoot":"","sources":["../src/isExecutable.ts"],"names":[],"mappings":";;;;;AAAA,2BAAmC;AACnC,+BAAgC;AAChC,4DAAkC;AAClC,kDAA2B;AAE3B,MAAM,UAAU,GAAG,IAAA,oBAAS,GAAE,CAAA;AAC9B,MAAM,KAAK,GAAG,IAAA,gBAAS,EAAC,eAAO,CAAC,CAAA;AAEhC,2BAA2B;AAC3B,kBAAe,KAAK,EAAE,EAAyC,EAAE,QAAgB,EAAE,EAAE;IACnF,IAAI,UAAU,EAAE;QACd,EAAE,CAAC,MAAM,KAAK,CAAC,GAAG,QAAQ,MAAM,CAAC,EAAE,GAAG,QAAQ,oBAAoB,CAAC,CAAA;QACnE,OAAM;KACP;IAED,MAAM,IAAI,GAAG,MAAM,aAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACpC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,KAAK,EAAE,GAAG,QAAQ,gBAAgB,CAAC,CAAA;IAC9D,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,QAAQ,mBAAmB,CAAC,CAAA;AACnD,CAAC,CAAA"}

package/package.json

@@ -1,67 +1,54 @@
 {
   "name": "@pnpm/assert-project",
   "description": "Utils for testing projects that use pnpm",
-  "version": "1.1.2",
+  "version": "1.2.2",
   "author": {
     "name": "Zoltan Kochan",
     "email": "z@kochan.io",
     "url": "https://www.kochan.io/"
   },
   "bugs": {
-    "url": "https://github.com/pnpm/assert-project/issues"
+    "url": "https://github.com/pnpm/pnpm/issues"
   },
   "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
+  "types": "lib/index.d.ts",
   "files": [
     "lib/"
   ],
   "devDependencies": {
-    "@commitlint/cli": "^6.1.3",
-    "@commitlint/config-conventional": "^6.1.3",
-    "@commitlint/prompt-cli": "^6.1.3",
-    "@zkochan/husky": "^0.0.0",
-    "package-preview": "^1.0.0",
-    "rimraf": "^2.6.2",
-    "ts-node": "^5.0.1",
-    "tslint": "^5.4.2",
-    "typescript": "^2.7.1"
+    "@pnpm/assert-project": "1.2.2",
+    "@types/is-windows": "^1.0.0",
+    "@types/isexe": "2.0.0",
+    "@types/node": "^14.18.20"
   },
   "directories": {
     "test": "test"
   },
-  "homepage": "https://github.com/pnpm/assert-project#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/master/privatePackages/assert-project#readme",
   "keywords": [],
   "license": "MIT",
   "engines": {
-    "node": ">=4"
+    "node": ">=10"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/pnpm/assert-project.git"
+  "repository": "https://github.com/pnpm/pnpm/blob/master/privatePackages/assert-project",
+  "dependencies": {
+    "@pnpm/assert-store": "0.0.2",
+    "@pnpm/constants": "5.0.0",
+    "@pnpm/lockfile-types": "3.2.1",
+    "@pnpm/modules-yaml": "9.1.2",
+    "@pnpm/registry-mock": "2.20.0",
+    "@pnpm/types": "7.11.0",
+    "is-windows": "^1.0.2",
+    "isexe": "2.0.0",
+    "path-exists": "^4.0.0",
+    "read-yaml-file": "^2.1.0",
+    "write-pkg": "4.0.0"
   },
   "scripts": {
-    "commit": "commit",
-    "commitmsg": "commitlint -e",
-    "lint": "tslint -c tslint.json --project .",
+    "lint": "tslint -c ../../tslint.json --project .",
     "lint-test": "tslint -c tslint.json --project test",
-    "tsc": "rimraf lib && tsc",
-    "prepublishOnly": "npm run tsc",
-    "pretest": "pnpm i --prefix test/fixture/project",
-    "test": "npm run lint && npm run lint-test && preview && ts-node test"
-  },
-  "dependencies": {
-    "@pnpm/modules-yaml": "^1.0.0",
-    "@types/mz": "^0.0.32",
-    "@types/path-exists": "^3.0.0",
-    "@types/tape": "^4.2.32",
-    "@types/write-pkg": "^3.1.0",
-    "is-windows": "^1.0.2",
-    "isexe": "^2.0.0",
-    "load-yaml-file": "^0.1.0",
-    "mz": "^2.7.0",
-    "path-exists": "^3.0.0",
-    "tape": "^4.9.0",
-    "util.promisify": "^1.0.0",
-    "write-pkg": "^3.1.0"
+    "compile": "rimraf tsconfig.tsbuildinfo lib && tsc --build",
+    "pretest": "pnpm install -C test/fixture/project --force --no-shared-workspace-lockfile",
+    "test": "pnpm pretest && pnpm run compile && jest"
   }
-}
+}