@o3r/application 12.5.0-prerelease.3 → 12.5.0-prerelease.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/application",
-  "version": "12.5.0-prerelease.3",
+  "version": "12.5.0-prerelease.30",
   "publishConfig": {
     "access": "public"
   },
@@ -26,14 +26,15 @@
     "@angular-devkit/schematics": "^19.0.0",
     "@angular/common": "^19.0.0",
     "@angular/core": "^19.0.0",
-    "@o3r/core": "^12.5.0-prerelease.3",
-    "@o3r/logger": "^12.5.0-prerelease.3",
-    "@o3r/routing": "^12.5.0-prerelease.3",
-    "@o3r/schematics": "^12.5.0-prerelease.3",
-    "@o3r/testing": "^12.5.0-prerelease.3",
+    "@o3r/core": "^12.5.0-prerelease.30",
+    "@o3r/logger": "^12.5.0-prerelease.30",
+    "@o3r/routing": "^12.5.0-prerelease.30",
+    "@o3r/schematics": "^12.5.0-prerelease.30",
+    "@o3r/testing": "^12.5.0-prerelease.30",
     "@schematics/angular": "^19.0.0",
     "rxjs": "^7.8.1",
     "ts-node": "~10.9.2",
+    "type-fest": "^4.30.1",
     "typescript": "^5.5.4"
   },
   "peerDependenciesMeta": {
@@ -46,12 +47,15 @@
     "@o3r/testing": {
       "optional": true
     },
+    "type-fest": {
+      "optional": true
+    },
     "typescript": {
       "optional": true
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^12.5.0-prerelease.3",
+    "@o3r/schematics": "^12.5.0-prerelease.30",
     "tslib": "^2.6.2"
   },
   "engines": {

package/schemas/functional-content.metadata.schema.json

@@ -164,6 +164,26 @@
       ],
       "description": "Enum collection type of the value type"
     },
+    "choices": {
+      "type": "array",
+      "description": "Array of object to define the choices for a property",
+      "minItems": 1,
+      "items": {
+        "type": "object",
+        "required": [
+          "key",
+          "title"
+        ],
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "enumProperty": {
       "type": "object",
       "description": "Type of the property (enum)",
@@ -182,24 +202,7 @@
           "$ref": "#/definitions/propertyCollectionType"
         },
         "choices": {
-          "type": "array",
-          "description": "Array of object to define the choices for an ENUM valueType",
-          "minItems": 1,
-          "items": {
-            "type": "object",
-            "required": [
-              "key",
-              "title"
-            ],
-            "properties": {
-              "key": {
-                "type": "string"
-              },
-              "title": {
-                "type": "string"
-              }
-            }
-          }
+          "$ref": "#/definitions/choices"
         },
         "defaultValue": {
           "type": [
@@ -269,6 +272,9 @@
         "collectionType": {
           "$ref": "#/definitions/propertyCollectionType"
         },
+        "choices": {
+          "$ref": "#/definitions/choices"
+        },
         "defaultValue": {
           "type": [
             "string",

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":"AACA,OAAO,KAAK,EACV,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAoBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA6FlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAwBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAyHlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -6,6 +6,18 @@ const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const utility_1 = require("@schematics/angular/utility");
 const devtools_registration_1 = require("./helpers/devtools-registration");
+/**
+ * List of external dependencies to be added to the project as peer dependencies
+ */
+const dependenciesToInstall = [
+    '@angular/common',
+    '@angular/core',
+    'rxjs'
+];
+/**
+ * List of external dependencies to be added to the project as dev dependencies
+ */
+const devDependenciesToInstall = [];
 /**
  * Add Otter application to an Angular Project
  * @param options The options to pass to ng-add execution
@@ -55,11 +67,20 @@ function ngAddFn(options) {
             };
             return acc;
         }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
+        const projectDirectory = workspaceProject?.root || '.';
+        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
+        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
+            devDependenciesToInstall,
+            dependenciesToInstall,
+            projectType: workspaceProject?.projectType,
+            o3rPackageJsonPath: packageJsonPath,
+            projectPackageJson
+        }, context.logger);
         const registerDevtoolRule = (0, devtools_registration_1.registerDevtools)(options);
         return () => (0, schematics_1.chain)([
             (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
-                dependencies,
+                dependencies: { ...dependencies, ...externalDependenciesInfo },
                 ngAddToRun: depsInfo.o3rPeerDeps
             }),
             addAngularAnimationPreferences,