@elumixor/notion-orm 2.1.3 → 2.2.1

package/dist/cli.js

@@ -174152,7 +174152,10 @@ async function resolveDataSourceId(auth, id) {
     const dataSources = database.data_sources;
     if (dataSources && dataSources.length > 0)
       return dataSources[0].id;
-  } catch {}
+  } catch (error2) {
+    if (!(import_client.APIResponseError.isAPIResponseError(error2) && error2.code === import_client.APIErrorCode.ObjectNotFound))
+      throw error2;
+  }
   await probeClient.dataSources.retrieve({ data_source_id: id });
   return id;
 }

package/dist/db-client/client.d.ts

@@ -1,5 +1,6 @@
 import type { ZodTypeAny } from "zod";
 import type { FindManyArgs, IconCoverResult, PaginateArgs, QueryFilter, SupportedNotionColumnType } from "./types";
+export type ImageInput = string | Blob | Uint8Array;
 export type camelPropertyNameToNameAndTypeMapType = Record<string, {
     columnName: string;
     type: SupportedNotionColumnType;
@@ -107,16 +108,16 @@ export declare class DatabaseClient<DatabaseSchemaType extends Record<string, an
     /** Create a new record and return it. */
     create(args: {
         data: DatabaseSchemaType;
-        $icon?: string | null;
-        $cover?: string | null;
+        $icon?: ImageInput | null;
+        $cover?: ImageInput | null;
     }): Promise<Partial<DatabaseSchemaType> & {
         id: string;
     }>;
     /** Create multiple records and return them. */
     createMany(args: {
         data: DatabaseSchemaType[];
-        $icon?: string | null;
-        $cover?: string | null;
+        $icon?: ImageInput | null;
+        $cover?: ImageInput | null;
     }): Promise<(Partial<DatabaseSchemaType> & {
         id: string;
     })[]>;
@@ -126,15 +127,15 @@ export declare class DatabaseClient<DatabaseSchemaType extends Record<string, an
             id: string;
         };
         data: Partial<DatabaseSchemaType>;
-        $icon?: string | null;
-        $cover?: string | null;
+        $icon?: ImageInput | null;
+        $cover?: ImageInput | null;
     }): Promise<void>;
     /** Update all records matching the filter. Returns the count of updated records. */
     updateMany(args: {
         where?: QueryFilter<DatabaseSchemaType, ColumnNameToColumnType>;
         data: Partial<DatabaseSchemaType>;
-        $icon?: string | null;
-        $cover?: string | null;
+        $icon?: ImageInput | null;
+        $cover?: ImageInput | null;
     }): Promise<{
         count: number;
     }>;
@@ -143,8 +144,8 @@ export declare class DatabaseClient<DatabaseSchemaType extends Record<string, an
         where: QueryFilter<DatabaseSchemaType, ColumnNameToColumnType>;
         create: DatabaseSchemaType;
         update: Partial<DatabaseSchemaType>;
-        $icon?: string | null;
-        $cover?: string | null;
+        $icon?: ImageInput | null;
+        $cover?: ImageInput | null;
     }): Promise<{
         created: boolean;
         id: string;
@@ -166,6 +167,7 @@ export declare class DatabaseClient<DatabaseSchemaType extends Record<string, an
         where?: QueryFilter<DatabaseSchemaType, ColumnNameToColumnType>;
     }): Promise<number>;
     private buildCreateBody;
+    private resolveIconCover;
     private parsePage;
     private buildQueryCall;
     private fetchAllPages;

package/dist/index.js

@@ -1619,6 +1619,26 @@ function recursivelyBuildFilter(queryFilter, camelPropertyNameToNameAndTypeMap)
 }
 
 // src/db-client/client.ts
+var MIME_TO_EXT = {
+  "image/jpeg": "jpg",
+  "image/png": "png",
+  "image/gif": "gif",
+  "image/webp": "webp",
+  "image/svg+xml": "svg",
+  "image/avif": "avif"
+};
+function sniffMimeType(bytes) {
+  if (bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255)
+    return "image/jpeg";
+  if (bytes[0] === 137 && bytes[1] === 80 && bytes[2] === 78 && bytes[3] === 71)
+    return "image/png";
+  if (bytes[0] === 71 && bytes[1] === 73 && bytes[2] === 70)
+    return "image/gif";
+  if (bytes[8] === 87 && bytes[9] === 69 && bytes[10] === 66 && bytes[11] === 80)
+    return "image/webp";
+  return "application/octet-stream";
+}
+
 class DatabaseClient {
   client;
   id;
@@ -1681,7 +1701,7 @@ class DatabaseClient {
     }
   }
   async create(args) {
-    const callBody = this.buildCreateBody(args.data, args.$icon, args.$cover);
+    const callBody = await this.buildCreateBody(args.data, args.$icon, args.$cover);
     const page = await this.client.pages.create(callBody);
     return this.parsePage(page);
   }
@@ -1690,10 +1710,11 @@ class DatabaseClient {
   }
   async update(args) {
     const callBody = { page_id: args.where.id, properties: {} };
-    if (args.$icon !== undefined)
-      callBody.icon = args.$icon === null ? null : { type: "external", external: { url: args.$icon } };
-    if (args.$cover !== undefined)
-      callBody.cover = args.$cover === null ? null : { type: "external", external: { url: args.$cover } };
+    const [icon, cover] = await Promise.all([this.resolveIconCover(args.$icon), this.resolveIconCover(args.$cover)]);
+    if (icon !== undefined)
+      callBody.icon = icon;
+    if (cover !== undefined)
+      callBody.cover = cover;
     for (const [propertyName, value] of Object.entries(args.data)) {
       const { type, columnName } = this.camelPropertyNameToNameAndTypeMap[propertyName];
       const columnObject = buildPropertyValueForAddPage({ type, value });
@@ -1733,15 +1754,16 @@ class DatabaseClient {
     const results = await this.fetchAllPages(queryCall, {});
     return results.length;
   }
-  buildCreateBody(data, $icon, $cover) {
+  async buildCreateBody(data, $icon, $cover) {
     const callBody = {
       parent: { data_source_id: this.id, type: "data_source_id" },
       properties: {}
     };
-    if ($icon !== undefined)
-      callBody.icon = $icon === null ? null : { type: "external", external: { url: $icon } };
-    if ($cover !== undefined)
-      callBody.cover = $cover === null ? null : { type: "external", external: { url: $cover } };
+    const [icon, cover] = await Promise.all([this.resolveIconCover($icon), this.resolveIconCover($cover)]);
+    if (icon !== undefined)
+      callBody.icon = icon;
+    if (cover !== undefined)
+      callBody.cover = cover;
     for (const [propertyName, value] of Object.entries(data)) {
       const { type, columnName } = this.camelPropertyNameToNameAndTypeMap[propertyName];
       const columnObject = buildPropertyValueForAddPage({ type, value });
@@ -1750,6 +1772,22 @@ class DatabaseClient {
     }
     return callBody;
   }
+  async resolveIconCover(value) {
+    if (value === undefined)
+      return;
+    if (value === null)
+      return null;
+    if (typeof value === "string")
+      return { type: "external", external: { url: value } };
+    const bytes = value instanceof Blob ? new Uint8Array(await value.arrayBuffer()) : value;
+    const contentType = value instanceof Blob && value.type ? value.type : sniffMimeType(bytes);
+    const ext = MIME_TO_EXT[contentType] ?? "bin";
+    const filename = `upload.${ext}`;
+    const blob = new Blob([bytes], { type: contentType });
+    const upload = await this.client.fileUploads.create({ filename, content_type: contentType });
+    await this.client.fileUploads.send({ file_upload_id: upload.id, file: { data: blob, filename } });
+    return { type: "file_upload", file_upload: { id: upload.id } };
+  }
   parsePage(page, meta) {
     const result = { id: page.id };
     for (const [columnName, value] of Object.entries(page.properties)) {

package/dist/public-api.d.ts

@@ -3,5 +3,6 @@
  * External users' generated files import DatabaseClient and types from here.
  */
 export { DatabaseClient } from "./db-client/client";
+export type { ImageInput } from "./db-client/client";
 export type { FindManyArgs, PaginateArgs, Query, QueryFilter, QueryResult, QueryResultType, OrderByInput, SupportedNotionColumnType, } from "./db-client/types";
 export type { NotionConfigType } from "./config/helpers";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elumixor/notion-orm",
-  "version": "2.1.3",
+  "version": "2.2.1",
   "type": "module",
   "description": "Bring Notion database schemas/types to TypeScript",
   "main": "dist/index.js",