@loomcore/common 0.0.38 → 0.0.40

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

@@ -1,16 +1,17 @@
+import { AppId } from '../types/app.types.js';
 export interface IAuditable {
     _created: Date;
-    _createdBy: string;
+    _createdBy: AppId;
     _updated: Date;
-    _updatedBy: string;
+    _updatedBy: AppId;
     _deleted?: Date;
-    _deletedBy?: string;
+    _deletedBy?: AppId;
 }
 export declare const AuditableSchema: import("@sinclair/typebox").TObject<{
     _created: import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>;
-    _createdBy: import("@sinclair/typebox").TString;
+    _createdBy: import("@sinclair/typebox").TSchema;
     _updated: import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>;
-    _updatedBy: import("@sinclair/typebox").TString;
+    _updatedBy: import("@sinclair/typebox").TSchema;
     _deleted: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>>;
-    _deletedBy: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    _deletedBy: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TSchema>;
 }>;

package/dist/models/auditable.model.js

@@ -1,10 +1,11 @@
 import { Type } from '@sinclair/typebox';
-import { TypeboxIsoDate } from '../validation/index.js';
+import { getIdSchema, TypeboxIsoDate } from '../validation/index.js';
+const idSchema = getIdSchema();
 export const AuditableSchema = Type.Object({
     _created: TypeboxIsoDate(),
-    _createdBy: Type.String(),
+    _createdBy: idSchema,
     _updated: TypeboxIsoDate(),
-    _updatedBy: Type.String(),
+    _updatedBy: idSchema,
     _deleted: Type.Optional(TypeboxIsoDate()),
-    _deletedBy: Type.Optional(Type.String()),
+    _deletedBy: Type.Optional(idSchema),
 });

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

@@ -4,6 +4,6 @@ export interface IEntity {
     _orgId?: AppId;
 }
 export declare const EntitySchema: import("@sinclair/typebox").TObject<{
-    _id: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TNumber]>;
+    _id: import("@sinclair/typebox").TSchema;
     _orgId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnsafe<unknown>>;
 }>;

package/dist/models/entity.model.js

@@ -1,6 +1,7 @@
 import { Type } from '@sinclair/typebox';
-import { IdSchema } from '../validation/id-schema.provider.js';
+import { getIdSchema } from '../validation/typebox-extensions.js';
+const idSchema = getIdSchema();
 export const EntitySchema = Type.Object({
-    _id: IdSchema,
-    _orgId: Type.Optional(Type.Unsafe({ ...IdSchema, title: 'Organization ID' }))
+    _id: idSchema,
+    _orgId: Type.Optional(Type.Unsafe({ ...idSchema, title: 'Organization ID' }))
 });

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

@@ -1,6 +1,7 @@
 import { IAuditable } from './auditable.model.js';
+import { AppId } from '../types/app.types.js';
 export interface IOrganization extends IAuditable {
-    _id: string;
+    _id: AppId;
     name: string;
     code: string;
     description?: string;
@@ -9,7 +10,7 @@ export interface IOrganization extends IAuditable {
     authToken?: string;
 }
 export declare const OrganizationSchema: import("@sinclair/typebox").TObject<{
-    _id: import("@sinclair/typebox").TString;
+    _id: import("@sinclair/typebox").TSchema;
     name: import("@sinclair/typebox").TString;
     code: import("@sinclair/typebox").TString;
     description: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;

package/dist/models/organization.model.js

@@ -1,9 +1,9 @@
 import { Type } from '@sinclair/typebox';
 import { entityUtils } from '../utils/index.js';
+import { getIdSchema } from '../validation/index.js';
+const idSchema = getIdSchema();
 export const OrganizationSchema = Type.Object({
-    _id: Type.String({
-        title: 'ID'
-    }),
+    _id: idSchema,
     name: Type.String({
         title: 'Name'
     }),
@@ -24,4 +24,4 @@ export const OrganizationSchema = Type.Object({
         title: 'Authentication Token'
     }))
 });
-export const OrganizationSpec = entityUtils.getModelSpec(OrganizationSchema, { isAuditable: true });
+export const OrganizationSpec = entityUtils.getModelSpec(OrganizationSchema, { isAuditable: true, isEntity: false });

package/dist/utils/entity.utils.d.ts

@@ -6,6 +6,7 @@ import { IModelSpec } from '../models/model-spec.interface.js';
 declare function getValidator(schema: TSchema): ReturnType<typeof TypeCompiler.Compile>;
 declare function getModelSpec<T extends TSchema>(schema: T, options?: {
     isAuditable?: boolean;
+    isEntity?: boolean;
 }): IModelSpec;
 declare function validate(validator: ReturnType<typeof TypeCompiler.Compile>, data: unknown): ValueError[] | null;
 declare function handleValidationResult(validationErrors: ValueError[] | null, methodName: string): void;

package/dist/utils/entity.utils.js

@@ -9,11 +9,14 @@ function getValidator(schema) {
     return validator;
 }
 function getModelSpec(schema, options = {}) {
+    const { isAuditable = false, isEntity = true } = options;
     const partialSchema = Type.Partial(schema);
     const schemasToIntersect = [];
     schemasToIntersect.push(schema);
-    schemasToIntersect.push(EntitySchema);
-    if (options.isAuditable) {
+    if (isEntity) {
+        schemasToIntersect.push(EntitySchema);
+    }
+    if (isAuditable) {
         schemasToIntersect.push(AuditableSchema);
     }
     const fullSchema = Type.Intersect(schemasToIntersect);

package/dist/validation/typebox-extensions.d.ts

@@ -1,4 +1,6 @@
 import { Kind, TSchema, NumberOptions } from '@sinclair/typebox';
+export declare const setIdSchema: (schema: TSchema) => void;
+export declare const getIdSchema: () => TSchema;
 export declare function TypeboxIsoDate(options?: object): import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>;
 export declare function TypeboxDate(options?: object): import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>;
 export declare function TypeboxObjectId(options?: object): import("@sinclair/typebox").TString;

package/dist/validation/typebox-extensions.js

@@ -2,6 +2,22 @@ import { Type, Kind, ValueGuard } from '@sinclair/typebox';
 import { TypeRegistry } from '@sinclair/typebox';
 import { Decimal as _Decimal } from 'decimal.js';
 import { Value } from '@sinclair/typebox/value';
+let idSchemaInstance;
+export const setIdSchema = (schema) => {
+    if (idSchemaInstance) {
+        throw new Error('IdSchema has already been initialized and cannot be set again.');
+    }
+    if (!schema) {
+        throw new Error('Schema cannot be null or undefined.');
+    }
+    idSchemaInstance = schema;
+};
+export const getIdSchema = () => {
+    if (!idSchemaInstance) {
+        throw new Error('IdSchema has not been initialized. Please call setIdSchema() at application startup.');
+    }
+    return idSchemaInstance;
+};
 export function TypeboxIsoDate(options = {}) {
     const dateTransform = Type.Transform(Type.String({ format: 'date-time', ...options }))
         .Decode(value => new Date(value))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/common",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "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": {

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

@@ -1,2 +0,0 @@
-export declare let IdSchema: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TNumber]>;
-export declare function setIdSchema(schema: typeof IdSchema): void;

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

@@ -1,8 +0,0 @@
-import { Type } from '@sinclair/typebox';
-export let IdSchema = Type.Union([
-    Type.String({ title: 'ID' }),
-    Type.Number({ title: 'ID', integer: true, minimum: 1 })
-]);
-export function setIdSchema(schema) {
-    IdSchema = schema;
-}