@doracli/helper 0.0.3 → 0.0.5

package/lib/type/index.d.ts

@@ -1,10 +1,11 @@
-import * as _doracli_type from '@doracli/type';
-import { TTsConfig, TDoraConfig, TCdnConfigDefine, TPackageConfig, TDoraConfigDefine, TMode, TCdn, TModule } from '@doracli/type';
 import * as _cclr_lang from '@cclr/lang';
-import { TPlainObject, TAny, PartialRecursive } from '@cclr/lang';
+import { TPlainObject, PartialRecursive, TAny } from '@cclr/lang';
+import * as _doracli_type from '@doracli/type';
+import { TTsConfig, TDoraConfig, TCdn, TPackageConfig, TMode, TDoraConfigDefine, TCdnConfigDefine, TModule } from '@doracli/type';
+import { TOnionFun } from '@cclr/utils';
 import * as _doracli_type_src_dora_config_dts from '@doracli/type/src/dora-config-dts';
-import * as _doracli_type_src_dora_config_service from '@doracli/type/src/dora-config-service';
 import * as _doracli_type_src_dora_config_esbuild from '@doracli/type/src/dora-config-esbuild';
+import * as _doracli_type_src_common from '@doracli/type/src/common';
 export { default as picocolors } from 'picocolors';
 
 declare class ConfigCtx {
@@ -22,13 +23,31 @@ declare class ConfigCtx {
     getTsConfig(): TTsConfig;
     setDoraConfig(config: TDoraConfig): void;
     getDoraConfig(): TDoraConfig;
-    setCdnConfig(config: TCdnConfigDefine): void;
-    getCdnConfig(): Partial<Record<"headAfterScript" | "headAfterStyle" | "bodyBeforeScript" | "bodyAfterScript", string[] | ((mode: _doracli_type.TMode) => string[])>>;
+    setCdnConfig(config: TCdn): void;
+    getCdnConfig(): TCdn;
     setPackageConfig(config: TPackageConfig): void;
     getPackageConfig(): TPackageConfig;
     copy(): ConfigCtx;
 }
 
+declare const clearMw: () => TOnionFun<ConfigCtx>;
+
+declare const collectPackageJsonMw: () => TOnionFun<ConfigCtx>;
+declare const collectTsconfigJsonMw: () => TOnionFun<ConfigCtx>;
+declare const collectCdnConfigMw: (mode: TMode) => TOnionFun<ConfigCtx>;
+declare const collectDoraConfigMw: (mode: TMode) => TOnionFun<ConfigCtx>;
+declare const collectBaseConfigMw: (workRoot: string, cmd: TPlainObject) => TOnionFun<ConfigCtx>;
+
+declare const wholeDoraConfigMw: (defaultConfig: PartialRecursive<TDoraConfig>) => TOnionFun<ConfigCtx>;
+
+declare const wholeDoraInoutMw: () => TOnionFun<ConfigCtx>;
+
+declare const configCtxWorkflow: <T extends TPlainObject>(config: T) => {
+    use(middleware: TOnionFun<T>): any;
+    getResult(): Promise<T>;
+};
+type TWorkflowApi<T extends TPlainObject> = ReturnType<typeof configCtxWorkflow<T>>;
+
 declare enum EnvEnum {
     dev = "development",
     prod = "production"
@@ -46,6 +65,7 @@ declare abstract class CompilerBase<T extends TPlainObject, R extends {
         output: (output: TPlainObject) => R['build'];
     }>;
     abstract context: (options: T) => Promise<{
+        compiler?: unknown;
         rebuild: () => R['build'];
         cancel: () => Promise<void>;
     }>;
@@ -54,6 +74,114 @@ declare abstract class CompilerBase<T extends TPlainObject, R extends {
     abstract server: (server: TPlainObject) => R['server'];
 }
 
+interface IScriptOptions {
+    src: string;
+    async?: boolean;
+    defer?: boolean;
+    order?: number;
+}
+/**
+ * 动态html生成器
+ */
+declare class DynamicHtml {
+    headScripts: IScriptOptions[];
+    bodyScripts: IScriptOptions[];
+    headStyles: IScriptOptions[];
+    headTags: string[];
+    bodyTags: string[];
+    addHeadScripts(scripts: IScriptOptions[], force?: boolean): void;
+    addBodyScripts(scripts: IScriptOptions[], force?: boolean): void;
+    addHeadStyles(styles: IScriptOptions[], force?: boolean): void;
+    addHeadTags(tags: string[], force?: boolean): void;
+    addBodyTags(tags: string[], force?: boolean): void;
+    copy(): DynamicHtml;
+    /**
+     * 序列化为html模板
+     * @param title
+     * @returns
+     */
+    generateHtmlTemplate(title?: string): string;
+}
+
+type TBundleAsset = {
+    name: string;
+    scripts: string[];
+    styles: string[];
+    runtimeChunks: string[];
+};
+declare class HtmlAssetManager {
+    publicPath: string;
+    private assetMap;
+    private dynamicHtml;
+    private initAwaitList;
+    assetList: string[];
+    constructor(publicPath?: string);
+    updateAssetList(assetList: string[], force?: boolean): void;
+    updateAssetMap(assetMap: Record<string, TBundleAsset>, force?: boolean): void;
+    getAssetMap(): Record<string, TBundleAsset>;
+    getModuleAsset(moduleName: string): TBundleAsset;
+    getModuleHtml(moduleName: string): Promise<string>;
+}
+
+interface TParsedTagAttr {
+    name: string;
+    value: string | boolean;
+}
+interface TParsedTag {
+    tagName: string;
+    attrs?: TParsedTagAttr[];
+    selfClosing?: boolean;
+    /**
+     * 1. 标签内的文本
+     * 2. 子标签集合
+     */
+    children?: (TParsedTag | string)[];
+}
+declare class HtmlManage {
+    head: TParsedTag[];
+    body: TParsedTag[];
+    constructor(options?: {
+        head?: TParsedTag[];
+        body?: TParsedTag[];
+    });
+    addHead(tag: TParsedTag): this;
+    addHeads(tags: TParsedTag[]): this;
+    addBody(tag: TParsedTag): this;
+    addBodys(tags: TParsedTag[]): this;
+    parseHtmlByFile(filePath: string): this;
+    generateHtml(): string;
+    copy(): HtmlManage;
+    static parseHtml(html: string): {
+        head: TParsedTag[];
+        body: TParsedTag[];
+    };
+}
+
+/**
+ * 解析html
+ * 会解析 head body 下一层级的标签，子标签，已children保存
+ */
+declare const parseHtml: (html: string) => {
+    head: TParsedTag[];
+    body: TParsedTag[];
+};
+
+declare class GenerateConfigHtml extends HtmlManage {
+    configCtx: ConfigCtx;
+    constructor(configCtx: ConfigCtx);
+    init(): Promise<this>;
+    addConfigCdn(): this;
+    /**
+     * 写入到文件，没有文件创建文件
+     * @param filePath 文件路径
+     * @returns
+     */
+    writeToFile(filePath: string): this;
+    addBodyScripts(scripts: string[]): this;
+    addHeadStyles(styles: string[]): this;
+    copy(): GenerateConfigHtml;
+}
+
 /**
  * 在制定目录下插入 tsconfig.json 文件
  * @param cwd
@@ -76,25 +204,25 @@ declare const setLogLevel: (lvl: number) => void;
  * @param msg 消息
  * @returns
  */
-declare const cLogDebugger: (mode: string, status: string, ...msg: string[]) => void;
+declare const cLogDebugger: (mode: string, status: string, ...msg: TAny[]) => void;
 /**
  * @param mode 模式
  * @param status 状态
  * @param msg 消息
  * @returns
  */
-declare const cLogMessage: (mode: string, status: string, ...msg: string[]) => void;
-declare const cLogSuccess: (mode: string, status: string, ...msg: string[]) => void;
-declare const cLogWarn: (mode: "serve" | "build" | string, status: string, ...msg: string[]) => void;
-declare const cLogError: (mode: string, status: string, ...msg: string[]) => void;
+declare const cLogMessage: (mode: string, status: string, ...msg: TAny[]) => void;
+declare const cLogSuccess: (mode: string, status: string, ...msg: TAny[]) => void;
+declare const cLogWarn: (mode: "serve" | "build" | string, status: string, ...msg: TAny[]) => void;
+declare const cLogError: (mode: string, status: string, ...msg: TAny[]) => void;
 declare const cLogTime: (key?: string) => () => void;
 declare const cLogTimeEnd: (key: string) => void;
 declare const cLog: {
-    log: (mode: string, status: string, ...msg: string[]) => void;
-    debug: (mode: string, status: string, ...msg: string[]) => void;
-    error: (mode: string, status: string, ...msg: string[]) => void;
-    warn: (mode: "serve" | "build" | string, status: string, ...msg: string[]) => void;
-    info: (mode: string, status: string, ...msg: string[]) => void;
+    log: (mode: string, status: string, ...msg: TAny[]) => void;
+    debug: (mode: string, status: string, ...msg: TAny[]) => void;
+    error: (mode: string, status: string, ...msg: TAny[]) => void;
+    warn: (mode: "serve" | "build" | string, status: string, ...msg: TAny[]) => void;
+    info: (mode: string, status: string, ...msg: TAny[]) => void;
     time: (key?: string) => () => void;
     timeEnd: (key: string) => void;
 };
@@ -120,18 +248,14 @@ declare const getTsconfigJson: (root: string) => Promise<any>;
  */
 declare function getUserCdn(root: string): Promise<TCdnConfigDefine | null>;
 
-declare const mergeDoraCliConfig: <T extends PartialRecursive<TDoraConfig>>(target: T, source?: T) => Omit<T, "output"> & {
-    output: {
-        file?: string;
-        path?: string | undefined;
-    };
-};
+declare const mergeDoraCliConfig: <T extends PartialRecursive<TDoraConfig>>(target: T, source?: T) => T;
 /**
  * 合并多个配置项
  * @param target 配置项，可多个，后面的配置项会覆盖前面的配置项
  * @returns
  */
 declare const mergeDoraCliConfigMutiple: <T extends PartialRecursive<TDoraConfig>>(...target: T[]) => T;
+declare const deepMergeObject: <T extends TPlainObject>(target: T, source: T) => T;
 
 /**
  * 获取cdn文件配置
@@ -155,13 +279,17 @@ declare const parseDoracliConfig: (userConfig: TDoraConfigDefine | null, mode: T
  * @returns
  */
 declare const splitDoraCliConfig: (config: TDoraConfig) => {
+    name: string;
+    type: _doracli_type.TConfigType;
     input: string;
     output: _doracli_type.TOutput;
-    formatList: _doracli_type.TModule[];
+    lib: _doracli_type.TLib;
     format: _doracli_type.TModule;
+    libList: _doracli_type.TLib[];
+    formatList: _doracli_type.TModule[];
     clear: boolean;
     minimize: boolean;
-    externals: string[];
+    externals: string[] | _doracli_type_src_common.TPlainObject[];
     internals: string[];
     alias: Record<string, string>;
     dts: {
@@ -176,7 +304,7 @@ declare const splitDoraCliConfig: (config: TDoraConfig) => {
     rspackConfig?: _doracli_type.TDoraConfigWebpack;
     rollupConfig?: _doracli_type.TDoraConfigRollup;
     esbuildConfig?: _doracli_type_src_dora_config_esbuild.TDoraConfigEsbuild;
-    serviceConfig?: _doracli_type_src_dora_config_service.TDoraConfigService;
+    serviceConfig?: Partial<_doracli_type.TDoraConfigService>;
     dtsConfig?: _doracli_type_src_dora_config_dts.TDoraConfigDts;
 }[] | PartialRecursive<TDoraConfig>[];
 
@@ -185,6 +313,8 @@ declare const wholeDoraConfig: (config: PartialRecursive<TDoraConfig>, workRootD
 declare const inputFileDirList: string[];
 declare const inputFileTypeList: string[];
 declare const findInput: (workRootDir: string) => string;
+declare const inputHtmlFileDirList: string[];
+declare const findInputHtml: (workRootDir: string) => string;
 
 /**
  * 获取tsconfig.json里的paths，作为项目路径别名
@@ -207,7 +337,7 @@ declare const collectConfig: (configCtx: ConfigCtx, mode: TMode, presetConfig?:
  * 获取cdn文件配置
  * @returns
  */
-declare function resolveCdnConfig(workRootDir: string, mode: TMode): Promise<{} | undefined>;
+declare function resolveCdnConfig(workRootDir: string, mode: TMode): Promise<TCdn | undefined>;
 
 declare const resolveDoraConfig: (workRootDir: string, mode: TMode) => Promise<_cclr_lang.PartialRecursive<_doracli_type.TDoraConfig> | null>;
 
@@ -246,6 +376,12 @@ declare const configCtxCollect: (configCtx: ConfigCtx, params: {
     cmd?: TPlainObject;
 } & TParseConfigResult) => Promise<void>;
 
+/**
+ * 创建环境参数
+ * @description 会自动处理出绝对路径的 workRootDir
+ * @param params 上下文变量
+ * @returns
+ */
 declare const createEnvParams: <T extends TPlainObject>(params: T) => T;
 
 type TOutputSingle = {
@@ -260,14 +396,41 @@ type TOutputSingle = {
 };
 declare const createOutputList: (config: TDoraConfig) => TOutputSingle[];
 
-declare const splitDoraConfig: (config: TDoraConfig) => PartialRecursive<TDoraConfig>[] | {
+/**
+ * 依赖项过滤
+ * @param options 过滤选项
+ * @param strategy 规则冲突时，过滤策略 include-包含 | exclude-排除，默认排除
+ * @returns 依赖过滤函数 () => boolean 返回true表示 - 属于排除范围
+ */
+declare const createDependFilter: (options: {
+    externals?: TDoraConfig["externals"];
+    internals?: TDoraConfig["internals"];
+    dependencies?: Record<string, string>;
+    peerDependencies?: Record<string, string>;
+    devDependencies?: Record<string, string>;
+    /**
+     * 判断模块名是否相等，默认是使用 targetId.startsWith(moduleRuleId) 进行判断
+     * @param targetId 代码中使用的模块名
+     * @param moduleRuleId 规则中的模块名
+     * @returns true 相等
+     */
+    compare?: (targetId: string, moduleRuleId: string) => boolean;
+}, strategy?: "include" | "exclude") => (id: string) => string | false;
+
+declare const getDefaultHtml: (workRootDir: string) => Promise<string>;
+
+declare const splitDoraConfig: (config: TDoraConfig) => PartialRecursive<TDoraConfig>[] | _doracli_type.TDoraConfigMultiple[] | {
+    name: string;
+    type: _doracli_type.TConfigType;
     input: string;
     output: _doracli_type.TOutput;
-    formatList: _doracli_type.TModule[];
+    lib: _doracli_type.TLib;
     format: _doracli_type.TModule;
+    libList: _doracli_type.TLib[];
+    formatList: _doracli_type.TModule[];
     clear: boolean;
     minimize: boolean;
-    externals: string[];
+    externals: string[] | _doracli_type_src_common.TPlainObject[];
     internals: string[];
     alias: Record<string, string>;
     dts: {
@@ -282,9 +445,9 @@ declare const splitDoraConfig: (config: TDoraConfig) => PartialRecursive<TDoraCo
     rspackConfig?: _doracli_type.TDoraConfigWebpack;
     rollupConfig?: _doracli_type.TDoraConfigRollup;
     esbuildConfig?: _doracli_type_src_dora_config_esbuild.TDoraConfigEsbuild;
-    serviceConfig?: _doracli_type_src_dora_config_service.TDoraConfigService;
+    serviceConfig?: Partial<_doracli_type.TDoraConfigService>;
     dtsConfig?: _doracli_type_src_dora_config_dts.TDoraConfigDts;
 }[];
 
-export { CompilerBase, ConfigCtx, EnvEnum, cLog, cLogDebugger, cLogError, cLogMessage, cLogSuccess, cLogTime, cLogTimeEnd, cLogWarn, collectConfig, collectConfigs, configCtxCollect, createEnvParams, createOutputList, findInput, getDependencies, getDoracliConfig, getPackageJson, getTsPathAlias, getTsconfigJson, getUserCdn, inputFileDirList, inputFileTypeList, insertTsconfig, mergeDoraCliConfig, mergeDoraCliConfigMutiple, parseCdnConfig, parseDoracliConfig, parsetConfig, resolveCdnConfig, resolveDoraConfig, resolvePackageJson, resolveTsconfigJson, setLogLevel, splitDoraCliConfig, splitDoraConfig, wholeDoraConfig };
-export type { TCollectType, TOutputSingle, TParseConfigResult };
+export { CompilerBase, ConfigCtx, DynamicHtml, EnvEnum, GenerateConfigHtml, HtmlAssetManager, HtmlManage, cLog, cLogDebugger, cLogError, cLogMessage, cLogSuccess, cLogTime, cLogTimeEnd, cLogWarn, clearMw, collectBaseConfigMw, collectCdnConfigMw, collectConfig, collectConfigs, collectDoraConfigMw, collectPackageJsonMw, collectTsconfigJsonMw, configCtxCollect, configCtxWorkflow, createDependFilter, createEnvParams, createOutputList, deepMergeObject, findInput, findInputHtml, getDefaultHtml, getDependencies, getDoracliConfig, getPackageJson, getTsPathAlias, getTsconfigJson, getUserCdn, inputFileDirList, inputFileTypeList, inputHtmlFileDirList, insertTsconfig, mergeDoraCliConfig, mergeDoraCliConfigMutiple, parseCdnConfig, parseDoracliConfig, parseHtml, parsetConfig, resolveCdnConfig, resolveDoraConfig, resolvePackageJson, resolveTsconfigJson, setLogLevel, splitDoraCliConfig, splitDoraConfig, wholeDoraConfig, wholeDoraConfigMw, wholeDoraInoutMw };
+export type { IScriptOptions, TBundleAsset, TCollectType, TOutputSingle, TParseConfigResult, TParsedTag, TParsedTagAttr, TWorkflowApi };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@doracli/helper",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "use helper",
   "author": "cclr <18843152354@163.com>",
   "homepage": "",
@@ -25,20 +25,20 @@
   "scripts": {
     "test": "vitest",
     "g:test": "vitest run",
-    "build": "drn build",
-    "g:build": "drn build"
+    "build": "drr build",
+    "g:build": "drr build"
   },
   "dependencies": {
-    "@cclr/lang": "^0.1.28",
-    "@cclr/utils": "^0.1.28",
-    "@dorabag/config-loader": "^1.0.11",
+    "@cclr/lang": "^0.1.49",
+    "@cclr/utils": "^0.1.49",
+    "@dorabag/config-loader": "^1.0.16",
     "@dorabag/file-pro": "^1.0.10",
-    "@dorabag/open-browser": "^1.0.10",
-    "@dorabag/srv-tool": "^1.0.10",
-    "@doracli/type": "^0.0.3",
+    "@dorabag/open-browser": "^1.0.16",
+    "@dorabag/srv-tool": "^1.0.16",
+    "@doracli/type": "^0.0.5",
     "picocolors": "^1.1.1",
-    "webpack": "^5.102.1",
+    "webpack": "^5.104.1",
     "webpack-dev-server": "^5.2.2"
   },
-  "gitHead": "c89b02be8c385738ad80749447133d30e00b1f75"
+  "gitHead": "ac4c6829b2cec621ecf66b6324843773e8b5141f"
 }