@endo/compartment-mapper 1.6.2 → 2.0.0

package/src/node-powers.d.ts

@@ -3,7 +3,7 @@ export function makeReadNowPowers({ fs, url, crypto, path, }: {
     url?: UrlInterface | undefined;
     crypto?: CryptoInterface | undefined;
     path?: PathInterface | undefined;
-}): MaybeReadPowers & ReadNowPowers;
+}): ReadNowPowers<FileUrlString>;
 /**
  * The implementation of `makeReadPowers` and the deprecated
  * `makeNodeReadPowers` handles the case when the `url` power is not provided,
@@ -14,14 +14,14 @@ export function makeReadNowPowers({ fs, url, crypto, path, }: {
  * @param {UrlInterface} [args.url]
  * @param {CryptoInterface} [args.crypto]
  * @param {PathInterface} [args.path]
- * @returns {MaybeReadPowers}
+ * @returns {MaybeReadPowers<FileUrlString>}
  */
 export function makeReadPowers({ fs, url, crypto, path, }: {
     fs: FsInterface;
     url?: UrlInterface | undefined;
     crypto?: CryptoInterface | undefined;
     path?: PathInterface | undefined;
-}): MaybeReadPowers;
+}): MaybeReadPowers<FileUrlString>;
 /**
  * The implementation of `makeWritePowers` and the deprecated
  * `makeNodeWritePowers` handles the case when the `url` power is not provided,
@@ -37,14 +37,15 @@ export function makeWritePowers({ fs, url }: {
 }): {
     write: (location: string, data: Uint8Array) => Promise<void>;
 };
-export function makeNodeReadPowers(fs: FsInterface, crypto?: CryptoInterface): ReadPowers;
+export function makeNodeReadPowers(fs: FsInterface, crypto?: CryptoInterface): ReadPowers<FileUrlString>;
 export function makeNodeWritePowers(fs: FsInterface): WritePowers;
 import type { FsInterface } from './types/node-powers.js';
 import type { UrlInterface } from './types/node-powers.js';
 import type { CryptoInterface } from './types/node-powers.js';
 import type { PathInterface } from './types/node-powers.js';
-import type { MaybeReadPowers } from './types/powers.js';
+import type { FileUrlString } from './types/external.js';
 import type { ReadNowPowers } from './types/powers.js';
+import type { MaybeReadPowers } from './types/powers.js';
 import type { ReadPowers } from './types/powers.js';
 import type { WritePowers } from './types/powers.js';
 //# sourceMappingURL=node-powers.d.ts.map

package/src/node-powers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-powers.d.ts","sourceRoot":"","sources":["node-powers.js"],"names":[],"mappings":"AA4LO,8DANJ;IAA0B,EAAE,EAApB,WAAW;IACS,GAAG;IACA,MAAM;IACR,IAAI;CACjC,GAAU,eAAe,GAAG,aAAa,CAoC3C;AAlKD;;;;;;;;;;;GAWG;AACH,2DANG;IAA0B,EAAE,EAApB,WAAW;IACS,GAAG;IACA,MAAM;IACR,IAAI;CACjC,GAAU,eAAe,CA0G3B;AAgDD;;;;;;;;GAQG;AACH,6CAHG;IAA0B,EAAE,EAApB,WAAW;IACS,GAAG;CAAC;sBAOtB,MAAM,QACN,UAAU;EAYtB;AA2BM,uCALI,WAAW,WACX,eAAe,GACb,UAAU,CAKtB;AAWM,wCAJI,WAAW,GACT,WAAW,CAKvB;iCApRS,wBAAwB;kCAAxB,wBAAwB;qCAAxB,wBAAwB;mCAAxB,wBAAwB;qCAexB,mBAAmB;mCAAnB,mBAAmB;gCAAnB,mBAAmB;iCAAnB,mBAAmB"}
+{"version":3,"file":"node-powers.d.ts","sourceRoot":"","sources":["node-powers.js"],"names":[],"mappings":"AA+LO,8DANJ;IAA0B,EAAE,EAApB,WAAW;IACS,GAAG;IACA,MAAM;IACR,IAAI;CACjC,GAAU,cAAc,aAAa,CAAC,CAoCxC;AApKD;;;;;;;;;;;GAWG;AACH,2DANG;IAA0B,EAAE,EAApB,WAAW;IACS,GAAG;IACA,MAAM;IACR,IAAI;CACjC,GAAU,gBAAgB,aAAa,CAAC,CA4G1C;AAgDD;;;;;;;;GAQG;AACH,6CAHG;IAA0B,EAAE,EAApB,WAAW;IACS,GAAG;CAAC;sBAOtB,MAAM,QACN,UAAU;EAYtB;AA2BM,uCALI,WAAW,WACX,eAAe,GACb,WAAW,aAAa,CAAC,CAKrC;AAWM,wCAJI,WAAW,GACT,WAAW,CAKvB;iCAvRS,wBAAwB;kCAAxB,wBAAwB;qCAAxB,wBAAwB;mCAAxB,wBAAwB;mCACF,qBAAqB;mCAe3C,mBAAmB;qCAAnB,mBAAmB;gCAAnB,mBAAmB;iCAAnB,mBAAmB"}

package/src/node-powers.js

@@ -16,6 +16,7 @@
  *   PathInterface,
  *   UrlInterface,
  * } from './types/node-powers.js'
+ * @import {FileUrlString} from './types/external.js'
  * @import {
  *   CanonicalFn,
  *   FileURLToPathFn,
@@ -68,7 +69,7 @@ const fakeIsAbsolute = () => false;
  * @param {UrlInterface} [args.url]
  * @param {CryptoInterface} [args.crypto]
  * @param {PathInterface} [args.path]
- * @returns {MaybeReadPowers}
+ * @returns {MaybeReadPowers<FileUrlString>}
  */
 const makeReadPowersSloppy = ({
   fs,
@@ -125,9 +126,9 @@ const makeReadPowersSloppy = ({
 
   /**
    * There are two special things about the canonical function the compartment
-   * mapper needs. It needs to use URL’s instead of posix paths to avoid
+   * mapper needs. It needs to use URL's instead of posix paths to avoid
    * bundling up a bunch of cruft when we port this around. It needs to use
-   * promises. URL’s can and must logically distinguish a directory from a
+   * promises. URL's can and must logically distinguish a directory from a
    * file, by the final slash, whereas paths must never have a final slash
    * because that implies a blank file name within the enclosing directory. The
    * canonical function must also return the logical path instead of the real
@@ -136,7 +137,7 @@ const makeReadPowersSloppy = ({
    * non-existent directory on the next step after canonicalizing the package
    * location.
    *
-   * @type {CanonicalFn}
+   * @type {CanonicalFn<FileUrlString>}
    */
   const canonical = async location => {
     await null;
@@ -145,10 +146,12 @@ const makeReadPowersSloppy = ({
         const realPath = await fs.promises.realpath(
           fileURLToPath(location).replace(/\/$/, ''),
         );
-        return `${pathToFileURL(realPath).href}/`;
+        return /** @type {FileUrlString} */ (
+          `${pathToFileURL(realPath).href}/`
+        );
       } else {
         const realPath = await fs.promises.realpath(fileURLToPath(location));
-        return pathToFileURL(realPath).href;
+        return /** @type {FileUrlString} */ (pathToFileURL(realPath).href);
       }
     } catch {
       return location;
@@ -184,7 +187,7 @@ const makeReadPowersSloppy = ({
  * @param {UrlInterface} [args.url]
  * @param {CryptoInterface} [args.crypto]
  * @param {PathInterface} [args.path]
- * @returns {MaybeReadPowers & ReadNowPowers}
+ * @returns {ReadNowPowers<FileUrlString>}
  */
 export const makeReadNowPowers = ({
   fs,
@@ -273,7 +276,7 @@ export const makeWritePowers = makeWritePowersSloppy;
  *
  * @param {FsInterface} fs
  * @param {CryptoInterface} [crypto]
- * @returns {ReadPowers}
+ * @returns {ReadPowers<FileUrlString>}
  * @deprecated
  */
 export const makeNodeReadPowers = (fs, crypto = undefined) => {

package/src/parse-cjs-shared-export-wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-cjs-shared-export-wrapper.d.ts","sourceRoot":"","sources":["parse-cjs-shared-export-wrapper.js"],"names":[],"mappings":"AA0CO,2CAPI,UAAU,GAAG,MAAM,GAAG,SAAS,YAC/B,MAAM,GACJ;IACR,QAAQ,EAAC,MAAM,GAAC,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,GAAC,IAAI,CAAA;CACrB,CAgCH;AAmBM,uGAZJ;IAAmB,uBAAuB,EAAlC,MAAM;IACU,WAAW,EAA3B,WAAW;IACgB,eAAe,EAA1C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IACX,QAAQ,EAAnB,MAAM;IAC8B,UAAU,EAA9C,MAAM,GAAG,UAAU,GAAG,SAAS;CACvC,GAAU;IACR,MAAM,EAAE;QAAE,OAAO,EAAE,GAAG,CAAA;KAAE,CAAC;IACzB,aAAa,EAAE,GAAG,CAAC;IACnB,YAAY,WAAW;IACvB,OAAO,WAAW;CACnB,CA+IH;gCAhOqC,YAAY;4BAAZ,YAAY"}
+{"version":3,"file":"parse-cjs-shared-export-wrapper.d.ts","sourceRoot":"","sources":["parse-cjs-shared-export-wrapper.js"],"names":[],"mappings":"AA0CO,2CAPI,UAAU,GAAG,MAAM,GAAG,SAAS,YAC/B,MAAM,GACJ;IACR,QAAQ,EAAC,MAAM,GAAC,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,GAAC,IAAI,CAAA;CACrB,CAgCH;AAmBM,uGAZJ;IAAmB,uBAAuB,EAAlC,MAAM;IACU,WAAW,EAA3B,WAAW;IACgB,eAAe,EAA1C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IACX,QAAQ,EAAnB,MAAM;IAC8B,UAAU,EAA9C,MAAM,GAAG,UAAU,GAAG,SAAS;CACvC,GAAU;IACR,MAAM,EAAE;QAAE,OAAO,EAAE,GAAG,CAAA;KAAE,CAAC;IACzB,aAAa,EAAE,GAAG,CAAC;IACnB,YAAY,WAAW;IACvB,OAAO,WAAW;CACnB,CAiJH;gCAlOqC,YAAY;4BAAZ,YAAY"}

package/src/parse-cjs-shared-export-wrapper.js

@@ -219,7 +219,9 @@ export const wrap = ({
       }
     } else {
       for (const prop of redefined) {
-        moduleEnvironmentRecord[prop] = moduleEnvironmentRecord.default[prop];
+        if (prop !== 'default') {
+          moduleEnvironmentRecord[prop] = moduleEnvironmentRecord.default[prop];
+        }
       }
     }
   };

package/src/policy-format.d.ts

@@ -1,10 +1,27 @@
+/**
+ * Const string to identify the internal attenuators compartment
+ */
+export const ATTENUATORS_COMPARTMENT: "<ATTENUATORS>";
+export const ENTRY_COMPARTMENT: "$root$";
+export function generateCanonicalName({ isEntry, name, path }: PackageNamingKit): string;
 export const WILDCARD_POLICY_VALUE: "any";
-export function policyLookupHelper(packagePolicy: import("./types.js").PackagePolicy, field: "builtins" | "globals" | "packages", itemName: string): boolean | import("./types.js").AttenuationDefinition;
-export function isAllowingEverything(policyValue: unknown): policyValue is import("./types.js").WildcardPolicy;
-export function isAttenuationDefinition(allegedDefinition: unknown): allegedDefinition is import("./types.js").AttenuationDefinition;
-export function getAttenuatorFromDefinition(attenuationDefinition: import("./types.js").AttenuationDefinition): import("./types.js").UnifiedAttenuationDefinition;
-export function assertPackagePolicy(allegedPackagePolicy: unknown, path: string, url?: string): asserts allegedPackagePolicy is SomePackagePolicy | undefined;
+export function policyLookupHelper(packagePolicy: PackagePolicy, field: PolicyEnforcementField, canonicalName: string): boolean | AttenuationDefinition;
+export function isAllowingEverything(policyValue: unknown): policyValue is WildcardPolicy;
+/**
+ * Type guard for `AttenuationDefinition`
+ */
+export const isAttenuationDefinition: (value: unknown) => value is FullAttenuationDefinition | ImplicitAttenuationDefinition;
+export function getAttenuatorFromDefinition(attenuationDefinition: AttenuationDefinition): UnifiedAttenuationDefinition;
+export function assertPackagePolicy(allegedPackagePolicy: unknown, keypath: string, url?: string): asserts allegedPackagePolicy is SomePackagePolicy | undefined;
 export function assertPolicy(allegedPolicy: unknown): asserts allegedPolicy is (SomePolicy | undefined);
+import type { PackageNamingKit } from './types.js';
+import type { PackagePolicy } from './types.js';
+import type { PolicyEnforcementField } from './types.js';
+import type { AttenuationDefinition } from './types.js';
+import type { WildcardPolicy } from './types.js';
+import type { FullAttenuationDefinition } from './types.js';
+import type { ImplicitAttenuationDefinition } from './types.js';
+import type { UnifiedAttenuationDefinition } from './types.js';
 import type { SomePackagePolicy } from './types.js';
 import type { SomePolicy } from './types.js';
 //# sourceMappingURL=policy-format.d.ts.map

package/src/policy-format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"policy-format.d.ts","sourceRoot":"","sources":["policy-format.js"],"names":[],"mappings":"AAeA,oCAAqC,KAAK,CAAC;AAepC,kDALI,OAAO,YAAY,EAAE,aAAa,SAClC,UAAU,GAAC,SAAS,GAAC,UAAU,YAC/B,MAAM,GACJ,OAAO,GAAG,OAAO,YAAY,EAAE,qBAAqB,CAyBhE;AAQM,kDAHI,OAAO,GACL,WAAW,IAAI,OAAO,YAAY,EAAE,cAAc,CAGxB;AAOhC,2DAHI,OAAO,GACL,iBAAiB,IAAI,OAAO,YAAY,EAAE,qBAAqB,CAS3E;AAOM,mEAHI,OAAO,YAAY,EAAE,qBAAqB,GACxC,OAAO,YAAY,EAAE,4BAA4B,CAuB7D;AA0CM,0DALI,OAAO,QACP,MAAM,QACN,MAAM,GACJ,QAAQ,oBAAoB,IAAI,iBAAiB,GAAC,SAAS,CA4DvE;AAUM,4CAHI,OAAO,GACL,QAAQ,aAAa,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC,CAgC7D;uCA7OgD,YAAY;gCAAZ,YAAY"}
+{"version":3,"file":"policy-format.d.ts","sourceRoot":"","sources":["policy-format.js"],"names":[],"mappings":"AA8BA;;GAEG;AACH,sCAAuC,eAAe,CAAC;AAEvD,gCAAiC,QAAQ,CAAC;AAmBnC,+DAJI,gBAAgB,GACd,MAAM,CAWlB;AAED,oCAAqC,KAAK,CAAC;AAqEpC,kDALI,aAAa,SACb,sBAAsB,iBACtB,MAAM,GACJ,OAAO,GAAG,qBAAqB,CA2B3C;AAQM,kDAHI,OAAO,GACL,WAAW,IAAI,cAAc,CAGH;AA6EvC;;GAEG;AACH,6HAGG;AAQI,mEAHI,qBAAqB,GACnB,4BAA4B,CAwBxC;AAqGM,0DALI,OAAO,WACP,MAAM,QACN,MAAM,GACJ,QAAQ,oBAAoB,IAAI,iBAAiB,GAAC,SAAS,CA0DvE;AAUM,4CAHI,OAAO,GACL,QAAQ,aAAa,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC,CAiC7D;sCAvcQ,YAAY;mCAAZ,YAAY;4CAAZ,YAAY;2CAAZ,YAAY;oCAAZ,YAAY;+CAAZ,YAAY;mDAAZ,YAAY;kDAAZ,YAAY;uCAAZ,YAAY;gCAAZ,YAAY"}