@storm-software/workspace-tools 1.267.20 → 1.267.21
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 +12 -0
- package/README.md +1 -1
- package/dist/chunk-22UY7NFX.js +41 -0
- package/dist/chunk-23BZQTB2.mjs +425 -0
- package/dist/{chunk-7O34DHUG.js → chunk-2AVWFUXP.js} +4 -19
- package/dist/{chunk-YAKIVJU6.mjs → chunk-2M22JVJQ.mjs} +307 -192
- package/dist/{chunk-GXIIWSRN.mjs → chunk-3EDSGFA5.mjs} +63 -54
- package/dist/chunk-3RG5ZIWI.js +10 -0
- package/dist/{chunk-AC5SI4YZ.js → chunk-3TYXXJKV.js} +11 -8
- package/dist/{chunk-7GXOAREP.mjs → chunk-3ZBMLG4D.mjs} +17 -14
- package/dist/chunk-437WGH2M.mjs +32 -0
- package/dist/{chunk-ULBTYC2B.js → chunk-4BECJRPP.js} +13 -42
- package/dist/chunk-4QRA66TH.mjs +379 -0
- package/dist/chunk-4S66IYQF.mjs +31 -0
- package/dist/{chunk-4JOIS7WW.js → chunk-4WHSR4FK.js} +24 -14
- package/dist/{chunk-JTAXCQX6.js → chunk-53DNHF7B.js} +7 -13
- package/dist/{chunk-GGGO542M.js → chunk-54FVHKCU.js} +36 -24
- package/dist/{chunk-23IRDNF3.mjs → chunk-5HUW3BTP.mjs} +37 -21
- package/dist/{chunk-7NN23VWS.mjs → chunk-5LB2F3L4.mjs} +80 -65
- package/dist/{chunk-UF6KFXG5.js → chunk-5VY5IBBQ.js} +20 -17
- package/dist/{chunk-6QO3KMZA.js → chunk-5ZFTWEKB.js} +2 -16
- package/dist/chunk-6EMYX25V.js +7 -0
- package/dist/chunk-6QZSAZZ3.mjs +64 -0
- package/dist/{chunk-2JA7WAH7.mjs → chunk-7AN4JMFC.mjs} +2 -16
- package/dist/{chunk-MXS2AKLY.mjs → chunk-7HWV6U3E.mjs} +33 -18
- package/dist/{chunk-GKL4BY2Y.js → chunk-A5CKB6IJ.js} +7 -8
- package/dist/{chunk-HSN5YXMG.mjs → chunk-ABE7UOMX.mjs} +24 -21
- package/dist/{chunk-6W2B4WA4.mjs → chunk-AHLKRK7D.mjs} +33 -18
- package/dist/{chunk-6CGAYKQL.js → chunk-AJ3C2EDW.js} +69 -44
- package/dist/chunk-AMW7VHFM.mjs +52 -0
- package/dist/chunk-AOFWKOAI.js +31 -0
- package/dist/{chunk-7YRW5HNX.js → chunk-AX3RSZT7.js} +42 -31
- package/dist/chunk-BFD7HHVZ.mjs +32 -0
- package/dist/{chunk-ZMFVKBRM.js → chunk-BWGJVRAS.js} +2 -13
- package/dist/{chunk-M6NHJNGU.js → chunk-CWBHZBTN.js} +277 -169
- package/dist/{chunk-BNYSKNEI.mjs → chunk-EKWR7TBP.mjs} +36 -24
- package/dist/chunk-EU6N7QT3.js +32 -0
- package/dist/chunk-EYXDS7SG.js +105 -0
- package/dist/chunk-F66XEAID.mjs +113 -0
- package/dist/chunk-FOFNKU5G.js +379 -0
- package/dist/{chunk-7NNHBZC5.js → chunk-GNOIETZR.js} +28 -17
- package/dist/chunk-GQQLBQPQ.mjs +32 -0
- package/dist/{chunk-7PRHEOCT.js → chunk-H5NKKUPV.js} +31 -18
- package/dist/{chunk-NM7WF6O5.mjs → chunk-HMJTTE4A.mjs} +39 -30
- package/dist/{chunk-ZCIEDGNG.mjs → chunk-HY3ZC5EZ.mjs} +10 -31
- package/dist/{chunk-OQPX75CG.js → chunk-I5MSPQMO.js} +31 -18
- package/dist/{chunk-WPRKDCZP.mjs → chunk-IEZKYJSF.mjs} +3 -6
- package/dist/{chunk-IWCQL3AQ.js → chunk-IL3R5ZVS.js} +10 -31
- package/dist/{chunk-P4OVFIT6.js → chunk-IZN2IVJ4.js} +19 -6
- package/dist/{chunk-UALZJZUK.js → chunk-J2Z4WP3E.js} +32 -16
- package/dist/{chunk-RBU35LQW.js → chunk-J4DYXH46.js} +70 -61
- package/dist/chunk-KP4RPOBI.mjs +105 -0
- package/dist/chunk-KR72GKIT.mjs +7 -0
- package/dist/chunk-L4NCVOB5.mjs +17 -0
- package/dist/{chunk-4Y6B6JDH.js → chunk-LBAVVYKU.js} +315 -136
- package/dist/{chunk-34WSVY5D.mjs → chunk-LSF4BHCI.mjs} +24 -14
- package/dist/chunk-M725BO42.mjs +32 -0
- package/dist/{chunk-SAWEMBTS.mjs → chunk-MF6VZSIO.mjs} +30 -17
- package/dist/{chunk-2I6S33ZD.mjs → chunk-MMBLGUC3.mjs} +311 -132
- package/dist/chunk-MZSZKV4N.mjs +47 -0
- package/dist/chunk-O6RRIC6I.js +32 -0
- package/dist/chunk-OKSECMVK.js +32 -0
- package/dist/chunk-Q2HYWACQ.mjs +50 -0
- package/dist/{chunk-LJFHW7ZR.mjs → chunk-QFWQZOVG.mjs} +14 -43
- package/dist/{chunk-DHGZTMND.js → chunk-QVYCDING.js} +4 -7
- package/dist/{chunk-Z4NKRWWJ.js → chunk-RJRBED5Q.js} +48 -32
- package/dist/chunk-S5Z4QGF3.js +64 -0
- package/dist/{chunk-KQL5XMNL.mjs → chunk-SITFTWPY.mjs} +23 -8
- package/dist/chunk-SNMXP6JV.mjs +41 -0
- package/dist/chunk-SPXJBMLY.js +50 -0
- package/dist/{chunk-7TLYMNLD.mjs → chunk-SW2E5MQJ.mjs} +4 -19
- package/dist/{chunk-OKW5O5P4.js → chunk-T7BALDKJ.js} +26 -22
- package/dist/chunk-TSYIV33W.js +32 -0
- package/dist/{chunk-S3IPRXVE.mjs → chunk-U65XVJ4Y.mjs} +1 -12
- package/dist/{chunk-D3U4WMSI.mjs → chunk-U7JFVMCK.mjs} +6 -12
- package/dist/chunk-UIPUSUAB.js +425 -0
- package/dist/{chunk-O5QR3B3Z.mjs → chunk-UYSJG2E5.mjs} +56 -31
- package/dist/{chunk-SJGDCFBH.mjs → chunk-VLOTOQYE.mjs} +11 -8
- package/dist/{chunk-ENE6R7BT.mjs → chunk-W2C5IGWW.mjs} +3 -6
- package/dist/{chunk-G4QFSE5B.js → chunk-WE4HK4RN.js} +327 -212
- package/dist/{chunk-SUQKASD7.js → chunk-X2VJXJEF.js} +82 -67
- package/dist/{chunk-RK3UDPDP.mjs → chunk-X6PHOMFB.mjs} +32 -16
- package/dist/{chunk-PK2SUBWI.js → chunk-XZSS3YAB.js} +19 -16
- package/dist/chunk-YXBFVZ3K.js +47 -0
- package/dist/{chunk-CUPARBOS.js → chunk-ZP76EMBE.js} +41 -32
- package/dist/{chunk-OBZTQWHM.mjs → chunk-ZT4IIRQF.mjs} +254 -146
- package/dist/executors.js +21 -21
- package/dist/executors.mjs +20 -20
- package/dist/generators.js +17 -17
- package/dist/generators.mjs +18 -18
- package/dist/index.js +41 -41
- package/dist/index.mjs +42 -42
- package/dist/src/base/base-executor.js +7 -7
- package/dist/src/base/base-executor.mjs +6 -6
- package/dist/src/base/base-executor.untyped.js +1 -1
- package/dist/src/base/base-executor.untyped.mjs +1 -1
- package/dist/src/base/base-generator.js +7 -7
- package/dist/src/base/base-generator.mjs +6 -6
- package/dist/src/base/base-generator.untyped.js +1 -1
- package/dist/src/base/base-generator.untyped.mjs +1 -1
- package/dist/src/base/cargo-base-executor.untyped.js +3 -3
- package/dist/src/base/cargo-base-executor.untyped.mjs +2 -2
- package/dist/src/base/index.js +13 -13
- package/dist/src/base/index.mjs +12 -12
- package/dist/src/base/typescript-build-executor.untyped.js +3 -3
- package/dist/src/base/typescript-build-executor.untyped.mjs +2 -2
- package/dist/src/base/typescript-library-generator.untyped.js +3 -3
- package/dist/src/base/typescript-library-generator.untyped.mjs +2 -2
- package/dist/src/executors/cargo-build/executor.js +9 -9
- package/dist/src/executors/cargo-build/executor.mjs +8 -8
- package/dist/src/executors/cargo-build/untyped.js +3 -3
- package/dist/src/executors/cargo-build/untyped.mjs +2 -2
- package/dist/src/executors/cargo-check/executor.js +9 -9
- package/dist/src/executors/cargo-check/executor.mjs +8 -8
- package/dist/src/executors/cargo-check/untyped.js +3 -3
- package/dist/src/executors/cargo-check/untyped.mjs +2 -2
- package/dist/src/executors/cargo-clippy/executor.js +9 -9
- package/dist/src/executors/cargo-clippy/executor.mjs +8 -8
- package/dist/src/executors/cargo-clippy/untyped.js +3 -3
- package/dist/src/executors/cargo-clippy/untyped.mjs +2 -2
- package/dist/src/executors/cargo-doc/executor.js +9 -9
- package/dist/src/executors/cargo-doc/executor.mjs +8 -8
- package/dist/src/executors/cargo-doc/untyped.js +3 -3
- package/dist/src/executors/cargo-doc/untyped.mjs +2 -2
- package/dist/src/executors/cargo-format/executor.js +9 -9
- package/dist/src/executors/cargo-format/executor.mjs +8 -8
- package/dist/src/executors/cargo-format/untyped.js +3 -3
- package/dist/src/executors/cargo-format/untyped.mjs +2 -2
- package/dist/src/executors/cargo-publish/executor.js +4 -4
- package/dist/src/executors/cargo-publish/executor.mjs +3 -3
- package/dist/src/executors/cargo-publish/untyped.js +3 -3
- package/dist/src/executors/cargo-publish/untyped.mjs +2 -2
- package/dist/src/executors/clean-package/executor.js +84 -62
- package/dist/src/executors/clean-package/executor.mjs +84 -62
- package/dist/src/executors/clean-package/untyped.js +2 -4
- package/dist/src/executors/clean-package/untyped.mjs +2 -4
- package/dist/src/executors/esbuild/executor.js +8 -8
- package/dist/src/executors/esbuild/executor.mjs +7 -7
- package/dist/src/executors/esbuild/untyped.js +4 -8
- package/dist/src/executors/esbuild/untyped.mjs +3 -7
- package/dist/src/executors/npm-publish/executor.js +5 -5
- package/dist/src/executors/npm-publish/executor.mjs +4 -4
- package/dist/src/executors/npm-publish/untyped.js +1 -1
- package/dist/src/executors/npm-publish/untyped.mjs +1 -1
- package/dist/src/executors/size-limit/executor.js +8 -8
- package/dist/src/executors/size-limit/executor.mjs +7 -7
- package/dist/src/executors/size-limit/untyped.js +1 -1
- package/dist/src/executors/size-limit/untyped.mjs +1 -1
- package/dist/src/executors/typia/executor.js +8 -8
- package/dist/src/executors/typia/executor.mjs +7 -7
- package/dist/src/executors/typia/untyped.js +4 -12
- package/dist/src/executors/typia/untyped.mjs +4 -12
- package/dist/src/executors/unbuild/executor.js +8 -8
- package/dist/src/executors/unbuild/executor.mjs +7 -7
- package/dist/src/executors/unbuild/untyped.js +6 -13
- package/dist/src/executors/unbuild/untyped.mjs +5 -12
- package/dist/src/generators/browser-library/generator.js +10 -10
- package/dist/src/generators/browser-library/generator.mjs +9 -9
- package/dist/src/generators/browser-library/untyped.js +5 -11
- package/dist/src/generators/browser-library/untyped.mjs +4 -10
- package/dist/src/generators/config-schema/generator.js +8 -8
- package/dist/src/generators/config-schema/generator.mjs +7 -7
- package/dist/src/generators/config-schema/untyped.js +1 -1
- package/dist/src/generators/config-schema/untyped.mjs +1 -1
- package/dist/src/generators/init/init.js +3 -3
- package/dist/src/generators/init/init.mjs +2 -2
- package/dist/src/generators/init/untyped.js +1 -1
- package/dist/src/generators/init/untyped.mjs +1 -1
- package/dist/src/generators/neutral-library/generator.js +10 -10
- package/dist/src/generators/neutral-library/generator.mjs +9 -9
- package/dist/src/generators/neutral-library/untyped.js +5 -10
- package/dist/src/generators/neutral-library/untyped.mjs +4 -9
- package/dist/src/generators/node-library/generator.js +10 -10
- package/dist/src/generators/node-library/generator.mjs +9 -9
- package/dist/src/generators/node-library/untyped.js +5 -11
- package/dist/src/generators/node-library/untyped.mjs +4 -10
- package/dist/src/generators/preset/generator.js +8 -8
- package/dist/src/generators/preset/generator.mjs +7 -7
- package/dist/src/generators/preset/untyped.js +3 -11
- package/dist/src/generators/preset/untyped.mjs +3 -11
- package/dist/src/generators/release-version/generator.js +7 -7
- package/dist/src/generators/release-version/generator.mjs +6 -6
- package/dist/src/generators/release-version/untyped.js +3 -14
- package/dist/src/generators/release-version/untyped.mjs +3 -14
- package/dist/src/plugins/rust/cargo-toml.js +5 -5
- package/dist/src/plugins/rust/cargo-toml.mjs +4 -4
- package/dist/src/plugins/rust/index.js +5 -5
- package/dist/src/plugins/rust/index.mjs +4 -4
- package/dist/src/plugins/typescript/index.js +5 -5
- package/dist/src/plugins/typescript/index.mjs +4 -4
- package/dist/src/plugins/typescript/project-config.js +5 -5
- package/dist/src/plugins/typescript/project-config.mjs +4 -4
- package/dist/src/plugins/typescript/tsup.js +114 -109
- package/dist/src/plugins/typescript/tsup.mjs +116 -111
- package/dist/src/plugins/typescript/untyped-schema.js +93 -77
- package/dist/src/plugins/typescript/untyped-schema.mjs +96 -80
- package/dist/src/types.js +1 -1
- package/dist/src/types.mjs +1 -1
- package/dist/src/utils/apply-workspace-tokens.js +5 -5
- package/dist/src/utils/apply-workspace-tokens.mjs +4 -4
- package/dist/src/utils/cargo.js +3 -3
- package/dist/src/utils/cargo.mjs +2 -2
- package/dist/src/utils/create-cli-options.js +3 -3
- package/dist/src/utils/create-cli-options.mjs +2 -2
- package/dist/src/utils/get-project-configurations.js +5 -5
- package/dist/src/utils/get-project-configurations.mjs +4 -4
- package/dist/src/utils/index.js +15 -15
- package/dist/src/utils/index.mjs +14 -14
- package/dist/src/utils/lock-file.js +3 -3
- package/dist/src/utils/lock-file.mjs +2 -2
- package/dist/src/utils/package-helpers.js +5 -5
- package/dist/src/utils/package-helpers.mjs +4 -4
- package/dist/src/utils/plugin-helpers.js +4 -4
- package/dist/src/utils/plugin-helpers.mjs +3 -3
- package/dist/src/utils/pnpm-deps-update.js +4 -4
- package/dist/src/utils/pnpm-deps-update.mjs +3 -3
- package/dist/src/utils/project-tags.js +3 -3
- package/dist/src/utils/project-tags.mjs +2 -2
- package/dist/src/utils/toml.js +3 -3
- package/dist/src/utils/toml.mjs +2 -2
- package/dist/src/utils/typia-transform.js +3 -3
- package/dist/src/utils/typia-transform.mjs +2 -2
- package/dist/src/utils/versions.js +1 -1
- package/dist/src/utils/versions.mjs +1 -1
- package/package.json +1 -1
- package/dist/chunk-3GQAWCBQ.js +0 -13
- package/dist/chunk-3IZ3O4OK.js +0 -30
- package/dist/chunk-6JJB5AYA.js +0 -51
- package/dist/chunk-7AXFMX2T.js +0 -37
- package/dist/chunk-B3DVFXXD.js +0 -32
- package/dist/chunk-DHOPT66G.mjs +0 -32
- package/dist/chunk-ECGUA6DW.mjs +0 -48
- package/dist/chunk-FMDP5I2Q.mjs +0 -446
- package/dist/chunk-GFHXZA2W.mjs +0 -31
- package/dist/chunk-HIZQZGPN.mjs +0 -32
- package/dist/chunk-HOXPAVCL.js +0 -32
- package/dist/chunk-ICPUM2HS.js +0 -50
- package/dist/chunk-ID7QJZH6.mjs +0 -37
- package/dist/chunk-KCUI5EYN.mjs +0 -468
- package/dist/chunk-KEBNU3P2.js +0 -446
- package/dist/chunk-KVZPB73M.mjs +0 -86
- package/dist/chunk-NSCWEC2S.js +0 -32
- package/dist/chunk-NX7JRHF4.mjs +0 -50
- package/dist/chunk-OQTJDGUH.js +0 -468
- package/dist/chunk-QCF7H4NZ.mjs +0 -32
- package/dist/chunk-QKHODSAV.mjs +0 -13
- package/dist/chunk-QMD25JYH.mjs +0 -43
- package/dist/chunk-RUKOOSWL.js +0 -31
- package/dist/chunk-SBJV4LAX.mjs +0 -51
- package/dist/chunk-TET4GF3D.js +0 -43
- package/dist/chunk-XITP2BX2.js +0 -13
- package/dist/chunk-XJZ5TRTJ.mjs +0 -102
- package/dist/chunk-Y4TQKFAH.mjs +0 -18
- package/dist/chunk-YW4UN25U.js +0 -86
- package/dist/chunk-ZUNLUDAB.mjs +0 -30
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
joinPaths
|
|
3
|
-
} from "./chunk-
|
|
4
|
-
import {
|
|
5
|
-
__name
|
|
6
|
-
} from "./chunk-WPRKDCZP.mjs";
|
|
3
|
+
} from "./chunk-U7JFVMCK.mjs";
|
|
7
4
|
|
|
8
5
|
// src/utils/pnpm-deps-update.ts
|
|
9
6
|
import { existsSync } from "node:fs";
|
|
@@ -15,26 +12,36 @@ async function pnpmCatalogUpdate(packageRoot, workspaceRoot = process.cwd()) {
|
|
|
15
12
|
if (!pnpmCatalog) {
|
|
16
13
|
const pnpmWorkspacePath = joinPaths(workspaceRoot, "pnpm-workspace.yaml");
|
|
17
14
|
if (!existsSync(pnpmWorkspacePath)) {
|
|
18
|
-
console.warn(
|
|
15
|
+
console.warn(
|
|
16
|
+
`No \`pnpm-workspace.yaml\` file found in workspace root (searching in: ${pnpmWorkspacePath}). Skipping pnpm catalog read for now.`
|
|
17
|
+
);
|
|
19
18
|
return;
|
|
20
19
|
}
|
|
21
20
|
const pnpmWorkspaceYaml = await readYamlFile(pnpmWorkspacePath);
|
|
22
|
-
console.info(
|
|
21
|
+
console.info(
|
|
22
|
+
`pnpmWorkspaceYaml: ${JSON.stringify(pnpmWorkspaceYaml ?? {})}`
|
|
23
|
+
);
|
|
23
24
|
if (pnpmWorkspaceYaml?.catalog) {
|
|
24
25
|
pnpmCatalog = pnpmWorkspaceYaml.catalog;
|
|
25
26
|
} else {
|
|
26
|
-
console.warn(
|
|
27
|
+
console.warn(
|
|
28
|
+
`Found a \`pnpm-workspace.yaml\` file in the workspace root directory, but no pnpm catalog existed:
|
|
27
29
|
File name: ${pnpmWorkspacePath}
|
|
28
|
-
File contents: ${pnpmWorkspaceYaml ? JSON.stringify(pnpmWorkspaceYaml) : "EMPTY FILE"}`
|
|
30
|
+
File contents: ${pnpmWorkspaceYaml ? JSON.stringify(pnpmWorkspaceYaml) : "EMPTY FILE"}`
|
|
31
|
+
);
|
|
29
32
|
}
|
|
30
33
|
}
|
|
31
34
|
if (!pnpmCatalog) {
|
|
32
|
-
console.warn(
|
|
35
|
+
console.warn(
|
|
36
|
+
`No pnpm catalog found. Attempting to read from workspace root's \`pnpm-workspace.yaml\` file.`
|
|
37
|
+
);
|
|
33
38
|
}
|
|
34
39
|
const packageJsonPath = joinPaths(packageRoot, "package.json");
|
|
35
40
|
const packageJsonFile = await readFile(packageJsonPath, "utf8");
|
|
36
41
|
if (!packageJsonFile) {
|
|
37
|
-
throw new Error(
|
|
42
|
+
throw new Error(
|
|
43
|
+
"No package.json file found in package root: " + packageRoot
|
|
44
|
+
);
|
|
38
45
|
}
|
|
39
46
|
const packageJson = JSON.parse(packageJsonFile);
|
|
40
47
|
for (const dependencyType of [
|
|
@@ -49,7 +56,9 @@ File contents: ${pnpmWorkspaceYaml ? JSON.stringify(pnpmWorkspaceYaml) : "EMPTY
|
|
|
49
56
|
for (const dependencyName of Object.keys(dependencies)) {
|
|
50
57
|
if (dependencies[dependencyName] === "catalog:") {
|
|
51
58
|
if (!pnpmCatalog) {
|
|
52
|
-
throw new Error(
|
|
59
|
+
throw new Error(
|
|
60
|
+
`Dependency ${dependencyName} is marked as \`catalog:\`, but no catalog exists in the workspace root's \`pnpm-workspace.yaml\` file.`
|
|
61
|
+
);
|
|
53
62
|
}
|
|
54
63
|
const catalogVersion = pnpmCatalog[dependencyName];
|
|
55
64
|
if (!catalogVersion) {
|
|
@@ -61,26 +70,26 @@ File contents: ${pnpmWorkspaceYaml ? JSON.stringify(pnpmWorkspaceYaml) : "EMPTY
|
|
|
61
70
|
}
|
|
62
71
|
}
|
|
63
72
|
}
|
|
64
|
-
return writeFile(
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
"
|
|
80
|
-
|
|
81
|
-
|
|
73
|
+
return writeFile(
|
|
74
|
+
packageJsonPath,
|
|
75
|
+
await format(JSON.stringify(packageJson), {
|
|
76
|
+
parser: "json",
|
|
77
|
+
proseWrap: "always",
|
|
78
|
+
trailingComma: "none",
|
|
79
|
+
tabWidth: 2,
|
|
80
|
+
semi: true,
|
|
81
|
+
singleQuote: false,
|
|
82
|
+
quoteProps: "as-needed",
|
|
83
|
+
insertPragma: false,
|
|
84
|
+
bracketSameLine: true,
|
|
85
|
+
printWidth: 80,
|
|
86
|
+
bracketSpacing: true,
|
|
87
|
+
arrowParens: "avoid",
|
|
88
|
+
endOfLine: "lf",
|
|
89
|
+
plugins: ["prettier-plugin-pkg"]
|
|
90
|
+
})
|
|
91
|
+
);
|
|
82
92
|
}
|
|
83
|
-
__name(pnpmCatalogUpdate, "pnpmCatalogUpdate");
|
|
84
93
|
|
|
85
94
|
export {
|
|
86
95
|
pnpmCatalogUpdate
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
base_executor_untyped_default
|
|
3
3
|
} from "./chunk-DGC5L3Z7.mjs";
|
|
4
|
-
import {
|
|
5
|
-
__name
|
|
6
|
-
} from "./chunk-WPRKDCZP.mjs";
|
|
7
4
|
|
|
8
5
|
// src/base/typescript-build-executor.untyped.ts
|
|
9
6
|
import { defineUntypedSchema } from "untyped";
|
|
@@ -13,10 +10,7 @@ var typescript_build_executor_untyped_default = defineUntypedSchema({
|
|
|
13
10
|
id: "TypeScriptBuildExecutorSchema",
|
|
14
11
|
title: "TypeScript Build Executor",
|
|
15
12
|
description: "A type definition for the base TypeScript build executor schema",
|
|
16
|
-
required: [
|
|
17
|
-
"entry",
|
|
18
|
-
"tsconfig"
|
|
19
|
-
]
|
|
13
|
+
required: ["entry", "tsconfig"]
|
|
20
14
|
},
|
|
21
15
|
entry: {
|
|
22
16
|
$schema: {
|
|
@@ -24,13 +18,9 @@ var typescript_build_executor_untyped_default = defineUntypedSchema({
|
|
|
24
18
|
format: "path",
|
|
25
19
|
type: "array",
|
|
26
20
|
description: "The entry file or files to build",
|
|
27
|
-
items: {
|
|
28
|
-
type: "string"
|
|
29
|
-
}
|
|
21
|
+
items: { type: "string" }
|
|
30
22
|
},
|
|
31
|
-
$default: [
|
|
32
|
-
"{sourceRoot}/index.ts"
|
|
33
|
-
]
|
|
23
|
+
$default: ["{sourceRoot}/index.ts"]
|
|
34
24
|
},
|
|
35
25
|
tsconfig: {
|
|
36
26
|
$schema: {
|
|
@@ -110,7 +100,7 @@ var typescript_build_executor_untyped_default = defineUntypedSchema({
|
|
|
110
100
|
]
|
|
111
101
|
},
|
|
112
102
|
$default: "esnext",
|
|
113
|
-
$resolve:
|
|
103
|
+
$resolve: (val = "esnext") => val.toLowerCase()
|
|
114
104
|
},
|
|
115
105
|
format: {
|
|
116
106
|
$schema: {
|
|
@@ -119,28 +109,17 @@ var typescript_build_executor_untyped_default = defineUntypedSchema({
|
|
|
119
109
|
description: "The format to build",
|
|
120
110
|
items: {
|
|
121
111
|
type: "string",
|
|
122
|
-
enum: [
|
|
123
|
-
"cjs",
|
|
124
|
-
"esm",
|
|
125
|
-
"iife"
|
|
126
|
-
]
|
|
112
|
+
enum: ["cjs", "esm", "iife"]
|
|
127
113
|
}
|
|
128
114
|
},
|
|
129
|
-
$resolve:
|
|
130
|
-
"cjs",
|
|
131
|
-
"esm"
|
|
132
|
-
]) => [].concat(val), "$resolve")
|
|
115
|
+
$resolve: (val = ["cjs", "esm"]) => [].concat(val)
|
|
133
116
|
},
|
|
134
117
|
platform: {
|
|
135
118
|
$schema: {
|
|
136
119
|
title: "Platform",
|
|
137
120
|
type: "string",
|
|
138
121
|
description: "The platform to build",
|
|
139
|
-
enum: [
|
|
140
|
-
"neutral",
|
|
141
|
-
"node",
|
|
142
|
-
"browser"
|
|
143
|
-
]
|
|
122
|
+
enum: ["neutral", "node", "browser"]
|
|
144
123
|
},
|
|
145
124
|
$default: "neutral"
|
|
146
125
|
},
|
|
@@ -150,7 +129,7 @@ var typescript_build_executor_untyped_default = defineUntypedSchema({
|
|
|
150
129
|
type: "array",
|
|
151
130
|
description: "The external dependencies"
|
|
152
131
|
},
|
|
153
|
-
$resolve:
|
|
132
|
+
$resolve: (val = []) => [].concat(val)
|
|
154
133
|
},
|
|
155
134
|
define: {
|
|
156
135
|
$schema: {
|
|
@@ -159,7 +138,7 @@ var typescript_build_executor_untyped_default = defineUntypedSchema({
|
|
|
159
138
|
tsType: "Record<string, string>",
|
|
160
139
|
description: "The define values"
|
|
161
140
|
},
|
|
162
|
-
$resolve:
|
|
141
|
+
$resolve: (val = {}) => val,
|
|
163
142
|
$default: {}
|
|
164
143
|
},
|
|
165
144
|
env: {
|
|
@@ -169,7 +148,7 @@ var typescript_build_executor_untyped_default = defineUntypedSchema({
|
|
|
169
148
|
tsType: "Record<string, string>",
|
|
170
149
|
description: "The environment variable values"
|
|
171
150
|
},
|
|
172
|
-
$resolve:
|
|
151
|
+
$resolve: (val = {}) => val,
|
|
173
152
|
$default: {}
|
|
174
153
|
}
|
|
175
154
|
});
|
|
@@ -1,21 +1,29 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
|
|
2
2
|
|
|
3
3
|
|
|
4
|
-
var
|
|
4
|
+
var _chunkJ4DYXH46js = require('./chunk-J4DYXH46.js');
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _chunkRJRBED5Qjs = require('./chunk-RJRBED5Q.js');
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
var _chunk53DNHF7Bjs = require('./chunk-53DNHF7B.js');
|
|
11
|
+
|
|
12
|
+
// src/generators/browser-library/generator.ts
|
|
8
13
|
|
|
9
14
|
|
|
10
|
-
var _chunkJTAXCQX6js = require('./chunk-JTAXCQX6.js');
|
|
11
15
|
|
|
12
16
|
|
|
13
|
-
var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
|
|
14
17
|
|
|
15
|
-
// src/generators/browser-library/generator.ts
|
|
16
18
|
var _devkit = require('@nx/devkit');
|
|
17
19
|
async function browserLibraryGeneratorFn(tree, schema, config) {
|
|
18
|
-
const filesDir =
|
|
20
|
+
const filesDir = _chunk53DNHF7Bjs.joinPaths.call(void 0,
|
|
21
|
+
__dirname,
|
|
22
|
+
"src",
|
|
23
|
+
"generators",
|
|
24
|
+
"browser-library",
|
|
25
|
+
"files"
|
|
26
|
+
);
|
|
19
27
|
const tsLibraryGeneratorOptions = {
|
|
20
28
|
buildExecutor: "@storm-software/workspace-tools:unbuild",
|
|
21
29
|
platform: "browser",
|
|
@@ -40,8 +48,10 @@ async function browserLibraryGeneratorFn(tree, schema, config) {
|
|
|
40
48
|
description: schema.description,
|
|
41
49
|
directory: schema.directory
|
|
42
50
|
};
|
|
43
|
-
const options = await
|
|
44
|
-
const { className, name, propertyName } = _devkit.names.call(void 0,
|
|
51
|
+
const options = await _chunkJ4DYXH46js.normalizeOptions.call(void 0, tree, tsLibraryGeneratorOptions);
|
|
52
|
+
const { className, name, propertyName } = _devkit.names.call(void 0,
|
|
53
|
+
options.projectNames.projectFileName
|
|
54
|
+
);
|
|
45
55
|
_devkit.generateFiles.call(void 0, tree, filesDir, options.projectRoot, {
|
|
46
56
|
...schema,
|
|
47
57
|
dot: ".",
|
|
@@ -68,20 +78,23 @@ async function browserLibraryGeneratorFn(tree, schema, config) {
|
|
|
68
78
|
}
|
|
69
79
|
}
|
|
70
80
|
});
|
|
71
|
-
await
|
|
81
|
+
await _chunkJ4DYXH46js.typeScriptLibraryGeneratorFn.call(void 0, tree, tsLibraryGeneratorOptions, config);
|
|
72
82
|
await _devkit.formatFiles.call(void 0, tree);
|
|
73
83
|
return null;
|
|
74
84
|
}
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
options
|
|
81
|
-
|
|
82
|
-
|
|
85
|
+
var generator_default = _chunkRJRBED5Qjs.withRunGenerator.call(void 0,
|
|
86
|
+
"TypeScript Library Creator (Browser Platform)",
|
|
87
|
+
browserLibraryGeneratorFn,
|
|
88
|
+
{
|
|
89
|
+
hooks: {
|
|
90
|
+
applyDefaultOptions: (options) => {
|
|
91
|
+
options.description ??= "A library used by Storm Software to support browser applications";
|
|
92
|
+
options.platform ??= "browser";
|
|
93
|
+
return options;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
83
96
|
}
|
|
84
|
-
|
|
97
|
+
);
|
|
85
98
|
|
|
86
99
|
|
|
87
100
|
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
var __defProp = Object.defineProperty;
|
|
2
|
-
var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
|
|
3
1
|
var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
|
|
4
2
|
get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
|
|
5
3
|
}) : x)(function(x) {
|
|
@@ -7,15 +5,14 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
|
|
|
7
5
|
throw Error('Dynamic require of "' + x + '" is not supported');
|
|
8
6
|
});
|
|
9
7
|
|
|
10
|
-
// ../../node_modules/.pnpm/tsup@8.4.0_patch_hash=
|
|
8
|
+
// ../../node_modules/.pnpm/tsup@8.4.0_patch_hash=616d4d8468728c5caa25e7b97fe871f667b5342103b43bda8e891020bc6b674a__e7bfd10e92d28211ce978b182e37e925/node_modules/tsup/assets/esm_shims.js
|
|
11
9
|
import { fileURLToPath } from "url";
|
|
12
10
|
import path from "path";
|
|
13
|
-
var getFilename =
|
|
14
|
-
var getDirname =
|
|
11
|
+
var getFilename = () => fileURLToPath(import.meta.url);
|
|
12
|
+
var getDirname = () => path.dirname(getFilename());
|
|
15
13
|
var __dirname = /* @__PURE__ */ getDirname();
|
|
16
14
|
|
|
17
15
|
export {
|
|
18
|
-
__name,
|
|
19
16
|
__require,
|
|
20
17
|
__dirname
|
|
21
18
|
};
|
|
@@ -2,9 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
var _chunkI734UVDTjs = require('./chunk-I734UVDT.js');
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
|
|
7
|
-
|
|
8
5
|
// src/base/typescript-build-executor.untyped.ts
|
|
9
6
|
var _untyped = require('untyped');
|
|
10
7
|
var typescript_build_executor_untyped_default = _untyped.defineUntypedSchema.call(void 0, {
|
|
@@ -13,10 +10,7 @@ var typescript_build_executor_untyped_default = _untyped.defineUntypedSchema.cal
|
|
|
13
10
|
id: "TypeScriptBuildExecutorSchema",
|
|
14
11
|
title: "TypeScript Build Executor",
|
|
15
12
|
description: "A type definition for the base TypeScript build executor schema",
|
|
16
|
-
required: [
|
|
17
|
-
"entry",
|
|
18
|
-
"tsconfig"
|
|
19
|
-
]
|
|
13
|
+
required: ["entry", "tsconfig"]
|
|
20
14
|
},
|
|
21
15
|
entry: {
|
|
22
16
|
$schema: {
|
|
@@ -24,13 +18,9 @@ var typescript_build_executor_untyped_default = _untyped.defineUntypedSchema.cal
|
|
|
24
18
|
format: "path",
|
|
25
19
|
type: "array",
|
|
26
20
|
description: "The entry file or files to build",
|
|
27
|
-
items: {
|
|
28
|
-
type: "string"
|
|
29
|
-
}
|
|
21
|
+
items: { type: "string" }
|
|
30
22
|
},
|
|
31
|
-
$default: [
|
|
32
|
-
"{sourceRoot}/index.ts"
|
|
33
|
-
]
|
|
23
|
+
$default: ["{sourceRoot}/index.ts"]
|
|
34
24
|
},
|
|
35
25
|
tsconfig: {
|
|
36
26
|
$schema: {
|
|
@@ -110,7 +100,7 @@ var typescript_build_executor_untyped_default = _untyped.defineUntypedSchema.cal
|
|
|
110
100
|
]
|
|
111
101
|
},
|
|
112
102
|
$default: "esnext",
|
|
113
|
-
$resolve:
|
|
103
|
+
$resolve: (val = "esnext") => val.toLowerCase()
|
|
114
104
|
},
|
|
115
105
|
format: {
|
|
116
106
|
$schema: {
|
|
@@ -119,28 +109,17 @@ var typescript_build_executor_untyped_default = _untyped.defineUntypedSchema.cal
|
|
|
119
109
|
description: "The format to build",
|
|
120
110
|
items: {
|
|
121
111
|
type: "string",
|
|
122
|
-
enum: [
|
|
123
|
-
"cjs",
|
|
124
|
-
"esm",
|
|
125
|
-
"iife"
|
|
126
|
-
]
|
|
112
|
+
enum: ["cjs", "esm", "iife"]
|
|
127
113
|
}
|
|
128
114
|
},
|
|
129
|
-
$resolve:
|
|
130
|
-
"cjs",
|
|
131
|
-
"esm"
|
|
132
|
-
]) => [].concat(val), "$resolve")
|
|
115
|
+
$resolve: (val = ["cjs", "esm"]) => [].concat(val)
|
|
133
116
|
},
|
|
134
117
|
platform: {
|
|
135
118
|
$schema: {
|
|
136
119
|
title: "Platform",
|
|
137
120
|
type: "string",
|
|
138
121
|
description: "The platform to build",
|
|
139
|
-
enum: [
|
|
140
|
-
"neutral",
|
|
141
|
-
"node",
|
|
142
|
-
"browser"
|
|
143
|
-
]
|
|
122
|
+
enum: ["neutral", "node", "browser"]
|
|
144
123
|
},
|
|
145
124
|
$default: "neutral"
|
|
146
125
|
},
|
|
@@ -150,7 +129,7 @@ var typescript_build_executor_untyped_default = _untyped.defineUntypedSchema.cal
|
|
|
150
129
|
type: "array",
|
|
151
130
|
description: "The external dependencies"
|
|
152
131
|
},
|
|
153
|
-
$resolve:
|
|
132
|
+
$resolve: (val = []) => [].concat(val)
|
|
154
133
|
},
|
|
155
134
|
define: {
|
|
156
135
|
$schema: {
|
|
@@ -159,7 +138,7 @@ var typescript_build_executor_untyped_default = _untyped.defineUntypedSchema.cal
|
|
|
159
138
|
tsType: "Record<string, string>",
|
|
160
139
|
description: "The define values"
|
|
161
140
|
},
|
|
162
|
-
$resolve:
|
|
141
|
+
$resolve: (val = {}) => val,
|
|
163
142
|
$default: {}
|
|
164
143
|
},
|
|
165
144
|
env: {
|
|
@@ -169,7 +148,7 @@ var typescript_build_executor_untyped_default = _untyped.defineUntypedSchema.cal
|
|
|
169
148
|
tsType: "Record<string, string>",
|
|
170
149
|
description: "The environment variable values"
|
|
171
150
|
},
|
|
172
|
-
$resolve:
|
|
151
|
+
$resolve: (val = {}) => val,
|
|
173
152
|
$default: {}
|
|
174
153
|
}
|
|
175
154
|
});
|
|
@@ -4,12 +4,16 @@
|
|
|
4
4
|
var _chunkHI4G4OOGjs = require('./chunk-HI4G4OOG.js');
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _chunkRJRBED5Qjs = require('./chunk-RJRBED5Q.js');
|
|
8
|
+
|
|
9
|
+
// src/generators/preset/generator.ts
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
8
14
|
|
|
9
15
|
|
|
10
|
-
var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
|
|
11
16
|
|
|
12
|
-
// src/generators/preset/generator.ts
|
|
13
17
|
var _devkit = require('@nx/devkit');
|
|
14
18
|
var _path = require('path'); var path = _interopRequireWildcard(_path);
|
|
15
19
|
async function presetGeneratorFn(tree, options) {
|
|
@@ -225,11 +229,20 @@ async function presetGeneratorFn(tree, options) {
|
|
|
225
229
|
"nx-cloud": "latest"
|
|
226
230
|
};
|
|
227
231
|
}
|
|
228
|
-
await Promise.resolve(
|
|
232
|
+
await Promise.resolve(
|
|
233
|
+
_devkit.addDependenciesToPackageJson.call(void 0,
|
|
234
|
+
tree,
|
|
235
|
+
dependencies,
|
|
236
|
+
{},
|
|
237
|
+
_devkit.joinPathFragments.call(void 0, projectRoot, "package.json")
|
|
238
|
+
)
|
|
239
|
+
);
|
|
229
240
|
return null;
|
|
230
241
|
}
|
|
231
|
-
|
|
232
|
-
|
|
242
|
+
var generator_default = _chunkRJRBED5Qjs.withRunGenerator.call(void 0,
|
|
243
|
+
"Storm Workspace Preset Generator",
|
|
244
|
+
presetGeneratorFn
|
|
245
|
+
);
|
|
233
246
|
|
|
234
247
|
|
|
235
248
|
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
|
|
2
2
|
|
|
3
|
-
var
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
|
|
3
|
+
var _chunk4WHSR4FKjs = require('./chunk-4WHSR4FK.js');
|
|
7
4
|
|
|
8
5
|
// ../config-tools/src/utilities/apply-workspace-tokens.ts
|
|
9
|
-
var applyWorkspaceBaseTokens =
|
|
6
|
+
var applyWorkspaceBaseTokens = async (option, tokenParams) => {
|
|
10
7
|
let result = option;
|
|
11
8
|
if (!result) {
|
|
12
9
|
return result;
|
|
@@ -16,7 +13,10 @@ var applyWorkspaceBaseTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void
|
|
|
16
13
|
if (optionKeys.some((optionKey) => result.includes(`{${optionKey}}`))) {
|
|
17
14
|
for (const optionKey of optionKeys) {
|
|
18
15
|
if (result.includes(`{${optionKey}}`)) {
|
|
19
|
-
result = result.replaceAll(
|
|
16
|
+
result = result.replaceAll(
|
|
17
|
+
`{${optionKey}}`,
|
|
18
|
+
_optionalChain([tokenParams, 'optionalAccess', _ => _[optionKey]]) || ""
|
|
19
|
+
);
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -26,37 +26,53 @@ var applyWorkspaceBaseTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void
|
|
|
26
26
|
if (configKeys.some((configKey) => result.includes(`{${configKey}}`))) {
|
|
27
27
|
for (const configKey of configKeys) {
|
|
28
28
|
if (result.includes(`{${configKey}}`)) {
|
|
29
|
-
result = result.replaceAll(
|
|
29
|
+
result = result.replaceAll(
|
|
30
|
+
`{${configKey}}`,
|
|
31
|
+
tokenParams.config[configKey] || ""
|
|
32
|
+
);
|
|
30
33
|
}
|
|
31
34
|
}
|
|
32
35
|
}
|
|
33
36
|
}
|
|
34
37
|
if (result.includes("{workspaceRoot}")) {
|
|
35
|
-
result = result.replaceAll(
|
|
38
|
+
result = result.replaceAll(
|
|
39
|
+
"{workspaceRoot}",
|
|
40
|
+
_nullishCoalesce(_nullishCoalesce(tokenParams.workspaceRoot, () => ( _optionalChain([tokenParams, 'access', _2 => _2.config, 'optionalAccess', _3 => _3.workspaceRoot]))), () => ( _chunk4WHSR4FKjs.findWorkspaceRoot.call(void 0, )))
|
|
41
|
+
);
|
|
36
42
|
}
|
|
37
43
|
return result;
|
|
38
|
-
}
|
|
39
|
-
var applyWorkspaceProjectTokens =
|
|
44
|
+
};
|
|
45
|
+
var applyWorkspaceProjectTokens = (option, tokenParams) => {
|
|
40
46
|
return applyWorkspaceBaseTokens(option, tokenParams);
|
|
41
|
-
}
|
|
42
|
-
var applyWorkspaceTokens =
|
|
47
|
+
};
|
|
48
|
+
var applyWorkspaceTokens = async (options, tokenParams, tokenizerFn) => {
|
|
43
49
|
if (!options) {
|
|
44
50
|
return {};
|
|
45
51
|
}
|
|
46
52
|
const result = {};
|
|
47
53
|
for (const option of Object.keys(options)) {
|
|
48
54
|
if (typeof options[option] === "string") {
|
|
49
|
-
result[option] = await Promise.resolve(
|
|
55
|
+
result[option] = await Promise.resolve(
|
|
56
|
+
tokenizerFn(options[option], tokenParams)
|
|
57
|
+
);
|
|
50
58
|
} else if (Array.isArray(options[option])) {
|
|
51
|
-
result[option] = await Promise.all(
|
|
59
|
+
result[option] = await Promise.all(
|
|
60
|
+
options[option].map(
|
|
61
|
+
async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, tokenParams)) : item
|
|
62
|
+
)
|
|
63
|
+
);
|
|
52
64
|
} else if (typeof options[option] === "object") {
|
|
53
|
-
result[option] = await applyWorkspaceTokens(
|
|
65
|
+
result[option] = await applyWorkspaceTokens(
|
|
66
|
+
options[option],
|
|
67
|
+
tokenParams,
|
|
68
|
+
tokenizerFn
|
|
69
|
+
);
|
|
54
70
|
} else {
|
|
55
71
|
result[option] = options[option];
|
|
56
72
|
}
|
|
57
73
|
}
|
|
58
74
|
return result;
|
|
59
|
-
}
|
|
75
|
+
};
|
|
60
76
|
|
|
61
77
|
|
|
62
78
|
|