Merge pull request #75 from xpepermint/master

Consolidate createModelClass interfaces
rawmodel · Sep 27, 2019 · 270ba24 · 270ba24
2 parents aabfeed + 16ba51c
commit 270ba24
Show file tree

Hide file tree

Showing 24 changed files with 104 additions and 41 deletions.
diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -2,7 +2,7 @@
   {
     "policyName": "patchAll",
     "definitionName": "lockStepVersion",
-    "version": "3.1.0",
+    "version": "3.2.0",
     "nextBump": "patch"
   }
 ]
diff --git a/packages/rawmodel-core/CHANGELOG.json b/packages/rawmodel-core/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@rawmodel/core",
   "entries": [
+    {
+      "version": "3.2.0",
+      "tag": "@rawmodel/core_v3.2.0",
+      "date": "Fri, 27 Sep 2019 23:06:25 GMT",
+      "comments": {}
+    },
     {
       "version": "3.1.0",
       "tag": "@rawmodel/core_v3.1.0",

diff --git a/packages/rawmodel-core/CHANGELOG.md b/packages/rawmodel-core/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rawmodel/core
 
-This log was last generated on Fri, 27 Sep 2019 22:48:59 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Sep 2019 23:06:25 GMT and should not be manually modified.
+
+## 3.2.0
+Fri, 27 Sep 2019 23:06:25 GMT
+
+*Version update only*
 
 ## 3.1.0
 Fri, 27 Sep 2019 22:48:59 GMT

diff --git a/packages/rawmodel-core/package.json b/packages/rawmodel-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rawmodel/core",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Strongly-typed JavaScript object with support for validation and error handling.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -84,13 +84,13 @@
   "devDependencies": {
     "@hayspec/cli": "^0.8.4",
     "@hayspec/spec": "^0.8.4",
-    "@rawmodel/parsers": "3.1.0",
+    "@rawmodel/parsers": "3.2.0",
     "nyc": "^14.1.1",
     "ts-node": "^8.3.0",
     "tslint": "^5.18.0",
     "typescript": "^3.5.3"
   },
   "dependencies": {
-    "@rawmodel/utils": "3.1.0"
+    "@rawmodel/utils": "3.2.0"
   }
 }
diff --git a/packages/rawmodel-core/src/core/builder.ts b/packages/rawmodel-core/src/core/builder.ts
@@ -15,7 +15,7 @@ export function createModelClass(props: PropDefinition[]): typeof Model {
   });
 
   props.forEach((prop) => {
-    Klass.$props[prop.name] = { ...prop.prop };
+    Klass.$props[prop.name] = { ...prop };
   });
 
   return Klass;

diff --git a/packages/rawmodel-core/src/core/types.ts b/packages/rawmodel-core/src/core/types.ts
@@ -52,9 +52,8 @@ export interface PropConfig {
 /**
  * Model property class configuration object.
  */
-export interface PropDefinition {
+export interface PropDefinition extends PropConfig {
   name: string;
-  prop?: PropConfig;
 }
 
 /**

diff --git a/packages/rawmodel-core/src/tests/core/builder/create-model-class-method.test.ts b/packages/rawmodel-core/src/tests/core/builder/create-model-class-method.test.ts
@@ -15,16 +15,14 @@ spec.test('generates model with properties', (ctx) => {
     },
     {
       name: 'book',
-      prop: {
-        parse: {
-          resolver: createModelClass([
-            {
-              name: 'title',
-            }
-          ]),
-        },
-      }
-    }
+      parse: {
+        resolver: createModelClass([
+          {
+            name: 'title',
+          }
+        ]),
+      },
+    },
   ]);
   const data = {
     name: 'foo',

diff --git a/packages/rawmodel-handlers/CHANGELOG.json b/packages/rawmodel-handlers/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@rawmodel/handlers",
   "entries": [
+    {
+      "version": "3.2.0",
+      "tag": "@rawmodel/handlers_v3.2.0",
+      "date": "Fri, 27 Sep 2019 23:06:25 GMT",
+      "comments": {}
+    },
     {
       "version": "3.1.0",
       "tag": "@rawmodel/handlers_v3.1.0",

diff --git a/packages/rawmodel-handlers/CHANGELOG.md b/packages/rawmodel-handlers/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rawmodel/handlers
 
-This log was last generated on Fri, 27 Sep 2019 22:48:59 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Sep 2019 23:06:25 GMT and should not be manually modified.
+
+## 3.2.0
+Fri, 27 Sep 2019 23:06:25 GMT
+
+*Version update only*
 
 ## 3.1.0
 Fri, 27 Sep 2019 22:48:59 GMT

diff --git a/packages/rawmodel-handlers/package.json b/packages/rawmodel-handlers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rawmodel/handlers",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "General property error handlers for RawModel.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/rawmodel-parsers/CHANGELOG.json b/packages/rawmodel-parsers/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@rawmodel/parsers",
   "entries": [
+    {
+      "version": "3.2.0",
+      "tag": "@rawmodel/parsers_v3.2.0",
+      "date": "Fri, 27 Sep 2019 23:06:25 GMT",
+      "comments": {}
+    },
     {
       "version": "3.1.0",
       "tag": "@rawmodel/parsers_v3.1.0",

diff --git a/packages/rawmodel-parsers/CHANGELOG.md b/packages/rawmodel-parsers/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rawmodel/parsers
 
-This log was last generated on Fri, 27 Sep 2019 22:48:59 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Sep 2019 23:06:25 GMT and should not be manually modified.
+
+## 3.2.0
+Fri, 27 Sep 2019 23:06:25 GMT
+
+*Version update only*
 
 ## 3.1.0
 Fri, 27 Sep 2019 22:48:59 GMT

diff --git a/packages/rawmodel-parsers/package.json b/packages/rawmodel-parsers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rawmodel/parsers",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "General data parsers for RawModel.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -91,6 +91,6 @@
     "typescript": "^3.5.3"
   },
   "dependencies": {
-    "@rawmodel/utils": "3.1.0"
+    "@rawmodel/utils": "3.2.0"
   }
 }
diff --git a/packages/rawmodel-schema/CHANGELOG.json b/packages/rawmodel-schema/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@rawmodel/schema",
   "entries": [
+    {
+      "version": "3.2.0",
+      "tag": "@rawmodel/schema_v3.2.0",
+      "date": "Fri, 27 Sep 2019 23:06:25 GMT",
+      "comments": {}
+    },
     {
       "version": "3.1.0",
       "tag": "@rawmodel/schema_v3.1.0",

diff --git a/packages/rawmodel-schema/CHANGELOG.md b/packages/rawmodel-schema/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rawmodel/schema
 
-This log was last generated on Fri, 27 Sep 2019 22:48:59 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Sep 2019 23:06:25 GMT and should not be manually modified.
+
+## 3.2.0
+Fri, 27 Sep 2019 23:06:25 GMT
+
+*Version update only*
 
 ## 3.1.0
 Fri, 27 Sep 2019 22:48:59 GMT

diff --git a/packages/rawmodel-schema/package.json b/packages/rawmodel-schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rawmodel/schema",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "JSON Schema utils for RawModel.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -84,16 +84,16 @@
   "devDependencies": {
     "@hayspec/cli": "^0.8.4",
     "@hayspec/spec": "^0.8.4",
-    "@rawmodel/handlers": "3.1.0",
-    "@rawmodel/parsers": "3.1.0",
-    "@rawmodel/validators": "3.1.0",
+    "@rawmodel/handlers": "3.2.0",
+    "@rawmodel/parsers": "3.2.0",
+    "@rawmodel/validators": "3.2.0",
     "nyc": "^14.1.1",
     "ts-node": "^8.3.0",
     "tslint": "^5.18.0",
     "typescript": "^3.5.3"
   },
   "dependencies": {
-    "@rawmodel/core": "3.1.0",
-    "@rawmodel/utils": "3.1.0"
+    "@rawmodel/core": "3.2.0",
+    "@rawmodel/utils": "3.2.0"
   }
 }
diff --git a/packages/rawmodel-schema/src/core/types.ts b/packages/rawmodel-schema/src/core/types.ts
@@ -13,13 +13,13 @@ export interface SchemaRecipe {
   parsers?: { [name: string]: (o?: any) => ParserResolver };
   validators?: { [name: string]: (o?: any) => ValidatorResolver };
   handlers?: { [name: string]: (o?: any) => HandlerResolver };
-  props?: PropRecipe[];
+  props?: PropDefinition[];
 }
 
 /**
  * Schema property recipe.
  */
-export interface PropRecipe {
+export interface PropDefinition {
   name: string;
   set?: string;
   get?: string;

diff --git a/packages/rawmodel-utils/CHANGELOG.json b/packages/rawmodel-utils/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@rawmodel/utils",
   "entries": [
+    {
+      "version": "3.2.0",
+      "tag": "@rawmodel/utils_v3.2.0",
+      "date": "Fri, 27 Sep 2019 23:06:25 GMT",
+      "comments": {}
+    },
     {
       "version": "3.1.0",
       "tag": "@rawmodel/utils_v3.1.0",

diff --git a/packages/rawmodel-utils/CHANGELOG.md b/packages/rawmodel-utils/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rawmodel/utils
 
-This log was last generated on Fri, 27 Sep 2019 22:48:59 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Sep 2019 23:06:25 GMT and should not be manually modified.
+
+## 3.2.0
+Fri, 27 Sep 2019 23:06:25 GMT
+
+*Version update only*
 
 ## 3.1.0
 Fri, 27 Sep 2019 22:48:59 GMT

diff --git a/packages/rawmodel-utils/package.json b/packages/rawmodel-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rawmodel/utils",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Shared helpers for RawModel.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/rawmodel-validators/CHANGELOG.json b/packages/rawmodel-validators/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@rawmodel/validators",
   "entries": [
+    {
+      "version": "3.2.0",
+      "tag": "@rawmodel/validators_v3.2.0",
+      "date": "Fri, 27 Sep 2019 23:06:25 GMT",
+      "comments": {}
+    },
     {
       "version": "3.1.0",
       "tag": "@rawmodel/validators_v3.1.0",

diff --git a/packages/rawmodel-validators/CHANGELOG.md b/packages/rawmodel-validators/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rawmodel/validators
 
-This log was last generated on Fri, 27 Sep 2019 22:48:59 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Sep 2019 23:06:25 GMT and should not be manually modified.
+
+## 3.2.0
+Fri, 27 Sep 2019 23:06:25 GMT
+
+*Version update only*
 
 ## 3.1.0
 Fri, 27 Sep 2019 22:48:59 GMT

diff --git a/packages/rawmodel-validators/package.json b/packages/rawmodel-validators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rawmodel/validators",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "General validators for RawModel.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -91,6 +91,6 @@
     "typescript": "^3.5.3"
   },
   "dependencies": {
-    "@rawmodel/utils": "3.1.0"
+    "@rawmodel/utils": "3.2.0"
   }
 }