@haustle/notion-orm 0.0.38 → 0.0.42

package/src/{NotionConfig.ts → index.ts}

@@ -1,10 +1,13 @@
+/**
+ * Responsible for consuming notion.config.js
+ */
+
 import { Client } from "@notionhq/client";
 import { GetDatabaseResponse } from "@notionhq/client/build/src/api-endpoints";
 import { createTypescriptFileForDatabase } from "./GenerateTypes";
 import * as ts from "typescript";
 import fs from "fs";
 import path from "path";
-require("dotenv").config();
 
 export const DATABASES_DIR = path.join(__dirname, "../../build", "databases");
 
@@ -13,13 +16,8 @@ export type NotionConfigType = {
 	databaseIds: string[];
 };
 
-type importClassType = {
-	databaseId: string;
-	databaseClassName: string;
-};
-
-export const createDatabaseTypes = async (notionInfo: NotionConfigType) => {
-	const { auth, databaseIds } = notionInfo;
+export const createDatabaseTypes = async (args: NotionConfigType) => {
+	const { auth, databaseIds } = args;
 
 	// Making sure the user is passing valid arguments
 	if (!auth) {
@@ -62,7 +60,6 @@ export const createDatabaseTypes = async (notionInfo: NotionConfigType) => {
 			databaseClassExportStatements.push(
 				databaseExportStatement({
 					databaseClassName,
-					databaseId,
 				})
 			);
 		} catch (e) {
@@ -72,12 +69,16 @@ export const createDatabaseTypes = async (notionInfo: NotionConfigType) => {
 	}
 
 	// Create a file that exports all databases
-	createNotionFile([...databaseClassExportStatements]);
+	createDatabaseBarrelFile({
+		databaseClassExportStatements,
+	});
 	return { databaseNames };
 };
 
-// Create the import statement for notion.ts file
-function databaseExportStatement(dbClass: importClassType) {
+// Create the export statement for database file file
+// export { databaseName } from "./databaseName"
+function databaseExportStatement(args: { databaseClassName: string }) {
+	const { databaseClassName } = args;
 	return ts.factory.createExportDeclaration(
 		undefined,
 		false,
@@ -85,17 +86,20 @@ function databaseExportStatement(dbClass: importClassType) {
 			ts.factory.createExportSpecifier(
 				false,
 				undefined,
-				ts.factory.createIdentifier(dbClass.databaseClassName)
+				ts.factory.createIdentifier(databaseClassName)
 			),
 		]),
-		ts.factory.createStringLiteral(`./${dbClass.databaseId}`),
+		ts.factory.createStringLiteral(`./${databaseClassName}`),
 		undefined
 	);
 }
 
 // Creates file that import all generated notion database Ids
-function createNotionFile(nodeArr: ts.Node[]) {
-	const nodes = ts.factory.createNodeArray(nodeArr);
+function createDatabaseBarrelFile(args: {
+	databaseClassExportStatements: ts.Node[];
+}) {
+	const { databaseClassExportStatements } = args;
+	const nodes = ts.factory.createNodeArray(databaseClassExportStatements);
 	const sourceFile = ts.createSourceFile(
 		"placeholder.ts",
 		"",
@@ -122,11 +126,11 @@ function createNotionFile(nodeArr: ts.Node[]) {
 
 	// Create TypeScript and JavaScript file
 	fs.writeFileSync(
-		path.resolve(DATABASES_DIR, "notion.ts"),
+		path.resolve(DATABASES_DIR, "index.ts"),
 		typescriptCodeToString
 	);
 	fs.writeFileSync(
-		path.resolve(DATABASES_DIR, "notion.js"),
-		typescriptCodeToString
+		path.resolve(DATABASES_DIR, "index.js"),
+		transpileToJavaScript
 	);
 }

package/src/queryTypes.ts

@@ -6,18 +6,22 @@
 import { PageObjectResponse } from "@notionhq/client/build/src/api-endpoints";
 
 type columnDiscriminatedUnionTypes = PageObjectResponse["properties"];
-type NotionColumnTypes =
+export type NotionColumnTypes =
 	columnDiscriminatedUnionTypes[keyof columnDiscriminatedUnionTypes]["type"];
-
-export type FilterOptionNames =
-	| "text"
-	| "title"
-	| "number"
-	| "checkbox"
-	| "select"
-	| "multi_select"
-	| "url"
-	| "date";
+// type SupportedQueryableNotionColumnTypes = Exclude<NotionColumnTypes, "created_by" | >
+
+export type SupportedNotionColumnTypes = Exclude<
+	NotionColumnTypes,
+	| "formula"
+	| "files"
+	| "people"
+	| "relation"
+	| "rollup"
+	| "created_by"
+	| "last_edited_by"
+	| "created_time"
+	| "last_edited_time"
+>;
 
 type TextPropertyFilters = {
 	equals: string;
@@ -62,11 +66,14 @@ type MultiSelectPropertyFilters<T> = {
 	is_not_empty: true;
 };
 
+type StatusPropertyFilters<T> = SelectPropertyFilters<T>;
+
+type ISO8601Date = string;
 type DatePropertyFilters = {
-	equals: string;
-	before: string;
-	after: string;
-	on_or_before: string;
+	equals: ISO8601Date;
+	before: ISO8601Date;
+	after: ISO8601Date;
+	on_or_before: ISO8601Date;
 	is_empty: true;
 	is_not_empty: true;
 	on_or_after: string;
@@ -80,25 +87,27 @@ type DatePropertyFilters = {
 };
 
 export type FilterOptions<T = []> = {
-	text: TextPropertyFilters;
+	rich_text: TextPropertyFilters;
 	title: TextPropertyFilters;
 	number: NumberPropertyFilters;
 	checkbox: CheckBoxPropertyFilters;
 	select: SelectPropertyFilters<T>;
 	multi_select: MultiSelectPropertyFilters<T>;
-	url: string;
+	url: TextPropertyFilters;
 	date: DatePropertyFilters;
+	status: StatusPropertyFilters<T>;
+	email: TextPropertyFilters;
+	phone_number: TextPropertyFilters;
 };
 
 /**
  * Types to build query object user types out
  */
 
-const x = {
-	character: "multi_select",
-};
-
-type ColumnNameToNotionColumnType<T> = Record<keyof T, FilterOptionNames>;
+type ColumnNameToNotionColumnType<T> = Record<
+	keyof T,
+	SupportedNotionColumnTypes
+>;
 type ColumnNameToPossibleValues = Record<string, any>;
 // T is a column name to column type
 // Y is the collection type
@@ -112,19 +121,19 @@ export type SingleFilter<
 
 export type CompoundFilters<
 	Y extends Record<string, any>,
-	T extends Record<keyof Y, FilterOptionNames>
+	T extends Record<keyof Y, SupportedNotionColumnTypes>
 > =
 	| { and: Array<SingleFilter<Y, T> | CompoundFilters<Y, T>> }
 	| { or: Array<SingleFilter<Y, T> | CompoundFilters<Y, T>> };
 
 export type QueryFilter<
 	Y extends Record<string, any>,
-	T extends Record<keyof Y, FilterOptionNames>
+	T extends Record<keyof Y, SupportedNotionColumnTypes>
 > = SingleFilter<Y, T> | CompoundFilters<Y, T>;
 
 export type Query<
 	Y extends Record<string, any>,
-	T extends Record<keyof Y, FilterOptionNames>
+	T extends Record<keyof Y, SupportedNotionColumnTypes>
 > = {
 	filter?: QueryFilter<Y, T>;
 	sort?: [];

package/build/src/NotionConfig.d.ts

@@ -1,9 +0,0 @@
-export declare const DATABASES_DIR: string;
-export type NotionConfigType = {
-    auth: string;
-    databaseIds: string[];
-};
-export declare const createDatabaseTypes: (notionInfo: NotionConfigType) => Promise<{
-    databaseNames: string[];
-}>;
-//# sourceMappingURL=NotionConfig.d.ts.map

package/build/src/NotionConfig.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NotionConfig.d.ts","sourceRoot":"","sources":["../../src/NotionConfig.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,aAAa,QAAmD,CAAC;AAE9E,MAAM,MAAM,gBAAgB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAOF,eAAO,MAAM,mBAAmB,eAAsB,gBAAgB;;EAwDrE,CAAC"}

package/build/src/NotionConfig.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"NotionConfig.js","sourceRoot":"","sources":["../../src/NotionConfig.ts"],"names":[],"mappings":"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"}