@paralect/hive 0.1.12 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paralect/hive",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "",
   "main": "index.js",
   "bin": {

package/starter/src/autoMap/addHandlers.js

@@ -1,21 +1,10 @@
 import _ from "lodash";
 import db from "db";
 import ifUpdated from "helpers/db/ifUpdated";
-import schemaMappings from "./schemaMappings.js";
+import schemaMappings from "./schemaMappings";
+import getDependentFields from './getDependentFields';
 import { ZodArray } from 'zod';
 
-const getDependentFields = (schema, dependentFieldName) => {
-  let targetSchema = schema.shape[dependentFieldName];
-
-  if (targetSchema instanceof ZodArray) {
-    targetSchema = targetSchema.element;
-  }
-
-  return Object.keys(targetSchema.shape).filter(
-    (key) => !_.includes(['_id', 'createdOn', 'updatedOn'], key)
-  );
-};
-
 const updatedSchemaMappings = (() => {
   const result = {};
   const schemaNames = Object.keys(schemaMappings);

package/starter/src/autoMap/getDependentFields.js

@@ -0,0 +1,33 @@
+import { z } from 'zod';
+
+const getZodKeys = schema => {
+  // make sure schema is not null or undefined
+  if (schema === null || schema === undefined) return [];
+  // check if schema is nullable or optional
+  if (schema instanceof z.ZodNullable || schema instanceof z.ZodOptional) return getZodKeys(schema.unwrap());
+  // check if schema is an array
+  if (schema instanceof z.ZodArray) return getZodKeys(schema.element);
+  // check if schema is an object
+  if (schema instanceof z.ZodObject) {
+    // get key/value pairs from schema
+    const entries = Object.entries(schema.shape);
+    // loop through key/value pairs
+    return entries.flatMap(([key, value]) => {
+      // get nested keys
+      const nested = value instanceof z.ZodType ? getZodKeys(value).map(subKey => `${key}.${subKey}`) : [];
+      // return nested keys
+      return nested.length ? nested : key;
+    });
+  }
+  // return empty array
+  return [];
+};
+
+export default (schema, dependentFieldName) => {
+  let targetSchema = schema.shape[dependentFieldName];
+  let zodKeys = getZodKeys(targetSchema)
+
+  return zodKeys.filter(
+    (key) => !_.includes(['_id', 'createdOn', 'updatedOn'], key)
+  );
+};

package/starter/src/autoMap/mapSchema.js

@@ -1,20 +1,13 @@
 import _ from "lodash";
 import db from "db";
-import schemaMappings from "./schemaMappings.js";
+import fs from 'fs';
+import { z, ZodArray } from 'zod';
 
-const schemaMappingService = db.services.schemaMappings;
-
-const getDependentFields = (schema, dependentFieldName) => {
-  let targetSchema = schema.shape[dependentFieldName].shape;
+import schemaMappings from "./schemaMappings";
+import getDependentFields from './getDependentFields';
 
-  if (targetSchema instanceof ZodArray) {
-    targetSchema = targetSchema.element;
-  }
+const schemaMappingService = db.services.schemaMappings;
 
-  return Object.keys(targetSchema).filter(
-    (key) => !_.includes(['_id', 'createdOn', 'updatedOn'], key)
-  );
-};
 const zodSchemaToSchemaMappings = () => {
   const newSchemaMappings = {};
 
@@ -30,7 +23,7 @@ const zodSchemaToSchemaMappings = () => {
       };
     });
   });
-
+  console.log('newSchemaMappings', newSchemaMappings)
   return newSchemaMappings;
 };
 
@@ -70,7 +63,7 @@ export default async () => {
               );
               await Promise.all(
                 uniqueDependentEntities.map(async (entity) => {
-                  if (schema[fieldName].type === "array") {
+                  if (schema[fieldName] instanceof ZodArray) {
                     await db.services[schemaName].atomic.update(
                       { [`${fieldName}._id`]: entity._id },
                       {

package/starter/src/autoMap/schemaMappings.js

@@ -1,7 +1,13 @@
-export default {
-  // contacts: {
-  //   master: {
-  //     schema: 'users',
-  //   },
-  // },
-};
+import fs from 'fs';
+
+let schemaMappings = {};
+
+if (fs.existsSync('./schemaMappings.json')) {
+  schemaMappings = JSON.parse(fs.readFileSync('./schemaMappings.json', 'utf8') || '{}');
+}
+
+if (process.env.HIVE_SRC && fs.existsSync(`${process.env.HIVE_SRC}/automap/schemaMappings.json`)) {
+  schemaMappings = JSON.parse(fs.readFileSync(`${process.env.HIVE_SRC}/automap/schemaMappings.json`, 'utf8') || '{}');
+}
+
+export default schemaMappings;

package/starter/src/autoMap/schemaMappings.json

@@ -0,0 +1,3 @@
+{
+
+}