fib-app - npm Package Compare versions

Comparing version 1.15.3 to 1.15.4

lib/app.js

@@ -0,0 +0,0 @@ const mq = require("mq");

lib/db.js

@@ -0,0 +0,0 @@ const orm = require("@fxjs/orm");

lib/http/_ctx.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/http/base.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/http/extend.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/http/function.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/http/graphql.js

@@ -0,0 +0,0 @@ const util = require("util");

lib/http/hook.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/http/index.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/http/view.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/http/websocket_rpc.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/index.js

 const App = require("./app");
 module.exports = App;

lib/orm_plugins/app.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/orm_plugins/assoc.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/orm_plugins/index.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/orm_plugins/timestamp.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/orm_plugins/uuid.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/testkits/http-client.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/testkits/http-server.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/testkits/index.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/testkits/utils.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/Typo/acl.js

 /// <reference types="@fibjs/types" />
 Object.defineProperty(exports, "__esModule", { value: true });

lib/Typo/app.js

@@ -0,0 +0,0 @@ /// <reference types="@fibjs/types" />

lib/Typo/test.js

 Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/batch-request.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/checkout_acl.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/common.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/debug.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/diagram.js

 const NO_GRAPHQL_COLOR = 'lightgray'; // '#ec8888'
 module.exports = function () {
-    var nomnoml = require('nomnoml');
+    const util = require('util');
+    const Viz = require('viz.js');
+    const { Module, render } = require('viz.js/lite.render.js');
     const models = [];
@@ -13,24 +15,37 @@ const exts = [];
             for (const k in m.properties) {
-                ks.push(`+ ${k} : ${m.properties[k].type}`);
+                var ps;
+                if (m.properties[k].comment)
+                    ps = `+ ${m.properties[k].comment}(${k}) : ${m.properties[k].type}`;
+                else
+                    ps = `+ ${k} : ${m.properties[k].type}`;
+                ks.push(ps);
             }
             const is_nographql = m.no_graphql;
-            models.push(`[${is_nographql ? "<nographql>" : ""}${m.model_name}|${ks.join(';')}]`);
+            if (m.comment)
+                models.push(`${m.model_name} [tooltip="${m.model_name}", ${is_nographql ? `fillcolor="${NO_GRAPHQL_COLOR}",` : ''} label="{${m.comment}(${m.model_name})|${ks.join('\\l')}\\l}"];`);
+            else
+                models.push(`${m.model_name} [tooltip="${m.model_name}", ${is_nographql ? `fillcolor="${NO_GRAPHQL_COLOR}",` : ''} label="{${m.model_name}|${ks.join('\\l')}\\l}"];`);
             for (const e in m.associations) {
                 const assoc_info = m.associations[e];
                 const one = assoc_info.type === "hasOne" && !assoc_info.association.reversed;
-                exts.push(`[${m.model_name}] ${assoc_info.association.name.replace(/_/g, '%5f')}${one ? "->" : "--:>"} [${assoc_info.association.model.model_name}]`);
+                const extendsTo = assoc_info.type === "extendsTo";
+                var es = `${m.model_name} -> ${assoc_info.association.model.model_name} [label=${e}, arrowhead=`;
+                es += extendsTo ? "diamond" : one ? "empty" : "oinv";
+                es += "];";
+                exts.push(es);
             }
         }
     });
-    const dot = `#lineWidth: 1.5
-#font: Helvetica,sans-Serif
-#fontSize: 10
-#leading: 1.6
-#fill: white
-#.nographql: fill=${NO_GRAPHQL_COLOR}
+    const dot = `
+digraph
+{
+node [fontname="Helvetica,sans-Serif", fontsize=10, shape="record", style="filled", fillcolor="white"];
+edge [fontname="Helvetica,sans-Serif", fontsize=10, dir=both, arrowsize=0.8, arrowtail=odot];
 
 ${models.join('\n')}
 ${exts.join('\n')}
-`;
-    return nomnoml.renderSvg(dot).replace(/%5f/g, '_');
+}`;
+    let viz = new Viz({ Module, render });
+    viz.renderStringSync = util.sync(viz.renderString, true);
+    return viz.renderStringSync(dot);
 };

lib/utils/err_info.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/filter_request.js

@@ -0,0 +0,0 @@ /// <reference lib="es2016" />

lib/utils/filter.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/find.js

@@ -0,0 +0,0 @@ const checkout_acl_1 = require("./checkout_acl");

lib/utils/get.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/graphql.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/index.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/mimes.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/obj.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/orm-assoc.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/orm.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

lib/utils/query.js

@@ -0,0 +0,0 @@ /// <reference lib="es2017" />

lib/utils/str.js

@@ -0,0 +0,0 @@ Object.defineProperty(exports, "__esModule", { value: true });

package.json

 {
   "name": "fib-app",
-  "version": "1.15.3",
+  "version": "1.15.4",
   "description": "",
@@ -43,3 +43,3 @@ "main": "lib",
     "graphql-type-json": "^0.1.4",
-    "nomnoml": "^1.3.1"
+    "viz.js": "^2.1.2"
   },
@@ -46,0 +46,0 @@ "devDependencies": {

README.md

@@ -0,0 +0,0 @@ # fib-app

typings/app.d.ts

@@ -0,0 +0,0 @@ import * as mq from 'mq';

typings/db.d.ts

 import { FibApp } from './Typo/app';
 declare const _default: (app: FibApp.FibAppClass, connStr: string, opts: FibApp.FibAppDbSetupOpts) => FibApp.AppORMPool<FibApp.FibAppORM>;
 export = _default;

typings/http/_ctx.d.ts

@@ -0,0 +0,0 @@ declare const capabilities: {

typings/http/base.d.ts

 import { FibApp } from '../Typo/app';
 export declare function setup(app: FibApp.FibAppClass): void;

typings/http/extend.d.ts

 import type { FibApp } from '../Typo/app';
 export declare function setup(app: FibApp.FibAppClass): void;

typings/http/function.d.ts

 import { FibApp } from '../Typo/app';
 export declare function setup(app: FibApp.FibAppClass): void;

typings/http/graphql.d.ts

 import { FibApp } from '../Typo/app';
 declare const _default: (app: FibApp.FibAppClass, ormInstance: FibApp.FibAppORM) => void;
 export = _default;

typings/http/hook.d.ts

 export declare const wait: import("@fxjs/orm/typings/Typo/hook").FxOrmHook.HookWait<import("@fxjs/orm/typings/Typo/instance").FxOrmInstance.Instance, any>;
 export declare const trigger: import("@fxjs/orm/typings/Typo/hook").FxOrmHook.HookTrigger<any, any>;

typings/http/index.d.ts

 import { FibApp } from '../Typo/app';
 export declare function bind(app: FibApp.FibAppClass): void;

typings/http/view.d.ts

 import { FibApp } from '../Typo/app';
 export declare function setup(app: FibApp.FibAppClass): void;

typings/http/websocket_rpc.d.ts

 import { FibApp } from '../Typo/app';
 export declare function bind_rpc(app: FibApp.FibAppClass): void;
 export declare function bind_websocket_and_rpc(app: FibApp.FibAppClass): void;

typings/index.d.ts

 import App = require('./app');
 export = App;

typings/orm_plugins/app.d.ts

@@ -0,0 +0,0 @@ import type { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';

typings/orm_plugins/assoc.d.ts

 import { FxOrmNS } from "@fxjs/orm/typings/Typo/ORM";
 export default function (orm: FxOrmNS.ORM, plugin_opts: {}): FxOrmNS.Plugin;

typings/orm_plugins/index.d.ts

@@ -0,0 +0,0 @@ export { default as timestamp } from './timestamp';

typings/orm_plugins/timestamp.d.ts

@@ -0,0 +0,0 @@ import { FxOrmModel } from '@fxjs/orm/typings/Typo/model';

typings/orm_plugins/uuid.d.ts

@@ -0,0 +0,0 @@ import { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';

typings/testkits/http-client.d.ts

@@ -0,0 +0,0 @@ import { FibAppTest } from '../Typo/test';

typings/testkits/http-server.d.ts

@@ -0,0 +0,0 @@ /// <reference types="@fibjs/types" />

typings/testkits/index.d.ts

 import { FibApp } from '../Typo/app';
 export declare function bind(app: FibApp.FibAppClass): void;

typings/testkits/utils.d.ts

 /// <reference types="@fibjs/types" />
 export declare function graphqlRequest(url: string, body: string): Class_HttpResponse;
 export declare function shuffleArray(arr?: any[]): any[];

typings/Typo/acl.d.ts

@@ -0,0 +0,0 @@ import { FibApp } from "./app";

typings/Typo/app.d.ts

@@ -0,0 +0,0 @@ /// <reference types="fib-rpc" />

typings/Typo/test.d.ts

@@ -0,0 +0,0 @@ import type { FibApp } from "./app";

typings/utils/batch-request.d.ts

 import { FibApp } from '../Typo/app';
 export declare function run_batch(app: FibApp.FibAppClass, req: FibApp.FibAppHttpRequest): void;

typings/utils/checkout_acl.d.ts

@@ -0,0 +0,0 @@ import { FxOrmNS } from '@fxjs/orm/typings/Typo/ORM';

typings/utils/common.d.ts

@@ -0,0 +0,0 @@ import { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance';

typings/utils/debug.d.ts

@@ -0,0 +0,0 @@ /// <reference types="@fibjs/types" />

typings/utils/diagram.d.ts

 declare const _default: () => any;
 export = _default;

typings/utils/err_info.d.ts

@@ -0,0 +0,0 @@ /// <reference types="@fibjs/types" />

typings/utils/filter_request.d.ts

@@ -0,0 +0,0 @@ /// <reference types="@fibjs/types" />

typings/utils/filter.d.ts

@@ -0,0 +0,0 @@ import type { FibApp } from '../Typo/app';

typings/utils/find.d.ts

@@ -0,0 +0,0 @@ import { FxOrmInstance } from '@fxjs/orm/typings/Typo/instance';

typings/utils/get.d.ts

@@ -0,0 +0,0 @@ import { FibApp } from '../Typo/app';

typings/utils/graphql.d.ts

 import { FibApp } from "../Typo/app";
 export declare function is_graphql_request(request: FibApp.FibAppHttpRequest): boolean;
 export declare function run_graphql(app: FibApp.FibAppClass, req: FibApp.FibAppHttpRequest): void;

typings/utils/index.d.ts

 import { FibApp } from '../Typo/app';
 export declare function bind(app: FibApp.FibAppClass): void;

typings/utils/mimes.d.ts

@@ -0,0 +0,0 @@ export declare const ouputMap: {

typings/utils/obj.d.ts

 /// <reference types="@fibjs/types" />
 export declare function addHiddenProperty<T = any>(obj: Fibjs.AnyObject, p: string, v: T): void;
 export declare function addReadonlyHiddenProperty<T = any>(obj: Fibjs.AnyObject, p: string, getter: (...args: any) => T): void;

typings/utils/orm-assoc.d.ts

@@ -0,0 +0,0 @@ import { FxOrmAssociation } from '@fxjs/orm/typings/Typo/assoc';

typings/utils/orm.d.ts

@@ -0,0 +0,0 @@ import { FxOrmNS } from "@fxjs/orm/typings/Typo/ORM";

typings/utils/query.d.ts

@@ -0,0 +0,0 @@ /// <reference lib="es2017" />

typings/utils/str.d.ts

 export declare function lcfirst(str?: string): string;
 export declare function ucfirst(str?: string): string;

No alert changes

Improved metrics

Lines of code

4256

increased by0.35%

Worsened metrics

Total package byte prevSize

180299

decreased by-1.85%

Dependency changes

• + Addedviz.js@^2.1.2

• + Addedviz.js@2.1.2(transitive)

• - Removednomnoml@^1.3.1

• - Removedgraphre@0.1.3(transitive)

• - Removednomnoml@1.7.0(transitive)