@wpelevator/wp-release 0.13.0 → 0.14.0

package/dist/version-files.js

@@ -4,21 +4,20 @@ import { ValidationError } from "./errors.js";
 import { readJson } from "./json-files.js";
 import { findMainPluginFile } from "./package-meta.js";
 import { escapeRegExp } from "./regexp.js";
-import { formatTemplatePrefix } from "./tag-format.js";
+import { DEFAULT_TAG_FORMAT, formatTag } from "./tag-format.js";
 import { findConstantValues } from "./version-check.js";
 import { compareVersions, isPrerelease } from "./versions.js";
 /**
  * Read the current version of a package from its configured source.
  *
- * @param  repository   Repository, for versions stored as git tags.
- * @param  directory    Package directory.
- * @param  descriptor   Version source.
- * @param  relativePath Package path relative to the package root.
- * @param  tagType      Configured {type} of the package tags.
+ * @param  repository Repository, for versions stored as git tags.
+ * @param  directory  Package directory.
+ * @param  descriptor Version source.
+ * @param  pkg        Package name and path, for the tags of a git-tag source.
  * @return Current version.
  * @throws {ValidationError} If the version is missing.
  */
-export async function readVersion(repository, directory, descriptor, relativePath, tagType) {
+export async function readVersion(repository, directory, descriptor, pkg) {
     if ('package-json' === descriptor.kind ||
         'composer-json' === descriptor.kind) {
         const manifest = await readJson(path.join(directory, descriptor.file));
@@ -29,8 +28,8 @@ export async function readVersion(repository, directory, descriptor, relativePat
         throw new ValidationError(`Missing ${descriptor.file}#${descriptor.field} in ${directory}.`);
     }
     if ('git-tag' === descriptor.kind) {
-        const pattern = descriptor.pattern ?? '{path}/{version}';
-        const tags = await repository.listTags(formatTemplatePrefix(pattern, relativePath, tagType));
+        const pattern = descriptor.pattern ?? DEFAULT_TAG_FORMAT;
+        const tags = await repository.listTags(formatTag(pattern, pkg, ''));
         const versions = tags
             .map((tag) => tag.match(/(?:^|\/|v)(\d+(?:\.\d+){1,3})$/)?.[1])
             .filter((item) => Boolean(item));
@@ -38,7 +37,7 @@ export async function readVersion(repository, directory, descriptor, relativePat
         if (versions[0]) {
             return versions[0];
         }
-        throw new ValidationError(`No git tag matches ${pattern} for ${relativePath}.`);
+        throw new ValidationError(`No git tag matches ${pattern} for ${pkg.path}.`);
     }
     if ('php-constant' === descriptor.kind) {
         const file = path.join(directory, descriptor.file);
@@ -142,7 +141,7 @@ export async function verifyVersionTargets(repository, pkg, expected) {
             actual = undefined;
         }
         else {
-            actual = await readVersion(repository, pkg.directory, target, pkg.path, pkg.group.tagType);
+            actual = await readVersion(repository, pkg.directory, target, pkg);
         }
         if (undefined !== actual && actual !== expected) {
             throw new ValidationError(`Version mismatch for ${pkg.name}: expected ${expected}, found ${actual}.`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wpelevator/wp-release",
-	"version": "0.13.0",
+	"version": "0.14.0",
 	"description": "Package, checksum, sign, verify and version-check WordPress plugins and themes, and deploy plugins to WordPress.org SVN",
 	"license": "MIT",
 	"repository": {
@@ -58,7 +58,7 @@
 		"build": "tsc -p tsconfig.build.json",
 		"prepack": "npm run build",
 		"lint": "npm-run-all lint:*",
-		"lint:js": "wp-scripts lint-js src",
+		"lint:js": "wp-scripts lint-js",
 		"lint:types": "tsc -p tsconfig.json",
 		"format": "wp-scripts format src",
 		"test": "node --test --conditions=wpelevator-source"