xhs-mp-compiler-cli 1.1.3 → 1.1.4

package/dist/utils/tagTransformMap.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tagTransformMap = {
+    view: 'xhs-vue-view',
+    text: 'xhs-vue-text',
+    // block: 'span',
+    image: 'xhs-vue-image',
+    input: 'xhs-vue-input',
+    icon: 'xhs-vue-icon',
+    label: 'xhs-vue-label',
+    radio: 'xhs-vue-radio',
+    'radio-group': 'xhs-vue-radio-group',
+    checkbox: 'xhs-vue-checkbox',
+    'checkbox-group': 'xhs-vue-checkbox-group',
+    switch: 'xhs-vue-switch',
+    textarea: 'xhs-vue-textarea',
+    button: 'xhs-vue-button',
+    swiper: 'xhs-vue-swiper',
+    'swiper-item': 'xhs-vue-swiper-item',
+    navigator: 'xhs-vue-navigator',
+    slider: 'xhs-vue-slider',
+    progress: 'xhs-vue-progress',
+    'rich-text': 'xhs-vue-rich-text',
+    'mf-page': 'div',
+    'scroll-view': 'xhs-vue-scroll-view',
+    picker: 'xhs-vue-picker',
+    'picker-view': 'xhs-vue-picker-view',
+    'picker-view-column': 'xhs-vue-picker-view-column',
+    form: 'xhs-vue-form',
+    'web-view': 'xhs-vue-web-view',
+    video: 'xhs-vue-video',
+    map: 'xhs-vue-map',
+    editor: 'xhs-vue-editor',
+    'movable-area': 'xhs-vue-movable-area',
+    'movable-view': 'xhs-vue-movable-view',
+    canvas: 'xhs-vue-canvas'
+};
+exports.default = tagTransformMap;

package/dist/utils/utils.d.ts

@@ -0,0 +1,7 @@
+export declare function getMd5(str: any): any;
+export declare function normalizePath(str: any): any;
+declare const _default: {
+    hasFile: (filepath: any) => boolean;
+    getTsconfigPath: (config: any) => string | null;
+};
+export default _default;

package/dist/utils/utils.js

@@ -0,0 +1,50 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizePath = exports.getMd5 = void 0;
+// @ts-nocheck
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const crypto = require('crypto');
+function getMd5(str) {
+    const hash = crypto.createHash('md5');
+    hash.update(str);
+    const md5 = hash.digest('hex');
+    return md5;
+}
+exports.getMd5 = getMd5;
+function normalizePath(str) {
+    return str.replace(/\\/g, '/');
+}
+exports.normalizePath = normalizePath;
+const hasFile = filepath => {
+    try {
+        const stat = fs_1.default.statSync(filepath);
+        return stat.isFile();
+    }
+    catch (e) {
+        return false;
+    }
+};
+const getTsconfigPath = config => {
+    let res = '';
+    // 查询距离最近的 tsconfig.json
+    if (config.projectPath) {
+        res = path_1.default.resolve(process.cwd(), config.projectPath, 'tsconfig.json');
+        if (hasFile(res)) {
+            return res;
+        }
+    }
+    // 查询 root 的 tsconfig.json
+    res = path_1.default.resolve(process.cwd(), 'tsconfig.json');
+    if (hasFile(res)) {
+        return res;
+    }
+    return null;
+};
+exports.default = {
+    hasFile,
+    getTsconfigPath,
+};

package/dist/utils/zip.d.ts

@@ -0,0 +1,28 @@
+import type { Archiver } from 'archiver';
+import * as fse from 'fs-extra';
+interface IOptions {
+    outputDir: string;
+}
+export declare class Zip {
+    options: IOptions;
+    archive: Archiver;
+    output: fse.WriteStream;
+    constructor(options: IOptions);
+    initOutput(): void;
+    finalize(): Promise<any>;
+}
+/**
+ * 解压 zip 文件 yauzl
+ * @param zipPath string
+ * @param outputDir string
+ * @param options unzipOptions
+ */
+export declare function unzip(zipPath: string, outputDir: string): Promise<void>;
+/**
+ * 解压 zip 文件
+ * @param zipPath string
+ * @param outputDir string
+ */
+export declare function unzipMac(zipPath: string, outputDir: string): Promise<unknown>;
+export declare const genZip: (input: string, output: string, appId?: string) => Promise<void>;
+export {};

package/dist/utils/zip.js

@@ -0,0 +1,287 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genZip = exports.unzipMac = exports.unzip = exports.Zip = void 0;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const fse = __importStar(require("fs-extra"));
+const debug = require('debug')('zip');
+const path = require('path');
+const { promisify } = require('util');
+const stream = require('stream');
+const archiver = require('archiver');
+const yauzl = require('yauzl');
+const openZip = promisify(yauzl.open);
+const pipeline = promisify(stream.pipeline);
+class Extractor {
+    constructor(zipPath, opts) {
+        this.zipPath = '';
+        this.opts = null;
+        this.zipfile = null;
+        this.canceled = false;
+        this.zipPath = zipPath;
+        this.opts = opts;
+    }
+    extract() {
+        return __awaiter(this, void 0, void 0, function* () {
+            debug('opening', this.zipPath, 'with opts', this.opts);
+            this.zipfile = yield openZip(this.zipPath, { lazyEntries: true });
+            this.canceled = false;
+            return new Promise((resolve, reject) => {
+                this.zipfile.on('error', err => {
+                    this.canceled = true;
+                    reject(err);
+                });
+                this.zipfile.readEntry();
+                this.zipfile.on('close', () => {
+                    if (!this.canceled) {
+                        debug('zip extraction complete');
+                        resolve();
+                    }
+                });
+                this.zipfile.on('entry', (entry) => __awaiter(this, void 0, void 0, function* () {
+                    /* istanbul ignore if */
+                    if (this.canceled) {
+                        debug('skipping entry', entry.fileName, { cancelled: this.canceled });
+                        return;
+                    }
+                    debug('zipfile entry', entry.fileName);
+                    if (entry.fileName.startsWith('__MACOSX/')) {
+                        this.zipfile.readEntry();
+                        return;
+                    }
+                    const destDir = path.dirname(path.join(this.opts.dir, entry.fileName));
+                    try {
+                        yield fs_1.promises.mkdir(destDir, { recursive: true });
+                        let canonicalDestDir = '';
+                        try {
+                            canonicalDestDir = yield fs_1.promises.realpath(destDir);
+                        }
+                        catch (error) {
+                            canonicalDestDir = path.resolve(destDir);
+                        }
+                        const relativeDestDir = path.relative(this.opts.dir, canonicalDestDir);
+                        if (relativeDestDir.split(path.sep).includes('..')) {
+                            throw new Error(`Out of bound path "${canonicalDestDir}" found while processing file ${entry.fileName}`);
+                        }
+                        yield this.extractEntry(entry);
+                        debug('finished processing', entry.fileName);
+                        this.zipfile.readEntry();
+                    }
+                    catch (err) {
+                        this.canceled = true;
+                        this.zipfile.close();
+                        reject(err);
+                    }
+                }));
+            });
+        });
+    }
+    extractEntry(entry) {
+        return __awaiter(this, void 0, void 0, function* () {
+            /* istanbul ignore if */
+            if (this.canceled) {
+                debug('skipping entry extraction', entry.fileName, {
+                    cancelled: this.canceled
+                });
+                return;
+            }
+            if (this.opts.onEntry) {
+                this.opts.onEntry(entry, this.zipfile);
+            }
+            const dest = path.join(this.opts.dir, entry.fileName);
+            // convert external file attr int into a fs stat mode int
+            const mode = (entry.externalFileAttributes >> 16) & 0xffff;
+            // check if it's a symlink or dir (using stat mode constants)
+            const IFMT = 61440;
+            const IFDIR = 16384;
+            const IFLNK = 40960;
+            const symlink = (mode & IFMT) === IFLNK;
+            let isDir = (mode & IFMT) === IFDIR;
+            // Failsafe, borrowed from jsZip
+            if (!isDir && entry.fileName.endsWith('/')) {
+                isDir = true;
+            }
+            // check for windows weird way of specifying a directory
+            // https://github.com/maxogden/extract-zip/issues/13#issuecomment-154494566
+            const madeBy = entry.versionMadeBy >> 8;
+            if (!isDir)
+                isDir = madeBy === 0 && entry.externalFileAttributes === 16;
+            debug('extracting entry', {
+                filename: entry.fileName,
+                isDir,
+                isSymlink: symlink
+            });
+            const procMode = this.getExtractedMode(mode, isDir) & 0o777;
+            // always ensure folders are created
+            const destDir = isDir ? dest : path.dirname(dest);
+            const mkdirOptions = { recursive: true };
+            if (isDir) {
+                mkdirOptions.mode = procMode;
+            }
+            debug('mkdir', Object.assign({ dir: destDir }, mkdirOptions));
+            yield fs_1.promises.mkdir(destDir, mkdirOptions);
+            if (isDir)
+                return;
+            debug('opening read stream', dest);
+            const readStream = yield promisify(this.zipfile.openReadStream.bind(this.zipfile))(entry);
+            if (symlink) {
+                // const link = await getStream(readStream)
+                // debug('creating symlink', link, dest)
+                // await fs.symlink(link, dest)
+            }
+            else {
+                yield pipeline(readStream, (0, fs_1.createWriteStream)(dest, { mode: procMode }));
+            }
+        });
+    }
+    getExtractedMode(entryMode, isDir) {
+        let mode = entryMode;
+        // Set defaults, if necessary
+        if (mode === 0) {
+            if (isDir) {
+                if (this.opts.defaultDirMode) {
+                    mode = parseInt(this.opts.defaultDirMode, 10);
+                }
+                if (!mode) {
+                    mode = 0o755;
+                }
+            }
+            else {
+                if (this.opts.defaultFileMode) {
+                    mode = parseInt(this.opts.defaultFileMode, 10);
+                }
+                if (!mode) {
+                    mode = 0o644;
+                }
+            }
+        }
+        return mode;
+    }
+}
+class Zip {
+    constructor(options) {
+        this.options = options;
+        this.archive = archiver('zip', {
+            zlib: { level: 9 } // Sets the compression level.
+        });
+        this.initOutput();
+    }
+    initOutput() {
+        const { outputDir } = this.options;
+        this.output = fse.createWriteStream(outputDir);
+        this.archive.pipe(this.output);
+    }
+    finalize() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.archive.finalize();
+        });
+    }
+}
+exports.Zip = Zip;
+/**
+ * 解压 zip 文件 yauzl
+ * @param zipPath string
+ * @param outputDir string
+ * @param options unzipOptions
+ */
+function unzip(zipPath, outputDir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        debug('creating target directory', outputDir);
+        if (!path.isAbsolute(outputDir)) {
+            throw new Error('Target directory is expected to be absolute');
+        }
+        yield fs_1.promises.mkdir(outputDir, { recursive: true });
+        const _outputDir = yield fs_1.promises.realpath(outputDir);
+        return new Extractor(zipPath, {
+            dir: _outputDir
+        }).extract();
+    });
+}
+exports.unzip = unzip;
+/**
+ * 解压 zip 文件
+ * @param zipPath string
+ * @param outputDir string
+ */
+function unzipMac(zipPath, outputDir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            const proc = (0, child_process_1.spawn)('/usr/bin/unzip', [zipPath, '-d', outputDir]);
+            const output = '';
+            proc.on('error', err => {
+                reject(err);
+            });
+            proc.on('exit', (code) => {
+                if (code > 0) {
+                    reject(new Error(`Exited with code ${code}`));
+                }
+                else {
+                    resolve(output);
+                }
+            });
+            proc.stderr.on('data', chunk => {
+                console.error(chunk.toString());
+            });
+            proc.stdout.on('data', chunk => {
+                // console.log(chunk.toString());
+            });
+        });
+    });
+}
+exports.unzipMac = unzipMac;
+const genZip = (input, output, appId) => __awaiter(void 0, void 0, void 0, function* () {
+    return new Promise((resolve, reject) => {
+        const outputStream = (0, fs_1.createWriteStream)(output);
+        const archive = archiver('zip', {
+            zlib: { level: 9 } // Sets the compression level.
+        });
+        outputStream.on('close', () => {
+            resolve();
+        });
+        archive.on('error', error => {
+            console.error('archive error:', error);
+            reject(error);
+        });
+        archive.pipe(outputStream);
+        if (appId) {
+            archive.directory(input, appId);
+        }
+        else {
+            archive.directory(input, './');
+        }
+        archive.finalize();
+    });
+});
+exports.genZip = genZip;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
@@ -82,11 +82,11 @@
     "webpack-bundle-analyzer": "^4.4.0",
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.2",
-    "xhs-mp-compiler-ml-loader": "1.1.2",
-    "xhs-mp-compiler-utils": "1.1.1",
-    "xhs-mp-pack": "^1.1.1",
-    "xhs-mp-project": "^1.1.1",
-    "xhs-mp-utils": "^1.1.1"
+    "xhs-mp-compiler-ml-loader": "1.1.3",
+    "xhs-mp-compiler-utils": "1.1.2",
+    "xhs-mp-pack": "^1.1.2",
+    "xhs-mp-project": "^1.1.2",
+    "xhs-mp-utils": "^1.1.2"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.3",