codefoxui - npm Package Compare versions

Comparing version 0.4.9 to 0.5.0

lib/features/chart/chart.component.d.ts

@@ -111,2 +111,3 @@ import { AfterViewInit, ChangeDetectorRef, ElementRef, EventEmitter, OnChanges } from "@angular/core";
     setSeriesData(index: number, data: SeriesData[]): void;
+    setSeriesVisible(index: number, value: boolean): void;
     detectChanges(): void;
@@ -113,0 +114,0 @@ ngOnChanges(): void;

lib/features/chart/chart.interfaces.d.ts

@@ -212,2 +212,3 @@ import { ChartComponent } from "./chart.component";
     valueId?: string;
+    visible?: boolean;
 }
@@ -214,0 +215,0 @@ export interface SeriesProcessed {

lib/features/elements/menu/menu.component.d.ts

 import { MenuItem } from "../../../interfaces";
+import { CfPermissionsService } from "../../../shared";
 import * as i0 from "@angular/core";
 export declare class MenuComponent {
+    permissionsService: CfPermissionsService;
     menuItems: MenuItem[];
@@ -8,4 +10,5 @@ width: string;
     get hostStyle(): any;
+    get filteredMenuItems(): MenuItem[];
     static ɵfac: i0.ɵɵFactoryDeclaration<MenuComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MenuComponent, "cf-menu", never, { "menuItems": { "alias": "menuItems"; "required": false; }; "width": { "alias": "width"; "required": false; }; "classes": { "alias": "classes"; "required": false; }; }, {}, never, never, true, never>;
 }

lib/interfaces.d.ts

@@ -223,2 +223,3 @@ import { TemplateRef } from '@angular/core';
     iconUrl?: string;
+    children?: MenuItem[];
 }
@@ -225,0 +226,0 @@ export interface FormatNumberOptions {

lib/shared/helpers/helpers.d.ts

@@ -54,3 +54,4 @@ import { DomSanitizer, SafeHtml } from "@angular/platform-browser";
 export declare function localStorage(): Storage | null;
+export declare function webSocket(url: string, protocols?: string | string[]): WebSocket | null;
 export declare function sessionStorage(): Storage | null;
 export declare function isBrowser(): boolean;

lib/shared/services/cookie.service.d.ts

@@ -5,2 +5,4 @@ import { CfConfigService } from "./config.service";
 export declare class CfCookieService {
+    browser: boolean;
+    document: Document;
     configService: CfConfigService;
@@ -7,0 +9,0 @@ loggerService: CfLoggerService;

lib/shared/services/websocket.service.d.ts

@@ -7,2 +7,4 @@ import { Subject } from "rxjs";
     private configService;
+    isBrowser: boolean;
+    document: Document;
     configuration: CfWebSocketConfiguration;
@@ -9,0 +11,0 @@ webSocket: WebSocket | null;

package.json

 {
   "name": "codefoxui",
-  "version": "0.4.9",
+  "version": "0.5.0",
   "peerDependencies": {
@@ -5,0 +5,0 @@ "@angular/common": "^16.1.0",

README.md

@@ -0,0 +0,0 @@ # Codefox UI

schematics/collection.json

@@ -8,12 +8,2 @@ {
 		},
-		"local-api-service": {
-			"description": "Generate a local.api.service.ts file in the project.",
-			"factory": "./local-api-service/index#localApiService",
-			"schema": "./local-api-service/schema.json"
-		},
-		"local-socket-service": {
-			"description": "Generate a local.socket.service.ts file in the project.",
-			"factory": "./local-socket-service/index#localSocketService",
-			"schema": "./local-socket-service/schema.json"
-		},
 		"editor": {
@@ -34,8 +24,8 @@ "description": "Generate an editor ts and html into a separate folder file in the project.",
 		},
-		"base": {
-			"description": "Generate base files",
-			"factory": "./base/index#base",
-			"schema": "./base/schema.json"
+		"adminbase": {
+			"description": "Generate adminbase files",
+			"factory": "./adminbase/index#adminbase",
+			"schema": "./adminbase/schema.json"
 		}
 	}
 }

schematics/editor/index.js

@@ -58,3 +58,47 @@ "use strict";
         const plurallowercase = plural.toLowerCase();
+        const pluraluppercase = plural.toUpperCase();
         const singularfirstlower = singular[0].toLowerCase() + singular.slice(1, singular.length);
+        // Interfaces file
+        const interfacesFileUrl = `${project.sourceRoot}/${projectType}/interfaces.ts`;
+        if (tree.exists(interfacesFileUrl)) {
+            let fileContent = tree.readText(interfacesFileUrl);
+            if (fileContent !== null) {
+                fileContent = (0, utility_1.updateInterfaces)(fileContent, [{
+                        key: singular + 'Editor',
+                        values: []
+                    }]);
+            }
+            if (fileContent !== null) {
+                tree.overwrite(interfacesFileUrl, fileContent);
+            }
+        }
+        // Local api service
+        const lasFileUrl = `${project.sourceRoot}/${projectType}/services/local.api.service.ts`;
+        if (tree.exists(lasFileUrl)) {
+            let fileContent = tree.readText(lasFileUrl);
+            if (fileContent !== null) {
+                fileContent = (0, utility_1.updateImports)(fileContent, `${project.sourceRoot}/${projectType}/interfaces`, singular + 'Editor');
+            }
+            if (fileContent !== null) {
+                fileContent = (0, utility_1.updateLocalApiService)(fileContent, [
+                    `\r\r\t// ${pluraluppercase}`,
+                    `\tget${singular}(id: number): Observable<{`,
+                    `\t\t${singularfirstlower}Editor: ${singular}Editor;`,
+                    `\t}> {`,
+                    `\t\treturn this.apiService.get("${plurallowercase}/" + id)`,
+                    '\t}',
+                    '',
+                    `\tcreate${singular}(editor: ${singular}Editor): Observable<{${singularfirstlower}Id: number; }> {`,
+                    `\t\treturn this.apiService.post("${plurallowercase}", editor)`,
+                    '\t}',
+                    '',
+                    `\tupdate${singular}(id: number, editor: ${singular}Editor): Observable<{}> {`,
+                    `\t\treturn this.apiService.patch("${plurallowercase}/" + id, editor)`,
+                    '\t}'
+                ].join('\r'));
+            }
+            if (fileContent !== null) {
+                tree.overwrite(lasFileUrl, fileContent);
+            }
+        }
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
@@ -73,24 +117,2 @@ (0, schematics_1.applyTemplates)({
         ]);
-        // Interfaces file
-        (0, utility_1.createOrUpdateInterfaces)(tree, `${project.sourceRoot}/${projectType}/interfaces/interfaces.ts`, (0, utility_1.generateInterfaceString)([{
-                key: singular + 'Editor',
-                values: []
-            }]));
-        // Service
-        (0, utility_1.updateLocalApiServiceImports)(tree, `${project.sourceRoot}/${projectType}/services/local.api.service.ts`, '../interfaces/interfaces', singular + 'Editor');
-        (0, utility_1.updateLocalApiService)(tree, `${project.sourceRoot}/${projectType}/services/local.api.service.ts`, [
-            '',
-            `\tget${singular}(id: number): Observable<{`,
-            `\t\t${singularfirstlower}Editor: ${singular}Editor; }> {`,
-            `\t\treturn this.apiService.get("${plurallowercase}/" + id)`,
-            '\t}',
-            '',
-            `\tcreate${singular}(editor: ${singular}Editor): Observable<{${singularfirstlower}Id: number; }> {`,
-            `\t\treturn this.apiService.post("${plurallowercase}", editor)`,
-            '\t}',
-            '',
-            `\tupdate${singular}(id: number, editor: ${singular}Editor): Observable<{}> {`,
-            `\t\treturn this.apiService.patch("${plurallowercase}/" + id, editor)`,
-            '\t}'
-        ]);
         return (0, schematics_1.chain)([
@@ -97,0 +119,0 @@ (0, schematics_1.mergeWith)(templateSource)

schematics/list/index.js

@@ -60,3 +60,51 @@ "use strict";
         const pluraluppercase = plural.toUpperCase();
+        const route = pluraluppercase + '_ROUTE';
         const singularfirstlower = singular[0].toLowerCase() + singular.slice(1, singular.length);
+        // Interfaces file
+        const interfacesFileUrl = `${project.sourceRoot}/${projectType}/interfaces.ts`;
+        if (tree.exists(interfacesFileUrl)) {
+            let fileContent = tree.readText(interfacesFileUrl);
+            if (fileContent !== null) {
+                fileContent = (0, utility_1.updateInterfaces)(fileContent, [{
+                        key: singular + 'Row',
+                        values: [{
+                                name: singularfirstlower + 'Id',
+                                type: 'number'
+                            }]
+                    }]);
+            }
+            if (fileContent !== null) {
+                tree.overwrite(interfacesFileUrl, fileContent);
+            }
+        }
+        // Local api service
+        const lasFileUrl = `${project.sourceRoot}/${projectType}/services/local.api.service.ts`;
+        if (tree.exists(lasFileUrl)) {
+            let fileContent = tree.readText(lasFileUrl);
+            if (fileContent !== null) {
+                fileContent = (0, utility_1.updateLocalApiService)(fileContent, [
+                    `\r\r\t// ${pluraluppercase}`,
+                    '\tdelete' + singular + '(id: number): Observable<{}> {',
+                    '\t\treturn this.apiService.delete("' + plurallowercase + '/" + id)',
+                    '\t}'
+                ].join('\r'));
+            }
+            if (fileContent !== null) {
+                tree.overwrite(lasFileUrl, fileContent);
+            }
+        }
+        // UPDATE ROUTES
+        const routesFileUrl = `${project.sourceRoot}/${projectType}/app.routes.ts`;
+        if (tree.exists(routesFileUrl)) {
+            let fileContent = tree.readText(routesFileUrl);
+            if (fileContent !== null) {
+                fileContent = (0, utility_1.updateImports)(fileContent, `${project.sourceRoot}/${projectType}/components/${plural.toLowerCase()}/${plural.toLowerCase()}.component`, route);
+            }
+            if (fileContent !== null) {
+                fileContent = (0, utility_1.updateRoutes)(fileContent, route);
+            }
+            if (fileContent !== null) {
+                tree.overwrite(routesFileUrl, fileContent);
+            }
+        }
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
@@ -71,2 +119,3 @@ (0, schematics_1.applyTemplates)({
                 pluraluppercase,
+                route,
                 singularfirstlower,
@@ -77,17 +126,2 @@ src: `${project.sourceRoot}/${projectType}`
         ]);
-        // Interfaces file
-        (0, utility_1.createOrUpdateInterfaces)(tree, `${project.sourceRoot}/${projectType}/interfaces/interfaces.ts`, (0, utility_1.generateInterfaceString)([{
-                key: singular + 'Row',
-                values: [{
-                        name: singularfirstlower + 'Id',
-                        type: 'number'
-                    }]
-            }]));
-        // Service
-        (0, utility_1.updateLocalApiService)(tree, `${project.sourceRoot}/${projectType}/services/local.api.service.ts`, [
-            '',
-            '\tdelete' + singular + '(id: number): Observable<{}> {',
-            '\t\treturn this.apiService.delete("' + plurallowercase + '/" + id)',
-            '\t}'
-        ]);
         return (0, schematics_1.chain)([
@@ -94,0 +128,0 @@ (0, schematics_1.mergeWith)(templateSource)

schematics/utility/utility.d.ts

@@ -1,3 +0,8 @@
-import { Tree } from '@angular-devkit/schematics';
-export declare function createOrUpdateInterfaces(tree: Tree, interfacesUrl: string, interfacesContent: string): void;
+export declare function updateInterfaces(fileContent: string, interfaces: {
+    key: string;
+    values: {
+        name: string;
+        type: string;
+    }[];
+}[]): string | null;
 export declare function generateInterfaceString(interfaces: {
@@ -10,3 +15,5 @@ key: string;
 }[]): string;
-export declare function updateLocalApiServiceImports(tree: Tree, localApiServiceUrl: string, importSource: string, importData: string): void;
-export declare function updateLocalApiService(tree: Tree, localApiServiceUrl: string, insertLines: string[]): void;
+export declare function updateImports(fileContent: string, importSource: string, importData: string): string | null;
+export declare function updateLocalApiService(fileContent: string, insertText: string): string | null;
+export declare function updateRoutes(fileContent: string, insertText: string): string | null;
+export declare function updateApplicationConfig(fileContent: string, insertText: string): string | null;

schematics/utility/utility.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateLocalApiService = exports.updateLocalApiServiceImports = exports.generateInterfaceString = exports.createOrUpdateInterfaces = void 0;
-function createOrUpdateInterfaces(tree, interfacesUrl, interfacesContent) {
-    if (!tree.exists(interfacesUrl)) {
-        tree.create(interfacesUrl, interfacesContent);
-    }
-    else {
-        const buffer = tree.read(interfacesUrl);
-        if (buffer !== null) {
-            if (buffer.length === 0) {
-                tree.overwrite(interfacesUrl, buffer.toString() + interfacesContent);
-            }
-            else {
-                tree.overwrite(interfacesUrl, buffer.toString() + '\n\n' + interfacesContent);
-            }
+exports.updateApplicationConfig = exports.updateRoutes = exports.updateLocalApiService = exports.updateImports = exports.generateInterfaceString = exports.updateInterfaces = void 0;
+const ts = require("typescript");
+function updateInterfaces(fileContent, interfaces) {
+    const sourceFile = ts.createSourceFile('tmp.ts', fileContent, {
+        languageVersion: ts.ScriptTarget.ES2022
+    });
+    let interfacesToAppend = [...interfaces];
+    let insertPosition = null;
+    for (let statement of sourceFile.statements) {
+        if (statement.kind === ts.SyntaxKind.InterfaceDeclaration) {
+            const interfaceDeclaration = statement;
+            const name = interfaceDeclaration.name.text;
+            interfacesToAppend = interfacesToAppend.filter(({ key }) => key !== name);
+            insertPosition = interfaceDeclaration.end;
         }
     }
+    if (interfacesToAppend.length === 0 || insertPosition === null) {
+        return null;
+    }
+    const source = sourceFile.text;
+    return source.substring(0, insertPosition) + generateInterfaceString(interfacesToAppend) + source.substring(insertPosition, source.length);
 }
-exports.createOrUpdateInterfaces = createOrUpdateInterfaces;
+exports.updateInterfaces = updateInterfaces;
 function generateInterfaceString(interfaces) {
-    const interfaceStrings = [];
+    const interfaceStrings = ['\r'];
     interfaces.forEach(({ key, values }) => {
@@ -29,38 +34,153 @@ interfaceStrings.push('export interface ' + key + ' {\n' + values.map(({ name, type }) => '\t' + name + ': ' + type).join('\n') + '\n}');
 exports.generateInterfaceString = generateInterfaceString;
-function updateLocalApiServiceImports(tree, localApiServiceUrl, importSource, importData) {
-    if (!tree.exists(localApiServiceUrl)) {
-        return;
+function updateImports(fileContent, importSource, importData) {
+    const sourceFile = ts.createSourceFile('tmp.ts', fileContent, {
+        languageVersion: ts.ScriptTarget.ES2022
+    });
+    const imports = [];
+    for (let statement of sourceFile.statements) {
+        if (statement.kind === ts.SyntaxKind.ImportDeclaration) {
+            imports.push(statement);
+        }
     }
-    const buffer = tree.read(localApiServiceUrl);
-    if (buffer === null) {
-        return;
+    let insertPosition = 0;
+    let insertText = null;
+    if (imports.length > 0) {
+        const sameImportDeclaration = imports.find(({ moduleSpecifier }) => moduleSpecifier.getText(sourceFile) === "'" + importSource + "'") || null;
+        if (sameImportDeclaration !== null) {
+            const identifiers = [];
+            if (sameImportDeclaration.importClause !== undefined && sameImportDeclaration.importClause.namedBindings !== undefined) {
+                for (let element of sameImportDeclaration.importClause.namedBindings.elements) {
+                    if (element.kind === ts.SyntaxKind.ImportSpecifier) {
+                        identifiers.push(element.name);
+                    }
+                }
+            }
+            if (identifiers.length > 0) {
+                const sameIdentifier = identifiers.find(({ text }) => text === importData) || null;
+                if (sameIdentifier === null) {
+                    insertPosition = identifiers[identifiers.length - 1].end;
+                    insertText = ', ' + importData;
+                }
+            }
+        }
+        else {
+            insertPosition = imports[imports.length - 1].end;
+            insertText = "\rimport { " + importData + " } from '" + importSource + "';";
+        }
     }
-    const content = buffer.toString();
-    const contentLines = content.split('\n');
-    const findIndex = contentLines.findIndex((line) => !line.startsWith('import'));
-    if (findIndex === -1) {
-        return;
+    if (insertText === null) {
+        return null;
     }
-    const newLines = [...contentLines.slice(0, findIndex), "import { " + importData + " } from '" + importSource + "';", ...contentLines.slice(findIndex, contentLines.length)];
-    tree.overwrite(localApiServiceUrl, newLines.join('\n'));
+    const source = sourceFile.text;
+    return source.substring(0, insertPosition) + insertText + source.substring(insertPosition, source.length);
 }
-exports.updateLocalApiServiceImports = updateLocalApiServiceImports;
-function updateLocalApiService(tree, localApiServiceUrl, insertLines) {
-    if (!tree.exists(localApiServiceUrl)) {
-        return;
+exports.updateImports = updateImports;
+function updateLocalApiService(fileContent, insertText) {
+    const sourceFile = ts.createSourceFile('tmp.ts', fileContent, {
+        languageVersion: ts.ScriptTarget.ES2022
+    });
+    let lasClassDeclaration = null;
+    for (let statement of sourceFile.statements) {
+        if (statement.kind === ts.SyntaxKind.ClassDeclaration) {
+            const classDeclaration = statement;
+            if (classDeclaration.name !== undefined && classDeclaration.name.text === 'LocalApiService') {
+                lasClassDeclaration = classDeclaration;
+            }
+        }
     }
-    const buffer = tree.read(localApiServiceUrl);
-    if (buffer === null) {
-        return;
+    if (lasClassDeclaration === null) {
+        return null;
     }
-    const content = buffer.toString();
-    const contentLines = content.split('\n');
-    const findIndex = contentLines.findIndex((line) => line.startsWith('export class'));
-    if (findIndex === -1) {
-        return;
+    let lastMethodDeclaration = null;
+    for (let member of lasClassDeclaration.members) {
+        if (member.kind === ts.SyntaxKind.MethodDeclaration) {
+            lastMethodDeclaration = member;
+        }
     }
-    const newLines = [...contentLines.slice(0, findIndex + 1), ...insertLines, ...contentLines.slice(findIndex + 1, contentLines.length)];
-    tree.overwrite(localApiServiceUrl, newLines.join('\n'));
+    if (lastMethodDeclaration === null) {
+        return null;
+    }
+    const source = sourceFile.text;
+    return source.substring(0, lastMethodDeclaration.end) + insertText + source.substring(lastMethodDeclaration.end, source.length);
 }
 exports.updateLocalApiService = updateLocalApiService;
+function updateRoutes(fileContent, insertText) {
+    const sourceFile = ts.createSourceFile('tmp.ts', fileContent, {
+        languageVersion: ts.ScriptTarget.ES2022
+    });
+    if (sourceFile === undefined) {
+        return null;
+    }
+    let insertPositionStart = null;
+    let insertPositionEnd = null;
+    for (let statement of sourceFile.statements) {
+        if (statement.kind === ts.SyntaxKind.VariableStatement) {
+            const declarationList = statement.declarationList;
+            if (declarationList.declarations[0] !== undefined && ts.isVariableDeclaration(declarationList.declarations[0])) {
+                const variableDeclaration = declarationList.declarations[0];
+                if (ts.isIdentifier(variableDeclaration.name)) {
+                    const identifier = variableDeclaration.name;
+                    if (identifier.text.toLowerCase() === 'routes') {
+                        if (variableDeclaration.initializer !== undefined && ts.isArrayLiteralExpression(variableDeclaration.initializer)) {
+                            const arrayLiteralExpression = variableDeclaration.initializer;
+                            if (arrayLiteralExpression.elements.length > 0) {
+                                insertPositionStart = arrayLiteralExpression.elements[arrayLiteralExpression.elements.length - 1].end;
+                                insertPositionEnd = insertPositionStart;
+                                insertText = ',\r\t' + insertText;
+                            }
+                            else {
+                                insertPositionStart = variableDeclaration.initializer.pos;
+                                insertPositionEnd = variableDeclaration.initializer.end;
+                                insertText = '\t[\r\t\t' + insertText + '\r\t]';
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    if (insertPositionStart === null || insertPositionEnd === null) {
+        return null;
+    }
+    const source = sourceFile.text;
+    return source.substring(0, insertPositionStart) + insertText + source.substring(insertPositionEnd, source.length);
+}
+exports.updateRoutes = updateRoutes;
+function updateApplicationConfig(fileContent, insertText) {
+    const sourceFile = ts.createSourceFile('tmp.ts', fileContent, {
+        languageVersion: ts.ScriptTarget.ES2022
+    });
+    let insertPositionStart = null;
+    let insertPositionEnd = null;
+    for (let statement of sourceFile.statements) {
+        if (ts.isVariableStatement(statement) && ts.isVariableDeclarationList(statement.declarationList)) {
+            if (statement.declarationList.declarations.length > 0) {
+                const declaration = statement.declarationList.declarations[0];
+                if (ts.isVariableDeclaration(declaration) && declaration.name.getText(sourceFile) === 'appConfig' && declaration.initializer !== undefined && ts.isObjectLiteralExpression(declaration.initializer)) {
+                    if (ts.isPropertyAssignment(declaration.initializer.properties[0])) {
+                        const pa = declaration.initializer.properties[0];
+                        if (pa.name.getText(sourceFile) === 'providers' && ts.isArrayLiteralExpression(pa.initializer)) {
+                            if (pa.initializer.elements.length === 0) {
+                                insertPositionStart = pa.initializer.pos;
+                                insertPositionEnd = pa.initializer.end;
+                                insertText = '[' + insertText + ']';
+                            }
+                            else {
+                                insertPositionStart = pa.initializer.elements[pa.initializer.elements.length - 1].end;
+                                insertPositionEnd = insertPositionStart;
+                                insertText = ', ' + insertText;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    if (insertPositionStart === null || insertPositionEnd === null) {
+        return null;
+    }
+    const source = sourceFile.text;
+    return source.substring(0, insertPositionStart) + insertText + source.substring(insertPositionEnd, source.length);
+}
+exports.updateApplicationConfig = updateApplicationConfig;
 //# sourceMappingURL=utility.js.map

No alert changes

Improved metrics

Total package byte prevSize

5885979

0.78%

Number of package files

320

3.56%

Lines of code

38383

2.13%

No dependency changes