@dereekb/dbx-components-mcp 13.12.0 → 13.12.2

package/dbx-components-mcp.js

@@ -5,7 +5,7 @@ const require = __createRequire(import.meta.url);
 // packages/dbx-components-mcp/package.json
 var package_default = {
   name: "@dereekb/dbx-components-mcp",
-  version: "13.12.0",
+  version: "13.12.2",
   type: "module",
   bin: {
     "dbx-components-mcp": "dbx-components-mcp.js"
@@ -20,20 +20,20 @@ var package_default = {
     "@angular/core": "21.2.11",
     "@angular/forms": "21.2.11",
     "@angular/material": "^21.2.9",
-    "@dereekb/dbx-cli": "13.12.0",
-    "@dereekb/dbx-core": "13.12.0",
-    "@dereekb/dbx-firebase": "13.12.0",
-    "@dereekb/dbx-form": "13.12.0",
-    "@dereekb/dbx-web": "13.12.0",
-    "@dereekb/firebase": "13.12.0",
-    "@dereekb/firebase-server": "13.12.0",
-    "@dereekb/rxjs": "13.12.0",
-    "@dereekb/util": "13.12.0",
+    "@dereekb/dbx-cli": "13.12.2",
+    "@dereekb/dbx-core": "13.12.2",
+    "@dereekb/dbx-firebase": "13.12.2",
+    "@dereekb/dbx-form": "13.12.2",
+    "@dereekb/dbx-web": "13.12.2",
+    "@dereekb/firebase": "13.12.2",
+    "@dereekb/firebase-server": "13.12.2",
+    "@dereekb/rxjs": "13.12.2",
+    "@dereekb/util": "13.12.2",
     "@uirouter/angular": "21.0.0",
     rxjs: "^7.8.2"
   },
   devDependencies: {
-    "@dereekb/model": "13.12.0"
+    "@dereekb/model": "13.12.2"
   }
 };
 
@@ -7039,6 +7039,8 @@ var AUTH_ROLE_CLAIMS_SERVICE_FN = "authRoleClaimsService";
 function extractAuthEntries(input) {
   const { project, knownRoles } = input;
   const warnings = [];
+  const localRoleConsts = collectLocalRoleConsts(project);
+  const mergedKnownRoles = mergeKnownRoles(knownRoles, localRoleConsts.scalars);
   const taggedAppDecls = collectTaggedAppDecls(project, warnings);
   const serviceMappings = collectServiceMappings(project, warnings, taggedAppDecls);
   const apps = [];
@@ -7052,7 +7054,8 @@ function extractAuthEntries(input) {
       interfaceName: tagged.interfaceName,
       filePath: tagged.filePath,
       service: serviceForApp,
-      knownRoles,
+      knownRoles: mergedKnownRoles,
+      localArrayRoles: localRoleConsts.arrays,
       warnings
     });
     for (const claim of ownClaims) claims.push(claim);
@@ -7243,6 +7246,11 @@ function readRoleAtom(node) {
     result = { text: node.getLiteralText(), resolvable: true };
   } else if (Node11.isIdentifier(node)) {
     result = { text: node.getText(), resolvable: false };
+  } else if (Node11.isSpreadElement(node)) {
+    const inner = node.getExpression();
+    if (Node11.isIdentifier(inner)) {
+      result = { text: inner.getText(), resolvable: false };
+    }
   }
   return result;
 }
@@ -7298,7 +7306,7 @@ function collectPropertySignaturesFromTypeNode(typeNode, sink) {
   }
 }
 function buildClaimFromProperty(input) {
-  const { property, app, interfaceName, filePath, service, knownRoles, warnings } = input;
+  const { property, app, interfaceName, filePath, service, knownRoles, localArrayRoles, warnings } = input;
   const tagState = readPropertyTagState(property.getJsDocs());
   let result;
   if (tagState.hasMarker) {
@@ -7310,7 +7318,7 @@ function buildClaimFromProperty(input) {
     if (parsed === void 0) {
       warnings.push({ kind: "claim-missing-mapping", app, key, filePath, line });
     }
-    const mapping = parsed === void 0 ? { roles: [], inverse: false, customEncodeDecode: false } : resolveMappingRoles({ mapping: parsed.mapping, unresolvedRoleConsts: parsed.unresolvedRoleConsts, knownRoles, app, key, filePath, line, warnings });
+    const mapping = parsed === void 0 ? { roles: [], inverse: false, customEncodeDecode: false } : resolveMappingRoles({ mapping: parsed.mapping, unresolvedRoleConsts: parsed.unresolvedRoleConsts, knownRoles, localArrayRoles, app, key, filePath, line, warnings });
     result = {
       key,
       type: typeText,
@@ -7326,20 +7334,97 @@ function buildClaimFromProperty(input) {
   return result;
 }
 function resolveMappingRoles(input) {
-  const { mapping, knownRoles, app, key, filePath, line, warnings } = input;
+  const { mapping, knownRoles, localArrayRoles, app, key, filePath, line, warnings } = input;
   const resolved = [];
   for (const role of mapping.roles) {
     if (knownRoles.has(role)) {
       resolved.push(knownRoles.get(role));
     } else if (input.unresolvedRoleConsts.includes(role)) {
-      warnings.push({ kind: "unresolved-role-const", app, key, constName: role, filePath, line });
-      resolved.push(role);
+      const aggregate = resolveRoleConstByName(role, { knownRoles, localArrayRoles, seen: /* @__PURE__ */ new Set() });
+      if (aggregate.unresolved.length === 0) {
+        for (const aggregateRole of aggregate.roles) resolved.push(aggregateRole);
+      } else {
+        warnings.push({ kind: "unresolved-role-const", app, key, constName: role, filePath, line });
+        resolved.push(role);
+      }
     } else {
       resolved.push(role);
     }
   }
   return { ...mapping, roles: resolved };
 }
+function collectLocalRoleConsts(project) {
+  const scalars = /* @__PURE__ */ new Map();
+  const arrays = /* @__PURE__ */ new Map();
+  for (const sourceFile of project.getSourceFiles()) {
+    for (const stmt of sourceFile.getVariableStatements()) {
+      if (!stmt.isExported()) continue;
+      for (const decl of stmt.getDeclarations()) {
+        const initializer = decl.getInitializer();
+        const name = decl.getName();
+        if (initializer === void 0) continue;
+        if (Node11.isStringLiteral(initializer) || Node11.isNoSubstitutionTemplateLiteral(initializer)) {
+          if (!scalars.has(name)) scalars.set(name, initializer.getLiteralText());
+        } else if (Node11.isArrayLiteralExpression(initializer) && !arrays.has(name)) arrays.set(name, initializer);
+      }
+    }
+  }
+  return { scalars, arrays };
+}
+function mergeKnownRoles(builtins, localScalars) {
+  const out = /* @__PURE__ */ new Map();
+  for (const [name, role] of localScalars) out.set(name, role);
+  for (const [name, role] of builtins) out.set(name, role);
+  return out;
+}
+var EMPTY_ROLE_CONST_RESOLUTION = { roles: [], unresolved: [] };
+function resolveRoleConstByName(name, ctx) {
+  let result;
+  const scalar = ctx.knownRoles.get(name);
+  if (scalar !== void 0) {
+    result = { roles: [scalar], unresolved: [] };
+  } else {
+    const arrayExpr = ctx.localArrayRoles.get(name);
+    if (arrayExpr === void 0) {
+      result = { roles: [], unresolved: [name] };
+    } else if (ctx.seen.has(name)) {
+      result = EMPTY_ROLE_CONST_RESOLUTION;
+    } else {
+      const nextSeen = new Set(ctx.seen);
+      nextSeen.add(name);
+      result = resolveRoleArrayLiteral(arrayExpr, { ...ctx, seen: nextSeen });
+    }
+  }
+  return result;
+}
+function resolveRoleArrayLiteral(arrayExpr, ctx) {
+  const roles = [];
+  const unresolved = [];
+  for (const element of arrayExpr.getElements()) {
+    const elementResult = resolveRoleArrayElement(element, ctx);
+    for (const role of elementResult.roles) roles.push(role);
+    for (const name of elementResult.unresolved) unresolved.push(name);
+  }
+  return { roles, unresolved };
+}
+function resolveRoleArrayElement(element, ctx) {
+  let result = EMPTY_ROLE_CONST_RESOLUTION;
+  if (Node11.isStringLiteral(element) || Node11.isNoSubstitutionTemplateLiteral(element)) {
+    result = { roles: [element.getLiteralText()], unresolved: [] };
+  } else if (Node11.isIdentifier(element)) {
+    result = resolveRoleConstByName(element.getText(), ctx);
+  } else if (Node11.isSpreadElement(element)) {
+    const inner = element.getExpression();
+    if (Node11.isIdentifier(inner)) {
+      result = resolveRoleConstByName(inner.getText(), ctx);
+    } else if (Node11.isArrayLiteralExpression(inner)) {
+      result = resolveRoleArrayLiteral(inner, ctx);
+    } else {
+      result = { roles: [], unresolved: [inner.getText()] };
+    }
+  }
+  return result;
+}
 function readPropertyTagState(jsDocs) {
   const summaries = [];
   const tags = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/dbx-components-mcp",
-  "version": "13.12.0",
+  "version": "13.12.2",
   "type": "module",
   "bin": {
     "dbx-components-mcp": "dbx-components-mcp.js"
@@ -15,19 +15,19 @@
     "@angular/core": "21.2.11",
     "@angular/forms": "21.2.11",
     "@angular/material": "^21.2.9",
-    "@dereekb/dbx-cli": "13.12.0",
-    "@dereekb/dbx-core": "13.12.0",
-    "@dereekb/dbx-firebase": "13.12.0",
-    "@dereekb/dbx-form": "13.12.0",
-    "@dereekb/dbx-web": "13.12.0",
-    "@dereekb/firebase": "13.12.0",
-    "@dereekb/firebase-server": "13.12.0",
-    "@dereekb/rxjs": "13.12.0",
-    "@dereekb/util": "13.12.0",
+    "@dereekb/dbx-cli": "13.12.2",
+    "@dereekb/dbx-core": "13.12.2",
+    "@dereekb/dbx-firebase": "13.12.2",
+    "@dereekb/dbx-form": "13.12.2",
+    "@dereekb/dbx-web": "13.12.2",
+    "@dereekb/firebase": "13.12.2",
+    "@dereekb/firebase-server": "13.12.2",
+    "@dereekb/rxjs": "13.12.2",
+    "@dereekb/util": "13.12.2",
     "@uirouter/angular": "21.0.0",
     "rxjs": "^7.8.2"
   },
   "devDependencies": {
-    "@dereekb/model": "13.12.0"
+    "@dereekb/model": "13.12.2"
   }
 }