Refactors protolib/base to not include external files, just before ex…

…tracting it into its own package

packages/app/features/auth/login.tsx

@@ -8,7 +8,7 @@ import { useSearchParams, useRouter } from 'solito/navigation';
 import { getErrorMessage } from "@my/ui";
 import { SiteConfig } from '../../conf'
 import { useSession, useSessionContext } from 'protolib/lib/Session'
-import { createSession } from 'protolib/api/lib/session'
+import { createSession } from 'protolib/base/Session'
 import { Auth } from 'protolib/lib/Auth'
 import { Center } from 'protolib/components/Center'
 import { HorizontalBox } from 'protolib/components/HorizontalBox'

packages/app/features/auth/register.tsx

@@ -7,7 +7,7 @@ import { ProtofyLogoSVG, Separator, XStack, getValidation } from '@my/ui'
 import { useSearchParams, useRouter } from 'solito/navigation';
 import { getErrorMessage } from "@my/ui";
 import { useSession, useSessionContext } from 'protolib/lib/Session'
-import { createSession } from 'protolib/api/lib/session'
+import { createSession } from 'protolib/base/Session'
 import { Auth } from 'protolib/lib/Auth'
 import { Center } from 'protolib/components/Center'
 import { HorizontalBox } from 'protolib/components/HorizontalBox'

packages/protobase/package.json

@@ -5,8 +5,7 @@
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
-        "build": "tsc",
-        "clean": "rm -rf dist"
+        "build": "tsc"
     },
     "files": [
         "dist"

packages/protolib/src/api/lib/handler.ts

@@ -1,7 +1,8 @@
 
-import type {Request, RequestHandler, Response} from 'express';
-import {ZodError} from "../../base";
-import {createSession, SessionDataType} from './session';
+import type { Request, RequestHandler, Response } from 'express';
+import { ZodError } from "../../base";
+import { SessionDataType } from './session';
+import { createSession } from '../../base/Session';
 import {verifyToken} from './crypt';
 import { getLogger } from '../../base';
 

packages/protolib/src/api/lib/session.ts

@@ -6,18 +6,6 @@ export const getSessionContext = async (type) => {
     return { state: 'resolved', group: type ? (await API.get('/adminapi/v1/groups/'+type)).data : {} }
 }
 
-export const createSession = (data?:userData, token?:string):SessionDataType => {
-    return {
-        user: {
-            admin: data?.admin ? data?.admin : false,
-            id: data?.id ? data.id : 'guest',
-            type: data?.id ? (data?.type ? data.type : 'user') : 'guest',
-            permissions: data?.permissions ? data?.permissions : []
-        },
-        token: token ? token : '',
-        loggedIn: data?.id ? true : false
-    }
-}
 export const validateSession = async (session:SessionDataType):Promise<validatedUserData> => jwt.verify(session.token ?? '', process.env.TOKEN_SECRET ?? '') as validatedUserData
 //DO NOT DELETE
 //This is the code to validate sessions in api instead of nextjs

packages/protolib/src/base/Api.ts

@@ -1,4 +1,4 @@
-import { PendingResult, getPendingResult } from "../base/PendingResult";
+import { PendingResult, getPendingResult } from "./PendingResult";
 import {devMode} from './env'
 import { isElectron } from "./lib/isElectron";
 import { getLogger } from "./logger"

packages/protolib/src/base/BaseSchema.ts

@@ -1,7 +1,6 @@
 import * as Zod from 'zod'
 import { v4 as uuidv4 } from 'uuid';
 import moment from 'moment';
-import { ProtoModel } from './ProtoModel';
 
 initSchemaSystem()
 

packages/protolib/src/base/ProtoCollection.ts

@@ -1,4 +1,4 @@
-import { SessionDataType } from "../api/lib/session";
+import { SessionDataType } from "./lib/perms";
 import { ProtoModel } from "./ProtoModel";
 
 export class ProtoCollection<T extends ProtoModel<any>> {

packages/protolib/src/base/ProtoModel.ts

@@ -1,5 +1,6 @@
-import { createSession, SessionDataType } from 'protolib/api/lib/session'
-import { ZodObject } from 'protolib/base'
+import { createSession } from './Session'
+import { SessionDataType } from './lib/perms'
+import { ZodObject } from './BaseSchema'
 import { ProtoSchema } from './ProtoSchema';
 import { getLogger } from "./logger"
 import { API } from './Api';

packages/protolib/src/base/Session.ts

@@ -0,0 +1,14 @@
+import { SessionDataType } from "./lib/perms"
+
+export const createSession = (data?, token?:string):SessionDataType => {
+    return {
+        user: {
+            admin: data?.admin ? data?.admin : false,
+            id: data?.id ? data.id : 'guest',
+            type: data?.id ? (data?.type ? data.type : 'user') : 'guest',
+            permissions: data?.permissions ? data?.permissions : []
+        },
+        token: token ? token : '',
+        loggedIn: data?.id ? true : false
+    }
+}

packages/protolib/src/base/index.ts

@@ -9,4 +9,5 @@ export * from './lib/isElectron'
 export * from './lib/perms'
 export * from './lib/getEnv'
 export * from './logger'
-export * from './Protofy'
+export * from './Protofy'
+export * from './Session'

packages/protolib/src/lib/Session.ts

@@ -1,10 +1,11 @@
 import { atom, useAtom } from 'jotai';
 import { atomWithStorage, useHydrateAtoms } from 'jotai/utils';
 import * as cookie from 'cookie'
-import { createSession, validateSession, SessionDataType, getSessionContext } from '../api/lib/session';
+import { validateSession, SessionDataType, getSessionContext } from '../api/lib/session';
 import { NextPageContext } from 'next'
 import { parse } from 'cookie';
-import { getLogger } from "protolib/base/logger"
+import { getLogger } from "../base/logger"
+import { createSession } from '../base/Session'
 
 const logger = getLogger()
 

packages/protonode/package.json

@@ -5,8 +5,7 @@
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
-        "build": "tsc",
-        "clean": "rm -rf dist"
+        "build": "tsc"
     },
     "files": [
         "dist"