@o3r/extractors 13.0.0-next.3 → 13.0.0-next.31

package/package.json

@@ -2,7 +2,7 @@
   "name": "@o3r/extractors",
   "main": "./src/public_api.js",
   "types": "./src/public_api.d.ts",
-  "version": "13.0.0-next.3",
+  "version": "13.0.0-next.31",
   "publishConfig": {
     "access": "public"
   },
@@ -21,13 +21,13 @@
     "prepare:build:builders": "yarn cpy 'builders/**/*.json' dist/builders && yarn cpy 'schematics/**/*.json' 'schematics/**/templates/**' dist/schematics && yarn cpy '{builders,collection,migration}.json' dist && yarn cpy 'schemas/*.json' 'dist/schemas'"
   },
   "peerDependencies": {
-    "@angular-devkit/architect": ">=0.1900.0 <0.2000.0-0",
-    "@angular-devkit/core": "^19.0.0",
-    "@angular-devkit/schematics": "^19.0.0",
-    "@o3r/core": "^13.0.0-next.3",
-    "@o3r/schematics": "^13.0.0-next.3",
-    "@o3r/telemetry": "^13.0.0-next.3",
-    "@schematics/angular": "^19.0.0",
+    "@angular-devkit/architect": ">=0.2000.0 <0.2100.0-0",
+    "@angular-devkit/core": "^20.0.0",
+    "@angular-devkit/schematics": "^20.0.0",
+    "@o3r/core": "^13.0.0-next.31",
+    "@o3r/schematics": "^13.0.0-next.31",
+    "@o3r/telemetry": "^13.0.0-next.31",
+    "@schematics/angular": "^20.0.0",
     "@yarnpkg/cli": "^4.0.0",
     "@yarnpkg/core": "^4.1.1",
     "@yarnpkg/fslib": "^3.1.0",
@@ -36,8 +36,8 @@
     "globby": "^11.1.0",
     "semver": "^7.5.2",
     "ts-node": "~10.9.2",
-    "type-fest": "^4.10.2",
-    "typescript": "^5.5.4"
+    "type-fest": "^4.30.1",
+    "typescript": "^5.8.0"
   },
   "peerDependenciesMeta": {
     "@angular-devkit/schematics": {
@@ -67,9 +67,6 @@
     "globby": {
       "optional": true
     },
-    "semver": {
-      "optional": true
-    },
     "type-fest": {
       "optional": true
     }
@@ -82,79 +79,80 @@
     "typedoc": "~0.28.0"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "~0.1902.0",
-    "@angular-devkit/build-angular": "~19.2.0",
-    "@angular-devkit/core": "~19.2.0",
-    "@angular-devkit/schematics": "~19.2.0",
-    "@angular/animations": "~19.2.0",
-    "@angular/common": "~19.2.0",
-    "@angular/compiler": "~19.2.0",
-    "@angular/compiler-cli": "~19.2.0",
-    "@angular/core": "~19.2.0",
-    "@angular/platform-browser": "~19.2.0",
-    "@angular/platform-browser-dynamic": "~19.2.0",
-    "@babel/core": "~7.27.0",
+    "@angular-devkit/architect": "~0.2000.0",
+    "@angular-devkit/build-angular": "~20.0.0",
+    "@angular-devkit/core": "~20.0.0",
+    "@angular-devkit/schematics": "~20.0.0",
+    "@angular/animations": "~20.0.0",
+    "@angular/common": "~20.0.0",
+    "@angular/compiler": "~20.0.0",
+    "@angular/compiler-cli": "~20.0.0",
+    "@angular/core": "~20.0.0",
+    "@angular/platform-browser": "~20.0.0",
+    "@angular/platform-browser-dynamic": "~20.0.0",
+    "@babel/core": "~7.28.0",
     "@babel/preset-typescript": "~7.27.0",
     "@compodoc/compodoc": "^1.1.19",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
-    "@nx/eslint": "~20.8.0",
-    "@nx/eslint-plugin": "~20.8.0",
-    "@nx/jest": "~20.8.0",
-    "@nx/js": "~20.8.0",
-    "@o3r/build-helpers": "^13.0.0-next.3",
-    "@o3r/core": "^13.0.0-next.3",
-    "@o3r/eslint-config": "^13.0.0-next.3",
-    "@o3r/eslint-plugin": "^13.0.0-next.3",
-    "@o3r/schematics": "^13.0.0-next.3",
-    "@o3r/telemetry": "^13.0.0-next.3",
-    "@o3r/test-helpers": "^13.0.0-next.3",
-    "@schematics/angular": "~19.2.0",
-    "@stylistic/eslint-plugin": "~3.1.0",
+    "@nx/eslint": "~21.3.11",
+    "@nx/eslint-plugin": "~21.3.11",
+    "@nx/jest": "~21.3.11",
+    "@nx/js": "~21.3.11",
+    "@o3r/build-helpers": "^13.0.0-next.31",
+    "@o3r/core": "^13.0.0-next.31",
+    "@o3r/eslint-config": "^13.0.0-next.31",
+    "@o3r/eslint-plugin": "^13.0.0-next.31",
+    "@o3r/schematics": "^13.0.0-next.31",
+    "@o3r/telemetry": "^13.0.0-next.31",
+    "@o3r/test-helpers": "^13.0.0-next.31",
+    "@schematics/angular": "~20.0.0",
+    "@stylistic/eslint-plugin": "~5.2.0",
     "@swc/helpers": "~0.5.0",
     "@types/jest": "~29.5.2",
-    "@types/node": "^20.0.0",
+    "@types/node": "^22.0.0",
     "@types/semver": "^7.3.13",
-    "@typescript-eslint/parser": "~8.35.0",
+    "@typescript-eslint/parser": "~8.39.0",
     "@yarnpkg/cli": "^4.5.0",
     "@yarnpkg/core": "^4.1.3",
     "@yarnpkg/fslib": "^3.1.0",
     "@yarnpkg/plugin-npm": "^3.0.1",
     "@yarnpkg/plugin-pack": "^4.0.0",
-    "angular-eslint": "~19.4.0",
-    "cpy-cli": "^5.0.0",
-    "eslint": "~9.29.0",
+    "angular-eslint": "~20.1.0",
+    "cpy-cli": "^6.0.0",
+    "eslint": "~9.33.0",
     "eslint-import-resolver-node": "~0.3.9",
-    "eslint-import-resolver-typescript": "~3.10.0",
+    "eslint-import-resolver-typescript": "~4.4.0",
     "eslint-plugin-import": "~2.32.0",
     "eslint-plugin-import-newlines": "~1.4.0",
-    "eslint-plugin-jest": "~28.14.0",
-    "eslint-plugin-jsdoc": "~50.8.0",
+    "eslint-plugin-jest": "~29.0.0",
+    "eslint-plugin-jsdoc": "~54.1.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
-    "eslint-plugin-unicorn": "~56.0.0",
+    "eslint-plugin-unicorn": "~60.0.0",
     "eslint-plugin-unused-imports": "~4.1.4",
-    "globals": "^15.9.0",
+    "globals": "^16.0.0",
     "globby": "^11.1.0",
     "intl-messageformat": "~10.7.0",
     "jest": "~29.7.0",
     "jest-environment-jsdom": "~29.7.0",
     "jest-junit": "~16.0.0",
-    "jest-preset-angular": "~14.5.0",
+    "jest-preset-angular": "~14.6.0",
+    "jest-util": "~29.7.0",
     "jsonc-eslint-parser": "~2.4.0",
-    "nx": "~20.8.0",
+    "nx": "~21.3.11",
     "pid-from-port": "^1.1.3",
     "rimraf": "^6.0.1",
     "rxjs": "^7.8.1",
     "semver": "^7.5.2",
-    "ts-jest": "~29.3.0",
+    "ts-jest": "~29.4.0",
     "ts-node": "~10.9.2",
     "type-fest": "^4.30.1",
     "typescript": "~5.8.2",
-    "typescript-eslint": "~8.35.0",
+    "typescript-eslint": "~8.39.0",
     "typescript-json-schema": "^0.65.0",
     "zone.js": "~0.15.0"
   },
   "engines": {
-    "node": "^20.11.1 || >=22.0.0"
+    "node": "^20.19.0 || ^22.17.0 || ^24.0.0"
   },
   "builders": "./builders.json",
   "schematics": "./collection.json",

package/schemas/migration.metadata.schema.json

@@ -24,9 +24,24 @@
       "description": "List of all the changes contained in this version",
       "items": {
         "oneOf": [
-          { "$ref": "#/definitions/ConfigChange" },
-          { "$ref": "#/definitions/LocalizationChange" },
-          { "$ref": "#/definitions/StyleChange" }
+          {
+            "$ref": "#/definitions/ConfigChange"
+          },
+          {
+            "$ref": "#/definitions/LocalizationChange"
+          },
+          {
+            "$ref": "#/definitions/StyleChange"
+          },
+          {
+            "$ref": "#/definitions/AssetChange"
+          },
+          {
+            "$ref": "#/definitions/ComponentChange"
+          },
+          {
+            "$ref": "#/definitions/RuleFactChange"
+          }
         ]
       }
     }
@@ -34,7 +49,9 @@
   "definitions": {
     "ConfigMigrationItem": {
       "type": "object",
-      "required": ["libraryName"],
+      "required": [
+        "libraryName"
+      ],
       "properties": {
         "libraryName": {
           "type": "string",
@@ -52,7 +69,9 @@
     },
     "LocalizationMigrationItem": {
       "type": "object",
-      "required": ["key"],
+      "required": [
+        "key"
+      ],
       "properties": {
         "key": {
           "type": "string",
@@ -62,7 +81,9 @@
     },
     "StyleMigrationItem": {
       "type": "object",
-      "required": ["name"],
+      "required": [
+        "name"
+      ],
       "properties": {
         "name": {
           "type": "string",
@@ -70,6 +91,50 @@
         }
       }
     },
+    "AssetMigrationItem": {
+      "type": "object",
+      "required": [
+        "name"
+      ],
+      "properties": {
+        "path": {
+          "type": "string",
+          "description": "Path of the asset, starting from the root assets folder"
+        }
+      }
+    },
+    "ComponentMigrationItem": {
+      "type": "object",
+      "required": [
+        "libraryName"
+      ],
+      "properties": {
+        "libraryName": {
+          "type": "string",
+          "description": "Library name"
+        },
+        "componentName": {
+          "type": "string",
+          "description": "Component name"
+        },
+        "placeholderId": {
+          "type": "string",
+          "description": "Placeholder id"
+        }
+      }
+    },
+    "RuleFactMigrationItem": {
+      "type": "object",
+      "required": [
+        "name"
+      ],
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the fact"
+        }
+      }
+    },
     "ConfigChange": {
       "type": "object",
       "required": [
@@ -135,6 +200,72 @@
           "$ref": "#/definitions/StyleMigrationItem"
         }
       }
+    },
+    "AssetChange": {
+      "type": "object",
+      "required": [
+        "contentType",
+        "before"
+      ],
+      "properties": {
+        "contentType": {
+          "type": "string",
+          "description": "Metadata type",
+          "const": "ASSET"
+        },
+        "before": {
+          "description": "Previous metadata value",
+          "$ref": "#/definitions/AssetMigrationItem"
+        },
+        "after": {
+          "description": "New metadata value",
+          "$ref": "#/definitions/AssetMigrationItem"
+        }
+      }
+    },
+    "ComponentChange": {
+      "type": "object",
+      "required": [
+        "contentType",
+        "before"
+      ],
+      "properties": {
+        "contentType": {
+          "type": "string",
+          "description": "Metadata type",
+          "const": "COMPONENT"
+        },
+        "before": {
+          "description": "Previous metadata value",
+          "$ref": "#/definitions/ComponentMigrationItem"
+        },
+        "after": {
+          "description": "New metadata value",
+          "$ref": "#/definitions/ComponentMigrationItem"
+        }
+      }
+    },
+    "RuleFactChange": {
+      "type": "object",
+      "required": [
+        "contentType",
+        "before"
+      ],
+      "properties": {
+        "contentType": {
+          "type": "string",
+          "description": "Metadata type",
+          "const": "RULE_FACT"
+        },
+        "before": {
+          "description": "Previous metadata value",
+          "$ref": "#/definitions/RuleFactMigrationItem"
+        },
+        "after": {
+          "description": "New metadata value",
+          "$ref": "#/definitions/RuleFactMigrationItem"
+        }
+      }
     }
   }
-}
+}

package/schematics/cms-adapter/templates/tsconfig.cms.json.template

@@ -3,7 +3,6 @@
   "compilerOptions": {
     "target": "es5",
     "module": "es2020",
-    "moduleResolution": "node",
     "experimentalDecorators": true,
     "lib": [
       "dom",

package/schematics/ng-add/schema.json

@@ -9,7 +9,8 @@
       "description": "Project name",
       "$default": {
         "$source": "projectName"
-      }
+      },
+      "alias": "project"
     },
     "exactO3rVersion": {
       "type": "boolean",