#1076: nominal subtyping for ids

src/actionPanel/native.tsx

@@ -17,7 +17,7 @@
 
 import { browser } from "webextension-polyfill-ts";
 import { reportError } from "@/telemetry/logging";
-import { v4 as uuidv4 } from "uuid";
+import { uuidv4 } from "@/types/helpers";
 import {
   ActionPanelStore,
   PanelEntry,

src/background/devtools/external.ts

@@ -29,7 +29,7 @@ import {
   TabId,
 } from "@/background/devtools/contract";
 import { browser, Runtime, WebNavigation } from "webextension-polyfill-ts";
-import { v4 as uuidv4 } from "uuid";
+import { uuidv4 } from "@/types/helpers";
 import { SimpleEvent } from "@/hooks/events";
 import { forbidBackgroundPage } from "@/utils/expectContext";
 import { getErrorMessage } from "@/errors";

src/background/devtools/internal.ts

@@ -36,7 +36,7 @@ import {
 } from "@/background/devtools/contract";
 import { reportError } from "@/telemetry/logging";
 import { isBackgroundPage } from "webext-detect-page";
-import { v4 as uuidv4 } from "uuid";
+import { uuidv4 } from "@/types/helpers";
 import { callBackground } from "@/background/devtools/external";
 import { ensureContentScript } from "@/background/util";
 import * as nativeEditorProtocol from "@/nativeEditor";

src/background/locator.ts

@@ -18,6 +18,7 @@
 import LazyLocatorFactory from "@/services/locator";
 import { liftBackground } from "@/background/protocol";
 import { isBackgroundPage } from "webext-detect-page";
+import { RegistryId, UUID } from "@/core";
 
 export const locator = new LazyLocatorFactory();
 
@@ -27,7 +28,8 @@ async function initLocator() {
 
 export const locate = liftBackground(
   "LOCATE_SERVICE",
-  async (serviceId: string, id: string | null) => locator.locate(serviceId, id)
+  async (serviceId: RegistryId, id: UUID | null) =>
+    locator.locate(serviceId, id)
 );
 
 type RefreshOptions = {

src/background/logging.ts

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { v4 as uuidv4 } from "uuid";
+import { uuidv4 } from "@/types/helpers";
 import { liftBackground } from "@/background/protocol";
 import { rollbar } from "@/telemetry/rollbar";
 import { MessageContext, Logger as ILogger, SerializedError } from "@/core";

src/background/preload.ts

@@ -23,11 +23,11 @@ import {
 } from "@/extensionPoints/contextMenu";
 import { reportError } from "@/telemetry/logging";
 import { loadOptions } from "@/options/loader";
-import { EmptyConfig } from "@/core";
+import { EmptyConfig, RegistryId, UUID } from "@/core";
 
 type PreloadOptions<TConfig = EmptyConfig> = {
-  id: string;
-  extensionPointId: string;
+  id: UUID;
+  extensionPointId: RegistryId;
   config: TConfig;
 };
 

src/background/protocol.ts

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { v4 as uuidv4 } from "uuid";
+import { uuidv4 } from "@/types/helpers";
 import { getChromeExtensionId, RuntimeNotFoundError } from "@/chrome";
 import { browser, Runtime } from "webextension-polyfill-ts";
 import { patternToRegex } from "webext-patterns";

src/background/telemetry.ts

@@ -17,7 +17,7 @@
 
 import { liftBackground } from "@/background/protocol";
 import { JsonObject } from "type-fest";
-import { v4 as uuidv4 } from "uuid";
+import { uuidv4 } from "@/types/helpers";
 import { debounce, uniq, throttle, compact } from "lodash";
 import { browser } from "webextension-polyfill-ts";
 import { readStorage, setStorage } from "@/chrome";

src/baseRegistry.ts

@@ -104,7 +104,7 @@ export class Registry<TItem extends RegistryItem> {
    * @deprecated needed for header generation; will be removed in future versions
    */
   cached(): TItem[] {
-    return Object.values(this.cache);
+    return [...this.cache.values()];
   }
 
   /**
@@ -121,7 +121,7 @@ export class Registry<TItem extends RegistryItem> {
         }
       })
     );
-    return Object.values(this.cache);
+    return [...this.cache.values()];
   }
 
   register(...items: TItem[]): void {
@@ -173,7 +173,7 @@ export class Registry<TItem extends RegistryItem> {
 
       if (!this.kinds.has(item.kind)) {
         console.warn(
-          `Item ${item.metadata?.id ?? "<unknown>"} has kind ${
+          `Item ${item.metadata?.id ?? "[[unknown]]"} has kind ${
             item.kind
           }; expected: ${[...this.kinds.values()].join(", ")}`
         );

src/blocks/transformers/modal.tsx

@@ -21,7 +21,7 @@ import Form from "@rjsf/core";
 import { Transformer } from "@/types";
 import { BlockArg, Schema } from "@/core";
 import { registerBlock } from "@/blocks/registry";
-import { v4 as uuidv4 } from "uuid";
+import { uuidv4 } from "@/types/helpers";
 import { BusinessError, CancelError } from "@/errors";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires, unicorn/prefer-module

src/blocks/types.ts

@@ -15,8 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-export const PACKAGE_REGEX = /^((?<scope>@[\da-z~-][\d._a-z~-]*)\/)?((?<collection>[\da-z~-][\d._a-z~-]*)\/)?(?<name>[\da-z~-][\d._a-z~-]*)$/;
-
 export interface Availability {
   matchPatterns?: string | string[];
   selectors?: string | string[];

src/components/logViewer/LogTable.stories.tsx

@@ -17,7 +17,7 @@
 
 import React from "react";
 import { ComponentStory, ComponentMeta } from "@storybook/react";
-import { v4 as uuidv4 } from "uuid";
+import { uuidv4 } from "@/types/helpers";
 import LogTable from "@/components/logViewer/LogTable";
 import { serializeError } from "serialize-error";
 import { Card } from "react-bootstrap";

src/contentScript.ts

@@ -15,9 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { uuidv4 } from "@/types/helpers";
+
 const start = Date.now();
 
-import { v4 as uuidv4 } from "uuid";
 import "@/extensionContext";
 import addErrorListeners from "@/contentScript/errors";
 import "@/blocks";

src/contentScript/context.ts

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { v4 as uuidv4 } from "uuid";
+import { uuidv4 } from "@/types/helpers";
 
 export const sessionId = uuidv4();
 export const sessionTimestamp = new Date();

src/contentScript/externalProtocol.ts

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { v4 as uuidv4 } from "uuid";
+import { uuidv4 } from "@/types/helpers";
 import {
   HandlerEntry,
   HandlerOptions,

src/contentScript/lifecycle.ts

@@ -17,7 +17,7 @@
 
 import { loadOptions } from "@/options/loader";
 import extensionPointRegistry from "@/extensionPoints/registry";
-import { IExtensionPoint } from "@/core";
+import { IExtensionPoint, RegistryId } from "@/core";
 import {
   liftContentScript,
   notifyContentScripts,
@@ -30,7 +30,7 @@ import { testMatchPatterns } from "@/blocks/available";
 import { reportError } from "@/telemetry/logging";
 import { browser } from "webextension-polyfill-ts";
 
-let _scriptPromise: Promise<void>;
+let _scriptPromise: Promise<void> | undefined;
 const _dynamic: Map<string, IExtensionPoint> = new Map();
 const _frameHref: Map<number, string> = new Map();
 let _extensionPoints: IExtensionPoint[];
@@ -44,7 +44,7 @@ const WAIT_LOADED_INTERVAL_MS = 25;
 async function installScriptOnce(): Promise<void> {
   // https://stackoverflow.com/questions/9515704/insert-code-into-the-page-context-using-a-content-script/9517879#9517879
   // https://stackoverflow.com/questions/9602022/chrome-extension-retrieving-global-variable-from-webpage
-  if (!_scriptPromise) {
+  if (_scriptPromise == null) {
     console.debug("Installing page script");
     _scriptPromise = new Promise((resolve) => {
       const script = document.createElement("script");
@@ -179,7 +179,9 @@ export async function runDynamic(
 async function loadExtensions() {
   console.debug("Loading extensions for page");
 
-  const previousIds = new Set((_extensionPoints ?? []).map((x) => x.id));
+  const previousIds = new Set<RegistryId>(
+    (_extensionPoints ?? []).map((x) => x.id)
+  );
 
   _extensionPoints = [];
 
@@ -190,7 +192,10 @@ async function loadExtensions() {
   )) {
     const extensions = Object.values(extensionMap);
 
-    if (extensions.length === 0 && !previousIds.has(extensionPointId)) {
+    if (
+      extensions.length === 0 &&
+      !previousIds.has(extensionPointId as RegistryId)
+    ) {
       // Ignore the case where we uninstalled the last extension, but the extension point was
       // not deleted from the state.
       //

src/contrib/uipath/embedApp.ts

@@ -19,7 +19,7 @@ import { Renderer } from "@/types";
 import { registerBlock } from "@/blocks/registry";
 import { isEmpty } from "lodash";
 import { BlockArg, BlockOptions, Schema } from "@/core";
-import { v4 as uuidv4 } from "uuid";
+import { uuidv4 } from "@/types/helpers";
 import { browser, Permissions } from "webextension-polyfill-ts";
 import { executeForNonce } from "@/background/executor";
 

src/contrib/zapier/push.ts

@@ -24,7 +24,7 @@ import { getBaseURL } from "@/services/baseService";
 import { validateInput } from "@/validators/generic";
 import { Webhook } from "@/contrib/zapier/contract";
 import { Permissions } from "webextension-polyfill-ts";
-import { v4 as uuidv4 } from "uuid";
+import { uuidv4 } from "@/types/helpers";
 import { BusinessError } from "@/errors";
 
 export const ZAPIER_ID = "@pixiebrix/zapier/push-data";