@malloydata/malloyyo 0.2.36 → 0.2.38

package/dist/index.js

@@ -558,6 +558,9 @@ function stripScalarArrayValue(parent, groups) {
   if (!isScalarArray(parent)) return groups;
   return { ...groups, dimensions: groups.dimensions.filter((f) => f.name !== "value") };
 }
+function rawDef(structDefFields, name) {
+  return structDefFields.find((x) => (x.as ?? x.name) === name);
+}
 function fieldKind(af, structDefFields) {
   const raw = structDefFields.find((x) => x.name === af.name);
   const et = raw?.expressionType;
@@ -617,6 +620,7 @@ function walkFields(fields, structDefFields, depth, ctx, anon) {
     const mLoc = f.location;
     const local = isLocal(mLoc, ctx.rootUri);
     const loc = local ? toLoc(mLoc) : void 0;
+    const access = rawDef(structDefFields, f.name)?.accessModifier;
     if (f.isExploreField()) {
       const ef = f;
       const cls = classifyJoinTarget(ef, ctx.knownSources);
@@ -630,6 +634,7 @@ function walkFields(fields, structDefFields, depth, ctx, anon) {
       if (needsQuote(f.name)) join5.must_quote = true;
       if (annotations.length > 0) join5.annotations = annotations;
       if (loc) join5.location = loc;
+      if (access) join5.access = access;
       const synthetic = isScalarArray(ef) || isRepeatedRecord(ef) || isAnonymousRecord(ef);
       if (isScalarArray(ef)) join5.column_shape = "scalar_array";
       else if (isRepeatedRecord(ef)) join5.column_shape = "record_array";
@@ -653,6 +658,7 @@ function walkFields(fields, structDefFields, depth, ctx, anon) {
       if (needsQuote(f.name)) view.must_quote = true;
       if (annotations.length > 0) view.annotations = annotations;
       if (loc) view.location = loc;
+      if (access) view.access = access;
       if (mLoc) {
         const body = sliceSource(ctx.readSource(mLoc.url), mLoc);
         if (body) view.body = body;
@@ -669,6 +675,7 @@ function walkFields(fields, structDefFields, depth, ctx, anon) {
     if (expr && expr !== f.name) info.expression = expr;
     if (annotations.length > 0) info.annotations = annotations;
     if (loc) info.location = loc;
+    if (access) info.access = access;
     if (fieldKind(af, structDefFields) === "measure") groups.measures.push(info);
     else groups.dimensions.push(info);
   }
@@ -840,6 +847,31 @@ async function compile(runtime, entry, opts = {}) {
     return { ok: false, problems: [errorProblem(e, entry.href)] };
   }
 }
+var isPublic = (m) => m.access === void 0;
+function publicGroups(g) {
+  return {
+    dimensions: g.dimensions.filter(isPublic),
+    measures: g.measures.filter(isPublic),
+    views: g.views.filter(isPublic),
+    joins: g.joins.filter(isPublic).map(
+      (j) => j.fields ? { ...j, fields: publicGroups(j.fields) } : j
+    )
+  };
+}
+function publicSource(s) {
+  const groups = publicGroups(s);
+  const out = { ...s, ...groups };
+  if (out.primary_key && !groups.dimensions.some((d) => d.name === out.primary_key)) {
+    out.primary_key = null;
+  }
+  if (s.anon_srcs) out.anon_srcs = s.anon_srcs.map(publicSource);
+  return out;
+}
+function publicOnlyModel(m) {
+  const sources = {};
+  for (const [name, s] of Object.entries(m.sources)) sources[name] = publicSource(s);
+  return { ...m, sources };
+}
 var EMPTY_GROUPS = { dimensions: [], measures: [], views: [], joins: [] };
 var seg = (m) => m.must_quote ? `\`${m.name}\`` : m.name;
 var barePath = (prefix, j) => prefix ? `${prefix}.${j.name}` : j.name;
@@ -986,7 +1018,8 @@ function emitSourceJoin(j, bare, quoted, anonScope, fans, namedOnPath, anonOnPat
     );
   }
 }
-function buildSourceDescribe(model, name) {
+function buildSourceDescribe(compiled, name) {
+  const model = publicOnlyModel(compiled);
   const root = model.sources[name];
   if (!root) return void 0;
   const ctx = { model, joins: /* @__PURE__ */ Object.create(null), map: /* @__PURE__ */ Object.create(null) };
@@ -2847,7 +2880,7 @@ function clearCreds(url6) {
 }
 
 // package.json
-var version = "0.2.36";
+var version = "0.2.38";
 
 // src/http.ts
 var USER_AGENT = `malloyyo/${version}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloyyo",
-  "version": "0.2.36",
+  "version": "0.2.38",
   "description": "Publish Malloy models to a Malloyyo instance",
   "license": "MIT",
   "repository": {