tailwindcss-injector 0.1.3 → 0.1.5

package/dist/postcss.cjs

@@ -323,15 +323,40 @@ function md5(input) {
   hash.update(input);
   return hash.digest("hex");
 }
+function isRegexp(value) {
+  return Object.prototype.toString.call(value) === "[object RegExp]";
+}
+function regExpTest(arr = [], str) {
+  if (Array.isArray(arr)) {
+    for (const item of arr) {
+      if (typeof item === "string") {
+        if (str.includes(item)) {
+          return true;
+        }
+      } else if (isRegexp(item)) {
+        item.lastIndex = 0;
+        if (item.test(str)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  throw new TypeError("paramater 'arr' should be a Array of Regexp | String !");
+}
 
 // src/config.ts
 function getDefaultConfig() {
   return {
     filter: () => true,
     config: void 0,
+    // 倒叙插入
     directiveParams: ["utilities", "components"],
     cwd: _process2.default.cwd(),
-    extensions: ["wxml", "js", "ts"]
+    extensions: ["wxml", "js", "ts"],
+    // @import and @use (scss)
+    insertAfterAtRulesNames: ["import", "use"],
+    insertAfterComments: ["@import"]
   };
 }
 function getConfig(options) {
@@ -440,7 +465,7 @@ async function getDepFiles(file) {
 
 // src/postcss.ts
 var creator = (options) => {
-  const { config, filter, directiveParams, cwd, extensions } = getConfig(options);
+  const { config, filter, directiveParams, cwd, extensions, insertAfterAtRulesNames, insertAfterComments } = getConfig(options);
   const extensionsGlob = `{${extensions.join(",")}}`;
   return {
     postcssPlugin,
@@ -449,10 +474,18 @@ var creator = (options) => {
         postcssPlugin: `${postcssPlugin}:post`,
         async Once(root, helpers) {
           if (filter(_optionalChain([root, 'access', _ => _.source, 'optionalAccess', _2 => _2.input]))) {
+            const atruleLastIndex = root.nodes.findLastIndex((x) => x.type === "atrule" && insertAfterAtRulesNames.includes(x.name));
+            const commentLastIndex = root.nodes.findLastIndex((x) => x.type === "comment" && regExpTest(insertAfterComments, x.text));
+            const lastIndex = Math.max(atruleLastIndex, commentLastIndex);
             for (const params of directiveParams) {
               const node = root.nodes.find((x) => x.type === "atrule" && x.params === params);
               if (!node) {
-                root.prepend(helpers.atRule({ name: "tailwind", params }));
+                const atRule = helpers.atRule({ name: "tailwind", params });
+                if (lastIndex < 0) {
+                  root.prepend(atRule);
+                } else {
+                  root.insertAfter(lastIndex, atRule);
+                }
               }
             }
             const cfg = typeof config === "function" ? config(_optionalChain([root, 'access', _3 => _3.source, 'optionalAccess', _4 => _4.input])) : config;
@@ -482,7 +515,7 @@ var creator = (options) => {
                 _tailwindcss2.default.call(void 0, tailwindcssConfig)
               ]).process(root, {
                 from: root.source.input.file
-              });
+              }).async();
             }
           }
         }

package/dist/postcss.d.cts

@@ -8,6 +8,8 @@ interface Options {
     config: InlineTailwindcssOptions | ((input?: postcss.Input) => InlineTailwindcssOptions);
     directiveParams: ('base' | 'components' | 'utilities' | 'variants')[];
     extensions: string[];
+    insertAfterAtRulesNames: string[];
+    insertAfterComments: (string | RegExp)[];
 }
 
 declare const creator: PluginCreator<Partial<Options>>;

package/dist/postcss.d.ts

@@ -8,6 +8,8 @@ interface Options {
     config: InlineTailwindcssOptions | ((input?: postcss.Input) => InlineTailwindcssOptions);
     directiveParams: ('base' | 'components' | 'utilities' | 'variants')[];
     extensions: string[];
+    insertAfterAtRulesNames: string[];
+    insertAfterComments: (string | RegExp)[];
 }
 
 declare const creator: PluginCreator<Partial<Options>>;

package/dist/postcss.js

@@ -323,15 +323,40 @@ function md5(input) {
   hash.update(input);
   return hash.digest("hex");
 }
+function isRegexp(value) {
+  return Object.prototype.toString.call(value) === "[object RegExp]";
+}
+function regExpTest(arr = [], str) {
+  if (Array.isArray(arr)) {
+    for (const item of arr) {
+      if (typeof item === "string") {
+        if (str.includes(item)) {
+          return true;
+        }
+      } else if (isRegexp(item)) {
+        item.lastIndex = 0;
+        if (item.test(str)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  throw new TypeError("paramater 'arr' should be a Array of Regexp | String !");
+}
 
 // src/config.ts
 function getDefaultConfig() {
   return {
     filter: () => true,
     config: void 0,
+    // 倒叙插入
     directiveParams: ["utilities", "components"],
     cwd: process.cwd(),
-    extensions: ["wxml", "js", "ts"]
+    extensions: ["wxml", "js", "ts"],
+    // @import and @use (scss)
+    insertAfterAtRulesNames: ["import", "use"],
+    insertAfterComments: ["@import"]
   };
 }
 function getConfig(options) {
@@ -440,7 +465,7 @@ async function getDepFiles(file) {
 
 // src/postcss.ts
 var creator = (options) => {
-  const { config, filter, directiveParams, cwd, extensions } = getConfig(options);
+  const { config, filter, directiveParams, cwd, extensions, insertAfterAtRulesNames, insertAfterComments } = getConfig(options);
   const extensionsGlob = `{${extensions.join(",")}}`;
   return {
     postcssPlugin,
@@ -449,10 +474,18 @@ var creator = (options) => {
         postcssPlugin: `${postcssPlugin}:post`,
         async Once(root, helpers) {
           if (filter(root.source?.input)) {
+            const atruleLastIndex = root.nodes.findLastIndex((x) => x.type === "atrule" && insertAfterAtRulesNames.includes(x.name));
+            const commentLastIndex = root.nodes.findLastIndex((x) => x.type === "comment" && regExpTest(insertAfterComments, x.text));
+            const lastIndex = Math.max(atruleLastIndex, commentLastIndex);
             for (const params of directiveParams) {
               const node = root.nodes.find((x) => x.type === "atrule" && x.params === params);
               if (!node) {
-                root.prepend(helpers.atRule({ name: "tailwind", params }));
+                const atRule = helpers.atRule({ name: "tailwind", params });
+                if (lastIndex < 0) {
+                  root.prepend(atRule);
+                } else {
+                  root.insertAfter(lastIndex, atRule);
+                }
               }
             }
             const cfg = typeof config === "function" ? config(root.source?.input) : config;
@@ -482,7 +515,7 @@ var creator = (options) => {
                 tailwindcss(tailwindcssConfig)
               ]).process(root, {
                 from: root.source.input.file
-              });
+              }).async();
             }
           }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tailwindcss-injector",
   "type": "module",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "tsup(esbuild) build package template",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -33,7 +33,7 @@
   "dependencies": {
     "fs-extra": "^11.2.0",
     "htmlparser2": "^9.1.0",
-    "magic-string": "^0.30.14",
+    "magic-string": "^0.30.15",
     "postcss": "^8.4.49",
     "tailwindcss": "^3.4.16",
     "tailwindcss-config": "0.0.0"