@weapp-tailwindcss/cli 0.0.0-alpha.6 → 0.0.0-alpha.7

package/dist/index.mjs

@@ -9,6 +9,10 @@ import { createPlugins } from 'weapp-tailwindcss/gulp';
 import postcssrc from 'gulp-postcss';
 import plumber from 'gulp-plumber';
 import gulpif from 'gulp-if';
+import createSass from 'gulp-sass';
+import rename from 'gulp-rename';
+import less from 'gulp-less';
+import typescript from 'gulp-typescript';
 import { cosmiconfigSync } from 'cosmiconfig';
 
 function isPlainObject$2(value) {
@@ -77,263 +81,6 @@ var AssetType = /* @__PURE__ */ ((AssetType2) => {
   return AssetType2;
 })(AssetType || {});
 
-function getTasks(options) {
-  const { root: cwd, weappTailwindcssOptions, outDir, src: srcBase, extensions, exclude, include, postcssOptions } = options;
-  const globsSet = /* @__PURE__ */ new Set();
-  const base = srcBase ? srcBase + "/" : "";
-  function globsSetAdd(...value) {
-    for (const v of value) {
-      if (Array.isArray(v)) {
-        for (const vv of v) {
-          globsSet.add(vv);
-        }
-      } else {
-        globsSet.add(v);
-      }
-    }
-  }
-  function getGlobs(type) {
-    const globs = [];
-    if (typeof include === "function") {
-      globs.push(...include(type).map((x) => x));
-    }
-    if (typeof exclude === "function") {
-      globs.push(...exclude(type).map((x) => "!" + x));
-    } else if (Array.isArray(exclude)) {
-      globs.push(...exclude.map((x) => "!" + x));
-    }
-    globs.push(`!${outDir}/**/*`);
-    return globs;
-  }
-  const { transformJs, transformWxml, transformWxss } = createPlugins(weappTailwindcssOptions);
-  function getJsTasks() {
-    const assetType = AssetType.JavaScript;
-    const globs = getGlobs(assetType);
-    globsSetAdd(globs);
-    return extensions[assetType].map((x) => {
-      const src = `${base}**/*.${x}`;
-      globsSetAdd(src);
-      return function JsTask() {
-        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsTask) }).pipe(plumber()).pipe(
-          transformJs({
-            babelParserOptions: x === "ts" ? {
-              plugins: ["typescript"]
-            } : void 0
-          })
-        ).pipe(
-          gulp.dest(outDir, {
-            cwd
-          })
-        );
-      };
-    });
-  }
-  function getJsonTasks() {
-    const assetType = AssetType.Json;
-    const globs = getGlobs(assetType);
-    globsSetAdd(globs);
-    return extensions[assetType].map((x) => {
-      const src = `${base}**/*.${x}`;
-      globsSetAdd(src);
-      return function JsonTask() {
-        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsonTask) }).pipe(plumber()).pipe(
-          gulp.dest(outDir, {
-            cwd
-          })
-        );
-      };
-    });
-  }
-  function getCssTasks() {
-    const assetType = AssetType.Css;
-    const globs = getGlobs(assetType);
-    globsSetAdd(globs);
-    return extensions[assetType].map((x) => {
-      const src = `${base}**/*.${x}`;
-      globsSetAdd(src);
-      return function CssTask() {
-        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(CssTask) }).pipe(plumber()).pipe(gulpif(Boolean(postcssOptions), postcssrc(postcssOptions?.plugins, postcssOptions?.options))).pipe(transformWxss()).pipe(
-          gulp.dest(outDir, {
-            cwd
-          })
-        );
-      };
-    });
-  }
-  function getHtmlTasks() {
-    const assetType = AssetType.Html;
-    const globs = getGlobs(assetType);
-    globsSetAdd(globs);
-    return extensions[assetType].map((x) => {
-      const src = `${base}**/*.${x}`;
-      globsSetAdd(src);
-      return function HtmlTask() {
-        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(HtmlTask) }).pipe(plumber()).pipe(transformWxml()).pipe(
-          gulp.dest(outDir, {
-            cwd
-          })
-        );
-      };
-    });
-  }
-  function copyOthers() {
-    if (Array.isArray(include)) {
-      const globs = include.map((x) => {
-        return `${base}${x}`;
-      });
-      globsSetAdd(globs);
-      return gulp.src(globs, { cwd, since: gulp.lastRun(copyOthers) }).pipe(plumber()).pipe(
-        gulp.dest(outDir, {
-          cwd
-        })
-      );
-    }
-  }
-  return {
-    getGlobs,
-    getJsTasks,
-    getJsonTasks,
-    getCssTasks,
-    getHtmlTasks,
-    copyOthers,
-    globsSet
-  };
-}
-
-const defaultJavascriptExtensions = ["js"];
-const defaultTypescriptExtensions = ["ts"];
-const defaultWxsExtensions = ["wxs"];
-const defaultNodeModulesDirs = [
-  "**/node_modules/**",
-  "**/miniprogram_npm/**",
-  "**/project.config.json/**",
-  "**/project.private.config.json/**",
-  "**/package.json/**",
-  "postcss.config.js",
-  "tailwind.config.js"
-];
-function createBuilder(options) {
-  const {
-    root: cwd,
-    weappTailwindcssOptions,
-    outDir,
-    src: srcBase,
-    clean,
-    extensions,
-    exclude,
-    include,
-    watchOptions,
-    postcssOptions
-  } = defu(options, {
-    outDir: "dist",
-    weappTailwindcssOptions: {},
-    clean: true,
-    src: "",
-    exclude: [...defaultNodeModulesDirs],
-    extensions: {
-      javascript: [...defaultJavascriptExtensions, ...defaultTypescriptExtensions, ...defaultWxsExtensions],
-      html: ["wxml"],
-      css: ["wxss", "less", "sass", "scss"],
-      json: ["json"]
-    },
-    watchOptions: {
-      events: ["add", "change", "unlink", "ready"]
-    }
-  });
-  const { copyOthers, getCssTasks, getHtmlTasks, getJsTasks, getJsonTasks, globsSet } = getTasks({
-    root: cwd,
-    weappTailwindcssOptions,
-    outDir,
-    src: srcBase,
-    clean,
-    extensions,
-    exclude,
-    include,
-    watchOptions,
-    postcssOptions
-  });
-  const tasks = {
-    css: getCssTasks(),
-    html: getHtmlTasks(),
-    json: getJsonTasks(),
-    js: getJsTasks(),
-    extra: [copyOthers]
-  };
-  async function runTasks() {
-    debug("run tasks start");
-    for (const [key, value] of Object.entries(tasks)) {
-      debug(`run task ${pc.bold(pc.green(key))} start`);
-      for (const task of value) {
-        const s = task();
-        if (s) {
-          await new Promise((resolve, reject) => s.on("finish", resolve).on("error", reject));
-        }
-      }
-      debug(`run task ${pc.bold(pc.green(key))} end`);
-    }
-    debug("run tasks end");
-  }
-  return {
-    watcher: void 0,
-    async build() {
-      if (clean) {
-        debug("del start");
-        const { deleteAsync } = await import('del');
-        const patterns = [outDir + "/**"];
-        await deleteAsync(patterns, { cwd, ignore: defaultNodeModulesDirs });
-        debug("del end");
-      }
-      ensureDirSync(path.resolve(cwd, outDir));
-      await runTasks();
-      return this;
-    },
-    watch() {
-      ensureDirSync(path.resolve(cwd, outDir));
-      const watcher = gulp.watch([...globsSet], watchOptions, async (cb) => {
-        try {
-          await runTasks();
-          cb();
-        } catch (error) {
-          cb(error);
-        }
-      });
-      watcher.on("change", function(path2) {
-        console.log(`${pc.green("changed")} ${path2}`);
-      });
-      watcher.on("add", function(path2) {
-        console.log(`${pc.green("add")} ${path2}`);
-      });
-      watcher.on("unlink", function(path2) {
-        console.log(`${pc.green("remove")} ${path2}`);
-      });
-      watcher.on("ready", function() {
-        console.log(`${pc.green("weapp")}-${pc.blue("tailwindcss")} is ready!`);
-      });
-      this.watcher = watcher;
-      return this;
-    },
-    globsSet
-  };
-}
-async function build(options) {
-  let postcssOptions;
-  try {
-    postcssOptions = await loadPostcssConfig({ cwd: options?.root });
-  } catch {
-  }
-  const builder = createBuilder(defu(options, { postcssOptions }));
-  return await builder.build();
-}
-async function watch(options) {
-  let postcssOptions;
-  try {
-    postcssOptions = await loadPostcssConfig({ cwd: options?.root });
-  } catch {
-  }
-  const builder = createBuilder(defu(options, { postcssOptions }));
-  return await builder.watch();
-}
-
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
@@ -370,10 +117,10 @@ var isobject = function isObject(val) {
  * Released under the MIT License.
  */
 
-var isObject$2 = isobject;
+var isObject$3 = isobject;
 
 function isObjectObject(o) {
-  return isObject$2(o) === true
+  return isObject$3(o) === true
     && Object.prototype.toString.call(o) === '[object Object]';
 }
 
@@ -410,7 +157,7 @@ const { deleteProperty } = Reflect;
 const isPrimitive = isPrimitive$1;
 const isPlainObject = isPlainObject$1;
 
-const isObject$1 = value => {
+const isObject$2 = value => {
   return (typeof value === 'object' && value !== null) || typeof value === 'function';
 };
 
@@ -528,7 +275,7 @@ const assignProp = (obj, prop, value, options) => {
 };
 
 const setValue = (target, path, value, options) => {
-  if (!path || !isObject$1(target)) return target;
+  if (!path || !isObject$2(target)) return target;
 
   const keys = split$1(path, options);
   let obj = target;
@@ -549,7 +296,7 @@ const setValue = (target, path, value, options) => {
       continue;
     }
 
-    if (!isObject$1(obj[key])) {
+    if (!isObject$2(obj[key])) {
       obj[key] = {};
     }
 
@@ -576,10 +323,10 @@ const set = /*@__PURE__*/getDefaultExportFromCjs(setValue_1);
  * Released under the MIT License.
  */
 
-const isObject = isobject;
+const isObject$1 = isobject;
 
 var getValue = function(target, path, options) {
-  if (!isObject(options)) {
+  if (!isObject$1(options)) {
     options = { default: options };
   }
 
@@ -677,11 +424,309 @@ function isValid(key, target, options) {
 }
 
 function isValidObject(val) {
-  return isObject(val) || Array.isArray(val) || typeof val === 'function';
+  return isObject$1(val) || Array.isArray(val) || typeof val === 'function';
 }
 
 const get = /*@__PURE__*/getDefaultExportFromCjs(getValue);
 
+function isObject(x) {
+  return typeof x === "object" && x !== null;
+}
+
+function isSassLang(lang) {
+  return lang === "scss" || lang === "sass";
+}
+function isLessLang(lang) {
+  return lang === "less";
+}
+function isTsLang(lang) {
+  return lang === "ts";
+}
+async function getTasks(options) {
+  let { typescriptOptions } = options;
+  const { root: cwd, weappTailwindcssOptions, outDir, src: srcBase, extensions, exclude, include, postcssOptions, preprocessorOptions } = options;
+  const globsSet = /* @__PURE__ */ new Set();
+  const base = srcBase ? srcBase + "/" : "";
+  const enableSass = Boolean(preprocessorOptions?.sass);
+  const enableLess = Boolean(preprocessorOptions?.less);
+  if (typescriptOptions === true) {
+    typescriptOptions = {
+      tsConfigFileName: "tsconfig.json"
+    };
+  } else if (isObject(typescriptOptions) && typescriptOptions.tsConfigFileName === void 0) {
+    typescriptOptions.tsConfigFileName = "tsconfig.json";
+  }
+  const enableTs = Boolean(typescriptOptions);
+  let sass;
+  if (enableSass) {
+    const sassLib = await import('sass');
+    sass = createSass(sassLib);
+  }
+  const { transformJs, transformWxml, transformWxss } = createPlugins(weappTailwindcssOptions);
+  function globsSetAdd(...value) {
+    for (const v of value) {
+      if (Array.isArray(v)) {
+        for (const vv of v) {
+          globsSet.add(vv);
+        }
+      } else {
+        globsSet.add(v);
+      }
+    }
+  }
+  function getGlobs(type) {
+    const globs = [];
+    if (typeof include === "function") {
+      globs.push(...include(type).map((x) => x));
+    }
+    if (typeof exclude === "function") {
+      globs.push(...exclude(type).map((x) => "!" + x));
+    } else if (Array.isArray(exclude)) {
+      globs.push(...exclude.map((x) => "!" + x));
+    }
+    globs.push(`!${outDir}/**/*`);
+    return globs;
+  }
+  function getJsTasks() {
+    const assetType = AssetType.JavaScript;
+    const globs = getGlobs(assetType);
+    globsSetAdd(globs);
+    return extensions[assetType]?.map((x) => {
+      const src = `${base}**/*.${x}`;
+      globsSetAdd(src);
+      const isTs = isTsLang(x);
+      const loadTs = enableTs && isTs;
+      let gulpTs;
+      if (enableTs && typeof typescriptOptions !== "boolean") {
+        gulpTs = typescript.createProject(typescriptOptions.tsConfigFileName ?? "tsconfig.json", typeof typescriptOptions === "boolean" ? {} : typescriptOptions);
+      }
+      return function JsTask() {
+        let chain = gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsTask) }).pipe(plumber());
+        if (loadTs) {
+          chain = chain.pipe(gulpTs());
+        }
+        return chain.pipe(
+          transformJs({
+            babelParserOptions: !enableTs && isTs ? {
+              plugins: ["typescript"]
+            } : void 0
+          })
+        ).pipe(
+          gulpif(
+            loadTs,
+            rename({
+              extname: ".js"
+            })
+          )
+        ).pipe(
+          gulp.dest(outDir, {
+            cwd
+          })
+        );
+      };
+    });
+  }
+  function getJsonTasks() {
+    const assetType = AssetType.Json;
+    const globs = getGlobs(assetType);
+    globsSetAdd(globs);
+    return extensions[assetType]?.map((x) => {
+      const src = `${base}**/*.${x}`;
+      globsSetAdd(src);
+      return function JsonTask() {
+        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsonTask) }).pipe(plumber()).pipe(
+          gulp.dest(outDir, {
+            cwd
+          })
+        );
+      };
+    });
+  }
+  function getCssTasks() {
+    const assetType = AssetType.Css;
+    const globs = getGlobs(assetType);
+    globsSetAdd(globs);
+    return extensions[assetType]?.map((x) => {
+      const src = `${base}**/*.${x}`;
+      globsSetAdd(src);
+      const loadSass = enableSass && isSassLang(x);
+      const loadLess = enableLess && isLessLang(x);
+      return function CssTask() {
+        let chain = gulp.src([src, ...globs], { cwd, since: gulp.lastRun(CssTask) }).pipe(plumber());
+        if (loadSass) {
+          chain = chain.pipe(
+            sass.sync(
+              // @ts-ignore
+              typeof preprocessorOptions?.sass === "boolean" ? void 0 : preprocessorOptions?.sass
+            ).on("error", sass.logError)
+          );
+        }
+        return chain.pipe(gulpif(loadLess, less(typeof preprocessorOptions?.less === "boolean" ? void 0 : preprocessorOptions?.less))).pipe(gulpif(Boolean(postcssOptions), postcssrc(postcssOptions?.plugins, postcssOptions?.options))).pipe(transformWxss()).pipe(
+          gulpif(
+            loadSass || loadLess,
+            rename({
+              extname: ".wxss"
+            })
+          )
+        ).pipe(
+          gulp.dest(outDir, {
+            cwd
+          })
+        );
+      };
+    });
+  }
+  function getHtmlTasks() {
+    const assetType = AssetType.Html;
+    const globs = getGlobs(assetType);
+    globsSetAdd(globs);
+    return extensions[assetType]?.map((x) => {
+      const src = `${base}**/*.${x}`;
+      globsSetAdd(src);
+      return function HtmlTask() {
+        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(HtmlTask) }).pipe(plumber()).pipe(transformWxml()).pipe(
+          gulp.dest(outDir, {
+            cwd
+          })
+        );
+      };
+    });
+  }
+  function copyOthers() {
+    if (Array.isArray(include)) {
+      const globs = include.map((x) => {
+        return `${base}${x}`;
+      });
+      globsSetAdd(globs);
+      return gulp.src(globs, { cwd, since: gulp.lastRun(copyOthers) }).pipe(plumber()).pipe(
+        gulp.dest(outDir, {
+          cwd
+        })
+      );
+    }
+  }
+  return {
+    getGlobs,
+    getJsTasks,
+    getJsonTasks,
+    getCssTasks,
+    getHtmlTasks,
+    copyOthers,
+    globsSet
+  };
+}
+
+const defaultJavascriptExtensions = ["js"];
+const defaultTypescriptExtensions = ["ts"];
+const defaultWxsExtensions = ["wxs"];
+const defaultNodeModulesDirs = [
+  "**/node_modules/**",
+  "**/miniprogram_npm/**",
+  "**/project.config.json/**",
+  "**/project.private.config.json/**",
+  "**/package.json/**",
+  "postcss.config.js",
+  "tailwind.config.js"
+];
+async function createBuilder(options) {
+  let postcssOptionsFromConfig;
+  try {
+    postcssOptionsFromConfig = await loadPostcssConfig({ cwd: options?.root });
+  } catch {
+  }
+  const opt = defu(options, {
+    outDir: "dist",
+    weappTailwindcssOptions: {},
+    clean: true,
+    src: "",
+    exclude: [...defaultNodeModulesDirs],
+    extensions: {
+      javascript: [...defaultJavascriptExtensions, ...defaultTypescriptExtensions, ...defaultWxsExtensions],
+      html: ["wxml"],
+      css: ["wxss", "less", "sass", "scss"],
+      json: ["json"]
+    },
+    watchOptions: {
+      events: ["add", "change", "unlink", "ready"]
+    },
+    postcssOptions: postcssOptionsFromConfig
+  });
+  const { copyOthers, getCssTasks, getHtmlTasks, getJsTasks, getJsonTasks, globsSet } = await getTasks(opt);
+  const tasks = {
+    css: getCssTasks(),
+    html: getHtmlTasks(),
+    json: getJsonTasks(),
+    js: getJsTasks(),
+    extra: [copyOthers]
+  };
+  async function runTasks() {
+    debug("run tasks start");
+    for (const [key, value] of Object.entries(tasks)) {
+      if (value) {
+        debug(`run task ${pc.bold(pc.green(key))} start`);
+        for (const task of value) {
+          const s = task();
+          if (s) {
+            await new Promise((resolve, reject) => s.on("finish", resolve).on("error", reject));
+          }
+        }
+        debug(`run task ${pc.bold(pc.green(key))} end`);
+      }
+    }
+    debug("run tasks end");
+  }
+  const { clean, outDir, root: cwd, watchOptions } = opt;
+  return {
+    watcher: void 0,
+    async build() {
+      if (clean) {
+        debug("del start");
+        const { deleteAsync } = await import('del');
+        const patterns = [outDir + "/**"];
+        await deleteAsync(patterns, { cwd, ignore: defaultNodeModulesDirs });
+        debug("del end");
+      }
+      ensureDirSync(path.resolve(cwd, outDir));
+      await runTasks();
+      return this;
+    },
+    watch() {
+      ensureDirSync(path.resolve(cwd, outDir));
+      const watcher = gulp.watch([...globsSet], watchOptions, async (cb) => {
+        try {
+          await runTasks();
+          cb();
+        } catch (error) {
+          cb(error);
+        }
+      });
+      watcher.on("change", function(path2) {
+        console.log(`${pc.green("changed")} ${path2}`);
+      });
+      watcher.on("add", function(path2) {
+        console.log(`${pc.green("add")} ${path2}`);
+      });
+      watcher.on("unlink", function(path2) {
+        console.log(`${pc.green("remove")} ${path2}`);
+      });
+      watcher.on("ready", function() {
+        console.log(`${pc.green("weapp")}-${pc.blue("tailwindcss")} is ready!`);
+      });
+      this.watcher = watcher;
+      return this;
+    },
+    globsSet
+  };
+}
+async function build(options) {
+  const builder = await createBuilder(options);
+  return await builder.build();
+}
+async function watch(options) {
+  const builder = await createBuilder(options);
+  return await builder.watch();
+}
+
 function createConfigLoader(root) {
   const explorer = cosmiconfigSync("weapp-tw");
   function search(searchFrom = root) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/cli",
-  "version": "0.0.0-alpha.6",
+  "version": "0.0.0-alpha.7",
   "description": "The cli of weapp-tailwindcss",
   "keywords": [
     "weapp",
@@ -40,32 +40,29 @@
     "gulp-less": "^5.0.0",
     "gulp-plumber": "^1.2.1",
     "gulp-postcss": "^10.0.0",
+    "gulp-rename": "^2.0.0",
     "gulp-sass": "^5.1.0",
+    "gulp-typescript": "6.0.0-alpha.1",
     "picocolors": "^1.0.0",
     "postcss": "^8.4.38",
     "postcss-load-config": "^5.0.3"
   },
   "peerDependencies": {
+    "less": "*",
+    "sass": "*",
+    "typescript": "*",
     "weapp-tailwindcss": "3.2.0-alpha.7"
   },
-  "devDependencies": {
-    "@types/debug": "^4.1.12",
-    "@types/fs-extra": "^11.0.4",
-    "@types/get-value": "^3.0.5",
-    "@types/gulp": "^4.0.17",
-    "@types/gulp-if": "^3.0.4",
-    "@types/gulp-less": "^0.0.36",
-    "@types/gulp-plumber": "^0.0.37",
-    "@types/gulp-postcss": "^8.0.6",
-    "@types/gulp-sass": "^5.0.4",
-    "@types/set-value": "^4.0.3",
-    "@types/vinyl-fs": "^3.0.5",
-    "chokidar": "^3.6.0",
-    "defu": "^6.1.4",
-    "get-value": "^3.0.1",
-    "set-value": "^4.1.0",
-    "ts-morph": "^22.0.0",
-    "vinyl-fs": "^4.0.0"
+  "peerDependenciesMeta": {
+    "less": {
+      "optional": true
+    },
+    "sass": {
+      "optional": true
+    },
+    "typescript": {
+      "optional": true
+    }
   },
   "publishConfig": {
     "access": "public",