Fix bug related to slash in URL rules config

Author: SOHELAHMED7

TODO.taskpaper

@@ -2,6 +2,7 @@ TODO.taskpaper
 
  ✔ fix failing tests @done (25-03-21 16:20)
  ✔ Implement code generation for nested module in `x-route` and other pertinent place @done (25-03-26 11:38)
+ ☐ implement default action `actionIndex()` in `DefaultController` in module generation
  ☐ resolve all sub tasks of issue - Support for Yii Modules in x-route and pertinent places #14
  ☐ resolve all TODOs
  ☐ delete this file

src/lib/items/ActionHelperTrait.php

@@ -38,23 +38,23 @@ public function getOptionsRoute():string
         array_pop($r);
         return implode('/', $r) . '/options';
 
-        if (!empty($this->prefixSettings)) {
-            if (isset($this->prefixSettings['module'])) {
-                $prefix = $this->prefixSettings['module'];
-                return static::finalOptionsRoute($prefix, $this->controllerId);
-            } elseif (isset($this->prefixSettings['namespace']) && str_contains($this->prefixSettings['namespace'], '\modules\\')) { # if `module` not present then check in namespace and then in path
-                $prefix = static::computeModule('\\', $this->prefixSettings['namespace']);
-                if ($prefix) {
-                    return static::finalOptionsRoute($prefix, $this->controllerId);
-                }
-            } elseif (isset($this->prefixSettings['path']) && str_contains($this->prefixSettings['path'], '/modules/')) {
-                $prefix = static::computeModule('/', $this->prefixSettings['path']);
-                if ($prefix) {
-                    return static::finalOptionsRoute($prefix, $this->controllerId);
-                }
-            }
-        }
-        return $this->controllerId.'/options';
+//        if (!empty($this->prefixSettings)) {
+//            if (isset($this->prefixSettings['module'])) {
+//                $prefix = $this->prefixSettings['module'];
+//                return static::finalOptionsRoute($prefix, $this->controllerId);
+//            } elseif (isset($this->prefixSettings['namespace']) && str_contains($this->prefixSettings['namespace'], '\modules\\')) { # if `module` not present then check in namespace and then in path
+//                $prefix = static::computeModule('\\', $this->prefixSettings['namespace']);
+//                if ($prefix) {
+//                    return static::finalOptionsRoute($prefix, $this->controllerId);
+//                }
+//            } elseif (isset($this->prefixSettings['path']) && str_contains($this->prefixSettings['path'], '/modules/')) {
+//                $prefix = static::computeModule('/', $this->prefixSettings['path']);
+//                if ($prefix) {
+//                    return static::finalOptionsRoute($prefix, $this->controllerId);
+//                }
+//            }
+//        }
+//        return $this->controllerId.'/options';
     }
 
     /**
@@ -97,18 +97,18 @@ public function getRoute(): string
             if (isset($this->prefixSettings['module'])) {
                 $prefix = $this->prefixSettings['module'];
 //                return static::finalOptionsRoute($prefix, $this->controllerId);
-                return trim($prefix, '/') . '/' . $this->controllerId . '/' . $this->id;
+                return trim($prefix, '/') . '/' . $this->controllerId . ($this->id ? '/' . $this->id : '');
             } elseif (isset($this->prefixSettings['namespace']) && str_contains($this->prefixSettings['namespace'], '\modules\\')) { # if `module` not present then check in namespace and then in path
                 $prefix = static::computeModule('\\', $this->prefixSettings['namespace']);
                 if ($prefix) {
 //                    return static::finalOptionsRoute($prefix, $this->controllerId);
-                    return trim($prefix, '/') . '/' . $this->controllerId . '/' . $this->id;
+                    return trim($prefix, '/') . '/' . $this->controllerId . ($this->id ? '/' . $this->id : '');
                 }
             } elseif (isset($this->prefixSettings['path']) && str_contains($this->prefixSettings['path'], '/modules/')) {
                 $prefix = static::computeModule('/', $this->prefixSettings['path']);
                 if ($prefix) {
 //                    return static::finalOptionsRoute($prefix, $this->controllerId);
-                    return trim($prefix, '/') . '/' . $this->controllerId . '/' . $this->id;
+                    return trim($prefix, '/') . '/' . $this->controllerId . ($this->id ? '/' . $this->id : '');
                 }
             }
         }
@@ -118,6 +118,6 @@ public function getRoute(): string
 //            return trim($prefix, '/') . '/' . $this->controllerId . '/' . $this->id;
 //        }
 
-        return $this->controllerId . '/' . $this->id;
+        return $this->controllerId . ($this->id ? '/' . $this->id : '');
     }
 }

src/lib/items/RouteData.php

@@ -276,7 +276,7 @@ public function init()
         }
         $this->pattern = implode('/', $patternParts);
         if ($this->prefix) {
-            $this->pattern = trim($this->prefix, '/').'/'.$this->pattern;
+            $this->pattern = trim($this->prefix, '/') . ($this->pattern ? '/' . $this->pattern : '');
         }
         if ($this->hasParams && $this->isRelationship()) {
             $this->relatedModel = $this->getFirstParam()['model'] ?? null;

tests/specs/issue_fix/35_resolve_todo_re_check_options_route_in_rest_action/mysql/config/urls.rest.php

@@ -5,8 +5,8 @@
  * This file is auto generated.
  */
 return [
-    'GET api/v1/pets' => 'api/v1/pet/list',
-    'POST api/v1/pets' => 'api/v1/pet/create',
+    'GET api/v1/pets' => 'some/pet/list',
+    'POST api/v1/pets' => 'some/pet/create',
     'GET animals/pets/<id:[\w-]+>' => 'pet/view',
     'DELETE animals/pets/<id:[\w-]+>' => 'pet/delete',
     'PATCH animals/pets/<id:[\w-]+>' => 'pet/update',