Merge pull request #86 from shiftcode/#7-next

#7 next

Author: mumenthalers

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@shiftcode/airtable-syncer",
-  "version": "1.0.1",
+  "version": "1.0.2-pr7.2",
   "description": "base utils and services to export airtable and upload to S3",
   "repository": "https://github.com/shiftcode/sc-commons-public",
   "license": "MIT",

packages/airtable-syncer/package.json

@@ -134,7 +134,7 @@ export class AirtableFetcher {
     }
 
     /* eslint-disable-next-line @typescript-eslint/no-non-null-assertion */
-    const cachedRecordsMap: Map<string, AirtableIdRecord> = <any>this.cache.get(map.tableName)!.items
+    const cachedRecordsMap: Map<string, AirtableIdRecord> = this.cache.get(map.tableName)!.items
 
     if (ids && Array.isArray(ids) && ids.length) {
       // filter only required ids

packages/airtable-syncer/src/services/airtable-fetcher.service.ts

@@ -6,8 +6,11 @@ Utilities for branch info depending on env (GitHub Workflow or Local)
 
 ## Stage Name Concept
 
-the stageId is extracted from the branchname by the pattern `/^#(\d+)-(.*)/`
+the stageId is extracted from the branchname by the pattern `/^#?(\d+)-(.*)/`
 
 - When Master --> `master`
+- When `main` --> `main`
 - When Local or nonPr github workflow --> `xx#{stageId}`
 - When Github PR --> `pr#{stageId}`
+- the `#` is optional in the branchname; if present, it is stripped from the stageId.
+- the branch name may contain a directory like prefix, e.g. `feature/#72-ok` or `copilot/123-fix-a-thing`

packages/branch-utilities/README.md

@@ -1,6 +1,6 @@
 {
   "name": "@shiftcode/branch-utilities",
-  "version": "6.0.0",
+  "version": "6.1.0-pr7.4",
   "description": "Utilities for local and ci to get branch name and stage",
   "repository": "https://github.com/shiftcode/sc-commons-public",
   "license": "MIT",

packages/branch-utilities/package.json

@@ -15,13 +15,13 @@ describe('base utils', () => {
         SC_OVERRIDE_BRANCH_NAME: undefined,
         SC_OVERRIDE_IS_PR: undefined,
       }
-      expect(getBranchInfo(env, 'master')).toEqual(<BranchInfo>{
+      expect(getBranchInfo(env, 'master')).toEqual({
         stage: 'master',
         isPr: false,
         isProd: true,
         name: 'master',
         branchName: 'master',
-      })
+      } satisfies BranchInfo)
     })
 
     test('works locally when not master', () => {
@@ -53,9 +53,9 @@ describe('base utils', () => {
       const env: Partial<GithubActionEnv & CustomGitHubContext> = {
         GITHUB_ACTIONS: 'true',
         GITHUB_EVENT_NAME: 'push',
-        GITHUB_CONTEXT: JSON.stringify(<Partial<GitHubContext>>{
+        GITHUB_CONTEXT: JSON.stringify({
           ref: 'refs/heads/master',
-        }),
+        } satisfies Partial<GitHubContext>),
       }
       expect(getBranchInfo(env)).toEqual({
         branchName: 'master',
@@ -72,13 +72,13 @@ describe('base utils', () => {
         SC_OVERRIDE_BRANCH_NAME: '#1313-on-branch-to-override-them-all',
         SC_OVERRIDE_IS_PR: 'true',
       }
-      expect(getBranchInfo(env, 'master')).toEqual(<BranchInfo>{
+      expect(getBranchInfo(env, 'master')).toEqual({
         stage: 'pr1313',
         isPr: true,
         isProd: false,
         name: 'on-branch-to-override-them-all',
         branchName: '#1313-on-branch-to-override-them-all',
-      })
+      } satisfies BranchInfo)
     })
   })
 
@@ -94,6 +94,16 @@ describe('base utils', () => {
 
       expect(parseBranchName('#72- whatever').branchId).toBe(72)
       expect(parseBranchName('feature/#72-ok').branchId).toBe(72)
+      expect(parseBranchName('1-foobar')).toEqual({ branchId: 1, branchName: 'foobar' } satisfies ReturnType<
+        typeof parseBranchName
+      >)
+      expect(parseBranchName('feat/42-foo-bar-baz')).toEqual({
+        branchId: 42,
+        branchName: 'foo-bar-baz',
+      } satisfies ReturnType<typeof parseBranchName>)
+      expect(parseBranchName('007-oh-james')).toEqual({ branchId: 7, branchName: 'oh-james' } satisfies ReturnType<
+        typeof parseBranchName
+      >)
     })
 
     test('works for github copilot created branches', () => {
@@ -107,8 +117,10 @@ describe('base utils', () => {
 
     test('throws when invalid pattern', () => {
       expect(() => parseBranchName('whrjwe')).toThrow()
-      expect(() => parseBranchName('copilot/123-fix')).toThrow()
       expect(() => parseBranchName('feat/copilot/fix-123')).toThrow()
+      expect(() => parseBranchName('/42-foo')).toThrow()
+      expect(() => parseBranchName('fix-7-issues')).toThrow()
+      expect(() => parseBranchName('fix7-issues')).toThrow()
     })
   })
 

packages/branch-utilities/src/lib/base.utils.spec.ts

@@ -13,7 +13,7 @@ export const REGEX_MAIN = /^main$/
  * @example #123-my-feature ->  { id:  '123',  name: 'my-feature' }
  * @example feature/#456-yanr -> { id:  '456',  name: 'yanr' }
  */
-const REGEX_BRANCH_NAME_DEFAULT = /^[a-z]*\/?#(?<id>\d+)-(?<name>.*)$/
+const REGEX_BRANCH_NAME_DEFAULT = /^(?:[a-z]+\/)?#?(?<id>\d+)-(?<name>.*)$/
 /**
  * regex to match the branch convention github copilot uses with the following named capture groups: id, name
  * @example copilot/fix-789 -> { id:  '789',  name: 'fix' }
@@ -153,7 +153,7 @@ export function parseBranchName(branchName: string): { branchId: number; branchN
     }
   } else {
     throw new Error(
-      `given branch name ${branchName} does not match our convention #<one or more digit>-<branch-name-with-kebap-case>`,
+      `given branch name ${branchName} does not match our conventions: [<lowercase-prefix>/][#]<digits>-<name> or copilot/<name>-<digits>`,
     )
   }
 }

packages/branch-utilities/src/lib/base.utils.ts

@@ -1,6 +1,6 @@
 {
   "name": "@shiftcode/eslint-config-recommended",
-  "version": "7.0.0",
+  "version": "8.0.0-pr7.2",
   "description": "default shiftcode config for eslint",
   "repository": "https://github.com/shiftcode/sc-commons-public",
   "license": "MIT",
@@ -28,19 +28,19 @@
   },
   "dependencies": {
     "@eslint/js": "^9.37.0",
-    "@shiftcode/eslint-plugin-rules": "^6.0.0",
+    "@shiftcode/eslint-plugin-rules": "^6.0.1-pr7.1",
     "eslint": "^9.37.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-unused-imports": "^4.2.0",
-    "typescript-eslint": "8.46.0"
+    "eslint-plugin-unused-imports": "^4.4.1",
+    "typescript-eslint": "8.67.0"
   },
   "devDependencies": {
-    "angular-eslint": "^20.5.1"
+    "angular-eslint": "~21.3.1"
   },
   "peerDependencies": {
-    "angular-eslint": "^20.5.1 || ^21.0.0"
+    "angular-eslint": "^21.3.0 || ^22.0.0"
   },
   "peerDependenciesMeta": {
     "angular-eslint": {

packages/eslint-config-recommended/package.json

@@ -36,7 +36,6 @@ export function defineScAngularConfig(...configs: Parameters<typeof defineConfig
   return defineScTsConfig(
     {
       files: ['**/*.ts'],
-      // @ts-expect-error angular fck it up
       extends: [eslintAngular.configs.tsRecommended],
       processor: eslintAngular.processInlineTemplates,
       rules: {
@@ -45,9 +44,11 @@ export function defineScAngularConfig(...configs: Parameters<typeof defineConfig
         '@angular-eslint/sort-lifecycle-methods': 'error',
         '@angular-eslint/no-lifecycle-call': 'error',
         '@angular-eslint/prefer-output-readonly': 'error',
+        '@angular-eslint/prefer-output-emitter-ref': 'error',
         '@angular-eslint/no-host-metadata-property': 'off',
         '@angular-eslint/prefer-host-metadata-property': 'error',
         '@angular-eslint/no-queries-metadata-property': 'error',
+        '@angular-eslint/computed-must-return': 'error',
 
         '@angular-eslint/use-lifecycle-interface': 'error',
         '@angular-eslint/use-pipe-transform-interface': 'error',
@@ -93,6 +94,8 @@ export function defineScAngularConfig(...configs: Parameters<typeof defineConfig
         '@angular-eslint/template/no-negated-async': 'error',
         '@angular-eslint/template/no-empty-control-flow': 'error',
         '@angular-eslint/template/prefer-at-empty': 'error',
+        '@angular-eslint/template/prefer-class-binding': 'error',
+        '@angular-eslint/template/no-non-null-assertion': 'error',
 
         // some very basic a11y rules
         '@angular-eslint/template/elements-content': 'error',

packages/eslint-config-recommended/src/angular/index.ts

@@ -57,6 +57,7 @@ export function defineScTsConfig(...configs: Parameters<typeof defineConfig>): R
         'simple-import-sort/exports': 'error',
         'no-console': 'error',
         'max-classes-per-file': 'error',
+        'object-shorthand': 'error',
         curly: 'error',
         eqeqeq: 'error',
       },