@microsoft/m365-spec-parser 0.2.2-alpha.2c5119322.0 → 0.2.2-alpha.2f6f18b3b.0

package/dist/index.esm2017.mjs

@@ -3,6 +3,7 @@ import converter from 'swagger2openapi';
 import jsyaml from 'js-yaml';
 import fs from 'fs-extra';
 import path from 'path';
+import { createHash } from 'crypto';
 
 // Copyright (c) Microsoft Corporation.
 /**
@@ -1599,7 +1600,7 @@ function inferProperties(card) {
 
 // Copyright (c) Microsoft Corporation.
 class ManifestUpdater {
-    static async updateManifestWithAiPlugin(manifestPath, outputSpecPath, apiPluginFilePath, spec, options, authInfo) {
+    static async updateManifestWithAiPlugin(manifestPath, outputSpecPath, apiPluginFilePath, spec, options, authInfo, existingPluginManifestInfo) {
         const manifest = await fs.readJSON(manifestPath);
         const apiPluginRelativePath = ManifestUpdater.getRelativePath(manifestPath, apiPluginFilePath);
         manifest.copilotExtensions = manifest.copilotExtensions || {};
@@ -1615,7 +1616,7 @@ class ManifestUpdater {
         }
         const appName = this.removeEnvs(manifest.name.short);
         const specRelativePath = ManifestUpdater.getRelativePath(manifestPath, outputSpecPath);
-        const [apiPlugin, warnings] = await ManifestUpdater.generatePluginManifestSchema(spec, specRelativePath, apiPluginFilePath, appName, authInfo, options);
+        const [apiPlugin, warnings] = await ManifestUpdater.generatePluginManifestSchema(spec, specRelativePath, apiPluginFilePath, appName, authInfo, options, existingPluginManifestInfo);
         return [manifest, apiPlugin, warnings];
     }
     static updateManifestDescription(manifest, spec) {
@@ -1637,7 +1638,7 @@ class ManifestUpdater {
             throw new SpecParserError(Utils.format(ConstantString.UnsupportedSchema, method, pathUrl, JSON.stringify(schema)), ErrorType.UpdateManifestFailed);
         }
     }
-    static async generatePluginManifestSchema(spec, specRelativePath, apiPluginFilePath, appName, authInfo, options) {
+    static async generatePluginManifestSchema(spec, specRelativePath, apiPluginFilePath, appName, authInfo, options, existingPluginManifestInfo) {
         var _a, _b, _c, _d;
         const warnings = [];
         const functions = [];
@@ -1756,6 +1757,10 @@ class ManifestUpdater {
         if (await fs.pathExists(apiPluginFilePath)) {
             apiPlugin = await fs.readJSON(apiPluginFilePath);
         }
+        else if (existingPluginManifestInfo &&
+            (await fs.pathExists(existingPluginManifestInfo.manifestPath))) {
+            apiPlugin = await fs.readJSON(existingPluginManifestInfo.manifestPath);
+        }
         else {
             apiPlugin = {
                 $schema: ConstantString.PluginManifestSchema,
@@ -1778,6 +1783,11 @@ class ManifestUpdater {
             }
         }
         apiPlugin.runtimes = apiPlugin.runtimes || [];
+        // Need to delete previous runtime since spec path has changed
+        if (existingPluginManifestInfo) {
+            const relativePath = ManifestUpdater.getRelativePath(existingPluginManifestInfo.manifestPath, existingPluginManifestInfo.specPath);
+            apiPlugin.runtimes = apiPlugin.runtimes.filter((runtime) => runtime.spec.url !== relativePath);
+        }
         const index = apiPlugin.runtimes.findIndex((runtime) => {
             var _a, _b;
             return runtime.spec.url === specRelativePath &&
@@ -1974,6 +1984,7 @@ class SpecParser {
      */
     async validate() {
         try {
+            let hash = "";
             try {
                 await this.loadSpec();
                 if (!this.parser.$refs.circular) {
@@ -1989,8 +2000,13 @@ class SpecParser {
                     status: ValidationStatus.Error,
                     warnings: [],
                     errors: [{ type: ErrorType.SpecNotValid, content: e.toString() }],
+                    specHash: hash,
                 };
             }
+            if (this.unResolveSpec.servers) {
+                const serverString = JSON.stringify(this.unResolveSpec.servers);
+                hash = createHash("sha256").update(serverString).digest("hex");
+            }
             const errors = [];
             const warnings = [];
             if (!this.options.allowSwagger && this.isSwaggerFile) {
@@ -2000,6 +2016,7 @@ class SpecParser {
                     errors: [
                         { type: ErrorType.SwaggerNotSupported, content: ConstantString.SwaggerNotSupported },
                     ],
+                    specHash: hash,
                 };
             }
             // Remote reference not supported
@@ -2033,6 +2050,7 @@ class SpecParser {
                 status: status,
                 warnings: warnings,
                 errors: errors,
+                specHash: hash,
             };
         }
         catch (err) {
@@ -2148,7 +2166,7 @@ class SpecParser {
      * @param outputSpecPath File path of the new OpenAPI specification file to generate. If not specified or empty, no spec file will be generated.
      * @param pluginFilePath File path of the api plugin file to generate.
      */
-    async generateForCopilot(manifestPath, filter, outputSpecPath, pluginFilePath, signal) {
+    async generateForCopilot(manifestPath, filter, outputSpecPath, pluginFilePath, existingPluginFilePath, signal) {
         const result = {
             allSuccess: true,
             warnings: [],
@@ -2162,7 +2180,13 @@ class SpecParser {
             if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                 throw new SpecParserError(ConstantString.CancelledMessage, ErrorType.Cancelled);
             }
-            const [updatedManifest, apiPlugin, warnings] = await ManifestUpdater.updateManifestWithAiPlugin(manifestPath, outputSpecPath, pluginFilePath, newSpec, this.options, authInfo);
+            const existingPluginManifestInfo = existingPluginFilePath
+                ? {
+                    manifestPath: existingPluginFilePath,
+                    specPath: this.pathOrSpec,
+                }
+                : undefined;
+            const [updatedManifest, apiPlugin, warnings] = await ManifestUpdater.updateManifestWithAiPlugin(manifestPath, outputSpecPath, pluginFilePath, newSpec, this.options, authInfo, existingPluginManifestInfo);
             result.warnings.push(...warnings);
             await fs.outputJSON(manifestPath, updatedManifest, { spaces: 4 });
             await fs.outputJSON(pluginFilePath, apiPlugin, { spaces: 4 });