@oiyo/core 0.3.0-beta.3 → 0.3.1

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 /**
- * @oiyo/core v0.3.0-beta.3
+ * @oiyo/core v0.3.1
  * 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
@@ -44,17 +43,11 @@ declare function createLogger(level?: LogLevel, options?: LoggerOptions): Logger
 //#endregion
 //#region src/module/api/types.d.ts
 interface ApiFile {
-  /** 源文件在磁盘上的绝对路径 */
   filePath: string;
-  /** 导出名称，如 'default' 或具名导出 */
   exportName: string;
-  /** 被消费的导入绝对路径 */
   importPath: string;
-  /** 被消费的引用命名 */
   importName: string;
-  /** 是否为类型 */
   isType: boolean;
-  /** 是否位于 Node 模块中 */
   isNodeModule: boolean;
 }
 //#endregion
@@ -99,7 +92,6 @@ declare class OiyoModApi {
   private readonly config;
   private readonly logger;
   private readonly oiyoState;
-  /** 不含有 only 的 ApiScanTarget */
   private sources;
   apis: Map<string, ApiFile>;
   constructor(config: OiyoConfig, deps: {
@@ -113,19 +105,7 @@ declare class OiyoModApi {
   private recordApiSource;
   private toApiSource;
   private saveApi;
-  /**
-   * 直接提取
-   * - 1.必须是 Node 包
-   * - 2.必须指定某些值
-   */
   private directApi;
-  /**
-   * 扫描提取
-   * - 纯文件
-   * - 路径
-   * - node包
-   * - glob语法
-   */
   private scanApi;
   scanApis(): Promise<(ApiFile[] | void[] | undefined)[]>;
   private findApiSource;
@@ -142,37 +122,19 @@ declare class OiyoModApi {
 //#endregion
 //#region src/module/component/types.d.ts
 interface ComponentFile {
-  /** 源文件在磁盘上的绝对路径 */
   filePath: string;
-  /** 导出名称，如 'default' 或具名导出 */
   exportName: string;
-  /** 被消费的引用命名 */
   importName: string;
-  /** 被消费的导入绝对路径 */
   importPath: string;
-  /** 是否位于 Node 模块中 */
   isNodeModule: boolean;
 }
 interface ComponentScanSource extends ComponentScanTarget {
-  /**
-   * 扫描真实绝对路径
-   */
   dir: string;
-  /**
-   * 匹配文件模式 (支持glob语法)
-   */
   patterns?: string[];
-  /**
-   * 包的导出接口，用于针对 Node module
-   */
   isNodeModule: boolean;
 }
 //#endregion
 //#region src/module/component/instance.d.ts
-/**
- * TODO:
- * - 当 config 中含多个相同(范围匹配)的 target 时合并他们。
- */
 declare class OiyoModComponent {
   private readonly config;
   private readonly logger;
@@ -192,17 +154,7 @@ declare class OiyoModComponent {
   private recordComponentSource;
   private toComponentSource;
   private saveComponent;
-  /**
-   * 直接提取
-   * - 1.必须是 Node 包
-   * - 2.必须指定某些值
-   */
   private scanComponentByDirect;
-  /**
-   * 扫描提取
-   * - 1.可以是 路径、 Node 包
-   * - 2.不能指定某些值
-   */
   private scanComponentByDir;
   private scanComponent;
   scanComponents(): Promise<void>;
@@ -213,7 +165,7 @@ declare class OiyoModComponent {
   generateDeclaration(): string;
   writeDeclaration(): void;
   applyComponents(source: string, file: string, options?: {
-    /** 同时应用Api */withApis: boolean;
+    withApis: boolean;
   }): {
     code: string;
     map: _$magic_string0.SourceMap;
@@ -221,15 +173,9 @@ declare class OiyoModComponent {
 }
 //#endregion
 //#region src/module/layout/types.d.ts
-/**
- * 布局信息
- */
 interface LayoutFile {
-  /** 布局应用名称 */
   useName: string;
-  /** 布局组件名称 */
   componentName: string;
-  /** 布局文件的绝对路径 */
   filePath: string;
 }
 //#endregion
@@ -255,11 +201,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,72 +208,40 @@ 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;
-  };
-  /** 根虚拟模块 */
-  rootVM?: string;
-  /** 根宏命令结构 */
-  rootMarco?: ParsedRootMarco;
   private readonly logger;
+  rootTemplateImports: Map<string, ImportInfo>;
+  rootTemplateContent: string;
+  rootTemplateScript: string;
+  rootMarcoImports: Map<string, ImportInfo>;
+  rootMarcoScript: string;
+  rootVM?: string;
   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
-/**
- * 根上下文工厂函数
- */
 type RootContextFactory<T extends object> = () => T;
-/**
- * 定义根上下文
- * @param factory 返回上下文对象的工厂函数
- * @returns 上下文对象
- */
 declare const defineRootContext: <T extends object>(factory: RootContextFactory<T>) => T;
 //#endregion
 //#region src/module/root/virtual-module.d.ts
@@ -340,44 +249,20 @@ declare const VIRTUAL_ROOT_CONTEXT_ID = "virtual:oiyo-root-context";
 declare const RESOLVED_VIRTUAL_ROOT_CONTEXT_ID = "\0virtual:oiyo-root-context";
 //#endregion
 //#region src/module/route/types.d.ts
-/**
- * 可序列化的页面元信息值类型
- * 用于静态提取和 pages.json 生成
- */
 type PageMetaValue = string | number | boolean | null | PageMetaObject | PageMetaValue[];
-/**
- * 可序列化的页面元信息对象
- */
 interface PageMetaObject {
   [key: string]: PageMetaValue | undefined;
 }
-/**
- * 页面元信息基础字段
- */
 interface BasePageMeta {
-  /** 页面类型 */
   type?: 'page' | 'home';
-  /** 使用的布局名称，false 表示不使用布局 */
   layout?: string | false;
-  /** uni-app 页面样式配置 */
   style?: GlobalStyle;
 }
-/**
- * 已解析的页面元信息
- * 用于编译期静态提取和 pages.json 生成
- */
 interface ResolvedPageMeta extends BasePageMeta, PageMetaObject {}
-/**
- * 页面文件信息
- */
 interface PageFile {
-  /** 页面路径（相对于 srcDir，不含扩展名） */
   pagePath: string;
-  /** 页面文件的绝对路径 */
   filePath: string;
-  /** 页面元信息 */
   pageMeta: ResolvedPageMeta;
-  /** 所属包（main 或子包名称） */
   pageBelong: string;
 }
 //#endregion
@@ -410,7 +295,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,25 +306,20 @@ 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
 //#region src/module/route/macro.d.ts
-/**
- * 页面元信息
- * 用户在 definePageMeta() 中使用的类型
- * 支持通过 declare module '@skiyee/oiyo' 进行扩展
- */
 interface PageMeta extends BasePageMeta {
-  /** 其他自定义字段 */
   [key: string]: unknown;
 }
-/**
- * 定义页面元信息
- * @param meta 页面元信息配置
- */
 declare const definePageMeta: (meta: PageMeta) => void;
 //#endregion
 //#region src/module/route/placeholder.d.ts

package/dist/index.d.mts

@@ -1,11 +1,10 @@
 /**
- * @oiyo/core v0.3.0-beta.3
+ * @oiyo/core v0.3.1
  * 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";
@@ -44,17 +43,11 @@ declare function createLogger(level?: LogLevel, options?: LoggerOptions): Logger
 //#endregion
 //#region src/module/api/types.d.ts
 interface ApiFile {
-  /** 源文件在磁盘上的绝对路径 */
   filePath: string;
-  /** 导出名称，如 'default' 或具名导出 */
   exportName: string;
-  /** 被消费的导入绝对路径 */
   importPath: string;
-  /** 被消费的引用命名 */
   importName: string;
-  /** 是否为类型 */
   isType: boolean;
-  /** 是否位于 Node 模块中 */
   isNodeModule: boolean;
 }
 //#endregion
@@ -99,7 +92,6 @@ declare class OiyoModApi {
   private readonly config;
   private readonly logger;
   private readonly oiyoState;
-  /** 不含有 only 的 ApiScanTarget */
   private sources;
   apis: Map<string, ApiFile>;
   constructor(config: OiyoConfig, deps: {
@@ -113,19 +105,7 @@ declare class OiyoModApi {
   private recordApiSource;
   private toApiSource;
   private saveApi;
-  /**
-   * 直接提取
-   * - 1.必须是 Node 包
-   * - 2.必须指定某些值
-   */
   private directApi;
-  /**
-   * 扫描提取
-   * - 纯文件
-   * - 路径
-   * - node包
-   * - glob语法
-   */
   private scanApi;
   scanApis(): Promise<(ApiFile[] | void[] | undefined)[]>;
   private findApiSource;
@@ -142,37 +122,19 @@ declare class OiyoModApi {
 //#endregion
 //#region src/module/component/types.d.ts
 interface ComponentFile {
-  /** 源文件在磁盘上的绝对路径 */
   filePath: string;
-  /** 导出名称，如 'default' 或具名导出 */
   exportName: string;
-  /** 被消费的引用命名 */
   importName: string;
-  /** 被消费的导入绝对路径 */
   importPath: string;
-  /** 是否位于 Node 模块中 */
   isNodeModule: boolean;
 }
 interface ComponentScanSource extends ComponentScanTarget {
-  /**
-   * 扫描真实绝对路径
-   */
   dir: string;
-  /**
-   * 匹配文件模式 (支持glob语法)
-   */
   patterns?: string[];
-  /**
-   * 包的导出接口，用于针对 Node module
-   */
   isNodeModule: boolean;
 }
 //#endregion
 //#region src/module/component/instance.d.ts
-/**
- * TODO:
- * - 当 config 中含多个相同(范围匹配)的 target 时合并他们。
- */
 declare class OiyoModComponent {
   private readonly config;
   private readonly logger;
@@ -192,17 +154,7 @@ declare class OiyoModComponent {
   private recordComponentSource;
   private toComponentSource;
   private saveComponent;
-  /**
-   * 直接提取
-   * - 1.必须是 Node 包
-   * - 2.必须指定某些值
-   */
   private scanComponentByDirect;
-  /**
-   * 扫描提取
-   * - 1.可以是 路径、 Node 包
-   * - 2.不能指定某些值
-   */
   private scanComponentByDir;
   private scanComponent;
   scanComponents(): Promise<void>;
@@ -213,7 +165,7 @@ declare class OiyoModComponent {
   generateDeclaration(): string;
   writeDeclaration(): void;
   applyComponents(source: string, file: string, options?: {
-    /** 同时应用Api */withApis: boolean;
+    withApis: boolean;
   }): {
     code: string;
     map: _$magic_string0.SourceMap;
@@ -221,15 +173,9 @@ declare class OiyoModComponent {
 }
 //#endregion
 //#region src/module/layout/types.d.ts
-/**
- * 布局信息
- */
 interface LayoutFile {
-  /** 布局应用名称 */
   useName: string;
-  /** 布局组件名称 */
   componentName: string;
-  /** 布局文件的绝对路径 */
   filePath: string;
 }
 //#endregion
@@ -255,11 +201,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,72 +208,40 @@ 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;
-  };
-  /** 根虚拟模块 */
-  rootVM?: string;
-  /** 根宏命令结构 */
-  rootMarco?: ParsedRootMarco;
   private readonly logger;
+  rootTemplateImports: Map<string, ImportInfo>;
+  rootTemplateContent: string;
+  rootTemplateScript: string;
+  rootMarcoImports: Map<string, ImportInfo>;
+  rootMarcoScript: string;
+  rootVM?: string;
   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
-/**
- * 根上下文工厂函数
- */
 type RootContextFactory<T extends object> = () => T;
-/**
- * 定义根上下文
- * @param factory 返回上下文对象的工厂函数
- * @returns 上下文对象
- */
 declare const defineRootContext: <T extends object>(factory: RootContextFactory<T>) => T;
 //#endregion
 //#region src/module/root/virtual-module.d.ts
@@ -340,44 +249,20 @@ declare const VIRTUAL_ROOT_CONTEXT_ID = "virtual:oiyo-root-context";
 declare const RESOLVED_VIRTUAL_ROOT_CONTEXT_ID = "\0virtual:oiyo-root-context";
 //#endregion
 //#region src/module/route/types.d.ts
-/**
- * 可序列化的页面元信息值类型
- * 用于静态提取和 pages.json 生成
- */
 type PageMetaValue = string | number | boolean | null | PageMetaObject | PageMetaValue[];
-/**
- * 可序列化的页面元信息对象
- */
 interface PageMetaObject {
   [key: string]: PageMetaValue | undefined;
 }
-/**
- * 页面元信息基础字段
- */
 interface BasePageMeta {
-  /** 页面类型 */
   type?: 'page' | 'home';
-  /** 使用的布局名称，false 表示不使用布局 */
   layout?: string | false;
-  /** uni-app 页面样式配置 */
   style?: GlobalStyle;
 }
-/**
- * 已解析的页面元信息
- * 用于编译期静态提取和 pages.json 生成
- */
 interface ResolvedPageMeta extends BasePageMeta, PageMetaObject {}
-/**
- * 页面文件信息
- */
 interface PageFile {
-  /** 页面路径（相对于 srcDir，不含扩展名） */
   pagePath: string;
-  /** 页面文件的绝对路径 */
   filePath: string;
-  /** 页面元信息 */
   pageMeta: ResolvedPageMeta;
-  /** 所属包（main 或子包名称） */
   pageBelong: string;
 }
 //#endregion
@@ -410,7 +295,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,25 +306,20 @@ 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
 //#region src/module/route/macro.d.ts
-/**
- * 页面元信息
- * 用户在 definePageMeta() 中使用的类型
- * 支持通过 declare module '@skiyee/oiyo' 进行扩展
- */
 interface PageMeta extends BasePageMeta {
-  /** 其他自定义字段 */
   [key: string]: unknown;
 }
-/**
- * 定义页面元信息
- * @param meta 页面元信息配置
- */
 declare const definePageMeta: (meta: PageMeta) => void;
 //#endregion
 //#region src/module/route/placeholder.d.ts