@lerna-lite/core 1.5.1 → 1.9.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/dist/child-process.js +2 -4
- package/dist/child-process.js.map +1 -1
- package/dist/command.d.ts +3 -3
- package/dist/command.js.map +1 -1
- package/dist/conventional-commits/constants.js.map +1 -1
- package/dist/conventional-commits/get-changelog-config.js.map +1 -1
- package/dist/conventional-commits/get-commits-since-last-release.d.ts +20 -0
- package/dist/conventional-commits/get-commits-since-last-release.js +53 -0
- package/dist/conventional-commits/get-commits-since-last-release.js.map +1 -0
- package/dist/conventional-commits/get-github-commits.d.ts +20 -0
- package/dist/conventional-commits/get-github-commits.js +82 -0
- package/dist/conventional-commits/get-github-commits.js.map +1 -0
- package/dist/conventional-commits/index.d.ts +2 -0
- package/dist/conventional-commits/index.js +2 -0
- package/dist/conventional-commits/index.js.map +1 -1
- package/dist/conventional-commits/recommend-version.js +1 -1
- package/dist/conventional-commits/recommend-version.js.map +1 -1
- package/dist/conventional-commits/update-changelog.d.ts +7 -6
- package/dist/conventional-commits/update-changelog.js +86 -9
- package/dist/conventional-commits/update-changelog.js.map +1 -1
- package/dist/git-clients/github-client.d.ts +1 -3
- package/dist/git-clients/gitlab-client.js.map +1 -1
- package/dist/models/command-options.d.ts +44 -5
- package/dist/models/interfaces.d.ts +36 -17
- package/dist/otplease.js.map +1 -1
- package/dist/package-graph/package-graph.js +2 -3
- package/dist/package-graph/package-graph.js.map +1 -1
- package/dist/package.d.ts +19 -4
- package/dist/package.js +14 -3
- package/dist/package.js.map +1 -1
- package/dist/project/lib/apply-extends.js.map +1 -1
- package/dist/project/lib/make-file-finder.js.map +1 -1
- package/dist/project/lib/shallow-extend.js.map +1 -1
- package/dist/project/project.d.ts +2 -2
- package/dist/project/project.js +0 -2
- package/dist/project/project.js.map +1 -1
- package/dist/prompt.js.map +1 -1
- package/dist/utils/collect-uncommitted.js +2 -3
- package/dist/utils/collect-uncommitted.js.map +1 -1
- package/dist/utils/collect-updates/collect-updates.js +10 -3
- package/dist/utils/collect-updates/collect-updates.js.map +1 -1
- package/dist/utils/collect-updates/lib/collect-packages.js.map +1 -1
- package/dist/utils/collect-updates/lib/get-packages-for-option.d.ts +1 -1
- package/dist/utils/collect-updates/lib/get-packages-for-option.js.map +1 -1
- package/dist/utils/collect-updates/lib/has-tags.d.ts +3 -1
- package/dist/utils/collect-updates/lib/has-tags.js +8 -2
- package/dist/utils/collect-updates/lib/has-tags.js.map +1 -1
- package/dist/utils/collect-updates/lib/make-diff-predicate.js +1 -2
- package/dist/utils/collect-updates/lib/make-diff-predicate.js.map +1 -1
- package/dist/utils/describe-ref.d.ts +1 -1
- package/dist/utils/describe-ref.js +12 -4
- package/dist/utils/describe-ref.js.map +1 -1
- package/dist/utils/query-graph.js.map +1 -1
- package/dist/utils/run-lifecycle.js +39 -30
- package/dist/utils/run-lifecycle.js.map +1 -1
- package/dist/utils/run-topologically.js.map +1 -1
- package/dist/utils/temp-write.d.ts +0 -1
- package/dist/utils/temp-write.js.map +1 -1
- package/dist/utils/types.js.map +1 -1
- package/dist/utils/warn-if-hanging.js.map +1 -1
- package/package.json +14 -12
|
@@ -1,3 +1,22 @@
|
|
|
1
|
+
import { RemoteClientType } from './interfaces';
|
|
2
|
+
export interface ChangedCommandOption {
|
|
3
|
+
/** use conventional-changelog to determine version bump and generate CHANGELOG. */
|
|
4
|
+
conventionalCommits?: boolean;
|
|
5
|
+
/** detect currently prereleased packages that would change to a non-prerelease version. */
|
|
6
|
+
conventionalGraduate: boolean | string | string[];
|
|
7
|
+
/** always include targeted packages when detecting changed packages, skipping default logic. */
|
|
8
|
+
forcePublish?: boolean | string | string[];
|
|
9
|
+
/** ignore changes in files matched by glob(s) when detecting changed packages. Pass --no-ignore-changes to completely disable. */
|
|
10
|
+
ignoreChanges: string[];
|
|
11
|
+
/** include tags from merged branches when detecting changed packages. */
|
|
12
|
+
includeMergedTags?: boolean;
|
|
13
|
+
}
|
|
14
|
+
export interface DiffCommandOption {
|
|
15
|
+
/** ignore changes in files matched by glob(s) when detecting changed packages. Pass --no-ignore-changes to completely disable. */
|
|
16
|
+
ignoreChanges: string[];
|
|
17
|
+
/** package name */
|
|
18
|
+
pkgName: string;
|
|
19
|
+
}
|
|
1
20
|
export interface ExecCommandOption {
|
|
2
21
|
/** command to execute by the command */
|
|
3
22
|
cmd?: string;
|
|
@@ -106,12 +125,29 @@ export interface VersionCommandOption {
|
|
|
106
125
|
conventionalGraduate?: boolean | string;
|
|
107
126
|
/** Version changed packages as prereleases when using --conventional-commits. */
|
|
108
127
|
conventionalPrerelease?: boolean | string;
|
|
109
|
-
/** Add a custom message at the top of your "changelog.md" which is located in the root of your project. This option only
|
|
128
|
+
/** Add a custom message at the top of your "changelog.md" which is located in the root of your project. This option is only available when using --conventional-commits with changelogs. */
|
|
110
129
|
changelogHeaderMessage?: string;
|
|
111
|
-
/**
|
|
130
|
+
/**
|
|
131
|
+
* Specify if we want to include the commit author's name, this option is only available when using --conventional-commits with changelogs.
|
|
132
|
+
* We can also optionally provide a custom message or else a default format will be used.
|
|
133
|
+
*/
|
|
134
|
+
changelogIncludeCommitsGitAuthor?: boolean | string;
|
|
135
|
+
/** @deprecated option renamed to `changelogIncludeCommitsGitAuthor` */
|
|
136
|
+
changelogIncludeCommitAuthorFullname?: boolean | string;
|
|
137
|
+
/**
|
|
138
|
+
* Specify if we want to include the commit remote client login name (ie GitHub username), this option is only available when using --conventional-commits with changelogs.
|
|
139
|
+
* We can also optionally provide a custom message or else a default format will be used.
|
|
140
|
+
*/
|
|
141
|
+
changelogIncludeCommitsClientLogin?: boolean | string;
|
|
142
|
+
/**
|
|
143
|
+
* Add a custom message as a prefix to each new version in your "changelog.md" which is located in the root of your project.
|
|
144
|
+
* This option is only available when using --conventional-commits with changelogs.
|
|
145
|
+
*/
|
|
112
146
|
changelogVersionMessage?: string;
|
|
113
147
|
/** Defaults 'angular', custom conventional-changelog preset. */
|
|
114
148
|
changelogPreset?: string;
|
|
149
|
+
/** Create an official GitHub or GitLab release for every version. */
|
|
150
|
+
createRelease?: RemoteClientType;
|
|
115
151
|
/** Specify cross-dependency version numbers exactly rather than with a caret (^). */
|
|
116
152
|
exact?: boolean;
|
|
117
153
|
/** Always include targeted packages in versioning operations, skipping default logic. */
|
|
@@ -120,8 +156,6 @@ export interface VersionCommandOption {
|
|
|
120
156
|
gitDryRun?: boolean;
|
|
121
157
|
/** Defaults to 'origin', push git changes to the specified remote. */
|
|
122
158
|
gitRemote: string;
|
|
123
|
-
/** Create an official GitHub or GitLab release for every version. */
|
|
124
|
-
createRelease?: 'gitlab' | 'github';
|
|
125
159
|
/**
|
|
126
160
|
* Ignore changes in files matched by glob(s) when detecting changed packages.
|
|
127
161
|
* Pass --no-ignore-changes to completely disable.
|
|
@@ -161,6 +195,8 @@ export interface VersionCommandOption {
|
|
|
161
195
|
push?: boolean;
|
|
162
196
|
/** Defaults to 'alpha', specify the prerelease identifier when versioning a prerelease */
|
|
163
197
|
preid?: string;
|
|
198
|
+
/** Remote git client, which client is used when reading commits from remote which is useful when associating client login for each changelog entry. */
|
|
199
|
+
remoteClient?: RemoteClientType;
|
|
164
200
|
/** Pass the `--gpg-sign` flag to `git commit`. */
|
|
165
201
|
signGitCommit?: boolean;
|
|
166
202
|
/** Pass the `--signoff` flag to `git commit`. */
|
|
@@ -177,7 +213,10 @@ export interface VersionCommandOption {
|
|
|
177
213
|
manuallyUpdateRootLockfile?: boolean;
|
|
178
214
|
/** Runs `npm install --package-lock-only` or equivalent depending on the package manager defined in `npmClient` */
|
|
179
215
|
syncWorkspaceLock?: boolean;
|
|
180
|
-
/**
|
|
216
|
+
/**
|
|
217
|
+
* @deprecated Strict match transform version numbers to an exact range (like "1.2.3") rather than with a caret (like ^1.2.3) when using `workspace:*`.
|
|
218
|
+
* Future version will make `workspace:` protocol as strict matching at all time, so this flag becomes redundant.
|
|
219
|
+
*/
|
|
181
220
|
workspaceStrictMatch?: boolean;
|
|
182
221
|
/** alias to '--yes' */
|
|
183
222
|
y?: boolean;
|
|
@@ -17,13 +17,14 @@ export interface CommandOptions {
|
|
|
17
17
|
rollPublish?: boolean;
|
|
18
18
|
rollVersion?: boolean;
|
|
19
19
|
}
|
|
20
|
-
export declare type CommandType = '' | 'exec' | 'info' | 'init' | 'list' | 'publish' | 'run' | 'version';
|
|
20
|
+
export declare type CommandType = '' | 'changed' | 'exec' | 'info' | 'init' | 'list' | 'publish' | 'run' | 'version';
|
|
21
21
|
export interface DescribeRefOptions {
|
|
22
22
|
cwd?: string;
|
|
23
23
|
match?: string;
|
|
24
24
|
}
|
|
25
25
|
export interface DescribeRefFallbackResult {
|
|
26
26
|
isDirty: boolean;
|
|
27
|
+
lastVersion?: string;
|
|
27
28
|
lastTagName?: string;
|
|
28
29
|
refCount: number | string;
|
|
29
30
|
sha: string;
|
|
@@ -41,13 +42,19 @@ export interface ExecOpts {
|
|
|
41
42
|
maxBuffer?: number;
|
|
42
43
|
}
|
|
43
44
|
export interface LifecycleConfig {
|
|
44
|
-
|
|
45
|
+
access?: 'public' | 'restricted';
|
|
46
|
+
defaultTag?: string;
|
|
45
47
|
ignorePrepublish?: boolean;
|
|
46
48
|
ignoreScripts?: boolean;
|
|
49
|
+
log: log.Logger;
|
|
50
|
+
lernaCommand?: string;
|
|
47
51
|
nodeOptions?: string;
|
|
52
|
+
projectScope?: string | null;
|
|
48
53
|
scriptShell?: string;
|
|
49
54
|
scriptsPrependNodePath?: boolean;
|
|
50
55
|
snapshot?: any;
|
|
56
|
+
stdio?: string;
|
|
57
|
+
tag?: string;
|
|
51
58
|
unsafePerm?: boolean;
|
|
52
59
|
}
|
|
53
60
|
export interface Manifest {
|
|
@@ -60,18 +67,23 @@ export interface UpdateChangelogOption {
|
|
|
60
67
|
changelogHeaderMessage?: string;
|
|
61
68
|
changelogVersionMessage?: string;
|
|
62
69
|
changelogPreset?: string;
|
|
70
|
+
changelogIncludeCommitsGitAuthor?: boolean | string;
|
|
71
|
+
changelogIncludeCommitsClientLogin?: boolean | string;
|
|
72
|
+
commitsSinceLastRelease?: RemoteCommit[];
|
|
63
73
|
rootPath?: string;
|
|
64
74
|
tagPrefix?: string;
|
|
65
75
|
version?: string;
|
|
76
|
+
/** @deprecated this option was renamed to `changelogIncludeCommitsGitAuthor` */
|
|
77
|
+
changelogIncludeCommitAuthorFullname?: boolean | string;
|
|
66
78
|
}
|
|
67
79
|
export interface FetchConfig {
|
|
68
80
|
fetchRetries: number;
|
|
69
|
-
log:
|
|
81
|
+
log: log.Logger;
|
|
70
82
|
registry: string;
|
|
71
83
|
username: string;
|
|
72
84
|
}
|
|
73
85
|
export interface PackConfig {
|
|
74
|
-
log:
|
|
86
|
+
log: log.Logger;
|
|
75
87
|
lernaCommand?: string;
|
|
76
88
|
ignorePrepublish?: boolean;
|
|
77
89
|
}
|
|
@@ -124,7 +136,7 @@ export declare type NpaResolveResult = (npa.FileResult | npa.HostedGitResult | n
|
|
|
124
136
|
};
|
|
125
137
|
/** Passed between concurrent executions */
|
|
126
138
|
export interface OneTimePasswordCache {
|
|
127
|
-
otp?: string;
|
|
139
|
+
otp?: string | number;
|
|
128
140
|
}
|
|
129
141
|
export interface LernaConfig {
|
|
130
142
|
command?: {
|
|
@@ -134,15 +146,7 @@ export interface LernaConfig {
|
|
|
134
146
|
run?: RunCommandOption;
|
|
135
147
|
};
|
|
136
148
|
packages?: string[];
|
|
137
|
-
loglevel?: 'silent';
|
|
138
|
-
'error': any;
|
|
139
|
-
'warn': any;
|
|
140
|
-
'notice': any;
|
|
141
|
-
'http': any;
|
|
142
|
-
'timing': any;
|
|
143
|
-
'info': any;
|
|
144
|
-
'verbose': any;
|
|
145
|
-
'silly': any;
|
|
149
|
+
loglevel?: 'silent' | 'error' | 'warn' | 'notice' | 'http' | 'timing' | 'info' | 'verbose' | 'silly';
|
|
146
150
|
/** executable used to install dependencies (npm, yarn, pnpm, ...) */
|
|
147
151
|
npmClient?: 'npm' | 'pnpm' | 'yarn';
|
|
148
152
|
/** enables integration with Yarn or other package manager that use `workspaces` property in `package.json` */
|
|
@@ -157,8 +161,9 @@ export interface ProjectConfig extends LernaConfig, QueryGraphConfig {
|
|
|
157
161
|
lernaVersion: string;
|
|
158
162
|
progress?: boolean;
|
|
159
163
|
since?: string;
|
|
160
|
-
sort?:
|
|
164
|
+
sort?: boolean;
|
|
161
165
|
stream?: boolean;
|
|
166
|
+
useNx?: boolean;
|
|
162
167
|
onRejected?: (result: any) => void;
|
|
163
168
|
onResolved?: (result: any) => void;
|
|
164
169
|
}
|
|
@@ -183,6 +188,17 @@ export interface ReleaseNote {
|
|
|
183
188
|
name: string;
|
|
184
189
|
notes?: string;
|
|
185
190
|
}
|
|
191
|
+
export declare type RemoteClientType = 'gitlab' | 'github';
|
|
192
|
+
export declare type RemoteCommit = {
|
|
193
|
+
/** git commit author name */
|
|
194
|
+
authorName: string;
|
|
195
|
+
/** remote client login (ie github login) */
|
|
196
|
+
login: string;
|
|
197
|
+
/** commit message headling (50 chars maxlen) */
|
|
198
|
+
message: string;
|
|
199
|
+
/** short commit hash (7 chars long) */
|
|
200
|
+
shortHash: string;
|
|
201
|
+
};
|
|
186
202
|
export interface UpdateCollectorOptions {
|
|
187
203
|
/** The semver bump keyword (patch/minor/major) or explicit version used */
|
|
188
204
|
bump?: string;
|
|
@@ -193,10 +209,13 @@ export interface UpdateCollectorOptions {
|
|
|
193
209
|
/** Whether or not to include the --first-parent flag when calling `git describe` (awkwardly, pass `true` to _omit_ the flag, the default is to include it) */
|
|
194
210
|
includeMergedTags?: boolean;
|
|
195
211
|
/** Which packages, if any, to always include. Force all packages to be versioned with `true`, or pass a list of globs that match package names */
|
|
196
|
-
forcePublish?: boolean | string[];
|
|
212
|
+
forcePublish?: boolean | string | string[];
|
|
197
213
|
/** Ref to use when querying git, defaults to most recent annotated tag */
|
|
198
214
|
since?: string;
|
|
215
|
+
/** are we using Lerna independent mode? */
|
|
216
|
+
isIndependent?: boolean;
|
|
217
|
+
/** are we using conventional commits? */
|
|
199
218
|
conventionalCommits?: boolean;
|
|
200
|
-
conventionalGraduate?: boolean;
|
|
219
|
+
conventionalGraduate?: boolean | string;
|
|
201
220
|
excludeDependents?: boolean;
|
|
202
221
|
}
|
package/dist/otplease.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otplease.js","sourceRoot":"","sources":["../src/otplease.ts"],"names":[],"mappings":";;;AACA,qCAA2C;AAE3C,+BAA+B;AAC/B,MAAM,SAAS,GAAQ;IACrB,IAAI;QACF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,8DAA8D;gBAC9D,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBACtC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;gBAC1B,CAAC,CAAC,CAAC;gBACH,OAAO,CAAC,SAAS,CAAC,CAAC;aACpB;iBAAM;gBACL,uEAAuE;gBACvE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAChD;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO;QACL,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,uBAAuB;QACvB,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC1B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC1B,uDAAuD;YACvD,OAAO,EAAE,CAAC;SACX;IACH,CAAC;CACF,CAAC;AAEF;;;;;;GAMG;AACH,SAAgB,QAAQ,
|
|
1
|
+
{"version":3,"file":"otplease.js","sourceRoot":"","sources":["../src/otplease.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,7 @@ class PackageGraph extends Map {
|
|
|
65
65
|
// we'll have to pull the version from its parent package version property
|
|
66
66
|
// example with `1.5.0`, ws:* => "1.5.0", ws:^ => "^1.5.0", ws:~ => "~1.5.0", ws:^1.5.0 => "^1.5.0"
|
|
67
67
|
if (spec === '*' || spec === '^' || spec === '~') {
|
|
68
|
-
const depPkg = packages.find(pkg => pkg.name === depName);
|
|
68
|
+
const depPkg = packages.find((pkg) => pkg.name === depName);
|
|
69
69
|
const version = depPkg === null || depPkg === void 0 ? void 0 : depPkg.version;
|
|
70
70
|
const specTarget = spec === '*' ? '' : spec;
|
|
71
71
|
spec = depPkg ? `${specTarget}${version}` : '';
|
|
@@ -210,8 +210,7 @@ class PackageGraph extends Map {
|
|
|
210
210
|
return;
|
|
211
211
|
}
|
|
212
212
|
alreadyVisited.add(topLevelDependent);
|
|
213
|
-
if (topLevelDependent === baseNode ||
|
|
214
|
-
(topLevelDependent.isCycle && topLevelDependent.has(baseNode.name))) {
|
|
213
|
+
if (topLevelDependent === baseNode || (topLevelDependent.isCycle && topLevelDependent.has(baseNode.name))) {
|
|
215
214
|
const cycle = new lib_1.CyclicPackageGraphNode();
|
|
216
215
|
walkStack.forEach((nodeInCycle) => {
|
|
217
216
|
nodeToCycle.set(nodeInCycle, cycle);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-graph.js","sourceRoot":"","sources":["../../src/package-graph/package-graph.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAkC;AAElC,+BAA+E;AAE/E,0DAAsD;AAGtD;;;;GAIG;AACH,MAAa,YAAa,SAAQ,GAAG;IACnC;;;;;;OAMG;IACH,
|
|
1
|
+
{"version":3,"file":"package-graph.js","sourceRoot":"","sources":["../../src/package-graph/package-graph.ts"],"names":[],"mappings":"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"}
|
package/dist/package.d.ts
CHANGED
|
@@ -45,10 +45,18 @@ export declare class Package {
|
|
|
45
45
|
});
|
|
46
46
|
get contents(): string;
|
|
47
47
|
set contents(subDirectory: string);
|
|
48
|
-
get dependencies():
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
get
|
|
48
|
+
get dependencies(): {
|
|
49
|
+
[depName: string]: string;
|
|
50
|
+
};
|
|
51
|
+
get devDependencies(): {
|
|
52
|
+
[depName: string]: string;
|
|
53
|
+
};
|
|
54
|
+
get optionalDependencies(): {
|
|
55
|
+
[depName: string]: string;
|
|
56
|
+
};
|
|
57
|
+
get peerDependencies(): {
|
|
58
|
+
[depName: string]: string;
|
|
59
|
+
};
|
|
52
60
|
get pkg(): Package;
|
|
53
61
|
/**
|
|
54
62
|
* Map-like retrieval of arbitrary values
|
|
@@ -81,6 +89,7 @@ export declare class Package {
|
|
|
81
89
|
serialize(): Promise<this>;
|
|
82
90
|
/**
|
|
83
91
|
* Mutate given dependency (could be local/external) spec according to type
|
|
92
|
+
* @param {String} pkgName - package name
|
|
84
93
|
* @param {Object} resolved npa metadata
|
|
85
94
|
*/
|
|
86
95
|
removeDependencyWorkspaceProtocolPrefix(pkgName: string, resolved: NpaResolveResult): void;
|
|
@@ -93,5 +102,11 @@ export declare class Package {
|
|
|
93
102
|
* @param {String} [updatedByCommand] - which command called this update?
|
|
94
103
|
*/
|
|
95
104
|
updateLocalDependency(resolved: NpaResolveResult, depVersion: string, savePrefix: string, workspaceStrictMatch?: boolean, updatedByCommand?: CommandType): void;
|
|
105
|
+
/**
|
|
106
|
+
* Retrieve the dependencies collection which contain the dependency name provided, we'll search in all type of dependencies/devDependencies/...
|
|
107
|
+
* @param {String} depName - dependency name
|
|
108
|
+
* @param {Boolean} [includePeerDepsFallback] - should we include peerDependencies as fallback?
|
|
109
|
+
* @returns {Array<String>} - array of dependencies that contains the dependency name provided
|
|
110
|
+
*/
|
|
96
111
|
private retrievePackageDependencies;
|
|
97
112
|
}
|
package/dist/package.js
CHANGED
|
@@ -210,12 +210,13 @@ class Package {
|
|
|
210
210
|
}
|
|
211
211
|
/**
|
|
212
212
|
* Mutate given dependency (could be local/external) spec according to type
|
|
213
|
+
* @param {String} pkgName - package name
|
|
213
214
|
* @param {Object} resolved npa metadata
|
|
214
215
|
*/
|
|
215
216
|
removeDependencyWorkspaceProtocolPrefix(pkgName, resolved) {
|
|
216
217
|
var _a;
|
|
217
218
|
const depName = resolved.name;
|
|
218
|
-
const depCollection = this.retrievePackageDependencies(depName);
|
|
219
|
+
const depCollection = this.retrievePackageDependencies(depName, true);
|
|
219
220
|
const workspaceTarget = (_a = resolved === null || resolved === void 0 ? void 0 : resolved.workspaceTarget) !== null && _a !== void 0 ? _a : '';
|
|
220
221
|
if (depCollection &&
|
|
221
222
|
(resolved.registry || resolved.type === 'directory') &&
|
|
@@ -250,7 +251,7 @@ class Package {
|
|
|
250
251
|
// when using explicit `workspace:` protocol
|
|
251
252
|
if (resolved.explicitWorkspace) {
|
|
252
253
|
const workspaceTarget = (_a = resolved === null || resolved === void 0 ? void 0 : resolved.workspaceTarget) !== null && _a !== void 0 ? _a : '';
|
|
253
|
-
const [_, _wsTxt, operatorPrefix, rangePrefix] = workspaceTarget.match(/^(workspace:)?([<>=]{0,2})?([*^~])?(.*)$/);
|
|
254
|
+
const [_, _wsTxt, operatorPrefix, rangePrefix] = workspaceTarget.match(/^(workspace:)?([<>=]{0,2})?([*^~])?(.*)$/) || [];
|
|
254
255
|
if (operatorPrefix) {
|
|
255
256
|
// with workspace it might include an operator, if so use it like "workspace:>=1.2.3"
|
|
256
257
|
depCollection[depName] = `${operatorPrefix}${depVersion}`;
|
|
@@ -303,7 +304,13 @@ class Package {
|
|
|
303
304
|
depCollection[depName] = hosted.toString({ noGitPlus: false, noCommittish: false });
|
|
304
305
|
}
|
|
305
306
|
}
|
|
306
|
-
|
|
307
|
+
/**
|
|
308
|
+
* Retrieve the dependencies collection which contain the dependency name provided, we'll search in all type of dependencies/devDependencies/...
|
|
309
|
+
* @param {String} depName - dependency name
|
|
310
|
+
* @param {Boolean} [includePeerDepsFallback] - should we include peerDependencies as fallback?
|
|
311
|
+
* @returns {Array<String>} - array of dependencies that contains the dependency name provided
|
|
312
|
+
*/
|
|
313
|
+
retrievePackageDependencies(depName, includePeerDepsFallback = false) {
|
|
307
314
|
// first, try runtime dependencies
|
|
308
315
|
let depCollection = this.dependencies;
|
|
309
316
|
// try optionalDependencies if that didn't work
|
|
@@ -314,6 +321,10 @@ class Package {
|
|
|
314
321
|
if (!depCollection || !depCollection[depName]) {
|
|
315
322
|
depCollection = this.devDependencies;
|
|
316
323
|
}
|
|
324
|
+
// fall back to peerDependencies (when enabled)
|
|
325
|
+
if (includePeerDepsFallback && (!depCollection || !depCollection[depName])) {
|
|
326
|
+
depCollection = this.peerDependencies;
|
|
327
|
+
}
|
|
317
328
|
return depCollection;
|
|
318
329
|
}
|
|
319
330
|
}
|
package/dist/package.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA0C;AAC1C,sEAAkC;AAClC,oDAA4B;
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA0C;AAC1C,sEAAkC;AAClC,oDAA4B;AAC5B,gDAAwB;AACxB,0DAAiC;AAIjC,uCAAuC;AACvC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;AAE1B,iBAAiB;AACjB,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AACrC,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AACrC,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AACrC,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AACnC,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAErC;;GAEG;AACH,SAAS,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAc;IAC9C,OAAO,KAAK,CAAC,CAAC,CAAC,IAAK,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1D,CAAC;AAED,8EAA8E;AAC9E,SAAS,WAAW,CAAC,IAAS;IAC5B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC3C,MAAM,GAAG,GAAQ,IAAI,CAAC,GAAG,CAAC,CAAC;QAE3B,wBAAwB;QACxB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACtB,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;SACxB;aAAM,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;SACnC;aAAM;YACL,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;SAChB;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED;;;GAGG;AACH,MAAa,OAAO;IA6BlB;;;;OAIG;IACH,YAAY,GAAgB,EAAE,QAAgB,EAAE,QAAQ,GAAG,QAAQ;;QAjCnE,QAAG,GAAG,EAAE,CAAC;QAET,gBAAW,GAAG,EAAE,CAAC;QACjB,sBAAiB,GAAG,IAAI,GAAG,EAAe,CAAC;QA+BzC,iDAAiD;QACjD,MAAM,QAAQ,GAAG,yBAAG,CAAC,OAAO,CAAC,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,mCAAI,EAAE,EAAE,QAAQ,cAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAErG,IAAI,CAAC,IAAI,GAAG,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,mCAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QAEhB,oFAAoF;QACpF,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAExE,IAAI,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;QAC3B,IAAI,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;QAC3B,IAAI,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;QAC3B,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IA1CD;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CAAC,GAAmC,EAAE,GAAG,GAAG,GAAG;QACxD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,cAAc,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/F,MAAM,QAAQ,GAAG,wBAAY,CAAC,IAAI,CAAc,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;YAErF,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;SACxC;QAED,wEAAwE;QACxE,IAAI,kBAAkB,IAAI,GAAG,EAAE;YAC7B,OAAO,GAAG,CAAC;SACZ;QAED,8BAA8B;QAC9B,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC;IAuBD,mBAAmB;IACnB,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,GAAG;QACL,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QACtB,OAAO,OAAO,GAAG,CAAC,GAAG,KAAK,QAAQ;YAChC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,QAAiC,CAAW,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE;YAC9E,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,mBAAmB;QACrB,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAClD,CAAC;IAED,kDAAkD;IAClD,IAAI,gBAAgB;QAClB,iDAAiD;QACjD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY;IACZ,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED,IAAI,OAAO,CAAC,OAAe;QACzB,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC;IAC9B,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC;IAC9B,CAAC;IAED,IAAI,UAAU,CAAC,UAA6C;QAC1D,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,UAAU,CAAC;IACpC,CAAC;IAED,IAAI,QAAQ;QACV,0CAA0C;QAC1C,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE;YACnB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;SACxB;QAED,mDAAmD;QACnD,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,SAAS,EAAE;YAChE,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;SACpE;QAED,0BAA0B;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,QAAQ,CAAC,YAAoB;QAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAC3D,CAAC;IAED,qBAAqB;IACrB,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC;IAChC,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC;IACnC,CAAC;IAED,IAAI,oBAAoB;QACtB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC;IACxC,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,gBAAgB,CAAC;IACpC,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAA8B,GAAW;QAC1C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IAED;;;;;;OAMG;IACH,GAAG,CAAC,GAAW,EAAE,GAAmC;QAClD,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QAErB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,MAAM;QACJ,OAAO,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,OAAO;QACL,OAAO,IAAA,wBAAY,EAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACtD,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;YAEhB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,SAAS;QACP,OAAO,IAAA,mBAAQ,EAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACrE,CAAC;IAED;;;;OAIG;IACH,uCAAuC,CAAC,OAAe,EAAE,QAA0B;;QACjF,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAc,CAAC;QACxC,MAAM,aAAa,GAAG,IAAI,CAAC,2BAA2B,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACtE,MAAM,eAAe,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,eAAe,mCAAI,EAAE,CAAC;QAExD,IACE,aAAa;YACb,CAAC,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,CAAC;YACpD,qBAAqB,CAAC,IAAI,CAAC,eAAe,CAAC,EAC3C;YACA,IAAI,eAAe,EAAE;gBACnB,IAAI,QAAQ,CAAC,SAAS,KAAK,QAAQ,EAAE;oBACnC,gBAAM,CAAC,KAAK,CACV,SAAS,EACT;wBACE,uBAAuB,OAAO,8FAA8F;wBAC5H,+DAA+D;wBAC/D,sDAAsD,OAAO,OAAO,QAAQ,CAAC,SAAS,IAAI;qBAC3F,CAAC,IAAI,CAAC,EAAE,CAAC,CACX,CAAC;iBACH;gBACD,aAAa,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,SAAmB,CAAC;aACvD;SACF;IACH,CAAC;IAED;;;;;;;OAOG;IACH,qBAAqB,CACnB,QAA0B,EAC1B,UAAkB,EAClB,UAAkB,EAClB,oBAAoB,GAAG,IAAI,EAC3B,gBAA8B;;QAE9B,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAc,CAAC;QACxC,MAAM,aAAa,GAAG,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;QAEhE,IAAI,aAAa,IAAI,CAAC,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE;YACzE,qEAAqE;YACrE,aAAa,CAAC,OAAO,CAAC,GAAG,GAAG,UAAU,GAAG,UAAU,EAAE,CAAC;YAEtD,4CAA4C;YAC5C,IAAI,QAAQ,CAAC,iBAAiB,EAAE;gBAC9B,MAAM,eAAe,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,eAAe,mCAAI,EAAE,CAAC;gBACxD,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,CAAC,GAC5C,eAAe,CAAC,KAAK,CAAC,0CAA0C,CAAC,IAAI,EAAE,CAAC;gBAE1E,IAAI,cAAc,EAAE;oBAClB,qFAAqF;oBACrF,aAAa,CAAC,OAAO,CAAC,GAAG,GAAG,cAAc,GAAG,UAAU,EAAE,CAAC;iBAC3D;qBAAM,IAAI,oBAAoB,EAAE;oBAC/B,wFAAwF;oBACxF,aAAa,CAAC,OAAO,CAAC,GAAG,GAAG,WAAW,IAAI,EAAE,GAAG,UAAU,EAAE,CAAC;iBAC9D;gBAED,IAAI,gBAAgB,KAAK,SAAS,EAAE;oBAClC,0EAA0E;oBAC1E,gJAAgJ;oBAChJ,IAAI,oBAAoB,EAAE;wBACxB,IAAI,eAAe,KAAK,aAAa,EAAE;4BACrC,aAAa,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,CAAC,2BAA2B;yBACjE;6BAAM,IAAI,eAAe,KAAK,aAAa,EAAE;4BAC5C,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC,CAAC,4BAA4B;yBACxE;6BAAM,IAAI,eAAe,KAAK,aAAa,EAAE;4BAC5C,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC,CAAC,4BAA4B;yBACxE;qBACF;oBACD,+EAA+E;oBAC/E,iFAAiF;iBAClF;qBAAM;oBACL,oGAAoG;oBACpG,6FAA6F;oBAC7F,6FAA6F;oBAC7F,aAAa,CAAC,OAAO,CAAC,GAAG,sBAAsB,CAAC,IAAI,CAAC,eAAe,CAAC;wBACnE,CAAC,CAAE,QAAQ,CAAC,eAA0B,CAAC,iFAAiF;wBACxH,CAAC,CAAC,aAAa,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,2EAA2E;iBACvH;aACF;SACF;aAAM,IAAI,QAAQ,CAAC,aAAa,EAAE;YACjC,yDAAyD;YACzD,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAoB,CAAC;YAE3E,oBAAoB;YACpB,MAAM,EAAE,MAAM,EAAE,GAAG,QAAe,CAAC,CAAC,mBAAmB;YACvD,MAAM,CAAC,UAAU,GAAG,GAAG,SAAS,GAAG,UAAU,EAAE,CAAC;YAEhD,0EAA0E;YAC1E,aAAa,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;SACrF;aAAM,IAAI,QAAQ,CAAC,QAAQ,EAAE;YAC5B,oDAAoD;YACpD,MAAM,EAAE,MAAM,EAAE,GAAG,QAAe,CAAC,CAAC,mBAAmB;YACvD,MAAM,CAAC,UAAU,GAAG,UAAU,UAAU,GAAG,UAAU,EAAE,CAAC;YAExD,0EAA0E;YAC1E,aAAa,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;SACrF;IACH,CAAC;IAED;;;;;OAKG;IACK,2BAA2B,CAAC,OAAe,EAAE,uBAAuB,GAAG,KAAK;QAClF,kCAAkC;QAClC,IAAI,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QAEtC,+CAA+C;QAC/C,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE;YAC7C,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC;SAC3C;QAED,+BAA+B;QAC/B,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE;YAC7C,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC;SACtC;QAED,+CAA+C;QAC/C,IAAI,uBAAuB,IAAI,CAAC,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE;YAC1E,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC;SACvC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AApVD,0BAoVC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-extends.js","sourceRoot":"","sources":["../../../src/project/lib/apply-extends.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,gEAAuC;AAEvC,qDAAiD;AACjD,6DAAyD;AAEzD;;;;GAIG;AACH,SAAgB,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"apply-extends.js","sourceRoot":"","sources":["../../../src/project/lib/apply-extends.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,gEAAuC;AAEvC,qDAAiD;AACjD,6DAAyD;AAEzD;;;;GAIG;AACH,SAAgB,YAAY,CAAC,MAA8B,EAAE,GAAW,EAAE,OAAO,IAAI,GAAG,EAAU;IAChG,IAAI,aAAa,GAAG,EAAE,CAAC;IAEvB,IAAI,SAAS,IAAI,MAAM,EAAE;QACvB,IAAI,aAAa,CAAC;QAElB,IAAI;YACF,aAAa,GAAG,IAAA,sBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;SAClD;QAAC,OAAO,GAAQ,EAAE;YACjB,MAAM,IAAI,kCAAe,CAAC,WAAW,EAAE,4CAA4C,EAAE,GAAG,CAAC,CAAC;SAC3F;QAED,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;YAC3B,MAAM,IAAI,kCAAe,CAAC,WAAW,EAAE,oCAAoC,EAAE,IAAW,CAAC,CAAC;SAC3F;QAED,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAExB,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;QACvC,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,wCAAwC;QAE/D,iDAAiD;QAEjD,aAAa,GAAG,YAAY,CAAC,aAAa,EAAE,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,CAAC;KAChF;IAED,OAAO,IAAA,8BAAa,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAC9C,CAAC;AA3BD,oCA2BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-file-finder.js","sourceRoot":"","sources":["../../../src/project/lib/make-file-finder.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA+C;AAC/C,gDAAwB;AACxB,kDAAyB;AAEzB,6DAAyD;AAEzD;;GAEG;AACH,SAAS,SAAS,CAAC,OAAiB;IAClC,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,cAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,WAAW,CAAC,QAAgB,EAAE,cAAwB;IAC7D,MAAM,QAAQ,GAAG;QACf,GAAG,EAAE,QAAQ;QACb,QAAQ,EAAE,IAAI;QACd,iBAAiB,EAAE,KAAK;QACxB,mBAAmB,EAAE,KAAK;KACV,CAAC;IAEnB,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QACxD,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAClE,MAAM,IAAI,kCAAe,
|
|
1
|
+
{"version":3,"file":"make-file-finder.js","sourceRoot":"","sources":["../../../src/project/lib/make-file-finder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shallow-extend.js","sourceRoot":"","sources":["../../../src/project/lib/shallow-extend.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,SAAgB,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"shallow-extend.js","sourceRoot":"","sources":["../../../src/project/lib/shallow-extend.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,SAAgB,aAAa,CAAC,IAA4B,EAAE,WAAmC,EAAE;IAC/F,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QAEtB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACtB,mEAAmE;YACnE,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;SACxB;aAAM,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzC,GAAG,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SACzC;aAAM;YACL,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;SAChB;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,QAAQ,CAAC,CAAC;AACf,CAAC;AAfD,sCAeC"}
|
|
@@ -15,7 +15,7 @@ export declare class Project {
|
|
|
15
15
|
/**
|
|
16
16
|
* @param {string} [cwd] Defaults to process.cwd()
|
|
17
17
|
*/
|
|
18
|
-
constructor(cwd
|
|
18
|
+
constructor(cwd?: string);
|
|
19
19
|
/**
|
|
20
20
|
* @param {string} [cwd] Defaults to process.cwd()
|
|
21
21
|
*/
|
|
@@ -27,7 +27,7 @@ export declare class Project {
|
|
|
27
27
|
get version(): string;
|
|
28
28
|
set version(val: string);
|
|
29
29
|
get packageConfigs(): string[];
|
|
30
|
-
get packageParentDirs():
|
|
30
|
+
get packageParentDirs(): string[];
|
|
31
31
|
get manifest(): RawManifest;
|
|
32
32
|
get licensePath(): string;
|
|
33
33
|
get fileFinder(): (fileName: string, fileMapper: any, customGlobOpts?: any) => Promise<any>;
|
package/dist/project/project.js
CHANGED
|
@@ -196,6 +196,4 @@ Project.PACKAGE_GLOB = 'packages/*';
|
|
|
196
196
|
Project.LICENSE_GLOB = 'LICEN{S,C}E{,.*}';
|
|
197
197
|
Project.PACKAGE_GLOB = 'packages/*';
|
|
198
198
|
Project.LICENSE_GLOB = 'LICEN{S,C}E{,.*}';
|
|
199
|
-
module.exports.getPackages = Project.getPackages;
|
|
200
|
-
module.exports.getPackagesSync = Project.getPackagesSync;
|
|
201
199
|
//# sourceMappingURL=project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/project/project.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA8C;AAC9C,oDAA4B;AAC5B,oDAA+C;AAC/C,8DAAqC;AACrC,oDAAyB;AACzB,gDAAwB;AACxB,kDAAyB;AACzB,oEAA0C;AAC1C,sEAA4C;AAE5C,wCAAqC;AACrC,uDAAmD;AACnD,0DAAsD;AACtD,6DAA4E;AAG5E;;;;;GAKG;AACH,MAAa,OAAO;IAOlB;;OAEG;IACH,YAAY,
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/project/project.ts"],"names":[],"mappings":"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"}
|
package/dist/prompt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../src/prompt.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAiE;AACjE,oDAAyB;AAEzB;;;;GAIG;AACI,KAAK,UAAU,kBAAkB,CAAC,OAAe;IACtD,gBAAG,CAAC,KAAK,EAAE,CAAC;IACZ,MAAM,OAAO,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;QACpC;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,SAAS;YACf,OAAO;YACP,OAAO,EAAE,CAAC;YACV,OAAO,EAAE;gBACP,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;gBACtC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE;aACvC;SACF;KACF,CAAC,CAAC;IACH,gBAAG,CAAC,MAAM,EAAE,CAAC;IAEb,OAAO,OAAO,CAAC,OAAO,CAAC;AACzB,CAAC;AAjBD,gDAiBC;AAED;;;;;GAKG;AACI,KAAK,UAAU,eAAe,
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../src/prompt.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAiE;AACjE,oDAAyB;AAEzB;;;;GAIG;AACI,KAAK,UAAU,kBAAkB,CAAC,OAAe;IACtD,gBAAG,CAAC,KAAK,EAAE,CAAC;IACZ,MAAM,OAAO,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;QACpC;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,SAAS;YACf,OAAO;YACP,OAAO,EAAE,CAAC;YACV,OAAO,EAAE;gBACP,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;gBACtC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE;aACvC;SACF;KACF,CAAC,CAAC;IACH,gBAAG,CAAC,MAAM,EAAE,CAAC;IAEb,OAAO,OAAO,CAAC,OAAO,CAAC;AACzB,CAAC;AAjBD,gDAiBC;AAED;;;;;GAKG;AACI,KAAK,UAAU,eAAe,CACnC,OAAe,EACf,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,KAAK,EAA8E;IAE9G,gBAAG,CAAC,KAAK,EAAE,CAAC;IAEZ,MAAM,OAAO,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;QACpC;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,OAAO;YACP,OAAO;YACP,QAAQ,EAAE,OAAO,CAAC,MAAM;YACxB,MAAM;YACN,QAAQ;SACT;KACF,CAAC,CAAC;IACH,gBAAG,CAAC,MAAM,EAAE,CAAC;IAEb,OAAO,OAAO,CAAC,MAAM,CAAC;AACxB,CAAC;AApBD,0CAoBC;AAED;;;;;GAKG;AACI,KAAK,UAAU,eAAe,CACnC,OAAe,EACf,EAAE,MAAM,EAAE,QAAQ,KAAK,EAA2C;IAElE,gBAAG,CAAC,KAAK,EAAE,CAAC;IAEZ,MAAM,OAAO,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;QACpC;YACE,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,OAAO;YACb,OAAO;YACP,MAAM;YACN,QAAQ;SACT;KACF,CAAC,CAAC;IACH,gBAAG,CAAC,MAAM,EAAE,CAAC;IAEb,OAAO,OAAO,CAAC,KAAK,CAAC;AACvB,CAAC;AAlBD,0CAkBC"}
|
|
@@ -7,7 +7,7 @@ exports.collectUncommittedSync = exports.collectUncommitted = void 0;
|
|
|
7
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
8
|
const npmlog_1 = __importDefault(require("npmlog"));
|
|
9
9
|
const child_process_1 = require("../child-process");
|
|
10
|
-
const maybeColorize = (colorize) => (s) =>
|
|
10
|
+
const maybeColorize = (colorize) => (s) => s !== ' ' ? colorize(s) : s;
|
|
11
11
|
const cRed = maybeColorize(chalk_1.default.red);
|
|
12
12
|
const cGreen = maybeColorize(chalk_1.default.green);
|
|
13
13
|
const colorizeStats = (stats) => stats.replace(/^([^U]| )([A-Z]| )/gm, replaceStatus).replace(/^\?{2}|U{2}/gm, cRed('$&'));
|
|
@@ -23,8 +23,7 @@ const transformOutput = o(filterEmpty, o(splitOnNewLine, colorizeStats));
|
|
|
23
23
|
*/
|
|
24
24
|
function collectUncommitted({ cwd, log = npmlog_1.default }, gitDryRun = false) {
|
|
25
25
|
log.silly('collect-uncommitted', 'git status --porcelain (async)');
|
|
26
|
-
return (0, child_process_1.exec)('git', ['status', '--porcelain'], { cwd }, gitDryRun)
|
|
27
|
-
.then(({ stdout }) => transformOutput(stdout));
|
|
26
|
+
return (0, child_process_1.exec)('git', ['status', '--porcelain'], { cwd }, gitDryRun).then(({ stdout }) => transformOutput(stdout));
|
|
28
27
|
}
|
|
29
28
|
exports.collectUncommitted = collectUncommitted;
|
|
30
29
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect-uncommitted.js","sourceRoot":"","sources":["../../src/utils/collect-uncommitted.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oDAA4B;AAE5B,oDAAkD;AAOlD,MAAM,aAAa,GAAG,CAAC,QAAoC,EAAE,EAAE,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"collect-uncommitted.js","sourceRoot":"","sources":["../../src/utils/collect-uncommitted.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oDAA4B;AAE5B,oDAAkD;AAOlD,MAAM,aAAa,GAAG,CAAC,QAAoC,EAAE,EAAE,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5G,MAAM,IAAI,GAAG,aAAa,CAAC,eAAK,CAAC,GAAG,CAAC,CAAC;AACtC,MAAM,MAAM,GAAG,aAAa,CAAC,eAAK,CAAC,KAAK,CAAC,CAAC;AAC1C,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CACtC,KAAK,CAAC,OAAO,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5F,MAAM,aAAa,GAAG,CAAC,CAAC,EAAE,UAAmB,EAAE,QAAiB,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;AAC9G,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AACxD,MAAM,WAAW,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC7E,MAAM,CAAC,GAAG,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7C,MAAM,eAAe,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC;AAEzE;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,EAAE,GAAG,EAAE,GAAG,GAAG,gBAAM,EAAqB,EAAE,SAAS,GAAG,KAAK;IAC5F,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,gCAAgC,CAAC,CAAC;IAEnE,OAAO,IAAA,oBAAI,EAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;AAClH,CAAC;AAJD,gDAIC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,EAAE,GAAG,EAAE,GAAG,GAAG,gBAAM,EAAqB,EAAE,SAAS,GAAG,KAAK;IAChG,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,+BAA+B,CAAC,CAAC;IAElE,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;IAC9E,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;AACjC,CAAC;AALD,wDAKC"}
|
|
@@ -18,7 +18,7 @@ const make_diff_predicate_1 = require("./lib/make-diff-predicate");
|
|
|
18
18
|
* @param {UpdateCollectorOptions} commandOptions
|
|
19
19
|
*/
|
|
20
20
|
function collectUpdates(filteredPackages, packageGraph, execOpts, commandOptions, gitDryRun = false) {
|
|
21
|
-
const { forcePublish, conventionalCommits, conventionalGraduate, excludeDependents } = commandOptions;
|
|
21
|
+
const { forcePublish, conventionalCommits, conventionalGraduate, excludeDependents, isIndependent } = commandOptions;
|
|
22
22
|
// If --conventional-commits and --conventional-graduate are both set, ignore --force-publish
|
|
23
23
|
const useConventionalGraduate = conventionalCommits && conventionalGraduate;
|
|
24
24
|
const forced = (0, get_packages_for_option_1.getPackagesForOption)(useConventionalGraduate ? conventionalGraduate : forcePublish);
|
|
@@ -26,9 +26,16 @@ function collectUpdates(filteredPackages, packageGraph, execOpts, commandOptions
|
|
|
26
26
|
? packageGraph
|
|
27
27
|
: new Map(filteredPackages.map(({ name }) => [name, packageGraph.get(name)]));
|
|
28
28
|
let committish = commandOptions.since;
|
|
29
|
-
|
|
29
|
+
const tagPattern = isIndependent ? '*@*' : '';
|
|
30
|
+
if ((0, has_tags_1.hasTags)(execOpts, tagPattern)) {
|
|
31
|
+
const describeOptions = {
|
|
32
|
+
...execOpts,
|
|
33
|
+
};
|
|
34
|
+
if (isIndependent) {
|
|
35
|
+
describeOptions.match = tagPattern;
|
|
36
|
+
}
|
|
30
37
|
// describe the last annotated tag in the current branch
|
|
31
|
-
const { sha, refCount, lastTagName } = (0, describe_ref_1.describeRefSync)(
|
|
38
|
+
const { sha, refCount, lastTagName } = (0, describe_ref_1.describeRefSync)(describeOptions, commandOptions.includeMergedTags, gitDryRun);
|
|
32
39
|
// TODO: warn about dirty tree?
|
|
33
40
|
if (refCount === '0' && forced.size === 0 && !committish) {
|
|
34
41
|
// no commits since previous release
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect-updates.js","sourceRoot":"","sources":["../../../src/utils/collect-updates/collect-updates.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAyB;AAKzB,kDAAkD;AAClD,6DAAyD;AACzD,2EAAqE;AACrE,6CAAyC;AACzC,mEAA8D;AAE9D;;;;;;GAMG;AACH,SAAgB,cAAc,
|
|
1
|
+
{"version":3,"file":"collect-updates.js","sourceRoot":"","sources":["../../../src/utils/collect-updates/collect-updates.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect-packages.js","sourceRoot":"","sources":["../../../../src/utils/collect-updates/lib/collect-packages.ts"],"names":[],"mappings":";;;AACA,6DAAyD;AAQzD;;;;GAIG;AACH,SAAgB,eAAe,
|
|
1
|
+
{"version":3,"file":"collect-packages.js","sourceRoot":"","sources":["../../../../src/utils/collect-updates/lib/collect-packages.ts"],"names":[],"mappings":";;;AACA,6DAAyD;AAQzD;;;;GAIG;AACH,SAAgB,eAAe,CAC7B,QAAQ,EACR,EAAE,WAAW,GAAG,GAAG,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,iBAAiB,KAAK,EAA6B;IAE1F,mEAAmE;IACnE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;IAE7B,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QAC9B,IAAI,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YAC3B,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SACtB;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,iBAAiB,EAAE;QACtB,IAAA,sCAAiB,EAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;KACvE;IAED,6DAA6D;IAC7D,MAAM,OAAO,GAAuB,EAAE,CAAC;IAEvC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QAC9B,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACxB,IAAI,SAAS,EAAE;gBACb,SAAS,CAAC,IAAI,CAAC,CAAC;aACjB;YACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACpB;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC;AA9BD,0CA8BC"}
|