chore: typo cleanup.

fibjs · Nov 27, 2022 · 03ab4d3 · 03ab4d3
1 parent 3171442
commit 03ab4d3
Show file tree

Hide file tree

Showing 31 changed files with 47 additions and 68 deletions.
diff --git a/src/Typo/app.ts b/src/Typo/app.ts
@@ -3,15 +3,14 @@
 /// <reference types="fib-pool" />
 /// <reference types="fib-rpc" />
 
-import type { FxOrmModel } from '@fxjs/orm/typings/Typo/model'
-import type { FxOrmNS, FxSqlQuerySubQuery } from '@fxjs/orm/typings/Typo/ORM'
-import type { FxOrmQuery } from '@fxjs/orm/typings/Typo/query'
-import type { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance'
+import type { FxOrmNS, FxOrmModel, FxOrmHook, FxOrmProperty } from '@fxjs/orm'
+import type { FxSqlQuerySubQuery } from '@fxjs/sql-query';
+
+import type { FxOrmQuery } from '@fxjs/orm'
+import type { FxOrmInstance } from '@fxjs/orm'
 
 import type { FibAppACL } from './acl';
-import { FxOrmHook } from '@fxjs/orm/typings/Typo/hook';
 import { FibAppTest } from './test';
-import { FxOrmProperty } from '@fxjs/orm/typings/Typo/property';
 
 export namespace FibApp {
     export type AppIdType = number | string

diff --git a/src/http/base.ts b/src/http/base.ts
@@ -1,4 +1,6 @@
 import ORM = require('@fxjs/orm');
+import { FxOrmInstance } from '@fxjs/orm';
+
 const Helpers = ORM.Helpers;
 
 import { err_info } from '../utils/err_info';
@@ -13,8 +15,6 @@ import { shouldSetSingle, execLinkers, getValidDataFieldsFromModel, getOneMergeI
 import { filterInstanceAsItsOwnShape, map_to_result } from '../utils/common';
 import { FibApp } from '../Typo/app';
 import { FibAppACL } from '../Typo/acl';
-import { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance';
-import { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
 
 export function setup (app: FibApp.FibAppClass) {
     const api = app.api;
@@ -35,7 +35,7 @@ export function setup (app: FibApp.FibAppClass) {
         function _create(d: FxOrmInstance.InstanceDataPayload) {
             d = filter(d, acl);
 
-            let o: FxOrmNS.Instance = ormUtils.create_instance_for_internal_api(cls, {
+            let o: FxOrmInstance.Instance = ormUtils.create_instance_for_internal_api(cls, {
                 data: d,
                 req_info: req,
                 keys_to_left: KEYS_TO_LEFT

diff --git a/src/http/extend.ts b/src/http/extend.ts
@@ -17,9 +17,7 @@ import { addHiddenProperty } from '../utils/obj';
 
 import type { FibApp } from '../Typo/app';
 import type { FibAppACL } from '../Typo/acl';
-import type { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
-import { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance';
-import { FxOrmAssociation } from '@fxjs/orm/typings/Typo/assoc';
+import type { FxOrmNS, FxOrmAssociation, FxOrmInstance } from '@fxjs/orm';
 
 export function setup(app: FibApp.FibAppClass) {
     const api = app.api;

diff --git a/src/http/graphql.ts b/src/http/graphql.ts
@@ -1,5 +1,5 @@
-import { FxOrmModel } from '@fxjs/orm/typings/Typo/model';
-import { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
+import type { FxOrmNS, FxOrmModel } from '@fxjs/orm';
+
 import util = require('util')
 import { FibApp } from '../Typo/app';
 

diff --git a/src/http/index.ts b/src/http/index.ts
@@ -13,7 +13,7 @@ import * as Hook from './hook';
 import { ROOT_PATH } from './_ctx';
 import { FibApp } from '../Typo/app';
 import { FibAppACL } from '../Typo/acl';
-import { FxOrmError } from '@fxjs/orm/typings/Typo/Error';
+import { FxOrmError } from '@fxjs/orm';
 
 const defaultCustomizeApiRoute: FibApp.FibAppOpts['customizeApiRoute'] = (ctx) => {
     return ctx.handler;

diff --git a/src/orm_plugins/app.ts b/src/orm_plugins/app.ts
@@ -1,4 +1,4 @@
-import type { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
+import type { FxOrmNS } from '@fxjs/orm';
 import type { FibApp } from '../Typo/app';
 
 import util = require('util')

diff --git a/src/orm_plugins/assoc.ts b/src/orm_plugins/assoc.ts
@@ -1,4 +1,4 @@
-import { FxOrmNS } from "@fxjs/orm/typings/Typo/ORM";
+import { FxOrmNS } from "@fxjs/orm";
 
 export default function (
     orm: FxOrmNS.ORM,

diff --git a/src/orm_plugins/timestamp.ts b/src/orm_plugins/timestamp.ts
@@ -1,9 +1,7 @@
 import util = require('util')
 import ORM = require('@fxjs/orm')
-import { FxOrmModel } from '@fxjs/orm/typings/Typo/model';
-import { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
+import { FxOrmNS, FxOrmModel } from '@fxjs/orm';
 const Helpers = ORM.Helpers;
-const { prependHook } = Helpers;
 
 interface PluginOptions__Timestamp {
 	createdPropertyName?: string | false

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/typings/Typo/ORM';
+import { FxOrmNS } from '@fxjs/orm';
 const Helpers = ORM.Helpers;
 const { prependHook } = Helpers;
 

diff --git a/src/utils/checkout_acl.ts b/src/utils/checkout_acl.ts
@@ -1,4 +1,4 @@
-import { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
+import { FxOrmNS } from '@fxjs/orm';
 import * as util from 'util';
 import { FibAppACL } from '../Typo/acl';
 

diff --git a/src/utils/common.ts b/src/utils/common.ts
@@ -1,4 +1,4 @@
-import { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance'
+import { FxOrmInstance } from '@fxjs/orm'
 import util = require('util')
 
 export function filterInstanceAsItsOwnShape<T = any, T2 = T> (

diff --git a/src/utils/filter.ts b/src/utils/filter.ts
@@ -6,9 +6,8 @@ import {
 } from './checkout_acl';
 
 import type { FibApp } from '../Typo/app';
-import type { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance'
+import type { FxOrmNS, FxOrmInstance } from '@fxjs/orm'
 import type { FibAppACL } from '../Typo/acl';
-import type { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
 
 export function filter <T = FxOrmInstance.Instance | FibApp.FibDataPayload> (
     obj: FxOrmInstance.Instance | FibApp.FibDataPayload,

diff --git a/src/utils/find.ts b/src/utils/find.ts
@@ -1,6 +1,4 @@
-import { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance';
-import { FxOrmModel } from '@fxjs/orm/typings/Typo/model';
-import { FxOrmQuery } from '@fxjs/orm/typings/Typo/query';
+import { FxOrmInstance, FxOrmModel, FxOrmQuery } from '@fxjs/orm';
 import util = require('util')
 import { FibAppACL } from '../Typo/acl';
 import { FibApp } from '../Typo/app';
@@ -18,7 +16,7 @@ import {
     query_filter_order
 } from './query';
 
-export = function<ReponseT = any> (
+export = function (
     req: FibApp.FibAppReq,
     finder: FxOrmQuery.IChainFind['find'],
     base_model: FxOrmModel.Model,

diff --git a/src/utils/get.ts b/src/utils/get.ts
@@ -1,13 +1,14 @@
 import util = require('util');
 import ORM = require('@fxjs/orm');
-const Helpers = ORM.Helpers;
+import { FxOrmNS } from '@fxjs/orm';
 
 import { err_info } from '../utils/err_info';
 import { checkout_obj_acl, checkout_robj_acl } from './checkout_acl';
 import { FibApp } from '../Typo/app';
-import { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
 import { FibAppACL } from '../Typo/acl';
 
+const Helpers = ORM.Helpers;
+
 function isInvalidNumber (v: string | number) {
     v = parseInt(v as any);
 

diff --git a/src/utils/orm-assoc.ts b/src/utils/orm-assoc.ts
@@ -1,7 +1,4 @@
-import { FxOrmAssociation } from '@fxjs/orm/typings/Typo/assoc';
-import { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance';
-import { FxOrmModel } from '@fxjs/orm/typings/Typo/model';
-import { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
+import { FxOrmInstance, FxOrmModel, FxOrmNS, FxOrmAssociation } from '@fxjs/orm';
 
 import util = require('util')
 import { FibApp } from '../Typo/app';

diff --git a/src/utils/orm.ts b/src/utils/orm.ts
@@ -1,4 +1,4 @@
-import { FxOrmNS } from "@fxjs/orm/typings/Typo/ORM";
+import { FxOrmNS } from "@fxjs/orm";
 import { FibApp } from "../Typo/app";
 import { buildCleanInstance, getValidDataFieldsFromModel } from "./orm-assoc";
 

diff --git a/src/utils/query.ts b/src/utils/query.ts
@@ -7,10 +7,9 @@ const Helpers = ORM.Helpers;
 import { checkout_acl } from './checkout_acl';
 import { ucfirst } from './str';
 
-import type { FxOrmAssociation } from '@fxjs/orm/typings/Typo/assoc';
-import type { FxOrmModel } from '@fxjs/orm/typings/Typo/model';
-import type { FxOrmQuery } from '@fxjs/orm/typings/Typo/query';
-import type { FxOrmNS, FxSqlQuerySubQuery } from '@fxjs/orm/typings/Typo/ORM';
+import type { FxOrmAssociation, FxOrmModel, FxOrmQuery, FxOrmNS } from '@fxjs/orm';
+import type { FxSqlQuerySubQuery } from '@fxjs/sql-query';
+
 import { FibApp } from '../Typo/app';
 
 export function query_filter_where (req: FibApp.FibAppReq) {

diff --git a/tsconfig.json b/tsconfig.json
@@ -25,7 +25,7 @@
     "typeAcquisition": {
         "exclude": [
             "fib-session",
-            "fib-vk"
+            "fib-kv"
         ]
     }
 }
diff --git a/typings/Typo/app.d.ts b/typings/Typo/app.d.ts
@@ -2,14 +2,12 @@
 /// <reference types="fib-pool" />
 /// <reference types="@fibjs/types" />
 /// <reference types="fib-session" />
-import type { FxOrmModel } from '@fxjs/orm/typings/Typo/model';
-import type { FxOrmNS, FxSqlQuerySubQuery } from '@fxjs/orm/typings/Typo/ORM';
-import type { FxOrmQuery } from '@fxjs/orm/typings/Typo/query';
-import type { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance';
+import type { FxOrmNS, FxOrmModel, FxOrmHook, FxOrmProperty } from '@fxjs/orm';
+import type { FxSqlQuerySubQuery } from '@fxjs/sql-query';
+import type { FxOrmQuery } from '@fxjs/orm';
+import type { FxOrmInstance } from '@fxjs/orm';
 import type { FibAppACL } from './acl';
-import { FxOrmHook } from '@fxjs/orm/typings/Typo/hook';
 import { FibAppTest } from './test';
-import { FxOrmProperty } from '@fxjs/orm/typings/Typo/property';
 export declare namespace FibApp {
     type AppIdType = number | string;
     type UidType = AppIdType;

diff --git a/typings/orm_plugins/app.d.ts b/typings/orm_plugins/app.d.ts
@@ -1,4 +1,4 @@
-import type { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
+import type { FxOrmNS } from '@fxjs/orm';
 import type { FibApp } from '../Typo/app';
 /**
  * @description first initial plugin before all other plugins

diff --git a/typings/orm_plugins/assoc.d.ts b/typings/orm_plugins/assoc.d.ts
@@ -1,2 +1,2 @@
-import { FxOrmNS } from "@fxjs/orm/typings/Typo/ORM";
+import { FxOrmNS } from "@fxjs/orm";
 export default function (orm: FxOrmNS.ORM, plugin_opts: {}): FxOrmNS.Plugin;
diff --git a/typings/orm_plugins/timestamp.d.ts b/typings/orm_plugins/timestamp.d.ts
@@ -1,5 +1,4 @@
-import { FxOrmModel } from '@fxjs/orm/typings/Typo/model';
-import { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
+import { FxOrmNS, FxOrmModel } from '@fxjs/orm';
 interface PluginOptions__Timestamp {
     createdPropertyName?: string | false;
     createdProperty?: FxOrmNS.OrigDetailedModelProperty;

diff --git a/typings/orm_plugins/uuid.d.ts b/typings/orm_plugins/uuid.d.ts
@@ -1,4 +1,4 @@
-import { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
+import { FxOrmNS } from '@fxjs/orm';
 export default function (orm: FxOrmNS.ORM, plugin_opts: {
     enable: boolean;
 }): FxOrmNS.Plugin;
diff --git a/typings/utils/checkout_acl.d.ts b/typings/utils/checkout_acl.d.ts
@@ -1,4 +1,4 @@
-import { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
+import { FxOrmNS } from '@fxjs/orm';
 import { FibAppACL } from '../Typo/acl';
 import { FibApp } from '../Typo/app';
 export declare function default_session_for_acl(session_obj?: FibApp.FibAppSession | null): FibApp.FibAppSession;

diff --git a/typings/utils/common.d.ts b/typings/utils/common.d.ts
@@ -1,4 +1,4 @@
-import { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance';
+import { FxOrmInstance } from '@fxjs/orm';
 export declare function filterInstanceAsItsOwnShape<T = any, T2 = T>(inst: T | T[], mapper: (inst: T, idx?: number, arr?: any) => T2): T2 | T2[];
 export declare const map_to_result: (ro: FxOrmInstance.Instance) => {
     id: any;

diff --git a/typings/utils/filter.d.ts b/typings/utils/filter.d.ts
@@ -1,6 +1,5 @@
 import type { FibApp } from '../Typo/app';
-import type { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance';
+import type { FxOrmNS, FxOrmInstance } from '@fxjs/orm';
 import type { FibAppACL } from '../Typo/acl';
-import type { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
 export declare function filter<T = FxOrmInstance.Instance | FibApp.FibDataPayload>(obj: FxOrmInstance.Instance | FibApp.FibDataPayload, keys: boolean | string | string[], readonly_keys?: FibAppACL.RoleActDescriptor): T;
 export declare function filter_ext(session: FibApp.FibAppSession, obj: FxOrmNS.Instance): FxOrmInstance.Instance;
diff --git a/typings/utils/find.d.ts b/typings/utils/find.d.ts
@@ -1,9 +1,7 @@
-import { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance';
-import { FxOrmModel } from '@fxjs/orm/typings/Typo/model';
-import { FxOrmQuery } from '@fxjs/orm/typings/Typo/query';
+import { FxOrmInstance, FxOrmModel, FxOrmQuery } from '@fxjs/orm';
 import { FibAppACL } from '../Typo/acl';
 import { FibApp } from '../Typo/app';
-declare const _default: <ReponseT = any>(req: FibApp.FibAppReq, finder: FxOrmQuery.IChainFind['find'], base_model: FxOrmModel.Model, ext_info?: {
+declare const _default: (req: FibApp.FibAppReq, finder: FxOrmQuery.IChainFind['find'], base_model: FxOrmModel.Model, ext_info?: {
     base_instance: FxOrmInstance.Instance;
     extend_in_rest: FibAppACL.ACLExtendModelNameType;
 }) => FibApp.FibAppIneternalApiFindResult<FxOrmInstance.Instance>;

diff --git a/typings/utils/get.d.ts b/typings/utils/get.d.ts
@@ -1,5 +1,5 @@
+import { FxOrmNS } from '@fxjs/orm';
 import { FibApp } from '../Typo/app';
-import { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
 import { FibAppACL } from '../Typo/acl';
 export declare const _get: (cls: FxOrmNS.Model, id: FibApp.AppIdType, session: FibApp.FibAppSession, act?: FibAppACL.ACLActString) => FibApp.FibAppInternalCommObj;
 export declare const _eget: (cls: FxOrmNS.Model, id: FibApp.IdPayloadVar | FxOrmNS.Instance, extend: FibAppACL.ACLExtendModelNameType, rid: FibApp.AppIdType, session: FibApp.FibAppSession, act: FibAppACL.ACLActString) => FibApp.FibAppInternalCommExtendObj;

diff --git a/typings/utils/orm-assoc.d.ts b/typings/utils/orm-assoc.d.ts
@@ -1,7 +1,4 @@
-import { FxOrmAssociation } from '@fxjs/orm/typings/Typo/assoc';
-import { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance';
-import { FxOrmModel } from '@fxjs/orm/typings/Typo/model';
-import { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';
+import { FxOrmInstance, FxOrmModel, FxOrmNS, FxOrmAssociation } from '@fxjs/orm';
 import { FibApp } from '../Typo/app';
 export declare function check_hasmanyassoc_with_extraprops(instance: FxOrmNS.Instance, extend_name: string): FxOrmNS.InstanceAssociationItem_HasMany | false;
 export declare function extra_save(instance: FxOrmNS.Instance, rinstance: FxOrmNS.Instance, _many_assoc: FxOrmNS.InstanceAssociationItem_HasMany, extra: any, just_set?: boolean): void;

diff --git a/typings/utils/orm.d.ts b/typings/utils/orm.d.ts
@@ -1,4 +1,4 @@
-import { FxOrmNS } from "@fxjs/orm/typings/Typo/ORM";
+import { FxOrmNS } from "@fxjs/orm";
 import { FibApp } from "../Typo/app";
 export declare function default_settings(): FibApp.FibAppOrmSettings;
 export declare function set_orm_default_settings(orm: FibApp.FibAppORM): void;

diff --git a/typings/utils/query.d.ts b/typings/utils/query.d.ts
@@ -1,6 +1,5 @@
 /// <reference lib="es2017" />
-import type { FxOrmModel } from '@fxjs/orm/typings/Typo/model';
-import type { FxOrmQuery } from '@fxjs/orm/typings/Typo/query';
+import type { FxOrmModel, FxOrmQuery } from '@fxjs/orm';
 import { FibApp } from '../Typo/app';
 export declare function query_filter_where(req: FibApp.FibAppReq): unknown;
 export declare function query_filter_join_where(req: FibApp.FibAppReq): unknown;