restore invoices

apps/cms-v2/package.json

@@ -57,6 +57,7 @@
     "@graphql-typed-document-node/core": "3.2.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/react-hooks": "^8.0.1",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@types/qs": "^6.9.7",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",

apps/cms-v2/reset.d.ts

@@ -0,0 +1 @@
+import "@total-typescript/ts-reset";

apps/cms-v2/src/modules/configuration/app-config.ts

@@ -19,7 +19,7 @@ export class AppConfig {
     connections: [],
   };
 
-  constructor(initialData?: RootConfig.Shape) {
+  constructor(initialData?: RootConfig.Shape | unknown) {
     if (initialData) {
       this.rootData = RootConfig.Schema.parse(initialData);
     }

apps/cms-v2/src/modules/providers/builder.io/builder-io.client.ts

@@ -2,6 +2,7 @@ import { BuilderIoProviderConfig } from "@/modules/configuration";
 import { WebhookProductVariantFragment } from "../../../../generated/graphql";
 import { createLogger } from "@saleor/apps-shared";
 import { FieldsMapper } from "../fields-mapper";
+import { z } from "zod";
 
 // https://www.builder.io/c/docs/write-api
 export class BuilderIoClient {
@@ -43,7 +44,7 @@ export class BuilderIoClient {
 
   private async updateProductVariantCall(
     builderIoEntryId: string,
-    variant: WebhookProductVariantFragment
+    variant: WebhookProductVariantFragment,
   ) {
     try {
       const response = await fetch(this.endpoint + `/${builderIoEntryId}`, {
@@ -71,13 +72,13 @@ export class BuilderIoClient {
       {
         entriesToUpdate,
       },
-      "Trying to update variants in builder.io with following IDs"
+      "Trying to update variants in builder.io with following IDs",
     );
 
     return Promise.all(
       entriesToUpdate.map((id) => {
         return this.updateProductVariantCall(id, variant);
-      })
+      }),
     );
   }
 
@@ -94,7 +95,7 @@ export class BuilderIoClient {
       return Promise.all(
         entriesToUpdate.map((id) => {
           return this.updateProductVariantCall(id, variant);
-        })
+        }),
       );
     }
   }
@@ -112,8 +113,8 @@ export class BuilderIoClient {
             "Content-Type": "application/json",
             Authorization: `Bearer ${this.config.privateApiKey}`,
           },
-        })
+        }),
-      )
+      ),
     );
   }
 
@@ -127,15 +128,23 @@ export class BuilderIoClient {
         variantID: variantId,
         variantFieldMapping: this.config.productVariantFieldsMapping.variantId,
       },
-      "Trying to fetch variant from Builder.io"
+      "Trying to fetch variant from Builder.io",
     );
 
+    const expectedSchema = z.object({
+      results: z.array(
+        z.object({
+          id: z.string(),
+        }),
+      ),
+    });
+
     return fetch(
-      `https://cdn.builder.io/api/v3/content/${this.config.modelName}?apiKey=${this.config.publicApiKey}&query.data.${this.config.productVariantFieldsMapping.variantId}.$eq=${variantId}&limit=10&includeUnpublished=false&cacheSeconds=0`
+      `https://cdn.builder.io/api/v3/content/${this.config.modelName}?apiKey=${this.config.publicApiKey}&query.data.${this.config.productVariantFieldsMapping.variantId}.$eq=${variantId}&limit=10&includeUnpublished=false&cacheSeconds=0`,
     )
-      .then((res) => res.json())
+      .then((res) => expectedSchema.parse(res.json()))
       .then((data) => {
-        return data.results.map((result: any) => result.id) as string[];
+        return data.results.map((result) => result.id) as string[];
       })
       .catch((err) => {
         this.logger.error(err, "Failed to fetch builder.io entry id");

apps/crm/package.json

@@ -51,6 +51,7 @@
     "@graphql-typed-document-node/core": "3.2.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/react-hooks": "^8.0.1",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@types/mailchimp__mailchimp_marketing": "^3.0.7",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",

apps/crm/reset.d.ts

@@ -0,0 +1 @@
+import "@total-typescript/ts-reset";

apps/crm/src/lib/app-bridge-persistence.ts

@@ -23,7 +23,7 @@ export const AppBridgePersistence = {
     }
 
     try {
-      return JSON.parse(storageItem as string);
+      return JSON.parse(storageItem as string) as AppBridgeStorageState;
     } catch (e) {
       return null;
     }

apps/crm/src/modules/mailchimp/mailchimp-config-settings-manager.test.ts

@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { MailchimpConfigSettingsManagerV1 } from "./mailchimp-config-settings-manager";
+import { MailchimpConfigSettingsManagerV1, MailchimpConfigType } from "./mailchimp-config-settings-manager";
 import { Client } from "urql";
 import { SettingsManager, SettingsValue } from "@saleor/app-sdk/settings-manager";
 
@@ -70,9 +70,11 @@ describe("MailchimpConfigSettingsManagerV1", () => {
       dc: "us41",
     });
 
-    const parsedSetValue = JSON.parse(valueHasBeenSet!);
+    const parsedSetValue = JSON.parse(valueHasBeenSet!) as {
+      config: MailchimpConfigType
+    };
 
-    expect(parsedSetValue.config.customerCreateEvent.enabled).toBe(false);
+    expect(parsedSetValue.config.customerCreateEvent?.enabled).toBe(false);
   });
 
   it("Calls settings manager with default customerCreateEvent setting to be disabled", async () => {
@@ -90,9 +92,11 @@ describe("MailchimpConfigSettingsManagerV1", () => {
       dc: "us41",
     });
 
-    const parsedSetValue = JSON.parse(valueHasBeenSet!);
+    const parsedSetValue = JSON.parse(valueHasBeenSet!) as {
+      config: MailchimpConfigType
+    };
 
-    expect(parsedSetValue.config.customerCreateEvent.enabled).toBe(false);
+    expect(parsedSetValue.config.customerCreateEvent?.enabled).toBe(false);
   });
 
   it(".get returns null if data doesnt match schema", async () => {

apps/crm/src/pages/api/auth/mailchimp/callback.ts

@@ -1,6 +1,8 @@
 import { NextApiHandler } from "next";
 import { MailchimpClientOAuth } from "../../../../modules/mailchimp/mailchimp-client";
 import { createLogger } from "@saleor/apps-shared";
+import { z } from "zod";
+import * as Sentry from "@sentry/nextjs";
 
 export const getBaseUrl = (headers: { [name: string]: string | string[] | undefined }): string => {
   const { host, "x-forwarded-proto": protocol = "http" } = headers;
@@ -8,6 +10,17 @@ export const getBaseUrl = (headers: { [name: string]: string | string[] | undefi
   return `${protocol}://${host}`;
 };
 
+const tokenResponseSchema = z.object({
+  access_token: z.string().min(1),
+});
+
+const metadataResponseSchema = z.object({
+  dc: z.string().min(1),
+  login: z.object({
+    email: z.string().min(1),
+  }),
+});
+
 const handler: NextApiHandler = async (req, res) => {
   const baseUrl = getBaseUrl(req.headers);
 
@@ -28,25 +41,46 @@ const handler: NextApiHandler = async (req, res) => {
     }),
   });
 
-  const { access_token } = await tokenResponse.json();
+  let accessToken: string;
 
-  logger.debug({ access_token }, "Received mailchimp access_token");
+  try {
+    const tokenResponseJson = await tokenResponse.json();
+    const parsedTokenResponse = tokenResponseSchema.parse(tokenResponseJson);
 
+    accessToken = parsedTokenResponse.access_token;
+  } catch {
+    Sentry.captureException(
+      "Mailchimp token response doesnt contain access_token or can't be fetched",
+    );
+
+    return res.status(500).end();
+  }
+
+  logger.debug({ access_token: accessToken }, "Received mailchimp access_token");
+
+  try {
     const metadataResponse = await fetch("https://login.mailchimp.com/oauth2/metadata", {
       headers: {
-      Authorization: `OAuth ${access_token}`,
+        Authorization: `OAuth ${accessToken}`,
       },
     });
 
-  const metadata = await metadataResponse.json();
+    const metadataJson = await metadataResponse.json();
 
-  const mc = new MailchimpClientOAuth(metadata.dc, access_token);
+    const parsedMetadata = metadataResponseSchema.parse(metadataJson);
+
+    const mc = new MailchimpClientOAuth(parsedMetadata.dc, accessToken);
 
     await mc.ping();
 
     return res.redirect(
-    `/configuration/mailchimp/oauth-success?token=${access_token}&email=${metadata.login.email}&dc=${metadata.dc}`
+      `/configuration/mailchimp/oauth-success?token=${accessToken}&email=${parsedMetadata.login.email}&dc=${parsedMetadata.dc}`,
-  ); // todo maybe move to cookie
+    );
+  } catch {
+    Sentry.captureException("Mailchimp oauth metadata cant be fetched or is malformed");
+
+    return res.status(500).end();
+  }
 };
 
 export default handler;

apps/data-importer/package.json

@@ -49,6 +49,7 @@
     "@graphql-typed-document-node/core": "3.2.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/react-hooks": "^8.0.1",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@types/dot-object": "^2.1.2",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",

apps/data-importer/reset.d.ts

@@ -0,0 +1 @@
+import "@total-typescript/ts-reset";

apps/emails-and-messages/package.json

@@ -61,6 +61,7 @@
     "@graphql-typed-document-node/core": "3.2.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/react-hooks": "^8.0.1",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@types/html-to-text": "^9.0.0",
     "@types/mjml": "^4.7.0",
     "@types/nodemailer": "^6.4.7",

apps/emails-and-messages/reset.d.ts

@@ -0,0 +1 @@
+import "@total-typescript/ts-reset";

apps/invoices/reset.d.ts

@@ -0,0 +1 @@
+import "@total-typescript/ts-reset";

apps/invoices/scripts/migrations/v1-to-v2/restore-migration.ts

@@ -37,7 +37,7 @@ const runMigration = async () => {
         .catch((e) => {
           console.error("❌ Error removing metadata", e);
         });
-    })
+    }),
   );
 
   console.log(results);

apps/invoices/scripts/migrations/v1-to-v2/run-migration.ts

@@ -44,7 +44,7 @@ const runMigration = async () => {
               .catch((e) => {
                 console.log(
                   `🚫 failed to create empty config for ${env.saleorApiUrl}. Env may not exist.`,
-                  e.message
+                  e.message,
                 );
               });
           }
@@ -60,7 +60,7 @@ const runMigration = async () => {
         .catch((e) => {
           console.error("🚫 Failed to migrate ", env.saleorApiUrl, e);
         });
-    })
+    }),
   );
 };
 

apps/invoices/scripts/migrations/v1-to-v2/run-report.ts

@@ -38,7 +38,7 @@ const runReport = async () => {
           metadata: metadata,
           env: env.saleorApiUrl,
         }));
-    })
+    }),
   );
 
   const report = results.map((r: any) => ({

apps/invoices/src/modules/app-configuration/app-configuration-router.ts

@@ -47,7 +47,7 @@ export const appConfigurationRouter = router({
     .input(
       z.object({
         channelSlug: z.string(),
-      })
+      }),
     )
     .mutation(async ({ ctx, input }) => {
       const appConfigV2 =

apps/invoices/src/modules/app-configuration/schema-v1/app-configurator.ts

@@ -17,7 +17,10 @@ export interface AppConfigurator {
 export class PrivateMetadataAppConfiguratorV1 implements AppConfigurator {
   private metadataKey = "app-config";
 
-  constructor(private metadataManager: SettingsManager, private saleorApiUrl: string) {}
+  constructor(
+    private metadataManager: SettingsManager,
+    private saleorApiUrl: string,
+  ) {}
 
   getConfig(): Promise<AppConfigV1 | undefined> {
     return this.metadataManager.get(this.metadataKey, this.saleorApiUrl).then((data) => {

apps/invoices/src/modules/app-configuration/schema-v2/config-v1-to-v2-migration.service.test.ts

@@ -18,13 +18,13 @@ describe("config-v1-to-v2-migration.service", () => {
     service = new ConfigV1ToV2MigrationService(mockClient, "https://example.com/graphql/");
 
     vi.spyOn(service.configMetadataManager, "set").mockImplementationOnce(async () =>
-      Promise.resolve()
+      Promise.resolve(),
     );
   });
 
   it("Returns a pure V2 config if V1 config is not present", async () => {
     vi.spyOn(service.metadataV1AppConfigurator, "getConfig").mockImplementationOnce(async () =>
-      Promise.resolve(undefined)
+      Promise.resolve(undefined),
     );
 
     const migrationResult = await service.migrate();
@@ -41,7 +41,7 @@ describe("config-v1-to-v2-migration.service", () => {
             address: getMockAddress(),
           },
         },
-      })
+      }),
     );
 
     const migrationResult = await service.migrate();
@@ -49,13 +49,13 @@ describe("config-v1-to-v2-migration.service", () => {
     expect(migrationResult.getChannelsOverrides()).toEqual(
       expect.objectContaining({
         "default-channel": expect.objectContaining(getMockAddress()),
-      })
+      }),
     );
   });
 
   it("Runs a beforeSave callback and saves modified state in metadata - missing v1 config scenario", async () => {
     vi.spyOn(service.metadataV1AppConfigurator, "getConfig").mockImplementationOnce(async () =>
-      Promise.resolve(undefined)
+      Promise.resolve(undefined),
     );
 
     const beforeSaveCb = vi.fn().mockImplementationOnce((config: AppConfigV2) => {
@@ -79,7 +79,7 @@ describe("config-v1-to-v2-migration.service", () => {
             address: getMockAddress(),
           },
         },
-      })
+      }),
     );
 
     const beforeSaveCb = vi.fn().mockImplementationOnce((config: AppConfigV2) => {

apps/invoices/src/modules/app-configuration/schema-v2/config-v1-to-v2-migration.service.ts

@@ -10,12 +10,15 @@ export class ConfigV1ToV2MigrationService {
   configMetadataManager: AppConfigV2MetadataManager;
   metadataV1AppConfigurator: PrivateMetadataAppConfiguratorV1;
 
-  constructor(private client: SimpleGraphqlClient, private saleorApiUrl: string) {
+  constructor(
+    private client: SimpleGraphqlClient,
+    private saleorApiUrl: string,
+  ) {
     this.settingsManager = createSettingsManager(client);
     this.configMetadataManager = new AppConfigV2MetadataManager(this.settingsManager);
     this.metadataV1AppConfigurator = new PrivateMetadataAppConfiguratorV1(
       this.settingsManager,
-      this.saleorApiUrl
+      this.saleorApiUrl,
     );
   }
 

apps/invoices/src/modules/app-configuration/schema-v2/config-v1-to-v2-transformer.test.ts

@@ -22,7 +22,7 @@ describe("ConfigV1ToV2Transformer", function () {
     expect(v2.getChannelsOverrides()).toEqual(
       expect.objectContaining({
         "default-channel": getMockAddress(),
-      })
+      }),
     );
   });
 
@@ -42,7 +42,7 @@ describe("ConfigV1ToV2Transformer", function () {
       expect.objectContaining({
         "default-channel": getMockAddress(),
         "custom-channel": getMockAddress(),
-      })
+      }),
     );
   });
 
@@ -66,7 +66,7 @@ describe("ConfigV1ToV2Transformer", function () {
           ...getMockAddress(),
           city: "",
         },
-      })
+      }),
     );
   });
 });

apps/invoices/src/modules/invoices/invoice-generator/microinvoice/microinvoice-invoice-generator.ts

@@ -8,7 +8,7 @@ export class MicroinvoiceInvoiceGenerator implements InvoiceGenerator {
   constructor(
     private settings = {
       locale: "en-US",
-    }
+    },
   ) {}
   async generate(input: {
     order: OrderPayloadFragment;
@@ -19,17 +19,7 @@ export class MicroinvoiceInvoiceGenerator implements InvoiceGenerator {
     const { invoiceNumber, order, companyAddressData, filename } = input;
 
     const microinvoiceInstance = new Microinvoice({
-      style: {
+      style: {},
-        /*
-         * header: {
-         *   image: {
-         *     path: "./examples/logo.png",
-         *     width: 50,
-         *     height: 19,
-         *   },
-         * },
-         */
-      },
       data: {
         invoice: {
           name: `Invoice ${invoiceNumber}`,
@@ -63,12 +53,6 @@ export class MicroinvoiceInvoiceGenerator implements InvoiceGenerator {
                 order.billingAddress?.country.country,
               ],
             },
-            /*
-             * {
-             *   label: "Tax Identifier",
-             *   value: "todo",
-             * },
-             */
           ],
 
           seller: [
@@ -84,28 +68,9 @@ export class MicroinvoiceInvoiceGenerator implements InvoiceGenerator {
                 companyAddressData.countryArea,
               ],
             },
-            /*
-             * {
-             *   label: "Tax Identifier",
-             *   value: "todo",
-             * },
-             */
           ],
 
-          legal: [
+          legal: [],
-            /*
-             * {
-             *   value: "Lorem ipsum dolor sit amet, consectetur adipiscing elit",
-             *   weight: "bold",
-             *   color: "primary",
-             * },
-             * {
-             *   value: "sed do eiusmod tempor incididunt ut labore et dolore magna.",
-             *   weight: "bold",
-             *   color: "secondary",
-             * },
-             */
-          ],
 
           details: {
             header: [

apps/invoices/src/modules/shop-info/shop-address.ts

@@ -0,0 +1,10 @@
+export type ShopAddress = {
+  city: string;
+  cityArea: string;
+  companyName: string;
+  country: string;
+  countryArea: string;
+  postalCode: string;
+  streetAddress1: string;
+  streetAddress2: string;
+};

apps/invoices/src/pages/api/webhooks/invoice-requested.ts

@@ -156,7 +156,7 @@ const invoiceNumberGenerator = new InvoiceNumberGenerator();
 export const handler: NextWebhookApiHandler<InvoiceRequestedPayloadFragment> = async (
   req,
   res,
-  context
+  context,
 ) => {
   const { authData, payload, baseUrl } = context;
   const logger = createLogger({ domain: authData.saleorApiUrl, url: baseUrl });
@@ -176,7 +176,7 @@ export const handler: NextWebhookApiHandler<InvoiceRequestedPayloadFragment> = a
    */
   const invoiceName = invoiceNumberGenerator.generateFromOrder(
     order as OrderPayloadFragment,
-    InvoiceNumberGenerationStrategy.localizedDate("en-US") // todo connect locale -> where from?
+    InvoiceNumberGenerationStrategy.localizedDate("en-US"), // todo connect locale -> where from?
   );
 
   Sentry.addBreadcrumb({
@@ -270,7 +270,7 @@ export const handler: NextWebhookApiHandler<InvoiceRequestedPayloadFragment> = a
     await new InvoiceCreateNotifier(client).notifyInvoiceCreated(
       orderId,
       invoiceName,
-      uploadedFileUrl
+      uploadedFileUrl,
     );
 
     Sentry.addBreadcrumb({

apps/klaviyo/package.json

@@ -43,6 +43,7 @@
     "@graphql-codegen/typescript-operations": "4.0.1",
     "@graphql-codegen/typescript-urql": "3.7.3",
     "@graphql-typed-document-node/core": "3.2.0",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",
     "autoprefixer": "^10.4.7",

apps/klaviyo/reset.d.ts

@@ -0,0 +1 @@
+import "@total-typescript/ts-reset";

apps/klaviyo/src/pages/api/webhooks/customer-created.ts

@@ -56,13 +56,13 @@ export const customerCreatedWebhook = new SaleorAsyncWebhook<CustomerCreatedWebh
     event: "CUSTOMER_CREATED",
     apl: saleorApp.apl,
     query: UntypedCustomerCreatedDocument,
-  }
+  },
 );
 
 const handler: NextWebhookApiHandler<CustomerCreatedWebhookPayloadFragment> = async (
   req,
   res,
-  context
+  context,
 ) => {
   console.debug("customerCreatedWebhook handler called");
 
@@ -94,7 +94,8 @@ const handler: NextWebhookApiHandler<CustomerCreatedWebhookPayloadFragment> = as
   const klaviyoResponse = await klaviyoClient.send(klaviyoMetric, userEmail, payload);
 
   if (klaviyoResponse.status !== 200) {
-    const klaviyoMessage = ` Message: ${(await klaviyoResponse.json())?.message}.` || "";
+    const klaviyoMessage =
+      ` Message: ${((await klaviyoResponse.json()) as { message: string })?.message}.` || "";
 
     console.debug("Klaviyo returned error: ", klaviyoMessage);
 

apps/klaviyo/src/pages/api/webhooks/fulfillment-created.ts

@@ -68,7 +68,7 @@ export const fulfillmentCreatedWebhook =
 const handler: NextWebhookApiHandler<FulfillmentCreatedWebhookPayloadFragment> = async (
   req,
   res,
-  context
+  context,
 ) => {
   console.debug("fulfillmentCreatedWebhook handler called");
 
@@ -98,7 +98,8 @@ const handler: NextWebhookApiHandler<FulfillmentCreatedWebhookPayloadFragment> =
   const klaviyoResponse = await klaviyoClient.send(klaviyoMetric, userEmail, payload);
 
   if (klaviyoResponse.status !== 200) {
-    const klaviyoMessage = ` Message: ${(await klaviyoResponse.json())?.message}.` || "";
+    const klaviyoMessage =
+      ` Message: ${((await klaviyoResponse.json()) as { message: string })?.message}.` || "";
 
     console.debug("Klaviyo returned error: ", klaviyoMessage);
 

apps/klaviyo/src/pages/api/webhooks/order-created.ts

@@ -38,7 +38,7 @@ export const orderCreatedWebhook = new SaleorAsyncWebhook<OrderCreatedWebhookPay
 const handler: NextWebhookApiHandler<OrderCreatedWebhookPayloadFragment> = async (
   req,
   res,
-  context
+  context,
 ) => {
   console.debug("orderCreatedWebhook handler called");
 
@@ -69,7 +69,8 @@ const handler: NextWebhookApiHandler<OrderCreatedWebhookPayloadFragment> = async
   const klaviyoResponse = await klaviyoClient.send(klaviyoMetric, userEmail, payload);
 
   if (klaviyoResponse.status !== 200) {
-    const klaviyoMessage = ` Message: ${(await klaviyoResponse.json())?.message}.` || "";
+    const klaviyoMessage =
+      ` Message: ${((await klaviyoResponse.json()) as { message: string })?.message}.` || "";
 
     console.debug("Klaviyo returned error: ", klaviyoMessage);
     return res.status(500).json({

apps/klaviyo/src/pages/api/webhooks/order-fully-paid.ts

@@ -38,7 +38,7 @@ export const orderFullyPaidWebhook = new SaleorAsyncWebhook<OrderFullyPaidWebhoo
 const handler: NextWebhookApiHandler<OrderFullyPaidWebhookPayloadFragment> = async (
   req,
   res,
-  context
+  context,
 ) => {
   console.debug("orderFullyPaidWebhook handler called");
 
@@ -70,7 +70,8 @@ const handler: NextWebhookApiHandler<OrderFullyPaidWebhookPayloadFragment> = asy
   const klaviyoResponse = await klaviyoClient.send(klaviyoMetric, userEmail, payload);
 
   if (klaviyoResponse.status !== 200) {
-    const klaviyoMessage = ` Message: ${(await klaviyoResponse.json())?.message}.` || "";
+    const klaviyoMessage =
+      ` Message: ${((await klaviyoResponse.json()) as { message: string })?.message}.` || "";
 
     console.debug("Klaviyo returned error: ", klaviyoMessage);
 

apps/products-feed/package.json

@@ -56,6 +56,7 @@
     "@graphql-typed-document-node/core": "3.2.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/react-hooks": "^8.0.1",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",
     "eslint": "8.46.0",

apps/products-feed/reset.d.ts

@@ -0,0 +1 @@
+import "@total-typescript/ts-reset";

apps/products-feed/src/modules/app-configuration/app-config.test.ts

@@ -94,7 +94,6 @@ describe("AppConfig", function () {
       expect(
         () =>
           new AppConfig({
-            // @ts-expect-error
             foo: "bar",
           }),
       ).toThrow();

apps/products-feed/src/modules/app-configuration/app-config.ts

@@ -72,7 +72,7 @@ export class AppConfig {
     imageSize: imageSizeFieldSchema.parse(undefined),
   };
 
-  constructor(initialData?: RootConfig) {
+  constructor(initialData?: RootConfig | unknown) {
     if (initialData) {
       try {
         this.rootData = rootAppConfigSchema.parse(initialData);

apps/products-feed/src/modules/metadata-cache/cache-configurator.ts

@@ -1,9 +1,13 @@
 import { SettingsManager } from "@saleor/app-sdk/settings-manager";
+import { z } from "zod";
 
 export class CacheConfigurator {
   private metadataKeyPrefix = "cursor-cache-";
 
-  constructor(private metadataManager: SettingsManager, private saleorApiUrl: string) {}
+  constructor(
+    private metadataManager: SettingsManager,
+    private saleorApiUrl: string,
+  ) {}
 
   private constructKey(channel: string) {
     return this.metadataKeyPrefix + channel;
@@ -16,7 +20,7 @@ export class CacheConfigurator {
       }
 
       try {
-        return JSON.parse(data);
+        return z.array(z.string()).parse(JSON.parse(data));
       } catch (e) {
         throw new Error("Invalid metadata value, can't be parsed");
       }

apps/search/package.json

@@ -52,6 +52,7 @@
     "@graphql-codegen/typescript-operations": "4.0.1",
     "@graphql-codegen/typescript-urql": "3.7.3",
     "@graphql-typed-document-node/core": "3.2.0",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",
     "@vitejs/plugin-react": "4.0.4",

apps/search/reset.d.ts

@@ -0,0 +1 @@
+import "@total-typescript/ts-reset";

apps/search/src/lib/useWebhooksStatus.tsx

@@ -7,7 +7,9 @@ export const useWebhooksStatus = () => {
   const fetch: typeof window.fetch = useAuthenticatedFetch();
 
   const fetchFn = useCallback(() => {
-    return fetch("/api/webhooks-status").then((resp) => resp.json());
+    return fetch("/api/webhooks-status").then(
+      (resp) => resp.json() as unknown as WebhooksStatusResponse,
+    );
     /**
      * fetch from SDK is not wrapped with memo todo
      */

apps/search/src/modules/configuration/configuration.ts

@@ -27,7 +27,7 @@ export class AppConfig {
     },
   };
 
-  constructor(initialData?: AppConfigRootSchemaFields) {
+  constructor(initialData?: AppConfigRootSchemaFields | unknown) {
     if (initialData) {
       this.rootData = AppConfigRootSchema.parse(initialData);
     }

apps/search/src/test/handlers/webhooks-status-handler.test.ts

@@ -1,4 +1,4 @@
-import { NextProtectedApiHandler } from "@saleor/app-sdk/handlers/next";
+import { NextProtectedApiHandler, ProtectedHandlerContext } from "@saleor/app-sdk/handlers/next";
 import { SettingsManager } from "@saleor/app-sdk/settings-manager";
 import { createMocks } from "node-mocks-http";
 import { Client, OperationResult } from "urql";
@@ -8,11 +8,12 @@ import { IWebhookActivityTogglerService } from "../../domain/WebhookActivityTogg
 import { SearchProvider } from "../../lib/searchProvider";
 import { webhooksStatusHandlerFactory } from "../../pages/api/webhooks-status";
 import { AppConfig } from "../../modules/configuration/configuration";
+import { NextApiRequest, NextApiResponse } from "next";
 
 /**
  * Context provided from ProtectedApiHandler to handler body
  */
-const mockWebhookContext = {
+const mockWebhookContext: ProtectedHandlerContext = {
   authData: {
     appId: "app-id",
     domain: "domain.saleor.io",
@@ -20,6 +21,10 @@ const mockWebhookContext = {
     saleorApiUrl: "https://domain.saleor.io/graphql",
   },
   baseUrl: "localhost:3000",
+  user: {
+    email: "",
+    userPermissions: [],
+  },
 };
 
 const appWebhooksResponseData: Pick<OperationResult<FetchOwnWebhooksQuery, any>, "data"> = {
@@ -90,6 +95,7 @@ describe("webhooksStatusHandler", () => {
   it("Disables webhooks if Algolia settings are not saved in Saleor Metadata", async function () {
     const { req, res } = createMocks({});
 
+    // @ts-expect-error - mock doesnt contain next-specific fields
     await handler(req, res, mockWebhookContext);
 
     expect(webhooksTogglerServiceMock.disableOwnWebhooks).toHaveBeenCalled();
@@ -113,6 +119,7 @@ describe("webhooksStatusHandler", () => {
 
     const { req, res } = createMocks({});
 
+    // @ts-expect-error - mock doesnt contain next-specific fields
     await handler(req, res, mockWebhookContext);
 
     expect(webhooksTogglerServiceMock.disableOwnWebhooks).toHaveBeenCalled();

apps/segment/package.json

@@ -54,6 +54,7 @@
     "@graphql-typed-document-node/core": "3.2.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/react-hooks": "^8.0.1",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",
     "eslint": "8.46.0",

apps/segment/reset.d.ts

@@ -0,0 +1 @@
+import "@total-typescript/ts-reset";

apps/segment/src/modules/configuration/app-config.ts

@@ -4,7 +4,7 @@ import { RootConfig } from "./schemas/root-config.schema";
 export class AppConfig {
   private rootData: RootConfig.Shape = null;
 
-  constructor(initialData?: RootConfig.Shape) {
+  constructor(initialData?: RootConfig.Shape | unknown) {
     if (initialData) {
       this.rootData = RootConfig.Schema.parse(initialData);
     }

apps/slack/package.json

@@ -45,6 +45,7 @@
     "@graphql-codegen/typescript-operations": "4.0.1",
     "@graphql-codegen/typescript-urql": "3.7.3",
     "@graphql-typed-document-node/core": "3.2.0",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",
     "@typescript-eslint/eslint-plugin": "^5.36.2",

apps/slack/reset.d.ts

@@ -0,0 +1 @@
+import "@total-typescript/ts-reset";

apps/slack/src/hooks/useAppApi.ts

@@ -40,7 +40,7 @@ export const useAppApi = <D>({ url, options, skip }: UseFetchProps) => {
 
         const json = await res.json();
 
-        setData(json);
+        setData(json as D);
       } catch (e) {
         setError(e as unknown);
       } finally {

apps/taxes/package.json

@@ -55,6 +55,7 @@
     "@graphql-typed-document-node/core": "3.2.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/react-hooks": "^8.0.1",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",
     "@vitejs/plugin-react": "4.0.4",

apps/taxes/reset.d.ts

@@ -0,0 +1 @@
+import "@total-typescript/ts-reset";

cspell.json

@@ -67,6 +67,7 @@
     "vals",
     "urql",
     "Protos",
+    "Consts",
     "pino",
     "IFRAME",
     "dedupe"
@@ -82,6 +83,7 @@
     "**/*.spec.ts",
     "**/graphql.ts",
     "**/CHANGELOG.md",
-    "**/schema.graphql"
+    "**/schema.graphql",
+    "**/*mock*"
   ]
 }

packages/e2e/package.json

@@ -10,6 +10,7 @@
   "devDependencies": {
     "@playwright/test": "^1.35.1",
     "@saleor/app-sdk": "0.43.1",
+    "@total-typescript/ts-reset": "^0.5.1",
     "dotenv": "^16.3.1",
     "eslint-config-saleor": "workspace:*",
     "zod": "3.21.4"

packages/eslint-config-saleor/package.json

@@ -2,6 +2,7 @@
   "name": "eslint-config-saleor",
   "version": "0.4.5",
   "devDependencies": {
+    "@total-typescript/ts-reset": "^0.5.1",
     "eslint": "8.46.0",
     "eslint-config-next": "13.4.8",
     "eslint-config-prettier": "8.8.0",

packages/react-hook-form-macaw/package.json

@@ -21,6 +21,7 @@
     "@storybook/react": "^7.0.12",
     "@storybook/react-vite": "^7.0.12",
     "@storybook/testing-library": "^0.0.14-next.2",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",
     "@vanilla-extract/vite-plugin": "^3.8.1",

packages/shared/package.json

@@ -17,6 +17,7 @@
     "@material-ui/lab": "4.0.0-alpha.61",
     "@saleor/app-sdk": "0.43.1",
     "@saleor/macaw-ui": "0.8.0-pre.127",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",
     "@types/semver": "^7.5.0",

packages/trpc/package.json

@@ -6,6 +6,7 @@
   },
   "devDependencies": {
     "@saleor/app-sdk": "0.41.1",
+    "@total-typescript/ts-reset": "^0.5.1",
     "eslint": "8.46.0",
     "eslint-config-saleor": "workspace:*",
     "next": "13.4.8",

packages/ui/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "@saleor/app-sdk": "0.43.1",
     "@saleor/macaw-ui": "0.8.0-pre.127",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",
     "eslint-config-saleor": "workspace:*",

pnpm-lock.yaml

@@ -176,6 +176,9 @@ importers:
       '@testing-library/react-hooks':
         specifier: ^8.0.1
         version: 8.0.1(@types/react@18.2.5)(react-dom@18.2.0)(react@18.2.0)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/qs':
         specifier: ^6.9.7
         version: 6.9.7
@@ -312,6 +315,9 @@ importers:
       '@testing-library/react-hooks':
         specifier: ^8.0.1
         version: 8.0.1(@types/react@18.2.5)(react-dom@18.2.0)(react@18.2.0)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/mailchimp__mailchimp_marketing':
         specifier: ^3.0.7
         version: 3.0.7
@@ -442,6 +448,9 @@ importers:
       '@testing-library/react-hooks':
         specifier: ^8.0.1
         version: 8.0.1(@types/react@18.2.5)(react-dom@18.2.0)(react@18.2.0)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/dot-object':
         specifier: ^2.1.2
         version: 2.1.2
@@ -605,6 +614,9 @@ importers:
       '@testing-library/react-hooks':
         specifier: ^8.0.1
         version: 8.0.1(@types/react@18.2.5)(react-dom@18.2.0)(react@18.2.0)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/html-to-text':
         specifier: ^9.0.0
         version: 9.0.0
@@ -741,6 +753,9 @@ importers:
       '@graphql-typed-document-node/core':
         specifier: 3.2.0
         version: 3.2.0(graphql@16.7.1)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/react':
         specifier: 18.2.5
         version: 18.2.5
@@ -868,6 +883,9 @@ importers:
       '@graphql-typed-document-node/core':
         specifier: 3.2.0
         version: 3.2.0(graphql@16.7.1)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/react':
         specifier: 18.2.5
         version: 18.2.5
@@ -1025,6 +1043,9 @@ importers:
       '@testing-library/react-hooks':
         specifier: ^8.0.1
         version: 8.0.1(@types/react@18.2.5)(react-dom@18.2.0)(react@18.2.0)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/react':
         specifier: 18.2.5
         version: 18.2.5
@@ -1158,6 +1179,9 @@ importers:
       '@graphql-typed-document-node/core':
         specifier: 3.2.0
         version: 3.2.0(graphql@16.7.1)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/react':
         specifier: 18.2.5
         version: 18.2.5
@@ -1309,6 +1333,9 @@ importers:
       '@testing-library/react-hooks':
         specifier: ^8.0.1
         version: 8.0.1(@types/react@18.2.5)(react-dom@18.2.0)(react@18.2.0)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/react':
         specifier: 18.2.5
         version: 18.2.5
@@ -1427,6 +1454,9 @@ importers:
       '@graphql-typed-document-node/core':
         specifier: 3.2.0
         version: 3.2.0(graphql@16.7.1)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/react':
         specifier: 18.2.5
         version: 18.2.5
@@ -1584,6 +1614,9 @@ importers:
       '@testing-library/react-hooks':
         specifier: ^8.0.1
         version: 8.0.1(@types/react@18.2.5)(react-dom@18.2.0)(react@18.2.0)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/react':
         specifier: 18.2.5
         version: 18.2.5
@@ -1611,6 +1644,9 @@ importers:
       '@saleor/app-sdk':
         specifier: 0.43.1
         version: 0.43.1(graphql@16.7.1)(next@13.4.8)(react-dom@18.2.0)(react@18.2.0)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       dotenv:
         specifier: ^16.3.1
         version: 16.3.1
@@ -1623,6 +1659,9 @@ importers:
 
   packages/eslint-config-saleor:
     devDependencies:
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       eslint:
         specifier: 8.46.0
         version: 8.46.0
@@ -1681,6 +1720,9 @@ importers:
       '@storybook/testing-library':
         specifier: ^0.0.14-next.2
         version: 0.0.14-next.2
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/react':
         specifier: 18.2.5
         version: 18.2.5
@@ -1748,6 +1790,9 @@ importers:
       '@saleor/macaw-ui':
         specifier: 0.8.0-pre.127
         version: 0.8.0-pre.127(@types/react-dom@18.2.5)(@types/react@18.2.5)(react-dom@18.2.0)(react@18.2.0)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/react':
         specifier: 18.2.5
         version: 18.2.5
@@ -1821,6 +1866,9 @@ importers:
       '@saleor/app-sdk':
         specifier: 0.43.1
         version: 0.43.1(graphql@16.7.1)(next@13.4.8)(react-dom@18.2.0)(react@18.2.0)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       eslint:
         specifier: 8.46.0
         version: 8.46.0
@@ -1849,6 +1897,9 @@ importers:
       '@saleor/macaw-ui':
         specifier: 0.8.0-pre.127
         version: 0.8.0-pre.127(@types/react-dom@18.2.5)(@types/react@18.2.5)(react-dom@18.2.0)(react@18.2.0)
+      '@total-typescript/ts-reset':
+        specifier: ^0.5.1
+        version: 0.5.1
       '@types/react':
         specifier: 18.2.5
         version: 18.2.5
@@ -10675,6 +10726,10 @@ packages:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
 
+  /@total-typescript/ts-reset@0.5.1:
+    resolution: {integrity: sha512-AqlrT8YA1o7Ff5wPfMOL0pvL+1X+sw60NN6CcOCqs658emD6RfiXhF7Gu9QcfKBH7ELY2nInLhKSCWVoNL70MQ==}
+    dev: true
+
   /@trpc/client@10.34.0(@trpc/server@10.34.0):
     resolution: {integrity: sha512-nqtDTIqSY/9syo2EjSy4WWWXPU9GsamEh9Tsg698gLAh1nhgFc5+/YYeb+Ne1pbvWGZ5/3t9Dcz3h4wMyyJ9gQ==}
     peerDependencies: