Merge pull request #6 from ianacaburian/develop

Cleaned up import statements. Exposed test seed to env. Updated Readm…

Author: ianacaburian

.gitignore

@@ -1,4 +1,5 @@
 /node_modules
+.vscode
 
 # Ignore test-related files
 /coverage.data

.vscode/settings.json

@@ -106,10 +106,16 @@ npm run open:test/console       # Open test/console project in Xcode.
 npm run install:test/console    # Build and install the test/console bins.
 ```
 
-Optional: Set "FC_NUM_RUMS" (default=1) to specify how many times to run each
-(randomly generated) propery-based test -- see
-[fast-check](https://github.com/dubzzz/fast-check).
+-   Optional: Set "FC_NUM_RUMS" (default=1) to specify how many times to run
+    each (randomly generated) propery-based test -- see
+    [fast-check](https://github.com/dubzzz/fast-check).
 
 ```
 FC_NUM_RUNS=1000 npm run test   # Run each fc test 1000 times.
 ```
+
+-   Optional: Set "FC_SEED" (default=1) to specify the seed for each fc test.
+
+```
+FC_SEED=2 npm run test   # Run each fc test with seed=2.
+```

README.md

@@ -1,6 +1,6 @@
 {
     "name": "@ianacaburian/generate-key-file",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "description": "Ports juce_KeyGeneration::generateKeyFile() to node.",
     "type": "module",
     "main": "./dist/index.js",

package.json

@@ -1,5 +1,7 @@
-export * from './juce/JuceKeyGeneration'
 export {
     type GenerateKeyFileParams,
     type GenerateExpiringKeyFileParams
 } from './types'
+
+export { generateKeyFile } from './generateKeyFile'
+export { generateExpiringKeyFile } from './generateExpiringKeyFile'

src/index.ts

@@ -1,7 +1,7 @@
-import { JuceKeyFileUtils } from 'src/juce/JuceKeyFileUtils'
 import { GenerateExpiringKeyFileParams, GenerateKeyFileParams } from 'src/types'
 
 import { JuceDateString } from './JuceDateString'
+import { JuceKeyFileUtils } from './JuceKeyFileUtils'
 import { JuceRSAKey } from './JuceRSAKey'
 
 export class JuceKeyGeneration {

src/juce/JuceKeyGeneration.ts

@@ -1,5 +1,3 @@
-// import { BigInteger as JSBN } from 'jsbn'
-
 import { JuceBigInteger } from './JuceBigInteger'
 
 export class JuceRSAKey {

src/juce/JuceRSAKey.ts

@@ -1,8 +1,9 @@
 import fc from 'fast-check'
 import { JuceBigInteger } from 'src/juce/JuceBigInteger'
-import { execTestBin, hexArbitrary } from 'src/test/test-utils'
 import { describe, expect, it } from 'vitest'
 
+import { execTestBin, hexArbitrary } from './test-utils'
+
 describe('JuceBigInteger', () => {
     it('fromUTF8MemoryBlock', ctx => {
         console.log(`Testing ${ctx.task.name}...`)

src/test/JuceBigInteger.test.ts

@@ -2,7 +2,6 @@ import fc from 'fast-check'
 import { JuceDateString } from 'src/juce/JuceDateString'
 import { JuceKeyFileUtils } from 'src/juce/JuceKeyFileUtils'
 import { JuceRSAKey } from 'src/juce/JuceRSAKey'
-import { execTestBin, hexArbitrary } from 'src/test/test-utils'
 import {
     CreateKeyFileCommentParams,
     createKeyFileCommentParamsValidator,
@@ -12,6 +11,8 @@ import {
 import { describe, expect, it } from 'vitest'
 import { ZodFastCheck } from 'zod-fast-check'
 
+import { execTestBin, hexArbitrary } from './test-utils'
+
 describe('JuceKeyFileUtils', () => {
     it('createKeyFileContentLine', ctx => {
         console.log(`Testing ${ctx.task.name}...`)

src/test/JuceKeyFileUtils.test.ts

@@ -1,9 +1,10 @@
 import fc from 'fast-check'
 import { JuceDateString } from 'src/juce/JuceDateString'
 import { JuceKeyGeneration } from 'src/juce/JuceKeyGeneration'
-import { execTestBin } from 'src/test/test-utils'
 import { describe, expect, it } from 'vitest'
 
+import { execTestBin } from './test-utils'
+
 describe('JuceKeyGeneration', () => {
     type TestParams = {
         userEmail: string
@@ -181,8 +182,8 @@ describe('JuceKeyGeneration', () => {
         fc.assert(
             fc.property(
                 fc.record({
-                    userEmail: fc.string({ minLength: 1 }),
-                    userName: fc.string({ minLength: 1 })
+                    userEmail: fc.string({ minLength: 100 }),
+                    userName: fc.string({ minLength: 100 })
                 }),
                 input => {
                     count += 1n

src/test/JuceKeyGeneration.test.ts

@@ -1,9 +1,10 @@
 import fc from 'fast-check'
 import { JuceBigInteger } from 'src/juce/JuceBigInteger'
 import { JuceRSAKey } from 'src/juce/JuceRSAKey'
-import { execTestBin, hexArbitrary } from 'src/test/test-utils'
 import { describe, expect, it } from 'vitest'
 
+import { execTestBin, hexArbitrary } from './test-utils'
+
 describe('JuceRSAKey', () => {
     it('applyToValue', ctx => {
         console.log(`Testing ${ctx.task.name}...`)

src/test/JuceRSAKey.test.ts

@@ -1,6 +1,4 @@
 import { execSync } from 'child_process'
-import crypto from 'crypto'
-import os from 'os'
 import path from 'path'
 import fc from 'fast-check'
 

src/test/test-utils.ts

@@ -1,3 +1,7 @@
 import fc from 'fast-check'
 
-fc.configureGlobal({ numRuns: process.env.FC_NUM_RUNS || 1, verbose: 1 })
+fc.configureGlobal({
+    verbose: 1,
+    numRuns: process.env.FC_NUM_RUNS || 1,
+    seed: process.env.FC_SEED || 1
+})