@lcap/nasl-unified-frontend-generator 4.1.0-beta.1 → 4.1.0-beta.2

package/dist/index.d.mts

@@ -117,7 +117,7 @@ interface I18nInfo {
 declare const metadataPlugin: {
     name: string;
     functions: {
-        makeBasePlatformConfig(app: Pick<App, "name" | "dnsAddr" | "hasUserCenter" | "hasAuth" | "sysPrefixPath" | "id" | "appTimeZone">, frontend: Frontend, config: CommonAppConfig): BasePlatformConfig;
+        makeBasePlatformConfig(app: Pick<App, 'name' | 'dnsAddr' | 'hasUserCenter' | 'hasAuth' | 'sysPrefixPath' | 'id' | 'appTimeZone'>, frontend: Frontend, config: CommonAppConfig): BasePlatformConfig;
     };
 };
 
@@ -641,7 +641,7 @@ declare const routesExtractionPlugin: {
     functions: {
         extractRoute(components: ViewComponentIR[], routePrefix: string, options?: {
             lazy?: boolean;
-            frameworkKind?: "react" | "vue2" | "vue3";
+            frameworkKind?: 'react' | 'vue2' | 'vue3';
         }): {
             routes: RouteIR[];
             authResourcePaths: string[];
@@ -1172,10 +1172,18 @@ declare const reactComponentLibHackPlugin: {
     name: string;
     functions: {
         __hooksDefinitions(): ReactFileDescription;
-        hackBindAttribute<T extends BindAttributeIR & {
+        hackBindAttribute<T extends {
             kind: "expr";
+            expression: ExprIR;
+            __raw: _lcap_nasl_concepts.BindAttribute;
+            sync: boolean;
+        } & {
+            concept: "BindAttribute";
+            name: string;
+        } & {
+            kind: 'expr';
         }>(b: T): BindAttributeIR & {
-            kind: "expr";
+            kind: 'expr';
         };
     };
 };
@@ -1672,7 +1680,7 @@ declare class VirtualProject {
     getFileDict(): {
         files: Record<string, ProjectFile>;
     };
-    readFile(path: string): string | Buffer<ArrayBufferLike>;
+    readFile(path: string): string | Buffer;
 }
 declare function compileAsProject(app: App, frontend: Frontend, config: CommonAppConfig, container?: Container): Promise<VirtualProject>;
 declare function compileNASLToReactDist(app: App, frontend: Frontend, config: CommonAppConfig, http: AxiosInstance): Promise<OrganizedFile[]>;

package/dist/index.d.ts

@@ -117,7 +117,7 @@ interface I18nInfo {
 declare const metadataPlugin: {
     name: string;
     functions: {
-        makeBasePlatformConfig(app: Pick<App, "name" | "dnsAddr" | "hasUserCenter" | "hasAuth" | "sysPrefixPath" | "id" | "appTimeZone">, frontend: Frontend, config: CommonAppConfig): BasePlatformConfig;
+        makeBasePlatformConfig(app: Pick<App, 'name' | 'dnsAddr' | 'hasUserCenter' | 'hasAuth' | 'sysPrefixPath' | 'id' | 'appTimeZone'>, frontend: Frontend, config: CommonAppConfig): BasePlatformConfig;
     };
 };
 
@@ -641,7 +641,7 @@ declare const routesExtractionPlugin: {
     functions: {
         extractRoute(components: ViewComponentIR[], routePrefix: string, options?: {
             lazy?: boolean;
-            frameworkKind?: "react" | "vue2" | "vue3";
+            frameworkKind?: 'react' | 'vue2' | 'vue3';
         }): {
             routes: RouteIR[];
             authResourcePaths: string[];
@@ -1172,10 +1172,18 @@ declare const reactComponentLibHackPlugin: {
     name: string;
     functions: {
         __hooksDefinitions(): ReactFileDescription;
-        hackBindAttribute<T extends BindAttributeIR & {
+        hackBindAttribute<T extends {
             kind: "expr";
+            expression: ExprIR;
+            __raw: _lcap_nasl_concepts.BindAttribute;
+            sync: boolean;
+        } & {
+            concept: "BindAttribute";
+            name: string;
+        } & {
+            kind: 'expr';
         }>(b: T): BindAttributeIR & {
-            kind: "expr";
+            kind: 'expr';
         };
     };
 };
@@ -1672,7 +1680,7 @@ declare class VirtualProject {
     getFileDict(): {
         files: Record<string, ProjectFile>;
     };
-    readFile(path: string): string | Buffer<ArrayBufferLike>;
+    readFile(path: string): string | Buffer;
 }
 declare function compileAsProject(app: App, frontend: Frontend, config: CommonAppConfig, container?: Container): Promise<VirtualProject>;
 declare function compileNASLToReactDist(app: App, frontend: Frontend, config: CommonAppConfig, http: AxiosInstance): Promise<OrganizedFile[]>;

package/dist/index.js

@@ -5,6 +5,9 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __esm = (fn, res) => function __init() {
+  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -37,6 +40,75 @@ var __decorateClass = (decorators, target, key, kind) => {
 };
 var __decorateParam = (index, decorator) => (target, key) => decorator(target, key, index);
 
+// src/plugins/templates/auto-reload.js
+var auto_reload_exports = {};
+__export(auto_reload_exports, {
+  default: () => auto_reload_default
+});
+var auto_reload_default;
+var init_auto_reload = __esm({
+  "src/plugins/templates/auto-reload.js"() {
+    "use strict";
+    auto_reload_default = `
+const dom = document.createElement('div');
+dom.classList = "lcap-deploy-loading-container";
+dom.style.display = 'none';
+dom.innerHTML = "<div class='lcap-deploy-loading-icon'></div><div>\u6B63\u5728\u66F4\u65B0\u6700\u65B0\u53D1\u5E03\u5185\u5BB9...</div>";
+document.getElementsByTagName('body')[0].appendChild(dom);
+
+const style = document.createElement('style');
+style.innerHTML = \`.lcap-deploy-loading-container {
+    width: 208px;
+    height: 40px;
+    background: rgba(48, 48, 48, 0.8);
+    box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.1);
+    border-radius: 4px;
+    position: fixed;
+    top: 120px;
+    left: 50%;
+    margin-left: -104px;
+    color: #FFFFFF;
+    font-size: 14px;
+    justify-content: center;
+    align-items: center;
+}
+
+.lcap-deploy-loading-icon{
+    width: 12px;
+    height: 12px;
+    margin-right: 10px;
+    animation: loading-animation 0.8s infinite linear;
+    border: 2px solid #f3f3f3;
+    border-top: 2px solid rgb(109, 108, 108);
+    border-right: 2px solid rgb(109, 108, 108);
+    border-bottom: 2px solid rgb(109, 108, 108);
+    border-radius: 50%;
+}
+
+@keyframes loading-animation{
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+}\`;
+document.getElementsByTagName('body')[0].appendChild(style);
+
+window.addEventListener('message', function (e) {
+    if(e.data ==="release-start"){
+      document.querySelector(".lcap-deploy-loading-container").style.display ="flex"
+    }
+
+    if(e.data==="release-end"){
+      document.querySelector(".lcap-deploy-loading-container").style.display ="none"
+      window.location.reload();
+    }
+});
+`;
+  }
+});
+
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
@@ -1305,8 +1377,8 @@ var reactComponentLibHackPlugin = makePlugin({
           }
 
           Object.assign(utils, {
-            jsonSerialize: JSON.stringify,
-            jsonDeserialize: JSON.parse,
+            jsonSerialize: utils.JsonSerialize || JSON.stringify,
+            jsonDeserialize: utils.JsonDeserialize || JSON.parse,
           });
 
           const logging = {
@@ -4292,40 +4364,40 @@ var metadataPlugin = makePlugin({
 // src/hack/material-config/material.config.js
 var materials = {
   framework: {
-    version: "2.1.0",
+    version: "2.0.1",
     core: "@lcap/basic-template",
     pc: [
       {
         frameworkKind: "vue2",
         name: "@lcap/pc-template",
-        version: "2.1.0"
+        version: "2.0.1"
       },
       {
         frameworkKind: "react",
         name: "@lcap/pc-template-react",
-        version: "2.1.0"
+        version: "2.0.1"
       },
       {
         frameworkKind: "vue3",
         name: "@lcap/pc-template-vue3",
-        version: "2.1.0"
+        version: "2.0.1"
       }
     ],
     h5: [
       {
         frameworkKind: "vue2",
         name: "@lcap/mobile-template",
-        version: "2.1.0"
+        version: "2.0.1"
       },
       {
         frameworkKind: "react",
         name: "@lcap/mobile-template-react",
-        version: "2.1.0"
+        version: "2.0.1"
       },
       {
         frameworkKind: "vue3",
         name: "@lcap/mobile-template-vue3",
-        version: "2.1.0"
+        version: "2.0.1"
       }
     ]
   },
@@ -4399,29 +4471,6 @@ var coreVersion = materials.framework.version;
 function getPredefinedMaterialConfig() {
   return materials;
 }
-function getPredefinedLibConstants() {
-  if (!reactUi || !vue3Ui) {
-    throw new Error("not found");
-  }
-  if (reactUi.name !== "@lcap/pc-react-ui") {
-    throw new Error("cannot find @lcap/pc-react-ui in material.config.js");
-  }
-  return {
-    reactUI: {
-      kind: "standard",
-      name: reactUi.name,
-      version: reactUi.version
-    },
-    vue3Ui: {
-      kind: "standard",
-      name: vue3Ui.name,
-      version: vue3Ui.version
-    },
-    basicTemplate: {
-      version: coreVersion
-    }
-  };
-}
 var getPredefinedMaterialByTags = (() => {
   const materialConfig = getPredefinedMaterialConfig();
   let allMaterials = [];
@@ -4445,12 +4494,14 @@ var getPredefinedMaterialByTags = (() => {
   materialConfig.ui.pc.forEach((item) => {
     allMaterials.push({
       ...item,
+      kind: "standard",
       tags: ["ui", "pc", item.frameworkKind, item.libName]
     });
   });
   materialConfig.ui.h5.forEach((item) => {
     allMaterials.push({
       ...item,
+      kind: "standard",
       tags: ["ui", "h5", item.frameworkKind, item.libName]
     });
   });
@@ -4610,7 +4661,10 @@ function bindAttrToIR(b) {
         throw new Error("string\u4E0D\u53EF\u4E3Async");
       }
       if (b.i18nKey && b.value && b.frontend?.i18nInfo?.enabled) {
-        b.type = "dynamic";
+        const frameworkKind = b.frontend?.frameworkKind;
+        if (!["vue3"].includes(frameworkKind)) {
+          b.type = "dynamic";
+        }
         const wrapperExpr = import_nasl_concepts9.CallFunction.from(
           {
             calleeNamespace: "$i18n",
@@ -4714,7 +4768,7 @@ function bindEventToAction(b) {
     kind: "standalone"
   };
 }
-var DefaultComponentLibraryName = getPredefinedLibConstants().reactUI.name;
+var DefaultComponentLibraryName = getPredefinedMaterialByTags(["ui", "pc", "react"])?.name;
 function getReferencedLibComponent(e) {
   const tag = e.tag;
   if (tag.startsWith("BS")) {
@@ -5380,8 +5434,8 @@ var NASLAppIRBuilderPlugin = class {
         });
         logger5.debug({ extensionPackages });
         const frameworkKind = frontend.frameworkKind;
-        const libs = getPredefinedLibConstants();
-        return [...extensionPackages, frameworkKind === "vue3" ? libs.vue3Ui : libs.reactUI];
+        const uiLib = getPredefinedMaterialByTags(["ui", frontend.type, frameworkKind]);
+        return [...extensionPackages, uiLib];
       };
       var buildConfigs = buildConfigs2, collectPackages = collectPackages2;
       config.debug && breakpoint2.genBreakpoints(app);
@@ -6750,10 +6804,9 @@ function extractAppLevelFrontendDeps(app) {
 }
 function extractFrontendLevelDeps(frontend) {
   const deps = [];
-  if (frontend.frameworkKind === "react") {
-    deps.push(getPredefinedLibConstants().reactUI);
-  } else if (frontend.frameworkKind === "vue3") {
-    deps.push(getPredefinedLibConstants().vue3Ui);
+  const uiLib = getPredefinedMaterialByTags(["ui", frontend.type, frontend.frameworkKind]);
+  if (uiLib) {
+    deps.push(uiLib);
   }
   return deps;
 }
@@ -6926,11 +6979,11 @@ async function downloadDependenciesToLcapModules(feDeps, fs, config) {
     }
     let packageJson = fs.read("/package.json")?.toString();
     packageJson = JSON.parse(packageJson);
-    if (!packageJson.dependencies) {
-      packageJson.dependencies = {};
+    if (!packageJson.lcap_modules) {
+      packageJson.lcap_modules = {};
     }
     downloadedDeps.forEach(({ pkgName, targetPath }) => {
-      packageJson.dependencies[pkgName] = `.${targetPath}`;
+      packageJson.lcap_modules[pkgName] = `.${targetPath}`;
     });
     fs.write("/package.json", JSON.stringify(packageJson, null, 2));
     logger13.info("\u4E0B\u8F7D\u524D\u7AEF\u4F9D\u8D56\u5E93\u5230 lcap_modules \u76EE\u5F55\u5B8C\u6210");
@@ -7206,7 +7259,7 @@ export function loadAssets(){
   generateEntry(ir) {
     const entryScript = this.microFrontendManager.produceScript(ir);
     const publicPathScript = this.microFrontendManager.producePublicPathScript(ir);
-    const code = `
+    let code = `
     export function startApp(){
       if(window.LcapMicro){
         // \u5DF2\u7ECF\u88AB\u52A0\u8F7D\u4E8E\u5FAE\u524D\u7AEF\u73AF\u5883
@@ -7217,6 +7270,11 @@ export function loadAssets(){
       }
     }
     `;
+    const { env, isExport } = ir.configs.config;
+    if (!isExport && env === "dev") {
+      const autoReloadScript = (init_auto_reload(), __toCommonJS(auto_reload_exports));
+      code += autoReloadScript?.default || autoReloadScript;
+    }
     const imports = [
       {
         from: "../init"
@@ -7284,23 +7342,28 @@ var VueRouterPlugin = class {
   }
   routeToCode(routes, componentPathManager, config) {
     function serializeVueRoute(r, isRoot = false) {
-      const path = r.thisLevelPath ?? "/";
+      const { accumulativePath, thisLevelPath } = r;
+      const path = isRoot ? accumulativePath : thisLevelPath ?? "/";
+      const basePath = config.basePath;
       if (r.kind === "normal") {
         const children = r.children?.map((i) => serializeVueRoute(i)).filter(isNotNil) ?? [];
         const childrenStr = children.join(",\n");
         const componentCode = `component: ${r.elementMangledName ?? r.elementTemplate.identifier}`;
-        return `{path: "${isRoot ? r.accumulativePath : path}", meta: ${JSON.stringify(
+        return `{path: "${path}", meta: ${JSON.stringify(
           r.meta
         )}, children: [${childrenStr}], ${componentCode} }`;
       } else if (r.kind === "redirect") {
-        const replaceWildCardForVue3 = (frameworkKind, path2) => {
-          if (frameworkKind === "vue3" && path2 === "*") {
-            return "/:pathMatch(.*)*";
+        if (["vue3"].includes(config.frameworkKind) && path === "*") {
+          return `{ path: "/:pathMatch(.*)*", redirect: ${JSON.stringify(basePath + r.redirect)} }`;
+        }
+        if (["vue3"].includes(config.frameworkKind) && path === "/") {
+          let result = `{ path: "/", redirect: ${JSON.stringify(basePath + r.redirect)} }`;
+          if (basePath !== "/") {
+            result += `, { path: "${basePath}", redirect: ${JSON.stringify(basePath + r.redirect)} }`;
           }
-          return path2;
-        };
-        const processedPath = replaceWildCardForVue3(config.frameworkKind, path);
-        return `{path: "${processedPath}", redirect: ${JSON.stringify(r.redirect)}}`;
+          return result;
+        }
+        return `{ path: "${path}", redirect: to => to.path.replace(/\\/$/, '') + '/' + ${JSON.stringify(r.redirect)} }`;
       }
       notImplemented(r);
     }
@@ -7389,7 +7452,7 @@ var Vue3EntryBuilderPlugin = class {
   buildEntry(ir) {
     const entryScript = this.microFrontendManager.produceScript(ir);
     const publicPathScript = this.microFrontendManager.producePublicPathScript(ir);
-    const code = `
+    let code = `
       if(window.LcapMicro){
         // \u5DF2\u7ECF\u88AB\u52A0\u8F7D\u4E8E\u5FAE\u524D\u7AEF\u73AF\u5883
         renderApp();
@@ -7407,6 +7470,11 @@ var Vue3EntryBuilderPlugin = class {
         from: "./public-path"
       } : void 0
     ].filter(isNotNil);
+    const { env, isExport } = ir.configs.config;
+    if (!isExport && env === "dev") {
+      const autoReloadScript = (init_auto_reload(), __toCommonJS(auto_reload_exports));
+      code += autoReloadScript?.default || autoReloadScript;
+    }
     return [
       new ReactFileDescription("main.ts", imports, [], [code]),
       publicPathScript ? new ReactFileDescription("public-path.ts", [], [], [publicPathScript]) : void 0
@@ -7432,10 +7500,13 @@ var Vue3LibrariesBuilderPlugin = class {
    */
   async buildLibrariesImport(ir, config) {
     const importArr = [];
+    const exportArr = [];
     const standardLib = ir.packages.find((x) => x.kind === "standard");
     if (standardLib) {
       const formattedName = kebab2Pascal(standardLib.name.split("/").at(-1));
-      importArr.push(`export * as ${formattedName} from '${standardLib.name}';`);
+      importArr.push(`import * as ${formattedName} from '${standardLib.name}';`);
+      exportArr.push(`export { ${formattedName} };`);
+      exportArr.push(`window.lcapStandardUI = ${formattedName};`);
       const isPackageZipExists = await judgePackageZipExists(standardLib, config.STATIC_URL);
       importArr.push(
         `import '${standardLib.name}${isPackageZipExists ? "/dist-theme" : ""}/index.css';`
@@ -7446,14 +7517,14 @@ var Vue3LibrariesBuilderPlugin = class {
       const formattedName = kebab2Pascal(ext.name.split("/").at(-1));
       const isPackageZipExists = await judgePackageZipExists(ext, config.STATIC_URL);
       const prefix = isPackageZipExists ? "" : "@extension/";
-      importArr.push(`export * as ${formattedName} from '${prefix}${ext.name}';`);
+      exportArr.push(`export * as ${formattedName} from '${prefix}${ext.name}';`);
       if (ext.hasCss) {
         importArr.push(
           `import '${prefix}${ext.name}${isPackageZipExists ? "/dist-theme" : ""}/index.css';`
         );
       }
     }
-    return new ReactFileDescription("libraries.ts", [], [], [importArr.join("\n")]);
+    return new ReactFileDescription("libraries.ts", [], [], [[...importArr, ...exportArr].join("\n")]);
   }
   static install(c) {
     c.bind(Vue3LibrariesBuilderPlugin).toSelf();
@@ -7689,15 +7760,16 @@ var Vue3ApplicationAssemblerPlugin = class {
     const bizComponents = ir.bizComponents.flatMap((x) => {
       return this.vue3CodegenPlugin.genFiles(x, manager);
     });
-    let routePrefix = ir.configs.frontendDesc.path;
-    if (!/\/$/.test(routePrefix)) {
-      routePrefix += "/";
+    let basePath = ir.configs.basePlatformConfig.basePath;
+    if (!/\/$/.test(basePath)) {
+      basePath += "/";
     }
-    const routesObjects = this.routesExtactor.extractRoute(ir.views, routePrefix, {
+    const routesObjects = this.routesExtactor.extractRoute(ir.views, basePath, {
       lazy: true
     });
     const router = this.routerBuilder.routeToCode(routesObjects.routes, manager, {
-      frameworkKind: "vue3"
+      frameworkKind: "vue3",
+      basePath
     });
     const routerFile = new ReactFileDescription("router.ts", router.imports, [], [router.code]);
     const libraries = await this.librariesBuilder.buildLibrariesImport(ir, config);
@@ -7750,6 +7822,30 @@ var Vue3PresetPlugin = class {
       const app = deserializeAppWhileKeepTypeAnnotation(appJson);
       const frontend = app.findNodeByPath(instruction.frontend.nodePath);
       const ir = this.irBuilder.buildIR(app, frontend, instruction.config);
+      const needCompileViews = instruction.config?.needCompileViews ?? [];
+      const isIncremental = needCompileViews.length > 0;
+      if (isIncremental) {
+        const filterChildComponents = (view, needCompileViews2) => {
+          if (!view.childComponents?.length) {
+            return;
+          }
+          view.childComponents = view.childComponents.filter((child) => {
+            if (needCompileViews2.includes(child.__raw.nodePath)) {
+              filterChildComponents(child, needCompileViews2);
+              return true;
+            }
+            return false;
+          });
+        };
+        ir.views = ir.views.filter((view) => {
+          if (needCompileViews.includes(view.__raw.nodePath)) {
+            filterChildComponents(view, needCompileViews);
+            return true;
+          }
+          return false;
+        });
+        ir.bizComponents = [];
+      }
       const assembledApplication = await this.applicationAssembler.assemble(ir, instruction.config);
       const finalizedFiles = await this.projectOrganizer.organize({
         baseDir: instruction.baseDir,
@@ -7831,7 +7927,7 @@ async function translateNASLToApp(app, frontend, config, baseDir = "./out", cont
     if (needCompileViews?.length > 0) {
       let traverseChildren2 = function(view, callback) {
         if (view.children?.length > 0) {
-          view.children.forEach((childView) => {
+          [...view.children].forEach((childView) => {
             const deep = callback(childView);
             if (deep) {
               traverseChildren2(childView, callback);
@@ -7841,9 +7937,10 @@ async function translateNASLToApp(app, frontend, config, baseDir = "./out", cont
       };
       var traverseChildren = traverseChildren2;
       logger13.info("\u5F00\u59CB\u6309\u9700\u7FFB\u8BD1\u9875\u9762");
-      frontend.views.forEach((view) => {
+      [...frontend.views].forEach((view) => {
         if (!needCompileViews.includes(view.nodePath)) {
           view.delete();
+          console.log(`\u5220\u9664\u9875\u9762 ${view.nodePath}\uFF0C\u56E0\u4E3A\u5B83\u4E0D\u5728 needCompileViews \u4E2D`);
         } else {
           traverseChildren2(view, (childView) => {
             if (!needCompileViews.includes(childView.nodePath)) {