@react-native-reusables/cli 0.6.1 → 0.6.3

package/bin.cjs

@@ -55406,9 +55406,8 @@ var path4 = Options_exports.text("path").pipe(Options_exports.withDefault(""), O
 var template = Options_exports.text("template").pipe(Options_exports.withAlias("t"), Options_exports.withDefault(""));
 
 // src/project-manifest.ts
-var DEPENDENCIES = [
+var CORE_DEPENDENCIES = [
   "expo",
-  "nativewind",
   "react-native-reanimated",
   "react-native-safe-area-context",
   "tailwindcss-animate",
@@ -55416,6 +55415,10 @@ var DEPENDENCIES = [
   "clsx",
   "tailwind-merge"
 ];
+var DEPENDENCIES = {
+  nativewind: [...CORE_DEPENDENCIES, "nativewind"],
+  uniwind: [...CORE_DEPENDENCIES, "uniwind"]
+};
 var DEV_DEPENDENCIES = ["tailwindcss@^3.4.14"];
 var FILE_CHECKS = [
   {
@@ -55428,7 +55431,8 @@ var FILE_CHECKS = [
         message: "jsxImportSource or nativewind/babel is missing",
         docs: "https://www.nativewind.dev/docs/getting-started/installation#3-add-the-babel-preset"
       }
-    ]
+    ],
+    stylingLibraries: ["nativewind"]
   },
   {
     name: "Metro Config",
@@ -55445,7 +55449,21 @@ var FILE_CHECKS = [
         message: "The 'inlineRem: 16' is missing",
         docs: "https://reactnativereusables.com/docs/installation/manual#update-the-default-inlined-rem-value"
       }
-    ]
+    ],
+    stylingLibraries: ["nativewind"]
+  },
+  {
+    name: "Metro Config",
+    fileNames: ["metro.config.js", "metro.config.ts"],
+    docs: "https://www.nativewind.dev/docs/getting-started/installation#4-create-or-modify-your-metroconfigjs",
+    includes: [
+      {
+        content: ["withUniwindConfig("],
+        message: "The withUniwindConfig function is missing",
+        docs: "https://docs.uniwind.dev/api/metro-config#metro-config-js"
+      }
+    ],
+    stylingLibraries: ["uniwind"]
   },
   {
     name: "Root Layout",
@@ -55463,7 +55481,8 @@ var FILE_CHECKS = [
         message: "The PortalHost component is missing",
         docs: "https://reactnativereusables.com/docs/installation/manual#add-the-portal-host-to-your-root-layout"
       }
-    ]
+    ],
+    stylingLibraries: ["nativewind", "uniwind"]
   }
 ];
 var DEPRECATED_FROM_LIB = [
@@ -55557,7 +55576,8 @@ var CUSTOM_FILE_CHECKS = {
         message: "At least one of the color css variables is missing",
         docs: "https://reactnativereusables.com/docs/installation/manual#configure-your-styles"
       }
-    ]
+    ],
+    stylingLibraries: ["nativewind"]
   },
   theme: {
     name: "Theme",
@@ -55574,7 +55594,8 @@ var CUSTOM_FILE_CHECKS = {
         message: "The NAV_THEME is missing",
         docs: "https://reactnativereusables.com/docs/installation/manual#configure-your-styles"
       }
-    ]
+    ],
+    stylingLibraries: ["nativewind", "uniwind"]
   },
   nativewindEnv: {
     name: "Nativewind Env",
@@ -55585,7 +55606,8 @@ var CUSTOM_FILE_CHECKS = {
         message: "The nativewind types are missing",
         docs: "https://www.nativewind.dev/docs/getting-started/installation#7-typescript-setup-optional"
       }
-    ]
+    ],
+    stylingLibraries: ["nativewind"]
   },
   uniwindTypes: {
     name: "Uniwind Types",
@@ -55597,7 +55619,8 @@ var CUSTOM_FILE_CHECKS = {
         message: "The uniwind types are missing",
         docs: "https://docs.uniwind.dev/api/metro-config#dtsfile"
       }
-    ]
+    ],
+    stylingLibraries: ["uniwind"]
   },
   utils: {
     name: "Utils",
@@ -55609,7 +55632,8 @@ var CUSTOM_FILE_CHECKS = {
         message: "The cn function is missing",
         docs: "https://reactnativereusables.com/docs/installation/manual#add-a-cn-helper"
       }
-    ]
+    ],
+    stylingLibraries: ["nativewind", "uniwind"]
   },
   css: {
     name: "CSS",
@@ -55626,7 +55650,26 @@ var CUSTOM_FILE_CHECKS = {
         message: "At least one of the color css variables is missing",
         docs: "https://reactnativereusables.com/docs/installation/manual#configure-your-styles"
       }
-    ]
+    ],
+    stylingLibraries: ["nativewind"]
+  },
+  uniwindCss: {
+    name: "CSS",
+    defaultFileNames: ["globals.css", "src/global.css"],
+    docs: "https://reactnativereusables.com/docs/installation/manual#configure-your-styles",
+    includes: [
+      {
+        content: ["tailwindcss", "uniwind"],
+        message: "The tailwind layer directives are missing",
+        docs: "https://reactnativereusables.com/docs/installation/manual#configure-your-styles"
+      },
+      {
+        content: CSS_VARIABLE_NAMES,
+        message: "At least one of the color css variables is missing",
+        docs: "https://reactnativereusables.com/docs/installation/manual#configure-your-styles"
+      }
+    ],
+    stylingLibraries: ["uniwind"]
   }
 };
 var NATIVEWIND_ENV_FILE = "nativewind-env.d.ts";
@@ -55693,6 +55736,9 @@ var PROJECT_MANIFEST = {
   templates: TEMPLATES
 };
 
+// src/utils/retry-with.ts
+var retryWith = (fn2, inputs) => inputs.slice(1).reduce((acc, input) => acc.pipe(Effect_exports.orElse(() => fn2(input))), fn2(inputs[0]));
+
 // ../../node_modules/log-symbols/symbols.js
 var symbols_exports = {};
 __export(symbols_exports, {
@@ -55827,22 +55873,39 @@ var ProjectConfig = class extends Effect_exports.Service()("ProjectConfig", {
       yield* Effect_exports.logDebug(`componentJsonConfig: ${JSON.stringify(componentJsonConfig, null, 2)}`);
       return config2;
     });
-    const getStylingLibrary = () => Effect_exports.gen(function* () {
-      const nativewindEnvExists = yield* fs2.exists(path8.join(options3.cwd, "nativewind-env.d.ts"));
-      const uniwindTypesExists = yield* fs2.exists(path8.join(options3.cwd, "uniwind-types.d.ts"));
-      if (nativewindEnvExists) {
-        return "nativewind";
+    const getUniwindDtsPath = () => Effect_exports.gen(function* () {
+      const metroConfigPaths = ["metro.config.js", "metro.config.ts"].map((p3) => path8.join(options3.cwd, p3));
+      const metroContent = yield* retryWith((filePath) => fs2.readFileString(filePath), metroConfigPaths).pipe(
+        Effect_exports.catchAll(() => Effect_exports.succeed(null))
+      );
+      if (!metroContent?.includes("withUniwindConfig")) {
+        return null;
+      }
+      const dtsFileMatch = metroContent.match(/dtsFile\s*:\s*["']([^"']+)["']/);
+      if (dtsFileMatch?.[1]) {
+        const dtsPath = dtsFileMatch[1].replace(/^\.\//, "");
+        return path8.join(options3.cwd, dtsPath);
       }
-      if (uniwindTypesExists) {
+      return path8.join(options3.cwd, PROJECT_MANIFEST.uniwindTypesFile);
+    });
+    const getStylingLibrary = () => Effect_exports.gen(function* () {
+      const metroConfigPaths = ["metro.config.js", "metro.config.ts"].map((p3) => path8.join(options3.cwd, p3));
+      const metroContent = yield* retryWith((filePath) => fs2.readFileString(filePath), metroConfigPaths).pipe(
+        Effect_exports.catchAll(() => Effect_exports.succeed(null))
+      );
+      if (metroContent?.includes("withUniwindConfig")) {
         return "uniwind";
       }
-      return "nativewind";
+      if (metroContent?.toLowerCase().includes("withnativewind")) {
+        return "nativewind";
+      }
+      return "unknown";
     });
     const handleInvalidComponentJson = (exists4) => Effect_exports.gen(function* () {
       yield* Effect_exports.logWarning(
         `${exists4 ? "Invalid components.json" : "Missing components.json"}${" (required to continue)"}`
       );
-      const agreeToWrite = options3.yes ? true : yield* Prompt_exports.confirm({
+      const agreeToWrite = yield* Prompt_exports.confirm({
         message: `Would you like to ${exists4 ? "update the" : "write a"} components.json file?`,
         label: { confirm: "y", deny: "n" },
         initial: true,
@@ -55868,8 +55931,9 @@ var ProjectConfig = class extends Effect_exports.Service()("ProjectConfig", {
         message: "What is the name of the CSS file and path to it? (e.g. global.css or src/global.css)",
         default: detectedCss
       });
+      const stylingLibrary = yield* getStylingLibrary();
       const hasTailwindConfig = yield* fs2.exists(path8.join(options3.cwd, "tailwind.config.js"));
-      const tailwindConfig = options3.yes && hasTailwindConfig ? "tailwind.config.js" : yield* Prompt_exports.text({
+      const tailwindConfig = stylingLibrary === "uniwind" ? "" : options3.yes && hasTailwindConfig ? "tailwind.config.js" : yield* Prompt_exports.text({
         message: "What is the name of the Tailwind config file and path to it? (e.g. tailwind.config.js or src/tailwind.config.js)",
         default: "tailwind.config.js"
       });
@@ -55974,15 +56038,13 @@ var ProjectConfig = class extends Effect_exports.Service()("ProjectConfig", {
       getComponentJson,
       getTsConfig,
       resolvePathFromAlias,
-      getStylingLibrary
+      getStylingLibrary,
+      getUniwindDtsPath
     };
   })
 }) {
 };
 
-// src/utils/retry-with.ts
-var retryWith = (fn2, inputs) => inputs.slice(1).reduce((acc, input) => acc.pipe(Effect_exports.orElse(() => fn2(input))), fn2(inputs[0]));
-
 // src/services/required-files-checker.ts
 var RequiredFileError = class extends Data_exports.TaggedError("RequiredFileError") {
 };
@@ -55992,11 +56054,11 @@ var RequiredFilesChecker = class extends Effect_exports.Service()("RequiredFiles
     const path8 = yield* Path_exports.Path;
     const options3 = yield* CliOptions;
     const projectConfig = yield* ProjectConfig;
-    const checkFiles = (fileChecks) => Effect_exports.gen(function* () {
+    const checkFiles = (fileChecks, stylingLibrary) => Effect_exports.gen(function* () {
       const missingFiles = [];
       const missingIncludes = [];
       const filesWithContent = yield* Effect_exports.forEach(
-        fileChecks,
+        fileChecks.filter((file7) => file7.stylingLibraries.includes(stylingLibrary)),
         (file7) => retryWith(
           (filePath) => Effect_exports.gen(function* () {
             const fileContents = yield* fs2.readFileString(filePath);
@@ -56092,7 +56154,7 @@ var RequiredFilesChecker = class extends Effect_exports.Service()("RequiredFiles
       );
       return [...existingDeprecatedFromLibs, ...existingDeprecatedFromUi];
     });
-    const checkCustomFiles = (customFileChecks) => Effect_exports.gen(function* () {
+    const checkCustomFiles = (customFileChecks, stylingLibrary) => Effect_exports.gen(function* () {
       const componentJson = yield* projectConfig.getComponentJson();
       const aliasForLib = componentJson.aliases.lib ?? `${componentJson.aliases.utils}/lib`;
       const missingFiles = [];
@@ -56115,7 +56177,8 @@ var RequiredFilesChecker = class extends Effect_exports.Service()("RequiredFiles
           )
         )
       );
-      for (const include of customFileChecks.css.includes) {
+      const cssShouldInclude = stylingLibrary === "uniwind" ? customFileChecks.uniwindCss.includes : customFileChecks.css.includes;
+      for (const include of cssShouldInclude) {
         if (include.content.every((str) => cssContent.includes(str))) {
           yield* Effect_exports.logDebug(
             `${symbols_exports.success} ${customFileChecks.css.name} has ${include.content.join(", ")}`
@@ -56127,48 +56190,51 @@ var RequiredFilesChecker = class extends Effect_exports.Service()("RequiredFiles
         );
         missingIncludes.push({ ...include, fileName: customFileChecks.css.name });
       }
-      let stylingLibrary = "nativewind";
       if (componentJson.tsx !== false) {
         const missingTypeFiles = [];
-        const nativewindEnvContent = yield* fs2.readFileString(path8.join(options3.cwd, PROJECT_MANIFEST.nativewindEnvFile)).pipe(
-          Effect_exports.catchAll(() => {
-            missingTypeFiles.push(customFileChecks.nativewindEnv);
-            return Effect_exports.succeed(null);
-          })
-        );
-        const uniwindTypesContent = yield* fs2.readFileString(path8.join(options3.cwd, PROJECT_MANIFEST.uniwindTypesFile)).pipe(
-          Effect_exports.catchAll(() => {
-            missingTypeFiles.push(customFileChecks.uniwindTypes);
-            return Effect_exports.succeed(null);
-          })
-        );
-        if (nativewindEnvContent) {
-          for (const include of customFileChecks.nativewindEnv.includes) {
-            if (include.content.every((str) => nativewindEnvContent.includes(str))) {
+        if (stylingLibrary === "nativewind") {
+          const nativewindEnvContent = yield* fs2.readFileString(path8.join(options3.cwd, PROJECT_MANIFEST.nativewindEnvFile)).pipe(
+            Effect_exports.catchAll(() => {
+              missingTypeFiles.push(customFileChecks.nativewindEnv);
+              return Effect_exports.succeed(null);
+            })
+          );
+          if (nativewindEnvContent) {
+            for (const include of customFileChecks.nativewindEnv.includes) {
+              if (include.content.every((str) => nativewindEnvContent.includes(str))) {
+                yield* Effect_exports.logDebug(
+                  `${symbols_exports.success} ${customFileChecks.nativewindEnv.name} has ${include.content.join(", ")}`
+                );
+                continue;
+              }
               yield* Effect_exports.logDebug(
-                `${symbols_exports.success} ${customFileChecks.nativewindEnv.name} has ${include.content.join(", ")}`
+                `${symbols_exports.error} ${customFileChecks.nativewindEnv.name} missing ${include.content.join(", ")}`
               );
-              continue;
+              missingIncludes.push({ ...include, fileName: customFileChecks.nativewindEnv.name });
             }
-            yield* Effect_exports.logDebug(
-              `${symbols_exports.error} ${customFileChecks.nativewindEnv.name} missing ${include.content.join(", ")}`
-            );
-            missingIncludes.push({ ...include, fileName: customFileChecks.nativewindEnv.name });
           }
         }
-        if (uniwindTypesContent) {
-          stylingLibrary = "uniwind";
-          for (const include of customFileChecks.uniwindTypes.includes) {
-            if (include.content.every((str) => uniwindTypesContent.includes(str))) {
+        if (stylingLibrary === "uniwind") {
+          const uniwindDtsPath = yield* projectConfig.getUniwindDtsPath();
+          const uniwindTypesContent = uniwindDtsPath ? yield* fs2.readFileString(uniwindDtsPath).pipe(
+            Effect_exports.catchAll(() => {
+              missingTypeFiles.push(customFileChecks.uniwindTypes);
+              return Effect_exports.succeed(null);
+            })
+          ) : null;
+          if (uniwindTypesContent) {
+            for (const include of customFileChecks.uniwindTypes.includes) {
+              if (include.content.every((str) => uniwindTypesContent.includes(str))) {
+                yield* Effect_exports.logDebug(
+                  `${symbols_exports.success} ${customFileChecks.uniwindTypes.name} has ${include.content.join(", ")}`
+                );
+                continue;
+              }
               yield* Effect_exports.logDebug(
-                `${symbols_exports.success} ${customFileChecks.uniwindTypes.name} has ${include.content.join(", ")}`
+                `${symbols_exports.error} ${customFileChecks.uniwindTypes.name} missing ${include.content.join(", ")}`
               );
-              continue;
+              missingIncludes.push({ ...include, fileName: customFileChecks.uniwindTypes.name });
             }
-            yield* Effect_exports.logDebug(
-              `${symbols_exports.error} ${customFileChecks.uniwindTypes.name} missing ${include.content.join(", ")}`
-            );
-            missingIncludes.push({ ...include, fileName: customFileChecks.uniwindTypes.name });
           }
         }
         if (missingTypeFiles.length === 2) {
@@ -56264,11 +56330,12 @@ var RequiredFilesChecker = class extends Effect_exports.Service()("RequiredFiles
         customFileChecks,
         deprecatedFromLib,
         deprecatedFromUi,
-        fileChecks
+        fileChecks,
+        stylingLibrary
       }) => Effect_exports.gen(function* () {
         const [fileResults, customFileResults, deprecatedFileResults] = yield* Effect_exports.all([
-          checkFiles(fileChecks),
-          checkCustomFiles(customFileChecks),
+          checkFiles(fileChecks, stylingLibrary),
+          checkCustomFiles(customFileChecks, stylingLibrary),
           checkDeprecatedFiles(deprecatedFromLib, deprecatedFromUi)
         ]);
         return { fileResults, customFileResults, deprecatedFileResults };
@@ -58209,6 +58276,13 @@ var Doctor = class extends Effect_exports.Service()("Doctor", {
     const path8 = yield* Path_exports.Path;
     const requiredFileChecker = yield* RequiredFilesChecker;
     const spinner = yield* Spinner;
+    const projectConfig = yield* ProjectConfig;
+    const stylingLibrary = yield* projectConfig.getStylingLibrary();
+    if (stylingLibrary !== "unknown") {
+      console.log(
+        `\x1B[2m${symbols_exports.info} Styling Library: ${stylingLibrary === "uniwind" ? "Uniwind" : "Nativewind"}\x1B[0m`
+      );
+    }
     const checkRequiredDependencies = ({
       dependencies,
       devDependencies
@@ -58246,18 +58320,20 @@ var Doctor = class extends Effect_exports.Service()("Doctor", {
       }
       return { uninstalledDependencies, uninstalledDevDependencies };
     });
+    const registry = stylingLibrary === "uniwind" ? "uniwind" : "nativewind";
     return {
       run: (options4) => Effect_exports.gen(function* () {
         yield* Effect_exports.logDebug(`Doctor options: ${JSON.stringify(options4, null, 2)}`);
         const { uninstalledDependencies, uninstalledDevDependencies } = yield* checkRequiredDependencies({
-          dependencies: PROJECT_MANIFEST.dependencies,
+          dependencies: PROJECT_MANIFEST.dependencies[registry],
           devDependencies: PROJECT_MANIFEST.devDependencies
         });
         const { customFileResults, deprecatedFileResults, fileResults } = yield* requiredFileChecker.run({
           customFileChecks: PROJECT_MANIFEST.customFileChecks,
           deprecatedFromLib: PROJECT_MANIFEST.deprecatedFromLib,
           deprecatedFromUi: PROJECT_MANIFEST.deprecatedFromUi,
-          fileChecks: PROJECT_MANIFEST.fileChecks
+          fileChecks: PROJECT_MANIFEST.fileChecks,
+          stylingLibrary: registry
         });
         const result = {
           missingFiles: [...fileResults.missingFiles, ...customFileResults.missingFiles],
@@ -58564,8 +58640,8 @@ var BINARY_RUNNERS = {
   npm: ["npx"],
   bun: ["bunx", "--bun"],
   pnpm: ["pnpm", "dlx"],
-  yarn: ["yarn"],
-  "yarn@berry": ["yarn", "dlx"]
+  yarn: ["npx"],
+  "yarn@berry": ["npx"]
 };
 var detectPackageManager = (cwd2) => Effect_exports.tryPromise({
   try: () => {
@@ -58626,7 +58702,8 @@ var Add = class extends Effect_exports.Service()("Add", {
         }
         yield* Effect_exports.logDebug(`Selected components: ${components.join(", ")}`);
         const stylingLibrary = yield* projectConfig.getStylingLibrary();
-        const baseUrl = process.env.INTERNAL_ENV === "development" ? `http://localhost:3000/local/r/${stylingLibrary}` : `https://reactnativereusables.com/r/${stylingLibrary}`;
+        const registry = stylingLibrary === "uniwind" ? "uniwind" : "nativewind";
+        const baseUrl = process.env.INTERNAL_ENV === "development" ? `http://localhost:3000/local/r/${registry}` : `https://reactnativereusables.com/r/${registry}`;
         const componentUrls = components.map((component) => {
           const lowerCaseComponent = component.toLocaleLowerCase();
           return lowerCaseComponent.startsWith("http") ? lowerCaseComponent : `${baseUrl}/${lowerCaseComponent}.json`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-reusables/cli",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "type": "module",
   "description": "A CLI for React Native Reusables",
   "main": "bin.cjs",