Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Importing Modules on First Run #67

Merged
merged 2 commits into from
Oct 15, 2024
Merged

Fix Importing Modules on First Run #67

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca475ed
move import later to maybe fix the globalThis reference
seveibar Oct 15, 2024
6b33f5a
fix require not being available for imports on first run
seveibar Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 23 additions & 27 deletions src/hooks/use-run-tsx/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,27 @@ export const useRunTsx = ({
}
if (!code) return
async function run() {
const { success, compiledTsx: compiledJs, error } = safeCompileTsx(code!)

if (!success) {
setTsxResult({
compiledModule: null,
message: `Compile Error: ${error.message}`,
circuitJson: null,
isLoading: false,
})
}

const userCodeTsciImports = getImportsFromCode(code!).filter((imp) =>
imp.startsWith("@tsci/"),
)

const preSuppliedImports: Record<string, any> =
preSuppliedImportsRef.current

const __tscircuit_require = (name: string) => {
if (!preSuppliedImports[name]) {
throw new Error(
`Import "${name}" not found (imports available: ${Object.keys(preSuppliedImports).join(",")})`,
)
}
return preSuppliedImports[name]
}
;(globalThis as any).__tscircuit_require = __tscircuit_require
preSuppliedImports["@tscircuit/core"] = tscircuitCore
preSuppliedImports["react"] = React
preSuppliedImports["jscad-fiber"] = jscadFiber
globalThis.React = React

async function addImport(importName: string, depth: number = 0) {
if (!importName.startsWith("@tsci/")) return
if (preSuppliedImports[importName]) return
Expand All @@ -98,9 +101,7 @@ export const useRunTsx = ({

const { compiled_js, code } = importedSnippet

const importNames = getImportsFromCode(code!).filter(
(imp) => !preSuppliedImports[imp],
)
const importNames = getImportsFromCode(code!)

for (const importName of importNames) {
if (!preSuppliedImports[importName]) {
Expand All @@ -119,23 +120,18 @@ export const useRunTsx = ({
await addImport(userCodeTsciImport)
}

preSuppliedImports["@tscircuit/core"] = tscircuitCore
preSuppliedImports["react"] = React
preSuppliedImports["jscad-fiber"] = jscadFiber
const { success, compiledTsx: compiledJs, error } = safeCompileTsx(code!)

const __tscircuit_require = (name: string) => {
if (!preSuppliedImports[name]) {
throw new Error(
`Import "${name}" not found (imports available: ${Object.keys(preSuppliedImports).join(",")})`,
)
}
return preSuppliedImports[name]
if (!success) {
setTsxResult({
compiledModule: null,
message: `Compile Error: ${error.message}`,
circuitJson: null,
isLoading: false,
})
}
;(globalThis as any).__tscircuit_require = __tscircuit_require

try {
globalThis.React = React

const module = evalCompiledJs(compiledJs!)

const componentExportKeys = Object.keys(module.exports).filter(
Expand Down
Loading