@haustle/notion-orm 0.0.2 → 0.0.4

package/build/src/BuildCall.d.ts

@@ -0,0 +1,32 @@
+import { PropertyType } from "./GenerateTypes";
+export declare function getCall(args: {
+    type: PropertyType;
+    value: string | number | boolean;
+}): {
+    select: {
+        name: string;
+    };
+} | {
+    multi_select: {
+        name: string;
+    }[];
+} | {
+    number: number;
+} | {
+    url: string;
+} | {
+    checkbox: boolean;
+} | {
+    title: {
+        text: {
+            content: string;
+        };
+    }[];
+} | {
+    rich_text: {
+        text: {
+            content: string;
+        };
+    }[];
+} | undefined;
+//# sourceMappingURL=BuildCall.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"BuildCall.d.ts","sourceRoot":"","sources":["../../src/BuildCall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,wBAAgB,OAAO,CAAC,IAAI,EAAE;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACjC;;;;;;;;;;;;;;;;;;;;;;;;;;cAkBA"}

package/build/{NotionActions → src}/BuildCall.js

@@ -78,3 +78,4 @@ const checkboxCall = (args) => {
     const { checked: checkbox } = args;
     return { checkbox };
 };
+//# sourceMappingURL=BuildCall.js.map

package/build/src/BuildCall.js.map

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

package/build/src/DatabaseActions.d.ts

@@ -0,0 +1,17 @@
+import { PropertyType } from "./GenerateTypes";
+import { FilterOptionNames, Query } from "./queryTypes";
+export type propNameToColumnNameType = Record<string, {
+    columnName: string;
+    type: PropertyType;
+}>;
+export declare class DatabaseActions<DatabaseSchemaType extends Record<string, any>, ColumnNameToColumnType extends Record<keyof DatabaseSchemaType, FilterOptionNames>> {
+    private NotionClient;
+    private databaseId;
+    private propNameToColumnName;
+    private columnNames;
+    constructor(datbaseId: string, propNameToColumnName: propNameToColumnNameType);
+    add(pageObject: DatabaseSchemaType): Promise<void>;
+    query(query: Query<DatabaseSchemaType, ColumnNameToColumnType>): Promise<void>;
+    private recursivelyBuildFilter;
+}
+//# sourceMappingURL=DatabaseActions.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"DatabaseActions.d.ts","sourceRoot":"","sources":["../../src/DatabaseActions.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,OAAO,EAIN,iBAAiB,EACjB,KAAK,EAGL,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,wBAAwB,GAAG,MAAM,CAC5C,MAAM,EACN;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,YAAY,CAAA;CAAE,CAC1C,CAAC;AAQF,qBAAa,eAAe,CAC3B,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9C,sBAAsB,SAAS,MAAM,CACpC,MAAM,kBAAkB,EACxB,iBAAiB,CACjB;IAED,OAAO,CAAC,YAAY,CAEjB;IACH,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,oBAAoB,CAA2B;IACvD,OAAO,CAAC,WAAW,CAAW;gBAG7B,SAAS,EAAE,MAAM,EACjB,oBAAoB,EAAE,wBAAwB;IAQzC,GAAG,CAAC,UAAU,EAAE,kBAAkB;IAwBlC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,kBAAkB,EAAE,sBAAsB,CAAC;IAqBpE,OAAO,CAAC,sBAAsB;CAyC9B"}

package/build/{NotionActions/NotionCollection.js → src/DatabaseActions.js}

@@ -8,15 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CollectionActions = void 0;
+exports.DatabaseActions = void 0;
 const client_1 = require("@notionhq/client");
 const BuildCall_1 = require("./BuildCall");
-require("dotenv").config();
-class CollectionActions {
+const path_1 = __importDefault(require("path"));
+// Import auth key from config file
+const { auth } = require(path_1.default.join(process.cwd(), "notion.config"));
+class DatabaseActions {
     constructor(datbaseId, propNameToColumnName) {
         this.NotionClient = new client_1.Client({
-            auth: process.env.NOTION_KEY,
+            auth,
         });
         this.databaseId = datbaseId;
         this.propNameToColumnName = propNameToColumnName;
@@ -92,4 +97,5 @@ class CollectionActions {
         }
     }
 }
-exports.CollectionActions = CollectionActions;
+exports.DatabaseActions = DatabaseActions;
+//# sourceMappingURL=DatabaseActions.js.map

package/build/src/DatabaseActions.js.map

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

package/build/src/GenerateTypes.d.ts

@@ -0,0 +1,10 @@
+import { GetDatabaseResponse } from "@notionhq/client/build/src/api-endpoints";
+declare const propertyArr: string[];
+export type PropertyType = typeof propertyArr[number];
+export declare function createTypescriptFileForDatabase(dbResponse: GetDatabaseResponse): Promise<{
+    databaseName: string;
+    databaseClassName: string;
+    databaseId: string;
+}>;
+export {};
+//# sourceMappingURL=GenerateTypes.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"GenerateTypes.d.ts","sourceRoot":"","sources":["../../src/GenerateTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,mBAAmB,EACnB,MAAM,0CAA0C,CAAC;AAOlD,QAAA,MAAM,WAAW,UAQhB,CAAC;AACF,MAAM,MAAM,YAAY,GAAG,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;AAUtD,wBAAsB,+BAA+B,CACpD,UAAU,EAAE,mBAAmB;;;;GA+G/B"}

package/build/{NotionActions → src}/GenerateTypes.js

@@ -39,6 +39,7 @@ exports.createTypescriptFileForDatabase = void 0;
 const ts = __importStar(require("typescript"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const NotionConfig_1 = require("./NotionConfig");
 // This can be grabbed from // api-endpoints.d.ts with some work
 const propertyArr = [
     "text",
@@ -71,7 +72,10 @@ function createTypescriptFileForDatabase(dbResponse) {
             };
             if (columnType === "title" || columnType === "rich_text") {
                 // add text column to collection type
-                databaseColumnTypeProps.push(createTextProperty(camelizedColumnName, columnType === "title"));
+                databaseColumnTypeProps.push(createTextProperty({
+                    name: camelizedColumnName,
+                    isTitle: columnType === "title",
+                }));
             }
             else if (columnType === "number") {
                 // add number column to collection type
@@ -79,7 +83,7 @@ function createTypescriptFileForDatabase(dbResponse) {
             }
             else if (columnType === "url") {
                 // add url column to collection type
-                databaseColumnTypeProps.push(createTextProperty(camelizedColumnName, false));
+                databaseColumnTypeProps.push(createTextProperty({ name: camelizedColumnName, isTitle: false }));
             }
             else if (columnType === "date") {
                 // add Date column to collection type
@@ -88,38 +92,45 @@ function createTypescriptFileForDatabase(dbResponse) {
             else if (columnType == "select" || columnType == "multi_select") {
                 // @ts-ignore
                 const options = value[columnType].options.map((x) => x.name);
-                databaseColumnTypeProps.push(createMultiOptionProp(camelizedColumnName, options, 
-                // This determines whether the property needs to be a union or a union array
-                columnType === "multi_select"));
+                databaseColumnTypeProps.push(createMultiOptionProp({
+                    name: camelizedColumnName,
+                    options,
+                    isArray: columnType === "multi_select", // Union or Union Array
+                }));
             }
         });
         // Object type that represents the database schema
-        const CollectionType = ts.factory.createTypeAliasDeclaration([ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)], ts.factory.createIdentifier("CollectionType"), undefined, ts.factory.createTypeLiteralNode(databaseColumnTypeProps));
-        // Top level non-nested variable, functions, types
-        const nodeArr = [
-            importCollectionClass(),
+        const DatabaseSchemaType = ts.factory.createTypeAliasDeclaration(undefined, ts.factory.createIdentifier("DatabaseSchemaType"), undefined, ts.factory.createTypeLiteralNode(databaseColumnTypeProps));
+        // Top level non-nested variable, functions, types for database files
+        const TsNodesForDatabaseFile = ts.factory.createNodeArray([
+            createDatabaseActionsClassImport(),
             createDatabaseIdVariable(databaseId),
-            CollectionType,
-            mapPropNameToColumnDetails(propNameToColumnName),
-            ColNameToType(),
-            exportCollectionActions(databaseClassName),
-        ];
-        const nodes = ts.factory.createNodeArray(nodeArr);
-        const sourceFile = ts.createSourceFile("placeholder.ts", "", ts.ScriptTarget.ESNext, true, ts.ScriptKind.TS);
+            DatabaseSchemaType,
+            createColumnNameToColumnProperties(propNameToColumnName),
+            createColumnNameToColumnType(),
+            createDatabaseClassExport({ databaseName: databaseClassName }),
+        ]);
+        const sourceFile = ts.createSourceFile("", "", ts.ScriptTarget.ESNext, true, ts.ScriptKind.TS);
         const printer = ts.createPrinter();
-        const outputFile = printer.printList(ts.ListFormat.MultiLine, nodes, sourceFile);
-        // Create our output folder
-        const outputDir = path_1.default.join(__dirname, "../../src", "NotionActions", "DatabaseTypes");
-        if (!fs_1.default.existsSync(outputDir)) {
-            fs_1.default.mkdirSync(outputDir);
+        const typescriptCodeToString = printer.printList(ts.ListFormat.MultiLine, TsNodesForDatabaseFile, sourceFile);
+        const transpileToJavaScript = ts.transpile(typescriptCodeToString, {
+            module: ts.ModuleKind.None,
+            target: ts.ScriptTarget.ESNext,
+        });
+        // Create databases output folder
+        if (!fs_1.default.existsSync(NotionConfig_1.DATABASES_DIR)) {
+            fs_1.default.mkdirSync(NotionConfig_1.DATABASES_DIR);
         }
-        fs_1.default.writeFileSync(path_1.default.resolve(outputDir, `${databaseId}.ts`), outputFile);
+        // Create TypeScript and JavaScript files
+        fs_1.default.writeFileSync(path_1.default.resolve(NotionConfig_1.DATABASES_DIR, `${databaseClassName}.ts`), typescriptCodeToString);
+        fs_1.default.writeFileSync(path_1.default.resolve(NotionConfig_1.DATABASES_DIR, `${databaseClassName}.js`), transpileToJavaScript);
         return { databaseName, databaseClassName, databaseId };
     });
 }
 exports.createTypescriptFileForDatabase = createTypescriptFileForDatabase;
 // generate text property
-function createTextProperty(name, isTitle) {
+function createTextProperty(args) {
+    const { name, isTitle } = args;
     const text = ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier(name), !isTitle ? ts.factory.createToken(ts.SyntaxKind.QuestionToken) : undefined, ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword));
     return text;
 }
@@ -132,20 +143,12 @@ function createNumberProperty(name) {
     return number;
 }
 /**
- *
- * @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, options, array) {
-    return ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier(name), ts.factory.createToken(ts.SyntaxKind.QuestionToken), array
+function createMultiOptionProp(args) {
+    const { isArray, name, options } = args;
+    return ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier(name), ts.factory.createToken(ts.SyntaxKind.QuestionToken), isArray
         ? ts.factory.createArrayTypeNode(ts.factory.createParenthesizedType(ts.factory.createUnionTypeNode([
             ...options.map((option) => ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(option))),
             createOtherStringProp(),
@@ -163,7 +166,7 @@ function createOtherStringProp() {
     ]);
 }
 function createDateProperty(name) {
-    return ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier("s"), undefined, ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("Date"), undefined));
+    return ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier(name), ts.factory.createToken(ts.SyntaxKind.QuestionToken), ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("Date"), undefined));
 }
 // Generate database Id variable
 // const databaseId = <database-id>
@@ -179,7 +182,7 @@ function createDatabaseIdVariable(databaseId) {
  *
  * Example
  *
- * const propMap = {
+ * const columnNameToColumnProperties = {
  *
  *      "bookRating": {
  *          columnName: "Book Rating",
@@ -191,12 +194,10 @@ function createDatabaseIdVariable(databaseId) {
  *      }
  *
  * }
- * @param colMap
- * @returns
  */
-function mapPropNameToColumnDetails(colMap) {
+function createColumnNameToColumnProperties(colMap) {
     return ts.factory.createVariableDeclarationList([
-        ts.factory.createVariableDeclaration(ts.factory.createIdentifier("propMap"), undefined, undefined, ts.factory.createAsExpression(ts.factory.createObjectLiteralExpression([
+        ts.factory.createVariableDeclaration(ts.factory.createIdentifier("columnNameToColumnProperties"), undefined, undefined, ts.factory.createAsExpression(ts.factory.createObjectLiteralExpression([
             ...Object.entries(colMap).map(([propName, value]) => ts.factory.createPropertyAssignment(ts.factory.createStringLiteral(propName), ts.factory.createObjectLiteralExpression([
                 ts.factory.createPropertyAssignment(ts.factory.createIdentifier("columnName"), ts.factory.createStringLiteral(value.columnName)),
                 ts.factory.createPropertyAssignment(ts.factory.createIdentifier("type"), ts.factory.createStringLiteral(value.type)),
@@ -204,33 +205,30 @@ function mapPropNameToColumnDetails(colMap) {
         ], true), ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("const"), undefined))),
     ], ts.NodeFlags.Const);
 }
-function ColNameToType() {
-    return ts.factory.createTypeAliasDeclaration(undefined, ts.factory.createIdentifier("ColNameToType"), undefined, ts.factory.createMappedTypeNode(undefined, ts.factory.createTypeParameterDeclaration(undefined, ts.factory.createIdentifier("Property"), ts.factory.createTypeOperatorNode(ts.SyntaxKind.KeyOfKeyword, ts.factory.createTypeQueryNode(ts.factory.createIdentifier("propMap"), undefined)), undefined), undefined, undefined, ts.factory.createIndexedAccessTypeNode(ts.factory.createIndexedAccessTypeNode(ts.factory.createTypeQueryNode(ts.factory.createIdentifier("propMap"), undefined), ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("Property"), undefined)), ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral("type"))), undefined
+function createColumnNameToColumnType() {
+    return ts.factory.createTypeAliasDeclaration(undefined, ts.factory.createIdentifier("ColumnNameToColumnType"), undefined, ts.factory.createMappedTypeNode(undefined, ts.factory.createTypeParameterDeclaration(undefined, ts.factory.createIdentifier("Property"), ts.factory.createTypeOperatorNode(ts.SyntaxKind.KeyOfKeyword, ts.factory.createTypeQueryNode(ts.factory.createIdentifier("columnNameToColumnProperties"), undefined)), undefined), undefined, undefined, ts.factory.createIndexedAccessTypeNode(ts.factory.createIndexedAccessTypeNode(ts.factory.createTypeQueryNode(ts.factory.createIdentifier("columnNameToColumnProperties"), undefined), ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("Property"), undefined)), ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral("type"))), undefined
     /* unknown */
     ));
 }
-// 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(false, undefined, ts.factory.createNamedImports([
-        ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("CollectionActions")),
-    ])), ts.factory.createStringLiteral("../NotionCollection"), undefined);
+        ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("DatabaseActions")),
+    ])), ts.factory.createStringLiteral("../src/DatabaseActions"), undefined);
 }
-// We export the database with the class above.
-// export
 /**
- * We export the database with
- * @param databaseName
- *
- * const <datbase-name> = new CollectionActions<CollectionType>(datbaseId, propMap)
+ * Create export statement for the database class
+ * export const <databaseName> = new DatabaseActions<DatabaseSchemaType>(datbaseId, columnNameToColumnProperties)
  */
-function exportCollectionActions(databaseName) {
+function createDatabaseClassExport(args) {
+    const { databaseName } = args;
     return ts.factory.createVariableStatement([ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)], ts.factory.createVariableDeclarationList([
-        ts.factory.createVariableDeclaration(ts.factory.createIdentifier(databaseName), undefined, undefined, ts.factory.createNewExpression(ts.factory.createIdentifier("CollectionActions"), [
-            ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("CollectionType"), undefined),
-            ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("ColNameToType"), undefined),
+        ts.factory.createVariableDeclaration(ts.factory.createIdentifier(databaseName), undefined, undefined, ts.factory.createNewExpression(ts.factory.createIdentifier("DatabaseActions"), [
+            ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("DatabaseSchemaType"), undefined),
+            ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("ColumnNameToColumnType"), undefined),
         ], [
             ts.factory.createIdentifier("databaseId"),
-            ts.factory.createIdentifier("propMap"),
+            ts.factory.createIdentifier("columnNameToColumnProperties"),
         ])),
     ], ts.NodeFlags.Const));
 }
@@ -242,3 +240,4 @@ function camelize(str) {
         return index === 0 ? match.toLowerCase() : match.toUpperCase();
     });
 }
+//# sourceMappingURL=GenerateTypes.js.map

package/build/src/GenerateTypes.js.map

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

package/build/src/NotionConfig.d.ts

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

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

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

@@ -35,15 +35,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDatabaseTypes = void 0;
+exports.createDatabaseTypes = exports.DATABASES_DIR = void 0;
 const client_1 = require("@notionhq/client");
 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();
-const createDatabaseTypes = (notionInfo) => __awaiter(void 0, void 0, void 0, function* () {
-    const { auth, databaseIds } = notionInfo;
+exports.DATABASES_DIR = path_1.default.join(__dirname, "../../build", "databases");
+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");
@@ -58,61 +58,58 @@ const createDatabaseTypes = (notionInfo) => __awaiter(void 0, void 0, void 0, fu
         auth: auth,
     });
     const databaseNames = [];
-    // retrieve the database object
-    const databaseClassImports = [];
-    const databaseCamelizedNames = [];
+    const databaseClassExportStatements = [];
+    // Remove the previous databases, so they can call get updated
+    fs_1.default.rmdir(exports.DATABASES_DIR, () => console.log("Deleting current database types..."));
     for (const database_id of databaseIds) {
         let dbOjbect;
-        // Try to get the database schema
         try {
+            // Get the database schema
             dbOjbect = yield NotionClient.databases.retrieve({
                 database_id,
             });
+            // Create typescript file based on schema
+            const { databaseClassName, databaseId, databaseName } = yield (0, GenerateTypes_1.createTypescriptFileForDatabase)(dbOjbect);
+            databaseNames.push(databaseName);
+            databaseClassExportStatements.push(databaseExportStatement({
+                databaseClassName,
+            }));
         }
         catch (e) {
             console.error(e);
             return { databaseNames: [] };
         }
-        const { databaseClassName, databaseId, databaseName } = yield (0, GenerateTypes_1.createTypescriptFileForDatabase)(dbOjbect);
-        databaseNames.push(databaseName);
-        databaseCamelizedNames.push(databaseClassName);
-        databaseClassImports.push(databaseImportStatement({
-            databaseClassName,
-            databaseId,
-        }));
     }
-    const nodeArr = [
-        ...databaseClassImports,
-        mainNotionVariable(databaseCamelizedNames),
-    ];
-    createNotionFile(nodeArr);
+    // Create a file that exports all databases
+    createNotionFile({
+        databaseClassExportStatements,
+    });
     return { databaseNames };
 });
 exports.createDatabaseTypes = createDatabaseTypes;
 // Create the import statement for notion.ts file
-function databaseImportStatement(dbClass) {
-    return ts.factory.createImportDeclaration(undefined, ts.factory.createImportClause(false, undefined, ts.factory.createNamedImports([
-        ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(dbClass.databaseClassName)),
-    ])), 
-    // We've setup paths to allow @notion-database access
-    ts.factory.createStringLiteral(`@notion-database/${dbClass.databaseId}`), undefined);
-}
-function mainNotionVariable(databaseNames) {
-    return ts.factory.createVariableStatement([ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)], ts.factory.createVariableDeclarationList([
-        ts.factory.createVariableDeclaration(ts.factory.createIdentifier("notion"), undefined, undefined, ts.factory.createObjectLiteralExpression([
-            ...databaseNames.map((name) => ts.factory.createShorthandPropertyAssignment(ts.factory.createIdentifier(name), undefined)),
-        ], true)),
-    ], ts.NodeFlags.Const));
+function databaseExportStatement(args) {
+    const { databaseClassName } = args;
+    return ts.factory.createExportDeclaration(undefined, false, ts.factory.createNamedExports([
+        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 createNotionFile(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 outputFile = printer.printList(ts.ListFormat.MultiLine, nodes, sourceFile);
-    const outputDir = path_1.default.join(__dirname, "../../src", "NotionActions");
-    if (!fs_1.default.existsSync(outputDir)) {
-        fs_1.default.mkdirSync(outputDir);
+    const typescriptCodeToString = printer.printList(ts.ListFormat.MultiLine, nodes, sourceFile);
+    const transpileToJavaScript = ts.transpile(typescriptCodeToString, {
+        module: ts.ModuleKind.CommonJS,
+        target: ts.ScriptTarget.ES2015,
+    });
+    if (!fs_1.default.existsSync(exports.DATABASES_DIR)) {
+        fs_1.default.mkdirSync(exports.DATABASES_DIR);
     }
-    fs_1.default.writeFileSync(path_1.default.resolve(outputDir, "notion.ts"), outputFile);
+    // Create TypeScript and JavaScript file
+    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

package/build/src/NotionConfig.js.map

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

package/build/src/cli.d.ts

@@ -0,0 +1,3 @@
+#! /usr/bin/env node
+export {};
+//# sourceMappingURL=cli.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":""}

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

@@ -14,9 +14,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-const NotionConfig_1 = require("./NotionActions/NotionConfig");
+const NotionConfig_1 = require("./NotionConfig");
 const path_1 = __importDefault(require("path"));
-require("dotenv").config();
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
         const args = process.argv.slice(2);
@@ -47,3 +46,4 @@ function main() {
     });
 }
 main();
+//# sourceMappingURL=cli.js.map

package/build/src/cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,4CAAoB;AACpB,iDAAqD;AACrD,gDAAwB;AAExB,SAAe,IAAI;;QAClB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEnC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE;YAChD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YAE9B,MAAM,iBAAiB,GAAG,YAAE,CAAC,UAAU,CACtC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC,CACtC,CAAC;YACF,MAAM,iBAAiB,GAAG,YAAE,CAAC,UAAU,CACtC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC,CACtC,CAAC;YAEF,OAAO,CAAC,GAAG,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;YACjD,IAAI,iBAAiB,IAAI,iBAAiB,EAAE;gBAC3C,kDAAkD;gBAElD,MAAM,MAAM,GAAG,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;gBAE5D,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,IAAA,kCAAmB,EAAC,MAAM,CAAC,CAAC;gBAC5D,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC7B,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;iBAClC;qBAAM;oBACN,OAAO,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;oBAC9D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBAC9C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;qBACzC;iBACD;aACD;iBAAM;gBACN,OAAO,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBAChE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aAChB;SACD;IACF,CAAC;CAAA;AAED,IAAI,EAAE,CAAC"}

package/build/src/queryTypes.d.ts

@@ -0,0 +1,102 @@
+/**
+ * Column types' for all query options
+ */
+export type FilterOptionNames = "text" | "title" | "number" | "checkbox" | "select" | "multi_select" | "url" | "date";
+type TextPropertyFilters = {
+    equals: string;
+    does_not_equal: string;
+    contains: string;
+    does_not_contain: string;
+    starts_with: string;
+    ends_with: string;
+    is_empty: true;
+    is_not_empty: true;
+};
+type NumberPropertyFilters = {
+    equals: number;
+    does_not_equals: number;
+    greater_than: number;
+    less_than: number;
+    greater_than_or_equal_to: number;
+    less_than_or_equal_to: number;
+    is_empty: true;
+    is_not_empty: true;
+};
+type CheckBoxPropertyFilters = {
+    equals: boolean;
+    does_not_equal: boolean;
+};
+type SelectPropertyFilters<T> = {
+    equals: (T extends Array<any> ? T[number] : T) | (string & {});
+    does_not_equal: (T extends Array<any> ? T[number] : T) | (string & {});
+    is_empty: true;
+    is_not_empty: true;
+};
+type MultiSelectPropertyFilters<T> = {
+    contains: (T extends Array<any> ? T[number] : T) | (string & {});
+    does_not_contain: (T extends Array<any> ? T[number] : T) | (string & {});
+    is_empty: true;
+    is_not_empty: true;
+};
+type DatePropertyFilters = {
+    equals: string;
+    before: string;
+    after: string;
+    on_or_before: string;
+    is_empty: true;
+    is_not_empty: true;
+    on_or_after: string;
+    past_week: {};
+    past_month: {};
+    past_year: {};
+    this_week: {};
+    next_week: {};
+    next_month: {};
+    next_year: {};
+};
+export type FilterOptions<T = []> = {
+    text: TextPropertyFilters;
+    title: TextPropertyFilters;
+    number: NumberPropertyFilters;
+    checkbox: CheckBoxPropertyFilters;
+    select: SelectPropertyFilters<T>;
+    multi_select: MultiSelectPropertyFilters<T>;
+    url: string;
+    date: DatePropertyFilters;
+};
+type ColumnNameToNotionColumnType<T> = Record<keyof T, FilterOptionNames>;
+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>> = {
+    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>> = {
+    filter?: QueryFilter<Y, T>;
+    sort?: [];
+};
+export type apiFilterQuery = {
+    filter?: apiSingleFilter | apiAndFilter | apiOrFilter;
+};
+/**
+ * Transform the types above to build types to
+ * actually build schema for query request
+ */
+type apiColumnTypeToOptions = {
+    [prop in keyof FilterOptions]?: Partial<FilterOptions[prop]>;
+};
+export interface apiSingleFilter extends apiColumnTypeToOptions {
+    property: string;
+}
+export type apiFilterType = apiSingleFilter | apiAndFilter | apiOrFilter | undefined;
+type apiAndFilter = {
+    and: Array<apiFilterType>;
+};
+type apiOrFilter = {
+    or: Array<apiFilterType>;
+};
+export {};
+//# sourceMappingURL=queryTypes.d.ts.map