zarro 1.175.2 → 1.175.4

package/gulp-tasks/modules/dotnet-cli.js

@@ -77,6 +77,9 @@
     function findPackageReferencesOn(xml) {
         const itemGroups = getByPath(xml, "Project.ItemGroup");
         const result = [];
+        if (!itemGroups) {
+            return result;
+        }
         for (const dict of itemGroups) {
             const packageReferences = getByPath(dict, "PackageReference");
             if (packageReferences) {

package/gulp-tasks/upgrade-packages.js

@@ -1,6 +1,6 @@
 "use strict";
 (function () {
-    const { ls, FsEntities } = require("yafs"), gulp = requireModule("gulp");
+    const { ls, FsEntities, fileExistsSync } = require("yafs"), gulp = requireModule("gulp");
     gulp.task("upgrade-packages", async () => {
         const env = requireModule("env"), { upgradePackages } = requireModule("dotnet-cli"), rawPackageMask = env.resolveArray(env.UPGRADE_PACKAGES), packageMask = parseMasks(rawPackageMask, true), rawTargetMask = env.resolveArray(env.UPGRADE_PACKAGES_TARGET), nugetSource = env.resolve(env.NUGET_SOURCE), showProgress = env.resolveFlag(env.UPGRADE_PACKAGES_PROGRESS), preRelease = env.resolveFlag(env.UPGRADE_PACKAGES_PRERELEASE), noRestore = env.resolveFlag(env.UPGRADE_PACKAGES_NO_RESTORE), targets = await resolveTargets(rawTargetMask);
         for (const target of targets) {
@@ -19,19 +19,29 @@
         if (!rawTargets || rawTargets.length === 0) {
             return await findSolutions();
         }
-        const regexTargets = parseMasks(rawTargets, false);
+        const exactMatches = rawTargets.filter(t => {
+            return fileExistsSync(t);
+        });
+        const inexactMatches = rawTargets.filter(s => exactMatches.indexOf(s) === -1);
+        const regexTargets = parseMasks(inexactMatches, false);
+        if (regexTargets.length === 0) {
+            return exactMatches;
+        }
         const interestingFiles = await findFiles([
             solutionRe,
             projectRe
         ]);
-        return interestingFiles.filter(filepath => {
-            for (const re of regexTargets) {
-                if (re.test(filepath)) {
-                    return true;
+        return [
+            ...exactMatches,
+            ...interestingFiles.filter(filepath => {
+                for (const re of regexTargets) {
+                    if (re.test(filepath)) {
+                        return true;
+                    }
                 }
-            }
-            return false;
-        });
+                return false;
+            })
+        ];
     }
     async function findSolutions() {
         return await findFiles([solutionRe]);
@@ -48,11 +58,30 @@
     function parseMasks(masks, strict) {
         // package masks can be raw strings or strings representing regular expressions
         return masks.map(s => looksLikeRegex(s)
-            ? new RegExp(s)
+            ? makeCaseInsensitiveRegex(s)
             : looksLikeAGlob(s)
                 ? createRegExpFromGlob(s)
                 : makeRegex(s, strict));
     }
+    function makeCaseInsensitiveRegex(s) {
+        const parts = s.split("/"), hasEnoughParts = parts.length >= 3;
+        if (!hasEnoughParts) {
+            return new RegExp(s, "i");
+        }
+        const startsWithSlash = parts[0] === "", endsWithSlash = parts[parts.length - 1] === "", finalSlashIsEscaped = hasEnoughParts && !parts[parts.length - 2].endsWith("\\"), isEz = startsWithSlash && endsWithSlash && !finalSlashIsEscaped;
+        if (isEz) {
+            let re = s;
+            if (startsWithSlash) {
+                re = re.substring(1);
+            }
+            if (endsWithSlash) {
+                re = re.substring(0, re.length - 1);
+            }
+            return new RegExp(re, "i");
+        }
+        const bitsInTheMiddle = parts.slice(1, parts.length - 2), rejoined = bitsInTheMiddle.join("/");
+        return new RegExp(rejoined, "i");
+    }
     function makeRegex(s, strict) {
         const escaped = s.replace(".", "\\.");
         return strict

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.175.2",
+  "version": "1.175.4",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "index.js"