objectmodel 4.4.2 → 4.4.4

package/test/map-model.test-d.ts

@@ -1,4 +1,4 @@
-import {expectType} from 'tsd';
+import {expectError, expectType} from 'tsd';
 import { ObjectModel } from '../src/object-model';
 import { MapModel } from '../src/map-model';
 
@@ -18,4 +18,9 @@ expectType<Map<string | number | { ref: string }, Date | string | { date: Date }
     ["a", new Date()],
     [2, "b"],
     [{ ref: "c"}, { date: new Date() }]
-]))
+]))
+
+const M = MapModel(Number, String).defaultTo(new Map([[1, "first"]]))
+expectType<Map<number, string>>(new M())
+expectError(MapModel(Number, String).defaultTo("not a map"))
+expectError(M("not a map"))

package/test/object-model.test-d.ts

@@ -50,4 +50,33 @@ ann = new ClassMother({ name: "Ann", child: joanna })
 
 expectType<ClassMother>(ann)
 expectType<string>(ann.name)
-expectType<ClassPerson>(ann.child)
+expectType<ClassPerson>(ann.child)
+
+const FileInfo = ObjectModel({
+	name: String,
+	size: [Number],
+	creationDate: [Date],
+	writable: Boolean
+}).defaultTo({
+	name: "Untitled file",
+	size: 0,
+	writable: true
+});
+
+expectType<{
+	name: string,
+	size: number,
+	writable: true
+}>(new FileInfo())
+
+expectType<{
+	name: string,
+	size: number,
+	writable: boolean,
+	creationDate: Date
+}>(new FileInfo({
+	name: "My file",
+	size: 100,
+	writable: false,
+	creationDate: new Date()
+}))

package/test/set-model.spec.cjs

@@ -148,6 +148,15 @@ QUnit.test("defaults values", function (assert) {
 
 })
 
+QUnit.test("validate defaut values provided", function (assert) {
+	assert.throws(function () {
+		SetModel(Number).defaultTo()
+	}, /TypeError.*expecting Set of Number, got undefined*/, "invalid default value provided: undefined");
+	assert.throws(function () {
+		SetModel(Number).defaultTo(new Set(["foo", "bar"]))
+	}, /TypeError.*expecting Set value to be Number, got String \"foo\"*/, "invalid default value provided: wrong type");	
+})
+
 QUnit.test("assertions", function (assert) {
 
 	const SetMax3 = SetModel(String).assert(function maxEntries(set) {

package/test/set-model.test-d.ts

@@ -1,4 +1,4 @@
-import {expectType} from 'tsd';
+import {expectError, expectType} from 'tsd';
 import { ObjectModel } from '../src/object-model';
 import { SetModel } from '../src/set-model';
 
@@ -14,4 +14,9 @@ expectType<Set<{ answer: number } | string | boolean>>(Quiz(new Set()));
 
 const SetModel1 = SetModel(String)
 const SetModel2 = SetModel1.extend(Date, Number)
-expectType<Set<string | Date | number>>(SetModel2([1,"2",new Date()]))
+expectType<Set<string | Date | number>>(SetModel2([1,"2",new Date()]))
+
+const S = SetModel(Number).defaultTo(new Set([1,2,3]))
+expectType<Set<number>>(S())
+expectError(SetModel(Number).defaultTo("not a set"))
+expectError(S("not a number"))