firstly 0.0.11 → 0.0.13

package/esm/bin/cmd.js

@@ -47,14 +47,12 @@ function mergeAndSort(deps, depsToAdd) {
     return sorted;
 }
 pkg.devDependencies = mergeAndSort(pkg.devDependencies, {
-    '@kitql/eslint-config': '0.3.7',
-    '@kitql/helpers': '0.8.10',
+    '@kitql/eslint-config': '0.5.8',
+    '@kitql/helpers': '0.8.12',
     pg: '8.12.0',
     remult: versionFirstly,
 });
-pkg.dependencies = mergeAndSort(pkg.dependencies, {
-    oslo: '^1.2.1',
-});
+pkg.dependencies = mergeAndSort(pkg.dependencies, {});
 pkg.scripts = {
     ...pkg.scripts,
     '//// ---- BEST PRACTICES ---- ////': '',
@@ -65,14 +63,26 @@ if (res.includes('all') || res.includes('dependencies')) {
     write('./package.json', [JSON.stringify(pkg, null, 2)]);
 }
 const obj = {
-    './.eslintrc.cjs': [
-        `module.exports = {
-  extends: ['@kitql'],
-  rules: {
-    // Your overrides here
-  }
-}
-  `,
+    './.npmrc': [
+        `engine-strict=true
+
+public-hoist-pattern[]=*eslint*
+public-hoist-pattern[]=*prettier*
+public-hoist-pattern[]=*globals*
+`,
+    ],
+    './eslint.config.js': [
+        `import { kitql } from '@kitql/eslint-config'
+
+/** @type { import("eslint").Linter.Config[] } */
+export default [
+	...kitql({ pnpmCatalogs: { enable: false } }),
+	{
+		name: 'APP:ignores',
+		ignores: ['**/*.svelte.ts'],
+	},
+]
+`,
     ],
     './.prettierignore': [
         `node_modules/
@@ -96,16 +106,14 @@ db/
 src/lib/ROUTES.ts
   `,
     ],
-    './.prettierrc.cjs': [
-        `const {
-  //plugins,
-  ...prettierConfig
-} = require('@kitql/eslint-config/.prettierrc.cjs')
-
-module.exports = {
-  ...prettierConfig,
+    './.prettierrc.mjs': [
+        `import { kitql } from '@kitql/eslint-config/.prettierrc.mjs'
+
+export default {
+	...kitql(),
   // Your overrides here
-}`,
+}
+`,
     ],
     '.env.example': [
         `# Enable some roles
@@ -119,9 +127,9 @@ module.exports = {
     ],
     './src/lib/firstly/index.ts': [
         `import { FF_Role } from 'firstly'
-import { firstly } from 'firstly/api'
-import { auth } from 'firstly/auth'
-import { changeLog } from 'firstly/changeLog'
+import { firstly, Module } from 'firstly/api'
+import { auth } from 'firstly/auth/server'
+import { changeLog } from 'firstly/changeLog/server'
 import { Log } from '@kitql/helpers'
 
 import { task } from './modules/task'
@@ -157,8 +165,8 @@ export const api = firstly({
       providers: {
         demo: [
           { name: 'Ermin' },
-          { name: 'JYC', roles: [FF_Role.Admin] },
-          { name: 'Noam', roles: [FF_Role.Admin, Role.Boss] },
+          { name: 'JYC', roles: [FF_Role.FF_Role_Admin] },
+          { name: 'Noam', roles: [FF_Role.FF_Role_Admin, Role.Boss] },
         ],
 
         // password: {},
@@ -170,7 +178,7 @@ export const api = firstly({
           // To enable OAuth via Github
           // Instructions by hovering the method \`github\`
           // NEEDS ON TOP OF THE FILE: 
-          //   import { github } from 'firstly/auth/providers'
+          //   import { github } from 'firstly/auth/server'
           //----------------------------------------
           // github(),
         ],
@@ -185,14 +193,14 @@ export const api = firstly({
     //----------------------------------------
     // example of a userland inline module
     //----------------------------------------
-    {
+    new Module({
       name: 'app',
       entities: [],
       controllers: [],
       initApi: async () => {
         log.success('App is ready! 🚀')
       },
-    },
+    }),
 
     //----------------------------------------
     // Replace @Entity by @FF_Entity in your entities to enable changeLog on this entity
@@ -204,24 +212,50 @@ export const api = firstly({
     ],
     './src/hooks.server.ts': [
         `import { sequence } from '@sveltejs/kit/hooks'
-
-import { firstly } from 'firstly/handle'
-
-import { api } from '${libAlias}/firstly'
-
-export const handle = sequence(firstly(api))
+import { redirect } from '@sveltejs/kit'
+
+import { handleAuth, handleGuard } from 'firstly/auth/server'
+import { api as handleRemult } from '${libAlias}/firstly'
+import { route } from '${libAlias}/ROUTES'
+
+export const handle = sequence(
+	//
+	handleRemult,
+	handleAuth,
+  // client side guard is not here!
+	handleGuard({
+		authenticated: ['/app*'],
+    redirectToLogin: route('/'),
+    // You want to redirect to the firstly UI ? change redirectToLogin to this 👇
+		// redirectToLogin: route('login'),
+		redirectAuthenticated: route('/app'),
+		redirect,
+	})
+)
 `,
     ],
     './src/routes/api/[...remult]/+server.ts': [
         `import { api } from '${libAlias}/firstly'
 
-export const GET = api.server.GET
-export const POST = api.server.POST
-export const PUT = api.server.PUT
-export const DELETE = api.server.DELETE
+export const { GET, POST, PUT, DELETE } = api
+`,
+    ],
+    './src/routes/+page.svelte': [
+        `<h1>Home</h1>
+
+<p>
+    Welcome here
+</p>`,
+    ],
+    './src/routes/app/+page.svelte': [
+        `<h1>App</h1>
+
+<p>
+    Only autenticated users can see this page!
+</p>
+
 `,
     ],
-    './src/routes/+page.svelte': [`Home 👋`, ``],
     './src/routes/+layout.server.ts': [
         `import { remult } from 'remult'
 
@@ -230,6 +264,31 @@ import type { LayoutServerLoad } from './$types'
 export const load = (async () => {
   return { user: remult.user }
 }) satisfies LayoutServerLoad	
+`,
+    ],
+    './src/routes/+layout.ts': [
+        `import { remult } from 'remult'
+import type { LayoutLoad } from './$types'
+
+export const load = (async (event) => {
+  // Instruct remult to use the special svelte fetch
+  // Like this univeral load will work in SSR & CSR
+  remult.useFetch(event.fetch)
+  // return repo(Task).find()
+  return { ...event.data }
+}) satisfies LayoutLoad
+`,
+    ],
+    './src/routes/+page.ts': [
+        `import { remult } from 'remult'
+import type { PageLoad } from './$types'
+
+export const load = (async (event) => {
+  // Instruct remult to use the special svelte fetch
+  // Like this univeral load will work in SSR & CSR
+  remult.useFetch(event.fetch)
+  // return repo(Task).find()
+}) satisfies PageLoad
 `,
     ],
     './src/routes/+layout.svelte': [
@@ -268,11 +327,19 @@ export const load = (async () => {
   <SignIn demo="Noam"></SignIn>
   <br />
   <SignIn ffLink></SignIn>
+  <br />
   <SignIn oauth="github"></SignIn>
 {/if}
 
 <hr />
 
+<a href={route('/')}>Home</a> | 
+{#if remult.authenticated()}
+  <a href={route('/app')}>App (Protected route)</a>
+{/if}
+
+<hr />
+
 <slot />
 
 <hr />
@@ -291,11 +358,11 @@ export const load = (async () => {
     './src/lib/ui/SignIn.svelte': [
         `<script lang="ts">
   import { isError } from 'firstly'
-  import { Auth } from 'firstly/auth/client'
+  import { AuthController } from 'firstly/auth/client'
 
   import { goto, invalidateAll } from '$app/navigation'
 
-  import { route } from '../ROUTES'
+  import { route } from '${libAlias}/ROUTES'
 
   // Examples of signin modes
   export let demo = ''
@@ -304,11 +371,11 @@ export const load = (async () => {
 
   const signinDemo = async (identif: string) => {
     try {
-      await Auth.signInDemo(identif)
+      await AuthController.signInDemo(identif)
       invalidateAll()
     } catch (error) {
       if (isError(error)) {
-        // TODO: You will probably not leave this alert in production
+        // You will probably not leave this alert in production
         alert(error.message)
       }
     }
@@ -316,13 +383,13 @@ export const load = (async () => {
 
   async function signinOAuth(provider: 'github') {
     try {
-      window.location.href = await Auth.signInOAuthGetUrl({
+      window.location.href = await AuthController.signInOAuthGetUrl({
         provider,
         redirect: window.location.pathname,
       })
     } catch (error) {
       if (isError(error)) {
-        // TODO: You will probably not leave this alert in production
+        // You will probably not leave this alert in production
         alert(error.message)
       }
     }
@@ -332,7 +399,7 @@ export const load = (async () => {
 {#if demo}
   <button on:click={() => signinDemo(demo)}>Login as {demo}</button>
 {:else if ffLink}
-  <button on:click={() => goto(route('firstly_sign_in'))}>Login with Firstly</button>
+  <button on:click={() => goto(route('login'))}>Login with Firstly UI</button>
 {:else if oauth}
   <button on:click={() => signinOAuth(oauth)}>Login With {oauth}</button>
 {/if}
@@ -341,13 +408,13 @@ export const load = (async () => {
     './src/lib/ui/SignOut.svelte': [
         `<script lang="ts">
   import { isError } from 'firstly'
-  import { Auth } from 'firstly/auth/client'
+  import { AuthController } from 'firstly/auth/client'
 
   import { invalidateAll } from '$app/navigation'
 
   const logout = async () => {
     try {
-      await Auth.signOut()
+      await AuthController.signOut()
       invalidateAll()
     } catch (error) {
       if (isError(error)) {
@@ -392,10 +459,11 @@ import type { KIT_ROUTES } from '${libAlias}/ROUTES'
 
 export default defineConfig({
   plugins: [
+    // @ts-ignore JYC TODO (vite 5 / vite 6...)
     firstly<KIT_ROUTES>({
       kitRoutes: {
         LINKS: { 
-          firstly_sign_in: 'ff/auth/sign-in',
+          login: 'ff/auth/sign-in',
           github: 'https://github.com/[owner]/[repo]',
           remult_admin: 'api/admin',
         },
@@ -428,7 +496,7 @@ vite.config.ts.timestamp-*
 `,
     ],
     './src/lib/firstly/modules/task/index.ts': [
-        `import type { Module } from 'firstly/api'
+        `import { Module } from 'firstly/api'
 
 import { log } from '${libAlias}/firstly'
 
@@ -436,14 +504,14 @@ import { Task } from './Task'
 import { TaskController } from './TaskController'
 
 export const task: (o: { specialInfo: string }) => Module = ({ specialInfo }) => {
-  return {
+  return new Module({
     name: 'task',
     entities: [Task],
     controllers: [TaskController],
     initApi: async () => {
       log.success(\`Task module is ready! 🚀 (specialInfo: \${specialInfo})\`)
     },
-  }
+  })
 }`,
     ],
     './src/lib/firstly/modules/task/Task.ts': [

package/esm/cellsBuildor.js

@@ -55,9 +55,6 @@ export const buildSearchWhere = (entity, fields, search) => {
     const f = [
         {
             $or: fields.map((f) => {
-                // REMULT P1: isServerExpression is false when sqlExpression there ?!
-                // if (f.isServerExpression || f.options.sqlExpression) {
-                // check if this field has a specific filter function
                 const fnName = f.key + 'Filter';
                 // @ts-ignore
                 if (entity && entity[fnName]) {
@@ -77,6 +74,9 @@ export const buildSearchWhere = (entity, fields, search) => {
     return f;
 };
 export const containsWords = (fields, search) => {
+    if (!search) {
+        return {};
+    }
     const sSplitted = search.split(' ').filter((s) => s.length > 0);
     if (fields.length === 1) {
         return {
@@ -84,8 +84,8 @@ export const containsWords = (fields, search) => {
         };
     }
     return {
-        $or: fields.map((f) => {
-            return { $and: sSplitted.map((s) => ({ [f.key]: { $contains: s } })) };
+        $and: sSplitted.map((s) => {
+            return { $or: fields.map((f) => ({ [f.key]: { $contains: s } })) };
         }),
     };
 };
@@ -94,12 +94,12 @@ export const buildWhere = (entity, defaultWhere, fields_filter, fields_search, o
     if (defaultWhere) {
         and.push(defaultWhere);
     }
-    if (obj.search) {
+    if (obj && obj.search) {
         and.push(...buildSearchWhere(entity, fields_search, obj.search));
     }
     for (const field of fields_filter) {
         // if there is a value
-        if (obj[field.key]) {
+        if (obj && obj[field.key]) {
             const rfi = getRelationFieldInfo(field);
             if (field.inputType === 'checkbox') {
                 // @ts-ignore

package/esm/changeLog/index.d.ts

@@ -1,40 +1,4 @@
 import { type FieldRef, type FieldsRef, type LifecycleEvent } from 'remult';
-import type { Module } from '../api';
-/**
- * ## Default way
- * The easiest is to switch from `@Entity` to `@FF_Entity` to the entities where you want to log changes.
- *
- * ```ts
- * \@FF_Entity<User>('users', {
- *
- *   // Optional => To disable change logs
- *   // changeLog: false,
- *
- *   // Optional => To disable some columns from being logged
- *   // changeLog: {
- *   //   excludeColumns: (e) => {
- *   //     return [e.password]
- *   //   },
- *   // },
- * })
- * export class User {}
- * ```
- *
- * ## Manual way
- * If you want to go more manual, you can import these functions and call them in your entity's lifecycle events.
- * ```ts
- * \@Entity<User>('users', {
- *   saved: async (entity, e) => {
- *     await recordSaved(entity, e)
- *   },
- *   deleted: async (entity, e) => {
- *     await recordDeleted(entity, e)
- *   },
- * })
- * export class User {}
- * ```
- */
-export declare const changeLog: () => Module;
 export declare class ChangeLog {
     id: string;
     entity: string;

package/esm/changeLog/index.js

@@ -4,47 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { Entity, Fields, getEntityRef, IdEntity, isBackend, remult, } from 'remult';
-/**
- * ## Default way
- * The easiest is to switch from `@Entity` to `@FF_Entity` to the entities where you want to log changes.
- *
- * ```ts
- * \@FF_Entity<User>('users', {
- *
- *   // Optional => To disable change logs
- *   // changeLog: false,
- *
- *   // Optional => To disable some columns from being logged
- *   // changeLog: {
- *   //   excludeColumns: (e) => {
- *   //     return [e.password]
- *   //   },
- *   // },
- * })
- * export class User {}
- * ```
- *
- * ## Manual way
- * If you want to go more manual, you can import these functions and call them in your entity's lifecycle events.
- * ```ts
- * \@Entity<User>('users', {
- *   saved: async (entity, e) => {
- *     await recordSaved(entity, e)
- *   },
- *   deleted: async (entity, e) => {
- *     await recordDeleted(entity, e)
- *   },
- * })
- * export class User {}
- * ```
- */
-export const changeLog = () => {
-    return {
-        name: 'changeLog',
-        entities: [ChangeLog],
-    };
-};
+import { Entity, Fields, getEntityRef, IdEntity, isBackend, remult, repo, } from 'remult';
 let ChangeLog = class ChangeLog {
     id = '';
     entity = '';
@@ -120,7 +80,7 @@ export async function recordSaved(entity, e, options) {
             }
         }
         if (changes.length > 0) {
-            await remult.repo(ChangeLog).insert({
+            await repo(ChangeLog).insert({
                 changeDate,
                 changes,
                 entity: e.metadata.key,
@@ -153,7 +113,7 @@ export async function recordDeleted(entity, e, options) {
             throw err;
         }
     }
-    await remult.repo(ChangeLog).insert({
+    await repo(ChangeLog).insert({
         changeDate,
         changes,
         entity: e.metadata.key,

package/esm/changeLog/server/index.d.ts

@@ -0,0 +1,36 @@
+import { Module } from '../../api';
+/**
+ * ## Default way
+ * The easiest is to switch from `@Entity` to `@FF_Entity` to the entities where you want to log changes.
+ *
+ * ```ts
+ * \@FF_Entity<User>('users', {
+ *
+ *   // Optional => To disable change logs
+ *   // changeLog: false,
+ *
+ *   // Optional => To disable some columns from being logged
+ *   // changeLog: {
+ *   //   excludeColumns: (e) => {
+ *   //     return [e.password]
+ *   //   },
+ *   // },
+ * })
+ * export class User {}
+ * ```
+ *
+ * ## Manual way
+ * If you want to go more manual, you can import these functions and call them in your entity's lifecycle events.
+ * ```ts
+ * \@Entity<User>('users', {
+ *   saved: async (entity, e) => {
+ *     await recordSaved(entity, e)
+ *   },
+ *   deleted: async (entity, e) => {
+ *     await recordDeleted(entity, e)
+ *   },
+ * })
+ * export class User {}
+ * ```
+ */
+export declare const changeLog: () => Module;

package/esm/changeLog/server/index.js

@@ -0,0 +1,42 @@
+import { Module } from '../../api';
+import { ChangeLog } from '../index';
+/**
+ * ## Default way
+ * The easiest is to switch from `@Entity` to `@FF_Entity` to the entities where you want to log changes.
+ *
+ * ```ts
+ * \@FF_Entity<User>('users', {
+ *
+ *   // Optional => To disable change logs
+ *   // changeLog: false,
+ *
+ *   // Optional => To disable some columns from being logged
+ *   // changeLog: {
+ *   //   excludeColumns: (e) => {
+ *   //     return [e.password]
+ *   //   },
+ *   // },
+ * })
+ * export class User {}
+ * ```
+ *
+ * ## Manual way
+ * If you want to go more manual, you can import these functions and call them in your entity's lifecycle events.
+ * ```ts
+ * \@Entity<User>('users', {
+ *   saved: async (entity, e) => {
+ *     await recordSaved(entity, e)
+ *   },
+ *   deleted: async (entity, e) => {
+ *     await recordDeleted(entity, e)
+ *   },
+ * })
+ * export class User {}
+ * ```
+ */
+export const changeLog = () => {
+    return new Module({
+        name: 'changeLog',
+        entities: [ChangeLog],
+    });
+};

package/esm/common.d.ts

@@ -0,0 +1,5 @@
+import { Log } from '@kitql/helpers';
+export declare const ff_Log: Log;
+export declare const FF_Role: {
+    readonly FF_Role_Admin: "FF_Role.Admin";
+};

package/esm/common.js

@@ -0,0 +1,8 @@
+// ******************************
+// Objects
+import { Log } from '@kitql/helpers';
+// ******************************
+export const ff_Log = new Log('firstly');
+export const FF_Role = {
+    FF_Role_Admin: 'FF_Role.Admin',
+};

package/esm/cron/{index.d.ts → server/index.d.ts}

@@ -1,5 +1,5 @@
 import { CronJob } from 'cron';
-import type { Module } from '../api';
+import { Module } from '../../api';
 export declare const jobs: Record<string, {
     job: CronJob<null, unknown> | null;
     concurrentInProgress: number;