get version const from tools package

rsek · Dec 8, 2023 · bd04ee2 · bd04ee2
1 parent b0db4eb
commit bd04ee2
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "datasworn-tools",
+	"name": "@datasworn/tools",
 	"version": "0.0.5",
 	"description": "",
 	"type": "module",
@@ -9,21 +9,28 @@
 		"build:schema": "ts-node ./src/scripts/schema/buildSchema.ts",
 		"build:jtd": "ts-node ./src/scripts/json-typedef/index.ts",
 		"build:dts": "ts-node ./src/scripts/codegen/writeTypescriptTypes.ts",
-		"build:tools": "tsc --project tsconfig.json ; tsc-alias -p tsconfig.json ./dist",
 		"build:json": "ts-node ./src/scripts/datasworn/writeDatasworn.ts",
 		"build:pkg": "ts-node ./src/scripts/pkg/nodejs/buildPackages.ts",
 		"build": "ts-node ./src/scripts/pkg/nodejs/updatePackageVersions.ts && npm run build:schema && npm run build:jtd && npm run build:dts && npm run build:json && npm run build:pkg",
 		"pkg:node": "ts-node ./src/scripts/pkg/nodejs/publishPackages.ts"
 	},
-	"files": ["docs", "img", "markdown"],
+	"files": [
+		"docs",
+		"img",
+		"markdown"
+	],
 	"directories": {
 		"doc": "./docs"
 	},
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/rsek/datasworn.git"
 	},
-	"keywords": ["ironsworn", "starforged", "TTRPG"],
+	"keywords": [
+		"ironsworn",
+		"starforged",
+		"TTRPG"
+	],
 	"author": {
 		"name": "rsek",
 		"email": "r.sekouri@gmail.com",
@@ -77,4 +84,4 @@
 		"winston": "^3.11.0",
 		"yaml": "^2.3.4"
 	}
-}
+}
diff --git a/src/scripts/const.ts b/src/scripts/const.ts
@@ -1,8 +1,13 @@
 import path from 'path'
+import fs from 'fs-extra'
+
+const toolsPkg = fs.readJSONSync(path.join(process.cwd(), 'package.json')) as {
+	version: string
+}
 
 export const PKG_NAME = 'Datasworn'
 
-export const VERSION = '0.0.5'
+export const VERSION = toolsPkg.version
 
 export const PKG_SCOPE_OFFICIAL = '@datasworn'
 export const PKG_SCOPE_COMMUNITY = '@datasworn-community-content'

diff --git a/src/scripts/pkg/nodejs/updatePackageVersions.ts b/src/scripts/pkg/nodejs/updatePackageVersions.ts
@@ -18,31 +18,32 @@ export async function updatePackageVersions(
   const pattern =
     /^(?<headerText># .+? v)(?<version>(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)/
 
-  for (const filePath of [...pkgs, path.join(process.cwd(), 'package.json')])
-    toWrite.push(
-      fs.readJSON(filePath).then(async (json) => {
-        const oldVersion = json?.version as string
-
-
+  for (const filePath of pkgs)
+		toWrite.push(
+			fs.readJSON(filePath).then(async (json) => {
+				const oldVersion = json?.version as string
 
-        if (oldVersion !== newVersion) {
-          Log.info(
-            `Updating from v${oldVersion} to v${newVersion} in ./${path.relative(
-              process.cwd(),
-              filePath
-            )}`
-          )
-          json.version = newVersion
-        }
+				if (oldVersion !== newVersion) {
+					Log.info(
+						`Updating from v${oldVersion} to v${newVersion} in ./${path.relative(
+							process.cwd(),
+							filePath
+						)}`
+					)
+					json.version = newVersion
+				}
 
-        const newDependencies = mapValues(json.dependencies as Record<string, string>, (value, key) => key.startsWith('@datasworn/') ? newVersion : value)
+				const newDependencies = mapValues(
+					json.dependencies as Record<string, string>,
+					(value, key) => (key.startsWith('@datasworn/') ? newVersion : value)
+				)
 
-        if (!isEqual(json.dependencies, newDependencies))
-          json.dependencies = newDependencies
+				if (!isEqual(json.dependencies, newDependencies))
+					json.dependencies = newDependencies
 
-        return writeJSON(filePath, json)
-      })
-    )
+				return writeJSON(filePath, json)
+			})
+		)
 
   for (const filePath of readmes) {
     toWrite.push(