Resolve dependencies right away

kingstinct · Oct 16, 2023 · b81b43c · b81b43c
1 parent 070c553
commit b81b43c
Show file tree

Hide file tree

Showing 38 changed files with 195 additions and 52 deletions.
diff --git a/apps/supplement-stack/CHANGELOG.md b/apps/supplement-stack/CHANGELOG.md
@@ -1,5 +1,17 @@
 # supplement-stack
 
+## 0.0.8
+
+### Patch Changes
+
+- Updated dependencies
+  - [email protected]
+  - @zemble/core@0.0.8
+  - @zemble/graphql@0.0.12
+  - [email protected]
+  - [email protected]
+  - [email protected]
+
 ## 0.0.7
 
 ### Patch Changes

diff --git a/apps/supplement-stack/package.json b/apps/supplement-stack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "supplement-stack",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "",
   "main": "app.ts",
   "private": true,

diff --git a/apps/todo-app-with-auth-backend/CHANGELOG.md b/apps/todo-app-with-auth-backend/CHANGELOG.md
@@ -1,5 +1,17 @@
 # todo-app-with-auth-backend
 
+## 0.0.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.8
+  - @zemble/graphql@0.0.12
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+
 ## 0.0.7
 
 ### Patch Changes

diff --git a/apps/todo-app-with-auth-backend/package.json b/apps/todo-app-with-auth-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "todo-app-with-auth-backend",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "",
   "private": true,
   "main": "app.ts",

diff --git a/packages/apple-app-site-association/CHANGELOG.md b/packages/apple-app-site-association/CHANGELOG.md
@@ -1,5 +1,12 @@
 # zemble-plugin-apple-app-site-association
 
+## 0.0.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.8
+
 ## 0.0.5
 
 ### Patch Changes

diff --git a/packages/apple-app-site-association/package.json b/packages/apple-app-site-association/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-apple-app-site-association",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "",
   "private": true,
   "main": "plugin.ts",

diff --git a/packages/auth-anonymous/CHANGELOG.md b/packages/auth-anonymous/CHANGELOG.md
@@ -1,5 +1,14 @@
 # zemble-plugin-auth-anonymous
 
+## 0.0.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.8
+  - @zemble/graphql@0.0.12
+  - [email protected]
+
 ## 0.0.7
 
 ### Patch Changes

diff --git a/packages/auth-anonymous/package.json b/packages/auth-anonymous/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-auth-anonymous",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "",
   "main": "plugin.ts",
   "scripts": {

diff --git a/packages/auth-api-token/CHANGELOG.md b/packages/auth-api-token/CHANGELOG.md
@@ -1,5 +1,14 @@
 # zemble-plugin-auth-api-token
 
+## 0.0.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.8
+  - @zemble/graphql@0.0.12
+  - [email protected]
+
 ## 0.0.9
 
 ### Patch Changes

diff --git a/packages/auth-api-token/package.json b/packages/auth-api-token/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-auth-api-token",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "",
   "main": "plugin.ts",
   "scripts": {

diff --git a/packages/auth-otp/CHANGELOG.md b/packages/auth-otp/CHANGELOG.md
@@ -1,5 +1,16 @@
 # zemble-plugin-auth-otp
 
+## 0.0.10
+
+### Patch Changes
+
+- Fix dependency resolution
+- Updated dependencies
+  - @zemble/core@0.0.8
+  - @zemble/graphql@0.0.12
+  - [email protected]
+  - [email protected]
+
 ## 0.0.9
 
 ### Patch Changes

diff --git a/packages/auth-otp/package.json b/packages/auth-otp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-auth-otp",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "",
   "main": "plugin.ts",
   "scripts": {

diff --git a/packages/auth-otp/plugin.ts b/packages/auth-otp/plugin.ts
@@ -96,7 +96,7 @@ const plugin = new Plugin<OtpAuthConfig, typeof defaultConfig>(__dirname, {
   devConfig: {
     handleAuthRequest: ({ email }, code, { logger }) => { logger.log(`handleAuthRequest for ${email}`, code) },
     generateTokenContents,
-    from: { email: 'noreply@Zemble.com' },
+    from: { email: 'noreply@zemble.com' },
   },
 })
 

diff --git a/packages/auth/CHANGELOG.md b/packages/auth/CHANGELOG.md
@@ -1,5 +1,13 @@
 # zemble-plugin-auth
 
+## 0.0.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.8
+  - @zemble/graphql@0.0.12
+
 ## 0.0.9
 
 ### Patch Changes

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-auth",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "",
   "main": "plugin.ts",
   "bin": {

diff --git a/packages/bull/CHANGELOG.md b/packages/bull/CHANGELOG.md
@@ -1,5 +1,14 @@
 # zemble-plugin-bull
 
+## 0.0.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.8
+  - @zemble/graphql@0.0.12
+  - [email protected]
+
 ## 0.0.9
 
 ### Patch Changes

diff --git a/packages/bull/package.json b/packages/bull/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-bull",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "",
   "main": "plugin.ts",
   "scripts": {

diff --git a/packages/cms-users/CHANGELOG.md b/packages/cms-users/CHANGELOG.md
@@ -1,5 +1,17 @@
 # zemble-plugin-cms-users
 
+## 0.0.8
+
+### Patch Changes
+
+- Updated dependencies
+  - [email protected]
+  - @zemble/core@0.0.8
+  - @zemble/graphql@0.0.12
+  - [email protected]
+  - [email protected]
+  - [email protected]
+
 ## 0.0.7
 
 ### Patch Changes

diff --git a/packages/cms-users/package.json b/packages/cms-users/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-cms-users",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "",
   "main": "plugin.ts",
   "private": true,

diff --git a/packages/cms/CHANGELOG.md b/packages/cms/CHANGELOG.md
@@ -1,5 +1,14 @@
 # zemble-plugin-cms
 
+## 0.0.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.8
+  - @zemble/graphql@0.0.12
+  - [email protected]
+
 ## 0.0.7
 
 ### Patch Changes

diff --git a/packages/cms/package.json b/packages/cms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-cms",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "",
   "main": "plugin.ts",
   "private": true,

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @zemble/core
 
+## 0.0.8
+
+### Patch Changes
+
+- Fix dependency resolution
+
 ## 0.0.7
 
 ### Patch Changes

diff --git a/packages/core/Plugin.ts b/packages/core/Plugin.ts
@@ -4,9 +4,8 @@ import { createApp } from './server'
 import mergeDeep from './utils/mergeDeep'
 import { readPackageJson } from './utils/readPackageJson'
 
-import type PluginWithMiddleware from './PluginWithMiddleware'
 import type { ZembleApp } from './server'
-import type { DependenciesResolver, Dependency, PluginOpts } from './types'
+import type { Dependency, PluginOpts } from './types'
 
 // initialize dotenv before any plugins are loaded/configured
 configDotenv()
@@ -21,7 +20,7 @@ export class Plugin<
 
   readonly #devConfig?: TConfig
 
-  readonly #dependencies: DependenciesResolver<Plugin<Zemble.GlobalConfig>>
+  readonly dependencies: readonly Plugin<Zemble.GlobalConfig>[]
 
   readonly pluginPath: string
 
@@ -37,8 +36,16 @@ export class Plugin<
     this.pluginPath = __dirname
     this.#config = (opts?.defaultConfig ?? {}) as TResolvedConfig
     this.#devConfig = opts?.devConfig
-    // @ts-expect-error not the most important
-    this.#dependencies = opts?.dependencies ?? []
+    const deps = opts?.dependencies ?? []
+
+    const allDeps = (typeof deps === 'function') ? deps(this) : deps
+
+    const filteredDeps = allDeps.filter(this.#filterDevDependencies.bind(this))
+
+    const resolvedDeps = filteredDeps
+      .map(({ plugin, config }) => plugin.configure(config))
+
+    this.dependencies = resolvedDeps
 
     if (this.#isPluginDevMode) {
       void this.#devApp().then((app) => app.start())
@@ -101,28 +108,13 @@ export class Plugin<
     return this.#config
   }
 
-  get dependencies() {
-    const allDeps = Promise.resolve((typeof this.#dependencies === 'function') ? this.#dependencies(this) : this.#dependencies)
-
-    return allDeps.then(async (allDeps) => {
-      const filteredDeps = allDeps.filter(this.#filterDevDependencies.bind(this))
-
-      const resolvedDeps: Promise<readonly Plugin[]> = Promise.all(filteredDeps
-        .map(({ plugin, config }) => plugin.configure(config))
-        .flatMap(async (dep) => [dep, ...await dep.dependencies]))
-        .then((deps) => deps.flat())
-
-      return resolvedDeps
-    })
-  }
-
   async #devApp(): Promise<ZembleApp> {
     const resolved = this.configure(this.#devConfig)
     return createApp({
       plugins: [
-        ...await this.dependencies,
+        ...this.dependencies,
         resolved,
-      ] as readonly (Plugin<Zemble.GlobalConfig> | PluginWithMiddleware<Zemble.GlobalConfig>)[],
+      ],
     })
   }
 

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zemble/core",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "",
   "main": "index.ts",
   "scripts": {

diff --git a/packages/core/server.ts b/packages/core/server.ts
@@ -54,17 +54,15 @@ export const createApp = async ({ plugins: pluginsBeforeResolvingDeps }: Configu
 
   app.use('*', cors())
 
-  const resolved = await Promise.all(
-    pluginsBeforeResolvingDeps.flatMap(async (plugin) => [...await plugin.dependencies, plugin]),
-  ).then((plugins) => plugins.flat())
+  const resolved = pluginsBeforeResolvingDeps.flatMap((plugin) => [...plugin.dependencies, plugin])
 
   const plugins = resolved.reduce((prev, plugin) => {
     const existingPlugin = prev.find(({ pluginName }) => pluginName === plugin.pluginName)
     if (existingPlugin) {
-      if (existingPlugin.config !== plugin.config) {
+      if (existingPlugin !== plugin) {
         // in some situation we can end up with two instances of the same plugin (dependeing on package manager and
         // other factors). In those cases we use the latest version of the plugin, but try to merge the config
-        const pluginToUse = existingPlugin.pluginVersion > plugin.pluginVersion
+        const pluginToUse = existingPlugin.pluginVersion >= plugin.pluginVersion
           ? existingPlugin.configure(plugin.config)
           : plugin.configure(existingPlugin.config)
 

diff --git a/packages/core/types.ts b/packages/core/types.ts
@@ -110,7 +110,7 @@ export type Dependency<TConfig extends Zemble.GlobalConfig = Zemble.GlobalConfig
   readonly devOnly?: boolean, // decides if we should warn if this plugin is not used in production
 }
 
-export type DependenciesResolver<TSelf> = readonly Dependency[] | Promise<readonly Dependency[]> | ((self: TSelf) => readonly Dependency[]) | ((self: TSelf) => Promise<readonly Dependency[]>)
+export type DependenciesResolver<TSelf> = readonly Dependency[] | ((self: TSelf) => readonly Dependency[])
 
 export type PluginOpts<TDefaultConfig extends Zemble.GlobalConfig, TSelf, TConfig extends Zemble.GlobalConfig> = {
   /**

diff --git a/packages/email-sendgrid/CHANGELOG.md b/packages/email-sendgrid/CHANGELOG.md
@@ -1,5 +1,14 @@
 # zemble-plugin-email-sendgrid
 
+## 0.0.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.8
+  - @zemble/graphql@0.0.12
+  - [email protected]
+
 ## 0.0.9
 
 ### Patch Changes

diff --git a/packages/email-sendgrid/package.json b/packages/email-sendgrid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-email-sendgrid",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "",
   "main": "plugin.ts",
   "scripts": {