Merge pull request #28 from easyops-cn/steve/contracts

Steve/contracts

Author: weareoutman

apps/test/src/app.json

@@ -1,5 +1,12 @@
 {
   "id": "test",
   "name": "Test App",
-  "homepage": "/test"
+  "homepage": "/test",
+  "defaultConfig": {
+    "settings": {
+      "misc": {
+        "globalThemeVariant": "elevo"
+      }
+    }
+  }
 }

packages/builder/bin/builder.js

@@ -277,8 +277,13 @@ async function buildApp(watchMode, withContracts) {
     }
   }
 
+  console.log(
+    `Using global theme variant: ${appJson?.defaultConfig?.settings?.misc?.globalThemeVariant}`
+  );
+
   const { routes, functions, templates, errors } = await convertApp(app, {
     rootId: "",
+    themeVariant: appJson?.defaultConfig?.settings?.misc?.globalThemeVariant,
   });
 
   if (errors.length > 0) {

packages/converter/src/convertComponent.ts

@@ -38,12 +38,14 @@ import { convertLifeCycle } from "./convertLifeCycle.js";
 import { convertProperties } from "./convertProperties.js";
 import { hasOwnProperty } from "@next-core/utils/general";
 
-const PORTAL_COMPONENTS = [
+const PORTAL_COMPONENTS = new Set([
   "eo-modal",
   "eo-drawer",
   "eo-event-agent",
   "eo-batch-agent",
-];
+]);
+
+const NO_THEME_VARIANT_BRICKS = new Set(["eo-event-agent", "eo-batch-agent"]);
 
 export async function convertComponent(
   component: ComponentChild,
@@ -234,6 +236,18 @@ export async function convertComponent(
     brick.slot = component.slot;
   }
 
+  if (
+    options.themeVariant &&
+    brick.brick?.includes("-") &&
+    !brick.brick.startsWith("tpl-") &&
+    !brick.brick.startsWith("isolated-tpl-") &&
+    !brick.properties?.themeVariant &&
+    !NO_THEME_VARIANT_BRICKS.has(brick.brick)
+  ) {
+    brick.properties ??= {};
+    brick.properties.themeVariant = options.themeVariant;
+  }
+
   brick.events = convertEvents(component, options);
 
   brick.lifeCycle = convertLifeCycle(component, options);
@@ -270,7 +284,7 @@ export async function convertComponent(
     }
   }
 
-  if (component.portal || PORTAL_COMPONENTS.includes(brick.brick)) {
+  if (component.portal || PORTAL_COMPONENTS.has(brick.brick)) {
     brick.portal = true;
   }
 

packages/converter/src/interfaces.ts

@@ -15,6 +15,7 @@ export interface ConvertOptions {
   withContexts?: Record<string, unknown>;
   allowAnyBricks?: boolean;
   withoutWrapper?: boolean;
+  themeVariant?: string;
 }
 
 export interface ConvertResult {

packages/converter/src/modules/getTplName.ts

@@ -11,7 +11,9 @@ export function getAppTplName(name: string) {
 
 function getViewTplNamePrefixByRootId(rootId: string) {
   if (!tplNameMap.has(rootId)) {
-    tplNameMap.set(rootId, `isolated-tpl-${counter++}`);
+    const tplName = `isolated-tpl-${counter++}`;
+    tplNameMap.set(rootId, tplName);
+    return tplName;
   }
   return tplNameMap.get(rootId)!;
 }