@ng-atomic/schematics 20.67.0 → 20.73.0
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.
- package/index.js +812 -391
- package/lib/_utilities/index.js +812 -391
- package/lib/atomic-component/index.js +5 -11
- package/lib/ng-add/index.js +811 -390
- package/lib/page/index.js +811 -390
- package/lib/pages/index.js +5 -11
- package/lib/setup/index.js +812 -391
- package/package.json +1 -1
package/lib/setup/index.js
CHANGED
|
@@ -212,6 +212,7 @@ var require_delegate = __commonJS({
|
|
|
212
212
|
_other;
|
|
213
213
|
constructor(_other) {
|
|
214
214
|
this._other = _other;
|
|
215
|
+
this[interface_1.TreeSymbol] = () => this;
|
|
215
216
|
}
|
|
216
217
|
branch() {
|
|
217
218
|
return this._other.branch();
|
|
@@ -270,9 +271,6 @@ var require_delegate = __commonJS({
|
|
|
270
271
|
get actions() {
|
|
271
272
|
return this._other.actions;
|
|
272
273
|
}
|
|
273
|
-
[interface_1.TreeSymbol]() {
|
|
274
|
-
return this;
|
|
275
|
-
}
|
|
276
274
|
};
|
|
277
275
|
exports2.DelegateTree = DelegateTree;
|
|
278
276
|
}
|
|
@@ -2161,6 +2159,7 @@ var require_scoped = __commonJS({
|
|
|
2161
2159
|
_root;
|
|
2162
2160
|
constructor(_base, scope) {
|
|
2163
2161
|
this._base = _base;
|
|
2162
|
+
this[interface_1.TreeSymbol] = () => this;
|
|
2164
2163
|
const normalizedScope = (0, core_1.normalize)("/" + scope);
|
|
2165
2164
|
this._root = new ScopedDirEntry(this._base.getDir(normalizedScope), normalizedScope);
|
|
2166
2165
|
}
|
|
@@ -2247,9 +2246,6 @@ var require_scoped = __commonJS({
|
|
|
2247
2246
|
}
|
|
2248
2247
|
return scopedActions;
|
|
2249
2248
|
}
|
|
2250
|
-
[interface_1.TreeSymbol]() {
|
|
2251
|
-
return this;
|
|
2252
|
-
}
|
|
2253
2249
|
_fullPath(path) {
|
|
2254
2250
|
return (0, core_1.join)(this._root.scope, (0, core_1.normalize)("/" + path));
|
|
2255
2251
|
}
|
|
@@ -2336,9 +2332,6 @@ var require_host_tree = __commonJS({
|
|
|
2336
2332
|
_recordSync;
|
|
2337
2333
|
_ancestry = /* @__PURE__ */ new Set();
|
|
2338
2334
|
_dirCache = /* @__PURE__ */ new Map();
|
|
2339
|
-
[interface_1.TreeSymbol]() {
|
|
2340
|
-
return this;
|
|
2341
|
-
}
|
|
2342
2335
|
static isHostTree(tree) {
|
|
2343
2336
|
if (tree instanceof _HostTree) {
|
|
2344
2337
|
return true;
|
|
@@ -2350,6 +2343,7 @@ var require_host_tree = __commonJS({
|
|
|
2350
2343
|
}
|
|
2351
2344
|
constructor(_backend = new core_1.virtualFs.Empty()) {
|
|
2352
2345
|
this._backend = _backend;
|
|
2346
|
+
this[interface_1.TreeSymbol] = () => this;
|
|
2353
2347
|
this._record = new core_1.virtualFs.CordHost(new core_1.virtualFs.SafeReadonlyHost(_backend));
|
|
2354
2348
|
this._recordSync = new core_1.virtualFs.SyncDelegateHost(this._record);
|
|
2355
2349
|
}
|
|
@@ -12154,8 +12148,8 @@ var require_null = __commonJS({
|
|
|
12154
12148
|
};
|
|
12155
12149
|
exports2.NullTreeDirEntry = NullTreeDirEntry;
|
|
12156
12150
|
var NullTree = class _NullTree {
|
|
12157
|
-
|
|
12158
|
-
|
|
12151
|
+
constructor() {
|
|
12152
|
+
this[interface_1.TreeSymbol] = () => this;
|
|
12159
12153
|
}
|
|
12160
12154
|
branch() {
|
|
12161
12155
|
return new _NullTree();
|
|
@@ -424685,7 +424679,7 @@ ${fromBody}`;
|
|
|
424685
424679
|
exports22.parseString = parseString;
|
|
424686
424680
|
}
|
|
424687
424681
|
});
|
|
424688
|
-
var
|
|
424682
|
+
var require_package3 = __commonJS22({
|
|
424689
424683
|
"node_modules/editorconfig/package.json"(exports22, module22) {
|
|
424690
424684
|
module22.exports = {
|
|
424691
424685
|
name: "editorconfig",
|
|
@@ -424887,7 +424881,7 @@ ${fromBody}`;
|
|
|
424887
424881
|
var fnmatch_1 = __importDefault22(require_fnmatch());
|
|
424888
424882
|
var ini_1 = require_ini();
|
|
424889
424883
|
exports22.parseString = ini_1.parseString;
|
|
424890
|
-
var package_json_1 = __importDefault22(
|
|
424884
|
+
var package_json_1 = __importDefault22(require_package3());
|
|
424891
424885
|
var knownProps = {
|
|
424892
424886
|
end_of_line: true,
|
|
424893
424887
|
indent_style: true,
|
|
@@ -444324,22 +444318,26 @@ var require_format_files = __commonJS({
|
|
|
444324
444318
|
"use strict";
|
|
444325
444319
|
Object.defineProperty(exports2, "__esModule", { value: true });
|
|
444326
444320
|
exports2.formatFiles = formatFiles;
|
|
444321
|
+
var tslib_1 = (init_tslib_es6(), __toCommonJS(tslib_es6_exports));
|
|
444327
444322
|
var devkit_exports_1 = require("nx/src/devkit-exports");
|
|
444328
444323
|
var devkit_internals_1 = require("nx/src/devkit-internals");
|
|
444329
|
-
var path = require("path");
|
|
444324
|
+
var path = tslib_1.__importStar(require("path"));
|
|
444330
444325
|
async function formatFiles(tree, options = {}) {
|
|
444326
|
+
options.sortRootTsconfigPaths ??= process.env.NX_FORMAT_SORT_TSCONFIG_PATHS === "true";
|
|
444327
|
+
if (options.sortRootTsconfigPaths) {
|
|
444328
|
+
sortTsConfig(tree);
|
|
444329
|
+
}
|
|
444330
|
+
if (process.env.NX_SKIP_FORMAT === "true") {
|
|
444331
|
+
return;
|
|
444332
|
+
}
|
|
444331
444333
|
let prettier;
|
|
444332
444334
|
try {
|
|
444333
|
-
prettier = await Promise.resolve().then(() => require_prettier());
|
|
444335
|
+
prettier = await Promise.resolve().then(() => tslib_1.__importStar(require_prettier()));
|
|
444334
444336
|
if (!(0, devkit_internals_1.isUsingPrettierInTree)(tree)) {
|
|
444335
444337
|
return;
|
|
444336
444338
|
}
|
|
444337
444339
|
} catch {
|
|
444338
444340
|
}
|
|
444339
|
-
options.sortRootTsconfigPaths ??= process.env.NX_FORMAT_SORT_TSCONFIG_PATHS === "true";
|
|
444340
|
-
if (options.sortRootTsconfigPaths) {
|
|
444341
|
-
sortTsConfig(tree);
|
|
444342
|
-
}
|
|
444343
444341
|
if (!prettier)
|
|
444344
444342
|
return;
|
|
444345
444343
|
const files = new Set(tree.listChanges().filter((file) => file.type !== "DELETE"));
|
|
@@ -444695,16 +444693,18 @@ var require_binary_extensions = __commonJS({
|
|
|
444695
444693
|
}
|
|
444696
444694
|
});
|
|
444697
444695
|
|
|
444698
|
-
// node_modules/ejs/lib/utils.js
|
|
444696
|
+
// node_modules/ejs/lib/cjs/utils.js
|
|
444699
444697
|
var require_utils = __commonJS({
|
|
444700
|
-
"node_modules/ejs/lib/utils.js"(exports2) {
|
|
444698
|
+
"node_modules/ejs/lib/cjs/utils.js"(exports2, module2) {
|
|
444701
444699
|
"use strict";
|
|
444700
|
+
Object.defineProperty(exports2, "__esModule", { value: true });
|
|
444701
|
+
var utils = {};
|
|
444702
444702
|
var regExpChars = /[|\\{}()[\]^$+*?.]/g;
|
|
444703
444703
|
var hasOwnProperty6 = Object.prototype.hasOwnProperty;
|
|
444704
444704
|
var hasOwn = function(obj, key) {
|
|
444705
444705
|
return hasOwnProperty6.apply(obj, [key]);
|
|
444706
444706
|
};
|
|
444707
|
-
|
|
444707
|
+
utils.escapeRegExpChars = function(string) {
|
|
444708
444708
|
if (!string) {
|
|
444709
444709
|
return "";
|
|
444710
444710
|
}
|
|
@@ -444733,7 +444733,7 @@ function encode_char(c) {
|
|
|
444733
444733
|
return _ENCODE_HTML_RULES[c] || c;
|
|
444734
444734
|
};
|
|
444735
444735
|
`;
|
|
444736
|
-
|
|
444736
|
+
utils.escapeXML = function(markup) {
|
|
444737
444737
|
return markup == void 0 ? "" : String(markup).replace(_MATCH_HTML, encode_char);
|
|
444738
444738
|
};
|
|
444739
444739
|
function escapeXMLToString() {
|
|
@@ -444741,14 +444741,14 @@ function encode_char(c) {
|
|
|
444741
444741
|
}
|
|
444742
444742
|
try {
|
|
444743
444743
|
if (typeof Object.defineProperty === "function") {
|
|
444744
|
-
Object.defineProperty(
|
|
444744
|
+
Object.defineProperty(utils.escapeXML, "toString", { value: escapeXMLToString });
|
|
444745
444745
|
} else {
|
|
444746
|
-
|
|
444746
|
+
utils.escapeXML.toString = escapeXMLToString;
|
|
444747
444747
|
}
|
|
444748
444748
|
} catch (err) {
|
|
444749
444749
|
console.warn("Unable to set escapeXML.toString (is the Function prototype frozen?)");
|
|
444750
444750
|
}
|
|
444751
|
-
|
|
444751
|
+
utils.shallowCopy = function(to, from) {
|
|
444752
444752
|
from = from || {};
|
|
444753
444753
|
if (to !== null && to !== void 0) {
|
|
444754
444754
|
for (var p in from) {
|
|
@@ -444763,7 +444763,7 @@ function encode_char(c) {
|
|
|
444763
444763
|
}
|
|
444764
444764
|
return to;
|
|
444765
444765
|
};
|
|
444766
|
-
|
|
444766
|
+
utils.shallowCopyFromList = function(to, from, list) {
|
|
444767
444767
|
list = list || [];
|
|
444768
444768
|
from = from || {};
|
|
444769
444769
|
if (to !== null && to !== void 0) {
|
|
@@ -444782,7 +444782,7 @@ function encode_char(c) {
|
|
|
444782
444782
|
}
|
|
444783
444783
|
return to;
|
|
444784
444784
|
};
|
|
444785
|
-
|
|
444785
|
+
utils.cache = {
|
|
444786
444786
|
_data: {},
|
|
444787
444787
|
set: function(key, val) {
|
|
444788
444788
|
this._data[key] = val;
|
|
@@ -444797,12 +444797,12 @@ function encode_char(c) {
|
|
|
444797
444797
|
this._data = {};
|
|
444798
444798
|
}
|
|
444799
444799
|
};
|
|
444800
|
-
|
|
444800
|
+
utils.hyphenToCamel = function(str) {
|
|
444801
444801
|
return str.replace(/-[a-z]/g, function(match) {
|
|
444802
444802
|
return match[1].toUpperCase();
|
|
444803
444803
|
});
|
|
444804
444804
|
};
|
|
444805
|
-
|
|
444805
|
+
utils.createNullProtoObjWherePossible = (function() {
|
|
444806
444806
|
if (typeof Object.create == "function") {
|
|
444807
444807
|
return function() {
|
|
444808
444808
|
return /* @__PURE__ */ Object.create(null);
|
|
@@ -444817,8 +444817,8 @@ function encode_char(c) {
|
|
|
444817
444817
|
return {};
|
|
444818
444818
|
};
|
|
444819
444819
|
})();
|
|
444820
|
-
|
|
444821
|
-
var o =
|
|
444820
|
+
utils.hasOwnOnlyObject = function(obj) {
|
|
444821
|
+
var o = utils.createNullProtoObjWherePossible();
|
|
444822
444822
|
for (var p in obj) {
|
|
444823
444823
|
if (hasOwn(obj, p)) {
|
|
444824
444824
|
o[p] = obj[p];
|
|
@@ -444826,71 +444826,30 @@ function encode_char(c) {
|
|
|
444826
444826
|
}
|
|
444827
444827
|
return o;
|
|
444828
444828
|
};
|
|
444829
|
+
if (typeof exports2 != "undefined") {
|
|
444830
|
+
module2.exports = utils;
|
|
444831
|
+
}
|
|
444832
|
+
exports2.default = utils;
|
|
444829
444833
|
}
|
|
444830
444834
|
});
|
|
444831
444835
|
|
|
444832
|
-
// node_modules/ejs/
|
|
444833
|
-
var require_package2 = __commonJS({
|
|
444834
|
-
"node_modules/ejs/package.json"(exports2, module2) {
|
|
444835
|
-
module2.exports = {
|
|
444836
|
-
name: "ejs",
|
|
444837
|
-
description: "Embedded JavaScript templates",
|
|
444838
|
-
keywords: [
|
|
444839
|
-
"template",
|
|
444840
|
-
"engine",
|
|
444841
|
-
"ejs"
|
|
444842
|
-
],
|
|
444843
|
-
version: "3.1.10",
|
|
444844
|
-
author: "Matthew Eernisse <mde@fleegix.org> (http://fleegix.org)",
|
|
444845
|
-
license: "Apache-2.0",
|
|
444846
|
-
bin: {
|
|
444847
|
-
ejs: "./bin/cli.js"
|
|
444848
|
-
},
|
|
444849
|
-
main: "./lib/ejs.js",
|
|
444850
|
-
jsdelivr: "ejs.min.js",
|
|
444851
|
-
unpkg: "ejs.min.js",
|
|
444852
|
-
repository: {
|
|
444853
|
-
type: "git",
|
|
444854
|
-
url: "git://github.com/mde/ejs.git"
|
|
444855
|
-
},
|
|
444856
|
-
bugs: "https://github.com/mde/ejs/issues",
|
|
444857
|
-
homepage: "https://github.com/mde/ejs",
|
|
444858
|
-
dependencies: {
|
|
444859
|
-
jake: "^10.8.5"
|
|
444860
|
-
},
|
|
444861
|
-
devDependencies: {
|
|
444862
|
-
browserify: "^16.5.1",
|
|
444863
|
-
eslint: "^6.8.0",
|
|
444864
|
-
"git-directory-deploy": "^1.5.1",
|
|
444865
|
-
jsdoc: "^4.0.2",
|
|
444866
|
-
"lru-cache": "^4.0.1",
|
|
444867
|
-
mocha: "^10.2.0",
|
|
444868
|
-
"uglify-js": "^3.3.16"
|
|
444869
|
-
},
|
|
444870
|
-
engines: {
|
|
444871
|
-
node: ">=0.10.0"
|
|
444872
|
-
},
|
|
444873
|
-
scripts: {
|
|
444874
|
-
test: "npx jake test"
|
|
444875
|
-
}
|
|
444876
|
-
};
|
|
444877
|
-
}
|
|
444878
|
-
});
|
|
444879
|
-
|
|
444880
|
-
// node_modules/ejs/lib/ejs.js
|
|
444836
|
+
// node_modules/ejs/lib/cjs/ejs.js
|
|
444881
444837
|
var require_ejs = __commonJS({
|
|
444882
|
-
"node_modules/ejs/lib/ejs.js"(exports2) {
|
|
444838
|
+
"node_modules/ejs/lib/cjs/ejs.js"(exports2, module2) {
|
|
444883
444839
|
"use strict";
|
|
444884
|
-
var
|
|
444885
|
-
|
|
444886
|
-
|
|
444887
|
-
|
|
444888
|
-
var
|
|
444840
|
+
var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
|
|
444841
|
+
return mod && mod.__esModule ? mod : { "default": mod };
|
|
444842
|
+
};
|
|
444843
|
+
Object.defineProperty(exports2, "__esModule", { value: true });
|
|
444844
|
+
var fs_1 = __importDefault2(require("fs"));
|
|
444845
|
+
var path_1 = __importDefault2(require("path"));
|
|
444846
|
+
var utils_js_1 = __importDefault2(require_utils());
|
|
444847
|
+
var DECLARATION_KEYWORD = "var";
|
|
444848
|
+
var ejs = {};
|
|
444889
444849
|
var _DEFAULT_OPEN_DELIMITER = "<";
|
|
444890
444850
|
var _DEFAULT_CLOSE_DELIMITER = ">";
|
|
444891
444851
|
var _DEFAULT_DELIMITER = "%";
|
|
444892
444852
|
var _DEFAULT_LOCALS_NAME = "locals";
|
|
444893
|
-
var _NAME = "ejs";
|
|
444894
444853
|
var _REGEX_STRING = "(<%%|%%>|<%=|<%-|<%_|<%#|<%|%>|-%>|_%>)";
|
|
444895
444854
|
var _OPTS_PASSABLE_WITH_DATA = [
|
|
444896
444855
|
"delimiter",
|
|
@@ -444898,7 +444857,6 @@ var require_ejs = __commonJS({
|
|
|
444898
444857
|
"context",
|
|
444899
444858
|
"debug",
|
|
444900
444859
|
"compileDebug",
|
|
444901
|
-
"client",
|
|
444902
444860
|
"_with",
|
|
444903
444861
|
"rmWhitespace",
|
|
444904
444862
|
"strict",
|
|
@@ -444908,14 +444866,14 @@ var require_ejs = __commonJS({
|
|
|
444908
444866
|
var _OPTS_PASSABLE_WITH_DATA_EXPRESS = _OPTS_PASSABLE_WITH_DATA.concat("cache");
|
|
444909
444867
|
var _BOM = /^\uFEFF/;
|
|
444910
444868
|
var _JS_IDENTIFIER = /^[a-zA-Z_$][0-9a-zA-Z_$]*$/;
|
|
444911
|
-
|
|
444912
|
-
|
|
444913
|
-
|
|
444914
|
-
|
|
444915
|
-
|
|
444916
|
-
var dirname =
|
|
444917
|
-
var extname =
|
|
444918
|
-
var resolve =
|
|
444869
|
+
ejs.cache = utils_js_1.default.cache;
|
|
444870
|
+
ejs.fileLoader = fs_1.default.readFileSync;
|
|
444871
|
+
ejs.localsName = _DEFAULT_LOCALS_NAME;
|
|
444872
|
+
ejs.promiseImpl = new Function("return this;")().Promise;
|
|
444873
|
+
ejs.resolveInclude = function(name, filename, isDir) {
|
|
444874
|
+
var dirname = path_1.default.dirname;
|
|
444875
|
+
var extname = path_1.default.extname;
|
|
444876
|
+
var resolve = path_1.default.resolve;
|
|
444919
444877
|
var includePath = resolve(isDir ? filename : dirname(filename), name);
|
|
444920
444878
|
var ext = extname(name);
|
|
444921
444879
|
if (!ext) {
|
|
@@ -444926,36 +444884,36 @@ var require_ejs = __commonJS({
|
|
|
444926
444884
|
function resolvePaths(name, paths) {
|
|
444927
444885
|
var filePath;
|
|
444928
444886
|
if (paths.some(function(v) {
|
|
444929
|
-
filePath =
|
|
444930
|
-
return
|
|
444887
|
+
filePath = ejs.resolveInclude(name, v, true);
|
|
444888
|
+
return fs_1.default.existsSync(filePath);
|
|
444931
444889
|
})) {
|
|
444932
444890
|
return filePath;
|
|
444933
444891
|
}
|
|
444934
444892
|
}
|
|
444935
|
-
function getIncludePath(
|
|
444893
|
+
function getIncludePath(path, options) {
|
|
444936
444894
|
var includePath;
|
|
444937
444895
|
var filePath;
|
|
444938
444896
|
var views = options.views;
|
|
444939
|
-
var match = /^[A-Za-z]+:\\|^\//.exec(
|
|
444897
|
+
var match = /^[A-Za-z]+:\\|^\//.exec(path);
|
|
444940
444898
|
if (match && match.length) {
|
|
444941
|
-
|
|
444899
|
+
path = path.replace(/^\/*/, "");
|
|
444942
444900
|
if (Array.isArray(options.root)) {
|
|
444943
|
-
includePath = resolvePaths(
|
|
444901
|
+
includePath = resolvePaths(path, options.root);
|
|
444944
444902
|
} else {
|
|
444945
|
-
includePath =
|
|
444903
|
+
includePath = ejs.resolveInclude(path, options.root || "/", true);
|
|
444946
444904
|
}
|
|
444947
444905
|
} else {
|
|
444948
444906
|
if (options.filename) {
|
|
444949
|
-
filePath =
|
|
444950
|
-
if (
|
|
444907
|
+
filePath = ejs.resolveInclude(path, options.filename);
|
|
444908
|
+
if (fs_1.default.existsSync(filePath)) {
|
|
444951
444909
|
includePath = filePath;
|
|
444952
444910
|
}
|
|
444953
444911
|
}
|
|
444954
444912
|
if (!includePath && Array.isArray(views)) {
|
|
444955
|
-
includePath = resolvePaths(
|
|
444913
|
+
includePath = resolvePaths(path, views);
|
|
444956
444914
|
}
|
|
444957
444915
|
if (!includePath && typeof options.includer !== "function") {
|
|
444958
|
-
throw new Error('Could not find the include file "' + options.escapeFunction(
|
|
444916
|
+
throw new Error('Could not find the include file "' + options.escapeFunction(path) + '"');
|
|
444959
444917
|
}
|
|
444960
444918
|
}
|
|
444961
444919
|
return includePath;
|
|
@@ -444968,7 +444926,7 @@ var require_ejs = __commonJS({
|
|
|
444968
444926
|
if (!filename) {
|
|
444969
444927
|
throw new Error("cache option requires a filename");
|
|
444970
444928
|
}
|
|
444971
|
-
func =
|
|
444929
|
+
func = ejs.cache.get(filename);
|
|
444972
444930
|
if (func) {
|
|
444973
444931
|
return func;
|
|
444974
444932
|
}
|
|
@@ -444981,17 +444939,17 @@ var require_ejs = __commonJS({
|
|
|
444981
444939
|
}
|
|
444982
444940
|
template2 = fileLoader(filename).toString().replace(_BOM, "");
|
|
444983
444941
|
}
|
|
444984
|
-
func =
|
|
444942
|
+
func = ejs.compile(template2, options);
|
|
444985
444943
|
if (options.cache) {
|
|
444986
|
-
|
|
444944
|
+
ejs.cache.set(filename, func);
|
|
444987
444945
|
}
|
|
444988
444946
|
return func;
|
|
444989
444947
|
}
|
|
444990
444948
|
function tryHandleCache(options, data, cb) {
|
|
444991
444949
|
var result;
|
|
444992
444950
|
if (!cb) {
|
|
444993
|
-
if (typeof
|
|
444994
|
-
return new
|
|
444951
|
+
if (typeof ejs.promiseImpl == "function") {
|
|
444952
|
+
return new ejs.promiseImpl(function(resolve, reject) {
|
|
444995
444953
|
try {
|
|
444996
444954
|
result = handleCache(options)(data);
|
|
444997
444955
|
resolve(result);
|
|
@@ -445012,13 +444970,13 @@ var require_ejs = __commonJS({
|
|
|
445012
444970
|
}
|
|
445013
444971
|
}
|
|
445014
444972
|
function fileLoader(filePath) {
|
|
445015
|
-
return
|
|
444973
|
+
return ejs.fileLoader(filePath);
|
|
445016
444974
|
}
|
|
445017
|
-
function includeFile(
|
|
445018
|
-
var opts =
|
|
445019
|
-
opts.filename = getIncludePath(
|
|
444975
|
+
function includeFile(path, options) {
|
|
444976
|
+
var opts = utils_js_1.default.shallowCopy(utils_js_1.default.createNullProtoObjWherePossible(), options);
|
|
444977
|
+
opts.filename = getIncludePath(path, opts);
|
|
445020
444978
|
if (typeof options.includer === "function") {
|
|
445021
|
-
var includerResult = options.includer(
|
|
444979
|
+
var includerResult = options.includer(path, opts.filename);
|
|
445022
444980
|
if (includerResult) {
|
|
445023
444981
|
if (includerResult.filename) {
|
|
445024
444982
|
opts.filename = includerResult.filename;
|
|
@@ -445046,13 +445004,10 @@ var require_ejs = __commonJS({
|
|
|
445046
445004
|
function stripSemi(str) {
|
|
445047
445005
|
return str.replace(/;(\s*$)/, "$1");
|
|
445048
445006
|
}
|
|
445049
|
-
|
|
445007
|
+
ejs.compile = function compile(template2, opts) {
|
|
445050
445008
|
var templ;
|
|
445051
445009
|
if (opts && opts.scope) {
|
|
445052
|
-
|
|
445053
|
-
console.warn("`scope` option is deprecated and will be removed in EJS 3");
|
|
445054
|
-
scopeOptionWarned = true;
|
|
445055
|
-
}
|
|
445010
|
+
console.warn("`scope` option is deprecated and will be removed in future EJS");
|
|
445056
445011
|
if (!opts.context) {
|
|
445057
445012
|
opts.context = opts.scope;
|
|
445058
445013
|
}
|
|
@@ -445061,15 +445016,15 @@ var require_ejs = __commonJS({
|
|
|
445061
445016
|
templ = new Template(template2, opts);
|
|
445062
445017
|
return templ.compile();
|
|
445063
445018
|
};
|
|
445064
|
-
|
|
445065
|
-
var data = d ||
|
|
445066
|
-
var opts = o ||
|
|
445019
|
+
ejs.render = function(template2, d, o) {
|
|
445020
|
+
var data = d || utils_js_1.default.createNullProtoObjWherePossible();
|
|
445021
|
+
var opts = o || utils_js_1.default.createNullProtoObjWherePossible();
|
|
445067
445022
|
if (arguments.length == 2) {
|
|
445068
|
-
|
|
445023
|
+
utils_js_1.default.shallowCopyFromList(opts, data, _OPTS_PASSABLE_WITH_DATA);
|
|
445069
445024
|
}
|
|
445070
445025
|
return handleCache(opts, template2)(data);
|
|
445071
445026
|
};
|
|
445072
|
-
|
|
445027
|
+
ejs.renderFile = function() {
|
|
445073
445028
|
var args = Array.prototype.slice.call(arguments);
|
|
445074
445029
|
var filename = args.shift();
|
|
445075
445030
|
var cb;
|
|
@@ -445082,7 +445037,7 @@ var require_ejs = __commonJS({
|
|
|
445082
445037
|
if (args.length) {
|
|
445083
445038
|
data = args.shift();
|
|
445084
445039
|
if (args.length) {
|
|
445085
|
-
|
|
445040
|
+
utils_js_1.default.shallowCopy(opts, args.pop());
|
|
445086
445041
|
} else {
|
|
445087
445042
|
if (data.settings) {
|
|
445088
445043
|
if (data.settings.views) {
|
|
@@ -445093,37 +445048,36 @@ var require_ejs = __commonJS({
|
|
|
445093
445048
|
}
|
|
445094
445049
|
viewOpts = data.settings["view options"];
|
|
445095
445050
|
if (viewOpts) {
|
|
445096
|
-
|
|
445051
|
+
utils_js_1.default.shallowCopy(opts, viewOpts);
|
|
445097
445052
|
}
|
|
445098
445053
|
}
|
|
445099
|
-
|
|
445054
|
+
utils_js_1.default.shallowCopyFromList(opts, data, _OPTS_PASSABLE_WITH_DATA_EXPRESS);
|
|
445100
445055
|
}
|
|
445101
445056
|
opts.filename = filename;
|
|
445102
445057
|
} else {
|
|
445103
|
-
data =
|
|
445058
|
+
data = utils_js_1.default.createNullProtoObjWherePossible();
|
|
445104
445059
|
}
|
|
445105
445060
|
return tryHandleCache(opts, data, cb);
|
|
445106
445061
|
};
|
|
445107
|
-
|
|
445108
|
-
|
|
445109
|
-
|
|
445062
|
+
ejs.Template = Template;
|
|
445063
|
+
ejs.clearCache = function() {
|
|
445064
|
+
ejs.cache.reset();
|
|
445110
445065
|
};
|
|
445111
445066
|
function Template(text, optsParam) {
|
|
445112
|
-
var opts =
|
|
445113
|
-
var options =
|
|
445067
|
+
var opts = utils_js_1.default.hasOwnOnlyObject(optsParam);
|
|
445068
|
+
var options = utils_js_1.default.createNullProtoObjWherePossible();
|
|
445114
445069
|
this.templateText = text;
|
|
445115
445070
|
this.mode = null;
|
|
445116
445071
|
this.truncate = false;
|
|
445117
445072
|
this.currentLine = 1;
|
|
445118
445073
|
this.source = "";
|
|
445119
|
-
options.
|
|
445120
|
-
options.escapeFunction = opts.escape || opts.escapeFunction || utils.escapeXML;
|
|
445074
|
+
options.escapeFunction = opts.escape || opts.escapeFunction || utils_js_1.default.escapeXML;
|
|
445121
445075
|
options.compileDebug = opts.compileDebug !== false;
|
|
445122
445076
|
options.debug = !!opts.debug;
|
|
445123
445077
|
options.filename = opts.filename;
|
|
445124
|
-
options.openDelimiter = opts.openDelimiter ||
|
|
445125
|
-
options.closeDelimiter = opts.closeDelimiter ||
|
|
445126
|
-
options.delimiter = opts.delimiter ||
|
|
445078
|
+
options.openDelimiter = opts.openDelimiter || ejs.openDelimiter || _DEFAULT_OPEN_DELIMITER;
|
|
445079
|
+
options.closeDelimiter = opts.closeDelimiter || ejs.closeDelimiter || _DEFAULT_CLOSE_DELIMITER;
|
|
445080
|
+
options.delimiter = opts.delimiter || ejs.delimiter || _DEFAULT_DELIMITER;
|
|
445127
445081
|
options.strict = opts.strict || false;
|
|
445128
445082
|
options.context = opts.context;
|
|
445129
445083
|
options.cache = opts.cache || false;
|
|
@@ -445131,7 +445085,7 @@ var require_ejs = __commonJS({
|
|
|
445131
445085
|
options.root = opts.root;
|
|
445132
445086
|
options.includer = opts.includer;
|
|
445133
445087
|
options.outputFunctionName = opts.outputFunctionName;
|
|
445134
|
-
options.localsName = opts.localsName ||
|
|
445088
|
+
options.localsName = opts.localsName || ejs.localsName || _DEFAULT_LOCALS_NAME;
|
|
445135
445089
|
options.views = opts.views;
|
|
445136
445090
|
options.async = opts.async;
|
|
445137
445091
|
options.destructuredLocals = opts.destructuredLocals;
|
|
@@ -445154,9 +445108,9 @@ var require_ejs = __commonJS({
|
|
|
445154
445108
|
Template.prototype = {
|
|
445155
445109
|
createRegex: function() {
|
|
445156
445110
|
var str = _REGEX_STRING;
|
|
445157
|
-
var delim =
|
|
445158
|
-
var open =
|
|
445159
|
-
var close =
|
|
445111
|
+
var delim = utils_js_1.default.escapeRegExpChars(this.opts.delimiter);
|
|
445112
|
+
var open = utils_js_1.default.escapeRegExpChars(this.opts.openDelimiter);
|
|
445113
|
+
var close = utils_js_1.default.escapeRegExpChars(this.opts.closeDelimiter);
|
|
445160
445114
|
str = str.replace(/%/g, delim).replace(/</g, open).replace(/>/g, close);
|
|
445161
445115
|
return new RegExp(str);
|
|
445162
445116
|
},
|
|
@@ -445171,27 +445125,27 @@ var require_ejs = __commonJS({
|
|
|
445171
445125
|
var sanitizedFilename = opts.filename ? JSON.stringify(opts.filename) : "undefined";
|
|
445172
445126
|
if (!this.source) {
|
|
445173
445127
|
this.generateSource();
|
|
445174
|
-
prepended +=
|
|
445128
|
+
prepended += " ".concat(DECLARATION_KEYWORD, ' __output = "";\n') + " function __append(s) { if (s !== undefined && s !== null) __output += s }\n";
|
|
445175
445129
|
if (opts.outputFunctionName) {
|
|
445176
445130
|
if (!_JS_IDENTIFIER.test(opts.outputFunctionName)) {
|
|
445177
445131
|
throw new Error("outputFunctionName is not a valid JS identifier.");
|
|
445178
445132
|
}
|
|
445179
|
-
prepended += "
|
|
445133
|
+
prepended += " ".concat(DECLARATION_KEYWORD, " ") + opts.outputFunctionName + " = __append;\n";
|
|
445180
445134
|
}
|
|
445181
445135
|
if (opts.localsName && !_JS_IDENTIFIER.test(opts.localsName)) {
|
|
445182
445136
|
throw new Error("localsName is not a valid JS identifier.");
|
|
445183
445137
|
}
|
|
445184
445138
|
if (opts.destructuredLocals && opts.destructuredLocals.length) {
|
|
445185
|
-
var destructuring = "
|
|
445139
|
+
var destructuring = " ".concat(DECLARATION_KEYWORD, " __locals = (") + opts.localsName + " || {}),\n";
|
|
445186
445140
|
for (var i = 0; i < opts.destructuredLocals.length; i++) {
|
|
445187
|
-
var
|
|
445188
|
-
if (!_JS_IDENTIFIER.test(
|
|
445141
|
+
var name_1 = opts.destructuredLocals[i];
|
|
445142
|
+
if (!_JS_IDENTIFIER.test(name_1)) {
|
|
445189
445143
|
throw new Error("destructuredLocals[" + i + "] is not a valid JS identifier.");
|
|
445190
445144
|
}
|
|
445191
445145
|
if (i > 0) {
|
|
445192
445146
|
destructuring += ",\n ";
|
|
445193
445147
|
}
|
|
445194
|
-
destructuring +=
|
|
445148
|
+
destructuring += name_1 + " = __locals." + name_1;
|
|
445195
445149
|
}
|
|
445196
445150
|
prepended += destructuring + ";\n";
|
|
445197
445151
|
}
|
|
@@ -445203,16 +445157,10 @@ var require_ejs = __commonJS({
|
|
|
445203
445157
|
this.source = prepended + this.source + appended;
|
|
445204
445158
|
}
|
|
445205
445159
|
if (opts.compileDebug) {
|
|
445206
|
-
src = "
|
|
445160
|
+
src = "".concat(DECLARATION_KEYWORD, " __line = 1") + "\n , __lines = " + JSON.stringify(this.templateText) + "\n , __filename = " + sanitizedFilename + ";\ntry {\n" + this.source + "} catch (e) {\n rethrow(e, __lines, __filename, __line, escapeFn);\n}\n";
|
|
445207
445161
|
} else {
|
|
445208
445162
|
src = this.source;
|
|
445209
445163
|
}
|
|
445210
|
-
if (opts.client) {
|
|
445211
|
-
src = "escapeFn = escapeFn || " + escapeFn.toString() + ";\n" + src;
|
|
445212
|
-
if (opts.compileDebug) {
|
|
445213
|
-
src = "rethrow = rethrow || " + rethrow.toString() + ";\n" + src;
|
|
445214
|
-
}
|
|
445215
|
-
}
|
|
445216
445164
|
if (opts.strict) {
|
|
445217
445165
|
src = '"use strict";\n' + src;
|
|
445218
445166
|
}
|
|
@@ -445252,22 +445200,19 @@ var require_ejs = __commonJS({
|
|
|
445252
445200
|
}
|
|
445253
445201
|
throw e;
|
|
445254
445202
|
}
|
|
445255
|
-
var returnedFn =
|
|
445256
|
-
var include = function(
|
|
445257
|
-
var d =
|
|
445203
|
+
var returnedFn = function anonymous(data) {
|
|
445204
|
+
var include = function(path, includeData) {
|
|
445205
|
+
var d = utils_js_1.default.shallowCopy(utils_js_1.default.createNullProtoObjWherePossible(), data);
|
|
445258
445206
|
if (includeData) {
|
|
445259
|
-
d =
|
|
445207
|
+
d = utils_js_1.default.shallowCopy(d, includeData);
|
|
445260
445208
|
}
|
|
445261
|
-
return includeFile(
|
|
445209
|
+
return includeFile(path, opts)(d);
|
|
445262
445210
|
};
|
|
445263
|
-
return fn.apply(
|
|
445264
|
-
opts.context,
|
|
445265
|
-
[data || utils.createNullProtoObjWherePossible(), escapeFn, include, rethrow]
|
|
445266
|
-
);
|
|
445211
|
+
return fn.apply(opts.context, [data || utils_js_1.default.createNullProtoObjWherePossible(), escapeFn, include, rethrow]);
|
|
445267
445212
|
};
|
|
445268
445213
|
if (opts.filename && typeof Object.defineProperty === "function") {
|
|
445269
445214
|
var filename = opts.filename;
|
|
445270
|
-
var basename =
|
|
445215
|
+
var basename = path_1.default.basename(filename, path_1.default.extname(filename));
|
|
445271
445216
|
try {
|
|
445272
445217
|
Object.defineProperty(returnedFn, "name", {
|
|
445273
445218
|
value: basename,
|
|
@@ -445285,12 +445230,16 @@ var require_ejs = __commonJS({
|
|
|
445285
445230
|
if (opts.rmWhitespace) {
|
|
445286
445231
|
this.templateText = this.templateText.replace(/[\r\n]+/g, "\n").replace(/^\s+|\s+$/gm, "");
|
|
445287
445232
|
}
|
|
445288
|
-
this.templateText = this.templateText.replace(/[ \t]*<%_/gm, "<%_").replace(/_%>[ \t]*/gm, "_%>");
|
|
445289
445233
|
var self2 = this;
|
|
445290
|
-
var matches = this.parseTemplateText();
|
|
445291
445234
|
var d = this.opts.delimiter;
|
|
445292
445235
|
var o = this.opts.openDelimiter;
|
|
445293
445236
|
var c = this.opts.closeDelimiter;
|
|
445237
|
+
var openWhitespaceSlurpTag = utils_js_1.default.escapeRegExpChars(o + d + "_");
|
|
445238
|
+
var closeWhitespaceSlurpTag = utils_js_1.default.escapeRegExpChars("_" + d + c);
|
|
445239
|
+
var openWhitespaceSlurpReplacement = o + d + "_";
|
|
445240
|
+
var closeWhitespaceSlurpReplacement = "_" + d + c;
|
|
445241
|
+
this.templateText = this.templateText.replace(new RegExp("[ \\t]*" + openWhitespaceSlurpTag, "gm"), openWhitespaceSlurpReplacement).replace(new RegExp(closeWhitespaceSlurpTag + "[ \\t]*", "gm"), closeWhitespaceSlurpReplacement);
|
|
445242
|
+
var matches = this.parseTemplateText();
|
|
445294
445243
|
if (matches && matches.length) {
|
|
445295
445244
|
matches.forEach(function(line, index) {
|
|
445296
445245
|
var closing;
|
|
@@ -445417,13 +445366,15 @@ var require_ejs = __commonJS({
|
|
|
445417
445366
|
}
|
|
445418
445367
|
}
|
|
445419
445368
|
};
|
|
445420
|
-
|
|
445421
|
-
|
|
445422
|
-
exports2.VERSION = _VERSION_STRING;
|
|
445423
|
-
exports2.name = _NAME;
|
|
445369
|
+
ejs.escapeXML = utils_js_1.default.escapeXML;
|
|
445370
|
+
ejs.__express = ejs.renderFile;
|
|
445424
445371
|
if (typeof window != "undefined") {
|
|
445425
|
-
window.ejs =
|
|
445372
|
+
window.ejs = ejs;
|
|
445426
445373
|
}
|
|
445374
|
+
if (typeof module2 != "undefined") {
|
|
445375
|
+
module2.exports = ejs;
|
|
445376
|
+
}
|
|
445377
|
+
exports2.default = ejs;
|
|
445427
445378
|
}
|
|
445428
445379
|
});
|
|
445429
445380
|
|
|
@@ -445434,8 +445385,9 @@ var require_generate_files = __commonJS({
|
|
|
445434
445385
|
Object.defineProperty(exports2, "__esModule", { value: true });
|
|
445435
445386
|
exports2.OverwriteStrategy = void 0;
|
|
445436
445387
|
exports2.generateFiles = generateFiles;
|
|
445388
|
+
var tslib_1 = (init_tslib_es6(), __toCommonJS(tslib_es6_exports));
|
|
445437
445389
|
var fs_1 = require("fs");
|
|
445438
|
-
var path = require("path");
|
|
445390
|
+
var path = tslib_1.__importStar(require("path"));
|
|
445439
445391
|
var binary_extensions_1 = require_binary_extensions();
|
|
445440
445392
|
var devkit_exports_1 = require("nx/src/devkit-exports");
|
|
445441
445393
|
var OverwriteStrategy;
|
|
@@ -445707,6 +445659,18 @@ var require_semver = __commonJS({
|
|
|
445707
445659
|
var { safeRe: re, t } = require_re();
|
|
445708
445660
|
var parseOptions = require_parse_options();
|
|
445709
445661
|
var { compareIdentifiers } = require_identifiers();
|
|
445662
|
+
var isPrereleaseIdentifier = (prerelease, identifier) => {
|
|
445663
|
+
const identifiers = identifier.split(".");
|
|
445664
|
+
if (identifiers.length > prerelease.length) {
|
|
445665
|
+
return false;
|
|
445666
|
+
}
|
|
445667
|
+
for (let i = 0; i < identifiers.length; i++) {
|
|
445668
|
+
if (compareIdentifiers(prerelease[i], identifiers[i]) !== 0) {
|
|
445669
|
+
return false;
|
|
445670
|
+
}
|
|
445671
|
+
}
|
|
445672
|
+
return true;
|
|
445673
|
+
};
|
|
445710
445674
|
var SemVer = class _SemVer {
|
|
445711
445675
|
constructor(version, options) {
|
|
445712
445676
|
options = parseOptions(options);
|
|
@@ -445953,8 +445917,9 @@ var require_semver = __commonJS({
|
|
|
445953
445917
|
if (identifierBase === false) {
|
|
445954
445918
|
prerelease = [identifier];
|
|
445955
445919
|
}
|
|
445956
|
-
if (
|
|
445957
|
-
|
|
445920
|
+
if (isPrereleaseIdentifier(this.prerelease, identifier)) {
|
|
445921
|
+
const prereleaseBase = this.prerelease[identifier.split(".").length];
|
|
445922
|
+
if (isNaN(prereleaseBase)) {
|
|
445958
445923
|
this.prerelease = prerelease;
|
|
445959
445924
|
}
|
|
445960
445925
|
} else {
|
|
@@ -446356,6 +446321,47 @@ var require_coerce = __commonJS({
|
|
|
446356
446321
|
}
|
|
446357
446322
|
});
|
|
446358
446323
|
|
|
446324
|
+
// node_modules/@nx/devkit/node_modules/semver/functions/truncate.js
|
|
446325
|
+
var require_truncate = __commonJS({
|
|
446326
|
+
"node_modules/@nx/devkit/node_modules/semver/functions/truncate.js"(exports2, module2) {
|
|
446327
|
+
"use strict";
|
|
446328
|
+
var parse2 = require_parse();
|
|
446329
|
+
var constants = require_constants();
|
|
446330
|
+
var SemVer = require_semver();
|
|
446331
|
+
var truncate = (version, truncation, options) => {
|
|
446332
|
+
if (!constants.RELEASE_TYPES.includes(truncation)) {
|
|
446333
|
+
return null;
|
|
446334
|
+
}
|
|
446335
|
+
const clonedVersion = cloneInputVersion(version, options);
|
|
446336
|
+
return clonedVersion && doTruncation(clonedVersion, truncation);
|
|
446337
|
+
};
|
|
446338
|
+
var cloneInputVersion = (version, options) => {
|
|
446339
|
+
const versionStringToParse = version instanceof SemVer ? version.version : version;
|
|
446340
|
+
return parse2(versionStringToParse, options);
|
|
446341
|
+
};
|
|
446342
|
+
var doTruncation = (version, truncation) => {
|
|
446343
|
+
if (isPrerelease(truncation)) {
|
|
446344
|
+
return version.version;
|
|
446345
|
+
}
|
|
446346
|
+
version.prerelease = [];
|
|
446347
|
+
switch (truncation) {
|
|
446348
|
+
case "major":
|
|
446349
|
+
version.minor = 0;
|
|
446350
|
+
version.patch = 0;
|
|
446351
|
+
break;
|
|
446352
|
+
case "minor":
|
|
446353
|
+
version.patch = 0;
|
|
446354
|
+
break;
|
|
446355
|
+
}
|
|
446356
|
+
return version.format();
|
|
446357
|
+
};
|
|
446358
|
+
var isPrerelease = (type) => {
|
|
446359
|
+
return type.startsWith("pre");
|
|
446360
|
+
};
|
|
446361
|
+
module2.exports = truncate;
|
|
446362
|
+
}
|
|
446363
|
+
});
|
|
446364
|
+
|
|
446359
446365
|
// node_modules/@nx/devkit/node_modules/semver/internal/lrucache.js
|
|
446360
446366
|
var require_lrucache = __commonJS({
|
|
446361
446367
|
"node_modules/@nx/devkit/node_modules/semver/internal/lrucache.js"(exports2, module2) {
|
|
@@ -446464,6 +446470,7 @@ var require_range2 = __commonJS({
|
|
|
446464
446470
|
return this.range;
|
|
446465
446471
|
}
|
|
446466
446472
|
parseRange(range) {
|
|
446473
|
+
range = range.replace(BUILDSTRIPRE, "");
|
|
446467
446474
|
const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
|
|
446468
446475
|
const memoKey = memoOpts + ":" + range;
|
|
446469
446476
|
const cached = cache.get(memoKey);
|
|
@@ -446546,12 +446553,14 @@ var require_range2 = __commonJS({
|
|
|
446546
446553
|
var SemVer = require_semver();
|
|
446547
446554
|
var {
|
|
446548
446555
|
safeRe: re,
|
|
446556
|
+
src,
|
|
446549
446557
|
t,
|
|
446550
446558
|
comparatorTrimReplace,
|
|
446551
446559
|
tildeTrimReplace,
|
|
446552
446560
|
caretTrimReplace
|
|
446553
446561
|
} = require_re();
|
|
446554
446562
|
var { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = require_constants();
|
|
446563
|
+
var BUILDSTRIPRE = new RegExp(src[t.BUILD], "g");
|
|
446555
446564
|
var isNullSet = (c) => c.value === "<0.0.0-0";
|
|
446556
446565
|
var isAny = (c) => c.value === "";
|
|
446557
446566
|
var isSatisfiable = (comparators, options) => {
|
|
@@ -446580,20 +446589,22 @@ var require_range2 = __commonJS({
|
|
|
446580
446589
|
return comp;
|
|
446581
446590
|
};
|
|
446582
446591
|
var isX = (id) => !id || id.toLowerCase() === "x" || id === "*";
|
|
446592
|
+
var invalidXRangeOrder = (M, m, p) => isX(M) && !isX(m) || isX(m) && p && !isX(p);
|
|
446583
446593
|
var replaceTildes = (comp, options) => {
|
|
446584
446594
|
return comp.trim().split(/\s+/).map((c) => replaceTilde(c, options)).join(" ");
|
|
446585
446595
|
};
|
|
446586
446596
|
var replaceTilde = (comp, options) => {
|
|
446587
446597
|
const r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE];
|
|
446598
|
+
const z = options.includePrerelease ? "-0" : "";
|
|
446588
446599
|
return comp.replace(r, (_, M, m, p, pr) => {
|
|
446589
446600
|
debug("tilde", comp, _, M, m, p, pr);
|
|
446590
446601
|
let ret;
|
|
446591
446602
|
if (isX(M)) {
|
|
446592
446603
|
ret = "";
|
|
446593
446604
|
} else if (isX(m)) {
|
|
446594
|
-
ret = `>=${M}.0.0 <${+M + 1}.0.0-0`;
|
|
446605
|
+
ret = `>=${M}.0.0${z} <${+M + 1}.0.0-0`;
|
|
446595
446606
|
} else if (isX(p)) {
|
|
446596
|
-
ret = `>=${M}.${m}.0 <${M}.${+m + 1}.0-0`;
|
|
446607
|
+
ret = `>=${M}.${m}.0${z} <${M}.${+m + 1}.0-0`;
|
|
446597
446608
|
} else if (pr) {
|
|
446598
446609
|
debug("replaceTilde pr", pr);
|
|
446599
446610
|
ret = `>=${M}.${m}.${p}-${pr} <${M}.${+m + 1}.0-0`;
|
|
@@ -446639,9 +446650,9 @@ var require_range2 = __commonJS({
|
|
|
446639
446650
|
debug("no pr");
|
|
446640
446651
|
if (M === "0") {
|
|
446641
446652
|
if (m === "0") {
|
|
446642
|
-
ret = `>=${M}.${m}.${p}
|
|
446653
|
+
ret = `>=${M}.${m}.${p} <${M}.${m}.${+p + 1}-0`;
|
|
446643
446654
|
} else {
|
|
446644
|
-
ret = `>=${M}.${m}.${p}
|
|
446655
|
+
ret = `>=${M}.${m}.${p} <${M}.${+m + 1}.0-0`;
|
|
446645
446656
|
}
|
|
446646
446657
|
} else {
|
|
446647
446658
|
ret = `>=${M}.${m}.${p} <${+M + 1}.0.0-0`;
|
|
@@ -446660,6 +446671,9 @@ var require_range2 = __commonJS({
|
|
|
446660
446671
|
const r = options.loose ? re[t.XRANGELOOSE] : re[t.XRANGE];
|
|
446661
446672
|
return comp.replace(r, (ret, gtlt, M, m, p, pr) => {
|
|
446662
446673
|
debug("xRange", comp, ret, gtlt, M, m, p, pr);
|
|
446674
|
+
if (invalidXRangeOrder(M, m, p)) {
|
|
446675
|
+
return comp;
|
|
446676
|
+
}
|
|
446663
446677
|
const xM = isX(M);
|
|
446664
446678
|
const xm = xM || isX(m);
|
|
446665
446679
|
const xp = xm || isX(p);
|
|
@@ -447307,7 +447321,7 @@ var require_subset = __commonJS({
|
|
|
447307
447321
|
if (higher === c && higher !== gt) {
|
|
447308
447322
|
return false;
|
|
447309
447323
|
}
|
|
447310
|
-
} else if (gt.operator === ">=" && !
|
|
447324
|
+
} else if (gt.operator === ">=" && !c.test(gt.semver)) {
|
|
447311
447325
|
return false;
|
|
447312
447326
|
}
|
|
447313
447327
|
}
|
|
@@ -447322,7 +447336,7 @@ var require_subset = __commonJS({
|
|
|
447322
447336
|
if (lower === c && lower !== lt) {
|
|
447323
447337
|
return false;
|
|
447324
447338
|
}
|
|
447325
|
-
} else if (lt.operator === "<=" && !
|
|
447339
|
+
} else if (lt.operator === "<=" && !c.test(lt.semver)) {
|
|
447326
447340
|
return false;
|
|
447327
447341
|
}
|
|
447328
447342
|
}
|
|
@@ -447390,6 +447404,7 @@ var require_semver2 = __commonJS({
|
|
|
447390
447404
|
var lte = require_lte();
|
|
447391
447405
|
var cmp = require_cmp();
|
|
447392
447406
|
var coerce = require_coerce();
|
|
447407
|
+
var truncate = require_truncate();
|
|
447393
447408
|
var Comparator = require_comparator();
|
|
447394
447409
|
var Range = require_range2();
|
|
447395
447410
|
var satisfies = require_satisfies();
|
|
@@ -447428,6 +447443,7 @@ var require_semver2 = __commonJS({
|
|
|
447428
447443
|
lte,
|
|
447429
447444
|
cmp,
|
|
447430
447445
|
coerce,
|
|
447446
|
+
truncate,
|
|
447431
447447
|
Comparator,
|
|
447432
447448
|
Range,
|
|
447433
447449
|
satisfies,
|
|
@@ -447463,19 +447479,23 @@ var require_install_packages_task = __commonJS({
|
|
|
447463
447479
|
var child_process_1 = require("child_process");
|
|
447464
447480
|
var path_1 = require("path");
|
|
447465
447481
|
var devkit_exports_1 = require("nx/src/devkit-exports");
|
|
447466
|
-
function installPackagesTask(tree,
|
|
447467
|
-
|
|
447482
|
+
function installPackagesTask(tree, ensureInstall = false, cwd = "", packageManager = (0, devkit_exports_1.detectPackageManager)((0, path_1.join)(tree.root, cwd))) {
|
|
447483
|
+
const packageJsonPath = (0, devkit_exports_1.joinPathFragments)(cwd, "package.json");
|
|
447484
|
+
const packageJsonChanged = tree.listChanges().some((f) => f.path === packageJsonPath);
|
|
447485
|
+
if (!packageJsonChanged && !ensureInstall) {
|
|
447468
447486
|
return;
|
|
447469
447487
|
}
|
|
447470
|
-
const packageJsonValue = tree.read(
|
|
447471
|
-
|
|
447472
|
-
|
|
447488
|
+
const packageJsonValue = tree.read(packageJsonPath, "utf-8");
|
|
447489
|
+
const storedPackageJsonValue = global["__packageJsonInstallCache__"];
|
|
447490
|
+
const installAlreadyRan = storedPackageJsonValue != null;
|
|
447491
|
+
const packageJsonDiffers = storedPackageJsonValue != packageJsonValue;
|
|
447492
|
+
if (packageJsonDiffers || ensureInstall && !installAlreadyRan) {
|
|
447473
447493
|
global["__packageJsonInstallCache__"] = packageJsonValue;
|
|
447474
447494
|
const pmc = (0, devkit_exports_1.getPackageManagerCommand)(packageManager);
|
|
447475
447495
|
const execSyncOptions = {
|
|
447476
447496
|
cwd: (0, path_1.join)(tree.root, cwd),
|
|
447477
447497
|
stdio: process.env.NX_GENERATE_QUIET === "true" ? "ignore" : "inherit",
|
|
447478
|
-
windowsHide:
|
|
447498
|
+
windowsHide: true
|
|
447479
447499
|
};
|
|
447480
447500
|
if (process.env.npm_config_registry && process.env.npm_config_registry.match(/^https:\/\/registry\.(npmjs\.org|yarnpkg\.com)/)) {
|
|
447481
447501
|
delete process.env.npm_config_registry;
|
|
@@ -450274,6 +450294,26 @@ var require_js_yaml = __commonJS({
|
|
|
450274
450294
|
}
|
|
450275
450295
|
});
|
|
450276
450296
|
|
|
450297
|
+
// node_modules/@nx/devkit/src/utils/catalog/manager.js
|
|
450298
|
+
var require_manager = __commonJS({
|
|
450299
|
+
"node_modules/@nx/devkit/src/utils/catalog/manager.js"(exports2) {
|
|
450300
|
+
"use strict";
|
|
450301
|
+
Object.defineProperty(exports2, "__esModule", { value: true });
|
|
450302
|
+
exports2.formatCatalogError = formatCatalogError;
|
|
450303
|
+
function formatCatalogError(error2, suggestions) {
|
|
450304
|
+
let message = error2;
|
|
450305
|
+
if (suggestions.length > 0) {
|
|
450306
|
+
message += "\n\nSuggestions:";
|
|
450307
|
+
suggestions.forEach((suggestion) => {
|
|
450308
|
+
message += `
|
|
450309
|
+
\u2022 ${suggestion}`;
|
|
450310
|
+
});
|
|
450311
|
+
}
|
|
450312
|
+
return message;
|
|
450313
|
+
}
|
|
450314
|
+
}
|
|
450315
|
+
});
|
|
450316
|
+
|
|
450277
450317
|
// node_modules/@nx/devkit/src/utils/catalog/pnpm-manager.js
|
|
450278
450318
|
var require_pnpm_manager = __commonJS({
|
|
450279
450319
|
"node_modules/@nx/devkit/src/utils/catalog/pnpm-manager.js"(exports2) {
|
|
@@ -450285,6 +450325,8 @@ var require_pnpm_manager = __commonJS({
|
|
|
450285
450325
|
var node_path_1 = require("node:path");
|
|
450286
450326
|
var devkit_exports_1 = require("nx/src/devkit-exports");
|
|
450287
450327
|
var devkit_internals_1 = require("nx/src/devkit-internals");
|
|
450328
|
+
var manager_1 = require_manager();
|
|
450329
|
+
var PNPM_WORKSPACE_FILENAME = "pnpm-workspace.yaml";
|
|
450288
450330
|
var PnpmCatalogManager = class {
|
|
450289
450331
|
constructor() {
|
|
450290
450332
|
this.name = "pnpm";
|
|
@@ -450304,18 +450346,21 @@ var require_pnpm_manager = __commonJS({
|
|
|
450304
450346
|
isDefaultCatalog: isDefault
|
|
450305
450347
|
};
|
|
450306
450348
|
}
|
|
450349
|
+
getCatalogDefinitionFilePaths() {
|
|
450350
|
+
return [PNPM_WORKSPACE_FILENAME];
|
|
450351
|
+
}
|
|
450307
450352
|
getCatalogDefinitions(treeOrRoot) {
|
|
450308
450353
|
if (typeof treeOrRoot === "string") {
|
|
450309
|
-
const
|
|
450310
|
-
if (!(0, node_fs_1.existsSync)(
|
|
450354
|
+
const configPath = (0, node_path_1.join)(treeOrRoot, PNPM_WORKSPACE_FILENAME);
|
|
450355
|
+
if (!(0, node_fs_1.existsSync)(configPath)) {
|
|
450311
450356
|
return null;
|
|
450312
450357
|
}
|
|
450313
|
-
return
|
|
450358
|
+
return readConfigFromFs(configPath);
|
|
450314
450359
|
} else {
|
|
450315
|
-
if (!treeOrRoot.exists(
|
|
450360
|
+
if (!treeOrRoot.exists(PNPM_WORKSPACE_FILENAME)) {
|
|
450316
450361
|
return null;
|
|
450317
450362
|
}
|
|
450318
|
-
return
|
|
450363
|
+
return readConfigFromTree(treeOrRoot, PNPM_WORKSPACE_FILENAME);
|
|
450319
450364
|
}
|
|
450320
450365
|
}
|
|
450321
450366
|
resolveCatalogReference(treeOrRoot, packageName, version) {
|
|
@@ -450323,15 +450368,15 @@ var require_pnpm_manager = __commonJS({
|
|
|
450323
450368
|
if (!catalogRef) {
|
|
450324
450369
|
return null;
|
|
450325
450370
|
}
|
|
450326
|
-
const
|
|
450327
|
-
if (!
|
|
450371
|
+
const catalogDefs = this.getCatalogDefinitions(treeOrRoot);
|
|
450372
|
+
if (!catalogDefs) {
|
|
450328
450373
|
return null;
|
|
450329
450374
|
}
|
|
450330
450375
|
let catalogToUse;
|
|
450331
450376
|
if (catalogRef.isDefaultCatalog) {
|
|
450332
|
-
catalogToUse =
|
|
450377
|
+
catalogToUse = catalogDefs.catalog ?? catalogDefs.catalogs?.default;
|
|
450333
450378
|
} else if (catalogRef.catalogName) {
|
|
450334
|
-
catalogToUse =
|
|
450379
|
+
catalogToUse = catalogDefs.catalogs?.[catalogRef.catalogName];
|
|
450335
450380
|
}
|
|
450336
450381
|
return catalogToUse?.[packageName] || null;
|
|
450337
450382
|
}
|
|
@@ -450340,35 +450385,35 @@ var require_pnpm_manager = __commonJS({
|
|
|
450340
450385
|
if (!catalogRef) {
|
|
450341
450386
|
throw new Error(`Invalid catalog reference syntax: "${version}". Expected format: "catalog:" or "catalog:name"`);
|
|
450342
450387
|
}
|
|
450343
|
-
const
|
|
450344
|
-
if (!
|
|
450345
|
-
throw new Error(formatCatalogError(
|
|
450388
|
+
const catalogDefs = this.getCatalogDefinitions(treeOrRoot);
|
|
450389
|
+
if (!catalogDefs) {
|
|
450390
|
+
throw new Error((0, manager_1.formatCatalogError)(`Cannot get Pnpm catalog definitions. No ${PNPM_WORKSPACE_FILENAME} found in workspace root.`, [`Create a ${PNPM_WORKSPACE_FILENAME} file in your workspace root`]));
|
|
450346
450391
|
}
|
|
450347
450392
|
let catalogToUse;
|
|
450348
450393
|
if (catalogRef.isDefaultCatalog) {
|
|
450349
|
-
const hasCatalog = !!
|
|
450350
|
-
const hasCatalogsDefault = !!
|
|
450394
|
+
const hasCatalog = !!catalogDefs.catalog;
|
|
450395
|
+
const hasCatalogsDefault = !!catalogDefs.catalogs?.default;
|
|
450351
450396
|
if (hasCatalog && hasCatalogsDefault) {
|
|
450352
450397
|
throw new Error("The 'default' catalog was defined multiple times. Use the 'catalog' field or 'catalogs.default', but not both.");
|
|
450353
450398
|
}
|
|
450354
|
-
catalogToUse =
|
|
450399
|
+
catalogToUse = catalogDefs.catalog ?? catalogDefs.catalogs?.default;
|
|
450355
450400
|
if (!catalogToUse) {
|
|
450356
|
-
const availableCatalogs = Object.keys(
|
|
450401
|
+
const availableCatalogs = Object.keys(catalogDefs.catalogs || {});
|
|
450357
450402
|
const suggestions = [
|
|
450358
|
-
|
|
450403
|
+
`Define a default catalog in ${PNPM_WORKSPACE_FILENAME} under the "catalog" key`
|
|
450359
450404
|
];
|
|
450360
450405
|
if (availableCatalogs.length > 0) {
|
|
450361
450406
|
suggestions.push(`Or select from the available named catalogs: ${availableCatalogs.map((c) => `"catalog:${c}"`).join(", ")}`);
|
|
450362
450407
|
}
|
|
450363
|
-
throw new Error(formatCatalogError(
|
|
450408
|
+
throw new Error((0, manager_1.formatCatalogError)(`No default catalog defined in ${PNPM_WORKSPACE_FILENAME}`, suggestions));
|
|
450364
450409
|
}
|
|
450365
450410
|
} else if (catalogRef.catalogName) {
|
|
450366
|
-
catalogToUse =
|
|
450411
|
+
catalogToUse = catalogDefs.catalogs?.[catalogRef.catalogName];
|
|
450367
450412
|
if (!catalogToUse) {
|
|
450368
|
-
const availableCatalogs = Object.keys(
|
|
450369
|
-
const defaultCatalog = !!
|
|
450413
|
+
const availableCatalogs = Object.keys(catalogDefs.catalogs || {}).filter((c) => c !== "default");
|
|
450414
|
+
const defaultCatalog = !!catalogDefs.catalog ? "catalog" : !catalogDefs.catalogs?.default ? "catalogs.default" : null;
|
|
450370
450415
|
const suggestions = [
|
|
450371
|
-
|
|
450416
|
+
`Define the catalog in ${PNPM_WORKSPACE_FILENAME} under the "catalogs" key`
|
|
450372
450417
|
];
|
|
450373
450418
|
if (availableCatalogs.length > 0) {
|
|
450374
450419
|
suggestions.push(`Or select from the available named catalogs: ${availableCatalogs.map((c) => `"catalog:${c}"`).join(", ")}`);
|
|
@@ -450376,25 +450421,25 @@ var require_pnpm_manager = __commonJS({
|
|
|
450376
450421
|
if (defaultCatalog) {
|
|
450377
450422
|
suggestions.push(`Or use the default catalog ("${defaultCatalog}")`);
|
|
450378
450423
|
}
|
|
450379
|
-
throw new Error(formatCatalogError(`Catalog "${catalogRef.catalogName}" not found in
|
|
450424
|
+
throw new Error((0, manager_1.formatCatalogError)(`Catalog "${catalogRef.catalogName}" not found in ${PNPM_WORKSPACE_FILENAME}`, suggestions));
|
|
450380
450425
|
}
|
|
450381
450426
|
}
|
|
450382
450427
|
if (!catalogToUse[packageName]) {
|
|
450383
450428
|
let catalogName;
|
|
450384
450429
|
if (catalogRef.isDefaultCatalog) {
|
|
450385
|
-
const hasCatalog = !!
|
|
450430
|
+
const hasCatalog = !!catalogDefs.catalog;
|
|
450386
450431
|
catalogName = hasCatalog ? 'default catalog ("catalog")' : 'default catalog ("catalogs.default")';
|
|
450387
450432
|
} else {
|
|
450388
450433
|
catalogName = `catalog '${catalogRef.catalogName}'`;
|
|
450389
450434
|
}
|
|
450390
450435
|
const availablePackages = Object.keys(catalogToUse);
|
|
450391
450436
|
const suggestions = [
|
|
450392
|
-
`Add "${packageName}" to ${catalogName} in
|
|
450437
|
+
`Add "${packageName}" to ${catalogName} in ${PNPM_WORKSPACE_FILENAME}`
|
|
450393
450438
|
];
|
|
450394
450439
|
if (availablePackages.length > 0) {
|
|
450395
450440
|
suggestions.push(`Or select from the available packages in ${catalogName}: ${availablePackages.map((p) => `"${p}"`).join(", ")}`);
|
|
450396
450441
|
}
|
|
450397
|
-
throw new Error(formatCatalogError(`Package "${packageName}" not found in ${catalogName}`, suggestions));
|
|
450442
|
+
throw new Error((0, manager_1.formatCatalogError)(`Package "${packageName}" not found in ${catalogName}`, suggestions));
|
|
450398
450443
|
}
|
|
450399
450444
|
}
|
|
450400
450445
|
updateCatalogVersions(treeOrRoot, updates) {
|
|
@@ -450402,46 +450447,46 @@ var require_pnpm_manager = __commonJS({
|
|
|
450402
450447
|
let readYaml;
|
|
450403
450448
|
let writeYaml;
|
|
450404
450449
|
if (typeof treeOrRoot === "string") {
|
|
450405
|
-
const
|
|
450406
|
-
checkExists = () => (0, node_fs_1.existsSync)(
|
|
450407
|
-
readYaml = () => (0, node_fs_1.readFileSync)(
|
|
450408
|
-
writeYaml = (content) => (0, node_fs_1.writeFileSync)(
|
|
450450
|
+
const configPath = (0, node_path_1.join)(treeOrRoot, PNPM_WORKSPACE_FILENAME);
|
|
450451
|
+
checkExists = () => (0, node_fs_1.existsSync)(configPath);
|
|
450452
|
+
readYaml = () => (0, node_fs_1.readFileSync)(configPath, "utf-8");
|
|
450453
|
+
writeYaml = (content) => (0, node_fs_1.writeFileSync)(configPath, content, "utf-8");
|
|
450409
450454
|
} else {
|
|
450410
|
-
checkExists = () => treeOrRoot.exists(
|
|
450411
|
-
readYaml = () => treeOrRoot.read(
|
|
450412
|
-
writeYaml = (content) => treeOrRoot.write(
|
|
450455
|
+
checkExists = () => treeOrRoot.exists(PNPM_WORKSPACE_FILENAME);
|
|
450456
|
+
readYaml = () => treeOrRoot.read(PNPM_WORKSPACE_FILENAME, "utf-8");
|
|
450457
|
+
writeYaml = (content) => treeOrRoot.write(PNPM_WORKSPACE_FILENAME, content);
|
|
450413
450458
|
}
|
|
450414
450459
|
if (!checkExists()) {
|
|
450415
450460
|
devkit_exports_1.output.warn({
|
|
450416
|
-
title:
|
|
450461
|
+
title: `No ${PNPM_WORKSPACE_FILENAME} found`,
|
|
450417
450462
|
bodyLines: [
|
|
450418
|
-
|
|
450419
|
-
|
|
450463
|
+
`Cannot update catalog versions without a ${PNPM_WORKSPACE_FILENAME} file.`,
|
|
450464
|
+
`Create a ${PNPM_WORKSPACE_FILENAME} file to use catalogs.`
|
|
450420
450465
|
]
|
|
450421
450466
|
});
|
|
450422
450467
|
return;
|
|
450423
450468
|
}
|
|
450424
450469
|
try {
|
|
450425
|
-
const
|
|
450426
|
-
const
|
|
450470
|
+
const configContent = readYaml();
|
|
450471
|
+
const configData = (0, js_yaml_1.load)(configContent) || {};
|
|
450427
450472
|
let hasChanges = false;
|
|
450428
450473
|
for (const update of updates) {
|
|
450429
450474
|
const { packageName, version, catalogName } = update;
|
|
450430
450475
|
const normalizedCatalogName = catalogName === "default" ? void 0 : catalogName;
|
|
450431
450476
|
let targetCatalog;
|
|
450432
450477
|
if (!normalizedCatalogName) {
|
|
450433
|
-
if (
|
|
450434
|
-
targetCatalog =
|
|
450435
|
-
} else if (
|
|
450436
|
-
targetCatalog =
|
|
450478
|
+
if (configData.catalog) {
|
|
450479
|
+
targetCatalog = configData.catalog;
|
|
450480
|
+
} else if (configData.catalogs?.default) {
|
|
450481
|
+
targetCatalog = configData.catalogs.default;
|
|
450437
450482
|
} else {
|
|
450438
|
-
|
|
450439
|
-
targetCatalog =
|
|
450483
|
+
configData.catalog ??= {};
|
|
450484
|
+
targetCatalog = configData.catalog;
|
|
450440
450485
|
}
|
|
450441
450486
|
} else {
|
|
450442
|
-
|
|
450443
|
-
|
|
450444
|
-
targetCatalog =
|
|
450487
|
+
configData.catalogs ??= {};
|
|
450488
|
+
configData.catalogs[normalizedCatalogName] ??= {};
|
|
450489
|
+
targetCatalog = configData.catalogs[normalizedCatalogName];
|
|
450445
450490
|
}
|
|
450446
450491
|
if (targetCatalog[packageName] !== version) {
|
|
450447
450492
|
targetCatalog[packageName] = version;
|
|
@@ -450449,7 +450494,7 @@ var require_pnpm_manager = __commonJS({
|
|
|
450449
450494
|
}
|
|
450450
450495
|
}
|
|
450451
450496
|
if (hasChanges) {
|
|
450452
|
-
writeYaml((0, js_yaml_1.dump)(
|
|
450497
|
+
writeYaml((0, js_yaml_1.dump)(configData, {
|
|
450453
450498
|
indent: 2,
|
|
450454
450499
|
quotingType: '"',
|
|
450455
450500
|
forceQuotes: true
|
|
@@ -450465,40 +450510,250 @@ var require_pnpm_manager = __commonJS({
|
|
|
450465
450510
|
}
|
|
450466
450511
|
};
|
|
450467
450512
|
exports2.PnpmCatalogManager = PnpmCatalogManager;
|
|
450468
|
-
function
|
|
450513
|
+
function readConfigFromFs(path) {
|
|
450469
450514
|
try {
|
|
450470
450515
|
return (0, devkit_internals_1.readYamlFile)(path);
|
|
450471
450516
|
} catch (error2) {
|
|
450472
450517
|
devkit_exports_1.output.warn({
|
|
450473
|
-
title:
|
|
450518
|
+
title: `Unable to parse ${PNPM_WORKSPACE_FILENAME}`,
|
|
450474
450519
|
bodyLines: [error2.toString()]
|
|
450475
450520
|
});
|
|
450476
450521
|
return null;
|
|
450477
450522
|
}
|
|
450478
450523
|
}
|
|
450479
|
-
function
|
|
450524
|
+
function readConfigFromTree(tree, path) {
|
|
450480
450525
|
const content = tree.read(path, "utf-8");
|
|
450481
|
-
const { load: load2 } = require_js_yaml();
|
|
450482
450526
|
try {
|
|
450483
|
-
return
|
|
450527
|
+
return (0, js_yaml_1.load)(content, { filename: path });
|
|
450484
450528
|
} catch (error2) {
|
|
450485
450529
|
devkit_exports_1.output.warn({
|
|
450486
|
-
title:
|
|
450530
|
+
title: `Unable to parse ${PNPM_WORKSPACE_FILENAME}`,
|
|
450487
450531
|
bodyLines: [error2.toString()]
|
|
450488
450532
|
});
|
|
450489
450533
|
return null;
|
|
450490
450534
|
}
|
|
450491
450535
|
}
|
|
450492
|
-
|
|
450493
|
-
|
|
450494
|
-
|
|
450495
|
-
|
|
450496
|
-
|
|
450497
|
-
|
|
450498
|
-
|
|
450536
|
+
}
|
|
450537
|
+
});
|
|
450538
|
+
|
|
450539
|
+
// node_modules/@nx/devkit/src/utils/catalog/yarn-manager.js
|
|
450540
|
+
var require_yarn_manager = __commonJS({
|
|
450541
|
+
"node_modules/@nx/devkit/src/utils/catalog/yarn-manager.js"(exports2) {
|
|
450542
|
+
"use strict";
|
|
450543
|
+
Object.defineProperty(exports2, "__esModule", { value: true });
|
|
450544
|
+
exports2.YarnCatalogManager = void 0;
|
|
450545
|
+
var js_yaml_1 = require_js_yaml();
|
|
450546
|
+
var node_fs_1 = require("node:fs");
|
|
450547
|
+
var node_path_1 = require("node:path");
|
|
450548
|
+
var devkit_exports_1 = require("nx/src/devkit-exports");
|
|
450549
|
+
var devkit_internals_1 = require("nx/src/devkit-internals");
|
|
450550
|
+
var manager_1 = require_manager();
|
|
450551
|
+
var YARNRC_FILENAME = ".yarnrc.yml";
|
|
450552
|
+
var YarnCatalogManager = class {
|
|
450553
|
+
constructor() {
|
|
450554
|
+
this.name = "yarn";
|
|
450555
|
+
this.catalogProtocol = "catalog:";
|
|
450556
|
+
}
|
|
450557
|
+
isCatalogReference(version) {
|
|
450558
|
+
return version.startsWith(this.catalogProtocol);
|
|
450559
|
+
}
|
|
450560
|
+
parseCatalogReference(version) {
|
|
450561
|
+
if (!this.isCatalogReference(version)) {
|
|
450562
|
+
return null;
|
|
450563
|
+
}
|
|
450564
|
+
const catalogName = version.substring(this.catalogProtocol.length);
|
|
450565
|
+
const isDefault = !catalogName || catalogName === "default";
|
|
450566
|
+
return {
|
|
450567
|
+
catalogName: isDefault ? void 0 : catalogName,
|
|
450568
|
+
isDefaultCatalog: isDefault
|
|
450569
|
+
};
|
|
450570
|
+
}
|
|
450571
|
+
getCatalogDefinitionFilePaths() {
|
|
450572
|
+
return [YARNRC_FILENAME];
|
|
450573
|
+
}
|
|
450574
|
+
getCatalogDefinitions(treeOrRoot) {
|
|
450575
|
+
if (typeof treeOrRoot === "string") {
|
|
450576
|
+
const configPath = (0, node_path_1.join)(treeOrRoot, YARNRC_FILENAME);
|
|
450577
|
+
if (!(0, node_fs_1.existsSync)(configPath)) {
|
|
450578
|
+
return null;
|
|
450579
|
+
}
|
|
450580
|
+
return readConfigFromFs(configPath);
|
|
450581
|
+
} else {
|
|
450582
|
+
if (!treeOrRoot.exists(YARNRC_FILENAME)) {
|
|
450583
|
+
return null;
|
|
450584
|
+
}
|
|
450585
|
+
return readConfigFromTree(treeOrRoot, YARNRC_FILENAME);
|
|
450586
|
+
}
|
|
450587
|
+
}
|
|
450588
|
+
resolveCatalogReference(treeOrRoot, packageName, version) {
|
|
450589
|
+
const catalogRef = this.parseCatalogReference(version);
|
|
450590
|
+
if (!catalogRef) {
|
|
450591
|
+
return null;
|
|
450592
|
+
}
|
|
450593
|
+
const catalogDefs = this.getCatalogDefinitions(treeOrRoot);
|
|
450594
|
+
if (!catalogDefs) {
|
|
450595
|
+
return null;
|
|
450596
|
+
}
|
|
450597
|
+
let catalogToUse;
|
|
450598
|
+
if (catalogRef.isDefaultCatalog) {
|
|
450599
|
+
catalogToUse = catalogDefs.catalog ?? catalogDefs.catalogs?.default;
|
|
450600
|
+
} else if (catalogRef.catalogName) {
|
|
450601
|
+
catalogToUse = catalogDefs.catalogs?.[catalogRef.catalogName];
|
|
450602
|
+
}
|
|
450603
|
+
return catalogToUse?.[packageName] || null;
|
|
450604
|
+
}
|
|
450605
|
+
validateCatalogReference(treeOrRoot, packageName, version) {
|
|
450606
|
+
const catalogRef = this.parseCatalogReference(version);
|
|
450607
|
+
if (!catalogRef) {
|
|
450608
|
+
throw new Error(`Invalid catalog reference syntax: "${version}". Expected format: "catalog:" or "catalog:name"`);
|
|
450609
|
+
}
|
|
450610
|
+
const catalogDefs = this.getCatalogDefinitions(treeOrRoot);
|
|
450611
|
+
if (!catalogDefs) {
|
|
450612
|
+
throw new Error((0, manager_1.formatCatalogError)(`Cannot get Yarn catalog definitions. No ${YARNRC_FILENAME} found in workspace root.`, [`Create a ${YARNRC_FILENAME} file in your workspace root`]));
|
|
450613
|
+
}
|
|
450614
|
+
let catalogToUse;
|
|
450615
|
+
if (catalogRef.isDefaultCatalog) {
|
|
450616
|
+
const hasCatalog = !!catalogDefs.catalog;
|
|
450617
|
+
const hasCatalogsDefault = !!catalogDefs.catalogs?.default;
|
|
450618
|
+
if (hasCatalog && hasCatalogsDefault) {
|
|
450619
|
+
throw new Error("The 'default' catalog was defined multiple times. Use the 'catalog' field or 'catalogs.default', but not both.");
|
|
450620
|
+
}
|
|
450621
|
+
catalogToUse = catalogDefs.catalog ?? catalogDefs.catalogs?.default;
|
|
450622
|
+
if (!catalogToUse) {
|
|
450623
|
+
const availableCatalogs = Object.keys(catalogDefs.catalogs || {});
|
|
450624
|
+
const suggestions = [
|
|
450625
|
+
`Define a default catalog in ${YARNRC_FILENAME} under the "catalog" key`
|
|
450626
|
+
];
|
|
450627
|
+
if (availableCatalogs.length > 0) {
|
|
450628
|
+
suggestions.push(`Or select from the available named catalogs: ${availableCatalogs.map((c) => `"catalog:${c}"`).join(", ")}`);
|
|
450629
|
+
}
|
|
450630
|
+
throw new Error((0, manager_1.formatCatalogError)(`No default catalog defined in ${YARNRC_FILENAME}`, suggestions));
|
|
450631
|
+
}
|
|
450632
|
+
} else if (catalogRef.catalogName) {
|
|
450633
|
+
catalogToUse = catalogDefs.catalogs?.[catalogRef.catalogName];
|
|
450634
|
+
if (!catalogToUse) {
|
|
450635
|
+
const availableCatalogs = Object.keys(catalogDefs.catalogs || {}).filter((c) => c !== "default");
|
|
450636
|
+
const defaultCatalog = !!catalogDefs.catalog ? "catalog" : !catalogDefs.catalogs?.default ? "catalogs.default" : null;
|
|
450637
|
+
const suggestions = [
|
|
450638
|
+
`Define the catalog in ${YARNRC_FILENAME} under the "catalogs" key`
|
|
450639
|
+
];
|
|
450640
|
+
if (availableCatalogs.length > 0) {
|
|
450641
|
+
suggestions.push(`Or select from the available named catalogs: ${availableCatalogs.map((c) => `"catalog:${c}"`).join(", ")}`);
|
|
450642
|
+
}
|
|
450643
|
+
if (defaultCatalog) {
|
|
450644
|
+
suggestions.push(`Or use the default catalog ("${defaultCatalog}")`);
|
|
450645
|
+
}
|
|
450646
|
+
throw new Error((0, manager_1.formatCatalogError)(`Catalog "${catalogRef.catalogName}" not found in ${YARNRC_FILENAME}`, suggestions));
|
|
450647
|
+
}
|
|
450648
|
+
}
|
|
450649
|
+
if (!catalogToUse[packageName]) {
|
|
450650
|
+
let catalogName;
|
|
450651
|
+
if (catalogRef.isDefaultCatalog) {
|
|
450652
|
+
const hasCatalog = !!catalogDefs.catalog;
|
|
450653
|
+
catalogName = hasCatalog ? 'default catalog ("catalog")' : 'default catalog ("catalogs.default")';
|
|
450654
|
+
} else {
|
|
450655
|
+
catalogName = `catalog '${catalogRef.catalogName}'`;
|
|
450656
|
+
}
|
|
450657
|
+
const availablePackages = Object.keys(catalogToUse);
|
|
450658
|
+
const suggestions = [
|
|
450659
|
+
`Add "${packageName}" to ${catalogName} in ${YARNRC_FILENAME}`
|
|
450660
|
+
];
|
|
450661
|
+
if (availablePackages.length > 0) {
|
|
450662
|
+
suggestions.push(`Or select from the available packages in ${catalogName}: ${availablePackages.map((p) => `"${p}"`).join(", ")}`);
|
|
450663
|
+
}
|
|
450664
|
+
throw new Error((0, manager_1.formatCatalogError)(`Package "${packageName}" not found in ${catalogName}`, suggestions));
|
|
450665
|
+
}
|
|
450666
|
+
}
|
|
450667
|
+
updateCatalogVersions(treeOrRoot, updates) {
|
|
450668
|
+
let checkExists;
|
|
450669
|
+
let readYaml;
|
|
450670
|
+
let writeYaml;
|
|
450671
|
+
if (typeof treeOrRoot === "string") {
|
|
450672
|
+
const configPath = (0, node_path_1.join)(treeOrRoot, YARNRC_FILENAME);
|
|
450673
|
+
checkExists = () => (0, node_fs_1.existsSync)(configPath);
|
|
450674
|
+
readYaml = () => (0, node_fs_1.readFileSync)(configPath, "utf-8");
|
|
450675
|
+
writeYaml = (content) => (0, node_fs_1.writeFileSync)(configPath, content, "utf-8");
|
|
450676
|
+
} else {
|
|
450677
|
+
checkExists = () => treeOrRoot.exists(YARNRC_FILENAME);
|
|
450678
|
+
readYaml = () => treeOrRoot.read(YARNRC_FILENAME, "utf-8");
|
|
450679
|
+
writeYaml = (content) => treeOrRoot.write(YARNRC_FILENAME, content);
|
|
450680
|
+
}
|
|
450681
|
+
if (!checkExists()) {
|
|
450682
|
+
devkit_exports_1.output.warn({
|
|
450683
|
+
title: `No ${YARNRC_FILENAME} found`,
|
|
450684
|
+
bodyLines: [
|
|
450685
|
+
`Cannot update catalog versions without a ${YARNRC_FILENAME} file.`,
|
|
450686
|
+
`Create a ${YARNRC_FILENAME} file to use catalogs.`
|
|
450687
|
+
]
|
|
450688
|
+
});
|
|
450689
|
+
return;
|
|
450690
|
+
}
|
|
450691
|
+
try {
|
|
450692
|
+
const configContent = readYaml();
|
|
450693
|
+
const configData = (0, js_yaml_1.load)(configContent) || {};
|
|
450694
|
+
let hasChanges = false;
|
|
450695
|
+
for (const update of updates) {
|
|
450696
|
+
const { packageName, version, catalogName } = update;
|
|
450697
|
+
const normalizedCatalogName = catalogName === "default" ? void 0 : catalogName;
|
|
450698
|
+
let targetCatalog;
|
|
450699
|
+
if (!normalizedCatalogName) {
|
|
450700
|
+
if (configData.catalog) {
|
|
450701
|
+
targetCatalog = configData.catalog;
|
|
450702
|
+
} else if (configData.catalogs?.default) {
|
|
450703
|
+
targetCatalog = configData.catalogs.default;
|
|
450704
|
+
} else {
|
|
450705
|
+
configData.catalog ??= {};
|
|
450706
|
+
targetCatalog = configData.catalog;
|
|
450707
|
+
}
|
|
450708
|
+
} else {
|
|
450709
|
+
configData.catalogs ??= {};
|
|
450710
|
+
configData.catalogs[normalizedCatalogName] ??= {};
|
|
450711
|
+
targetCatalog = configData.catalogs[normalizedCatalogName];
|
|
450712
|
+
}
|
|
450713
|
+
if (targetCatalog[packageName] !== version) {
|
|
450714
|
+
targetCatalog[packageName] = version;
|
|
450715
|
+
hasChanges = true;
|
|
450716
|
+
}
|
|
450717
|
+
}
|
|
450718
|
+
if (hasChanges) {
|
|
450719
|
+
writeYaml((0, js_yaml_1.dump)(configData, {
|
|
450720
|
+
indent: 2,
|
|
450721
|
+
quotingType: '"',
|
|
450722
|
+
forceQuotes: true
|
|
450723
|
+
}));
|
|
450724
|
+
}
|
|
450725
|
+
} catch (error2) {
|
|
450726
|
+
devkit_exports_1.output.error({
|
|
450727
|
+
title: "Failed to update catalog versions",
|
|
450728
|
+
bodyLines: [error2 instanceof Error ? error2.message : String(error2)]
|
|
450729
|
+
});
|
|
450730
|
+
throw error2;
|
|
450731
|
+
}
|
|
450732
|
+
}
|
|
450733
|
+
};
|
|
450734
|
+
exports2.YarnCatalogManager = YarnCatalogManager;
|
|
450735
|
+
function readConfigFromFs(path) {
|
|
450736
|
+
try {
|
|
450737
|
+
return (0, devkit_internals_1.readYamlFile)(path);
|
|
450738
|
+
} catch (error2) {
|
|
450739
|
+
devkit_exports_1.output.warn({
|
|
450740
|
+
title: `Unable to parse ${YARNRC_FILENAME}`,
|
|
450741
|
+
bodyLines: [error2.toString()]
|
|
450499
450742
|
});
|
|
450743
|
+
return null;
|
|
450744
|
+
}
|
|
450745
|
+
}
|
|
450746
|
+
function readConfigFromTree(tree, path) {
|
|
450747
|
+
const content = tree.read(path, "utf-8");
|
|
450748
|
+
try {
|
|
450749
|
+
return (0, js_yaml_1.load)(content, { filename: path });
|
|
450750
|
+
} catch (error2) {
|
|
450751
|
+
devkit_exports_1.output.warn({
|
|
450752
|
+
title: `Unable to parse ${YARNRC_FILENAME}`,
|
|
450753
|
+
bodyLines: [error2.toString()]
|
|
450754
|
+
});
|
|
450755
|
+
return null;
|
|
450500
450756
|
}
|
|
450501
|
-
return message;
|
|
450502
450757
|
}
|
|
450503
450758
|
}
|
|
450504
450759
|
});
|
|
@@ -450511,11 +450766,14 @@ var require_manager_factory = __commonJS({
|
|
|
450511
450766
|
exports2.getCatalogManager = getCatalogManager;
|
|
450512
450767
|
var devkit_exports_1 = require("nx/src/devkit-exports");
|
|
450513
450768
|
var pnpm_manager_1 = require_pnpm_manager();
|
|
450769
|
+
var yarn_manager_1 = require_yarn_manager();
|
|
450514
450770
|
function getCatalogManager(workspaceRoot) {
|
|
450515
450771
|
const packageManager = (0, devkit_exports_1.detectPackageManager)(workspaceRoot);
|
|
450516
450772
|
switch (packageManager) {
|
|
450517
450773
|
case "pnpm":
|
|
450518
450774
|
return new pnpm_manager_1.PnpmCatalogManager();
|
|
450775
|
+
case "yarn":
|
|
450776
|
+
return new yarn_manager_1.YarnCatalogManager();
|
|
450519
450777
|
default:
|
|
450520
450778
|
return null;
|
|
450521
450779
|
}
|
|
@@ -450933,7 +451191,7 @@ var require_package_json = __commonJS({
|
|
|
450933
451191
|
if (process.env.NX_DRY_RUN && process.env.NX_DRY_RUN !== "false") {
|
|
450934
451192
|
throw new Error('NOTE: This generator does not support --dry-run. If you are running this in Nx Console, it should execute fine once you hit the "Generate" button.\n');
|
|
450935
451193
|
}
|
|
450936
|
-
const { tempDir } = (0, devkit_internals_1.installPackageToTmp)(pkg, requiredVersion);
|
|
451194
|
+
const { tempDir } = (0, devkit_internals_1.installPackageToTmp)(pkg, requiredVersion, (0, devkit_exports_1.detectPackageManager)(devkit_exports_1.workspaceRoot));
|
|
450937
451195
|
addToNodePath((0, path_1.join)(devkit_exports_1.workspaceRoot, "node_modules"));
|
|
450938
451196
|
addToNodePath((0, path_1.join)(tempDir, "node_modules"));
|
|
450939
451197
|
module_1.Module._initPaths();
|
|
@@ -451113,7 +451371,8 @@ var require_parse_target_string = __commonJS({
|
|
|
451113
451371
|
if (!projectGraph.nodes[maybeProject] && projectGraphOrCtx && "projectName" in projectGraphOrCtx && maybeProject !== projectGraphOrCtx.projectName) {
|
|
451114
451372
|
targetString = `${projectGraphOrCtx.projectName}:${targetString}`;
|
|
451115
451373
|
}
|
|
451116
|
-
const
|
|
451374
|
+
const currentProject = projectGraphOrCtx && "projectName" in projectGraphOrCtx ? projectGraphOrCtx.projectName : void 0;
|
|
451375
|
+
const [project, target, configuration] = (0, devkit_internals_1.splitTarget)(targetString, projectGraph, { currentProject });
|
|
451117
451376
|
if (!project || !target) {
|
|
451118
451377
|
throw new Error(`Invalid Target String: ${targetString}`);
|
|
451119
451378
|
}
|
|
@@ -454066,7 +454325,7 @@ var init_yoctocolors = __esm({
|
|
|
454066
454325
|
}
|
|
454067
454326
|
});
|
|
454068
454327
|
|
|
454069
|
-
// node_modules/is-unicode-supported/index.js
|
|
454328
|
+
// node_modules/ora/node_modules/is-unicode-supported/index.js
|
|
454070
454329
|
function isUnicodeSupported() {
|
|
454071
454330
|
const { env: env2 } = import_node_process4.default;
|
|
454072
454331
|
const { TERM, TERM_PROGRAM } = env2;
|
|
@@ -454077,7 +454336,7 @@ function isUnicodeSupported() {
|
|
|
454077
454336
|
}
|
|
454078
454337
|
var import_node_process4;
|
|
454079
454338
|
var init_is_unicode_supported = __esm({
|
|
454080
|
-
"node_modules/is-unicode-supported/index.js"() {
|
|
454339
|
+
"node_modules/ora/node_modules/is-unicode-supported/index.js"() {
|
|
454081
454340
|
"use strict";
|
|
454082
454341
|
import_node_process4 = __toESM(require("node:process"), 1);
|
|
454083
454342
|
}
|
|
@@ -454113,7 +454372,7 @@ var init_log_symbols = __esm({
|
|
|
454113
454372
|
}
|
|
454114
454373
|
});
|
|
454115
454374
|
|
|
454116
|
-
// node_modules/ora/node_modules/strip-ansi/node_modules/ansi-regex/index.js
|
|
454375
|
+
// node_modules/ora/node_modules/string-width/node_modules/strip-ansi/node_modules/ansi-regex/index.js
|
|
454117
454376
|
function ansiRegex({ onlyFirst = false } = {}) {
|
|
454118
454377
|
const ST = "(?:\\u0007|\\u001B\\u005C|\\u009C)";
|
|
454119
454378
|
const osc = `(?:\\u001B\\][\\s\\S]*?${ST})`;
|
|
@@ -454122,12 +454381,12 @@ function ansiRegex({ onlyFirst = false } = {}) {
|
|
|
454122
454381
|
return new RegExp(pattern, onlyFirst ? void 0 : "g");
|
|
454123
454382
|
}
|
|
454124
454383
|
var init_ansi_regex = __esm({
|
|
454125
|
-
"node_modules/ora/node_modules/strip-ansi/node_modules/ansi-regex/index.js"() {
|
|
454384
|
+
"node_modules/ora/node_modules/string-width/node_modules/strip-ansi/node_modules/ansi-regex/index.js"() {
|
|
454126
454385
|
"use strict";
|
|
454127
454386
|
}
|
|
454128
454387
|
});
|
|
454129
454388
|
|
|
454130
|
-
// node_modules/ora/node_modules/strip-ansi/index.js
|
|
454389
|
+
// node_modules/ora/node_modules/string-width/node_modules/strip-ansi/index.js
|
|
454131
454390
|
function stripAnsi(string) {
|
|
454132
454391
|
if (typeof string !== "string") {
|
|
454133
454392
|
throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
|
|
@@ -454136,7 +454395,7 @@ function stripAnsi(string) {
|
|
|
454136
454395
|
}
|
|
454137
454396
|
var regex;
|
|
454138
454397
|
var init_strip_ansi = __esm({
|
|
454139
|
-
"node_modules/ora/node_modules/strip-ansi/index.js"() {
|
|
454398
|
+
"node_modules/ora/node_modules/string-width/node_modules/strip-ansi/index.js"() {
|
|
454140
454399
|
"use strict";
|
|
454141
454400
|
init_ansi_regex();
|
|
454142
454401
|
regex = ansiRegex();
|
|
@@ -454339,14 +454598,14 @@ var init_string_width = __esm({
|
|
|
454339
454598
|
}
|
|
454340
454599
|
});
|
|
454341
454600
|
|
|
454342
|
-
// node_modules/is-interactive/index.js
|
|
454601
|
+
// node_modules/ora/node_modules/is-interactive/index.js
|
|
454343
454602
|
function isInteractive({ stream = process.stdout } = {}) {
|
|
454344
454603
|
return Boolean(
|
|
454345
454604
|
stream && stream.isTTY && process.env.TERM !== "dumb" && !("CI" in process.env)
|
|
454346
454605
|
);
|
|
454347
454606
|
}
|
|
454348
454607
|
var init_is_interactive = __esm({
|
|
454349
|
-
"node_modules/is-interactive/index.js"() {
|
|
454608
|
+
"node_modules/ora/node_modules/is-interactive/index.js"() {
|
|
454350
454609
|
"use strict";
|
|
454351
454610
|
}
|
|
454352
454611
|
});
|
|
@@ -454360,6 +454619,18 @@ var init_stdin_discarder = __esm({
|
|
|
454360
454619
|
ASCII_ETX_CODE = 3;
|
|
454361
454620
|
StdinDiscarder = class {
|
|
454362
454621
|
#activeCount = 0;
|
|
454622
|
+
#stdin;
|
|
454623
|
+
#stdinWasPaused = false;
|
|
454624
|
+
#stdinWasRaw = false;
|
|
454625
|
+
#handleInputBound = (chunk) => {
|
|
454626
|
+
if (!chunk?.length) {
|
|
454627
|
+
return;
|
|
454628
|
+
}
|
|
454629
|
+
const code = typeof chunk === "string" ? chunk.codePointAt(0) : chunk[0];
|
|
454630
|
+
if (code === ASCII_ETX_CODE) {
|
|
454631
|
+
import_node_process5.default.kill(import_node_process5.default.pid, "SIGINT");
|
|
454632
|
+
}
|
|
454633
|
+
};
|
|
454363
454634
|
start() {
|
|
454364
454635
|
this.#activeCount++;
|
|
454365
454636
|
if (this.#activeCount === 1) {
|
|
@@ -454367,38 +454638,47 @@ var init_stdin_discarder = __esm({
|
|
|
454367
454638
|
}
|
|
454368
454639
|
}
|
|
454369
454640
|
stop() {
|
|
454370
|
-
if (this.#activeCount <= 0) {
|
|
454371
|
-
throw new Error("`stop` called more times than `start`");
|
|
454372
|
-
}
|
|
454373
|
-
this.#activeCount--;
|
|
454374
454641
|
if (this.#activeCount === 0) {
|
|
454642
|
+
return;
|
|
454643
|
+
}
|
|
454644
|
+
if (--this.#activeCount === 0) {
|
|
454375
454645
|
this.#realStop();
|
|
454376
454646
|
}
|
|
454377
454647
|
}
|
|
454378
454648
|
#realStart() {
|
|
454379
|
-
|
|
454649
|
+
const { stdin } = import_node_process5.default;
|
|
454650
|
+
if (import_node_process5.default.platform === "win32" || !stdin?.isTTY || typeof stdin.setRawMode !== "function") {
|
|
454651
|
+
this.#stdin = void 0;
|
|
454380
454652
|
return;
|
|
454381
454653
|
}
|
|
454382
|
-
|
|
454383
|
-
|
|
454384
|
-
|
|
454654
|
+
this.#stdin = stdin;
|
|
454655
|
+
this.#stdinWasPaused = stdin.isPaused();
|
|
454656
|
+
this.#stdinWasRaw = Boolean(stdin.isRaw);
|
|
454657
|
+
stdin.setRawMode(true);
|
|
454658
|
+
stdin.prependListener("data", this.#handleInputBound);
|
|
454659
|
+
if (this.#stdinWasPaused) {
|
|
454660
|
+
stdin.resume();
|
|
454661
|
+
}
|
|
454385
454662
|
}
|
|
454386
454663
|
#realStop() {
|
|
454387
|
-
if (!
|
|
454664
|
+
if (!this.#stdin) {
|
|
454388
454665
|
return;
|
|
454389
454666
|
}
|
|
454390
|
-
|
|
454391
|
-
|
|
454392
|
-
|
|
454393
|
-
|
|
454394
|
-
#handleInput(chunk) {
|
|
454395
|
-
if (chunk[0] === ASCII_ETX_CODE) {
|
|
454396
|
-
import_node_process5.default.emit("SIGINT");
|
|
454667
|
+
const stdin = this.#stdin;
|
|
454668
|
+
stdin.off("data", this.#handleInputBound);
|
|
454669
|
+
if (stdin.isTTY) {
|
|
454670
|
+
stdin.setRawMode?.(this.#stdinWasRaw);
|
|
454397
454671
|
}
|
|
454672
|
+
if (this.#stdinWasPaused) {
|
|
454673
|
+
stdin.pause();
|
|
454674
|
+
}
|
|
454675
|
+
this.#stdin = void 0;
|
|
454676
|
+
this.#stdinWasPaused = false;
|
|
454677
|
+
this.#stdinWasRaw = false;
|
|
454398
454678
|
}
|
|
454399
454679
|
};
|
|
454400
454680
|
stdinDiscarder = new StdinDiscarder();
|
|
454401
|
-
stdin_discarder_default = stdinDiscarder;
|
|
454681
|
+
stdin_discarder_default = Object.freeze(stdinDiscarder);
|
|
454402
454682
|
}
|
|
454403
454683
|
});
|
|
454404
454684
|
|
|
@@ -454430,40 +454710,102 @@ async function oraPromise(action, options) {
|
|
|
454430
454710
|
throw error2;
|
|
454431
454711
|
}
|
|
454432
454712
|
}
|
|
454433
|
-
var import_node_process6, Ora;
|
|
454713
|
+
var import_node_process6, import_node_util, RENDER_DEFERRAL_TIMEOUT, SYNCHRONIZED_OUTPUT_ENABLE, SYNCHRONIZED_OUTPUT_DISABLE, activeHooksPerStream, Ora;
|
|
454434
454714
|
var init_ora = __esm({
|
|
454435
454715
|
"node_modules/ora/index.js"() {
|
|
454436
454716
|
"use strict";
|
|
454437
454717
|
import_node_process6 = __toESM(require("node:process"), 1);
|
|
454718
|
+
import_node_util = require("node:util");
|
|
454438
454719
|
init_source();
|
|
454439
454720
|
init_cli_cursor();
|
|
454440
454721
|
init_cli_spinners();
|
|
454441
454722
|
init_log_symbols();
|
|
454442
|
-
init_strip_ansi();
|
|
454443
454723
|
init_string_width();
|
|
454444
454724
|
init_is_interactive();
|
|
454445
454725
|
init_is_unicode_supported();
|
|
454446
454726
|
init_stdin_discarder();
|
|
454447
454727
|
init_cli_spinners();
|
|
454728
|
+
RENDER_DEFERRAL_TIMEOUT = 200;
|
|
454729
|
+
SYNCHRONIZED_OUTPUT_ENABLE = "\x1B[?2026h";
|
|
454730
|
+
SYNCHRONIZED_OUTPUT_DISABLE = "\x1B[?2026l";
|
|
454731
|
+
activeHooksPerStream = /* @__PURE__ */ new Map();
|
|
454448
454732
|
Ora = class {
|
|
454449
454733
|
#linesToClear = 0;
|
|
454450
|
-
#isDiscardingStdin = false;
|
|
454451
|
-
#lineCount = 0;
|
|
454452
454734
|
#frameIndex = -1;
|
|
454453
|
-
#
|
|
454454
|
-
#lastIndent = 0;
|
|
454735
|
+
#lastFrameTime = 0;
|
|
454455
454736
|
#options;
|
|
454456
454737
|
#spinner;
|
|
454457
454738
|
#stream;
|
|
454458
454739
|
#id;
|
|
454459
|
-
#
|
|
454460
|
-
#
|
|
454461
|
-
#
|
|
454462
|
-
#
|
|
454463
|
-
#
|
|
454464
|
-
#prefixText;
|
|
454465
|
-
#suffixText;
|
|
454740
|
+
#hookedStreams = /* @__PURE__ */ new Map();
|
|
454741
|
+
#isInternalWrite = false;
|
|
454742
|
+
#drainHandler;
|
|
454743
|
+
#deferRenderTimer;
|
|
454744
|
+
#isDiscardingStdin = false;
|
|
454466
454745
|
color;
|
|
454746
|
+
// Helper to execute writes while preventing hook recursion
|
|
454747
|
+
#internalWrite(fn) {
|
|
454748
|
+
this.#isInternalWrite = true;
|
|
454749
|
+
try {
|
|
454750
|
+
return fn();
|
|
454751
|
+
} finally {
|
|
454752
|
+
this.#isInternalWrite = false;
|
|
454753
|
+
}
|
|
454754
|
+
}
|
|
454755
|
+
// Helper to render if still spinning
|
|
454756
|
+
#tryRender() {
|
|
454757
|
+
if (this.isSpinning) {
|
|
454758
|
+
this.render();
|
|
454759
|
+
}
|
|
454760
|
+
}
|
|
454761
|
+
#stringifyChunk(chunk, encoding) {
|
|
454762
|
+
if (chunk === void 0 || chunk === null) {
|
|
454763
|
+
return "";
|
|
454764
|
+
}
|
|
454765
|
+
if (typeof chunk === "string") {
|
|
454766
|
+
return chunk;
|
|
454767
|
+
}
|
|
454768
|
+
if (Buffer.isBuffer(chunk) || ArrayBuffer.isView(chunk)) {
|
|
454769
|
+
const normalizedEncoding = typeof encoding === "string" && encoding && encoding !== "buffer" ? encoding : "utf8";
|
|
454770
|
+
return Buffer.from(chunk).toString(normalizedEncoding);
|
|
454771
|
+
}
|
|
454772
|
+
return String(chunk);
|
|
454773
|
+
}
|
|
454774
|
+
#chunkTerminatesLine(chunkString) {
|
|
454775
|
+
if (!chunkString) {
|
|
454776
|
+
return false;
|
|
454777
|
+
}
|
|
454778
|
+
const lastCharacter = chunkString.at(-1);
|
|
454779
|
+
return lastCharacter === "\n" || lastCharacter === "\r";
|
|
454780
|
+
}
|
|
454781
|
+
#scheduleRenderDeferral() {
|
|
454782
|
+
if (this.#deferRenderTimer) {
|
|
454783
|
+
return;
|
|
454784
|
+
}
|
|
454785
|
+
this.#deferRenderTimer = setTimeout(() => {
|
|
454786
|
+
this.#deferRenderTimer = void 0;
|
|
454787
|
+
if (this.isSpinning) {
|
|
454788
|
+
this.#tryRender();
|
|
454789
|
+
}
|
|
454790
|
+
}, RENDER_DEFERRAL_TIMEOUT);
|
|
454791
|
+
if (typeof this.#deferRenderTimer?.unref === "function") {
|
|
454792
|
+
this.#deferRenderTimer.unref();
|
|
454793
|
+
}
|
|
454794
|
+
}
|
|
454795
|
+
#clearRenderDeferral() {
|
|
454796
|
+
if (this.#deferRenderTimer) {
|
|
454797
|
+
clearTimeout(this.#deferRenderTimer);
|
|
454798
|
+
this.#deferRenderTimer = void 0;
|
|
454799
|
+
}
|
|
454800
|
+
}
|
|
454801
|
+
// Helper to build complete line with symbol, text, prefix, and suffix
|
|
454802
|
+
#buildOutputLine(symbol, text, prefixText, suffixText) {
|
|
454803
|
+
const fullPrefixText = this.#getFullPrefixText(prefixText, " ");
|
|
454804
|
+
const separatorText = symbol ? " " : "";
|
|
454805
|
+
const fullText = typeof text === "string" ? separatorText + text : "";
|
|
454806
|
+
const fullSuffixText = this.#getFullSuffixText(suffixText, " ");
|
|
454807
|
+
return fullPrefixText + symbol + fullText + fullSuffixText;
|
|
454808
|
+
}
|
|
454467
454809
|
constructor(options) {
|
|
454468
454810
|
if (typeof options === "string") {
|
|
454469
454811
|
options = {
|
|
@@ -454478,18 +454820,23 @@ var init_ora = __esm({
|
|
|
454478
454820
|
...options
|
|
454479
454821
|
};
|
|
454480
454822
|
this.color = this.#options.color;
|
|
454481
|
-
this.spinner = this.#options.spinner;
|
|
454482
|
-
this.#initialInterval = this.#options.interval;
|
|
454483
454823
|
this.#stream = this.#options.stream;
|
|
454484
|
-
|
|
454485
|
-
|
|
454824
|
+
if (typeof this.#options.isEnabled !== "boolean") {
|
|
454825
|
+
this.#options.isEnabled = isInteractive({ stream: this.#stream });
|
|
454826
|
+
}
|
|
454827
|
+
if (typeof this.#options.isSilent !== "boolean") {
|
|
454828
|
+
this.#options.isSilent = false;
|
|
454829
|
+
}
|
|
454830
|
+
const userInterval = this.#options.interval;
|
|
454831
|
+
this.spinner = this.#options.spinner;
|
|
454832
|
+
this.#options.interval = userInterval;
|
|
454486
454833
|
this.text = this.#options.text;
|
|
454487
454834
|
this.prefixText = this.#options.prefixText;
|
|
454488
454835
|
this.suffixText = this.#options.suffixText;
|
|
454489
454836
|
this.indent = this.#options.indent;
|
|
454490
454837
|
if (import_node_process6.default.env.NODE_ENV === "test") {
|
|
454491
454838
|
this._stream = this.#stream;
|
|
454492
|
-
this._isEnabled = this.#isEnabled;
|
|
454839
|
+
this._isEnabled = this.#options.isEnabled;
|
|
454493
454840
|
Object.defineProperty(this, "_linesToClear", {
|
|
454494
454841
|
get() {
|
|
454495
454842
|
return this.#linesToClear;
|
|
@@ -454505,30 +454852,36 @@ var init_ora = __esm({
|
|
|
454505
454852
|
});
|
|
454506
454853
|
Object.defineProperty(this, "_lineCount", {
|
|
454507
454854
|
get() {
|
|
454508
|
-
|
|
454855
|
+
const columns = this.#stream.columns ?? 80;
|
|
454856
|
+
const prefixText = typeof this.#options.prefixText === "function" ? "" : this.#options.prefixText;
|
|
454857
|
+
const suffixText = typeof this.#options.suffixText === "function" ? "" : this.#options.suffixText;
|
|
454858
|
+
const fullPrefixText = typeof prefixText === "string" && prefixText !== "" ? prefixText + " " : "";
|
|
454859
|
+
const fullSuffixText = typeof suffixText === "string" && suffixText !== "" ? " " + suffixText : "";
|
|
454860
|
+
const spinnerChar = "-";
|
|
454861
|
+
const fullText = " ".repeat(this.#options.indent) + fullPrefixText + spinnerChar + (typeof this.#options.text === "string" ? " " + this.#options.text : "") + fullSuffixText;
|
|
454862
|
+
return this.#computeLineCountFrom(fullText, columns);
|
|
454509
454863
|
}
|
|
454510
454864
|
});
|
|
454511
454865
|
}
|
|
454512
454866
|
}
|
|
454513
454867
|
get indent() {
|
|
454514
|
-
return this.#indent;
|
|
454868
|
+
return this.#options.indent;
|
|
454515
454869
|
}
|
|
454516
454870
|
set indent(indent = 0) {
|
|
454517
454871
|
if (!(indent >= 0 && Number.isInteger(indent))) {
|
|
454518
454872
|
throw new Error("The `indent` option must be an integer from 0 and up");
|
|
454519
454873
|
}
|
|
454520
|
-
this.#indent = indent;
|
|
454521
|
-
this.#updateLineCount();
|
|
454874
|
+
this.#options.indent = indent;
|
|
454522
454875
|
}
|
|
454523
454876
|
get interval() {
|
|
454524
|
-
return this.#
|
|
454877
|
+
return this.#options.interval ?? this.#spinner.interval ?? 100;
|
|
454525
454878
|
}
|
|
454526
454879
|
get spinner() {
|
|
454527
454880
|
return this.#spinner;
|
|
454528
454881
|
}
|
|
454529
454882
|
set spinner(spinner) {
|
|
454530
454883
|
this.#frameIndex = -1;
|
|
454531
|
-
this.#
|
|
454884
|
+
this.#options.interval = void 0;
|
|
454532
454885
|
if (typeof spinner === "object") {
|
|
454533
454886
|
if (!Array.isArray(spinner.frames) || spinner.frames.length === 0 || spinner.frames.some((frame) => typeof frame !== "string")) {
|
|
454534
454887
|
throw new Error("The given spinner must have a non-empty `frames` array of strings");
|
|
@@ -454548,25 +454901,22 @@ var init_ora = __esm({
|
|
|
454548
454901
|
}
|
|
454549
454902
|
}
|
|
454550
454903
|
get text() {
|
|
454551
|
-
return this.#text;
|
|
454904
|
+
return this.#options.text;
|
|
454552
454905
|
}
|
|
454553
454906
|
set text(value = "") {
|
|
454554
|
-
this.#text = value;
|
|
454555
|
-
this.#updateLineCount();
|
|
454907
|
+
this.#options.text = value;
|
|
454556
454908
|
}
|
|
454557
454909
|
get prefixText() {
|
|
454558
|
-
return this.#prefixText;
|
|
454910
|
+
return this.#options.prefixText;
|
|
454559
454911
|
}
|
|
454560
454912
|
set prefixText(value = "") {
|
|
454561
|
-
this.#prefixText = value;
|
|
454562
|
-
this.#updateLineCount();
|
|
454913
|
+
this.#options.prefixText = value;
|
|
454563
454914
|
}
|
|
454564
454915
|
get suffixText() {
|
|
454565
|
-
return this.#suffixText;
|
|
454916
|
+
return this.#options.suffixText;
|
|
454566
454917
|
}
|
|
454567
454918
|
set suffixText(value = "") {
|
|
454568
|
-
this.#suffixText = value;
|
|
454569
|
-
this.#updateLineCount();
|
|
454919
|
+
this.#options.suffixText = value;
|
|
454570
454920
|
}
|
|
454571
454921
|
get isSpinning() {
|
|
454572
454922
|
return this.#id !== void 0;
|
|
@@ -454578,110 +454928,179 @@ var init_ora = __esm({
|
|
|
454578
454928
|
}
|
|
454579
454929
|
return "";
|
|
454580
454930
|
}
|
|
454581
|
-
#getFullPrefixText(prefixText = this.#prefixText, postfix = " ") {
|
|
454931
|
+
#getFullPrefixText(prefixText = this.#options.prefixText, postfix = " ") {
|
|
454582
454932
|
return this.#formatAffix(prefixText, postfix, false);
|
|
454583
454933
|
}
|
|
454584
|
-
#getFullSuffixText(suffixText = this.#suffixText, prefix = " ") {
|
|
454934
|
+
#getFullSuffixText(suffixText = this.#options.suffixText, prefix = " ") {
|
|
454585
454935
|
return this.#formatAffix(suffixText, prefix, true);
|
|
454586
454936
|
}
|
|
454587
454937
|
#computeLineCountFrom(text, columns) {
|
|
454588
454938
|
let count = 0;
|
|
454589
|
-
for (const line of
|
|
454939
|
+
for (const line of (0, import_node_util.stripVTControlCharacters)(text).split("\n")) {
|
|
454590
454940
|
count += Math.max(1, Math.ceil(stringWidth(line) / columns));
|
|
454591
454941
|
}
|
|
454592
454942
|
return count;
|
|
454593
454943
|
}
|
|
454594
|
-
#updateLineCount() {
|
|
454595
|
-
const columns = this.#stream.columns ?? 80;
|
|
454596
|
-
const prefixText = typeof this.#prefixText === "function" ? "" : this.#prefixText;
|
|
454597
|
-
const suffixText = typeof this.#suffixText === "function" ? "" : this.#suffixText;
|
|
454598
|
-
const fullPrefixText = typeof prefixText === "string" && prefixText !== "" ? prefixText + " " : "";
|
|
454599
|
-
const fullSuffixText = typeof suffixText === "string" && suffixText !== "" ? " " + suffixText : "";
|
|
454600
|
-
const spinnerChar = "-";
|
|
454601
|
-
const fullText = " ".repeat(this.#indent) + fullPrefixText + spinnerChar + (typeof this.#text === "string" ? " " + this.#text : "") + fullSuffixText;
|
|
454602
|
-
this.#lineCount = this.#computeLineCountFrom(fullText, columns);
|
|
454603
|
-
}
|
|
454604
454944
|
get isEnabled() {
|
|
454605
|
-
return this.#isEnabled && !this.#isSilent;
|
|
454945
|
+
return this.#options.isEnabled && !this.#options.isSilent;
|
|
454606
454946
|
}
|
|
454607
454947
|
set isEnabled(value) {
|
|
454608
454948
|
if (typeof value !== "boolean") {
|
|
454609
454949
|
throw new TypeError("The `isEnabled` option must be a boolean");
|
|
454610
454950
|
}
|
|
454611
|
-
this.#isEnabled = value;
|
|
454951
|
+
this.#options.isEnabled = value;
|
|
454612
454952
|
}
|
|
454613
454953
|
get isSilent() {
|
|
454614
|
-
return this.#isSilent;
|
|
454954
|
+
return this.#options.isSilent;
|
|
454615
454955
|
}
|
|
454616
454956
|
set isSilent(value) {
|
|
454617
454957
|
if (typeof value !== "boolean") {
|
|
454618
454958
|
throw new TypeError("The `isSilent` option must be a boolean");
|
|
454619
454959
|
}
|
|
454620
|
-
this.#isSilent = value;
|
|
454960
|
+
this.#options.isSilent = value;
|
|
454621
454961
|
}
|
|
454622
454962
|
frame() {
|
|
454623
454963
|
const now = Date.now();
|
|
454624
|
-
if (this.#frameIndex === -1 || now - this.#
|
|
454625
|
-
this.#frameIndex =
|
|
454626
|
-
this.#
|
|
454964
|
+
if (this.#frameIndex === -1 || now - this.#lastFrameTime >= this.interval) {
|
|
454965
|
+
this.#frameIndex = (this.#frameIndex + 1) % this.#spinner.frames.length;
|
|
454966
|
+
this.#lastFrameTime = now;
|
|
454627
454967
|
}
|
|
454628
454968
|
const { frames } = this.#spinner;
|
|
454629
454969
|
let frame = frames[this.#frameIndex];
|
|
454630
454970
|
if (this.color) {
|
|
454631
454971
|
frame = source_default[this.color](frame);
|
|
454632
454972
|
}
|
|
454633
|
-
const fullPrefixText = this.#getFullPrefixText(this.#prefixText, " ");
|
|
454973
|
+
const fullPrefixText = this.#getFullPrefixText(this.#options.prefixText, " ");
|
|
454634
454974
|
const fullText = typeof this.text === "string" ? " " + this.text : "";
|
|
454635
|
-
const fullSuffixText = this.#getFullSuffixText(this.#suffixText, " ");
|
|
454975
|
+
const fullSuffixText = this.#getFullSuffixText(this.#options.suffixText, " ");
|
|
454636
454976
|
return fullPrefixText + frame + fullText + fullSuffixText;
|
|
454637
454977
|
}
|
|
454638
454978
|
clear() {
|
|
454639
|
-
if (!this
|
|
454979
|
+
if (!this.isEnabled || !this.#stream.isTTY) {
|
|
454640
454980
|
return this;
|
|
454641
454981
|
}
|
|
454642
|
-
this.#
|
|
454643
|
-
|
|
454644
|
-
|
|
454645
|
-
|
|
454982
|
+
this.#internalWrite(() => {
|
|
454983
|
+
this.#stream.cursorTo(0);
|
|
454984
|
+
for (let index = 0; index < this.#linesToClear; index++) {
|
|
454985
|
+
if (index > 0) {
|
|
454986
|
+
this.#stream.moveCursor(0, -1);
|
|
454987
|
+
}
|
|
454988
|
+
this.#stream.clearLine(1);
|
|
454646
454989
|
}
|
|
454647
|
-
this.#
|
|
454648
|
-
|
|
454649
|
-
|
|
454650
|
-
|
|
454651
|
-
}
|
|
454652
|
-
this.#lastIndent = this.#indent;
|
|
454990
|
+
if (this.#options.indent) {
|
|
454991
|
+
this.#stream.cursorTo(this.#options.indent);
|
|
454992
|
+
}
|
|
454993
|
+
});
|
|
454653
454994
|
this.#linesToClear = 0;
|
|
454654
454995
|
return this;
|
|
454655
454996
|
}
|
|
454997
|
+
// Helper to hook a single stream
|
|
454998
|
+
#hookStream(stream) {
|
|
454999
|
+
if (!stream || this.#hookedStreams.has(stream) || !stream.isTTY || typeof stream.write !== "function") {
|
|
455000
|
+
return;
|
|
455001
|
+
}
|
|
455002
|
+
if (activeHooksPerStream.has(stream)) {
|
|
455003
|
+
console.warn("[ora] Multiple concurrent spinners detected. This may cause visual corruption. Use one spinner at a time.");
|
|
455004
|
+
}
|
|
455005
|
+
const originalWrite = stream.write;
|
|
455006
|
+
this.#hookedStreams.set(stream, originalWrite);
|
|
455007
|
+
activeHooksPerStream.set(stream, this);
|
|
455008
|
+
stream.write = (chunk, encoding, callback) => this.#hookedWrite(stream, originalWrite, chunk, encoding, callback);
|
|
455009
|
+
}
|
|
455010
|
+
/**
|
|
455011
|
+
Intercept stream writes while spinner is active to handle external writes cleanly without visual corruption.
|
|
455012
|
+
Hooks process stdio streams and the active spinner stream so console.log(), console.error(), and direct writes stay tidy.
|
|
455013
|
+
*/
|
|
455014
|
+
#installHook() {
|
|
455015
|
+
if (!this.isEnabled || this.#hookedStreams.size > 0) {
|
|
455016
|
+
return;
|
|
455017
|
+
}
|
|
455018
|
+
const streamsToHook = /* @__PURE__ */ new Set([this.#stream, import_node_process6.default.stdout, import_node_process6.default.stderr]);
|
|
455019
|
+
for (const stream of streamsToHook) {
|
|
455020
|
+
this.#hookStream(stream);
|
|
455021
|
+
}
|
|
455022
|
+
}
|
|
455023
|
+
#uninstallHook() {
|
|
455024
|
+
for (const [stream, originalWrite] of this.#hookedStreams) {
|
|
455025
|
+
stream.write = originalWrite;
|
|
455026
|
+
if (activeHooksPerStream.get(stream) === this) {
|
|
455027
|
+
activeHooksPerStream.delete(stream);
|
|
455028
|
+
}
|
|
455029
|
+
}
|
|
455030
|
+
this.#hookedStreams.clear();
|
|
455031
|
+
}
|
|
455032
|
+
// eslint-disable-next-line max-params -- Need stream and originalWrite for multi-stream support
|
|
455033
|
+
#hookedWrite(stream, originalWrite, chunk, encoding, callback) {
|
|
455034
|
+
if (typeof encoding === "function") {
|
|
455035
|
+
callback = encoding;
|
|
455036
|
+
encoding = void 0;
|
|
455037
|
+
}
|
|
455038
|
+
if (this.#isInternalWrite) {
|
|
455039
|
+
return originalWrite.call(stream, chunk, encoding, callback);
|
|
455040
|
+
}
|
|
455041
|
+
this.clear();
|
|
455042
|
+
const chunkString = this.#stringifyChunk(chunk, encoding);
|
|
455043
|
+
const chunkTerminatesLine = this.#chunkTerminatesLine(chunkString);
|
|
455044
|
+
const writeResult = originalWrite.call(stream, chunk, encoding, callback);
|
|
455045
|
+
if (chunkTerminatesLine) {
|
|
455046
|
+
this.#clearRenderDeferral();
|
|
455047
|
+
} else if (chunkString.length > 0) {
|
|
455048
|
+
this.#scheduleRenderDeferral();
|
|
455049
|
+
}
|
|
455050
|
+
if (this.isSpinning && !this.#deferRenderTimer) {
|
|
455051
|
+
this.render();
|
|
455052
|
+
}
|
|
455053
|
+
return writeResult;
|
|
455054
|
+
}
|
|
454656
455055
|
render() {
|
|
454657
|
-
if (!this
|
|
455056
|
+
if (!this.isEnabled || this.#drainHandler || this.#deferRenderTimer) {
|
|
454658
455057
|
return this;
|
|
454659
455058
|
}
|
|
454660
|
-
this.
|
|
454661
|
-
let
|
|
454662
|
-
|
|
454663
|
-
|
|
454664
|
-
|
|
454665
|
-
|
|
454666
|
-
|
|
454667
|
-
|
|
454668
|
-
frameContent =
|
|
454669
|
-
|
|
454670
|
-
|
|
454671
|
-
|
|
455059
|
+
const useSynchronizedOutput = this.#stream.isTTY;
|
|
455060
|
+
let shouldDisableSynchronizedOutput = false;
|
|
455061
|
+
try {
|
|
455062
|
+
if (useSynchronizedOutput) {
|
|
455063
|
+
this.#internalWrite(() => this.#stream.write(SYNCHRONIZED_OUTPUT_ENABLE));
|
|
455064
|
+
shouldDisableSynchronizedOutput = true;
|
|
455065
|
+
}
|
|
455066
|
+
this.clear();
|
|
455067
|
+
let frameContent = this.frame();
|
|
455068
|
+
const columns = this.#stream.columns ?? 80;
|
|
455069
|
+
const actualLineCount = this.#computeLineCountFrom(frameContent, columns);
|
|
455070
|
+
const consoleHeight = this.#stream.rows;
|
|
455071
|
+
if (consoleHeight && consoleHeight > 1 && actualLineCount > consoleHeight) {
|
|
455072
|
+
const lines = frameContent.split("\n");
|
|
455073
|
+
const maxLines = consoleHeight - 1;
|
|
455074
|
+
frameContent = [...lines.slice(0, maxLines), "... (content truncated to fit terminal)"].join("\n");
|
|
455075
|
+
}
|
|
455076
|
+
const canContinue = this.#internalWrite(() => this.#stream.write(frameContent));
|
|
455077
|
+
if (canContinue === false && this.#stream.isTTY) {
|
|
455078
|
+
this.#drainHandler = () => {
|
|
455079
|
+
this.#drainHandler = void 0;
|
|
455080
|
+
this.#tryRender();
|
|
455081
|
+
};
|
|
455082
|
+
this.#stream.once("drain", this.#drainHandler);
|
|
455083
|
+
}
|
|
455084
|
+
this.#linesToClear = this.#computeLineCountFrom(frameContent, columns);
|
|
455085
|
+
} finally {
|
|
455086
|
+
if (shouldDisableSynchronizedOutput) {
|
|
455087
|
+
this.#internalWrite(() => this.#stream.write(SYNCHRONIZED_OUTPUT_DISABLE));
|
|
455088
|
+
}
|
|
455089
|
+
}
|
|
454672
455090
|
return this;
|
|
454673
455091
|
}
|
|
454674
455092
|
start(text) {
|
|
454675
455093
|
if (text) {
|
|
454676
455094
|
this.text = text;
|
|
454677
455095
|
}
|
|
454678
|
-
if (this
|
|
455096
|
+
if (this.isSilent) {
|
|
454679
455097
|
return this;
|
|
454680
455098
|
}
|
|
454681
|
-
if (!this
|
|
454682
|
-
const
|
|
455099
|
+
if (!this.isEnabled) {
|
|
455100
|
+
const symbol = this.text ? "-" : "";
|
|
455101
|
+
const line = " ".repeat(this.#options.indent) + this.#buildOutputLine(symbol, this.text, this.#options.prefixText, this.#options.suffixText);
|
|
454683
455102
|
if (line.trim() !== "") {
|
|
454684
|
-
this.#stream.write(line + "\n");
|
|
455103
|
+
this.#internalWrite(() => this.#stream.write(line + "\n"));
|
|
454685
455104
|
}
|
|
454686
455105
|
return this;
|
|
454687
455106
|
}
|
|
@@ -454692,9 +455111,10 @@ var init_ora = __esm({
|
|
|
454692
455111
|
cli_cursor_default.hide(this.#stream);
|
|
454693
455112
|
}
|
|
454694
455113
|
if (this.#options.discardStdin && import_node_process6.default.stdin.isTTY) {
|
|
454695
|
-
this.#isDiscardingStdin = true;
|
|
454696
455114
|
stdin_discarder_default.start();
|
|
455115
|
+
this.#isDiscardingStdin = true;
|
|
454697
455116
|
}
|
|
455117
|
+
this.#installHook();
|
|
454698
455118
|
this.render();
|
|
454699
455119
|
this.#id = setInterval(this.render.bind(this), this.interval);
|
|
454700
455120
|
return this;
|
|
@@ -454702,16 +455122,23 @@ var init_ora = __esm({
|
|
|
454702
455122
|
stop() {
|
|
454703
455123
|
clearInterval(this.#id);
|
|
454704
455124
|
this.#id = void 0;
|
|
454705
|
-
this.#frameIndex =
|
|
454706
|
-
|
|
455125
|
+
this.#frameIndex = -1;
|
|
455126
|
+
this.#lastFrameTime = 0;
|
|
455127
|
+
this.#clearRenderDeferral();
|
|
455128
|
+
this.#uninstallHook();
|
|
455129
|
+
if (this.#drainHandler) {
|
|
455130
|
+
this.#stream.removeListener("drain", this.#drainHandler);
|
|
455131
|
+
this.#drainHandler = void 0;
|
|
455132
|
+
}
|
|
455133
|
+
if (this.isEnabled) {
|
|
454707
455134
|
this.clear();
|
|
454708
455135
|
if (this.#options.hideCursor) {
|
|
454709
455136
|
cli_cursor_default.show(this.#stream);
|
|
454710
455137
|
}
|
|
454711
455138
|
}
|
|
454712
|
-
if (this.#
|
|
454713
|
-
stdin_discarder_default.stop();
|
|
455139
|
+
if (this.#isDiscardingStdin) {
|
|
454714
455140
|
this.#isDiscardingStdin = false;
|
|
455141
|
+
stdin_discarder_default.stop();
|
|
454715
455142
|
}
|
|
454716
455143
|
return this;
|
|
454717
455144
|
}
|
|
@@ -454728,20 +455155,16 @@ var init_ora = __esm({
|
|
|
454728
455155
|
return this.stopAndPersist({ symbol: symbols_exports.info, text });
|
|
454729
455156
|
}
|
|
454730
455157
|
stopAndPersist(options = {}) {
|
|
454731
|
-
if (this
|
|
455158
|
+
if (this.isSilent) {
|
|
454732
455159
|
return this;
|
|
454733
455160
|
}
|
|
454734
|
-
const
|
|
454735
|
-
const fullPrefixText = this.#getFullPrefixText(prefixText, " ");
|
|
454736
|
-
const symbolText = options.symbol ?? " ";
|
|
455161
|
+
const symbol = options.symbol ?? " ";
|
|
454737
455162
|
const text = options.text ?? this.text;
|
|
454738
|
-
const
|
|
454739
|
-
const
|
|
454740
|
-
const
|
|
454741
|
-
const fullSuffixText = this.#getFullSuffixText(suffixText, " ");
|
|
454742
|
-
const textToWrite = fullPrefixText + symbolText + fullText + fullSuffixText + "\n";
|
|
455163
|
+
const prefixText = options.prefixText ?? this.#options.prefixText;
|
|
455164
|
+
const suffixText = options.suffixText ?? this.#options.suffixText;
|
|
455165
|
+
const textToWrite = this.#buildOutputLine(symbol, text, prefixText, suffixText) + "\n";
|
|
454743
455166
|
this.stop();
|
|
454744
|
-
this.#stream.write(textToWrite);
|
|
455167
|
+
this.#internalWrite(() => this.#stream.write(textToWrite));
|
|
454745
455168
|
return this;
|
|
454746
455169
|
}
|
|
454747
455170
|
};
|
|
@@ -454982,7 +455405,6 @@ var require_executor2 = __commonJS({
|
|
|
454982
455405
|
const errorStream = ignoreErrorStream ? "ignore" : process.stderr;
|
|
454983
455406
|
const spawnOptions = {
|
|
454984
455407
|
stdio: [process.stdin, outputStream, errorStream],
|
|
454985
|
-
shell: true,
|
|
454986
455408
|
cwd: path.join(rootDirectory, options.workingDirectory || ""),
|
|
454987
455409
|
env: {
|
|
454988
455410
|
...process.env,
|
|
@@ -454991,7 +455413,7 @@ var require_executor2 = __commonJS({
|
|
|
454991
455413
|
}
|
|
454992
455414
|
};
|
|
454993
455415
|
return new Promise((resolve, reject) => {
|
|
454994
|
-
(0, node_child_process_1.spawn)(
|
|
455416
|
+
(0, node_child_process_1.spawn)("git", args, spawnOptions).on("close", (code) => {
|
|
454995
455417
|
if (code === 0) {
|
|
454996
455418
|
resolve();
|
|
454997
455419
|
} else {
|
|
@@ -455017,7 +455439,7 @@ var require_executor2 = __commonJS({
|
|
|
455017
455439
|
await execute(["add", "."]);
|
|
455018
455440
|
if (options.commit) {
|
|
455019
455441
|
const message = options.message || "initial commit";
|
|
455020
|
-
await execute(["commit",
|
|
455442
|
+
await execute(["commit", "-m", message]);
|
|
455021
455443
|
}
|
|
455022
455444
|
context.logger.info("Successfully initialized git.");
|
|
455023
455445
|
} catch {
|
|
@@ -457983,20 +458405,20 @@ var require_internal = __commonJS({
|
|
|
457983
458405
|
});
|
|
457984
458406
|
|
|
457985
458407
|
// node_modules/@angular-devkit/architect/package.json
|
|
457986
|
-
var
|
|
458408
|
+
var require_package2 = __commonJS({
|
|
457987
458409
|
"node_modules/@angular-devkit/architect/package.json"(exports2, module2) {
|
|
457988
458410
|
module2.exports = {
|
|
457989
458411
|
name: "@angular-devkit/architect",
|
|
457990
|
-
version: "0.
|
|
458412
|
+
version: "0.2102.28",
|
|
457991
458413
|
description: "Angular Build Facade",
|
|
457992
458414
|
experimental: true,
|
|
457993
458415
|
bin: {
|
|
457994
|
-
architect: "
|
|
458416
|
+
architect: "bin/cli.js"
|
|
457995
458417
|
},
|
|
457996
458418
|
main: "src/index.js",
|
|
457997
458419
|
typings: "src/index.d.ts",
|
|
457998
458420
|
dependencies: {
|
|
457999
|
-
"@angular-devkit/core": "21.
|
|
458421
|
+
"@angular-devkit/core": "21.2.28",
|
|
458000
458422
|
rxjs: "7.8.2"
|
|
458001
458423
|
},
|
|
458002
458424
|
builders: "./builders/builders.json",
|
|
@@ -458009,9 +458431,9 @@ var require_package3 = __commonJS({
|
|
|
458009
458431
|
],
|
|
458010
458432
|
repository: {
|
|
458011
458433
|
type: "git",
|
|
458012
|
-
url: "https://github.com/angular/angular-cli.git"
|
|
458434
|
+
url: "git+https://github.com/angular/angular-cli.git"
|
|
458013
458435
|
},
|
|
458014
|
-
packageManager: "pnpm@10.
|
|
458436
|
+
packageManager: "pnpm@10.33.2",
|
|
458015
458437
|
engines: {
|
|
458016
458438
|
node: "^20.19.0 || ^22.12.0 || >=24.0.0",
|
|
458017
458439
|
npm: "^6.11.0 || ^7.5.6 || >=8.0.0",
|
|
@@ -458183,7 +458605,7 @@ var require_create_builder = __commonJS({
|
|
|
458183
458605
|
return {
|
|
458184
458606
|
handler,
|
|
458185
458607
|
[internal_1.BuilderSymbol]: true,
|
|
458186
|
-
[internal_1.BuilderVersionSymbol]:
|
|
458608
|
+
[internal_1.BuilderVersionSymbol]: require_package2().version,
|
|
458187
458609
|
// Only needed for type safety around `Builder` types.
|
|
458188
458610
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
458189
458611
|
__OptionT: null
|
|
@@ -459368,11 +459790,10 @@ lodash/lodash.js:
|
|
|
459368
459790
|
* Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
|
|
459369
459791
|
*)
|
|
459370
459792
|
|
|
459371
|
-
ejs/lib/ejs.js:
|
|
459793
|
+
ejs/lib/cjs/ejs.js:
|
|
459372
459794
|
(**
|
|
459373
459795
|
* @file Embedded JavaScript templating engine. {@link http://ejs.co}
|
|
459374
459796
|
* @author Matthew Eernisse <mde@fleegix.org>
|
|
459375
|
-
* @author Tiancheng "Timothy" Gu <timothygu99@gmail.com>
|
|
459376
459797
|
* @project EJS
|
|
459377
459798
|
* @license {@link http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0}
|
|
459378
459799
|
*)
|
|
@@ -459381,7 +459802,7 @@ lodash-es/lodash.js:
|
|
|
459381
459802
|
(**
|
|
459382
459803
|
* @license
|
|
459383
459804
|
* Lodash (Custom Build) <https://lodash.com/>
|
|
459384
|
-
* Build: `lodash modularize exports="es" -o ./`
|
|
459805
|
+
* Build: `lodash modularize exports="es" --repo lodash/lodash#4.18.1 -o ./`
|
|
459385
459806
|
* Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
|
|
459386
459807
|
* Released under MIT license <https://lodash.com/license>
|
|
459387
459808
|
* Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
|