ovsx 0.2.1 → 0.5.0

package/lib/util.js

@@ -1,184 +1,184 @@
-"use strict";
-/********************************************************************************
- * Copyright (c) 2019 TypeFox 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
- ********************************************************************************/
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs");
-const path = require("path");
-const tmp = require("tmp");
-const readline = require("readline");
-var util_1 = require("util");
-exports.promisify = util_1.promisify;
-function addEnvOptions(options) {
-    if (!options.registryUrl) {
-        options.registryUrl = process.env.OVSX_REGISTRY_URL;
-    }
-    if (!options.pat) {
-        options.pat = process.env.OVSX_PAT;
-    }
-    if (!options.username) {
-        options.username = process.env.OVSX_USERNAME;
-    }
-    if (!options.password) {
-        options.password = process.env.OVSX_PASSWORD;
-    }
-}
-exports.addEnvOptions = addEnvOptions;
-function matchExtensionId(id) {
-    return /^([\w-]+)(?:\.|\/)([\w-]+)$/.exec(id);
-}
-exports.matchExtensionId = matchExtensionId;
-function optionalStat(path) {
-    return new Promise((resolve, reject) => {
-        fs.stat(path, (err, stats) => resolve(stats));
-    });
-}
-exports.optionalStat = optionalStat;
-function makeDirs(path) {
-    return new Promise((resolve, reject) => {
-        if (fs.existsSync(path)) {
-            resolve();
-        }
-        else {
-            fs.mkdir(path, { recursive: true }, err => {
-                if (err)
-                    reject(err);
-                else
-                    resolve();
-            });
-        }
-    });
-}
-exports.makeDirs = makeDirs;
-function createTempFile(options) {
-    return new Promise((resolve, reject) => {
-        tmp.tmpName(options, (err, name) => {
-            if (err)
-                reject(err);
-            else
-                resolve(name);
-        });
-    });
-}
-exports.createTempFile = createTempFile;
-function handleError(debug, additionalMessage) {
-    return reason => {
-        if (reason instanceof Error && !debug) {
-            console.error(`\u274c  ${reason.message}`);
-            if (additionalMessage) {
-                console.error(additionalMessage);
-            }
-        }
-        else if (typeof reason === 'string') {
-            console.error(`\u274c  ${reason}`);
-        }
-        else if (reason !== undefined) {
-            console.error(reason);
-        }
-        else {
-            console.error('An unknown error occurred.');
-        }
-        process.exit(1);
-    };
-}
-exports.handleError = handleError;
-function statusError(response) {
-    if (response.statusMessage)
-        return new Error(`The server responded with status ${response.statusCode}: ${response.statusMessage}`);
-    else
-        return new Error(`The server responded with status ${response.statusCode}.`);
-}
-exports.statusError = statusError;
-function readFile(name, packagePath, encoding = 'utf-8') {
-    return new Promise((resolve, reject) => {
-        fs.readFile(path.join(packagePath || process.cwd(), name), { encoding }, (err, content) => {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve(content);
-            }
-        });
-    });
-}
-exports.readFile = readFile;
-function readManifest(packagePath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const content = yield readFile('package.json', packagePath);
-        return JSON.parse(content);
-    });
-}
-exports.readManifest = readManifest;
-function validateManifest(manifest) {
-    if (!manifest.publisher) {
-        throw new Error("Missing required field 'publisher'.");
-    }
-    if (!manifest.name) {
-        throw new Error("Missing required field 'name'.");
-    }
-    if (!manifest.version) {
-        throw new Error("Missing required field 'version'.");
-    }
-}
-exports.validateManifest = validateManifest;
-function writeFile(name, content, packagePath, encoding = 'utf-8') {
-    return new Promise((resolve, reject) => {
-        fs.writeFile(path.join(packagePath || process.cwd(), name), content, { encoding }, err => {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve();
-            }
-        });
-    });
-}
-exports.writeFile = writeFile;
-function writeManifest(manifest, packagePath) {
-    const content = JSON.stringify(manifest, null, 4);
-    return writeFile('package.json', content, packagePath);
-}
-exports.writeManifest = writeManifest;
-function getUserInput(text) {
-    return new Promise(resolve => {
-        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-        rl.question(text, answer => {
-            resolve(answer);
-            rl.close();
-        });
-    });
-}
-exports.getUserInput = getUserInput;
-function getUserChoice(text, values, defaultValue, lowerCase = true) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const prompt = text + '\n' + values.map(v => v === defaultValue ? `[${v}]` : v).join('/') + ': ';
-        const answer = yield getUserInput(prompt);
-        if (!answer) {
-            return defaultValue;
-        }
-        const lcAnswer = lowerCase ? answer.toLowerCase() : answer;
-        for (const value of values) {
-            if (value.startsWith(lcAnswer)) {
-                return value;
-            }
-        }
-        return defaultValue;
-    });
-}
-exports.getUserChoice = getUserChoice;
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2019 TypeFox 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
+ ********************************************************************************/
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const path = require("path");
+const tmp = require("tmp");
+const readline = require("readline");
+var util_1 = require("util");
+exports.promisify = util_1.promisify;
+function addEnvOptions(options) {
+    if (!options.registryUrl) {
+        options.registryUrl = process.env.OVSX_REGISTRY_URL;
+    }
+    if (!options.pat) {
+        options.pat = process.env.OVSX_PAT;
+    }
+    if (!options.username) {
+        options.username = process.env.OVSX_USERNAME;
+    }
+    if (!options.password) {
+        options.password = process.env.OVSX_PASSWORD;
+    }
+}
+exports.addEnvOptions = addEnvOptions;
+function matchExtensionId(id) {
+    return /^([\w-]+)(?:\.|\/)([\w-]+)$/.exec(id);
+}
+exports.matchExtensionId = matchExtensionId;
+function optionalStat(path) {
+    return new Promise((resolve, reject) => {
+        fs.stat(path, (err, stats) => resolve(stats));
+    });
+}
+exports.optionalStat = optionalStat;
+function makeDirs(path) {
+    return new Promise((resolve, reject) => {
+        if (fs.existsSync(path)) {
+            resolve();
+        }
+        else {
+            fs.mkdir(path, { recursive: true }, err => {
+                if (err)
+                    reject(err);
+                else
+                    resolve();
+            });
+        }
+    });
+}
+exports.makeDirs = makeDirs;
+function createTempFile(options) {
+    return new Promise((resolve, reject) => {
+        tmp.tmpName(options, (err, name) => {
+            if (err)
+                reject(err);
+            else
+                resolve(name);
+        });
+    });
+}
+exports.createTempFile = createTempFile;
+function handleError(debug, additionalMessage) {
+    return reason => {
+        if (reason instanceof Error && !debug) {
+            console.error(`\u274c  ${reason.message}`);
+            if (additionalMessage) {
+                console.error(additionalMessage);
+            }
+        }
+        else if (typeof reason === 'string') {
+            console.error(`\u274c  ${reason}`);
+        }
+        else if (reason !== undefined) {
+            console.error(reason);
+        }
+        else {
+            console.error('An unknown error occurred.');
+        }
+        process.exit(1);
+    };
+}
+exports.handleError = handleError;
+function statusError(response) {
+    if (response.statusMessage)
+        return new Error(`The server responded with status ${response.statusCode}: ${response.statusMessage}`);
+    else
+        return new Error(`The server responded with status ${response.statusCode}.`);
+}
+exports.statusError = statusError;
+function readFile(name, packagePath, encoding = 'utf-8') {
+    return new Promise((resolve, reject) => {
+        fs.readFile(path.join(packagePath || process.cwd(), name), { encoding }, (err, content) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve(content);
+            }
+        });
+    });
+}
+exports.readFile = readFile;
+function readManifest(packagePath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const content = yield readFile('package.json', packagePath);
+        return JSON.parse(content);
+    });
+}
+exports.readManifest = readManifest;
+function validateManifest(manifest) {
+    if (!manifest.publisher) {
+        throw new Error("Missing required field 'publisher'.");
+    }
+    if (!manifest.name) {
+        throw new Error("Missing required field 'name'.");
+    }
+    if (!manifest.version) {
+        throw new Error("Missing required field 'version'.");
+    }
+}
+exports.validateManifest = validateManifest;
+function writeFile(name, content, packagePath, encoding = 'utf-8') {
+    return new Promise((resolve, reject) => {
+        fs.writeFile(path.join(packagePath || process.cwd(), name), content, { encoding }, err => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve();
+            }
+        });
+    });
+}
+exports.writeFile = writeFile;
+function writeManifest(manifest, packagePath) {
+    const content = JSON.stringify(manifest, null, 4);
+    return writeFile('package.json', content, packagePath);
+}
+exports.writeManifest = writeManifest;
+function getUserInput(text) {
+    return new Promise(resolve => {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        rl.question(text, answer => {
+            resolve(answer);
+            rl.close();
+        });
+    });
+}
+exports.getUserInput = getUserInput;
+function getUserChoice(text, values, defaultValue, lowerCase = true) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const prompt = text + '\n' + values.map(v => v === defaultValue ? `[${v}]` : v).join('/') + ': ';
+        const answer = yield getUserInput(prompt);
+        if (!answer) {
+            return defaultValue;
+        }
+        const lcAnswer = lowerCase ? answer.toLowerCase() : answer;
+        for (const value of values) {
+            if (value.startsWith(lcAnswer)) {
+                return value;
+            }
+        }
+        return defaultValue;
+    });
+}
+exports.getUserChoice = getUserChoice;
 //# sourceMappingURL=util.js.map

package/package.json

@@ -1,67 +1,67 @@
-{
-    "name": "ovsx",
-    "version": "0.2.1",
-    "description": "Command line interface for Eclipse Open VSX",
-    "keywords": [
-        "cli",
-        "vscode",
-        "extensions",
-        "publish"
-    ],
-    "license": "EPL-2.0",
-    "homepage": "https://open-vsx.org",
-    "repository": {
-        "type": "git",
-        "url": "ssh://git@github.com:eclipse/openvsx.git",
-        "directory": "cli"
-    },
-    "bugs": "https://github.com/eclipse/openvsx/issues",
-    "contributors": [
-        {
-            "name": "Miro Spönemann",
-            "email": "miro.spoenemann@typefox.io",
-            "url": "https://www.typefox.io"
-        }
-    ],
-    "files": [
-        "lib",
-        "src"
-    ],
-    "main": "lib/index",
-    "types": "lib/index",
-    "bin": {
-        "ovsx": "lib/ovsx"
-    },
-    "engines": {
-        "node": ">= 10"
-    },
-    "dependencies": {
-        "commander": "^6.1.0",
-        "follow-redirects": "^1.13.2",
-        "is-ci": "^2.0.0",
-        "leven": "^3.1.0",
-        "tmp": "^0.2.1",
-        "vsce": "~1.97.0"
-    },
-    "devDependencies": {
-        "@types/follow-redirects": "^1.13.0",
-        "@types/is-ci": "^2.0.0",
-        "@types/node": "^10.14.18",
-        "@types/semver": "^7.1.0",
-        "@types/tmp": "^0.1.0",
-        "@typescript-eslint/eslint-plugin": "^3.6.1",
-        "@typescript-eslint/parser": "^3.6.1",
-        "eslint": "^7.4.0",
-        "rimraf": "^3.0.2",
-        "typescript": "3.8.3"
-    },
-    "scripts": {
-        "clean": "rimraf lib",
-        "build": "tsc -p ./tsconfig.json && yarn run lint && cp src/ovsx lib/ovsx",
-        "watch": "tsc -w -p ./tsconfig.json",
-        "lint": "eslint -c ./configs/eslintrc.json --ext .ts src",
-        "prepare": "yarn run clean && yarn run build",
-        "publish:next": "yarn publish --new-version \"$(semver $npm_package_version -i minor)-next.$(git rev-parse --short HEAD)\" --tag next --no-git-tag-version",
-        "publish:latest": "yarn publish --tag latest"
-    }
-}
+{
+    "name": "ovsx",
+    "version": "0.5.0",
+    "description": "Command line interface for Eclipse Open VSX",
+    "keywords": [
+        "cli",
+        "vscode",
+        "extensions",
+        "publish"
+    ],
+    "license": "EPL-2.0",
+    "homepage": "https://open-vsx.org",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/eclipse/openvsx.git",
+        "directory": "cli"
+    },
+    "bugs": "https://github.com/eclipse/openvsx/issues",
+    "contributors": [
+        {
+            "name": "Miro Spönemann",
+            "email": "miro.spoenemann@typefox.io",
+            "url": "https://www.typefox.io"
+        }
+    ],
+    "files": [
+        "lib",
+        "src"
+    ],
+    "main": "lib/index",
+    "types": "lib/index",
+    "bin": {
+        "ovsx": "lib/ovsx"
+    },
+    "engines": {
+        "node": ">= 14"
+    },
+    "dependencies": {
+        "commander": "^6.1.0",
+        "follow-redirects": "^1.14.6",
+        "is-ci": "^2.0.0",
+        "leven": "^3.1.0",
+        "tmp": "^0.2.1",
+        "vsce": "^2.6.3"
+    },
+    "devDependencies": {
+        "@types/follow-redirects": "^1.13.1",
+        "@types/is-ci": "^2.0.0",
+        "@types/node": "^10.17.60",
+        "@types/semver": "^7.3.9",
+        "@types/tmp": "^0.1.0",
+        "@typescript-eslint/eslint-plugin": "^3.10.1",
+        "@typescript-eslint/parser": "^3.10.1",
+        "eslint": "^7.32.0",
+        "rimraf": "^3.0.2",
+        "typescript": "3.8.3"
+    },
+    "scripts": {
+        "clean": "rimraf lib",
+        "build": "tsc -p ./tsconfig.json && yarn run lint && cp src/ovsx lib/ovsx",
+        "watch": "tsc -w -p ./tsconfig.json",
+        "lint": "eslint -c ./configs/eslintrc.json --ext .ts src",
+        "prepare": "yarn run clean && yarn run build",
+        "publish:next": "yarn publish --new-version \"$(semver $npm_package_version -i minor)-next.$(git rev-parse --short HEAD)\" --tag next --no-git-tag-version",
+        "publish:latest": "yarn publish --tag latest"
+    }
+}

package/src/get.ts

@@ -19,14 +19,17 @@ import { promisify, matchExtensionId, optionalStat, makeDirs, addEnvOptions } fr
  */
 export async function getExtension(options: GetOptions): Promise<void> {
     addEnvOptions(options);
-    const registry = new Registry(options);
+    if (!options.target) {
+        options.target = 'universal';
+    }
 
+    const registry = new Registry(options);
     const match = matchExtensionId(options.extensionId);
     if (!match) {
         throw new Error('The extension identifier must have the form `namespace.extension`.');
     }
 
-    const extension = await registry.getMetadata(match[1], match[2]);
+    const extension = await registry.getMetadata(match[1], match[2], options.target);
     if (extension.error) {
         throw new Error(extension.error);
     }
@@ -48,7 +51,7 @@ function findMatchingVersion(registry: Registry, extension: Extension, constrain
         return Promise.resolve(extension);
     }
     for (const version of Object.keys(extension.allVersions)) {
-        if (semver.satisfies(version, constraint)) {
+        if (!isAlias(extension, version) && semver.satisfies(version, constraint)) {
             try {
                 return registry.getJson(new URL(extension.allVersions[version]));
             } catch (err) {
@@ -59,6 +62,10 @@ function findMatchingVersion(registry: Registry, extension: Extension, constrain
     return Promise.reject(`Extension ${extension.namespace}.${extension.name} has no published version matching '${constraint}'`);
 }
 
+function isAlias(extension: Extension, version: string): boolean {
+    return extension.versionAlias.includes(version);
+}
+
 async function printMetadata(registry: Registry, extension: Extension, output?: string): Promise<void> {
     const metadata = JSON.stringify(extension, null, 4);
     if (!output) {
@@ -83,7 +90,7 @@ async function download(registry: Registry, extension: Extension, output?: strin
         throw new Error(`Extension ${extension.namespace}.${extension.name} does not provide a download URL.`);
     }
     const fileNameIndex = downloadUrl.lastIndexOf('/');
-    const fileName = downloadUrl.substring(fileNameIndex + 1);
+    const fileName = decodeURIComponent(downloadUrl.substring(fileNameIndex + 1));
     let filePath: string | undefined;
     if (output) {
         const stats = await optionalStat(output);
@@ -96,7 +103,8 @@ async function download(registry: Registry, extension: Extension, output?: strin
         filePath = path.resolve(process.cwd(), fileName);
     }
     await makeDirs(path.dirname(filePath));
-    console.log(`Downloading ${extension.namespace}.${extension.name} v${extension.version} to ${filePath}`);
+    const target = extension.targetPlatform !== 'universal' ? '@' + extension.targetPlatform : '';
+    console.log(`Downloading ${extension.namespace}.${extension.name}-${extension.version}${target} to ${filePath}`);
     await registry.download(filePath, new URL(downloadUrl));
 }
 
@@ -105,6 +113,10 @@ export interface GetOptions extends RegistryOptions {
      * Identifier in the form `namespace.extension` or `namespace/extension`.
      */
     extensionId: string;
+    /**
+     * Target platform.
+     */
+    target?: string;
     /**
      * An exact version or version range.
      */

package/src/main.ts

@@ -35,15 +35,21 @@ module.exports = function (argv: string[]): void {
 
     const publishCmd = program.command('publish [extension.vsix]');
     publishCmd.description('Publish an extension, packaging it first if necessary.')
-        .option('--packagePath <path>', 'Package and publish the extension at the specified path.')
+        .option('-t, --target <targets...>', 'Target architectures')
+        .option('-i, --packagePath <paths...>', 'Publish the provided VSIX packages.')
         .option('--baseContentUrl <url>', 'Prepend all relative links in README.md with this URL.')
         .option('--baseImagesUrl <url>', 'Prepend all relative image links in README.md with this URL.')
         .option('--yarn', 'Use yarn instead of npm while packing extension files.')
-        .action((extensionFile: string, { packagePath, baseContentUrl, baseImagesUrl, yarn }) => {
+        .option('--pre-release', 'Mark this package as a pre-release')
+        .action((extensionFile: string, { target, packagePath, baseContentUrl, baseImagesUrl, yarn, preRelease }) => {
             if (extensionFile !== undefined && packagePath !== undefined) {
                 console.error('\u274c  Please specify either a package file or a package path, but not both.\n');
                 publishCmd.help();
             }
+            if (extensionFile !== undefined && target !== undefined) {
+                console.warn("Ignoring option '--target' for prepackaged extension.");
+                target = undefined;
+            }
             if (extensionFile !== undefined && baseContentUrl !== undefined)
                 console.warn("Ignoring option '--baseContentUrl' for prepackaged extension.");
             if (extensionFile !== undefined && baseImagesUrl !== undefined)
@@ -51,7 +57,7 @@ module.exports = function (argv: string[]): void {
             if (extensionFile !== undefined && yarn !== undefined)
                 console.warn("Ignoring option '--yarn' for prepackaged extension.");
             const { registryUrl, pat } = program.opts();
-            publish({ extensionFile, registryUrl, pat, packagePath, baseContentUrl, baseImagesUrl, yarn })
+            publish({ extensionFile, registryUrl, pat, targets: typeof target === 'string' ? [target] : target, packagePath: typeof packagePath === 'string' ? [packagePath] : packagePath, baseContentUrl, baseImagesUrl, yarn, preRelease })
                 .catch(handleError(program.debug,
                     'See the documentation for more information:\n'
                     + 'https://github.com/eclipse/openvsx/wiki/Publishing-Extensions'
@@ -60,12 +66,13 @@ module.exports = function (argv: string[]): void {
 
     const getCmd = program.command('get <namespace.extension>');
     getCmd.description('Download an extension or its metadata.')
+        .option('-t, --target <target>', 'Target architecture')
         .option('-v, --versionRange <version>', 'Specify an exact version or a version range.')
         .option('-o, --output <path>', 'Save the output in the specified file or directory.')
         .option('--metadata', 'Print the extension\'s metadata instead of downloading it.')
-        .action((extensionId: string, { versionRange, output, metadata }) => {
+        .action((extensionId: string, { target, versionRange, output, metadata }) => {
             const { registryUrl } = program.opts();
-            getExtension({ extensionId, version: versionRange, registryUrl, output, metadata })
+            getExtension({ extensionId, target: target, version: versionRange, registryUrl, output, metadata })
                 .catch(handleError(program.debug));
         });
 

package/src/ovsx

@@ -1,8 +1,10 @@
-#!/usr/bin/env node
-
-if (global.URL === undefined) {
-    console.error('ovsx requires at least NodeJS version 10. Check your installed version with `node --version`.');
-    process.exit(1);
-}
-
-require('./main')(process.argv);
+#!/usr/bin/env node
+
+const semver = require('semver');
+
+if (semver.lt(process.versions.node, '14.0.0')) {
+    console.error('ovsx requires at least NodeJS version 14. Check your installed version with `node --version`.');
+    process.exit(1);
+}
+
+require('./main')(process.argv);