for controllers

Author: tolyo

index.html

@@ -14,6 +14,7 @@
           }
         }
         class TodoController {
+          static $scopename = "test";
           constructor() {
             this.greeting = "Todos";
             this.model = {

src/angular.js

@@ -304,7 +304,8 @@ export class Angular {
    *
    * Internally, this walks down the `Scope` tree starting from `$rootScope`
    * and checks for a matching `$scopename` property. The `$scopename` property
-   * may be defined statically or assigned via the `ngScope` directive.
+   * may be defined statically on controllers using `as` syntax, assigned via the `ngScope` directive,
+   * or defined on `$scope` injectable.
    *
    * @param {string} name
    * @returns {ProxyHandler<ng.Scope>|undefined}

src/angular.spec.js

@@ -9,8 +9,8 @@ describe("angular", () => {
 
   beforeEach(() => {
     angular = new Angular();
-    module = angular.module("defaultModule", ["ng"]);
-    injector = createInjector(["ng", "defaultModule"]);
+    module = angular.module("default", ["ng"]);
+    injector = createInjector(["ng", "default"]);
     $rootScope = injector.get("$rootScope");
     $compile = injector.get("$compile");
   });
@@ -215,8 +215,8 @@ describe("angular", () => {
 
     beforeEach(() => {
       angular = new Angular();
-      module = angular.module("defaultModule", ["ng"]);
-      injector = createInjector(["defaultModule"]);
+      module = angular.module("default", ["ng"]);
+      injector = createInjector(["default"]);
       $rootScope = injector.get("$rootScope");
       $compile = injector.get("$compile");
     });
@@ -246,8 +246,13 @@ describe("angular", () => {
 
     beforeEach(() => {
       angular = new Angular();
-      module = angular.module("defaultModule", ["ng"]);
-      injector = createInjector(["defaultModule"]);
+      module = angular.module("default", ["ng"]).controller(
+        "demo",
+        class Demo {
+          static $scopename = "demo";
+        },
+      );
+      injector = createInjector(["default"]);
     });
 
     it("should return named scope", () => {
@@ -264,6 +269,22 @@ describe("angular", () => {
 
       expect(angular.getScopeByName("fail")).toBeUndefined();
     });
+
+    it("should return controllers with static $scopename property", () => {
+      const element = createElementFromHTML("<div ng-controller='demo'></div>");
+      angular.bootstrap(element, ["default"]);
+
+      expect(angular.getScopeByName("demo")).toBeDefined();
+    });
+
+    it("should return controllers with static $scopename property registered with `as` syntax", () => {
+      const element = createElementFromHTML(
+        "<div ng-controller='demo as $ctrl'></div>",
+      );
+      angular.bootstrap(element, ["default"]);
+
+      expect(angular.getScopeByName("demo")).toBeDefined();
+    });
   });
 });
 

src/core/compile/compile.spec.js

@@ -10488,6 +10488,7 @@ describe("$compile", () => {
 
         expect(childCtrl.fromParent1).toBe(parentCtrl.value1);
         expect(childCtrl.fromParent1).not.toBe(childCtrl.value1);
+        debugger;
         expect(childCtrl.fromParent2).toBe(parentCtrl.value2);
         expect(childCtrl.fromParent2).not.toBe(childCtrl.value2);
         expect(childCtrl.fromParent3()()).toBe(parentCtrl.value3());

src/core/controller/controller.js

@@ -123,6 +123,10 @@ export class ControllerProvider {
             );
           }
 
+          if (instance?.constructor?.$scopename) {
+            locals.$scope.$scopename = instance.constructor.$scopename;
+          }
+
           return function () {
             const result = $injector.invoke(
               expression,