@dcloudio/uni-cli-shared 3.0.0-alpha-3021320211109002 → 3.0.0-alpha-3021220211105012

package/dist/logs/console.js

@@ -1,14 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rewriteConsoleExpr = void 0;
-const compiler_sfc_1 = require("@vue/compiler-sfc");
+const magic_string_1 = __importDefault(require("magic-string"));
 const utils_1 = require("../utils");
 const F = '__f__';
 function rewriteConsoleExpr(filename, code) {
     filename = (0, utils_1.normalizePath)(filename);
     const re = /(console\.(log|info|debug|warn|error))\(([^)]+)\)/g;
     const locate = getLocator(code);
-    const s = new compiler_sfc_1.MagicString(code);
+    const s = new magic_string_1.default(code);
     let match;
     while ((match = re.exec(code))) {
         const [, expr, type] = match;

package/dist/logs/format.js

@@ -12,6 +12,12 @@ const initErrFormattersOnce = (0, uni_shared_1.once)(() => {
     if ((0, env_1.isInHBuilderX)()) {
         errFormatters.push(alias_1.moduleAliasFormatter);
     }
+    if ((0, env_1.runByHBuilderX)()) {
+        errFormatters.push(log_1.HBuilderXFileFormatter);
+    }
+    else {
+        errFormatters.push(log_1.FilenameFormatter);
+    }
 });
 const initInfoFormattersOnce = (0, uni_shared_1.once)(() => {
     if ((0, env_1.isInHBuilderX)()) {

package/dist/messages/index.d.ts

@@ -13,4 +13,6 @@ export declare const M: {
     'i18n.fallbackLocale.default': string;
     'i18n.fallbackLocale.missing': string;
     'easycom.conflict': string;
+    'mp.component.args[0]': string;
+    'mp.component.args[1]': string;
 };

package/dist/messages/index.js

@@ -16,4 +16,6 @@ exports.M = {
     'i18n.fallbackLocale.default': '当前应用未在 manifest.json 配置 fallbackLocale，默认使用：{locale}',
     'i18n.fallbackLocale.missing': '当前应用配置的 fallbackLocale 或 locale 为：{locale}，但 locale 目录缺少该语言文件',
     'easycom.conflict': 'easycom组件冲突：',
+    'mp.component.args[0]': '{0}的第一个参数必须为静态字符串',
+    'mp.component.args[1]': '{0}需要两个参数',
 };

package/dist/mp/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const COMPONENT_ON_LINK = "onVI";
+export declare const COMPONENT_BIND_LINK = "__l";

package/dist/mp/constants.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.COMPONENT_BIND_LINK = exports.COMPONENT_ON_LINK = void 0;
+exports.COMPONENT_ON_LINK = 'onVI';
+exports.COMPONENT_BIND_LINK = '__l';

package/dist/mp/event.d.ts

@@ -1,4 +1,5 @@
-export declare function formatMiniProgramEvent(eventName: string, { isCatch, isCapture, }: {
+export declare function formatMiniProgramEvent(eventName: string, { isCatch, isCapture, isComponent, }: {
     isCatch?: boolean;
     isCapture?: boolean;
+    isComponent?: boolean;
 }): string;

package/dist/mp/event.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatMiniProgramEvent = void 0;
-function formatMiniProgramEvent(eventName, { isCatch, isCapture, }) {
+function formatMiniProgramEvent(eventName, { isCatch, isCapture, isComponent, }) {
+    if (!isComponent && eventName === 'click') {
+        eventName = 'tap';
+    }
     let eventType = 'bind';
     if (isCatch) {
         eventType = 'catch';
@@ -9,7 +12,19 @@ function formatMiniProgramEvent(eventName, { isCatch, isCapture, }) {
     if (isCapture) {
         return `capture-${eventType}:${eventName}`;
     }
-    // 原生组件不支持 bind:input 等写法，统一使用 bindinput
-    return `${eventType}${eventName}`;
+    // bind:foo-bar
+    return eventType + (isSimpleExpr(eventName) ? '' : ':') + eventName;
 }
 exports.formatMiniProgramEvent = formatMiniProgramEvent;
+function isSimpleExpr(name) {
+    if (name.startsWith('_')) {
+        return false;
+    }
+    if (name.indexOf('-') > -1) {
+        return false;
+    }
+    if (name.indexOf(':') > -1) {
+        return false;
+    }
+    return true;
+}

package/dist/mp/imports.d.ts

@@ -0,0 +1,5 @@
+import { PluginContext } from 'rollup';
+import { ImportSpecifier } from 'es-module-lexer';
+export declare function findVueComponentImports(source: string, importer: string, resolve: PluginContext['resolve']): Promise<(ImportSpecifier & {
+    i: string;
+})[]>;

package/dist/mp/imports.js

@@ -0,0 +1,63 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findVueComponentImports = void 0;
+const path_1 = __importDefault(require("path"));
+const es_module_lexer_1 = require("es-module-lexer");
+const shared_1 = require("@vue/shared");
+const types_1 = require("@babel/types");
+const parser_1 = require("@babel/parser");
+const constants_1 = require("../constants");
+async function findVueComponentImports(source, importer, resolve) {
+    await es_module_lexer_1.init;
+    let imports = [];
+    // strip UTF-8 BOM
+    if (source.charCodeAt(0) === 0xfeff) {
+        source = source.slice(1);
+    }
+    try {
+        imports = (0, es_module_lexer_1.parse)(source)[0];
+    }
+    catch (e) {
+        console.error(e);
+    }
+    if (!imports.length) {
+        return [];
+    }
+    const rewriteImports = [];
+    for (let i = 0; i < imports.length; i++) {
+        const importSpecifier = imports[i];
+        const { n } = importSpecifier;
+        if (!n) {
+            continue;
+        }
+        const extname = path_1.default.extname(n);
+        // 仅处理没有后缀，或后缀是.vue,.nvue的文件
+        if (extname && !constants_1.EXTNAME_VUE.includes(extname)) {
+            continue;
+        }
+        const res = await resolve(n, importer);
+        if (!res) {
+            continue;
+        }
+        if (constants_1.EXTNAME_VUE_RE.test(res.id)) {
+            const expr = (0, parser_1.parse)(source.slice(importSpecifier.ss, importSpecifier.se), {
+                sourceType: 'module',
+            }).program.body[0];
+            if ((0, types_1.isImportDeclaration)(expr) && expr.specifiers.length === 1) {
+                const importDefaultSpecifier = expr.specifiers[0];
+                if (!(0, types_1.isImportDefaultSpecifier)(importDefaultSpecifier)) {
+                    continue;
+                }
+                rewriteImports.push((0, shared_1.extend)(importSpecifier, {
+                    n: res.id,
+                    i: importDefaultSpecifier.local.name,
+                }));
+            }
+        }
+    }
+    return rewriteImports;
+}
+exports.findVueComponentImports = findVueComponentImports;

package/dist/mp/index.d.ts

@@ -1 +1,6 @@
+export * from './nvue';
 export * from './event';
+export * from './style';
+export * from './template';
+export * from './constants';
+export { transformVueComponentImports } from './transformImports';

package/dist/mp/index.js

@@ -10,4 +10,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformVueComponentImports = void 0;
+__exportStar(require("./nvue"), exports);
 __exportStar(require("./event"), exports);
+__exportStar(require("./style"), exports);
+__exportStar(require("./template"), exports);
+__exportStar(require("./constants"), exports);
+var transformImports_1 = require("./transformImports");
+Object.defineProperty(exports, "transformVueComponentImports", { enumerable: true, get: function () { return transformImports_1.transformVueComponentImports; } });

package/dist/mp/nvue.d.ts

@@ -0,0 +1 @@
+export declare function genNVueCssCode(manifestJson: Record<string, any>): string;

package/dist/mp/nvue.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genNVueCssCode = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const nvue_1 = require("../json/app/manifest/nvue");
+function genNVueCssCode(manifestJson) {
+    let nvueCssCode = fs_1.default.readFileSync(path_1.default.resolve(__dirname, '../../lib/nvue.css'), 'utf8');
+    const flexDirection = (0, nvue_1.getNVueFlexDirection)(manifestJson);
+    if (flexDirection !== 'column') {
+        nvueCssCode = nvueCssCode.replace('column', flexDirection);
+    }
+    return nvueCssCode;
+}
+exports.genNVueCssCode = genNVueCssCode;

package/dist/mp/style.d.ts

@@ -0,0 +1 @@
+export declare function transformScopedCss(cssCode: string): string;

package/dist/mp/style.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformScopedCss = void 0;
+const scopedRE = /\[(data-v-[a-f0-9]{8})\]/gi;
+function transformScopedCss(cssCode) {
+    return cssCode.replace(scopedRE, (_, scopedId) => {
+        return '.' + scopedId;
+    });
+}
+exports.transformScopedCss = transformScopedCss;

package/dist/mp/template.d.ts

@@ -0,0 +1,55 @@
+import { EmittedAsset } from 'rollup';
+export interface MiniProgramCompilerOptions {
+    /**
+     * 需要延迟渲染的组件，通常是某个组件的某个事件会立刻触发，需要延迟到首次 render 之后，比如微信 editor 的 ready 事件，快手 switch 的 change
+     */
+    lazyElement?: {
+        [name: string]: string[];
+    };
+    event?: {
+        format(name: string, opts: {
+            isCatch?: boolean;
+            isCapture?: boolean;
+            isComponent?: boolean;
+        }): string;
+    };
+    class: {
+        /**
+         * 是否支持绑定 array 类型
+         */
+        array: boolean;
+    };
+    slot: {
+        /**
+         * 是否支持 $slots.default 访问
+         */
+        $slots?: boolean;
+        /**
+         * 是否支持后备内容
+         */
+        fallbackContent?: boolean;
+        /**
+         * 是否支持动态插槽名
+         */
+        dynamicSlotNames?: boolean;
+    };
+    filter?: {
+        lang: string;
+    };
+    directive: string;
+    emitFile?: (emittedFile: EmittedAsset) => string;
+}
+export interface MiniProgramFilterOptions {
+    id: string;
+    type: string;
+    name: string;
+    src?: string;
+    code: string;
+}
+declare type GenFilterFn = (filter: MiniProgramFilterOptions, filename: string) => string | void;
+export declare function findMiniProgramTemplateFiles(genFilter?: GenFilterFn): Record<string, string>;
+export declare function clearMiniProgramTemplateFiles(): void;
+export declare function addMiniProgramTemplateFile(filename: string, code: string): void;
+export declare function clearMiniProgramTemplateFilter(filename: string): void;
+export declare function addMiniProgramTemplateFilter(filename: string, filter: MiniProgramFilterOptions): void;
+export {};

package/dist/mp/template.js

@@ -0,0 +1,73 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addMiniProgramTemplateFilter = exports.clearMiniProgramTemplateFilter = exports.addMiniProgramTemplateFile = exports.clearMiniProgramTemplateFiles = exports.findMiniProgramTemplateFiles = void 0;
+const path_1 = __importDefault(require("path"));
+const uni_shared_1 = require("@dcloudio/uni-shared");
+const utils_1 = require("../utils");
+const templateFilesCache = new Map();
+const templateFiltersCache = new Map();
+function relativeFilterFilename(filename, filter) {
+    if (!filter.src) {
+        return '';
+    }
+    return ('./' +
+        (0, utils_1.normalizeMiniProgramFilename)(path_1.default.relative(path_1.default.dirname(filename), filter.src)));
+}
+function findMiniProgramTemplateFiles(genFilter) {
+    const files = Object.create(null);
+    templateFilesCache.forEach((code, filename) => {
+        if (!genFilter) {
+            files[filename] = code;
+        }
+        else {
+            const filters = getMiniProgramTemplateFilters(filename);
+            if (filters && filters.length) {
+                files[filename] =
+                    filters
+                        .map((filter) => genFilter(filter, relativeFilterFilename(filename, filter)))
+                        .join(uni_shared_1.LINEFEED) +
+                        uni_shared_1.LINEFEED +
+                        code;
+            }
+            else {
+                files[filename] = code;
+            }
+        }
+    });
+    return files;
+}
+exports.findMiniProgramTemplateFiles = findMiniProgramTemplateFiles;
+function clearMiniProgramTemplateFiles() {
+    templateFilesCache.clear();
+}
+exports.clearMiniProgramTemplateFiles = clearMiniProgramTemplateFiles;
+function addMiniProgramTemplateFile(filename, code) {
+    templateFilesCache.set(filename, code);
+}
+exports.addMiniProgramTemplateFile = addMiniProgramTemplateFile;
+function getMiniProgramTemplateFilters(filename) {
+    return templateFiltersCache.get(filename);
+}
+function clearMiniProgramTemplateFilter(filename) {
+    templateFiltersCache.delete(filename);
+}
+exports.clearMiniProgramTemplateFilter = clearMiniProgramTemplateFilter;
+function addMiniProgramTemplateFilter(filename, filter) {
+    const filters = templateFiltersCache.get(filename);
+    if (filters) {
+        const filterIndex = filters.findIndex((f) => f.id === filter.id);
+        if (filterIndex > -1) {
+            filters.splice(filterIndex, 1, filter);
+        }
+        else {
+            filters.push(filter);
+        }
+    }
+    else {
+        templateFiltersCache.set(filename, [filter]);
+    }
+}
+exports.addMiniProgramTemplateFilter = addMiniProgramTemplateFilter;

package/dist/mp/transformImports.d.ts

@@ -0,0 +1,14 @@
+import { ParserPlugin } from '@babel/parser';
+import { PluginContext } from 'rollup';
+interface TransformVueComponentImportsOptions {
+    root: string;
+    global?: boolean;
+    resolve: PluginContext['resolve'];
+    dynamicImport: (name: string, source: string) => string;
+    babelParserPlugins?: ParserPlugin[];
+}
+export declare function transformVueComponentImports(code: string, importer: string, { root, resolve, global, dynamicImport, babelParserPlugins, }: TransformVueComponentImportsOptions): Promise<{
+    code: string;
+    usingComponents: Record<string, string>;
+}>;
+export {};

package/dist/mp/transformImports.js

@@ -0,0 +1,175 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformVueComponentImports = void 0;
+const parser_1 = require("@babel/parser");
+const types_1 = require("@babel/types");
+const shared_1 = require("@vue/shared");
+const estree_walker_1 = require("estree-walker");
+const magic_string_1 = __importDefault(require("magic-string"));
+const messages_1 = require("../messages");
+const constants_1 = require("../constants");
+const utils_1 = require("../utils");
+async function transformVueComponentImports(code, importer, { root, resolve, global, dynamicImport, babelParserPlugins, }) {
+    if (!global && !code.includes(constants_1.BINDING_COMPONENTS)) {
+        return { code, usingComponents: {} };
+    }
+    const s = new magic_string_1.default(code);
+    const scriptAst = (0, parser_1.parse)(code, {
+        plugins: [...(babelParserPlugins || [])],
+        sourceType: 'module',
+    }).program;
+    const imports = findVueComponentImports(scriptAst.body, global
+        ? parseGlobalComponents(scriptAst)
+        : parseComponents(scriptAst, findBindingComponents(scriptAst.body)));
+    const usingComponents = {};
+    for (let i = 0; i < imports.length; i++) {
+        const { tag, import: { start, end, specifiers: [specifier], source, }, } = imports[i];
+        const resolveId = await resolve(source.value, importer);
+        if (resolveId) {
+            s.overwrite(start, end, dynamicImport(specifier.local.name, resolveId.id) + ';');
+            const componentName = (0, shared_1.hyphenate)(tag);
+            if (!usingComponents[componentName]) {
+                usingComponents[componentName] =
+                    '/' + (0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)(resolveId.id, root));
+            }
+        }
+    }
+    return { code: s.toString(), usingComponents };
+}
+exports.transformVueComponentImports = transformVueComponentImports;
+/**
+ * 解析编译器生成的 bindingComponents
+ * @param ast
+ * @returns
+ */
+function findBindingComponents(ast) {
+    for (const node of ast) {
+        if (!(0, types_1.isVariableDeclaration)(node)) {
+            continue;
+        }
+        const declarator = node.declarations[0];
+        if ((0, types_1.isIdentifier)(declarator.id) &&
+            declarator.id.name === constants_1.BINDING_COMPONENTS) {
+            const bindingComponents = JSON.parse(declarator.init.value);
+            return Object.keys(bindingComponents).reduce((bindings, tag) => {
+                const binding = bindingComponents[tag];
+                bindings[binding.name] = {
+                    tag,
+                    type: binding.type,
+                };
+                return bindings;
+            }, {});
+        }
+    }
+    return {};
+}
+/**
+ * 查找全局组件定义：app.component('component-a',{})
+ * @param ast
+ * @returns
+ */
+function parseGlobalComponents(ast) {
+    const bindingComponents = {};
+    estree_walker_1.walk(ast, {
+        enter(child) {
+            if (!(0, types_1.isCallExpression)(child)) {
+                return;
+            }
+            const { callee } = child;
+            // .component
+            if (!(0, types_1.isMemberExpression)(callee) ||
+                !(0, types_1.isIdentifier)(callee.property) ||
+                callee.property.name !== 'component') {
+                return;
+            }
+            // .component('component-a',{})
+            const args = child.arguments;
+            if (args.length !== 2) {
+                return;
+            }
+            const [name, value] = args;
+            if (!(0, types_1.isStringLiteral)(name)) {
+                return console.warn(messages_1.M['mp.component.args[0]']);
+            }
+            if (!(0, types_1.isIdentifier)(value)) {
+                return console.warn(messages_1.M['mp.component.args[1]']);
+            }
+            bindingComponents[value.name] = {
+                tag: name.value,
+                type: 'unknown',
+            };
+        },
+    });
+    return bindingComponents;
+}
+/**
+ * 从 components 中查找定义的组件，修改 bindingComponents
+ * @param ast
+ * @param bindingComponents
+ */
+function parseComponents(ast, bindingComponents) {
+    ;
+    estree_walker_1.walk(ast, {
+        enter(child) {
+            if (!(0, types_1.isObjectExpression)(child)) {
+                return;
+            }
+            const componentsProp = child.properties.find((prop) => (0, types_1.isObjectProperty)(prop) &&
+                (0, types_1.isIdentifier)(prop.key) &&
+                prop.key.name === 'components');
+            if (!componentsProp) {
+                return;
+            }
+            const componentsExpr = componentsProp.value;
+            if (!(0, types_1.isObjectExpression)(componentsExpr)) {
+                return;
+            }
+            componentsExpr.properties.forEach((prop) => {
+                if (!(0, types_1.isObjectProperty)(prop)) {
+                    return;
+                }
+                if (!(0, types_1.isIdentifier)(prop.key) && !(0, types_1.isStringLiteral)(prop.key)) {
+                    return;
+                }
+                if (!(0, types_1.isIdentifier)(prop.value)) {
+                    return;
+                }
+                const tag = (0, types_1.isIdentifier)(prop.key) ? prop.key.name : prop.key.value;
+                const name = findBindingComponent(tag, bindingComponents);
+                if (name) {
+                    bindingComponents[prop.value.name] = bindingComponents[name];
+                }
+            });
+        },
+    });
+    return bindingComponents;
+}
+function findBindingComponent(tag, bindingComponents) {
+    return Object.keys(bindingComponents).find((name) => {
+        const componentTag = bindingComponents[name].tag;
+        const camelName = (0, shared_1.camelize)(componentTag);
+        const PascalName = (0, shared_1.capitalize)(camelName);
+        return tag === componentTag || tag === camelName || tag === PascalName;
+    });
+}
+function findVueComponentImports(ast, bindingComponents) {
+    const imports = [];
+    for (let i = 0; i < ast.length; i++) {
+        const node = ast[i];
+        if (!(0, types_1.isImportDeclaration)(node)) {
+            continue;
+        }
+        if (node.specifiers.length !== 1) {
+            continue;
+        }
+        const { name } = node.specifiers[0].local;
+        if (!bindingComponents[name]) {
+            continue;
+        }
+        imports.push({ tag: bindingComponents[name].tag, import: node });
+    }
+    return imports;
+}

package/dist/postcss/plugins/stylePluginScoped.d.ts

@@ -1,3 +1,3 @@
-import { PluginCreator } from 'postcss';
+import type { PluginCreator } from 'postcss';
 declare const scopedPlugin: PluginCreator<string>;
 export default scopedPlugin;

package/dist/postcss/plugins/uniapp.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from 'postcss';
+import type { Plugin } from 'postcss';
 interface UniAppCssProcessorOptions {
     page?: string;
     unit?: string;