feat: normalize type usage of @fxjs/orm.

fibjs · Nov 27, 2022 · 6f030a3 · 6f030a3
1 parent 2775413
commit 6f030a3
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/src/Typo/app.ts b/src/Typo/app.ts
@@ -120,7 +120,7 @@ export namespace FibApp {
     }
 
     // keep compatible with definition in '@fxjs/orm'
-    export interface AppSpecialDateProperty extends FxOrmNS.ModelPropertyDefinition {
+    export interface AppSpecialDateProperty extends FxOrmModel.ModelPropertyDefinition {
         type: 'date'
         time?: true
     }

diff --git a/src/orm_plugins/app.ts b/src/orm_plugins/app.ts
@@ -1,4 +1,4 @@
-import type { FxOrmNS } from '@fxjs/orm';
+import type { FxOrmNS, FxOrmModel } from '@fxjs/orm';
 import type { FibApp } from '../Typo/app';
 
 import util = require('util')
@@ -32,7 +32,7 @@ export default function (ormInstance: FibApp.FibAppORM, opts: FxOrmNS.ModelOptio
 
     const orm_definition_hash: {[model_name: string]: {
         name: string
-        properties: Record<string, FxOrmNS.ModelPropertyDefinition>
+        properties: Record<string, FxOrmModel.ModelPropertyDefinition>
         opts: FibApp.FibAppOrmModelDefOptions
     }} = {};
 
@@ -44,7 +44,7 @@ export default function (ormInstance: FibApp.FibAppORM, opts: FxOrmNS.ModelOptio
         'viewServices',
         'no_graphql',
     ]
-    function beforeDefine (name: string, properties: Record<string, FxOrmNS.ModelPropertyDefinition>, opts: FxOrmNS.ModelOptions) {
+    function beforeDefine (name: string, properties: Record<string, FxOrmModel.ModelPropertyDefinition>, opts: FxOrmNS.ModelOptions) {
         opts.timestamp = true
 
         orm_definition_hash[name] = { name, properties, opts }

diff --git a/src/orm_plugins/assoc.ts b/src/orm_plugins/assoc.ts
@@ -1,11 +1,11 @@
-import { FxOrmNS } from "@fxjs/orm";
+import { FxOrmNS, FxOrmModel } from "@fxjs/orm";
 
 export default function (
     orm: FxOrmNS.ORM,
     plugin_opts: {
     }
 ): FxOrmNS.Plugin {
-	function beforeDefine (name: string, properties: Record<string, FxOrmNS.ModelPropertyDefinition>, opts: FxOrmNS.ModelOptions) {
+	function beforeDefine (name: string, properties: Record<string, FxOrmModel.ModelPropertyDefinition>, opts: FxOrmNS.ModelOptions) {
         if ((opts.extension || opts.__for_extension) && !properties.id) {
             opts.__webx_use_uuid = true;
         }

diff --git a/src/orm_plugins/timestamp.ts b/src/orm_plugins/timestamp.ts
@@ -1,16 +1,16 @@
 import util = require('util')
 import ORM = require('@fxjs/orm')
-import { FxOrmNS, FxOrmModel } from '@fxjs/orm';
+import { FxOrmNS, FxOrmModel, FxOrmProperty } from '@fxjs/orm';
 const Helpers = ORM.Helpers;
 
 interface PluginOptions__Timestamp {
 	createdPropertyName?: string | false
-	createdProperty?: FxOrmNS.OrigDetailedModelProperty,
+	createdProperty?: FxOrmProperty.NormalizedProperty,
 	updatedPropertyName?: string | false
-	updatedProperty?: FxOrmNS.OrigDetailedModelProperty,
+	updatedProperty?: FxOrmProperty.NormalizedProperty,
 	expiredPropertyName?: string | false
-	expiredProperty?: FxOrmNS.OrigDetailedModelProperty,
-	type?: FxOrmNS.OrigDetailedModelProperty
+	expiredProperty?: FxOrmProperty.NormalizedProperty,
+	type?: FxOrmProperty.NormalizedProperty
 	now?: { (): Date }
 	expire?: { (): Date }
 }
@@ -27,7 +27,7 @@ const defaults_opts: PluginOptions__Timestamp = {
 export default function (orm: FxOrmNS.ORM, plugin_opts: PluginOptions__Timestamp = {}) {
 	plugin_opts = util.extend({}, defaults_opts, plugin_opts)
 
-	function beforeDefine (name: string, properties: Record<string, FxOrmNS.ModelPropertyDefinition>, opts: FxOrmNS.ModelOptions) {
+	function beforeDefine (name: string, properties: Record<string, FxOrmModel.ModelPropertyDefinition>, opts: FxOrmNS.ModelOptions) {
 		if (!opts.timestamp) return;
 
 		if (typeof opts.timestamp == 'object')

diff --git a/src/orm_plugins/uuid.ts b/src/orm_plugins/uuid.ts
@@ -1,6 +1,6 @@
 import uuid = require('uuid')
 import ORM = require('@fxjs/orm')
-import { FxOrmNS } from '@fxjs/orm';
+import { FxOrmNS, FxOrmModel } from '@fxjs/orm';
 const Helpers = ORM.Helpers;
 const { prependHook } = Helpers;
 
@@ -12,7 +12,7 @@ export default function (
 ): FxOrmNS.Plugin {
     let { enable: use_uuid = false } = plugin_opts || {};
 
-	function beforeDefine (name: string, properties: Record<string, FxOrmNS.ModelPropertyDefinition>, opts: FxOrmNS.ModelOptions) {
+	function beforeDefine (name: string, properties: Record<string, FxOrmModel.ModelPropertyDefinition>, opts: FxOrmNS.ModelOptions) {
         use_uuid = use_uuid || opts.__webx_use_uuid
 
         if (!use_uuid)

diff --git a/typings/Typo/app.d.ts b/typings/Typo/app.d.ts
@@ -95,7 +95,7 @@ export declare namespace FibApp {
         acl: FibAppACL.ACLDefinition;
         oacl: FibAppACL.OACLDefinition;
     }
-    interface AppSpecialDateProperty extends FxOrmNS.ModelPropertyDefinition {
+    interface AppSpecialDateProperty extends FxOrmModel.ModelPropertyDefinition {
         type: 'date';
         time?: true;
     }

diff --git a/typings/orm_plugins/app.d.ts b/typings/orm_plugins/app.d.ts
@@ -1,9 +1,9 @@
-import type { FxOrmNS } from '@fxjs/orm';
+import type { FxOrmNS, FxOrmModel } from '@fxjs/orm';
 import type { FibApp } from '../Typo/app';
 /**
  * @description first initial plugin before all other plugins
  */
 export default function (ormInstance: FibApp.FibAppORM, opts: FxOrmNS.ModelOptions): {
-    beforeDefine: (name: string, properties: Record<string, FxOrmNS.ModelPropertyDefinition>, opts: FxOrmNS.ModelOptions) => void;
+    beforeDefine: (name: string, properties: Record<string, FxOrmModel.ModelPropertyDefinition>, opts: FxOrmNS.ModelOptions) => void;
     define: (m: FibApp.FibAppORMModel) => FibApp.FibAppORMModel;
 };
diff --git a/typings/orm_plugins/timestamp.d.ts b/typings/orm_plugins/timestamp.d.ts
@@ -1,12 +1,12 @@
-import { FxOrmNS, FxOrmModel } from '@fxjs/orm';
+import { FxOrmNS, FxOrmModel, FxOrmProperty } from '@fxjs/orm';
 interface PluginOptions__Timestamp {
     createdPropertyName?: string | false;
-    createdProperty?: FxOrmNS.OrigDetailedModelProperty;
+    createdProperty?: FxOrmProperty.NormalizedProperty;
     updatedPropertyName?: string | false;
-    updatedProperty?: FxOrmNS.OrigDetailedModelProperty;
+    updatedProperty?: FxOrmProperty.NormalizedProperty;
     expiredPropertyName?: string | false;
-    expiredProperty?: FxOrmNS.OrigDetailedModelProperty;
-    type?: FxOrmNS.OrigDetailedModelProperty;
+    expiredProperty?: FxOrmProperty.NormalizedProperty;
+    type?: FxOrmProperty.NormalizedProperty;
     now?: {
         (): Date;
     };
@@ -15,7 +15,7 @@ interface PluginOptions__Timestamp {
     };
 }
 export default function (orm: FxOrmNS.ORM, plugin_opts?: PluginOptions__Timestamp): {
-    beforeDefine: (name: string, properties: Record<string, FxOrmNS.ModelPropertyDefinition>, opts: FxOrmNS.ModelOptions) => void;
+    beforeDefine: (name: string, properties: Record<string, FxOrmModel.ModelPropertyDefinition>, opts: FxOrmNS.ModelOptions) => void;
     define(model: FxOrmModel.Model): void;
 };
 export {};