@ronas-it/nx-generators 0.15.0-alpha.0 → 0.15.0-alpha.2

package/README.md

@@ -1,6 +1,28 @@
 # Nx Generators
 
-Nx generators for Ronas IT projects.
+This package provides a set of [Nx](https://nx.dev/getting-started/intro) generators that help maintain a consistent project structure, enforce best practices, and automate common development tasks. It is designed to streamline and standardize the development workflow for monorepos with React Native and/or Next.js apps.
+
+## Features
+
+- **Automated setup**: Quick setup of new projects with pre-configured [best practices](#best-practices)
+- **Cross-platform support**: Generators for both web (Next.js) and mobile (RN Expo) applications
+- **Code quality tools**: Built-in configuration for ESLint, Prettier, and TypeScript pre-commit checks
+- **Library management**: Tools for creating, moving, renaming, and managing libraries with pre-defined boundaries
+- **Component generation**: Automated creation of components, form interaction, and other utility tools
+- **Data access setup**: State management and API interaction setup using [Redux Toolkit](https://redux-toolkit.js.org/) and [RTKQ Entity API](https://github.com/RonasIT/rtkq-entity-api)
+- **Internationalization**: Built-in support for i18n in both Next.js and RN Expo applications
+
+See full list of generators [below](#generators-overview).
+
+## Best Practices
+
+The generators enforce several best practices according to [Nx concepts](https://nx.dev/concepts/decisions):
+
+- Scalable [monorepo organization](https://nx.dev/concepts/decisions/why-monorepos)
+- Consistent [project structure](https://nx.dev/concepts/decisions/folder-structure)
+- Clear [libraries hierarchy](https://nx.dev/concepts/decisions/project-dependency-rules)
+- Proper [module boundaries](https://nx.dev/features/enforce-module-boundaries)
+- Streamlined [dependency management](https://nx.dev/concepts/decisions/dependency-management)
 
 ## Usage
 
@@ -75,6 +97,7 @@ Configures code checks and formatting with pre-commit hook.
 ### 3. `expo-app`
 
 Generates and configures an Expo React Native app.
+Also generates [navigation utilities](#navigation-utilities)
 
 #### Options
 
@@ -97,6 +120,7 @@ npx nx g expo-app my-app mobile
 ### 4. `next-app`
 
 Generates and configures a Next.js app.
+Also generates [navigation utilities](#navigation-utilities).
 
 #### Options
 
@@ -120,7 +144,7 @@ npx nx g next-app my-app web
 
 ### 5. `react-lib`
 
-Generates a library according to [Nx notation](https://nx.dev/concepts/more-concepts/applications-and-libraries).
+Generates a library according to [Nx notation](https://nx.dev/concepts/decisions/project-dependency-rules).
 
 #### Options
 
@@ -304,3 +328,141 @@ Creates [Sentry](https://sentry.io/) integration for Expo/Next application.
 ### 14. `dockerfile`
 
 Generates a deployment-ready Dockerfile for Next.js applications in the monorepo.
+
+## Navigation utilities
+
+The generators `next-app` and `expo-app` also create customizable utilities for navigation
+and empty `navigationConfig` - an object, where routes should be stored.
+There are utilities, which may help to create routes
+
+### getLinkBuilder
+
+It's a function for building URLs based on a base path and optional query parameters.
+Library - `navigation`.
+
+#### Parameters
+
+- `basePath` — the initial URL. It may contain placeholders for dynamic substitution (e.g., `[id]`).
+
+#### Returns
+
+`() => string` or `(args?: TRootParams) => string` - a function that constructs a URL by replacing placeholders in the `basePath`
+with values from an optional args object and appends query parameters.
+
+#### Example of usage
+
+```ts
+export class ItemSearchParams {
+  @Expose()
+  public categoryId?: number;
+
+  @Expose()
+  public tags?: Array<string>;
+}
+
+const navigationConfig = {
+  routes: {
+    items: getLinkBuilder<ItemSearchParams>('/items'),
+  },
+};
+
+// /items
+const allItemsLink = navigationConfig.routes.items();
+// /items?categoryId=1&tags=fiction&tags=newest
+const filteredItemsLink = navigationConfig.routes.items({
+  categoryId: 1,
+  tags: ['fiction', 'newest'],
+});
+```
+
+### getResourcePaths
+
+It's a function that generates an object of URL paths related to a specific resource:
+list, single view, creation, and editing.
+Library - `navigation`.
+
+#### Parameters
+
+- `basePath` - the root path for the resource.
+- `options` (optional) - an object to enable additional paths.
+  - `withCreation` (optional) includes a path for creation a new resource.
+  - `withEditing` (optional) includes a path for editing an existing resource.
+
+#### Returns
+
+`ResourcePaths<TRootParams>` - an object containing URL path builders for various resource operations:
+
+- `list` - a function to generate the listing URL, supporting query parameters like a result of [getLinkBuilder](#getlinkbuilder).
+- `view` - a function to generate a URL for viewing a specific resource by its id.
+- `create` (optional) - URL string for the creation page, if `withCreation` is enabled.
+- `edit` (optional) - a function to generate a URL for editing a specific resource by its id, if `withEditing` is enabled.
+
+#### Example of usage
+
+```ts
+export class ItemSearchParams {
+  @Expose()
+  public categoryId?: number;
+
+  @Expose()
+  public tags?: Array<string>;
+}
+
+const navigationConfig = {
+  routes: {
+    items: getResourcePaths<ItemSearchParams>('/items', {
+      withCreation: true,
+      withEditing: true,
+    }),
+  },
+};
+
+const allItemsLink = navigationConfig.routes.items.list(); // /items
+const filteredItemsLink = navigationConfig.routes.items.list({
+  // /items?categoryId=1&tags=fiction&tags=newest
+  categoryId: 1,
+  tags: ['fiction', 'newest'],
+});
+const viewLink = navigationConfig.routes.items.view(1); // /items/1
+const creationLink = navigationConfig.routes.items.create; // /items/create
+const editingLink = navigationConfig.routes.items.edit?.(1); // /items/1/edit
+```
+
+### useFilteringSearchParams (web only)
+
+It's a hook, which converts query parameters to and from a specified model for filtering purposes.
+It calls `useSearchParams` from `next/navigation` under the hook.
+Library - `filtering-search-params`
+
+#### Parameters
+
+- `searchParamsConstructor` - a class constructor used to instantiate the type `TParams` from the parsed search parameters.
+
+#### Returns
+
+An object containing:
+
+- `initialSearchParams` - search parameters, instantiated from `searchParamsConstructor`.
+- `setSearchParams` - a function to update the URL with new search parameters, accepting an instance of `TParams`.
+
+#### Example of usage
+
+```ts
+export class ItemSearchParams {
+  @Expose()
+  public categoryId?: number;
+
+  @Expose()
+  public tags?: Array<string>;
+}
+
+// It's necessary to add ItemSearchParams to this union type
+// so that the hook can accept ItemSearchParams
+export type FilteringSearchParams = ItemSearchParams;
+
+const { initialSearchParams, setSearchParams } = useFilteringSearchParams<ItemSearchParams>({
+  searchParamsConstructor: ItemSearchParams,
+});
+
+setSearchParams({ categoryId: 5 });
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronas-it/nx-generators",
-  "version": "0.15.0-alpha.0",
+  "version": "0.15.0-alpha.2",
   "description": "Nx generators for Ronas IT projects",
   "license": "MIT",
   "author": "Ronas IT",
@@ -24,11 +24,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@nx/devkit": "^20.2.2",
+    "@nx/devkit": "^21.2.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "lodash": "^4.17.21",
     "tslib": "^2.6.3",
-    "ts-morph": "^23.0.0"
+    "ts-morph": "^26.0.0"
   },
   "peerDependencies": {
     "typescript": "^5.3.3"

package/src/generators/code-checks/config.d.ts

@@ -5,6 +5,12 @@ declare const _default: {
         '*.{ts,tsx,js}': string;
     };
     tsconfig: {
+        baseUrl: string;
+        rootDir: string;
+        sourceMap: boolean;
+        declaration: boolean;
+        emitDecoratorMetadata: boolean;
+        experimentalDecorators: boolean;
         jsx: string;
         allowJs: boolean;
         noEmit: boolean;
@@ -14,5 +20,6 @@ declare const _default: {
         strictPropertyInitialization: boolean;
         strictNullChecks: boolean;
     };
+    tsConfigExclude: string[];
 };
 export default _default;

package/src/generators/code-checks/config.js

@@ -7,6 +7,12 @@ exports.default = {
         '*.{ts,tsx,js}': 'eslint --cache --fix',
     },
     tsconfig: {
+        baseUrl: '.',
+        rootDir: '.',
+        sourceMap: true,
+        declaration: false,
+        emitDecoratorMetadata: true,
+        experimentalDecorators: true,
         jsx: 'react-native',
         allowJs: true,
         noEmit: true,
@@ -16,5 +22,6 @@ exports.default = {
         strictPropertyInitialization: false,
         strictNullChecks: true,
     },
+    tsConfigExclude: ['**/*.cjs', '**/*.mjs', 'node_modules', 'dist'],
 };
 //# sourceMappingURL=config.js.map

package/src/generators/code-checks/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/code-checks/config.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,aAAa,EAAE;QACb,YAAY,EAAE,+BAA+B;QAC7C,4BAA4B,EAAE,kBAAkB;QAChD,eAAe,EAAE,sBAAsB;KACxC;IACD,QAAQ,EAAE;QACR,GAAG,EAAE,cAAc;QACnB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,IAAI;QACZ,4BAA4B,EAAE,IAAI;QAClC,aAAa,EAAE,IAAI;QACnB,4BAA4B,EAAE,KAAK;QACnC,gBAAgB,EAAE,IAAI;KACvB;CACF,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/code-checks/config.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,aAAa,EAAE;QACb,YAAY,EAAE,+BAA+B;QAC7C,4BAA4B,EAAE,kBAAkB;QAChD,eAAe,EAAE,sBAAsB;KACxC;IACD,QAAQ,EAAE;QACR,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,GAAG;QACZ,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,KAAK;QAClB,qBAAqB,EAAE,IAAI;QAC3B,sBAAsB,EAAE,IAAI;QAC5B,GAAG,EAAE,cAAc;QACnB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,IAAI;QACZ,4BAA4B,EAAE,IAAI;QAClC,aAAa,EAAE,IAAI;QACnB,4BAA4B,EAAE,KAAK;QACnC,gBAAgB,EAAE,IAAI;KACvB;IACD,eAAe,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,CAAC;CAClE,CAAC"}

package/src/generators/code-checks/files/.gitignore.template

@@ -0,0 +1,2 @@
+ios/
+android/

package/src/generators/code-checks/generator.js

@@ -26,12 +26,14 @@ function codeChecksGenerator(tree, options) {
         // Update tsconfig.base.json
         const tsconfigJson = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
         tsconfigJson.compilerOptions = Object.assign(Object.assign({}, config_1.default.tsconfig), tsconfigJson.compilerOptions);
+        tsconfigJson.exclude = [...config_1.default.tsConfigExclude];
         (0, devkit_1.writeJson)(tree, 'tsconfig.base.json', tsconfigJson);
         // Update .gitignore
         const gitignoreContent = ((_a = tree.read('.gitignore')) === null || _a === void 0 ? void 0 : _a.toString()) + '\n.eslintcache\n';
         tree.write('.gitignore', gitignoreContent);
         // Update .prettierignore
-        const prettierignoreContent = ((_b = tree.read('.prettierignore')) === null || _b === void 0 ? void 0 : _b.toString()) + '# Files with custom rules\n**/actions.ts\n**/epics.ts\n**/selectors.ts\n';
+        const prettierignoreContent = ((_b = tree.read('.prettierignore')) === null || _b === void 0 ? void 0 : _b.toString()) +
+            '# Files with custom rules\n**/actions.ts\n**/epics.ts\n**/selectors.ts\n';
         tree.write('.prettierignore', prettierignoreContent);
         // Add files
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), projectRoot, options);

package/src/generators/code-checks/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/code-checks/generator.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,6BAA6B;AAC7B,uCAQoB;AACpB,4DAA4D;AAC5D,qCAA8B;AAE9B,uCAAgC;AAEhC,SAAsB,mBAAmB,CAAC,IAAU,EAAE,OAAkC;;;QACtF,MAAM,WAAW,GAAG,GAAG,CAAC;QAExB,eAAe;QACf,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAE3B,4BAA4B;QAC5B,IAAA,wBAAQ,EAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAExD,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACnD,WAAW,CAAC,aAAa,CAAC,GAAG,gBAAM,CAAC,aAAa,CAAC,CAAC;QACnD,WAAW,CAAC,OAAO,mCAAQ,iBAAO,GAAK,WAAW,CAAC,OAAO,CAAE,CAAC;QAC7D,IAAA,kBAAS,EAAC,IAAI,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;QAE7C,4BAA4B;QAC5B,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;QAC1D,YAAY,CAAC,eAAe,mCAAQ,gBAAM,CAAC,QAAQ,GAAK,YAAY,CAAC,eAAe,CAAE,CAAC;QACvF,IAAA,kBAAS,EAAC,IAAI,EAAE,oBAAoB,EAAE,YAAY,CAAC,CAAC;QAEpD,oBAAoB;QACpB,MAAM,gBAAgB,GAAG,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,0CAAE,QAAQ,EAAE,IAAG,kBAAkB,CAAC;QAClF,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;QAE3C,yBAAyB;QACzB,MAAM,qBAAqB,GAAG,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,0CAAE,QAAQ,EAAE,IAAG,0EAA0E,CAAC;QACpJ,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;QAErD,YAAY;QACZ,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAEzE,iCAAiC;QACjC,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,8BAAe,CAAC,aAAa,CAAC,CAAC,CAAC;QAEvE,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;;CACH;AAzCD,kDAyCC;AAED,kBAAe,mBAAmB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/code-checks/generator.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,6BAA6B;AAC7B,uCAQoB;AACpB,4DAA4D;AAC5D,qCAA8B;AAE9B,uCAAgC;AAEhC,SAAsB,mBAAmB,CAAC,IAAU,EAAE,OAAkC;;;QACtF,MAAM,WAAW,GAAG,GAAG,CAAC;QAExB,eAAe;QACf,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAE3B,4BAA4B;QAC5B,IAAA,wBAAQ,EAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAExD,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACnD,WAAW,CAAC,aAAa,CAAC,GAAG,gBAAM,CAAC,aAAa,CAAC,CAAC;QACnD,WAAW,CAAC,OAAO,mCAAQ,iBAAO,GAAK,WAAW,CAAC,OAAO,CAAE,CAAC;QAC7D,IAAA,kBAAS,EAAC,IAAI,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;QAE7C,4BAA4B;QAC5B,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;QAC1D,YAAY,CAAC,eAAe,mCAAQ,gBAAM,CAAC,QAAQ,GAAK,YAAY,CAAC,eAAe,CAAE,CAAC;QACvF,YAAY,CAAC,OAAO,GAAG,CAAC,GAAG,gBAAM,CAAC,eAAe,CAAC,CAAC;QACnD,IAAA,kBAAS,EAAC,IAAI,EAAE,oBAAoB,EAAE,YAAY,CAAC,CAAC;QAEpD,oBAAoB;QACpB,MAAM,gBAAgB,GAAG,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,0CAAE,QAAQ,EAAE,IAAG,kBAAkB,CAAC;QAClF,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;QAE3C,yBAAyB;QACzB,MAAM,qBAAqB,GACzB,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,0CAAE,QAAQ,EAAE;YACxC,0EAA0E,CAAC;QAC7E,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;QAErD,YAAY;QACZ,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAEzE,iCAAiC;QACjC,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,8BAAe,CAAC,aAAa,CAAC,CAAC,CAAC;QAEvE,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;;CACH;AA5CD,kDA4CC;AAED,kBAAe,mBAAmB,CAAC"}

package/src/generators/expo-app/app-files/app/_layout.tsx.template

@@ -1,5 +1,5 @@
 <% if(isStoreEnabled) { %> import { store } from '<%= libPath %>/shared/data-access/store';<% } %>
-import { setLanguage } from '@ronas-it/react-native-common-modules';
+import { setLanguage } from '@ronas-it/react-native-common-modules/src/utils/i18n';
 <% if(isUIKittenEnabled) { %>
 import { UserThemeProvider } from '<%= libPath %>/shared/features/user-theme-provider';
 <% } %>

package/src/generators/expo-app/app-files/app.config.ts.template

@@ -1,5 +1,4 @@
-import { ExpoConfig } from '@expo/config';
-import { EASConfig } from 'expo-constants/build/Constants.types';
+import { EASConfig, ExpoConfig } from '@expo/config';
 
 const createConfig = (): Omit<ExpoConfig, 'extra'> & { extra: { eas: EASConfig } & typeof extra } => {
   const projectId = '';
@@ -40,6 +39,7 @@ const createConfig = (): Omit<ExpoConfig, 'extra'> & { extra: { eas: EASConfig }
         foregroundImage: './assets/adaptive-icon.png',
         backgroundColor: '#FFFFFF',
       },
+      edgeToEdgeEnabled: true
     },
     plugins: ['expo-router'],
     newArchEnabled: true,

package/src/generators/expo-app/generator.js

@@ -76,6 +76,8 @@ function expoAppGenerator(tree, options) {
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'app-files'), appRoot, Object.assign(Object.assign({}, options), { formatName: utils_1.formatName,
             formatAppIdentifier: utils_1.formatAppIdentifier,
             libPath, isUIKittenEnabled: options.withUIKitten, isStoreEnabled: options.withStore, appDirectory: options.directory }));
+        // Remove unnecessary tsconfig.app.json file
+        tree.delete(`${appRoot}/tsconfig.app.json`);
         (0, utils_1.addNxAppTag)(tree, options.directory);
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'i18n'), i18nRoot, {});
         // Add dependencies

package/src/generators/expo-app/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/expo-app/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/expo-app/generator.ts"],"names":[],"mappings":"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"}

package/src/generators/expo-app/scripts.d.ts

@@ -9,5 +9,7 @@ declare const _default: {
     'update:prod': string;
     'submit:dev': string;
     'submit:prod': string;
+    android: string;
+    ios: string;
 };
 export default _default;

package/src/generators/expo-app/scripts.js

@@ -11,5 +11,7 @@ exports.default = {
     'update:prod': 'cross-env EXPO_PUBLIC_APP_ENV=production eas update --branch production',
     'submit:dev': 'cross-env EXPO_PUBLIC_APP_ENV=development eas submit --no-wait --profile=development',
     'submit:prod': 'cross-env EXPO_PUBLIC_APP_ENV=production eas submit --no-wait --profile=production',
+    android: 'npx expo run:android',
+    ios: 'npx expo run:ios',
 };
 //# sourceMappingURL=scripts.js.map

package/src/generators/expo-app/scripts.js.map

@@ -1 +1 @@
-{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/expo-app/scripts.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,KAAK,EAAE,0DAA0D;IACjE,YAAY,EAAE,yDAAyD;IACvE,WAAW,EAAE,kDAAkD;IAC/D,gBAAgB,EAAE,yCAAyC;IAC3D,aAAa,EAAE,sCAAsC;IACrD,YAAY,EAAE,2CAA2C;IACzD,YAAY,EAAE,2EAA2E;IACzF,aAAa,EAAE,yEAAyE;IACxF,YAAY,EAAE,sFAAsF;IACpG,aAAa,EAAE,oFAAoF;CACpG,CAAC"}
+{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/expo-app/scripts.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,KAAK,EAAE,0DAA0D;IACjE,YAAY,EAAE,yDAAyD;IACvE,WAAW,EAAE,kDAAkD;IAC/D,gBAAgB,EAAE,yCAAyC;IAC3D,aAAa,EAAE,sCAAsC;IACrD,YAAY,EAAE,2CAA2C;IACzD,YAAY,EAAE,2EAA2E;IACzF,aAAa,EAAE,yEAAyE;IACxF,YAAY,EAAE,sFAAsF;IACpG,aAAa,EAAE,oFAAoF;IACnG,OAAO,EAAE,sBAAsB;IAC/B,GAAG,EAAE,kBAAkB;CACxB,CAAC"}

package/src/generators/react-component/files/component.tsx.template

@@ -1,17 +1,18 @@
-import React, { <% if(withForwardRef) { %>forwardRef, ForwardedRef, <% } %>Fragment, ReactElement } from 'react';
+import React, {<% if (withForwardRef) { %> useRefCallback,<% } %> Fragment, ReactElement} from 'react';
 
 interface <%= name %>Props {
   // TODO: Describe props
+  <% if (withForwardRef) { %>
+  forwardedRef?: React.Ref<any>;
+  <% } %>
 }
 
-<% if(withForwardRef) { %>
-export const <%= name %> = forwardRef(function Component(
-  props: <%= name %>Props,
-  ref: ForwardedRef<>, // TODO: add ref type
-): ReactElement {
+<% if (withForwardRef) { %>
+export function <%= name %>(props: <%= name %>Props): ReactElement {
+  const refCallback = useRefCallback(props.forwardedRef);
   // TODO: Implement component
-  return <Fragment />;
-});
+  return <Fragment ref={refCallback} />;
+}
 <% } else { %>
 export function <%= name %>(props: <%= name %>Props): ReactElement {
   // TODO: Implement component

package/src/generators/react-lib/files/lib/component.tsx.template

@@ -1,20 +1,17 @@
-import React, { <% if(withComponentForwardRef) { %>forwardRef, ForwardedRef, <% } %>Fragment, ReactElement } from 'react';
+import React, {<% if (withComponentForwardRef) { %>useRefCallback,<% } %> Fragment, ReactElement} from 'react';
 
 interface <%= name %>Props {
   // TODO: Describe props
+  <% if (withComponentForwardRef) { %>
+  forwardedRef?: React.Ref<any>;
+  <% } %>
 }
 
-<% if(withComponentForwardRef) { %>
-export const <%= name %> = forwardRef(function Component(
-  props: <%= name %>Props,
-  ref: ForwardedRef<>, // TODO: add ref type
-): ReactElement {
-  // TODO: Implement component
-  return <Fragment />;
-});
-<% } else { %>
 export function <%= name %>(props: <%= name %>Props): ReactElement {
+  <% if (withComponentForwardRef) { %>
+  const refCallback = useRefCallback(props.forwardedRef);
+  <% } %>
+
   // TODO: Implement component
-  return <Fragment />;
+  return <Fragment <% if (withComponentForwardRef) { %>ref={refCallback}<% } %> />;
 }
-<% } %>

package/src/generators/react-lib/generator.js

@@ -23,8 +23,7 @@ function reactLibGenerator(tree, options) {
                 limit: Object.values(utils_1.LibraryType).length,
                 choices: Object.values(utils_1.LibraryType),
             }).run();
-        options.name =
-            options.name || (yield (0, utils_1.askQuestion)('Enter the name of the library (e.g: settings): '));
+        options.name = options.name || (yield (0, utils_1.askQuestion)('Enter the name of the library (e.g: settings): '));
         if ([utils_1.LibraryType.FEATURES, utils_1.LibraryType.UI].includes(options.type) &&
             !(0, lodash_1.isBoolean)(options.withComponent)) {
             options.withComponent = yield (0, utils_1.confirm)('Generate component inside lib folder?');
@@ -46,8 +45,10 @@ function reactLibGenerator(tree, options) {
         if (options.withComponent) {
             const srcPath = `${libPath}/src`;
             (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), srcPath, Object.assign(Object.assign({}, options), { name: (0, utils_1.formatName)(options.name, true) }));
-            tree.write(`${srcPath}/index.ts`, 'export * from \'./lib\';');
+            tree.write(`${srcPath}/index.ts`, "export * from './lib';");
         }
+        //Remove unnecessary tsconfig.lib.json
+        tree.delete(`${libPath}/tsconfig.lib.json`);
         (0, utils_1.addNxScopeTag)(tree, scopeTag);
         yield (0, devkit_1.formatFiles)(tree);
         if (libDirectoryName !== options.name) {

package/src/generators/react-lib/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/react-lib/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/react-lib/generator.ts"],"names":[],"mappings":"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"}

package/src/shared/dependencies.d.ts

@@ -19,6 +19,7 @@ export declare const dependencies: {
     'next-app': {
         'next-intl': string;
         'lodash-es': string;
+        'class-transformer': string;
     };
     'api-client': {
         '@ronas-it/axios-api-client': string;

package/src/shared/dependencies.js

@@ -3,76 +3,75 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.devDependencies = exports.dependencies = void 0;
 exports.dependencies = {
     'expo-app': {
-        '@ronas-it/react-native-common-modules': '^0.6.2',
+        '@ronas-it/react-native-common-modules': '^1.0.0',
         'react-native-mmkv': '^3.2.0',
-        'expo-constants': '~17.0.3',
-        'expo-dev-client': '^5.0.6',
-        'expo-router': '~4.0.14',
-        'react-native-safe-area-context': '^4.12.0',
-        'react-native-screens': '~4.4.0',
-        'expo-linking': '~7.0.3',
-        'expo-status-bar': '^2.0.0',
-        'expo-updates': '^0.26.10',
-        'expo-insights': '~0.8.1',
+        'expo-constants': '17.1.6',
+        'expo-dev-client': '^5.2.0',
+        'expo-router': '~5.1.0',
+        'react-native-safe-area-context': '^5.4.0',
+        'react-native-screens': '~4.11.1',
+        'expo-linking': '~7.1.5',
+        'expo-status-bar': '^2.2.3',
+        'expo-updates': '^0.28.14',
+        'expo-insights': '~0.9.3',
         'lodash-es': '^4.17.21',
     },
     'expo-app-root': {
-        // Need new version to fix this error:
-        // https://github.com/kristerkari/react-native-svg-transformer/issues/329
-        'react-native-svg-transformer': '^1.4.0',
+        'react-native-svg-transformer': '^1.5.1',
     },
     'next-app': {
-        'next-intl': '^3.26.3',
+        'next-intl': '^4.1.0',
         'lodash-es': '^4.17.21',
+        'class-transformer': '^0.5.1',
     },
     'api-client': {
-        '@ronas-it/axios-api-client': '^0.1.0',
+        '@ronas-it/axios-api-client': '^0.1.2',
     },
     auth: {
-        luxon: '^3.4.4',
+        luxon: '^3.6.1',
     },
     'rn-styles': {
         'react-native-extended-stylesheet': '^0.12.0',
     },
     store: {
-        '@ronas-it/rtkq-entity-api': '^0.4.3',
-        'react-redux': '^9.1.2',
+        '@ronas-it/rtkq-entity-api': '^0.4.11',
+        'react-redux': '^9.2.0',
     },
     'ui-kitten': {
         '@eva-design/eva': '^2.2.0',
         '@ui-kitten/components': '^5.3.1',
     },
     form: {
-        '@hookform/resolvers': '^3.9.0',
-        'react-hook-form': '^7.53.0',
-        yup: '^1.4.0',
+        '@hookform/resolvers': '^5.1.1',
+        'react-hook-form': '^7.57.0',
+        yup: '^1.6.1',
     },
     sentry: {
         expo: {
-            '@sentry/react-native': '~6.6.0',
+            '@sentry/react-native': '~6.14.0',
         },
         next: {
-            '@sentry/nextjs': '^8.54.0',
+            '@sentry/nextjs': '^9.28.1',
         },
     },
 };
 exports.devDependencies = {
     'code-checks': {
-        '@eslint/compat': '^1.2.6',
-        '@eslint/eslintrc': '^3.2.0',
-        eslint: '^9.8.0',
-        prettier: '^3.3.2',
-        'eslint-config-prettier': '^9.1.0',
-        'eslint-import-resolver-typescript': '^3.7.0',
-        'eslint-plugin-import': '^2.29.1',
-        'eslint-plugin-jsx-a11y': '^6.9.0',
-        'eslint-plugin-react': '^7.34.3',
-        'eslint-plugin-react-hooks': '^5.0.0',
+        '@eslint/compat': '^1.3.0',
+        '@eslint/eslintrc': '^3.3.1',
+        eslint: '^9.28.0',
+        prettier: '^3.5.3',
+        'eslint-config-prettier': '^10.1.5',
+        'eslint-import-resolver-typescript': '^4.4.3',
+        'eslint-plugin-import': '^2.31.0',
+        'eslint-plugin-jsx-a11y': '^6.10.2',
+        'eslint-plugin-react': '^7.37.5',
+        'eslint-plugin-react-hooks': '^5.2.0',
         'eslint-plugin-unused-imports': '^4.1.4',
-        husky: '^9.1.5',
-        '@stylistic/eslint-plugin': '^2.12.1',
-        '@typescript-eslint/eslint-plugin': '^8.18.1',
-        '@typescript-eslint/parser': '^8.18.1',
+        husky: '^9.1.7',
+        '@stylistic/eslint-plugin': '^4.4.1',
+        '@typescript-eslint/eslint-plugin': '^8.34.0',
+        '@typescript-eslint/parser': '^8.34.0',
         'tsc-files': '^1.1.4',
     },
     'expo-app': {
@@ -83,14 +82,14 @@ exports.devDependencies = {
     },
     'next-app': {
         // nx/next 20 adds package that doesn't support eslint 9
-        'eslint-config-next': '^15.1.6',
+        'eslint-config-next': '^15.3.3',
         '@types/lodash-es': '^4.17.12',
     },
     'repo-config': {
-        syncpack: '^12.3.2',
+        syncpack: '^13.0.4',
     },
     auth: {
-        '@types/luxon': '3.4.2',
+        '@types/luxon': '3.6.2',
     },
 };
 //# sourceMappingURL=dependencies.js.map

package/src/shared/dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../plugin/src/shared/dependencies.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG;IAC1B,UAAU,EAAE;QACV,uCAAuC,EAAE,QAAQ;QACjD,mBAAmB,EAAE,QAAQ;QAC7B,gBAAgB,EAAE,SAAS;QAC3B,iBAAiB,EAAE,QAAQ;QAC3B,aAAa,EAAE,SAAS;QACxB,gCAAgC,EAAE,SAAS;QAC3C,sBAAsB,EAAE,QAAQ;QAChC,cAAc,EAAE,QAAQ;QACxB,iBAAiB,EAAE,QAAQ;QAC3B,cAAc,EAAE,UAAU;QAC1B,eAAe,EAAE,QAAQ;QACzB,WAAW,EAAE,UAAU;KACxB;IACD,eAAe,EAAE;QACf,sCAAsC;QACtC,yEAAyE;QACzE,8BAA8B,EAAE,QAAQ;KACzC;IACD,UAAU,EAAE;QACV,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,UAAU;KACxB;IACD,YAAY,EAAE;QACZ,4BAA4B,EAAE,QAAQ;KACvC;IACD,IAAI,EAAE;QACJ,KAAK,EAAE,QAAQ;KAChB;IACD,WAAW,EAAE;QACX,kCAAkC,EAAE,SAAS;KAC9C;IACD,KAAK,EAAE;QACL,2BAA2B,EAAE,QAAQ;QACrC,aAAa,EAAE,QAAQ;KACxB;IACD,WAAW,EAAE;QACX,iBAAiB,EAAE,QAAQ;QAC3B,uBAAuB,EAAE,QAAQ;KAClC;IACD,IAAI,EAAE;QACJ,qBAAqB,EAAE,QAAQ;QAC/B,iBAAiB,EAAE,SAAS;QAC5B,GAAG,EAAE,QAAQ;KACd;IACD,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,sBAAsB,EAAE,QAAQ;SACjC;QACD,IAAI,EAAE;YACJ,gBAAgB,EAAE,SAAS;SAC5B;KACF;CACF,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,aAAa,EAAE;QACb,gBAAgB,EAAE,QAAQ;QAC1B,kBAAkB,EAAE,QAAQ;QAC5B,MAAM,EAAE,QAAQ;QAChB,QAAQ,EAAE,QAAQ;QAClB,wBAAwB,EAAE,QAAQ;QAClC,mCAAmC,EAAE,QAAQ;QAC7C,sBAAsB,EAAE,SAAS;QACjC,wBAAwB,EAAE,QAAQ;QAClC,qBAAqB,EAAE,SAAS;QAChC,2BAA2B,EAAE,QAAQ;QACrC,8BAA8B,EAAE,QAAQ;QACxC,KAAK,EAAE,QAAQ;QACf,0BAA0B,EAAE,SAAS;QACrC,kCAAkC,EAAE,SAAS;QAC7C,2BAA2B,EAAE,SAAS;QACtC,WAAW,EAAE,QAAQ;KACtB;IACD,UAAU,EAAE;QACV,kBAAkB,EAAE,UAAU;KAC/B;IACD,eAAe,EAAE;QACf,WAAW,EAAE,QAAQ;KACtB;IACD,UAAU,EAAE;QACV,wDAAwD;QACxD,oBAAoB,EAAE,SAAS;QAC/B,kBAAkB,EAAE,UAAU;KAC/B;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,SAAS;KACpB;IACD,IAAI,EAAE;QACJ,cAAc,EAAE,OAAO;KACxB;CACF,CAAC"}
+{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../plugin/src/shared/dependencies.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG;IAC1B,UAAU,EAAE;QACV,uCAAuC,EAAE,QAAQ;QACjD,mBAAmB,EAAE,QAAQ;QAC7B,gBAAgB,EAAE,QAAQ;QAC1B,iBAAiB,EAAE,QAAQ;QAC3B,aAAa,EAAE,QAAQ;QACvB,gCAAgC,EAAE,QAAQ;QAC1C,sBAAsB,EAAE,SAAS;QACjC,cAAc,EAAE,QAAQ;QACxB,iBAAiB,EAAE,QAAQ;QAC3B,cAAc,EAAE,UAAU;QAC1B,eAAe,EAAE,QAAQ;QACzB,WAAW,EAAE,UAAU;KACxB;IACD,eAAe,EAAE;QACf,8BAA8B,EAAE,QAAQ;KACzC;IACD,UAAU,EAAE;QACV,WAAW,EAAE,QAAQ;QACrB,WAAW,EAAE,UAAU;QACvB,mBAAmB,EAAE,QAAQ;KAC9B;IACD,YAAY,EAAE;QACZ,4BAA4B,EAAE,QAAQ;KACvC;IACD,IAAI,EAAE;QACJ,KAAK,EAAE,QAAQ;KAChB;IACD,WAAW,EAAE;QACX,kCAAkC,EAAE,SAAS;KAC9C;IACD,KAAK,EAAE;QACL,2BAA2B,EAAE,SAAS;QACtC,aAAa,EAAE,QAAQ;KACxB;IACD,WAAW,EAAE;QACX,iBAAiB,EAAE,QAAQ;QAC3B,uBAAuB,EAAE,QAAQ;KAClC;IACD,IAAI,EAAE;QACJ,qBAAqB,EAAE,QAAQ;QAC/B,iBAAiB,EAAE,SAAS;QAC5B,GAAG,EAAE,QAAQ;KACd;IACD,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,sBAAsB,EAAE,SAAS;SAClC;QACD,IAAI,EAAE;YACJ,gBAAgB,EAAE,SAAS;SAC5B;KACF;CACF,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,aAAa,EAAE;QACb,gBAAgB,EAAE,QAAQ;QAC1B,kBAAkB,EAAE,QAAQ;QAC5B,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,QAAQ;QAClB,wBAAwB,EAAE,SAAS;QACnC,mCAAmC,EAAE,QAAQ;QAC7C,sBAAsB,EAAE,SAAS;QACjC,wBAAwB,EAAE,SAAS;QACnC,qBAAqB,EAAE,SAAS;QAChC,2BAA2B,EAAE,QAAQ;QACrC,8BAA8B,EAAE,QAAQ;QACxC,KAAK,EAAE,QAAQ;QACf,0BAA0B,EAAE,QAAQ;QACpC,kCAAkC,EAAE,SAAS;QAC7C,2BAA2B,EAAE,SAAS;QACtC,WAAW,EAAE,QAAQ;KACtB;IACD,UAAU,EAAE;QACV,kBAAkB,EAAE,UAAU;KAC/B;IACD,eAAe,EAAE;QACf,WAAW,EAAE,QAAQ;KACtB;IACD,UAAU,EAAE;QACV,wDAAwD;QACxD,oBAAoB,EAAE,SAAS;QAC/B,kBAAkB,EAAE,UAAU;KAC/B;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,SAAS;KACpB;IACD,IAAI,EAAE;QACJ,cAAc,EAAE,OAAO;KACxB;CACF,CAAC"}

package/src/shared/generators/auth/lib-files/shared/data-access/api/src/lib/auth/api.ts.template

@@ -23,7 +23,7 @@ export const authApi = createAppApi({
           data: request,
         };
       },
-      transformResponse: (response) => plainToInstance(LogInResponse, response),
+      transformResponse: (response: object) => plainToInstance(LogInResponse, response),
       transformErrorResponse: (response) => ({ ...response, skipToast: true }),
     }),
     register: builder.mutation<LogInResponse, RegisterRequest>({
@@ -36,7 +36,7 @@ export const authApi = createAppApi({
           data: request,
         };
       },
-      transformResponse: (response) => plainToInstance(LogInResponse, response),
+      transformResponse: (response: object) => plainToInstance(LogInResponse, response),
       transformErrorResponse: (response) => ({ ...response, skipToast: true }),
     }),
     refreshToken: builder.mutation<RefreshTokenResponse, void>({

package/src/shared/generators/auth/lib-files/shared/data-access/api/src/lib/profile/api.ts.template

@@ -24,7 +24,7 @@ export const profileApi = createAppApi({
           params,
         };
       },
-      transformResponse: (response) => plainToInstance(User, response),
+      transformResponse: (response: object) => plainToInstance(User, response),
       providesTags: [ProfileApiTag.PROFILE],
     }),
     updateProfile: builder.mutation<void, User>({

package/src/shared/generators/navigation-utils/{next-app-lib-files/shared/utils/navigation → filtering-search-params-lib-files/shared/utils/filtering-search-params}/src/lib/hooks/use-filtering-search-params.ts.template

@@ -8,7 +8,7 @@ interface FilteringSearchParamsConfig<TParams> {
 }
 
 export const useFilteringSearchParams = <TParams extends FilteringSearchParams>({
-  searchParamsConstructor
+  searchParamsConstructor,
 }: FilteringSearchParamsConfig<TParams>): typeof result => {
   const initialParams = useRef<TParams | null>(null);
   const searchParams = useSearchParams();
@@ -18,16 +18,30 @@ export const useFilteringSearchParams = <TParams extends FilteringSearchParams>(
   const getSearchParams = useCallback((): TParams => {
     const initialParams = {} as Record<string, any>;
     searchParams.forEach((value, key) => {
+      let parsedValue: any;
+
       try {
-        initialParams[key] = JSON.parse(value);
+        parsedValue = JSON.parse(value);
       } catch {
-        initialParams[key] = value;
+        parsedValue = value;
+      }
+
+      if (key in initialParams) {
+        if (Array.isArray(initialParams[key])) {
+          if (!initialParams[key].includes(parsedValue)) {
+            initialParams[key].push(parsedValue);
+          }
+        } else {
+          initialParams[key] = [...new Set([initialParams[key], parsedValue])];
+        }
+      } else {
+        initialParams[key] = parsedValue;
       }
     });
 
     return plainToInstance(searchParamsConstructor, initialParams, {
       excludeExtraneousValues: true,
-      exposeUnsetFields: false
+      exposeUnsetFields: false,
     });
   }, [searchParams]);
 
@@ -39,8 +53,15 @@ export const useFilteringSearchParams = <TParams extends FilteringSearchParams>(
       Object.keys(plainParams).forEach((field) => {
         const value = plainParams[field];
 
-        if (value !== null && value !== undefined && !(Array.isArray(value) && value.length === 0)) {
-          newSearchParams.set(field, JSON.stringify(value));
+        if (value !== null && value !== undefined) {
+          if (Array.isArray(value)) {
+            const uniqueValues = new Set(value);
+            uniqueValues.forEach((item) => {
+              newSearchParams.append(field, JSON.stringify(item));
+            });
+          } else {
+            newSearchParams.set(field, JSON.stringify(value));
+          }
         }
       });
 
@@ -54,7 +75,7 @@ export const useFilteringSearchParams = <TParams extends FilteringSearchParams>(
 
   const result = {
     initialSearchParams: initialParams.current,
-    setSearchParams
+    setSearchParams,
   };
 
   return result;

package/src/shared/generators/navigation-utils/filtering-search-params-lib-files/shared/utils/filtering-search-params/src/lib/index.ts.template

@@ -0,0 +1,2 @@
+export * from './hooks';
+export * from './types';

package/src/shared/generators/navigation-utils/generator.js

@@ -2,27 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runNavigationUtilsGenerator = void 0;
 const tslib_1 = require("tslib");
-const child_process_1 = require("child_process");
-const path = require("path");
-const devkit_1 = require("@nx/devkit");
 const enums_1 = require("../../enums");
-const utils_1 = require("../../utils");
+const utils_1 = require("./utils");
 function runNavigationUtilsGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const libRoot = `libs/${options.appDirectory}`;
-        // Generate shared libs
-        (0, child_process_1.execSync)(`npx nx g react-lib --app=${options.appDirectory} --scope=shared --type=utils --name=navigation`, {
-            stdio: 'inherit',
-        });
-        // Remove unnecessary files and files that will be replaced
-        const libPath = `${libRoot}/shared/utils/navigation/src`;
-        tree.delete(`${libPath}/index.ts`);
-        // Add lib files
-        (0, devkit_1.generateFiles)(tree, path.join(__dirname, '/common-lib-files'), libRoot, {});
-        if (options.baseGeneratorType === enums_1.BaseGeneratorType.NEXT_APP) {
-            (0, devkit_1.generateFiles)(tree, path.join(__dirname, '/next-app-lib-files'), libRoot, {});
-            const newIndexContent = `export * from './hooks';\nexport * from './types';`;
-            (0, utils_1.appendFileContent)(`${libPath}/lib/index.ts`, newIndexContent, tree);
+        const { appDirectory, baseGeneratorType } = options;
+        (0, utils_1.setupLib)(tree, appDirectory, 'navigation');
+        if (baseGeneratorType === enums_1.BaseGeneratorType.NEXT_APP) {
+            (0, utils_1.setupLib)(tree, appDirectory, 'filtering-search-params');
         }
     });
 }

package/src/shared/generators/navigation-utils/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../plugin/src/shared/generators/navigation-utils/generator.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,6BAA6B;AAC7B,uCAAiD;AACjD,uCAAgD;AAChD,uCAAgD;AAGhD,SAAsB,2BAA2B,CAAC,IAAU,EAAE,OAAuC;;QACnG,MAAM,OAAO,GAAG,QAAQ,OAAO,CAAC,YAAY,EAAE,CAAC;QAE/C,uBAAuB;QACvB,IAAA,wBAAQ,EAAC,4BAA4B,OAAO,CAAC,YAAY,gDAAgD,EAAE;YACzG,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QAEH,2DAA2D;QAC3D,MAAM,OAAO,GAAG,GAAG,OAAO,8BAA8B,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,WAAW,CAAC,CAAC;QAEnC,gBAAgB;QAChB,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QAE5E,IAAI,OAAO,CAAC,iBAAiB,KAAK,yBAAiB,CAAC,QAAQ,EAAE,CAAC;YAC7D,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;YAE9E,MAAM,eAAe,GAAG,oDAAoD,CAAC;YAC7E,IAAA,yBAAiB,EAAC,GAAG,OAAO,eAAe,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;CAAA;AArBD,kEAqBC;AAED,kBAAe,2BAA2B,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../plugin/src/shared/generators/navigation-utils/generator.ts"],"names":[],"mappings":";;;;AACA,uCAAgD;AAEhD,mCAAmC;AAEnC,SAAsB,2BAA2B,CAAC,IAAU,EAAE,OAAuC;;QACnG,MAAM,EAAE,YAAY,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;QAEpD,IAAA,gBAAQ,EAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;QAE3C,IAAI,iBAAiB,KAAK,yBAAiB,CAAC,QAAQ,EAAE,CAAC;YACrD,IAAA,gBAAQ,EAAC,IAAI,EAAE,YAAY,EAAE,yBAAyB,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;CAAA;AARD,kEAQC;AAED,kBAAe,2BAA2B,CAAC"}

package/src/shared/generators/navigation-utils/navigation-lib-files/shared/utils/navigation/src/index.ts.template

@@ -0,0 +1 @@
+export * from './lib';

package/src/shared/generators/navigation-utils/utils/index.d.ts

@@ -0,0 +1 @@
+export * from './setup-lib';

package/src/shared/generators/navigation-utils/utils/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./setup-lib"), exports);
+//# sourceMappingURL=index.js.map

package/src/shared/generators/navigation-utils/utils/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../plugin/src/shared/generators/navigation-utils/utils/index.ts"],"names":[],"mappings":";;;AAAA,sDAA4B"}

package/src/shared/generators/navigation-utils/utils/setup-lib.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function setupLib(tree: Tree, appDirectory: string, libName: string): void;

package/src/shared/generators/navigation-utils/utils/setup-lib.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupLib = void 0;
+const child_process_1 = require("child_process");
+const path = require("path");
+const devkit_1 = require("@nx/devkit");
+function setupLib(tree, appDirectory, libName) {
+    (0, child_process_1.execSync)(`npx nx g react-lib --app=${appDirectory} --scope=shared --type=utils --name=${libName}`, {
+        stdio: 'inherit',
+    });
+    const libRoot = `libs/${appDirectory}`;
+    const libPath = `${libRoot}/shared/utils/${libName}/src`;
+    tree.delete(`${libPath}/index.ts`);
+    (0, devkit_1.generateFiles)(tree, path.join(__dirname, `../${libName}-lib-files`), libRoot, {});
+}
+exports.setupLib = setupLib;
+//# sourceMappingURL=setup-lib.js.map

package/src/shared/generators/navigation-utils/utils/setup-lib.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-lib.js","sourceRoot":"","sources":["../../../../../../../plugin/src/shared/generators/navigation-utils/utils/setup-lib.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,6BAA6B;AAC7B,uCAAiD;AAEjD,SAAgB,QAAQ,CAAC,IAAU,EAAE,YAAoB,EAAE,OAAe;IACxE,IAAA,wBAAQ,EAAC,4BAA4B,YAAY,uCAAuC,OAAO,EAAE,EAAE;QACjG,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,QAAQ,YAAY,EAAE,CAAC;IACvC,MAAM,OAAO,GAAG,GAAG,OAAO,iBAAiB,OAAO,MAAM,CAAC;IACzD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,WAAW,CAAC,CAAC;IAEnC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,OAAO,YAAY,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;AACpF,CAAC;AAVD,4BAUC"}

package/src/shared/generators/store/expo-app/lib-files/shared/data-access/store/src/store.ts.template

@@ -1,5 +1,5 @@
 import { Middleware, Reducer } from '@reduxjs/toolkit';
-import { setupReactotron } from '@ronas-it/react-native-common-modules';
+import { setupReactotron } from '@ronas-it/react-native-common-modules/src/data-access/store/utils/reactotron/builder';
 import {
   AppStateFromRootReducer,
   createStoreInitializer,

package/src/shared/generators/ui-kitten/lib-files/shared/ui/styles/src/lib/create-adaptive-styles.ts.template

@@ -23,7 +23,7 @@ export const isTablet = screenWidth <= ViewPortWidthBreakpoints.TABLET;
 
 export function createAdaptiveStyles<T extends EStyleSet = EStyleSet>(
   stylesOrGetter: EStyleSet<T> | ((theme: Theme) => T),
-): typeof useAdaptiveStyles {
+): (theme?: Theme) => StyleSet<T> {
   const useAdaptiveStyles = (theme?: Theme): StyleSet<T> => {
     const { width } = useWindowDimensions();
     const appTheme = useAppTheme();
@@ -36,4 +36,3 @@ export function createAdaptiveStyles<T extends EStyleSet = EStyleSet>(
 
   return useAdaptiveStyles;
 }
-

package/src/shared/generators/ui-kitten/schema.json

@@ -14,5 +14,5 @@
       "x-prompt": "Enter the name of the directory in the 'apps/' folder"
     }
   },
-  "required": ["name", "directory"]
+  "required": ["directory"]
 }