@opencrvs/toolkit 2.0.0-rc.a657c77 → 2.0.0-rc.a7c070e
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 +12 -20
- package/dist/cli.js +93 -187
- package/dist/commons/api/router.d.ts +7 -0
- package/dist/commons/events/ActionInput.d.ts +36 -0
- package/dist/commons/events/Draft.d.ts +1 -0
- package/dist/events/index.js +13 -20
- 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 +2 -1
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +1 -9
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
- package/dist/migrations/v2.0/delete-infrastructure-directory.js +20 -66
- package/dist/migrations/v2.0/index.d.ts +3 -5
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +93 -187
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +1 -11
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.js +16 -17
- package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-workqueue-configs.js +59 -140
- package/dist/notification/index.js +13 -20
- package/opencrvs-toolkit-2.0.0-rc.a7c070e.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.a657c77.tgz +0 -0
|
@@ -418,28 +418,20 @@ function schemaPriority(schema) {
|
|
|
418
418
|
return idx === -1 ? 9999 : idx;
|
|
419
419
|
}
|
|
420
420
|
function safeUnion(schemas) {
|
|
421
|
+
const sortedSchemas = [...schemas].sort(
|
|
422
|
+
(a, b) => schemaPriority(a) - schemaPriority(b)
|
|
423
|
+
);
|
|
421
424
|
return z7.any().superRefine((val, ctx) => {
|
|
422
|
-
const
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
if (successful.length === 0) {
|
|
427
|
-
ctx.addIssue({
|
|
428
|
-
code: "invalid_type",
|
|
429
|
-
expected: "custom",
|
|
430
|
-
message: "Value does not match any schema"
|
|
431
|
-
});
|
|
432
|
-
return;
|
|
433
|
-
}
|
|
434
|
-
successful.sort((a, b) => schemaPriority(a) - schemaPriority(b));
|
|
435
|
-
const best = successful[0];
|
|
436
|
-
if (!best.safeParse(val).success) {
|
|
437
|
-
ctx.addIssue({
|
|
438
|
-
expected: "custom",
|
|
439
|
-
code: "invalid_type",
|
|
440
|
-
message: "Value did not match the best schema"
|
|
441
|
-
});
|
|
425
|
+
for (const schema of sortedSchemas) {
|
|
426
|
+
if (schema.safeParse(val).success) {
|
|
427
|
+
return;
|
|
428
|
+
}
|
|
442
429
|
}
|
|
430
|
+
ctx.addIssue({
|
|
431
|
+
code: "invalid_type",
|
|
432
|
+
expected: "custom",
|
|
433
|
+
message: "Value does not match any schema"
|
|
434
|
+
});
|
|
443
435
|
}).meta({
|
|
444
436
|
description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
|
|
445
437
|
});
|
package/dist/cli.js
CHANGED
|
@@ -3674,10 +3674,6 @@ var ACTION_PROPERTY_NAME2 = "action";
|
|
|
3674
3674
|
var CONDITIONALS_PROPERTY_NAME = "conditionals";
|
|
3675
3675
|
var TYPE_PROPERTY_NAME7 = "type";
|
|
3676
3676
|
var SLUG_PROPERTY_NAME = "slug";
|
|
3677
|
-
var READ_ACTION_TYPE = "READ";
|
|
3678
|
-
var ACTION_TYPE_IMPORT_NAME = "ActionType";
|
|
3679
|
-
var TOOLKIT_EVENTS_MODULE2 = "@opencrvs/toolkit/events";
|
|
3680
|
-
var READ_ACTION_FALLBACK_INITIALIZER = `{ type: ${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE} }`;
|
|
3681
3677
|
var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
|
|
3682
3678
|
"READ",
|
|
3683
3679
|
"DELETE",
|
|
@@ -3725,137 +3721,91 @@ function isUnsupportedActionType(action) {
|
|
|
3725
3721
|
}
|
|
3726
3722
|
return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
|
|
3727
3723
|
}
|
|
3728
|
-
function ensureValidAction(workqueue, relPath) {
|
|
3729
|
-
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3730
|
-
const actionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3731
|
-
if (actionProperty && import_ts_morph17.Node.isPropertyAssignment(actionProperty)) {
|
|
3732
|
-
const initializer = actionProperty.getInitializer();
|
|
3733
|
-
if (initializer && import_ts_morph17.Node.isObjectLiteralExpression(initializer)) {
|
|
3734
|
-
if (!isUnsupportedActionType(initializer)) {
|
|
3735
|
-
return { changed: false, usedReadFallback: false };
|
|
3736
|
-
}
|
|
3737
|
-
actionProperty.set({
|
|
3738
|
-
name: ACTION_PROPERTY_NAME2,
|
|
3739
|
-
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3740
|
-
});
|
|
3741
|
-
console.log(
|
|
3742
|
-
` [${relPath}] Replaced unsupported 'action' type with '${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE}' on workqueue '${workqueueLabel}'`
|
|
3743
|
-
);
|
|
3744
|
-
return { changed: true, usedReadFallback: true };
|
|
3745
|
-
}
|
|
3746
|
-
}
|
|
3747
|
-
workqueue.addPropertyAssignment({
|
|
3748
|
-
name: ACTION_PROPERTY_NAME2,
|
|
3749
|
-
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3750
|
-
});
|
|
3751
|
-
console.log(
|
|
3752
|
-
` [${relPath}] Added default 'action: ${READ_ACTION_FALLBACK_INITIALIZER}' to workqueue '${workqueueLabel}'`
|
|
3753
|
-
);
|
|
3754
|
-
return { changed: true, usedReadFallback: true };
|
|
3755
|
-
}
|
|
3756
3724
|
function migrateWorkqueueActions(workqueue, relPath) {
|
|
3757
|
-
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3758
3725
|
const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
|
|
3759
|
-
|
|
3760
|
-
|
|
3761
|
-
|
|
3762
|
-
|
|
3763
|
-
|
|
3764
|
-
|
|
3765
|
-
|
|
3766
|
-
|
|
3767
|
-
|
|
3768
|
-
|
|
3769
|
-
|
|
3770
|
-
|
|
3771
|
-
|
|
3772
|
-
|
|
3773
|
-
|
|
3774
|
-
` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
|
|
3775
|
-
);
|
|
3776
|
-
}
|
|
3777
|
-
}
|
|
3778
|
-
}
|
|
3779
|
-
actionsProperty.remove();
|
|
3780
|
-
console.log(
|
|
3781
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3782
|
-
);
|
|
3783
|
-
actionsArrayMigrated = true;
|
|
3784
|
-
} else {
|
|
3785
|
-
const actionCandidates = actionsInitializer.getElements().filter(
|
|
3786
|
-
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
3726
|
+
if (!actionsProperty || !import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
|
|
3727
|
+
return 0;
|
|
3728
|
+
}
|
|
3729
|
+
const actionsInitializer = actionsProperty.getInitializer();
|
|
3730
|
+
if (!actionsInitializer || !import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
|
|
3731
|
+
return 0;
|
|
3732
|
+
}
|
|
3733
|
+
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3734
|
+
const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3735
|
+
if (existingActionProperty) {
|
|
3736
|
+
if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
|
|
3737
|
+
const existingActionInitializer = existingActionProperty.getInitializer();
|
|
3738
|
+
if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
|
|
3739
|
+
const conditionalsProperty2 = existingActionInitializer.getProperty(
|
|
3740
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3787
3741
|
);
|
|
3788
|
-
if (
|
|
3789
|
-
|
|
3742
|
+
if (conditionalsProperty2) {
|
|
3743
|
+
conditionalsProperty2.remove();
|
|
3790
3744
|
console.log(
|
|
3791
|
-
` [${relPath}] Removed
|
|
3745
|
+
` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
|
|
3792
3746
|
);
|
|
3793
|
-
|
|
3794
|
-
|
|
3795
|
-
|
|
3796
|
-
|
|
3797
|
-
|
|
3798
|
-
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3799
|
-
);
|
|
3800
|
-
}
|
|
3801
|
-
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3802
|
-
CONDITIONALS_PROPERTY_NAME
|
|
3747
|
+
}
|
|
3748
|
+
if (isUnsupportedActionType(existingActionInitializer)) {
|
|
3749
|
+
existingActionProperty.remove();
|
|
3750
|
+
console.log(
|
|
3751
|
+
` [${relPath}] Removed unsupported 'action' type on workqueue '${workqueueLabel}'`
|
|
3803
3752
|
);
|
|
3804
|
-
if (conditionalsProperty) {
|
|
3805
|
-
conditionalsProperty.remove();
|
|
3806
|
-
console.log(
|
|
3807
|
-
` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
|
|
3808
|
-
);
|
|
3809
|
-
}
|
|
3810
|
-
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3811
|
-
actionsProperty.remove();
|
|
3812
|
-
console.log(
|
|
3813
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3814
|
-
);
|
|
3815
|
-
actionsArrayMigrated = true;
|
|
3816
|
-
} else {
|
|
3817
|
-
const firstActionText = actionCandidates[0].getText();
|
|
3818
|
-
workqueue.addPropertyAssignment({
|
|
3819
|
-
name: ACTION_PROPERTY_NAME2,
|
|
3820
|
-
initializer: firstActionText
|
|
3821
|
-
});
|
|
3822
|
-
actionsProperty.remove();
|
|
3823
|
-
console.log(
|
|
3824
|
-
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3825
|
-
);
|
|
3826
|
-
actionsArrayMigrated = true;
|
|
3827
|
-
}
|
|
3828
3753
|
}
|
|
3829
3754
|
}
|
|
3830
3755
|
}
|
|
3756
|
+
actionsProperty.remove();
|
|
3757
|
+
console.log(
|
|
3758
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3759
|
+
);
|
|
3760
|
+
return 1;
|
|
3831
3761
|
}
|
|
3832
|
-
const
|
|
3833
|
-
|
|
3834
|
-
changed: actionsArrayMigrated || fallback.changed,
|
|
3835
|
-
usedReadFallback: fallback.usedReadFallback
|
|
3836
|
-
};
|
|
3837
|
-
}
|
|
3838
|
-
function ensureActionTypeImport(sourceFile) {
|
|
3839
|
-
const existingImport = sourceFile.getImportDeclaration(
|
|
3840
|
-
(decl) => decl.getModuleSpecifierValue() === TOOLKIT_EVENTS_MODULE2
|
|
3762
|
+
const actionCandidates = actionsInitializer.getElements().filter(
|
|
3763
|
+
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
3841
3764
|
);
|
|
3842
|
-
if (
|
|
3843
|
-
|
|
3844
|
-
|
|
3845
|
-
|
|
3846
|
-
|
|
3847
|
-
return;
|
|
3765
|
+
if (actionCandidates.length === 0) {
|
|
3766
|
+
actionsProperty.remove();
|
|
3767
|
+
console.log(
|
|
3768
|
+
` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
|
|
3769
|
+
);
|
|
3770
|
+
return 1;
|
|
3848
3771
|
}
|
|
3849
|
-
|
|
3850
|
-
|
|
3851
|
-
|
|
3772
|
+
if (actionCandidates.length > 1) {
|
|
3773
|
+
const droppedCount = actionCandidates.length - 1;
|
|
3774
|
+
console.warn(
|
|
3775
|
+
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3776
|
+
);
|
|
3777
|
+
}
|
|
3778
|
+
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3779
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3780
|
+
);
|
|
3781
|
+
if (conditionalsProperty) {
|
|
3782
|
+
conditionalsProperty.remove();
|
|
3783
|
+
console.log(
|
|
3784
|
+
` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
|
|
3785
|
+
);
|
|
3786
|
+
}
|
|
3787
|
+
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3788
|
+
actionsProperty.remove();
|
|
3789
|
+
console.log(
|
|
3790
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3791
|
+
);
|
|
3792
|
+
return 1;
|
|
3793
|
+
}
|
|
3794
|
+
const firstActionText = actionCandidates[0].getText();
|
|
3795
|
+
workqueue.addPropertyAssignment({
|
|
3796
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3797
|
+
initializer: firstActionText
|
|
3852
3798
|
});
|
|
3799
|
+
actionsProperty.remove();
|
|
3800
|
+
console.log(
|
|
3801
|
+
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3802
|
+
);
|
|
3803
|
+
return 1;
|
|
3853
3804
|
}
|
|
3854
3805
|
function processFile13(filePath, project) {
|
|
3855
3806
|
const sourceFile = project.getSourceFile(filePath);
|
|
3856
3807
|
if (!sourceFile) return 0;
|
|
3857
3808
|
let migratedWorkqueues = 0;
|
|
3858
|
-
let needsActionTypeImport = false;
|
|
3859
3809
|
const relPath = import_path18.default.relative(process.cwd(), filePath);
|
|
3860
3810
|
const callExpressions = sourceFile.getDescendantsOfKind(
|
|
3861
3811
|
import_ts_morph17.SyntaxKind.CallExpression
|
|
@@ -3871,14 +3821,9 @@ function processFile13(filePath, project) {
|
|
|
3871
3821
|
if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
|
|
3872
3822
|
for (const element of workqueuesArg.getElements()) {
|
|
3873
3823
|
if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
|
|
3874
|
-
|
|
3875
|
-
if (result.changed) migratedWorkqueues++;
|
|
3876
|
-
if (result.usedReadFallback) needsActionTypeImport = true;
|
|
3824
|
+
migratedWorkqueues += migrateWorkqueueActions(element, relPath);
|
|
3877
3825
|
}
|
|
3878
3826
|
}
|
|
3879
|
-
if (needsActionTypeImport) {
|
|
3880
|
-
ensureActionTypeImport(sourceFile);
|
|
3881
|
-
}
|
|
3882
3827
|
return migratedWorkqueues;
|
|
3883
3828
|
}
|
|
3884
3829
|
async function main18() {
|
|
@@ -4213,7 +4158,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4213
4158
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4214
4159
|
var import_child_process = require("child_process");
|
|
4215
4160
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4216
|
-
var UPSTREAM_BRANCH = "
|
|
4161
|
+
var UPSTREAM_BRANCH = "develop";
|
|
4217
4162
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4218
4163
|
var FILES_TO_CHECKOUT = [
|
|
4219
4164
|
"src/analytics/analytics.ts",
|
|
@@ -4763,13 +4708,9 @@ function gitShowBytes(ref, path23) {
|
|
|
4763
4708
|
return null;
|
|
4764
4709
|
}
|
|
4765
4710
|
}
|
|
4766
|
-
async function main25({
|
|
4767
|
-
subdirs = []
|
|
4768
|
-
} = {}) {
|
|
4769
|
-
const pathspecs = subdirs.length > 0 ? subdirs.map((s) => `${INFRASTRUCTURE_DIR}/${s}/`) : [`${INFRASTRUCTURE_DIR}/`];
|
|
4770
|
-
const scopeLabel = pathspecs.map((p) => `'${p}'`).join(", ");
|
|
4711
|
+
async function main25() {
|
|
4771
4712
|
console.log(
|
|
4772
|
-
`Merging ${
|
|
4713
|
+
`Merging '${INFRASTRUCTURE_DIR}/' from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
|
|
4773
4714
|
`
|
|
4774
4715
|
);
|
|
4775
4716
|
assertIsGitRepo();
|
|
@@ -4784,12 +4725,20 @@ async function main25({
|
|
|
4784
4725
|
const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
|
|
4785
4726
|
const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
|
|
4786
4727
|
const upstreamFiles = runGit(
|
|
4787
|
-
[
|
|
4728
|
+
[
|
|
4729
|
+
"ls-tree",
|
|
4730
|
+
"-r",
|
|
4731
|
+
"--name-only",
|
|
4732
|
+
"-z",
|
|
4733
|
+
ref,
|
|
4734
|
+
"--",
|
|
4735
|
+
`${INFRASTRUCTURE_DIR}/`
|
|
4736
|
+
],
|
|
4788
4737
|
{ silent: true }
|
|
4789
4738
|
).split("\0").filter(Boolean);
|
|
4790
4739
|
if (upstreamFiles.length === 0) {
|
|
4791
4740
|
console.log(
|
|
4792
|
-
` No files found under ${
|
|
4741
|
+
` No files found under '${INFRASTRUCTURE_DIR}/' on ${ref}. Nothing to merge.`
|
|
4793
4742
|
);
|
|
4794
4743
|
return;
|
|
4795
4744
|
}
|
|
@@ -4864,9 +4813,7 @@ async function main25({
|
|
|
4864
4813
|
var import_fs6 = require("fs");
|
|
4865
4814
|
var import_path25 = require("path");
|
|
4866
4815
|
var INFRASTRUCTURE_DIR2 = "infrastructure";
|
|
4867
|
-
async function main26({
|
|
4868
|
-
keep = []
|
|
4869
|
-
} = {}) {
|
|
4816
|
+
async function main26() {
|
|
4870
4817
|
const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
|
|
4871
4818
|
if (!(0, import_fs6.existsSync)(fullPath)) {
|
|
4872
4819
|
console.log(
|
|
@@ -4874,64 +4821,24 @@ async function main26({
|
|
|
4874
4821
|
);
|
|
4875
4822
|
return;
|
|
4876
4823
|
}
|
|
4877
|
-
|
|
4878
|
-
if (keep.length === 0) {
|
|
4879
|
-
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4824
|
+
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4880
4825
|
`);
|
|
4881
|
-
|
|
4882
|
-
|
|
4883
|
-
|
|
4884
|
-
|
|
4885
|
-
|
|
4886
|
-
|
|
4887
|
-
|
|
4888
|
-
|
|
4889
|
-
console.log(
|
|
4890
|
-
` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4891
|
-
);
|
|
4892
|
-
}
|
|
4893
|
-
console.log(
|
|
4894
|
-
`
|
|
4895
|
-
Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4896
|
-
);
|
|
4897
|
-
return;
|
|
4898
|
-
}
|
|
4899
|
-
const keepSet = new Set(keep);
|
|
4900
|
-
console.log(
|
|
4901
|
-
`Deleting contents of '${INFRASTRUCTURE_DIR2}/' except: ${[...keepSet].map((name) => `'${name}'`).join(", ")}
|
|
4902
|
-
`
|
|
4903
|
-
);
|
|
4904
|
-
const topLevelEntries = (0, import_fs6.readdirSync)(fullPath, { withFileTypes: true });
|
|
4905
|
-
let deleted = 0;
|
|
4906
|
-
for (const entry of topLevelEntries) {
|
|
4907
|
-
if (keepSet.has(entry.name)) {
|
|
4908
|
-
console.log(` Keeping '${INFRASTRUCTURE_DIR2}/${entry.name}'.`);
|
|
4909
|
-
continue;
|
|
4910
|
-
}
|
|
4911
|
-
const relPath = `${INFRASTRUCTURE_DIR2}/${entry.name}${entry.isDirectory() ? "/" : ""}`;
|
|
4912
|
-
runGit(["rm", "-rf", "--ignore-unmatch", "--", relPath], { silent: true });
|
|
4913
|
-
const fullEntryPath = (0, import_path25.join)(fullPath, entry.name);
|
|
4914
|
-
if ((0, import_fs6.existsSync)(fullEntryPath)) {
|
|
4915
|
-
(0, import_fs6.rmSync)(fullEntryPath, { recursive: true, force: true });
|
|
4916
|
-
}
|
|
4917
|
-
console.log(` Deleted '${relPath}'.`);
|
|
4918
|
-
deleted++;
|
|
4919
|
-
}
|
|
4920
|
-
const presentNames = new Set(topLevelEntries.map((e) => e.name));
|
|
4921
|
-
const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
|
|
4922
|
-
if (missingKeeps.length > 0) {
|
|
4923
|
-
console.warn(
|
|
4924
|
-
` [warn] Requested to keep ${missingKeeps.map((n) => `'${n}'`).join(", ")} but they don't exist under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4925
|
-
);
|
|
4826
|
+
assertIsGitRepo();
|
|
4827
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
|
|
4828
|
+
silent: true
|
|
4829
|
+
});
|
|
4830
|
+
console.log(` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`);
|
|
4831
|
+
if ((0, import_fs6.existsSync)(fullPath)) {
|
|
4832
|
+
(0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
|
|
4833
|
+
console.log(` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`);
|
|
4926
4834
|
}
|
|
4927
4835
|
console.log(
|
|
4928
4836
|
`
|
|
4929
|
-
Done.
|
|
4837
|
+
Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4930
4838
|
);
|
|
4931
4839
|
}
|
|
4932
4840
|
|
|
4933
4841
|
// src/migrations/v2.0/index.ts
|
|
4934
|
-
var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
|
|
4935
4842
|
async function runUpgrade(dockerSwarm) {
|
|
4936
4843
|
await main18();
|
|
4937
4844
|
await main();
|
|
@@ -4960,8 +4867,7 @@ async function runUpgrade(dockerSwarm) {
|
|
|
4960
4867
|
if (dockerSwarm) {
|
|
4961
4868
|
await main25();
|
|
4962
4869
|
} else {
|
|
4963
|
-
await main26(
|
|
4964
|
-
await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
|
|
4870
|
+
await main26();
|
|
4965
4871
|
}
|
|
4966
4872
|
}
|
|
4967
4873
|
|
|
@@ -1105,6 +1105,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
1105
1105
|
annotation?: Record<string, unknown> | undefined;
|
|
1106
1106
|
originalActionId?: string | undefined;
|
|
1107
1107
|
keepAssignment?: boolean | undefined;
|
|
1108
|
+
waitFor?: boolean | undefined;
|
|
1108
1109
|
createdAtLocation?: string | null | undefined;
|
|
1109
1110
|
};
|
|
1110
1111
|
output: {
|
|
@@ -1225,6 +1226,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
1225
1226
|
annotation?: Record<string, unknown> | undefined;
|
|
1226
1227
|
originalActionId?: string | undefined;
|
|
1227
1228
|
keepAssignment?: boolean | undefined;
|
|
1229
|
+
waitFor?: boolean | undefined;
|
|
1228
1230
|
createdAtLocation?: string | null | undefined;
|
|
1229
1231
|
type?: "DECLARE" | undefined;
|
|
1230
1232
|
};
|
|
@@ -1799,6 +1801,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
1799
1801
|
annotation?: Record<string, unknown> | undefined;
|
|
1800
1802
|
originalActionId?: string | undefined;
|
|
1801
1803
|
keepAssignment?: boolean | undefined;
|
|
1804
|
+
waitFor?: boolean | undefined;
|
|
1802
1805
|
createdAtLocation?: string | null | undefined;
|
|
1803
1806
|
type?: "CUSTOM" | undefined;
|
|
1804
1807
|
};
|
|
@@ -2154,6 +2157,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
2154
2157
|
annotation?: Record<string, unknown> | undefined;
|
|
2155
2158
|
originalActionId?: string | undefined;
|
|
2156
2159
|
keepAssignment?: boolean | undefined;
|
|
2160
|
+
waitFor?: boolean | undefined;
|
|
2157
2161
|
createdAtLocation?: string | null | undefined;
|
|
2158
2162
|
};
|
|
2159
2163
|
output: {
|
|
@@ -2467,6 +2471,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
2467
2471
|
annotation?: Record<string, unknown> | undefined;
|
|
2468
2472
|
originalActionId?: string | undefined;
|
|
2469
2473
|
keepAssignment?: boolean | undefined;
|
|
2474
|
+
waitFor?: boolean | undefined;
|
|
2470
2475
|
createdAtLocation?: string | null | undefined;
|
|
2471
2476
|
type?: "UNASSIGN" | undefined;
|
|
2472
2477
|
assignedTo?: null | undefined;
|
|
@@ -2960,6 +2965,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
2960
2965
|
annotation?: Record<string, unknown> | undefined;
|
|
2961
2966
|
originalActionId?: string | undefined;
|
|
2962
2967
|
keepAssignment?: boolean | undefined;
|
|
2968
|
+
waitFor?: boolean | undefined;
|
|
2963
2969
|
createdAtLocation?: string | null | undefined;
|
|
2964
2970
|
type?: "MARK_AS_DUPLICATE" | undefined;
|
|
2965
2971
|
content?: {
|
|
@@ -3277,6 +3283,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
3277
3283
|
annotation?: Record<string, unknown> | undefined;
|
|
3278
3284
|
originalActionId?: string | undefined;
|
|
3279
3285
|
keepAssignment?: boolean | undefined;
|
|
3286
|
+
waitFor?: boolean | undefined;
|
|
3280
3287
|
createdAtLocation?: string | null | undefined;
|
|
3281
3288
|
type?: "MARK_AS_NOT_DUPLICATE" | undefined;
|
|
3282
3289
|
};
|