@opencrvs/toolkit 2.0.0-rc.ab3230c → 2.0.0-rc.ab3ae65
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 +50 -20
- package/create-countryconfig/package.json +12 -2
- package/dist/application-config/index.js +278 -123
- package/dist/cli.js +406 -134
- package/dist/commons/api/router.d.ts +3379 -237
- 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/ActionConfig.d.ts +28 -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/CountryConfigQueryInput.d.ts +42 -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 +14 -3
- package/dist/commons/events/EventMetadata.d.ts +0 -7
- package/dist/commons/events/FieldConfig.d.ts +383 -50
- package/dist/commons/events/FieldType.d.ts +1 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/FieldValue.d.ts +6 -0
- package/dist/commons/events/WorkqueueConfig.d.ts +189 -150
- package/dist/commons/events/field.d.ts +53 -1
- package/dist/commons/events/index.d.ts +2 -0
- 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 +1082 -288
- 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 +906 -159
- package/dist/scopes/index.d.ts +10 -7
- package/dist/scopes/index.js +17 -7
- package/opencrvs-toolkit-2.0.0-rc.ab3ae65.tgz +0 -0
- package/package.json +6 -2
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.ab3230c.tgz +0 -0
package/dist/cli.js
CHANGED
|
@@ -1883,9 +1883,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
|
|
|
1883
1883
|
}
|
|
1884
1884
|
return replacedCount;
|
|
1885
1885
|
}
|
|
1886
|
-
function resolveConfigChain(configObj,
|
|
1886
|
+
function resolveConfigChain(configObj, path24) {
|
|
1887
1887
|
let current = configObj;
|
|
1888
|
-
for (const key of
|
|
1888
|
+
for (const key of path24) {
|
|
1889
1889
|
if (!import_ts_morph10.Node.isObjectLiteralExpression(current)) return null;
|
|
1890
1890
|
const prop = current.getProperty(key);
|
|
1891
1891
|
if (!prop || !import_ts_morph10.Node.isPropertyAssignment(prop)) return null;
|
|
@@ -2120,6 +2120,10 @@ Done. Converted ${convertedCount} config file(s), replaced ${totalReplaced} rout
|
|
|
2120
2120
|
var import_ts_morph11 = require("ts-morph");
|
|
2121
2121
|
var import_path11 = __toESM(require("path"));
|
|
2122
2122
|
|
|
2123
|
+
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2124
|
+
var z4 = __toESM(require("zod/v4"));
|
|
2125
|
+
var import_lodash = require("lodash");
|
|
2126
|
+
|
|
2123
2127
|
// ../commons/src/scopes.ts
|
|
2124
2128
|
var z3 = __toESM(require("zod/v4"));
|
|
2125
2129
|
var qs = __toESM(require("qs"));
|
|
@@ -2296,12 +2300,14 @@ var SystemScopeType = z3.enum([
|
|
|
2296
2300
|
"organisation.read-locations",
|
|
2297
2301
|
"user.read",
|
|
2298
2302
|
"user.create",
|
|
2299
|
-
"user.edit"
|
|
2303
|
+
"user.edit",
|
|
2304
|
+
"user.search"
|
|
2300
2305
|
]);
|
|
2301
2306
|
var UserScopeType = SystemScopeType.extract([
|
|
2302
2307
|
"user.read",
|
|
2303
2308
|
"user.create",
|
|
2304
|
-
"user.edit"
|
|
2309
|
+
"user.edit",
|
|
2310
|
+
"user.search"
|
|
2305
2311
|
]);
|
|
2306
2312
|
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
2307
2313
|
var UserScopeV2 = z3.discriminatedUnion("type", [
|
|
@@ -2310,7 +2316,7 @@ var UserScopeV2 = z3.discriminatedUnion("type", [
|
|
|
2310
2316
|
options: AllUserScopeOptions.optional()
|
|
2311
2317
|
}),
|
|
2312
2318
|
z3.object({
|
|
2313
|
-
type: UserScopeType.extract(["user.read"]),
|
|
2319
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
2314
2320
|
options: AccessLevelOptions.optional()
|
|
2315
2321
|
})
|
|
2316
2322
|
]);
|
|
@@ -2376,22 +2382,29 @@ var encodeScope = (scope) => {
|
|
|
2376
2382
|
encode: false
|
|
2377
2383
|
});
|
|
2378
2384
|
};
|
|
2379
|
-
var
|
|
2380
|
-
|
|
2385
|
+
var decodedScopeCache = /* @__PURE__ */ new Map();
|
|
2386
|
+
var decodeScope = (encodedScope) => {
|
|
2387
|
+
if (decodedScopeCache.has(encodedScope)) {
|
|
2388
|
+
return decodedScopeCache.get(encodedScope);
|
|
2389
|
+
}
|
|
2390
|
+
const scope = qs.parse(encodedScope, {
|
|
2381
2391
|
ignoreQueryPrefix: true,
|
|
2382
2392
|
comma: true,
|
|
2383
2393
|
allowDots: true
|
|
2384
2394
|
});
|
|
2385
2395
|
const unflattenedScope = unflattenScope(scope);
|
|
2386
|
-
|
|
2396
|
+
const result = Scope2.safeParse(unflattenedScope)?.data;
|
|
2397
|
+
decodedScopeCache.set(encodedScope, result);
|
|
2398
|
+
return result;
|
|
2387
2399
|
};
|
|
2388
2400
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
2389
2401
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
2390
|
-
accessLevel: JurisdictionFilter.enum.all
|
|
2402
|
+
accessLevel: JurisdictionFilter.enum.all,
|
|
2403
|
+
registeredIn: JurisdictionFilter.enum.all,
|
|
2404
|
+
declaredIn: JurisdictionFilter.enum.all
|
|
2391
2405
|
};
|
|
2392
2406
|
|
|
2393
2407
|
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2394
|
-
var z4 = __toESM(require("zod/v4"));
|
|
2395
2408
|
var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
|
|
2396
2409
|
var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
|
|
2397
2410
|
var SearchScope = z4.object({
|
|
@@ -2625,6 +2638,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
|
|
|
2625
2638
|
}
|
|
2626
2639
|
throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
|
|
2627
2640
|
};
|
|
2641
|
+
var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
|
|
2642
|
+
function isMergeableUserScopeType(type) {
|
|
2643
|
+
return MERGEABLE_USER_SCOPE_TYPES.includes(type);
|
|
2644
|
+
}
|
|
2645
|
+
function decodeLegacyScope(legacy) {
|
|
2646
|
+
const encoded = legacyScopeToV2Scope(legacy);
|
|
2647
|
+
const scope = decodeScope(encoded);
|
|
2648
|
+
if (!scope) {
|
|
2649
|
+
throw new Error(
|
|
2650
|
+
`Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
|
|
2651
|
+
);
|
|
2652
|
+
}
|
|
2653
|
+
return { legacy, scope };
|
|
2654
|
+
}
|
|
2655
|
+
function groupByType(entries) {
|
|
2656
|
+
return entries.reduce(
|
|
2657
|
+
(groups, entry) => ({
|
|
2658
|
+
...groups,
|
|
2659
|
+
[entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
|
|
2660
|
+
}),
|
|
2661
|
+
{}
|
|
2662
|
+
);
|
|
2663
|
+
}
|
|
2664
|
+
function deduplicateEntries(entries) {
|
|
2665
|
+
return entries.filter(
|
|
2666
|
+
(entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
|
|
2667
|
+
);
|
|
2668
|
+
}
|
|
2669
|
+
function mergeEntries(type, entries) {
|
|
2670
|
+
const optionsList = entries.map(
|
|
2671
|
+
(e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
|
|
2672
|
+
);
|
|
2673
|
+
const allKeys = optionsList.flatMap(
|
|
2674
|
+
(opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
|
|
2675
|
+
);
|
|
2676
|
+
const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
|
|
2677
|
+
if (conflictKey) {
|
|
2678
|
+
const conflicting = entries.filter(
|
|
2679
|
+
(e) => conflictKey in ("options" in e.scope && e.scope.options || {})
|
|
2680
|
+
).map((e) => JSON.stringify(e.legacy));
|
|
2681
|
+
throw new Error(
|
|
2682
|
+
`Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
|
|
2683
|
+
);
|
|
2684
|
+
}
|
|
2685
|
+
const mergedOptions = Object.assign({}, ...optionsList);
|
|
2686
|
+
const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
|
|
2687
|
+
const parsed = Scope2.safeParse(merged);
|
|
2688
|
+
if (!parsed.success) {
|
|
2689
|
+
throw new Error(
|
|
2690
|
+
`Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
|
|
2691
|
+
);
|
|
2692
|
+
}
|
|
2693
|
+
return parsed.data;
|
|
2694
|
+
}
|
|
2695
|
+
function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
|
|
2696
|
+
const groups = groupByType(legacyScopes.map(decodeLegacyScope));
|
|
2697
|
+
return Object.entries(groups).flatMap(([type, entries]) => {
|
|
2698
|
+
const deduped = deduplicateEntries(entries);
|
|
2699
|
+
if (deduped.length <= 1) return deduped.map((e) => e.scope);
|
|
2700
|
+
if (!isMergeableUserScopeType(type)) {
|
|
2701
|
+
console.warn(
|
|
2702
|
+
`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.`
|
|
2703
|
+
);
|
|
2704
|
+
return deduped.map((e) => e.scope);
|
|
2705
|
+
}
|
|
2706
|
+
return [mergeEntries(type, deduped)];
|
|
2707
|
+
});
|
|
2708
|
+
}
|
|
2628
2709
|
|
|
2629
2710
|
// src/migrations/v2.0/migrate-scopes.ts
|
|
2630
2711
|
var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
|
|
@@ -2662,57 +2743,65 @@ function resolveLegacyScopeFromElement(element) {
|
|
|
2662
2743
|
}
|
|
2663
2744
|
function migrateScopesArrays(rolesFilePath, project) {
|
|
2664
2745
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
2665
|
-
if (!sourceFile)
|
|
2746
|
+
if (!sourceFile) {
|
|
2747
|
+
return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
|
|
2748
|
+
}
|
|
2666
2749
|
let migratedCount = 0;
|
|
2667
2750
|
let removedCount = 0;
|
|
2751
|
+
let mergedCount = 0;
|
|
2668
2752
|
const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
|
|
2753
|
+
const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
|
|
2669
2754
|
for (const scopesProp of scopesProperties) {
|
|
2670
2755
|
const initializer = scopesProp.getInitializer();
|
|
2671
2756
|
if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
|
|
2672
|
-
const
|
|
2673
|
-
|
|
2674
|
-
|
|
2675
|
-
|
|
2757
|
+
const rawTexts = [];
|
|
2758
|
+
const legacyStrings = [];
|
|
2759
|
+
let anyChange = false;
|
|
2760
|
+
for (const element of initializer.getElements()) {
|
|
2676
2761
|
const scopeKey = resolveScopeKeyFromElementAccess(element);
|
|
2677
2762
|
if (scopeKey && !(scopeKey in SCOPES)) {
|
|
2678
2763
|
console.warn(
|
|
2679
|
-
` [${
|
|
2764
|
+
` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
|
|
2680
2765
|
);
|
|
2681
|
-
initializer.removeElement(index);
|
|
2682
2766
|
removedCount++;
|
|
2767
|
+
anyChange = true;
|
|
2683
2768
|
continue;
|
|
2684
2769
|
}
|
|
2685
2770
|
const legacyScope = resolveLegacyScopeFromElement(element);
|
|
2686
2771
|
if (!legacyScope) {
|
|
2687
2772
|
console.warn(
|
|
2688
|
-
` [${
|
|
2773
|
+
` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
|
|
2689
2774
|
);
|
|
2775
|
+
rawTexts.push(element.getText());
|
|
2690
2776
|
continue;
|
|
2691
2777
|
}
|
|
2692
|
-
|
|
2693
|
-
|
|
2694
|
-
const scope = decodeScope(migratedScope);
|
|
2695
|
-
if (!scope) {
|
|
2696
|
-
console.warn(
|
|
2697
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
|
|
2698
|
-
);
|
|
2699
|
-
continue;
|
|
2700
|
-
}
|
|
2701
|
-
element.replaceWithText(JSON.stringify(scope));
|
|
2702
|
-
migratedCount++;
|
|
2703
|
-
} catch (error) {
|
|
2704
|
-
console.warn(
|
|
2705
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
|
|
2706
|
-
);
|
|
2707
|
-
}
|
|
2778
|
+
legacyStrings.push(legacyScope);
|
|
2779
|
+
anyChange = true;
|
|
2708
2780
|
}
|
|
2781
|
+
if (!anyChange) continue;
|
|
2782
|
+
let mergedScopes;
|
|
2783
|
+
try {
|
|
2784
|
+
mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
|
|
2785
|
+
} catch (error) {
|
|
2786
|
+
throw new Error(
|
|
2787
|
+
`[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
|
|
2788
|
+
{ cause: error }
|
|
2789
|
+
);
|
|
2790
|
+
}
|
|
2791
|
+
migratedCount += legacyStrings.length;
|
|
2792
|
+
mergedCount += legacyStrings.length - mergedScopes.length;
|
|
2793
|
+
const outputElements = [
|
|
2794
|
+
...rawTexts,
|
|
2795
|
+
...mergedScopes.map((s) => JSON.stringify(s))
|
|
2796
|
+
];
|
|
2797
|
+
scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
|
|
2709
2798
|
}
|
|
2710
2799
|
if (removedCount > 0) {
|
|
2711
2800
|
console.log(
|
|
2712
|
-
` Removed ${removedCount} unknown SCOPES reference(s) from '${
|
|
2801
|
+
` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
|
|
2713
2802
|
);
|
|
2714
2803
|
}
|
|
2715
|
-
return { migratedCount, removedCount };
|
|
2804
|
+
return { migratedCount, removedCount, mergedCount };
|
|
2716
2805
|
}
|
|
2717
2806
|
function ensureScopesHelpersImport(rolesFilePath, project) {
|
|
2718
2807
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
@@ -2847,7 +2936,7 @@ async function main11() {
|
|
|
2847
2936
|
return;
|
|
2848
2937
|
}
|
|
2849
2938
|
const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
|
|
2850
|
-
const { migratedCount, removedCount } = migrateScopesArrays(
|
|
2939
|
+
const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
|
|
2851
2940
|
rolesFilePath,
|
|
2852
2941
|
project
|
|
2853
2942
|
);
|
|
@@ -2866,7 +2955,7 @@ async function main11() {
|
|
|
2866
2955
|
}
|
|
2867
2956
|
await sourceFile.save();
|
|
2868
2957
|
console.log(
|
|
2869
|
-
`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." : "."}`
|
|
2958
|
+
`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." : "."}`
|
|
2870
2959
|
);
|
|
2871
2960
|
}
|
|
2872
2961
|
|
|
@@ -3672,6 +3761,10 @@ var ACTION_PROPERTY_NAME2 = "action";
|
|
|
3672
3761
|
var CONDITIONALS_PROPERTY_NAME = "conditionals";
|
|
3673
3762
|
var TYPE_PROPERTY_NAME7 = "type";
|
|
3674
3763
|
var SLUG_PROPERTY_NAME = "slug";
|
|
3764
|
+
var READ_ACTION_TYPE = "READ";
|
|
3765
|
+
var ACTION_TYPE_IMPORT_NAME = "ActionType";
|
|
3766
|
+
var TOOLKIT_EVENTS_MODULE2 = "@opencrvs/toolkit/events";
|
|
3767
|
+
var READ_ACTION_FALLBACK_INITIALIZER = `{ type: ${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE} }`;
|
|
3675
3768
|
var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
|
|
3676
3769
|
"READ",
|
|
3677
3770
|
"DELETE",
|
|
@@ -3719,91 +3812,137 @@ function isUnsupportedActionType(action) {
|
|
|
3719
3812
|
}
|
|
3720
3813
|
return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
|
|
3721
3814
|
}
|
|
3722
|
-
function
|
|
3723
|
-
const
|
|
3724
|
-
|
|
3725
|
-
|
|
3726
|
-
|
|
3727
|
-
|
|
3728
|
-
|
|
3729
|
-
|
|
3815
|
+
function ensureValidAction(workqueue, relPath) {
|
|
3816
|
+
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3817
|
+
const actionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3818
|
+
if (actionProperty && import_ts_morph17.Node.isPropertyAssignment(actionProperty)) {
|
|
3819
|
+
const initializer = actionProperty.getInitializer();
|
|
3820
|
+
if (initializer && import_ts_morph17.Node.isObjectLiteralExpression(initializer)) {
|
|
3821
|
+
if (!isUnsupportedActionType(initializer)) {
|
|
3822
|
+
return { changed: false, usedReadFallback: false };
|
|
3823
|
+
}
|
|
3824
|
+
actionProperty.set({
|
|
3825
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3826
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3827
|
+
});
|
|
3828
|
+
console.log(
|
|
3829
|
+
` [${relPath}] Replaced unsupported 'action' type with '${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE}' on workqueue '${workqueueLabel}'`
|
|
3830
|
+
);
|
|
3831
|
+
return { changed: true, usedReadFallback: true };
|
|
3832
|
+
}
|
|
3730
3833
|
}
|
|
3834
|
+
workqueue.addPropertyAssignment({
|
|
3835
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3836
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3837
|
+
});
|
|
3838
|
+
console.log(
|
|
3839
|
+
` [${relPath}] Added default 'action: ${READ_ACTION_FALLBACK_INITIALIZER}' to workqueue '${workqueueLabel}'`
|
|
3840
|
+
);
|
|
3841
|
+
return { changed: true, usedReadFallback: true };
|
|
3842
|
+
}
|
|
3843
|
+
function migrateWorkqueueActions(workqueue, relPath) {
|
|
3731
3844
|
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3732
|
-
const
|
|
3733
|
-
|
|
3734
|
-
|
|
3735
|
-
|
|
3736
|
-
|
|
3737
|
-
|
|
3738
|
-
|
|
3845
|
+
const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
|
|
3846
|
+
let actionsArrayMigrated = false;
|
|
3847
|
+
if (actionsProperty && import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
|
|
3848
|
+
const actionsInitializer = actionsProperty.getInitializer();
|
|
3849
|
+
if (actionsInitializer && import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
|
|
3850
|
+
const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3851
|
+
if (existingActionProperty) {
|
|
3852
|
+
if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
|
|
3853
|
+
const existingActionInitializer = existingActionProperty.getInitializer();
|
|
3854
|
+
if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
|
|
3855
|
+
const conditionalsProperty = existingActionInitializer.getProperty(
|
|
3856
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3857
|
+
);
|
|
3858
|
+
if (conditionalsProperty) {
|
|
3859
|
+
conditionalsProperty.remove();
|
|
3860
|
+
console.log(
|
|
3861
|
+
` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
|
|
3862
|
+
);
|
|
3863
|
+
}
|
|
3864
|
+
}
|
|
3865
|
+
}
|
|
3866
|
+
actionsProperty.remove();
|
|
3867
|
+
console.log(
|
|
3868
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3869
|
+
);
|
|
3870
|
+
actionsArrayMigrated = true;
|
|
3871
|
+
} else {
|
|
3872
|
+
const actionCandidates = actionsInitializer.getElements().filter(
|
|
3873
|
+
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
3739
3874
|
);
|
|
3740
|
-
if (
|
|
3741
|
-
|
|
3875
|
+
if (actionCandidates.length === 0) {
|
|
3876
|
+
actionsProperty.remove();
|
|
3742
3877
|
console.log(
|
|
3743
|
-
` [${relPath}] Removed
|
|
3878
|
+
` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
|
|
3744
3879
|
);
|
|
3745
|
-
|
|
3746
|
-
|
|
3747
|
-
|
|
3748
|
-
|
|
3749
|
-
|
|
3880
|
+
actionsArrayMigrated = true;
|
|
3881
|
+
} else {
|
|
3882
|
+
if (actionCandidates.length > 1) {
|
|
3883
|
+
const droppedCount = actionCandidates.length - 1;
|
|
3884
|
+
console.warn(
|
|
3885
|
+
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3886
|
+
);
|
|
3887
|
+
}
|
|
3888
|
+
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3889
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3750
3890
|
);
|
|
3891
|
+
if (conditionalsProperty) {
|
|
3892
|
+
conditionalsProperty.remove();
|
|
3893
|
+
console.log(
|
|
3894
|
+
` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
|
|
3895
|
+
);
|
|
3896
|
+
}
|
|
3897
|
+
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3898
|
+
actionsProperty.remove();
|
|
3899
|
+
console.log(
|
|
3900
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3901
|
+
);
|
|
3902
|
+
actionsArrayMigrated = true;
|
|
3903
|
+
} else {
|
|
3904
|
+
const firstActionText = actionCandidates[0].getText();
|
|
3905
|
+
workqueue.addPropertyAssignment({
|
|
3906
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3907
|
+
initializer: firstActionText
|
|
3908
|
+
});
|
|
3909
|
+
actionsProperty.remove();
|
|
3910
|
+
console.log(
|
|
3911
|
+
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3912
|
+
);
|
|
3913
|
+
actionsArrayMigrated = true;
|
|
3914
|
+
}
|
|
3751
3915
|
}
|
|
3752
3916
|
}
|
|
3753
3917
|
}
|
|
3754
|
-
actionsProperty.remove();
|
|
3755
|
-
console.log(
|
|
3756
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3757
|
-
);
|
|
3758
|
-
return 1;
|
|
3759
3918
|
}
|
|
3760
|
-
const
|
|
3761
|
-
|
|
3762
|
-
|
|
3763
|
-
|
|
3764
|
-
|
|
3765
|
-
|
|
3766
|
-
|
|
3767
|
-
|
|
3768
|
-
|
|
3769
|
-
}
|
|
3770
|
-
if (actionCandidates.length > 1) {
|
|
3771
|
-
const droppedCount = actionCandidates.length - 1;
|
|
3772
|
-
console.warn(
|
|
3773
|
-
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3774
|
-
);
|
|
3775
|
-
}
|
|
3776
|
-
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3777
|
-
CONDITIONALS_PROPERTY_NAME
|
|
3919
|
+
const fallback = ensureValidAction(workqueue, relPath);
|
|
3920
|
+
return {
|
|
3921
|
+
changed: actionsArrayMigrated || fallback.changed,
|
|
3922
|
+
usedReadFallback: fallback.usedReadFallback
|
|
3923
|
+
};
|
|
3924
|
+
}
|
|
3925
|
+
function ensureActionTypeImport(sourceFile) {
|
|
3926
|
+
const existingImport = sourceFile.getImportDeclaration(
|
|
3927
|
+
(decl) => decl.getModuleSpecifierValue() === TOOLKIT_EVENTS_MODULE2
|
|
3778
3928
|
);
|
|
3779
|
-
if (
|
|
3780
|
-
|
|
3781
|
-
|
|
3782
|
-
|
|
3783
|
-
|
|
3784
|
-
|
|
3785
|
-
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3786
|
-
actionsProperty.remove();
|
|
3787
|
-
console.log(
|
|
3788
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3789
|
-
);
|
|
3790
|
-
return 1;
|
|
3929
|
+
if (existingImport) {
|
|
3930
|
+
const alreadyImported = existingImport.getNamedImports().some((ni) => ni.getName() === ACTION_TYPE_IMPORT_NAME);
|
|
3931
|
+
if (!alreadyImported) {
|
|
3932
|
+
existingImport.addNamedImport(ACTION_TYPE_IMPORT_NAME);
|
|
3933
|
+
}
|
|
3934
|
+
return;
|
|
3791
3935
|
}
|
|
3792
|
-
|
|
3793
|
-
|
|
3794
|
-
|
|
3795
|
-
initializer: firstActionText
|
|
3936
|
+
sourceFile.addImportDeclaration({
|
|
3937
|
+
moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
|
|
3938
|
+
namedImports: [ACTION_TYPE_IMPORT_NAME]
|
|
3796
3939
|
});
|
|
3797
|
-
actionsProperty.remove();
|
|
3798
|
-
console.log(
|
|
3799
|
-
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3800
|
-
);
|
|
3801
|
-
return 1;
|
|
3802
3940
|
}
|
|
3803
3941
|
function processFile13(filePath, project) {
|
|
3804
3942
|
const sourceFile = project.getSourceFile(filePath);
|
|
3805
3943
|
if (!sourceFile) return 0;
|
|
3806
3944
|
let migratedWorkqueues = 0;
|
|
3945
|
+
let needsActionTypeImport = false;
|
|
3807
3946
|
const relPath = import_path18.default.relative(process.cwd(), filePath);
|
|
3808
3947
|
const callExpressions = sourceFile.getDescendantsOfKind(
|
|
3809
3948
|
import_ts_morph17.SyntaxKind.CallExpression
|
|
@@ -3819,9 +3958,14 @@ function processFile13(filePath, project) {
|
|
|
3819
3958
|
if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
|
|
3820
3959
|
for (const element of workqueuesArg.getElements()) {
|
|
3821
3960
|
if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
|
|
3822
|
-
|
|
3961
|
+
const result = migrateWorkqueueActions(element, relPath);
|
|
3962
|
+
if (result.changed) migratedWorkqueues++;
|
|
3963
|
+
if (result.usedReadFallback) needsActionTypeImport = true;
|
|
3823
3964
|
}
|
|
3824
3965
|
}
|
|
3966
|
+
if (needsActionTypeImport) {
|
|
3967
|
+
ensureActionTypeImport(sourceFile);
|
|
3968
|
+
}
|
|
3825
3969
|
return migratedWorkqueues;
|
|
3826
3970
|
}
|
|
3827
3971
|
async function main18() {
|
|
@@ -4156,7 +4300,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4156
4300
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4157
4301
|
var import_child_process = require("child_process");
|
|
4158
4302
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4159
|
-
var UPSTREAM_BRANCH = "
|
|
4303
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4160
4304
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4161
4305
|
var FILES_TO_CHECKOUT = [
|
|
4162
4306
|
"src/analytics/analytics.ts",
|
|
@@ -4695,9 +4839,9 @@ var import_path24 = require("path");
|
|
|
4695
4839
|
var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
|
|
4696
4840
|
var INFRASTRUCTURE_DIR = "infrastructure";
|
|
4697
4841
|
var BASE_BRANCH = "release-v1.9";
|
|
4698
|
-
function gitShowBytes(ref,
|
|
4842
|
+
function gitShowBytes(ref, path24) {
|
|
4699
4843
|
try {
|
|
4700
|
-
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${
|
|
4844
|
+
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
|
|
4701
4845
|
cwd: process.cwd(),
|
|
4702
4846
|
stdio: ["ignore", "pipe", "pipe"]
|
|
4703
4847
|
});
|
|
@@ -4706,9 +4850,13 @@ function gitShowBytes(ref, path23) {
|
|
|
4706
4850
|
return null;
|
|
4707
4851
|
}
|
|
4708
4852
|
}
|
|
4709
|
-
async function main25(
|
|
4853
|
+
async function main25({
|
|
4854
|
+
subdirs = []
|
|
4855
|
+
} = {}) {
|
|
4856
|
+
const pathspecs = subdirs.length > 0 ? subdirs.map((s) => `${INFRASTRUCTURE_DIR}/${s}/`) : [`${INFRASTRUCTURE_DIR}/`];
|
|
4857
|
+
const scopeLabel = pathspecs.map((p) => `'${p}'`).join(", ");
|
|
4710
4858
|
console.log(
|
|
4711
|
-
`Merging
|
|
4859
|
+
`Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
|
|
4712
4860
|
`
|
|
4713
4861
|
);
|
|
4714
4862
|
assertIsGitRepo();
|
|
@@ -4723,20 +4871,12 @@ async function main25() {
|
|
|
4723
4871
|
const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
|
|
4724
4872
|
const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
|
|
4725
4873
|
const upstreamFiles = runGit(
|
|
4726
|
-
[
|
|
4727
|
-
"ls-tree",
|
|
4728
|
-
"-r",
|
|
4729
|
-
"--name-only",
|
|
4730
|
-
"-z",
|
|
4731
|
-
ref,
|
|
4732
|
-
"--",
|
|
4733
|
-
`${INFRASTRUCTURE_DIR}/`
|
|
4734
|
-
],
|
|
4874
|
+
["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
|
|
4735
4875
|
{ silent: true }
|
|
4736
4876
|
).split("\0").filter(Boolean);
|
|
4737
4877
|
if (upstreamFiles.length === 0) {
|
|
4738
4878
|
console.log(
|
|
4739
|
-
` No files found under
|
|
4879
|
+
` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
|
|
4740
4880
|
);
|
|
4741
4881
|
return;
|
|
4742
4882
|
}
|
|
@@ -4811,7 +4951,9 @@ async function main25() {
|
|
|
4811
4951
|
var import_fs6 = require("fs");
|
|
4812
4952
|
var import_path25 = require("path");
|
|
4813
4953
|
var INFRASTRUCTURE_DIR2 = "infrastructure";
|
|
4814
|
-
async function main26(
|
|
4954
|
+
async function main26({
|
|
4955
|
+
keep = []
|
|
4956
|
+
} = {}) {
|
|
4815
4957
|
const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
|
|
4816
4958
|
if (!(0, import_fs6.existsSync)(fullPath)) {
|
|
4817
4959
|
console.log(
|
|
@@ -4819,24 +4961,152 @@ async function main26() {
|
|
|
4819
4961
|
);
|
|
4820
4962
|
return;
|
|
4821
4963
|
}
|
|
4822
|
-
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4823
|
-
`);
|
|
4824
4964
|
assertIsGitRepo();
|
|
4825
|
-
|
|
4826
|
-
|
|
4965
|
+
if (keep.length === 0) {
|
|
4966
|
+
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4967
|
+
`);
|
|
4968
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
|
|
4969
|
+
silent: true
|
|
4970
|
+
});
|
|
4971
|
+
console.log(
|
|
4972
|
+
` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4973
|
+
);
|
|
4974
|
+
if ((0, import_fs6.existsSync)(fullPath)) {
|
|
4975
|
+
(0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
|
|
4976
|
+
console.log(
|
|
4977
|
+
` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4978
|
+
);
|
|
4979
|
+
}
|
|
4980
|
+
console.log(
|
|
4981
|
+
`
|
|
4982
|
+
Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4983
|
+
);
|
|
4984
|
+
return;
|
|
4985
|
+
}
|
|
4986
|
+
const keepSet = new Set(keep);
|
|
4987
|
+
console.log(
|
|
4988
|
+
`Deleting contents of '${INFRASTRUCTURE_DIR2}/' except: ${[...keepSet].map((name) => `'${name}'`).join(", ")}
|
|
4989
|
+
`
|
|
4990
|
+
);
|
|
4991
|
+
const topLevelEntries = (0, import_fs6.readdirSync)(fullPath, { withFileTypes: true });
|
|
4992
|
+
let deleted = 0;
|
|
4993
|
+
for (const entry of topLevelEntries) {
|
|
4994
|
+
if (keepSet.has(entry.name)) {
|
|
4995
|
+
console.log(` Keeping '${INFRASTRUCTURE_DIR2}/${entry.name}'.`);
|
|
4996
|
+
continue;
|
|
4997
|
+
}
|
|
4998
|
+
const relPath = `${INFRASTRUCTURE_DIR2}/${entry.name}${entry.isDirectory() ? "/" : ""}`;
|
|
4999
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", relPath], { silent: true });
|
|
5000
|
+
const fullEntryPath = (0, import_path25.join)(fullPath, entry.name);
|
|
5001
|
+
if ((0, import_fs6.existsSync)(fullEntryPath)) {
|
|
5002
|
+
(0, import_fs6.rmSync)(fullEntryPath, { recursive: true, force: true });
|
|
5003
|
+
}
|
|
5004
|
+
console.log(` Deleted '${relPath}'.`);
|
|
5005
|
+
deleted++;
|
|
5006
|
+
}
|
|
5007
|
+
const presentNames = new Set(topLevelEntries.map((e) => e.name));
|
|
5008
|
+
const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
|
|
5009
|
+
if (missingKeeps.length > 0) {
|
|
5010
|
+
console.warn(
|
|
5011
|
+
` [warn] Requested to keep ${missingKeeps.map((n) => `'${n}'`).join(", ")} but they don't exist under '${INFRASTRUCTURE_DIR2}/'.`
|
|
5012
|
+
);
|
|
5013
|
+
}
|
|
5014
|
+
console.log(
|
|
5015
|
+
`
|
|
5016
|
+
Done. Deleted ${deleted} top-level entr${deleted === 1 ? "y" : "ies"}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
5017
|
+
);
|
|
5018
|
+
}
|
|
5019
|
+
|
|
5020
|
+
// src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
|
|
5021
|
+
var import_ts_morph22 = require("ts-morph");
|
|
5022
|
+
var import_path26 = __toESM(require("path"));
|
|
5023
|
+
var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
|
|
5024
|
+
var ACTION_PARAMETER_NAME = "action";
|
|
5025
|
+
var OLD_TYPE = "ActionInput";
|
|
5026
|
+
var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
|
|
5027
|
+
function isAcceptRequestedRegistrationParameter(parameter) {
|
|
5028
|
+
const functionDeclaration = parameter.getFirstAncestorByKind(
|
|
5029
|
+
import_ts_morph22.SyntaxKind.FunctionDeclaration
|
|
5030
|
+
);
|
|
5031
|
+
if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
|
|
5032
|
+
return true;
|
|
5033
|
+
}
|
|
5034
|
+
const arrowFunction = parameter.getFirstAncestorByKind(
|
|
5035
|
+
import_ts_morph22.SyntaxKind.ArrowFunction
|
|
5036
|
+
);
|
|
5037
|
+
const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
|
|
5038
|
+
import_ts_morph22.SyntaxKind.VariableDeclaration
|
|
5039
|
+
);
|
|
5040
|
+
return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
|
|
5041
|
+
}
|
|
5042
|
+
function processFile14(filePath, project) {
|
|
5043
|
+
const sourceFile = project.getSourceFile(filePath);
|
|
5044
|
+
if (!sourceFile) return 0;
|
|
5045
|
+
let updatedCount = 0;
|
|
5046
|
+
for (const parameter of sourceFile.getDescendantsOfKind(
|
|
5047
|
+
import_ts_morph22.SyntaxKind.Parameter
|
|
5048
|
+
)) {
|
|
5049
|
+
if (parameter.getName() !== ACTION_PARAMETER_NAME) {
|
|
5050
|
+
continue;
|
|
5051
|
+
}
|
|
5052
|
+
if (!isAcceptRequestedRegistrationParameter(parameter)) {
|
|
5053
|
+
continue;
|
|
5054
|
+
}
|
|
5055
|
+
const typeNode = parameter.getTypeNode();
|
|
5056
|
+
if (!typeNode || typeNode.getText() !== OLD_TYPE) {
|
|
5057
|
+
continue;
|
|
5058
|
+
}
|
|
5059
|
+
parameter.setType(NEW_TYPE);
|
|
5060
|
+
updatedCount++;
|
|
5061
|
+
console.log(
|
|
5062
|
+
` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
|
|
5063
|
+
);
|
|
5064
|
+
}
|
|
5065
|
+
return updatedCount;
|
|
5066
|
+
}
|
|
5067
|
+
async function main27() {
|
|
5068
|
+
const srcDir = import_path26.default.join(process.cwd(), "src");
|
|
5069
|
+
console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
|
|
5070
|
+
`);
|
|
5071
|
+
const project = new import_ts_morph22.Project({
|
|
5072
|
+
tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
|
|
5073
|
+
skipAddingFilesFromTsConfig: false
|
|
5074
|
+
});
|
|
5075
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
5076
|
+
const filePath = sf.getFilePath();
|
|
5077
|
+
return filePath.includes("/src/") && !filePath.includes("/node_modules/");
|
|
4827
5078
|
});
|
|
4828
|
-
|
|
4829
|
-
|
|
4830
|
-
|
|
4831
|
-
|
|
5079
|
+
let totalUpdated = 0;
|
|
5080
|
+
const modifiedFiles = [];
|
|
5081
|
+
for (const sourceFile of sourceFiles) {
|
|
5082
|
+
const filePath = sourceFile.getFilePath();
|
|
5083
|
+
const updated = processFile14(filePath, project);
|
|
5084
|
+
if (updated > 0) {
|
|
5085
|
+
totalUpdated += updated;
|
|
5086
|
+
modifiedFiles.push(filePath);
|
|
5087
|
+
}
|
|
5088
|
+
}
|
|
5089
|
+
if (modifiedFiles.length === 0) {
|
|
5090
|
+
console.log(
|
|
5091
|
+
`No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
|
|
5092
|
+
);
|
|
5093
|
+
return;
|
|
5094
|
+
}
|
|
5095
|
+
console.log(`
|
|
5096
|
+
Saving ${modifiedFiles.length} modified file(s)...`);
|
|
5097
|
+
for (const filePath of modifiedFiles) {
|
|
5098
|
+
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
5099
|
+
await sourceFile.save();
|
|
5100
|
+
console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
|
|
4832
5101
|
}
|
|
4833
5102
|
console.log(
|
|
4834
5103
|
`
|
|
4835
|
-
|
|
5104
|
+
Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
|
|
4836
5105
|
);
|
|
4837
5106
|
}
|
|
4838
5107
|
|
|
4839
5108
|
// src/migrations/v2.0/index.ts
|
|
5109
|
+
var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
|
|
4840
5110
|
async function runUpgrade(dockerSwarm) {
|
|
4841
5111
|
await main18();
|
|
4842
5112
|
await main();
|
|
@@ -4861,11 +5131,13 @@ async function runUpgrade(dockerSwarm) {
|
|
|
4861
5131
|
await main22();
|
|
4862
5132
|
await main23();
|
|
4863
5133
|
await main24();
|
|
5134
|
+
await main27();
|
|
4864
5135
|
await main17();
|
|
4865
5136
|
if (dockerSwarm) {
|
|
4866
5137
|
await main25();
|
|
4867
5138
|
} else {
|
|
4868
|
-
await main26();
|
|
5139
|
+
await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
|
|
5140
|
+
await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
|
|
4869
5141
|
}
|
|
4870
5142
|
}
|
|
4871
5143
|
|
|
@@ -4894,7 +5166,7 @@ Options:
|
|
|
4894
5166
|
'infrastructure/' directory is deleted (default).
|
|
4895
5167
|
-h, --help Show this message.
|
|
4896
5168
|
`.trim();
|
|
4897
|
-
function
|
|
5169
|
+
function main28() {
|
|
4898
5170
|
const command = args[0];
|
|
4899
5171
|
if (!command || command === "--help" || command === "-h") {
|
|
4900
5172
|
console.log(USAGE);
|
|
@@ -4969,4 +5241,4 @@ function handleCheckTranslations() {
|
|
|
4969
5241
|
console.warn("This command is not implemented yet!");
|
|
4970
5242
|
process.exit(1);
|
|
4971
5243
|
}
|
|
4972
|
-
|
|
5244
|
+
main28();
|