Merge pull request #21 from rowyio/feat/add-table-schema-to-context

Feat: add tableSchema to context
rowyio · Dec 29, 2022 · 2adbb23 · 2adbb23
2 parents ee846f5 + 2ed2995
commit 2adbb23
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 5 deletions.
diff --git a/src/functionBuilder/compiler/loader/index.ts b/src/functionBuilder/compiler/loader/index.ts
@@ -55,6 +55,7 @@ export const getConfigFromTableSchema = async (
       fieldTypes,
       extensions,
       runtimeOptions,
+      tableSchema: schemaData,
     };
     if (schemaData.searchIndex) {
       config.searchIndex = {
@@ -86,6 +87,7 @@ export const combineConfigs = (configs: any[]) =>
         extensions,
         searchIndex,
         runtimeOptions,
+        tableSchema,
       } = cur;
       return {
         derivativeColumns: [...acc.derivativeColumns, ...derivativeColumns],
@@ -105,6 +107,7 @@ export const combineConfigs = (configs: any[]) =>
           ? [...acc.searchIndices, searchIndex]
           : acc.searchIndices,
         runtimeOptions,
+        tableSchema,
       };
     },
     {
@@ -131,6 +134,7 @@ export const generateFile = async (configData, buildFolderTimestamp) => {
     region,
     searchHost,
     runtimeOptions,
+    tableSchema,
   } = configData;
   const serializedConfigData = {
     fieldTypes: JSON.stringify(fieldTypes),
@@ -144,6 +148,7 @@ export const generateFile = async (configData, buildFolderTimestamp) => {
       serviceAccount: `rowy-functions@${projectId}.iam.gserviceaccount.com`,
       ...runtimeOptions,
     }),
+    tableSchema: JSON.stringify(tableSchema),
     region: JSON.stringify(region),
     searchHost: JSON.stringify(searchHost),
     searchIndices: JSON.stringify(searchIndices),

diff --git a/src/functionBuilder/compiler/loader/types.ts b/src/functionBuilder/compiler/loader/types.ts
@@ -50,4 +50,5 @@ export interface TableConfig {
     fields: string[];
   };
   runtimeOptions: IRuntimeOptions;
+  tableSchema: any;
 }
diff --git a/src/functionBuilder/functions/src/extensions/index.ts b/src/functionBuilder/functions/src/extensions/index.ts
@@ -3,7 +3,7 @@ import utilFns, { hasRequiredFields, getTriggerType } from "../utils";
 import { db, auth, storage } from "../firebaseConfig";
 
 const extension =
-  (extensionConfig, fieldTypes) =>
+  (extensionConfig, fieldTypes, tableSchema) =>
   async (
     change: functions.Change<functions.firestore.DocumentSnapshot>,
     context: functions.EventContext
@@ -33,6 +33,7 @@ const extension =
         utilFns,
         fieldTypes,
         storage,
+        tableSchema,
       };
       if (!triggers.includes(triggerType)) return false; //check if trigger type is included in the extension
       if (

diff --git a/src/functionBuilder/functions/src/index.ts b/src/functionBuilder/functions/src/index.ts
@@ -20,7 +20,11 @@ export const R = {
           extensionConfig.triggers.includes(triggerType)
         )
         .map((extensionConfig) =>
-          extension(extensionConfig, functionConfig.fieldTypes)(change, context)
+          extension(
+            extensionConfig,
+            functionConfig.fieldTypes,
+            functionConfig.tableSchema
+          )(change, context)
         );
       console.log(
         `#${

diff --git a/src/scripts/action.ts b/src/scripts/action.ts
@@ -124,8 +124,8 @@ export const actionScript = async (req: Request, res: Response) => {
           user: { ...authUser2rowyUser(user), roles: userRoles },
           fetch,
           rowy,
-          tableSchema: schemaDocData,
           logging,
+          tableSchema: schemaDocData,
         });
         if (result.success || result.status) {
           const cellValue = {

diff --git a/src/scripts/connector.ts b/src/scripts/connector.ts
@@ -27,6 +27,7 @@ type ConnectorArgs = {
   fetch: any;
   storage: admin.storage.Storage;
   logging: RowyLogging;
+  tableSchema: any;
 };
 
 type Connector = (args: ConnectorArgs) => Promise<any[]> | any[];
@@ -77,7 +78,7 @@ export const connector = async (req: Request, res: Response) => {
     );
 
     const connectorScript = eval(
-      `async ({ row, db, ref, auth, fetch, rowy, storage, logging }) =>` +
+      `async ({ row, db, ref, auth, fetch, rowy, storage, logging, tableSchema }) =>` +
         connectorFnBody
     ) as Connector;
     const pattern = /row(?!y)/;
@@ -96,6 +97,7 @@ export const connector = async (req: Request, res: Response) => {
       storage,
       rowy,
       logging,
+      tableSchema: schemaDocData,
     });
 
     const functionEndTime = Date.now();

diff --git a/src/scripts/derivative.ts b/src/scripts/derivative.ts
@@ -69,7 +69,7 @@ export const evaluateDerivative = async (req: Request, res: Response) => {
     );
 
     const derivativeFunction = eval(
-      `async ({ row, db, ref, auth, fetch, rowy, logging }) =>` +
+      `async ({ row, db, ref, auth, fetch, rowy, logging, tableSchema }) =>` +
         code.replace(/^.*=>/, "")
     );
     let rowSnapshots: FirebaseFirestore.DocumentSnapshot<FirebaseFirestore.DocumentData>[] =
@@ -97,6 +97,7 @@ export const evaluateDerivative = async (req: Request, res: Response) => {
             fetch,
             rowy,
             logging,
+            tableSchema: schemaDocData,
           });
           const update = { [columnKey]: result };
           if (schemaDocData?.audit !== false) {