fix(core): Ensure that dynamically registered services are always set up (#2593)

daffl · web-flow · commit 27cc7d083218 · 2022-04-06T08:01:51.000-07:00
diff --git a/packages/feathers/src/application.ts b/packages/feathers/src/application.ts
@@ -147,6 +147,8 @@ export class Feathers<Services, Settings> extends EventEmitter implements Feathe
   }
 
   setup () {
+    this._isSetup = true;
+
     return Object.keys(this.services).reduce((current, path) => current
       .then(() => {
         const service: any = this.service(path as any);
@@ -156,14 +158,12 @@ export class Feathers<Services, Settings> extends EventEmitter implements Feathe
 
           return service.setup(this, path);
         }
-      }), Promise.resolve())
-      .then(() => {
-        this._isSetup = true;
-        return this;
-      });
+      }), Promise.resolve()).then(() => this);
   }
 
   teardown () {
+    this._isSetup = false;
+
     return Object.keys(this.services).reduce((current, path) => current
       .then(() => {
         const service: any = this.service(path as any);
@@ -173,10 +173,6 @@ export class Feathers<Services, Settings> extends EventEmitter implements Feathe
 
           return service.teardown(this, path);
         }
-      }), Promise.resolve())
-      .then(() => {
-        this._isSetup = false;
-        return this;
-      });
+      }), Promise.resolve()).then(() => this)
   }
 }
diff --git a/packages/feathers/test/application.test.ts b/packages/feathers/test/application.test.ts
@@ -344,18 +344,18 @@ describe('Feathers application', () => {
       assert.strictEqual(teardownCount, 2);
     });
 
-    it('registering a service after app.setup will be set up', done => {
+    it('registering app.setup but while still pending will be set up', done => {
       const app = feathers();
 
-      app.setup().then(() => {
-        app.use('/dummy', {
-          async setup (appRef: any, path: any) {
-            assert.ok((app as any)._isSetup);
-            assert.strictEqual(appRef, app);
-            assert.strictEqual(path, 'dummy');
-            done();
-          }
-        });
+      app.setup();
+
+      app.use('/dummy', {
+        async setup (appRef: any, path: any) {
+          assert.ok((app as any)._isSetup);
+          assert.strictEqual(appRef, app);
+          assert.strictEqual(path, 'dummy');
+          done();
+        }
       });
     });
   });

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,8 @@ export class Feathers<Services, Settings> extends EventEmitter implements Feathe`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`setup () {`
	`150`	`+ this._isSetup = true;`
	`151`	`+`
`150`	`152`	`return Object.keys(this.services).reduce((current, path) => current`
`151`	`153`	`.then(() => {`
`152`	`154`	`const service: any = this.service(path as any);`
`@@ -156,14 +158,12 @@ export class Feathers<Services, Settings> extends EventEmitter implements Feathe`
`156`	`158`
`157`	`159`	`return service.setup(this, path);`
`158`	`160`	`}`
`159`		`- }), Promise.resolve())`
`160`		`- .then(() => {`
`161`		`- this._isSetup = true;`
`162`		`- return this;`
`163`		`- });`
	`161`	`+ }), Promise.resolve()).then(() => this);`
`164`	`162`	`}`
`165`	`163`
`166`	`164`	`teardown () {`
	`165`	`+ this._isSetup = false;`
	`166`	`+`
`167`	`167`	`return Object.keys(this.services).reduce((current, path) => current`
`168`	`168`	`.then(() => {`
`169`	`169`	`const service: any = this.service(path as any);`
`@@ -173,10 +173,6 @@ export class Feathers<Services, Settings> extends EventEmitter implements Feathe`
`173`	`173`
`174`	`174`	`return service.teardown(this, path);`
`175`	`175`	`}`
`176`		`- }), Promise.resolve())`
`177`		`- .then(() => {`
`178`		`- this._isSetup = false;`
`179`		`- return this;`
`180`		`- });`
	`176`	`+ }), Promise.resolve()).then(() => this)`
`181`	`177`	`}`
`182`	`178`	`}`