@syntropix/database 0.0.3 → 0.0.5

package/dist/core/dataClient.d.ts

@@ -2,7 +2,7 @@ import { DeleteData, Insert, Query, Update } from '../types/requests';
 import { ClientConfig } from './config';
 export declare class DataClient {
     private client;
-    constructor(config: ClientConfig);
+    constructor(config?: ClientConfig);
     insertData(data: Insert): Promise<any>;
     insertOne(data: Insert): Promise<any>;
     updateByPrimaryKey(pk: string, data: Update): Promise<any>;

package/dist/core/dataClient.js

@@ -1,7 +1,8 @@
 import { Client } from './client';
+import { ClientConfig } from './config';
 export class DataClient {
     client;
-    constructor(config) {
+    constructor(config = new ClientConfig()) {
         this.client = new Client(config);
     }
     async insertData(data) {

package/dist/core/tableClient.d.ts

@@ -4,7 +4,7 @@ import { TableAddColumn, TableCreate, TableDrop, TableDropColumn, TableGetSchema
 import { ClientConfig } from './config';
 export declare class TableClient {
     private client;
-    constructor(config: ClientConfig);
+    constructor(config?: ClientConfig);
     createTable(data: TableCreate): Promise<TableCreateResponse>;
     dropTable(data: TableDrop): Promise<any>;
     renameTable(data: TableRename): Promise<any>;

package/dist/core/tableClient.js

@@ -1,7 +1,8 @@
 import { Client } from './client';
+import { ClientConfig } from './config';
 export class TableClient {
     client;
-    constructor(config) {
+    constructor(config = new ClientConfig()) {
         this.client = new Client(config);
     }
     async createTable(data) {

package/dist/types/basemodel.d.ts

@@ -51,7 +51,7 @@ export declare class BaseModel {
     static get<T extends BaseModel>(this: new (data?: any) => T, filter: Filter, select?: string[], _client?: SyntropixClient | null): Promise<T>;
     static filter<T extends BaseModel>(this: new (data?: any) => T, options: {
         filter: Filter;
-        sort?: Sort;
+        sort?: Sort[];
         aggregate?: Aggregate[];
         join?: Join;
         limit?: number;

package/dist/types/filter.d.ts

@@ -16,9 +16,13 @@ export declare enum FilterOperation {
     NEQ = "NEQ",
     Between = "Between",
     In = "In",
+    Contains = "Contains",
+    Overlap = "Overlap",
     NotIn = "NotIn",
     Like = "Like",
     NotLike = "NotLike",
+    ILike = "ILike",
+    NotILike = "NotILike",
     IsNull = "IsNull",
     IsNotNull = "IsNotNull",
     Similarity = "Similarity",
@@ -51,6 +55,10 @@ export declare const GTE: (field: string, value: any) => SyntropixDBFilterItem;
 export declare const LT: (field: string, value: any) => SyntropixDBFilterItem;
 export declare const LTE: (field: string, value: any) => SyntropixDBFilterItem;
 export declare const IN: (field: string, values: any[]) => SyntropixDBFilterItem;
+export declare const CONTAINS: (field: string, value: any) => SyntropixDBFilterItem;
+export declare const OVERLAP: (field: string, value: any) => SyntropixDBFilterItem;
+export declare const I_LIKE: (field: string, pattern: string) => SyntropixDBFilterItem;
+export declare const NOT_I_LIKE: (field: string, pattern: string) => SyntropixDBFilterItem;
 export declare const NOT_IN: (field: string, values: any[]) => SyntropixDBFilterItem;
 export declare const LIKE: (field: string, pattern: string) => SyntropixDBFilterItem;
 export declare const NOT_LIKE: (field: string, pattern: string) => SyntropixDBFilterItem;

package/dist/types/filter.js

@@ -14,9 +14,13 @@ export var FilterOperation;
     FilterOperation["NEQ"] = "NEQ";
     FilterOperation["Between"] = "Between";
     FilterOperation["In"] = "In";
+    FilterOperation["Contains"] = "Contains";
+    FilterOperation["Overlap"] = "Overlap";
     FilterOperation["NotIn"] = "NotIn";
     FilterOperation["Like"] = "Like";
     FilterOperation["NotLike"] = "NotLike";
+    FilterOperation["ILike"] = "ILike";
+    FilterOperation["NotILike"] = "NotILike";
     FilterOperation["IsNull"] = "IsNull";
     FilterOperation["IsNotNull"] = "IsNotNull";
     FilterOperation["Similarity"] = "Similarity";
@@ -67,6 +71,26 @@ export const IN = (field, values) => ({
     operator: FilterOperation.In,
     static_value: values,
 });
+export const CONTAINS = (field, value) => ({
+    column: field,
+    operator: FilterOperation.Contains,
+    static_value: value,
+});
+export const OVERLAP = (field, value) => ({
+    column: field,
+    operator: FilterOperation.Overlap,
+    static_value: value,
+});
+export const I_LIKE = (field, pattern) => ({
+    column: field,
+    operator: FilterOperation.ILike,
+    static_value: pattern,
+});
+export const NOT_I_LIKE = (field, pattern) => ({
+    column: field,
+    operator: FilterOperation.NotILike,
+    static_value: pattern,
+});
 export const NOT_IN = (field, values) => ({
     column: field,
     operator: FilterOperation.NotIn,

package/dist/types/requests.d.ts

@@ -1,5 +1,5 @@
 import { Aggregate, Column, ForeignKey, GroupBy, Index, Join, Sort } from './common';
-import { Filter, SortType, SyntropixDBFilter } from './filter';
+import { Filter } from './filter';
 export interface TableCreate {
     name: string;
     description?: string;
@@ -58,7 +58,7 @@ export interface DeleteData {
 }
 export interface QueryPayload {
     filter?: Filter;
-    sort?: Sort;
+    sort?: Sort[];
     aggregate?: Aggregate[];
     join?: Join[];
     limit?: number;
@@ -70,42 +70,3 @@ export interface Query {
     table_name: string;
     query: QueryPayload;
 }
-export interface SyntropixDBSortItem {
-    column: string;
-    direction: SortType;
-}
-export type SyntropixDBSort = SyntropixDBSortItem[];
-export interface SyntropixDBJoin {
-    table: string;
-    on: string;
-}
-export interface SyntropixDBAggregate {
-    function: string;
-    column: string;
-    alias: string;
-}
-export type SyntropixDBGroupBy = string[];
-export type SyntropixDBDistinct = string[];
-export interface SyntropixDBQuery {
-    filter: SyntropixDBFilter;
-    sort?: SyntropixDBSort;
-    limit?: number;
-    offset?: number;
-    select?: string[];
-    join?: SyntropixDBJoin[];
-    aggregate?: SyntropixDBAggregate[];
-    group_by?: SyntropixDBGroupBy;
-    distinct?: SyntropixDBDistinct;
-}
-export interface SyntropixDBInsert {
-    columns: string[];
-    values: any[][];
-}
-export interface SyntropixDBUpdate {
-    filter: SyntropixDBFilter;
-    columns: string[];
-    values: any[];
-}
-export interface SyntropixDBDelete {
-    filter: SyntropixDBFilter;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syntropix/database",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "type": "module",
   "description": "TypeScript SDK for database operations with ORM support",
   "main": "dist/index.js",
@@ -10,11 +10,14 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
     "test": "node --experimental-vm-modules $(yarn bin jest)",
-    "publish": "npm publish --access public",
+    "release": "yarn install && yarn build && npm publish --access public",
     "example": "tsx --tsconfig examples/tsconfig.json examples/usage.ts",
     "lint": "eslint",
     "lint:fix": "eslint --fix",

package/.editorconfig

@@ -1,8 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_size = 2
-indent_style = space
-insert_final_newline = true

package/.env

@@ -1,2 +0,0 @@
-SYNTROPIX_API_KEY = "MrxxQ9nzk9LNSHMTBLGP1YpTVr+sT+sldRYASP0r/v7qPB16Qaksv3GU3ns/viLTyHDVgh1dN1ihtns+GXPu8pR4CjUuqpjXaowI5glQt2VbDXdScRQOkBs4YfJ9HBCts+Ri/32QYeOIjtWYWh52+349zi34rA91btmDw/0yzSv4mG9esygDm2zCSSvSEh/XZY1VhC+97/gxXwKOEVwINI2Twd/DOV3zvmQxfY733Ono1+2qWbLMLY/0rEKDx16eyRlud1PwauZXKzA1VdVpxC6O1RLwVXkfS7LNkr5QxhaWPdQWcbeJ9fPboFFbGNzICs5hBTEBDGnqbSnqwD6CfsqqgVpl5YM1DGzQyfvjb88="
-SYNTROPIX_API_URL = "http://149.248.14.64:8080"

package/.gitattributes

@@ -1,4 +0,0 @@
-/.yarn/**            linguist-vendored
-/.yarn/releases/*    binary
-/.yarn/plugins/**/*  binary
-/.pnp.*              binary linguist-generated

package/.husky/pre-commit

@@ -1 +0,0 @@
-yarn lint-staged

package/.prettierrc

@@ -1,8 +0,0 @@
-{
-  "tabWidth": 2,
-  "useTabs": false,
-  "singleQuote": true,
-  "trailingComma": "all",
-  "printWidth": 120,
-  "plugins": ["prettier-plugin-tailwindcss", "prettier-plugin-organize-imports"]
-}

package/.vscode/settings.json

@@ -1 +0,0 @@
-{}

package/.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules

package/eslint.config.mjs

@@ -1,23 +0,0 @@
-import eslint from '@eslint/js';
-import { defineConfig, globalIgnores } from 'eslint/config';
-import tseslint from 'typescript-eslint';
-
-export default defineConfig([
-  globalIgnores(['dist/**', 'node_modules/**', 'examples/**', 'tests/**', 'jest.config.ts']),
-  eslint.configs.recommended,
-  ...tseslint.configs.recommended,
-  {
-    files: ['**/*.ts', '**/*.tsx'],
-    languageOptions: {
-      parser: tseslint.parser,
-      parserOptions: {
-        project: './tsconfig.json',
-      },
-    },
-    rules: {
-      'no-unused-vars': 'off',
-      '@typescript-eslint/no-unused-vars': 'off',
-      '@typescript-eslint/no-explicit-any': 'off',
-    },
-  },
-]);

package/examples/advanced-usage.ts

@@ -1,214 +0,0 @@
-import 'dotenv/config';
-import { ClientConfig } from '../src/core/config';
-import { SyntropixClient } from '../src/core/syntropix';
-import { BaseModel, Column, ForeignKey } from '../src/types/basemodel';
-import { AND, GTE, OR } from '../src/types/filter';
-
-export class CompanyGroup extends BaseModel {
-  static tableName = 'syntropix_company_groups';
-  static description = 'Company groups';
-
-  @Column({
-    type: 'Integer',
-    primary: true,
-    auto_increment: true,
-    description: 'Group ID',
-  })
-  id!: number;
-
-  @Column({ type: { String: 256 }, description: 'Group Name' })
-  name!: string;
-
-  @Column({ type: 'Text', description: 'Group Description' })
-  description!: string;
-}
-
-export class CompanyGroupMember extends BaseModel {
-  static tableName = 'syntropix_company_group_members';
-  static description = 'Company group members';
-
-  @Column({
-    type: 'Integer',
-    primary: true,
-    auto_increment: true,
-    description: 'Member ID',
-  })
-  id!: number;
-
-  @ForeignKey('syntropix_company_groups', 'id', { description: 'Group ID' })
-  groupId!: number;
-
-  @ForeignKey('syntropix_company_members', 'id', { description: 'Member ID' })
-  memberId!: number;
-}
-
-export class CompanyMember extends BaseModel {
-  static tableName = 'syntropix_company_members';
-  static description = 'Company members';
-
-  @Column({
-    type: 'Integer',
-    primary: true,
-    auto_increment: true,
-    description: 'Member ID',
-  })
-  id!: number;
-
-  @Column({
-    type: { String: 256 },
-    description: 'User id in mongodb',
-    nullable: false,
-    name: 'user_id',
-  })
-  userId!: string;
-
-  @Column({
-    type: { String: 256 },
-    description: 'First Name',
-    nullable: false,
-    name: 'first_name',
-  })
-  firstName!: string;
-  @Column({
-    type: { String: 256 },
-    description: 'Last Name',
-    nullable: false,
-    name: 'last_name',
-  })
-  lastName!: string;
-  @Column({
-    type: { String: 256 },
-    description: 'Middle Name',
-    nullable: true,
-    name: 'middle_name',
-  })
-  middleName!: string | null;
-  @Column({
-    type: { String: 256 },
-    description: 'Email',
-    nullable: false,
-    name: 'email',
-  })
-  email!: string;
-  @Column({
-    type: { String: 256 },
-    description: 'Avatar',
-    nullable: true,
-    name: 'avatar',
-  })
-  avatar!: string | null;
-  @Column({ type: 'Text', description: 'Bio', nullable: true, name: 'bio' })
-  bio!: string;
-  @Column({
-    type: { String: 32 },
-    description: 'Role',
-    nullable: false,
-    name: 'role',
-  })
-  role!: 'admin' | 'user';
-  @Column({
-    type: { String: 256 },
-    description: 'Personal Key',
-    nullable: false,
-    name: 'personal_key',
-  })
-  personalKey!: string;
-}
-
-export class CompanyApiKey extends BaseModel {
-  static tableName = 'syntropix_company_api_keys';
-  static description = 'Company API keys';
-
-  @Column({
-    type: 'Integer',
-    primary: true,
-    auto_increment: true,
-    description: 'API Key ID',
-  })
-  id!: number;
-  @Column({
-    type: { String: 256 },
-    description: 'Name',
-    nullable: false,
-    name: 'name',
-  })
-  name!: string;
-  @Column({
-    type: 'Text',
-    description: 'Description',
-    nullable: true,
-    name: 'description',
-  })
-  description!: string | null;
-  @Column({
-    type: { String: 256 },
-    description: 'Key',
-    nullable: false,
-    name: 'key',
-  })
-  key!: string;
-  @Column({
-    type: 'DateTime',
-    description: 'Created At',
-    nullable: false,
-    name: 'created_at',
-  })
-  createdAt!: Date | string;
-
-  @Column({
-    type: 'Boolean',
-    description: 'Is Personal',
-    nullable: false,
-    name: 'is_personal',
-  })
-  isPersonal!: boolean;
-
-  @ForeignKey('syntropix_company_members', 'id', { description: 'Created By', name: 'created_by' })
-  createdBy!: number;
-}
-
-// Example usage
-async function examples() {
-  const _client = new SyntropixClient(new ClientConfig());
-  console.log(CompanyApiKey.getDescription());
-  const member = await CompanyMember.filter({
-    filter: OR(AND(GTE('id', 0))),
-  });
-  console.log(member);
-  // await CompanyMember.dropTable(_client);
-  // await CompanyApiKey.dropTable(_client);
-  // await CompanyMember.createTable(_client);
-  // await CompanyGroup.createTable(_client);
-  // await CompanyApiKey.createTable(_client);
-  // await CompanyGroupMember.createTable(_client);
-
-  // await CompanyMember.create(
-  //   {
-  //     userId: "1234567890",
-  //     firstName: "John",
-  //     lastName: "Doe",
-  //     middleName: "Doe",
-  //     email: "john.doe@example.com",
-  //     avatar: "https://example.com/avatar.png",
-  //     bio: "",
-  //     role: "admin",
-  //     personalKey: "1234567890",
-  //   },
-  //   _client
-  // );
-
-  // await CompanyApiKey.create(
-  //   {
-  //     name: "Admin API Key for John Doe",
-  //     description: "Admin API Key for John Doe",
-  //     key: "1234567890",
-  //     createdAt: new Date(),
-  //     createdBy: 1,
-  //     isPersonal: true,
-  //   },
-  //   _client
-  // );
-}
-
-// Run examples
-examples().catch(console.error);

package/examples/tsconfig.json

@@ -1,13 +0,0 @@
-// This file is used to let VSCode respect the tsconfig.json for this test folder
-{
-  "extends": "../tsconfig.json",
-  "include": [".", "../src"],
-  "compilerOptions": {
-    "noEmit": true,
-    "baseUrl": ".",
-    "paths": {
-      "@syntropix/database": ["../src/index.ts"],
-      "@syntropix/database/*": ["../src/*"]
-    }
-  }
-}

package/examples/usage.ts

@@ -1,94 +0,0 @@
-import { AND, BaseModel, Column, EQ, IN, OR } from '@syntropix/database';
-import { DataClient } from '@syntropix/database/core/dataClient';
-import { TableClient } from '@syntropix/database/core/tableClient';
-import 'dotenv/config';
-
-class User extends BaseModel {
-  static tableName = 'users';
-
-  @Column({ type: 'Integer', primary: true, auto_increment: true })
-  declare id: number;
-
-  @Column()
-  declare email: string;
-
-  @Column({ name: 'full_name' })
-  declare fullName: string;
-
-  @Column({ type: 'Json', nullable: true })
-  declare profile: any;
-
-  @Column({ type: 'Boolean', name: 'is_active' })
-  declare isActive: boolean;
-}
-
-async function ORMExample() {
-  // Create table
-  // await User.createTable();
-
-  // Create a new user
-  // const newUser = await User.create({
-  //   id: 1,
-  //   email: 'user@example.com',
-  //   fullName: 'John Doe',
-  //   isActive: true,
-  // });
-  // console.log(newUser);
-
-  // // Get a user
-  // const user = await User.get(OR(AND(EQ('email', 'user@example.com'))));
-  // console.log(user);
-
-  // // Update user
-  // user.fullName = 'Jane Doe1';
-  // await user.save();
-
-  // Filter users
-  const activeUsers = await User.filter({
-    filter: OR(AND(IN('email', ['user@example.com', 'user3@example.com']))),
-    limit: 10,
-  });
-
-  console.log(activeUsers);
-
-  // // // Count users
-  // const userCount = await User.count({
-  //   filter: OR(AND(EQ('is_active', true))),
-  // });
-  // console.log(activeUsers);
-  // console.log(userCount);
-  // // // Delete user
-  // await user.remove();
-
-  // // // Bulk create
-  // await User.bulkCreate([
-  //   {
-  //     id: 2,
-  //     email: 'user2@example.com',
-  //     fullName: 'User 2',
-  //     isActive: true,
-  //   },
-  //   {
-  //     id: 3,
-  //     email: 'user3@example.com',
-  //     fullName: 'User 3',
-  //     isActive: false,
-  //   },
-  // ]);
-}
-
-async function ClientExample() {
-  const tableClient = new TableClient();
-  const dataClient = new DataClient();
-  const data = await dataClient.queryMany({
-    table_name: 'users',
-    query: {
-      filter: OR(AND(EQ('is_active', true))),
-    },
-  });
-  console.log(data);
-}
-
-// Run examples
-ORMExample().catch(console.error);
-// ClientExample().catch(console.error);

package/jest.config.ts

@@ -1,9 +0,0 @@
-import type { Config } from 'jest';
-import { createDefaultEsmPreset, pathsToModuleNameMapper } from 'ts-jest';
-
-const presetConfig = createDefaultEsmPreset({});
-
-export default {
-  ...presetConfig,
-  moduleNameMapper: pathsToModuleNameMapper({ '@/*': ['src/*'] }, { prefix: '<rootDir>/' }),
-} satisfies Config;

package/src/core/client.ts

@@ -1,41 +0,0 @@
-import { ClientConfig } from './config';
-
-export class Client {
-  protected config: ClientConfig;
-
-  constructor(config: ClientConfig) {
-    this.config = config;
-  }
-
-  private headers() {
-    return {
-      'Content-Type': 'application/json',
-      Authorization: this.config.apiKey || '',
-    };
-  }
-
-  private url(path: string) {
-    if (path.startsWith('/')) {
-      path = path.slice(1);
-    }
-    return `${this.config.baseUrl}${path}`;
-  }
-
-  public async get(path: string, data: Record<string, any> = {}): Promise<Record<string, any>> {
-    const response = await fetch(this.url(path), {
-      method: 'GET',
-      headers: this.headers(),
-      body: JSON.stringify(data),
-    });
-    return response.json();
-  }
-
-  public async post(path: string, data: Record<string, any> = {}): Promise<Record<string, any>> {
-    const response = await fetch(this.url(path), {
-      method: 'POST',
-      headers: this.headers(),
-      body: JSON.stringify(data),
-    });
-    return response.json();
-  }
-}

package/src/core/config.ts

@@ -1,29 +0,0 @@
-export class ClientConfig {
-  public apiKey?: string;
-  public baseUrl?: string;
-  public timeout?: number;
-  public retries?: number;
-
-  constructor(config?: any) {
-    this.apiKey = config?.apiKey || process.env.SYNTROPIX_API_KEY;
-    this.baseUrl = config?.baseUrl || process.env.SYNTROPIX_API_URL;
-    this.timeout = config?.timeout || process.env.SYNTROPIX_API_TIMEOUT;
-    this.retries = config?.retries || process.env.SYNTROPIX_API_RETRIES;
-
-    if (!this.apiKey || !this.baseUrl) {
-      throw new Error('API key and base URL are required');
-    }
-
-    if (!this.timeout) {
-      this.timeout = 10000;
-    }
-
-    if (!this.retries) {
-      this.retries = 3;
-    }
-
-    if (!this.baseUrl.endsWith('/')) {
-      this.baseUrl += '/';
-    }
-  }
-}