@oiyo/core 0.3.0-beta.2 → 0.3.0

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 /**
- * @oiyo/core v0.3.0-beta.2
+ * @oiyo/core v0.3.0
  * Copyright (c) 2026 skiyee. All rights reserved.
  * Commercial software. See LICENSE for terms.
  * Official site: https://oiyo.js.org
@@ -7,7 +7,6 @@
 import * as _$magic_string0 from "magic-string";
 import { ComponentScanTarget, GlobalStyle, OiyoConfig, PagesConfig } from "@oiyo/config";
 import * as _$vue from "vue";
-import { SFCDescriptor } from "@vue/compiler-sfc";
 import { Plugin } from "vite";
 
 //#region src/logger.d.ts
@@ -255,11 +254,6 @@ declare class OiyoModLayout {
   exitLayout(file: string): boolean;
   generateDeclaration(): string;
   writeDeclaration(): boolean;
-  applyLayout(useName: string | false | undefined, template: string): {
-    template: string;
-    script: string;
-    imports: string[];
-  };
 }
 //#endregion
 //#region src/module/layout/placeholder.d.ts
@@ -267,60 +261,37 @@ declare const OiyoLayout: _$vue.DefineComponent<{}, () => _$vue.VNode<_$vue.Rend
   [key: string]: any;
 }>[] | undefined, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, string, _$vue.PublicProps, Readonly<_$vue.ExtractPropTypes<{}>>, {}, {}>;
 //#endregion
-//#region src/module/root/parse.d.ts
-interface ParsedRootMarco {
-  /** 宏引用模块 */
-  imports?: string[];
-  /** 宏工厂代码 (()=>{xxx}) */
-  script?: string;
-  /** 宏普通赋值的变量名，如 `const state = defineRootContext(...)` 中的 `state` */
-  variable?: string;
-  /** 宏解构赋值的属性列表，如 `const { count, user: u } = defineRootContext(...)` */
-  properties?: {
-    /** 本地变量名（解构后使用的名字） */local: string; /** 原始属性名（对象中的 key） */
-    original: string;
-  }[];
+//#region src/module/shared/extractor/import.d.ts
+interface ImportInfo {
+  importPath: string;
+  exportName: string;
+  importName: string;
 }
 //#endregion
 //#region src/module/root/instance.d.ts
 declare class OiyoModRoot {
   readonly config: OiyoConfig;
-  /** 根视图模块 */
-  rootView: {
-    imports: string[];
-    template: string;
-    script: string;
-  };
+  private readonly logger;
+  rootTemplateImports: Map<string, ImportInfo>;
+  rootTemplateContent: string;
+  rootTemplateScript: string;
+  rootMarcoImports: Map<string, ImportInfo>;
+  rootMarcoScript: string;
   /** 根虚拟模块 */
   rootVM?: string;
-  /** 根宏命令结构 */
-  rootMarco?: ParsedRootMarco;
-  private readonly logger;
   constructor(config: OiyoConfig, deps: {
     logger: Logger;
   });
   get srcDir(): string;
   get rootPath(): string;
   isRootPath(absPath: string): boolean;
-  parseRoot(source: string): {
-    view: {
-      imports: string[];
-      template: string;
-      script: string;
-    };
-    marco: ParsedRootMarco | undefined;
-  };
+  parseRoot(source: string): boolean;
   transformRoot(source: string): {
     code: string;
-    sourceMap: _$magic_string0.SourceMap;
+    map: _$magic_string0.SourceMap;
   };
   shouldRefreshView(code: string): boolean;
   shouldRefreshVM: (code: string) => boolean;
-  applyRoot(pageSfc: SFCDescriptor): {
-    imports: string[];
-    script: string;
-    template: string;
-  };
 }
 //#endregion
 //#region src/module/root/macro.d.ts
@@ -410,7 +381,6 @@ declare class OiyoModRoute {
   private toPage;
   private savePage;
   private loadPagesConfig;
-  private loadPagesJson;
   scanPages(): Promise<Map<string, PageFile>>;
   isPage(file: string): boolean;
   enterPage(file: string): boolean;
@@ -422,8 +392,13 @@ declare class OiyoModRoute {
   watchPagesConfig(onUpdateCallback?: () => void | Promise<void>): Promise<void>;
   unwatchPagesConfig(): Promise<void>;
   transformPage(source: string, file: string): Promise<{
+    code: string;
+    map: _$magic_string0.SourceMap;
+    sourceMap?: undefined;
+  } | {
     code: string;
     sourceMap: _$magic_string0.SourceMap;
+    map?: undefined;
   }>;
 }
 //#endregion

package/dist/index.d.mts

@@ -1,11 +1,10 @@
 /**
- * @oiyo/core v0.3.0-beta.2
+ * @oiyo/core v0.3.0
  * Copyright (c) 2026 skiyee. All rights reserved.
  * Commercial software. See LICENSE for terms.
  * Official site: https://oiyo.js.org
  */
 import * as _$magic_string0 from "magic-string";
-import { SFCDescriptor } from "@vue/compiler-sfc";
 import { ComponentScanTarget, GlobalStyle, OiyoConfig, PagesConfig } from "@oiyo/config";
 import * as _$vue from "vue";
 import { Plugin } from "vite";
@@ -255,11 +254,6 @@ declare class OiyoModLayout {
   exitLayout(file: string): boolean;
   generateDeclaration(): string;
   writeDeclaration(): boolean;
-  applyLayout(useName: string | false | undefined, template: string): {
-    template: string;
-    script: string;
-    imports: string[];
-  };
 }
 //#endregion
 //#region src/module/layout/placeholder.d.ts
@@ -267,60 +261,37 @@ declare const OiyoLayout: _$vue.DefineComponent<{}, () => _$vue.VNode<_$vue.Rend
   [key: string]: any;
 }>[] | undefined, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, string, _$vue.PublicProps, Readonly<_$vue.ExtractPropTypes<{}>>, {}, {}>;
 //#endregion
-//#region src/module/root/parse.d.ts
-interface ParsedRootMarco {
-  /** 宏引用模块 */
-  imports?: string[];
-  /** 宏工厂代码 (()=>{xxx}) */
-  script?: string;
-  /** 宏普通赋值的变量名，如 `const state = defineRootContext(...)` 中的 `state` */
-  variable?: string;
-  /** 宏解构赋值的属性列表，如 `const { count, user: u } = defineRootContext(...)` */
-  properties?: {
-    /** 本地变量名（解构后使用的名字） */local: string; /** 原始属性名（对象中的 key） */
-    original: string;
-  }[];
+//#region src/module/shared/extractor/import.d.ts
+interface ImportInfo {
+  importPath: string;
+  exportName: string;
+  importName: string;
 }
 //#endregion
 //#region src/module/root/instance.d.ts
 declare class OiyoModRoot {
   readonly config: OiyoConfig;
-  /** 根视图模块 */
-  rootView: {
-    imports: string[];
-    template: string;
-    script: string;
-  };
+  private readonly logger;
+  rootTemplateImports: Map<string, ImportInfo>;
+  rootTemplateContent: string;
+  rootTemplateScript: string;
+  rootMarcoImports: Map<string, ImportInfo>;
+  rootMarcoScript: string;
   /** 根虚拟模块 */
   rootVM?: string;
-  /** 根宏命令结构 */
-  rootMarco?: ParsedRootMarco;
-  private readonly logger;
   constructor(config: OiyoConfig, deps: {
     logger: Logger;
   });
   get srcDir(): string;
   get rootPath(): string;
   isRootPath(absPath: string): boolean;
-  parseRoot(source: string): {
-    view: {
-      imports: string[];
-      template: string;
-      script: string;
-    };
-    marco: ParsedRootMarco | undefined;
-  };
+  parseRoot(source: string): boolean;
   transformRoot(source: string): {
     code: string;
-    sourceMap: _$magic_string0.SourceMap;
+    map: _$magic_string0.SourceMap;
   };
   shouldRefreshView(code: string): boolean;
   shouldRefreshVM: (code: string) => boolean;
-  applyRoot(pageSfc: SFCDescriptor): {
-    imports: string[];
-    script: string;
-    template: string;
-  };
 }
 //#endregion
 //#region src/module/root/macro.d.ts
@@ -410,7 +381,6 @@ declare class OiyoModRoute {
   private toPage;
   private savePage;
   private loadPagesConfig;
-  private loadPagesJson;
   scanPages(): Promise<Map<string, PageFile>>;
   isPage(file: string): boolean;
   enterPage(file: string): boolean;
@@ -422,8 +392,13 @@ declare class OiyoModRoute {
   watchPagesConfig(onUpdateCallback?: () => void | Promise<void>): Promise<void>;
   unwatchPagesConfig(): Promise<void>;
   transformPage(source: string, file: string): Promise<{
+    code: string;
+    map: _$magic_string0.SourceMap;
+    sourceMap?: undefined;
+  } | {
     code: string;
     sourceMap: _$magic_string0.SourceMap;
+    map?: undefined;
   }>;
 }
 //#endregion