@opencrvs/toolkit 2.0.0-rc.c661677 → 2.0.0-rc.ca1536b
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/application-config/index.js +13 -25
- package/dist/cli.js +295 -122
- package/dist/commons/api/router.d.ts +2961 -246
- package/dist/commons/conditionals/validate.d.ts +1 -0
- package/dist/commons/events/ActionInput.d.ts +108 -0
- package/dist/commons/events/Draft.d.ts +3 -0
- package/dist/commons/events/EventIndex.d.ts +0 -3
- package/dist/commons/events/EventMetadata.d.ts +0 -7
- package/dist/commons/events/state/index.d.ts +0 -4
- package/dist/commons/events/state/utils.d.ts +0 -2
- package/dist/commons/events/utils.d.ts +1 -1
- package/dist/events/index.js +29 -55
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
- package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
- package/dist/migrations/v2.0/index.d.ts +5 -3
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +295 -122
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
- package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-scopes.js +54 -30
- package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
- package/dist/notification/index.js +16 -25
- package/opencrvs-toolkit-2.0.0-rc.ca1536b.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.c661677.tgz +0 -0
package/dist/events/index.js
CHANGED
|
@@ -306,7 +306,6 @@ __export(events_exports, {
|
|
|
306
306
|
getAllUniqueFields: () => getAllUniqueFields,
|
|
307
307
|
getAnnotationFromDrafts: () => getAnnotationFromDrafts,
|
|
308
308
|
getAssignedUserFromActions: () => getAssignedUserFromActions,
|
|
309
|
-
getAssignedUserSignatureFromActions: () => getAssignedUserSignatureFromActions,
|
|
310
309
|
getAssignmentStatus: () => getAssignmentStatus,
|
|
311
310
|
getAvailableActionsForEvent: () => getAvailableActionsForEvent,
|
|
312
311
|
getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
|
|
@@ -1414,28 +1413,20 @@ function schemaPriority(schema) {
|
|
|
1414
1413
|
return idx === -1 ? 9999 : idx;
|
|
1415
1414
|
}
|
|
1416
1415
|
function safeUnion(schemas) {
|
|
1416
|
+
const sortedSchemas = [...schemas].sort(
|
|
1417
|
+
(a, b) => schemaPriority(a) - schemaPriority(b)
|
|
1418
|
+
);
|
|
1417
1419
|
return z12.any().superRefine((val, ctx) => {
|
|
1418
|
-
const
|
|
1419
|
-
|
|
1420
|
-
|
|
1421
|
-
|
|
1422
|
-
if (successful.length === 0) {
|
|
1423
|
-
ctx.addIssue({
|
|
1424
|
-
code: "invalid_type",
|
|
1425
|
-
expected: "custom",
|
|
1426
|
-
message: "Value does not match any schema"
|
|
1427
|
-
});
|
|
1428
|
-
return;
|
|
1429
|
-
}
|
|
1430
|
-
successful.sort((a, b) => schemaPriority(a) - schemaPriority(b));
|
|
1431
|
-
const best = successful[0];
|
|
1432
|
-
if (!best.safeParse(val).success) {
|
|
1433
|
-
ctx.addIssue({
|
|
1434
|
-
expected: "custom",
|
|
1435
|
-
code: "invalid_type",
|
|
1436
|
-
message: "Value did not match the best schema"
|
|
1437
|
-
});
|
|
1420
|
+
for (const schema of sortedSchemas) {
|
|
1421
|
+
if (schema.safeParse(val).success) {
|
|
1422
|
+
return;
|
|
1423
|
+
}
|
|
1438
1424
|
}
|
|
1425
|
+
ctx.addIssue({
|
|
1426
|
+
code: "invalid_type",
|
|
1427
|
+
expected: "custom",
|
|
1428
|
+
message: "Value does not match any schema"
|
|
1429
|
+
});
|
|
1439
1430
|
}).meta({
|
|
1440
1431
|
description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
|
|
1441
1432
|
});
|
|
@@ -1773,8 +1764,7 @@ var ActionCreationMetadata = z16.object({
|
|
|
1773
1764
|
),
|
|
1774
1765
|
createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
|
|
1775
1766
|
acceptedAt: z16.iso.datetime().describe("Timestamp when the action request was accepted."),
|
|
1776
|
-
createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
|
|
1777
|
-
createdBySignature: z16.string().nullish().describe("Signature of the user who created the action request.")
|
|
1767
|
+
createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
|
|
1778
1768
|
});
|
|
1779
1769
|
var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
1780
1770
|
registrationNumber: z16.string().describe(
|
|
@@ -1802,9 +1792,6 @@ var EventMetadata = z16.object({
|
|
|
1802
1792
|
createdAtLocation: UUID.nullish().describe(
|
|
1803
1793
|
"Location of the user who created the event."
|
|
1804
1794
|
),
|
|
1805
|
-
createdBySignature: DocumentPath.nullish().describe(
|
|
1806
|
-
"Signature of the user who created the event."
|
|
1807
|
-
),
|
|
1808
1795
|
updatedAtLocation: UUID.nullish().describe(
|
|
1809
1796
|
"Location of the user who last changed the status."
|
|
1810
1797
|
),
|
|
@@ -3804,6 +3791,9 @@ function precompileActionSchemas(eventConfigurations) {
|
|
|
3804
3791
|
function isAgeValue(value) {
|
|
3805
3792
|
return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
|
|
3806
3793
|
}
|
|
3794
|
+
function mergeWithBaseFormState(values, context) {
|
|
3795
|
+
return { ...context.baseFormState, ...values };
|
|
3796
|
+
}
|
|
3807
3797
|
function validate(schema, data) {
|
|
3808
3798
|
const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
|
|
3809
3799
|
if ("$form" in data) {
|
|
@@ -3842,7 +3832,7 @@ function isOnline() {
|
|
|
3842
3832
|
}
|
|
3843
3833
|
function isConditionMet(conditional, values, context, eventIndex) {
|
|
3844
3834
|
return validate(conditional, {
|
|
3845
|
-
$form: values,
|
|
3835
|
+
$form: mergeWithBaseFormState(values, context),
|
|
3846
3836
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3847
3837
|
$online: isOnline(),
|
|
3848
3838
|
$user: context.user,
|
|
@@ -3871,7 +3861,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
|
3871
3861
|
return true;
|
|
3872
3862
|
}
|
|
3873
3863
|
const validConditionals = getConditionalActionsForField(field3, {
|
|
3874
|
-
$form: form,
|
|
3864
|
+
$form: mergeWithBaseFormState(form, context),
|
|
3875
3865
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3876
3866
|
$online: isOnline(),
|
|
3877
3867
|
$user: context.user,
|
|
@@ -4063,7 +4053,7 @@ function runFieldValidations({
|
|
|
4063
4053
|
return [];
|
|
4064
4054
|
}
|
|
4065
4055
|
const conditionalParameters = {
|
|
4066
|
-
$form: form,
|
|
4056
|
+
$form: mergeWithBaseFormState(form, context),
|
|
4067
4057
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
4068
4058
|
/**
|
|
4069
4059
|
* In real use cases, there can be hundreds of thousands of locations.
|
|
@@ -4307,17 +4297,16 @@ function isPageVisible(page, formValues, context) {
|
|
|
4307
4297
|
}
|
|
4308
4298
|
return isConditionMet(page.conditional, formValues, context);
|
|
4309
4299
|
}
|
|
4310
|
-
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false
|
|
4300
|
+
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
|
|
4311
4301
|
const base = (0, import_lodash.cloneDeep)(formValues);
|
|
4312
4302
|
function fn(prevVisibilityContext) {
|
|
4313
|
-
const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
|
|
4314
4303
|
const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
|
|
4315
4304
|
const fieldConfig = fields.filter((f) => f.id === fieldId);
|
|
4316
4305
|
if (!fieldConfig.length) {
|
|
4317
4306
|
return false;
|
|
4318
4307
|
}
|
|
4319
4308
|
const isHidden = fieldConfig.every(
|
|
4320
|
-
(f) => !isFieldVisible(f,
|
|
4309
|
+
(f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
|
|
4321
4310
|
);
|
|
4322
4311
|
if (!isHidden) {
|
|
4323
4312
|
return false;
|
|
@@ -4335,7 +4324,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
|
|
|
4335
4324
|
const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4336
4325
|
const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4337
4326
|
const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
|
|
4338
|
-
return hiddenFields.some((f) => f.id === fieldId);
|
|
4327
|
+
return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
|
|
4339
4328
|
});
|
|
4340
4329
|
return omitHiddenFields(
|
|
4341
4330
|
visibleFields,
|
|
@@ -4382,13 +4371,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
|
|
|
4382
4371
|
}
|
|
4383
4372
|
function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
|
|
4384
4373
|
const annotationFields = getActionAnnotationFields(actionConfig);
|
|
4385
|
-
return omitHiddenFields(
|
|
4386
|
-
|
|
4387
|
-
|
|
4388
|
-
|
|
4389
|
-
false,
|
|
4390
|
-
declaration
|
|
4391
|
-
);
|
|
4374
|
+
return omitHiddenFields(annotationFields, annotation, {
|
|
4375
|
+
...context,
|
|
4376
|
+
baseFormState: declaration
|
|
4377
|
+
});
|
|
4392
4378
|
}
|
|
4393
4379
|
function deepMerge(currentDocument, actionDocument) {
|
|
4394
4380
|
const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
|
|
@@ -5900,6 +5886,9 @@ var BaseActionInput = z38.object({
|
|
|
5900
5886
|
originalActionId: UUID.optional(),
|
|
5901
5887
|
// should not be part of base action.
|
|
5902
5888
|
keepAssignment: z38.boolean().optional(),
|
|
5889
|
+
keepAssignmentIfAccepted: z38.boolean().optional(),
|
|
5890
|
+
keepAssignmentIfRejected: z38.boolean().optional(),
|
|
5891
|
+
waitFor: z38.boolean().optional(),
|
|
5903
5892
|
// For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
|
|
5904
5893
|
// @TODO: createdAtLocation should be limited to actions that system users can perform. For normal users, it should not be part of the base action.
|
|
5905
5894
|
createdAtLocation: UUID.nullish().describe(
|
|
@@ -6153,7 +6142,6 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
|
|
|
6153
6142
|
createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
|
|
6154
6143
|
acceptedAt: acceptAction.createdAt,
|
|
6155
6144
|
createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
|
|
6156
|
-
createdBySignature: requestAction?.createdBySignature ?? acceptAction.createdBySignature,
|
|
6157
6145
|
registrationNumber
|
|
6158
6146
|
};
|
|
6159
6147
|
}
|
|
@@ -6367,17 +6355,6 @@ function getAssignedUserFromActions(actions) {
|
|
|
6367
6355
|
return user2;
|
|
6368
6356
|
}, null);
|
|
6369
6357
|
}
|
|
6370
|
-
function getAssignedUserSignatureFromActions(actions) {
|
|
6371
|
-
return actions.reduce((signature, action) => {
|
|
6372
|
-
if (action.type === ActionType.ASSIGN) {
|
|
6373
|
-
return action.createdBySignature || null;
|
|
6374
|
-
}
|
|
6375
|
-
if (action.type === ActionType.UNASSIGN) {
|
|
6376
|
-
return null;
|
|
6377
|
-
}
|
|
6378
|
-
return signature;
|
|
6379
|
-
}, null);
|
|
6380
|
-
}
|
|
6381
6358
|
function deepDropNulls(obj) {
|
|
6382
6359
|
if (Array.isArray(obj)) {
|
|
6383
6360
|
return obj.map(deepDropNulls);
|
|
@@ -6473,10 +6450,8 @@ function getCurrentEventState(event2, config) {
|
|
|
6473
6450
|
createdBy: creationAction.createdBy,
|
|
6474
6451
|
createdByUserType: creationAction.createdByUserType,
|
|
6475
6452
|
createdAtLocation: creationAction.createdAtLocation,
|
|
6476
|
-
createdBySignature: creationAction.createdBySignature,
|
|
6477
6453
|
updatedAt: acceptedActionMetadata.createdAt,
|
|
6478
6454
|
assignedTo: getAssignedUserFromActions(acceptedActions),
|
|
6479
|
-
assignedToSignature: getAssignedUserSignatureFromActions(acceptedActions),
|
|
6480
6455
|
updatedBy: requestActionMetadata.createdBy,
|
|
6481
6456
|
updatedAtLocation: requestActionMetadata.createdAtLocation,
|
|
6482
6457
|
declaration,
|
|
@@ -9735,7 +9710,6 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
|
|
|
9735
9710
|
createdBy: overrides.createdBy ?? generateUuid(rng),
|
|
9736
9711
|
createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
|
|
9737
9712
|
updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
|
|
9738
|
-
createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
|
|
9739
9713
|
updatedAt: overrides.updatedAt ?? (0, import_date_fns4.addDays)(new Date(createdAt), 1).toISOString(),
|
|
9740
9714
|
assignedTo: overrides.assignedTo ?? null,
|
|
9741
9715
|
updatedBy: overrides.updatedBy ?? generateUuid(rng),
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
2
|
-
export declare const UPSTREAM_BRANCH = "
|
|
2
|
+
export declare const UPSTREAM_BRANCH = "release-v2.0.0";
|
|
3
3
|
/**
|
|
4
4
|
* Runs a git command in the country config working directory.
|
|
5
5
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;
|
|
1
|
+
{"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;AAE1D,eAAO,MAAM,eAAe,mBAAmB,CAAA;AAc/C;;;;;;GAMG;AACH,wBAAgB,MAAM,CACpB,IAAI,EAAE,MAAM,EAAE,EACd,EAAE,MAAc,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAC5C,MAAM,CAMR;AAED;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAO9C;AAED,wBAAgB,eAAe,IAAI,IAAI,CAMtC;AAID,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAuDnC;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|
|
@@ -59,8 +59,7 @@ exports.main = main;
|
|
|
59
59
|
*/
|
|
60
60
|
const child_process_1 = require("child_process");
|
|
61
61
|
exports.UPSTREAM_URL = 'https://github.com/opencrvs/opencrvs-countryconfig.git';
|
|
62
|
-
|
|
63
|
-
exports.UPSTREAM_BRANCH = 'develop';
|
|
62
|
+
exports.UPSTREAM_BRANCH = 'release-v2.0.0';
|
|
64
63
|
// Remote name used only for the duration of this codemod. Prefixed to avoid
|
|
65
64
|
// clashing with remotes the user may have (origin, upstream, etc.).
|
|
66
65
|
const TEMP_REMOTE = 'opencrvs-upgrade-v19-v20-codemod';
|
|
@@ -1,3 +1,11 @@
|
|
|
1
|
-
|
|
1
|
+
interface DeleteInfrastructureOptions {
|
|
2
|
+
/**
|
|
3
|
+
* Top-level entries directly under `infrastructure/` to preserve. Names
|
|
4
|
+
* match against the basename of each entry (file or directory). When
|
|
5
|
+
* empty (the default), the whole `infrastructure/` directory is deleted.
|
|
6
|
+
*/
|
|
7
|
+
keep?: string[];
|
|
8
|
+
}
|
|
9
|
+
declare function main({ keep }?: DeleteInfrastructureOptions): Promise<void>;
|
|
2
10
|
export { main };
|
|
3
11
|
//# sourceMappingURL=delete-infrastructure-directory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete-infrastructure-directory.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/delete-infrastructure-directory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"delete-infrastructure-directory.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/delete-infrastructure-directory.ts"],"names":[],"mappings":"AAoDA,UAAU,2BAA2B;IACnC;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;CAChB;AAED,iBAAe,IAAI,CAAC,EAClB,IAAS,EACV,GAAE,2BAAgC,GAAG,OAAO,CAAC,IAAI,CAAC,CA4FlD;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|
|
@@ -27,20 +27,28 @@ exports.main = main;
|
|
|
27
27
|
* via Docker Swarm. In that case the `infrastructure/` directory shipped
|
|
28
28
|
* with opencrvs-countryconfig is no longer needed and can be removed.
|
|
29
29
|
*
|
|
30
|
+
* Some non-Swarm deployments still need a small subset of
|
|
31
|
+
* `infrastructure/` (e.g. `postgres/` and `metabase/`). Pass `keep` to
|
|
32
|
+
* preserve those top-level subdirectories — everything else under
|
|
33
|
+
* `infrastructure/` is deleted, and the kept subdirectories can then be
|
|
34
|
+
* refreshed from upstream by `merge-infrastructure-directory.ts` with the
|
|
35
|
+
* matching `subdirs` option.
|
|
36
|
+
*
|
|
30
37
|
* Usage:
|
|
31
38
|
* ts-node -r tsconfig-paths/register src/migrations/v2.0/delete-infrastructure-directory.ts
|
|
32
39
|
*
|
|
33
40
|
* What it does:
|
|
34
41
|
* 1. Stages deletion of all tracked files under `infrastructure/` via
|
|
35
|
-
* `git rm -rf --ignore-unmatch --
|
|
36
|
-
*
|
|
42
|
+
* `git rm -rf --ignore-unmatch -- <path>`. This both removes the
|
|
43
|
+
* files from the working tree and records the deletion in the
|
|
37
44
|
* index, so it shows up in the upgrade commit alongside the other
|
|
38
|
-
* codemod changes.
|
|
45
|
+
* codemod changes. When `keep` is provided, deletion is scoped to
|
|
46
|
+
* the top-level entries that are NOT in `keep`.
|
|
39
47
|
* 2. Cleans up any untracked files / empty directory that `git rm` left
|
|
40
|
-
* behind, so the
|
|
48
|
+
* behind, so the deleted paths are fully gone from the working tree.
|
|
41
49
|
*
|
|
42
50
|
* Caveats:
|
|
43
|
-
* - Destructive: any local edits to
|
|
51
|
+
* - Destructive: any local edits to deleted paths are lost. Run on a
|
|
44
52
|
* clean working tree (or after committing your local changes).
|
|
45
53
|
* - If `infrastructure/` doesn't exist, this codemod is a no-op.
|
|
46
54
|
* - Requires git to be installed and the country config working directory
|
|
@@ -51,27 +59,65 @@ const path_1 = require("path");
|
|
|
51
59
|
const checkout_upstream_files_1 = require("./checkout-upstream-files");
|
|
52
60
|
const INFRASTRUCTURE_DIR = 'infrastructure';
|
|
53
61
|
function main() {
|
|
54
|
-
return __awaiter(this,
|
|
62
|
+
return __awaiter(this, arguments, void 0, function* ({ keep = [] } = {}) {
|
|
55
63
|
const fullPath = (0, path_1.join)(process.cwd(), INFRASTRUCTURE_DIR);
|
|
56
64
|
if (!(0, fs_1.existsSync)(fullPath)) {
|
|
57
65
|
console.log(`'${INFRASTRUCTURE_DIR}/' not found in ${process.cwd()} — nothing to delete.`);
|
|
58
66
|
return;
|
|
59
67
|
}
|
|
60
|
-
console.log(`Deleting '${INFRASTRUCTURE_DIR}/'...\n`);
|
|
61
68
|
(0, checkout_upstream_files_1.assertIsGitRepo)();
|
|
62
|
-
//
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
69
|
+
// ─── Whole-directory delete (legacy behavior) ────────────────────────
|
|
70
|
+
if (keep.length === 0) {
|
|
71
|
+
console.log(`Deleting '${INFRASTRUCTURE_DIR}/'...\n`);
|
|
72
|
+
// `git rm -rf --ignore-unmatch` removes tracked files (working tree +
|
|
73
|
+
// index) and is a no-op for paths with no tracked entries, so it's
|
|
74
|
+
// safe to run even when `infrastructure/` exists only as untracked
|
|
75
|
+
// files.
|
|
76
|
+
(0, checkout_upstream_files_1.runGit)(['rm', '-rf', '--ignore-unmatch', '--', `${INFRASTRUCTURE_DIR}/`], {
|
|
77
|
+
silent: true
|
|
78
|
+
});
|
|
79
|
+
console.log(` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR}/'.`);
|
|
80
|
+
// `git rm` leaves untracked files (and any now-empty directory) on
|
|
81
|
+
// disk; remove whatever's left so the path is fully gone.
|
|
82
|
+
if ((0, fs_1.existsSync)(fullPath)) {
|
|
83
|
+
(0, fs_1.rmSync)(fullPath, { recursive: true, force: true });
|
|
84
|
+
console.log(` Removed remaining untracked files under '${INFRASTRUCTURE_DIR}/'.`);
|
|
85
|
+
}
|
|
86
|
+
console.log(`\n Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR}/'`);
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
// ─── Selective delete: keep listed top-level entries ─────────────────
|
|
90
|
+
const keepSet = new Set(keep);
|
|
91
|
+
console.log(`Deleting contents of '${INFRASTRUCTURE_DIR}/' except: ${[...keepSet]
|
|
92
|
+
.map((name) => `'${name}'`)
|
|
93
|
+
.join(', ')}\n`);
|
|
94
|
+
const topLevelEntries = (0, fs_1.readdirSync)(fullPath, { withFileTypes: true });
|
|
95
|
+
let deleted = 0;
|
|
96
|
+
for (const entry of topLevelEntries) {
|
|
97
|
+
if (keepSet.has(entry.name)) {
|
|
98
|
+
console.log(` Keeping '${INFRASTRUCTURE_DIR}/${entry.name}'.`);
|
|
99
|
+
continue;
|
|
100
|
+
}
|
|
101
|
+
// Append a trailing slash for directories so git treats it as a tree
|
|
102
|
+
// pathspec (matches the recursive behavior of `git rm -rf`).
|
|
103
|
+
const relPath = `${INFRASTRUCTURE_DIR}/${entry.name}${entry.isDirectory() ? '/' : ''}`;
|
|
104
|
+
(0, checkout_upstream_files_1.runGit)(['rm', '-rf', '--ignore-unmatch', '--', relPath], { silent: true });
|
|
105
|
+
const fullEntryPath = (0, path_1.join)(fullPath, entry.name);
|
|
106
|
+
if ((0, fs_1.existsSync)(fullEntryPath)) {
|
|
107
|
+
(0, fs_1.rmSync)(fullEntryPath, { recursive: true, force: true });
|
|
108
|
+
}
|
|
109
|
+
console.log(` Deleted '${relPath}'.`);
|
|
110
|
+
deleted++;
|
|
111
|
+
}
|
|
112
|
+
// Note any requested keeps that weren't actually present, so the dev
|
|
113
|
+
// notices typos / missing directories.
|
|
114
|
+
const presentNames = new Set(topLevelEntries.map((e) => e.name));
|
|
115
|
+
const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
|
|
116
|
+
if (missingKeeps.length > 0) {
|
|
117
|
+
console.warn(` [warn] Requested to keep ${missingKeeps
|
|
118
|
+
.map((n) => `'${n}'`)
|
|
119
|
+
.join(', ')} but they don't exist under '${INFRASTRUCTURE_DIR}/'.`);
|
|
74
120
|
}
|
|
75
|
-
console.log(`\n Done. Review the staged
|
|
121
|
+
console.log(`\n Done. Deleted ${deleted} top-level entr${deleted === 1 ? 'y' : 'ies'}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR}/'`);
|
|
76
122
|
});
|
|
77
123
|
}
|
|
@@ -3,9 +3,11 @@
|
|
|
3
3
|
* directory.
|
|
4
4
|
*
|
|
5
5
|
* @param dockerSwarm - When true, the local `infrastructure/` directory is
|
|
6
|
-
* merged with upstream changes (Docker Swarm deployments
|
|
7
|
-
* When false (the default),
|
|
8
|
-
*
|
|
6
|
+
* merged with upstream changes in its entirety (Docker Swarm deployments
|
|
7
|
+
* still need it all). When false (the default), everything under
|
|
8
|
+
* `infrastructure/` is deleted EXCEPT the subdirectories listed in
|
|
9
|
+
* `NON_SWARM_INFRA_SUBDIRS`, and those preserved subdirectories are then
|
|
10
|
+
* merged with upstream.
|
|
9
11
|
*/
|
|
10
12
|
export declare function runUpgrade(dockerSwarm: boolean): Promise<void>;
|
|
11
13
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/index.ts"],"names":[],"mappings":"AA6CA;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAAC,WAAW,EAAE,OAAO,iBAgCpD"}
|