@dazl/internal-api-client 1.21.1 → 1.22.0

package/src/client/client.gen.ts

@@ -75,171 +75,154 @@ export const createClient = (config: Config = {}): Client => {
   };
 
   const request: Client['request'] = async (options) => {
-    const { opts, url } = await beforeRequest(options);
-    const requestInit: ReqInit = {
-      redirect: 'follow',
-      ...opts,
-      body: getValidRequestBody(opts),
-    };
-
-    let request = new Request(url, requestInit);
-
-    for (const fn of interceptors.request.fns) {
-      if (fn) {
-        request = await fn(request, opts);
-      }
-    }
+    const throwOnError = options.throwOnError ?? _config.throwOnError;
+    const responseStyle = options.responseStyle ?? _config.responseStyle;
 
-    // fetch must be assigned here, otherwise it would throw the error:
-    // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
-    const _fetch = opts.fetch!;
-    let response: Response;
+    let request: Request | undefined;
+    let response: Response | undefined;
 
     try {
-      response = await _fetch(request);
-    } catch (error) {
-      // Handle fetch exceptions (AbortError, network errors, etc.)
-      let finalError = error;
+      const { opts, url } = await beforeRequest(options);
+      const requestInit: ReqInit = {
+        redirect: 'follow',
+        ...opts,
+        body: getValidRequestBody(opts),
+      };
 
-      for (const fn of interceptors.error.fns) {
+      request = new Request(url, requestInit);
+
+      for (const fn of interceptors.request.fns) {
         if (fn) {
-          finalError = (await fn(error, undefined as any, request, opts)) as unknown;
+          request = await fn(request, opts);
         }
       }
 
-      finalError = finalError || ({} as unknown);
+      // fetch must be assigned here, otherwise it would throw the error:
+      // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+      const _fetch = opts.fetch!;
 
-      if (opts.throwOnError) {
-        throw finalError;
-      }
-
-      // Return error response
-      return opts.responseStyle === 'data'
-        ? undefined
-        : {
-            error: finalError,
-            request,
-            response: undefined as any,
-          };
-    }
+      response = await _fetch(request);
 
-    for (const fn of interceptors.response.fns) {
-      if (fn) {
-        response = await fn(response, request, opts);
+      for (const fn of interceptors.response.fns) {
+        if (fn) {
+          response = await fn(response, request, opts);
+        }
       }
-    }
-
-    const result = {
-      request,
-      response,
-    };
 
-    if (response.ok) {
-      const parseAs =
-        (opts.parseAs === 'auto'
-          ? getParseAs(response.headers.get('Content-Type'))
-          : opts.parseAs) ?? 'json';
+      const result = {
+        request,
+        response,
+      };
+
+      if (response.ok) {
+        const parseAs =
+          (opts.parseAs === 'auto'
+            ? getParseAs(response.headers.get('Content-Type'))
+            : opts.parseAs) ?? 'json';
+
+        if (response.status === 204 || response.headers.get('Content-Length') === '0') {
+          let emptyData: any;
+          switch (parseAs) {
+            case 'arrayBuffer':
+            case 'blob':
+            case 'text':
+              emptyData = await response[parseAs]();
+              break;
+            case 'formData':
+              emptyData = new FormData();
+              break;
+            case 'stream':
+              emptyData = response.body;
+              break;
+            case 'json':
+            default:
+              emptyData = {};
+              break;
+          }
+          return opts.responseStyle === 'data'
+            ? emptyData
+            : {
+                data: emptyData,
+                ...result,
+              };
+        }
 
-      if (response.status === 204 || response.headers.get('Content-Length') === '0') {
-        let emptyData: any;
+        let data: any;
         switch (parseAs) {
           case 'arrayBuffer':
           case 'blob':
+          case 'formData':
           case 'text':
-            emptyData = await response[parseAs]();
+            data = await response[parseAs]();
             break;
-          case 'formData':
-            emptyData = new FormData();
+          case 'json': {
+            // Some servers return 200 with no Content-Length and empty body.
+            // response.json() would throw; read as text and parse if non-empty.
+            const text = await response.text();
+            data = text ? JSON.parse(text) : {};
             break;
+          }
           case 'stream':
-            emptyData = response.body;
-            break;
-          case 'json':
-          default:
-            emptyData = {};
-            break;
+            return opts.responseStyle === 'data'
+              ? response.body
+              : {
+                  data: response.body,
+                  ...result,
+                };
         }
+
+        if (parseAs === 'json') {
+          if (opts.responseValidator) {
+            await opts.responseValidator(data);
+          }
+
+          if (opts.responseTransformer) {
+            data = await opts.responseTransformer(data);
+          }
+        }
+
         return opts.responseStyle === 'data'
-          ? emptyData
+          ? data
           : {
-              data: emptyData,
+              data,
               ...result,
             };
       }
 
-      let data: any;
-      switch (parseAs) {
-        case 'arrayBuffer':
-        case 'blob':
-        case 'formData':
-        case 'text':
-          data = await response[parseAs]();
-          break;
-        case 'json': {
-          // Some servers return 200 with no Content-Length and empty body.
-          // response.json() would throw; read as text and parse if non-empty.
-          const text = await response.text();
-          data = text ? JSON.parse(text) : {};
-          break;
-        }
-        case 'stream':
-          return opts.responseStyle === 'data'
-            ? response.body
-            : {
-                data: response.body,
-                ...result,
-              };
+      const textError = await response.text();
+      let jsonError: unknown;
+
+      try {
+        jsonError = JSON.parse(textError);
+      } catch {
+        // noop
       }
 
-      if (parseAs === 'json') {
-        if (opts.responseValidator) {
-          await opts.responseValidator(data);
-        }
+      throw jsonError ?? textError;
+    } catch (error) {
+      let finalError = error;
 
-        if (opts.responseTransformer) {
-          data = await opts.responseTransformer(data);
+      for (const fn of interceptors.error.fns) {
+        if (fn) {
+          finalError = await fn(finalError, response, request, options as ResolvedRequestOptions);
         }
       }
 
-      return opts.responseStyle === 'data'
-        ? data
-        : {
-            data,
-            ...result,
-          };
-    }
-
-    const textError = await response.text();
-    let jsonError: unknown;
-
-    try {
-      jsonError = JSON.parse(textError);
-    } catch {
-      // noop
-    }
-
-    const error = jsonError ?? textError;
-    let finalError = error;
+      finalError = finalError || {};
 
-    for (const fn of interceptors.error.fns) {
-      if (fn) {
-        finalError = (await fn(error, response, request, opts)) as string;
+      if (throwOnError) {
+        throw finalError;
       }
-    }
-
-    finalError = finalError || ({} as string);
 
-    if (opts.throwOnError) {
-      throw finalError;
+      // TODO: we probably want to return error and improve types
+      return responseStyle === 'data'
+        ? undefined
+        : {
+            error: finalError,
+            request,
+            response,
+          };
     }
-
-    // TODO: we probably want to return error and improve types
-    return opts.responseStyle === 'data'
-      ? undefined
-      : {
-          error: finalError,
-          ...result,
-        };
   };
 
   const makeMethodFn = (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
@@ -250,7 +233,6 @@ export const createClient = (config: Config = {}): Client => {
     return createSseClient({
       ...opts,
       body: opts.body as BodyInit | null | undefined,
-      headers: opts.headers as unknown as Record<string, string>,
       method,
       onRequest: async (url, init) => {
         let request = new Request(url, init);

package/src/client/types.gen.ts

@@ -127,8 +127,10 @@ export type RequestResult<
                 error: TError extends Record<string, unknown> ? TError[keyof TError] : TError;
               }
           ) & {
-            request: Request;
-            response: Response;
+            /** request may be undefined, because error may be from building the request object itself */
+            request?: Request;
+            /** response may be undefined, because error may be from building the request object itself or from a network error */
+            response?: Response;
           }
     >;
 

package/src/client/utils.gen.ts

@@ -218,8 +218,10 @@ export const mergeHeaders = (
 
 type ErrInterceptor<Err, Res, Req, Options> = (
   error: Err,
-  response: Res,
-  request: Req,
+  /** response may be undefined due to a network error where no response object is produced */
+  response: Res | undefined,
+  /** request may be undefined, because error may be from building the request object itself */
+  request: Req | undefined,
   options: Options,
 ) => Err | Promise<Err>;
 

package/src/db/generated-types.ts

@@ -37,7 +37,7 @@ export interface _PrismaMigrations {
 
 export interface AdminAction {
   action: string;
-  adminDazlUserId: string | null;
+  adminDazlUserId: string;
   adminUserId: number;
   createdAt: Generated<Timestamp>;
   id: Generated<number>;
@@ -46,18 +46,22 @@ export interface AdminAction {
   targetDazlUserId: string | null;
   targetProjectId: string | null;
   targetUserId: number | null;
+  updatedAt: Generated<Timestamp>;
 }
 
 export interface CreditBalance {
   balance: Generated<number>;
+  createdAt: Generated<Timestamp>;
   dazlUserId: string;
   priceId: string | null;
-  updatedAt: Timestamp;
+  updatedAt: Generated<Timestamp>;
   userId: number;
 }
 
 export interface CreditTransaction {
+  createdAt: Generated<Timestamp>;
   id: string;
+  updatedAt: Generated<Timestamp>;
 }
 
 export interface Deploy {
@@ -69,6 +73,7 @@ export interface Deploy {
   productionURL: string | null;
   projectId: string;
   publishedAt: Timestamp | null;
+  updatedAt: Generated<Timestamp>;
 }
 
 export interface EncryptedValue {
@@ -90,7 +95,7 @@ export interface GitHubUser {
   accessToken: string | null;
   createdAt: Generated<Timestamp>;
   refreshToken: string | null;
-  updatedAt: Timestamp;
+  updatedAt: Generated<Timestamp>;
   userDazlId: string;
   username: string;
 }
@@ -111,9 +116,11 @@ export interface Media {
 }
 
 export interface NetlifyAccount {
+  createdAt: Generated<Timestamp>;
   netlifyAccountId: string;
   netlifySlug: string;
   typeId: string | null;
+  updatedAt: Generated<Timestamp>;
   userId: string;
 }
 
@@ -128,6 +135,7 @@ export interface Project {
   members: Json | null;
   name: string;
   originTemplateId: string | null;
+  updatedAt: Generated<Timestamp>;
   userId: number;
 }
 
@@ -147,7 +155,7 @@ export interface ProjectOnGitHub {
   installationId: number;
   projectId: string;
   repoFullName: string;
-  updatedAt: Timestamp;
+  updatedAt: Generated<Timestamp>;
 }
 
 export interface StripePrice {
@@ -159,7 +167,7 @@ export interface StripePrice {
   lookupKey: string | null;
   productId: string;
   unitAmount: number;
-  updatedAt: Timestamp;
+  updatedAt: Generated<Timestamp>;
 }
 
 export interface StripeProduct {
@@ -167,7 +175,7 @@ export interface StripeProduct {
   createdAt: Generated<Timestamp>;
   id: string;
   name: string;
-  updatedAt: Timestamp;
+  updatedAt: Generated<Timestamp>;
 }
 
 export interface Template {
@@ -183,6 +191,7 @@ export interface Template {
   preserveEnvFile: Generated<boolean>;
   screenshot: string | null;
   sharedWith: Json | null;
+  updatedAt: Generated<Timestamp>;
   usageCount: Generated<number>;
   userId: number;
 }
@@ -196,6 +205,7 @@ export interface User {
   name: string;
   picture: string | null;
   stripeCustomerId: string | null;
+  updatedAt: Generated<Timestamp>;
 }
 
 export interface UserKeyValue {
@@ -212,7 +222,7 @@ export interface UserKeyValue {
 export interface UserSettings {
   createdAt: Generated<Timestamp>;
   settings: Json;
-  updatedAt: Timestamp;
+  updatedAt: Generated<Timestamp>;
   userId: string;
 }
 

package/src/feature-toggles-config.ts

@@ -0,0 +1,19 @@
+/**
+ * this file is copyied into the SDK
+ * DO NOT IMPORT INTO THIS FILE.
+ */
+export type ToggleScope = "RemoteAndEditor" | "SiteAndEditor";
+
+export interface FeatureToggleConfig {
+  scope: ToggleScope;
+  canClose: boolean;
+  owner: string;
+}
+
+export const featureTogglesConfig: Record<string, FeatureToggleConfig> = {
+  test: {
+    scope: "SiteAndEditor",
+    canClose: true,
+    owner: "testOwner",
+  },
+};

package/src/types.gen.ts

@@ -83,6 +83,7 @@ export type Deployment = {
     createdAt: string;
     customDomain: string | null;
     customDomainStatus: 'success' | 'pending' | 'error' | null;
+    updatedAt: string;
 };
 
 export type ProjectRaw = {
@@ -219,6 +220,7 @@ export type TemplateRaw = {
         email: string;
     }> | null;
     screenshotUrl?: string | null;
+    updatedAt: string;
 };
 
 export type UploadConfiguration = {
@@ -401,6 +403,7 @@ export type UserRaw = {
     id: number;
     createdAt: string;
     picture: string | null;
+    updatedAt: string;
 } & {
     dazlId: string;
     name: string;
@@ -419,20 +422,20 @@ export type DeleteProjectInput = {
     /**
      * The admin user's internal ID
      */
-    adminUserId: number;
+    adminUserId?: number;
     /**
      * The admin user's Dazl ID
      */
-    adminDazlUserId?: string;
+    adminDazlUserId: string;
 } & {
     /**
      * The target user's internal ID
      */
-    targetUserId: number;
+    targetUserId?: number;
     /**
      * The target user's Dazl ID
      */
-    targetDazlUserId?: string;
+    targetDazlUserId: string;
 };
 
 export type CloneProjectCreateInput = {
@@ -444,22 +447,22 @@ export type CloneProjectCreateInput = {
     /**
      * The admin user's internal ID
      */
-    adminUserId: number;
+    adminUserId?: number;
     /**
      * The admin user's Dazl ID
      */
-    adminDazlUserId?: string;
+    adminDazlUserId: string;
 };
 
 export type CloneProjectLogInput = {
     /**
      * The internal ID of the original project owner
      */
-    originalProjectOwnerId: number;
+    originalProjectOwnerId?: number;
     /**
      * The Dazl ID of the original project owner
      */
-    originalProjectOwnerDazlId?: string;
+    originalProjectOwnerDazlId: string;
     /**
      * The ID of the original project
      */
@@ -472,11 +475,11 @@ export type CloneProjectLogInput = {
     /**
      * The admin user's internal ID
      */
-    adminUserId: number;
+    adminUserId?: number;
     /**
      * The admin user's Dazl ID
      */
-    adminDazlUserId?: string;
+    adminDazlUserId: string;
 };
 
 export type CleanupProjectInput = {
@@ -503,25 +506,26 @@ export type UpdateCreditsInput = {
     /**
      * The admin user's internal ID
      */
-    adminUserId: number;
+    adminUserId?: number;
     /**
      * The admin user's Dazl ID
      */
-    adminDazlUserId?: string;
+    adminDazlUserId: string;
 } & {
     /**
      * The target user's internal ID
      */
-    targetUserId: number;
+    targetUserId?: number;
     /**
      * The target user's Dazl ID
      */
-    targetDazlUserId?: string;
+    targetDazlUserId: string;
 };
 
 export type FeatureToggle = {
     name: string;
     scope: 'RemoteAndEditor' | 'SiteAndEditor';
+    updatedAt: string;
 };
 
 export type PurgeUserAccountInput = {