@o3r/styling 12.3.0-prerelease.47 → 12.3.0-prerelease.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/styling",
-  "version": "12.3.0-prerelease.47",
+  "version": "12.3.0-prerelease.49",
   "publishConfig": {
     "access": "public"
   },
@@ -38,11 +38,11 @@
     "@angular/common": "^19.0.0",
     "@angular/core": "^19.0.0",
     "@angular/material": "^19.0.0",
-    "@o3r/core": "^12.3.0-prerelease.47",
-    "@o3r/dynamic-content": "^12.3.0-prerelease.47",
-    "@o3r/extractors": "^12.3.0-prerelease.47",
-    "@o3r/logger": "^12.3.0-prerelease.47",
-    "@o3r/schematics": "^12.3.0-prerelease.47",
+    "@o3r/core": "^12.3.0-prerelease.49",
+    "@o3r/dynamic-content": "^12.3.0-prerelease.49",
+    "@o3r/extractors": "^12.3.0-prerelease.49",
+    "@o3r/logger": "^12.3.0-prerelease.49",
+    "@o3r/schematics": "^12.3.0-prerelease.49",
     "@schematics/angular": "^19.0.0",
     "@yarnpkg/cli": "^4.3.1",
     "@yarnpkg/core": "^4.1.1",
@@ -127,6 +127,7 @@
     }
   },
   "dependencies": {
+    "@o3r/schematics": "^12.3.0-prerelease.49",
     "tslib": "^2.6.2"
   },
   "generatorDependencies": {

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAmGlB;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAKtD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAkBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAgFlB;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -4,6 +4,7 @@ exports.ngAdd = void 0;
 const fs = require("node:fs");
 const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const cms_adapter_1 = require("../cms-adapter");
 const devDependenciesToInstall = [
     'chokidar',
@@ -13,12 +14,6 @@ const dependenciesToInstall = [
     '@angular/material',
     '@angular/cdk'
 ];
-const reportMissingSchematicsDep = (logger) => (reason) => {
-    logger.error(`[ERROR]: Adding @o3r/styling has failed.
-If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the styling package. Please run 'ng add @o3r/core' .
-Otherwise, use the error message as guidance.`);
-    throw reason;
-};
 /**
  * Add Otter styling to an Angular Project
  * Update the styling if the app/lib used otter v7
@@ -27,26 +22,25 @@ Otherwise, use the error message as guidance.`);
 function ngAddFn(options) {
     return async (tree, context) => {
         const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-        const { getDefaultOptionsForSchematic, getPackageInstallConfig, getO3rPeerDeps, getProjectNewDependenciesTypes, getWorkspaceConfig, setupDependencies, removePackages, registerPackageCollectionSchematics, setupSchematicsParamsForProject, updateSassImports, getExternalDependenciesVersionRange } = await Promise.resolve().then(() => require('@o3r/schematics'));
-        options = { ...getDefaultOptionsForSchematic(getWorkspaceConfig(tree), '@o3r/styling', 'ng-add', options), ...options };
+        options = { ...(0, schematics_2.getDefaultOptionsForSchematic)((0, schematics_2.getWorkspaceConfig)(tree), '@o3r/styling', 'ng-add', options), ...options };
         const { updateThemeFiles, removeV7OtterAssetsInAngularJson } = await Promise.resolve().then(() => require('./theme-files'));
         const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
-        const depsInfo = getO3rPeerDeps(packageJsonPath);
+        const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
         if (options.enableMetadataExtract) {
             depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
         }
-        const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
             acc[dep] = {
                 inManifest: [{
                         range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
-                        types: getProjectNewDependenciesTypes(workspaceProject)
+                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
                     }],
                 ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
             };
             return acc;
-        }, getPackageInstallConfig(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
-        Object.entries(getExternalDependenciesVersionRange(devDependenciesToInstall, packageJsonPath, context.logger))
+        }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
+        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(devDependenciesToInstall, packageJsonPath, context.logger))
             .forEach(([dep, range]) => {
             dependencies[dep] = {
                 inManifest: [{
@@ -55,12 +49,12 @@ function ngAddFn(options) {
                     }]
             };
         });
-        Object.entries(getExternalDependenciesVersionRange(dependenciesToInstall, packageJsonPath, context.logger))
+        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(dependenciesToInstall, packageJsonPath, context.logger))
             .forEach(([dep, range]) => {
             dependencies[dep] = {
                 inManifest: [{
                         range,
-                        types: getProjectNewDependenciesTypes(workspaceProject)
+                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
                     }]
             };
         });
@@ -68,17 +62,17 @@ function ngAddFn(options) {
             useOtterTheming: undefined
         };
         return (0, schematics_1.chain)([
-            removePackages(['@otter/styling']),
-            updateSassImports('o3r'),
+            (0, schematics_2.removePackages)(['@otter/styling']),
+            (0, schematics_2.updateSassImports)('o3r'),
             updateThemeFiles(__dirname, options),
             removeV7OtterAssetsInAngularJson(options),
-            setupDependencies({
+            (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
                 dependencies,
                 ngAddToRun: depsInfo.o3rPeerDeps
             }),
-            registerPackageCollectionSchematics(JSON.parse(fs.readFileSync(packageJsonPath).toString())),
-            setupSchematicsParamsForProject({
+            (0, schematics_2.registerPackageCollectionSchematics)(JSON.parse(fs.readFileSync(packageJsonPath).toString())),
+            (0, schematics_2.setupSchematicsParamsForProject)({
                 '@o3r/core:component': schematicsDefaultOptions,
                 '@o3r/core:component-presenter': schematicsDefaultOptions
             }, options.projectName),
@@ -91,9 +85,6 @@ function ngAddFn(options) {
  * Update the styling if the app/lib used otter v7
  * @param options for the dependency installations
  */
-const ngAdd = (options) => async (_, { logger }) => {
-    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics')).catch(reportMissingSchematicsDep(logger));
-    return createOtterSchematic(ngAddFn)(options);
-};
+const ngAdd = (options) => (0, schematics_2.createOtterSchematic)(ngAddFn)(options);
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map

package/schematics/ng-add/theme-files/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/theme-files/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAEpC;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,GAAG,IAAI,CAgD7G;AAID;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,GAAG,IAAI,CAoB3G"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/theme-files/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAOpC;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,GAAG,IAAI,CA+C7G;AAID;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,GAAG,IAAI,CAmB3G"}

package/schematics/ng-add/theme-files/index.js

@@ -5,6 +5,7 @@ exports.removeV7OtterAssetsInAngularJson = removeV7OtterAssetsInAngularJson;
 const path = require("node:path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 /**
  * Added styling support
  * @param rootPath @see RuleFactory.rootPath
@@ -12,9 +13,8 @@ const schematics_1 = require("@angular-devkit/schematics");
  * @param options.projectName
  */
 function updateThemeFiles(rootPath, options) {
-    return async (tree, context) => {
-        const { getTemplateFolder, getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
-        const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
+    return (tree, context) => {
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         if (!workspaceProject || workspaceProject.projectType === 'library') {
             return schematics_1.noop;
         }
@@ -40,7 +40,7 @@ function updateThemeFiles(rootPath, options) {
             || tree.exists(path.posix.join(mainStyleFolder, 'styling', '_styling.scss'))) { // do nothing if the styling is already in place
             return;
         }
-        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)(getTemplateFolder(rootPath, __dirname)), [
+        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname)), [
             (0, schematics_1.template)({
                 ...core_1.strings,
                 currentStyleFile,
@@ -58,9 +58,8 @@ function updateThemeFiles(rootPath, options) {
  * @param options.projectName
  */
 function removeV7OtterAssetsInAngularJson(options) {
-    return async (tree, context) => {
-        const { writeAngularJson, getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
-        const workspace = getWorkspaceConfig(tree);
+    return (tree, context) => {
+        const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
         const projectName = options.projectName;
         const workspaceProject = options.projectName ? workspace?.projects[options.projectName] : undefined;
         // exit if not an application
@@ -72,7 +71,7 @@ function removeV7OtterAssetsInAngularJson(options) {
             workspaceProject.architect.build.options.assets = workspaceProject.architect.build.options.assets.filter((a) => !a.input || !a.input.includes('node_modules/@otter/styling/assets'));
         }
         workspace.projects[projectName] = workspaceProject;
-        writeAngularJson(tree, workspace);
+        (0, schematics_2.writeAngularJson)(tree, workspace);
     };
 }
 //# sourceMappingURL=index.js.map