@forzalabs/remora 1.1.12 → 1.1.13

package/index.js

@@ -13500,7 +13500,7 @@ var import_promises = __toESM(require("fs/promises"), 1);
 
 // ../../packages/constants/src/Constants.ts
 var CONSTANTS = {
-  cliVersion: "1.1.12",
+  cliVersion: "1.1.13",
   backendVersion: 1,
   backendPort: 5088,
   workerVersion: 2,
@@ -13672,6 +13672,42 @@ var SchemaValidatorClass = class {
 var SchemaValidator = new SchemaValidatorClass();
 var SchemaValidator_default = SchemaValidator;
 
+// ../../packages/common/src/ResourcesUtils.ts
+var ResourcesUtilsClass = class {
+  constructor() {
+    this.getAvailableColumns = (consumer) => {
+      return consumer.producers.flatMap((cProd) => {
+        const producer = Environment_default.getProducer(cProd.name);
+        if (!producer) {
+          const subConsumer = Environment_default.getConsumer(cProd.name);
+          Affirm_default(subConsumer, `No producer found with name "${cProd.name}"`);
+          return this.getAvailableColumns(subConsumer);
+        } else {
+          const dims = producer.dimensions.map((x) => ({
+            consumerAlias: null,
+            consumerKey: null,
+            nameInProducer: x.name,
+            aliasInProducer: x.alias,
+            dimension: x,
+            owner: cProd.name
+          }));
+          const meas = producer.measures?.map((x) => ({
+            consumerAlias: null,
+            consumerKey: null,
+            nameInProducer: x.name,
+            aliasInProducer: x.name,
+            measure: x,
+            owner: cProd.name
+          })) ?? [];
+          return [...dims, ...meas];
+        }
+      });
+    };
+  }
+};
+var ResourcesUtils = new ResourcesUtilsClass();
+var ResourcesUtils_default = ResourcesUtils;
+
 // ../../packages/common/src/validation/Validator.ts
 var ValidatorClass = class {
   constructor() {
@@ -13782,6 +13818,38 @@ var ValidatorClass = class {
         const uniqNames = Algo_default.uniqBy(sources, "name");
         if (uniqNames.length !== 1)
           errors.push(`Producers with different sources are used in the consumer "${consumer.name}" (${uniqNames.join(", ")})`);
+        const availableColumns = ResourcesUtils_default.getAvailableColumns(consumer);
+        const availableFieldsByProducer = /* @__PURE__ */ new Map();
+        for (const col of availableColumns) {
+          const existing = availableFieldsByProducer.get(col.owner) ?? [];
+          if (!existing.includes(col.nameInProducer))
+            existing.push(col.nameInProducer);
+          availableFieldsByProducer.set(col.owner, existing);
+        }
+        const allAvailableFields = [...availableFieldsByProducer.values()].flat();
+        for (const field of consumer.fields) {
+          if (field.key === "*" || field.fixed || field.copyFrom) continue;
+          if (field.from) {
+            const producerFields = availableFieldsByProducer.get(field.from);
+            if (producerFields && !producerFields.includes(field.key))
+              errors.push(`Field "${field.key}" (from: "${field.from}") is not found in producer "${field.from}" in consumer "${consumer.name}". Available fields: ${producerFields.join(", ")}`);
+          } else if (consumer.producers.length === 1) {
+            const producerFields = availableFieldsByProducer.get(consumer.producers[0].name);
+            if (producerFields && !producerFields.includes(field.key))
+              errors.push(`Field "${field.key}" is not found in producer "${consumer.producers[0].name}" in consumer "${consumer.name}". Available fields: ${producerFields.join(", ")}`);
+          } else {
+            if (allAvailableFields.length > 0 && !allAvailableFields.includes(field.key))
+              errors.push(`Field "${field.key}" is not found in any of the producers of consumer "${consumer.name}".`);
+          }
+        }
+        for (let i = 0; i < consumer.fields.length; i++) {
+          const field = consumer.fields[i];
+          if (!field.copyFrom) continue;
+          const precedingFields = consumer.fields.slice(0, i);
+          const found = precedingFields.find((f) => (f.alias ?? f.key) === field.copyFrom);
+          if (!found)
+            errors.push(`Field "${field.alias ?? field.key}" uses copyFrom "${field.copyFrom}" but no field with that name/alias exists before it in consumer "${consumer.name}".`);
+        }
         if (consumer.filters && consumer.filters.length > 0) {
           if (consumer.filters.some((x) => x.sql && x.rule))
             errors.push(`A single consumer can't have both filters based on SQL and filters based on rules.`);
@@ -13854,6 +13922,20 @@ var ValidatorClass = class {
         if (consumer.options) {
           if (Algo_default.hasVal(consumer.options.distinct) && Algo_default.hasVal(consumer.options.distinctOn))
             errors.push(`Can't specify a "distinct" and a "distinctOn" clause on the same consumer (${consumer.name}); use one or the other.`);
+          if (Algo_default.hasVal(consumer.options.distinctOn)) {
+            const { distinctOn } = consumer.options;
+            const hasWildcard = consumer.fields.some((x) => x.key === "*");
+            const consumerFieldKeys = consumer.fields.map((x) => x.alias ?? x.key);
+            if (!hasWildcard) {
+              const missingKeys = distinctOn.keys.filter((k) => !consumerFieldKeys.includes(k));
+              if (missingKeys.length > 0)
+                errors.push(`distinctOn references key(s) "${missingKeys.join(", ")}" that are not present in the consumer "${consumer.name}".`);
+            }
+            if (distinctOn.resolution?.orderBy && !hasWildcard) {
+              if (!consumerFieldKeys.includes(distinctOn.resolution.orderBy))
+                errors.push(`distinctOn resolution orderBy field "${distinctOn.resolution.orderBy}" is not present in the consumer "${consumer.name}".`);
+            }
+          }
           if (Algo_default.hasVal(consumer.options.pivot)) {
             if (Algo_default.hasVal(consumer.options.distinct) || Algo_default.hasVal(consumer.options.distinctOn))
               errors.push(`Can't specify "pivot" together with "distinct" or "distinctOn" on the same consumer (${consumer.name}).`);
@@ -16155,8 +16237,15 @@ var DatabaseEngineClass = class {
     this.MAX_TRY_CONNECTION = 3;
     this.db = () => this._db;
     this.connect = async () => {
-      this._uri = ProcessENVManager_default.getEnvVariable("MONGO_URI") ?? Helper_default.isDev() ? "mongodb://mongo:27017/remora" : "mongodb://localhost:27017/remora";
-      this._client = new import_mongodb.MongoClient(this._uri);
+      if (!ProcessENVManager_default.getEnvVariable("MONGO_URI")) {
+        if (Helper_default.isDev()) {
+          this._uri = "mongodb://mongo:27017/remora";
+        } else {
+          this._uri = "mongodb://localhost:27017/remora";
+        }
+      } else {
+        this._uri = ProcessENVManager_default.getEnvVariable("MONGO_URI");
+      }
       const errors = [];
       this._client = new import_mongodb.MongoClient(this._uri);
       for (let i = 0; i < this.MAX_TRY_CONNECTION; i++) {
@@ -17734,33 +17823,7 @@ var ConsumerManagerClass = class {
       return expandedFields;
     };
     this.getAvailableColumns = (consumer) => {
-      const availableColumns = consumer.producers.flatMap((cProd) => {
-        const producer = Environment_default.getProducer(cProd.name);
-        if (!producer) {
-          const subConsumer = Environment_default.getConsumer(cProd.name);
-          Affirm_default(subConsumer, `No producer found with name "${cProd.name}"`);
-          return this.getAvailableColumns(subConsumer);
-        } else {
-          const dims = producer.dimensions.map((x) => ({
-            consumerAlias: null,
-            consumerKey: null,
-            nameInProducer: x.name,
-            aliasInProducer: x.alias,
-            dimension: x,
-            owner: cProd.name
-          }));
-          const meas = producer.measures?.map((x) => ({
-            consumerAlias: null,
-            consumerKey: null,
-            nameInProducer: x.name,
-            aliasInProducer: x.name,
-            measure: x,
-            owner: cProd.name
-          })) ?? [];
-          return [...dims, ...meas];
-        }
-      });
-      return availableColumns;
+      return ResourcesUtils_default.getAvailableColumns(consumer);
     };
     this.expandField = (consumer, field, availableColumns) => {
       Affirm_default(consumer, "Invalid consumer");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@forzalabs/remora",
-    "version": "1.1.12",
+    "version": "1.1.13",
     "description": "A powerful CLI tool for seamless data translation.",
     "main": "index.js",
     "private": false,

package/workers/ExecutorWorker.js

@@ -13494,7 +13494,7 @@ var import_promises = __toESM(require("fs/promises"), 1);
 
 // ../../packages/constants/src/Constants.ts
 var CONSTANTS = {
-  cliVersion: "1.1.12",
+  cliVersion: "1.1.13",
   backendVersion: 1,
   backendPort: 5088,
   workerVersion: 2,
@@ -13666,6 +13666,42 @@ var SchemaValidatorClass = class {
 var SchemaValidator = new SchemaValidatorClass();
 var SchemaValidator_default = SchemaValidator;
 
+// ../../packages/common/src/ResourcesUtils.ts
+var ResourcesUtilsClass = class {
+  constructor() {
+    this.getAvailableColumns = (consumer) => {
+      return consumer.producers.flatMap((cProd) => {
+        const producer = Environment_default.getProducer(cProd.name);
+        if (!producer) {
+          const subConsumer = Environment_default.getConsumer(cProd.name);
+          Affirm_default(subConsumer, `No producer found with name "${cProd.name}"`);
+          return this.getAvailableColumns(subConsumer);
+        } else {
+          const dims = producer.dimensions.map((x) => ({
+            consumerAlias: null,
+            consumerKey: null,
+            nameInProducer: x.name,
+            aliasInProducer: x.alias,
+            dimension: x,
+            owner: cProd.name
+          }));
+          const meas = producer.measures?.map((x) => ({
+            consumerAlias: null,
+            consumerKey: null,
+            nameInProducer: x.name,
+            aliasInProducer: x.name,
+            measure: x,
+            owner: cProd.name
+          })) ?? [];
+          return [...dims, ...meas];
+        }
+      });
+    };
+  }
+};
+var ResourcesUtils = new ResourcesUtilsClass();
+var ResourcesUtils_default = ResourcesUtils;
+
 // ../../packages/common/src/validation/Validator.ts
 var ValidatorClass = class {
   constructor() {
@@ -13776,6 +13812,38 @@ var ValidatorClass = class {
         const uniqNames = Algo_default.uniqBy(sources, "name");
         if (uniqNames.length !== 1)
           errors.push(`Producers with different sources are used in the consumer "${consumer.name}" (${uniqNames.join(", ")})`);
+        const availableColumns = ResourcesUtils_default.getAvailableColumns(consumer);
+        const availableFieldsByProducer = /* @__PURE__ */ new Map();
+        for (const col of availableColumns) {
+          const existing = availableFieldsByProducer.get(col.owner) ?? [];
+          if (!existing.includes(col.nameInProducer))
+            existing.push(col.nameInProducer);
+          availableFieldsByProducer.set(col.owner, existing);
+        }
+        const allAvailableFields = [...availableFieldsByProducer.values()].flat();
+        for (const field of consumer.fields) {
+          if (field.key === "*" || field.fixed || field.copyFrom) continue;
+          if (field.from) {
+            const producerFields = availableFieldsByProducer.get(field.from);
+            if (producerFields && !producerFields.includes(field.key))
+              errors.push(`Field "${field.key}" (from: "${field.from}") is not found in producer "${field.from}" in consumer "${consumer.name}". Available fields: ${producerFields.join(", ")}`);
+          } else if (consumer.producers.length === 1) {
+            const producerFields = availableFieldsByProducer.get(consumer.producers[0].name);
+            if (producerFields && !producerFields.includes(field.key))
+              errors.push(`Field "${field.key}" is not found in producer "${consumer.producers[0].name}" in consumer "${consumer.name}". Available fields: ${producerFields.join(", ")}`);
+          } else {
+            if (allAvailableFields.length > 0 && !allAvailableFields.includes(field.key))
+              errors.push(`Field "${field.key}" is not found in any of the producers of consumer "${consumer.name}".`);
+          }
+        }
+        for (let i = 0; i < consumer.fields.length; i++) {
+          const field = consumer.fields[i];
+          if (!field.copyFrom) continue;
+          const precedingFields = consumer.fields.slice(0, i);
+          const found = precedingFields.find((f) => (f.alias ?? f.key) === field.copyFrom);
+          if (!found)
+            errors.push(`Field "${field.alias ?? field.key}" uses copyFrom "${field.copyFrom}" but no field with that name/alias exists before it in consumer "${consumer.name}".`);
+        }
         if (consumer.filters && consumer.filters.length > 0) {
           if (consumer.filters.some((x) => x.sql && x.rule))
             errors.push(`A single consumer can't have both filters based on SQL and filters based on rules.`);
@@ -13848,6 +13916,20 @@ var ValidatorClass = class {
         if (consumer.options) {
           if (Algo_default.hasVal(consumer.options.distinct) && Algo_default.hasVal(consumer.options.distinctOn))
             errors.push(`Can't specify a "distinct" and a "distinctOn" clause on the same consumer (${consumer.name}); use one or the other.`);
+          if (Algo_default.hasVal(consumer.options.distinctOn)) {
+            const { distinctOn } = consumer.options;
+            const hasWildcard = consumer.fields.some((x) => x.key === "*");
+            const consumerFieldKeys = consumer.fields.map((x) => x.alias ?? x.key);
+            if (!hasWildcard) {
+              const missingKeys = distinctOn.keys.filter((k) => !consumerFieldKeys.includes(k));
+              if (missingKeys.length > 0)
+                errors.push(`distinctOn references key(s) "${missingKeys.join(", ")}" that are not present in the consumer "${consumer.name}".`);
+            }
+            if (distinctOn.resolution?.orderBy && !hasWildcard) {
+              if (!consumerFieldKeys.includes(distinctOn.resolution.orderBy))
+                errors.push(`distinctOn resolution orderBy field "${distinctOn.resolution.orderBy}" is not present in the consumer "${consumer.name}".`);
+            }
+          }
           if (Algo_default.hasVal(consumer.options.pivot)) {
             if (Algo_default.hasVal(consumer.options.distinct) || Algo_default.hasVal(consumer.options.distinctOn))
               errors.push(`Can't specify "pivot" together with "distinct" or "distinctOn" on the same consumer (${consumer.name}).`);
@@ -17071,33 +17153,7 @@ var ConsumerManagerClass = class {
       return expandedFields;
     };
     this.getAvailableColumns = (consumer) => {
-      const availableColumns = consumer.producers.flatMap((cProd) => {
-        const producer = Environment_default.getProducer(cProd.name);
-        if (!producer) {
-          const subConsumer = Environment_default.getConsumer(cProd.name);
-          Affirm_default(subConsumer, `No producer found with name "${cProd.name}"`);
-          return this.getAvailableColumns(subConsumer);
-        } else {
-          const dims = producer.dimensions.map((x) => ({
-            consumerAlias: null,
-            consumerKey: null,
-            nameInProducer: x.name,
-            aliasInProducer: x.alias,
-            dimension: x,
-            owner: cProd.name
-          }));
-          const meas = producer.measures?.map((x) => ({
-            consumerAlias: null,
-            consumerKey: null,
-            nameInProducer: x.name,
-            aliasInProducer: x.name,
-            measure: x,
-            owner: cProd.name
-          })) ?? [];
-          return [...dims, ...meas];
-        }
-      });
-      return availableColumns;
+      return ResourcesUtils_default.getAvailableColumns(consumer);
     };
     this.expandField = (consumer, field, availableColumns) => {
       Affirm_default(consumer, "Invalid consumer");
@@ -17809,8 +17865,15 @@ var DatabaseEngineClass = class {
     this.MAX_TRY_CONNECTION = 3;
     this.db = () => this._db;
     this.connect = async () => {
-      this._uri = ProcessENVManager_default.getEnvVariable("MONGO_URI") ?? Helper_default.isDev() ? "mongodb://mongo:27017/remora" : "mongodb://localhost:27017/remora";
-      this._client = new import_mongodb.MongoClient(this._uri);
+      if (!ProcessENVManager_default.getEnvVariable("MONGO_URI")) {
+        if (Helper_default.isDev()) {
+          this._uri = "mongodb://mongo:27017/remora";
+        } else {
+          this._uri = "mongodb://localhost:27017/remora";
+        }
+      } else {
+        this._uri = ProcessENVManager_default.getEnvVariable("MONGO_URI");
+      }
       const errors = [];
       this._client = new import_mongodb.MongoClient(this._uri);
       for (let i = 0; i < this.MAX_TRY_CONNECTION; i++) {