From 9376487a72e7039b09eb6def0c153515585b9419 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Mon, 29 Jul 2024 17:42:14 -0700 Subject: [PATCH 1/2] chore: Revert compartment-map.json tags to conditions schema migration --- packages/compartment-mapper/README.md | 2 +- .../compartment-mapper/src/archive-lite.js | 4 +++- packages/compartment-mapper/src/bundle.js | 4 ++-- .../compartment-mapper/src/capture-lite.js | 4 +++- .../compartment-mapper/src/compartment-map.js | 5 +++-- .../compartment-mapper/src/node-modules.js | 4 +++- packages/compartment-mapper/src/types.js | 3 +-- packages/compartment-mapper/test/app.agar | Bin 32577 -> 32571 bytes 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/packages/compartment-mapper/README.md b/packages/compartment-mapper/README.md index 68ed240a52..4013b692ec 100644 --- a/packages/compartment-mapper/README.md +++ b/packages/compartment-mapper/README.md @@ -380,7 +380,7 @@ The compartment map shape: // CompartmentMap describes how to prepare compartments // to run an application. type CompartmentMap = { - conditions: Conditions, + tags: Conditions, entry: Entry, compartments: Record, realms: Record, // TODO diff --git a/packages/compartment-mapper/src/archive-lite.js b/packages/compartment-mapper/src/archive-lite.js index d7a70f19bd..5ffa0d721b 100644 --- a/packages/compartment-mapper/src/archive-lite.js +++ b/packages/compartment-mapper/src/archive-lite.js @@ -281,7 +281,9 @@ export const makeArchiveCompartmentMap = (compartmentMap, sources) => { const archiveSources = renameSources(sources, compartmentRenames); const archiveCompartmentMap = { - conditions: [], + // TODO migrate tags to conditions + // https://github.com/endojs/endo/issues/2388 + tags: [], entry: { compartment: archiveEntryCompartmentName, module: entryModuleSpecifier, diff --git a/packages/compartment-mapper/src/bundle.js b/packages/compartment-mapper/src/bundle.js index 1c431c58a3..68adc32d21 100644 --- a/packages/compartment-mapper/src/bundle.js +++ b/packages/compartment-mapper/src/bundle.js @@ -224,8 +224,8 @@ export const makeBundle = async (readPowers, moduleLocation, options) => { const { moduleTransforms, dev, - tags, - conditions: conditionsOption = tags, + tags: tagsOption, + conditions: conditionsOption = tagsOption, searchSuffixes, commonDependencies, sourceMapHook = undefined, diff --git a/packages/compartment-mapper/src/capture-lite.js b/packages/compartment-mapper/src/capture-lite.js index f584218e1c..6d489dfccb 100644 --- a/packages/compartment-mapper/src/capture-lite.js +++ b/packages/compartment-mapper/src/capture-lite.js @@ -227,7 +227,9 @@ const captureCompartmentMap = (compartmentMap, sources) => { const captureSources = renameSources(sources, compartmentRenames); const captureCompartmentMap = { - conditions: [], + // TODO graceful migration from tags to conditions + // https://github.com/endojs/endo/issues/2388 + tags: [], entry: { compartment: captureEntryCompartmentName, module: entryModuleSpecifier, diff --git a/packages/compartment-mapper/src/compartment-map.js b/packages/compartment-mapper/src/compartment-map.js index ef5fd024b5..1f42425d99 100644 --- a/packages/compartment-mapper/src/compartment-map.js +++ b/packages/compartment-mapper/src/compartment-map.js @@ -481,8 +481,9 @@ export const assertCompartmentMap = ( )}`, ); const { - tags, - conditions = tags, + // TODO migrate tags to conditions + // https://github.com/endojs/endo/issues/2388 + tags: conditions, entry, compartments, ...extra diff --git a/packages/compartment-mapper/src/node-modules.js b/packages/compartment-mapper/src/node-modules.js index 786d93a06d..609dddb7f6 100644 --- a/packages/compartment-mapper/src/node-modules.js +++ b/packages/compartment-mapper/src/node-modules.js @@ -728,7 +728,9 @@ const translateGraph = ( } return { - conditions: [...conditions], + // TODO graceful migration from tags to conditions + // https://github.com/endojs/endo/issues/2388 + tags: [...conditions], entry: { compartment: entryPackageLocation, module: entryModuleSpecifier, diff --git a/packages/compartment-mapper/src/types.js b/packages/compartment-mapper/src/types.js index 800c663df0..a22702c3c9 100644 --- a/packages/compartment-mapper/src/types.js +++ b/packages/compartment-mapper/src/types.js @@ -17,8 +17,7 @@ export {}; * Compartments, each corresponding to Node.js style packaged modules. * * @typedef {object} CompartmentMapDescriptor - * @property {Array} [tags] is deprecated in favor of `conditions` - * @property {Array} conditions + * @property {Array} tags * @property {EntryDescriptor} entry * @property {Record} compartments */ diff --git a/packages/compartment-mapper/test/app.agar b/packages/compartment-mapper/test/app.agar index 83c413af3219685cffabee91899c8eb1e2affbe2..e7f529e37dd59e73f91d94010fc56f7b1df7062c 100644 GIT binary patch delta 361 zcmX|-JxD@v6ve&&G*rlxvM?>op+OpKXbHcb1}_M#l%yphlGmajkx!rR!`y_1jI-Bb zLrWmEMN|Y4ffUpdMC}o6L6h|i?85!s!#xKs+^aU7waL9W-($2Ix+SHTcdw@mhE5OS zvoLIytzNHhdwsJRMZxlK})VS9o^30f*wkmNLz18C^PYkugEg zJa|)VtSJ1gP6P}3R6jcvP*sPppav+59hGORSyZx4yz1U$4vE|-RK?Tp=srxJjj9nz YEleNS*J9+ulNQx4J1Y~t=Y>w}7s?KNp#T5? delta 426 zcmY+9Pbh(ezTxJy zlZD*G#lH&&lqeT2%2iHkwU|tKF5gez@6+?`ImyylmQ0@B0-c`A&*mouuB;q)wQjPM z_#$Ed^!#)reAtd?$zO!W=rGGzQD!TLC<*j{pyZ+y_M|S>Ey62S!4MPJrW0vr4PG@P z-a3tjd_!vS1!~Mq#kh>wnKXdafhM%b0&{yX?rFrWY{Z6K&2&T9mwQ>^Ffwun-J@OU zrd=#4c9L+aI9YlGXCvh>#Rb}eD=zX2qZ~J{%mzXce{?2*JGCB73eWeC{j#NAW{EJ-Un@cp6=&prcQ;$~x2{*`Y{Ew1^0 z7LJmwOr83{Y_g3V=g^EnRbX?$Z>+>lun60#Kt7zS4rU9XCsdm|2fN0T9(`H|ePBg% TQ6p|N2R)&5p`qv^n(O)k5@44> From fd2a3934b1a3fbcb6f6179dfd7f5f6e712014e46 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Tue, 30 Jul 2024 12:00:53 -0700 Subject: [PATCH 2/2] chore(bundle-source): Rectify jsdoc ts typos --- packages/bundle-source/cache.js | 2 -- packages/bundle-source/src/zip-base64.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/bundle-source/cache.js b/packages/bundle-source/cache.js index 9c0b612ef5..7a3640264e 100644 --- a/packages/bundle-source/cache.js +++ b/packages/bundle-source/cache.js @@ -52,7 +52,6 @@ export const makeBundleCache = (wr, cwd, readPowers, opts) => { * @param {Logger} [log] * @param {object} [options] * @param {boolean} [options.noTransforms] - * @param {string[]} [options.tags] * @param {string[]} [options.conditions] * @param {ModuleFormat} [options.format] */ @@ -154,7 +153,6 @@ export const makeBundleCache = (wr, cwd, readPowers, opts) => { * @param {object} [options] * @param {boolean} [options.noTransforms] * @param {ModuleFormat} [options.format] - * @param {string[]} [options.tags] * @param {string[]} [options.conditions] * @returns {Promise} */ diff --git a/packages/bundle-source/src/zip-base64.js b/packages/bundle-source/src/zip-base64.js index dbf7cb0089..d097e9d63b 100644 --- a/packages/bundle-source/src/zip-base64.js +++ b/packages/bundle-source/src/zip-base64.js @@ -22,7 +22,7 @@ const readPowers = makeReadPowers({ fs, url, crypto }); * @param {boolean} [options.dev] * @param {boolean} [options.cacheSourceMaps] * @param {boolean} [options.noTransforms] - * @param {string[]} [options.condditions] + * @param {string[]} [options.conditions] * @param {Record} [options.commonDependencies] * @param {object} [grantedPowers] * @param {(bytes: string | Uint8Array) => string} [grantedPowers.computeSha512]