@ui5/webcomponents-ngx 0.1.0 → 0.1.1-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-ngx",
-  "version": "0.1.0",
+  "version": "0.1.1-rc.1",
   "license": "Apache-2.0",
   "author": "SAP SE (https://www.sap.com)",
   "keywords": [

package/schematics/add-dependencies/index.js

@@ -17,16 +17,18 @@ const workspace_1 = require("@schematics/angular/utility/workspace");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const package_config_1 = require("../utils/package-config");
 const package_json_1 = __importDefault(require("../../package.json"));
+const commonCssPackageName = '@fundamental-styles/common-css';
+const themingNgxPackageName = '@ui5/theming-ngx';
 function addDependencies(options) {
     return (tree, context) => (0, workspace_1.updateWorkspace)(() => __awaiter(this, void 0, void 0, function* () {
         if (!options.theming && options.commonCss.length === 0) {
             return;
         }
-        if (options.commonCss.length && !(0, package_config_1.getPackageVersionFromPackageJson)(tree, '@fundamental-styles/common-css')) {
-            (0, package_config_1.addPackageToPackageJson)(tree, '@fundamental-styles/common-css', 'latest');
+        if (options.commonCss.length && !(0, package_config_1.getPackageVersionFromPackageJson)(tree, commonCssPackageName)) {
+            (0, package_config_1.addPackageToPackageJson)(tree, commonCssPackageName, 'latest');
         }
-        if (options.theming && !(0, package_config_1.getPackageVersionFromPackageJson)(tree, '@ui5/theming-ngx')) {
-            (0, package_config_1.addPackageToPackageJson)(tree, '@ui5/theming-ngx', package_json_1.default.version);
+        if (options.theming && !(0, package_config_1.getPackageVersionFromPackageJson)(tree, themingNgxPackageName)) {
+            (0, package_config_1.addPackageToPackageJson)(tree, themingNgxPackageName, package_json_1.default.version);
         }
         const peerDependencies = Object.keys(package_json_1.default.peerDependencies).map((peerDependency) => ([peerDependency, package_json_1.default.peerDependencies[peerDependency]]));
         for (const [peerDependency, version] of peerDependencies) {

package/schematics/add-styles/index.js

@@ -12,9 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addStyles = void 0;
 const workspace_1 = require("@schematics/angular/utility/workspace");
 const schematics_1 = require("@angular-devkit/schematics");
-const tasks_1 = require("@angular-devkit/schematics/tasks");
 function addStyles(options) {
-    return (_, context) => (0, workspace_1.updateWorkspace)((workspace) => __awaiter(this, void 0, void 0, function* () {
+    return () => (0, workspace_1.updateWorkspace)((workspace) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const currentWorkspace = workspace.projects.get(options.project);
         if (!currentWorkspace) {
@@ -24,14 +23,13 @@ function addStyles(options) {
         if (!buildTargetOptions) {
             throw new schematics_1.SchematicsException('Could not find build target options for defined project.');
         }
-        let styles = buildTargetOptions['styles'];
+        let styles = (buildTargetOptions['styles'] || []);
         styles = styles.filter(style => (typeof style === 'string' && !style.startsWith('node_modules/@fundamental-styles/common-css') ||
             typeof style !== 'string' && !style.input.startsWith('node_modules/@fundamental-styles/common-css')));
         options.commonCss.forEach((style) => {
             styles.push(`node_modules/@fundamental-styles/common-css/dist/${style}.css`);
         });
         buildTargetOptions['styles'] = styles;
-        context.addTask(new tasks_1.NodePackageInstallTask());
     }));
 }
 exports.addStyles = addStyles;

package/schematics/add-theming/index.js

@@ -53,6 +53,9 @@ function addTheming(options) {
         if (!buildTargetOptions) {
             throw new schematics_1.SchematicsException('Could not find build target options for defined project.');
         }
+        if (!buildTargetOptions['main']) {
+            throw new schematics_1.SchematicsException('Could not find main entry file for defined project.');
+        }
         const rootModule = (0, ng_ast_utils_1.getAppModulePath)(tree, buildTargetOptions['main']);
         if (!rootModule) {
             throw new schematics_1.SchematicsException('Could not find root module for defined project.');

package/schematics/{ng-add/available-themes.d.ts → config.d.ts}

@@ -2,3 +2,7 @@ export declare const AvailableThemes: {
     value: string;
     name: string;
 }[];
+export declare const CommonCssParts: {
+    value: string;
+    name: string;
+}[];

package/schematics/{ng-add/common-css-parts.js → config.js}

@@ -1,6 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonCssParts = void 0;
+exports.CommonCssParts = exports.AvailableThemes = void 0;
+exports.AvailableThemes = [
+    {
+        value: 'sap_horizon',
+        name: 'Morning Horizon (Light)'
+    },
+    {
+        value: 'sap_horizon_dark',
+        name: 'Evening Horizon (Dark)'
+    },
+    {
+        value: 'sap_horizon_hcb',
+        name: 'Horizon High Contrast Black'
+    },
+    {
+        value: 'sap_horizon_hcw',
+        name: 'Horizon High Contrast White'
+    },
+    {
+        value: 'sap_fiori_3',
+        name: 'Quartz Light'
+    },
+    {
+        value: 'sap_fiori_3_dark',
+        name: 'Quartz Dark'
+    },
+    {
+        value: 'sap_fiori_3_hcb',
+        name: 'Quartz High Contrast Black'
+    },
+    {
+        value: 'sap_fiori_3_hcw',
+        name: 'Quartz High Contrast White'
+    }
+];
 exports.CommonCssParts = [
     {
         value: 'sap-normalize',

package/schematics/get-config.d.ts

@@ -0,0 +1,2 @@
+import { Schema } from "./schema";
+export declare function collectConfig(): Promise<Partial<Schema>>;

package/schematics/get-config.js

@@ -0,0 +1,69 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.collectConfig = void 0;
+const config_1 = require("./config");
+const promt_1 = require("./utils/promt");
+function collectConfig() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const schema = {
+            commonCss: [],
+            defaultTheme: 'sap_horizon'
+        };
+        const includeCommonCss = yield askCommonCssDependency();
+        if (includeCommonCss) {
+            schema.commonCss = yield askCommonCssParts();
+        }
+        schema.theming = yield askThemingDependency();
+        if (schema.theming) {
+            schema.defaultTheme = yield askDefaultTheme();
+        }
+        return schema;
+    });
+}
+exports.collectConfig = collectConfig;
+function askCommonCssDependency() {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield (0, promt_1.askQuestion)({
+            type: 'confirm',
+            message: 'Would you like to add Common CSS into your application?',
+            default: false,
+        });
+    });
+}
+function askCommonCssParts() {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield (0, promt_1.askQuestion)({
+            type: 'checkbox',
+            message: 'Please select desired Common CSS features',
+            choices: config_1.CommonCssParts,
+        });
+    });
+}
+function askThemingDependency() {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield (0, promt_1.askQuestion)({
+            type: 'confirm',
+            message: 'Would you like to add Theming capabilities into your application?',
+            default: true,
+        });
+    });
+}
+function askDefaultTheme() {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield (0, promt_1.askQuestion)({
+            type: 'list',
+            message: 'Please select desired Common CSS features',
+            default: 'sap_horizon',
+            choices: config_1.AvailableThemes,
+        });
+    });
+}

package/schematics/ng-add/index.js

@@ -12,76 +12,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.proceedWithSchematics = exports.ngAdd = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
-const promt_1 = require("../utils/promt");
-const available_themes_1 = require("./available-themes");
-const common_css_parts_1 = require("./common-css-parts");
+const get_config_1 = require("../get-config");
 function ngAdd(options) {
     return (_, context) => __awaiter(this, void 0, void 0, function* () {
-        const userConfig = yield collectConfig();
+        const userConfig = yield (0, get_config_1.collectConfig)();
         options = Object.assign(Object.assign({}, options), userConfig);
         // First, queue dependency installation task.
         const dependenciesTaskId = context.addTask(new tasks_1.RunSchematicTask('add-dependencies', options));
         // Wait for dependencies to be installed and proceed with main schematics.
         context.addTask(new tasks_1.RunSchematicTask('proceed-with-schematics', options), [dependenciesTaskId]);
         return (0, schematics_1.chain)([]);
-        // return tree;
     });
 }
 exports.ngAdd = ngAdd;
-function collectConfig() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const schema = {
-            commonCss: [],
-            defaultTheme: 'sap_horizon'
-        };
-        const includeCommonCss = yield askCommonCssDependency();
-        if (includeCommonCss) {
-            schema.commonCss = yield askCommonCssParts();
-        }
-        schema.theming = yield askThemingDependency();
-        if (schema.theming) {
-            schema.defaultTheme = yield askDefaultTheme();
-        }
-        return schema;
-    });
-}
-function askCommonCssDependency() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield (0, promt_1.askQuestion)({
-            type: 'confirm',
-            message: 'Would you like to add Common CSS into your application?',
-            default: false,
-        });
-    });
-}
-function askCommonCssParts() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield (0, promt_1.askQuestion)({
-            type: 'checkbox',
-            message: 'Please select desired Common CSS features',
-            choices: common_css_parts_1.CommonCssParts,
-        });
-    });
-}
-function askThemingDependency() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield (0, promt_1.askQuestion)({
-            type: 'confirm',
-            message: 'Would you like to add Theming capabilities into your application?',
-            default: true,
-        });
-    });
-}
-function askDefaultTheme() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield (0, promt_1.askQuestion)({
-            type: 'list',
-            message: 'Please select desired default theme',
-            default: 'sap_horizon',
-            choices: available_themes_1.AvailableThemes,
-        });
-    });
-}
 function proceedWithSchematics(options) {
     return (0, schematics_1.chain)([
         (0, schematics_1.schematic)('add-styles', options),

package/schematics/ng-add/available-themes.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AvailableThemes = void 0;
-exports.AvailableThemes = [
-    {
-        value: 'sap_horizon',
-        name: 'Morning Horizon (Light)'
-    },
-    {
-        value: 'sap_horizon_dark',
-        name: 'Evening Horizon (Dark)'
-    },
-    {
-        value: 'sap_horizon_hcb',
-        name: 'Horizon High Contrast Black'
-    },
-    {
-        value: 'sap_horizon_hcw',
-        name: 'Horizon High Contrast White'
-    },
-    {
-        value: 'sap_fiori_3',
-        name: 'Quartz Light'
-    },
-    {
-        value: 'sap_fiori_3_dark',
-        name: 'Quartz Dark'
-    },
-    {
-        value: 'sap_fiori_3_hcb',
-        name: 'Quartz High Contrast Black'
-    },
-    {
-        value: 'sap_fiori_3_hcw',
-        name: 'Quartz High Contrast White'
-    }
-];

package/schematics/ng-add/common-css-parts.d.ts

@@ -1,4 +0,0 @@
-export declare const CommonCssParts: {
-    value: string;
-    name: string;
-}[];