@sidekick-coder/zenith-kit 0.4.3 → 0.4.4

package/package.json

@@ -1,12 +1,11 @@
 {
     "name": "@sidekick-coder/zenith-kit",
-    "version": "0.4.3",
+    "version": "0.4.4",
     "license": "MIT",
     "description": "Package to use with zenith framework",
     "author": "Henrique Oliveira <henriqueoliwork@gmail.com>",
     "homepage": "https://github.com/sidekick-coder/zenith-kit",
     "bin": {
-        "zkit": "./bin/zkit.js",
         "zenith": "./bin/zenith.js"
     },
     "repository": {
@@ -19,32 +18,31 @@
     "imports": {
         "#client/*": "./src/client/*",
         "#server/*": "./src/server/*",
-        "#shared/*": "./src/shared/*"
+        "#shared/*": "./src/shared/*",
+        "#build/*": "./src/build/*"
     },
     "exports": {
         "./shared": {
-            "development": {
-                "types": "./src/shared/index.ts",
-                "import": "./src/shared/index.ts"
-            },
             "types": "./dist/shared/index.d.mts",
             "import": "./dist/shared/index.mjs",
             "require": "./dist/shared/index.js"
         },
+        "./shared/*": {
+            "types": "./dist/shared/*.d.mts",
+            "import": "./dist/shared/*.mjs",
+            "require": "./dist/shared/*.js"
+        },
         "./server": {
-            "development": {
-                "types": "./src/server/index.ts",
-                "import": "./src/server/index.ts"
-            },
             "types": "./dist/server/index.d.mts",
             "import": "./dist/server/index.mjs",
             "require": "./dist/server/index.js"
         },
+        "./server/*": {
+            "types": "./dist/server/*.d.mts",
+            "import": "./dist/server/*.mjs",
+            "require": "./dist/server/*.js"
+        },
         "./client": {
-            "development": {
-                "types": "./src/client/index.ts",
-                "import": "./src/client/index.ts"
-            },
             "types": "./dist/client/src/client/index.d.ts",
             "import": "./dist/client/index.es.js",
             "require": "./dist/client/index.es.js"
@@ -89,7 +87,7 @@
         "@types/cors": "^2.8.19",
         "@types/supertest": "^7.2.0",
         "acorn-typescript": "^1.4.13",
-        "better-sqlite3": "^12.10.0",
+        "better-sqlite3": "^13.0.3",
         "npm-run-all": "^4.1.5"
     },
     "dependencies": {

package/src/build/createTsdownConfig.ts

@@ -0,0 +1,22 @@
+import { defineConfig, type UserConfig } from 'tsdown'
+import path from 'path'
+
+export interface CreateTsdownConfigOptions {
+    root?: string
+    entry?: UserConfig['entry']
+    outDir?: string
+}
+
+export function createTsDownConfig(options: CreateTsdownConfigOptions) {
+    const tsConfigPath = path.resolve(import.meta.dirname, '..', '..', '..', 'tsconfig.server.json')
+
+    return defineConfig({
+        root: options.root || process.cwd(),
+        entry: options.entry,
+        outDir: options.outDir || 'dist/server',
+        tsconfig: tsConfigPath,
+        minify: true,
+        unbundle: true,
+    })
+
+}

package/src/build/createViteConfig.ts

@@ -0,0 +1,51 @@
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
+import tailwindcss from '@tailwindcss/vite'
+
+export interface CreateViteConfigOptions {
+    entry: string
+    name?: string
+    outDir?: string
+    env?: Record<string, any>
+    ssr?: boolean
+}
+
+export function createViteConfig(options: CreateViteConfigOptions) {
+    return defineConfig({
+        define: {
+            'process.env': options.env || {}
+        },
+        plugins: [
+            vue({
+                template: {
+                    compilerOptions: {
+                        isCustomElement: (tag) => {
+                            return ['iconify-icon'].includes(tag)
+                        }
+                    }
+                }
+            }),
+            tailwindcss(),
+        ],
+        build: {
+            outDir: options.outDir,
+            minify: true,
+            manifest: true,
+            ssr: options.ssr || false,
+            ssrManifest: options.ssr || false,
+            rollupOptions: {
+                external: [
+                    'vue',
+                    'vue-router',
+                    'vee-validate',
+                ],
+            },
+            lib: {
+                name: options.name,
+                entry: options.entry,
+                formats: ['es'],
+            },
+        },
+    })
+}
+

package/src/client/components.ts

@@ -9,6 +9,7 @@ export * from './composables/useHead.ts'
 export * from './composables/useLayoutOptions.ts'
 export * from './composables/useLoading.ts'
 export * from './composables/useMenu.ts'
+export * from './composables/useRoute.ts'
 export * from './composables/useRouteQuery.ts'
 export * from './composables/useState.ts'
 export * from './components/ui/accordion/index.ts'

package/src/client/composables/useFetchPagination.ts

@@ -1,4 +1,4 @@
-import { computed, ref, toRef, watch } from 'vue'
+import { computed, onMounted, onServerPrefetch, ref, toRef, watch } from 'vue'
 import type { MaybeRef, Ref } from 'vue'
 import { watchDebounced } from '@vueuse/core'
 import { useState } from './useState.ts'
@@ -132,6 +132,11 @@ export function useFetchPagination<T = any>(url: string, options: UseFetchPagina
         await load()
     }
 
+    if (options.immediate !== false) {
+        onMounted(hydrate)
+        onServerPrefetch(hydrate)
+    }
+
     return {
         page,
         limit,

package/src/client/composables/useForm.ts

@@ -1,4 +1,4 @@
-import { type ValibotObjectSchema, type ValibotSchema, type ValidatePayload, type ValidatorResult } from '#shared/index.ts';
+import { type ValibotObjectSchema, type ValibotSchema, type ValidatePayload, type ValidatorResult } from '#shared/services/ValidatorService.ts';
 import { toTypedSchema as  veeValidateToTypedSchema } from '@vee-validate/valibot';
 import { useForm as useVeeValidateForm, type FormContext, type FormOptions, type GenericObject } from 'vee-validate';
 

package/src/client/composables/useRoute.ts

@@ -0,0 +1,10 @@
+import { useRoute as vueUseRoute, useRouter as vueUseRouter, } from 'vue-router'
+
+export const useRoute: typeof vueUseRoute = () => {
+  return vueUseRoute()
+}
+
+export const useRouter: typeof vueUseRouter = () => {
+  return vueUseRouter()
+}
+

package/src/client/composables/useRouteQuery.ts

@@ -1,12 +1,13 @@
-import route from '#client/facades/route.ts'
-import router from '#client/facades/router.ts'
+// import route from '#client/facades/route.ts'
+// import router from '#client/facades/router.ts'
 
 import { useRouteQuery as vueUserRouteQuery } from '@vueuse/router'
+import { useRoute, useRouter } from 'vue-router'
 
 const zenithUseRouteQuery= (key: any, defaultValue: any, options: any) => {
     return vueUserRouteQuery(key, defaultValue, {
-        route,
-        router,
+        route: useRoute(),
+        router: useRouter(),
         ...options
     })
 }

package/src/client/facades/emmitter.ts

@@ -1,5 +1,5 @@
 import container from './container'
-import { EmmitterService } from '#shared/index.ts'
+import EmmitterService from '#shared/services/EmmitterService.ts'
 
 const emmitter = container.proxy<EmmitterService>(EmmitterService)
 

package/src/client/index.ts

@@ -25,6 +25,7 @@ export * from './composables/useHead.ts'
 export * from './composables/useLayoutOptions.ts'
 export * from './composables/useLoading.ts'
 export * from './composables/useMenu.ts'
+export * from './composables/useRoute.ts'
 export * from './composables/useRouteQuery.ts'
 export * from './composables/useState.ts'
 export * from './facades/acl.ts'

package/src/client/services/LayoutService.ts

@@ -1,4 +1,4 @@
-import { BaseException } from "#shared/index.ts"
+import BaseException from '#shared/exceptions/BaseException.ts'
 import type { DefineComponent } from "vue"
 import emmitter from '../facades/emmitter.ts'
 

package/src/client/zenith-env.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="vite/client" />
-import type { ContainerService, tryCatch } from '#shared/index.ts'
+import type { ContainerService, tryCatch } from '#shared/utils/tryCatch.ts'
+import type ConfigService from '#shared/services/ConfigService.ts'
 import type ConfigService from '#shared/services/ConfigService.ts'
 import type TranslatorService from '#shared/services/TranslatorService.ts'
 

package/src/server/__tests__/helpers/createUser.ts

@@ -1,5 +1,5 @@
 import userRepository from "#server/facades/userRepository.ts";
-import type { UserEntity } from "#shared/index.ts";
+import type UserEntity from "#shared/entities/UserEntity.ts";
 import { faker } from '@faker-js/faker'
 
 export async function createUser(payload: Partial<UserEntity> = {}): Promise<UserEntity> {

package/src/server/__tests__/setup.ts

@@ -1,6 +1,6 @@
 import container from "#server/facades/container.ts";
 import HasherService from "#server/services/HasherService.ts";
-import { EmmitterService } from "#shared/index.ts";
+import EmmitterService from "#shared/services/EmmitterService.ts";
 
 container.set(HasherService, new HasherService());
 container.set(EmmitterService, new EmmitterService());

package/src/server/commands/pluginBuild.ts

@@ -0,0 +1,60 @@
+import * as tsdown from 'tsdown'
+import * as vite from 'vite'
+import path from 'path'
+import { CliCommand } from '#server/services/CliService.js'
+import { createTsDownConfig } from '#build/createTsdownConfig.js'
+import { createViteConfig } from '#build/createViteConfig.js'
+import { getPluginConfig } from '#server/utils/config.js'
+
+const command = new CliCommand('plugin:build')
+
+command
+    .helpGroup('plugins')
+    .description('Build plugin for production')
+    .action(async () => {
+        const cwd = process.cwd()
+
+        const config = getPluginConfig(cwd)
+
+
+        const entry = {
+            index: 'src/server/index.ts',
+        }
+
+        if (config?.build?.server?.entries) {
+            Object.assign(entry, config.build.server.entries)
+        }
+
+        const tsdownConfig = createTsDownConfig({
+            root: cwd,
+            entry: entry,
+        })
+
+
+        await tsdown.build(tsdownConfig)
+
+        const viteNodeConfig = createViteConfig({
+            entry: path.resolve(cwd, 'src/client/index.ts'),
+            outDir: path.resolve(cwd, 'dist/client-node'),
+            ssr: true,
+            env: {
+                NODE_ENV: 'production'
+            }
+        })
+
+        await vite.build(viteNodeConfig)
+
+        const viteBrowserConfig = createViteConfig({
+            entry: path.resolve(cwd, 'src/client/index.ts'),
+            outDir: path.resolve(cwd, 'dist/client-browser'),
+            ssr: false,
+            env: {
+                NODE_ENV: 'production'
+            }
+        })
+
+        await vite.build(viteBrowserConfig)
+    })
+
+export default command
+

package/src/server/commands/pluginGenerateId.ts

@@ -0,0 +1,18 @@
+import { CliCommand } from '#server/services/CliService.ts'
+import { ulid } from 'ulid'
+
+const command = new CliCommand('plugin:generate-id')
+
+command
+    .helpGroup('plugins')
+    .description('Generate a unique plugin ID to be added to zenith.config.yml file')
+    .action(async () => {
+        const id = ulid()
+
+        console.log(id)
+    })
+
+export default command
+
+
+

package/src/server/contracts/HttpContextContract.ts

@@ -3,7 +3,7 @@
 // import type UploadService from '#server/services/upload.service.ts'
 // import type CookieService from '#shared/services/cookie.service.ts'
 import type Acl from '#server/entities/AclEntity.ts'
-import type { CookieMapEntity } from '#shared/index.ts';
+import type CookieMapEntity from '#shared/entities/CookieMapEntity.ts';
 
 export interface Request {
     [key: string]: any; // Allow additional properties

package/src/server/entities/MigrationEntity.ts

@@ -1,4 +1,4 @@
-import { BaseException } from "#shared/index.ts";
+import BaseException from "#shared/exceptions/BaseException.ts";
 import type { Kysely } from "kysely";
 
 export interface MigrationEntiyData {

package/src/server/entities/PluginEntity.ts

@@ -1,9 +1,5 @@
 import { join } from 'path'
-import RouterFileBaseRoutingService from '#server/services/RouterFileBaseRoutingService.ts'
 import PluginEntryEntity from './PluginEntryEntity.ts'
-import emmitter from '#server/facades/emmitter.ts'
-import type { RouterEvents } from '#server/services/RouterService.ts'
-import type RouterRegister from '#server/services/RouterRegisterService.ts'
 
 interface AddApiFolderOptions {
     prefix?: string
@@ -15,8 +11,6 @@ export default class PluginEntity extends PluginEntryEntity {
 
     constructor() {
         super()
-
-        emmitter.on('router:registered', this.onRouterRegistered.bind(this))
     }
 
     public staticPath(...parts: string[]) {
@@ -27,35 +21,6 @@ export default class PluginEntity extends PluginEntryEntity {
         // This method can be used to load additional data from the plugin's directory if needed
     }
 
-    public async onRouterRegistered(ctx: RouterEvents['router:registered']) {
-        const router = ctx.router as RouterRegister
-
-        for (const [directory, options] of this.apiFolders) {
-            const prefix = options.prefix || `/api/`
-
-            await RouterFileBaseRoutingService
-                .create(directory)
-                .setPrefix(prefix)
-                .setRouter(router)
-                .setModule(this.id)
-                .load()
-        }
-
-        for (const apiDir of this.apiDirectories) {
-            router.addDir(apiDir, {
-                module: this.id,
-            })
-        }
-    }
-
-    public addApiFolder(directory: string, options: AddApiFolderOptions = {}) {
-        this.apiFolders.set(directory, options)
-    }
-
-    public addRouterFolder(directory: string) {
-        this.apiDirectories.add(directory)
-    }
-
     public static fromPluginDiscoverEntity<T>(this: new () => T, entity: PluginEntryEntity): T {
         const contructor = (typeof this === 'function' ? this : PluginEntity) as any
 

package/src/server/entities/PluginEntryEntity.ts

@@ -1,9 +1,4 @@
 import config from '#server/facades/config.ts'
-import container from '#server/facades/container.ts'
-import { GitGateway } from '#server/gateways/GitGateway.ts'
-import GitBranchRepository from '#server/repositories/GitBranchRepository.ts'
-import GitCommitRepository from '#server/repositories/GitCommitRepository.ts'
-import ShellService from '#server/services/ShellService.ts'
 import Base from '#shared/entities/PluginEntity.ts'
 import { composeWith } from '#shared/utils/compose.ts'
 import { join } from 'node:path'
@@ -22,27 +17,4 @@ export default class PluginEntryEntity extends composeWith(Base) {
     public get: typeof config.get = (key, defaultValue) => {
         return config.get(`plugins.registry.${this.id}.${key}`, defaultValue)
     }
-
-    public get git(){
-        return new GitGateway({
-            cwd: this.directory,
-            shell: container.has(ShellService) ? container.get(ShellService) : undefined,
-            sshKey: config.get(`plugins.registry.${this.id}.ssh_key`),
-            sshKeyFile: config.get(`plugins.registry.${this.id}.ssh_key_file`)
-        })
-    }
-
-    public get commits() {
-        return new GitCommitRepository({
-            cwd: this.directory,
-            shell: container.has(ShellService) ? container.get(ShellService) : undefined
-        })
-    }
-
-    public get branches() {
-        return new GitBranchRepository({
-            cwd: this.directory,
-            shell: container.has(ShellService) ? container.get(ShellService) : undefined
-        })
-    }
 }

package/src/server/entities/RoutineEntity.ts

@@ -1,4 +1,4 @@
-import { Job } from 'node-schedule'
+import type { Job } from 'node-schedule'
 
 export interface RoutineHandler {
     (): void | Promise<void>

package/src/server/entities/SeederEntity.ts

@@ -1,4 +1,4 @@
-import { BaseException } from "#shared/index.ts";
+import BaseException from "#shared/exceptions/BaseException.ts";
 import type { Kysely } from "kysely";
 
 export interface SeederEntiyData {

package/src/server/facades/emmitter.ts

@@ -1,5 +1,5 @@
-import container from './container'
-import { EmmitterService } from '#shared/index.ts'
+import container from './container.ts'
+import EmmitterService from '#shared/services/EmmitterService.ts'
 
 const emmitter = container.proxy<EmmitterService>(EmmitterService)
 

package/src/server/facades/lifecycle.ts

@@ -0,0 +1,6 @@
+import container from './container'
+import LifecycleService from '#server/services/LifecycleService.ts'
+
+const lifecycle = container.proxy<LifecycleService>(LifecycleService)
+
+export default lifecycle