@varlet/cli 2.7.0-alpha.1673534139536 → 2.7.0-alpha.1673584157662

package/lib/node/bin.js

@@ -1,10 +1,8 @@
 #!/usr/bin/env node
-import fse from 'fs-extra';
 import { Command } from 'commander';
-import { CLI_PACKAGE_JSON } from './shared/constant.js';
-const { readJSONSync } = fse;
+import { getCliVersion } from './shared/fsUtils.js';
 const program = new Command();
-program.version(`varlet-cli ${readJSONSync(CLI_PACKAGE_JSON).version}`).usage('<command> [options]');
+program.version(`varlet-cli ${getCliVersion()}`).usage('<command> [options]');
 program
     .command('dev')
     .option('-f --force', 'Force dep pre-optimization regardless of whether deps have changed')

package/lib/node/commands/release.d.ts

@@ -1,5 +1,6 @@
 interface ReleaseCommandOptions {
     remote?: string;
+    task?(): Promise<void>;
 }
 export declare function release(options: ReleaseCommandOptions): Promise<void>;
 export {};

package/lib/node/commands/release.js

@@ -8,6 +8,7 @@ import inquirer from 'inquirer';
 import { CWD } from '../shared/constant.js';
 import { resolve } from 'path';
 import { changelog } from './changelog.js';
+import { getVersion } from '../shared/fsUtils.js';
 const { writeFileSync, readJSONSync } = fse;
 const { prompt } = inquirer;
 const releaseTypes = ['premajor', 'preminor', 'prepatch', 'major', 'minor', 'patch'];
@@ -100,7 +101,7 @@ async function getReleaseType() {
 }
 export async function release(options) {
     try {
-        const currentVersion = readJSONSync(resolve(CWD, 'package.json')).version;
+        const currentVersion = getVersion();
         if (!currentVersion) {
             logger.error('Your package is missing the version field');
             return;
@@ -123,6 +124,9 @@ export async function release(options) {
             return;
         }
         updateVersion(expectVersion);
+        if (options.task) {
+            await options.task();
+        }
         await publish(isPreRelease);
         if (!isPreRelease) {
             await changelog();

package/lib/node/compiler/compileScript.d.ts

@@ -1,15 +1,10 @@
-export declare const IMPORT_VUE_PATH_RE: RegExp;
-export declare const IMPORT_TS_PATH_RE: RegExp;
-export declare const IMPORT_JSX_PATH_RE: RegExp;
-export declare const IMPORT_TSX_PATH_RE: RegExp;
-export declare const REQUIRE_VUE_PATH_RE: RegExp;
-export declare const REQUIRE_TS_PATH_RE: RegExp;
-export declare const REQUIRE_JSX_PATH_RE: RegExp;
-export declare const REQUIRE_TSX_PATH_RE: RegExp;
-export declare const replaceVueExt: (script: string) => string;
-export declare const replaceTSExt: (script: string) => string;
-export declare const replaceJSXExt: (script: string) => string;
-export declare const replaceTSXExt: (script: string) => string;
+export declare const IMPORT_FROM_DEPENDENCE_RE: RegExp;
+export declare const IMPORT_DEPENDENCE_RE: RegExp;
+export declare const REQUIRE_DEPENDENCE_RE: RegExp;
+export declare const scriptExtNames: string[];
+export declare const scriptIndexes: string[];
+export declare const tryMatchExtname: (file: string, extname: string[]) => string | undefined;
+export declare const resolveDependence: (file: string, script: string) => string;
 export declare const moduleCompatible: (script: string) => Promise<string>;
 export declare function compileScript(script: string, file: string): Promise<void>;
 export declare function compileScriptFile(file: string): Promise<void>;

package/lib/node/compiler/compileScript.js

@@ -1,25 +1,65 @@
 import fse from 'fs-extra';
 import { transformAsync } from '@babel/core';
 import { bigCamelize } from '@varlet/shared';
-import { replaceExt } from '../shared/fsUtils.js';
+import { getVersion, isDir, replaceExt } from '../shared/fsUtils.js';
 import { extractStyleDependencies, IMPORT_CSS_RE, IMPORT_LESS_RE, REQUIRE_CSS_RE, REQUIRE_LESS_RE, } from './compileStyle.js';
-import { resolve } from 'path';
+import { resolve, extname, dirname } from 'path';
 import { get } from 'lodash-es';
 import { getVarletConfig } from '../config/varlet.config.js';
-const { writeFileSync, readFileSync, removeSync, writeFile } = fse;
-export const IMPORT_VUE_PATH_RE = /((?<!['"`])import\s+.+from\s+['"]\s*\.{1,2}\/.+)\.vue(\s*['"`]);?(?!\s*['"`])/g;
-export const IMPORT_TS_PATH_RE = /((?<!['"`])import\s+.+from\s+['"]\s*\.{1,2}\/.+)\.ts(\s*['"`]);?(?!\s*['"`])/g;
-export const IMPORT_JSX_PATH_RE = /((?<!['"`])import\s+.+from\s+['"]\s*\.{1,2}\/.+)\.jsx(\s*['"`]);?(?!\s*['"`])/g;
-export const IMPORT_TSX_PATH_RE = /((?<!['"`])import\s+.+from\s+['"]\s*\.{1,2}\/.+)\.tsx(\s*['"`]);?(?!\s*['"`])/g;
-export const REQUIRE_VUE_PATH_RE = /(?<!['"`]\s*)(require\s*\(\s*['"]\s*\.{1,2}\/.+)\.vue(\s*['"`]\))(?!\s*['"`])/g;
-export const REQUIRE_TS_PATH_RE = /(?<!['"`]\s*)(require\s*\(\s*['"]\s*\.{1,2}\/.+)\.ts(\s*['"`]\))(?!\s*['"`])/g;
-export const REQUIRE_JSX_PATH_RE = /(?<!['"`]\s*)(require\s*\(\s*['"]\s*\.{1,2}\/.+)\.jsx(\s*['"`]\))(?!\s*['"`])/g;
-export const REQUIRE_TSX_PATH_RE = /(?<!['"`]\s*)(require\s*\(\s*['"]\s*\.{1,2}\/.+)\.tsx(\s*['"`]\))(?!\s*['"`])/g;
-const scriptReplacer = (_, p1, p2) => `${p1}.${getScriptExtname()}${p2}`;
-export const replaceVueExt = (script) => script.replace(IMPORT_VUE_PATH_RE, scriptReplacer).replace(REQUIRE_VUE_PATH_RE, scriptReplacer);
-export const replaceTSExt = (script) => script.replace(IMPORT_TS_PATH_RE, scriptReplacer).replace(REQUIRE_TS_PATH_RE, scriptReplacer);
-export const replaceJSXExt = (script) => script.replace(IMPORT_JSX_PATH_RE, scriptReplacer).replace(REQUIRE_JSX_PATH_RE, scriptReplacer);
-export const replaceTSXExt = (script) => script.replace(IMPORT_TSX_PATH_RE, scriptReplacer).replace(REQUIRE_TSX_PATH_RE, scriptReplacer);
+const { writeFileSync, readdirSync, readFileSync, removeSync, writeFile, pathExistsSync } = fse;
+// https://regexr.com/765a4
+export const IMPORT_FROM_DEPENDENCE_RE = /import\s+?[\w\s{},$*]+\s+from\s+?(".*?"|'.*?')/g;
+// https://regexr.com/764ve
+export const IMPORT_DEPENDENCE_RE = /import\s+['"]\s*\.{1,2}\/(.+)\s*['"];?/g;
+// https://regexr.com/764vn
+export const REQUIRE_DEPENDENCE_RE = /require\(['"]\s*(\.{1,2}\/.+)\s*['"]\)/g;
+export const scriptExtNames = ['mjs', 'vue', 'ts', 'tsx', 'js', 'jsx'];
+export const scriptIndexes = ['index.mjs', 'index.vue', 'index.ts', 'index.tsx', 'index.js', 'index.jsx'];
+export const tryMatchExtname = (file, extname) => {
+    // eslint-disable-next-line no-restricted-syntax
+    for (const ext of extname) {
+        const matched = `${file}.${ext}`;
+        if (pathExistsSync(matched)) {
+            return ext;
+        }
+    }
+};
+export const resolveDependence = (file, script) => {
+    return script.replace(IMPORT_FROM_DEPENDENCE_RE, (source, dependence) => {
+        dependence = dependence.slice(1, dependence.length - 1);
+        const ext = extname(dependence);
+        const targetDependenceFile = resolve(dirname(file), dependence);
+        const scriptExtname = getScriptExtname();
+        const inNodeModules = !dependence.startsWith('.');
+        if (inNodeModules) {
+            // e.g. @varlet/shared
+            return source;
+        }
+        if (!ext) {
+            // e.g. ../button/props -> ../button/props.m?js
+            const matched = tryMatchExtname(targetDependenceFile, scriptExtNames);
+            if (matched) {
+                return source.replace(dependence, `${dependence}.${scriptExtname}`);
+            }
+        }
+        if (!ext && isDir(targetDependenceFile)) {
+            // e.g. ../button
+            const files = readdirSync(targetDependenceFile);
+            const hasScriptIndex = files.some((file) => scriptIndexes.some((name) => file.endsWith(name)));
+            if (hasScriptIndex) {
+                // e.g. -> ../button/index.m?js
+                return source.replace(dependence, `${dependence}/index.${scriptExtname}`);
+            }
+            const hasStyleIndex = files.some((file) => ['index.less', 'index.css'].some((name) => file.endsWith(name)));
+            if (hasStyleIndex) {
+                // e.g. -> ../button/index.css
+                return source.replace(dependence, `${dependence}/index.css`);
+            }
+        }
+        // e.g. ../button/props.ts -> ../button/props.m?js
+        return source.replace(dependence, dependence.replace(ext, `.${scriptExtname}`));
+    });
+};
 export const moduleCompatible = async (script) => {
     const moduleCompatible = get(await getVarletConfig(), 'moduleCompatible', {});
     Object.keys(moduleCompatible).forEach((esm) => {
@@ -36,14 +76,13 @@ export async function compileScript(script, file) {
     let { code } = (await transformAsync(script, {
         filename: file,
     }));
-    code = extractStyleDependencies(file, code, targetModule === 'commonjs' ? REQUIRE_CSS_RE : IMPORT_CSS_RE);
-    code = extractStyleDependencies(file, code, targetModule === 'commonjs' ? REQUIRE_LESS_RE : IMPORT_LESS_RE);
-    code = replaceVueExt(code);
-    code = replaceTSXExt(code);
-    code = replaceJSXExt(code);
-    code = replaceTSExt(code);
-    removeSync(file);
-    writeFileSync(replaceExt(file, `.${getScriptExtname()}`), code, 'utf8');
+    if (code) {
+        code = extractStyleDependencies(file, code, targetModule === 'commonjs' ? REQUIRE_CSS_RE : IMPORT_CSS_RE);
+        code = extractStyleDependencies(file, code, targetModule === 'commonjs' ? REQUIRE_LESS_RE : IMPORT_LESS_RE);
+        code = resolveDependence(file, code);
+        removeSync(file);
+        writeFileSync(replaceExt(file, `.${getScriptExtname()}`), code, 'utf8');
+    }
 }
 export async function compileScriptFile(file) {
     const sources = readFileSync(file, 'utf-8');
@@ -58,15 +97,16 @@ export function getScriptExtname() {
 export async function compileESEntry(dir, publicDirs) {
     const imports = [];
     const plugins = [];
-    const constInternalComponents = [];
+    const exports = [];
     const cssImports = [];
     const publicComponents = [];
     const scriptExtname = getScriptExtname();
     publicDirs.forEach((dirname) => {
         const publicComponent = bigCamelize(dirname);
+        const module = `'./${dirname}/index.${scriptExtname}'`;
         publicComponents.push(publicComponent);
-        imports.push(`import ${publicComponent}, * as ${publicComponent}Module from './${dirname}/index.${scriptExtname}'`);
-        constInternalComponents.push(`export const _${publicComponent}Component = ${publicComponent}Module._${publicComponent}Component || {}`);
+        imports.push(`import ${publicComponent} from ${module}`);
+        exports.push(`export * from ${module}`);
         plugins.push(`${publicComponent}.install && app.use(${publicComponent})`);
         cssImports.push(`import './${dirname}/style/index.${scriptExtname}'`);
     });
@@ -75,16 +115,20 @@ function install(app) {
   ${plugins.join('\n  ')}
 }
 `;
+    const version = `const version = '${getVersion()}'`;
     const indexTemplate = `\
 ${imports.join('\n')}\n
-${constInternalComponents.join('\n')}\n
+${exports.join('\n')}\n
+${version}
 ${install}
 export {
+  version,
   install,
   ${publicComponents.join(',\n  ')}
 }
 
 export default {
+  version,
   install,
   ${publicComponents.join(',\n  ')}
 }
@@ -95,13 +139,16 @@ ${cssImports.join('\n')}
     const umdTemplate = `\
 ${imports.join('\n')}\n
 ${cssImports.join('\n')}\n
+${version}
 ${install}
 export {
+  version,
   install,
   ${publicComponents.join(',\n  ')}
 }
 
 export default {
+  version,
   install,
   ${publicComponents.join(',\n  ')}
 }
@@ -117,10 +164,13 @@ export async function compileCommonJSEntry(dir, publicDirs) {
     const plugins = [];
     const cssRequires = [];
     const publicComponents = [];
+    const exports = [];
     publicDirs.forEach((dirname) => {
         const publicComponent = bigCamelize(dirname);
+        const module = `'./${dirname}/index.js'`;
         publicComponents.push(publicComponent);
-        requires.push(`var ${publicComponent} = require('./${dirname}/index.js')['default']`);
+        requires.push(`var ${publicComponent} = require(${module})['default']`);
+        exports.push(`...ignoreDefault(require(${module}))`);
         plugins.push(`${publicComponent}.install && app.use(${publicComponent})`);
         cssRequires.push(`require('./${dirname}/style/index.js')`);
     });
@@ -133,8 +183,21 @@ function install(app) {
 ${requires.join('\n')}\n
 ${install}
 
+function ignoreDefault(module) {
+  return Object.keys(module).reduce((exports, key) => {
+    if (key !=== 'default') {
+      exports[key] = module[key]
+    }
+
+    return exports
+  }, {})
+}
+
+exports.install = install
+
 module.exports = {
   install,
+  ${exports.join(',\n  ')}
   ${publicComponents.join(',\n  ')}
 }
 `;

package/lib/node/compiler/compileTemplateHighlight.js

@@ -1,10 +1,10 @@
 import fse from 'fs-extra';
-import { SRC_DIR, HL_MD, HL_API_RE, HL_COMPONENT_NAME_RE, HL_TITLE_ATTRIBUTES_RE, HL_TITLE_EVENTS_RE, HL_TITLE_SLOTS_RE, HL_WEB_TYPES_JSON, HL_DIR, HL_TAGS_JSON, HL_ATTRIBUTES_JSON, CLI_PACKAGE_JSON, } from '../shared/constant.js';
+import { SRC_DIR, HL_MD, HL_API_RE, HL_COMPONENT_NAME_RE, HL_TITLE_ATTRIBUTES_RE, HL_TITLE_EVENTS_RE, HL_TITLE_SLOTS_RE, HL_WEB_TYPES_JSON, HL_DIR, HL_TAGS_JSON, HL_ATTRIBUTES_JSON, } from '../shared/constant.js';
 import { resolve } from 'path';
-import { isDir, isMD } from '../shared/fsUtils.js';
+import { getCliVersion, isDir, isMD } from '../shared/fsUtils.js';
 import { get } from 'lodash-es';
 import { getVarletConfig } from '../config/varlet.config.js';
-const { ensureDir, readdirSync, readFileSync, readJSONSync, writeFile } = fse;
+const { ensureDir, readdirSync, readFileSync, writeFile } = fse;
 const TABLE_HEAD_RE = /\s*\|.*\|\s*\n\s*\|.*---+\s*\|\s*\n+/;
 const TABLE_FOOT_RE = /(\|\s*$)|(\|\s*\n(?!\s*\|))/;
 export const replaceDot = (s) => s.replace(/`/g, '');
@@ -115,7 +115,7 @@ export async function compileTemplateHighlight() {
     const webTypes = {
         $schema: 'https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json',
         framework: 'vue',
-        version: readJSONSync(CLI_PACKAGE_JSON).version,
+        version: getCliVersion(),
         name: get(varletConfig, 'title'),
         contributions: {
             html: {

package/lib/node/index.d.ts

@@ -1 +1,13 @@
 export { defineConfig } from './config/varlet.config.js';
+export * from './commands/release.js';
+export * from './commands/dev.js';
+export * from './commands/build.js';
+export * from './commands/compile.js';
+export * from './commands/commitLint.js';
+export * from './commands/gen.js';
+export * from './commands/jest.js';
+export * from './commands/create.js';
+export * from './commands/lint.js';
+export * from './commands/changelog.js';
+export * from './commands/preview.js';
+export * from './commands/vite.js';

package/lib/node/index.js

@@ -1 +1,13 @@
 export { defineConfig } from './config/varlet.config.js';
+export * from './commands/release.js';
+export * from './commands/dev.js';
+export * from './commands/build.js';
+export * from './commands/compile.js';
+export * from './commands/commitLint.js';
+export * from './commands/gen.js';
+export * from './commands/jest.js';
+export * from './commands/create.js';
+export * from './commands/lint.js';
+export * from './commands/changelog.js';
+export * from './commands/preview.js';
+export * from './commands/vite.js';

package/lib/node/shared/fsUtils.d.ts

@@ -11,3 +11,5 @@ export declare function smartAppendFileSync(file: string, code: string): void;
 export declare function outputFileSyncOnChange(path: string, code: string): void;
 export declare function glob(pattern: string): Promise<string[]>;
 export declare function getDirname(url: string): string;
+export declare function getVersion(): any;
+export declare function getCliVersion(): any;

package/lib/node/shared/fsUtils.js

@@ -1,9 +1,9 @@
 import globSync from 'glob';
 import fse from 'fs-extra';
 import { extname, resolve } from 'path';
-import { PUBLIC_DIR_INDEXES, SCRIPTS_EXTENSIONS, SRC_DIR } from './constant.js';
+import { CLI_PACKAGE_JSON, PUBLIC_DIR_INDEXES, SCRIPTS_EXTENSIONS, SRC_DIR, UI_PACKAGE_JSON } from './constant.js';
 import { fileURLToPath } from 'url';
-const { appendFileSync, ensureFileSync, lstatSync, outputFileSync, pathExistsSync, readdir, readFileSync } = fse;
+const { appendFileSync, ensureFileSync, lstatSync, outputFileSync, pathExistsSync, readdir, readFileSync, readJSONSync, } = fse;
 export async function getPublicDirs() {
     const srcDir = await readdir(SRC_DIR);
     return srcDir.filter((filename) => isPublicDir(resolve(SRC_DIR, filename)));
@@ -46,3 +46,9 @@ export function glob(pattern) {
 export function getDirname(url) {
     return fileURLToPath(new URL('.', url));
 }
+export function getVersion() {
+    return readJSONSync(UI_PACKAGE_JSON).version;
+}
+export function getCliVersion() {
+    return readJSONSync(CLI_PACKAGE_JSON).version;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.7.0-alpha.1673534139536",
+  "version": "2.7.0-alpha.1673584157662",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -66,8 +66,8 @@
     "vite": "4.0.4",
     "vue": "3.2.25",
     "vue-jest": "^5.0.0-alpha.8",
-    "@varlet/vite-plugins": "2.7.0-alpha.1673534139536",
-    "@varlet/shared": "2.7.0-alpha.1673534139536"
+    "@varlet/vite-plugins": "2.7.0-alpha.1673584157662",
+    "@varlet/shared": "2.7.0-alpha.1673584157662"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.12",
@@ -79,8 +79,8 @@
     "@types/node": "^18.7.20",
     "@types/semver": "^7.3.9",
     "@types/inquirer": "^9.0.2",
-    "@varlet/icons": "2.7.0-alpha.1673534139536",
-    "@varlet/touch-emulator": "2.7.0-alpha.1673534139536"
+    "@varlet/icons": "2.7.0-alpha.1673584157662",
+    "@varlet/touch-emulator": "2.7.0-alpha.1673584157662"
   },
   "peerDependencies": {
     "@vue/runtime-core": "3.2.16",
@@ -90,8 +90,8 @@
     "lodash-es": "^4.17.21",
     "vue": "3.2.25",
     "vue-router": "4.0.12",
-    "@varlet/icons": "2.7.0-alpha.1673534139536",
-    "@varlet/touch-emulator": "2.7.0-alpha.1673534139536"
+    "@varlet/icons": "2.7.0-alpha.1673584157662",
+    "@varlet/touch-emulator": "2.7.0-alpha.1673584157662"
   },
   "scripts": {
     "dev": "tsc --watch",