@upstart.gg/sdk 0.0.135 → 0.0.137

package/src/shared/context.ts

@@ -1,6 +1,14 @@
-import type { ImageSearchResultsType } from "./images";
-import type { VersionedPage } from "./page";
-import type { Site } from "./site";
+import { type Static, Type } from "@sinclair/typebox";
+import { imageResultsSchema } from "./images";
+import { versionedPageSchema } from "./page";
+import { siteSchema } from "./site";
+
+export const generationStateSchema = Type.Object({
+  isReady: Type.Boolean(),
+  isSetup: Type.Boolean(),
+  hasSitemap: Type.Boolean(),
+  hasThemesGenerated: Type.Boolean(),
+});
 
 export type GenerationState = {
   isReady: boolean;
@@ -9,24 +17,17 @@ export type GenerationState = {
   hasThemesGenerated: boolean;
 };
 
-export type CallContextProps = {
-  /**
-   * The site object
-   */
-  site: Site;
-  /**
-   * Current page. Undefined if flow is "setup" and no page has been created yet.
-   */
-  page: VersionedPage;
-
-  /**
-   * The current generation state of the site. Only used when flow is "setup".
-   */
-  generationState?: GenerationState;
-  /**
-   * The user language guessed from the sitePrompt, if available.
-   */
-  userLanguage?: string;
+export const callContextSchema = Type.Object({
+  site: siteSchema,
+  page: versionedPageSchema,
+  generationState: Type.Optional(generationStateSchema),
+  userLanguage: Type.Optional(
+    Type.String({
+      minLength: 2,
+      maxLength: 2,
+    }),
+  ),
+  assets: imageResultsSchema,
+});
 
-  assets: ImageSearchResultsType;
-};
+export type CallContextProps = Static<typeof callContextSchema>;

package/src/shared/datarecords/external/airtable/types.ts

@@ -1,4 +1,5 @@
 import { Type, type Static } from "@sinclair/typebox";
+import { StringEnum } from "~/shared/utils/string-enum";
 
 export const airtableFields = Type.Array(
   Type.Object({
@@ -48,16 +49,16 @@ export type AirtableBases = {
   name: string;
 }[];
 
-export const AirtableFieldTypes = Type.Union([
-  Type.Literal("number"),
-  Type.Literal("checkbox"),
-  Type.Literal("date"),
-  Type.Literal("dateTime"),
-  Type.Literal("email"),
-  Type.Literal("url"),
-  Type.Literal("singleLineText"),
-  Type.Literal("multilineText"),
-  Type.Literal("singleSelect"),
-  Type.Literal("multipleSelects"),
+export const AirtableFieldTypes = StringEnum([
+  "number",
+  "checkbox",
+  "date",
+  "dateTime",
+  "email",
+  "url",
+  "singleLineText",
+  "multilineText",
+  "singleSelect",
+  "multipleSelects",
 ]);
 export type AirtableFieldType = Static<typeof AirtableFieldTypes>;

package/src/shared/datarecords/types.ts

@@ -1,17 +1,10 @@
 import { Type, type Static } from "@sinclair/typebox";
 import { airtableOptions } from "./external/airtable/types";
-import { genericWebhookOptions } from "./external/generic-webhook/options";
 import { googleSheetsOptions } from "./external/google/sheets/types";
 import { notionOptions } from "./external/notion/types";
+import { StringEnum } from "../utils/string-enum";
 
-export const connectorSchema = Type.Union([
-  Type.Literal("airtable"),
-  Type.Literal("google-sheets"),
-  Type.Literal("notion"),
-  // Type.Literal("generic-webhook"),
-  // saved to Upstart platform
-  Type.Literal("internal"),
-]);
+export const connectorSchema = StringEnum(["airtable", "google-sheets", "notion", "internal"]);
 
 export type DatarecordConnector = Static<typeof connectorSchema>;
 
@@ -111,55 +104,40 @@ const commonDatarecordSchema = Type.Object({
   }),
 });
 
-export const datarecordsConnectors = Type.Union([
-  Type.Composite([
+const commonDatarecordMetadata = Type.Object({
+  id: Type.String({
+    title: "Datarecord ID",
+    comment: "A unique identifier for the datarecord, e.g., 'newsletter_subscriptions'",
+  }),
+  label: Type.String({
+    title: "Name of the datarecord",
+    comment: "For example, 'Newsletter Subscriptions'",
+  }),
+  description: Type.Optional(Type.String({ title: "Description of the datarecord" })),
+});
+
+export const genericDatarecord = Type.Composite([
+  Type.Union([
     Type.Object({
       provider: Type.Literal("airtable"),
       options: airtableOptions,
     }),
-    commonDatarecordSchema,
-  ]),
-  Type.Composite([
     Type.Object({
       provider: Type.Literal("google-sheets"),
       options: googleSheetsOptions,
     }),
-    commonDatarecordSchema,
-  ]),
-  Type.Composite([
     Type.Object({
       provider: Type.Literal("notion"),
       options: notionOptions,
     }),
-    commonDatarecordSchema,
+    internalDatarecord,
   ]),
-  // Type.Composite([
-  //   Type.Object({
-  //     provider: Type.Literal("generic-webhook"),
-  //     options: genericWebhookOptions,
-  //   }),
-  //   commonDatarecordSchema,
-  // ]),
-  internalDatarecord,
+  commonDatarecordMetadata,
+  commonDatarecordSchema,
 ]);
 
-const datarecordMetadata = Type.Object({
-  id: Type.String({
-    title: "Datarecord ID",
-    comment: "A unique identifier for the datarecord, e.g., 'newsletter_subscriptions'",
-  }),
-  label: Type.String({
-    title: "Name of the datarecord",
-    comment: "For example, 'Newsletter Subscriptions'",
-  }),
-  description: Type.Optional(Type.String({ title: "Description of the datarecord" })),
-});
-
-const datarecordManifest = Type.Composite([datarecordsConnectors, datarecordMetadata]);
-
-export const internalDatarecordManifest = Type.Composite([datarecordMetadata, internalDatarecord]);
-export type InternalDatarecord = Static<typeof internalDatarecordManifest>;
-export type Datarecord = Static<typeof datarecordManifest>;
+export type Datarecord = Static<typeof genericDatarecord>;
+export type InternalDatarecord = Extract<Datarecord, { provider: "internal" }>;
 
-export const datarecordsList = Type.Array(datarecordManifest);
+export const datarecordsList = Type.Array(genericDatarecord);
 export type DatarecordsList = Static<typeof datarecordsList>;

package/src/shared/datasources/external/instagram/feed/schema.ts

@@ -1,4 +1,5 @@
 import { Type, type Static } from "@sinclair/typebox";
+import { StringEnum } from "../../../../utils/string-enum";
 
 export const instagramFeedSchema = Type.Object({
   data: Type.Array(
@@ -8,7 +9,7 @@ export const instagramFeedSchema = Type.Object({
       timestamp: Type.String(),
       media_url: Type.String(),
       permalink: Type.String(),
-      media_type: Type.Union([Type.Literal("IMAGE"), Type.Literal("VIDEO"), Type.Literal("CAROUSEL_ALBUM")]),
+      media_type: StringEnum(["IMAGE", "VIDEO", "CAROUSEL_ALBUM"]),
     }),
   ),
   paging: Type.Object({

package/src/shared/datasources/external/mastodon/status/schema.ts

@@ -1,15 +1,10 @@
 import { Type, type Static } from "@sinclair/typebox";
+import { StringEnum } from "../../../../utils/string-enum";
 import { mastodonAccountSchema } from "../account/schema";
 
 const mastodonMediaAttachmentSchema = Type.Object({
   id: Type.String(),
-  type: Type.Union([
-    Type.Literal("audio"),
-    Type.Literal("image"),
-    Type.Literal("video"),
-    Type.Literal("gifv"),
-    Type.Literal("unknown"),
-  ]),
+  type: StringEnum(["audio", "image", "video", "gifv", "unknown"]),
   url: Type.String(),
   preview_url: Type.Optional(Type.String()),
   remote_url: Type.Optional(Type.String()),
@@ -30,12 +25,7 @@ const mastodonPreviewCardSchema = Type.Object({
   url: Type.String(),
   title: Type.String(),
   description: Type.String(),
-  type: Type.Union([
-    Type.Literal("link"),
-    Type.Literal("photo"),
-    Type.Literal("video"),
-    Type.Literal("rich"),
-  ]),
+  type: StringEnum(["link", "photo", "video", "rich"]),
   author_name: Type.String(),
   author_url: Type.String(),
   provider_name: Type.String(),
@@ -71,12 +61,7 @@ export const mastodonStatusSchema = Type.Object({
   created_at: Type.String(),
   account: mastodonAccountSchema,
   content: Type.String(),
-  visibility: Type.Union([
-    Type.Literal("public"),
-    Type.Literal("unlisted"),
-    Type.Literal("private"),
-    Type.Literal("direct"),
-  ]),
+  visibility: StringEnum(["public", "unlisted", "private", "direct"]),
   sensitive: Type.Boolean(),
   media_attachments: Type.Array(mastodonMediaAttachmentSchema),
   application: Type.Optional(

package/src/shared/datasources/external/meta/oauth/config.ts

@@ -1,8 +1,9 @@
 import { Type, type Static, type StaticDecode } from "@sinclair/typebox";
+import { StringEnum } from "../../../../utils/string-enum";
 import { buildOAuthConfigSchema } from "~/shared/oauth";
 
 const metaOAuthConfig = Type.Object({
-  type: Type.Union([Type.Literal("short-lived"), Type.Literal("long-lived")]),
+  type: StringEnum(["short-lived", "long-lived"]),
   accessToken: Type.String(),
   userId: Type.String(),
   permissions: Type.Array(Type.String()),

package/src/shared/datasources/external/threads/media/schema.ts

@@ -1,18 +1,12 @@
 import { Type, type Static } from "@sinclair/typebox";
+import { StringEnum } from "../../../../utils/string-enum";
 
 export const threadsMediaSchema = Type.Object({
   data: Type.Array(
     Type.Object({
       id: Type.String(),
       media_product_type: Type.Literal("THREADS"),
-      media_type: Type.Union([
-        Type.Literal("TEXT_POST"),
-        Type.Literal("IMAGE"),
-        Type.Literal("VIDEO"),
-        Type.Literal("CAROUSEL_ALBUM"),
-        Type.Literal("AUDIO"),
-        Type.Literal("REPOST_FACADE"),
-      ]),
+      media_type: StringEnum(["TEXT_POST", "IMAGE", "VIDEO", "CAROUSEL_ALBUM", "AUDIO", "REPOST_FACADE"]),
       media_url: Type.String(),
       permalink: Type.String(),
       owner: Type.Object({

package/src/shared/datasources/internal/blog/schema.ts

@@ -1,4 +1,5 @@
 import { Type, type Static } from "@sinclair/typebox";
+import { StringEnum } from "../../../utils/string-enum";
 
 export const blogSchema = Type.Array(
   Type.Object({
@@ -39,7 +40,7 @@ export const blogSchema = Type.Array(
       pattern: "^[a-z0-9]+(?:-[a-z0-9]+)*$",
       description: "URL-friendly version of the title",
     }),
-    status: Type.Union([Type.Literal("draft"), Type.Literal("published"), Type.Literal("archived")], {
+    status: StringEnum(["draft", "published", "archived"], {
       title: "Status",
       description: "Publication status of the blog post",
     }),

package/src/shared/datasources/types.ts

@@ -2,26 +2,26 @@ import { Type, type Static } from "@sinclair/typebox";
 import { StringEnum } from "../utils/string-enum";
 import { toLLMSchema } from "../utils/llm";
 
-export const providersSchema = Type.Union([
-  // Type.Literal("facebook-posts"),
-  // Type.Literal("instagram-feed"),
-  // Type.Literal("mastodon-account"),
-  // Type.Literal("mastodon-status"),
-  // Type.Literal("mastodon-status-list"),
-  Type.Literal("internal"),
-  // Type.Literal("rss"),
-  // // Type.Literal("threads-media"),
-  // // Type.Literal("tiktok-video"),
-  // Type.Literal("youtube-list"),
-  // Type.Literal("http-json"),
-  // Type.Literal("internal-blog"),
-  // Type.Literal("internal-changelog"),
-  // // Type.Literal("internal-contact-info"),
-  // Type.Literal("internal-faq"),
-  // Type.Literal("internal-links"),
-  // Type.Literal("internal-recipes"),
-  // Type.Literal("internal-restaurant"),
-  // Type.Literal("internal-cv"),
+export const providersSchema = StringEnum([
+  // "facebook-posts",
+  // "instagram-feed",
+  // "mastodon-account",
+  // "mastodon-status",
+  // "mastodon-status-list",
+  "internal",
+  // "rss",
+  // // "threads-media",
+  // // "tiktok-video",
+  // "youtube-list",
+  // "http-json",
+  // "internal-blog",
+  // "internal-changelog",
+  // // "internal-contact-info",
+  // "internal-faq",
+  // "internal-links",
+  // "internal-recipes",
+  // "internal-restaurant",
+  // "internal-cv",
 ]);
 
 export type DatasourceProvider = Static<typeof providersSchema>;
@@ -77,19 +77,17 @@ const datasourceInternalManifest = Type.Object(
       title: "Schema",
       description: "JSON Schema of datasource. MUST Always an array of objects.",
     }),
-    indexes: Type.Optional(
-      Type.Array(
-        Type.Object({
-          name: Type.String({ title: "Index name" }),
-          fields: Type.Array(Type.String(), { title: "Fields to index" }),
-          unique: Type.Optional(Type.Boolean({ title: "Unique index", default: false })),
-        }),
-        {
-          title: "Indexes",
-          description:
-            "IMPORTANT: Indexes to create on the datasource. use it to enforce uniqueness or improve query performance.",
-        },
-      ),
+    indexes: Type.Array(
+      Type.Object({
+        name: Type.String({ title: "Index name" }),
+        fields: Type.Array(Type.String(), { title: "Fields to index" }),
+        unique: Type.Optional(Type.Boolean({ title: "Unique index", default: false })),
+      }),
+      {
+        title: "Indexes",
+        description:
+          "IMPORTANT: Indexes to create on the datasource. use it to enforce uniqueness or improve query performance.",
+      },
     ),
   },
   {
@@ -243,53 +241,40 @@ export type DatasourcesList = Static<typeof datasourcesList>;
 
 const stringFilter = Type.Object({
   field: Type.String(),
-  op: Type.Union([
-    Type.Literal("eq"),
-    Type.Literal("ne"),
-    Type.Literal("contains"),
-    Type.Literal("notContains"),
-    Type.Literal("startsWith"),
-    Type.Literal("notStartsWith"),
-    Type.Literal("endsWith"),
-    Type.Literal("notEndsWith"),
+  op: StringEnum([
+    "eq",
+    "ne",
+    "contains",
+    "notContains",
+    "startsWith",
+    "notStartsWith",
+    "endsWith",
+    "notEndsWith",
   ]),
   value: Type.String(),
 });
 
 const numberFilter = Type.Object({
   field: Type.String(),
-  op: Type.Union([
-    Type.Literal("eq"),
-    Type.Literal("ne"),
-    Type.Literal("lt"),
-    Type.Literal("lte"),
-    Type.Literal("gt"),
-    Type.Literal("gte"),
-  ]),
+  op: StringEnum(["eq", "ne", "lt", "lte", "gt", "gte"]),
   value: Type.Number(),
 });
 
 const dateFilterAbsolute = Type.Object({
   field: Type.String(),
-  op: Type.Union([Type.Literal("before"), Type.Literal("after")]),
+  op: StringEnum(["before", "after"]),
   value: Type.String(),
 });
 
 const dateFilterRelative = Type.Object({
   field: Type.String(),
-  op: Type.Union([Type.Literal("beforeNow"), Type.Literal("afterNow")]),
+  op: StringEnum(["beforeNow", "afterNow"]),
   value: Type.Null(),
 });
 
 const arrayFilter = Type.Object({
   field: Type.String(),
-  op: Type.Union([
-    Type.Literal("contains"),
-    Type.Literal("notContains"),
-    Type.Literal("containsAll"),
-    Type.Literal("containsAny"),
-    Type.Literal("notContainsAny"),
-  ]),
+  op: StringEnum(["contains", "notContains", "containsAll", "containsAny", "notContainsAny"]),
   value: Type.Array(Type.String()),
 });
 
@@ -392,27 +377,27 @@ export const querySchema = Type.Object(
       Type.Array(
         Type.Object({
           field: Type.String({ title: "Field", description: "Field name to use as parameter" }),
-          op: Type.Union(
+          op: StringEnum(
             [
-              Type.Literal("eq"),
-              Type.Literal("ne"),
-              Type.Literal("contains"),
-              Type.Literal("notContains"),
-              Type.Literal("startsWith"),
-              Type.Literal("notStartsWith"),
-              Type.Literal("endsWith"),
-              Type.Literal("notEndsWith"),
-              Type.Literal("lt"),
-              Type.Literal("lte"),
-              Type.Literal("gt"),
-              Type.Literal("gte"),
-              Type.Literal("before"),
-              Type.Literal("after"),
-              Type.Literal("beforeNow"),
-              Type.Literal("afterNow"),
-              Type.Literal("containsAll"),
-              Type.Literal("containsAny"),
-              Type.Literal("notContainsAny"),
+              "eq",
+              "ne",
+              "contains",
+              "notContains",
+              "startsWith",
+              "notStartsWith",
+              "endsWith",
+              "notEndsWith",
+              "lt",
+              "lte",
+              "gt",
+              "gte",
+              "before",
+              "after",
+              "beforeNow",
+              "afterNow",
+              "containsAll",
+              "containsAny",
+              "notContainsAny",
             ],
             { title: "Operator", description: "Operator to use for the parameter" },
           ),

package/src/shared/datasources.ts

@@ -1,5 +1,5 @@
-import type { Datasource } from "./datasources/types";
 import type { TArray } from "@sinclair/typebox";
+import type { Datasource } from "./datasources/types";
 
 /**
  * For now, defineDatasources() force the usage of a custom (internal) datasource
@@ -33,9 +33,7 @@ export function mapDatasourceSchemaWithInternalProperties(schema: TArray): Datas
         $publicationDate: { type: "string", format: "date-time", title: "Publication Date" },
         $lastModificationDate: { type: "string", format: "date-time", title: "Last Modification Date" },
       },
-      required: Array.from(
-        new Set(["$id", "$slug", "$publicationDate", "$lastModificationDate", ...items.required]),
-      ),
+      required: Array.from(new Set(["$id", "$slug", "$lastModificationDate", ...items.required])),
     },
   };
 }

package/src/shared/images.ts

@@ -16,24 +16,18 @@ export const imageSearchSchema = Type.Object({
 export type ImageSearchParams = Static<typeof imageSearchSchema>;
 
 export const imageResultsSchema = Type.Array(
-  Type.Object(
-    {
-      provider: Type.String({ description: "The image provider (e.g. unsplash, pexels)" }),
-      description: Type.String({ description: "A brief description of the image" }),
-      url: Type.String({ description: "The URL of the image" }),
-      blurHash: Type.Optional(Type.String({ description: "The blur hash of the image" })),
-      author: Type.Optional(
-        Type.Object(
-          {
-            name: Type.String({ description: "The name of the user who uploaded the image" }),
-            profile_url: Type.String({ description: "The profile URL of the user who uploaded the image" }),
-          },
-          { additionalProperties: false },
-        ),
-      ),
-    },
-    { additionalProperties: false },
-  ),
+  Type.Object({
+    provider: Type.String({ description: "The image provider (e.g. unsplash, pexels)" }),
+    description: Type.String({ description: "A brief description of the image" }),
+    url: Type.String({ description: "The URL of the image" }),
+    blurHash: Type.Optional(Type.String({ description: "The blur hash of the image" })),
+    author: Type.Optional(
+      Type.Object({
+        name: Type.String({ description: "The name of the user who uploaded the image" }),
+        profileUrl: Type.String({ description: "The profile URL of the user who uploaded the image" }),
+      }),
+    ),
+  }),
   {
     title: "Array of image search results",
   },

package/src/shared/page.ts

@@ -1,7 +1,6 @@
 import { pageAttributesSchema } from "./attributes";
 import { sectionSchema } from "./bricks";
 import { Type, type Static } from "@sinclair/typebox";
-import { toLLMSchema } from "./utils/llm";
 
 export const pageSchema = Type.Object({
   id: Type.String({
@@ -19,7 +18,15 @@ export const pageSchema = Type.Object({
 });
 
 export type Page = Static<typeof pageSchema>;
-export type VersionedPage = Page & { version: string };
+
+export const versionedPageSchema = Type.Composite([
+  pageSchema,
+  Type.Object({
+    version: Type.String(),
+  }),
+]);
+
+export type VersionedPage = Static<typeof versionedPageSchema>;
 
 /**
  * Page context represents the page config PLUS:

package/src/shared/site.ts

@@ -1,11 +1,11 @@
 import { Type, type Static } from "@sinclair/typebox";
+import { resolvePageAttributes, resolveSiteAttributes, siteAttributesSchema } from "./attributes";
 import { datarecordsList } from "./datarecords/types";
 import { datasourcesList } from "./datasources/types";
 import { pageSchema } from "./page";
 import { sitePrompt } from "./prompt";
 import { sitemapSchema } from "./sitemap";
 import { defaultTheme, themeSchema } from "./theme";
-import { resolvePageAttributes, resolveSiteAttributes, siteAttributesSchema } from "./attributes";
 
 export const siteSchema = Type.Object({
   id: Type.String(),
@@ -34,7 +34,7 @@ export function createEmptyConfig(sitePrompt: string): SiteAndPagesConfig {
   return {
     site: {
       id: crypto.randomUUID(),
-      label: "My site",
+      label: `My site ${new Date().toLocaleString(undefined, { dateStyle: "short", timeStyle: "short" })}`,
       hostname: "example.com",
       sitePrompt,
       theme: defaultTheme,
@@ -48,7 +48,7 @@ export function createEmptyConfig(sitePrompt: string): SiteAndPagesConfig {
     pages: [
       {
         id: "_default_",
-        label: "First page with really really long name that should be truncated",
+        label: "First page",
         sections: [],
         attributes: resolvePageAttributes({
           path: "/",