@haustle/notion-orm 0.0.38 → 0.0.42

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH,eAAO,MAAM,aAAa,QAAmD,CAAC;AAE9E,MAAM,MAAM,gBAAgB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,mBAAmB,SAAgB,gBAAgB;;EAyD/D,CAAC"}

package/build/src/{NotionConfig.js → index.js}

@@ -1,4 +1,7 @@
 "use strict";
+/**
+ * Responsible for consuming notion.config.js
+ */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -41,10 +44,9 @@ const GenerateTypes_1 = require("./GenerateTypes");
 const ts = __importStar(require("typescript"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-require("dotenv").config();
 exports.DATABASES_DIR = path_1.default.join(__dirname, "../../build", "databases");
-const createDatabaseTypes = (notionInfo) => __awaiter(void 0, void 0, void 0, function* () {
-    const { auth, databaseIds } = notionInfo;
+const createDatabaseTypes = (args) => __awaiter(void 0, void 0, void 0, function* () {
+    const { auth, databaseIds } = args;
     // Making sure the user is passing valid arguments
     if (!auth) {
         console.error("Please pass a valid Notion Integration Key");
@@ -74,7 +76,6 @@ const createDatabaseTypes = (notionInfo) => __awaiter(void 0, void 0, void 0, fu
             databaseNames.push(databaseName);
             databaseClassExportStatements.push(databaseExportStatement({
                 databaseClassName,
-                databaseId,
             }));
         }
         catch (e) {
@@ -83,31 +84,36 @@ const createDatabaseTypes = (notionInfo) => __awaiter(void 0, void 0, void 0, fu
         }
     }
     // Create a file that exports all databases
-    createNotionFile([...databaseClassExportStatements]);
+    createDatabaseBarrelFile({
+        databaseClassExportStatements,
+    });
     return { databaseNames };
 });
 exports.createDatabaseTypes = createDatabaseTypes;
-// Create the import statement for notion.ts file
-function databaseExportStatement(dbClass) {
+// Create the export statement for database file file
+// export { databaseName } from "./databaseName"
+function databaseExportStatement(args) {
+    const { databaseClassName } = args;
     return ts.factory.createExportDeclaration(undefined, false, ts.factory.createNamedExports([
-        ts.factory.createExportSpecifier(false, undefined, ts.factory.createIdentifier(dbClass.databaseClassName)),
-    ]), ts.factory.createStringLiteral(`./${dbClass.databaseId}`), undefined);
+        ts.factory.createExportSpecifier(false, undefined, ts.factory.createIdentifier(databaseClassName)),
+    ]), ts.factory.createStringLiteral(`./${databaseClassName}`), undefined);
 }
 // Creates file that import all generated notion database Ids
-function createNotionFile(nodeArr) {
-    const nodes = ts.factory.createNodeArray(nodeArr);
+function createDatabaseBarrelFile(args) {
+    const { databaseClassExportStatements } = args;
+    const nodes = ts.factory.createNodeArray(databaseClassExportStatements);
     const sourceFile = ts.createSourceFile("placeholder.ts", "", ts.ScriptTarget.ESNext, true, ts.ScriptKind.TS);
     const printer = ts.createPrinter();
     const typescriptCodeToString = printer.printList(ts.ListFormat.MultiLine, nodes, sourceFile);
     const transpileToJavaScript = ts.transpile(typescriptCodeToString, {
         module: ts.ModuleKind.None,
-        target: ts.ScriptTarget.ES2016,
+        target: ts.ScriptTarget.ES2015,
     });
     if (!fs_1.default.existsSync(exports.DATABASES_DIR)) {
         fs_1.default.mkdirSync(exports.DATABASES_DIR);
     }
     // Create TypeScript and JavaScript file
-    fs_1.default.writeFileSync(path_1.default.resolve(exports.DATABASES_DIR, "notion.ts"), typescriptCodeToString);
-    fs_1.default.writeFileSync(path_1.default.resolve(exports.DATABASES_DIR, "notion.js"), typescriptCodeToString);
+    fs_1.default.writeFileSync(path_1.default.resolve(exports.DATABASES_DIR, "index.ts"), typescriptCodeToString);
+    fs_1.default.writeFileSync(path_1.default.resolve(exports.DATABASES_DIR, "index.js"), transpileToJavaScript);
 }
-//# sourceMappingURL=NotionConfig.js.map
+//# sourceMappingURL=index.js.map

package/build/src/index.js.map

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

package/build/src/queryTypes.d.ts

@@ -1,7 +1,10 @@
 /**
  * Column types' for all query options
  */
-export type FilterOptionNames = "text" | "title" | "number" | "checkbox" | "select" | "multi_select" | "url" | "date";
+import { PageObjectResponse } from "@notionhq/client/build/src/api-endpoints";
+type columnDiscriminatedUnionTypes = PageObjectResponse["properties"];
+export type NotionColumnTypes = columnDiscriminatedUnionTypes[keyof columnDiscriminatedUnionTypes]["type"];
+export type SupportedNotionColumnTypes = Exclude<NotionColumnTypes, "formula" | "files" | "people" | "relation" | "rollup" | "created_by" | "last_edited_by" | "created_time" | "last_edited_time">;
 type TextPropertyFilters = {
     equals: string;
     does_not_equal: string;
@@ -38,11 +41,13 @@ type MultiSelectPropertyFilters<T> = {
     is_empty: true;
     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;
@@ -55,26 +60,32 @@ type DatePropertyFilters = {
     next_year: {};
 };
 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;
 };
-type ColumnNameToNotionColumnType<T> = Record<keyof T, FilterOptionNames>;
+/**
+ * Types to build query object user types out
+ */
+type ColumnNameToNotionColumnType<T> = Record<keyof T, SupportedNotionColumnTypes>;
 export type SingleFilter<Y extends Record<string, any>, T extends ColumnNameToNotionColumnType<Y>> = {
     [Property in keyof Y]?: Partial<FilterOptions<Y[Property]>[T[Property]]>;
 };
-export type CompoundFilters<Y extends Record<string, any>, T extends Record<keyof Y, FilterOptionNames>> = {
+export type CompoundFilters<Y extends Record<string, any>, 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>> = SingleFilter<Y, T> | CompoundFilters<Y, T>;
-export type Query<Y extends Record<string, any>, T extends Record<keyof Y, FilterOptionNames>> = {
+export type QueryFilter<Y extends Record<string, any>, 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, SupportedNotionColumnTypes>> = {
     filter?: QueryFilter<Y, T>;
     sort?: [];
 };

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

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

package/build/src/queryTypes.js

@@ -4,10 +4,4 @@
  */
 // import { PageObjectResponse }
 Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * Types to build query object user types out
- */
-const x = {
-    character: "multi_select",
-};
 //# sourceMappingURL=queryTypes.js.map

package/build/src/queryTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryTypes.js","sourceRoot":"","sources":["../../src/queryTypes.ts"],"names":[],"mappings":";AAAA;;GAEG;AACH,gCAAgC;;AAyFhC;;GAEG;AAEH,MAAM,CAAC,GAAG;IACT,SAAS,EAAE,cAAc;CACzB,CAAC"}
+{"version":3,"file":"queryTypes.js","sourceRoot":"","sources":["../../src/queryTypes.ts"],"names":[],"mappings":";AAAA;;GAEG;AACH,gCAAgC"}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@haustle/notion-orm",
-  "version": "0.0.38",
+  "version": "0.0.42",
   "description": "tool to bring notion databases schemas/types to typescript",
-  "main": "build/src/cli.js",
+  "main": "build/databases/index.js",
   "bin": {
     "notion": "build/src/cli.js"
   },
@@ -19,8 +19,14 @@
     "typescript": "^4.8.4"
   },
   "dependencies": {
-    "@notionhq/client": "^2.2.2",
-    "dotenv": "^16.0.3",
-    "path": "^0.12.7"
-  }
+    "@notionhq/client": "^2.2.2"
+  },
+
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Haustle/notion-orm"
+  },
+  "homepage": "https://github.com/Haustle/notion-orm#readme",
+  "keywords": ["notion orm", "typescript", "notion typesafety", "notion auto-complete", "notion databases", "notion-tables"]
+
 }

package/src/BuildCall.ts

@@ -1,25 +1,36 @@
-import { PropertyType } from "./GenerateTypes";
+import { SupportedNotionColumnTypes } from "./queryTypes";
 
 export function getCall(args: {
-	type: PropertyType;
+	type: SupportedNotionColumnTypes;
 	value: string | number | boolean;
 }) {
 	const { type, value } = args;
-	console.log(type, value, typeof value);
 	if (type === "select" && typeof value === "string") {
 		return selectCall({ value });
 	} else if (type === "multi_select" && Array.isArray(value)) {
 		return multiSelectCall({ value });
+	} else if (type === "status" && typeof value === "string") {
+		return statusCall({ option: value });
 	} else if (type === "number" && typeof value === "number") {
 		return numberCall({ value });
+	} else if (type === "email" && typeof value === "string") {
+		return emailCall({ value });
+	} else if (type === "date" && typeof value === "object") {
+		return dateCall({ value });
+	} else if (type === "phone_number" && typeof value === "string") {
+		return phoneNumberCall({ value });
 	} else if (type === "url" && typeof value === "string") {
 		return urlCall({ url: value });
 	} else if (type === "checkbox" && typeof value === "boolean") {
 		return checkboxCall({ checked: value });
 	} else if (type === "title" && typeof value === "string") {
 		return titleCall({ title: value });
-	} else if (type === "text" && typeof value === "string") {
+	} else if (type === "rich_text" && typeof value === "string") {
 		return textCall({ text: value });
+	} else {
+		console.error(
+			`'[@haustle/notion-orm] ${type}' column type currently not supported`
+		);
 	}
 }
 
@@ -37,6 +48,23 @@ const selectCall = (args: { value: string }) => {
 	return { select };
 };
 
+const dateCall = (args: { value: { start: string; end?: string } }) => {
+	const { value } = args;
+	return { date: value };
+};
+const phoneNumberCall = (args: { value: string }) => {
+	const { value } = args;
+	return { phone_number: value };
+};
+
+const statusCall = (args: { option: string }) => {
+	const { option } = args;
+	const status = {
+		name: option,
+	};
+	return { status };
+};
+
 const multiSelectCall = (args: { value: Array<string> }) => {
 	const { value } = args;
 	const multi_select = value.map((option) => ({ name: option }));
@@ -83,3 +111,8 @@ const checkboxCall = (args: { checked: boolean }) => {
 	const { checked: checkbox } = args;
 	return { checkbox };
 };
+
+const emailCall = (args: { value: string }) => {
+	const { value } = args;
+	return { email: value };
+};

package/src/DatabaseActions.ts

@@ -4,32 +4,38 @@ import {
 } from "@notionhq/client/build/src/api-endpoints";
 import { Client } from "@notionhq/client";
 import { getCall } from "./BuildCall";
-import { PropertyType } from "./GenerateTypes";
+import path from "path";
+import { NotionConfigType } from "./index";
 import {
 	apiFilterType,
 	apiSingleFilter,
 	CompoundFilters,
-	FilterOptionNames,
 	Query,
 	QueryFilter,
 	SingleFilter,
+	SupportedNotionColumnTypes,
 } from "./queryTypes";
-require("dotenv").config();
 
 export type propNameToColumnNameType = Record<
 	string,
-	{ columnName: string; type: PropertyType }
+	{ columnName: string; type: SupportedNotionColumnTypes }
 >;
 
+// Import auth key from config file
+const { auth }: NotionConfigType = require(path.join(
+	process.cwd(),
+	"notion.config"
+));
+
 export class DatabaseActions<
 	DatabaseSchemaType extends Record<string, any>,
 	ColumnNameToColumnType extends Record<
 		keyof DatabaseSchemaType,
-		FilterOptionNames
+		SupportedNotionColumnTypes
 	>
 > {
 	private NotionClient: Client = new Client({
-		auth: process.env.NOTION_KEY,
+		auth,
 	});
 	private databaseId: string;
 	private propNameToColumnName: propNameToColumnNameType;

package/src/GenerateTypes.ts

@@ -5,23 +5,12 @@ import {
 import * as ts from "typescript";
 import fs from "fs";
 import path from "path";
-import { DATABASES_DIR } from "./NotionConfig";
-
-// This can be grabbed from // api-endpoints.d.ts with some work
-const propertyArr = [
-	"text",
-	"select",
-	"title",
-	"number",
-	"multi_select",
-	"checkbox",
-	"url",
-];
-export type PropertyType = typeof propertyArr[number];
+import { DATABASES_DIR } from "./index";
+import { NotionColumnTypes } from "queryTypes";
 
 type propNameToColumnNameType = Record<
 	string,
-	{ columnName: string; type: PropertyType }
+	{ columnName: string; type: NotionColumnTypes }
 >;
 
 /* 
@@ -54,10 +43,18 @@ export async function createTypescriptFileForDatabase(
 			type: columnType,
 		};
 
-		if (columnType === "title" || columnType === "rich_text") {
+		if (
+			columnType === "title" ||
+			columnType === "rich_text" ||
+			columnType === "email" ||
+			columnType === "phone_number"
+		) {
 			// add text column to collection type
 			databaseColumnTypeProps.push(
-				createTextProperty(camelizedColumnName, columnType === "title")
+				createTextProperty({
+					name: camelizedColumnName,
+					isTitle: columnType === "title",
+				})
 			);
 		} else if (columnType === "number") {
 			// add number column to collection type
@@ -65,21 +62,24 @@ export async function createTypescriptFileForDatabase(
 		} else if (columnType === "url") {
 			// add url column to collection type
 			databaseColumnTypeProps.push(
-				createTextProperty(camelizedColumnName, false)
+				createTextProperty({ name: camelizedColumnName, isTitle: false })
 			);
 		} else if (columnType === "date") {
 			// add Date column to collection type
 			databaseColumnTypeProps.push(createDateProperty(camelizedColumnName));
-		} else if (columnType == "select" || columnType == "multi_select") {
+		} else if (
+			columnType === "select" ||
+			columnType === "status" ||
+			columnType === "multi_select"
+		) {
 			// @ts-ignore
 			const options = value[columnType].options.map((x) => x.name);
 			databaseColumnTypeProps.push(
-				createMultiOptionProp(
-					camelizedColumnName,
+				createMultiOptionProp({
+					name: camelizedColumnName,
 					options,
-					// This determines whether the property needs to be a union or a union array
-					columnType === "multi_select"
-				)
+					isArray: columnType === "multi_select", // Union or Union Array
+				})
 			);
 		}
 	});
@@ -94,12 +94,12 @@ export async function createTypescriptFileForDatabase(
 
 	// Top level non-nested variable, functions, types for database files
 	const TsNodesForDatabaseFile = ts.factory.createNodeArray([
-		importCollectionClass(),
+		createDatabaseActionsClassImport(),
 		createDatabaseIdVariable(databaseId),
 		DatabaseSchemaType,
-		mapPropNameToColumnDetails(propNameToColumnName),
-		ColumnNameToColumnType(),
-		exportDatabaseActions(databaseClassName),
+		createColumnNameToColumnProperties(propNameToColumnName),
+		createColumnNameToColumnType(),
+		createDatabaseClassExport({ databaseName: databaseClassName }),
 	]);
 
 	const sourceFile = ts.createSourceFile(
@@ -116,24 +116,23 @@ export async function createTypescriptFileForDatabase(
 		TsNodesForDatabaseFile,
 		sourceFile
 	);
-
 	const transpileToJavaScript = ts.transpile(typescriptCodeToString, {
 		module: ts.ModuleKind.None,
-		target: ts.ScriptTarget.ES2015,
+		target: ts.ScriptTarget.ESNext,
 	});
 
-	// Create our output folder
+	// Create databases output folder
 	if (!fs.existsSync(DATABASES_DIR)) {
 		fs.mkdirSync(DATABASES_DIR);
 	}
 
 	// Create TypeScript and JavaScript files
 	fs.writeFileSync(
-		path.resolve(DATABASES_DIR, `${databaseId}.ts`),
+		path.resolve(DATABASES_DIR, `${databaseClassName}.ts`),
 		typescriptCodeToString
 	);
 	fs.writeFileSync(
-		path.resolve(DATABASES_DIR, `${databaseId}.js`),
+		path.resolve(DATABASES_DIR, `${databaseClassName}.js`),
 		transpileToJavaScript
 	);
 
@@ -141,7 +140,8 @@ export async function createTypescriptFileForDatabase(
 }
 
 // generate text property
-function createTextProperty(name: string, isTitle: boolean) {
+function createTextProperty(args: { name: string; isTitle: boolean }) {
+	const { name, isTitle } = args;
 	const text = ts.factory.createPropertySignature(
 		undefined,
 		ts.factory.createIdentifier(name),
@@ -166,28 +166,20 @@ function createNumberProperty(name: string) {
 }
 
 /**
- *
- * @param name name of property
- * @param options
- * @param array
- * @returns
- *
  * For selects and multi-select collection properties
- *
  * array = true for multi-select
- *
- * name = ("x" | "y" | "z")[]
  */
-function createMultiOptionProp(
-	name: string,
-	options: string[],
-	array: boolean
-) {
+function createMultiOptionProp(args: {
+	name: string;
+	options: string[];
+	isArray: boolean;
+}) {
+	const { isArray, name, options } = args;
 	return ts.factory.createPropertySignature(
 		undefined,
 		ts.factory.createIdentifier(name),
 		ts.factory.createToken(ts.SyntaxKind.QuestionToken),
-		array
+		isArray
 			? ts.factory.createArrayTypeNode(
 					ts.factory.createParenthesizedType(
 						ts.factory.createUnionTypeNode([
@@ -218,15 +210,26 @@ function createOtherStringProp() {
 		ts.factory.createTypeLiteralNode([]),
 	]);
 }
+
 function createDateProperty(name: string) {
 	return ts.factory.createPropertySignature(
 		undefined,
 		ts.factory.createIdentifier(name),
 		ts.factory.createToken(ts.SyntaxKind.QuestionToken),
-		ts.factory.createTypeReferenceNode(
-			ts.factory.createIdentifier("Date"),
-			undefined
-		)
+		ts.factory.createTypeLiteralNode([
+			ts.factory.createPropertySignature(
+				undefined,
+				ts.factory.createIdentifier("start"),
+				undefined,
+				ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
+			),
+			ts.factory.createPropertySignature(
+				undefined,
+				ts.factory.createIdentifier("end"),
+				ts.factory.createToken(ts.SyntaxKind.QuestionToken),
+				ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
+			),
+		])
 	);
 }
 
@@ -256,7 +259,7 @@ function createDatabaseIdVariable(databaseId: string) {
  *
  * Example
  *
- * const propMap = {
+ * const columnNameToColumnProperties = {
  *
  *      "bookRating": {
  *          columnName: "Book Rating",
@@ -268,14 +271,12 @@ function createDatabaseIdVariable(databaseId: string) {
  *      }
  *
  * }
- * @param colMap
- * @returns
  */
-function mapPropNameToColumnDetails(colMap: propNameToColumnNameType) {
+function createColumnNameToColumnProperties(colMap: propNameToColumnNameType) {
 	return ts.factory.createVariableDeclarationList(
 		[
 			ts.factory.createVariableDeclaration(
-				ts.factory.createIdentifier("propMap"),
+				ts.factory.createIdentifier("columnNameToColumnProperties"),
 				undefined,
 				undefined,
 				ts.factory.createAsExpression(
@@ -313,7 +314,7 @@ function mapPropNameToColumnDetails(colMap: propNameToColumnNameType) {
 	);
 }
 
-function ColumnNameToColumnType() {
+function createColumnNameToColumnType() {
 	return ts.factory.createTypeAliasDeclaration(
 		undefined,
 		ts.factory.createIdentifier("ColumnNameToColumnType"),
@@ -326,7 +327,7 @@ function ColumnNameToColumnType() {
 				ts.factory.createTypeOperatorNode(
 					ts.SyntaxKind.KeyOfKeyword,
 					ts.factory.createTypeQueryNode(
-						ts.factory.createIdentifier("propMap"),
+						ts.factory.createIdentifier("columnNameToColumnProperties"),
 						undefined
 					)
 				),
@@ -337,7 +338,7 @@ function ColumnNameToColumnType() {
 			ts.factory.createIndexedAccessTypeNode(
 				ts.factory.createIndexedAccessTypeNode(
 					ts.factory.createTypeQueryNode(
-						ts.factory.createIdentifier("propMap"),
+						ts.factory.createIdentifier("columnNameToColumnProperties"),
 						undefined
 					),
 					ts.factory.createTypeReferenceNode(
@@ -353,8 +354,8 @@ function ColumnNameToColumnType() {
 	);
 }
 
-// Need to import the class responsible for adding and querying the database
-function importCollectionClass() {
+// Need to import the database class used to execute database actions (adding + querying)
+function createDatabaseActionsClassImport() {
 	return ts.factory.createImportDeclaration(
 		undefined,
 		ts.factory.createImportClause(
@@ -373,16 +374,12 @@ function importCollectionClass() {
 	);
 }
 
-// We export the database with the class above.
-// export
-
 /**
- * We export the database with
- * @param databaseName
- *
- * const <datbase-name> = new DatabaseActions<DatabaseSchemaType>(datbaseId, propMap)
+ * Create export statement for the database class
+ * export const <databaseName> = new DatabaseActions<DatabaseSchemaType>(datbaseId, columnNameToColumnProperties)
  */
-function exportDatabaseActions(databaseName: string) {
+function createDatabaseClassExport(args: { databaseName: string }) {
+	const { databaseName } = args;
 	return ts.factory.createVariableStatement(
 		[ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
 		ts.factory.createVariableDeclarationList(
@@ -405,7 +402,7 @@ function exportDatabaseActions(databaseName: string) {
 						],
 						[
 							ts.factory.createIdentifier("databaseId"),
-							ts.factory.createIdentifier("propMap"),
+							ts.factory.createIdentifier("columnNameToColumnProperties"),
 						]
 					)
 				),

package/src/cli.ts

@@ -1,9 +1,8 @@
 #! /usr/bin/env node
 
 import fs from "fs";
-import { createDatabaseTypes } from "./NotionConfig";
+import { createDatabaseTypes } from "./index";
 import path from "path";
-require("dotenv").config();
 
 async function main() {
 	const args = process.argv.slice(2);
@@ -20,8 +19,6 @@ async function main() {
 
 		console.log(path.join(projDir, "notion.config"));
 		if (notionConfigDirJS || notionConfigDirTS) {
-			// this is a relative import, so we can escape out
-
 			const config = require(path.join(projDir, "notion.config"));
 
 			const { databaseNames } = await createDatabaseTypes(config);