@upstart.gg/sdk 0.0.136 → 0.0.138

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,25 +17,17 @@ export type GenerationState = {
   hasThemesGenerated: boolean;
 };
 
-export type CallContextProps = {
-  userId: string;
-  /**
-   * 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

@@ -2,13 +2,9 @@ import { Type, type Static } from "@sinclair/typebox";
 import { airtableOptions } from "./external/airtable/types";
 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("internal"),
-]);
+export const connectorSchema = StringEnum(["airtable", "google-sheets", "notion", "internal"]);
 
 export type DatarecordConnector = Static<typeof connectorSchema>;
 
@@ -140,34 +136,6 @@ export const genericDatarecord = Type.Composite([
   commonDatarecordSchema,
 ]);
 
-// export const genericDatarecord = Type.Union([
-//   Type.Composite([
-//     Type.Object({
-//       provider: Type.Literal("airtable"),
-//       options: airtableOptions,
-//     }),
-//     commonDatarecordMetadata,
-//     commonDatarecordSchema,
-//   ]),
-//   Type.Composite([
-//     Type.Object({
-//       provider: Type.Literal("google-sheets"),
-//       options: googleSheetsOptions,
-//     }),
-//     commonDatarecordMetadata,
-//     commonDatarecordSchema,
-//   ]),
-//   Type.Composite([
-//     Type.Object({
-//       provider: Type.Literal("notion"),
-//       options: notionOptions,
-//     }),
-//     commonDatarecordMetadata,
-//     commonDatarecordSchema,
-//   ]),
-//   Type.Composite([internalDatarecord, commonDatarecordMetadata, commonDatarecordSchema]),
-// ]);
-
 export type Datarecord = Static<typeof genericDatarecord>;
 export type InternalDatarecord = Extract<Datarecord, { provider: "internal" }>;
 

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/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

@@ -6,6 +6,7 @@ export const pageSchema = Type.Object({
   id: Type.String({
     description: "The unique ID of the page. Use a human readable url-safe slug",
     examples: ["home", "about-us", "products-list"],
+    pattern: "^[a-z0-9-_]+$",
   }),
   label: Type.String({
     description: "The label (name) of the page",
@@ -18,7 +19,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

@@ -47,6 +47,7 @@ export function createEmptyConfig(sitePrompt: string): SiteAndPagesConfig {
     // we need a fake page
     pages: [
       {
+        // Keep this fake id as is!
         id: "_default_",
         label: "First page",
         sections: [],

package/src/shared/sitemap.ts

@@ -1,61 +1,12 @@
 import { Type, type Static } from "@sinclair/typebox";
 import { StringEnum } from "./utils/string-enum";
 import { pageSchema } from "./page";
-import { toLLMSchema } from "./utils/llm";
-
-export const sitemapPageEntry = Type.Pick(pageSchema, ["id", "label", "path", "attributes"]);
-export type SitemapPageEntry = Static<typeof sitemapPageEntry>;
-
-export const sectionsPlanSchema = Type.Array(
-  Type.Object(
-    {
-      id: Type.String({
-        title: "Section ID",
-        examples: ["header-section", "hero-section", "features-section"],
-        format: "slug",
-      }),
-      name: Type.String({ title: "Section name", examples: ["Header", "Hero", "Features"] }),
-      description: Type.String({
-        title: "A long description of the section",
-        description: `You must elaborate a clear and detailled plan that describes:
-- The section purpose in the page, in detail.
-- The section structure, look & feel, and structural/design organization, in detail
-- the types of bricks (e.g. "container", "text", "video", "carousel", etc) that will be used and their purpose, in detail
-
-IMPORTANT: be very descriptive and precise in your plan. The more details you provide, the better the generated page will be.`,
-
-        examples: [
-          "This section contains a `hero` and a call-to-action `button`. All of theme aligned horizontally. The section should market a coffee shop.",
-          "This section should contain a `hero` text and an `image`.",
-        ],
-      }),
-    },
-    { additionalProperties: false },
-  ),
-  {
-    title: "Sections plan",
-    description: "A plan for the sections of the page. Used to generate the page content.",
-    examples: [
-      [
-        {
-          id: "header-section",
-          name: "Header",
-          description: "This section only contains a header brick",
-        },
-        {
-          id: "hero-section",
-          name: "Hero",
-          description:
-            "This is the hero section of the page. It should display a marketing message using a hero brick, as well as a button (CTA). The section should center bricks horizontally.",
-        },
-      ],
-    ],
-  },
-);
+import { pageAttributesSchema } from "./attributes";
 
 export const sitemapEntry = Type.Composite(
   [
-    sitemapPageEntry,
+    Type.Pick(pageSchema, ["id", "label"]),
+    Type.Pick(pageAttributesSchema, ["path", "tags"]),
     Type.Object({
       status: Type.Optional(
         StringEnum(["draft", "published"], {
@@ -65,32 +16,14 @@ export const sitemapEntry = Type.Composite(
           "ai:hidden": true,
           description:
             "The status of the page. Can be draft or published. [AI instructions: Dont generate this.]",
-          "ai:instructions": "Upsie: Never generate this optional field.",
         }),
       ),
     }),
   ],
   {
     description: "Pages map. The complete list of site pages & their metadata",
-    additionalProperties: false,
   },
 );
 
 export const sitemapSchema = Type.Array(sitemapEntry);
 export type Sitemap = Static<typeof sitemapSchema>;
-
-export const sitemapSchemaLLM = toLLMSchema(
-  Type.Array(
-    Type.Composite([
-      sitemapEntry,
-      Type.Object({
-        // Sections plan helps agents to the structure and content of the page
-        sectionsPlan: sectionsPlanSchema,
-      }),
-    ]),
-  ),
-);
-
-export type SitemapWithPlans = Static<typeof sitemapSchemaLLM>;
-
-export const sitemapSchemaNoPlansLLM = toLLMSchema(sitemapSchema);

package/src/shared/tests/attributes.test.ts

@@ -16,6 +16,8 @@ describe("Attributes test suite", () => {
         title: "Untitled",
         description: "",
         keywords: "",
+        queries: [],
+        tags: [],
       });
     });
   });