@opencrvs/toolkit 2.0.0-rc.edee239 → 2.0.0-rc.eea3e42
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/create-countryconfig/index.js +103 -0
- package/create-countryconfig/package.json +21 -0
- package/dist/application-config/index.js +270 -122
- package/dist/cli.js +406 -134
- package/dist/commons/api/router.d.ts +3403 -272
- package/dist/commons/application-config/index.d.ts +1 -0
- package/dist/commons/conditionals/conditionals.d.ts +357 -7
- package/dist/commons/conditionals/validate.d.ts +52 -2
- package/dist/commons/events/ActionDocument.d.ts +6 -0
- package/dist/commons/events/ActionInput.d.ts +114 -0
- package/dist/commons/events/AdvancedSearchConfig.d.ts +342 -0
- package/dist/commons/events/Draft.d.ts +4 -2
- package/dist/commons/events/EventDocument.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/FieldConfig.d.ts +382 -50
- package/dist/commons/events/FieldValue.d.ts +6 -0
- package/dist/commons/events/WorkqueueConfig.d.ts +150 -150
- package/dist/commons/events/field.d.ts +53 -1
- package/dist/commons/events/index.d.ts +2 -0
- package/dist/commons/events/locations.d.ts +21 -0
- package/dist/commons/events/mocks.test.utils.d.ts +19 -0
- package/dist/commons/events/scopes.d.ts +24 -1
- package/dist/commons/events/state/flags.d.ts +16 -0
- package/dist/commons/events/state/index.d.ts +0 -4
- package/dist/commons/events/state/utils.d.ts +12 -289
- package/dist/commons/events/utils.d.ts +13 -2
- package/dist/conditionals/index.js +60 -5
- package/dist/events/index.js +1015 -258
- 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/fix-accept-requested-registration-function-type.d.ts +3 -0
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
- 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 +404 -132
- 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 +810 -157
- package/dist/scopes/index.d.ts +10 -7
- package/dist/scopes/index.js +17 -7
- package/opencrvs-toolkit-2.0.0-rc.eea3e42.tgz +0 -0
- package/package.json +6 -2
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.edee239.tgz +0 -0
|
@@ -1895,9 +1895,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
|
|
|
1895
1895
|
}
|
|
1896
1896
|
return replacedCount;
|
|
1897
1897
|
}
|
|
1898
|
-
function resolveConfigChain(configObj,
|
|
1898
|
+
function resolveConfigChain(configObj, path24) {
|
|
1899
1899
|
let current = configObj;
|
|
1900
|
-
for (const key of
|
|
1900
|
+
for (const key of path24) {
|
|
1901
1901
|
if (!import_ts_morph10.Node.isObjectLiteralExpression(current)) return null;
|
|
1902
1902
|
const prop = current.getProperty(key);
|
|
1903
1903
|
if (!prop || !import_ts_morph10.Node.isPropertyAssignment(prop)) return null;
|
|
@@ -2132,6 +2132,10 @@ Done. Converted ${convertedCount} config file(s), replaced ${totalReplaced} rout
|
|
|
2132
2132
|
var import_ts_morph11 = require("ts-morph");
|
|
2133
2133
|
var import_path11 = __toESM(require("path"));
|
|
2134
2134
|
|
|
2135
|
+
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2136
|
+
var z4 = __toESM(require("zod/v4"));
|
|
2137
|
+
var import_lodash = require("lodash");
|
|
2138
|
+
|
|
2135
2139
|
// ../commons/src/scopes.ts
|
|
2136
2140
|
var z3 = __toESM(require("zod/v4"));
|
|
2137
2141
|
var qs = __toESM(require("qs"));
|
|
@@ -2308,12 +2312,14 @@ var SystemScopeType = z3.enum([
|
|
|
2308
2312
|
"organisation.read-locations",
|
|
2309
2313
|
"user.read",
|
|
2310
2314
|
"user.create",
|
|
2311
|
-
"user.edit"
|
|
2315
|
+
"user.edit",
|
|
2316
|
+
"user.search"
|
|
2312
2317
|
]);
|
|
2313
2318
|
var UserScopeType = SystemScopeType.extract([
|
|
2314
2319
|
"user.read",
|
|
2315
2320
|
"user.create",
|
|
2316
|
-
"user.edit"
|
|
2321
|
+
"user.edit",
|
|
2322
|
+
"user.search"
|
|
2317
2323
|
]);
|
|
2318
2324
|
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
2319
2325
|
var UserScopeV2 = z3.discriminatedUnion("type", [
|
|
@@ -2322,7 +2328,7 @@ var UserScopeV2 = z3.discriminatedUnion("type", [
|
|
|
2322
2328
|
options: AllUserScopeOptions.optional()
|
|
2323
2329
|
}),
|
|
2324
2330
|
z3.object({
|
|
2325
|
-
type: UserScopeType.extract(["user.read"]),
|
|
2331
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
2326
2332
|
options: AccessLevelOptions.optional()
|
|
2327
2333
|
})
|
|
2328
2334
|
]);
|
|
@@ -2388,22 +2394,29 @@ var encodeScope = (scope) => {
|
|
|
2388
2394
|
encode: false
|
|
2389
2395
|
});
|
|
2390
2396
|
};
|
|
2391
|
-
var
|
|
2392
|
-
|
|
2397
|
+
var decodedScopeCache = /* @__PURE__ */ new Map();
|
|
2398
|
+
var decodeScope = (encodedScope) => {
|
|
2399
|
+
if (decodedScopeCache.has(encodedScope)) {
|
|
2400
|
+
return decodedScopeCache.get(encodedScope);
|
|
2401
|
+
}
|
|
2402
|
+
const scope = qs.parse(encodedScope, {
|
|
2393
2403
|
ignoreQueryPrefix: true,
|
|
2394
2404
|
comma: true,
|
|
2395
2405
|
allowDots: true
|
|
2396
2406
|
});
|
|
2397
2407
|
const unflattenedScope = unflattenScope(scope);
|
|
2398
|
-
|
|
2408
|
+
const result = Scope2.safeParse(unflattenedScope)?.data;
|
|
2409
|
+
decodedScopeCache.set(encodedScope, result);
|
|
2410
|
+
return result;
|
|
2399
2411
|
};
|
|
2400
2412
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
2401
2413
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
2402
|
-
accessLevel: JurisdictionFilter.enum.all
|
|
2414
|
+
accessLevel: JurisdictionFilter.enum.all,
|
|
2415
|
+
registeredIn: JurisdictionFilter.enum.all,
|
|
2416
|
+
declaredIn: JurisdictionFilter.enum.all
|
|
2403
2417
|
};
|
|
2404
2418
|
|
|
2405
2419
|
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2406
|
-
var z4 = __toESM(require("zod/v4"));
|
|
2407
2420
|
var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
|
|
2408
2421
|
var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
|
|
2409
2422
|
var SearchScope = z4.object({
|
|
@@ -2637,6 +2650,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
|
|
|
2637
2650
|
}
|
|
2638
2651
|
throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
|
|
2639
2652
|
};
|
|
2653
|
+
var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
|
|
2654
|
+
function isMergeableUserScopeType(type) {
|
|
2655
|
+
return MERGEABLE_USER_SCOPE_TYPES.includes(type);
|
|
2656
|
+
}
|
|
2657
|
+
function decodeLegacyScope(legacy) {
|
|
2658
|
+
const encoded = legacyScopeToV2Scope(legacy);
|
|
2659
|
+
const scope = decodeScope(encoded);
|
|
2660
|
+
if (!scope) {
|
|
2661
|
+
throw new Error(
|
|
2662
|
+
`Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
|
|
2663
|
+
);
|
|
2664
|
+
}
|
|
2665
|
+
return { legacy, scope };
|
|
2666
|
+
}
|
|
2667
|
+
function groupByType(entries) {
|
|
2668
|
+
return entries.reduce(
|
|
2669
|
+
(groups, entry) => ({
|
|
2670
|
+
...groups,
|
|
2671
|
+
[entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
|
|
2672
|
+
}),
|
|
2673
|
+
{}
|
|
2674
|
+
);
|
|
2675
|
+
}
|
|
2676
|
+
function deduplicateEntries(entries) {
|
|
2677
|
+
return entries.filter(
|
|
2678
|
+
(entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
|
|
2679
|
+
);
|
|
2680
|
+
}
|
|
2681
|
+
function mergeEntries(type, entries) {
|
|
2682
|
+
const optionsList = entries.map(
|
|
2683
|
+
(e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
|
|
2684
|
+
);
|
|
2685
|
+
const allKeys = optionsList.flatMap(
|
|
2686
|
+
(opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
|
|
2687
|
+
);
|
|
2688
|
+
const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
|
|
2689
|
+
if (conflictKey) {
|
|
2690
|
+
const conflicting = entries.filter(
|
|
2691
|
+
(e) => conflictKey in ("options" in e.scope && e.scope.options || {})
|
|
2692
|
+
).map((e) => JSON.stringify(e.legacy));
|
|
2693
|
+
throw new Error(
|
|
2694
|
+
`Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
|
|
2695
|
+
);
|
|
2696
|
+
}
|
|
2697
|
+
const mergedOptions = Object.assign({}, ...optionsList);
|
|
2698
|
+
const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
|
|
2699
|
+
const parsed = Scope2.safeParse(merged);
|
|
2700
|
+
if (!parsed.success) {
|
|
2701
|
+
throw new Error(
|
|
2702
|
+
`Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
|
|
2703
|
+
);
|
|
2704
|
+
}
|
|
2705
|
+
return parsed.data;
|
|
2706
|
+
}
|
|
2707
|
+
function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
|
|
2708
|
+
const groups = groupByType(legacyScopes.map(decodeLegacyScope));
|
|
2709
|
+
return Object.entries(groups).flatMap(([type, entries]) => {
|
|
2710
|
+
const deduped = deduplicateEntries(entries);
|
|
2711
|
+
if (deduped.length <= 1) return deduped.map((e) => e.scope);
|
|
2712
|
+
if (!isMergeableUserScopeType(type)) {
|
|
2713
|
+
console.warn(
|
|
2714
|
+
`Multiple non-mergeable '${type}' scopes detected after dedup \u2014 kept all as-is. Legacy scopes: [${deduped.map((e) => JSON.stringify(e.legacy)).join(", ")}]. Review whether the duplication is intentional.`
|
|
2715
|
+
);
|
|
2716
|
+
return deduped.map((e) => e.scope);
|
|
2717
|
+
}
|
|
2718
|
+
return [mergeEntries(type, deduped)];
|
|
2719
|
+
});
|
|
2720
|
+
}
|
|
2640
2721
|
|
|
2641
2722
|
// src/migrations/v2.0/migrate-scopes.ts
|
|
2642
2723
|
var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
|
|
@@ -2674,57 +2755,65 @@ function resolveLegacyScopeFromElement(element) {
|
|
|
2674
2755
|
}
|
|
2675
2756
|
function migrateScopesArrays(rolesFilePath, project) {
|
|
2676
2757
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
2677
|
-
if (!sourceFile)
|
|
2758
|
+
if (!sourceFile) {
|
|
2759
|
+
return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
|
|
2760
|
+
}
|
|
2678
2761
|
let migratedCount = 0;
|
|
2679
2762
|
let removedCount = 0;
|
|
2763
|
+
let mergedCount = 0;
|
|
2680
2764
|
const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
|
|
2765
|
+
const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
|
|
2681
2766
|
for (const scopesProp of scopesProperties) {
|
|
2682
2767
|
const initializer = scopesProp.getInitializer();
|
|
2683
2768
|
if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
|
|
2684
|
-
const
|
|
2685
|
-
|
|
2686
|
-
|
|
2687
|
-
|
|
2769
|
+
const rawTexts = [];
|
|
2770
|
+
const legacyStrings = [];
|
|
2771
|
+
let anyChange = false;
|
|
2772
|
+
for (const element of initializer.getElements()) {
|
|
2688
2773
|
const scopeKey = resolveScopeKeyFromElementAccess(element);
|
|
2689
2774
|
if (scopeKey && !(scopeKey in SCOPES)) {
|
|
2690
2775
|
console.warn(
|
|
2691
|
-
` [${
|
|
2776
|
+
` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
|
|
2692
2777
|
);
|
|
2693
|
-
initializer.removeElement(index);
|
|
2694
2778
|
removedCount++;
|
|
2779
|
+
anyChange = true;
|
|
2695
2780
|
continue;
|
|
2696
2781
|
}
|
|
2697
2782
|
const legacyScope = resolveLegacyScopeFromElement(element);
|
|
2698
2783
|
if (!legacyScope) {
|
|
2699
2784
|
console.warn(
|
|
2700
|
-
` [${
|
|
2785
|
+
` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
|
|
2701
2786
|
);
|
|
2787
|
+
rawTexts.push(element.getText());
|
|
2702
2788
|
continue;
|
|
2703
2789
|
}
|
|
2704
|
-
|
|
2705
|
-
|
|
2706
|
-
const scope = decodeScope(migratedScope);
|
|
2707
|
-
if (!scope) {
|
|
2708
|
-
console.warn(
|
|
2709
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
|
|
2710
|
-
);
|
|
2711
|
-
continue;
|
|
2712
|
-
}
|
|
2713
|
-
element.replaceWithText(JSON.stringify(scope));
|
|
2714
|
-
migratedCount++;
|
|
2715
|
-
} catch (error) {
|
|
2716
|
-
console.warn(
|
|
2717
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
|
|
2718
|
-
);
|
|
2719
|
-
}
|
|
2790
|
+
legacyStrings.push(legacyScope);
|
|
2791
|
+
anyChange = true;
|
|
2720
2792
|
}
|
|
2793
|
+
if (!anyChange) continue;
|
|
2794
|
+
let mergedScopes;
|
|
2795
|
+
try {
|
|
2796
|
+
mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
|
|
2797
|
+
} catch (error) {
|
|
2798
|
+
throw new Error(
|
|
2799
|
+
`[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
|
|
2800
|
+
{ cause: error }
|
|
2801
|
+
);
|
|
2802
|
+
}
|
|
2803
|
+
migratedCount += legacyStrings.length;
|
|
2804
|
+
mergedCount += legacyStrings.length - mergedScopes.length;
|
|
2805
|
+
const outputElements = [
|
|
2806
|
+
...rawTexts,
|
|
2807
|
+
...mergedScopes.map((s) => JSON.stringify(s))
|
|
2808
|
+
];
|
|
2809
|
+
scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
|
|
2721
2810
|
}
|
|
2722
2811
|
if (removedCount > 0) {
|
|
2723
2812
|
console.log(
|
|
2724
|
-
` Removed ${removedCount} unknown SCOPES reference(s) from '${
|
|
2813
|
+
` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
|
|
2725
2814
|
);
|
|
2726
2815
|
}
|
|
2727
|
-
return { migratedCount, removedCount };
|
|
2816
|
+
return { migratedCount, removedCount, mergedCount };
|
|
2728
2817
|
}
|
|
2729
2818
|
function ensureScopesHelpersImport(rolesFilePath, project) {
|
|
2730
2819
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
@@ -2859,7 +2948,7 @@ async function main11() {
|
|
|
2859
2948
|
return;
|
|
2860
2949
|
}
|
|
2861
2950
|
const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
|
|
2862
|
-
const { migratedCount, removedCount } = migrateScopesArrays(
|
|
2951
|
+
const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
|
|
2863
2952
|
rolesFilePath,
|
|
2864
2953
|
project
|
|
2865
2954
|
);
|
|
@@ -2878,7 +2967,7 @@ async function main11() {
|
|
|
2878
2967
|
}
|
|
2879
2968
|
await sourceFile.save();
|
|
2880
2969
|
console.log(
|
|
2881
|
-
`Done. Migrated ${migratedCount} legacy scope(s), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
|
|
2970
|
+
`Done. Migrated ${migratedCount} legacy scope(s), merged ${mergedCount} AND-paired scope(s) into single v2 objects (privilege-escalation fix, see issue #12489), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
|
|
2882
2971
|
);
|
|
2883
2972
|
}
|
|
2884
2973
|
|
|
@@ -3684,6 +3773,10 @@ var ACTION_PROPERTY_NAME2 = "action";
|
|
|
3684
3773
|
var CONDITIONALS_PROPERTY_NAME = "conditionals";
|
|
3685
3774
|
var TYPE_PROPERTY_NAME7 = "type";
|
|
3686
3775
|
var SLUG_PROPERTY_NAME = "slug";
|
|
3776
|
+
var READ_ACTION_TYPE = "READ";
|
|
3777
|
+
var ACTION_TYPE_IMPORT_NAME = "ActionType";
|
|
3778
|
+
var TOOLKIT_EVENTS_MODULE2 = "@opencrvs/toolkit/events";
|
|
3779
|
+
var READ_ACTION_FALLBACK_INITIALIZER = `{ type: ${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE} }`;
|
|
3687
3780
|
var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
|
|
3688
3781
|
"READ",
|
|
3689
3782
|
"DELETE",
|
|
@@ -3731,91 +3824,137 @@ function isUnsupportedActionType(action) {
|
|
|
3731
3824
|
}
|
|
3732
3825
|
return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
|
|
3733
3826
|
}
|
|
3734
|
-
function
|
|
3735
|
-
const
|
|
3736
|
-
|
|
3737
|
-
|
|
3738
|
-
|
|
3739
|
-
|
|
3740
|
-
|
|
3741
|
-
|
|
3827
|
+
function ensureValidAction(workqueue, relPath) {
|
|
3828
|
+
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3829
|
+
const actionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3830
|
+
if (actionProperty && import_ts_morph17.Node.isPropertyAssignment(actionProperty)) {
|
|
3831
|
+
const initializer = actionProperty.getInitializer();
|
|
3832
|
+
if (initializer && import_ts_morph17.Node.isObjectLiteralExpression(initializer)) {
|
|
3833
|
+
if (!isUnsupportedActionType(initializer)) {
|
|
3834
|
+
return { changed: false, usedReadFallback: false };
|
|
3835
|
+
}
|
|
3836
|
+
actionProperty.set({
|
|
3837
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3838
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3839
|
+
});
|
|
3840
|
+
console.log(
|
|
3841
|
+
` [${relPath}] Replaced unsupported 'action' type with '${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE}' on workqueue '${workqueueLabel}'`
|
|
3842
|
+
);
|
|
3843
|
+
return { changed: true, usedReadFallback: true };
|
|
3844
|
+
}
|
|
3742
3845
|
}
|
|
3846
|
+
workqueue.addPropertyAssignment({
|
|
3847
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3848
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3849
|
+
});
|
|
3850
|
+
console.log(
|
|
3851
|
+
` [${relPath}] Added default 'action: ${READ_ACTION_FALLBACK_INITIALIZER}' to workqueue '${workqueueLabel}'`
|
|
3852
|
+
);
|
|
3853
|
+
return { changed: true, usedReadFallback: true };
|
|
3854
|
+
}
|
|
3855
|
+
function migrateWorkqueueActions(workqueue, relPath) {
|
|
3743
3856
|
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3744
|
-
const
|
|
3745
|
-
|
|
3746
|
-
|
|
3747
|
-
|
|
3748
|
-
|
|
3749
|
-
|
|
3750
|
-
|
|
3857
|
+
const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
|
|
3858
|
+
let actionsArrayMigrated = false;
|
|
3859
|
+
if (actionsProperty && import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
|
|
3860
|
+
const actionsInitializer = actionsProperty.getInitializer();
|
|
3861
|
+
if (actionsInitializer && import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
|
|
3862
|
+
const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3863
|
+
if (existingActionProperty) {
|
|
3864
|
+
if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
|
|
3865
|
+
const existingActionInitializer = existingActionProperty.getInitializer();
|
|
3866
|
+
if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
|
|
3867
|
+
const conditionalsProperty = existingActionInitializer.getProperty(
|
|
3868
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3869
|
+
);
|
|
3870
|
+
if (conditionalsProperty) {
|
|
3871
|
+
conditionalsProperty.remove();
|
|
3872
|
+
console.log(
|
|
3873
|
+
` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
|
|
3874
|
+
);
|
|
3875
|
+
}
|
|
3876
|
+
}
|
|
3877
|
+
}
|
|
3878
|
+
actionsProperty.remove();
|
|
3879
|
+
console.log(
|
|
3880
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3881
|
+
);
|
|
3882
|
+
actionsArrayMigrated = true;
|
|
3883
|
+
} else {
|
|
3884
|
+
const actionCandidates = actionsInitializer.getElements().filter(
|
|
3885
|
+
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
3751
3886
|
);
|
|
3752
|
-
if (
|
|
3753
|
-
|
|
3887
|
+
if (actionCandidates.length === 0) {
|
|
3888
|
+
actionsProperty.remove();
|
|
3754
3889
|
console.log(
|
|
3755
|
-
` [${relPath}] Removed
|
|
3890
|
+
` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
|
|
3756
3891
|
);
|
|
3757
|
-
|
|
3758
|
-
|
|
3759
|
-
|
|
3760
|
-
|
|
3761
|
-
|
|
3892
|
+
actionsArrayMigrated = true;
|
|
3893
|
+
} else {
|
|
3894
|
+
if (actionCandidates.length > 1) {
|
|
3895
|
+
const droppedCount = actionCandidates.length - 1;
|
|
3896
|
+
console.warn(
|
|
3897
|
+
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3898
|
+
);
|
|
3899
|
+
}
|
|
3900
|
+
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3901
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3762
3902
|
);
|
|
3903
|
+
if (conditionalsProperty) {
|
|
3904
|
+
conditionalsProperty.remove();
|
|
3905
|
+
console.log(
|
|
3906
|
+
` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
|
|
3907
|
+
);
|
|
3908
|
+
}
|
|
3909
|
+
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3910
|
+
actionsProperty.remove();
|
|
3911
|
+
console.log(
|
|
3912
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3913
|
+
);
|
|
3914
|
+
actionsArrayMigrated = true;
|
|
3915
|
+
} else {
|
|
3916
|
+
const firstActionText = actionCandidates[0].getText();
|
|
3917
|
+
workqueue.addPropertyAssignment({
|
|
3918
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3919
|
+
initializer: firstActionText
|
|
3920
|
+
});
|
|
3921
|
+
actionsProperty.remove();
|
|
3922
|
+
console.log(
|
|
3923
|
+
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3924
|
+
);
|
|
3925
|
+
actionsArrayMigrated = true;
|
|
3926
|
+
}
|
|
3763
3927
|
}
|
|
3764
3928
|
}
|
|
3765
3929
|
}
|
|
3766
|
-
actionsProperty.remove();
|
|
3767
|
-
console.log(
|
|
3768
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3769
|
-
);
|
|
3770
|
-
return 1;
|
|
3771
3930
|
}
|
|
3772
|
-
const
|
|
3773
|
-
|
|
3774
|
-
|
|
3775
|
-
|
|
3776
|
-
|
|
3777
|
-
|
|
3778
|
-
|
|
3779
|
-
|
|
3780
|
-
|
|
3781
|
-
}
|
|
3782
|
-
if (actionCandidates.length > 1) {
|
|
3783
|
-
const droppedCount = actionCandidates.length - 1;
|
|
3784
|
-
console.warn(
|
|
3785
|
-
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3786
|
-
);
|
|
3787
|
-
}
|
|
3788
|
-
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3789
|
-
CONDITIONALS_PROPERTY_NAME
|
|
3931
|
+
const fallback = ensureValidAction(workqueue, relPath);
|
|
3932
|
+
return {
|
|
3933
|
+
changed: actionsArrayMigrated || fallback.changed,
|
|
3934
|
+
usedReadFallback: fallback.usedReadFallback
|
|
3935
|
+
};
|
|
3936
|
+
}
|
|
3937
|
+
function ensureActionTypeImport(sourceFile) {
|
|
3938
|
+
const existingImport = sourceFile.getImportDeclaration(
|
|
3939
|
+
(decl) => decl.getModuleSpecifierValue() === TOOLKIT_EVENTS_MODULE2
|
|
3790
3940
|
);
|
|
3791
|
-
if (
|
|
3792
|
-
|
|
3793
|
-
|
|
3794
|
-
|
|
3795
|
-
|
|
3796
|
-
|
|
3797
|
-
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3798
|
-
actionsProperty.remove();
|
|
3799
|
-
console.log(
|
|
3800
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3801
|
-
);
|
|
3802
|
-
return 1;
|
|
3941
|
+
if (existingImport) {
|
|
3942
|
+
const alreadyImported = existingImport.getNamedImports().some((ni) => ni.getName() === ACTION_TYPE_IMPORT_NAME);
|
|
3943
|
+
if (!alreadyImported) {
|
|
3944
|
+
existingImport.addNamedImport(ACTION_TYPE_IMPORT_NAME);
|
|
3945
|
+
}
|
|
3946
|
+
return;
|
|
3803
3947
|
}
|
|
3804
|
-
|
|
3805
|
-
|
|
3806
|
-
|
|
3807
|
-
initializer: firstActionText
|
|
3948
|
+
sourceFile.addImportDeclaration({
|
|
3949
|
+
moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
|
|
3950
|
+
namedImports: [ACTION_TYPE_IMPORT_NAME]
|
|
3808
3951
|
});
|
|
3809
|
-
actionsProperty.remove();
|
|
3810
|
-
console.log(
|
|
3811
|
-
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3812
|
-
);
|
|
3813
|
-
return 1;
|
|
3814
3952
|
}
|
|
3815
3953
|
function processFile13(filePath, project) {
|
|
3816
3954
|
const sourceFile = project.getSourceFile(filePath);
|
|
3817
3955
|
if (!sourceFile) return 0;
|
|
3818
3956
|
let migratedWorkqueues = 0;
|
|
3957
|
+
let needsActionTypeImport = false;
|
|
3819
3958
|
const relPath = import_path18.default.relative(process.cwd(), filePath);
|
|
3820
3959
|
const callExpressions = sourceFile.getDescendantsOfKind(
|
|
3821
3960
|
import_ts_morph17.SyntaxKind.CallExpression
|
|
@@ -3831,9 +3970,14 @@ function processFile13(filePath, project) {
|
|
|
3831
3970
|
if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
|
|
3832
3971
|
for (const element of workqueuesArg.getElements()) {
|
|
3833
3972
|
if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
|
|
3834
|
-
|
|
3973
|
+
const result = migrateWorkqueueActions(element, relPath);
|
|
3974
|
+
if (result.changed) migratedWorkqueues++;
|
|
3975
|
+
if (result.usedReadFallback) needsActionTypeImport = true;
|
|
3835
3976
|
}
|
|
3836
3977
|
}
|
|
3978
|
+
if (needsActionTypeImport) {
|
|
3979
|
+
ensureActionTypeImport(sourceFile);
|
|
3980
|
+
}
|
|
3837
3981
|
return migratedWorkqueues;
|
|
3838
3982
|
}
|
|
3839
3983
|
async function main18() {
|
|
@@ -4168,7 +4312,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4168
4312
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4169
4313
|
var import_child_process = require("child_process");
|
|
4170
4314
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4171
|
-
var UPSTREAM_BRANCH = "
|
|
4315
|
+
var UPSTREAM_BRANCH = "release-v2.0.0";
|
|
4172
4316
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4173
4317
|
var FILES_TO_CHECKOUT = [
|
|
4174
4318
|
"src/analytics/analytics.ts",
|
|
@@ -4707,9 +4851,9 @@ var import_path24 = require("path");
|
|
|
4707
4851
|
var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
|
|
4708
4852
|
var INFRASTRUCTURE_DIR = "infrastructure";
|
|
4709
4853
|
var BASE_BRANCH = "release-v1.9";
|
|
4710
|
-
function gitShowBytes(ref,
|
|
4854
|
+
function gitShowBytes(ref, path24) {
|
|
4711
4855
|
try {
|
|
4712
|
-
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${
|
|
4856
|
+
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
|
|
4713
4857
|
cwd: process.cwd(),
|
|
4714
4858
|
stdio: ["ignore", "pipe", "pipe"]
|
|
4715
4859
|
});
|
|
@@ -4718,9 +4862,13 @@ function gitShowBytes(ref, path23) {
|
|
|
4718
4862
|
return null;
|
|
4719
4863
|
}
|
|
4720
4864
|
}
|
|
4721
|
-
async function main25(
|
|
4865
|
+
async function main25({
|
|
4866
|
+
subdirs = []
|
|
4867
|
+
} = {}) {
|
|
4868
|
+
const pathspecs = subdirs.length > 0 ? subdirs.map((s) => `${INFRASTRUCTURE_DIR}/${s}/`) : [`${INFRASTRUCTURE_DIR}/`];
|
|
4869
|
+
const scopeLabel = pathspecs.map((p) => `'${p}'`).join(", ");
|
|
4722
4870
|
console.log(
|
|
4723
|
-
`Merging
|
|
4871
|
+
`Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
|
|
4724
4872
|
`
|
|
4725
4873
|
);
|
|
4726
4874
|
assertIsGitRepo();
|
|
@@ -4735,20 +4883,12 @@ async function main25() {
|
|
|
4735
4883
|
const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
|
|
4736
4884
|
const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
|
|
4737
4885
|
const upstreamFiles = runGit(
|
|
4738
|
-
[
|
|
4739
|
-
"ls-tree",
|
|
4740
|
-
"-r",
|
|
4741
|
-
"--name-only",
|
|
4742
|
-
"-z",
|
|
4743
|
-
ref,
|
|
4744
|
-
"--",
|
|
4745
|
-
`${INFRASTRUCTURE_DIR}/`
|
|
4746
|
-
],
|
|
4886
|
+
["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
|
|
4747
4887
|
{ silent: true }
|
|
4748
4888
|
).split("\0").filter(Boolean);
|
|
4749
4889
|
if (upstreamFiles.length === 0) {
|
|
4750
4890
|
console.log(
|
|
4751
|
-
` No files found under
|
|
4891
|
+
` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
|
|
4752
4892
|
);
|
|
4753
4893
|
return;
|
|
4754
4894
|
}
|
|
@@ -4823,7 +4963,9 @@ async function main25() {
|
|
|
4823
4963
|
var import_fs6 = require("fs");
|
|
4824
4964
|
var import_path25 = require("path");
|
|
4825
4965
|
var INFRASTRUCTURE_DIR2 = "infrastructure";
|
|
4826
|
-
async function main26(
|
|
4966
|
+
async function main26({
|
|
4967
|
+
keep = []
|
|
4968
|
+
} = {}) {
|
|
4827
4969
|
const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
|
|
4828
4970
|
if (!(0, import_fs6.existsSync)(fullPath)) {
|
|
4829
4971
|
console.log(
|
|
@@ -4831,24 +4973,152 @@ async function main26() {
|
|
|
4831
4973
|
);
|
|
4832
4974
|
return;
|
|
4833
4975
|
}
|
|
4834
|
-
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4835
|
-
`);
|
|
4836
4976
|
assertIsGitRepo();
|
|
4837
|
-
|
|
4838
|
-
|
|
4977
|
+
if (keep.length === 0) {
|
|
4978
|
+
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4979
|
+
`);
|
|
4980
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
|
|
4981
|
+
silent: true
|
|
4982
|
+
});
|
|
4983
|
+
console.log(
|
|
4984
|
+
` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4985
|
+
);
|
|
4986
|
+
if ((0, import_fs6.existsSync)(fullPath)) {
|
|
4987
|
+
(0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
|
|
4988
|
+
console.log(
|
|
4989
|
+
` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4990
|
+
);
|
|
4991
|
+
}
|
|
4992
|
+
console.log(
|
|
4993
|
+
`
|
|
4994
|
+
Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4995
|
+
);
|
|
4996
|
+
return;
|
|
4997
|
+
}
|
|
4998
|
+
const keepSet = new Set(keep);
|
|
4999
|
+
console.log(
|
|
5000
|
+
`Deleting contents of '${INFRASTRUCTURE_DIR2}/' except: ${[...keepSet].map((name) => `'${name}'`).join(", ")}
|
|
5001
|
+
`
|
|
5002
|
+
);
|
|
5003
|
+
const topLevelEntries = (0, import_fs6.readdirSync)(fullPath, { withFileTypes: true });
|
|
5004
|
+
let deleted = 0;
|
|
5005
|
+
for (const entry of topLevelEntries) {
|
|
5006
|
+
if (keepSet.has(entry.name)) {
|
|
5007
|
+
console.log(` Keeping '${INFRASTRUCTURE_DIR2}/${entry.name}'.`);
|
|
5008
|
+
continue;
|
|
5009
|
+
}
|
|
5010
|
+
const relPath = `${INFRASTRUCTURE_DIR2}/${entry.name}${entry.isDirectory() ? "/" : ""}`;
|
|
5011
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", relPath], { silent: true });
|
|
5012
|
+
const fullEntryPath = (0, import_path25.join)(fullPath, entry.name);
|
|
5013
|
+
if ((0, import_fs6.existsSync)(fullEntryPath)) {
|
|
5014
|
+
(0, import_fs6.rmSync)(fullEntryPath, { recursive: true, force: true });
|
|
5015
|
+
}
|
|
5016
|
+
console.log(` Deleted '${relPath}'.`);
|
|
5017
|
+
deleted++;
|
|
5018
|
+
}
|
|
5019
|
+
const presentNames = new Set(topLevelEntries.map((e) => e.name));
|
|
5020
|
+
const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
|
|
5021
|
+
if (missingKeeps.length > 0) {
|
|
5022
|
+
console.warn(
|
|
5023
|
+
` [warn] Requested to keep ${missingKeeps.map((n) => `'${n}'`).join(", ")} but they don't exist under '${INFRASTRUCTURE_DIR2}/'.`
|
|
5024
|
+
);
|
|
5025
|
+
}
|
|
5026
|
+
console.log(
|
|
5027
|
+
`
|
|
5028
|
+
Done. Deleted ${deleted} top-level entr${deleted === 1 ? "y" : "ies"}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
5029
|
+
);
|
|
5030
|
+
}
|
|
5031
|
+
|
|
5032
|
+
// src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
|
|
5033
|
+
var import_ts_morph22 = require("ts-morph");
|
|
5034
|
+
var import_path26 = __toESM(require("path"));
|
|
5035
|
+
var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
|
|
5036
|
+
var ACTION_PARAMETER_NAME = "action";
|
|
5037
|
+
var OLD_TYPE = "ActionInput";
|
|
5038
|
+
var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
|
|
5039
|
+
function isAcceptRequestedRegistrationParameter(parameter) {
|
|
5040
|
+
const functionDeclaration = parameter.getFirstAncestorByKind(
|
|
5041
|
+
import_ts_morph22.SyntaxKind.FunctionDeclaration
|
|
5042
|
+
);
|
|
5043
|
+
if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
|
|
5044
|
+
return true;
|
|
5045
|
+
}
|
|
5046
|
+
const arrowFunction = parameter.getFirstAncestorByKind(
|
|
5047
|
+
import_ts_morph22.SyntaxKind.ArrowFunction
|
|
5048
|
+
);
|
|
5049
|
+
const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
|
|
5050
|
+
import_ts_morph22.SyntaxKind.VariableDeclaration
|
|
5051
|
+
);
|
|
5052
|
+
return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
|
|
5053
|
+
}
|
|
5054
|
+
function processFile14(filePath, project) {
|
|
5055
|
+
const sourceFile = project.getSourceFile(filePath);
|
|
5056
|
+
if (!sourceFile) return 0;
|
|
5057
|
+
let updatedCount = 0;
|
|
5058
|
+
for (const parameter of sourceFile.getDescendantsOfKind(
|
|
5059
|
+
import_ts_morph22.SyntaxKind.Parameter
|
|
5060
|
+
)) {
|
|
5061
|
+
if (parameter.getName() !== ACTION_PARAMETER_NAME) {
|
|
5062
|
+
continue;
|
|
5063
|
+
}
|
|
5064
|
+
if (!isAcceptRequestedRegistrationParameter(parameter)) {
|
|
5065
|
+
continue;
|
|
5066
|
+
}
|
|
5067
|
+
const typeNode = parameter.getTypeNode();
|
|
5068
|
+
if (!typeNode || typeNode.getText() !== OLD_TYPE) {
|
|
5069
|
+
continue;
|
|
5070
|
+
}
|
|
5071
|
+
parameter.setType(NEW_TYPE);
|
|
5072
|
+
updatedCount++;
|
|
5073
|
+
console.log(
|
|
5074
|
+
` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
|
|
5075
|
+
);
|
|
5076
|
+
}
|
|
5077
|
+
return updatedCount;
|
|
5078
|
+
}
|
|
5079
|
+
async function main27() {
|
|
5080
|
+
const srcDir = import_path26.default.join(process.cwd(), "src");
|
|
5081
|
+
console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
|
|
5082
|
+
`);
|
|
5083
|
+
const project = new import_ts_morph22.Project({
|
|
5084
|
+
tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
|
|
5085
|
+
skipAddingFilesFromTsConfig: false
|
|
5086
|
+
});
|
|
5087
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
5088
|
+
const filePath = sf.getFilePath();
|
|
5089
|
+
return filePath.includes("/src/") && !filePath.includes("/node_modules/");
|
|
4839
5090
|
});
|
|
4840
|
-
|
|
4841
|
-
|
|
4842
|
-
|
|
4843
|
-
|
|
5091
|
+
let totalUpdated = 0;
|
|
5092
|
+
const modifiedFiles = [];
|
|
5093
|
+
for (const sourceFile of sourceFiles) {
|
|
5094
|
+
const filePath = sourceFile.getFilePath();
|
|
5095
|
+
const updated = processFile14(filePath, project);
|
|
5096
|
+
if (updated > 0) {
|
|
5097
|
+
totalUpdated += updated;
|
|
5098
|
+
modifiedFiles.push(filePath);
|
|
5099
|
+
}
|
|
5100
|
+
}
|
|
5101
|
+
if (modifiedFiles.length === 0) {
|
|
5102
|
+
console.log(
|
|
5103
|
+
`No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
|
|
5104
|
+
);
|
|
5105
|
+
return;
|
|
5106
|
+
}
|
|
5107
|
+
console.log(`
|
|
5108
|
+
Saving ${modifiedFiles.length} modified file(s)...`);
|
|
5109
|
+
for (const filePath of modifiedFiles) {
|
|
5110
|
+
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
5111
|
+
await sourceFile.save();
|
|
5112
|
+
console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
|
|
4844
5113
|
}
|
|
4845
5114
|
console.log(
|
|
4846
5115
|
`
|
|
4847
|
-
|
|
5116
|
+
Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
|
|
4848
5117
|
);
|
|
4849
5118
|
}
|
|
4850
5119
|
|
|
4851
5120
|
// src/migrations/v2.0/index.ts
|
|
5121
|
+
var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
|
|
4852
5122
|
async function runUpgrade(dockerSwarm) {
|
|
4853
5123
|
await main18();
|
|
4854
5124
|
await main();
|
|
@@ -4873,10 +5143,12 @@ async function runUpgrade(dockerSwarm) {
|
|
|
4873
5143
|
await main22();
|
|
4874
5144
|
await main23();
|
|
4875
5145
|
await main24();
|
|
5146
|
+
await main27();
|
|
4876
5147
|
await main17();
|
|
4877
5148
|
if (dockerSwarm) {
|
|
4878
5149
|
await main25();
|
|
4879
5150
|
} else {
|
|
4880
|
-
await main26();
|
|
5151
|
+
await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
|
|
5152
|
+
await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
|
|
4881
5153
|
}
|
|
4882
5154
|
}
|