arcadible 1.0.11 → 1.0.12

package/package.json

@@ -65,5 +65,5 @@
   "scripts": {
     "test": "node --test \"test/**/*.test.js\""
   },
-  "version": "1.0.11"
+  "version": "1.0.12"
 }

package/src/action/predeploy/pm.js

@@ -9,33 +9,22 @@ const path = require("node:path");
 
 const cfgcode = require("../../config/code");
 const error = require("../../util/error");
+const lockfile = require("../../util/lockfile");
 const phrase = require("../../phrase");
 
 // [use]
 
 const ArcError = error.ArcError;
+const detect = lockfile.detect;
 const existsSync = fs.existsSync; // eslint-disable-line no-sync
 const join = path.join;
 
-// [declare]
-
-const LOCK_FILES = [
-  // npm
-  "package-lock.json",
-  "npm-shrinkwrap.json",
-  // pnpm
-  "pnpm-lock.yaml",
-  // yarn
-  "yarn.lock",
-];
-
 // [function]
 
 // fails when there's a package.json without a lockfile: the release workflow
 // installs exactly what the lockfile pins.
 const ensureLockFile = function (root) {
-  const has = (file) => existsSync(join(root, file));
-  if (has("package.json") && !LOCK_FILES.some(has)) {
+  if (existsSync(join(root, "package.json")) && !detect(root)) {
     return Promise.reject(
       new ArcError(cfgcode.LOCKFILE_MISSING, phrase.lockfileMissing()),
     );

package/src/parser/env.js

@@ -12,6 +12,7 @@ const fs = require("fs-extra");
 
 const cfgcode = require("../config/code");
 const error = require("../util/error");
+const lockfile = require("../util/lockfile");
 const objs = require("../util/objs");
 const phrase = require("../phrase");
 
@@ -19,14 +20,13 @@ const phrase = require("../phrase");
 
 const ArcError = error.ArcError;
 const deepCompact = objs.deepCompact;
+const detect = lockfile.detect;
 const join = path.join;
 const pathExists = fs.pathExists;
 const readFile = fs.readFile;
 
 // [declare]
 
-// the build a package.json build script stands for.
-const NPM_RUN_BUILD = "npm run build";
 const PACKAGE = "package.json";
 
 // [function]
@@ -53,13 +53,19 @@ const parseJson = function (buf) {
 
 // [function]
 
-// package.json's version, and its build script as `npm run build`: run
-// through npm, the script finds the project's own tools on the PATH
-// (node_modules/.bin), and its prebuild and postbuild run, as they do
-// locally. npm runs the scripts of a pnpm or Yarn project too.
-const extract = function (conf) {
+// package.json's version, and its build script as `<manager> run build`, run
+// with the package manager its lockfile names (npm without one): the script
+// finds the project's own tools, and its prebuild and postbuild run, as they do
+// locally. A Yarn project on Plug'n'Play has no node_modules, so only Yarn
+// finds its tools.
+const extract = function (conf, manager) {
+  if (!Object.keys(conf).length) {
+    return {};
+  }
   const game = { version: conf.version };
-  const workflow = conf.scripts?.build ? { build: NPM_RUN_BUILD } : {};
+  const workflow = conf.scripts?.build
+    ? { build: `${manager || "npm"} run build` }
+    : {};
   return deepCompact({ game, workflow }) ?? {};
 };
 
@@ -70,7 +76,7 @@ const main = function (root) {
   return pathExists(file)
     .then((exists) => (exists ? readFile(file, "utf8") : null))
     .then((buf) => (buf === null ? {} : parseJson(buf)))
-    .then((conf) => (Object.keys(conf).length ? extract(conf) : {}));
+    .then((conf) => extract(conf, detect(root)));
 };
 
 // [export]

package/src/util/lockfile.js

@@ -0,0 +1,35 @@
+"use strict";
+
+// [import]
+
+const fs = require("node:fs");
+const path = require("node:path");
+
+// [use]
+
+const existsSync = fs.existsSync; // eslint-disable-line no-sync
+const join = path.join;
+
+// [declare]
+
+// each package manager, and the lockfiles that mean a project uses it, in the
+// order they're checked, as the release tools' install checks them.
+const LOCKFILES = [
+  ["npm", ["package-lock.json", "npm-shrinkwrap.json"]],
+  ["pnpm", ["pnpm-lock.yaml"]],
+  ["yarn", ["yarn.lock"]],
+];
+
+// [function]
+
+// the package manager a project's lockfile names, or "" when it has none.
+const detect = function (root) {
+  const found = LOCKFILES.find(([, names]) =>
+    names.some((name) => existsSync(join(root, name))),
+  );
+  return found ? found[0] : "";
+};
+
+// [export]
+
+module.exports = { detect };