@udixio/theme 1.0.0-beta.3 → 1.0.0-beta.31

package/package.json

@@ -1,11 +1,16 @@
 {
   "name": "@udixio/theme",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.31",
   "license": "MIT",
   "author": "vigreux-joël",
-  "main": "dist/index.js",
-  "module": "dist/udixio-theme.esm.js",
-  "typings": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/theme.esm.js",
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    }
+  },
+  "types": "dist/index.d.ts",
   "files": [
     "dist",
     "src"
@@ -16,6 +21,7 @@
   },
   "scripts": {
     "analyze": "size-limit --why",
+    "prebuild": "rm ./src/**/index.ts && rm ./src/index.ts && npx ctix create -f index.ts -a src\n",
     "build": "dts build",
     "lint": "dts lint",
     "prepare": "dts build",
@@ -34,31 +40,24 @@
   },
   "size-limit": [
     {
-      "path": "dist/udixio-theme.cjs.production.min.js",
+      "path": "dist/theme.cjs.production.min.js",
       "limit": "10 KB"
     },
     {
-      "path": "dist/udixio-theme.esm.js",
+      "path": "dist/theme.esm.js",
       "limit": "10 KB"
     }
   ],
   "dependencies": {
     "@material/material-color-utilities": "^0.3.0",
-    "@nestjs/common": "^10.3.10",
-    "@nestjs/core": "^10.3.10",
-    "@nestjs/microservices": "^10.3.10",
-    "@nestjs/platform-express": "^10.3.10",
-    "@nestjs/websockets": "^10.3.10",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^26.0.1",
-    "merge-deep": "^3.0.3",
+    "awilix": "^10.0.2",
     "reflect-metadata": "^0.2.2",
-    "rxjs": "^7.8.1"
+    "rxjs": "^7.8.1",
+    "tailwindcss-themer": "^4.0.0"
   },
   "devDependencies": {
-    "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/git": "^10.0.1",
-    "semantic-release": "^24.0.0",
     "@babel/cli": "^7.24.8",
     "@babel/core": "^7.24.9",
     "@babel/node": "^7.24.8",
@@ -69,17 +68,16 @@
     "@babel/preset-typescript": "^7.24.7",
     "@babel/register": "^7.24.6",
     "@babel/runtime": "^7.24.8",
-    "@nestjs/cli": "^10.4.2",
-    "@nestjs/schematics": "^10.1.2",
-    "@nestjs/testing": "^10.3.10",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/git": "^10.0.1",
     "@size-limit/preset-small-lib": "^11.1.4",
     "@tsconfig/recommended": "^1.0.7",
     "@types/express": "^4.17.21",
     "@types/jest": "28.1.8",
-    "@types/merge-deep": "^3.0.3",
     "@types/node": "^16.0.0",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
+    "ctix": "^1.8.2",
     "dts-cli": "^2.0.5",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^8.3.0",
@@ -88,14 +86,15 @@
     "i": "^0.3.7",
     "jest": "28.1.3",
     "prettier": "^2.3.2",
+    "semantic-release": "^24.0.0",
     "size-limit": "^11.1.4",
     "source-map-support": "^0.5.20",
     "supertest": "^6.1.3",
+    "tailwindcss": "^3.4.7",
     "ts-jest": "28.0.8",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.0.0",
     "tsconfig-paths": "4.1.0",
-    "tslib": "^2.6.3",
-    "typescript": "^4.7.4"
+    "tslib": "^2.6.3"
   }
 }

package/src/app.container.ts

@@ -0,0 +1,46 @@
+import {
+  AwilixContainer,
+  BuildResolver,
+  createContainer,
+  DisposableResolver,
+  InjectionMode,
+} from 'awilix';
+import { ColorModule } from './color/color.module';
+import { ThemeModule } from './theme/theme.module';
+import { AppModule } from './app.module';
+import { ConfigModule } from './config/config.module';
+import { PluginModule } from './plugin/plugin.module';
+
+export type Module = Record<
+  string,
+  BuildResolver<any> & DisposableResolver<any>
+>;
+
+export function importContainer(
+  container: AwilixContainer,
+  services: Module[]
+) {
+  services.forEach((service) => {
+    Object.entries(service).forEach(([name, serviceClass]) => {
+      container.register(name, serviceClass);
+    });
+  });
+  return container;
+}
+
+const AppContainer = createContainer({
+  injectionMode: InjectionMode.PROXY,
+});
+
+importContainer(AppContainer, [
+  ConfigModule,
+  AppModule,
+  PluginModule,
+  ColorModule,
+  ThemeModule,
+]);
+
+// AppContainer.register(ColorModule.cradle);
+// AppContainer.register(ThemeModule.cradle);
+
+export default AppContainer;

package/src/app.module.ts

@@ -1,10 +1,7 @@
-import { Module } from '@nestjs/common';
+import { asClass } from 'awilix';
 import { AppService } from './app.service';
-import { ColorModule } from './color/color.module';
-import { ThemeModule } from './theme/theme.module';
+import { Module } from './app.container';
 
-@Module({
-  imports: [ColorModule, ThemeModule],
-  providers: [AppService],
-})
-export class AppModule {}
+export const AppModule: Module = {
+  appService: asClass(AppService).singleton(),
+};

package/src/app.service.spec.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { AppService } from '../src/app.service';
-import { AppModule } from '../src/app.module';
+import { AppModule } from './app.container';
 
 describe('AppController (e2e)', () => {
   let appService: AppService;

package/src/app.service.ts

@@ -1,11 +1,23 @@
-import { Injectable } from '@nestjs/common';
-import { ColorService } from './color/color.service';
-import { ThemeService } from './theme/services/theme.service';
+import { ColorService } from './color';
+import { ThemeService } from './theme';
+import { PluginService } from './plugin/plugin.service';
 
-@Injectable()
 export class AppService {
-  constructor(
-    public colorService: ColorService,
-    public themeService: ThemeService
-  ) {}
+  public colorService: ColorService;
+  public themeService: ThemeService;
+  public pluginService: PluginService;
+
+  constructor({
+    colorService,
+    themeService,
+    pluginService,
+  }: {
+    colorService: ColorService;
+    themeService: ThemeService;
+    pluginService: PluginService;
+  }) {
+    this.pluginService = pluginService;
+    this.colorService = colorService;
+    this.themeService = themeService;
+  }
 }

package/src/color/color.interface.ts

@@ -9,7 +9,5 @@ export interface ColorInterface {
 
   updateColor(key: string, newColor: ColorOptions): ColorEntity;
 
-  getAllColors(): ReadonlyMap<string, ColorEntity>;
-
-  addColors(colors: Record<string, ColorOptions>): ColorEntity[];
+  getColors(): ReadonlyMap<string, ColorEntity>;
 }

package/src/color/color.module.ts

@@ -1,11 +1,9 @@
-import { ColorService } from './color.service';
-import { Module } from '@nestjs/common';
-import { ColorManagerService } from './color-manager.service';
-import { ThemeModule } from '../theme/theme.module';
+import { ColorService } from './services/color.service';
+import { ColorManagerService } from './services/color-manager.service';
+import { asClass } from 'awilix';
+import { Module } from '../app.container';
 
-@Module({
-  imports: [ThemeModule],
-  providers: [ColorService, ColorManagerService],
-  exports: [ColorService],
-})
-export class ColorModule {}
+export const ColorModule: Module = {
+  colorManagerService: asClass(ColorManagerService).singleton(),
+  colorService: asClass(ColorService).singleton(),
+};

package/src/color/entities/color.entity.ts

@@ -3,7 +3,7 @@ import { SchemeEntity } from '../../theme/entities/scheme.entity';
 import { DynamicColor } from '../../material-color-utilities/dynamic_color';
 import { ContrastCurve } from '../../material-color-utilities';
 import { SchemeService } from '../../theme/services/scheme.service';
-import { ColorManagerService } from '../color-manager.service';
+import { ColorManagerService } from '../services/color-manager.service';
 
 export interface ColorOptions {
   palette: (scheme: SchemeEntity) => TonalPalette;
@@ -21,6 +21,14 @@ export interface ColorOptions {
   };
 }
 
+function argbToRgb(argb: number): { r: number; g: number; b: number } {
+  return {
+    r: (argb >> 16) & 0xff,
+    g: (argb >> 8) & 0xff,
+    b: argb & 0xff,
+  };
+}
+
 export class ColorEntity {
   private dynamicColor: DynamicColor | null = null;
 
@@ -43,6 +51,10 @@ export class ColorEntity {
     return this.getDynamicColor().getArgb(this.schemeService.get());
   }
 
+  getRgb() {
+    return argbToRgb(this.getArgb());
+  }
+
   getName(): string {
     return this.option.name.replace(/([A-Z])/g, '_$1').toLowerCase();
   }

package/src/color/entities/index.ts

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

package/src/color/index.ts

@@ -0,0 +1,5 @@
+export * from './color.interface';
+export * from './color.module';
+export * from './entities';
+export * from './models';
+export * from './services';