@fxjs/orm
Advanced tools
Comparing version 1.8.0 to 1.8.1
@@ -8,4 +8,3 @@ /// <reference path="model.d.ts" /> | ||
model?: FxOrmModel.Model; | ||
// field?: FxOrmModel.ModelPropertyDefinitionHash | ||
field?: FxOrmProperty.NormalizedFieldOptionsHash | ||
field?: FxOrmProperty.NormalizedPropertyHash | ||
@@ -38,4 +37,4 @@ // is the association is extendsTo | ||
key?: boolean | ||
mergeId?: FxOrmProperty.NormalizedFieldOptionsHash | ||
mergeAssocId?: FxOrmProperty.NormalizedFieldOptionsHash | ||
mergeId?: FxOrmProperty.NormalizedPropertyHash | ||
mergeAssocId?: FxOrmProperty.NormalizedPropertyHash | ||
reverseAssociation?: string | ||
@@ -59,8 +58,8 @@ | ||
// is the association is extendsTo | ||
field: string | FxOrmProperty.NormalizedFieldOptionsHash | ||
field: string | FxOrmProperty.NormalizedPropertyHash | ||
extension?: boolean | ||
mergeId?: FxOrmProperty.NormalizedFieldOptionsHash | ||
mergeAssocId?: FxOrmProperty.NormalizedFieldOptionsHash | ||
mergeId?: FxOrmProperty.NormalizedPropertyHash | ||
mergeAssocId?: FxOrmProperty.NormalizedPropertyHash | ||
mergeTable?: string | ||
@@ -106,4 +105,4 @@ | ||
mergeTable: string | ||
mergeId: FxOrmProperty.NormalizedFieldOptionsHash | ||
mergeAssocId: FxOrmProperty.NormalizedFieldOptionsHash | ||
mergeId: FxOrmProperty.NormalizedPropertyHash | ||
mergeAssocId: FxOrmProperty.NormalizedPropertyHash | ||
@@ -110,0 +109,0 @@ getAccessor: string |
@@ -76,3 +76,3 @@ /// <reference types="@fxjs/sql-query" /> | ||
<T=FxOrmDMLDriver.QueryDataPayload[]>( | ||
fields: FxOrmModel.ModelFieldItem[], | ||
fields: FxSqlQueryColumns.SelectInputArgType[], | ||
table: string, | ||
@@ -79,0 +79,0 @@ conditions: FxSqlQuerySubQuery.SubQueryConditions, |
@@ -73,4 +73,4 @@ /// <reference types="@fxjs/sql-query" /> | ||
(conditions: ModelQueryConditions__Find, callback: ModelMethodCallback__Find): Model | ||
// (conditions: ModelQueryConditions__Find, id: FxOrmNS.IdType): FxOrmQuery.IChainFind | ||
// (conditions: ModelQueryConditions__Find, id: FxOrmNS.IdType, callback: ModelMethodCallback__Get): Model | ||
(conditions: ModelQueryConditions__Find, id: FxOrmNS.IdType): FxOrmQuery.IChainFind | ||
(conditions: ModelQueryConditions__Find, id: FxOrmNS.IdType, callback: ModelMethodCallback__Get): Model | ||
(conditions: ModelQueryConditions__Find, options?: ModelOptions__Find): FxOrmQuery.IChainFind | ||
@@ -249,4 +249,2 @@ (conditions: ModelQueryConditions__Find, options: ModelOptions__Find, callback: ModelMethodCallback__Find): Model | ||
type ModelFieldItem = FxSqlQueryColumns.SelectInputArgType | ||
// @deprecated | ||
@@ -253,0 +251,0 @@ type OrigDetailedModelProperty = FxOrmProperty.NormalizedProperty |
@@ -204,2 +204,9 @@ /// <reference types="fibjs" /> | ||
begin: void; | ||
commit: void; | ||
rollback: void; | ||
trans: { | ||
(fun: Function): void; | ||
} | ||
[extraMember: string]: any; | ||
@@ -206,0 +213,0 @@ } |
@@ -16,23 +16,6 @@ declare namespace FxOrmProperty { | ||
} | ||
/** | ||
* @description useful when pass property's option(such as type, big, ...etc) internally, useless for exposed api. | ||
*/ | ||
interface NormalizedFieldOptions { | ||
key: boolean | ||
type: string | ||
size: number | string | ||
unsigned: boolean | ||
time: boolean | ||
big: boolean | ||
values: any[] | ||
required: boolean | ||
name: string | ||
mapsTo: FxOrmModel.ModelPropertyDefinition['mapsTo'] | ||
} | ||
interface NormalizedFieldOptionsHash { | ||
[k: string]: FxOrmProperty.NormalizedFieldOptions | ||
} | ||
interface NormalizedProperty extends FxOrmModel.ModelPropertyDefinition { | ||
@@ -39,0 +22,0 @@ // all fields inherited from `FxOrmModel.ModelPropertyDefinition` are still optional |
@@ -148,5 +148,5 @@ /// <reference types="@fxjs/sql-query" /> | ||
properties: FxOrmProperty.NormalizedPropertyHash | ||
keyProperties: FxOrmProperty.NormalizedFieldOptions[] | ||
keyProperties: FxOrmProperty.NormalizedProperty[] | ||
order: [FxSqlQuerySql.SqlFragmentStr?, [...FxSqlQuerySql.SqlAssignmentValues]?] | ||
only: string[] | ||
only: string|FxSqlQueryColumns.SelectInputArgType[] | ||
limit: number | ||
@@ -153,0 +153,0 @@ offset: number |
v1.8.0 / 2019-01-08 | ||
v1.8.1 / 2019-01-08 | ||
================== | ||
* remove `FxOrmModel.ModelFieldItem`, `FxOrmProperty.NormalizedFieldOptions`. | ||
* fix ORM.d.ts. | ||
* little typo fix. | ||
v1.8.0 / 2019-01-08 | ||
=================== | ||
* Release v1.8.0 | ||
* remove some comments. | ||
@@ -6,0 +14,0 @@ * build next minor version's typo. |
{ | ||
"name": "@fxjs/orm", | ||
"version": "1.8.0", | ||
"version": "1.8.1", | ||
"description": "Object Relational Mapping for fibjs", | ||
@@ -44,3 +44,3 @@ "main": "lib", | ||
"@fxjs/sql-query": "^0.1.1", | ||
"fib-typify": "^0.4.1", | ||
"fib-typify": "^0.5.0", | ||
"lodash.clonedeep": "^4.5.0", | ||
@@ -47,0 +47,0 @@ "lodash.flatten": "^4.4.0", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
294026
7231
+ Addedbuffer-from@1.1.2(transitive)
+ Addedfib-typify@0.5.2(transitive)
+ Addedsource-map@0.6.1(transitive)
+ Addedsource-map-support@0.5.21(transitive)
- Removedfib-typify@0.4.1(transitive)
Updatedfib-typify@^0.5.0