serverless-plugin-module-registry 1.0.20 → 1.0.23

package/dist/index.js

@@ -16451,6 +16451,43 @@ var DynamoDBManager = class {
       ...entry
     }));
   }
+  /**
+   * Merge new module items with existing DDB records to preserve fields
+   * not set by the current deploy (e.g., apiGatewayId).
+   *
+   * Uses existing → new merge order so that new values always win,
+   * but fields only present in the existing record are preserved.
+   */
+  async mergeWithExistingModuleItems(newModuleItems, moduleNames) {
+    const existingByModule = /* @__PURE__ */ new Map();
+    for (const moduleName of moduleNames) {
+      try {
+        const existingItems = await this.queryModuleEntries(moduleName);
+        const moduleRecord = existingItems.find((item) => item.sk === "MODULE");
+        if (moduleRecord) {
+          existingByModule.set(moduleName, moduleRecord);
+        }
+      } catch (err) {
+        this.logger.warning(`   Could not read existing record for module '${moduleName}': ${err.message}`);
+      }
+    }
+    if (existingByModule.size === 0) {
+      return newModuleItems;
+    }
+    return newModuleItems.map((newItem) => {
+      const moduleName = newItem.moduleName;
+      const existing = existingByModule.get(moduleName);
+      if (!existing) return newItem;
+      const merged = { ...existing, ...newItem };
+      const preservedFields = Object.keys(existing).filter(
+        (k) => !(k in newItem) && existing[k] !== void 0
+      );
+      if (preservedFields.length > 0) {
+        this.logger.info(`   \u{1F500} Module '${moduleName}': preserved existing fields: ${preservedFields.join(", ")}`);
+      }
+      return merged;
+    });
+  }
   /**
    * Clean up stale entries for given modules
    * Note: Settings are now stored as attributes on module items, not separate items
@@ -16519,12 +16556,13 @@ var DynamoDBManager = class {
       await this.ensureTable();
       const moduleNames = [...new Set(moduleEntries.map((m) => m.moduleName))];
       await this.cleanupStaleEntries(moduleNames, moduleEntries, featureEntries, settingsEntries);
-      const moduleItems = this.moduleEntriesToItems(moduleEntries, settingsEntries);
+      let moduleItems = this.moduleEntriesToItems(moduleEntries, settingsEntries);
       const featureItems = this.featureEntriesToItems(featureEntries);
       this.logger.info(`   \u{1F4CA} Preparing items: ${moduleItems.length} modules (${settingsEntries.length} with settings), ${featureItems.length} features`);
       if (settingsEntries.length > 0) {
         this.logger.info(`   \u2699\uFE0F  Modules with settings: ${settingsEntries.map((s) => s.moduleName).join(", ")}`);
       }
+      moduleItems = await this.mergeWithExistingModuleItems(moduleItems, moduleNames);
       const allItems = [
         ...moduleItems,
         ...featureItems
@@ -16986,22 +17024,26 @@ var PluginOrchestrator = class {
       } catch (cfnError) {
         this.logger.warning(`CloudFormation API Gateway lookup failed: ${cfnError.message}`);
       }
-      const apiGatewayClient = new import_client_api_gateway.APIGatewayClient({ region });
-      try {
-        const apisCommand = new import_client_api_gateway.GetRestApisCommand({});
-        const apisResponse = await apiGatewayClient.send(apisCommand);
-        const matchingApi = (_b3 = apisResponse.items) == null ? void 0 : _b3.find(
-          (api) => {
-            var _a5;
-            return api.name === serviceName || ((_a5 = api.name) == null ? void 0 : _a5.includes(serviceName));
+      const stage = stackName.startsWith(serviceName + "-") ? stackName.slice(serviceName.length + 1) : void 0;
+      if (!stage) {
+        this.logger.warning(`Could not derive stage from stackName '${stackName}' and serviceName '${serviceName}'. Skipping API Gateway fallback.`);
+      } else {
+        const apiGatewayClient = new import_client_api_gateway.APIGatewayClient({ region });
+        const expectedApiName = `${stage}-${serviceName}`;
+        this.logger.info(`\u{1F50D} Fallback: looking for API Gateway with exact name: ${expectedApiName}`);
+        try {
+          const apisCommand = new import_client_api_gateway.GetRestApisCommand({});
+          const apisResponse = await apiGatewayClient.send(apisCommand);
+          const matchingApi = (_b3 = apisResponse.items) == null ? void 0 : _b3.find(
+            (api) => api.name === expectedApiName
+          );
+          if (matchingApi == null ? void 0 : matchingApi.id) {
+            this.logger.info(`\u2705 Discovered API Gateway ID from API Gateway service: ${matchingApi.id} (name: ${expectedApiName})`);
+            return matchingApi.id;
           }
-        );
-        if (matchingApi == null ? void 0 : matchingApi.id) {
-          this.logger.info(`\u2705 Discovered API Gateway ID from API Gateway service: ${matchingApi.id}`);
-          return matchingApi.id;
+        } catch (apiError) {
+          this.logger.warning(`API Gateway service lookup failed: ${apiError.message}`);
         }
-      } catch (apiError) {
-        this.logger.warning(`API Gateway service lookup failed: ${apiError.message}`);
       }
       this.logger.warning("Could not discover API Gateway ID. Module will be registered without apiGatewayId.");
       return void 0;
@@ -19668,29 +19710,33 @@ var ServerlessModuleRegistryPlugin = class {
       } catch (cfnError) {
         this.logger.warning(`CloudFormation API Gateway lookup failed: ${cfnError.message}`);
       }
-      if (!this.apiGatewayClient) {
-        this.apiGatewayClient = new import_client_api_gateway2.APIGatewayClient({ region });
-      }
-      try {
-        let position;
-        do {
-          const apisResponse = await this.apiGatewayClient.send(
-            new import_client_api_gateway2.GetRestApisCommand(position ? { position } : {})
-          );
-          const matchingApi = (_b3 = apisResponse.items) == null ? void 0 : _b3.find(
-            (api) => {
-              var _a5;
-              return api.name === serviceName || ((_a5 = api.name) == null ? void 0 : _a5.includes(serviceName));
+      const stage = stackName.startsWith(serviceName + "-") ? stackName.slice(serviceName.length + 1) : void 0;
+      if (!stage) {
+        this.logger.warning(`Could not derive stage from stackName '${stackName}' and serviceName '${serviceName}'. Skipping API Gateway fallback.`);
+      } else {
+        if (!this.apiGatewayClient) {
+          this.apiGatewayClient = new import_client_api_gateway2.APIGatewayClient({ region });
+        }
+        const expectedApiName = `${stage}-${serviceName}`;
+        this.logger.info(`\u{1F50D} Fallback: looking for API Gateway with exact name: ${expectedApiName}`);
+        try {
+          let position;
+          do {
+            const apisResponse = await this.apiGatewayClient.send(
+              new import_client_api_gateway2.GetRestApisCommand(position ? { position } : {})
+            );
+            const matchingApi = (_b3 = apisResponse.items) == null ? void 0 : _b3.find(
+              (api) => api.name === expectedApiName
+            );
+            if (matchingApi == null ? void 0 : matchingApi.id) {
+              this.logger.info(`\u2705 Discovered API Gateway ID from API Gateway service: ${matchingApi.id} (name: ${expectedApiName})`);
+              return matchingApi.id;
             }
-          );
-          if (matchingApi == null ? void 0 : matchingApi.id) {
-            this.logger.info(`\u2705 Discovered API Gateway ID from API Gateway service: ${matchingApi.id}`);
-            return matchingApi.id;
-          }
-          position = apisResponse.position;
-        } while (position);
-      } catch (apiError) {
-        this.logger.warning(`API Gateway service lookup failed: ${apiError.message}`);
+            position = apisResponse.position;
+          } while (position);
+        } catch (apiError) {
+          this.logger.warning(`API Gateway service lookup failed: ${apiError.message}`);
+        }
       }
       this.logger.warning("Could not discover API Gateway ID. Module will be registered without apiGatewayId.");
       return void 0;