zarro 1.168.4 → 1.168.8

package/gulp-tasks/modules/resolve-nuget-push-package-files.js

@@ -20,12 +20,14 @@
         const env = requireModule("env"), maskContainer = path.dirname(mask), searchContainers = path.isAbsolute(mask)
             ? [maskContainer]
             : [maskContainer, `${env.resolve(env.PACK_TARGET_FOLDER)}/${maskContainer}`], files = await lsAll(searchContainers);
-        const maskHasFolders = mask.includes("/") || mask.includes("\\"), leaf = path.basename(mask), start = leaf.startsWith("*") ? ".*" : "^", end = leaf.endsWith("*") ? ".*" : "", regexed = mask.replace(/\*/g, ".*").replace(/\\/g, "\\/"), nupkgRe = /\.nupkg$/i, maskRe = new RegExp(`${start}${regexed}${end}`);
+        const maskHasFolders = mask.includes("/") || mask.includes("\\"), leaf = path.basename(mask), start = leaf.startsWith("*") ? ".*" : "^", end = leaf.endsWith("*") ? ".*" : "", regexed = mask.replace(/\*/g, ".*").replace(/\\/g, "\\/"), nupkgRe = /\.nupkg$/i, symbolsRe = /\.symbols\.nupkg$/i, maskRe = new RegExp(`${start}${regexed}${end}`);
         return files.filter((f) => {
             const toTest = maskHasFolders
                 ? f
                 : path.basename(f);
-            return nupkgRe.test(toTest) && maskRe.test(toTest);
+            return !symbolsRe.test(toTest) &&
+                nupkgRe.test(toTest) &&
+                maskRe.test(toTest);
         });
     }
     async function lsAll(dirs) {
@@ -43,7 +45,8 @@
     async function enumeratePackagesIn(packRoot) {
         return await ls(packRoot, {
             entities: FsEntities.files,
-            match: /\.nupkg$/,
+            match: /\.nupkg$/i,
+            exclude: [/\.symbols\.nupkg$/i, /\.snupkg$/i],
             recurse: false,
             fullPaths: true
         });

package/index.js

@@ -84,7 +84,7 @@ async function loadDefaults() {
       // comment-only line or empty line
       continue;
     }
-    const sectionMatch = code.match(/\s*\[(?<section>[a-zA-Z0-9\s-_.]+)]\s*/);
+    const sectionMatch = code.match(/^\s*\[(?<section>[a-zA-Z0-9\s-_.]+)]\s*$/);
     if (sectionMatch) {
       currentSection = `${sectionMatch.groups.section}`.toLowerCase();
       continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.168.4",
+  "version": "1.168.8",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"
@@ -121,6 +121,7 @@
     "@types/semver": "^7.5.0",
     "@types/through2": "^2.0.38",
     "@types/typescript": "^2.0.0",
+    "@types/uuid": "^9.0.8",
     "@types/xml2js": "^0.4.8",
     "@types/yargs": "^15.0.13",
     "console-cls": "^1.2.2",
@@ -134,6 +135,7 @@
     "redlock": "^5.0.0-beta.2",
     "ts-jest": "^29.1.1",
     "typescript": "^5.1.6",
+    "uuid": "^9.0.1",
     "yargs": "^16.2.0"
   }
 }