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

package/dist/index.node.cjs.js

@@ -7,6 +7,7 @@ var converter = require('swagger2openapi');
 var jsyaml = require('js-yaml');
 var fs = require('fs-extra');
 var path = require('path');
+var crypto = require('crypto');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -1641,7 +1642,7 @@ function inferProperties(card) {
 
 // Copyright (c) Microsoft Corporation.
 class ManifestUpdater {
-    static updateManifestWithAiPlugin(manifestPath, outputSpecPath, apiPluginFilePath, spec, options, authInfo) {
+    static updateManifestWithAiPlugin(manifestPath, outputSpecPath, apiPluginFilePath, spec, options, authInfo, existingPluginManifestInfo) {
         return __awaiter(this, void 0, void 0, function* () {
             const manifest = yield fs__default['default'].readJSON(manifestPath);
             const apiPluginRelativePath = ManifestUpdater.getRelativePath(manifestPath, apiPluginFilePath);
@@ -1658,7 +1659,7 @@ class ManifestUpdater {
             }
             const appName = this.removeEnvs(manifest.name.short);
             const specRelativePath = ManifestUpdater.getRelativePath(manifestPath, outputSpecPath);
-            const [apiPlugin, warnings] = yield ManifestUpdater.generatePluginManifestSchema(spec, specRelativePath, apiPluginFilePath, appName, authInfo, options);
+            const [apiPlugin, warnings] = yield ManifestUpdater.generatePluginManifestSchema(spec, specRelativePath, apiPluginFilePath, appName, authInfo, options, existingPluginManifestInfo);
             return [manifest, apiPlugin, warnings];
         });
     }
@@ -1681,7 +1682,7 @@ class ManifestUpdater {
             throw new SpecParserError(Utils.format(ConstantString.UnsupportedSchema, method, pathUrl, JSON.stringify(schema)), exports.ErrorType.UpdateManifestFailed);
         }
     }
-    static generatePluginManifestSchema(spec, specRelativePath, apiPluginFilePath, appName, authInfo, options) {
+    static generatePluginManifestSchema(spec, specRelativePath, apiPluginFilePath, appName, authInfo, options, existingPluginManifestInfo) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const warnings = [];
@@ -1801,6 +1802,10 @@ class ManifestUpdater {
             if (yield fs__default['default'].pathExists(apiPluginFilePath)) {
                 apiPlugin = yield fs__default['default'].readJSON(apiPluginFilePath);
             }
+            else if (existingPluginManifestInfo &&
+                (yield fs__default['default'].pathExists(existingPluginManifestInfo.manifestPath))) {
+                apiPlugin = yield fs__default['default'].readJSON(existingPluginManifestInfo.manifestPath);
+            }
             else {
                 apiPlugin = {
                     $schema: ConstantString.PluginManifestSchema,
@@ -1823,6 +1828,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 &&
@@ -2025,6 +2035,7 @@ class SpecParser {
     validate() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                let hash = "";
                 try {
                     yield this.loadSpec();
                     if (!this.parser.$refs.circular) {
@@ -2040,8 +2051,13 @@ class SpecParser {
                         status: exports.ValidationStatus.Error,
                         warnings: [],
                         errors: [{ type: exports.ErrorType.SpecNotValid, content: e.toString() }],
+                        specHash: hash,
                     };
                 }
+                if (this.unResolveSpec.servers) {
+                    const serverString = JSON.stringify(this.unResolveSpec.servers);
+                    hash = crypto.createHash("sha256").update(serverString).digest("hex");
+                }
                 const errors = [];
                 const warnings = [];
                 if (!this.options.allowSwagger && this.isSwaggerFile) {
@@ -2051,6 +2067,7 @@ class SpecParser {
                         errors: [
                             { type: exports.ErrorType.SwaggerNotSupported, content: ConstantString.SwaggerNotSupported },
                         ],
+                        specHash: hash,
                     };
                 }
                 // Remote reference not supported
@@ -2084,6 +2101,7 @@ class SpecParser {
                     status: status,
                     warnings: warnings,
                     errors: errors,
+                    specHash: hash,
                 };
             }
             catch (err) {
@@ -2206,7 +2224,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.
      */
-    generateForCopilot(manifestPath, filter, outputSpecPath, pluginFilePath, signal) {
+    generateForCopilot(manifestPath, filter, outputSpecPath, pluginFilePath, existingPluginFilePath, signal) {
         return __awaiter(this, void 0, void 0, function* () {
             const result = {
                 allSuccess: true,
@@ -2221,7 +2239,13 @@ class SpecParser {
                 if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                     throw new SpecParserError(ConstantString.CancelledMessage, exports.ErrorType.Cancelled);
                 }
-                const [updatedManifest, apiPlugin, warnings] = yield ManifestUpdater.updateManifestWithAiPlugin(manifestPath, outputSpecPath, pluginFilePath, newSpec, this.options, authInfo);
+                const existingPluginManifestInfo = existingPluginFilePath
+                    ? {
+                        manifestPath: existingPluginFilePath,
+                        specPath: this.pathOrSpec,
+                    }
+                    : undefined;
+                const [updatedManifest, apiPlugin, warnings] = yield ManifestUpdater.updateManifestWithAiPlugin(manifestPath, outputSpecPath, pluginFilePath, newSpec, this.options, authInfo, existingPluginManifestInfo);
                 result.warnings.push(...warnings);
                 yield fs__default['default'].outputJSON(manifestPath, updatedManifest, { spaces: 4 });
                 yield fs__default['default'].outputJSON(pluginFilePath, apiPlugin, { spaces: 4 });