isaacscript 3.22.2 → 3.22.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import chalk from "chalk";
|
|
2
|
-
import { PACKAGE_JSON, PackageManager, copyFileOrDirectory, deleteFileOrDirectory, getFileNamesInDirectory, getPackageManagerExecCommand, getPackageManagerInstallCICommand, getPackageManagerInstallCommand, getPackageManagerLockFileName, isFile, makeDirectory, readFile, renameFile, updatePackageJSON, writeFile, } from "isaacscript-common-node";
|
|
3
|
-
import { removeLinesBetweenMarkers, removeLinesMatching, repeat, } from "isaacscript-common-ts";
|
|
2
|
+
import { PACKAGE_JSON, PackageManager, copyFileOrDirectory, deleteFileOrDirectory, fatalError, getFileNamesInDirectory, getPackageManagerExecCommand, getPackageManagerInstallCICommand, getPackageManagerInstallCommand, getPackageManagerLockFileName, isFile, makeDirectory, readFile, renameFile, updatePackageJSON, writeFile, } from "isaacscript-common-node";
|
|
3
|
+
import { parseSemanticVersion, removeLinesBetweenMarkers, removeLinesMatching, repeat, } from "isaacscript-common-ts";
|
|
4
4
|
import path from "node:path";
|
|
5
5
|
import { Config } from "../../classes/Config.js";
|
|
6
6
|
import { createConfigFile } from "../../configFile.js";
|
|
@@ -183,8 +183,19 @@ function upgradeYarn(projectPath, packageManager, verbose) {
|
|
|
183
183
|
if (packageManager !== PackageManager.yarn) {
|
|
184
184
|
return;
|
|
185
185
|
}
|
|
186
|
-
//
|
|
187
|
-
//
|
|
186
|
+
// First, check to see if they have already done "corepack enable". If they have not, then yarn
|
|
187
|
+
// might still be on version 1. Otherwise it will be version 3.
|
|
188
|
+
const { stdout } = execShellString("yarn --version", verbose);
|
|
189
|
+
const yarnVersion = parseSemanticVersion(stdout);
|
|
190
|
+
if (yarnVersion === undefined) {
|
|
191
|
+
fatalError(`Failed to parse the Yarn version when running the "yarn --version" command: ${stdout}`);
|
|
192
|
+
}
|
|
193
|
+
if (yarnVersion.majorVersion === 1) {
|
|
194
|
+
// They have not done a "corepack enable", so let them use Yarn 1 to reduce the complexity.
|
|
195
|
+
return;
|
|
196
|
+
}
|
|
197
|
+
// Yarn v3.5.1 is the default in Node.js v20 (once corepack has been enabled). On this version of
|
|
198
|
+
// node, the command will do two things:
|
|
188
199
|
// - It creates `./.yarn/releases/yarn-#.#.#.cjs`.
|
|
189
200
|
// - It creates the following string in the "package.json" file: `"packageManager": "yarn@#.#.#"`
|
|
190
201
|
execShellString("yarn set version latest", verbose, false, projectPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createProject.js","sourceRoot":"","sources":["../../../../../src/commands/init/createProject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,YAAY,EACZ,cAAc,EACd,mBAAmB,EACnB,qBAAqB,EACrB,uBAAuB,EACvB,4BAA4B,EAC5B,iCAAiC,EACjC,+BAA+B,EAC/B,6BAA6B,EAC7B,MAAM,EACN,aAAa,EACb,QAAQ,EACR,UAAU,EACV,iBAAiB,EACjB,SAAS,GACV,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,MAAM,GACP,MAAM,uBAAuB,CAAC;AAC/B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACL,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACvB,yBAAyB,EACzB,OAAO,EACP,qBAAqB,EACrB,YAAY,EACZ,0BAA0B,EAC1B,SAAS,EACT,aAAa,EACb,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,WAAmB,EACnB,UAA8B,EAC9B,WAAmB,EACnB,YAAqB,EACrB,aAAiC,EACjC,QAA4B,EAC5B,YAAgC,EAChC,WAAoB,EACpB,cAA8B,EAC9B,UAAmB,EACnB,GAAY,EACZ,OAAgB;IAEhB,IAAI,YAAY,EAAE;QAChB,aAAa,CAAC,WAAW,CAAC,CAAC;KAC5B;IAED,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,aAAa,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QACxD,gBAAgB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;KACvC;IAED,eAAe,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACzC,gBAAgB,CACd,WAAW,EACX,UAAU,EACV,WAAW,EACX,cAAc,EACd,GAAG,EACH,UAAU,CACX,CAAC;IACF,WAAW,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IAElD,2FAA2F;IAC3F,MAAM,iBAAiB,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAElD,kBAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IACtE,WAAW,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IAElD,qFAAqF;IACrF,iBAAiB,CAAC,WAAW,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IAEtD,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;AAC3E,CAAC;AAED,qEAAqE;AACrE,SAAS,eAAe,CAAC,WAAmB,EAAE,UAAmB;IAC/D,iGAAiG;IACjG,uCAAuC,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IAE3E,iGAAiG;IACjG,MAAM,eAAe,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IAClD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,eAAe,EAAE,CAAC,CAAC;IAC5E,uCAAuC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;IAEpE,2FAA2F;IAC3F,sBAAsB;IACtB,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IACjE,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IACxE,UAAU,CAAC,gBAAgB,EAAE,uBAAuB,CAAC,CAAC;IAEtD,iGAAiG;IACjG,wBAAwB;IACxB,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IACnE,MAAM,wBAAwB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAC1E,UAAU,CAAC,iBAAiB,EAAE,wBAAwB,CAAC,CAAC;IAExD,+FAA+F;IAC/F,uBAAuB;IACvB,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IACjE,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACvE,UAAU,CAAC,gBAAgB,EAAE,uBAAuB,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,uCAAuC,CAC9C,eAAuB,EACvB,WAAmB;IAEnB,MAAM,SAAS,GAAG,uBAAuB,CAAC,eAAe,CAAC,CAAC;IAC3D,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAC9D,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;YAChC,mBAAmB,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;SAC5D;KACF;AACH,CAAC;AAED,iEAAiE;AACjE,SAAS,gBAAgB,CACvB,WAAmB,EACnB,UAA8B,EAC9B,WAAmB,EACnB,cAA8B,EAC9B,GAAY,EACZ,UAAmB;IAEnB,uCAAuC;IACvC;QACE,MAAM,QAAQ,GAAG,UAAU,CAAC;QAC5B,MAAM,YAAY,GAAG,wBAAwB,CAAC;QAC9C,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAExD,MAAM,YAAY,GAAG,6BAA6B,CAAC,cAAc,CAAC,CAAC;QACnE,MAAM,cAAc,GAAG,iCAAiC,CAAC,cAAc,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,QAAQ;aACvB,UAAU,CAAC,sBAAsB,EAAE,cAAc,CAAC;aAClD,UAAU,CAAC,gCAAgC,EAAE,YAAY,CAAC;aAC1D,UAAU,CAAC,iCAAiC,EAAE,cAAc,CAAC,CAAC;QAEjE,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAC1E,aAAa,CAAC,SAAS,CAAC,CAAC;QACzB,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACvD,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;KACvC;IAED,eAAe;IACf;QACE,MAAM,YAAY,GAAG,uBAAuB,CAAC;QAC7C,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAExD,0CAA0C;QAC1C,IAAI,aAAa,GAAG,IAAI,CAAC;QACzB,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE;YAC9B,aAAa,IAAI,GAAG,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,aAAa,IAAI,IAAI,CAAC;QACtB,MAAM,eAAe,GAAG,GAAG,aAAa,KAAK,WAAW,KAAK,aAAa,IAAI,CAAC;QAC/E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACjC,qBAAqB,EACrB,gBAAgB,CACjB,CAAC;QACF,MAAM,aAAa,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAElD,2CAA2C;QAC3C,MAAM,SAAS,GAAG,eAAe,GAAG,QAAQ,GAAG,IAAI,GAAG,aAAa,CAAC;QAEpE,mDAAmD;QACnD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAC7D,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;KACvC;IAED,iBAAiB;IACjB;QACE,4FAA4F;QAC5F,MAAM,2BAA2B,GAAG,UAAU;YAC5C,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,kBAAkB,CAAC;QACvB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC5B,qBAAqB,EACrB,2BAA2B,CAC5B,CAAC;QACF,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QAExC,MAAM,WAAW,GAAG,QAAQ;aACzB,UAAU,CAAC,cAAc,EAAE,WAAW,CAAC;aACvC,UAAU,CAAC,aAAa,EAAE,UAAU,IAAI,SAAS,CAAC;aAClD,UAAU,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC;QAEjD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAC7D,SAAS,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;KACzC;IAED,cAAc;IACd;QACE,4FAA4F;QAC5F,MAAM,wBAAwB,GAAG,UAAU;YACzC,CAAC,CAAC,cAAc;YAChB,CAAC,CAAC,eAAe,CAAC;QACpB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC5B,qBAAqB,EACrB,wBAAwB,CACzB,CAAC;QACF,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QAExC,yFAAyF;QACzF,UAAU;QACV,MAAM,OAAO,GAAG,iCAAiC,CAAC,cAAc,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,QAAQ;aACtB,UAAU,CAAC,cAAc,EAAE,WAAW,CAAC;aACvC,UAAU,CAAC,iCAAiC,EAAE,OAAO,CAAC,CAAC;QAC1D,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAC1D,SAAS,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;KACtC;IAED,qBAAqB;IACrB,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC9C,aAAa,CAAC,OAAO,CAAC,CAAC;QAEvB,MAAM,QAAQ,GAAG,YAAY,CAAC;QAC9B,MAAM,YAAY,GAAG,0BAA0B,CAAC;QAChD,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QACrE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACrD,SAAS,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;KACzC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAC9C,aAAa,CAAC,OAAO,CAAC,CAAC;IAEvB,6FAA6F;IAC7F,IAAI,CAAC,UAAU,EAAE;QACf,0FAA0F;QAC1F,4CAA4C;QAC5C,MAAM,QAAQ,GAAG,OAAO,CAAC;QACzB,MAAM,YAAY,GAAG,qBAAqB,CAAC;QAC3C,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QAChE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACrD,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;KACpC;IAED,4FAA4F;IAC5F,iCAAiC;IACjC,IAAI,CAAC,UAAU,IAAI,GAAG,EAAE;QACtB,MAAM,QAAQ,GAAG,OAAO,CAAC;QACzB,MAAM,YAAY,GAAG,yBAAyB,CAAC;QAC/C,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,+CAA+C;QACxE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACrD,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;KACpC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,QAAgB,EAAE,UAAmB;IAC1D,MAAM,iBAAiB,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACpD,MAAM,mBAAmB,GAAG,aAAa,iBAAiB,EAAE,CAAC;IAC7D,MAAM,sBAAsB,GAAG,yBAAyB,CACtD,QAAQ,EACR,mBAAmB,CACpB,CAAC;IACF,MAAM,+BAA+B,GAAG,mBAAmB,CACzD,sBAAsB,EACtB,WAAW,CACZ,CAAC;IACF,MAAM,iCAAiC,GACrC,+BAA+B,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAEtE,OAAO,iCAAiC,CAAC;AAC3C,CAAC;AAED;;;GAGG;AACH,SAAS,WAAW,CAClB,WAAmB,EACnB,cAA8B,EAC9B,OAAgB;IAEhB,IAAI,cAAc,KAAK,cAAc,CAAC,IAAI,EAAE;QAC1C,OAAO;KACR;IAED,
|
|
1
|
+
{"version":3,"file":"createProject.js","sourceRoot":"","sources":["../../../../../src/commands/init/createProject.ts"],"names":[],"mappings":"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"}
|
package/dist/exec.js
CHANGED
|
@@ -41,22 +41,6 @@ export function execPowershell(command, verbose = false, cwd = CWD) {
|
|
|
41
41
|
}
|
|
42
42
|
return stdout;
|
|
43
43
|
}
|
|
44
|
-
/**
|
|
45
|
-
* Same as `execShell`, but accepts the command as a string instead of an array of arguments.
|
|
46
|
-
*
|
|
47
|
-
* @param commandString The command to run.
|
|
48
|
-
* @param verbose Default is false.
|
|
49
|
-
* @param allowFailure Default is false.
|
|
50
|
-
* @param cwd Default is CWD.
|
|
51
|
-
*/
|
|
52
|
-
export function execShellString(commandString, verbose = false, allowFailure = false, cwd = CWD) {
|
|
53
|
-
const args = commandString.split(" ");
|
|
54
|
-
const command = args.shift();
|
|
55
|
-
if (command === undefined) {
|
|
56
|
-
fatalError(`execShellString failed to parse the command of: ${commandString}`);
|
|
57
|
-
}
|
|
58
|
-
return execShell(command, args, verbose, allowFailure, cwd);
|
|
59
|
-
}
|
|
60
44
|
/**
|
|
61
45
|
* Returns a tuple of exit status and stdout. The stdout is trimmed for convenience.
|
|
62
46
|
*
|
|
@@ -110,4 +94,20 @@ export function execShell(command, args = [], verbose = false, allowFailure = fa
|
|
|
110
94
|
}
|
|
111
95
|
return { exitStatus, stdout };
|
|
112
96
|
}
|
|
97
|
+
/**
|
|
98
|
+
* Same as `execShell`, but accepts the command as a string instead of an array of arguments.
|
|
99
|
+
*
|
|
100
|
+
* @param commandString The command to run.
|
|
101
|
+
* @param verbose Default is false.
|
|
102
|
+
* @param allowFailure Default is false.
|
|
103
|
+
* @param cwd Default is CWD.
|
|
104
|
+
*/
|
|
105
|
+
export function execShellString(commandString, verbose = false, allowFailure = false, cwd = CWD) {
|
|
106
|
+
const args = commandString.split(" ");
|
|
107
|
+
const command = args.shift();
|
|
108
|
+
if (command === undefined) {
|
|
109
|
+
fatalError(`execShellString failed to parse the command of: ${commandString}`);
|
|
110
|
+
}
|
|
111
|
+
return execShell(command, args, verbose, allowFailure, cwd);
|
|
112
|
+
}
|
|
113
113
|
//# sourceMappingURL=exec.js.map
|
package/dist/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../src/exec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,MAAM,UAAU,OAAO,CACrB,IAAY,EACZ,IAAc,EACd,OAAgB,EAChB,GAAG,GAAG,GAAG;IAET,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;KAC1C;IAED,IAAI,MAAc,CAAC;IACnB,IAAI;QACF,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE;YACtC,GAAG;SACJ,CAAC,CAAC;QACH,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;KACnC;IAAC,OAAO,KAAK,EAAE;QACd,UAAU,CAAC,kBAAkB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;KAC5D;IAED,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;KACzC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,OAAe,EACf,OAAO,GAAG,KAAK,EACf,GAAG,GAAG,GAAG;IAET,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,EAAE,CAAC,CAAC;KACzD;IAED,IAAI,MAAc,CAAC;IACnB,IAAI;QACF,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,EAAE;YAC/B,KAAK,EAAE,gBAAgB;YACvB,GAAG;SACJ,CAAC,CAAC;QACH,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;KACnC;IAAC,OAAO,KAAK,EAAE;QACd,UAAU,CACR,qCAAqC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAC7D,KAAK,CACN,CAAC;KACH;IAED,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,gCAAgC,OAAO,EAAE,CAAC,CAAC;KACxD;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../src/exec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,MAAM,UAAU,OAAO,CACrB,IAAY,EACZ,IAAc,EACd,OAAgB,EAChB,GAAG,GAAG,GAAG;IAET,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;KAC1C;IAED,IAAI,MAAc,CAAC;IACnB,IAAI;QACF,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE;YACtC,GAAG;SACJ,CAAC,CAAC;QACH,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;KACnC;IAAC,OAAO,KAAK,EAAE;QACd,UAAU,CAAC,kBAAkB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;KAC5D;IAED,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;KACzC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,OAAe,EACf,OAAO,GAAG,KAAK,EACf,GAAG,GAAG,GAAG;IAET,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,EAAE,CAAC,CAAC;KACzD;IAED,IAAI,MAAc,CAAC;IACnB,IAAI;QACF,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,EAAE;YAC/B,KAAK,EAAE,gBAAgB;YACvB,GAAG;SACJ,CAAC,CAAC;QACH,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;KACnC;IAAC,OAAO,KAAK,EAAE;QACd,UAAU,CACR,qCAAqC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAC7D,KAAK,CACN,CAAC;KACH;IAED,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,gCAAgC,OAAO,EAAE,CAAC,CAAC;KACxD;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,SAAS,CACvB,OAAe,EACf,OAAiB,EAAE,EACnB,OAAO,GAAG,KAAK,EACf,YAAY,GAAG,KAAK,EACpB,GAAG,GAAG,GAAG;IAET,iGAAiG;IACjG,qFAAqF;IACrF,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAClD,UAAU,CACR,uFAAuF,CACxF,CAAC;KACH;IAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,IAAI,mBAAmB,EAAE;QACvB,UAAU,CACR,wEAAwE,CACzE,CAAC;KACH;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC;IACjD,MAAM,kBAAkB,GAAG,GAAG,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;IAEvE,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,sBAAsB,kBAAkB,EAAE,CAAC,CAAC;KACzD;IAED,IAAI,gBAA0C,CAAC;IAC/C,IAAI;QACF,gBAAgB,GAAG,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE;YAChD,KAAK,EAAE,IAAI;YACX,GAAG;SACJ,CAAC,CAAC;KACJ;IAAC,OAAO,KAAK,EAAE;QACd,UAAU,CACR,sBAAsB,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC,YAAY,EACjE,KAAK,CACN,CAAC;KACH;IAED,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,qBAAqB,kBAAkB,EAAE,CAAC,CAAC;KACxD;IAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,CAAC;IAC3C,IAAI,UAAU,KAAK,IAAI,EAAE;QACvB,UAAU,CACR,+CAA+C,kBAAkB,EAAE,CACpE,CAAC;KACH;IAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IAEzD,IAAI,UAAU,KAAK,CAAC,EAAE;QACpB,IAAI,YAAY,EAAE;YAChB,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;SAC/B;QAED,OAAO,CAAC,KAAK,CACX,sBAAsB,KAAK,CAAC,KAAK,CAC/B,kBAAkB,CACnB,kCAAkC,UAAU,GAAG,CACjD,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC5C,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;AAChC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAC7B,aAAqB,EACrB,OAAO,GAAG,KAAK,EACf,YAAY,GAAG,KAAK,EACpB,GAAG,GAAG,GAAG;IAET,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IAC7B,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,UAAU,CACR,mDAAmD,aAAa,EAAE,CACnE,CAAC;KACH;IAED,OAAO,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;AAC9D,CAAC"}
|