ovsx 0.9.4 → 0.10.0

package/lib/verify-pat.js

@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyPat = void 0;
+exports.doVerifyPat = exports.verifyPat = void 0;
 const registry_1 = require("./registry");
 const util_1 = require("./util");
 /**
@@ -17,9 +17,6 @@ const util_1 = require("./util");
  */
 async function verifyPat(options) {
     (0, util_1.addEnvOptions)(options);
-    if (!options.pat) {
-        throw new Error("A personal access token must be given with the option '--pat'.");
-    }
     if (!options.namespace) {
         let error;
         try {
@@ -33,12 +30,19 @@ async function verifyPat(options) {
                 (error ? `\n\n${error}` : ''));
         }
     }
+    options.pat = await (0, util_1.getPAT)(options.namespace, options, false);
+    await doVerifyPat(options);
+}
+exports.verifyPat = verifyPat;
+async function doVerifyPat(options) {
     const registry = new registry_1.Registry(options);
-    const result = await registry.verifyPat(options.namespace, options.pat);
+    const namespace = options.namespace;
+    const pat = options.pat;
+    const result = await registry.verifyPat(namespace, pat);
     if (result.error) {
         throw new Error(result.error);
     }
-    console.log(`\ud83d\ude80  PAT valid to publish at ${options.namespace}`);
+    console.log(`\ud83d\ude80  PAT valid to publish at ${namespace}`);
 }
-exports.verifyPat = verifyPat;
+exports.doVerifyPat = doVerifyPat;
 //# sourceMappingURL=verify-pat.js.map

package/lib/verify-pat.js.map

@@ -1 +1 @@
-{"version":3,"file":"verify-pat.js","sourceRoot":"","sources":["../src/verify-pat.ts"],"names":[],"mappings":";AAAA;;;;;;;;kFAQkF;;;AAElF,yCAAuD;AACvD,iCAAqD;AAErD;;GAEG;AACI,KAAK,UAAU,SAAS,CAAC,OAAyB;IACrD,IAAA,oBAAa,EAAC,OAAO,CAAC,CAAC;IACvB,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;KACrF;IAED,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QACtB,IAAI,KAAK,CAAC;QACV,IAAI;YACF,OAAO,CAAC,SAAS,GAAG,CAAC,MAAM,IAAA,mBAAY,GAAE,CAAC,CAAC,SAAS,CAAC;SACtD;QAAC,OAAO,CAAC,EAAE;YACV,KAAK,GAAG,CAAC,CAAC;SACX;QAED,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YACtB,MAAM,IAAI,KAAK,CACb,6GAA6G;gBAC7G,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC9B,CAAC;SACH;KACF;IAED,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACxE,IAAI,MAAM,CAAC,KAAK,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KACjC;IACD,OAAO,CAAC,GAAG,CAAC,yCAAyC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AAC9E,CAAC;AA5BD,8BA4BC"}
+{"version":3,"file":"verify-pat.js","sourceRoot":"","sources":["../src/verify-pat.ts"],"names":[],"mappings":";AAAA;;;;;;;;kFAQkF;;;AAElF,yCAAuD;AACvD,iCAA6D;AAE7D;;GAEG;AACI,KAAK,UAAU,SAAS,CAAC,OAAyB;IACrD,IAAA,oBAAa,EAAC,OAAO,CAAC,CAAC;IACvB,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QACpB,IAAI,KAAK,CAAC;QACV,IAAI;YACA,OAAO,CAAC,SAAS,GAAG,CAAC,MAAM,IAAA,mBAAY,GAAE,CAAC,CAAC,SAAS,CAAC;SACxD;QAAC,OAAO,CAAC,EAAE;YACR,KAAK,GAAG,CAAC,CAAC;SACb;QAED,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YACpB,MAAM,IAAI,KAAK,CACX,6GAA6G;gBAC7G,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAChC,CAAC;SACL;KACJ;IAED,OAAO,CAAC,GAAG,GAAG,MAAM,IAAA,aAAM,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9D,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;AAC/B,CAAC;AApBD,8BAoBC;AAEM,KAAK,UAAU,WAAW,CAAC,OAAyB;IACvD,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAmB,CAAC;IAC9C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAa,CAAC;IAClC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IACxD,IAAI,MAAM,CAAC,KAAK,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KACjC;IACD,OAAO,CAAC,GAAG,CAAC,yCAAyC,SAAS,EAAE,CAAC,CAAC;AACtE,CAAC;AATD,kCASC"}

package/lib/zip.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+import { Manifest } from './util';
+export declare function readZip(packagePath: string, filter: (name: string) => boolean): Promise<Map<string, Buffer>>;
+export declare function readVSIXPackage(packagePath: string): Promise<Manifest>;
+//# sourceMappingURL=zip.d.ts.map

package/lib/zip.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"zip.d.ts","sourceRoot":"","sources":["../src/zip.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAWlC,wBAAsB,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA+BlH;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAQ5E"}

package/lib/zip.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readVSIXPackage = exports.readZip = void 0;
+const yauzl_1 = require("yauzl");
+async function bufferStream(stream) {
+    return await new Promise((c, e) => {
+        const buffers = [];
+        stream.on('data', buffer => buffers.push(buffer));
+        stream.once('error', e);
+        stream.once('end', () => c(Buffer.concat(buffers)));
+    });
+}
+async function readZip(packagePath, filter) {
+    const zipfile = await new Promise((c, e) => (0, yauzl_1.open)(packagePath, { lazyEntries: true }, (err, zipfile) => (err ? e(err) : c(zipfile))));
+    return await new Promise((c, e) => {
+        const result = new Map();
+        zipfile.once('close', () => c(result));
+        zipfile.readEntry();
+        zipfile.on('entry', (entry) => {
+            const name = entry.fileName.toLowerCase();
+            if (filter(name)) {
+                zipfile.openReadStream(entry, (err, stream) => {
+                    if (err) {
+                        zipfile.close();
+                        return e(err);
+                    }
+                    bufferStream(stream).then(buffer => {
+                        result.set(name, buffer);
+                        zipfile.readEntry();
+                    });
+                });
+            }
+            else {
+                zipfile.readEntry();
+            }
+        });
+    });
+}
+exports.readZip = readZip;
+async function readVSIXPackage(packagePath) {
+    const map = await readZip(packagePath, name => /^extension\/package\.json$/i.test(name));
+    const rawManifest = map.get('extension/package.json');
+    if (!rawManifest) {
+        throw new Error('Manifest not found.');
+    }
+    return JSON.parse(rawManifest.toString('utf8'));
+}
+exports.readVSIXPackage = readVSIXPackage;
+//# sourceMappingURL=zip.js.map

package/lib/zip.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zip.js","sourceRoot":"","sources":["../src/zip.ts"],"names":[],"mappings":";;;AAAA,iCAA6C;AAI7C,KAAK,UAAU,YAAY,CAAC,MAAgB;IAC3C,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACxB,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,OAAO,CAAC,WAAmB,EAAE,MAAiC;IACnF,MAAM,OAAO,GAAG,MAAM,IAAI,OAAO,CAAU,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACnD,IAAA,YAAI,EAAC,WAAW,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAQ,CAAC,CAAC,CAAC,CACxF,CAAC;IAEF,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;QAEzC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QAEvC,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YACpC,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAE1C,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;gBACjB,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;oBAC7C,IAAI,GAAG,EAAE;wBACR,OAAO,CAAC,KAAK,EAAE,CAAC;wBAChB,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;qBACd;oBAED,YAAY,CAAC,MAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;wBACnC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;wBACzB,OAAO,CAAC,SAAS,EAAE,CAAC;oBACrB,CAAC,CAAC,CAAC;gBACJ,CAAC,CAAC,CAAC;aACH;iBAAM;gBACN,OAAO,CAAC,SAAS,EAAE,CAAC;aACpB;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC;AA/BD,0BA+BC;AAEM,KAAK,UAAU,eAAe,CAAC,WAAmB;IACxD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACzF,MAAM,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IACtD,IAAI,CAAC,WAAW,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;KACvC;IAEE,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAa,CAAC;AAChE,CAAC;AARD,0CAQC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ovsx",
-  "version": "0.9.4",
+  "version": "0.10.0",
   "description": "Command line interface for Eclipse Open VSX",
   "keywords": [
     "cli",
@@ -31,23 +31,25 @@
   "types": "lib/index",
   "bin": "lib/ovsx",
   "engines": {
-    "node": ">= 16"
+    "node": ">= 20"
   },
   "dependencies": {
-    "@vscode/vsce": "^2.25.0",
-    "commander": "^6.1.0",
+    "@vscode/vsce": "^3.1.0",
+    "commander": "^6.2.1",
     "follow-redirects": "^1.14.6",
     "is-ci": "^2.0.0",
     "leven": "^3.1.0",
     "semver": "^7.6.0",
-    "tmp": "^0.2.1"
+    "tmp": "^0.2.3",
+    "yauzl": "^3.1.3"
   },
   "devDependencies": {
     "@types/follow-redirects": "^1.13.1",
     "@types/is-ci": "^2.0.0",
-    "@types/node": "^16.11.7",
+    "@types/node": "^20.14.8",
     "@types/semver": "^7.5.8",
-    "@types/tmp": "^0.1.0",
+    "@types/tmp": "^0.2.2",
+    "@types/yauzl": "^2.10.3",
     "@typescript-eslint/eslint-plugin": "^5.44.0",
     "@typescript-eslint/parser": "^5.44.0",
     "eslint": "^8.28.0",

package/src/create-namespace.ts

@@ -9,7 +9,7 @@
  ********************************************************************************/
 
 import { Registry, RegistryOptions } from './registry';
-import { addEnvOptions } from './util';
+import { addEnvOptions, getPAT } from './util';
 
 /**
  * Creates a namespace (corresponds to `publisher` in package.json).
@@ -19,9 +19,8 @@ export async function createNamespace(options: CreateNamespaceOptions = {}): Pro
     if (!options.name) {
         throw new Error('The namespace name is mandatory.');
     }
-    if (!options.pat) {
-        throw new Error("A personal access token must be given with the option '--pat'.");
-    }
+
+    options.pat = await getPAT(options.name, options, false);
 
     const registry = new Registry(options);
     const result = await registry.createNamespace(options.name, options.pat);

package/src/login.ts

@@ -0,0 +1,41 @@
+/********************************************************************************
+ * Copyright (c) 2024 Precies. Software and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
+import {  } from '@vscode/vsce';
+import { addEnvOptions, getUserInput, requestPAT } from './util';
+import { openDefaultStore } from './store';
+import { RegistryOptions } from './registry';
+
+export default async function login(options: LoginOptions) {
+	addEnvOptions(options);
+	if (!options.namespace) {
+        throw new Error('Missing namespace name.');
+    }
+
+	const store = await openDefaultStore();
+	let pat = store.get(options.namespace);
+	if (pat) {
+		console.log(`Namespace '${options.namespace}' is already known.`);
+		const answer = await getUserInput('Do you want to overwrite its PAT? [y/N] ');
+
+		if (!/^y$/i.test(answer)) {
+			throw new Error('Aborted.');
+		}
+	}
+
+	pat = await requestPAT(options.namespace, options);
+	await store.add(options.namespace, pat);
+}
+
+export interface LoginOptions extends RegistryOptions {
+    /**
+     * Name of the namespace.
+     */
+    namespace?: string
+}

package/src/logout.ts

@@ -0,0 +1,15 @@
+import { openDefaultStore } from "./store";
+
+export default async function logout(namespaceName: string) {
+	if (!namespaceName) {
+        throw new Error('Missing namespace name.');
+    }
+
+	const store = await openDefaultStore();
+	if (!store.get(namespaceName)) {
+		throw new Error(`Unknown namespace '${namespaceName}'.`);
+	}
+
+	await store.delete(namespaceName);
+    console.log(`\ud83d\ude80  ${namespaceName} removed from the list of known namespaces`);
+}

package/src/main.ts

@@ -15,6 +15,8 @@ import { verifyPat } from './verify-pat';
 import { publish } from './publish';
 import { handleError } from './util';
 import { getExtension } from './get';
+import login from './login';
+import logout from './logout';
 
 const pkg = require('../package.json');
 
@@ -52,7 +54,8 @@ module.exports = function (argv: string[]): void {
         .option('--pre-release', 'Mark this package as a pre-release')
         .option('--no-dependencies', 'Disable dependency detection via npm or yarn')
         .option('--skip-duplicate', 'Fail silently if version already exists on the marketplace')
-        .action((extensionFile: string, { target, packagePath, baseContentUrl, baseImagesUrl, yarn, preRelease, dependencies, skipDuplicate }) => {
+        .option('--packageVersion <version>', 'Version of the provided VSIX packages.')
+        .action((extensionFile: string, { target, packagePath, baseContentUrl, baseImagesUrl, yarn, preRelease, dependencies, skipDuplicate, packageVersion }) => {
             if (extensionFile !== undefined && packagePath !== undefined) {
                 console.error('\u274c  Please specify either a package file or a package path, but not both.\n');
                 publishCmd.help();
@@ -67,8 +70,10 @@ module.exports = function (argv: string[]): void {
                 console.warn("Ignoring option '--baseImagesUrl' for prepackaged extension.");
             if (extensionFile !== undefined && yarn !== undefined)
                 console.warn("Ignoring option '--yarn' for prepackaged extension.");
+            if (extensionFile !== undefined && packageVersion !== undefined)
+                console.warn("Ignoring option '--packageVersion' for prepackaged extension.");
             const { registryUrl, pat } = program.opts();
-            publish({ extensionFile, registryUrl, pat, targets: typeof target === 'string' ? [target] : target, packagePath: typeof packagePath === 'string' ? [packagePath] : packagePath, baseContentUrl, baseImagesUrl, yarn, preRelease, dependencies, skipDuplicate })
+            publish({ extensionFile, registryUrl, pat, targets: typeof target === 'string' ? [target] : target, packagePath: typeof packagePath === 'string' ? [packagePath] : packagePath, baseContentUrl, baseImagesUrl, yarn, preRelease, dependencies, skipDuplicate, packageVersion })
                 .then(results => {
                     const reasons = results.filter(result => result.status === 'rejected')
                         .map(result => result as PromiseRejectedResult)
@@ -76,7 +81,7 @@ module.exports = function (argv: string[]): void {
 
                     if (reasons.length > 0) {
                         const message = 'See the documentation for more information:\n'
-                        + 'https://github.com/eclipse/openvsx/wiki/Publishing-Extensions';
+                            + 'https://github.com/eclipse/openvsx/wiki/Publishing-Extensions';
                         const errorHandler = handleError(program.debug, message, false);
                         for (const reason of reasons) {
                             errorHandler(reason);
@@ -99,6 +104,19 @@ module.exports = function (argv: string[]): void {
                 .catch(handleError(program.debug));
         });
 
+    const loginCmd = program.command('login <namespace>');
+    loginCmd.description('Adds a namespace to the list of known namespaces')
+        .action((namespace: string) => {
+            const { registryUrl, pat } = program.opts();
+            login({ namespace, registryUrl, pat }).catch(handleError(program.debug));
+        });
+
+    const logoutCmd = program.command('logout <namespace>');
+    logoutCmd.description('Removes a namespace from the list of known namespaces')
+        .action((namespace: string) => {
+            logout(namespace).catch(handleError(program.debug));
+        });
+
     program
         .command('*', '', { noHelp: true })
         .action((cmd: commander.Command) => {

package/src/ovsx

@@ -2,8 +2,8 @@
 
 const semver = require('semver');
 
-if (semver.lt(process.versions.node, '18.0.0')) {
-    console.error('ovsx requires at least NodeJS version 18. Check your installed version with `node --version`.');
+if (semver.lt(process.versions.node, '20.0.0')) {
+    console.error('ovsx requires at least NodeJS version 20. Check your installed version with `node --version`.');
     process.exit(1);
 }
 

package/src/publish.ts

@@ -8,32 +8,29 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 import { createVSIX, IPackageOptions } from '@vscode/vsce';
-import { createTempFile, addEnvOptions } from './util';
+import { createTempFile, addEnvOptions, getPAT } from './util';
 import { Extension, Registry, RegistryOptions } from './registry';
 import { checkLicense } from './check-license';
+import { readVSIXPackage } from './zip';
 
 /**
  * Publishes an extension.
  */
 export async function publish(options: PublishOptions = {}): Promise<PromiseSettledResult<void>[]> {
-        addEnvOptions(options);
-        const internalPublishOptions: InternalPublishOptions[] = [];
-        const packagePaths = options.packagePath || [undefined];
-        const targets = options.targets || [undefined];
-        for (const packagePath of packagePaths) {
-            for (const target of targets) {
-                internalPublishOptions.push({ ... options, packagePath: packagePath, target: target });
-            }
+    addEnvOptions(options);
+    const internalPublishOptions: InternalPublishOptions[] = [];
+    const packagePaths = options.packagePath || [undefined];
+    const targets = options.targets || [undefined];
+    for (const packagePath of packagePaths) {
+        for (const target of targets) {
+            internalPublishOptions.push({ ...options, packagePath: packagePath, target: target });
         }
+    }
 
-        return Promise.allSettled(internalPublishOptions.map(publishOptions => doPublish(publishOptions)));
+    return Promise.allSettled(internalPublishOptions.map(publishOptions => doPublish(publishOptions)));
 }
 
 async function doPublish(options: InternalPublishOptions = {}): Promise<void> {
-    if (!options.pat) {
-        throw new Error("A personal access token must be given with the option '--pat'.");
-    }
-
     // if the packagePath is a link to a vsix, don't need to package it
     if (options.packagePath?.endsWith('.vsix')) {
         options.extensionFile = options.packagePath;
@@ -48,6 +45,11 @@ async function doPublish(options: InternalPublishOptions = {}): Promise<void> {
         console.warn("Ignoring option '--pre-release' for prepackaged extension.");
     }
 
+    if (!options.pat) {
+        const namespace = (await readVSIXPackage(options.extensionFile!)).publisher;
+        options.pat = await getPAT(namespace, options);
+    }
+
     let extension: Extension | undefined;
     try {
         extension = await registry.publish(options.extensionFile!, options.pat);
@@ -100,6 +102,10 @@ interface PublishCommonOptions extends RegistryOptions {
      * Whether to fail silently if version already exists on the marketplace
      */
     skipDuplicate?: boolean;
+    /**
+     * Extension version. Only valid with `packagePath`.
+     */
+    packageVersion?: string;
 }
 
 // Interface used by top level CLI
@@ -141,7 +147,7 @@ interface InternalPublishOptions extends PublishCommonOptions {
     /**
      * Whether to do dependency detection via npm or yarn
      */
-     dependencies?: boolean;
+    dependencies?: boolean;
 }
 
 async function packageExtension(options: InternalPublishOptions, registry: Registry): Promise<void> {
@@ -158,7 +164,8 @@ async function packageExtension(options: InternalPublishOptions, registry: Regis
         baseImagesUrl: options.baseImagesUrl,
         useYarn: options.yarn,
         dependencies: options.dependencies,
-        preRelease: options.preRelease
+        preRelease: options.preRelease,
+        version: options.packageVersion
     };
     await createVSIX(packageOptions);
 }

package/src/store.ts

@@ -0,0 +1,142 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { homedir } from 'os';
+
+interface StoreEntry {
+    name: string
+    value: string
+}
+
+export interface Store extends Iterable<StoreEntry> {
+	readonly size: number;
+	get(name: string): string | undefined;
+	add(name: string, value: string): Promise<void>;
+	delete(name: string): Promise<void>;
+}
+
+export class FileStore implements Store {
+	private static readonly DefaultPath = path.join(homedir(), '.ovsx');
+
+	static async open(path: string = FileStore.DefaultPath): Promise<FileStore> {
+		try {
+			const rawStore = await fs.promises.readFile(path, 'utf8');
+			return new FileStore(path, JSON.parse(rawStore).entries);
+		} catch (err: any) {
+			if (err.code === 'ENOENT') {
+				return new FileStore(path, []);
+			} else if (/SyntaxError/.test(err)) {
+				throw new Error(`Error parsing file store: ${path}.`);
+			}
+
+			throw err;
+		}
+	}
+
+	get size(): number {
+		return this.entries.length;
+	}
+
+	private constructor(readonly path: string, private entries: StoreEntry[]) { }
+
+	private async save(): Promise<void> {
+		await fs.promises.writeFile(this.path, JSON.stringify({ entries: this.entries }), { mode: '0600' });
+	}
+
+	async deleteStore(): Promise<void> {
+		try {
+			await fs.promises.unlink(this.path);
+		} catch {
+			// noop
+		}
+	}
+
+	get(name: string): string | undefined {
+        return this.entries.find(p => p.name === name)?.value;
+	}
+
+	async add(name: string, value: string): Promise<void> {
+        const newEntry: StoreEntry = { name, value };
+		this.entries = [...this.entries.filter(p => p.name !== name), newEntry];
+		await this.save();
+	}
+
+	async delete(name: string): Promise<void> {
+		this.entries = this.entries.filter(p => p.name !== name);
+		await this.save();
+	}
+
+	[Symbol.iterator]() {
+		return this.entries[Symbol.iterator]();
+	}
+}
+
+export class KeytarStore implements Store {
+	static async open(serviceName = 'ovsx'): Promise<KeytarStore> {
+		const keytar = await import('keytar');
+		const creds = await keytar.findCredentials(serviceName);
+
+		return new KeytarStore(
+			keytar,
+			serviceName,
+			creds.map(({ account, password }) => ({ name: account, value: password }))
+		);
+	}
+
+	get size(): number {
+		return this.entries.length;
+	}
+
+	private constructor(
+		private readonly keytar: typeof import('keytar'),
+		private readonly serviceName: string,
+		private entries: StoreEntry[]
+	) { }
+
+	get(name: string): string | undefined {
+        return this.entries.find(p => p.name === name)?.value;
+	}
+
+	async add(name: string, value: string): Promise<void> {
+        const newEntry: StoreEntry = { name, value };
+		this.entries = [...this.entries.filter(p => p.name !== name), newEntry];
+		await this.keytar.setPassword(this.serviceName, name, value);
+	}
+
+	async delete(name: string): Promise<void> {
+		this.entries = this.entries.filter(p => p.name !== name);
+		await this.keytar.deletePassword(this.serviceName, name);
+	}
+
+	[Symbol.iterator](): Iterator<StoreEntry, any, undefined> {
+		return this.entries[Symbol.iterator]();
+	}
+}
+
+export async function openDefaultStore(): Promise<Store> {
+	if (/^file$/i.test(process.env['OVSX_STORE'] ?? '')) {
+		return await FileStore.open();
+	}
+
+	let keytarStore: Store;
+	try {
+		keytarStore = await KeytarStore.open();
+	} catch (err) {
+		const store = await FileStore.open();
+		console.warn(`Failed to open credential store. Falling back to storing secrets clear-text in: ${store.path}.`);
+		return store;
+	}
+
+	const fileStore = await FileStore.open();
+
+	// migrate from file store
+	if (fileStore.size) {
+		for (const { name, value } of fileStore) {
+			await keytarStore.add(name, value);
+		}
+
+		await fileStore.deleteStore();
+		console.info(`Migrated ${fileStore.size} publishers to system credential manager. Deleted local store '${fileStore.path}'.`);
+	}
+
+	return keytarStore;
+}

package/src/util.ts

@@ -14,6 +14,10 @@ import * as tmp from 'tmp';
 import * as http from 'http';
 import * as readline from 'readline';
 import { RegistryOptions } from './registry';
+import { VerifyPatOptions, doVerifyPat } from './verify-pat';
+import { PublishOptions } from './publish';
+import { openDefaultStore } from './store';
+import { CreateNamespaceOptions } from './create-namespace';
 
 export { promisify } from 'util';
 
@@ -183,3 +187,29 @@ export async function getUserChoice<R extends string>(text: string, values: R[],
     }
     return defaultValue;
 }
+
+export async function requestPAT(namespace: string, options: CreateNamespaceOptions | PublishOptions | VerifyPatOptions, verify: boolean = true): Promise<string> {
+    const pat = await getUserInput(`Personal Access Token for namespace '${namespace}':`);
+    if (verify) {
+        await doVerifyPat({ ...options, namespace, pat });
+    }
+
+    return pat;
+}
+
+export async function getPAT(namespace: string, options: CreateNamespaceOptions | PublishOptions | VerifyPatOptions, verify: boolean = true): Promise<string> {
+    if (options?.pat) {
+        return options.pat;
+    }
+
+    const store = await openDefaultStore();
+    let pat = store.get(namespace);
+    if (pat) {
+        return pat;
+    }
+
+    pat = await requestPAT(namespace, options, verify);
+    await store.add(namespace, pat);
+
+    return pat;
+}

package/src/verify-pat.ts

@@ -9,39 +9,42 @@
  ********************************************************************************/
 
 import { Registry, RegistryOptions } from './registry';
-import { readManifest, addEnvOptions } from './util';
+import { readManifest, addEnvOptions, getPAT } from './util';
 
 /**
  * Validates that a Personal Access Token can publish to a namespace.
  */
 export async function verifyPat(options: VerifyPatOptions): Promise<void> {
     addEnvOptions(options);
-    if (!options.pat) {
-        throw new Error("A personal access token must be given with the option '--pat'.");
-    }
-
     if (!options.namespace) {
-      let error;
-      try {
-        options.namespace = (await readManifest()).publisher;
-      } catch (e) {
-        error = e;
-      }
+        let error;
+        try {
+            options.namespace = (await readManifest()).publisher;
+        } catch (e) {
+            error = e;
+        }
 
-      if (!options.namespace) {
-        throw new Error(
-          `Unable to read the namespace's name. Please supply it as an argument or run ovsx from the extension folder.` +
-          (error ? `\n\n${error}` : '')
-        );
-      }
+        if (!options.namespace) {
+            throw new Error(
+                `Unable to read the namespace's name. Please supply it as an argument or run ovsx from the extension folder.` +
+                (error ? `\n\n${error}` : '')
+            );
+        }
     }
 
+    options.pat = await getPAT(options.namespace, options, false);
+    await doVerifyPat(options);
+}
+
+export async function doVerifyPat(options: VerifyPatOptions) {
     const registry = new Registry(options);
-    const result = await registry.verifyPat(options.namespace, options.pat);
+    const namespace = options.namespace as string;
+    const pat = options.pat as string;
+    const result = await registry.verifyPat(namespace, pat);
     if (result.error) {
         throw new Error(result.error);
     }
-    console.log(`\ud83d\ude80  PAT valid to publish at ${options.namespace}`);
+    console.log(`\ud83d\ude80  PAT valid to publish at ${namespace}`);
 }
 
 export interface VerifyPatOptions extends RegistryOptions {