Remove dependency on js-client-sdk for React generated types (#410)

DevCycleHQ · Jul 3, 2024 · 17dfa73 · 17dfa73
1 parent 77430b6
commit 17dfa73
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/src/commands/generate/__snapshots__/types.test.ts.snap b/src/commands/generate/__snapshots__/types.test.ts.snap
@@ -185,10 +185,11 @@ export const JSON_VAR = 'dvc_obfs_a991871dbce45b30da1e125ae28b59eb74c1da1f48ad6a
 `;
 
 exports[`generate types correctly generates React SDK types 1`] = `
-"import { DVCVariable, DVCVariableValue } from '@devcycle/js-client-sdk'
-import {
+"import {
     useVariable as originalUseVariable,
-    useVariableValue as originalUseVariableValue
+    useVariableValue as originalUseVariableValue,
+    DVCVariable,
+    DVCVariableValue
 } from '@devcycle/react-client-sdk'
 
 

diff --git a/src/commands/generate/types.ts b/src/commands/generate/types.ts
@@ -9,20 +9,26 @@ import { createHash } from 'crypto'
 import path from 'path'
 
 const reactImports = (oldRepos: boolean) => {
-    const jsRepo = oldRepos
-        ? '@devcycle/devcycle-js-sdk'
-        : '@devcycle/js-client-sdk'
-    const reactRepo = oldRepos
-        ? '@devcycle/devcycle-react-sdk'
-        : '@devcycle/react-client-sdk'
-    return `import { DVCVariable, DVCVariableValue } from '${jsRepo}'
+    if (oldRepos) {
+        return `import { DVCVariable, DVCVariableValue } from '@devcycle/devcycle-js-sdk'
 import {
     useVariable as originalUseVariable,
     useVariableValue as originalUseVariableValue
-} from '${reactRepo}'
+} from '@devcycle/devcycle-react-sdk'
 
 `
+    } else {
+        return `import {
+    useVariable as originalUseVariable,
+    useVariableValue as originalUseVariableValue,
+    DVCVariable,
+    DVCVariableValue
+} from '@devcycle/react-client-sdk'
+
+`
+    }
 }
+
 const reactOverrides = `
 export type UseVariableValue = <
     K extends string & keyof DVCVariableTypes
@@ -193,7 +199,9 @@ export default class GenerateTypes extends Base {
     }
 
     private getVariableKeyAndType(variable: Variable) {
-        return `'${this.obfuscate ? this.encryptKey(variable) : variable.key}': ${getVariableType(variable)}`
+        return `'${
+            this.obfuscate ? this.encryptKey(variable) : variable.key
+        }': ${getVariableType(variable)}`
     }
 
     private getVariableInfoComment(
@@ -237,7 +245,9 @@ export const ${constantName} = '${hashedKey}' as const`
     }
 
     private encryptKey(variable: Variable) {
-        return `dvc_obfs_${createHash('sha256').update(variable._id).digest('hex')}`
+        return `dvc_obfs_${createHash('sha256')
+            .update(variable._id)
+            .digest('hex')}`
     }
 
     private updateFileLocation() {