update types

Author: eveffer

src/auth/entries/user-role.ts

@@ -85,7 +85,7 @@ export const userRole = new EntryType("userRole", {
 userRole.addAction("syncWithSystem", {
   label: "Sync with System Roles",
   async action({ userRole, inCloud }) {
-    const roleConfig = await userRole.runAction<RoleConfig>("generateConfig");
+    const roleConfig = await userRole.runAction("generateConfig") as RoleConfig;
     try {
       inCloud.roles.updateRole(roleConfig);
     } catch (e) {
@@ -118,9 +118,9 @@ userRole.addAction("generateConfig", {
     const apiGroups = new Map<string, string[] | true>();
     if (userRole.$extendsRole) {
       const parentRole = await orm.getEntry("userRole", userRole.$extendsRole);
-      const parentConfig = await parentRole.runAction<RoleConfig>(
+      const parentConfig = await parentRole.runAction(
         "generateConfig",
-      );
+      ) as RoleConfig;
       if (parentConfig.entryTypes) {
         for (
           const [key, entryPerm] of Object.entries(parentConfig.entryTypes)

src/data-import/data-import.ts

@@ -244,7 +244,13 @@ dataImport.addAction("import", {
             `${subject} - ${JSON.stringify(info)} - ${response.join(", ")}`,
           );
         } else {
-          errors.push(e.message);
+          let message = "Unknown error";
+          if (e instanceof Error) {
+            message = e.message;
+          } else if (typeof e === "string") {
+            message = e;
+          }
+          errors.push(message);
         }
 
         failedRecords++;

src/email/email-manager.ts

@@ -74,7 +74,7 @@ export class EmailManager {
       templateId,
     );
     const rendered: { content: string; subject: string } = await template
-      .runAction("renderTemplate", { params });
+      .runAction("renderTemplate", { params }) as any;
     return await this.sendEmail({
       recipientEmail,
       subject: rendered.subject || "",

src/in-queue/entry-types/in-task/in-task.ts

@@ -115,7 +115,7 @@ async function runEntryTask(args: {
   orm: InSpatialORM;
 }) {
   const { entryType, id, actionName, taskData, orm } = args;
-  const entry = await orm.getEntry(entryType as EntryName, id);
+  const entry = await orm.getEntry(entryType, id);
   return await entry.runAction(actionName, taskData);
 }
 async function runSettingsTask(

src/in-queue/in-queue.ts

@@ -352,7 +352,7 @@ export class InQueue extends InCloud {
         },
       });
     }
-    const optimizeOptions: ListOptions = {
+    const optimizeOptions: ListOptions<"cloudFile" | "globalCloudFile"> = {
       columns: [
         "id",
         "filePath",

src/orm/db/postgres/in-pg/src/wasmLoader.ts

@@ -90,7 +90,10 @@ export class WasmLoader {
       ) as WebAssembly.ModuleImports,
     };
 
-    const result = await WebAssembly.instantiate(this.inPg.wasmData, info);
+    const result = await WebAssembly.instantiate(this.inPg.wasmData, info) as
+      & WebAssembly.Instance
+      & { instance: WebAssembly.Instance };
+
     this.wasmExports = result.instance.exports;
 
     for (const [sym, exp] of Object.entries(result.instance.exports)) {
@@ -379,7 +382,7 @@ export class WasmLoader {
     return this.wasmTable.length - 1;
   }
   loadWebAssemblyModule(
-    binary: Int8Array,
+    binary: Int8Array<ArrayBuffer>,
     flags: any,
     _libName: any,
     localScope: any,

src/orm/db/postgres/scram.ts

@@ -1,8 +1,8 @@
-function encodeBase64(data: Uint8Array): string {
+function encodeBase64(data: Uint8Array<ArrayBuffer>): string {
   return btoa(String.fromCharCode(...data));
 }
 
-function decodeBase64(data: string): Uint8Array {
+function decodeBase64(data: string): Uint8Array<ArrayBuffer> {
   return new Uint8Array(atob(data).split("").map((c) => c.charCodeAt(0)));
 }
 
@@ -24,9 +24,9 @@ enum AuthenticationState {
  * in HMAC-derived binary format
  */
 interface KeySignatures {
-  client: Uint8Array;
-  server: Uint8Array;
-  stored: Uint8Array;
+  client: Uint8Array<ArrayBuffer>;
+  server: Uint8Array<ArrayBuffer>;
+  stored: Uint8Array<ArrayBuffer>;
 }
 
 /**
@@ -63,8 +63,8 @@ function assertValidScramString(str: string) {
 
 async function computeScramSignature(
   message: string,
-  rawKey: Uint8Array,
-): Promise<Uint8Array> {
+  rawKey: Uint8Array<ArrayBuffer>,
+): Promise<Uint8Array<ArrayBuffer>> {
   const key = await crypto.subtle.importKey(
     "raw",
     rawKey,
@@ -82,7 +82,10 @@ async function computeScramSignature(
   );
 }
 
-function computeScramProof(signature: Uint8Array, key: Uint8Array): Uint8Array {
+function computeScramProof(
+  signature: Uint8Array<ArrayBuffer>,
+  key: Uint8Array<ArrayBuffer>,
+): Uint8Array<ArrayBuffer> {
   const digest = new Uint8Array(signature.length);
   for (let i = 0; i < digest.length; i++) {
     digest[i] = signature[i] ^ key[i];
@@ -95,7 +98,7 @@ function computeScramProof(signature: Uint8Array, key: Uint8Array): Uint8Array {
  */
 async function deriveKeySignatures(
   password: string,
-  salt: Uint8Array,
+  salt: Uint8Array<ArrayBuffer>,
   iterations: number,
 ): Promise<KeySignatures> {
   const pbkdf2Password = await crypto.subtle.importKey(
@@ -217,7 +220,7 @@ export class ScramClient {
       }
       this.#serverNonce = nonce;
 
-      let salt: Uint8Array | undefined;
+      let salt: Uint8Array<ArrayBuffer> | undefined;
       if (!attrs.s) {
         throw new Error(Reason.BadSalt);
       }

src/orm/field/field-def-types.ts

@@ -50,6 +50,7 @@ export interface FetchOptions {
    * The field in the fetched entry to get the value from.
    */
   fetchField: string;
+  global?: boolean;
 }
 type DependsOn<FK extends PropertyKey = PropertyKey> =
   | FK
@@ -72,6 +73,7 @@ type BaseField<FK extends PropertyKey = PropertyKey> = {
   defaultValue?: any;
   hidden?: boolean;
   placeholder?: string;
+  global?: boolean;
   /**
    * Fetch the value from another entry, based on the id in a `ConnectionField` in this entry.
    */

src/orm/inspatial-orm.ts

@@ -363,7 +363,7 @@ export class InSpatialORM {
   /**
    * Gets an entry from the database by its ID.
    */
-  async getEntry<E extends string>(
+  async getEntry<E extends EntryName | string>(
     entryType: E,
     id: IDValue,
   ): Promise<E extends EntryName ? EntryMap[E] : GenericEntry> {
@@ -383,7 +383,7 @@ export class InSpatialORM {
     const entry = await this.getEntry<E>(entryType, id);
     entry.update(data);
     await entry.save();
-    return entry;
+    return entry as EntryMap[E];
   }
 
   /**
@@ -402,7 +402,7 @@ export class InSpatialORM {
       }
       return this.handlePgError(e);
     }
-    return entry;
+    return entry as EntryMap[E];
   }
 
   /** Counts the how many entries there are in the database for all entry types that reference this one via a `ConnectionField` */
@@ -455,7 +455,7 @@ export class InSpatialORM {
       return null;
     }
     const entry = await this.getEntry(entryType, result.rows[0].id);
-    return entry;
+    return entry as EntryMap[E];
   }
   /** Finds and returns the ID of a single entry matching the provided filter. Returns null if no entry is found. */
   async findEntryId<E extends EntryName>(

src/serve/in-response.ts

@@ -51,7 +51,7 @@ export class InResponse {
   /**
    * The content of the response.
    */
-  #content?: string | Uint8Array | ArrayBuffer | ReadableStream;
+  #content?: string | Uint8Array<ArrayBuffer> | ArrayBuffer | ReadableStream;
   /**
    * A map of cookies to set in the response.
    */
@@ -220,7 +220,7 @@ export class InResponse {
   }
 
   setFile(options: {
-    content: string | Uint8Array | ArrayBuffer | ReadableStream;
+    content: string | Uint8Array<ArrayBuffer> | ArrayBuffer | ReadableStream;
     fileName: string;
     download?: boolean;
   }): void {