@helsevestikt/hviktor-angular 0.0.17 → 0.0.18

package/package.json

@@ -1,14 +1,18 @@
 {
   "name": "@helsevestikt/hviktor-angular",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "license": "MIT",
   "peerDependencies": {
     "@angular/common": ">=17.0.0 <22.0.0",
     "@angular/core": ">=17.0.0 <22.0.0"
   },
+  "schematics": "./schematics/collection.json",
+  "ng-add": {
+    "save": "dependencies"
+  },
   "dependencies": {
-    "@digdir/designsystemet-css": "^1.12.1",
-    "@floating-ui/dom": "^1.7.6",
+    "@digdir/designsystemet-css": "^1.13.1",
+    "@digdir/designsystemet-web": "^1.13.1",
     "@u-elements/u-details": "^0.1.5",
     "@u-elements/u-tabs": "^0.1.2",
     "tslib": "^2.3.0"
@@ -25,6 +29,7 @@
   },
   "files": [
     "fesm2022/",
+    "schematics/",
     "types/",
     "index.d.ts",
     "styles.css",
@@ -36,5 +41,6 @@
     "**/*.css"
   ],
   "module": "fesm2022/helsevestikt-hviktor-angular.mjs",
-  "typings": "types/helsevestikt-hviktor-angular.d.ts"
+  "typings": "types/helsevestikt-hviktor-angular.d.ts",
+  "type": "module"
 }

package/schematics/collection.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "../../../node_modules/@angular-devkit/schematics/collection-schema.json",
+  "schematics": {
+    "ng-add": {
+      "description": "Legg til hviktor i applikasjonen",
+      "factory": "./ng-add/index#ngAdd",
+      "schema": "./ng-add/schema.json"
+    }
+  }
+}

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

@@ -0,0 +1,3 @@
+import { Rule } from '@angular-devkit/schematics';
+import { Schema } from './schema';
+export declare function ngAdd(options: Schema): Rule;

package/schematics/ng-add/index.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ngAdd = ngAdd;
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+const HVIKTOR_PACKAGE = '@helsevestikt/hviktor-angular';
+const HVIKTOR_IMPORT = `@import '${HVIKTOR_PACKAGE}/styles.css';`;
+const TAILWIND_IMPORT = `@import 'tailwindcss';`;
+function getStylesPath(tree, project) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    const angularJsonContent = tree.read('/angular.json');
+    if (!angularJsonContent) {
+        return 'src/styles.css';
+    }
+    const angularJson = JSON.parse(angularJsonContent.toString('utf-8'));
+    const projectName = (_a = project !== null && project !== void 0 ? project : angularJson.defaultProject) !== null && _a !== void 0 ? _a : Object.keys((_b = angularJson.projects) !== null && _b !== void 0 ? _b : {})[0];
+    const projectConfig = (_c = angularJson.projects) === null || _c === void 0 ? void 0 : _c[projectName];
+    if (!projectConfig) {
+        return 'src/styles.css';
+    }
+    const buildTarget = (_e = (_d = projectConfig.architect) === null || _d === void 0 ? void 0 : _d.build) !== null && _e !== void 0 ? _e : (_f = projectConfig.targets) === null || _f === void 0 ? void 0 : _f.build;
+    const styles = (_h = (_g = buildTarget === null || buildTarget === void 0 ? void 0 : buildTarget.options) === null || _g === void 0 ? void 0 : _g.styles) !== null && _h !== void 0 ? _h : [];
+    for (const style of styles) {
+        const stylePath = typeof style === 'string' ? style : style.input;
+        if (stylePath.endsWith('.css') || stylePath.endsWith('.scss')) {
+            return stylePath;
+        }
+    }
+    const sourceRoot = (_j = projectConfig.sourceRoot) !== null && _j !== void 0 ? _j : 'src';
+    return `${sourceRoot}/styles.css`;
+}
+function addPackageJsonDependency(tree, name, version, devDependency) {
+    const packageJsonPath = '/package.json';
+    const content = tree.read(packageJsonPath);
+    if (!content) {
+        throw new Error('Fant ikke package.json i prosjektet.');
+    }
+    const json = JSON.parse(content.toString('utf-8'));
+    const key = devDependency ? 'devDependencies' : 'dependencies';
+    if (!json[key]) {
+        json[key] = {};
+    }
+    if (json[key][name]) {
+        return;
+    }
+    json[key][name] = version;
+    tree.overwrite(packageJsonPath, JSON.stringify(json, null, 2) + '\n');
+}
+function updateStylesCss(tree, stylesPath, imports) {
+    const existing = tree.read(stylesPath);
+    const content = existing ? existing.toString('utf-8') : '';
+    const newImports = imports.filter((imp) => !content.includes(imp));
+    if (newImports.length === 0) {
+        return;
+    }
+    const updatedContent = newImports.join('\n') + '\n' + content;
+    if (existing) {
+        tree.overwrite(stylesPath, updatedContent);
+    }
+    else {
+        tree.create(stylesPath, updatedContent);
+    }
+}
+function createPostcssConfig(tree) {
+    const configPath = '/.postcssrc.json';
+    if (tree.exists(configPath)) {
+        return;
+    }
+    const config = {
+        plugins: {
+            '@tailwindcss/postcss': {},
+        },
+    };
+    tree.create(configPath, JSON.stringify(config, null, 2) + '\n');
+}
+function ngAdd(options) {
+    return (tree, context) => {
+        const styleImports = [];
+        // Conditionally: set up Tailwind CSS
+        if (options.tailwind) {
+            addPackageJsonDependency(tree, 'tailwindcss', '^4.0.0', true);
+            addPackageJsonDependency(tree, '@tailwindcss/postcss', '^4.0.0', true);
+            addPackageJsonDependency(tree, 'postcss', '^8.5.0', true);
+            createPostcssConfig(tree);
+            styleImports.push(TAILWIND_IMPORT);
+        }
+        // Hviktor import always comes after tailwind
+        styleImports.push(HVIKTOR_IMPORT);
+        const stylesPath = getStylesPath(tree, options.project);
+        updateStylesCss(tree, stylesPath, styleImports);
+        // Schedule npm install
+        context.addTask(new tasks_1.NodePackageInstallTask());
+        return tree;
+    };
+}
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../projects/hviktor/schematics/ng-add/index.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,4 @@
+export interface Schema {
+    project?: string;
+    tailwind?: boolean;
+}

package/schematics/ng-add/schema.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=schema.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../projects/hviktor/schematics/ng-add/schema.ts"],"names":[],"mappings":""}

package/schematics/ng-add/schema.json

@@ -0,0 +1,22 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "HviktorNgAdd",
+  "title": "Hviktor ng-add schematic",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "Prosjektet som hviktor skal legges til i.",
+      "$default": {
+        "$source": "projectName"
+      }
+    },
+    "tailwind": {
+      "type": "boolean",
+      "description": "Installer og konfigurer Tailwind CSS.",
+      "default": false,
+      "x-prompt": "Vil du installere Tailwind CSS?"
+    }
+  },
+  "required": []
+}

package/styles.css

@@ -30,6 +30,11 @@ body {
   font-feature-settings: 'cv05' 1;
 }
 
+/* Automatic vertical spacing between direct children in hviForm, matching ds-fieldset */
+form[hviForm] > * + * {
+  margin-block-start: var(--ds-size-4);
+}
+
 /* adding styling to lists that tailwind has removed */
 ol.ds-list {
   list-style-type: decimal;