@storm-software/workspace-tools 1.62.8 → 1.62.10
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/CHANGELOG.md +24 -0
- package/declarations.d.ts +1 -1
- package/index.js +59 -47
- package/meta.json +1 -1
- package/package.json +1 -1
- package/src/base/index.js +22 -19
- package/src/executors/tsup/executor.js +26 -22
- package/src/executors/tsup-browser/executor.js +38 -27
- package/src/executors/tsup-neutral/executor.js +38 -27
- package/src/executors/tsup-node/executor.js +38 -27
- package/src/executors/typia/executor.js +22 -20
- package/src/generators/browser-library/generator.js +16 -14
- package/src/generators/config-schema/generator.js +22 -18
- package/src/generators/neutral-library/generator.js +16 -14
- package/src/generators/node-library/generator.js +16 -14
- package/src/generators/preset/generator.js +16 -14
- package/src/generators/release-version/generator.js +23 -21
- package/src/utils/index.js +36 -24
|
@@ -448947,8 +448947,7 @@ __export(executor_exports, {
|
|
|
448947
448947
|
module.exports = __toCommonJS(executor_exports);
|
|
448948
448948
|
|
|
448949
448949
|
// packages/workspace-tools/src/utils/apply-workspace-tokens.ts
|
|
448950
|
-
var
|
|
448951
|
-
var applyWorkspaceExecutorTokens = (option, tokenizerOptions) => {
|
|
448950
|
+
var applyWorkspaceExecutorTokens = async (option, tokenizerOptions) => {
|
|
448952
448951
|
let result = option;
|
|
448953
448952
|
if (!result) {
|
|
448954
448953
|
return result;
|
|
@@ -448991,30 +448990,33 @@ var applyWorkspaceExecutorTokens = (option, tokenizerOptions) => {
|
|
|
448991
448990
|
result = result.replaceAll("{sourceRoot}", sourceRoot);
|
|
448992
448991
|
}
|
|
448993
448992
|
if (result.includes("{workspaceRoot}")) {
|
|
448993
|
+
const { findWorkspaceRoot } = await import("@storm-software/config-tools");
|
|
448994
448994
|
result = result.replaceAll(
|
|
448995
448995
|
"{workspaceRoot}",
|
|
448996
|
-
tokenizerOptions.workspaceRoot ??
|
|
448996
|
+
tokenizerOptions.workspaceRoot ?? findWorkspaceRoot()
|
|
448997
448997
|
);
|
|
448998
448998
|
}
|
|
448999
448999
|
return result;
|
|
449000
449000
|
};
|
|
449001
|
-
var applyWorkspaceTokens = (options8, config, tokenizerFn) => {
|
|
449002
|
-
|
|
449003
|
-
if (!result) {
|
|
449001
|
+
var applyWorkspaceTokens = async (options8, config, tokenizerFn) => {
|
|
449002
|
+
if (!options8) {
|
|
449004
449003
|
return {};
|
|
449005
449004
|
}
|
|
449006
|
-
|
|
449005
|
+
const result = {};
|
|
449006
|
+
for (const option of Object.keys(options8)) {
|
|
449007
449007
|
if (typeof options8[option] === "string") {
|
|
449008
|
-
|
|
449008
|
+
result[option] = await Promise.resolve(tokenizerFn(options8[option], config));
|
|
449009
449009
|
} else if (Array.isArray(options8[option])) {
|
|
449010
|
-
|
|
449011
|
-
(
|
|
449010
|
+
result[option] = await Promise.all(
|
|
449011
|
+
options8[option].map(
|
|
449012
|
+
async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, config)) : item
|
|
449013
|
+
)
|
|
449012
449014
|
);
|
|
449013
449015
|
} else if (typeof options8[option] === "object") {
|
|
449014
|
-
|
|
449016
|
+
result[option] = await applyWorkspaceTokens(options8[option], config, tokenizerFn);
|
|
449015
449017
|
}
|
|
449016
|
-
|
|
449017
|
-
|
|
449018
|
+
}
|
|
449019
|
+
return result;
|
|
449018
449020
|
};
|
|
449019
449021
|
|
|
449020
449022
|
// packages/workspace-tools/src/base/base-executor.ts
|
|
@@ -449027,7 +449029,7 @@ var withRunExecutor = (name, executorFn, executorOptions) => async (_options, co
|
|
|
449027
449029
|
writeInfo,
|
|
449028
449030
|
writeSuccess,
|
|
449029
449031
|
writeTrace,
|
|
449030
|
-
findWorkspaceRoot
|
|
449032
|
+
findWorkspaceRoot,
|
|
449031
449033
|
loadStormConfig
|
|
449032
449034
|
} = await import("@storm-software/config-tools");
|
|
449033
449035
|
const stopwatch = getStopwatch(name);
|
|
@@ -449041,7 +449043,7 @@ var withRunExecutor = (name, executorFn, executorOptions) => async (_options, co
|
|
|
449041
449043
|
"The Build process failed because the context is not valid. Please run this command from a workspace."
|
|
449042
449044
|
);
|
|
449043
449045
|
}
|
|
449044
|
-
const workspaceRoot =
|
|
449046
|
+
const workspaceRoot = findWorkspaceRoot();
|
|
449045
449047
|
const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot;
|
|
449046
449048
|
const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot;
|
|
449047
449049
|
const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
|
|
@@ -449076,7 +449078,7 @@ ${Object.keys(options8).map(
|
|
|
449076
449078
|
(key2) => ` - ${key2}=${_isFunction(options8[key2]) ? "<function>" : JSON.stringify(options8[key2])}`
|
|
449077
449079
|
).join("\n")}`
|
|
449078
449080
|
);
|
|
449079
|
-
const tokenized = applyWorkspaceTokens(
|
|
449081
|
+
const tokenized = await applyWorkspaceTokens(
|
|
449080
449082
|
options8,
|
|
449081
449083
|
{
|
|
449082
449084
|
config,
|
|
@@ -449142,23 +449144,30 @@ var getFileBanner = (name, commentStart = "//") => {
|
|
|
449142
449144
|
while (name.length + padding.length < 12) {
|
|
449143
449145
|
padding += " ";
|
|
449144
449146
|
}
|
|
449147
|
+
let titleName = process.env.STORM_NAMESPACE ?? "";
|
|
449148
|
+
if (titleName) {
|
|
449149
|
+
if (titleName?.startsWith("@")) {
|
|
449150
|
+
titleName = titleName.slice(1);
|
|
449151
|
+
}
|
|
449152
|
+
titleName = (titleName.charAt(0).toUpperCase() + titleName.slice(1)).split("-").filter((word) => word && word.length > 0).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
|
|
449153
|
+
}
|
|
449145
449154
|
return `
|
|
449146
449155
|
|
|
449147
449156
|
${commentStart} -------------------------------------------------------------------
|
|
449148
449157
|
${commentStart}
|
|
449149
449158
|
${commentStart} ${padding}Storm Software
|
|
449150
|
-
${commentStart} \u26A1 ${
|
|
449159
|
+
${commentStart} \u26A1 ${titleName ? `${titleName} - ` : ""}${name}
|
|
449151
449160
|
${commentStart}
|
|
449152
|
-
${commentStart} This code was released as part of the ${
|
|
449161
|
+
${commentStart} This code was released as part of the ${titleName ? `${titleName} ` : ""}project. ${titleName ? titleName : "This project"}
|
|
449153
449162
|
${commentStart} is maintained by Storm Software under the ${process.env.STORM_LICENSE ?? "Apache License 2.0"}, and is
|
|
449154
449163
|
${commentStart} free for commercial and private use. For more information, please visit
|
|
449155
449164
|
${commentStart} our licensing page.
|
|
449156
449165
|
${commentStart}
|
|
449157
449166
|
${commentStart} Website: ${process.env.STORM_HOMEPAGE ?? "https://stormsoftware.org"}
|
|
449158
449167
|
${commentStart} Repository: ${process.env.STORM_REPOSITORY ?? "https://github.com/storm-software/storm-stack"}
|
|
449159
|
-
${commentStart} Documentation: https://stormsoftware.org/docs
|
|
449160
|
-
${commentStart} Contact: https://stormsoftware.org/contact
|
|
449161
|
-
${commentStart} Licensing: https://stormsoftware.org/licensing
|
|
449168
|
+
${commentStart} Documentation: https://stormsoftware.org/docs${titleName?.startsWith("@") ? `/${titleName.slice(1)}` : ""}
|
|
449169
|
+
${commentStart} Contact: ${process.env.STORM_HOMEPAGE ? process.env.STORM_HOMEPAGE.endsWith("/") ? process.env.STORM_HOMEPAGE.slice(-1) : process.env.STORM_HOMEPAGE : "https://stormsoftware.org"}/contact
|
|
449170
|
+
${commentStart} Licensing: ${process.env.STORM_HOMEPAGE ? process.env.STORM_HOMEPAGE.endsWith("/") ? process.env.STORM_HOMEPAGE.slice(-1) : process.env.STORM_HOMEPAGE : "https://stormsoftware.org"}/licensing
|
|
449162
449171
|
${commentStart}
|
|
449163
449172
|
${commentStart} -------------------------------------------------------------------
|
|
449164
449173
|
|
|
@@ -449372,8 +449381,8 @@ var applyDefaultOptions = (options8) => {
|
|
|
449372
449381
|
return options8;
|
|
449373
449382
|
};
|
|
449374
449383
|
var runTsupBuild = async (context, config, options8) => {
|
|
449375
|
-
const { LogLevel, getLogLevel, writeInfo, writeWarning, findWorkspaceRoot
|
|
449376
|
-
const workspaceRoot = config?.workspaceRoot ??
|
|
449384
|
+
const { LogLevel, getLogLevel, writeInfo, writeWarning, findWorkspaceRoot } = await import("@storm-software/config-tools");
|
|
449385
|
+
const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot();
|
|
449377
449386
|
const stormEnv = Object.keys(options8.env ?? {}).filter((key2) => key2.startsWith("STORM_")).reduce((ret, key2) => {
|
|
449378
449387
|
ret[key2] = options8.env?.[key2];
|
|
449379
449388
|
return ret;
|
|
@@ -455712,8 +455721,10 @@ var import_fileutils = require("nx/src/utils/fileutils.js");
|
|
|
455712
455721
|
|
|
455713
455722
|
// packages/workspace-tools/src/utils/get-project-configurations.ts
|
|
455714
455723
|
var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
|
|
455715
|
-
var
|
|
455716
|
-
|
|
455724
|
+
var getProjectConfigurations = async () => {
|
|
455725
|
+
const { findWorkspaceRoot } = await import("@storm-software/config-tools");
|
|
455726
|
+
return (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(findWorkspaceRoot());
|
|
455727
|
+
};
|
|
455717
455728
|
|
|
455718
455729
|
// packages/workspace-tools/src/utils/get-project-deps.ts
|
|
455719
455730
|
function getExtraDependencies(projectName, graph) {
|
|
@@ -455758,7 +455769,7 @@ async function tsupExecutorFn(options8, context, config) {
|
|
|
455758
455769
|
writeSuccess,
|
|
455759
455770
|
writeTrace,
|
|
455760
455771
|
writeWarning,
|
|
455761
|
-
findWorkspaceRoot
|
|
455772
|
+
findWorkspaceRoot
|
|
455762
455773
|
} = await import("@storm-software/config-tools");
|
|
455763
455774
|
writeInfo(config, "\u{1F4E6} Running Storm build executor on the workspace");
|
|
455764
455775
|
writeDebug(
|
|
@@ -455774,7 +455785,7 @@ ${Object.keys(options8).map(
|
|
|
455774
455785
|
"The Build process failed because the context is not valid. Please run this command from a workspace."
|
|
455775
455786
|
);
|
|
455776
455787
|
}
|
|
455777
|
-
const workspaceRoot =
|
|
455788
|
+
const workspaceRoot = findWorkspaceRoot();
|
|
455778
455789
|
const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot;
|
|
455779
455790
|
const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot;
|
|
455780
455791
|
if (options8.clean !== false) {
|
|
@@ -227772,13 +227772,11 @@ __export(executor_exports, {
|
|
|
227772
227772
|
typiaExecutorFn: () => typiaExecutorFn
|
|
227773
227773
|
});
|
|
227774
227774
|
module.exports = __toCommonJS(executor_exports);
|
|
227775
|
-
var import_config_tools2 = require("@storm-software/config-tools");
|
|
227776
227775
|
var import_fs_extra = __toESM(require_lib());
|
|
227777
227776
|
var import_TypiaProgrammer = __toESM(require_TypiaProgrammer());
|
|
227778
227777
|
|
|
227779
227778
|
// packages/workspace-tools/src/utils/apply-workspace-tokens.ts
|
|
227780
|
-
var
|
|
227781
|
-
var applyWorkspaceExecutorTokens = (option, tokenizerOptions) => {
|
|
227779
|
+
var applyWorkspaceExecutorTokens = async (option, tokenizerOptions) => {
|
|
227782
227780
|
let result = option;
|
|
227783
227781
|
if (!result) {
|
|
227784
227782
|
return result;
|
|
@@ -227821,30 +227819,33 @@ var applyWorkspaceExecutorTokens = (option, tokenizerOptions) => {
|
|
|
227821
227819
|
result = result.replaceAll("{sourceRoot}", sourceRoot);
|
|
227822
227820
|
}
|
|
227823
227821
|
if (result.includes("{workspaceRoot}")) {
|
|
227822
|
+
const { findWorkspaceRoot } = await import("@storm-software/config-tools");
|
|
227824
227823
|
result = result.replaceAll(
|
|
227825
227824
|
"{workspaceRoot}",
|
|
227826
|
-
tokenizerOptions.workspaceRoot ??
|
|
227825
|
+
tokenizerOptions.workspaceRoot ?? findWorkspaceRoot()
|
|
227827
227826
|
);
|
|
227828
227827
|
}
|
|
227829
227828
|
return result;
|
|
227830
227829
|
};
|
|
227831
|
-
var applyWorkspaceTokens = (options, config, tokenizerFn) => {
|
|
227832
|
-
|
|
227833
|
-
if (!result) {
|
|
227830
|
+
var applyWorkspaceTokens = async (options, config, tokenizerFn) => {
|
|
227831
|
+
if (!options) {
|
|
227834
227832
|
return {};
|
|
227835
227833
|
}
|
|
227836
|
-
|
|
227834
|
+
const result = {};
|
|
227835
|
+
for (const option of Object.keys(options)) {
|
|
227837
227836
|
if (typeof options[option] === "string") {
|
|
227838
|
-
|
|
227837
|
+
result[option] = await Promise.resolve(tokenizerFn(options[option], config));
|
|
227839
227838
|
} else if (Array.isArray(options[option])) {
|
|
227840
|
-
|
|
227841
|
-
(
|
|
227839
|
+
result[option] = await Promise.all(
|
|
227840
|
+
options[option].map(
|
|
227841
|
+
async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, config)) : item
|
|
227842
|
+
)
|
|
227842
227843
|
);
|
|
227843
227844
|
} else if (typeof options[option] === "object") {
|
|
227844
|
-
|
|
227845
|
+
result[option] = await applyWorkspaceTokens(options[option], config, tokenizerFn);
|
|
227845
227846
|
}
|
|
227846
|
-
|
|
227847
|
-
|
|
227847
|
+
}
|
|
227848
|
+
return result;
|
|
227848
227849
|
};
|
|
227849
227850
|
|
|
227850
227851
|
// packages/workspace-tools/src/base/base-executor.ts
|
|
@@ -227854,24 +227855,24 @@ var withRunExecutor = (name, executorFn, executorOptions) => async (_options, co
|
|
|
227854
227855
|
writeDebug,
|
|
227855
227856
|
writeError,
|
|
227856
227857
|
writeFatal,
|
|
227857
|
-
writeInfo
|
|
227858
|
+
writeInfo,
|
|
227858
227859
|
writeSuccess,
|
|
227859
227860
|
writeTrace,
|
|
227860
|
-
findWorkspaceRoot
|
|
227861
|
+
findWorkspaceRoot,
|
|
227861
227862
|
loadStormConfig
|
|
227862
227863
|
} = await import("@storm-software/config-tools");
|
|
227863
227864
|
const stopwatch = getStopwatch(name);
|
|
227864
227865
|
let options = _options;
|
|
227865
227866
|
let config;
|
|
227866
227867
|
try {
|
|
227867
|
-
|
|
227868
|
+
writeInfo(config, `\u26A1 Running the ${name} executor...
|
|
227868
227869
|
`);
|
|
227869
227870
|
if (!context.projectsConfigurations?.projects || !context.projectName || !context.projectsConfigurations.projects[context.projectName]) {
|
|
227870
227871
|
throw new Error(
|
|
227871
227872
|
"The Build process failed because the context is not valid. Please run this command from a workspace."
|
|
227872
227873
|
);
|
|
227873
227874
|
}
|
|
227874
|
-
const workspaceRoot =
|
|
227875
|
+
const workspaceRoot = findWorkspaceRoot();
|
|
227875
227876
|
const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot;
|
|
227876
227877
|
const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot;
|
|
227877
227878
|
const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
|
|
@@ -227906,7 +227907,7 @@ ${Object.keys(options).map(
|
|
|
227906
227907
|
(key) => ` - ${key}=${_isFunction(options[key]) ? "<function>" : JSON.stringify(options[key])}`
|
|
227907
227908
|
).join("\n")}`
|
|
227908
227909
|
);
|
|
227909
|
-
const tokenized = applyWorkspaceTokens(
|
|
227910
|
+
const tokenized = await applyWorkspaceTokens(
|
|
227910
227911
|
options,
|
|
227911
227912
|
{
|
|
227912
227913
|
config,
|
|
@@ -227968,8 +227969,9 @@ var _isFunction = (value) => {
|
|
|
227968
227969
|
|
|
227969
227970
|
// packages/workspace-tools/src/executors/typia/executor.ts
|
|
227970
227971
|
async function typiaExecutorFn(options, _, config) {
|
|
227972
|
+
const { writeInfo } = await import("@storm-software/config-tools");
|
|
227971
227973
|
if (options.clean !== false) {
|
|
227972
|
-
|
|
227974
|
+
writeInfo(config, `\u{1F9F9} Cleaning output path: ${options.outputPath}`);
|
|
227973
227975
|
(0, import_fs_extra.removeSync)(options.outputPath);
|
|
227974
227976
|
}
|
|
227975
227977
|
await import_TypiaProgrammer.TypiaProgrammer.build({
|
|
@@ -391223,8 +391223,7 @@ module.exports = __toCommonJS(generator_exports);
|
|
|
391223
391223
|
var import_devkit2 = __toESM(require_devkit());
|
|
391224
391224
|
|
|
391225
391225
|
// packages/workspace-tools/src/utils/apply-workspace-tokens.ts
|
|
391226
|
-
var
|
|
391227
|
-
var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
|
|
391226
|
+
var applyWorkspaceGeneratorTokens = async (option, tokenizerOptions) => {
|
|
391228
391227
|
let result = option;
|
|
391229
391228
|
if (!result) {
|
|
391230
391229
|
return result;
|
|
@@ -391240,30 +391239,33 @@ var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
|
|
|
391240
391239
|
}
|
|
391241
391240
|
}
|
|
391242
391241
|
if (result.includes("{workspaceRoot}")) {
|
|
391242
|
+
const { findWorkspaceRoot } = await import("@storm-software/config-tools");
|
|
391243
391243
|
result = result.replaceAll(
|
|
391244
391244
|
"{workspaceRoot}",
|
|
391245
|
-
tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ??
|
|
391245
|
+
tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ?? findWorkspaceRoot()
|
|
391246
391246
|
);
|
|
391247
391247
|
}
|
|
391248
391248
|
return result;
|
|
391249
391249
|
};
|
|
391250
|
-
var applyWorkspaceTokens = (options8, config, tokenizerFn) => {
|
|
391251
|
-
|
|
391252
|
-
if (!result) {
|
|
391250
|
+
var applyWorkspaceTokens = async (options8, config, tokenizerFn) => {
|
|
391251
|
+
if (!options8) {
|
|
391253
391252
|
return {};
|
|
391254
391253
|
}
|
|
391255
|
-
|
|
391254
|
+
const result = {};
|
|
391255
|
+
for (const option of Object.keys(options8)) {
|
|
391256
391256
|
if (typeof options8[option] === "string") {
|
|
391257
|
-
|
|
391257
|
+
result[option] = await Promise.resolve(tokenizerFn(options8[option], config));
|
|
391258
391258
|
} else if (Array.isArray(options8[option])) {
|
|
391259
|
-
|
|
391260
|
-
(
|
|
391259
|
+
result[option] = await Promise.all(
|
|
391260
|
+
options8[option].map(
|
|
391261
|
+
async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, config)) : item
|
|
391262
|
+
)
|
|
391261
391263
|
);
|
|
391262
391264
|
} else if (typeof options8[option] === "object") {
|
|
391263
|
-
|
|
391265
|
+
result[option] = await applyWorkspaceTokens(options8[option], config, tokenizerFn);
|
|
391264
391266
|
}
|
|
391265
|
-
|
|
391266
|
-
|
|
391267
|
+
}
|
|
391268
|
+
return result;
|
|
391267
391269
|
};
|
|
391268
391270
|
|
|
391269
391271
|
// packages/workspace-tools/src/base/base-generator.ts
|
|
@@ -391314,7 +391316,7 @@ ${Object.keys(process.env).map((key2) => ` - ${key2}=${JSON.stringify(process.en
|
|
|
391314
391316
|
`Generator schema options \u2699\uFE0F
|
|
391315
391317
|
${Object.keys(options8 ?? {}).map((key2) => ` - ${key2}=${JSON.stringify(options8[key2])}`).join("\n")}`
|
|
391316
391318
|
);
|
|
391317
|
-
const tokenized = applyWorkspaceTokens(
|
|
391319
|
+
const tokenized = await applyWorkspaceTokens(
|
|
391318
391320
|
options8,
|
|
391319
391321
|
{ workspaceRoot: tree.root, config },
|
|
391320
391322
|
applyWorkspaceGeneratorTokens
|
|
@@ -176547,8 +176547,7 @@ var zodToJsonSchema = (schema2, options8) => {
|
|
|
176547
176547
|
};
|
|
176548
176548
|
|
|
176549
176549
|
// packages/workspace-tools/src/utils/apply-workspace-tokens.ts
|
|
176550
|
-
var
|
|
176551
|
-
var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
|
|
176550
|
+
var applyWorkspaceGeneratorTokens = async (option, tokenizerOptions) => {
|
|
176552
176551
|
let result = option;
|
|
176553
176552
|
if (!result) {
|
|
176554
176553
|
return result;
|
|
@@ -176564,30 +176563,33 @@ var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
|
|
|
176564
176563
|
}
|
|
176565
176564
|
}
|
|
176566
176565
|
if (result.includes("{workspaceRoot}")) {
|
|
176566
|
+
const { findWorkspaceRoot } = await import("@storm-software/config-tools");
|
|
176567
176567
|
result = result.replaceAll(
|
|
176568
176568
|
"{workspaceRoot}",
|
|
176569
|
-
tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ??
|
|
176569
|
+
tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ?? findWorkspaceRoot()
|
|
176570
176570
|
);
|
|
176571
176571
|
}
|
|
176572
176572
|
return result;
|
|
176573
176573
|
};
|
|
176574
|
-
var applyWorkspaceTokens = (options8, config, tokenizerFn) => {
|
|
176575
|
-
|
|
176576
|
-
if (!result) {
|
|
176574
|
+
var applyWorkspaceTokens = async (options8, config, tokenizerFn) => {
|
|
176575
|
+
if (!options8) {
|
|
176577
176576
|
return {};
|
|
176578
176577
|
}
|
|
176579
|
-
|
|
176578
|
+
const result = {};
|
|
176579
|
+
for (const option of Object.keys(options8)) {
|
|
176580
176580
|
if (typeof options8[option] === "string") {
|
|
176581
|
-
|
|
176581
|
+
result[option] = await Promise.resolve(tokenizerFn(options8[option], config));
|
|
176582
176582
|
} else if (Array.isArray(options8[option])) {
|
|
176583
|
-
|
|
176584
|
-
(
|
|
176583
|
+
result[option] = await Promise.all(
|
|
176584
|
+
options8[option].map(
|
|
176585
|
+
async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, config)) : item
|
|
176586
|
+
)
|
|
176585
176587
|
);
|
|
176586
176588
|
} else if (typeof options8[option] === "object") {
|
|
176587
|
-
|
|
176589
|
+
result[option] = await applyWorkspaceTokens(options8[option], config, tokenizerFn);
|
|
176588
176590
|
}
|
|
176589
|
-
|
|
176590
|
-
|
|
176591
|
+
}
|
|
176592
|
+
return result;
|
|
176591
176593
|
};
|
|
176592
176594
|
|
|
176593
176595
|
// packages/workspace-tools/src/base/base-generator.ts
|
|
@@ -176638,7 +176640,7 @@ ${Object.keys(process.env).map((key2) => ` - ${key2}=${JSON.stringify(process.en
|
|
|
176638
176640
|
`Generator schema options \u2699\uFE0F
|
|
176639
176641
|
${Object.keys(options8 ?? {}).map((key2) => ` - ${key2}=${JSON.stringify(options8[key2])}`).join("\n")}`
|
|
176640
176642
|
);
|
|
176641
|
-
const tokenized = applyWorkspaceTokens(
|
|
176643
|
+
const tokenized = await applyWorkspaceTokens(
|
|
176642
176644
|
options8,
|
|
176643
176645
|
{ workspaceRoot: tree.root, config },
|
|
176644
176646
|
applyWorkspaceGeneratorTokens
|
|
@@ -176686,14 +176688,16 @@ ${Object.keys(options8 ?? {}).map((key2) => ` - ${key2}=${JSON.stringify(options
|
|
|
176686
176688
|
|
|
176687
176689
|
// packages/workspace-tools/src/utils/get-project-configurations.ts
|
|
176688
176690
|
var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
|
|
176689
|
-
var
|
|
176690
|
-
|
|
176691
|
+
var getProjectConfigurations = async () => {
|
|
176692
|
+
const { findWorkspaceRoot } = await import("@storm-software/config-tools");
|
|
176693
|
+
return (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(findWorkspaceRoot());
|
|
176694
|
+
};
|
|
176691
176695
|
|
|
176692
176696
|
// packages/workspace-tools/src/generators/config-schema/generator.ts
|
|
176693
|
-
var import_config_tools3 = require("@storm-software/config-tools");
|
|
176694
176697
|
async function configSchemaGeneratorFn(tree, options8, config) {
|
|
176698
|
+
const { findWorkspaceRoot } = await import("@storm-software/config-tools");
|
|
176695
176699
|
const projectConfigurations = getProjectConfigurations();
|
|
176696
|
-
const workspaceRoot = config?.workspaceRoot ??
|
|
176700
|
+
const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot();
|
|
176697
176701
|
const modules = await Promise.all(
|
|
176698
176702
|
Object.keys(projectConfigurations).map(async (key2) => {
|
|
176699
176703
|
if (projectConfigurations[key2]?.config) {
|
|
@@ -391223,8 +391223,7 @@ module.exports = __toCommonJS(generator_exports);
|
|
|
391223
391223
|
var import_devkit2 = __toESM(require_devkit());
|
|
391224
391224
|
|
|
391225
391225
|
// packages/workspace-tools/src/utils/apply-workspace-tokens.ts
|
|
391226
|
-
var
|
|
391227
|
-
var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
|
|
391226
|
+
var applyWorkspaceGeneratorTokens = async (option, tokenizerOptions) => {
|
|
391228
391227
|
let result = option;
|
|
391229
391228
|
if (!result) {
|
|
391230
391229
|
return result;
|
|
@@ -391240,30 +391239,33 @@ var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
|
|
|
391240
391239
|
}
|
|
391241
391240
|
}
|
|
391242
391241
|
if (result.includes("{workspaceRoot}")) {
|
|
391242
|
+
const { findWorkspaceRoot } = await import("@storm-software/config-tools");
|
|
391243
391243
|
result = result.replaceAll(
|
|
391244
391244
|
"{workspaceRoot}",
|
|
391245
|
-
tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ??
|
|
391245
|
+
tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ?? findWorkspaceRoot()
|
|
391246
391246
|
);
|
|
391247
391247
|
}
|
|
391248
391248
|
return result;
|
|
391249
391249
|
};
|
|
391250
|
-
var applyWorkspaceTokens = (options8, config, tokenizerFn) => {
|
|
391251
|
-
|
|
391252
|
-
if (!result) {
|
|
391250
|
+
var applyWorkspaceTokens = async (options8, config, tokenizerFn) => {
|
|
391251
|
+
if (!options8) {
|
|
391253
391252
|
return {};
|
|
391254
391253
|
}
|
|
391255
|
-
|
|
391254
|
+
const result = {};
|
|
391255
|
+
for (const option of Object.keys(options8)) {
|
|
391256
391256
|
if (typeof options8[option] === "string") {
|
|
391257
|
-
|
|
391257
|
+
result[option] = await Promise.resolve(tokenizerFn(options8[option], config));
|
|
391258
391258
|
} else if (Array.isArray(options8[option])) {
|
|
391259
|
-
|
|
391260
|
-
(
|
|
391259
|
+
result[option] = await Promise.all(
|
|
391260
|
+
options8[option].map(
|
|
391261
|
+
async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, config)) : item
|
|
391262
|
+
)
|
|
391261
391263
|
);
|
|
391262
391264
|
} else if (typeof options8[option] === "object") {
|
|
391263
|
-
|
|
391265
|
+
result[option] = await applyWorkspaceTokens(options8[option], config, tokenizerFn);
|
|
391264
391266
|
}
|
|
391265
|
-
|
|
391266
|
-
|
|
391267
|
+
}
|
|
391268
|
+
return result;
|
|
391267
391269
|
};
|
|
391268
391270
|
|
|
391269
391271
|
// packages/workspace-tools/src/base/base-generator.ts
|
|
@@ -391314,7 +391316,7 @@ ${Object.keys(process.env).map((key2) => ` - ${key2}=${JSON.stringify(process.en
|
|
|
391314
391316
|
`Generator schema options \u2699\uFE0F
|
|
391315
391317
|
${Object.keys(options8 ?? {}).map((key2) => ` - ${key2}=${JSON.stringify(options8[key2])}`).join("\n")}`
|
|
391316
391318
|
);
|
|
391317
|
-
const tokenized = applyWorkspaceTokens(
|
|
391319
|
+
const tokenized = await applyWorkspaceTokens(
|
|
391318
391320
|
options8,
|
|
391319
391321
|
{ workspaceRoot: tree.root, config },
|
|
391320
391322
|
applyWorkspaceGeneratorTokens
|
|
@@ -391223,8 +391223,7 @@ module.exports = __toCommonJS(generator_exports);
|
|
|
391223
391223
|
var import_devkit2 = __toESM(require_devkit());
|
|
391224
391224
|
|
|
391225
391225
|
// packages/workspace-tools/src/utils/apply-workspace-tokens.ts
|
|
391226
|
-
var
|
|
391227
|
-
var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
|
|
391226
|
+
var applyWorkspaceGeneratorTokens = async (option, tokenizerOptions) => {
|
|
391228
391227
|
let result = option;
|
|
391229
391228
|
if (!result) {
|
|
391230
391229
|
return result;
|
|
@@ -391240,30 +391239,33 @@ var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
|
|
|
391240
391239
|
}
|
|
391241
391240
|
}
|
|
391242
391241
|
if (result.includes("{workspaceRoot}")) {
|
|
391242
|
+
const { findWorkspaceRoot } = await import("@storm-software/config-tools");
|
|
391243
391243
|
result = result.replaceAll(
|
|
391244
391244
|
"{workspaceRoot}",
|
|
391245
|
-
tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ??
|
|
391245
|
+
tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ?? findWorkspaceRoot()
|
|
391246
391246
|
);
|
|
391247
391247
|
}
|
|
391248
391248
|
return result;
|
|
391249
391249
|
};
|
|
391250
|
-
var applyWorkspaceTokens = (options8, config, tokenizerFn) => {
|
|
391251
|
-
|
|
391252
|
-
if (!result) {
|
|
391250
|
+
var applyWorkspaceTokens = async (options8, config, tokenizerFn) => {
|
|
391251
|
+
if (!options8) {
|
|
391253
391252
|
return {};
|
|
391254
391253
|
}
|
|
391255
|
-
|
|
391254
|
+
const result = {};
|
|
391255
|
+
for (const option of Object.keys(options8)) {
|
|
391256
391256
|
if (typeof options8[option] === "string") {
|
|
391257
|
-
|
|
391257
|
+
result[option] = await Promise.resolve(tokenizerFn(options8[option], config));
|
|
391258
391258
|
} else if (Array.isArray(options8[option])) {
|
|
391259
|
-
|
|
391260
|
-
(
|
|
391259
|
+
result[option] = await Promise.all(
|
|
391260
|
+
options8[option].map(
|
|
391261
|
+
async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, config)) : item
|
|
391262
|
+
)
|
|
391261
391263
|
);
|
|
391262
391264
|
} else if (typeof options8[option] === "object") {
|
|
391263
|
-
|
|
391265
|
+
result[option] = await applyWorkspaceTokens(options8[option], config, tokenizerFn);
|
|
391264
391266
|
}
|
|
391265
|
-
|
|
391266
|
-
|
|
391267
|
+
}
|
|
391268
|
+
return result;
|
|
391267
391269
|
};
|
|
391268
391270
|
|
|
391269
391271
|
// packages/workspace-tools/src/base/base-generator.ts
|
|
@@ -391314,7 +391316,7 @@ ${Object.keys(process.env).map((key2) => ` - ${key2}=${JSON.stringify(process.en
|
|
|
391314
391316
|
`Generator schema options \u2699\uFE0F
|
|
391315
391317
|
${Object.keys(options8 ?? {}).map((key2) => ` - ${key2}=${JSON.stringify(options8[key2])}`).join("\n")}`
|
|
391316
391318
|
);
|
|
391317
|
-
const tokenized = applyWorkspaceTokens(
|
|
391319
|
+
const tokenized = await applyWorkspaceTokens(
|
|
391318
391320
|
options8,
|
|
391319
391321
|
{ workspaceRoot: tree.root, config },
|
|
391320
391322
|
applyWorkspaceGeneratorTokens
|
|
@@ -171961,8 +171961,7 @@ var path13 = __toESM(require("node:path"));
|
|
|
171961
171961
|
var import_devkit = __toESM(require_devkit());
|
|
171962
171962
|
|
|
171963
171963
|
// packages/workspace-tools/src/utils/apply-workspace-tokens.ts
|
|
171964
|
-
var
|
|
171965
|
-
var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
|
|
171964
|
+
var applyWorkspaceGeneratorTokens = async (option, tokenizerOptions) => {
|
|
171966
171965
|
let result = option;
|
|
171967
171966
|
if (!result) {
|
|
171968
171967
|
return result;
|
|
@@ -171978,30 +171977,33 @@ var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
|
|
|
171978
171977
|
}
|
|
171979
171978
|
}
|
|
171980
171979
|
if (result.includes("{workspaceRoot}")) {
|
|
171980
|
+
const { findWorkspaceRoot } = await import("@storm-software/config-tools");
|
|
171981
171981
|
result = result.replaceAll(
|
|
171982
171982
|
"{workspaceRoot}",
|
|
171983
|
-
tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ??
|
|
171983
|
+
tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ?? findWorkspaceRoot()
|
|
171984
171984
|
);
|
|
171985
171985
|
}
|
|
171986
171986
|
return result;
|
|
171987
171987
|
};
|
|
171988
|
-
var applyWorkspaceTokens = (options8, config, tokenizerFn) => {
|
|
171989
|
-
|
|
171990
|
-
if (!result) {
|
|
171988
|
+
var applyWorkspaceTokens = async (options8, config, tokenizerFn) => {
|
|
171989
|
+
if (!options8) {
|
|
171991
171990
|
return {};
|
|
171992
171991
|
}
|
|
171993
|
-
|
|
171992
|
+
const result = {};
|
|
171993
|
+
for (const option of Object.keys(options8)) {
|
|
171994
171994
|
if (typeof options8[option] === "string") {
|
|
171995
|
-
|
|
171995
|
+
result[option] = await Promise.resolve(tokenizerFn(options8[option], config));
|
|
171996
171996
|
} else if (Array.isArray(options8[option])) {
|
|
171997
|
-
|
|
171998
|
-
(
|
|
171997
|
+
result[option] = await Promise.all(
|
|
171998
|
+
options8[option].map(
|
|
171999
|
+
async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, config)) : item
|
|
172000
|
+
)
|
|
171999
172001
|
);
|
|
172000
172002
|
} else if (typeof options8[option] === "object") {
|
|
172001
|
-
|
|
172003
|
+
result[option] = await applyWorkspaceTokens(options8[option], config, tokenizerFn);
|
|
172002
172004
|
}
|
|
172003
|
-
|
|
172004
|
-
|
|
172005
|
+
}
|
|
172006
|
+
return result;
|
|
172005
172007
|
};
|
|
172006
172008
|
|
|
172007
172009
|
// packages/workspace-tools/src/base/base-generator.ts
|
|
@@ -172052,7 +172054,7 @@ ${Object.keys(process.env).map((key2) => ` - ${key2}=${JSON.stringify(process.en
|
|
|
172052
172054
|
`Generator schema options \u2699\uFE0F
|
|
172053
172055
|
${Object.keys(options8 ?? {}).map((key2) => ` - ${key2}=${JSON.stringify(options8[key2])}`).join("\n")}`
|
|
172054
172056
|
);
|
|
172055
|
-
const tokenized = applyWorkspaceTokens(
|
|
172057
|
+
const tokenized = await applyWorkspaceTokens(
|
|
172056
172058
|
options8,
|
|
172057
172059
|
{ workspaceRoot: tree.root, config },
|
|
172058
172060
|
applyWorkspaceGeneratorTokens
|