@lark-apaas/fullstack-cli 1.1.40-alpha.4 → 1.1.40-alpha.6

package/dist/index.js

@@ -3240,74 +3240,53 @@ function isInPercentage(tenantId, percentage) {
   return id % 100 < percentage;
 }
 function matchRule(rule, identity) {
-  let hasAnyCondition = false;
-  if (rule.tenant_ids && rule.tenant_ids.length > 0) {
-    hasAnyCondition = true;
-    if (!identity.tenantId || !rule.tenant_ids.includes(identity.tenantId)) {
-      return false;
+  switch (rule.type) {
+    case "tenant_id": {
+      return !!identity.tenantId && rule.values.includes(identity.tenantId);
     }
-  }
-  if (rule.app_ids && rule.app_ids.length > 0) {
-    hasAnyCondition = true;
-    if (!identity.appId || !rule.app_ids.includes(identity.appId)) {
-      return false;
+    case "app_id": {
+      return !!identity.appId && rule.values.includes(identity.appId);
     }
-  }
-  if (rule.percentage != null && rule.percentage > 0) {
-    hasAnyCondition = true;
-    if (rule.percentage < 100) {
-      if (!identity.tenantId || !isInPercentage(identity.tenantId, rule.percentage)) {
-        return false;
-      }
+    case "canary": {
+      return identity.xTtEnv === rule.value;
     }
-  }
-  if (rule.x_tt_env) {
-    hasAnyCondition = true;
-    if (identity.xTtEnv !== rule.x_tt_env) {
-      return false;
+    case "percentage": {
+      if (rule.value >= 100) return true;
+      if (rule.value <= 0) return false;
+      if (!identity.tenantId) return false;
+      return isInPercentage(identity.tenantId, rule.value);
     }
+    default:
+      return false;
   }
-  return hasAnyCondition;
-}
-function matchChannel(channel, identity) {
-  if (!channel.rules || channel.rules.length === 0) return false;
-  return channel.rules.some((rule) => matchRule(rule, identity));
 }
-function isBlocked(config, identity) {
-  if (identity.tenantId && config.blocked_tenant_ids?.includes(identity.tenantId)) {
+function isBlocked(channel, identity) {
+  if (identity.tenantId && channel.blocklist?.tenant_ids?.includes(identity.tenantId)) {
     return true;
   }
-  if (identity.appId && config.blocked_app_ids?.includes(identity.appId)) {
+  if (identity.appId && channel.blocklist?.app_ids?.includes(identity.appId)) {
     return true;
   }
   return false;
 }
+function matchChannel(channel, identity) {
+  if (isBlocked(channel, identity)) return false;
+  if (!channel.rules || channel.rules.length === 0) return false;
+  return channel.rules.some((rule) => matchRule(rule, identity));
+}
 function resolveTargetVersions(config, identity) {
   const stableVersions = config.stable?.versions || {};
-  let matchedChannel;
-  if (isBlocked(config, identity)) {
-    console.log("[grayscale] Tenant/app is in blocklist, use stable");
-  } else {
-    matchedChannel = (config.channels || []).find((ch) => matchChannel(ch, identity));
-  }
+  const matchedChannel = (config.channels || []).find((ch) => matchChannel(ch, identity));
   const merged = /* @__PURE__ */ new Map();
   for (const [pkg2, version] of Object.entries(stableVersions)) {
-    if (config.blocked_versions?.includes(version)) {
-      console.warn(`[grayscale] stable version ${version} of ${pkg2} is blocked, skipping`);
-      continue;
-    }
     merged.set(pkg2, version);
   }
   if (matchedChannel) {
     console.log(`[grayscale] Matched channel: ${matchedChannel.name}`);
     for (const [pkg2, version] of Object.entries(matchedChannel.versions || {})) {
-      if (config.blocked_versions?.includes(version)) {
-        console.warn(`[grayscale] channel version ${version} of ${pkg2} is blocked, skipping`);
-        continue;
-      }
       merged.set(pkg2, version);
     }
-  } else if (!isBlocked(config, identity)) {
+  } else {
     console.log("[grayscale] No channel matched, use stable");
   }
   return merged.size > 0 ? merged : null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.40-alpha.4",
+  "version": "1.1.40-alpha.6",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",