@sw-tsdk/core 2.10.0 → 2.11.2-next.3

package/lib/utils/index.d.ts

@@ -1,8 +1,5 @@
 export * from './fs-utils';
 export * from './netrc';
-export * from './git';
 export * from './strings';
 export * from './streams';
-export * from './git-credential';
-export * from './credential-helper';
 export * from './assertions';

package/lib/utils/index.js

@@ -3,10 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./fs-utils"), exports);
 tslib_1.__exportStar(require("./netrc"), exports);
-tslib_1.__exportStar(require("./git"), exports);
 tslib_1.__exportStar(require("./strings"), exports);
 tslib_1.__exportStar(require("./streams"), exports);
-tslib_1.__exportStar(require("./git-credential"), exports);
-tslib_1.__exportStar(require("./credential-helper"), exports);
 tslib_1.__exportStar(require("./assertions"), exports);
 //# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;AAAA,qDAA0B;AAC1B,kDAAuB;AACvB,gDAAqB;AACrB,oDAAyB;AACzB,oDAAyB;AACzB,2DAAgC;AAChC,8DAAmC;AACnC,uDAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;AAAA,qDAA0B;AAC1B,kDAAuB;AACvB,oDAAyB;AACzB,oDAAyB;AACzB,uDAA4B"}

package/package.json

@@ -9,8 +9,7 @@
     "fs-extra": "10.0.1",
     "git-credential-node": "1.1.0",
     "netrc-parser": "3.1.6",
-    "npmlog": "6.0.1",
-    "simple-git": "3.5.0"
+    "npmlog": "6.0.1"
   },
   "description": "Core library for sw-tsdk",
   "directories": {
@@ -40,6 +39,6 @@
     "test": "jest --passWithNoTests"
   },
   "types": "lib/index.d.ts",
-  "version": "2.10.0",
-  "gitHead": "78e79bfc1ca7826620b1dcc99c32114a38012256"
+  "version": "2.11.2-next.3+b820045",
+  "gitHead": "b820045036b742454739ba904c99959ce56ecdc5"
 }

package/lib/utils/credential-helper.d.ts

@@ -1,9 +0,0 @@
-interface GitCredentialSetupParams {
-    hostname: string;
-    username: string;
-    password: string;
-}
-export declare function shouldPromptForSetup(hostname: string): Promise<boolean>;
-export declare function gitCredentialSetup({ hostname, username, password }: GitCredentialSetupParams): Promise<void>;
-export declare function isOurCredentialHelper(cmd: string): boolean;
-export {};

package/lib/utils/credential-helper.js

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isOurCredentialHelper = exports.gitCredentialSetup = exports.shouldPromptForSetup = void 0;
-const tslib_1 = require("tslib");
-const git_credential_1 = require("./git-credential");
-const simple_git_1 = tslib_1.__importStar(require("simple-git"));
-// noinspection JSUnusedGlobalSymbols
-async function shouldPromptForSetup(hostname) {
-    const helper = await getCredentialHelper(hostname);
-    return helper === '' || !isOurCredentialHelper(helper);
-}
-exports.shouldPromptForSetup = shouldPromptForSetup;
-// noinspection JSUnusedGlobalSymbols
-async function gitCredentialSetup({ hostname, username, password }) {
-    const git = (0, simple_git_1.default)();
-    // first use a blank value to indicate to git we want to sever the chain of credential helpers
-    const helper = await getCredentialHelper(hostname);
-    if (helper === '') {
-        const configKey = gitCredentialHelperKey(hostname);
-        await git.addConfig(configKey, '', true, simple_git_1.GitConfigScope.global);
-        const executable = process.argv[1] || 'sw-tsdk';
-        await git.addConfig(configKey, `!${executable} auth:git-credential`, true, simple_git_1.GitConfigScope.global);
-    }
-    await (0, git_credential_1.reject)(hostname);
-    await (0, git_credential_1.approve)({ username, url: hostname, password: password });
-}
-exports.gitCredentialSetup = gitCredentialSetup;
-function isOurCredentialHelper(cmd) {
-    if (!cmd.startsWith('!')) {
-        return false;
-    }
-    return cmd.includes('sw-tsdk');
-}
-exports.isOurCredentialHelper = isOurCredentialHelper;
-async function getCredentialHelper(hostname) {
-    const git = (0, simple_git_1.default)();
-    const configKey = gitCredentialHelperKey(hostname);
-    let config = await git.getConfig(configKey);
-    if (config && config.value) {
-        return config.value;
-    }
-    config = await git.getConfig('credential.helper');
-    return (config === null || config === void 0 ? void 0 : config.value) || '';
-}
-function gitCredentialHelperKey(hostname) {
-    return `credential.${hostname}.helper`;
-}
-//# sourceMappingURL=credential-helper.js.map

package/lib/utils/credential-helper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"credential-helper.js","sourceRoot":"","sources":["../../src/utils/credential-helper.ts"],"names":[],"mappings":";;;;AAAA,qDAAgD;AAChD,iEAAoD;AAQpD,qCAAqC;AAC9B,KAAK,UAAU,oBAAoB,CAAC,QAAgB;IACzD,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAA;IAClD,OAAO,MAAM,KAAK,EAAE,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAA;AACxD,CAAC;AAHD,oDAGC;AAED,qCAAqC;AAC9B,KAAK,UAAU,kBAAkB,CAAC,EAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAA2B;IAC/F,MAAM,GAAG,GAAG,IAAA,oBAAS,GAAE,CAAA;IACvB,8FAA8F;IAC9F,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAA;IAClD,IAAI,MAAM,KAAK,EAAE,EAAE;QACjB,MAAM,SAAS,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAA;QAElD,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,2BAAc,CAAC,MAAM,CAAC,CAAA;QAC/D,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;QAC/C,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,UAAU,sBAAsB,EAAE,IAAI,EAAE,2BAAc,CAAC,MAAM,CAAC,CAAA;KAClG;IAED,MAAM,IAAA,uBAAM,EAAC,QAAQ,CAAC,CAAA;IACtB,MAAM,IAAA,wBAAO,EAAC,EAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAC,CAAC,CAAA;AAC9D,CAAC;AAdD,gDAcC;AAED,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACxB,OAAO,KAAK,CAAA;KACb;IAED,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;AAChC,CAAC;AAND,sDAMC;AAED,KAAK,UAAU,mBAAmB,CAAC,QAAgB;IACjD,MAAM,GAAG,GAAG,IAAA,oBAAS,GAAE,CAAA;IACvB,MAAM,SAAS,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAA;IAClD,IAAI,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IAE3C,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,EAAE;QAC1B,OAAO,MAAM,CAAC,KAAK,CAAA;KACpB;IAED,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAA;IAEjD,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,KAAI,EAAE,CAAA;AAC5B,CAAC;AAED,SAAS,sBAAsB,CAAC,QAAgB;IAC9C,OAAO,cAAc,QAAQ,SAAS,CAAA;AACxC,CAAC"}

package/lib/utils/git-credential.d.ts

@@ -1,14 +0,0 @@
-interface ApproveOptions {
-    username: string;
-    password: string;
-    url: string;
-}
-interface FillResult {
-    username: string;
-    password: string;
-}
-export declare function fill(url: string): Promise<FillResult | null>;
-export declare function reject(url: string): Promise<void>;
-export declare function approve(options: ApproveOptions): Promise<void>;
-export declare function hostPrefix(hostname: string): string;
-export {};

package/lib/utils/git-credential.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hostPrefix = exports.approve = exports.reject = exports.fill = void 0;
-const tslib_1 = require("tslib");
-const execa_1 = tslib_1.__importDefault(require("execa"));
-const credentialRE = /username=([^\n]+)\npassword=([^\n]+)\n/;
-function parse(result) {
-    const match = result.match(credentialRE);
-    if (!match) {
-        return null;
-    }
-    const username = match[1];
-    const password = match[2];
-    if (username.startsWith('Username for ')) {
-        return null;
-    }
-    return { username, password };
-}
-const fillOpts = (url) => ({
-    stripEof: false,
-    reject: false,
-    encoding: 'utf8',
-    input: url ? `url=${url}\n\n` : '\n',
-    env: Object.assign({ GIT_TERMINAL_PROMPT: '0' }, process.env),
-});
-const rejectOpts = (url) => ({
-    stripEof: false,
-    encoding: 'utf8',
-    input: url ? `url=${url}\n\n` : '\n',
-});
-const approveOpts = ({ username, password, url }) => ({
-    stripEof: false,
-    encoding: 'utf8',
-    input: (url ? `url=${url}\n` : '') +
-        `username=${username}\npassword=${password}\n\n`,
-});
-async function fill(url) {
-    const result = await (0, execa_1.default)('git', ['credential', 'fill'], fillOpts(url));
-    if (result.exitCode !== 0) {
-        return null;
-    }
-    return parse(result.stdout);
-}
-exports.fill = fill;
-async function reject(url) {
-    await (0, execa_1.default)('git', ['credential', 'reject'], rejectOpts(url));
-}
-exports.reject = reject;
-async function approve(options) {
-    await (0, execa_1.default)('git', ['credential', 'approve'], approveOpts(options));
-}
-exports.approve = approve;
-function hostPrefix(hostname) {
-    if (hostname.toLocaleLowerCase() === 'localhost') {
-        return 'http://localhost/';
-    }
-    return `https://${hostname}/`;
-}
-exports.hostPrefix = hostPrefix;
-//# sourceMappingURL=git-credential.js.map

package/lib/utils/git-credential.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"git-credential.js","sourceRoot":"","sources":["../../src/utils/git-credential.ts"],"names":[],"mappings":";;;;AAAA,0DAAyB;AAEzB,MAAM,YAAY,GAAG,wCAAwC,CAAA;AAa7D,SAAS,KAAK,CAAC,MAAc;IAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;IACxC,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;IACzB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;IAEzB,IAAI,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;QACxC,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,EAAC,QAAQ,EAAE,QAAQ,EAAC,CAAA;AAC7B,CAAC;AAED,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC;IACjC,QAAQ,EAAE,KAAK;IACf,MAAM,EAAE,KAAK;IACb,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI;IACpC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAC,mBAAmB,EAAE,GAAG,EAAC,EAAE,OAAO,CAAC,GAAG,CAAC;CAC5D,CAAC,CAAA;AAEF,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC;IACnC,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI;CACrC,CAAC,CAAA;AAEF,MAAM,WAAW,GAAG,CAAC,EAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAkB,EAAE,EAAE,CAAC,CAAC;IACnE,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9B,YAAY,QAAQ,cAAc,QAAQ,MAAM;CACrD,CAAC,CAAA;AAEK,KAAK,UAAU,IAAI,CAAC,GAAW;IACpC,MAAM,MAAM,GAAG,MAAM,IAAA,eAAK,EAAC,KAAK,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;IACxE,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE;QACzB,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;AAC7B,CAAC;AAPD,oBAOC;AAEM,KAAK,UAAU,MAAM,CAAC,GAAW;IACtC,MAAM,IAAA,eAAK,EAAC,KAAK,EAAE,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;AAC/D,CAAC;AAFD,wBAEC;AAEM,KAAK,UAAU,OAAO,CAAC,OAAuB;IACnD,MAAM,IAAA,eAAK,EAAC,KAAK,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;AACrE,CAAC;AAFD,0BAEC;AAED,SAAgB,UAAU,CAAC,QAAgB;IACzC,IAAI,QAAQ,CAAC,iBAAiB,EAAE,KAAK,WAAW,EAAE;QAChD,OAAO,mBAAmB,CAAA;KAC3B;IAED,OAAO,WAAW,QAAQ,GAAG,CAAA;AAC/B,CAAC;AAND,gCAMC"}

package/lib/utils/git.d.ts

@@ -1,8 +0,0 @@
-import { SimpleGit } from 'simple-git';
-export declare function getRepoUrl(directory: string): Promise<string>;
-interface GitRunnerParams {
-    gitProtocol: string;
-    directory: string;
-}
-export declare function gitRunner({ directory, gitProtocol, }: GitRunnerParams): Promise<SimpleGit>;
-export {};

package/lib/utils/git.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gitRunner = exports.getRepoUrl = void 0;
-const tslib_1 = require("tslib");
-const simple_git_1 = tslib_1.__importDefault(require("simple-git"));
-const npmlog_1 = require("npmlog");
-const GIT_SSH_COMMAND = 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no';
-// noinspection JSUnusedGlobalSymbols
-async function getRepoUrl(directory) {
-    return (0, simple_git_1.default)()
-        .cwd(directory)
-        .listRemote(['--get-url']);
-}
-exports.getRepoUrl = getRepoUrl;
-async function gitRunner({ directory = process.cwd(), gitProtocol = 'https', }) {
-    const git = (0, simple_git_1.default)({
-        baseDir: directory,
-    })
-        .outputHandler((command, stdout, stderr, args) => {
-        (0, npmlog_1.log)('silly', 'git', `${command} ${args.join(' ')}`);
-        stdout.on('data', chunk => {
-            (0, npmlog_1.log)('info', 'git', chunk === null || chunk === void 0 ? void 0 : chunk.toString());
-        });
-    });
-    if (gitProtocol === 'ssh') {
-        return git.env(Object.assign(Object.assign({}, process.env), { GIT_SSH_COMMAND }));
-    }
-    return git;
-}
-exports.gitRunner = gitRunner;
-//# sourceMappingURL=git.js.map

package/lib/utils/git.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/utils/git.ts"],"names":[],"mappings":";;;;AAAA,oEAA+C;AAC/C,mCAA0B;AAE1B,MAAM,eAAe,GAAG,iEAAiE,CAAA;AAEzF,qCAAqC;AAC9B,KAAK,UAAU,UAAU,CAAC,SAAiB;IAChD,OAAO,IAAA,oBAAS,GAAE;SACjB,GAAG,CAAC,SAAS,CAAC;SACd,UAAU,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;AAC5B,CAAC;AAJD,gCAIC;AAOM,KAAK,UAAU,SAAS,CAAC,EAC9B,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,WAAW,GAAG,OAAO,GACL;IAChB,MAAM,GAAG,GAAG,IAAA,oBAAS,EAAC;QACpB,OAAO,EAAE,SAAS;KACnB,CAAC;SACD,aAAa,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;QAC/C,IAAA,YAAG,EAAC,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACnD,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;YACxB,IAAA,YAAG,EAAC,MAAM,EAAE,KAAK,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,EAAE,CAAC,CAAA;QACvC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,IAAI,WAAW,KAAK,KAAK,EAAE;QACzB,OAAO,GAAG,CAAC,GAAG,iCAAK,OAAO,CAAC,GAAG,KAAE,eAAe,IAAE,CAAA;KAClD;IAED,OAAO,GAAG,CAAA;AACZ,CAAC;AAnBD,8BAmBC"}