@lukfel/ng-scaffold 20.0.48 → 20.0.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lukfel/ng-scaffold",
-  "version": "20.0.48",
+  "version": "20.0.50",
   "description": "This Angular library provides a basic UI scaffold and services for modern web and mobile apps",
   "license": "MIT",
   "author": {
@@ -16,9 +16,6 @@
     "@angular/core": "^20.0.5",
     "@angular/material": "^20.0.5"
   },
-  "dependencies": {
-    "tslib": "^2.3.0"
-  },
   "exports": {
     "./styles": {
       "sass": "./styles/style.scss"
@@ -37,5 +34,8 @@
   },
   "sideEffects": false,
   "module": "fesm2022/lukfel-ng-scaffold.mjs",
-  "typings": "index.d.ts"
+  "typings": "index.d.ts",
+  "dependencies": {
+    "tslib": "^2.3.0"
+  }
 }

package/schematics/collection.json

@@ -2,9 +2,9 @@
   "$schema": "../../../node_modules/@angular-devkit/schematics/collection-schema.json",
   "schematics": {
     "ng-add": {
-      "description": "Add ng-scaffold to the project",
+      "description": "Add ng-scaffold to the project.",
       "factory": "./ng-add/index#ngAdd",
       "schema": "./ng-add/schema.json"
     }
   }
-}
+}

package/schematics/ng-add/add-styles.d.ts

@@ -0,0 +1,2 @@
+import { Rule } from '@angular-devkit/schematics';
+export declare function addStyles(): Rule;

package/schematics/ng-add/{add-styles.ts → add-styles.js}

@@ -1,40 +1,38 @@
-import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
-
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addStyles = addStyles;
 const SNIPPET = `
 @use "@lukfel/ng-scaffold/styles" as lf;
 // Create a base theme and include it with @include lf.scaffold-theme($base-theme);
 // Include additional themes with @include lf.scaffold-colors($theme2, 'theme2');
 
-`;
-
-export function addStyles(): Rule {
-    return (tree: Tree, context: SchematicContext) => {
-        context.logger.info('[Styles] Searching for styles file ...');
-
-        const possiblePaths = [
-            'src/styles.scss',
-            'src/styles.sass',
-            'src/styles.css',
-            'src/styles.css.scss',
-            'styles.scss'
-        ];
-
-        const path = possiblePaths.find(p => tree.exists(p));
-        if (!path) {
-            context.logger.warn('[Styles] No global styles file found. Skip.');
-            return tree
-        };
-
-        const content = tree.read(path)!.toString('utf-8');
-        if (content.includes('@lukfel/ng-scaffold/styles') || content.includes('lf.scaffold-theme')) {
-            context.logger.info('[Styles] Styles already added. Skip.');
-            return tree;
-        }
-
-        const recorder = tree.beginUpdate(path);
-        recorder.insertLeft(content.length, SNIPPET);
-        tree.commitUpdate(recorder);
-        context.logger.info('[Styles] Successfully added.');
-        return tree;
-    };
-}
+`;
+function addStyles() {
+    return (tree, context) => {
+        context.logger.info('[Styles] Searching for styles file ...');
+        const possiblePaths = [
+            'src/styles.scss',
+            'src/styles.sass',
+            'src/styles.css',
+            'src/styles.css.scss',
+            'styles.scss'
+        ];
+        const path = possiblePaths.find(p => tree.exists(p));
+        if (!path) {
+            context.logger.warn('[Styles] No global styles file found. Skip.');
+            return tree;
+        }
+        ;
+        const content = tree.read(path).toString('utf-8');
+        if (content.includes('@lukfel/ng-scaffold/styles') || content.includes('lf.scaffold-theme')) {
+            context.logger.info('[Styles] Styles already added. Skip.');
+            return tree;
+        }
+        const recorder = tree.beginUpdate(path);
+        recorder.insertLeft(content.length, SNIPPET);
+        tree.commitUpdate(recorder);
+        context.logger.info('[Styles] Successfully added.');
+        return tree;
+    };
+}
+//# sourceMappingURL=add-styles.js.map

package/schematics/ng-add/add-styles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-styles.js","sourceRoot":"","sources":["../../../../projects/ng-scaffold/schematics/ng-add/add-styles.ts"],"names":[],"mappings":";;AASA,8BA8BC;AArCD,MAAM,OAAO,GAAG;;;;;CAKf,CAAC;AAEF,SAAgB,SAAS;IACrB,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;QAE9D,MAAM,aAAa,GAAG;YAClB,iBAAiB;YACjB,iBAAiB;YACjB,gBAAgB;YAChB,qBAAqB;YACrB,aAAa;SAChB,CAAC;QAEF,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;YACnE,OAAO,IAAI,CAAA;QACf,CAAC;QAAA,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC1F,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACxC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;AACN,CAAC"}

package/schematics/ng-add/index.d.ts

@@ -0,0 +1,2 @@
+import { Rule } from '@angular-devkit/schematics';
+export default function ngAdd(): Rule;

package/schematics/ng-add/index.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = ngAdd;
+const schematics_1 = require("@angular-devkit/schematics");
+// import { addModule } from './add-module';
+// import { addService } from './add-service';
+const add_styles_1 = require("./add-styles");
+// import { addTemplate } from './add-template';
+function ngAdd() {
+    return (0, schematics_1.chain)([
+        // addModule(),
+        // addService(),
+        // addTemplate(),
+        (0, add_styles_1.addStyles)(),
+    ]);
+}
+//# sourceMappingURL=index.js.map

package/schematics/ng-add/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../projects/ng-scaffold/schematics/ng-add/index.ts"],"names":[],"mappings":";;AAMA,wBAOC;AAbD,2DAAyD;AACzD,4CAA4C;AAC5C,8CAA8C;AAC9C,6CAAyC;AACzC,gDAAgD;AAEhD,SAAwB,KAAK;IACzB,OAAO,IAAA,kBAAK,EAAC;QACT,eAAe;QACf,gBAAgB;QAChB,iBAAiB;QACjB,IAAA,sBAAS,GAAE;KACd,CAAC,CAAC;AACP,CAAC"}

package/schematics/ng-add/add-module.ts

@@ -1,74 +0,0 @@
-import { Rule, SchematicsException, Tree } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
-import { getTsSourceFile } from './ts-ast-utils';
-
-export function addModule(): Rule {
-    return (tree: Tree) => {
-        const mainPaths = ['src/main.ts', 'main.ts'];
-        let mainPath: string | undefined;
-
-        for (const p of mainPaths) {
-            if (tree.exists(p)) {
-                mainPath = p;
-                break;
-            }
-        }
-
-        // --- 1) Standalone bootstrap ---
-        if (mainPath) {
-            const sourceFile = getTsSourceFile(tree, mainPath);
-            if (!sourceFile) throw new SchematicsException(`Could not read ${mainPath}`);
-            const content = tree.read(mainPath)!.toString('utf-8');
-
-            if (!content.includes('@lukfel/ng-scaffold')) {
-                const importStatements = sourceFile.statements.filter(s => ts.isImportDeclaration(s));
-                const insertPos = importStatements.length ? importStatements[importStatements.length - 1].end + 1 : 0;
-                const recorder = tree.beginUpdate(mainPath);
-                recorder.insertLeft(insertPos, 'import { ScaffoldModule } from \'@lukfel/ng-scaffold\';\n');
-                tree.commitUpdate(recorder);
-            }
-            return tree;
-        }
-
-        // --- 2) NgModule ---
-        const modulePaths = ['src/app/app.module.ts', 'app.module.ts'];
-        for (const mp of modulePaths) {
-            if (!tree.exists(mp)) continue;
-            const sourceFile = getTsSourceFile(tree, mp);
-            if (!sourceFile) continue;
-            let content = tree.read(mp)!.toString('utf-8');
-
-            // Add import if missing
-            if (!content.includes('@lukfel/ng-scaffold')) {
-                const importStatements = sourceFile.statements.filter(s => ts.isImportDeclaration(s));
-                const insertPos = importStatements.length ? importStatements[importStatements.length - 1].end + 1 : 0;
-                const recorder = tree.beginUpdate(mp);
-                recorder.insertLeft(insertPos, 'import { ScaffoldModule } from \'@lukfel/ng-scaffold\';\n');
-                tree.commitUpdate(recorder);
-                content = tree.read(mp)!.toString('utf-8');
-            }
-
-            // Add ScaffoldModule to imports array
-            const importsMatch = /imports\s*:\s*\[([\s\S]*?)\]/m.exec(content);
-            if (importsMatch) {
-                const arrayStart = content.indexOf('[', importsMatch.index) + 1;
-                const recorder = tree.beginUpdate(mp);
-                recorder.insertLeft(arrayStart, ' ScaffoldModule,');
-                tree.commitUpdate(recorder);
-                return tree;
-            }
-            // No imports array: insert one
-            const ngModuleMatch = /@NgModule\s*\(\s*\{/.exec(content);
-            if (ngModuleMatch) {
-                const insertPos = ngModuleMatch.index + ngModuleMatch[0].length;
-                const recorder = tree.beginUpdate(mp);
-                recorder.insertLeft(insertPos, '\n  imports: [ScaffoldModule],');
-                tree.commitUpdate(recorder);
-                return tree;
-            }
-
-        }
-
-        throw new SchematicsException('Could not find main.ts or app.module.ts to add ScaffoldModule');
-    };
-}

package/schematics/ng-add/add-service.ts

@@ -1,117 +0,0 @@
-import { Rule, SchematicsException, Tree } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
-
-function detectBootstrapComponent(tree: Tree): { className: string, filePath: string } | null {
-  // Reuse the same detection logic as addTemplate
-  const mainPaths = ['src/main.ts', 'main.ts'];
-  for (const mp of mainPaths) {
-    if (!tree.exists(mp)) continue;
-    const text = tree.read(mp)!.toString('utf-8');
-    // eslint-disable-next-line no-useless-escape
-    const match = /bootstrapApplication\(([^,\)]+)/.exec(text);
-    if (match) {
-      const className = match[1].trim();
-      const importMatch = new RegExp(`import\\s+\\{?\\s*${className}\\s*\\}?\\s+from\\s+['"](.*)['"]`).exec(text);
-      if (importMatch) {
-        const importPath = importMatch[1].startsWith('.') ? importMatch[1] : `./${importMatch[1]}`;
-        const filePath = `src/${importPath.replace(/^\.\/+/, '')}.ts`;
-        if (tree.exists(filePath)) return { className, filePath };
-      }
-    }
-  }
-
-  const modulePaths = ['src/app/app.module.ts', 'app.module.ts'];
-  for (const mp of modulePaths) {
-    if (!tree.exists(mp)) continue;
-    const text = tree.read(mp)!.toString('utf-8');
-    const match = /bootstrap\s*:\s*\[([^\]]+)\]/.exec(text);
-    if (match) {
-      const className = match[1].split(',')[0].trim();
-      const importMatch = new RegExp(`import\\s+\\{?\\s*${className}\\s*\\}?\\s+from\\s+['"](.*)['"]`).exec(text);
-      if (importMatch) {
-        const importPath = importMatch[1].startsWith('.') ? importMatch[1] : `./${importMatch[1]}`;
-        const filePath = `src/${importPath.replace(/^\.\/+/, '')}.ts`;
-        if (tree.exists(filePath)) return { className, filePath };
-      }
-    }
-  }
-
-  return null;
-}
-
-export function addService(): Rule {
-  return (tree: Tree) => {
-    const detected = detectBootstrapComponent(tree);
-    if (!detected) throw new SchematicsException('Could not detect bootstrap component');
-
-    const { className, filePath } = detected;
-    if (!tree.exists(filePath)) throw new SchematicsException(`Component file not found: ${filePath}`);
-
-    let content = tree.read(filePath)!.toString('utf-8');
-    const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
-    const recorder = tree.beginUpdate(filePath);
-
-    // Add imports if missing
-    if (!content.includes('@lukfel/ng-scaffold')) {
-      content = 'import { ScaffoldService, ScaffoldConfig } from \'@lukfel/ng-scaffold\';\n' + content;
-    }
-    if (!content.includes('inject')) {
-      content = 'import { inject } from \'@angular/core\';\n' + content;
-    }
-
-    // Find class node
-    let classNode: ts.ClassDeclaration | undefined;
-    function visit(node: ts.Node): void {
-      if (ts.isClassDeclaration(node) && node.name?.text === className) {
-        classNode = node;
-      } else ts.forEachChild(node, visit);
-    }
-    visit(sourceFile);
-
-    if (!classNode) throw new SchematicsException(`Could not find class ${className} in ${filePath}`);
-
-    // Determine constructor
-    const constructorNode = classNode.members.find(ts.isConstructorDeclaration);
-
-    if (constructorNode) {
-      // Existing constructor: inject via parameter if missing
-      const paramExists = constructorNode.parameters.some(p =>
-        p.type?.getText(sourceFile).includes('ScaffoldService')
-      );
-      if (!paramExists) {
-        const ctorStart = constructorNode.getStart(sourceFile);
-        const ctorText = constructorNode.getFullText(sourceFile);
-        const insertPos = ctorStart + ctorText.indexOf('(') + 1;
-        recorder.insertLeft(insertPos, 'private scaffoldService: ScaffoldService, ');
-      }
-
-      // Add assignment inside constructor body if missing
-      const bodyStart = constructorNode.body!.getStart(sourceFile);
-      const bodyEnd = constructorNode.body!.getEnd();
-      const bodyText = content.slice(bodyStart, bodyEnd);
-      if (!bodyText.includes('this.scaffoldService.scaffoldConfig')) {
-        recorder.insertLeft(bodyEnd - 1, '\n    this.scaffoldService.scaffoldConfig = this.scaffoldConfig;\n');
-      }
-    } else {
-      // No constructor: use inject() + new constructor
-      const classStart = classNode.getStart(sourceFile);
-      const classHeaderEnd = content.indexOf('{', classStart) + 1;
-
-      const snippet = `
-  private scaffoldService = inject(ScaffoldService);
-  private scaffoldConfig: ScaffoldConfig = {
-    // Create your own config or generate it at https://lukfel.github.io/ng-scaffold
-  };
-  constructor() {
-    this.scaffoldService.scaffoldConfig = this.scaffoldConfig;
-  }
-`;
-
-      recorder.insertLeft(classHeaderEnd, snippet);
-    }
-
-    tree.commitUpdate(recorder);
-    return tree;
-  };
-}
-

package/schematics/ng-add/add-template.ts

@@ -1,107 +0,0 @@
-import { Rule, SchematicsException, Tree } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
-
-function detectBootstrapComponent(tree: Tree): { className: string, filePath: string } | null {
-  // simplified detection: main.ts (standalone) or AppModule
-  const mainPaths = ['src/main.ts', 'main.ts'];
-  for (const mp of mainPaths) {
-    if (!tree.exists(mp)) continue;
-    const text = tree.read(mp)!.toString('utf-8');
-    // eslint-disable-next-line no-useless-escape
-    const match = /bootstrapApplication\(([^,\)]+)/.exec(text);
-    if (match) {
-      const className = match[1].trim();
-      const importMatch = new RegExp(`import\\s+\\{?\\s*${className}\\s*\\}?\\s+from\\s+['"](.*)['"]`).exec(text);
-      if (importMatch) {
-        const importPath = importMatch[1].startsWith('.') ? importMatch[1] : `./${importMatch[1]}`;
-        const filePath = `src/${importPath.replace(/^\.\/+/, '')}.ts`;
-        if (tree.exists(filePath)) return { className, filePath };
-      }
-    }
-  }
-
-  const modulePaths = ['src/app/app.module.ts', 'app.module.ts'];
-  for (const mp of modulePaths) {
-    if (!tree.exists(mp)) continue;
-    const text = tree.read(mp)!.toString('utf-8');
-    const match = /bootstrap\s*:\s*\[([^\]]+)\]/.exec(text);
-    if (match) {
-      const className = match[1].split(',')[0].trim();
-      const importMatch = new RegExp(`import\\s+\\{?\\s*${className}\\s*\\}?\\s+from\\s+['"](.*)['"]`).exec(text);
-      if (importMatch) {
-        const importPath = importMatch[1].startsWith('.') ? importMatch[1] : `./${importMatch[1]}`;
-        const filePath = `src/${importPath.replace(/^\.\/+/, '')}.ts`;
-        if (tree.exists(filePath)) return { className, filePath };
-      }
-    }
-  }
-
-  return null;
-}
-
-export function addTemplate(): Rule {
-  return (tree: Tree) => {
-    const detected = detectBootstrapComponent(tree);
-    if (!detected) throw new SchematicsException('Could not detect bootstrap component');
-
-    const { className, filePath } = detected;
-    if (!tree.exists(filePath)) throw new SchematicsException(`Component file not found: ${filePath}`);
-
-    const content = tree.read(filePath)!.toString('utf-8');
-    const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
-    const recorder = tree.beginUpdate(filePath);
-    let modified = false;
-
-    function visit(node: ts.Node): void {
-      if (ts.isClassDeclaration(node) && node.name?.text === className) {
-        // ✅ Correct type assertion for decorators
-        const decorators = (node as ts.ClassDeclaration & { decorators?: ts.NodeArray<ts.Decorator> }).decorators;
-        if (!decorators) return;
-
-        const componentDecorator = decorators.find(d => d.getText(sourceFile).startsWith('@Component'));
-        if (!componentDecorator) return;
-
-        const decoratorText = componentDecorator.getFullText(sourceFile);
-
-        // templateUrl
-        const templateUrlMatch = /templateUrl\s*:\s*['"`](.*?)['"`]/.exec(decoratorText);
-        if (templateUrlMatch) {
-          const templatePathRaw = templateUrlMatch[1];
-          // eslint-disable-next-line no-useless-escape
-          const compDir = filePath.replace(/\/[^\/]+$/, '');
-          let templatePath = templatePathRaw.startsWith('./')
-            ? `${compDir}/${templatePathRaw.slice(2)}`
-            : `${compDir}/${templatePathRaw}`;
-          if (!tree.exists(templatePath)) templatePath += '.html';
-          if (!tree.exists(templatePath)) throw new SchematicsException(`Template not found: ${templatePath}`);
-          const html = tree.read(templatePath)!.toString('utf-8');
-          if (!html.includes('<lf-scaffold>')) {
-            recorder.remove(0, html.length);
-            recorder.insertLeft(0, `<lf-scaffold>\n${html}\n</lf-scaffold>`);
-            modified = true;
-          }
-        } else {
-          // inline template
-          const templateMatch = /template\s*:\s*(`([\s\S]*?)`|['"`]([\s\S]*?)['"`])/.exec(decoratorText);
-          if (templateMatch) {
-            const inner = templateMatch[2] ?? templateMatch[3] ?? '';
-            const start = content.indexOf(inner);
-            if (start !== -1) {
-              recorder.remove(start, inner.length);
-              recorder.insertLeft(start, `<lf-scaffold>\n${inner}\n</lf-scaffold>`);
-              modified = true;
-            }
-          }
-        }
-      } else {
-        ts.forEachChild(node, visit);
-      }
-    }
-
-    visit(sourceFile);
-
-    if (modified) tree.commitUpdate(recorder);
-
-    return tree;
-  };
-}

package/schematics/ng-add/index.ts

@@ -1,14 +0,0 @@
-import { chain, Rule } from '@angular-devkit/schematics';
-// import { addModule } from './add-module';
-// import { addService } from './add-service';
-import { addStyles } from './add-styles';
-// import { addTemplate } from './add-template';
-
-export default function ngAdd(): Rule {
-    return chain([
-        // addModule(),
-        // addService(),
-        // addTemplate(),
-        addStyles(),
-    ]);
-}

package/schematics/ng-add/ts-ast-utils.ts

@@ -1,29 +0,0 @@
-import { Tree } from '@angular-devkit/schematics';
-import { InsertChange, ReplaceChange } from '@schematics/angular/utility/change';
-import * as ts from 'typescript';
-
-/**
- * Read a file into a ts.SourceFile
- */
-export function getTsSourceFile(tree: Tree, path: string): ts.SourceFile | null {
-    const buffer = tree.read(path);
-    if (!buffer) return null;
-    const content = buffer.toString('utf-8');
-    return ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
-}
-
-/**
- * Create InsertChange or ReplaceChange compatible object
- */
-export function applyInsertChanges(tree: Tree, filePath: string, changes: Array<InsertChange | ReplaceChange>): void {
-    const recorder = tree.beginUpdate(filePath);
-    for (const change of changes) {
-        // InsertChange has 'pos' and 'toAdd'
-        if ((change as any).pos !== undefined && (change as any).toAdd !== undefined) {
-            recorder.insertLeft((change as any).pos, (change as any).toAdd);
-        } else if ((change as any).order != undefined) {
-            // ignore other change shapes
-        }
-    }
-    tree.commitUpdate(recorder);
-}