fix: remove features not supported upstream

Author: usefulthink

package.json

@@ -44,7 +44,6 @@
     "@types/google.maps": "^3.53.1",
     "@types/jest": "^29.5.5",
     "@types/selenium-webdriver": "^4.0.9",
-    "@types/trusted-types": "^2.0.7",
     "@typescript-eslint/eslint-plugin": "^8.8.1",
     "@typescript-eslint/parser": "^8.8.1",
     "core-js": "^3.6.4",

src/2.0/2.0.md

@@ -22,105 +22,6 @@ import { setOptions, importLibrary } from "@googlemaps/js-api-loader";
 const { Map } = await importLibrary("maps");
 ```
 
-## Synchronous API (TBD)
-
-### Motivation
-
-There are a lot of situations where the `importLibrary` function doesn't
-work well, since using an async function or promises isn't always a viable
-option.
-
-Currently, the only alternative to `importLibrary` is to use the global
-`google.maps` namespaces. An additional synchronous API is intended to
-provide an alternative way to using the global namespaces while solving some
-of the problems that come with using them.
-
-Any synchronous access to the libraries requires developers to make sure the
-libraries have already been loaded when the corresponding code is executed.
-In practice, this is rarely a big issue.
-
-The exact shape of the synchronous API is to be determined, it could be a
-simple Map instance `libraries` or a pair of has/get functions to check for and
-retrieve loaded libraries.
-
-### Example 1: helper classes
-
-Imagine some service class that uses the `places` library and the
-`PlacesService` to do it's thing.
-
-#### global namespace
-
-This is how it would be written with the global `google.maps` namespace:
-
-```tsx
-class PlacesHelper {
-  private service: google.maps.places.PlacesService;
-
-  constructor() {
-    if (!google.maps.places.PlacesService)
-      throw new Error("maps api or places library missing");
-
-    this.service = new google.maps.places.PlacesService();
-  }
-
-  // ...
-}
-```
-
-This has two drawbacks:
-
-- having to write out `google.maps.places` for all classes (and
-  types, but that's a seperate issue) adds a lot of "noise" to the code
-- references to the global namespace can't really be minified, and
-  due to the late loading of the API, a global assignment to a shorthand
-  name isn't really possible.
-
-#### importLibrary
-
-Since in a constructor, we can't `await` the result of `importLibrary`, the
-only way to do this is using the `.then()` function, which drastically
-changes the semantics of the code:
-
-```tsx
-class PlacesHelper {
-  private service: google.maps.places.PlacesService | null = null;
-
-  constructor() {
-    importLibrary("places").then(
-      ({ PlacesService }) => (this.service = new PlacesService())
-    );
-  }
-}
-```
-
-Here, the service has to be declared as optional (`| null`) in typescript,
-and every other method of the class has to somehow deal with the fact that
-the service might not yet have been initialized. Even if the library is
-already loaded, it won't be returned until the queued mircotasks and the
-handlers for the awaited Promise are executed.
-This can even have cascading effects on all classes calling methods of this
-class.
-
-#### proposed sync API
-
-A synchronous API would allow us to write the same code we used for
-global namespaces, but without the readability problems and without global
-namespaces:
-
-```tsx
-class PlacesHelper {
-  private service: google.maps.places.PlacesService = null;
-
-  constructor() {
-    if (!isLibraryImported("places"))
-      throw new Error("maps api or places library missing");
-
-    const { PlacesService } = getImportedLibrary("places");
-    this.service = new PlacesService();
-  }
-}
-```
-
 ## Internal Behavior
 
 - the ApiLoader doesn't do anything (except for storing the options) until
@@ -129,7 +30,7 @@ class PlacesHelper {
   even if the maps API isn't used on most pages.
 
 - Once the importLibrary function is called, the options are frozen and
-  attempts to modify them will throw an Error
+  attempts to modify them will get ignored
 
   - the first call to importLibrary initiates the bootstrapping, once the
     maps API is loaded, importLibrary will directly forward to the

src/2.0/index.ts

@@ -33,9 +33,7 @@ const libraries_: Partial<APILibraryMap> = {};
  */
 export function setOptions(options: APIOptions) {
   if (isBootrapped_) {
-    throw new Error(
-      "options cannot be modified after the API has been loaded."
-    );
+    return;
   }
 
   options_ = options;
@@ -49,7 +47,7 @@ export async function importLibrary(
 ): ReturnType<typeof google.maps.importLibrary>;
 
 export async function importLibrary<
-  TLibraryName extends keyof APILibraryMap,
+  TLibraryName extends APILibraryName,
   TLibrary extends APILibraryMap[TLibraryName],
 >(libraryName: TLibraryName): Promise<TLibrary> {
   if (!isBootrapped_) {
@@ -76,33 +74,9 @@ export async function importLibrary<
   return libraries_[libraryName] as TLibrary;
 }
 
-/**
- * Synchronously loads a library. Will directly return the library, or null
- * if it hasn't been loaded.
- */
-export function getImportedLibrary<
-  TLibraryName extends APILibraryName,
-  TLibrary extends APILibraryMap[TLibraryName],
->(libraryName: TLibraryName): TLibrary | null {
-  if (!isLibraryImported(libraryName)) {
-    throw new Error(`library ${libraryName} hasn't been imported.`);
-  }
-
-  return libraries_[libraryName] as TLibrary;
-}
-
-/**
- * Check if the given library has already been loaded.
- */
-export function isLibraryImported(libraryName: APILibraryName): boolean {
-  return libraryName in libraries_;
-}
-
 const api = {
   setOptions,
   importLibrary,
-  getImportedLibrary,
-  isLibraryImported,
 };
 
 export default api;

src/2.0/loader.ts

@@ -59,9 +59,7 @@ export function bootstrapLoader(options: APIOptions) {
         urlParameters.set("callback", `google.maps.__ib__`);
 
         const scriptEl = document.createElement("script");
-        scriptEl.src = getTrustedScriptURL(
-          `https://maps.googleapis.com/maps/api/js?${urlParameters.toString()}`
-        ) as string;
+        scriptEl.src = `https://maps.googleapis.com/maps/api/js?${urlParameters.toString()}`;
 
         scriptEl.onerror = () => {
           reject(new APILoadingError());
@@ -81,7 +79,7 @@ export function bootstrapLoader(options: APIOptions) {
     return apiLoadedPromise;
   };
 
-  // create intermediate importLibrary function that loads the API and calls
+  // create the intermediate importLibrary function that loads the API and calls
   // the real importLibrary function.
   google.maps.importLibrary = async (library: string) => {
     libraries.add(library);
@@ -91,26 +89,3 @@ export function bootstrapLoader(options: APIOptions) {
     return google.maps.importLibrary(library);
   };
 }
-
-const getTrustedScriptURL: (url: string) => string | TrustedScriptURL = (() => {
-  // check if trustedTypes are supported
-  if (typeof window === "undefined" || !("trustedTypes" in window)) {
-    return (url) => url;
-  }
-
-  // this policy will only certify the `maps.googleapis.com` script url,
-  // everything else will throw an error.
-  const policy = window.trustedTypes.createPolicy(
-    "google-maps-api#js-api-loader",
-    {
-      createScriptURL: (input) => {
-        const url = new URL(input);
-        if (url.host !== "maps.googleapis.com") throw new Error("invalid url");
-
-        return input;
-      },
-    }
-  );
-
-  return (url) => policy.createScriptURL(url);
-})();