firstly 0.0.16-next.1 → 0.1.0-next.3

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # firstly
 
+## 0.1.0-next.3
+
+### Minor Changes
+
+- [#140](https://github.com/jycouet/firstly/pull/140)
+  [`94b2188`](https://github.com/jycouet/firstly/commit/94b2188c78772f94e7835ab933fcebbe2a37703c)
+  Thanks [@jycouet](https://github.com/jycouet)! - [BREAKING] - deprecate firstly module in favor of
+  remult module
+
+  ```diff
+  remultApi({
+  --	modules: [],   // firstly modules
+  ++	modulesFF: [], // firstly modules
+  })
+
+  Then, you can use `modules` level of `remult`
+  ```
+
+### Patch Changes
+
+- [#117](https://github.com/jycouet/firstly/pull/117)
+  [`407ed4d`](https://github.com/jycouet/firstly/commit/407ed4db8f4b99f234932965b870d51f6a9c07ca)
+  Thanks [@jycouet](https://github.com/jycouet)! - need to pass `redirect` to handleAuth manually
+
+- [#117](https://github.com/jycouet/firstly/pull/117)
+  [`f30c737`](https://github.com/jycouet/firstly/commit/f30c73781d8f50da08fcdc25f1f7611133ea8b0c)
+  Thanks [@jycouet](https://github.com/jycouet)! - switch mail engine to sailkit
+
+- [#117](https://github.com/jycouet/firstly/pull/117)
+  [`5e1d67e`](https://github.com/jycouet/firstly/commit/5e1d67eb8f75127c3d729945e20b22c40184ee20)
+  Thanks [@jycouet](https://github.com/jycouet)! - [BREAKING] - Auth Identifier got removed in favor
+  of name in User table.
+
+## 0.0.16-next.2
+
+### Patch Changes
+
+- [#110](https://github.com/jycouet/firstly/pull/110)
+  [`0c66f11`](https://github.com/jycouet/firstly/commit/0c66f114dd95f65c0407abddbd647a66769142eb)
+  Thanks [@jycouet](https://github.com/jycouet)! - add github in default ui (if configured)
+
 ## 0.0.16-next.1
 
 ### Patch Changes

package/esm/FF_Entity.d.ts

@@ -1,2 +1,2 @@
 import { type EntityOptions } from 'remult';
-export declare function FF_Entity<entityType>(key: string, options: EntityOptions<entityType extends new (...args: any) => any ? InstanceType<entityType> : entityType>): (target: any, info?: import("remult/src/remult3/remult3").ClassDecoratorContextStub<entityType extends infer T ? T extends entityType ? T extends new (...args: any) => any ? entityType : never : never : never> | undefined) => any;
+export declare function FF_Entity<entityType>(key: string, options?: EntityOptions<entityType extends new (...args: any) => any ? InstanceType<entityType> : entityType>): (target: any, info?: import("remult/src/remult3/remult3").ClassDecoratorContextStub<entityType extends infer T ? T extends entityType ? T extends new (...args: any) => any ? entityType : never : never : never> | undefined) => any;

package/esm/FF_Entity.js

@@ -12,31 +12,31 @@ const toAllow = (permission) => {
 export function FF_Entity(key, options) {
     return Entity(key, {
         ...options,
-        allowApiCrud: options.allowApiCrud ?? toAllow(options.permissionApiCrud),
-        allowApiDelete: options.allowApiDelete ?? toAllow(options.permissionApiDelete),
-        allowApiInsert: options.allowApiInsert ?? toAllow(options.permissionApiInsert),
-        allowApiRead: options.allowApiRead ?? toAllow(options.permissionApiRead),
-        allowApiUpdate: options.allowApiUpdate ?? toAllow(options.permissionApiUpdate),
+        allowApiCrud: options?.allowApiCrud ?? toAllow(options?.permissionApiCrud),
+        allowApiDelete: options?.allowApiDelete ?? toAllow(options?.permissionApiDelete),
+        allowApiInsert: options?.allowApiInsert ?? toAllow(options?.permissionApiInsert),
+        allowApiRead: options?.allowApiRead ?? toAllow(options?.permissionApiRead),
+        allowApiUpdate: options?.allowApiUpdate ?? toAllow(options?.permissionApiUpdate),
         // changesLogs
         saved: async (entity, e) => {
             await options?.saved?.(entity, e);
-            if (options.changeLog === false) {
+            if (options?.changeLog === false) {
                 // Don't log changes
             }
             else {
                 if (isBackend()) {
-                    await recordSaved(entity, e, options.changeLog);
+                    await recordSaved(entity, e, options?.changeLog);
                 }
             }
         },
         deleted: async (entity, e) => {
             await options?.deleted?.(entity, e);
-            if (options.changeLog === false) {
+            if (options?.changeLog === false) {
                 // Don't log changes
             }
             else {
                 if (isBackend()) {
-                    await recordDeleted(entity, e, options.changeLog);
+                    await recordDeleted(entity, e, options?.changeLog);
                 }
             }
         },

package/esm/ROUTES.d.ts

@@ -3,7 +3,7 @@
  *
  *      >> DO NOT EDIT THIS FILE MANUALLY <<
  */
-type ParamValue = string | number | undefined;
+type ParamValue = string | number | boolean | null | undefined;
 /**
  * Append search params to a string
  */

package/esm/ROUTES.js

@@ -37,8 +37,8 @@ const LINKS = {
     "remult_admin": `/api/admin`,
     "github": (params) => {
         params = params ?? {};
-        params['owner'] = params['owner'] ?? "jycouet";
-        params['repo'] = params['repo'] ?? "firstly";
+        params['owner'] = params['owner'] ?? "\"jycouet\"";
+        params['repo'] = params['repo'] ?? "\"firstly\"";
         return `https://github.com/${params['owner']}/${params['repo']}`;
     }
 };

package/esm/SqlDatabase/FF_LogToConsole.d.ts

@@ -1,5 +1,19 @@
+type TypeQuery = 'INSERT' | 'SELECT' | 'SELECT_COUNT' | 'UPDATE' | 'DELETE' | 'CREATE' | 'ALTER' | 'DROP' | 'TRUNCATE' | 'GRANT' | 'REVOKE';
+/**
+ * @example
+ * SqlDatabase.LogToConsole = (...a) => FF_LogToConsole(...a, {
+ *   type: {
+ *     exclude: ['SELECT', 'SELECT_COUNT']
+ *   }
+ * })
+ */
 export declare const FF_LogToConsole: (duration: number, query: string, args: Record<string, any>, options?: {
+    type?: {
+        include?: TypeQuery[];
+        exclude?: TypeQuery[];
+    };
     withDetails?: boolean;
     tablesToHide?: string[][];
     ending?: (duration: number, query: string, args: Record<string, any>, tables: string[]) => void;
 }) => string | undefined;
+export {};

package/esm/SqlDatabase/FF_LogToConsole.js

@@ -4,7 +4,7 @@ const typeQuery = new Map([
     // CRUD
     ['INSERT', '⚪'], // Used to insert new data into a database.
     ['SELECT', '🔵'], // Used to select data from a database and retrieve it.
-    ['COUNT ', '🟦'], // Used to count data from a database and retrieve it.
+    ['SELECT_COUNT', '🟦'], // Used to count data from a database and retrieve it.
     ['UPDATE', '🟣'], // Used to update existing data within a database.
     ['DELETE', '🟤'], // Used to delete existing data from a database.
     // Additional
@@ -18,17 +18,36 @@ const typeQuery = new Map([
 const keys = ['FROM', 'WHERE', 'LIMIT', 'OFFSET'];
 const typeQueryKey = Array.from(typeQuery.keys());
 const log = new Log('');
+/**
+ * @example
+ * SqlDatabase.LogToConsole = (...a) => FF_LogToConsole(...a, {
+ *   type: {
+ *     exclude: ['SELECT', 'SELECT_COUNT']
+ *   }
+ * })
+ */
 export const FF_LogToConsole = (duration, query, args, options) => {
     if (duration < SqlDatabase.durationThreshold)
         return;
     const rawSql = query
+        .replace(/--.*?(?=\r\n|\n|$)/g, '') // Remove SQL comments
         .replace(/(\r\n|\n|\r|\t)/gm, ' ')
         .replace(/  +/g, ' ')
         .trim();
     const s = rawSql.split(' ');
     let first = s[0].toUpperCase();
-    if (s.includes('count(*)')) {
-        first = 'COUNT ';
+    if (s.length > 1 && s[1].toLowerCase() === 'count(*)') {
+        first = 'SELECT_COUNT';
+    }
+    if (options?.type?.include) {
+        if (!options.type.include.includes(first)) {
+            return;
+        }
+    }
+    if (options?.type?.exclude) {
+        if (options.type.exclude.includes(first)) {
+            return;
+        }
     }
     const tables = [];
     const listArgs = [];
@@ -75,8 +94,8 @@ export const FF_LogToConsole = (duration, query, args, options) => {
         ['information_Schema.tables'],
         ['information_schema.columns'],
         // ['__remult_migrations_version'],
-        ['ff_auth.accounts'],
-        ['ff_auth.users'],
+        // ['ff_auth.accounts'],
+        // ['ff_auth.users'],
         ['ff_auth.users_sessions'],
         ['_ff_change_logs'],
     ];

package/esm/auth/Entities.d.ts

@@ -1,5 +1,7 @@
+import type { OAuth2Tokens } from 'arctic';
 import { BaseEnum } from '..';
 import type { BaseEnumOptions } from '..';
+import type { OAuth2UserInfo } from './types';
 export declare const FF_Role_Auth: {
     readonly FF_Role_Auth_Admin: "FF_Role_Auth.Admin";
     readonly FF_Role_Auth_Invite: "FF_Role_Auth.Invite";
@@ -8,7 +10,7 @@ export declare class FFAuthUser {
     id: string;
     createdAt: Date;
     updatedAt?: Date;
-    identifier: string;
+    name: string;
     roles: string[];
     accounts: FFAuthAccount[];
     sessions: FFAuthUserSession[];
@@ -21,10 +23,14 @@ export declare class FFAuthAccount {
     user: FFAuthUser;
     provider: string;
     providerUserId: string;
+    email?: string | null;
     hashPassword?: string;
     token?: string;
     expiresAt?: Date;
     lastVerifiedAt?: Date;
+    metadata?: OAuth2UserInfo & {
+        tokens_data: OAuth2Tokens['data'];
+    };
 }
 export declare class FFAuthUserSession {
     id: string;

package/esm/auth/Entities.js

@@ -15,7 +15,7 @@ let FFAuthUser = class FFAuthUser {
     id;
     createdAt;
     updatedAt;
-    identifier;
+    name;
     roles = [];
     accounts;
     sessions;
@@ -24,29 +24,29 @@ __decorate([
     Fields.cuid()
 ], FFAuthUser.prototype, "id", void 0);
 __decorate([
-    Fields.createdAt()
+    Fields.createdAt({ includeInApi: [FF_Role_Auth.FF_Role_Auth_Admin, FF_Role.FF_Role_Admin] })
 ], FFAuthUser.prototype, "createdAt", void 0);
 __decorate([
-    Fields.updatedAt()
+    Fields.updatedAt({ includeInApi: [FF_Role_Auth.FF_Role_Auth_Admin, FF_Role.FF_Role_Admin] })
 ], FFAuthUser.prototype, "updatedAt", void 0);
 __decorate([
     Fields.string({
-        allowApiUpdate: false,
-        validate: [
-            Validators.unique(),
-            Validators.required(),
-            (e) => {
-                if (e.identifier?.length < 2)
-                    throw 'Must be at least 2 characters long';
-            },
-        ],
+        required: true,
+        validate: [Validators.unique(), Validators.required()],
     })
-], FFAuthUser.prototype, "identifier", void 0);
+], FFAuthUser.prototype, "name", void 0);
 __decorate([
     Fields.json(() => [], {
+        includeInApi: [FF_Role_Auth.FF_Role_Auth_Admin, FF_Role.FF_Role_Admin],
         inputType: 'selectEnum',
         valueConverter: {
-            toDb: (x) => (x ? x.join(',') : []),
+            toDb: (x) => {
+                if (x === null)
+                    return null;
+                if (Array.isArray(x))
+                    return x.join(',');
+                return x;
+            },
             //FIXME: refacto this + remove "permissions" & add a disable user!
             fromDb: (x) => {
                 return x
@@ -80,10 +80,12 @@ let FFAuthAccount = class FFAuthAccount {
     user;
     provider = FFAuthProvider.PASSWORD.id;
     providerUserId = '';
+    email = null;
     hashPassword;
     token;
     expiresAt;
     lastVerifiedAt;
+    metadata;
 };
 __decorate([
     Fields.cuid()
@@ -106,6 +108,9 @@ __decorate([
 __decorate([
     Fields.string()
 ], FFAuthAccount.prototype, "providerUserId", void 0);
+__decorate([
+    Fields.string({ allowNull: true })
+], FFAuthAccount.prototype, "email", void 0);
 __decorate([
     Fields.string({ includeInApi: false, allowNull: true })
 ], FFAuthAccount.prototype, "hashPassword", void 0);
@@ -118,6 +123,9 @@ __decorate([
 __decorate([
     Fields.date({ includeInApi: false, allowNull: true })
 ], FFAuthAccount.prototype, "lastVerifiedAt", void 0);
+__decorate([
+    Fields.json({ includeInApi: false, allowNull: true })
+], FFAuthAccount.prototype, "metadata", void 0);
 FFAuthAccount = __decorate([
     FF_Entity('ff_auth.accounts', {
         allowApiCrud: [FF_Role_Auth.FF_Role_Auth_Admin, FF_Role.FF_Role_Admin],