@opencrvs/toolkit 2.0.0-rc.cfbf60d → 2.0.0-rc.cfcac91
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/README.md +15 -0
- package/build.sh +3 -2
- package/create-countryconfig/index.js +103 -0
- package/create-countryconfig/package.json +21 -0
- package/dist/application-config/index.js +286 -123
- package/dist/cli.js +3644 -168
- package/dist/commons/api/router.d.ts +3404 -239
- 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 +354 -0
- package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
- package/dist/commons/events/Draft.d.ts +4 -2
- package/dist/commons/events/EventConfig.d.ts +2 -0
- package/dist/commons/events/EventDocument.d.ts +3 -0
- package/dist/commons/events/EventIndex.d.ts +25 -3
- package/dist/commons/events/EventMetadata.d.ts +26 -7
- package/dist/commons/events/FieldConfig.d.ts +388 -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/locations.d.ts +22 -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 +8 -4
- package/dist/commons/events/state/utils.d.ts +21 -289
- package/dist/commons/events/utils.d.ts +13 -2
- package/dist/conditionals/index.js +63 -5
- package/dist/environment/custom-types.d.ts +33 -0
- package/dist/environment/custom-types.d.ts.map +1 -0
- package/dist/environment/custom-types.js +12 -0
- package/dist/environment/derived-variables.d.ts +134 -0
- package/dist/environment/derived-variables.d.ts.map +1 -0
- package/dist/environment/derived-variables.js +169 -0
- package/dist/environment/editor-questions.d.ts +4 -0
- package/dist/environment/editor-questions.d.ts.map +1 -0
- package/dist/environment/editor-questions.js +67 -0
- package/dist/environment/git.d.ts +5 -0
- package/dist/environment/git.d.ts.map +1 -0
- package/dist/environment/git.js +38 -0
- package/dist/environment/github.d.ts +26 -0
- package/dist/environment/github.d.ts.map +1 -0
- package/dist/environment/github.js +247 -0
- package/dist/environment/index.d.ts +5 -0
- package/dist/environment/index.d.ts.map +1 -0
- package/dist/environment/index.js +71 -0
- package/dist/environment/logger.d.ts +15 -0
- package/dist/environment/logger.d.ts.map +1 -0
- package/dist/environment/logger.js +25 -0
- package/dist/environment/manage-users.d.ts +11 -0
- package/dist/environment/manage-users.d.ts.map +1 -0
- package/dist/environment/manage-users.js +497 -0
- package/dist/environment/questions-helper.d.ts +15 -0
- package/dist/environment/questions-helper.d.ts.map +1 -0
- package/dist/environment/questions-helper.js +70 -0
- package/dist/environment/questions.d.ts +199 -0
- package/dist/environment/questions.d.ts.map +1 -0
- package/dist/environment/questions.js +412 -0
- package/dist/environment/setup-environment.d.ts +2 -0
- package/dist/environment/setup-environment.d.ts.map +1 -0
- package/dist/environment/setup-environment.js +794 -0
- package/dist/environment/ssh-keygen.d.ts +5 -0
- package/dist/environment/ssh-keygen.d.ts.map +1 -0
- package/dist/environment/ssh-keygen.js +21 -0
- package/dist/environment/swarm-to-k8s.d.ts +2 -0
- package/dist/environment/swarm-to-k8s.d.ts.map +1 -0
- package/dist/environment/swarm-to-k8s.js +173 -0
- package/dist/environment/templates.d.ts +27 -0
- package/dist/environment/templates.d.ts.map +1 -0
- package/dist/environment/templates.js +163 -0
- package/dist/environment/update-workflows.d.ts +2 -0
- package/dist/environment/update-workflows.d.ts.map +1 -0
- package/dist/environment/update-workflows.js +169 -0
- package/dist/environment/users.d.ts +2 -0
- package/dist/environment/users.d.ts.map +1 -0
- package/dist/environment/users.js +112 -0
- package/dist/environment/utils.d.ts +18 -0
- package/dist/environment/utils.d.ts.map +1 -0
- package/dist/environment/utils.js +100 -0
- package/dist/events/index.js +1168 -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 +407 -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 +914 -159
- package/dist/scopes/index.d.ts +93 -7
- package/dist/scopes/index.js +20 -7
- package/dist/templates/charts-values/dependencies/values.override.yaml +4 -0
- package/dist/templates/charts-values/dependencies/values.yaml +83 -0
- package/dist/templates/charts-values/opencrvs-services/values.override.yaml +4 -0
- package/dist/templates/charts-values/opencrvs-services/values.yaml +81 -0
- package/dist/templates/charts-values/traefik/values.override.yaml +4 -0
- package/dist/templates/charts-values/traefik/values.yaml +115 -0
- package/dist/templates/inventory/inventory.template.yml +100 -0
- package/dist/templates/inventory/production.example.yml +77 -0
- package/dist/templates/inventory/qa.example.yml +48 -0
- package/opencrvs-toolkit-2.0.0-rc.cfcac91.tgz +0 -0
- package/package.json +20 -2
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.cfbf60d.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"));
|
|
@@ -2200,11 +2204,13 @@ var scopeOptionsPlaceEvent = z3.object({
|
|
|
2200
2204
|
event: scopeByEvent,
|
|
2201
2205
|
placeOfEvent: JurisdictionFilter.optional()
|
|
2202
2206
|
}).describe("Options applicable to all record scopes.");
|
|
2203
|
-
var
|
|
2207
|
+
var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
|
|
2208
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
2209
|
+
notifiedBy: UserFilter.optional(),
|
|
2204
2210
|
declaredIn: JurisdictionFilter.optional(),
|
|
2205
2211
|
declaredBy: UserFilter.optional()
|
|
2206
2212
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
2207
|
-
var AllRecordScopeOptions =
|
|
2213
|
+
var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
|
|
2208
2214
|
registeredIn: JurisdictionFilter.optional(),
|
|
2209
2215
|
registeredBy: UserFilter.optional()
|
|
2210
2216
|
}).describe(
|
|
@@ -2242,6 +2248,8 @@ var ResolvedScopeOptionsPlaceEvent = z3.object({
|
|
|
2242
2248
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
2243
2249
|
);
|
|
2244
2250
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
2251
|
+
notifiedIn: UUID.nullish(),
|
|
2252
|
+
notifiedBy: z3.string().optional(),
|
|
2245
2253
|
declaredIn: UUID.nullish(),
|
|
2246
2254
|
declaredBy: z3.string().optional()
|
|
2247
2255
|
}).describe(
|
|
@@ -2287,7 +2295,7 @@ var RecordScopeV2 = z3.discriminatedUnion("type", [
|
|
|
2287
2295
|
}),
|
|
2288
2296
|
z3.object({
|
|
2289
2297
|
type: ScopesWithDeclaredOptions,
|
|
2290
|
-
options:
|
|
2298
|
+
options: scopeOptionsDeclaredOrNotified.optional()
|
|
2291
2299
|
}),
|
|
2292
2300
|
z3.object({
|
|
2293
2301
|
type: ScopesWithFullOptions,
|
|
@@ -2390,22 +2398,30 @@ var encodeScope = (scope) => {
|
|
|
2390
2398
|
encode: false
|
|
2391
2399
|
});
|
|
2392
2400
|
};
|
|
2393
|
-
var
|
|
2394
|
-
|
|
2401
|
+
var decodedScopeCache = /* @__PURE__ */ new Map();
|
|
2402
|
+
var decodeScope = (encodedScope) => {
|
|
2403
|
+
if (decodedScopeCache.has(encodedScope)) {
|
|
2404
|
+
return decodedScopeCache.get(encodedScope);
|
|
2405
|
+
}
|
|
2406
|
+
const scope = qs.parse(encodedScope, {
|
|
2395
2407
|
ignoreQueryPrefix: true,
|
|
2396
2408
|
comma: true,
|
|
2397
2409
|
allowDots: true
|
|
2398
2410
|
});
|
|
2399
2411
|
const unflattenedScope = unflattenScope(scope);
|
|
2400
|
-
|
|
2412
|
+
const result = Scope2.safeParse(unflattenedScope)?.data;
|
|
2413
|
+
decodedScopeCache.set(encodedScope, result);
|
|
2414
|
+
return result;
|
|
2401
2415
|
};
|
|
2402
2416
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
2403
2417
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
2404
|
-
accessLevel: JurisdictionFilter.enum.all
|
|
2418
|
+
accessLevel: JurisdictionFilter.enum.all,
|
|
2419
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
2420
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
2421
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
2405
2422
|
};
|
|
2406
2423
|
|
|
2407
2424
|
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2408
|
-
var z4 = __toESM(require("zod/v4"));
|
|
2409
2425
|
var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
|
|
2410
2426
|
var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
|
|
2411
2427
|
var SearchScope = z4.object({
|
|
@@ -2639,6 +2655,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
|
|
|
2639
2655
|
}
|
|
2640
2656
|
throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
|
|
2641
2657
|
};
|
|
2658
|
+
var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
|
|
2659
|
+
function isMergeableUserScopeType(type) {
|
|
2660
|
+
return MERGEABLE_USER_SCOPE_TYPES.includes(type);
|
|
2661
|
+
}
|
|
2662
|
+
function decodeLegacyScope(legacy) {
|
|
2663
|
+
const encoded = legacyScopeToV2Scope(legacy);
|
|
2664
|
+
const scope = decodeScope(encoded);
|
|
2665
|
+
if (!scope) {
|
|
2666
|
+
throw new Error(
|
|
2667
|
+
`Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
|
|
2668
|
+
);
|
|
2669
|
+
}
|
|
2670
|
+
return { legacy, scope };
|
|
2671
|
+
}
|
|
2672
|
+
function groupByType(entries) {
|
|
2673
|
+
return entries.reduce(
|
|
2674
|
+
(groups, entry) => ({
|
|
2675
|
+
...groups,
|
|
2676
|
+
[entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
|
|
2677
|
+
}),
|
|
2678
|
+
{}
|
|
2679
|
+
);
|
|
2680
|
+
}
|
|
2681
|
+
function deduplicateEntries(entries) {
|
|
2682
|
+
return entries.filter(
|
|
2683
|
+
(entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
|
|
2684
|
+
);
|
|
2685
|
+
}
|
|
2686
|
+
function mergeEntries(type, entries) {
|
|
2687
|
+
const optionsList = entries.map(
|
|
2688
|
+
(e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
|
|
2689
|
+
);
|
|
2690
|
+
const allKeys = optionsList.flatMap(
|
|
2691
|
+
(opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
|
|
2692
|
+
);
|
|
2693
|
+
const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
|
|
2694
|
+
if (conflictKey) {
|
|
2695
|
+
const conflicting = entries.filter(
|
|
2696
|
+
(e) => conflictKey in ("options" in e.scope && e.scope.options || {})
|
|
2697
|
+
).map((e) => JSON.stringify(e.legacy));
|
|
2698
|
+
throw new Error(
|
|
2699
|
+
`Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
|
|
2700
|
+
);
|
|
2701
|
+
}
|
|
2702
|
+
const mergedOptions = Object.assign({}, ...optionsList);
|
|
2703
|
+
const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
|
|
2704
|
+
const parsed = Scope2.safeParse(merged);
|
|
2705
|
+
if (!parsed.success) {
|
|
2706
|
+
throw new Error(
|
|
2707
|
+
`Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
|
|
2708
|
+
);
|
|
2709
|
+
}
|
|
2710
|
+
return parsed.data;
|
|
2711
|
+
}
|
|
2712
|
+
function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
|
|
2713
|
+
const groups = groupByType(legacyScopes.map(decodeLegacyScope));
|
|
2714
|
+
return Object.entries(groups).flatMap(([type, entries]) => {
|
|
2715
|
+
const deduped = deduplicateEntries(entries);
|
|
2716
|
+
if (deduped.length <= 1) return deduped.map((e) => e.scope);
|
|
2717
|
+
if (!isMergeableUserScopeType(type)) {
|
|
2718
|
+
console.warn(
|
|
2719
|
+
`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.`
|
|
2720
|
+
);
|
|
2721
|
+
return deduped.map((e) => e.scope);
|
|
2722
|
+
}
|
|
2723
|
+
return [mergeEntries(type, deduped)];
|
|
2724
|
+
});
|
|
2725
|
+
}
|
|
2642
2726
|
|
|
2643
2727
|
// src/migrations/v2.0/migrate-scopes.ts
|
|
2644
2728
|
var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
|
|
@@ -2676,57 +2760,65 @@ function resolveLegacyScopeFromElement(element) {
|
|
|
2676
2760
|
}
|
|
2677
2761
|
function migrateScopesArrays(rolesFilePath, project) {
|
|
2678
2762
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
2679
|
-
if (!sourceFile)
|
|
2763
|
+
if (!sourceFile) {
|
|
2764
|
+
return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
|
|
2765
|
+
}
|
|
2680
2766
|
let migratedCount = 0;
|
|
2681
2767
|
let removedCount = 0;
|
|
2768
|
+
let mergedCount = 0;
|
|
2682
2769
|
const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
|
|
2770
|
+
const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
|
|
2683
2771
|
for (const scopesProp of scopesProperties) {
|
|
2684
2772
|
const initializer = scopesProp.getInitializer();
|
|
2685
2773
|
if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
|
|
2686
|
-
const
|
|
2687
|
-
|
|
2688
|
-
|
|
2689
|
-
|
|
2774
|
+
const rawTexts = [];
|
|
2775
|
+
const legacyStrings = [];
|
|
2776
|
+
let anyChange = false;
|
|
2777
|
+
for (const element of initializer.getElements()) {
|
|
2690
2778
|
const scopeKey = resolveScopeKeyFromElementAccess(element);
|
|
2691
2779
|
if (scopeKey && !(scopeKey in SCOPES)) {
|
|
2692
2780
|
console.warn(
|
|
2693
|
-
` [${
|
|
2781
|
+
` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
|
|
2694
2782
|
);
|
|
2695
|
-
initializer.removeElement(index);
|
|
2696
2783
|
removedCount++;
|
|
2784
|
+
anyChange = true;
|
|
2697
2785
|
continue;
|
|
2698
2786
|
}
|
|
2699
2787
|
const legacyScope = resolveLegacyScopeFromElement(element);
|
|
2700
2788
|
if (!legacyScope) {
|
|
2701
2789
|
console.warn(
|
|
2702
|
-
` [${
|
|
2790
|
+
` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
|
|
2703
2791
|
);
|
|
2792
|
+
rawTexts.push(element.getText());
|
|
2704
2793
|
continue;
|
|
2705
2794
|
}
|
|
2706
|
-
|
|
2707
|
-
|
|
2708
|
-
const scope = decodeScope(migratedScope);
|
|
2709
|
-
if (!scope) {
|
|
2710
|
-
console.warn(
|
|
2711
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
|
|
2712
|
-
);
|
|
2713
|
-
continue;
|
|
2714
|
-
}
|
|
2715
|
-
element.replaceWithText(JSON.stringify(scope));
|
|
2716
|
-
migratedCount++;
|
|
2717
|
-
} catch (error) {
|
|
2718
|
-
console.warn(
|
|
2719
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
|
|
2720
|
-
);
|
|
2721
|
-
}
|
|
2795
|
+
legacyStrings.push(legacyScope);
|
|
2796
|
+
anyChange = true;
|
|
2722
2797
|
}
|
|
2798
|
+
if (!anyChange) continue;
|
|
2799
|
+
let mergedScopes;
|
|
2800
|
+
try {
|
|
2801
|
+
mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
|
|
2802
|
+
} catch (error) {
|
|
2803
|
+
throw new Error(
|
|
2804
|
+
`[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
|
|
2805
|
+
{ cause: error }
|
|
2806
|
+
);
|
|
2807
|
+
}
|
|
2808
|
+
migratedCount += legacyStrings.length;
|
|
2809
|
+
mergedCount += legacyStrings.length - mergedScopes.length;
|
|
2810
|
+
const outputElements = [
|
|
2811
|
+
...rawTexts,
|
|
2812
|
+
...mergedScopes.map((s) => JSON.stringify(s))
|
|
2813
|
+
];
|
|
2814
|
+
scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
|
|
2723
2815
|
}
|
|
2724
2816
|
if (removedCount > 0) {
|
|
2725
2817
|
console.log(
|
|
2726
|
-
` Removed ${removedCount} unknown SCOPES reference(s) from '${
|
|
2818
|
+
` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
|
|
2727
2819
|
);
|
|
2728
2820
|
}
|
|
2729
|
-
return { migratedCount, removedCount };
|
|
2821
|
+
return { migratedCount, removedCount, mergedCount };
|
|
2730
2822
|
}
|
|
2731
2823
|
function ensureScopesHelpersImport(rolesFilePath, project) {
|
|
2732
2824
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
@@ -2861,7 +2953,7 @@ async function main11() {
|
|
|
2861
2953
|
return;
|
|
2862
2954
|
}
|
|
2863
2955
|
const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
|
|
2864
|
-
const { migratedCount, removedCount } = migrateScopesArrays(
|
|
2956
|
+
const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
|
|
2865
2957
|
rolesFilePath,
|
|
2866
2958
|
project
|
|
2867
2959
|
);
|
|
@@ -2880,7 +2972,7 @@ async function main11() {
|
|
|
2880
2972
|
}
|
|
2881
2973
|
await sourceFile.save();
|
|
2882
2974
|
console.log(
|
|
2883
|
-
`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." : "."}`
|
|
2975
|
+
`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." : "."}`
|
|
2884
2976
|
);
|
|
2885
2977
|
}
|
|
2886
2978
|
|
|
@@ -3686,6 +3778,10 @@ var ACTION_PROPERTY_NAME2 = "action";
|
|
|
3686
3778
|
var CONDITIONALS_PROPERTY_NAME = "conditionals";
|
|
3687
3779
|
var TYPE_PROPERTY_NAME7 = "type";
|
|
3688
3780
|
var SLUG_PROPERTY_NAME = "slug";
|
|
3781
|
+
var READ_ACTION_TYPE = "READ";
|
|
3782
|
+
var ACTION_TYPE_IMPORT_NAME = "ActionType";
|
|
3783
|
+
var TOOLKIT_EVENTS_MODULE2 = "@opencrvs/toolkit/events";
|
|
3784
|
+
var READ_ACTION_FALLBACK_INITIALIZER = `{ type: ${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE} }`;
|
|
3689
3785
|
var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
|
|
3690
3786
|
"READ",
|
|
3691
3787
|
"DELETE",
|
|
@@ -3733,91 +3829,137 @@ function isUnsupportedActionType(action) {
|
|
|
3733
3829
|
}
|
|
3734
3830
|
return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
|
|
3735
3831
|
}
|
|
3736
|
-
function
|
|
3737
|
-
const
|
|
3738
|
-
|
|
3739
|
-
|
|
3740
|
-
|
|
3741
|
-
|
|
3742
|
-
|
|
3743
|
-
|
|
3832
|
+
function ensureValidAction(workqueue, relPath) {
|
|
3833
|
+
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3834
|
+
const actionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3835
|
+
if (actionProperty && import_ts_morph17.Node.isPropertyAssignment(actionProperty)) {
|
|
3836
|
+
const initializer = actionProperty.getInitializer();
|
|
3837
|
+
if (initializer && import_ts_morph17.Node.isObjectLiteralExpression(initializer)) {
|
|
3838
|
+
if (!isUnsupportedActionType(initializer)) {
|
|
3839
|
+
return { changed: false, usedReadFallback: false };
|
|
3840
|
+
}
|
|
3841
|
+
actionProperty.set({
|
|
3842
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3843
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3844
|
+
});
|
|
3845
|
+
console.log(
|
|
3846
|
+
` [${relPath}] Replaced unsupported 'action' type with '${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE}' on workqueue '${workqueueLabel}'`
|
|
3847
|
+
);
|
|
3848
|
+
return { changed: true, usedReadFallback: true };
|
|
3849
|
+
}
|
|
3744
3850
|
}
|
|
3851
|
+
workqueue.addPropertyAssignment({
|
|
3852
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3853
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3854
|
+
});
|
|
3855
|
+
console.log(
|
|
3856
|
+
` [${relPath}] Added default 'action: ${READ_ACTION_FALLBACK_INITIALIZER}' to workqueue '${workqueueLabel}'`
|
|
3857
|
+
);
|
|
3858
|
+
return { changed: true, usedReadFallback: true };
|
|
3859
|
+
}
|
|
3860
|
+
function migrateWorkqueueActions(workqueue, relPath) {
|
|
3745
3861
|
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3746
|
-
const
|
|
3747
|
-
|
|
3748
|
-
|
|
3749
|
-
|
|
3750
|
-
|
|
3751
|
-
|
|
3752
|
-
|
|
3862
|
+
const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
|
|
3863
|
+
let actionsArrayMigrated = false;
|
|
3864
|
+
if (actionsProperty && import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
|
|
3865
|
+
const actionsInitializer = actionsProperty.getInitializer();
|
|
3866
|
+
if (actionsInitializer && import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
|
|
3867
|
+
const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3868
|
+
if (existingActionProperty) {
|
|
3869
|
+
if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
|
|
3870
|
+
const existingActionInitializer = existingActionProperty.getInitializer();
|
|
3871
|
+
if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
|
|
3872
|
+
const conditionalsProperty = existingActionInitializer.getProperty(
|
|
3873
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3874
|
+
);
|
|
3875
|
+
if (conditionalsProperty) {
|
|
3876
|
+
conditionalsProperty.remove();
|
|
3877
|
+
console.log(
|
|
3878
|
+
` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
|
|
3879
|
+
);
|
|
3880
|
+
}
|
|
3881
|
+
}
|
|
3882
|
+
}
|
|
3883
|
+
actionsProperty.remove();
|
|
3884
|
+
console.log(
|
|
3885
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3886
|
+
);
|
|
3887
|
+
actionsArrayMigrated = true;
|
|
3888
|
+
} else {
|
|
3889
|
+
const actionCandidates = actionsInitializer.getElements().filter(
|
|
3890
|
+
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
3753
3891
|
);
|
|
3754
|
-
if (
|
|
3755
|
-
|
|
3892
|
+
if (actionCandidates.length === 0) {
|
|
3893
|
+
actionsProperty.remove();
|
|
3756
3894
|
console.log(
|
|
3757
|
-
` [${relPath}] Removed
|
|
3895
|
+
` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
|
|
3758
3896
|
);
|
|
3759
|
-
|
|
3760
|
-
|
|
3761
|
-
|
|
3762
|
-
|
|
3763
|
-
|
|
3897
|
+
actionsArrayMigrated = true;
|
|
3898
|
+
} else {
|
|
3899
|
+
if (actionCandidates.length > 1) {
|
|
3900
|
+
const droppedCount = actionCandidates.length - 1;
|
|
3901
|
+
console.warn(
|
|
3902
|
+
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3903
|
+
);
|
|
3904
|
+
}
|
|
3905
|
+
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3906
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3764
3907
|
);
|
|
3908
|
+
if (conditionalsProperty) {
|
|
3909
|
+
conditionalsProperty.remove();
|
|
3910
|
+
console.log(
|
|
3911
|
+
` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
|
|
3912
|
+
);
|
|
3913
|
+
}
|
|
3914
|
+
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3915
|
+
actionsProperty.remove();
|
|
3916
|
+
console.log(
|
|
3917
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3918
|
+
);
|
|
3919
|
+
actionsArrayMigrated = true;
|
|
3920
|
+
} else {
|
|
3921
|
+
const firstActionText = actionCandidates[0].getText();
|
|
3922
|
+
workqueue.addPropertyAssignment({
|
|
3923
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3924
|
+
initializer: firstActionText
|
|
3925
|
+
});
|
|
3926
|
+
actionsProperty.remove();
|
|
3927
|
+
console.log(
|
|
3928
|
+
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3929
|
+
);
|
|
3930
|
+
actionsArrayMigrated = true;
|
|
3931
|
+
}
|
|
3765
3932
|
}
|
|
3766
3933
|
}
|
|
3767
3934
|
}
|
|
3768
|
-
actionsProperty.remove();
|
|
3769
|
-
console.log(
|
|
3770
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3771
|
-
);
|
|
3772
|
-
return 1;
|
|
3773
3935
|
}
|
|
3774
|
-
const
|
|
3775
|
-
|
|
3776
|
-
|
|
3777
|
-
|
|
3778
|
-
|
|
3779
|
-
|
|
3780
|
-
|
|
3781
|
-
|
|
3782
|
-
|
|
3783
|
-
}
|
|
3784
|
-
if (actionCandidates.length > 1) {
|
|
3785
|
-
const droppedCount = actionCandidates.length - 1;
|
|
3786
|
-
console.warn(
|
|
3787
|
-
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3788
|
-
);
|
|
3789
|
-
}
|
|
3790
|
-
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3791
|
-
CONDITIONALS_PROPERTY_NAME
|
|
3936
|
+
const fallback = ensureValidAction(workqueue, relPath);
|
|
3937
|
+
return {
|
|
3938
|
+
changed: actionsArrayMigrated || fallback.changed,
|
|
3939
|
+
usedReadFallback: fallback.usedReadFallback
|
|
3940
|
+
};
|
|
3941
|
+
}
|
|
3942
|
+
function ensureActionTypeImport(sourceFile) {
|
|
3943
|
+
const existingImport = sourceFile.getImportDeclaration(
|
|
3944
|
+
(decl) => decl.getModuleSpecifierValue() === TOOLKIT_EVENTS_MODULE2
|
|
3792
3945
|
);
|
|
3793
|
-
if (
|
|
3794
|
-
|
|
3795
|
-
|
|
3796
|
-
|
|
3797
|
-
|
|
3798
|
-
|
|
3799
|
-
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3800
|
-
actionsProperty.remove();
|
|
3801
|
-
console.log(
|
|
3802
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3803
|
-
);
|
|
3804
|
-
return 1;
|
|
3946
|
+
if (existingImport) {
|
|
3947
|
+
const alreadyImported = existingImport.getNamedImports().some((ni) => ni.getName() === ACTION_TYPE_IMPORT_NAME);
|
|
3948
|
+
if (!alreadyImported) {
|
|
3949
|
+
existingImport.addNamedImport(ACTION_TYPE_IMPORT_NAME);
|
|
3950
|
+
}
|
|
3951
|
+
return;
|
|
3805
3952
|
}
|
|
3806
|
-
|
|
3807
|
-
|
|
3808
|
-
|
|
3809
|
-
initializer: firstActionText
|
|
3953
|
+
sourceFile.addImportDeclaration({
|
|
3954
|
+
moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
|
|
3955
|
+
namedImports: [ACTION_TYPE_IMPORT_NAME]
|
|
3810
3956
|
});
|
|
3811
|
-
actionsProperty.remove();
|
|
3812
|
-
console.log(
|
|
3813
|
-
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3814
|
-
);
|
|
3815
|
-
return 1;
|
|
3816
3957
|
}
|
|
3817
3958
|
function processFile13(filePath, project) {
|
|
3818
3959
|
const sourceFile = project.getSourceFile(filePath);
|
|
3819
3960
|
if (!sourceFile) return 0;
|
|
3820
3961
|
let migratedWorkqueues = 0;
|
|
3962
|
+
let needsActionTypeImport = false;
|
|
3821
3963
|
const relPath = import_path18.default.relative(process.cwd(), filePath);
|
|
3822
3964
|
const callExpressions = sourceFile.getDescendantsOfKind(
|
|
3823
3965
|
import_ts_morph17.SyntaxKind.CallExpression
|
|
@@ -3833,9 +3975,14 @@ function processFile13(filePath, project) {
|
|
|
3833
3975
|
if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
|
|
3834
3976
|
for (const element of workqueuesArg.getElements()) {
|
|
3835
3977
|
if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
|
|
3836
|
-
|
|
3978
|
+
const result = migrateWorkqueueActions(element, relPath);
|
|
3979
|
+
if (result.changed) migratedWorkqueues++;
|
|
3980
|
+
if (result.usedReadFallback) needsActionTypeImport = true;
|
|
3837
3981
|
}
|
|
3838
3982
|
}
|
|
3983
|
+
if (needsActionTypeImport) {
|
|
3984
|
+
ensureActionTypeImport(sourceFile);
|
|
3985
|
+
}
|
|
3839
3986
|
return migratedWorkqueues;
|
|
3840
3987
|
}
|
|
3841
3988
|
async function main18() {
|
|
@@ -4170,7 +4317,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4170
4317
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4171
4318
|
var import_child_process = require("child_process");
|
|
4172
4319
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4173
|
-
var UPSTREAM_BRANCH = "
|
|
4320
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4174
4321
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4175
4322
|
var FILES_TO_CHECKOUT = [
|
|
4176
4323
|
"src/analytics/analytics.ts",
|
|
@@ -4709,9 +4856,9 @@ var import_path24 = require("path");
|
|
|
4709
4856
|
var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
|
|
4710
4857
|
var INFRASTRUCTURE_DIR = "infrastructure";
|
|
4711
4858
|
var BASE_BRANCH = "release-v1.9";
|
|
4712
|
-
function gitShowBytes(ref,
|
|
4859
|
+
function gitShowBytes(ref, path24) {
|
|
4713
4860
|
try {
|
|
4714
|
-
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${
|
|
4861
|
+
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
|
|
4715
4862
|
cwd: process.cwd(),
|
|
4716
4863
|
stdio: ["ignore", "pipe", "pipe"]
|
|
4717
4864
|
});
|
|
@@ -4720,9 +4867,13 @@ function gitShowBytes(ref, path23) {
|
|
|
4720
4867
|
return null;
|
|
4721
4868
|
}
|
|
4722
4869
|
}
|
|
4723
|
-
async function main25(
|
|
4870
|
+
async function main25({
|
|
4871
|
+
subdirs = []
|
|
4872
|
+
} = {}) {
|
|
4873
|
+
const pathspecs = subdirs.length > 0 ? subdirs.map((s) => `${INFRASTRUCTURE_DIR}/${s}/`) : [`${INFRASTRUCTURE_DIR}/`];
|
|
4874
|
+
const scopeLabel = pathspecs.map((p) => `'${p}'`).join(", ");
|
|
4724
4875
|
console.log(
|
|
4725
|
-
`Merging
|
|
4876
|
+
`Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
|
|
4726
4877
|
`
|
|
4727
4878
|
);
|
|
4728
4879
|
assertIsGitRepo();
|
|
@@ -4737,20 +4888,12 @@ async function main25() {
|
|
|
4737
4888
|
const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
|
|
4738
4889
|
const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
|
|
4739
4890
|
const upstreamFiles = runGit(
|
|
4740
|
-
[
|
|
4741
|
-
"ls-tree",
|
|
4742
|
-
"-r",
|
|
4743
|
-
"--name-only",
|
|
4744
|
-
"-z",
|
|
4745
|
-
ref,
|
|
4746
|
-
"--",
|
|
4747
|
-
`${INFRASTRUCTURE_DIR}/`
|
|
4748
|
-
],
|
|
4891
|
+
["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
|
|
4749
4892
|
{ silent: true }
|
|
4750
4893
|
).split("\0").filter(Boolean);
|
|
4751
4894
|
if (upstreamFiles.length === 0) {
|
|
4752
4895
|
console.log(
|
|
4753
|
-
` No files found under
|
|
4896
|
+
` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
|
|
4754
4897
|
);
|
|
4755
4898
|
return;
|
|
4756
4899
|
}
|
|
@@ -4825,7 +4968,9 @@ async function main25() {
|
|
|
4825
4968
|
var import_fs6 = require("fs");
|
|
4826
4969
|
var import_path25 = require("path");
|
|
4827
4970
|
var INFRASTRUCTURE_DIR2 = "infrastructure";
|
|
4828
|
-
async function main26(
|
|
4971
|
+
async function main26({
|
|
4972
|
+
keep = []
|
|
4973
|
+
} = {}) {
|
|
4829
4974
|
const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
|
|
4830
4975
|
if (!(0, import_fs6.existsSync)(fullPath)) {
|
|
4831
4976
|
console.log(
|
|
@@ -4833,24 +4978,152 @@ async function main26() {
|
|
|
4833
4978
|
);
|
|
4834
4979
|
return;
|
|
4835
4980
|
}
|
|
4836
|
-
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4837
|
-
`);
|
|
4838
4981
|
assertIsGitRepo();
|
|
4839
|
-
|
|
4840
|
-
|
|
4982
|
+
if (keep.length === 0) {
|
|
4983
|
+
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4984
|
+
`);
|
|
4985
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
|
|
4986
|
+
silent: true
|
|
4987
|
+
});
|
|
4988
|
+
console.log(
|
|
4989
|
+
` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4990
|
+
);
|
|
4991
|
+
if ((0, import_fs6.existsSync)(fullPath)) {
|
|
4992
|
+
(0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
|
|
4993
|
+
console.log(
|
|
4994
|
+
` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4995
|
+
);
|
|
4996
|
+
}
|
|
4997
|
+
console.log(
|
|
4998
|
+
`
|
|
4999
|
+
Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
5000
|
+
);
|
|
5001
|
+
return;
|
|
5002
|
+
}
|
|
5003
|
+
const keepSet = new Set(keep);
|
|
5004
|
+
console.log(
|
|
5005
|
+
`Deleting contents of '${INFRASTRUCTURE_DIR2}/' except: ${[...keepSet].map((name) => `'${name}'`).join(", ")}
|
|
5006
|
+
`
|
|
5007
|
+
);
|
|
5008
|
+
const topLevelEntries = (0, import_fs6.readdirSync)(fullPath, { withFileTypes: true });
|
|
5009
|
+
let deleted = 0;
|
|
5010
|
+
for (const entry of topLevelEntries) {
|
|
5011
|
+
if (keepSet.has(entry.name)) {
|
|
5012
|
+
console.log(` Keeping '${INFRASTRUCTURE_DIR2}/${entry.name}'.`);
|
|
5013
|
+
continue;
|
|
5014
|
+
}
|
|
5015
|
+
const relPath = `${INFRASTRUCTURE_DIR2}/${entry.name}${entry.isDirectory() ? "/" : ""}`;
|
|
5016
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", relPath], { silent: true });
|
|
5017
|
+
const fullEntryPath = (0, import_path25.join)(fullPath, entry.name);
|
|
5018
|
+
if ((0, import_fs6.existsSync)(fullEntryPath)) {
|
|
5019
|
+
(0, import_fs6.rmSync)(fullEntryPath, { recursive: true, force: true });
|
|
5020
|
+
}
|
|
5021
|
+
console.log(` Deleted '${relPath}'.`);
|
|
5022
|
+
deleted++;
|
|
5023
|
+
}
|
|
5024
|
+
const presentNames = new Set(topLevelEntries.map((e) => e.name));
|
|
5025
|
+
const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
|
|
5026
|
+
if (missingKeeps.length > 0) {
|
|
5027
|
+
console.warn(
|
|
5028
|
+
` [warn] Requested to keep ${missingKeeps.map((n) => `'${n}'`).join(", ")} but they don't exist under '${INFRASTRUCTURE_DIR2}/'.`
|
|
5029
|
+
);
|
|
5030
|
+
}
|
|
5031
|
+
console.log(
|
|
5032
|
+
`
|
|
5033
|
+
Done. Deleted ${deleted} top-level entr${deleted === 1 ? "y" : "ies"}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
5034
|
+
);
|
|
5035
|
+
}
|
|
5036
|
+
|
|
5037
|
+
// src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
|
|
5038
|
+
var import_ts_morph22 = require("ts-morph");
|
|
5039
|
+
var import_path26 = __toESM(require("path"));
|
|
5040
|
+
var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
|
|
5041
|
+
var ACTION_PARAMETER_NAME = "action";
|
|
5042
|
+
var OLD_TYPE = "ActionInput";
|
|
5043
|
+
var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
|
|
5044
|
+
function isAcceptRequestedRegistrationParameter(parameter) {
|
|
5045
|
+
const functionDeclaration = parameter.getFirstAncestorByKind(
|
|
5046
|
+
import_ts_morph22.SyntaxKind.FunctionDeclaration
|
|
5047
|
+
);
|
|
5048
|
+
if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
|
|
5049
|
+
return true;
|
|
5050
|
+
}
|
|
5051
|
+
const arrowFunction = parameter.getFirstAncestorByKind(
|
|
5052
|
+
import_ts_morph22.SyntaxKind.ArrowFunction
|
|
5053
|
+
);
|
|
5054
|
+
const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
|
|
5055
|
+
import_ts_morph22.SyntaxKind.VariableDeclaration
|
|
5056
|
+
);
|
|
5057
|
+
return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
|
|
5058
|
+
}
|
|
5059
|
+
function processFile14(filePath, project) {
|
|
5060
|
+
const sourceFile = project.getSourceFile(filePath);
|
|
5061
|
+
if (!sourceFile) return 0;
|
|
5062
|
+
let updatedCount = 0;
|
|
5063
|
+
for (const parameter of sourceFile.getDescendantsOfKind(
|
|
5064
|
+
import_ts_morph22.SyntaxKind.Parameter
|
|
5065
|
+
)) {
|
|
5066
|
+
if (parameter.getName() !== ACTION_PARAMETER_NAME) {
|
|
5067
|
+
continue;
|
|
5068
|
+
}
|
|
5069
|
+
if (!isAcceptRequestedRegistrationParameter(parameter)) {
|
|
5070
|
+
continue;
|
|
5071
|
+
}
|
|
5072
|
+
const typeNode = parameter.getTypeNode();
|
|
5073
|
+
if (!typeNode || typeNode.getText() !== OLD_TYPE) {
|
|
5074
|
+
continue;
|
|
5075
|
+
}
|
|
5076
|
+
parameter.setType(NEW_TYPE);
|
|
5077
|
+
updatedCount++;
|
|
5078
|
+
console.log(
|
|
5079
|
+
` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
|
|
5080
|
+
);
|
|
5081
|
+
}
|
|
5082
|
+
return updatedCount;
|
|
5083
|
+
}
|
|
5084
|
+
async function main27() {
|
|
5085
|
+
const srcDir = import_path26.default.join(process.cwd(), "src");
|
|
5086
|
+
console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
|
|
5087
|
+
`);
|
|
5088
|
+
const project = new import_ts_morph22.Project({
|
|
5089
|
+
tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
|
|
5090
|
+
skipAddingFilesFromTsConfig: false
|
|
5091
|
+
});
|
|
5092
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
5093
|
+
const filePath = sf.getFilePath();
|
|
5094
|
+
return filePath.includes("/src/") && !filePath.includes("/node_modules/");
|
|
4841
5095
|
});
|
|
4842
|
-
|
|
4843
|
-
|
|
4844
|
-
|
|
4845
|
-
|
|
5096
|
+
let totalUpdated = 0;
|
|
5097
|
+
const modifiedFiles = [];
|
|
5098
|
+
for (const sourceFile of sourceFiles) {
|
|
5099
|
+
const filePath = sourceFile.getFilePath();
|
|
5100
|
+
const updated = processFile14(filePath, project);
|
|
5101
|
+
if (updated > 0) {
|
|
5102
|
+
totalUpdated += updated;
|
|
5103
|
+
modifiedFiles.push(filePath);
|
|
5104
|
+
}
|
|
5105
|
+
}
|
|
5106
|
+
if (modifiedFiles.length === 0) {
|
|
5107
|
+
console.log(
|
|
5108
|
+
`No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
|
|
5109
|
+
);
|
|
5110
|
+
return;
|
|
5111
|
+
}
|
|
5112
|
+
console.log(`
|
|
5113
|
+
Saving ${modifiedFiles.length} modified file(s)...`);
|
|
5114
|
+
for (const filePath of modifiedFiles) {
|
|
5115
|
+
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
5116
|
+
await sourceFile.save();
|
|
5117
|
+
console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
|
|
4846
5118
|
}
|
|
4847
5119
|
console.log(
|
|
4848
5120
|
`
|
|
4849
|
-
|
|
5121
|
+
Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
|
|
4850
5122
|
);
|
|
4851
5123
|
}
|
|
4852
5124
|
|
|
4853
5125
|
// src/migrations/v2.0/index.ts
|
|
5126
|
+
var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
|
|
4854
5127
|
async function runUpgrade(dockerSwarm) {
|
|
4855
5128
|
await main18();
|
|
4856
5129
|
await main();
|
|
@@ -4875,10 +5148,12 @@ async function runUpgrade(dockerSwarm) {
|
|
|
4875
5148
|
await main22();
|
|
4876
5149
|
await main23();
|
|
4877
5150
|
await main24();
|
|
5151
|
+
await main27();
|
|
4878
5152
|
await main17();
|
|
4879
5153
|
if (dockerSwarm) {
|
|
4880
5154
|
await main25();
|
|
4881
5155
|
} else {
|
|
4882
|
-
await main26();
|
|
5156
|
+
await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
|
|
5157
|
+
await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
|
|
4883
5158
|
}
|
|
4884
5159
|
}
|