@loomcore/common 0.0.34 → 0.0.35

package/dist/models/entity.model.d.ts

@@ -1,7 +1,9 @@
-import { TSchema, TString, TNumber } from '@sinclair/typebox';
-export interface IEntity<TId extends string | number = string> {
-    _id: TId;
-    _orgId?: TId;
+import { AppId } from '../types/app.types.js';
+export interface IEntity {
+    _id: AppId;
+    _orgId?: AppId;
 }
-export declare let EntitySchema: TSchema;
-export declare const createEntitySchema: (idType: TString | TNumber) => TSchema;
+export declare const EntitySchema: import("@sinclair/typebox").TObject<{
+    _id: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TNumber]>;
+    _orgId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnsafe<unknown>>;
+}>;

package/dist/models/entity.model.js

@@ -1,12 +1,6 @@
 import { Type } from '@sinclair/typebox';
-export let EntitySchema;
-export const createEntitySchema = (idType) => {
-    const orgIdType = idType.kind === 'String'
-        ? Type.String({ ...idType, title: 'Organization ID' })
-        : Type.Number({ ...idType, title: 'Organization ID' });
-    EntitySchema = Type.Object({
-        _id: idType,
-        _orgId: Type.Optional(orgIdType)
-    });
-    return EntitySchema;
-};
+import { IdSchema } from '../validation/id-schema.provider.js';
+export const EntitySchema = Type.Object({
+    _id: IdSchema,
+    _orgId: Type.Optional(Type.Unsafe({ ...IdSchema, title: 'Organization ID' }))
+});

package/dist/types/app.types.d.ts

@@ -0,0 +1,4 @@
+export interface AppIdType {
+    id: string | number;
+}
+export type AppId = AppIdType['id'];

package/dist/types/app.types.js

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

package/dist/validation/id-schema.provider.d.ts

@@ -0,0 +1 @@
+export declare const IdSchema: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TNumber]>;

package/dist/validation/id-schema.provider.js

@@ -0,0 +1,5 @@
+import { Type } from '@sinclair/typebox';
+export const IdSchema = Type.Union([
+    Type.String({ title: 'ID' }),
+    Type.Number({ title: 'ID' })
+]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/common",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "private": false,
   "description": "Loom Core Models- common models, interfaces, types, and utils for Loom Core. All things common to both api and client apps.",
   "scripts": {