@twin.org/entity 0.0.1-next.2 → 0.0.1-next.21

package/dist/cjs/index.cjs

@@ -61,7 +61,7 @@ function property(options) {
         const entitySchema = DecoratorHelper.getSchema(target);
         entitySchema.properties ??= [];
         const idx = entitySchema.properties.findIndex(p => p.property === propertyKey);
-        if (idx >= 0) {
+        if (idx !== -1) {
             entitySchema.properties[idx] = {
                 ...options,
                 property: propertyKey
@@ -572,7 +572,9 @@ class EntitySorter {
      */
     static compare(entity1, entity2, prop, type, direction = SortDirection.Ascending) {
         let res = 0;
-        if (!core.Is.empty(entity1[prop]) && !core.Is.empty(entity2[prop])) {
+        const hasProp1 = !core.Is.empty(entity1[prop]);
+        const hasProp2 = !core.Is.empty(entity2[prop]);
+        if (hasProp1 && hasProp2) {
             if (type === "number" || type === "integer") {
                 res = entity1[prop] - entity2[prop];
             }
@@ -593,6 +595,12 @@ class EntitySorter {
                 res = entity1[prop].localeCompare(entity2[prop]);
             }
         }
+        else if (hasProp1) {
+            res = -1;
+        }
+        else {
+            res = 1;
+        }
         return direction === SortDirection.Ascending ? res : res * -1;
     }
 }

package/dist/esm/index.mjs

@@ -59,7 +59,7 @@ function property(options) {
         const entitySchema = DecoratorHelper.getSchema(target);
         entitySchema.properties ??= [];
         const idx = entitySchema.properties.findIndex(p => p.property === propertyKey);
-        if (idx >= 0) {
+        if (idx !== -1) {
             entitySchema.properties[idx] = {
                 ...options,
                 property: propertyKey
@@ -570,7 +570,9 @@ class EntitySorter {
      */
     static compare(entity1, entity2, prop, type, direction = SortDirection.Ascending) {
         let res = 0;
-        if (!Is.empty(entity1[prop]) && !Is.empty(entity2[prop])) {
+        const hasProp1 = !Is.empty(entity1[prop]);
+        const hasProp2 = !Is.empty(entity2[prop]);
+        if (hasProp1 && hasProp2) {
             if (type === "number" || type === "integer") {
                 res = entity1[prop] - entity2[prop];
             }
@@ -591,6 +593,12 @@ class EntitySorter {
                 res = entity1[prop].localeCompare(entity2[prop]);
             }
         }
+        else if (hasProp1) {
+            res = -1;
+        }
+        else {
+            res = 1;
+        }
         return direction === SortDirection.Ascending ? res : res * -1;
     }
 }

package/docs/changelog.md

@@ -1,5 +1,5 @@
 # @twin.org/entity - Changelog
 
-## 0.0.1-next.1
+## 0.0.1-next.21
 
 - Initial Release

package/docs/reference/classes/DecoratorHelper.md

@@ -26,7 +26,9 @@ Get the schema from the reflection metadata.
 
 #### Parameters
 
-• **target**: `any`
+##### target
+
+`any`
 
 The object to get the schema data from.
 
@@ -50,11 +52,15 @@ Set the schema from the reflection metadata.
 
 #### Parameters
 
-• **target**: `any`
+##### target
+
+`any`
 
 The object to get the schema data from.
 
-• **entitySchema**: [`IEntitySchema`](../interfaces/IEntitySchema.md)\<`T`\>
+##### entitySchema
+
+[`IEntitySchema`](../interfaces/IEntitySchema.md)\<`T`\>
 
 The schema to set.
 

package/docs/reference/classes/EntityConditions.md

@@ -26,11 +26,15 @@ See if the entity matches the conditions.
 
 #### Parameters
 
-• **entity**: `T`
+##### entity
+
+`T`
 
 The entity to test.
 
-• **condition?**: [`EntityCondition`](../type-aliases/EntityCondition.md)\<`T`\>
+##### condition?
+
+[`EntityCondition`](../type-aliases/EntityCondition.md)\<`T`\>
 
 The conditions to test.
 
@@ -54,11 +58,15 @@ See if the entity matches the conditions.
 
 #### Parameters
 
-• **entity**: `T`
+##### entity
+
+`T`
 
 The entity to test.
 
-• **comparator**: [`IComparator`](../interfaces/IComparator.md)
+##### comparator
+
+[`IComparator`](../interfaces/IComparator.md)
 
 The condition to test.
 

package/docs/reference/classes/EntitySchemaHelper.md

@@ -26,7 +26,9 @@ Get the schema for the specified object.
 
 #### Parameters
 
-• **target**: `any`
+##### target
+
+`any`
 
 The object to get the schema data for.
 
@@ -50,7 +52,9 @@ Get the primary key from the entity schema.
 
 #### Parameters
 
-• **entitySchema**: [`IEntitySchema`](../interfaces/IEntitySchema.md)\<`T`\>
+##### entitySchema
+
+[`IEntitySchema`](../interfaces/IEntitySchema.md)\<`T`\>
 
 The entity schema to find the primary key from.
 
@@ -78,7 +82,9 @@ Get the sort properties from the schema.
 
 #### Parameters
 
-• **entitySchema**: [`IEntitySchema`](../interfaces/IEntitySchema.md)\<`T`\>
+##### entitySchema
+
+[`IEntitySchema`](../interfaces/IEntitySchema.md)\<`T`\>
 
 The entity schema to find the primary key from.
 
@@ -102,11 +108,15 @@ Build sort properties from the schema and override if necessary.
 
 #### Parameters
 
-• **entitySchema**: [`IEntitySchema`](../interfaces/IEntitySchema.md)\<`T`\>
+##### entitySchema
+
+[`IEntitySchema`](../interfaces/IEntitySchema.md)\<`T`\>
 
 The entity schema to retrieve the default sort keys.
 
-• **overrideSortKeys?**: `object`[]
+##### overrideSortKeys?
+
+`object`[]
 
 The override sort keys.
 

package/docs/reference/classes/EntitySorter.md

@@ -26,11 +26,15 @@ Sort a list of entities using multiple keys and direction.
 
 #### Parameters
 
-• **entities**: `T`[]
+##### entities
+
+`T`[]
 
 The list of entities.
 
-• **entitySorters?**: [`IEntitySort`](../interfaces/IEntitySort.md)\<`T`\>[]
+##### entitySorters?
+
+[`IEntitySort`](../interfaces/IEntitySort.md)\<`T`\>[]
 
 The sort keys to use.
 
@@ -54,23 +58,33 @@ Compare two properties.
 
 #### Parameters
 
-• **entity1**: `T`
+##### entity1
+
+`T`
 
 The first entity.
 
-• **entity2**: `T`
+##### entity2
+
+`T`
 
 The second entity.
 
-• **prop**: keyof `T`
+##### prop
+
+keyof `T`
 
 The property to compare.
 
-• **type**: [`EntitySchemaPropertyType`](../type-aliases/EntitySchemaPropertyType.md)
+##### type
+
+[`EntitySchemaPropertyType`](../type-aliases/EntitySchemaPropertyType.md)
 
 The type of the property.
 
-• **direction**: [`SortDirection`](../type-aliases/SortDirection.md) = `SortDirection.Ascending`
+##### direction
+
+[`SortDirection`](../type-aliases/SortDirection.md) = `SortDirection.Ascending`
 
 The direction of the sort.
 

package/docs/reference/functions/entity.md

@@ -6,7 +6,9 @@ Decorator to produce schema data for entity.
 
 ## Parameters
 
-• **options?**: [`IEntitySchemaOptions`](../interfaces/IEntitySchemaOptions.md)
+### options?
+
+[`IEntitySchemaOptions`](../interfaces/IEntitySchemaOptions.md)
 
 The options for the entity.
 

package/docs/reference/functions/property.md

@@ -6,7 +6,9 @@ Decorator to produce schema property data for entities.
 
 ## Parameters
 
-• **options**: `Omit`\<[`IEntitySchemaProperty`](../interfaces/IEntitySchemaProperty.md)\<`unknown`\>, `"property"`\>
+### options
+
+`Omit`\<[`IEntitySchemaProperty`](../interfaces/IEntitySchemaProperty.md), `"property"`\>
 
 The options for the property.
 

package/docs/reference/variables/EntitySchemaFactory.md

@@ -1,5 +1,5 @@
 # Variable: EntitySchemaFactory
 
-> `const` **EntitySchemaFactory**: `Factory`\<[`IEntitySchema`](../interfaces/IEntitySchema.md)\<`unknown`\>\>
+> `const` **EntitySchemaFactory**: `Factory`\<[`IEntitySchema`](../interfaces/IEntitySchema.md)\>
 
 Factory for creating entity schemas.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/entity",
-	"version": "0.0.1-next.2",
+	"version": "0.0.1-next.21",
 	"description": "Helpers for defining and working with entities",
 	"repository": {
 		"type": "git",
@@ -13,37 +13,11 @@
 	"engines": {
 		"node": ">=20.0.0"
 	},
-	"scripts": {
-		"clean": "rimraf dist coverage",
-		"build": "tspc",
-		"test": "vitest --run --config ./vitest.config.ts --no-cache",
-		"coverage": "vitest --run --coverage --config ./vitest.config.ts --no-cache",
-		"bundle:esm": "rollup --config rollup.config.mjs --environment MODULE:esm",
-		"bundle:cjs": "rollup --config rollup.config.mjs --environment MODULE:cjs",
-		"bundle": "npm run bundle:esm && npm run bundle:cjs",
-		"docs:clean": "rimraf docs/reference",
-		"docs:generate": "typedoc",
-		"docs": "npm run docs:clean && npm run docs:generate",
-		"dist": "npm run clean && npm run build && npm run test && npm run bundle && npm run docs"
-	},
 	"dependencies": {
+		"@twin.org/core": "0.0.1-next.21",
 		"@twin.org/nameof": "next",
-		"@twin.org/core": "0.0.1-next.2",
 		"reflect-metadata": "0.2.2"
 	},
-	"devDependencies": {
-		"@twin.org/nameof-transformer": "next",
-		"@vitest/coverage-v8": "2.1.1",
-		"copyfiles": "2.4.1",
-		"rimraf": "6.0.1",
-		"rollup": "4.21.3",
-		"rollup-plugin-typescript2": "0.36.0",
-		"ts-patch": "3.2.1",
-		"typedoc": "0.26.7",
-		"typedoc-plugin-markdown": "4.2.7",
-		"typescript": "5.6.2",
-		"vitest": "2.1.1"
-	},
 	"main": "./dist/cjs/index.cjs",
 	"module": "./dist/esm/index.mjs",
 	"types": "./dist/types/index.d.ts",
@@ -53,7 +27,7 @@
 			"import": "./dist/esm/index.mjs",
 			"types": "./dist/types/index.d.ts"
 		},
-		"./locales": "./locales"
+		"./locales/*.json": "./locales/*.json"
 	},
 	"files": [
 		"dist/cjs",