lucy-cli 2.0.0-alpha.1 → 2.0.0-alpha.11

package/dist/init.js

@@ -157,22 +157,22 @@ import { JsonSchema } from "./schemas/index.js";
 // 		console.log(blue.underline(`🐕 => Updated file ${orange(filePath)}`));
 // 	}
 // }
-const yarn = Command.make("yarn").pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
-Command.exitCode // Get the exit code
-);
 const init_expo = () => {
     return Effect.gen(function* () {
         const config = yield* Config;
         const terminal = yield* Terminal.Terminal;
         const fs = yield* FileSystem.FileSystem;
         const path = yield* Path.Path;
-        const yarn = Command.make("yarn", "add", "nativewind", "react-native-reanimated@~3.17.4", "react-native-safe-area-context@5.4.0", "@wix/sdk", "@wix/data", "expo-standard-web-crypto").pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
+        const yarn = Command.make("yarn", "add", "nativewind", "react-native-reanimated@~3.17.4", "react-native-safe-area-context@5.4.0", "@wix/sdk@1.15.24", "@wix/data", "expo-standard-web-crypto", "effect", "node-libs-react-native", "util", "events", "tailwindcss-animate").pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
         Command.exitCode // Get the exit code
         );
-        const yarnDev = Command.make("yarn", "add", "--dev", "tailwindcss@^3.4.17", "prettier-plugin-tailwindcss@^0.5.11", "@styled/typescript-styled-plugin", "typescript-eslint-language-service", "eslint-config-prettier", "eslint-plugin-jsdoc", "eslint-plugin-named-import-spacing", "eslint-plugin-only-warn", "eslint-plugin-react", "eslint-plugin-react-hooks", "eslint-plugin-simple-import-sort", "@next/eslint-plugin-next", "@styled/typescript-styled-plugin", "@stylelint/postcss-css-in-js", "@typescript-eslint/parser", "typescript-eslint", "typescript-eslint-language-service", "@total-typescript/ts-reset").pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
+        const yarnVersion = Command.make("yarn", "set", "version", "berry").pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
         Command.exitCode // Get the exit code
         );
-        const npx = Command.make("npx", "expo", "install", "tailwindcss-animate", "class-variance-authority", "clsx", "tailwind-merge", "expo-crypto").pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
+        const yarnDev = Command.make("yarn", "add", "--dev", "tailwindcss@^3.4.17", "prettier-plugin-tailwindcss@^0.5.11", "@styled/typescript-styled-plugin", "typescript-eslint-language-service", "eslint-config-prettier", "eslint-plugin-jsdoc", "eslint-plugin-named-import-spacing", "eslint-plugin-only-warn", "eslint-plugin-react", "eslint-plugin-react-hooks", "eslint-plugin-simple-import-sort", "@next/eslint-plugin-next", "@styled/typescript-styled-plugin", "@stylelint/postcss-css-in-js", "@typescript-eslint/parser", "typescript-eslint", "typescript-eslint-language-service", "@total-typescript/ts-reset", "expo-doctor", "tsx").pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
+        Command.exitCode // Get the exit code
+        );
+        const npx = Command.make("npx", "expo", "install", "tailwindcss-animate", "class-variance-authority", "clsx", "tailwind-merge", "expo-crypto", "react-dom", "react-native-web", "@expo/metro-runtime", "expo-system-ui").pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
         Command.exitCode // Get the exit code
         );
         const projectName = config.config.cwd.split('/').pop() || 'expo-project';
@@ -194,7 +194,7 @@ const init_expo = () => {
         if (nonGitFiles.length > 0)
             return yield* Effect.logError("The current directory is not empty. Please run this command in an empty directory.");
         if (!expoAppReady) {
-            const initExpo = Command.make("npx", "create-expo-app@latest", projectName).pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
+            const initExpo = Command.make("npx", "create-expo-app@latest", projectName, "--template", "blank-typescript", "--no-install").pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
             Command.exitCode // Get the exit code
             );
             yield* initExpo;
@@ -205,13 +205,6 @@ const init_expo = () => {
         }
         if (lucyInitialized)
             return yield* Effect.logError("Lucy is already initialized in this project. Please run this command in an empty directory.");
-        console.log("Expo project initialized with app.json:", projectName);
-        let res = yield* npx;
-        res = yield* yarn;
-        res = yield* yarnDev;
-        if (res !== 0) {
-            return yield* Effect.logError("Failed to install Expo dependencies. Please check the error message above.");
-        }
         const baseFiles = yield* fs.readDirectory(config.config.filesFolder + '/expo');
         yield* Effect.forEach(baseFiles, (file) => fs.copy(path.join(config.config.filesFolder, 'expo', file), path.join(config.config.cwd, file), { overwrite: true }));
         const newScripts = {
@@ -220,20 +213,53 @@ const init_expo = () => {
             "android": "expo start --android",
             "ios": "expo start --ios",
             "web": "expo start --web",
+            "reset": "tsx ./scripts/reset-project.ts",
             "format": "prettier --write \"./*.json\" \"**/*.{ts,tsx,md,json,jsonc,json5}\"",
-            "build:ios": "eas build --platform ios --local --profile preview",
-            "build:android": "eas build --platform android --local --profile preview",
-            "build:web": "eas build --platform web --local --profile preview",
+            "prebuild": "expo prebuild",
+            "pods": "npxpod-install",
+            "build:dev": "eas build --local --profile development",
+            "build:sim": "eas build --local --profile ios-simulator",
+            "build:prev": "eas build --local --profile preview",
+            "build:prod": "eas build --local --profile production",
+            "build:web": "expo export --platform web",
+            "doctor": "expo-doctor",
+            "eas-build-pre-install": "corepack enable && yarn set version 4"
         };
         const packageJsonPath = path.join(config.config.cwd, "package.json");
         const packageJsonRaw = yield* fs.readFile(packageJsonPath);
         const packageJson = Schema.decodeUnknownSync(JsonSchema)(packageJsonRaw.toString());
         packageJson.scripts = {
             ...packageJson.scripts,
-            ...newScripts
+            ...newScripts,
+        };
+        packageJson.resolutions = {
+            ...packageJson.resolutions,
+        };
+        packageJson.expo = {
+            doctor: {
+                reactNativeDirectoryCheck: {
+                    listUnknownPackages: false,
+                },
+            }
         };
         yield* fs.writeFileString(path.join(config.config.cwd, 'package.json'), JSON.stringify(packageJson, null, 2));
         yield* fs.remove(path.join(config.config.cwd, "package-lock.json"), { force: true });
+        let res = yield* yarnVersion;
+        if (res !== 0) {
+            return yield* Effect.logError("Failed to set Yarn version. Please check the error message above.");
+        }
+        res = yield* yarn;
+        if (res !== 0) {
+            return yield* Effect.logError("Failed to install dependencies. Please check the error message above.");
+        }
+        res = yield* yarnDev;
+        if (res !== 0) {
+            return yield* Effect.logError("Failed to install dev dependencies. Please check the error message above.");
+        }
+        res = yield* npx;
+        if (res !== 0) {
+            return yield* Effect.logError("Failed to install Expo dependencies. Please check the error message above.");
+        }
     });
 };
 export const init = () => {

package/files/expo/.prettierrc.js

@@ -0,0 +1,16 @@
+module.exports = {
+	printWidth: 80,
+	tabWidth: 4,
+	useTabs: true,
+	singleQuote: true,
+	trailingComma: 'all',
+	plugins: ['prettier-plugin-tailwindcss'],
+	overrides: [
+		{
+			files: ['**/*.{json,jsonc,json5}', '*.{json,jsonc,json5}'],
+			options: {
+				useTabs: true
+			}
+		}
+	]
+};

package/files/expo/.yarnrc.yml

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
-
 npmRegistryServer: "https://registry.npmjs.org/"
+patchFolder: patches

package/files/expo/babel.config.js

@@ -1,9 +1,10 @@
 module.exports = function(api) {
-    api.cache(true);
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+	api.cache(true);
 
-    return {
-        presets: [["babel-preset-expo", {
-            jsxImportSource: "nativewind"
-        }], "nativewind/babel"],
-    };
+	return {
+		presets: [['babel-preset-expo', {
+			jsxImportSource: 'nativewind'
+		}], 'nativewind/babel'],
+	};
 };

package/files/expo/constants/theme.ts

@@ -1,18 +1,18 @@
 export const NAV_THEME = {
-    light: {
-      background: 'hsl(0 0% 100%)', // background
-      border: 'hsl(240 5.9% 90%)', // border
-      card: 'hsl(0 0% 100%)', // card
-      notification: 'hsl(0 84.2% 60.2%)', // destructive
-      primary: 'hsl(240 5.9% 10%)', // primary
-      text: 'hsl(240 10% 3.9%)', // foreground
-    },
-    dark: {
-      background: 'hsl(240 10% 3.9%)', // background
-      border: 'hsl(240 3.7% 15.9%)', // border
-      card: 'hsl(240 10% 3.9%)', // card
-      notification: 'hsl(0 72% 51%)', // destructive
-      primary: 'hsl(0 0% 98%)', // primary
-      text: 'hsl(0 0% 98%)', // foreground
-    },
-  };
+	light: {
+		background: 'hsl(0 0% 100%)', // background
+		border: 'hsl(240 5.9% 90%)', // border
+		card: 'hsl(0 0% 100%)', // card
+		notification: 'hsl(0 84.2% 60.2%)', // destructive
+		primary: 'hsl(240 5.9% 10%)', // primary
+		text: 'hsl(240 10% 3.9%)', // foreground
+	},
+	dark: {
+		background: 'hsl(240 10% 3.9%)', // background
+		border: 'hsl(240 3.7% 15.9%)', // border
+		card: 'hsl(240 10% 3.9%)', // card
+		notification: 'hsl(0 72% 51%)', // destructive
+		primary: 'hsl(0 0% 98%)', // primary
+		text: 'hsl(0 0% 98%)', // foreground
+	},
+};

package/files/expo/eas.json

@@ -5,7 +5,9 @@
 	"build": {
 		"development": {
 			"developmentClient": true,
-			"distribution": "internal"
+			"distribution": "internal",
+			"environment": "development",
+			"env": {}
 		},
 		"ios-simulator": {
 			"extends": "development",
@@ -14,10 +16,14 @@
 			}
 		},
 		"preview": {
-			"distribution": "internal"
+			"distribution": "internal",
+			"environment": "preview",
+			"env": {}
 		},
 		"production": {
-			"autoIncrement": true
+			"autoIncrement": true,
+			"environment": "production",
+			"env": {}
 		}
 	},
 	"submit": {

package/files/expo/{eslint.config.js → eslint.config.mjs}

@@ -1,10 +1,8 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 // https://docs.expo.dev/guides/using-eslint/
-const { defineConfig } = require('eslint/config');
-const expoConfig = require('eslint-config-expo/flat');
-
 import eslint from '@eslint/js';
+import expoConfig from 'eslint-config-expo/flat.js';
 // @ts-ignore
-import importPlugin from 'eslint-plugin-import';
 import jsdoc from 'eslint-plugin-jsdoc';
 import namedImportSpacing from 'eslint-plugin-named-import-spacing';
 import simpleImportSort from 'eslint-plugin-simple-import-sort';
@@ -13,31 +11,28 @@ import tseslint from 'typescript-eslint';
 
 export default tseslint.config(
 	eslint.configs.recommended,
+	// eslint-disable-next-line import/no-named-as-default-member
 	tseslint.configs.recommendedTypeChecked,
 	jsdoc.configs['flat/recommended-typescript'],
-  expoConfig,
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+	expoConfig,
 	{
 		ignores: ['dist/*'],
 	},
 	{
 		plugins: {
-			'@typescript-eslint': tseslint.plugin,
 			'simple-import-sort': simpleImportSort,
-			import: importPlugin,
 			'named-import-spacing': namedImportSpacing,
-			jsdoc,
 		},
 		settings: {
 			'import/resolver': {
 				typescript: {
-					project: [
-						'typescript/tsconfig.json',
-						'lib/tsconfig.json'
-					],
+					project: './tsconfig.json',
 				}
 			}
 		},
 		languageOptions: {
+			// eslint-disable-next-line import/no-named-as-default-member
 			parser: tseslint.parser,
 			parserOptions: {
 				projectService: true,
@@ -99,7 +94,7 @@ export default tseslint.config(
 			'no-multi-spaces': 'error',
 			'import/newline-after-import': ['error', { count: 1 }],
 			'named-import-spacing/named-import-spacing': 2,
-			'no-unused-vars': 'warn',
+			'@typescript-eslint/no-unused-vars': 'warn',
 			'import/no-unresolved': [0],
 			'no-forbidden-relative-imports': [0],
 			'@typescript-eslint/triple-slash-reference': 'off',
@@ -119,8 +114,13 @@ export default tseslint.config(
 			'@typescript-eslint/naming-convention': [
 				'error',
 				{
-					selector: ['variable', 'function'],
-					format: ['camelCase'],
+					selector: ['variable'],
+					format: ['camelCase', 'UPPER_CASE'],
+					leadingUnderscore: 'allow',
+				},
+				{
+					selector: ['function'],
+					format: ['camelCase', 'PascalCase'],
 					leadingUnderscore: 'allow',
 				},
 				{
@@ -175,10 +175,6 @@ export default tseslint.config(
 					selector: 'typeLike',
 					format: ['PascalCase'],
 				},
-				{
-					selector: 'function',
-					format: ['UPPER_CASE'],
-				},
 			],
 		},
 	},

package/files/expo/hooks/useColorScheme.ts

@@ -1,11 +1,17 @@
 import { useColorScheme as useNativewindColorScheme } from 'nativewind';
 
+/**
+ * Custom hook to get the current color scheme and provide methods to change it.
+ * This hook uses the nativewind's useColorScheme to access the color scheme.
+ * @returns An object containing the current color scheme, a method to set the color scheme,
+ */
 export function useColorScheme() {
-  const { colorScheme, setColorScheme, toggleColorScheme } = useNativewindColorScheme();
-  return {
-    colorScheme: colorScheme ?? 'dark',
-    isDarkColorScheme: colorScheme === 'dark',
-    setColorScheme,
-    toggleColorScheme,
-  };
+	const { colorScheme, setColorScheme, toggleColorScheme } = useNativewindColorScheme();
+	
+	return {
+		colorScheme: colorScheme ?? 'dark',
+		isDarkColorScheme: colorScheme === 'dark',
+		setColorScheme,
+		toggleColorScheme,
+	};
 }

package/files/expo/index.ts

@@ -0,0 +1,11 @@
+import '@/global.css';
+import '@/lib/utils/polyfills';
+
+import { registerRootComponent } from 'expo';
+
+import App from './App';
+
+// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
+// It also ensures that whether you load the app in Expo Go or in a native build,
+// the environment is set up appropriately
+registerRootComponent(App);

package/files/expo/lib/data.ts

@@ -1,45 +1,48 @@
 import { Effect, Schedule, Schema } from 'effect';
-import { client, ClientError } from './wixClient';
+
+import { client, ClientError } from './wix';
 
 const dataSchema = Schema.Struct({
-    source: Schema.String,
-    content: Schema.String,
-    _id: Schema.String,
-    _owner: Schema.String,
-    _createdDate: Schema.Any,
-    _updatedDate: Schema.Any,
+	source: Schema.String,
+	content: Schema.String,
+	_id: Schema.String,
+	_owner: Schema.String,
+	_createdDate: Schema.Any,
+	_updatedDate: Schema.Any,
 });
 
-const COLLECTION_NAME = "dailySpiritQuotes";
+const COLLECTION_NAME = 'dailySpiritQuotes';
 
 export const getQuote = () => Effect.gen(function* () {
-    const count = yield* Effect.retry(Effect.tryPromise({
-        try: () => client.items.query(COLLECTION_NAME).count(),
-        catch: (error) => {
-            console.error('Error fetching quotes:', error);
-            Effect.fail(new ClientError());
-        }
-    }), Schedule.fromDelays(50, 100, 200, 400, 800));
-
-    if (count === 0) {
-        return yield* Effect.fail(new Error("No quotes found in the collection."));
-    }
+	const count = yield* Effect.retry(Effect.tryPromise({
+		try: () => client.items.query(COLLECTION_NAME).count(),
+		catch: (error) => {
+			console.error('Error fetching quotes:', error);
+			Effect.fail(new ClientError());
+		}
+	}), Schedule.fromDelays(50, 100, 200, 400, 800));
+
+	if (count === 0) {
+		return yield* Effect.fail(new Error('No quotes found in the collection.'));
+	}
     
-    const randomIndex = Math.floor(Math.random() * count);
+	const randomIndex = Math.floor(Math.random() * count);
 
-    const data = yield* Effect.retry(Effect.tryPromise({
-        try: () => client.items.query(COLLECTION_NAME).skip(randomIndex).limit(1).find(),
-        catch: (error) => {
-            console.error('Error fetching quotes:', error);
-            Effect.fail(new ClientError());
-        }
-    }), Schedule.fromDelays(50, 100, 200, 400, 800));
+	const data = yield* Effect.retry(Effect.tryPromise({
+		try: () => client.items.query(COLLECTION_NAME).skip(randomIndex).limit(1).find(),
+		catch: (error) => {
+			console.error('Error fetching quotes:', error);
+			Effect.fail(new ClientError());
+		}
+	}), Schedule.fromDelays(50, 100, 200, 400, 800));
 
-    yield* Effect.logDebug(`Fetched ${JSON.stringify(data, null, 2)}`);
+	yield* Effect.logDebug(`Fetched ${JSON.stringify(data, null, 2)}`);
 
-    const quote = yield* Schema.decodeUnknown(dataSchema)(data.items[0]);
-    return { source: quote.source, content: quote.content }
+	const quote = yield* Schema.decodeUnknown(dataSchema)(data.items[0]);
+	
+	return { source: quote.source, content: quote.content };
 }).pipe(Effect.catchAll((error) => {
-    console.error('Failed to fetch quote:', error);
-    return Effect.succeed({ source: 'The Lord', content: 'The ways of the Lord are inscrutable.'});
-}))
+	console.error('Failed to fetch quote:', error);
+	
+	return Effect.succeed({ source: 'The Lord', content: 'The ways of the Lord are inscrutable.' });
+}));

package/files/expo/lib/utils/index.ts

@@ -1,6 +1,11 @@
-import { clsx, type ClassValue } from 'clsx';
+import { type ClassValue, clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 
+/**
+ * Combines class names and merges Tailwind CSS classes.
+ * @param inputs - The class names to combine.
+ * @returns A string of combined class names.
+ */
 export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
+	return twMerge(clsx(inputs));
 }

package/files/expo/lib/utils/polyfills.ts

@@ -1,5 +1,5 @@
 
-import { polyfillWebCrypto } from "expo-standard-web-crypto";
+import { polyfillWebCrypto } from 'expo-standard-web-crypto';
 // import { Platform } from 'react-native';
 // // import polyfill from 'react-native-polyfill-globals';
 // import { TextDecoder, TextEncoder } from "text-encoding";

package/files/expo/lib/wix/client.ts

@@ -1,14 +1,12 @@
 import { items } from '@wix/data';
 import { createClient, OAuthStrategy } from '@wix/sdk';
-import { Data } from 'effect';
 
-const clientId = process.env.EXPO_PUBLIC_WIX_CLIENT_ID || "";
+const clientId = process.env.EXPO_PUBLIC_WIX_CLIENT_ID || '';
 
 //To access the Wix APIs, create a client with the createClient() function imported from the @wix/sdk package.
 export const client = createClient({
-    modules: { items },
-    auth: OAuthStrategy({ clientId: clientId }),
+	modules: { items },
+	auth: OAuthStrategy({ clientId: clientId }),
 });
-export class ClientError extends Data.TaggedError('ErrorParserError') {}
 
 

package/files/expo/lib/wix/error.ts

@@ -0,0 +1,3 @@
+import { Data } from 'effect';
+
+export class ClientError extends Data.TaggedError('ErrorParserError') {}

package/files/expo/lib/wix/index.ts

@@ -1 +1,2 @@
 export { client } from './client';
+export { ClientError } from './error';

package/files/expo/metro.config.js

@@ -0,0 +1,57 @@
+/* eslint-disable @typescript-eslint/no-require-imports */
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+const { getDefaultConfig } = require('expo/metro-config');
+const { withNativeWind } = require('nativewind/metro');
+const path = require('path');
+
+const ALIASES_WEB = {
+	'@wix/sdk': path.resolve(__dirname, './node_modules/@wix/sdk/cjs/build/index.js'),
+	// Example: redirect imports of 'some-native-library' to a web-compatible mock
+	// 'some-native-library': path.resolve(__dirname, 'src/mocks/some-native-library.web.js'),
+
+	// You can add your @wix/sdk aliases here if needed
+	// '@wix/sdk-something': path.resolve(__dirname, 'src/wix/sdk-something-web.js'),
+};
+const config = (() => {
+	let config = getDefaultConfig(__dirname);
+	const { transformer, resolver } = config;
+	config.transformer = {
+		...transformer,
+	};
+	config.resolver = {
+		...resolver,
+	};
+	
+	config.resolver.unstable_enablePackageExports = false;
+	// config.resolver.unstable_conditionsByPlatform = ['ios', 'android']
+config.resolver.resolveRequest = (context, moduleName, platform) => {
+	if (platform === 'web') {
+		// Check if the module name is in our alias map
+		const alias = ALIASES_WEB[moduleName];
+		if (alias) {
+			console.log(`Aliasing '${moduleName}' to '${alias}'`);
+			// If it is, resolve to the new path
+			return context.resolveRequest(context, alias, platform);
+		}
+	}
+	// Ensure you call the default resolver for everything else.
+	return context.resolveRequest(context, moduleName, platform);
+};
+
+	config.resolver.extraNodeModules = {
+		...config.resolver.extraNodeModules,
+		...require('node-libs-react-native'),
+		// 'node:buffer': require.resolve('buffer/'),
+		// 'node:crypto': require.resolve('react-native-crypto/'),
+		// 'node:util': require.resolve('util/'),
+		// 'node:http': require.resolve('stream-http/'),
+		// 'node:https': require.resolve('https-browserify/'),
+		// 'node:events': require.resolve('events/'),
+	};
+	
+	return config;
+})();
+// console.log('Using Metro config:', JSON.stringify(config, null, 2));
+module.exports = withNativeWind(config, { input: './global.css' });
+