@diia-inhouse/scaffold 2.59.2 → 2.60.1

package/dist/_templates/init/package/01-package.json.t

@@ -5,11 +5,17 @@ to:  <%= packageName %>/package.json
 {
     "name": "@diia-inhouse/<%= packageName %>",
     "version": "1.0.0",
-    "type": "module",
     "description": "<%= description %>",
     "author": "diia-team",
+    "files": [
+        "dist"
+    ],
+    "type": "module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
+    "imports": {
+        "#*": "./dist/*"
+    },
     "exports": {
         ".": {
             "types": "./dist/index.d.ts",
@@ -17,9 +23,6 @@ to:  <%= packageName %>/package.json
         },
         "./package.json": "./package.json"
     },
-    "engines": {
-        "node": ">=24"
-    },
     "scripts": {
         "prebuild": "rimraf dist",
         "build": "tsdown",
@@ -33,18 +36,15 @@ to:  <%= packageName %>/package.json
         "find-circulars": "madge --circular --extensions ts ./",
         "lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts registry.npmjs.org gitlab.diia.org.ua --validate-https"
     },
-    "files": ["dist"],
-    "imports": {
-        "#*": "./dist/*"
-    },
-    "keywords": [],
-    "devDependencies": {},
     "commitlint": {
         "extends": "@diia-inhouse/configs/dist/commitlint"
     },
     "release": {
         "extends": "@diia-inhouse/configs/dist/semantic-release/package"
     },
+    "engines": {
+        "node": ">=24"
+    },
     "madge": {
         "tsConfig": "./tsconfig.json"
     }

package/dist/_templates/init/service/01-.gitlab-ci.yml.t

@@ -10,11 +10,10 @@ variables:
     CI_PIPELINE_TYPE: nodeJS-tag
     CI_BUFBUILD_PROTOBUF_VERSION: '2.12.0'
     NODE_DEBIAN_BUILD_ENABLED: 'true'
+    CI_PROTO_BUF: 'true'
+    CI_PROTO_BREAKING: 'true'
 
 include:
     - project: diia-inhouse/ci
       ref: main
       file: main/node.gitlab-ci.yaml
-    - project: diia-inhouse/ci
-      ref: main
-      file: main/proto.gitlab-ci.yaml

package/dist/_templates/init/service/01-buf.gen.yaml.t

@@ -0,0 +1,10 @@
+---
+to:  <%= serviceName %>/buf.gen.yaml
+---
+version: v2
+inputs:
+    - directory: proto
+plugins:
+    - local: protoc-gen-diia-ts
+      out: src/generated
+      strategy: all

package/dist/_templates/init/service/01-buf.yaml.t

@@ -0,0 +1,10 @@
+---
+to:  <%= serviceName %>/buf.yaml
+---
+version: v2
+modules:
+    - path: proto
+    - path: node_modules/@diia-inhouse/design-system/dist/proto
+    - path: node_modules/@diia-inhouse/types/dist/proto
+deps:
+    - buf.build/googleapis/googleapis

package/dist/_templates/init/service/01-package.json.t

@@ -5,43 +5,42 @@ to:  <%= serviceName %>/package.json
 {
     "name": "<%= serviceName.replace(/-service$/, '') %>",
     "version": "1.0.0",
-    "type": "module",
+    "private": true,
     "description": "<%= description %>",
     "author": "diia-team",
+    "type": "module",
     "main": "dist/index.js",
+    "imports": {
+        "#*": "./dist/*"
+    },
     "scripts": {
         "build": "rimraf dist && npm run genproto && tsc",
         "start": "node dist/index.js",
+        "dev": "diia-dev",
         "semantic-release": "semantic-release -e @diia-inhouse/configs/dist/semantic-release/service-stage --debug --ci",
         "semantic-release-prod": "semantic-release -e @diia-inhouse/configs/dist/semantic-release/service-prod --debug --ci",
-        "lint": "oxlint && oxfmt --check . && buf format ./proto --diff --exit-code",
-        "lint-fix": "oxlint --fix && oxfmt . && buf format ./proto --write",
+        "lint": "oxlint && oxfmt --check . && diia-buf-lint",
+        "lint-fix": "oxlint --fix && oxfmt . && diia-buf-lint --fix",
         "lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts registry.npmjs.org gitlab.diia.org.ua --validate-https",
-        "test": "npm run genproto -- --generateClient=true && tsc --project tests/tsconfig.json --noEmit && vitest run",
+        "test": "npm run genproto && tsc --project tests/tsconfig.json --noEmit && vitest run",
         "test:watch": "vitest watch",
         "test:coverage": "vitest run --coverage",
-        <%if (h.isOptionSelected(selectedDependencies, 'database')) {%>
+        <%_ if (h.isOptionSelected(selectedDependencies, 'database')) { _%>
         "migrate-test": "NODE_ENV=test npm run migrate up",
         "migrate": "npm run indexes:sync && sh -c 'tsx --tsconfig migrations/tsconfig.json node_modules/.bin/migrate-mongo $0 $1 -f migrate-mongo-config.ts'",
         "indexes:sync": "./node_modules/.bin/diia-db sync-indexes",
-        <%}%>
+        <%_ } _%>
         "find-circulars": "madge --circular --extensions ts ./",
         "scaffold": "scaffold",
-        "genproto": "genproto --outputDir src/generated"
-    },
-    "keywords": [],
-    "engines": {
-        "node": ">=24"
-    },
-    "files": [
-        "dist"
-    ],
-    "imports": {
-        "#*": "./dist/*"
+        "genproto": "buf generate",
+        "proto:breaking": "diia-buf-breaking"
     },
     "commitlint": {
         "extends": "@diia-inhouse/configs/dist/commitlint"
     },
+    "engines": {
+        "node": ">=24"
+    },
     "madge": {
         "tsConfig": "./tsconfig.json"
     }

package/dist/_templates/init/service/02-scriptRunner.ts.t

@@ -1,5 +1,5 @@
 ---
-sh: "cd <%= serviceName %> && echo 'Installing dependencies and setting up environment, please wait...' && npm install <%= dependencies.deps %> --package-lock-only && npm install --save-dev <%= dependencies.devDeps %> --package-lock-only && rm -f package-lock.json && npm install && npm run genproto && npm run lint-fix && cp .env.example .env && cp .env.test .env.test.local && npm run build && npm test"
+sh: "cd <%= serviceName %> && echo 'Installing dependencies and setting up environment, please wait...' && npm install <%= dependencies.deps %> --package-lock-only && npm install --save-dev <%= dependencies.devDeps %> --package-lock-only && rm -f package-lock.json && npm install && npx buf dep update && npm run genproto && npm run lint-fix && cp .env.example .env && cp .env.test .env.test.local && npm run build && npm test"
 ---
 
 This file does not appear in the final package generation

package/dist/depsNames.js

@@ -19,7 +19,7 @@ const CommonDevDeps = [
     'vitest-mock-extended',
 ];
 const PackageDevDeps = [...CommonDevDeps, 'tsdown'];
-const ServiceDevDeps = [...CommonDevDeps, '@bufbuild/buf', '@diia-inhouse/genproto', '@diia-inhouse/scaffold', 'tsx'];
+const ServiceDevDeps = [...CommonDevDeps, '@bufbuild/buf', '@diia-inhouse/scaffold', 'tsx'];
 exports.packageDependencies = { devDeps: PackageDevDeps };
 exports.PackageDeps = [
     '@diia-inhouse/crypto',

package/dist/depsNames.js.map

@@ -1 +1 @@
-{"version":3,"file":"depsNames.js","sourceRoot":"","sources":["../src/depsNames.ts"],"names":[],"mappings":";;;AAAA,MAAM,aAAa,GAAG;IAClB,uBAAuB;IACvB,0BAA0B;IAC1B,oBAAoB;IACpB,qBAAqB;IACrB,YAAY;IACZ,eAAe;IACf,OAAO;IACP,OAAO;IACP,QAAQ;IACR,iBAAiB;IACjB,QAAQ;IACR,kBAAkB;IAClB,YAAY;IACZ,QAAQ;IACR,sBAAsB;CAChB,CAAA;AAEV,MAAM,cAAc,GAAG,CAAC,GAAG,aAAa,EAAE,QAAQ,CAAU,CAAA;AAE5D,MAAM,cAAc,GAAG,CAAC,GAAG,aAAa,EAAE,eAAe,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,KAAK,CAAU,CAAA;AAEjH,QAAA,mBAAmB,GAAG,EAAE,OAAO,EAAE,cAAc,EAAE,CAAA;AAEjD,QAAA,WAAW,GAAG;IACvB,sBAAsB;IACtB,kBAAkB;IAClB,6BAA6B;IAC7B,wBAAwB;IACxB,2BAA2B;IAC3B,0BAA0B;IAC1B,4BAA4B;IAC5B,mBAAmB;IACnB,sBAAsB;IACtB,2BAA2B;IAC3B,qBAAqB;IACrB,qBAAqB;IACrB,qBAAqB;IACrB,0BAA0B;IAC1B,eAAe;CACT,CAAA;AAIG,QAAA,mBAAmB,GAAG;IAC/B,OAAO,EAAE,cAAc;IACvB,IAAI,EAAE,mBAAW;CACpB,CAAA"}
+{"version":3,"file":"depsNames.js","sourceRoot":"","sources":["../src/depsNames.ts"],"names":[],"mappings":";;;AAAA,MAAM,aAAa,GAAG;IAClB,uBAAuB;IACvB,0BAA0B;IAC1B,oBAAoB;IACpB,qBAAqB;IACrB,YAAY;IACZ,eAAe;IACf,OAAO;IACP,OAAO;IACP,QAAQ;IACR,iBAAiB;IACjB,QAAQ;IACR,kBAAkB;IAClB,YAAY;IACZ,QAAQ;IACR,sBAAsB;CAChB,CAAA;AAEV,MAAM,cAAc,GAAG,CAAC,GAAG,aAAa,EAAE,QAAQ,CAAU,CAAA;AAE5D,MAAM,cAAc,GAAG,CAAC,GAAG,aAAa,EAAE,eAAe,EAAE,wBAAwB,EAAE,KAAK,CAAU,CAAA;AAEvF,QAAA,mBAAmB,GAAG,EAAE,OAAO,EAAE,cAAc,EAAE,CAAA;AAEjD,QAAA,WAAW,GAAG;IACvB,sBAAsB;IACtB,kBAAkB;IAClB,6BAA6B;IAC7B,wBAAwB;IACxB,2BAA2B;IAC3B,0BAA0B;IAC1B,4BAA4B;IAC5B,mBAAmB;IACnB,sBAAsB;IACtB,2BAA2B;IAC3B,qBAAqB;IACrB,qBAAqB;IACrB,qBAAqB;IACrB,0BAA0B;IAC1B,eAAe;CACT,CAAA;AAIG,QAAA,mBAAmB,GAAG;IAC/B,OAAO,EAAE,cAAc;IACvB,IAAI,EAAE,mBAAW;CACpB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@diia-inhouse/scaffold",
-    "version": "2.59.2",
+    "version": "2.60.1",
     "main": "dist/index.js",
     "engines": {
         "node": ">=22"