dc
821bf9d1ca
Two conflicts, both resolved by keeping the intent of each side:
- sas/mocks/sasjs/services/editors/getdata.js: the PK derivation and the
pkFirst() ordering from this branch, then the derived-variable block from the
release branch. The derived columns are added to the schema before the
filter, so the PK-first ordering still applies to the full column set.
- client/package-lock.json: taken from this branch. The merged package.json
differs from the release branch only in the fast-uri override (4.2.3 here,
3.1.8 there); the release branch already carries the same @angular 20.3.34
and @sasjs/adapter 5.1.2 pins, so the lock is unchanged from 74060c0.
Gates on the merged tree: npm audit --omit=dev 0 vulnerabilities, prettier
clean, 603/603 unit tests, ng build, license-checker. Mock services re-probed
against a local SASjs Server: MPE_ROW_LEVEL_SECURITY publishes PKCNT 10 with
the business keys first and no RLS_RK, an edit diffs as UPDATED 1 with the
base RK, and the derived table TESTDATA.DERIVED_DEMO still serves its computed
columns.