@holistics/cli-core 2.4.6 → 2.4.7

package/dist/commands.js

@@ -27799,7 +27799,7 @@ var require_dist3 = __commonJS((exports2) => {
   exports2.default = deferred;
 });
 // package.json
-var version = "2.4.6";
+var version = "2.4.7";
 
 // ../../node_modules/.pnpm/@commander-js+extra-typings@13.1.0_commander@13.1.0/node_modules/@commander-js/extra-typings/esm.mjs
 var import__ = __toESM(require_extra_typings(), 1);
@@ -112251,9 +112251,9 @@ function convertModelingParamField(e10, t) {
   };
 }
 var convertModelingMetricFields = (e10) => e10 ? import_lodash2.compact(e10).map((e11) => convertModelingField(e11, "measure", true)) : [];
-function modelFromModeling(e10, t, n = true) {
-  let r3 = getFqn(e10.name), i = (e11, t3) => e11 ? import_lodash2.compact(e11).map((e12) => convertModelingField(e12, t3, n, r3)) : [], a = (e11) => e11 ? import_lodash2.compact(e11).map((e12) => convertModelingParamField(e12, r3)) : [], s3 = (e11) => e11 ? import_lodash2.compact(e11.map((e12) => {
-    let t3 = convertModelingField(e12, "measure", n, r3);
+function modelFromModeling(e10, t, n, r3) {
+  let i = getFqn(e10.name), a = (e11, t3) => e11 ? import_lodash2.compact(e11).map((e12) => convertModelingField(e12, t3, n, i)) : [], s3 = (e11) => e11 ? import_lodash2.compact(e11).map((e12) => convertModelingParamField(e12, i)) : [], c3 = (e11) => e11 ? import_lodash2.compact(e11.map((e12) => {
+    let t3 = convertModelingField(e12, "measure", n, i);
     if (t3 && t3.syntax === "sql")
       return {
         ...t3,
@@ -112266,7 +112266,7 @@ function modelFromModeling(e10, t, n = true) {
           fieldName: `${t3.origin.fieldName}->inner`
         } }
       };
-  })) : [], c3 = (e11) => {
+  })) : [], l = (e11) => {
     if (e11)
       return {
         mode: e11.mode,
@@ -112284,31 +112284,31 @@ function modelFromModeling(e10, t, n = true) {
       return "QueryModel";
   })(e10)) {
     case "QueryModel": {
-      let n3 = e10, { models: l } = n3;
+      let n3 = e10, { models: u } = n3;
       return createQueryModel({
-        name: r3,
+        name: i,
         dataSource: t,
-        models: import_lodash2.values(l).map((e11) => modelFromModeling(e11, t, false)),
-        dimensions: import_lodash2.compact(import_lodash2.concat(i(n3.dimensions, "dimension"), s3(n3.measures))),
-        measures: import_lodash2.compact(i(n3.measures, "measure")),
-        params: import_lodash2.compact(a(n3.params)),
+        models: r3 ?? import_lodash2.values(u).map((e11) => modelFromModeling(e11, t, false)),
+        dimensions: import_lodash2.compact(import_lodash2.concat(a(n3.dimensions, "dimension"), c3(n3.measures))),
+        measures: import_lodash2.compact(a(n3.measures, "measure")),
+        params: import_lodash2.compact(s3(n3.params)),
         label: n3.label,
         description: n3.description,
         query: n3.query,
-        persistence: n3.persistence && c3(n3.persistence)
+        persistence: n3.persistence && l(n3.persistence)
       });
     }
     case "TableModel": {
-      let n3 = e10, c4 = typeof n3.table_name == "string" ? n3.table_name : n3.table_name.table_name;
+      let n3 = e10, r4 = typeof n3.table_name == "string" ? n3.table_name : n3.table_name.table_name;
       return createTableModel({
-        name: r3,
+        name: i,
         dataSource: t,
-        dimensions: import_lodash2.compact(import_lodash2.concat(i(n3.dimensions, "dimension"), s3(n3.measures))),
-        measures: import_lodash2.compact(i(n3.measures, "measure")),
-        params: import_lodash2.compact(a(n3.params)),
+        dimensions: import_lodash2.compact(import_lodash2.concat(a(n3.dimensions, "dimension"), c3(n3.measures))),
+        measures: import_lodash2.compact(a(n3.measures, "measure")),
+        params: import_lodash2.compact(s3(n3.params)),
         label: n3.label,
         description: n3.description,
-        tableName: c4
+        tableName: r4
       });
     }
     default:
@@ -112345,8 +112345,27 @@ function relationshipConfigFromModeling(e10) {
     ...e10.join.where ? { where: e10.join.where } : {}
   };
 }
+function modelsFromCompactModeling(e10, t) {
+  let { model_keys: n, model_definitions: r3 } = e10;
+  if (!n || !r3)
+    throw createError(ErrorCode.INVALID_EXPRESSION_0, undefined, `Dataset \`${e10.name}\` has no model_keys or model_definitions`);
+  let i = /* @__PURE__ */ new Map, a = (n3, s3) => {
+    let c3 = `${n3}:${s3}`, l = i.get(c3);
+    if (l)
+      return l;
+    let u = r3[n3];
+    if (!u)
+      throw createError(ErrorCode.INVALID_EXPRESSION_0, undefined, `Dataset \`${e10.name}\` refers to unknown model \`${n3}\``);
+    let f = "query" in u ? Object.values(u.models).map((e11) => a(e11, false)) : undefined, p3 = modelFromModeling({
+      ...u,
+      models: {}
+    }, t, s3, f);
+    return i.set(c3, p3), p3;
+  };
+  return n.map((e11) => a(e11, true));
+}
 function datasetFromModeling(e10) {
-  let t = dataSourceFromModeling(e10.data_source), n = e10.models.map((e11) => modelFromModeling(e11, t)), r3 = convertModelingMetricFields(e10.metrics), i = (e10.join_configs ?? []).map((e11) => relationshipConfigFromModeling(e11)), a = loadDatasetModuleFromModeling(e10.functions, e10.function_modules);
+  let t = dataSourceFromModeling(e10.data_source), n = e10.model_definitions ? modelsFromCompactModeling(e10, t) : e10.models.map((e11) => modelFromModeling(e11, t, true)), r3 = convertModelingMetricFields(e10.metrics), i = (e10.join_configs ?? []).map((e11) => relationshipConfigFromModeling(e11)), a = loadDatasetModuleFromModeling(e10.functions, e10.function_modules);
   return createDataset({
     name: getFqn(e10.name),
     label: e10.label,
@@ -112421,10 +112440,12 @@ var DatasetStore = class {
   globalModule;
   models;
   constructor(e10, t, { allowAmbiguousPaths: n = false, shouldPrioritizeLengthForMixedPaths: r3 } = {}) {
-    this.dataset = e10, this.dataSource = t, this.models = new Map(e10.models.map((e11) => [e11.name, import_lodash2.cloneDeep({
+    this.dataset = e10, this.dataSource = t;
+    let i = import_lodash2.cloneDeep(e10.models.map((e11) => ({
       ...e11,
       dataSource: t
-    })])), this.globalModule = new AmlModule, this.globalModule.setName("::");
+    })));
+    this.models = new Map(i.map((e11) => [e11.name, e11])), this.globalModule = new AmlModule, this.globalModule.setName("::");
     for (let e11 of this.models.keys())
       this.addToGlobalModule(e11);
     if (this.modelGraph = new ModelGraph(this.dataset.models.map((e11) => e11.name), this.dataset.relationships, undefined, n, r3), !n && this.modelGraph.isCyclic())

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@holistics/cli-core",
   "type": "module",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "bin": {
     "holistics": "./bin/holistics.js"
   },