Merge pull request #393 from formidablejs/release/0.28.5

donaldp · web-flow · commit 012f4b58fda4 · 2025-10-21T00:53:44.000+02:00
Release/0.28.5
diff --git a/formidable/auth/imba/test/__mocks__/@paralleldrive/cuid2.js b/formidable/auth/imba/test/__mocks__/@paralleldrive/cuid2.js
@@ -0,0 +1,8 @@
+//Mock for @paralleldrive/cuid2
+
+module.exports = {
+    createId: jest.fn(() => 'mock-id'),
+    init: jest.fn(),
+    getConstants: jest.fn(() => ({})),
+    isCuid: jest.fn(() => true)
+};
diff --git a/formidable/auth/imba/test/app.e2e.test.imba b/formidable/auth/imba/test/app.e2e.test.imba
@@ -1,3 +1,5 @@
+jest.mock '@paralleldrive/cuid2'
+
 const formidable = require('../.formidable/build').default
 const supertest = require('supertest')
 
diff --git a/formidable/auth/ts/test/__mocks__/@paralleldrive/cuid2.js b/formidable/auth/ts/test/__mocks__/@paralleldrive/cuid2.js
@@ -0,0 +1,8 @@
+//Mock for @paralleldrive/cuid2
+
+module.exports = {
+    createId: jest.fn(() => 'mock-id'),
+    init: jest.fn(),
+    getConstants: jest.fn(() => ({})),
+    isCuid: jest.fn(() => true)
+};
diff --git a/formidable/auth/ts/test/app.e2e.test.ts b/formidable/auth/ts/test/app.e2e.test.ts
@@ -1,3 +1,5 @@
+jest.mock('@paralleldrive/cuid2')
+
 const formidable = require('../.formidable/build').default
 const supertest = require('supertest')
 
diff --git a/formidable/web/test/imba/__mocks__/@paralleldrive/cuid2.js b/formidable/web/test/imba/__mocks__/@paralleldrive/cuid2.js
@@ -0,0 +1,8 @@
+//Mock for @paralleldrive/cuid2
+
+module.exports = {
+    createId: jest.fn(() => 'mock-id'),
+    init: jest.fn(),
+    getConstants: jest.fn(() => ({})),
+    isCuid: jest.fn(() => true)
+};
diff --git a/formidable/web/test/imba/app.e2e.test.imba b/formidable/web/test/imba/app.e2e.test.imba
@@ -1,3 +1,5 @@
+jest.mock '@paralleldrive/cuid2'
+
 const formidable = require('../.formidable/build').default
 const supertest = require('supertest')
 
diff --git a/formidable/web/test/ts/__mocks__/@paralleldrive/cuid2.js b/formidable/web/test/ts/__mocks__/@paralleldrive/cuid2.js
@@ -0,0 +1,8 @@
+//Mock for @paralleldrive/cuid2
+
+module.exports = {
+    createId: jest.fn(() => 'mock-id'),
+    init: jest.fn(),
+    getConstants: jest.fn(() => ({})),
+    isCuid: jest.fn(() => true)
+};
diff --git a/formidable/web/test/ts/app.e2e.test.ts b/formidable/web/test/ts/app.e2e.test.ts
@@ -1,3 +1,5 @@
+jest.mock('@paralleldrive/cuid2')
+
 const formidable = require('../.formidable/build').default
 const supertest = require('supertest')
 
@@ -17,7 +19,7 @@ describe('Application (e2e)', () => {
   })
 
   it('/ (GET: Welcome)', async () => {
-    supertest(app.server)
+    await supertest(app.server)
       .get('/')
       .expect(200)
       .expect((res) => {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@formidablejs/framework",
-  "version": "0.28.4",
+  "version": "0.28.5",
   "description": "Formidable Framework Core",
   "author": "Donald Pakkies",
   "license": "MIT",
diff --git a/scripts/e2e/test/__mocks__/@paralleldrive/cuid2.js b/scripts/e2e/test/__mocks__/@paralleldrive/cuid2.js
@@ -0,0 +1,8 @@
+//Mock for @paralleldrive/cuid2
+
+module.exports = {
+    createId: jest.fn(() => 'mock-id'),
+    init: jest.fn(),
+    getConstants: jest.fn(() => ({})),
+    isCuid: jest.fn(() => true)
+};
diff --git a/scripts/e2e/test/app.e2e.test.imba b/scripts/e2e/test/app.e2e.test.imba
@@ -1,3 +1,5 @@
+jest.mock '@paralleldrive/cuid2'
+
 const formidable = require('../.formidable/build').default
 const supertest = require('supertest')
 
diff --git a/scripts/e2e/test/auth.test.imba b/scripts/e2e/test/auth.test.imba
@@ -1,3 +1,5 @@
+jest.mock '@paralleldrive/cuid2'
+
 const formidable = require('../.formidable/build').default
 const supertest = require('supertest')
 
diff --git a/scripts/e2e/test/database.test.imba b/scripts/e2e/test/database.test.imba
@@ -1,3 +1,5 @@
+jest.mock '@paralleldrive/cuid2'
+
 const formidable = require('../.formidable/build').default
 const supertest = require('supertest')
 
diff --git a/scripts/e2e/test/language.test.imba b/scripts/e2e/test/language.test.imba
@@ -1,3 +1,5 @@
+jest.mock '@paralleldrive/cuid2'
+
 const formidable = require('../.formidable/build').default
 const supertest = require('supertest')
 
diff --git a/scripts/e2e/test/responses.test.imba b/scripts/e2e/test/responses.test.imba
@@ -1,3 +1,5 @@
+jest.mock '@paralleldrive/cuid2'
+
 const formidable = require('../.formidable/build').default
 const supertest = require('supertest')
 
diff --git a/scripts/e2e/test/routes.test.imba b/scripts/e2e/test/routes.test.imba
@@ -1,3 +1,5 @@
+jest.mock '@paralleldrive/cuid2'
+
 const formidable = require('../.formidable/build').default
 const supertest = require('supertest')
 
diff --git a/scripts/e2e/test/validation.test.imba b/scripts/e2e/test/validation.test.imba
@@ -1,3 +1,5 @@
+jest.mock '@paralleldrive/cuid2'
+
 const formidable = require('../.formidable/build').default
 const supertest = require('supertest')
 
diff --git a/src/Support/Helpers/config.imba b/src/Support/Helpers/config.imba
@@ -1,5 +1,6 @@
 import ConfigNotCachedError from './Error/ConfigNotCachedError'
 import dot from './dotNotation'
+import runtime from './runtime'
 import path from 'path'
 
 def fallback notation\string, default\any = null
@@ -15,7 +16,9 @@ export default def config notation\string, default\any = null
 	if !notation or typeof notation != 'string'
 		return default
 	try
-		const config = require(path.join(process.cwd!, 'bootstrap', 'cache', 'config.json'))
+		const cachedConfig = path.join(process.cwd!, 'bootstrap', 'cache', 'config.json')
+
+		const config = runtime() == 'bun' ? JSON.parse(fs.readFileSync(cachedConfig)) : require(cachedConfig)
 		return dot(config, notation) ?? default
 	catch e
 		return fallback(notation, default)
diff --git a/src/Support/Language/Language.imba b/src/Support/Language/Language.imba
@@ -1,4 +1,5 @@
 import dot from '../Helpers/dotNotation'
+import runtime from '../Helpers/runtime'
 import fs from 'fs'
 import path from 'path'
 
@@ -46,8 +47,10 @@ export default class Language
 
 			for file in fs.readdirSync(path.join(location, pack))
 				if path.extname(file) == '.json'
+					const translation = path.join(location, pack, file)
+
 					const definition = {
-						[path.parse(file).name]: require path.join(location, pack, file)
+						[path.parse(file).name]: runtime! == 'bun' ? JSON.parse(fs.readFileSync(translation).toString()) : require(translation)
 					}
 
 					if !definition

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+jest.mock '@paralleldrive/cuid2'`
	`2`	`+`
`1`	`3`	`const formidable = require('../.formidable/build').default`
`2`	`4`	`const supertest = require('supertest')`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+jest.mock('@paralleldrive/cuid2')`
	`2`	`+`
`1`	`3`	`const formidable = require('../.formidable/build').default`
`2`	`4`	`const supertest = require('supertest')`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@formidablejs/framework",`
`3`		`- "version": "0.28.4",`
	`3`	`+ "version": "0.28.5",`
`4`	`4`	`"description": "Formidable Framework Core",`
`5`	`5`	`"author": "Donald Pakkies",`
`6`	`6`	`"license": "MIT",`