@qrvey/cd-package-registry 1.0.8-1068.beta → 1.0.10-1109

package/dist/cjs/index.js

@@ -4581,7 +4581,7 @@ Dataset ID: ${input.qrveyId}`
     let columns = [];
     if (input.formula) columns = [
       ...input.formula.matchAll(/\[(.*?)\]/g)
-    ].map((m) => m[1]);
+    ].map((m) => m[1].replace("/formula", ""));
     if (columns.length > 0 && qrvey) {
       if (!qrvey.questions.data.some((q) => columns.includes(q.id))) errors.push({
         field: "formula",
@@ -4738,25 +4738,41 @@ var _DatasetDependencyValidator = class _DatasetDependencyValidator {
   }
   getDependencyKeys(input) {
     var _a3, _b;
+    const keys = (_b = (_a3 = input.datasources) == null ? void 0 : _a3.map((ds) => ({
+      connectionId: ds.connectionId
+    }))) != null ? _b : [];
+    if (input.datasetParentId) {
+      keys.push({
+        parentDatasetId: input.datasetParentId
+      });
+    }
     return {
-      keys: (_b = (_a3 = input.datasources) == null ? void 0 : _a3.map((ds) => ({
-        connectionId: ds.connectionId
-      }))) != null ? _b : []
+      keys
     };
   }
   async fetchDependencies(keys) {
-    const args = uniqueBy(keys != null ? keys : [], "connectionId");
-    const connections = await this.fetchConnectionsByIds(args);
-    const connectionMap = new Map(connections.map((c) => [
-      c.connectorid,
-      c
-    ]));
+    const connectionKeys = uniqueBy(keys.filter((k) => k.connectionId), "connectionId");
+    const parentKeys = uniqueBy(keys.filter((k) => k.parentDatasetId), "parentDatasetId");
+    const [connections, parentDatasets] = await Promise.all([
+      this.fetchConnectionsByIds(connectionKeys),
+      this.fetchDatasetsByIds(parentKeys)
+    ]);
     return {
-      connections: connectionMap
+      connections: new Map(connections.map((c) => [
+        c.connectorid,
+        c
+      ])),
+      parentDatasets: new Map(parentDatasets.map((d) => {
+        var _a3;
+        return [
+          (_a3 = d.datasetId) != null ? _a3 : d.qrveyid,
+          d
+        ];
+      }))
     };
   }
   validateWithContext(input, context) {
-    var _a3;
+    var _a3, _b;
     const errors = [];
     (_a3 = input.datasources) == null ? void 0 : _a3.forEach((ds) => {
       const connections = context.connections.get(ds.connectionId);
@@ -4770,6 +4786,18 @@ Connection ID: ${ds.connectionId}`
         });
       }
     });
+    if (input.datasetParentId) {
+      const parent = (_b = context.parentDatasets) == null ? void 0 : _b.get(input.datasetParentId);
+      if (!parent) {
+        errors.push({
+          field: "datasetParentId",
+          message: `The custom dataset '${input.name}' references a parent dataset that does not exist or is inaccessible.`,
+          value: input,
+          textDetails: `Dataset ID: ${input.datasetId}
+Parent Dataset ID: ${input.datasetParentId}`
+        });
+      }
+    }
     return errors;
   }
   //#region Private methods
@@ -4781,6 +4809,14 @@ Connection ID: ${ds.connectionId}`
     }, this.options)));
     return result.filter((res) => res.status === "fulfilled").map((res) => res.value);
   }
+  async fetchDatasetsByIds(args) {
+    const result = await Promise.allSettled(args.map(({ parentDatasetId }) => QrveyFetchClient.get({
+      userId: this.params.userId,
+      appId: this.params.appId,
+      qrveyId: parentDatasetId
+    }, this.options)));
+    return result.filter((res) => res.status === "fulfilled").map((res) => res.value);
+  }
 };
 __name(_DatasetDependencyValidator, "DatasetDependencyValidator");
 var DatasetDependencyValidator = _DatasetDependencyValidator;