From d3d7d77020698d00c3a11a14d2232d7f76ea9234 Mon Sep 17 00:00:00 2001 From: polatengin Date: Thu, 26 Sep 2024 08:40:46 -0700 Subject: [PATCH 1/3] removing unneeded imports --- app/exec/extension/_lib/vsix-manifest-builder.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/exec/extension/_lib/vsix-manifest-builder.ts b/app/exec/extension/_lib/vsix-manifest-builder.ts index a432398f..ab90bbc5 100644 --- a/app/exec/extension/_lib/vsix-manifest-builder.ts +++ b/app/exec/extension/_lib/vsix-manifest-builder.ts @@ -10,16 +10,15 @@ import { Vsix, VsixLanguagePack, } from "./interfaces"; -import { cleanAssetPath, jsonToXml, maxKey, toZipItemName } from "./utils"; +import { jsonToXml, maxKey, toZipItemName } from "./utils"; import _ = require("lodash"); import childProcess = require("child_process"); import onecolor = require("onecolor"); import os = require("os"); import path = require("path"); -import stream = require("stream"); import trace = require("../../../lib/trace"); import winreg = require("winreg"); -import xml = require("xml2js"); + export class VsixManifestBuilder extends ManifestBuilder { constructor(extRoot: string) { From cc00f47339da5ab784dd6d389ecbb5bfdb1bc30a Mon Sep 17 00:00:00 2001 From: polatengin Date: Thu, 26 Sep 2024 08:41:38 -0700 Subject: [PATCH 2/3] adding missing types --- .../extension/_lib/vsix-manifest-builder.ts | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/app/exec/extension/_lib/vsix-manifest-builder.ts b/app/exec/extension/_lib/vsix-manifest-builder.ts index ab90bbc5..344afc3a 100644 --- a/app/exec/extension/_lib/vsix-manifest-builder.ts +++ b/app/exec/extension/_lib/vsix-manifest-builder.ts @@ -19,6 +19,16 @@ import path = require("path"); import trace = require("../../../lib/trace"); import winreg = require("winreg"); +interface DetailsType { + path: string; + contentType: string; +} + +interface RepositoryType { + type: string; + url: string; + uri: string; +} export class VsixManifestBuilder extends ManifestBuilder { constructor(extRoot: string) { @@ -257,13 +267,15 @@ export class VsixManifestBuilder extends ManifestBuilder { }); break; case "details": - if (_.isObject(value) && value.path) { + const pathField: keyof DetailsType = "path" + if (_.isObject(value) && pathField in value) { + const file = value as DetailsType; let fileDecl: FileDeclaration = { - path: value.path, + path: file.path, addressable: true, auto: true, assetType: "Microsoft.VisualStudio.Services.Content.Details", - contentType: value.contentType, + contentType: file.contentType, }; this.addFile(fileDecl, true); } @@ -303,7 +315,7 @@ export class VsixManifestBuilder extends ManifestBuilder { break; case "repository": if (_.isObject(value)) { - const { type, url, uri } = value; + const { type, url, uri } = value as RepositoryType; if (!type) { throw new Error("Repository must have a 'type' property."); } From 6feff4cc01095e6b3a9ca136e57e96a94ad841ff Mon Sep 17 00:00:00 2001 From: polatengin Date: Thu, 26 Sep 2024 08:41:53 -0700 Subject: [PATCH 3/3] formatting document --- app/exec/extension/_lib/vsix-manifest-builder.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/exec/extension/_lib/vsix-manifest-builder.ts b/app/exec/extension/_lib/vsix-manifest-builder.ts index 344afc3a..e8d9e02a 100644 --- a/app/exec/extension/_lib/vsix-manifest-builder.ts +++ b/app/exec/extension/_lib/vsix-manifest-builder.ts @@ -819,7 +819,7 @@ export class VsixManifestBuilder extends ManifestBuilder { seenPartNames.add(partName); } if ((this.files[filePath] as any)._additionalPackagePaths) { - for (const additionalPath of (this.files[filePath] as any)._additionalPackagePaths) { + for (const additionalPath of (this.files[filePath] as any)._additionalPackagePaths) { let additionalPartName = "/" + toZipItemName(additionalPath); if (!seenPartNames.has(additionalPartName)) { contentTypes.Types.Override.push({