@o3r/components 11.0.0-rc.9 → 11.0.1

package/builders/metadata-check/helpers/config-metadata-comparison.helper.d.ts

@@ -0,0 +1,22 @@
+import type { ComponentConfigOutput } from '@o3r/components';
+import type { MetadataComparator } from '@o3r/extractors';
+/**
+ * Interface describing a config migration element
+ */
+export interface MigrationConfigData {
+    /** Library name */
+    libraryName: string;
+    /**
+     * Configuration name
+     */
+    configName?: string;
+    /**
+     * Configuration property name
+     */
+    propertyName?: string;
+}
+/**
+ * Comparator used to compare one version of config metadata with another
+ */
+export declare const configMetadataComparator: MetadataComparator<ComponentConfigOutput, MigrationConfigData, ComponentConfigOutput[]>;
+//# sourceMappingURL=config-metadata-comparison.helper.d.ts.map

package/builders/metadata-check/helpers/config-metadata-comparison.helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-metadata-comparison.helper.d.ts","sourceRoot":"","sources":["../../../../builders/metadata-check/helpers/config-metadata-comparison.helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,mBAAmB;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AA4BD;;GAEG;AACH,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,qBAAqB,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,CAI5H,CAAC"}

package/builders/metadata-check/helpers/config-metadata-comparison.helper.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.configMetadataComparator = void 0;
+/**
+ * Returns an array of config metadata from a metadata file.
+ * To be easily parseable, the properties will be split in separate items of the array.
+ * @param content Content of a migration metadata files
+ * @example Array conversion
+ * ```javascript
+ * [{ library: '@o3r/demo', properties: [{name : 'property1', type: 'string'}, {name : 'property2', type: 'number'}] }]
+ * ```
+ * will become :
+ * ```javascript
+ * [{ library: '@o3r/demo', properties: [{name : 'property1', type: 'string'}] }, { library: '@o3r/demo', properties: [{name : 'property2', type: 'number'}] }]
+ * ```
+ */
+const getConfigurationArray = (content) => content.flatMap((config) => config.properties.length > 1
+    ? config.properties.map((prop) => ({ ...config, properties: [prop] }))
+    : [config]);
+const getConfigurationPropertyName = (config) => `${config.library}#${config.name}` + (config.properties.length ? ` ${config.properties[0].name}` : '');
+const isMigrationConfigurationDataMatch = (config, migrationData) => migrationData.libraryName === config.library
+    && (!migrationData.configName || migrationData.configName === config.name)
+    && (!migrationData.propertyName || config.properties[0]?.name === migrationData.propertyName);
+/**
+ * Comparator used to compare one version of config metadata with another
+ */
+exports.configMetadataComparator = {
+    getArray: getConfigurationArray,
+    getIdentifier: getConfigurationPropertyName,
+    isMigrationDataMatch: isMigrationConfigurationDataMatch
+};
+//# sourceMappingURL=config-metadata-comparison.helper.js.map

package/builders/metadata-check/helpers/config-metadata-comparison.helper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-metadata-comparison.helper.js","sourceRoot":"","sources":["../../../../builders/metadata-check/helpers/config-metadata-comparison.helper.ts"],"names":[],"mappings":";;;AAmBA;;;;;;;;;;;;GAYG;AACH,MAAM,qBAAqB,GAAG,CAAC,OAAgC,EAA2B,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CACtH,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;IAC1B,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAC,GAAG,MAAM,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,EAAC,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC,MAAM,CAAC,CACb,CAAC;AAEF,MAAM,4BAA4B,GAAG,CAAC,MAA6B,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAE/K,MAAM,iCAAiC,GAAG,CAAC,MAA6B,EAAE,aAAkC,EAAE,EAAE,CAC9G,aAAa,CAAC,WAAW,KAAK,MAAM,CAAC,OAAO;OACzC,CAAC,CAAC,aAAa,CAAC,UAAU,IAAI,aAAa,CAAC,UAAU,KAAK,MAAM,CAAC,IAAI,CAAC;OACvE,CAAC,CAAC,aAAa,CAAC,YAAY,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,aAAa,CAAC,YAAY,CAAC,CAAC;AAEhG;;GAEG;AACU,QAAA,wBAAwB,GAA4F;IAC/H,QAAQ,EAAE,qBAAqB;IAC/B,aAAa,EAAE,4BAA4B;IAC3C,oBAAoB,EAAE,iCAAiC;CACxD,CAAC"}

package/builders/metadata-check/helpers/index.d.ts

@@ -0,0 +1,2 @@
+export * from './config-metadata-comparison.helper';
+//# sourceMappingURL=index.d.ts.map

package/builders/metadata-check/helpers/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../builders/metadata-check/helpers/index.ts"],"names":[],"mappings":"AAAA,cAAc,qCAAqC,CAAC"}

package/builders/metadata-check/helpers/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./config-metadata-comparison.helper"), exports);
+//# sourceMappingURL=index.js.map

package/builders/metadata-check/helpers/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../builders/metadata-check/helpers/index.ts"],"names":[],"mappings":";;;AAAA,8EAAoD"}

package/builders/metadata-check/index.d.ts

@@ -0,0 +1,4 @@
+import type { ConfigMigrationMetadataCheckBuilderSchema } from './schema';
+declare const _default: import("@angular-devkit/architect/src/internal").Builder<ConfigMigrationMetadataCheckBuilderSchema & import("@angular-devkit/core").JsonObject>;
+export default _default;
+//# sourceMappingURL=index.d.ts.map

package/builders/metadata-check/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../builders/metadata-check/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,yCAAyC,EAAE,MAAM,UAAU,CAAC;;AAE1E,wBAEI"}

package/builders/metadata-check/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const architect_1 = require("@angular-devkit/architect");
+const extractors_1 = require("@o3r/extractors");
+const config_metadata_comparison_helper_1 = require("./helpers/config-metadata-comparison.helper");
+exports.default = (0, architect_1.createBuilder)((0, extractors_1.createBuilderWithMetricsIfInstalled)((options, context) => {
+    return (0, extractors_1.checkMetadataBuilder)(options, context, config_metadata_comparison_helper_1.configMetadataComparator);
+}));
+//# sourceMappingURL=index.js.map

package/builders/metadata-check/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../builders/metadata-check/index.ts"],"names":[],"mappings":";;AAAA,yDAA8E;AAC9E,gDAA4F;AAC5F,mGAAuF;AAGvF,kBAAe,IAAA,yBAAa,EAA4C,IAAA,gDAAmC,EAAC,CAAC,OAAO,EAAE,OAAO,EAA0B,EAAE;IACvJ,OAAO,IAAA,iCAAoB,EAAC,OAAO,EAAE,OAAO,EAAE,4DAAwB,CAAC,CAAC;AAC1E,CAAC,CAAC,CAAC,CAAC"}

package/builders/metadata-check/schema.d.ts

@@ -0,0 +1,5 @@
+import type { MigrationMetadataCheckBuilderOptions } from '@o3r/extractors';
+/** Migration metadata check builder schema */
+export interface ConfigMigrationMetadataCheckBuilderSchema extends MigrationMetadataCheckBuilderOptions {
+}
+//# sourceMappingURL=schema.d.ts.map

package/builders/metadata-check/schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../builders/metadata-check/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,iBAAiB,CAAC;AAE5E,8CAA8C;AAC9C,MAAM,WAAW,yCAA0C,SAAQ,oCAAoC;CACtG"}

package/builders/metadata-check/schema.js

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

package/builders/metadata-check/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../builders/metadata-check/schema.ts"],"names":[],"mappings":""}

package/builders/metadata-check/schema.json

@@ -0,0 +1,41 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "type": "object",
+  "$id": "ConfigMigrationMetadataCheckBuilderSchema",
+  "title": "Check config migration metadata builder",
+  "description": "Check config migration metadata builder",
+  "properties": {
+    "migrationDataPath": {
+      "type": ["string", "array"],
+      "items": {
+        "type": "string"
+      },
+      "description": "Glob of the migration files to use."
+    },
+    "granularity": {
+      "type": "string",
+      "description": "Granularity of the migration check.",
+      "default": "minor",
+      "enum": [
+        "major",
+        "minor"
+      ]
+    },
+    "allowBreakingChanges": {
+      "type": "boolean",
+      "description": "Are breaking changes allowed.",
+      "default": false
+    },
+    "packageManager": {
+      "type": "string",
+      "description": "Override of the package manager, otherwise it will be computed from the project setup."
+    },
+    "metadataPath": {
+      "type": "string",
+      "description": "Path of the config metadata file.",
+      "default": "./component.config.metadata.json"
+    }
+  },
+  "additionalProperties": false,
+  "required": ["migrationDataPath"]
+}

package/builders.json

@@ -5,6 +5,11 @@
       "implementation": "./builders/component-extractor/",
       "schema": "./builders/component-extractor/schema.json",
       "description": "Extract the component metadata (configuration and class) from an Otter project"
+    },
+    "check-config-migration-metadata": {
+      "implementation": "./builders/metadata-check/",
+      "schema": "./builders/metadata-check/schema.json",
+      "description": "Check for component metadata breaking changes"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/components",
-  "version": "11.0.0-rc.9",
+  "version": "11.0.1",
   "publishConfig": {
     "access": "public"
   },
@@ -44,21 +44,27 @@
     "@ngrx/effects": "~18.0.0",
     "@ngrx/entity": "~18.0.0",
     "@ngrx/store": "~18.0.0",
-    "@o3r/analytics": "^11.0.0-rc.9",
-    "@o3r/configuration": "^11.0.0-rc.9",
-    "@o3r/core": "^11.0.0-rc.9",
-    "@o3r/dynamic-content": "^11.0.0-rc.9",
-    "@o3r/extractors": "^11.0.0-rc.9",
-    "@o3r/localization": "^11.0.0-rc.9",
-    "@o3r/logger": "^11.0.0-rc.9",
-    "@o3r/rules-engine": "^11.0.0-rc.9",
-    "@o3r/schematics": "^11.0.0-rc.9",
-    "@o3r/testing": "^11.0.0-rc.9",
+    "@o3r/analytics": "^11.0.1",
+    "@o3r/configuration": "^11.0.1",
+    "@o3r/core": "^11.0.1",
+    "@o3r/dynamic-content": "^11.0.1",
+    "@o3r/extractors": "^11.0.1",
+    "@o3r/localization": "^11.0.1",
+    "@o3r/logger": "^11.0.1",
+    "@o3r/rules-engine": "^11.0.1",
+    "@o3r/schematics": "^11.0.1",
+    "@o3r/testing": "^11.0.1",
     "@schematics/angular": "~18.0.0",
+    "@yarnpkg/cli": "^4.0.0",
+    "@yarnpkg/core": "^4.1.1",
+    "@yarnpkg/fslib": "^3.1.0",
+    "@yarnpkg/plugin-npm": "^3.0.1",
+    "@yarnpkg/plugin-pack": "^4.0.0",
     "chokidar": "^3.5.2",
     "globby": "^11.1.0",
     "jsonpath-plus": "^9.0.0",
     "rxjs": "^7.8.1",
+    "semver": "^7.5.2",
     "typescript": "~5.4.2"
   },
   "peerDependenciesMeta": {
@@ -92,6 +98,21 @@
     "@schematics/angular": {
       "optional": true
     },
+    "@yarnpkg/cli": {
+      "optional": true
+    },
+    "@yarnpkg/core": {
+      "optional": true
+    },
+    "@yarnpkg/fslib": {
+      "optional": true
+    },
+    "@yarnpkg/plugin-npm": {
+      "optional": true
+    },
+    "@yarnpkg/plugin-pack": {
+      "optional": true
+    },
     "chokidar": {
       "optional": true
     },
@@ -101,6 +122,9 @@
     "jsonpath-plus": {
       "optional": true
     },
+    "semver": {
+      "optional": true
+    },
     "typescript": {
       "optional": true
     }

package/schematics/cms-adapter/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/cms-adapter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAgFvF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB;kBA5EwB,MAAM,GAAG,SAAS;UA4EkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/cms-adapter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAuFvF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB;kBAnFwB,MAAM,GAAG,SAAS;UAmFkB,CAAC"}

package/schematics/cms-adapter/index.js

@@ -37,6 +37,12 @@ function updateCmsAdapterFn(options) {
                 libraries: []
             }
         };
+        workspaceProject.architect['check-config-migration-metadata'] ||= {
+            builder: '@o3r/components:check-config-migration-metadata',
+            options: {
+                migrationDataPath: 'MIGRATION-*.json'
+            }
+        };
         workspace.projects[options.projectName] = workspaceProject;
         tree.overwrite('/angular.json', JSON.stringify(workspace, null, 2));
         return tree;

package/schematics/cms-adapter/index.js.map

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