Allow to skip over reused element id as workaround for faulty changeset

.github/workflows/ci.yml

@@ -2,13 +2,14 @@ name: CI
 
 on:
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "itwinjs-v5" ]
   workflow_dispatch:
 
 jobs:
   check-change-files:
+    if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
-    name: Check change files
+    name: Check change files 
 
     steps:
     - name: Checkout
@@ -21,10 +22,10 @@ jobs:
       with:
         version: 9.14.2
 
-    - name: Use Node.js 20
+    - name: Use Node.js 22
       uses: actions/setup-node@v3
       with:
-        node-version: 20.18.1
+        node-version: 22.12.0
         cache: 'pnpm'
 
     - name: Install dependencies
@@ -48,10 +49,10 @@ jobs:
       with:
         version: 9.14.2
 
-    - name: Use Node.js 20
+    - name: Use Node.js 22
       uses: actions/setup-node@v3
       with:
-        node-version: 20.18.1
+        node-version: 22.12.0
         cache: 'pnpm'
 
     - id: set-matrix
@@ -104,10 +105,10 @@ jobs:
       with:
         version: 9.14.2
 
-    - name: Use Node.js 20
+    - name: Use Node.js 22
       uses: actions/setup-node@v3
       with:
-        node-version: 20.18.1
+        node-version: 22.12.0
         cache: 'pnpm'
 
     - name: Force dependency resolution
@@ -161,6 +162,7 @@ jobs:
         CORE_VERSION: ${{ matrix.version }}
 
     - name: Lint
+      if: github.ref == 'refs/heads/main'
       run: pnpm run lint
 
     - name: Build

.github/workflows/extract-api.yaml

@@ -35,10 +35,10 @@ jobs:
         with:
           version: 9.14.2
 
-      - name: Use Node.js 20
+      - name: Use Node.js 22
         uses: actions/setup-node@v3
         with:
-          node-version: 20.18.1
+          node-version: 22.12.0
           cache: 'pnpm'
 
       - name: Pnpm install

.github/workflows/release-dev.yml

@@ -31,10 +31,10 @@ jobs:
       with:
         version: 9.14.2
 
-    - name: Use Node.js 20
+    - name: Use Node.js 22
       uses: actions/setup-node@v3
       with:
-        node-version: 20.18.1
+        node-version: 22.12.0
         registry-url: https://registry.npmjs.org/
 
     - name: Install dependencies

.github/workflows/release.yml

@@ -19,10 +19,10 @@ jobs:
       with:
         version: 9.14.2
 
-    - name: Use Node.js 20
+    - name: Use Node.js 22
       uses: actions/setup-node@v3
       with:
-        node-version: 20.18.1
+        node-version: 22.12.0
         registry-url: https://registry.npmjs.org/
 
     - name: Install dependencies

.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npm run pre-commit
+lint-staged

change/@itwin-imodel-transformer-6aca5427-b509-472e-8478-7883e75f326f.json

@@ -0,0 +1,7 @@
+{
+  "type": "major",
+  "comment": "Upgrade to iTwin.js 5.0.",
+  "packageName": "@itwin/imodel-transformer",
+  "email": "22944042+pmconne@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

common/api/imodel-transformer.api.md

@@ -21,6 +21,7 @@ import { EntityProps } from '@itwin/core-common';
 import { EntityReference } from '@itwin/core-common';
 import { ExternalSourceAspect } from '@itwin/core-backend';
 import { ExternalSourceAspectProps } from '@itwin/core-common';
+import { FontFamilyDescriptor } from '@itwin/core-common';
 import { FontProps } from '@itwin/core-common';
 import { Helmert2DWithZOffset } from '@itwin/core-common';
 import { Id64Arg } from '@itwin/core-bentley';
@@ -45,6 +46,8 @@ import { Transform } from '@itwin/core-geometry';
 export class ChangedInstanceIds {
     constructor(db: IModelDb);
     addChange(change: ChangedECInstance): Promise<void>;
+    // (undocumented)
+    addChangeKey(change: ChangeInstanceKey): Promise<void>;
     // @beta
     addCustomAspectChange(changeType: SqliteChangeOp, ids: Id64Arg): void;
     // @beta
@@ -149,6 +152,8 @@ export class IModelExporter {
     exportCodeSpecByName(codeSpecName: string): Promise<void>;
     exportCodeSpecs(): Promise<void>;
     exportElement(elementId: Id64String): Promise<void>;
+    exportFontByFontFamilyDescriptor(fontFamily: FontFamilyDescriptor): Promise<void>;
+    exportFontByFontProps(fontProps: FontProps): Promise<void>;
     exportFontByName(fontName: string): Promise<void>;
     exportFontByNumber(fontNumber: number): Promise<void>;
     exportFonts(): Promise<void>;
@@ -273,7 +278,6 @@ export class IModelTransformer extends IModelExportHandler {
         fn: (sourceElementId: Id64String, targetElementId: Id64String) => void;
         skipPropagateChangesToRootElements: boolean;
     }): void;
-    protected get hasDefinitionContainerDeletionFeature(): boolean;
     protected hasElementChanged(sourceElement: Element_2): boolean;
     readonly importer: IModelImporter;
     initElementProvenance(sourceElementId: Id64String, targetElementId: Id64String): ExternalSourceAspectProps;
@@ -447,14 +451,16 @@ export class TemplateModelCloner extends IModelTransformer {
 
 // @public
 export enum TransformerLoggerCategory {
+    // (undocumented)
+    ECReferenceTypesCache = "imodel-transformer.ECReferenceTypesCache",
     // @beta
-    IModelCloneContext = "core-backend.IModelCloneContext",
+    IModelCloneContext = "imodel-transformer.IModelCloneContext",
     // @beta
-    IModelExporter = "core-backend.IModelExporter",
+    IModelExporter = "imodel-transformer.IModelExporter",
     // @beta
-    IModelImporter = "core-backend.IModelImporter",
+    IModelImporter = "imodel-transformer.IModelImporter",
     // @beta
-    IModelTransformer = "core-backend.IModelTransformer"
+    IModelTransformer = "imodel-transformer.IModelTransformer"
 }
 
 // (No @packageDocumentation comment for this package)

eslint.config.js

@@ -3,110 +3,113 @@ const iTwinPlugin = require("@itwin/eslint-plugin");
 const prettier = require("eslint-config-prettier/prettier");
 
 module.exports = [
-    {
-        files: ["**/*.ts"],
-        ...iTwinPlugin.configs.iTwinjsRecommendedConfig,
+  {
+    files: ["**/*.ts"],
+    ...iTwinPlugin.configs.iTwinjsRecommendedConfig,
+  },
+  {
+    files: ["**/*.ts"],
+    rules: {
+      "@itwin/no-internal": [
+        "warn",
+        {
+          tag: ["internal"],
+        },
+      ],
+      "@typescript-eslint/naming-convention": [
+        ...itwinjsRecommended.rules["@typescript-eslint/naming-convention"],
+        {
+          selector: "objectLiteralProperty",
+          format: null,
+          leadingUnderscore: "allowSingleOrDouble",
+        },
+      ],
+      "@typescript-eslint/indent": ["off"],
+      "@typescript-eslint/dot-notation": [
+        "error",
+        {
+          allowProtectedClassPropertyAccess: true,
+          allowPrivateClassPropertyAccess: true,
+        },
+      ],
+      /** The following set of rules were manually turned off by using the output of 'npx eslint-config-prettier ./src/IModelTransformer.ts'
+       *  which shows conflicting or unnecessary rules when using eslint + prettier.
+       */
+      "@typescript-eslint/member-delimiter-style": ["off"],
+      "@typescript-eslint/no-extra-semi": ["off"],
+      "@typescript-eslint/semi": ["off"],
+      "@typescript-eslint/space-before-function-paren": ["off"],
+      "@typescript-eslint/type-annotation-spacing": ["off"],
+      "eol-last": ["off"],
+      "max-statements-per-line": ["off"],
+      "new-parens": ["off"],
+      "no-multiple-empty-lines": ["off"],
+      "no-trailing-spaces": ["off"],
+      "nonblock-statement-body-position": ["off"],
+      "quote-props": ["off"],
+      "arrow-parens": ["off"],
+      "brace-style": ["off"],
+      "comma-dangle": ["off"],
+      /** https://github.com/prettier/eslint-config-prettier#special-rules */
+      quotes: [
+        "error",
+        "double",
+        { avoidEscape: true, allowTemplateLiterals: false },
+      ],
     },
-    {
-        files: ["**/*.ts"],
-        rules: {
-            "@itwin/no-internal": [
-              "warn",
-              {
-                tag: ["internal"],
-              },
-            ],
-            "@typescript-eslint/naming-convention": [
-              ...itwinjsRecommended.rules["@typescript-eslint/naming-convention"],
-              {
-                selector: "objectLiteralProperty",
-                format: null,
-                leadingUnderscore: "allowSingleOrDouble", 
-              },
-            ],
-            "@typescript-eslint/indent": ["off"],
-            "@typescript-eslint/dot-notation": [
-              "error",
-              {
-                allowProtectedClassPropertyAccess: true,
-                allowPrivateClassPropertyAccess: true,
-              },
-            ],
-            /** The following set of rules were manually turned off by using the output of 'npx eslint-config-prettier ./src/IModelTransformer.ts' 
-             *  which shows conflicting or unnecessary rules when using eslint + prettier.
-             */
-            "@typescript-eslint/member-delimiter-style": ["off"],
-            "@typescript-eslint/no-extra-semi": ["off"],
-            "@typescript-eslint/semi": ["off"],
-            "@typescript-eslint/space-before-function-paren": ["off"],
-            "@typescript-eslint/type-annotation-spacing": ["off"],
-            "eol-last": ["off"],
-            "max-statements-per-line": ["off"],
-            "new-parens": ["off"],
-            "no-multiple-empty-lines": ["off"],
-            "no-trailing-spaces": ["off"],
-            "nonblock-statement-body-position": ["off"],
-            "quote-props": ["off"],
-            "arrow-parens": ["off"],
-            "brace-style": ["off"],
-            "comma-dangle": ["off"],
-            /** https://github.com/prettier/eslint-config-prettier#special-rules */
-            "@typescript-eslint/quotes": [
-                "error", "double", { "avoidEscape": true, "allowTemplateLiterals": false }
-            ]
-          },
+  },
+  {
+    files: ["**/*.ts"],
+    ...prettier,
+  },
+  {
+    files: ["packages/transformer/**/*.ts"],
+    rules: {
+      "@typescript-eslint/no-unsafe-enum-comparison": "off",
     },
-    {
-        files: ["**/*.ts"],
-        ...prettier,
+    languageOptions: {
+      parserOptions: {
+        project: "packages/transformer/tsconfig.json",
+        tsconfigRootDir: __dirname,
+      },
+      sourceType: "commonjs",
     },
-    {
-        files: ["packages/transformer/**/*.ts"],
-        rules: {
-          "@typescript-eslint/no-unsafe-enum-comparison": "off",
+  },
+  {
+    files: ["packages/transformer/src/test/**/*.ts"],
+    rules: {
+      "@itwin/no-internal-barrel-imports": "off",
+      "@typescript-eslint/no-non-null-assertion": "off",
+    },
+  },
+  {
+    files: ["packages/performance-tests/**/*.ts"],
+    rules: {
+      "@typescript-eslint/naming-convention": [
+        ...itwinjsRecommended.rules["@typescript-eslint/naming-convention"],
+        {
+          selector: ["objectLiteralProperty", "typeProperty"],
+          format: null,
+          leadingUnderscore: "allowSingleOrDouble",
         },
-        languageOptions: {
-            parserOptions: {
-                project: "packages/transformer/tsconfig.json",
-                tsconfigRootDir: __dirname
-            },
-            sourceType: "commonjs",
-        }
+      ],
     },
-    {
-      files: ["packages/transformer/src/test/**/*.ts"],
-      rules: {
-        "@itwin/no-internal-barrel-imports": "off"
-      }
+    languageOptions: {
+      parserOptions: {
+        project: "packages/performance-tests/tsconfig.json",
+        tsconfigRootDir: __dirname,
+      },
+      sourceType: "commonjs",
     },
-    {
-        files: ["packages/performance-tests/**/*.ts"],
-        rules: {
-            "@typescript-eslint/naming-convention": [
-              ...itwinjsRecommended.rules["@typescript-eslint/naming-convention"],
-              {
-                selector: ["objectLiteralProperty", "typeProperty"],
-                format: null,
-                leadingUnderscore: "allowSingleOrDouble", 
-              },
-            ],
-        },
-        languageOptions: {
-            parserOptions: {
-                project: "packages/performance-tests/tsconfig.json",
-                tsconfigRootDir: __dirname
-            },
-            sourceType: "commonjs",
-        }
+  },
+  {
+    files: ["packages/test-app/**/*.ts"],
+    languageOptions: {
+      parserOptions: {
+        project: "packages/test-app/tsconfig.json",
+        tsconfigRootDir: __dirname,
+      },
+      sourceType: "commonjs",
     },
-    {
-        files: ["packages/test-app/**/*.ts"],
-        languageOptions: {
-            parserOptions: {
-                project: "packages/test-app/tsconfig.json",
-                tsconfigRootDir: __dirname
-            },
-            sourceType: "commonjs",
-        }
-    }
+  },
 ];