@pnp/cli-microsoft365 11.3.0 → 11.4.0-beta.0b6d893

package/dist/m365/external/commands/item/item-add.js

@@ -47,7 +47,7 @@ class ExternalItemAddCommand extends GraphCommand {
         // we need to rewrite the @odata properties to the correct format
         // to extract multiple values for collections into arrays
         this.rewriteCollectionProperties(args.options);
-        this.addUnknownOptionsToPayload(requestBody, args.options);
+        this.addUnknownOptionsToPayload(requestBody.properties, args.options);
         const requestOptions = {
             url: `${this.resource}/v1.0/external/connections/${args.options.externalConnectionId}/items/${args.options.id}`,
             headers: {

package/dist/m365/spe/commands/container/container-add.js

@@ -9,7 +9,7 @@ import request from '../../../../request.js';
 const options = globalOptionsZod
     .extend({
     name: zod.alias('n', z.string()),
-    description: zod.alias('d', z.string()).optional(),
+    description: zod.alias('d', z.string().optional()),
     containerTypeId: z.string()
         .refine(id => validation.isValidGuid(id), id => ({
         message: `'${id}' is not a valid GUID.`

package/dist/m365/spe/commands/container/container-remove.js

@@ -9,8 +9,8 @@ import request from '../../../../request.js';
 import { cli } from '../../../../cli/cli.js';
 const options = globalOptionsZod
     .extend({
-    id: zod.alias('i', z.string()).optional(),
-    name: zod.alias('n', z.string()).optional(),
+    id: zod.alias('i', z.string().optional()),
+    name: zod.alias('n', z.string().optional()),
     containerTypeId: z.string()
         .refine(id => validation.isValidGuid(id), id => ({
         message: `'${id}' is not a valid GUID.`

package/dist/m365/spfx/commands/project/project-upgrade/rules/DependencyRule.js

@@ -1,8 +1,15 @@
-import { lt, valid, validRange } from 'semver';
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _DependencyRule_instances, _DependencyRule_needsUpdate, _DependencyRule_getMaxVersion;
+import semver from 'semver';
 import { JsonRule } from '../../JsonRule.js';
 export class DependencyRule extends JsonRule {
     constructor(packageName, packageVersion, isDevDep = false, isOptional = false, add = true) {
         super();
+        _DependencyRule_instances.add(this);
         this.packageName = packageName;
         this.packageVersion = packageVersion;
         this.isDevDep = isDevDep;
@@ -39,23 +46,13 @@ export class DependencyRule extends JsonRule {
         }
         const projectDependencies = this.isDevDep ? project.packageJson.devDependencies : project.packageJson.dependencies;
         const versionEntry = projectDependencies ? projectDependencies[this.packageName] : '';
-        const packageVersion = valid(versionEntry);
-        const versionRange = validRange(versionEntry);
         if (this.add) {
             let jsonProperty = this.isDevDep ? 'devDependencies' : 'dependencies';
             if (versionEntry) {
                 jsonProperty += `.${this.packageName}`;
-                if (packageVersion) {
-                    if (lt(packageVersion, this.packageVersion)) {
-                        const node = this.getAstNodeFromFile(project.packageJson, jsonProperty);
-                        this.addFindingWithPosition(findings, node);
-                    }
-                }
-                else {
-                    if (versionRange) {
-                        const node = this.getAstNodeFromFile(project.packageJson, jsonProperty);
-                        this.addFindingWithPosition(findings, node);
-                    }
+                if (__classPrivateFieldGet(this, _DependencyRule_instances, "m", _DependencyRule_needsUpdate).call(this, this.packageVersion, versionEntry)) {
+                    const node = this.getAstNodeFromFile(project.packageJson, jsonProperty);
+                    this.addFindingWithPosition(findings, node);
                 }
             }
             else {
@@ -78,4 +75,49 @@ export class DependencyRule extends JsonRule {
         }
     }
 }
+_DependencyRule_instances = new WeakSet(), _DependencyRule_needsUpdate = function _DependencyRule_needsUpdate(ruleVersion, currentVersion) {
+    try {
+        // Get minimum versions for both
+        const ruleMin = semver.minVersion(ruleVersion);
+        const currentMin = semver.minVersion(currentVersion);
+        // Check if ranges overlap
+        const rangesOverlap = semver.intersects(ruleVersion, currentVersion);
+        if (rangesOverlap) {
+            // Even if they overlap, update if rule requires a higher minimum version
+            if (ruleMin && currentMin && semver.gt(ruleMin, currentMin)) {
+                return true;
+            }
+            return false;
+        }
+        // Ranges don't overlap - check if rule range is greater
+        // Get the maximum version that satisfies the current range
+        const currentMax = __classPrivateFieldGet(this, _DependencyRule_instances, "m", _DependencyRule_getMaxVersion).call(this, currentVersion);
+        // If rule's minimum is greater than current's maximum, update is needed
+        return !!(ruleMin && currentMax && semver.gt(ruleMin, currentMax));
+    }
+    catch {
+        return false;
+    }
+}, _DependencyRule_getMaxVersion = function _DependencyRule_getMaxVersion(range) {
+    const rangeObj = new semver.Range(range);
+    // If it's a specific version (no range operators), return it
+    if (semver.valid(range)) {
+        return semver.parse(range);
+    }
+    // For ranges, get the highest version from the set
+    // Check the range set to find upper bounds
+    let maxVer = null;
+    for (const comparatorSet of rangeObj.set) {
+        for (const comparator of comparatorSet) {
+            if (comparator.operator === '<' || comparator.operator === '<=') {
+                const ver = comparator.semver;
+                if (!maxVer || semver.gt(ver, maxVer)) {
+                    maxVer = ver;
+                }
+            }
+        }
+    }
+    // If no upper bound found, use minVersion as fallback
+    return maxVer || semver.minVersion(range);
+};
 //# sourceMappingURL=DependencyRule.js.map